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

2043 files changed, 18759 insertions, 18312 deletions

diff --git a/COMPILING.html b/COMPILING.html
index fad0c5f78..58deb391b 100644
--- a/COMPILING.html
+++ b/COMPILING.html
@@ -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:
 
diff --git a/COPYING b/COPYING
index 0058a832a..5185fd3f3 100644
--- a/COPYING
+++ b/COPYING
@@ -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
diff --git a/COPYING-DOCS b/COPYING-DOCS
index 6f8023988..4a0fe1c8d 100644
--- a/COPYING-DOCS
+++ b/COPYING-DOCS
@@ -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.
diff --git a/COPYING.LIB b/COPYING.LIB
index feb4003da..01148ab6f 100644
--- a/COPYING.LIB
+++ b/COPYING.LIB
@@ -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
diff --git a/DEBUG b/DEBUG
index d57f91d1d..58349d089 100644
--- a/DEBUG
+++ b/DEBUG
@@ -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
diff --git a/INSTALL b/INSTALL
index 3dfa60f89..349b80012 100644
--- a/INSTALL
+++ b/INSTALL
@@ -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.
 
diff --git a/KDE2PORTING.html b/KDE2PORTING.html
index 2422c5656..1154682c8 100644
--- a/KDE2PORTING.html
+++ b/KDE2PORTING.html
@@ -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>
diff --git a/KDE3PORTING.html b/KDE3PORTING.html
index dd341ab3d..e249020f6 100644
--- a/KDE3PORTING.html
+++ b/KDE3PORTING.html
@@ -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>
diff --git a/Mainpage.dox b/Mainpage.dox
index 346d51184..6e96558b3 100644
--- a/Mainpage.dox
+++ b/Mainpage.dox
@@ -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>
diff --git a/Makefile.am.in b/Makefile.am.in
index 6104020d3..ba1149e5e 100644
--- a/Makefile.am.in
+++ b/Makefile.am.in
@@ -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 ;\
diff --git a/README b/README
index 514bf381c..6dec4892d 100644
--- a/README
+++ b/README
@@ -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
diff --git a/TODO b/TODO
index e2f2eb5cc..2adb8eee1 100644
--- a/TODO
+++ b/TODO
@@ -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.
diff --git a/arts/kde/kartsdispatcher.h b/arts/kde/kartsdispatcher.h
index 26eb115d9..dcd094844 100644
--- a/arts/kde/kartsdispatcher.h
+++ b/arts/kde/kartsdispatcher.h
@@ -61,7 +61,7 @@ namespace Arts
  * }
  * \endcode
  */
-class KDE_EXPORT KArtsDispatcher : public TQObject
+class KDE_EXPORT KArtsDispatcher : public QObject
 {
 Q_OBJECT
 public:
diff --git a/arts/kde/kartsserver.cpp b/arts/kde/kartsserver.cpp
index b4c3f963b..ee220be17 100644
--- a/arts/kde/kartsserver.cpp
+++ b/arts/kde/kartsserver.cpp
@@ -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" ) );
 
diff --git a/arts/kde/kartsserver.h b/arts/kde/kartsserver.h
index 0735e2082..c01829cf1 100644
--- a/arts/kde/kartsserver.h
+++ b/arts/kde/kartsserver.h
@@ -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
 
diff --git a/arts/kde/kaudioconverter.h b/arts/kde/kaudioconverter.h
index 0022d9bba..21876e037 100644
--- a/arts/kde/kaudioconverter.h
+++ b/arts/kde/kaudioconverter.h
@@ -29,7 +29,7 @@
 class KURL;
 class TQString;
 
-class KAudioConverter : public TQObject
+class KAudioConverter : public QObject
 {
 Q_OBJECT
 public:
diff --git a/arts/kde/kaudiorecordstream.h b/arts/kde/kaudiorecordstream.h
index 8caab8325..fdd4353fe 100644
--- a/arts/kde/kaudiorecordstream.h
+++ b/arts/kde/kaudiorecordstream.h
@@ -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
 
diff --git a/arts/kde/kconverttest.h b/arts/kde/kconverttest.h
index 7e7cc6c50..1d0b10f87 100644
--- a/arts/kde/kconverttest.h
+++ b/arts/kde/kconverttest.h
@@ -24,7 +24,7 @@
 
 #include <tqobject.h>
 
-class KConvertTest : public TQObject
+class KConvertTest : public QObject
 {
 Q_OBJECT
 public:
diff --git a/arts/kde/kioinputstream_impl.cpp b/arts/kde/kioinputstream_impl.cpp
index e88d5a3c0..f7df6347c 100644
--- a/arts/kde/kioinputstream_impl.cpp
+++ b/arts/kde/kioinputstream_impl.cpp
@@ -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 &)));		     
diff --git a/arts/kde/kplayobject.cc b/arts/kde/kplayobject.cc
index 7c71be31f..becb20a58 100644
--- a/arts/kde/kplayobject.cc
+++ b/arts/kde/kplayobject.cc
@@ -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()
diff --git a/arts/kde/kplayobject.h b/arts/kde/kplayobject.h
index 4aafe0b58..907723cf3 100644
--- a/arts/kde/kplayobject.h
+++ b/arts/kde/kplayobject.h
@@ -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:
diff --git a/arts/kde/kplayobjectcreator.h b/arts/kde/kplayobjectcreator.h
index d52e18a1e..f012de2cd 100644
--- a/arts/kde/kplayobjectcreator.h
+++ b/arts/kde/kplayobjectcreator.h
@@ -29,7 +29,7 @@
 
 namespace KDE {
 
-class PlayObjectCreator : public TQObject
+class PlayObjectCreator : public QObject
 {
 Q_OBJECT
 public:
diff --git a/arts/kde/kplayobjectfactory.cc b/arts/kde/kplayobjectfactory.cc
index c02b896a5..99a2e2edb 100644
--- a/arts/kde/kplayobjectfactory.cc
+++ b/arts/kde/kplayobjectfactory.cc
@@ -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 );
diff --git a/arts/kde/kplayobjectfactory_p.h b/arts/kde/kplayobjectfactory_p.h
index 6d4b1fa26..f81349251 100644
--- a/arts/kde/kplayobjectfactory_p.h
+++ b/arts/kde/kplayobjectfactory_p.h
@@ -29,7 +29,7 @@ namespace KDE
 /**
  * @internal
  */
-class POFHelper : public TQObject
+class POFHelper : public QObject
 {
 	friend class PlayObjectFactory;
 	Q_OBJECT
diff --git a/arts/kde/kvideowidget.cpp b/arts/kde/kvideowidget.cpp
index cea85bd2c..6aeeb8e8f 100644
--- a/arts/kde/kvideowidget.cpp
+++ b/arts/kde/kvideowidget.cpp
@@ -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 );
 }
diff --git a/arts/kde/kvideowidget.h b/arts/kde/kvideowidget.h
index 734fe4b01..0e3881a93 100644
--- a/arts/kde/kvideowidget.h
+++ b/arts/kde/kvideowidget.h
@@ -36,7 +36,7 @@ public:
     bool isNormalSize();
     bool isDoubleSize();
 
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
 
     virtual int heightForWidth ( int w ) const;
 
diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp
index 6105cbf4a..ea20608ba 100644
--- a/arts/knotify/knotify.cpp
+++ b/arts/knotify/knotify.cpp
@@ -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 );
diff --git a/arts/knotify/knotify.h b/arts/knotify/knotify.h
index f35d9ad79..12e699299 100644
--- a/arts/knotify/knotify.h
+++ b/arts/knotify/knotify.h
@@ -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 );
diff --git a/arts/message/artsmessage.cc b/arts/message/artsmessage.cc
index cef8c2ca6..f77ecd581 100644
--- a/arts/message/artsmessage.cc
+++ b/arts/message/artsmessage.cc
@@ -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);
diff --git a/common_texts.cpp b/common_texts.cpp
index 59f3d5fed..d23fc3a07 100644
--- a/common_texts.cpp
+++ b/common_texts.cpp
@@ -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");
diff --git a/config.h.cmake b/config.h.cmake
index ab03bc56e..871c9f4bf 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -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 */
diff --git a/configure.in.bot b/configure.in.bot
index 40010e9f7..8c6d85bf6 100644
--- a/configure.in.bot
+++ b/configure.in.bot
@@ -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
diff --git a/configure.in.in b/configure.in.in
index 2a0d54605..6548b353e 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -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.
diff --git a/dcop/HOWTO b/dcop/HOWTO
index 12a7f996e..8609021c0 100644
--- a/dcop/HOWTO
+++ b/dcop/HOWTO
@@ -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
diff --git a/dcop/KDE-ICE/ICE-def.cpp b/dcop/KDE-ICE/ICE-def.cpp
index 0bf780f59..df1d9ea58 100644
--- a/dcop/KDE-ICE/ICE-def.cpp
+++ b/dcop/KDE-ICE/ICE-def.cpp
@@ -11,7 +11,7 @@ EXPORTS
  IceCloseConnection
  IceComposeNetworkIdList
  IceConnectionNumber
- IceConnectiontqStatus
+ IceConnectionStatus
  IceConnectionString
  IceFlush
  IceFreeAuthFileEntry
diff --git a/dcop/KDE-ICE/ICEmsg.h b/dcop/KDE-ICE/ICEmsg.h
index db76c8252..cf4d98975 100644
--- a/dcop/KDE-ICE/ICEmsg.h
+++ b/dcop/KDE-ICE/ICEmsg.h
@@ -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.
  */
 
diff --git a/dcop/KDE-ICE/ICEutil.h b/dcop/KDE-ICE/ICEutil.h
index 84ebc158d..dd32fe620 100644
--- a/dcop/KDE-ICE/ICEutil.h
+++ b/dcop/KDE-ICE/ICEutil.h
@@ -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 */
diff --git a/dcop/KDE-ICE/Xtrans.c b/dcop/KDE-ICE/Xtrans.c
index 1f072d8cd..371752919 100644
--- a/dcop/KDE-ICE/Xtrans.c
+++ b/dcop/KDE-ICE/Xtrans.c
@@ -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;
diff --git a/dcop/KDE-ICE/Xtranssock.c b/dcop/KDE-ICE/Xtranssock.c
index 812eb7b9d..7b14ca9ab 100644
--- a/dcop/KDE-ICE/Xtranssock.c
+++ b/dcop/KDE-ICE/Xtranssock.c
@@ -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;
     }
diff --git a/dcop/KDE-ICE/authutil.c b/dcop/KDE-ICE/authutil.c
index 38fc68cff..41a2eefaa 100644
--- a/dcop/KDE-ICE/authutil.c
+++ b/dcop/KDE-ICE/authutil.c
@@ -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))
diff --git a/dcop/KDE-ICE/iceauth.c b/dcop/KDE-ICE/iceauth.c
index f8bb87785..72297ceb5 100644
--- a/dcop/KDE-ICE/iceauth.c
+++ b/dcop/KDE-ICE/iceauth.c
@@ -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 =
diff --git a/dcop/KDE-ICE/listen.c b/dcop/KDE-ICE/listen.c
index 0547a6243..03b715c27 100644
--- a/dcop/KDE-ICE/listen.c
+++ b/dcop/KDE-ICE/listen.c
@@ -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))
diff --git a/dcop/KDE-ICE/listenwk.c b/dcop/KDE-ICE/listenwk.c
index 21d47a66a..80ff1dbae 100644
--- a/dcop/KDE-ICE/listenwk.c
+++ b/dcop/KDE-ICE/listenwk.c
@@ -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;
 
 
diff --git a/dcop/KDE-ICE/locking.c b/dcop/KDE-ICE/locking.c
index 0454704cf..0acce8368 100644
--- a/dcop/KDE-ICE/locking.c
+++ b/dcop/KDE-ICE/locking.c
@@ -32,7 +32,7 @@ Author: Ralph Mor, X Consortium
  */
 
 
-tqStatus
+Status
 IceInitThreads ()
 
 {
diff --git a/dcop/KDE-ICE/ping.c b/dcop/KDE-ICE/ping.c
index bfee548c8..5c0c601d6 100644
--- a/dcop/KDE-ICE/ping.c
+++ b/dcop/KDE-ICE/ping.c
@@ -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;
diff --git a/dcop/KDE-ICE/watch.c b/dcop/KDE-ICE/watch.c
index 18be1ddc5..79a2b8910 100644
--- a/dcop/KDE-ICE/watch.c
+++ b/dcop/KDE-ICE/watch.c
@@ -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;
diff --git a/dcop/Mainpage.dox b/dcop/Mainpage.dox
index 9e0bec658..d573b01b5 100644
--- a/dcop/Mainpage.dox
+++ b/dcop/Mainpage.dox
@@ -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
diff --git a/dcop/client/README.dcop b/dcop/client/README.dcop
index 8868b1c55..e352cb439 100644
--- a/dcop/client/README.dcop
+++ b/dcop/client/README.dcop
@@ -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:
 
diff --git a/dcop/client/dcop.cpp b/dcop/client/dcop.cpp
index 86b63cba6..1d167ce70 100644
--- a/dcop/client/dcop.cpp
+++ b/dcop/client/dcop.cpp
@@ -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);      
diff --git a/dcop/client/dcopfind.cpp b/dcop/client/dcopfind.cpp
index c8feb5936..cd3e4d517 100644
--- a/dcop/client/dcopfind.cpp
+++ b/dcop/client/dcopfind.cpp
@@ -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;
diff --git a/dcop/client/dcopstart.cpp b/dcop/client/dcopstart.cpp
index f46531735..5741ef775 100644
--- a/dcop/client/dcopstart.cpp
+++ b/dcop/client/dcopstart.cpp
@@ -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
diff --git a/dcop/client/marshall.cpp b/dcop/client/marshall.cpp
index 1e3c8d887..f9b7955f2 100644
--- a/dcop/client/marshall.cpp
+++ b/dcop/client/marshall.cpp
@@ -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" )
     {
         int i;
         stream >> i;
         result.setNum( i );
-    } else if ( type == "uint" || type == "TQ_UINT32" || type == "unsigned int" )
+    } else if ( type == "uint" || type == "Q_UINT32" || type == "unsigned int" )
     {
         uint i;
         stream >> i;
@@ -132,12 +132,12 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
         double d;
         stream >> d;
         result.setNum( d, 'f' );
-    } else if ( type == "TQ_INT64" ) {
-        TQ_INT64 i;
+    } else if ( type == "Q_INT64" ) {
+        Q_INT64 i;
         stream >> i;
         result.sprintf( "%lld", i );
-    } else if ( type == "TQ_UINT64" ) {
-        TQ_UINT64 i;
+    } else if ( type == "Q_UINT64" ) {
+        Q_UINT64 i;
         stream >> i;
         result.sprintf( "%llu", i );
     } else if ( type == "bool" )
@@ -190,7 +190,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
         result.sprintf( "%dx%d+%d+%d", r.width(), r.height(), r.x(), r.y() );
     } else if ( type == "TQVariant" )
     {
-        TQ_INT32 type;
+        Q_INT32 type;
         stream >> type;
         return demarshal( stream, TQVariant::typeToName( (TQVariant::Type)type ) );
     } else if ( type == "DCOPRef" )
@@ -205,7 +205,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
         result = r.url().local8Bit();
     } else if ( type.left( 11 ) == "TQValueList<" )
     {
-        if ( (uint)type.tqfind( '>', 11 ) != type.length() - 1 )
+        if ( (uint)type.find( '>', 11 ) != type.length() - 1 )
             return result;
 
         TQString nestedType = type.mid( 11, type.length() - 12 );
@@ -213,10 +213,10 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
         if ( nestedType.isEmpty() )
             return result;
 
-        TQ_UINT32 count;
+        Q_UINT32 count;
         stream >> count;
 
-        TQ_UINT32 i = 0;
+        Q_UINT32 i = 0;
         for (; i < count; ++i )
         {
             TQCString arg = demarshal( stream, nestedType );
@@ -227,21 +227,21 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
         }
     } else if ( type.left( 5 ) == "TQMap<" )
     {
-        int commaPos = type.tqfind( ',', 5 );
+        int commaPos = type.find( ',', 5 );
 
         if ( commaPos == -1 )
             return result;
 
-        if ( (uint)type.tqfind( '>', commaPos ) != type.length() - 1 )
+        if ( (uint)type.find( '>', commaPos ) != type.length() - 1 )
             return result;
 
         TQString keyType = type.mid( 5, commaPos - 5 );
         TQString valueType = type.mid( commaPos + 1, type.length() - commaPos - 2 );
 
-        TQ_UINT32 count;
+        Q_UINT32 count;
         stream >> count;
 
-        TQ_UINT32 i = 0;
+        Q_UINT32 i = 0;
         for (; i < count; ++i )
         {
             TQCString key = demarshal( stream, keyType );
@@ -291,15 +291,15 @@ void marshall( TQDataStream &arg, QCStringList args, uint &i, TQString type )
 	arg << s.toUInt();
     else if ( type == "unsigned int" )
 	arg << s.toUInt();
-    else if ( type == "TQ_INT32" )
+    else if ( type == "Q_INT32" )
 	arg << s.toInt();
-    else if ( type == "TQ_INT64" ) {
+    else if ( type == "Q_INT64" ) {
 	TQVariant qv = TQVariant( s );
 	arg << qv.toLongLong();
     }
-    else if ( type == "TQ_UINT32" )
+    else if ( type == "Q_UINT32" )
 	arg << s.toUInt();
-    else if ( type == "TQ_UINT64" ) {
+    else if ( type == "Q_UINT64" ) {
 	TQVariant qv = TQVariant( s );
 	arg << qv.toULongLong();
     }
@@ -376,7 +376,7 @@ void marshall( TQDataStream &arg, QCStringList args, uint &i, TQString type )
 	    marshall( dummy_arg, args, j, type );
 	    count++;
 	}
-	arg << (TQ_UINT32) count;
+	arg << (Q_UINT32) count;
 	// Parse the list for real
 	while (true) {
 	    if( i > args.count() )
diff --git a/dcop/dcopc.c b/dcop/dcopc.c
index 06cf8aaba..9667eb624 100644
--- a/dcop/dcopc.c
+++ b/dcop/dcopc.c
@@ -182,7 +182,7 @@ dcop_process_message(
 )
 {
   struct DCOPMsg * pMsg = 0L;
-  tqStatus status = False;
+  Status status = False;
 
   char  * buf         = 0L;
   char  * senderId    = 0L;
@@ -390,7 +390,7 @@ dcop_send_signal(
 
   free(header);
 
-  if (IceConnectiontqStatus(dcop_ice_conn) != IceConnectAccepted)
+  if (IceConnectionStatus(dcop_ice_conn) != IceConnectAccepted)
     return False;
 	
   return True;
@@ -412,7 +412,7 @@ dcop_call(
 )
 {
   IceReplyWaitInfo          waitInfo;
-  IceProcessMessagestqStatus  status;
+  IceProcessMessagesStatus  status;
   struct dcop_reply_struct  replyStruct;
 
   char  * pos               = 0L;
@@ -472,7 +472,7 @@ dcop_call(
   free(outputData);
   outputData = NULL;
 
-  if (IceConnectiontqStatus(dcop_ice_conn) != IceConnectAccepted) {
+  if (IceConnectionStatus(dcop_ice_conn) != IceConnectAccepted) {
       fprintf(stderr, "dcop_call(): Connection not accepted\n");
       return False;
   }
@@ -544,7 +544,7 @@ dcop_register(const char * app_name, Bool add_pid)
   char * data       = 0L;
   char * pos        = 0L;
   int    dataLength = 0;
-  Bool   calltqStatus = False;
+  Bool   callStatus = False;
 
   fprintf(stderr, "dcop_register(`%s')\n", app_name);
 
@@ -558,9 +558,9 @@ dcop_register(const char * app_name, Bool add_pid)
 
     fprintf(stderr, "dcop_init(): Reregistering as `%s'\n", app_name);
 
-    calltqStatus = dcop_detach();
+    callStatus = dcop_detach();
 
-    if (False == calltqStatus) {
+    if (False == callStatus) {
       fprintf(stderr, "dcop_init(): Could not detach before reregistering\n");
       return 0L;
     }
@@ -584,7 +584,7 @@ dcop_register(const char * app_name, Bool add_pid)
   pos = dcop_write_string(pos, dcop_requested_name);
   dataLength = pos - data;
 
-  calltqStatus =
+  callStatus =
     dcop_call(
       dcop_requested_name,
       "DCOPServer",
@@ -600,7 +600,7 @@ dcop_register(const char * app_name, Bool add_pid)
   free(dcop_requested_name);
   free(data);
 
-  if (False == calltqStatus) {
+  if (False == callStatus) {
     fprintf(stderr, "dcop_register(): dcop_call() failed\n");
     return 0L;
   }
@@ -769,7 +769,7 @@ dcop_protocol_setup()
 
   return (
     (status == IceProtocolSetupSuccess) &&
-    (IceConnectiontqStatus(dcop_ice_conn) == IceConnectAccepted)
+    (IceConnectionStatus(dcop_ice_conn) == IceConnectAccepted)
   );
 }
 
diff --git a/dcop/dcopclient.cpp b/dcop/dcopclient.cpp
index 39e6b7e92..8006ecd52 100644
--- a/dcop/dcopclient.cpp
+++ b/dcop/dcopclient.cpp
@@ -95,15 +95,15 @@ client_map_t *cliMap()
     return DCOPClient_CliMap;
 }
 
-DCOPClient *DCOPClient::tqfindLocalClient( const TQCString &_appId )
+DCOPClient *DCOPClient::findLocalClient( const TQCString &_appId )
 {
-    return cliMap()->tqfind(_appId.data());
+    return cliMap()->find(_appId.data());
 }
 
 static
 void registerLocalClient( const TQCString &_appId, DCOPClient *client )
 {
-    cliMap()->tqreplace(_appId.data(), client);
+    cliMap()->replace(_appId.data(), client);
 }
 
 static
@@ -141,7 +141,7 @@ public:
     TQCString* replyType;
     TQByteArray* replyData;
     int replyId;
-    TQ_INT32 transactionId;
+    Q_INT32 transactionId;
     TQCString calledApp;
     TQGuardedPtr<TQObject> replyObject;
     TQCString replySlot;
@@ -173,7 +173,7 @@ public:
     TQCString defaultObject;
     TQPtrList<DCOPClientTransaction> *transactionList;
     bool transaction;
-    TQ_INT32 transactionId;
+    Q_INT32 transactionId;
     int opcode;
 
     // Special key values:
@@ -205,7 +205,7 @@ public:
 class DCOPClientTransaction
 {
 public:
-    TQ_INT32 id;
+    Q_INT32 id;
     CARD32 key;
     TQCString senderId;
 };
@@ -263,12 +263,12 @@ static TQCString dcopServerFile(const TQCString &hostname, bool old)
         disp = "NODISPLAY";
 
     int i;
-    if((i = disp.tqfindRev('.')) > disp.tqfindRev(KPATH_SEPARATOR) && i >= 0)
+    if((i = disp.findRev('.')) > disp.findRev(KPATH_SEPARATOR) && i >= 0)
         disp.truncate(i);
 
     if (!old)
     {
-        while( (i = disp.tqfind(KPATH_SEPARATOR)) >= 0)
+        while( (i = disp.find(KPATH_SEPARATOR)) >= 0)
             disp[i] = '_';
     }
 
@@ -382,7 +382,7 @@ static void DCOPProcessMessage(IceConn iceConn, IcePointer clientObject,
     case DCOPReplyWait:
         if ( replyStruct ) {
             TQCString calledApp, app;
-            TQ_INT32 id;
+            Q_INT32 id;
             TQDataStream ds( dataReceived, IO_ReadOnly );
             ds >> calledApp >> app >> id;
             replyStruct->transactionId = id;
@@ -398,7 +398,7 @@ static void DCOPProcessMessage(IceConn iceConn, IcePointer clientObject,
         {
             TQDataStream ds( dataReceived, IO_ReadOnly );
             TQCString calledApp, app;
-            TQ_INT32 id;
+            Q_INT32 id;
 
             ds >> calledApp >> app >> id;
             if (replyStruct && (id == replyStruct->transactionId) && (calledApp == replyStruct->calledApp))
@@ -517,7 +517,7 @@ void DCOPProcessInternal( DCOPClientPrivate *d, int opcode, CARD32 key, const TQ
         d->currentKey = key;
 
     if ( opcode == DCOPFind )
-        b = c->tqfind(app, objId, fun, data, replyType, replyData );
+        b = c->find(app, objId, fun, data, replyType, replyData );
     else
         b = c->receive( app, objId, fun, data, replyType, replyData );
     // set notifier back to previous state
@@ -531,7 +531,7 @@ void DCOPProcessInternal( DCOPClientPrivate *d, int opcode, CARD32 key, const TQ
     TQByteArray reply;
     TQDataStream replyStream( reply, IO_WriteOnly );
 
-    TQ_INT32 id = c->transactionId();
+    Q_INT32 id = c->transactionId();
     if (id) {
         // Call delayed. Send back the transaction ID.
         replyStream << d->appId << fromApp << id;
@@ -672,9 +672,9 @@ bool DCOPClient::attach()
 
 void DCOPClient::bindToApp()
 {
-    // check if we have a tqApp instantiated.  If we do,
+    // check if we have a qApp instantiated.  If we do,
     // we can create a TQSocketNotifier and use it for receiving data.
-    if (tqApp) {
+    if (qApp) {
         if ( d->notifier )
             delete d->notifier;
         d->notifier = new TQSocketNotifier(socket(),
@@ -690,7 +690,7 @@ void DCOPClient::suspend()
     if (!d->notifier)
         return;
 #endif
-    assert(d->notifier); // Suspending makes no sense if we didn't had a tqApp yet
+    assert(d->notifier); // Suspending makes no sense if we didn't had a qApp yet
     d->notifier->setEnabled(false);
 }
 
@@ -764,7 +764,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
                                                       DCOPAuthCount,
                                                       const_cast<char **>(DCOPAuthNames),
                                                       DCOPClientAuthProcs, 0L)) < 0) {
-        emit attachFailed(TQString::tqfromLatin1( "Communications could not be established." ));
+        emit attachFailed(TQString::fromLatin1( "Communications could not be established." ));
         return false;
     }
 
@@ -779,7 +779,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
             TQCString fName = dcopServerFile();
             TQFile f(TQFile::decodeName(fName));
             if (!f.open(IO_ReadOnly)) {
-                emit attachFailed(TQString::tqfromLatin1( "Could not read network connection list.\n" )+TQFile::decodeName(fName));
+                emit attachFailed(TQString::fromLatin1( "Could not read network connection list.\n" )+TQFile::decodeName(fName));
                 return false;
             }
             int size = QMIN( (qint64)1024, f.size() ); // protection against a huge file
@@ -790,7 +790,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
                // Should we abort ?
             }
             contents[size] = '\0';
-            int pos = contents.tqfind('\n');
+            int pos = contents.find('\n');
             if ( pos == -1 ) // Shouldn't happen
             {
                 qDebug("Only one line in dcopserver file !: %s", contents.data());
@@ -819,7 +819,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
            delete [] d->serverAddr;
            d->serverAddr = 0;
         }
-        emit attachFailed(TQString::tqfromLatin1( errBuf ));
+        emit attachFailed(TQString::fromLatin1( errBuf ));
         return false;
     }
     fcntl(socket(), F_SETFL, FD_CLOEXEC);
@@ -845,7 +845,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
             delete [] d->serverAddr;
             d->serverAddr = 0;
         }
-        emit attachFailed(TQString::tqfromLatin1( errBuf ));
+        emit attachFailed(TQString::fromLatin1( errBuf ));
         return false;
     } else if (setupstat == IceProtocolAlreadyActive) {
         if (bClearServerAddr) {
@@ -853,7 +853,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
             d->serverAddr = 0;
         }
         /* should not happen because 3rd arg to IceOpenConnection was 0. */
-        emit attachFailed(TQString::tqfromLatin1( "internal error in IceOpenConnection" ));
+        emit attachFailed(TQString::fromLatin1( "internal error in IceOpenConnection" ));
         return false;
     }
 
@@ -863,7 +863,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
             delete [] d->serverAddr;
             d->serverAddr = 0;
         }
-        emit attachFailed(TQString::tqfromLatin1( "DCOP server did not accept the connection." ));
+        emit attachFailed(TQString::fromLatin1( "DCOP server did not accept the connection." ));
         return false;
     }
 
@@ -1017,7 +1017,7 @@ TQCString DCOPClient::normalizeFunctionSignature( const TQCString& fun ) {
     if ( fun.isEmpty() )                                // nothing to do
         return fun.copy();
     TQCString result( fun.size() );
-    char *from        = const_cast<TQCString&>(fun).data();
+    char *from        = fun.data();
     char *to        = result.data();
     char *first = to;
     char last = 0;
@@ -1052,11 +1052,11 @@ bool DCOPClient::send(const TQCString &remApp, const TQCString &remObjId,
 {
     if (remApp.isEmpty())
        return false;
-    DCOPClient *localClient = tqfindLocalClient( remApp );
+    DCOPClient *localClient = findLocalClient( remApp );
 
     if ( localClient  ) {
         bool saveTransaction = d->transaction;
-        TQ_INT32 saveTransactionId = d->transactionId;
+        Q_INT32 saveTransactionId = d->transactionId;
         TQCString saveSenderId = d->senderId;
 
         d->senderId = 0; // Local call
@@ -1110,15 +1110,15 @@ bool DCOPClient::send(const TQCString &remApp, const TQCString &remObjId,
     return send(remApp, remObjId, remFun, ba);
 }
 
-bool DCOPClient::tqfindObject(const TQCString &remApp, const TQCString &remObj,
+bool DCOPClient::findObject(const TQCString &remApp, const TQCString &remObj,
                             const TQCString &remFun, const TQByteArray &data,
                             TQCString &foundApp, TQCString &foundObj,
                             bool useEventLoop)
 {
-    return tqfindObject( remApp, remObj, remFun, data, foundApp, foundObj, useEventLoop, -1 );
+    return findObject( remApp, remObj, remFun, data, foundApp, foundObj, useEventLoop, -1 );
 }
 
-bool DCOPClient::tqfindObject(const TQCString &remApp, const TQCString &remObj,
+bool DCOPClient::findObject(const TQCString &remApp, const TQCString &remObj,
                             const TQCString &remFun, const TQByteArray &data,
                             TQCString &foundApp, TQCString &foundObj,
                             bool useEventLoop, int timeout)
@@ -1162,18 +1162,18 @@ bool DCOPClient::tqfindObject(const TQCString &remApp, const TQCString &remObj,
         TQCString replyType;
         TQByteArray replyData;
         bool result = false;
-        DCOPClient *localClient = tqfindLocalClient( remApp );
+        DCOPClient *localClient = findLocalClient( remApp );
 
         if ( (phase == 1) && localClient ) {
             // In phase 1 we do all local clients
             bool saveTransaction = d->transaction;
-            TQ_INT32 saveTransactionId = d->transactionId;
+            Q_INT32 saveTransactionId = d->transactionId;
             TQCString saveSenderId = d->senderId;
 
             d->senderId = 0; // Local call
-            result = localClient->tqfind(  remApp, remObj, remFun, data, replyType, replyData );
+            result = localClient->find(  remApp, remObj, remFun, data, replyType, replyData );
 
-            TQ_INT32 id = localClient->transactionId();
+            Q_INT32 id = localClient->transactionId();
             if (id) {
                 // Call delayed. We have to wait till it has been processed.
                 do {
@@ -1202,7 +1202,7 @@ bool DCOPClient::tqfindObject(const TQCString &remApp, const TQCString &remObj,
 
                 if (ref.app() == remApp) // Consistency check
                 {
-                    // replyType tqcontains objId.
+                    // replyType contains objId.
                     foundApp = ref.app();
                     foundObj = ref.object();
                     return true;
@@ -1298,7 +1298,7 @@ void DCOPClient::setNotifications(bool enabled)
 {
     TQByteArray data;
     TQDataStream ds(data, IO_WriteOnly);
-    ds << static_cast<TQ_INT8>(enabled);
+    ds << static_cast<Q_INT8>(enabled);
 
     TQCString replyType;
     TQByteArray reply;
@@ -1310,7 +1310,7 @@ void DCOPClient::setDaemonMode( bool daemonMode )
 {
     TQByteArray data;
     TQDataStream ds(data, IO_WriteOnly);
-    ds << static_cast<TQ_INT8>( daemonMode );
+    ds << static_cast<Q_INT8>( daemonMode );
 
     TQCString replyType;
     TQByteArray reply;
@@ -1331,9 +1331,9 @@ static void fillQtObjects( QCStringList& l, TQObject* o, TQCString path )
         path += '/';
 
     int unnamed = 0;
-    const TQObjectList list = o ? o->tqchildren() : TQObject::tqobjectTrees();
-    if ( !list.isEmpty() ) {
-        TQObjectListIt it( list );
+    const TQObjectList *list = o ? o->tqchildren() : TQObject::objectTrees();
+    if ( list ) {
+        TQObjectListIt it( *list );
         TQObject *obj;
         while ( (obj=it.current()) ) {
             ++it;
@@ -1341,11 +1341,11 @@ static void fillQtObjects( QCStringList& l, TQObject* o, TQCString path )
              if ( n == "unnamed" || n.isEmpty() )
              {
                  n.sprintf("%p", (void *) obj);
-                 n = TQString(TQString("unnamed%1(%2, %3)").arg(++unnamed).arg(obj->className()).arg(TQString(n))).latin1();
+                 n = TQString("unnamed%1(%2, %3)").arg(++unnamed).arg(obj->className()).arg(TQString(n)).latin1();
              }
              TQCString fn = path + n;
              l.append( fn );
-             if ( !obj->tqchildren().isEmpty() )
+             if ( obj->tqchildren() )
                  fillQtObjects( l, obj, fn );
         }
     }
@@ -1368,9 +1368,9 @@ static void fillQtObjectsEx( TQValueList<O>& l, TQObject* o, TQCString path )
         path += '/';
 
     int unnamed = 0;
-    const TQObjectList list = o ? o->tqchildren() : TQObject::tqobjectTrees();
-    if ( !list.isEmpty() ) {
-        TQObjectListIt it( list );
+    const TQObjectList *list = o ? o->tqchildren() : TQObject::objectTrees();
+    if ( list ) {
+        TQObjectListIt it( *list );
         TQObject *obj;
         while ( (obj=it.current()) ) {
             ++it;
@@ -1378,42 +1378,42 @@ static void fillQtObjectsEx( TQValueList<O>& l, TQObject* o, TQCString path )
             if ( n == "unnamed" || n.isEmpty() )
              {
                  n.sprintf("%p", (void *) obj);
-                 n = TQString(TQString("unnamed%1(%2, %3)").arg(++unnamed).arg(obj->className()).arg(TQString(n))).latin1();
+                 n = TQString("unnamed%1(%2, %3)").arg(++unnamed).arg(obj->className()).arg(TQString(n)).latin1();
              }
             TQCString fn = path + n;
             l.append( O( fn, obj ) );
-            if ( !obj->tqchildren().isEmpty() )
+            if ( obj->tqchildren() )
                 fillQtObjectsEx( l, obj, fn );
         }
     }
 }
 
 
-static TQObject* tqfindQtObject( TQCString id )
+static TQObject* findQtObject( TQCString id )
 {
     TQRegExp expr( id );
     TQValueList<O> l;
     fillQtObjectsEx( l, 0, "qt" );
-    // Prefer an exact match, but fall-back on the first that tqcontains the substring
+    // Prefer an exact match, but fall-back on the first that contains the substring
     TQObject* firstContains = 0L;
     for ( TQValueList<O>::ConstIterator it = l.begin(); it != l.end(); ++it ) {
         if ( (*it).s == id ) // exact match
             return (*it).o;
-        if ( !firstContains && (*it).s.tqcontains( expr ) ) {
+        if ( !firstContains && (*it).s.contains( expr ) ) {
             firstContains = (*it).o;
         }
     }
     return firstContains;
 }
 
-static QCStringList  tqfindQtObjects( TQCString id )
+static QCStringList  findQtObjects( TQCString id )
 {
     TQRegExp expr( id );
     TQValueList<O> l;
     fillQtObjectsEx( l, 0, "qt" );
     QCStringList result;
     for ( TQValueList<O>::ConstIterator it = l.begin(); it != l.end(); ++it ) {
-        if ( (*it).s.tqcontains( expr ) )
+        if ( (*it).s.contains( expr ) )
             result << (*it).s;
     }
     return result;
@@ -1438,7 +1438,7 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
             l << "QCStringList functions()";
             l << "QCStringList interfaces()";
             l << "QCStringList objects()";
-            l << "QCStringList tqfind(TQCString)";
+            l << "QCStringList find(TQCString)";
             reply << l;
             return true;
         } else if ( fun == "objects()" ) {
@@ -1448,17 +1448,17 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
             fillQtObjects( l, 0, "qt" );
             reply << l;
             return true;
-        } else if ( fun == "tqfind(TQCString)" ) {
+        } else if ( fun == "find(TQCString)" ) {
             TQDataStream ds( data, IO_ReadOnly );
             TQCString id;
             ds >> id ;
             replyType = "QCStringList";
             TQDataStream reply( replyData, IO_WriteOnly );
-            reply << tqfindQtObjects( id ) ;
+            reply << findQtObjects( id ) ;
             return true;
         }
     } else if ( objId.left(3) == "qt/" ) {
-        TQObject* o = tqfindQtObject( objId );
+        TQObject* o = findQtObject( objId );
         if ( !o )
             return false;
         if ( fun == "functions()" ) {
@@ -1470,13 +1470,13 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
             l << "QCStringList properties()";
             l << "bool setProperty(TQCString,TQVariant)";
             l << "TQVariant property(TQCString)";
-            TQStrList lst = o->tqmetaObject()->slotNames( true );
+            TQStrList lst = o->metaObject()->slotNames( true );
             int i = 0;
             for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
-                if ( o->tqmetaObject()->slot( i++, true )->tqt_mo_access != TQMetaData::Public )
+                if ( o->metaObject()->slot( i++, true )->tqaccess != QMetaData::Public )
                     continue;
                 TQCString slot = it.current();
-                if ( slot.tqcontains( "()" ) ) {
+                if ( slot.contains( "()" ) ) {
                     slot.prepend("void ");
                     l <<  slot;
                 }
@@ -1487,10 +1487,10 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
             replyType = "QCStringList";
             TQDataStream reply( replyData, IO_WriteOnly );
             QCStringList l;
-            TQMetaObject *meta = o->tqmetaObject();
+            TQMetaObject *meta = o->metaObject();
             while ( meta ) {
                 l.prepend( meta->className() );
-                meta = const_cast<TQMetaObject*>(TQT_TQMETAOBJECT_CONST(meta->superClass()));
+                meta = meta->superClass();
             }
             reply << l;
             return true;
@@ -1498,10 +1498,10 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
             replyType = "QCStringList";
             TQDataStream reply( replyData, IO_WriteOnly );
             QCStringList l;
-            TQStrList lst = o->tqmetaObject()->propertyNames( true );
+            TQStrList lst = o->metaObject()->propertyNames( true );
             for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
-                TQMetaObject *mo = o->tqmetaObject();
-                const TQMetaProperty* p = mo->property( mo->tqfindProperty( it.current(), true ), true );
+                TQMetaObject *mo = o->metaObject();
+                const TQMetaProperty* p = mo->property( mo->findProperty( it.current(), true ), true );
                 if ( !p )
                     continue;
                 TQCString prop = p->type();
@@ -1529,13 +1529,13 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
             ds >> name >> value;
             replyType = "bool";
             TQDataStream reply( replyData, IO_WriteOnly );
-            reply << (TQ_INT8) o->setProperty( name, value );
+            reply << (Q_INT8) o->setProperty( name, value );
             return true;
         } else {
-            int slot = o->tqmetaObject()->tqfindSlot( fun, true );
+            int slot = o->metaObject()->findSlot( fun, true );
             if ( slot != -1 ) {
                 replyType = "void";
-                TQUObject uo[ 1 ];
+                QUObject uo[ 1 ];
                 o->qt_invoke( slot, uo );
                 return true;
             }
@@ -1608,7 +1608,7 @@ bool DCOPClient::receive(const TQCString &/*app*/, const TQCString &objId,
 
     if ( objId.isEmpty() || objId == "default" ) {
         if ( !d->defaultObject.isEmpty() && DCOPObject::hasObject( d->defaultObject ) ) {
-            DCOPObject *objPtr = DCOPObject::tqfind( d->defaultObject );
+            DCOPObject *objPtr = DCOPObject::find( d->defaultObject );
             objPtr->setCallingDcopClient(this);
             if (objPtr->process(fun, data, replyType, replyData))
                 return true;
@@ -1640,7 +1640,7 @@ bool DCOPClient::receive(const TQCString &/*app*/, const TQCString &objId,
         return false;
 
     } else {
-        DCOPObject *objPtr = DCOPObject::tqfind(objId);
+        DCOPObject *objPtr = DCOPObject::find(objId);
         objPtr->setCallingDcopClient(this);
         if (!objPtr->process(fun, data, replyType, replyData)) {
             // obj doesn't understand function or some other error.
@@ -1654,9 +1654,9 @@ bool DCOPClient::receive(const TQCString &/*app*/, const TQCString &objId,
 // Check if the function result is a bool with the value "true"
 // If so set the function result to DCOPRef pointing to (app,objId) and
 // return true. Return false otherwise.
-static bool tqfindResultOk(TQCString &replyType, TQByteArray &replyData)
+static bool findResultOk(TQCString &replyType, TQByteArray &replyData)
 {
-    TQ_INT8 success; // Tsk.. why is there no operator>>(bool)?
+    Q_INT8 success; // Tsk.. why is there no operator>>(bool)?
     if (replyType != "bool") return false;
 
     TQDataStream reply( replyData, IO_ReadOnly );
@@ -1668,7 +1668,7 @@ static bool tqfindResultOk(TQCString &replyType, TQByteArray &replyData)
 
 // set the function result to DCOPRef pointing to (app,objId) and
 // return true.
-static bool tqfindSuccess(const TQCString &app, const TQCString objId, TQCString &replyType, TQByteArray &replyData)
+static bool findSuccess(const TQCString &app, const TQCString objId, TQCString &replyType, TQByteArray &replyData)
 {
     DCOPRef ref(app, objId);
     replyType = "DCOPRef";
@@ -1680,7 +1680,7 @@ static bool tqfindSuccess(const TQCString &app, const TQCString objId, TQCString
 }
 
 
-bool DCOPClient::tqfind(const TQCString &app, const TQCString &objId,
+bool DCOPClient::find(const TQCString &app, const TQCString &objId,
                       const TQCString &fun, const TQByteArray &data,
                       TQCString& replyType, TQByteArray &replyData)
 {
@@ -1695,14 +1695,14 @@ bool DCOPClient::tqfind(const TQCString &app, const TQCString &objId,
         if (fun.isEmpty())
         {
             if (objId.isEmpty() || DCOPObject::hasObject(objId))
-               return tqfindSuccess(app, objId, replyType, replyData);
+               return findSuccess(app, objId, replyType, replyData);
             return false;
         }
         // Message to application or single object...
         if (receive(app, objId, fun, data, replyType, replyData))
         {
-            if (tqfindResultOk(replyType, replyData))
-                return tqfindSuccess(app, objId, replyType, replyData);
+            if (findResultOk(replyType, replyData))
+                return findSuccess(app, objId, replyType, replyData);
         }
     }
     else {
@@ -1716,11 +1716,11 @@ bool DCOPClient::tqfind(const TQCString &app, const TQCString &objId,
             replyType = 0;
             replyData = TQByteArray();
             if (fun.isEmpty())
-                return tqfindSuccess(app, objPtr->objId(), replyType, replyData);
+                return findSuccess(app, objPtr->objId(), replyType, replyData);
             objPtr->setCallingDcopClient(this);
             if (objPtr->process(fun, data, replyType, replyData))
-                if (tqfindResultOk(replyType, replyData))
-                    return tqfindSuccess(app, objPtr->objId(), replyType, replyData);
+                if (findResultOk(replyType, replyData))
+                    return findSuccess(app, objPtr->objId(), replyType, replyData);
         }
     }
     return false;
@@ -1742,17 +1742,17 @@ bool DCOPClient::call(const TQCString &remApp, const TQCString &remObjId,
 {
     if (remApp.isEmpty())
         return false;
-    DCOPClient *localClient = tqfindLocalClient( remApp );
+    DCOPClient *localClient = findLocalClient( remApp );
 
     if ( localClient ) {
         bool saveTransaction = d->transaction;
-        TQ_INT32 saveTransactionId = d->transactionId;
+        Q_INT32 saveTransactionId = d->transactionId;
         TQCString saveSenderId = d->senderId;
 
         d->senderId = 0; // Local call
         bool b = localClient->receive(  remApp, remObjId, remFun, data, replyType, replyData );
         
-        TQ_INT32 id = localClient->transactionId();
+        Q_INT32 id = localClient->transactionId();
         if (id) {
            // Call delayed. We have to wait till it has been processed.
            do {
@@ -1882,7 +1882,7 @@ bool DCOPClient::callInternal(const TQCString &remApp, const TQCString &remObjId
     for(;;) {
         bool checkMessages = true;
         if ( useEventLoop
-             ? d->notifier != NULL  // useEventLoop needs a socket notifier and a tqApp
+             ? d->notifier != NULL  // useEventLoop needs a socket notifier and a qApp
              : timeout >= 0 ) {     // !useEventLoop doesn't block only for timeout >= 0
             const int guiTimeout = 100;
             checkMessages = false;
@@ -1907,7 +1907,7 @@ bool DCOPClient::callInternal(const TQCString &remApp, const TQCString &remObjId
                     }
                     if( timeout >= 0 )
                         d->eventLoopTimer.start(time_left - guiTimeout, true);
-                    tqApp->enter_loop();
+                    qApp->enter_loop();
                     d->eventLoopTimer.stop();
                     if ( !old_lock ) {
                         d->non_blocking_call_lock = false;
@@ -1974,7 +1974,7 @@ bool DCOPClient::callInternal(const TQCString &remApp, const TQCString &remObjId
 
     // Wake up parent call, maybe it's reply is available already.
     if ( d->non_blocking_call_lock ) {
-        tqApp->exit_loop();
+        qApp->exit_loop();
     }
 
     d->currentKey = oldCurrentKey;
@@ -1983,7 +1983,7 @@ bool DCOPClient::callInternal(const TQCString &remApp, const TQCString &remObjId
 
 void DCOPClient::eventLoopTimeout()
 {
-    tqApp->exit_loop();
+    qApp->exit_loop();
 }
 
 void DCOPClient::processSocketData(int fd)
@@ -2000,8 +2000,8 @@ void DCOPClient::processSocketData(int fd)
         return;
 
     if ( d->non_blocking_call_lock ) {
-        if( tqApp )
-            tqApp->exit_loop();
+        if( qApp )
+            qApp->exit_loop();
         return;
     }
 
@@ -2034,7 +2034,7 @@ TQCString DCOPClient::defaultObject() const
 }
 
 bool
-DCOPClient::isLocalTransactionFinished(TQ_INT32 id, TQCString &replyType, TQByteArray &replyData)
+DCOPClient::isLocalTransactionFinished(Q_INT32 id, TQCString &replyType, TQByteArray &replyData)
 {
     DCOPClientPrivate::LocalTransactionResult *result = d->localTransActionList.take(id);
     if (!result)
@@ -2068,7 +2068,7 @@ DCOPClient::beginTransaction()
     return trans;
 }
 
-TQ_INT32
+Q_INT32
 DCOPClient::transactionId() const
 {
     if (d->transaction)
@@ -2147,7 +2147,7 @@ DCOPClient::connectDCOPSignal( const TQCString &sender, const TQCString &senderO
 {
     TQCString replyType;
     TQByteArray data, replyData;
-    TQ_INT8 iVolatile = Volatile ? 1 : 0;
+    Q_INT8 iVolatile = Volatile ? 1 : 0;
 
     TQDataStream args(data, IO_WriteOnly );
     args << sender << senderObj << normalizeFunctionSignature(signal) << receiverObj << normalizeFunctionSignature(slot) << iVolatile;
@@ -2163,7 +2163,7 @@ DCOPClient::connectDCOPSignal( const TQCString &sender, const TQCString &senderO
         return false;
 
     TQDataStream reply(replyData, IO_ReadOnly );
-    TQ_INT8 result;
+    Q_INT8 result;
     reply >> result;
     return (result != 0);
 }
@@ -2197,7 +2197,7 @@ DCOPClient::disconnectDCOPSignal( const TQCString &sender, const TQCString &send
         return false;
 
     TQDataStream reply(replyData, IO_ReadOnly );
-    TQ_INT8 result;
+    Q_INT8 result;
     reply >> result;
     return (result != 0);
 }
diff --git a/dcop/dcopclient.h b/dcop/dcopclient.h
index 6c481b8af..41266c187 100644
--- a/dcop/dcopclient.h
+++ b/dcop/dcopclient.h
@@ -42,7 +42,7 @@ typedef TQValueList<TQCString> QCStringList;
  *
  * This class provides IPC and RPC for KDE applications.  Usually you
  * will not have to instantiate one yourself because KApplication
- * tqcontains a method to return a pointer to a DCOPClient object which
+ * contains a method to return a pointer to a DCOPClient object which
  * can be used for your whole application.
  *
  * Before being able to send or receive any DCOP messages, you will have
@@ -65,10 +65,9 @@ typedef TQValueList<TQCString> QCStringList;
  * @see KApplication::dcopClient()
  * @author Preston Brown <pbrown@kde.org>, Matthias Ettrich <ettrich@kde.org>
  */
-class DCOP_EXPORT DCOPClient : public TQObject
+class DCOP_EXPORT DCOPClient : public QObject
 {
   Q_OBJECT
-  TQ_OBJECT
 
  public:
   /**
@@ -84,7 +83,7 @@ class DCOP_EXPORT DCOPClient : public TQObject
    * Sets the address of a server to use upon attaching.
    *
    * If no server address is ever specified, attach will try its best to
-   * tqfind the server anyway.
+   * find the server anyway.
    * @param addr the new address of the server
    */
   static void setServerAddress(const TQCString &addr);
@@ -346,7 +345,7 @@ class DCOP_EXPORT DCOPClient : public TQObject
   /**
    * Searches for an object which matches a criteria.
    *
-   * tqfindObject calls @p remFun in the applications and objects identified
+   * findObject calls @p remFun in the applications and objects identified
    * by @p remApp and @p remObj until @p remFun returns true. The name of
    * the application and object that returned true are returned in
    * @p foundApp and @p foundObj respectively.
@@ -354,7 +353,7 @@ class DCOP_EXPORT DCOPClient : public TQObject
    * If @p remFun is empty a default function is called in the object
    * which always returns @p true.
    *
-   * A tqfindObject blocks the application until the process receives the
+   * A findObject blocks the application until the process receives the
    * answer.
    *
    * If @p useEventLoop is true, a local event loop will be started after
@@ -379,7 +378,7 @@ class DCOP_EXPORT DCOPClient : public TQObject
    *
    * @see send()
    */
-  bool tqfindObject(const TQCString &remApp, const TQCString &remObj,
+  bool findObject(const TQCString &remApp, const TQCString &remObj,
 	    const TQCString &remFun, const TQByteArray &data,
 	    TQCString &foundApp, TQCString &foundObj,
 	    bool useEventLoop/*=false*/, int timeout/*=-1*/);
@@ -388,7 +387,7 @@ class DCOP_EXPORT DCOPClient : public TQObject
    * @deprecated
    */
   // KDE4 merge with above
-  bool tqfindObject(const TQCString &remApp, const TQCString &remObj,
+  bool findObject(const TQCString &remApp, const TQCString &remObj,
 	    const TQCString &remFun, const TQByteArray &data,
 	    TQCString &foundApp, TQCString &foundObj,
 	    bool useEventLoop=false);
@@ -512,7 +511,7 @@ class DCOP_EXPORT DCOPClient : public TQObject
    * @see process()
    * @see beginTransaction()
    */
-  TQ_INT32 transactionId() const;
+  Q_INT32 transactionId() const;
 
   /**
    * Checks whether @p remApp is registered with the DCOP server.
@@ -590,7 +589,7 @@ class DCOP_EXPORT DCOPClient : public TQObject
    * @param replyType write the reply type in this string
    * @param replyData write the reply data in this array
    */
-  bool tqfind(const TQCString &app, const TQCString &obj,
+  bool find(const TQCString &app, const TQCString &obj,
 	    const TQCString &fun, const TQByteArray& data,
 	    TQCString& replyType, TQByteArray &replyData);
 
@@ -694,7 +693,7 @@ class DCOP_EXPORT DCOPClient : public TQObject
    * to check whether a given client (by name) is running in the same
    * process or in another one.
    */
-  static DCOPClient* tqfindLocalClient( const TQCString &_appId );
+  static DCOPClient* findLocalClient( const TQCString &_appId );
 
   /**
     * @internal Do not use.
@@ -716,7 +715,7 @@ class DCOP_EXPORT DCOPClient : public TQObject
     * File with information how to reach the dcopserver.
     * @param hostname Hostname to use, if empty current hostname of
     * the system is used.
-    * @return Filename that tqcontains information how to contact the
+    * @return Filename that contains information how to contact the
     * DCOPserver.
     */
   static TQCString dcopServerFile(const TQCString &hostname=0);
@@ -759,7 +758,7 @@ signals:
    *
    *  Usually attached to a dialog box or some other visual
    * aid.
-   * @param msg the message tha tqcontains further information
+   * @param msg the message tha contains further information
    */
   void attachFailed(const TQString &msg);
 
@@ -817,7 +816,7 @@ public:
 
 private:
 
-  bool isLocalTransactionFinished(TQ_INT32 id, TQCString &replyType, TQByteArray &replyData);
+  bool isLocalTransactionFinished(Q_INT32 id, TQCString &replyType, TQByteArray &replyData);
 
   bool attachInternal( bool registerAsAnonymous = true );
 
diff --git a/dcop/dcopidl/scanner.cc b/dcop/dcopidl/scanner.cc
index edc8ac567..e91b21d68 100644
--- a/dcop/dcopidl/scanner.cc
+++ b/dcop/dcopidl/scanner.cc
@@ -803,7 +803,7 @@ static int yy_lp;
 *yy_cp = yy_hold_char; /* undo effects of setting up yytext */ \
 yy_cp = yy_full_match; /* restore poss. backed-over text */ \
 ++yy_lp; \
-goto tqfind_rule; \
+goto find_rule; \
 }
 #define yymore() yymore_used_but_not_detected
 #define YY_MORE_ADJ 0
@@ -1140,11 +1140,11 @@ yy_match:
 			}
 		while ( yy_current_state != 310 );
 
-yy_tqfind_action:
+yy_find_action:
 		yy_current_state = *--yy_state_ptr;
 		yy_lp = yy_accept[yy_current_state];
-tqfind_rule: /* we branch to this label when backing up */
-		for ( ; ; ) /* until we tqfind what rule we matched */
+find_rule: /* we branch to this label when backing up */
+		for ( ; ; ) /* until we find what rule we matched */
 			{
 			if ( yy_lp && yy_lp < yy_accept[yy_current_state + 1] )
 				{
@@ -1226,8 +1226,8 @@ YY_RULE_SETUP
 #line 170 "scanner.ll"
 {
 			  TQString s( yytext );
-                          int i = s.tqfind(TQRegExp("[\"<]"))+1;
-                          int j = s.tqfind(TQRegExp("[\">]"), i);
+                          int i = s.find(TQRegExp("[\"<]"))+1;
+                          int j = s.find(TQRegExp("[\">]"), i);
 			  yylval._str = new TQString( s.mid( i, j - i ) );
                           idl_line_no++;
                           return T_INCLUDE;
@@ -1686,7 +1686,7 @@ ECHO;
 			else
 				{
 				yy_cp = yy_c_buf_p;
-				goto yy_tqfind_action;
+				goto yy_find_action;
 				}
 			}
 
@@ -1739,7 +1739,7 @@ ECHO;
 
 				yy_cp = yy_c_buf_p;
 				yy_bp = yytext_ptr + YY_MORE_ADJ;
-				goto yy_tqfind_action;
+				goto yy_find_action;
 			}
 		break;
 		}
diff --git a/dcop/dcopidl/scanner.ll b/dcop/dcopidl/scanner.ll
index 62a80cdd8..63e8ca59c 100644
--- a/dcop/dcopidl/scanner.ll
+++ b/dcop/dcopidl/scanner.ll
@@ -169,8 +169,8 @@ Kidl_Identifier		[_a-zA-Z][a-zA-Z0-9_]*
                         }
 "#include"[ \t]*[<\"][^>"]*[>\"]\s*\n {
 			  TQString s( yytext );
-                          int i = s.tqfind(TQRegExp("[\"<]"))+1;
-                          int j = s.tqfind(TQRegExp("[\">]"), i);
+                          int i = s.find(TQRegExp("[\"<]"))+1;
+                          int j = s.find(TQRegExp("[\">]"), i);
 			  yylval._str = new TQString( s.mid( i, j - i ) );
                           idl_line_no++;
                           return T_INCLUDE;
diff --git a/dcop/dcopidl/yacc.cc b/dcop/dcopidl/yacc.cc
index 1fbc4c0bd..d41fa6dbd 100644
--- a/dcop/dcopidl/yacc.cc
+++ b/dcop/dcopidl/yacc.cc
@@ -1643,7 +1643,7 @@ yyreduce:
   case 15:
 #line 221 "yacc.yy"
     {
-                      int pos = in_namespace.tqfindRev( "::", -3 );
+                      int pos = in_namespace.findRev( "::", -3 );
                       if( pos >= 0 )
                           in_namespace = in_namespace.left( pos + 2 );
                       else
diff --git a/dcop/dcopidl/yacc.yy b/dcop/dcopidl/yacc.yy
index 7870eb6e9..ca22c65e1 100644
--- a/dcop/dcopidl/yacc.yy
+++ b/dcop/dcopidl/yacc.yy
@@ -219,7 +219,7 @@ declaration
                   } 
             main T_RIGHT_CURLY_BRACKET opt_semicolon
                   {
-                      int pos = in_namespace.tqfindRev( "::", -3 );
+                      int pos = in_namespace.findRev( "::", -3 );
                       if( pos >= 0 )
                           in_namespace = in_namespace.left( pos + 2 );
                       else
diff --git a/dcop/dcopidl2cpp/main.cpp b/dcop/dcopidl2cpp/main.cpp
index c0fb786c8..5e0f27525 100644
--- a/dcop/dcopidl2cpp/main.cpp
+++ b/dcop/dcopidl2cpp/main.cpp
@@ -104,11 +104,11 @@ int main( int argc, char** argv )
     TQString base( argv[argpos] );
     TQString idl = base;
 
-    int pos = base.tqfindRev( '.' );
+    int pos = base.findRev( '.' );
     if ( pos != -1 )
 	base = base.left( pos );
 
-    pos = idl.tqfindRev('/');
+    pos = idl.findRev('/');
     if ( pos != -1 )
 	idl = idl.mid( pos+1 );
 
@@ -118,7 +118,7 @@ int main( int argc, char** argv )
     if ( generate_stub ) {
 	TQString header = base;
 	generateStub( idl, header + "_stub.h", de );
-	pos = header.tqfindRev('/');
+	pos = header.findRev('/');
 	if ( pos != -1 )
 	    header = header.mid( pos+1 );
 	generateStubImpl( idl, header + "_stub.h", base+".h", base + "_stub." + suffix, de);
diff --git a/dcop/dcopidl2cpp/skel.cpp b/dcop/dcopidl2cpp/skel.cpp
index b3d14fb13..5cc30de3e 100644
--- a/dcop/dcopidl2cpp/skel.cpp
+++ b/dcop/dcopidl2cpp/skel.cpp
@@ -92,7 +92,7 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d
 	TQDomElement n = e.firstChild().toElement();
 	Q_ASSERT( n.tagName() == "NAME" );
 	TQString className = n.firstChild().toText().data();
-	// tqfind dcop parent ( rightmost super class )
+	// find dcop parent ( rightmost super class )
 	TQString DCOPParent;
 	TQDomElement s = n.nextSibling().toElement();
 	for( ; !s.isNull(); s = s.nextSibling().toElement() ) {
@@ -177,7 +177,7 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d
 	TQString namespace_tmp = className;
 	str << endl;
 	for(;;) {
-	    int pos = namespace_tmp.tqfind( "::" );
+	    int pos = namespace_tmp.find( "::" );
 	    if( pos < 0 ) {
 		className = namespace_tmp;
 		break;
@@ -223,7 +223,7 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d
 	    str << "\t    fdict->insert( " << className << "_ftable[i][1],  new int( i ) );" << endl;
 	    str << "    }" << endl;
     
-	    str << "    int* fp = fdict->tqfind( fun );" << endl;
+	    str << "    int* fp = fdict->find( fun );" << endl;
 	    str << "    switch ( fp?*fp:-1) {" << endl;
 	}
 	s = n.nextSibling().toElement();
diff --git a/dcop/dcopidl2cpp/stub.cpp b/dcop/dcopidl2cpp/stub.cpp
index ab9165d4e..887945262 100644
--- a/dcop/dcopidl2cpp/stub.cpp
+++ b/dcop/dcopidl2cpp/stub.cpp
@@ -54,7 +54,7 @@ void generateStub( const TQString& idl, const TQString& filename, TQDomElement d
     str << endl;
 
     TQString ifdefstring = idl.upper();
-    int pos = idl.tqfindRev( '.' );
+    int pos = idl.findRev( '.' );
     if ( pos != -1 )
 	ifdefstring = ifdefstring.left( pos );
 
@@ -99,7 +99,7 @@ void generateStub( const TQString& idl, const TQString& filename, TQDomElement d
 		n = n.nextSibling().toElement();
 	}
 
-	// tqfind dcop parent ( rightmost super class )
+	// find dcop parent ( rightmost super class )
 	TQString DCOPParent;
 	for( ; !n.isNull(); n = n.nextSibling().toElement() ) {
 	    if ( n.tagName() == "SUPER" )
@@ -107,13 +107,13 @@ void generateStub( const TQString& idl, const TQString& filename, TQDomElement d
 	}
 
 	if( DCOPParent != "DCOPObject" ) { // we need to include the .h file for the base stub
-	    if( all_includes.tqcontains( DCOPParent + ".h" ))
+	    if( all_includes.contains( DCOPParent + ".h" ))
 		str << "#include <" << DCOPParent << "_stub.h>" << endl;
-	    else if( all_includes.tqcontains( DCOPParent.lower() + ".h" ))
+	    else if( all_includes.contains( DCOPParent.lower() + ".h" ))
 		str << "#include <" << DCOPParent.lower() << "_stub.h>" << endl;
 	    else {// damn ... let's assume it's the last include
 		TQString stub_h = all_includes.last();
-		unsigned int pos = stub_h.tqfind( ".h" );
+		unsigned int pos = stub_h.find( ".h" );
 		if( pos > 0 ) {
 		    stub_h = stub_h.remove( pos, 100000 );
 		    str << "#include <" << stub_h << "_stub.h>" << endl;
@@ -128,7 +128,7 @@ void generateStub( const TQString& idl, const TQString& filename, TQDomElement d
 	int namespace_count = 0;
 	TQString namespace_tmp = className;
 	for(;;) {
-	    int pos = namespace_tmp.tqfind( "::" );
+	    int pos = namespace_tmp.find( "::" );
 	    if( pos < 0 ) {
 		className = namespace_tmp;
 		break;
diff --git a/dcop/dcopidl2cpp/stubimpl.cpp b/dcop/dcopidl2cpp/stubimpl.cpp
index 7e9990e61..5cdd2a00d 100644
--- a/dcop/dcopidl2cpp/stubimpl.cpp
+++ b/dcop/dcopidl2cpp/stubimpl.cpp
@@ -98,7 +98,7 @@ void generateStubImpl( const TQString& idl, const TQString& header, const TQStri
 	TQString namespace_tmp = className_stub;
 	str << endl;
 	for(;;) {
-	    int pos = namespace_tmp.tqfind( "::" );
+	    int pos = namespace_tmp.find( "::" );
 	    if( pos < 0 ) {
 		className_stub = namespace_tmp;
 		break;
diff --git a/dcop/dcopidl2cpp/type.h b/dcop/dcopidl2cpp/type.h
index 005a97696..2a99c83a9 100644
--- a/dcop/dcopidl2cpp/type.h
+++ b/dcop/dcopidl2cpp/type.h
@@ -10,7 +10,7 @@ static TQString writeType( TQTextStream& str, const TQDomElement& r )
   if ( r.hasAttribute( "qleft" ) )
     str << r.attribute("qleft") << " ";
   TQString t = r.firstChild().toText().data();
-  t = t.tqreplace( ">>", "> >" );
+  t = t.replace( ">>", "> >" );
   str << t;
   if ( r.hasAttribute( "qright" ) )
     str << r.attribute("qright") << " ";
diff --git a/dcop/dcopidlng/kalyptus b/dcop/dcopidlng/kalyptus
index b0f0e1871..9a3709fc0 100644
--- a/dcop/dcopidlng/kalyptus
+++ b/dcop/dcopidlng/kalyptus
@@ -67,14 +67,14 @@ $exe = basename $0;
 @inputqueue = ();
 @codeqobject = split "\n", <<CODE;
 public:
-    virtual QMetaObject *tqmetaObject() const;
+    virtual QMetaObject *metaObject() const;
     virtual const char *className() const;
     virtual void* qt_cast( const char* );
     virtual bool qt_invoke( int, QUObject* );
     virtual bool qt_emit( int, QUObject* );
     virtual bool qt_property( int, int, QVariant* );
     static QMetaObject* staticMetaObject();
-    TQObject* qObject();
+    QObject* qObject();
     static QString tr( const char *, const char * = 0 );
     static QString trUtf8( const char *, const char * = 0 );
 private:
@@ -116,7 +116,7 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors);
     Q_WS_MAC => 'undef',
     Q_OBJECT => <<'CODE',
 public:
-    virtual QMetaObject *tqmetaObject() const;
+    virtual QMetaObject *metaObject() const;
     virtual const char *className() const;
     virtual bool qt_invoke( int, QUObject* );
     virtual bool qt_emit( int, QUObject* );
@@ -419,7 +419,7 @@ LOOP:
 		}
 
 		next if ( $p =~ /^\s*$/s ); 		# blank lines
-#			|| $p =~ /^\s*Q_OBJECT/		# TQObject macro
+#			|| $p =~ /^\s*Q_OBJECT/		# QObject macro
 #			);
 #
 
@@ -514,7 +514,7 @@ sub readCxxCodeBlock
 		return $lastLine if ( $open || $close) && $count == 0;
 	}
 
-	# tqfind opening brace
+	# find opening brace
 	if ( $count == 0 ) {
 		while( $count == 0 ) {
 			$l = readCxxLine();
@@ -529,7 +529,7 @@ sub readCxxCodeBlock
 		$count -= kdocUtil::countReg( $l, "}" );
 	}
 
-	# tqfind associated closing brace
+	# find associated closing brace
 	while ( $count > 0 ) {
 		$l = readCxxLine();
 		croak "Confused by unmatched braces" if !defined $l;
@@ -1096,8 +1096,8 @@ sub newClass
 	my $access = "private";
 	$access = "public" if $cNodeType ne "class";
 
-	# try to tqfind an exisiting node, or create a new one
-    # We need to make the fully-qualified-name otherwise tqfindRef will look
+	# try to find an exisiting node, or create a new one
+    # We need to make the fully-qualified-name otherwise findRef will look
 	# for that classname in the global namespace
     # testcase: class Foo; namespace Bar { class Foo { ... } }
     my @parents;
@@ -1105,7 +1105,7 @@ sub newClass
 	push @parents, $name;
 	my $fullyQualifiedName = join "::", @parents;
     print "looking for $fullyQualifiedName\n" if($debug);
-	my $oldnode = kdocAstUtil::tqfindRef( $cNode, $fullyQualifiedName );
+	my $oldnode = kdocAstUtil::findRef( $cNode, $fullyQualifiedName );
 	my $node = defined $oldnode ? $oldnode : Ast::New( $name );
 
 	if ( $endTag ne "{" ) {
@@ -1344,15 +1344,15 @@ sub newMethod
 			# ALWAYS IGNORE...
 			return undef;
 			
-			my $node = kdocAstUtil::tqfindRef( $cNode, $class );
+			my $node = kdocAstUtil::findRef( $cNode, $class );
 			
 			if ( !defined $node ) {
-				# if we couldn't tqfind the name, try again with
+				# if we couldn't find the name, try again with
 				# all template parameters stripped off:
 				my $strippedClass = $class;
 				$strippedClass =~ s/<[^<>]*>//g;
 
-				$node = kdocAstUtil::tqfindRef( $cNode, $strippedClass );
+				$node = kdocAstUtil::findRef( $cNode, $strippedClass );
 
 				# if still not found: give up
 				if ( !defined $node ) {
@@ -1370,7 +1370,7 @@ sub newMethod
 	    $class = $globalSpaceClassName; # FIXME - sanitize the naming system?
 	    $isGlobalSpace = 1;
 
-	    my $opsNode = kdocAstUtil::tqfindRef( $cNode, $class );
+	    my $opsNode = kdocAstUtil::findRef( $cNode, $class );
 	    if (!$opsNode) {
 		# manually create a "GlobalSpace" class
 		$opsNode = Ast::New( $class );
@@ -1468,7 +1468,7 @@ sub newMethod
 	* 1 for enums
 
 	Adds a property "ParamList" to the method node.
-	This property tqcontains a list of nodes, one for each parameter.
+	This property contains a list of nodes, one for each parameter.
 
 	Each parameter node has the following properties:
 	* ArgType the type of the argument, e.g. const QString&
diff --git a/dcop/dcopidlng/kdocAstUtil.pm b/dcop/dcopidlng/kdocAstUtil.pm
index 27f65dd21..ec67ace5f 100644
--- a/dcop/dcopidlng/kdocAstUtil.pm
+++ b/dcop/dcopidlng/kdocAstUtil.pm
@@ -17,13 +17,13 @@ use strict;
 use vars qw/ $depth $refcalls $refiters @noreflist %noref /;
 
 sub BEGIN {
-# statistics for tqfindRef
+# statistics for findRef
 
 	$depth = 0;
 	$refcalls = 0;
 	$refiters = 0;
 
-# tqfindRef will ignore these words
+# findRef will ignore these words
 
 	@noreflist = qw( const int char long double template 
 		unsigned signed float void bool true false uint 
@@ -35,22 +35,22 @@ sub BEGIN {
 }
 
 
-=head2 tqfindRef
+=head2 findRef
 
 	Parameters: root, ident, report-on-fail
 	Returns: node, or undef
 
 	Given a root node and a fully qualified identifier (:: separated),
-	this function will try to tqfind a child of the root node that matches
+	this function will try to find a child of the root node that matches
 	the identifier.
 
 =cut
 
-sub tqfindRef
+sub findRef
 {
 	my( $root, $name, $r ) = @_;
 
-	confess "tqfindRef: no name" if !defined $name || $name eq "";
+	confess "findRef: no name" if !defined $name || $name eq "";
 
 	$name =~ s/\s+//g;	
 	return undef if exists $noref{ $name };
@@ -65,7 +65,7 @@ sub tqfindRef
 	# Upward search for the first token
 	return undef if !defined $iter;
 
-	while ( !defined tqfindIn( $root, $iter ) ) {
+	while ( !defined findIn( $root, $iter ) ) {
 		return undef if !defined $root->{Parent};
 		$root = $root->{Parent};
 	}
@@ -77,8 +77,8 @@ sub tqfindRef
 		confess "iter in $name is undefined\n" if !defined $iter;
 		next if $iter =~ /^\s*$/;
 
-		unless ( defined tqfindIn( $root, $iter ) ) {
-			confess "tqfindRef: failed on '$name' at '$iter'\n"
+		unless ( defined findIn( $root, $iter ) ) {
+			confess "findRef: failed on '$name' at '$iter'\n"
 				if defined $r;
 			return undef;
 		}
@@ -90,13 +90,13 @@ sub tqfindRef
 	return $root;
 }
 
-=head2 tqfindIn
+=head2 findIn
 
 	node, name: search for a child
 
 =cut
 
-sub tqfindIn
+sub findIn
 {
 	return undef unless defined $_[0]->{KidHash};
 
@@ -147,7 +147,7 @@ ANITER:
 				next ANITER;
 			}
 
-			my $ref = kdocAstUtil::tqfindRef( $rnode, 
+			my $ref = kdocAstUtil::findRef( $rnode, 
 					$in->{astNodeName} );
 
 			if( !defined $ref ) {
@@ -302,16 +302,16 @@ sub allMembers
 	}
 }
 
-=head2 tqfindOverride
+=head2 findOverride
 
 	Parameters: root, node, name
 
 	Looks for nodes of the same name as the parameter, in its parent
-	and the parent's ancestors. It returns a node if it tqfinds one.
+	and the parent's ancestors. It returns a node if it finds one.
 
 =cut
 
-sub tqfindOverride
+sub findOverride
 {
 	my ( $root, $node, $name ) = @_;
 	return undef if !exists $node->{InList};
@@ -325,7 +325,7 @@ sub tqfindOverride
 		return $n if defined $ref && $ref->{NodeType} eq "method";
 
 		if ( exists $n->{InList} ) {
-			$ref = tqfindOverride( $root, $n, $name );
+			$ref = findOverride( $root, $n, $name );
 			return $ref if defined $ref;
 		}
 	}
@@ -464,14 +464,14 @@ sub testRef {
 
 	my $rootNode = $_[ 0 ];
 
-	my $term = new Term::ReadLine 'Testing tqfindRef';
+	my $term = new Term::ReadLine 'Testing findRef';
 
 	my $OUT = $term->OUT || *STDOUT{IO};
 	my $prompt = "Identifier: ";
 
 	while( defined ($_ = $term->readline($prompt)) ) {
 
-		my $node = kdocAstUtil::tqfindRef( $rootNode, $_ );
+		my $node = kdocAstUtil::findRef( $rootNode, $_ );
 
 		if( defined $node ) {
 			print $OUT "Reference: '", $node->{astNodeName}, 
@@ -487,7 +487,7 @@ sub testRef {
 
 sub printDebugStats
 {
-	print "tqfindRef: ", $refcalls, " calls, ", 
+	print "findRef: ", $refcalls, " calls, ", 
 		$refiters, " iterations.\n";
 }
 
diff --git a/dcop/dcopidlng/kdocUtil.pm b/dcop/dcopidlng/kdocUtil.pm
index e83359724..629147ac3 100644
--- a/dcop/dcopidlng/kdocUtil.pm
+++ b/dcop/dcopidlng/kdocUtil.pm
@@ -30,7 +30,7 @@ sub countReg
 	return $count;
 }
 
-=head2 tqfindCommonPrefix
+=head2 findCommonPrefix
 
 	Parameters: string, string
 
@@ -39,7 +39,7 @@ sub countReg
 
 =cut
 
-sub tqfindCommonPrefix
+sub findCommonPrefix
 {
 	my @s1 = split( "/", $_[0] );
 	my @s2 = split( "/", $_[1] );
@@ -72,7 +72,7 @@ sub makeRelativePath
 	$from .= '/' unless $from =~ m#/$#;
 	$to .= '/' unless $to =~ m#/$#;
 
-	my $pfx = tqfindCommonPrefix( $from, $to );
+	my $pfx = findCommonPrefix( $from, $to );
 
 	if ( $pfx ne "" ) {
 		$from =~ s/^$pfx//g;
diff --git a/dcop/dcopobject.cpp b/dcop/dcopobject.cpp
index c686b79d7..fd39fb347 100644
--- a/dcop/dcopobject.cpp
+++ b/dcop/dcopobject.cpp
@@ -58,7 +58,7 @@ DCOPObject::DCOPObject(TQObject *obj)
     while (currentObj != 0L) {
         ident.prepend( currentObj->name() );
         ident.prepend("/");
-        currentObj = currentObj->tqparent();
+        currentObj = currentObj->parent();
     }
     if ( ident[0] == '/' )
         ident = ident.mid(1);
@@ -97,7 +97,7 @@ void DCOPObject::setCallingDcopClient(DCOPClient *client)
 
 bool DCOPObject::setObjId(const TQCString &objId)
 {
-  if (objMap()->tqfind(objId)!=objMap()->end()) return false;
+  if (objMap()->find(objId)!=objMap()->end()) return false;
 
   DCOPClient *client = DCOPClient::mainClient();
     if ( d->m_signalConnections > 0 && client )
@@ -116,16 +116,16 @@ TQCString DCOPObject::objId() const
 
 bool DCOPObject::hasObject(const TQCString &_objId)
 {
-  if (objMap()->tqcontains(_objId))
+  if (objMap()->contains(_objId))
     return true;
   else
     return false;
 }
 
-DCOPObject *DCOPObject::tqfind(const TQCString &_objId)
+DCOPObject *DCOPObject::find(const TQCString &_objId)
 {
   TQMap<TQCString, DCOPObject *>::ConstIterator it;
-  it = objMap()->tqfind(_objId);
+  it = objMap()->find(_objId);
   if (it != objMap()->end())
     return *it;
   else
@@ -155,7 +155,7 @@ TQCString DCOPObject::objectName( TQObject* obj )
     {
 	identity.prepend( currentObj->name() );
 	identity.prepend("/");
-	currentObj = currentObj->tqparent();
+	currentObj = currentObj->parent();
     }
     if ( identity[0] == '/' )
 	identity = identity.mid(1);
diff --git a/dcop/dcopobject.h b/dcop/dcopobject.h
index d1f19ccb4..2040379b2 100644
--- a/dcop/dcopobject.h
+++ b/dcop/dcopobject.h
@@ -299,16 +299,16 @@ public:
   static bool hasObject(const TQCString &objId);
 
   /**
-   * Try to tqfind a dcop object with the given id.
+   * Try to find a dcop object with the given id.
    * This function does not query the DCOPObjectProxy.
    * @param objId the object id to search
    * @return the  DCOPObject for the id @p objId.
    */
-  static DCOPObject *tqfind(const TQCString &objId);
+  static DCOPObject *find(const TQCString &objId);
 
 
   /**
-   * Tries to tqfind an object using a partial object id.
+   * Tries to find an object using a partial object id.
    * This function is used for multicasting a DCOP message to
    * several objects inside a single process.
    * 
diff --git a/dcop/dcopref.cpp b/dcop/dcopref.cpp
index c446eb0ee..bb39c109b 100644
--- a/dcop/dcopref.cpp
+++ b/dcop/dcopref.cpp
@@ -62,9 +62,9 @@ DCOPReply DCOPRef::callInternal( const TQCString& fun, const TQCString& args, co
 	return reply;
     }
     TQCString sig = fun;
-    if ( fun.tqfind('(') == -1 ) {
+    if ( fun.find('(') == -1 ) {
 	sig += args;
-	if( args.tqfind( "<unknown" ) != -1 )
+	if( args.find( "<unknown" ) != -1 )
 	    qWarning("DCOPRef: unknown type error "
 		     "<\"%s\",\"%s\">::call(\"%s\",%s",
 		     STR(m_app), STR(m_obj), STR(fun), args.data()+1 );
@@ -87,9 +87,9 @@ bool DCOPRef::sendInternal( const TQCString& fun, const TQCString& args, const T
     }
     Q_UNUSED( data );
     TQCString sig = fun;
-    if ( fun.tqfind('(') == -1 ) {
+    if ( fun.find('(') == -1 ) {
 	sig += args;
-	if( args.tqfind( "<unknown" ) != -1 )
+	if( args.find( "<unknown" ) != -1 )
 	    qWarning("DCOPRef: unknown type error "
 		     "<\"%s\",\"%s\">::send(\"%s\",%s",
 		     STR(m_app), STR(m_obj), STR(fun), args.data()+1 );
diff --git a/dcop/dcopref.h b/dcop/dcopref.h
index c7fa69822..92cb921bb 100644
--- a/dcop/dcopref.h
+++ b/dcop/dcopref.h
@@ -396,7 +396,7 @@ public:
      * Flag for allowing entering the event loop if the call blocks too long.
      * @p NoEventLoop disables entering the event loop.
      * @p UseEventLoop allows entering the event loop while waiting for long
-     * blocking DCOP call, thus making the GUI tqrepaint if needed, and possibly
+     * blocking DCOP call, thus making the GUI repaint if needed, and possibly
      * allowing also other code in the application to be executed.
      * @see DCOPClient::call()
      */
diff --git a/dcop/dcopserver.cpp b/dcop/dcopserver.cpp
index 11ef834e3..41a639b2e 100644
--- a/dcop/dcopserver.cpp
+++ b/dcop/dcopserver.cpp
@@ -82,7 +82,7 @@ template class TQPtrList<DCOPListener>;
 #define _DCOPIceSendEnd()	\
    fcntl(fd, F_SETFL, fd_fl);
 
-static TQCString tqfindDcopserverShutdown()
+static TQCString findDcopserverShutdown()
 {
 #ifdef Q_OS_WIN32
 	char szPath[512];
@@ -124,9 +124,9 @@ void DCOPIceWriteChar(register IceConn iceConn, unsigned long nbytes, char *ptr)
 static TQCString readQCString(TQDataStream &ds)
 {
    TQCString result;
-   TQ_UINT32 len;
+   Q_UINT32 len;
    ds >> len;
-   TQIODevice *device = ds.tqdevice();
+   TQIODevice *device = ds.device();
    int bytesLeft = device->size()-device->at();
    if ((bytesLeft < 0 ) || (len > (uint) bytesLeft))
    {
@@ -142,9 +142,9 @@ static TQCString readQCString(TQDataStream &ds)
 static TQByteArray readQByteArray(TQDataStream &ds)
 {
    TQByteArray result;
-   TQ_UINT32 len;
+   Q_UINT32 len;
    ds >> len;
-   TQIODevice *device = ds.tqdevice();
+   TQIODevice *device = ds.device();
    int bytesLeft = device->size()-device->at();
    if ((bytesLeft < 0 ) || (len > (uint) bytesLeft))
    {
@@ -238,7 +238,7 @@ static unsigned long writeIceData(IceConn iceConn, unsigned long nbytes, char *p
 
 void DCOPIceWriteChar(register IceConn iceConn, unsigned long nbytes, char *ptr)
 {
-    DCOPConnection* conn = the_server->tqfindConn( iceConn );
+    DCOPConnection* conn = the_server->findConn( iceConn );
 #ifdef DCOP_DEBUG
 qWarning("DCOPServer: DCOPIceWriteChar() Writing %d bytes to %d [%s]", nbytes, fd, conn ? conn->appId.data() : "<unknown>");
 #endif
@@ -270,7 +270,7 @@ qWarning("DCOPServer: _IceWrite() outputBlocked. Queuing %d bytes.", _data.size(
 
 static void DCOPIceWrite(IceConn iceConn, const TQByteArray &_data)
 {
-    DCOPConnection* conn = the_server->tqfindConn( iceConn );
+    DCOPConnection* conn = the_server->findConn( iceConn );
 #ifdef DCOP_DEBUG
 qWarning("DCOPServer: DCOPIceWrite() Writing %d bytes to %d [%s]", _data.size(), fd, conn ? conn->appId.data() : "<unknown>");
 #endif
@@ -287,7 +287,7 @@ qWarning("DCOPServer: DCOPIceWrite() outputBlocked. Queuing %d bytes.", _data.si
        // assert(conn->outputBuffer.isEmpty());
     }
 
-    unsigned long nleft = writeIceData(iceConn, _data.size(), const_cast<TQByteArray&>(_data).data());
+    unsigned long nleft = writeIceData(iceConn, _data.size(), _data.data());
     if ((nleft > 0) && conn)
     {
         conn->waitForOutputReady(_data, _data.size() - nleft);
@@ -319,7 +319,7 @@ void DCOPServer::slotOutputReady(int socket)
 qWarning("DCOPServer: slotOutputReady fd = %d", socket);
 #endif
    // Find out connection.
-   DCOPConnection *conn = fd_clients.tqfind(socket);
+   DCOPConnection *conn = fd_clients.find(socket);
    //assert(conn);
    //assert(conn->outputBlocked);
    //assert(conn->socket() == socket);
@@ -396,7 +396,7 @@ qWarning("DCOPServer: Flushing data, fd = %d", IceConnectionNumber(_iceConn));
    DCOPIceWrite(_iceConn, _data);
 }
 
-class DCOPListener : public TQSocketNotifier
+class DCOPListener : public QSocketNotifier
 {
 public:
     DCOPListener( IceListenObj obj )
@@ -487,7 +487,7 @@ write_iceauth (FILE *addfp, IceAuthDataEntry *entry)
    SUFFIX_LEN tells us how long <suffix> is (it can be zero length).
 
    The last six characters of TEMPLATE before <suffix> must be "XXXXXX";
-   they are tqreplaced with a string that makes the filename unique.
+   they are replaced with a string that makes the filename unique.
 
    Returns a file descriptor open on the file for reading and writing.  */
 
@@ -535,7 +535,7 @@ int mkstemps (char* _template, int suffix_len)
 	 with (module 2^32).  */
       value += 7777;
     }
-  /* We return the null string if we can't tqfind a unique file name.  */
+  /* We return the null string if we can't find a unique file name.  */
   _template[0] = '\0';
   return -1;
 }
@@ -710,7 +710,7 @@ void DCOPProcessMessage( IceConn iceConn, IcePointer /*clientData*/,
 void DCOPServer::processMessage( IceConn iceConn, int opcode,
 				 unsigned long length, Bool /*swap*/)
 {
-    DCOPConnection* conn = clients.tqfind( iceConn );
+    DCOPConnection* conn = clients.find( iceConn );
     if ( !conn ) {
 	qWarning("DCOPServer::processMessage message from unknown connection. [opcode = %d]", opcode);
 	return;
@@ -728,7 +728,7 @@ void DCOPServer::processMessage( IceConn iceConn, int opcode,
 	    TQCString fromApp = readQCString(ds);
             TQCString toApp = readQCString(ds);
 
-	    DCOPConnection* target = tqfindApp( toApp );
+	    DCOPConnection* target = findApp( toApp );
 	    int datalen = ba.size();
 	    if ( opcode == DCOPReplyDelayed ) {
 		if ( !target )
@@ -805,7 +805,7 @@ if (opcode == DCOPSend)
 	    TQDataStream ds( ba, IO_ReadOnly );
 	    TQCString fromApp = readQCString(ds);
 	    TQCString toApp = readQCString(ds);
-	    DCOPConnection* target = tqfindApp( toApp );
+	    DCOPConnection* target = findApp( toApp );
 	    int datalen = ba.size();
 
 	    if ( target ) {
@@ -888,7 +888,7 @@ if (opcode == DCOPCall)
             TQCString fromApp = readQCString(ds);
             TQCString toApp = readQCString(ds);
 
-	    DCOPConnection* connreply = tqfindApp( toApp );
+	    DCOPConnection* connreply = findApp( toApp );
 	    int datalen = ba.size();
 
 	    if ( !connreply )
@@ -1090,7 +1090,7 @@ DCOPServer::DCOPServer(bool _suicide)
 
 DCOPServer::~DCOPServer()
 {
-    system(tqfindDcopserverShutdown()+" --nokill");
+    system(findDcopserverShutdown()+" --nokill");
     IceFreeListenObjs(numTransports, listenObjs);
     FreeAuthenticationData(numTransports, authDataEntries);
     delete dcopSignals;
@@ -1105,11 +1105,11 @@ DCOPServer::~DCOPServer()
 #endif
 }
 
-DCOPConnection* DCOPServer::tqfindApp( const TQCString& appId )
+DCOPConnection* DCOPServer::findApp( const TQCString& appId )
 {
     if ( appId.isNull() )
 	return 0;
-    DCOPConnection* conn = appIds.tqfind( appId );
+    DCOPConnection* conn = appIds.find( appId );
     return conn;
 }
 
@@ -1204,7 +1204,7 @@ void DCOPServer::removeConnection( void* data )
     while (!conn->waitingForReply.isEmpty()) {
 	IceConn iceConn = conn->waitingForReply.take(0);
 	if (iceConn) {
-	    DCOPConnection* target = clients.tqfind( iceConn );
+	    DCOPConnection* target = clients.find( iceConn );
 	    qWarning("DCOP aborting call from '%s' to '%s'", target ? target->appId.data() : "<unknown>" , conn->appId.data() );
 	    TQByteArray reply;
 	    DCOPMsg *pMsg;
@@ -1226,7 +1226,7 @@ void DCOPServer::removeConnection( void* data )
     while (!conn->waitingForDelayedReply.isEmpty()) {
 	IceConn iceConn = conn->waitingForDelayedReply.take(0);
 	if (iceConn) {
-	    DCOPConnection* target = clients.tqfind( iceConn );
+	    DCOPConnection* target = clients.find( iceConn );
 	    qWarning("DCOP aborting (delayed) call from '%s' to '%s'", target ? target->appId.data() : "<unknown>", conn->appId.data() );
 	    TQByteArray reply;
 	    DCOPMsg *pMsg;
@@ -1247,7 +1247,7 @@ void DCOPServer::removeConnection( void* data )
     {
 	IceConn iceConn = conn->waitingOnReply.take(0);
         if (iceConn) {
-           DCOPConnection* target = clients.tqfind( iceConn );
+           DCOPConnection* target = clients.find( iceConn );
            if (!target)
            {
                qWarning("DCOP Error: still waiting for answer from non-existing client.");
@@ -1295,7 +1295,7 @@ void DCOPServer::slotTerminate()
     dcopSignals->emitSignal(0L /* dcopserver */, "terminateKDE()", data, false);
     disconnect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTerminate()) );
     connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSuicide()) );
-    system(tqfindDcopserverShutdown()+" --nokill");
+    system(findDcopserverShutdown()+" --nokill");
 }
 
 void DCOPServer::slotSuicide()
@@ -1359,7 +1359,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
 
     if ( obj == "emit")
     {
-        DCOPConnection* conn = clients.tqfind( iceConn );
+        DCOPConnection* conn = clients.find( iceConn );
         if (conn) {
 	    //qDebug("DCOPServer: %s emits %s", conn->appId.data(), fun.data());
 	    dcopSignals->emitSignal(conn, fun, data, false);
@@ -1370,13 +1370,13 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
     if ( fun == "setDaemonMode(bool)" ) {
         TQDataStream args( data, IO_ReadOnly );
         if ( !args.atEnd() ) {
-            TQ_INT8 iDaemon;
+            Q_INT8 iDaemon;
             bool daemon;
             args >> iDaemon;
 
             daemon = static_cast<bool>( iDaemon );
 
-	    DCOPConnection* conn = clients.tqfind( iceConn );
+	    DCOPConnection* conn = clients.find( iceConn );
             if ( conn && !conn->appId.isNull() ) {
                 if ( daemon ) {
                     if ( !conn->daemon )
@@ -1414,10 +1414,10 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
 	if (!args.atEnd()) {
 	    TQCString app2 = readQCString(args);
 	    TQDataStream reply( replyData, IO_WriteOnly );
-	    DCOPConnection* conn = clients.tqfind( iceConn );
+	    DCOPConnection* conn = clients.find( iceConn );
 	    if ( conn && !app2.isEmpty() ) {
 		if ( !conn->appId.isNull() &&
-		     appIds.tqfind( conn->appId ) == conn ) {
+		     appIds.find( conn->appId ) == conn ) {
 		    appIds.remove( conn->appId );
 
 		}
@@ -1440,7 +1440,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
 #endif
 
 		conn->appId = app2;
-		if ( appIds.tqfind( app2 ) != 0 ) {
+		if ( appIds.find( app2 ) != 0 ) {
 		    // we already have this application, unify
 		    int n = 1;
 		    TQCString tmp;
@@ -1449,12 +1449,12 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
 			tmp.setNum( n );
 			tmp.prepend("-");
 			tmp.prepend( app2 );
-		    } while ( appIds.tqfind( tmp ) != 0 );
+		    } while ( appIds.find( tmp ) != 0 );
 		    conn->appId = tmp;
 		}
 		appIds.insert( conn->appId, conn );
 
-		int c = conn->appId.tqfind( '-' );
+		int c = conn->appId.find( '-' );
 		if ( c > 0 )
 		    conn->plainAppId = conn->appId.left( c );
 		else
@@ -1486,7 +1486,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
 	if (!args.atEnd()) {
 	    TQCString s = readQCString(args);
 	    TQDataStream reply( replyData, IO_WriteOnly );
-	    int b = ( tqfindApp( s ) != 0 );
+	    int b = ( findApp( s ) != 0 );
 	    replyType = "bool";
 	    reply << b;
 	    return true;
@@ -1494,9 +1494,9 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
     } else if ( fun == "setNotifications(bool)" ) {
 	TQDataStream args( data, IO_ReadOnly );
 	if (!args.atEnd()) {
-	    TQ_INT8 notifyActive;
+	    Q_INT8 notifyActive;
 	    args >> notifyActive;
-	    DCOPConnection* conn = clients.tqfind( iceConn );
+	    DCOPConnection* conn = clients.find( iceConn );
 	    if ( conn ) {
 		if ( notifyActive )
 		    conn->notifyRegister++;
@@ -1507,7 +1507,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
 	    return true;
 	}
     } else if ( fun == "connectSignal(TQCString,TQCString,TQCString,TQCString,TQCString,bool)") {
-        DCOPConnection* conn = clients.tqfind( iceConn );
+        DCOPConnection* conn = clients.find( iceConn );
         if (!conn) return false;
         TQDataStream args(data, IO_ReadOnly );
         if (args.atEnd()) return false;
@@ -1516,16 +1516,16 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
         TQCString signal = readQCString(args);
         TQCString receiverObj = readQCString(args);
         TQCString slot = readQCString(args);
-        TQ_INT8 Volatile;
+        Q_INT8 Volatile;
         args >> Volatile;
         //qDebug("DCOPServer: connectSignal(sender = %s senderObj = %s signal = %s recvObj = %s slot = %s)", sender.data(), senderObj.data(), signal.data(), receiverObj.data(), slot.data());
         bool b = dcopSignals->connectSignal(sender, senderObj, signal, conn, receiverObj, slot, (Volatile != 0));
         replyType = "bool";
         TQDataStream reply( replyData, IO_WriteOnly );
-        reply << (TQ_INT8) (b?1:0);
+        reply << (Q_INT8) (b?1:0);
         return true;
     } else if ( fun == "disconnectSignal(TQCString,TQCString,TQCString,TQCString,TQCString)") {
-        DCOPConnection* conn = clients.tqfind( iceConn );
+        DCOPConnection* conn = clients.find( iceConn );
         if (!conn) return false;
         TQDataStream args(data, IO_ReadOnly );
         if (args.atEnd()) return false;
@@ -1538,7 +1538,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
         bool b = dcopSignals->disconnectSignal(sender, senderObj, signal, conn, receiverObj, slot);
         replyType = "bool";
         TQDataStream reply( replyData, IO_WriteOnly );
-        reply << (TQ_INT8) (b?1:0);
+        reply << (Q_INT8) (b?1:0);
         return true;
     }
 
@@ -1618,7 +1618,7 @@ static bool isRunning(const TQCString &fName, bool printNetworkId = false)
 	TQCString contents( size+1 );
 	bool ok = f.readBlock( contents.data(), size ) == size;
 	contents[size] = '\0';
-	int pos = contents.tqfind('\n');
+	int pos = contents.find('\n');
 	ok = ok && ( pos != -1 );
 	pid_t pid = ok ? contents.mid(pos+1).toUInt(&ok) : 0;
 	f.close();
@@ -1739,7 +1739,7 @@ extern "C" DCOP_EXPORT int kdemain( int argc, char* argv[] )
                   return 0;
             }
             qWarning("DCOPServer self-test failed.");
-            system(tqfindDcopserverShutdown()+" --kill");
+            system(findDcopserverShutdown()+" --kill");
             return 1;
 	}
 	close(ready[0]);
diff --git a/dcop/dcopserver.h b/dcop/dcopserver.h
index 1373c2a03..7b649ccf2 100644
--- a/dcop/dcopserver.h
+++ b/dcop/dcopserver.h
@@ -66,7 +66,7 @@ typedef TQValueList<TQCString> QCStringList;
 /**
  * @internal
  */
-class DCOPConnection : public TQSocketNotifier
+class DCOPConnection : public QSocketNotifier
 {
 public:
     DCOPConnection( IceConn conn );
@@ -88,11 +88,11 @@ public:
     int notifyRegister;
     /**
      * When client A has called client B then for the duration of the call:
-     * A->waitingOnReply tqcontains B
+     * A->waitingOnReply contains B
      *   and either
-     * B->waitingForReply tqcontains A
+     * B->waitingForReply contains A
      *   or
-     * B->waitingForDelayedReply tqcontains A
+     * B->waitingForDelayedReply contains A
      *
      * This allows us to do proper bookkeeping in case client A, client B
      * or both unregister during the call.
@@ -112,7 +112,7 @@ public:
 /**
  * @internal
  */
-class DCOPServer : public TQObject
+class DCOPServer : public QObject
 {
     Q_OBJECT
 public:
@@ -128,9 +128,9 @@ public:
                  const TQCString &fun, const TQByteArray& data,
                  TQCString& replyType, TQByteArray &replyData, IceConn iceConn);
 
-    DCOPConnection *tqfindApp(const TQCString &appId);
-    DCOPConnection *tqfindConn(IceConn iceConn)
-       { return clients.tqfind(iceConn); }
+    DCOPConnection *findApp(const TQCString &appId);
+    DCOPConnection *findConn(IceConn iceConn)
+       { return clients.find(iceConn); }
 
     void sendMessage(DCOPConnection *conn, const TQCString &sApp,
                      const TQCString &rApp, const TQCString &rObj,
diff --git a/dcop/dcopserver_win.cpp b/dcop/dcopserver_win.cpp
index 7f06e287f..4e6bc5e9f 100644
--- a/dcop/dcopserver_win.cpp
+++ b/dcop/dcopserver_win.cpp
@@ -52,7 +52,7 @@ BOOL WINAPI DCOPServer::dcopServerConsoleProc(DWORD dwCtrlType)
 	case CTRL_LOGOFF_EVENT:
 	case CTRL_SHUTDOWN_EVENT:
     case CTRL_C_EVENT:
-        system(tqfindDcopserverShutdown()+" --nokill");
+        system(findDcopserverShutdown()+" --nokill");
         ret = TRUE;
         break;
     default:
diff --git a/dcop/dcopsignals.cpp b/dcop/dcopsignals.cpp
index e9f1af9aa..437051a55 100644
--- a/dcop/dcopsignals.cpp
+++ b/dcop/dcopsignals.cpp
@@ -39,14 +39,14 @@ DCOPSignals::emitSignal( DCOPConnection *conn, const TQCString &_fun, const TQBy
 {
    TQCString senderObj;
    TQCString fun = _fun;
-   int i = fun.tqfind('#');
+   int i = fun.find('#');
    if (i > -1)
    {
       senderObj = fun.left(i);
       fun = fun.mid(i+1);
    }
 
-   DCOPSignalConnectionList *list = connections.tqfind(fun);
+   DCOPSignalConnectionList *list = connections.find(fun);
    if (!list) return;
    for(DCOPSignalConnection *current = list->first(); current; current = list->next())
    {
@@ -102,16 +102,16 @@ DCOPSignals::connectSignal( const TQCString &sender, const TQCString &senderObj,
    // TODO: Check if signal and slot match
    TQCString signalArgs, slotArgs;
    int i,j;
-   i = signal.tqfind('(');
+   i = signal.find('(');
    if (i < 0) return false;
    signalArgs = signal.mid(i+1);
-   j = signalArgs.tqfind(')');
+   j = signalArgs.find(')');
    if (j < 0) return false;
    signalArgs.truncate(j);
-   i = slot.tqfind('(');
+   i = slot.find('(');
    if (i < 0) return false;
    slotArgs = slot.mid(i+1);
-   j = slotArgs.tqfind(')');
+   j = slotArgs.find(')');
    if (j < 0) return false;
    slotArgs.truncate(j);
 
@@ -129,7 +129,7 @@ DCOPSignals::connectSignal( const TQCString &sender, const TQCString &senderObj,
    DCOPConnection *senderConn = 0;
    if (Volatile)
    {
-      senderConn = the_server->tqfindApp(sender);
+      senderConn = the_server->findApp(sender);
       if (!senderConn)
          return false; // Sender does not exist.
    }
@@ -142,7 +142,7 @@ DCOPSignals::connectSignal( const TQCString &sender, const TQCString &senderObj,
    current->recvObj = receiverObj;
    current->slot = slot;
 
-   DCOPSignalConnectionList *list = connections.tqfind(signal);
+   DCOPSignalConnectionList *list = connections.find(signal);
    if (!list)
    {
       list = new DCOPSignalConnectionList;
@@ -177,7 +177,7 @@ DCOPSignals::disconnectSignal( const TQCString &sender, const TQCString &senderO
       return true;
    }
 
-   DCOPSignalConnectionList *list = connections.tqfind(signal);
+   DCOPSignalConnectionList *list = connections.find(signal);
    if (!list)
       return false; // Not found...
 
@@ -255,7 +255,7 @@ DCOPSignals::removeConnections(DCOPConnection *conn, const TQCString &obj)
       if (current->recvConn != conn)
          current->recvConn->signalConnectionList()->removeRef(current);
 
-      DCOPSignalConnectionList *signalList = connections.tqfind(current->signal);
+      DCOPSignalConnectionList *signalList = connections.find(current->signal);
       if (signalList)
       {
          signalList->removeRef(current);
diff --git a/dcop/dcopstub.cpp b/dcop/dcopstub.cpp
index 5f046aa45..903ed0bc5 100644
--- a/dcop/dcopstub.cpp
+++ b/dcop/dcopstub.cpp
@@ -64,12 +64,12 @@ DCOPClient* DCOPStub::dcopClient()
     return DCOPClient::mainClient();
 }
 
-DCOPStub::tqStatus DCOPStub::status() const
+DCOPStub::Status DCOPStub::status() const
 {
     return m_status;
 }
 
-void DCOPStub::setStatus( tqStatus _status )
+void DCOPStub::setStatus( Status _status )
 {
     m_status = _status;
 }
diff --git a/dcop/dcopstub.h b/dcop/dcopstub.h
index a60220f59..df55e0f72 100644
--- a/dcop/dcopstub.h
+++ b/dcop/dcopstub.h
@@ -75,7 +75,7 @@ public:
      */
     TQCString obj() const;
 
-    enum tqStatus{ CallSucceeded, CallFailed };
+    enum Status{ CallSucceeded, CallFailed };
     /**
      * Return the status of the last call, either @p CallSucceeded or
      * @p CallFailed.
@@ -83,7 +83,7 @@ public:
      * @return the status of the last call
      * @see ok();
      */
-    tqStatus status() const;
+    Status status() const;
 
 
     /**
@@ -101,7 +101,7 @@ protected:
        @param _status the new status
        @see status()
      */
-    void setStatus( tqStatus _status );
+    void setStatus( Status _status );
 
     /**
       Invoked whenever a call fails.  The default implementation
@@ -134,7 +134,7 @@ protected:
 private:
     TQCString m_app;
     TQCString m_obj;
-    tqStatus m_status;
+    Status m_status;
 
 protected:
     virtual	void virtual_hook( int id, void* data );
diff --git a/dcop/kdatastream.h b/dcop/kdatastream.h
index 6551295f6..de85ebb47 100644
--- a/dcop/kdatastream.h
+++ b/dcop/kdatastream.h
@@ -6,13 +6,13 @@
 #ifdef USE_QT3
 inline TQDataStream & operator << (TQDataStream & str, bool b)
 {
-  str << TQ_INT8(b);
+  str << Q_INT8(b);
   return str;
 }
 
 inline TQDataStream & operator >> (TQDataStream & str, bool & b)
 {
-  TQ_INT8 l;
+  Q_INT8 l;
   str >> l;
   b = bool(l);
   return str;
@@ -22,7 +22,7 @@ inline TQDataStream & operator >> (TQDataStream & str, bool & b)
 #if QT_VERSION < 0x030200 && !defined(Q_WS_WIN) && !defined(Q_WS_MAC)
 inline TQDataStream & operator << (TQDataStream & str, long long int ll)
 {
-  TQ_UINT32 l1,l2;
+  Q_UINT32 l1,l2;
   l1 = ll & 0xffffffffLL;
   l2 = ll >> 32;
   str << l1 << l2;
@@ -31,7 +31,7 @@ inline TQDataStream & operator << (TQDataStream & str, long long int ll)
 
 inline TQDataStream & operator >> (TQDataStream & str, long long int&ll)
 {
-  TQ_UINT32 l1,l2;
+  Q_UINT32 l1,l2;
   str >> l1 >> l2;
   ll = ((unsigned long long int)(l2) << 32) + (long long int) l1;
   return str;
@@ -39,7 +39,7 @@ inline TQDataStream & operator >> (TQDataStream & str, long long int&ll)
 
 inline TQDataStream & operator << (TQDataStream & str, unsigned long long int ll)
 {
-  TQ_UINT32 l1,l2;
+  Q_UINT32 l1,l2;
   l1 = ll & 0xffffffffLL;
   l2 = ll >> 32;
   str << l1 << l2;
@@ -48,7 +48,7 @@ inline TQDataStream & operator << (TQDataStream & str, unsigned long long int ll
 
 inline TQDataStream & operator >> (TQDataStream & str, unsigned long long int &ll)
 {
-  TQ_UINT32 l1,l2;
+  Q_UINT32 l1,l2;
   str >> l1 >> l2;
   ll = ((unsigned long long int)(l2) << 32) + (unsigned long long int) l1;
   return str;
diff --git a/dcop/testdcop.cpp b/dcop/testdcop.cpp
index ce30f0076..e43b41c31 100644
--- a/dcop/testdcop.cpp
+++ b/dcop/testdcop.cpp
@@ -248,23 +248,23 @@ int main(int argc, char **argv)
 
   // Find a object called "object1" in any application that
   // meets the criteria "canLaunchRockets()"
-//  bool boolResult = client->tqfindObject( "", "object1", "canLaunchRockets()", data, foundApp, foundObj);
-//  qDebug("tqfindObject: result = %s, %s, %s\n", boolResult ? "true" : "false",
+//  bool boolResult = client->findObject( "", "object1", "canLaunchRockets()", data, foundApp, foundObj);
+//  qDebug("findObject: result = %s, %s, %s\n", boolResult ? "true" : "false",
 //	foundApp.data(), foundObj.data());
 
   // Find an application that matches with "konqueror*"
-  bool boolResult = client->tqfindObject( "konqueror*", "", "", data, foundApp, foundObj);
-  qDebug("tqfindObject: result = %s, %s, %s\n", boolResult ? "true" : "false",
+  bool boolResult = client->findObject( "konqueror*", "", "", data, foundApp, foundObj);
+  qDebug("findObject: result = %s, %s, %s\n", boolResult ? "true" : "false",
 	foundApp.data(), foundObj.data());
 
   // Find an object called "object1" in any application.
-  boolResult = client->tqfindObject( "", "ksycoca", "", data, foundApp, foundObj);
-  qDebug("tqfindObject: result = %s, %s, %s\n", boolResult ? "true" : "false",
+  boolResult = client->findObject( "", "ksycoca", "", data, foundApp, foundObj);
+  qDebug("findObject: result = %s, %s, %s\n", boolResult ? "true" : "false",
 	foundApp.data(), foundObj.data());
 
   // Find ourselves in any application.
-  boolResult = client->tqfindObject( "testdcop", "ksycoca", "", data, foundApp, foundObj);
-  qDebug("tqfindObject: result = %s, %s, %s\n", boolResult ? "true" : "false",
+  boolResult = client->findObject( "testdcop", "ksycoca", "", data, foundApp, foundObj);
+  qDebug("findObject: result = %s, %s, %s\n", boolResult ? "true" : "false",
 	foundApp.data(), foundObj.data());
 
   DCOPClient *client2 = new DCOPClient();
@@ -287,8 +287,8 @@ qDebug("Calling countDown() in object1");
       qDebug("return type was '%s'", replyType.data() ); 
 
   // Find ourselves in any application.
-  boolResult = client2->tqfindObject( "testdcop", "object1", "", data, foundApp, foundObj);
-  qDebug("tqfindObject: result = %s, %s, %s\n", boolResult ? "true" : "false",
+  boolResult = client2->findObject( "testdcop", "object1", "", data, foundApp, foundObj);
+  qDebug("findObject: result = %s, %s, %s\n", boolResult ? "true" : "false",
 	foundApp.data(), foundObj.data());
 
   client->detach();
diff --git a/dcop/testdcop.h b/dcop/testdcop.h
index 936632b55..135812e39 100644
--- a/dcop/testdcop.h
+++ b/dcop/testdcop.h
@@ -35,13 +35,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <stdio.h>
 /**
- $QTDIR/bin/tqmoc testdcop.cpp -o testdcop.moc
+ $QTDIR/bin/moc testdcop.cpp -o testdcop.moc
  g++ -o testdcop testdcop.cpp -I$QTDIR/include -L$QTDIR/lib
  @internal
 
 **/
 
-class TestObject : public TQObject
+class TestObject : public QObject
 {
   Q_OBJECT
 public:
diff --git a/dcop/tests/testcases b/dcop/tests/testcases
index e9ba94919..0f16bdbe3 100644
--- a/dcop/tests/testcases
+++ b/dcop/tests/testcases
@@ -19,7 +19,7 @@
 # 2. First you put shell like argument:
 # "string with spaces" 4 string_without_spaces
 # Then you should put c++ style arguments: 
-# QString::tqfromLatin1("string with spaces"),4,"string_with_spaces"
+# QString::fromLatin1("string with spaces"),4,"string_with_spaces"
 #
 # Note that the first argument has type QString and the last type const char*
 # (adapt accordingly)
@@ -29,7 +29,7 @@ QString
 url
 ()
 {
-return QString::tqfromLatin1( "http://www.kde.org/");
+return QString::fromLatin1( "http://www.kde.org/");
 }
 -
 
@@ -63,7 +63,7 @@ identity
 {
 	return x;
 }
-"test";QString::tqfromLatin1("test")
+"test";QString::fromLatin1("test")
 
 // 2.3 unsigned long int
 unsigned long int
diff --git a/dnssd/Mainpage.dox b/dnssd/Mainpage.dox
index 5132ce0db..81ab7c98b 100644
--- a/dnssd/Mainpage.dox
+++ b/dnssd/Mainpage.dox
@@ -11,12 +11,12 @@ Apple's developer documentation provides lots of information about Bonjour
 in its <a href="http://developer.apple.com/documentation/Cocoa/Conceptual/NetServices/Articles/about.html#//apple_ref/doc/uid/TP40002458-SW1">Bonjour overview</a>.
 
 If you are writing an application that wants to discover services on the network,
-use DNSSD::ServiceBrowser.  You can also tqfind available service types using ServiceTypeBrowser.
+use DNSSD::ServiceBrowser.  You can also find available service types using ServiceTypeBrowser.
 
 If you want to announce the availability of a service provided by your application,
 use DNSSD::PublicService.
 
-DNSSD::DomainBrowser allows you to tqfind domains (other than the local one) recommended
+DNSSD::DomainBrowser allows you to find domains (other than the local one) recommended
 for browsing or publishing to.
 
 Note that DNSSD::ServiceBrowser::isAvailable() provides information about the availability
diff --git a/dnssd/Makefile.am b/dnssd/Makefile.am
index 19701045b..268e72a5d 100644
--- a/dnssd/Makefile.am
+++ b/dnssd/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir) $(all_includes) $(AVAHI_CFLAGS)
 # these are the headers for your project
 noinst_HEADERS = sdevent.h
 
-# let autotqmoc handle all of the meta source files (tqmoc)
+# let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
 
 lib_LTLIBRARIES =  libkdnssd.la
diff --git a/dnssd/README b/dnssd/README
index d30b70745..c797b2939 100644
--- a/dnssd/README
+++ b/dnssd/README
@@ -1,7 +1,7 @@
 Checklist to ensure that zeroconf will work:
 
 1) Install Avahi, at least version 0.3
-2) compile kdnssd-avahi and install it to tqreplace 'stub' libkdnssd.so provided by kdelibs
+2) compile kdnssd-avahi and install it to replace 'stub' libkdnssd.so provided by kdelibs
 3) check /etc/nsswitch.conf and ensure that there is 'mdns' before 'dns' in
 line starting with 'host:'. It should be something like:
 host: files mdns dns
diff --git a/dnssd/domainbrowser.cpp b/dnssd/domainbrowser.cpp
index 6cab652ac..8a24f11b6 100644
--- a/dnssd/domainbrowser.cpp
+++ b/dnssd/domainbrowser.cpp
@@ -125,7 +125,7 @@ void DomainBrowser::startBrowse()
 
 void DomainBrowser::gotNewDomain(const TQString& domain)
 {
-	if (d->m_domains.tqcontains(domain)) return;
+	if (d->m_domains.contains(domain)) return;
 	d->m_domains.append(domain);
 	emit domainAdded(domain);
 }
diff --git a/dnssd/domainbrowser.h b/dnssd/domainbrowser.h
index 199163cb1..a77849240 100644
--- a/dnssd/domainbrowser.h
+++ b/dnssd/domainbrowser.h
@@ -38,7 +38,7 @@ class DomainBrowserPrivate;
 @short Class used to provide current list of domains for browsing.
 @author Jakub Stachowski
 */
-class KDNSSD_EXPORT DomainBrowser : public TQObject
+class KDNSSD_EXPORT DomainBrowser : public QObject
 {
 	Q_OBJECT
 public:
diff --git a/dnssd/query.h b/dnssd/query.h
index 42dae32e2..90e9fe19d 100644
--- a/dnssd/query.h
+++ b/dnssd/query.h
@@ -36,7 +36,7 @@ name, either multicast or unicast DNS will be used.
 @short Class that represents service query in one domain.
 @author Jakub Stachowski
  */
-class KDNSSD_EXPORT Query : public TQObject
+class KDNSSD_EXPORT Query : public QObject
 {
 	Q_OBJECT
 public:
diff --git a/dnssd/remoteservice.cpp b/dnssd/remoteservice.cpp
index 2f5bc5927..62ec01eb0 100644
--- a/dnssd/remoteservice.cpp
+++ b/dnssd/remoteservice.cpp
@@ -166,7 +166,7 @@ void RemoteService::virtual_hook(int, void*)
 TQDataStream & operator<< (TQDataStream & s, const RemoteService & a)
 {
 	s << (static_cast<ServiceBase>(a));
-	TQ_INT8 resolved = a.d->m_resolved ? 1:0;
+	Q_INT8 resolved = a.d->m_resolved ? 1:0;
 	s << resolved;
 	return s;
 }
@@ -177,7 +177,7 @@ TQDataStream & operator>> (TQDataStream & s, RemoteService & a)
 #ifdef HAVE_DNSSD
 	a.d->stop();
 #endif
-	TQ_INT8 resolved;
+	Q_INT8 resolved;
 	operator>>(s,(static_cast<ServiceBase&>(a)));
 	s >> resolved;
 	a.d->m_resolved = (resolved == 1);
diff --git a/dnssd/responder.cpp b/dnssd/responder.cpp
index afa4b83c5..d85358429 100644
--- a/dnssd/responder.cpp
+++ b/dnssd/responder.cpp
@@ -72,7 +72,7 @@ Responder& Responder::self()
 
 void Responder::process()
 {
-    tqApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
+    qApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
 }
 
 #ifdef HAVE_DNSSD
diff --git a/dnssd/responder.h b/dnssd/responder.h
index 187683c7b..ae909b59b 100644
--- a/dnssd/responder.h
+++ b/dnssd/responder.h
@@ -41,7 +41,7 @@ This class should not be used directly.
 @author Jakub Stachowski
 @short Internal class wrapping avahi client
  */
-class Responder : public TQObject
+class Responder : public QObject
 {
 	Q_OBJECT
 
diff --git a/dnssd/servicebase.cpp b/dnssd/servicebase.cpp
index d15b6c0d2..52d18cca3 100644
--- a/dnssd/servicebase.cpp
+++ b/dnssd/servicebase.cpp
@@ -34,7 +34,7 @@ ServiceBase::~ServiceBase()
 
 TQString ServiceBase::encode()
 {
-	return  m_serviceName.tqreplace(".","\\.").tqreplace("\\","\\\\") + TQString(".") + m_type +
+	return  m_serviceName.replace(".","\\.").replace("\\","\\\\") + TQString(".") + m_type +
 			 TQString(".") + m_domain;
 }
 
@@ -50,15 +50,15 @@ void ServiceBase::decode(const TQString& name)
 		rest=name;
 	} else {		// normal service or domain
 		TQString decoded_name=name;
-		decoded_name=decoded_name.tqreplace("\\\\","\\");
-		int i = decoded_name.tqfind(TQRegExp("[^\\\\]\\."));
-		if (i==-1) return;            // first tqfind service name
+		decoded_name=decoded_name.replace("\\\\","\\");
+		int i = decoded_name.find(TQRegExp("[^\\\\]\\."));
+		if (i==-1) return;            // first find service name
 		rest = decoded_name.mid(i+2);
-		m_serviceName=decoded_name.left(i+1).tqreplace("\\.",".");
+		m_serviceName=decoded_name.left(i+1).replace("\\.",".");
 	}
 	m_type = rest.section('.',0,1);
 	// does it really have a type?
-	if (m_type[0]=='_' && m_type[m_type.tqfind('.')+1]=='_')
+	if (m_type[0]=='_' && m_type[m_type.find('.')+1]=='_')
 		m_domain = rest.section('.',2,-1,TQString::SectionIncludeTrailingSep);
 	else {
 		m_type="";
@@ -100,13 +100,13 @@ void ServiceBase::virtual_hook(int, void*)
 
 TQDataStream & operator<< (TQDataStream & s, const ServiceBase & a)
 {
-	s << a.m_serviceName << a.m_type << a.m_domain << a.m_hostName << TQ_INT16(a.m_port) << a.m_textData;
+	s << a.m_serviceName << a.m_type << a.m_domain << a.m_hostName << Q_INT16(a.m_port) << a.m_textData;
 	return s;
 }
 
 TQDataStream & operator>> (TQDataStream & s, ServiceBase & a)
 {
-	TQ_INT16 port;
+	Q_INT16 port;
 	s >> a.m_serviceName >> a.m_type >> a.m_domain >> a.m_hostName >> port >> a.m_textData;
 	a.m_port = port;	
 	return s;
diff --git a/dnssd/servicebrowser.cpp b/dnssd/servicebrowser.cpp
index 340053622..3c64ffe66 100644
--- a/dnssd/servicebrowser.cpp
+++ b/dnssd/servicebrowser.cpp
@@ -138,7 +138,7 @@ void ServiceBrowser::startBrowse()
 
 void ServiceBrowser::gotNewService(RemoteService::Ptr svr)
 {
-	if (tqfindDuplicate(svr)==(d->m_services.end()))  {
+	if (findDuplicate(svr)==(d->m_services.end()))  {
 		if (d->m_flags & AutoResolve) {
 			connect(svr,TQT_SIGNAL(resolved(bool )),this,TQT_SLOT(serviceResolved(bool )));
 			d->m_duringResolve+=svr;
@@ -152,7 +152,7 @@ void ServiceBrowser::gotNewService(RemoteService::Ptr svr)
 
 void ServiceBrowser::gotRemoveService(RemoteService::Ptr svr)
 {
-	TQValueList<RemoteService::Ptr>::Iterator it = tqfindDuplicate(svr);
+	TQValueList<RemoteService::Ptr>::Iterator it = findDuplicate(svr);
 	if (it!=(d->m_services.end())) {
 		emit serviceRemoved(*it);
 		d->m_services.remove(it);
@@ -212,7 +212,7 @@ const TQValueList<RemoteService::Ptr>& ServiceBrowser::services() const
 void ServiceBrowser::virtual_hook(int, void*)
 {}
 
-TQValueList<RemoteService::Ptr>::Iterator ServiceBrowser::tqfindDuplicate(RemoteService::Ptr src)
+TQValueList<RemoteService::Ptr>::Iterator ServiceBrowser::findDuplicate(RemoteService::Ptr src)
 {
 	TQValueList<RemoteService::Ptr>::Iterator itEnd = d->m_services.end();
 	for (TQValueList<RemoteService::Ptr>::Iterator it = d->m_services.begin(); it!=itEnd; ++it)
diff --git a/dnssd/servicebrowser.h b/dnssd/servicebrowser.h
index 80fd4695b..fac4d407c 100644
--- a/dnssd/servicebrowser.h
+++ b/dnssd/servicebrowser.h
@@ -51,7 +51,7 @@ to constructor, domains configured by user will be searched.
 @author Jakub Stachowski
 @short Browsing for specific type of services or all available service types
  */
-class KDNSSD_EXPORT ServiceBrowser : public TQObject
+class KDNSSD_EXPORT ServiceBrowser : public QObject
 {
 	Q_OBJECT
 public:
@@ -213,7 +213,7 @@ private:
 
 	bool allFinished();
 	void init(const TQStringList&, DomainBrowser*, int);
-	TQValueList<RemoteService::Ptr>::Iterator tqfindDuplicate(RemoteService::Ptr src);
+	TQValueList<RemoteService::Ptr>::Iterator findDuplicate(RemoteService::Ptr src);
 private slots:
 	void serviceResolved(bool success);
 	void gotNewService(DNSSD::RemoteService::Ptr);
diff --git a/doc/common/Doxyfile.global b/doc/common/Doxyfile.global
index 85ca3487b..67abce073 100644
--- a/doc/common/Doxyfile.global
+++ b/doc/common/Doxyfile.global
@@ -60,7 +60,7 @@ EXCLUDE_PATTERNS       = */.svn/* \
                          */.git/* \
                          */cmake/* \
                          *.moc.* \
-                         tqmoc* \
+                         moc* \
                          *.all_cpp.* \
                          *unload.* \
                          */test/* \
diff --git a/doc/common/README.Doxygen b/doc/common/README.Doxygen
index 139ee3777..77b6bfe5f 100644
--- a/doc/common/README.Doxygen
+++ b/doc/common/README.Doxygen
@@ -2,9 +2,9 @@
 *** README for KDE's Doxygen tools
 ***
 
-This directory tqcontains tools and data files for Doxygen
+This directory contains tools and data files for Doxygen
 generation. These are the GENERIC files; any module may
-override them by putting specific tqreplacements in doc/api/ .
+override them by putting specific replacements in doc/api/ .
 This allows modules to customize their appearance as desired.
 The files that may be overridden are:
 
@@ -55,9 +55,9 @@ doxygen.sh [--recurse] [--modulename] [--doxdatadir=<dir>] [--installdir=<dir>]
               a subdirectory apidocs/ . Modulename is the last part of
               the <top_srcdir> (usually a KDE SVN module name).
 --doxdatadir=<dir> Locate the HTML header files and support graphics.
-              In kdelibs, the subdirectory doc/common/ tqcontains these
+              In kdelibs, the subdirectory doc/common/ contains these
               files (and this README). In an installed KDE system, 
-              $KDEDIR/share/doc/HTML/en/common/ tqcontains a copy.
+              $KDEDIR/share/doc/HTML/en/common/ contains a copy.
               This argument is mandatory if doxygen.sh can't guess where
               the doxdata lives.
 --installdir=<dir> Locate the directory where apidox from other modules
@@ -111,6 +111,6 @@ Differences with current dox: <TODO>
 # Typically, this means $(top_builddir)/apidocs and something like
 # libfoo/html for the output. For the top-level dig, set relative-html
 # to "." . In non-top directories, both <!-- menu --> and <!-- gmenu -->
-# are calculated and tqreplaced. Top directories get an empty <!-- menu -->
+# are calculated and replaced. Top directories get an empty <!-- menu -->
 # if any.
 
diff --git a/doc/common/doctop1.png b/doc/common/doctop1.png
index ee0062a19..9ddb33de3 100644
--- a/doc/common/doctop1.png
+++ b/doc/common/doctop1.png
diff --git a/doc/common/fdl-license b/doc/common/fdl-license
index 6f8023988..4a0fe1c8d 100644
--- a/doc/common/fdl-license
+++ b/doc/common/fdl-license
@@ -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.
diff --git a/doc/common/fdl-license.html b/doc/common/fdl-license.html
index da970cbf8..9ce378a30 100644
--- a/doc/common/fdl-license.html
+++ b/doc/common/fdl-license.html
@@ -61,7 +61,7 @@
 
 <p>
   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,
@@ -81,7 +81,7 @@
   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
@@ -146,7 +146,7 @@
 
 <p>
   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"
@@ -304,7 +304,7 @@
 </p>
 
 <p>
-  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
@@ -319,7 +319,7 @@
   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.
 </p>
 
@@ -344,7 +344,7 @@
 
 <p>
   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
@@ -367,7 +367,7 @@
 
 <p>
   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.
@@ -488,7 +488,7 @@
 
 <p>
   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:
 </p>
 
 <pre>
@@ -503,7 +503,7 @@
 </p>
 
 <p>
-  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.
diff --git a/doc/common/gpl-license b/doc/common/gpl-license
index 2471f757c..93796b60a 100644
--- a/doc/common/gpl-license
+++ b/doc/common/gpl-license
@@ -59,7 +59,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"
@@ -96,7 +96,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.
 
@@ -154,7 +154,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
diff --git a/doc/common/gpl-license.html b/doc/common/gpl-license.html
index 4cb1a89ec..26ae3af1f 100644
--- a/doc/common/gpl-license.html
+++ b/doc/common/gpl-license.html
@@ -73,7 +73,7 @@ modification follow.</P>
 <H2><A NAME="show-c">GNU General Public License<BR>
 Terms And Conditions For Copying, Distribution And Modification</A></H2>
 
-<P>0. This License applies to any program or other work which tqcontains
+<P>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"
@@ -114,7 +114,7 @@ stating that you changed the files and the date of any change.</P>
 
 <LI>
 <P>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.</P>
 </LI>
@@ -184,7 +184,7 @@ an offer, in accord with Subsection b above.)</P>
 
 <P>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
diff --git a/doc/common/kde-default.css b/doc/common/kde-default.css
index 967e33213..61043e9ef 100644
--- a/doc/common/kde-default.css
+++ b/doc/common/kde-default.css
@@ -193,7 +193,7 @@ table.programlisting
 table.screen { 
   border-style: none;
   background-color: rgb(224,224,224);
-  table-tqlayout: auto; /* 100%? */
+  table-layout: auto; /* 100%? */
   color: rgb(0,0,0); /* should be inherit */
 }
 
@@ -202,7 +202,7 @@ table.screen {
    TABLE[class~=programlisting]
    TABLE[class~=screen] { border-style: none;
           background-color: rgb(224,224,224);
-          table-tqlayout: auto;
+          table-layout: auto;
           color: inherit;
 }
 */
@@ -263,7 +263,7 @@ h1, h2, h3, h4, h5, h6 {
   background-color: transparent;
 }
 
-.arg, .parameter, .tqreplaceable { 
+.arg, .parameter, .replaceable { 
   background-color: rgb(255,255,255);
   color: rgb(0,128,64);
   font-style: italic;
diff --git a/doc/common/kde-web.css b/doc/common/kde-web.css
index 0f1e481c4..1e3efe64a 100644
--- a/doc/common/kde-web.css
+++ b/doc/common/kde-web.css
@@ -85,7 +85,7 @@ DIV.INFORMALEXAMPLE { border-style: dotted;
 TABLE.programlisting
 TABLE.screen { border-style: none;
                background-color: rgb(224,224,224);
-               table-tqlayout: auto; /* 100%? */
+               table-layout: auto; /* 100%? */
                color: rgb(0,0,0); /* should be inherit */
                }
 
@@ -94,7 +94,7 @@ TABLE.screen { border-style: none;
 TABLE[class~=programlisting]
 TABLE[class~=screen] { border-style: none;
                        background-color: rgb(224,224,224);
-                       table-tqlayout: auto;
+                       table-layout: auto;
                        color: inherit;
                        }
 */
@@ -146,7 +146,7 @@ P, H1, H2, H3, H4, H5, TD, TH { font-family: sans-serif;
 
 h1, h2, h3, h4, h5, h6 { color: rgb(82,80,82);
                    }
-.arg, .parameter, .tqreplaceable{ background-color: rgb(255,255,255);
+.arg, .parameter, .replaceable{ background-color: rgb(255,255,255);
            color: rgb(0,128,64);
            font-style: italic;
            }
diff --git a/doc/common/lgpl-license b/doc/common/lgpl-license
index 298416664..ec47efc06 100644
--- a/doc/common/lgpl-license
+++ b/doc/common/lgpl-license
@@ -109,14 +109,14 @@ that program using a modified version of the Library.
   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, whereas the latter must
+former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
 
 		  GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library or other
-program which tqcontains a notice placed by the copyright holder or
+program which contains a notice placed by the copyright holder or
 other authorized party saying it may be distributed under the terms of
 this Lesser General Public License (also called "this License").
 Each licensee is addressed as "you".
@@ -135,7 +135,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.
 
@@ -237,7 +237,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
@@ -245,7 +245,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.
 
@@ -257,7 +257,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
@@ -344,7 +344,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
diff --git a/doc/common/lgpl-license.html b/doc/common/lgpl-license.html
index ca24e54eb..343576dfb 100644
--- a/doc/common/lgpl-license.html
+++ b/doc/common/lgpl-license.html
@@ -123,14 +123,14 @@ that program using a modified version of the Library.</P>
 <P>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, whereas the latter must
+former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.</P>
 
 <H2>GNU Lesser General Public License<BR>
 Terms And Conditions For Copying, Distribution And Modification</H2>
 
 <P>0. This License Agreement applies to any software library or other
-program which tqcontains a notice placed by the copyright holder or
+program which contains a notice placed by the copyright holder or
 other authorized party saying it may be distributed under the terms of
 this Lesser General Public License (also called "this License").
 Each licensee is addressed as "you".</P>
@@ -149,7 +149,7 @@ included without limitation in the term "modification".)</P>
 
 <P>"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.</P>
 
@@ -261,7 +261,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.</P>
 
-<P>5. A program that tqcontains no derivative of any portion of the
+<P>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
@@ -269,7 +269,7 @@ therefore falls outside the scope of this License.</P>
 
 <P>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.</P>
 
@@ -281,7 +281,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.</P>
 
 <P>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
@@ -384,7 +384,7 @@ Sections above.</P>
 <LI>
 <P>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.</P>
+where to find the accompanying uncombined form of the same work.</P>
 </LI>
 </OL>
 
diff --git a/doc/kdelibs/man-artsmessage.1.docbook b/doc/kdelibs/man-artsmessage.1.docbook
index da2c88c68..f7ccb9a28 100644
--- a/doc/kdelibs/man-artsmessage.1.docbook
+++ b/doc/kdelibs/man-artsmessage.1.docbook
@@ -31,7 +31,7 @@
       <option>-e, --error</option><option>-w,
       --warning</option><option>-i,--info</option>
       </group>
-      <arg><tqreplaceable>message</tqreplaceable></arg>
+      <arg><replaceable>message</replaceable></arg>
     </cmdsynopsis>
   </refsynopsisdiv>
 
diff --git a/doc/kdelibs/man-checkXML.1.docbook b/doc/kdelibs/man-checkXML.1.docbook
index 7f00ccae7..a083c4739 100644
--- a/doc/kdelibs/man-checkXML.1.docbook
+++ b/doc/kdelibs/man-checkXML.1.docbook
@@ -21,7 +21,7 @@
 
 <refsynopsisdiv>
 <cmdsynopsis>
-<command>checkXML</command> <arg><tqreplaceable>filename</tqreplaceable></arg>
+<command>checkXML</command> <arg><replaceable>filename</replaceable></arg>
 </cmdsynopsis>
 </refsynopsisdiv>
 
diff --git a/doc/kdelibs/man-dcop.1.docbook b/doc/kdelibs/man-dcop.1.docbook
index c430f724a..ba200e09b 100644
--- a/doc/kdelibs/man-dcop.1.docbook
+++ b/doc/kdelibs/man-dcop.1.docbook
@@ -26,19 +26,19 @@
 <cmdsynopsis>
 <command>dcop</command>
 <group><option>--pipe</option></group>
-<group><option>--user</option> <tqreplaceable> user</tqreplaceable></group>
+<group><option>--user</option> <replaceable> user</replaceable></group>
 <group><option>--all-users</option></group>
-<group><option>--session</option> <tqreplaceable> session</tqreplaceable></group>
+<group><option>--session</option> <replaceable> session</replaceable></group>
 <group><option>--all-sessions</option></group>
 <group><option>--list-sessions</option></group>
 <group><option>--no-user-time</option></group>
 <group>
-  <arg><tqreplaceable>application</tqreplaceable></arg>
+  <arg><replaceable>application</replaceable></arg>
   <group>
-    <arg><tqreplaceable>object</tqreplaceable></arg>
+    <arg><replaceable>object</replaceable></arg>
 	<group>
-           <arg choice="opt"><tqreplaceable>function</tqreplaceable></arg> 
-<group><arg choice="opt" rep="repeat"><tqreplaceable>arguments</tqreplaceable></arg></group>
+           <arg choice="opt"><replaceable>function</replaceable></arg> 
+<group><arg choice="opt" rep="repeat"><replaceable>arguments</replaceable></arg></group>
 </group>
 </group>
 </group>
@@ -70,7 +70,7 @@ linkers.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term><option>--user</option> <tqreplaceable>user</tqreplaceable></term>
+<term><option>--user</option> <replaceable>user</replaceable></term>
 <listitem>
 <para>Connect to the given user's &DCOP; server. This option will
 ignore the values of the environment vars $<envar>DCOPSERVER</envar>
@@ -92,7 +92,7 @@ be generated.</para>
 </varlistentry>
 <varlistentry>
 <term><option>--session</option>
-<tqreplaceable>session</tqreplaceable></term>
+<replaceable>session</replaceable></term>
 <listitem><para>Send to the given &kde; session.  This option can only
 be used in combination with the <option>--user</option> option.</para>
 </listitem>
@@ -148,14 +148,14 @@ options.</para>
 <refsect1>
 <title>See Also</title>
 
-<para>dcopclient(1) dcopref(1) dcoptqfind(1) kdcop(1)</para>
+<para>dcopclient(1) dcopref(1) dcopfind(1) kdcop(1)</para>
 
 <para>Inside &kde;, you can enter <userinput>help:/kdcop</userinput>
 in &konqueror; to see the User Manual for
 <application>kdcop</application> graphical dcop tool.</para>
 
 <!--
-<para> Info on where to tqfind proper dcop docs </para>
+<para> Info on where to find proper dcop docs </para>
 -->
 </refsect1>
 </refentry>
diff --git a/doc/kdelibs/man-kdeoptions.7.docbook b/doc/kdelibs/man-kdeoptions.7.docbook
index 61e401cb9..248daa5e0 100644
--- a/doc/kdelibs/man-kdeoptions.7.docbook
+++ b/doc/kdelibs/man-kdeoptions.7.docbook
@@ -23,7 +23,7 @@
 
 <refsynopsisdiv>
 <cmdsynopsis>
-<command><tqreplaceable>KDE application</tqreplaceable></command>
+<command><replaceable>KDE application</replaceable></command>
 <arg choice="opt">KDE Generic Options</arg>
 </cmdsynopsis>
 </refsynopsisdiv>
@@ -67,8 +67,8 @@ titlebar.</para></listitem>
 <listitem><para>Sets the appliction &GUI; style.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term><option>--tqgeometry</option> <parameter>tqgeometry</parameter></term>
-<listitem><para>Sets the client tqgeometry of the main widget.</para></listitem>
+<term><option>--geometry</option> <parameter>geometry</parameter></term>
+<listitem><para>Sets the client geometry of the main widget.</para></listitem>
 </varlistentry>
 </variablelist>
 
diff --git a/doc/kdelibs/man-qtoptions.7.docbook b/doc/kdelibs/man-qtoptions.7.docbook
index 537e987fc..b6ce61dc6 100644
--- a/doc/kdelibs/man-qtoptions.7.docbook
+++ b/doc/kdelibs/man-qtoptions.7.docbook
@@ -23,7 +23,7 @@
 
 <refsynopsisdiv>
 <cmdsynopsis>
-<command><tqreplaceable>Qt application</tqreplaceable></command>
+<command><replaceable>Qt application</replaceable></command>
 <arg choice="opt">Qt Generic Options</arg>
 </cmdsynopsis>
 </refsynopsisdiv>
diff --git a/doc/kspell/index.docbook b/doc/kspell/index.docbook
index 98aef5e9d..5f91f24f5 100644
--- a/doc/kspell/index.docbook
+++ b/doc/kspell/index.docbook
@@ -52,10 +52,10 @@ url="http://aspell.sourceforge.net/">ASpell home page</ulink>.)
 
 <para><anchor id="spelldlg"/>
 The top line in the dialog displays a possibly misspelled word which was found in your
-document. &kspell; attempts to tqfind an appropriate tqreplacement word. One or
+document. &kspell; attempts to find an appropriate replacement word. One or
 several may be found. The best guess is shown to the right of <guilabel>Replacement:</guilabel>.
-To accept this tqreplacement, click on <guibutton>Replace</guibutton>. You may also select a word
-from the list of <guilabel>Suggestions</guilabel> and then click <guibutton>Replace</guibutton> to tqreplace the
+To accept this replacement, click on <guibutton>Replace</guibutton>. You may also select a word
+from the list of <guilabel>Suggestions</guilabel> and then click <guibutton>Replace</guibutton> to replace the
 misspelled word with the selected word.</para>
 
 <para>To keep your original spelling, click on <guilabel>Ignore</guilabel>.</para>
@@ -67,8 +67,8 @@ on <guibutton>Stop</guibutton>.</para>
 <guibutton>Cancel</guibutton>.</para>
 
 <para>Clicking on <guibutton>Replace All</guibutton> will initially perform the same function as
-clicking on <guibutton>Replace</guibutton>, but will automatically tqreplace the misspelled word
-with the chosen tqreplacement word, if it appears again (at a later point) in your
+clicking on <guibutton>Replace</guibutton>, but will automatically replace the misspelled word
+with the chosen replacement word, if it appears again (at a later point) in your
 document.</para>
 
 <para>The <guibutton>Ignore All</guibutton> button ignores this and all future occurrences of the
@@ -132,7 +132,7 @@ your dictionary's distribution for more information.</para>
 <para>You may choose to use <application>Ispell</application> or <application>Aspell</application> as the spell-checking
 backend for &kspell;. <application>Ispell</application> is more widely available and may
 have better international support, but <application>Aspell</application> is gaining
-popularity as it claims to give better suggestions for word tqreplacements.</para>
+popularity as it claims to give better suggestions for word replacements.</para>
 </sect1>
 
 <sect1 id="other">
@@ -147,7 +147,7 @@ read the International <application>ISpell</application> man page.</para>
 <title>Contact Information</title>
 
 <para>For more information about &kspell;, visit the <ulink url="http://www.chaos.umd.edu/~dsweet/KDE/KSpell">&kspell; 
-Home Page</ulink>. In particular, you will tqfind information about programming the &kspell; C++ class.</para>
+Home Page</ulink>. In particular, you will find information about programming the &kspell; C++ class.</para>
 
 <para>You may email the author/maintainer with questions and/or comments at
 &David.Sweet.mail;.</para>
diff --git a/interfaces/khexedit/byteseditinterface.h b/interfaces/khexedit/byteseditinterface.h
index f2ec1e7bd..dc0a9dca5 100644
--- a/interfaces/khexedit/byteseditinterface.h
+++ b/interfaces/khexedit/byteseditinterface.h
@@ -143,8 +143,8 @@ class BytesEditInterface
     virtual bool isModified() const = 0;
 
   public: // call for action
-    /** tqrepaint the indizes from i1 to i2 */
-    virtual void tqrepaintRange( int i1, int i2 ) = 0;
+    /** repaint the indizes from i1 to i2 */
+    virtual void repaintRange( int i1, int i2 ) = 0;
 };
 
 
@@ -221,7 +221,7 @@ inline BytesEditInterface *bytesEditInterface( T *t )
 inline TQWidget *createBytesEditWidget( TQWidget *Parent = 0, const char *Name = 0 )
 {
   return KParts::ComponentFactory::createInstanceFromQuery<TQWidget>
-      ( TQString::tqfromLatin1("KHexEdit/KBytesEdit"), TQString::null, Parent, Name );
+      ( TQString::fromLatin1("KHexEdit/KBytesEdit"), TQString::null, Parent, Name );
 }
 
 }
diff --git a/interfaces/khexedit/clipboardinterface.h b/interfaces/khexedit/clipboardinterface.h
index da7dd114c..eeaf9d391 100644
--- a/interfaces/khexedit/clipboardinterface.h
+++ b/interfaces/khexedit/clipboardinterface.h
@@ -52,14 +52,14 @@ class ClipboardInterface
     virtual void cut() = 0;
     /** tries to paste. 
       * If there is nothing to paste or paste is not possible this call is a noop.
-      * Use BytesEditInterface::isReadOnly() to tqfind out if you can paste at all.
+      * Use BytesEditInterface::isReadOnly() to find out if you can paste at all.
       */
     virtual void paste() = 0;
 
   public: // signals
     /** signal: tells whether copy is possible or not.
       * Remember to use the created object, not the interface for connecting
-      * Use BytesEditInterface::isReadOnly() to tqfind out if you can also cut
+      * Use BytesEditInterface::isReadOnly() to find out if you can also cut
       * As this function symbol serves as a signal, this is a noop. Don't use it
       * for anything else.
       */
diff --git a/interfaces/khexedit/valuecolumninterface.h b/interfaces/khexedit/valuecolumninterface.h
index b21934a1d..7dafa7d42 100644
--- a/interfaces/khexedit/valuecolumninterface.h
+++ b/interfaces/khexedit/valuecolumninterface.h
@@ -47,14 +47,14 @@ class ValueColumnInterface
       MaxCodingId=0xFFFF
     };
 
-    /** collection of ids for the fitting of the tqlayout into the available widget's width */
+    /** collection of ids for the fitting of the layout into the available widget's width */
     enum KResizeStyle
     {
       /** we don't care about the actual sizing of the widget
         * but stick to the given NoOfBytesPerLine
         */
       NoResize=0,
-      /** we try to fit the tqlayout to the available width
+      /** we try to fit the layout to the available width
         * but only with full groups like set in NoOfGroupedBytes
         * with minimum of one full group
         */
diff --git a/interfaces/kimproxy/interface/kimiface.h b/interfaces/kimproxy/interface/kimiface.h
index dcf210f23..f3212df6d 100644
--- a/interfaces/kimproxy/interface/kimiface.h
+++ b/interfaces/kimproxy/interface/kimiface.h
@@ -179,7 +179,7 @@ k_dcop:
 	 *
 	 * @see allContacts()
 	 * @see presenceString()
-	 * @see presencetqStatus()
+	 * @see presenceStatus()
 	 * @see KABC::Addressee::uid()
 	 */
 	virtual bool isPresent( const TQString & uid ) = 0;
@@ -197,7 +197,7 @@ k_dcop:
 	 *
 	 * @see isPresent()
 	 * @see presenceString()
-	 * @see presencetqStatus()
+	 * @see presenceStatus()
 	 * @see KABC::Addressee::uid()
 	 */
 	virtual TQString displayName( const TQString & uid ) = 0;
@@ -214,7 +214,7 @@ k_dcop:
 	 *         TQString::null if the UID is unknown
 	 *
 	 * @see isPresent()
-	 * @see presencetqStatus()
+	 * @see presenceStatus()
 	 * @see KABC::Addressee::uid()
 	 */
 	virtual TQString presenceString( const TQString & uid ) = 0;
@@ -247,7 +247,7 @@ k_dcop:
 	 * @see presenceString()
 	 * @see KABC::Addressee::uid()
 	 */
-	virtual int presencetqStatus( const TQString & uid ) = 0;
+	virtual int presenceStatus( const TQString & uid ) = 0;
 
 	/**
 	 * @brief Indicate if a given contact can receive files
@@ -309,7 +309,7 @@ k_dcop:
 	 *
 	 * @see isPresent()
 	 * @see presenceString()
-	 * @see presencetqStatus()
+	 * @see presenceStatus()
 	 * @see KABC::Addressee::uid()
 	 */
 	virtual TQPixmap icon( const TQString & uid ) = 0;
@@ -467,7 +467,7 @@ k_dcop_signals:
 	/**
 	 * @brief Indicates that a contact's presence has changed
 	 *
-	 * Notifies connected DCOP tqreceivers about a change in a contact's
+	 * Notifies connected DCOP receivers about a change in a contact's
 	 * presence.
 	 *
 	 * Implementations just have to call this method with the appropriate
@@ -476,9 +476,9 @@ k_dcop_signals:
 	 * @param uid the KABC UID whose presence changed
 	 * @param appId the DCOP application ID of the program the signal
 	 *        originates from
-	 * @param presence the new presence's numeric value. See presencetqStatus()
+	 * @param presence the new presence's numeric value. See presenceStatus()
 	 *
-	 * @see presencetqStatus()
+	 * @see presenceStatus()
 	 * @see KABC::Addressee::uid()
 	 * @see DCOPClient::appId()
 	 */
diff --git a/interfaces/kimproxy/library/kimproxy.cpp b/interfaces/kimproxy/library/kimproxy.cpp
index 3ca9ae7b1..44f828a02 100644
--- a/interfaces/kimproxy/library/kimproxy.cpp
+++ b/interfaces/kimproxy/library/kimproxy.cpp
@@ -248,7 +248,7 @@ bool KIMProxy::initialize()
 						{
 							m_apps_available = true;
 							//kdDebug( 790 ) << " app name: " << (*offer)->name() << ", has instance " << *app << ", dcopService: " << dcopService << endl;
-							if ( !m_im_client_stubs.tqfind( dcopService ) )
+							if ( !m_im_client_stubs.find( dcopService ) )
 							{
 								kdDebug( 790 ) << "App " << *app << ", dcopObjectId " << dcopObjectId << " found, using it for presence info." << endl;
 								m_im_client_stubs.insert( *app, new KIMIface_stub( d->dc, *app, dcopObjectId ) );
@@ -284,7 +284,7 @@ void KIMProxy::registeredToDCOP( const TQCString& appId )
 		if ( appId.left( dcopService.length() ) == dcopService )
 		{
 			// if it's not already known, insert it
-			if ( !m_im_client_stubs.tqfind( appId ) )
+			if ( !m_im_client_stubs.find( appId ) )
 			{
 				newApp = true;
 				kdDebug( 790 ) << "App: " << appId << ", dcopService: " << dcopService << " started, using it for presence info."<< endl;
@@ -301,7 +301,7 @@ void KIMProxy::registeredToDCOP( const TQCString& appId )
 void KIMProxy::unregisteredFromDCOP( const TQCString& appId )
 {
 	//kdDebug( 790 ) << k_funcinfo << appId << endl;
-	if ( m_im_client_stubs.tqfind( appId ) )
+	if ( m_im_client_stubs.find( appId ) )
 	{
 		kdDebug( 790 ) << appId << " quit, removing its presence info." << endl;
 		
@@ -558,14 +558,14 @@ bool KIMProxy::imAppsAvailable()
 bool KIMProxy::startPreferredApp()
 {
 	TQString preferences = TQString("[X-DCOP-ServiceName] = '%1'").arg( preferredApp() );
-	// start/tqfind an instance of DCOP/InstantMessenger
+	// start/find an instance of DCOP/InstantMessenger
 	TQString error;
 	TQCString dcopService;
 	// Get a preferred IM client.
 	// The app will notify itself to us using registeredToDCOP, so we don't need to record a stub for it here
 	// FIXME: error in preferences, see debug output
 	preferences = TQString::null;
-	int result = KDCOPServiceStarter::self()->tqfindServiceFor( IM_SERVICE_TYPE, TQString::null, preferences, &error, &dcopService );
+	int result = KDCOPServiceStarter::self()->findServiceFor( IM_SERVICE_TYPE, TQString::null, preferences, &error, &dcopService );
 
 	kdDebug( 790 ) << k_funcinfo << "error was: " << error << ", dcopService: " << dcopService << endl;
 
@@ -578,14 +578,14 @@ void KIMProxy::pollAll( const TQString &uid )
 /*	// We only need to call this function if we don't have any data at all
 	// otherwise, the data will be kept fresh by received presence change
 	// DCOP signals
-	if ( !d->presence_map.tqcontains( uid ) )
+	if ( !d->presence_map.contains( uid ) )
 	{
 		AppPresence *presence = new AppPresence();
 		// record current presence from known clients
 		TQDictIterator<KIMIface_stub> it( m_im_client_stubs );
 		for ( ; it.current(); ++it )
 		{
-			presence->insert( it.currentKey().ascii(), it.current()->presencetqStatus( uid ) ); // m_im_client_stubs has qstring keys...
+			presence->insert( it.currentKey().ascii(), it.current()->presenceStatus( uid ) ); // m_im_client_stubs has qstring keys...
 		}
 		d->presence_map.insert( uid, presence );
 	}*/
@@ -603,7 +603,7 @@ void KIMProxy::pollApp( const TQCString & appId )
 		ContactPresenceListCurrent current = d->presence_map[ *it ];
 		AppPresenceCurrent ap;
 		ap.appId = appId;
-		ap.presence = appStub->presencetqStatus( *it );
+		ap.presence = appStub->presenceStatus( *it );
 		current.append( ap );
 
 		d->presence_map.insert( *it, current );
@@ -618,7 +618,7 @@ KIMIface_stub * KIMProxy::stubForUid( const TQString &uid )
 	// get best appPresence
 	AppPresenceCurrent ap = d->presence_map[ uid ].best();
 	// look up the presence string from that app
-		return m_im_client_stubs.tqfind( ap.appId );
+		return m_im_client_stubs.find( ap.appId );
 }
 
 KIMIface_stub * KIMProxy::stubForProtocol( const TQString &protocol)
@@ -626,7 +626,7 @@ KIMIface_stub * KIMProxy::stubForProtocol( const TQString &protocol)
 	KIMIface_stub * app;
 	// see if the preferred client supports this protocol
 	TQString preferred = preferredApp();
-	if ( ( app = m_im_client_stubs.tqfind( preferred ) ) )
+	if ( ( app = m_im_client_stubs.find( preferred ) ) )
 	{
 		if ( app->protocols().grep( protocol ).count() > 0 )
 			return app;
diff --git a/interfaces/kimproxy/library/kimproxy.h b/interfaces/kimproxy/library/kimproxy.h
index da1561152..d4312b341 100644
--- a/interfaces/kimproxy/library/kimproxy.h
+++ b/interfaces/kimproxy/library/kimproxy.h
@@ -43,8 +43,8 @@ class KURL;
 class ContactPresenceListCurrent;
 
 /** FIXME: remove for KDE4, binary compability again. */
-typedef TQMap<TQCString, int> AppPresence; 		// appId->presence; tqcontains all applications' ideas of a user's presence
-typedef TQDict<AppPresence> PresenceMap;			// uid->AppPresence; tqcontains a AppPresences for all users
+typedef TQMap<TQCString, int> AppPresence; 		// appId->presence; contains all applications' ideas of a user's presence
+typedef TQDict<AppPresence> PresenceMap;			// uid->AppPresence; contains a AppPresences for all users
 /** FIXME: remove presenceMap and call this presenceMap in KDE4.  This hack is for binary compatibility */
 typedef TQMap<TQString, ContactPresenceListCurrent> PresenceStringMap;
 
@@ -301,7 +301,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see isPresent()
 		 * @see presenceString()
 		 * @see presenceIcon()
-		 * @see KIMIface::presencetqStatus()
+		 * @see KIMIface::presenceStatus()
 		 * @see KABC::Addressee::uid()
 		 */
 		int presenceNumeric( const TQString& uid );
diff --git a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
index 63527893f..11fa58f27 100644
--- a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
+++ b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
@@ -65,8 +65,8 @@ KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name )
         m_supportedFormats.insert( *it, (void*) 1 );
 
     TQVGroupBox *box = new TQVGroupBox( i18n("Media Player"), this );
-    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
-    tqlayout->addWidget( box );
+    TQVBoxLayout *layout = new TQVBoxLayout( this );
+    layout->addWidget( box );
 
     (void) new TQWidget( box ); // spacer
 
@@ -83,7 +83,7 @@ KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name )
         {
             TQHBox *frame = new TQHBox( box );
             frame->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
-            frame->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
+            frame->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
             view->videoWidget()->reparent( frame, TQPoint(0,0) );
         }
 
@@ -110,7 +110,7 @@ void KFileAudioPreview::showPreview( const KURL &url )
         return;
 
     KMimeType::Ptr mt = KMimeType::findByURL( url );
-    bool supported = m_supportedFormats.tqfind( mt->name() );
+    bool supported = m_supportedFormats.find( mt->name() );
     d->player->view()->setEnabled( supported );
     if ( !supported )
         return;
diff --git a/interfaces/kmediaplayer/player.h b/interfaces/kmediaplayer/player.h
index 3657a3c1c..10e9f4a74 100644
--- a/interfaces/kmediaplayer/player.h
+++ b/interfaces/kmediaplayer/player.h
@@ -28,7 +28,7 @@
 #include <kmediaplayer/playerdcopobject.h>
 #include <kmediaplayer/view.h>
 
-/** KMediaPlayer tqcontains an interface to reusable media player components.
+/** KMediaPlayer contains an interface to reusable media player components.
 */
 namespace KMediaPlayer
 {
@@ -56,7 +56,7 @@ public:
 	/** This constructor is what to use when a GUI is required, as in the
 	 * case of a KMediaPlayer/Player.
 	 */
-	Player(TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name);
+	Player(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name);
 
 	virtual ~Player(void);
 
diff --git a/interfaces/kregexpeditor/kregexpeditorinterface.h b/interfaces/kregexpeditor/kregexpeditorinterface.h
index 71e59f404..01fab0fdf 100644
--- a/interfaces/kregexpeditor/kregexpeditorinterface.h
+++ b/interfaces/kregexpeditor/kregexpeditorinterface.h
@@ -59,8 +59,8 @@
  *   // now use the editor.
  *   editor->setRegExp("^kde$");
 
- *   // Finally insert the widget into the tqlayout of its parent
- *   tqlayout->addWidget( editorWidget );
+ *   // Finally insert the widget into the layout of its parent
+ *   layout->addWidget( editorWidget );
  * }
  * else {
  *   // Don't offer the editor widget.
diff --git a/interfaces/kscript/scriptinterface.desktop b/interfaces/kscript/scriptinterface.desktop
index 4fbd3293f..8e157e20a 100644
--- a/interfaces/kscript/scriptinterface.desktop
+++ b/interfaces/kscript/scriptinterface.desktop
@@ -12,7 +12,7 @@ Comment[ca]=Aquest és un enginy per a provar la interfície de l'script.
 Comment[cs]=Toto je obecný testovací skript pro testování skriptovacího rozhranní.
 Comment[csb]=Mòduł testowaniô skriptowegò interfejsu.
 Comment[cy]=Mae hyn yn beiriant sgript prawf generig i brofi y sgript rhyngwyneb.
-Comment[da]=Dette er en generisk testscript-tqmaskine til at teste scriptgrænsefladen.
+Comment[da]=Dette er en generisk testscript-maskine til at teste scriptgrænsefladen.
 Comment[de]=Dies ist eine allgemeine Sammlung von Testroutinen für die Skript-Schnittstelle.
 Comment[el]=Αυτό είναι μια γενική μηχανή ελέγχου σενα�ίων για τον έλεγχο της διασ�νδεσης σενα�ίων.
 Comment[eo]=Tio estas testprogram-ma�ino por testi la programinterfaco.
diff --git a/interfaces/kscript/scriptinterface.h b/interfaces/kscript/scriptinterface.h
index 1c37b7f71..e711e82ca 100644
--- a/interfaces/kscript/scriptinterface.h
+++ b/interfaces/kscript/scriptinterface.h
@@ -44,7 +44,7 @@ class KScriptClientInterface;
 	*	@author Ian Reinhart Geiser <geiseri@kde.org>
 	*
 	**/
-	class KDE_EXPORT KScriptInterface : public TQObject
+	class KDE_EXPORT KScriptInterface : public QObject
 	{
 	Q_OBJECT
 	public:
diff --git a/interfaces/kscript/scriptloader.h b/interfaces/kscript/scriptloader.h
index 7de2bd5b0..20b135231 100644
--- a/interfaces/kscript/scriptloader.h
+++ b/interfaces/kscript/scriptloader.h
@@ -26,7 +26,7 @@
 /**
  * Script loader
  */
-class ScriptLoader : virtual public TQObject
+class ScriptLoader : virtual public QObject
 {
 	Q_OBJECT
 	public:
diff --git a/interfaces/kscript/scriptmanager.cpp b/interfaces/kscript/scriptmanager.cpp
index 12ab08b93..5cdbd7459 100644
--- a/interfaces/kscript/scriptmanager.cpp
+++ b/interfaces/kscript/scriptmanager.cpp
@@ -126,7 +126,7 @@ void KScriptManager::runScript( const TQString &scriptName, TQObject *context, c
 		}
 	}
 	else
-	  KMessageBox::sorry(0, i18n("Unable tqfind script \"%1\".").arg(scriptName), i18n("KScript Error"));
+	  KMessageBox::sorry(0, i18n("Unable find script \"%1\".").arg(scriptName), i18n("KScript Error"));
 }
 #include "scriptmanager.moc"
 #include "scriptinterface.moc"
diff --git a/interfaces/kspeech/kspeech.h b/interfaces/kspeech/kspeech.h
index 35da55532..049afbfa2 100644
--- a/interfaces/kspeech/kspeech.h
+++ b/interfaces/kspeech/kspeech.h
@@ -442,7 +442,7 @@
  * a Spanish synthesizer would likely be unintelligible).  So the language
  * attribute is said to have "priority".
  * If an application does not specify a language attribute, a default one will be assumed.
- * The rest of the attributes are said to be "preferred".  If %KTTSD cannot tqfind
+ * The rest of the attributes are said to be "preferred".  If %KTTSD cannot find
  * a talker with the exact preferred attributes requested, the closest matching
  * talker will likely still be understandable.
  *
@@ -458,7 +458,7 @@
  * and Soft volume would not be picked as long as an English Female talker is
  * available.
  *
- * The algorithm used by %KTTSD to tqfind a matching talker is as follows:
+ * The algorithm used by %KTTSD to find a matching talker is as follows:
  *
  * - If language code is not specified by the application, assume default configured
  *   by user.  The primary language code automatically has priority.
@@ -511,8 +511,8 @@
  * and if there are none, display an error message to the user.
  *
  * Applications can implement their own talker-matching algorithm by
- * calling getTalkers, then tqfinding the desired talker from the returned
- * list.  When the full talker code is passed in, %KKTSD will tqfind an exact
+ * calling getTalkers, then finding the desired talker from the returned
+ * list.  When the full talker code is passed in, %KKTSD will find an exact
  * match and use the specified talker.
  *
  * If an application requires a configuration that user has not created,
@@ -708,7 +708,7 @@ class KSpeech : virtual public DCOPObject {
         *                       defaults to the closest matching talker.
         *
         * If an existing Screen Reader output is in progress, it is stopped and discarded and
-        * tqreplaced with this new message.
+        * replaced with this new message.
         */
         virtual ASYNC sayScreenReaderOutput(const TQString &msg, const TQString &talker) = 0;
 
@@ -748,14 +748,14 @@ class KSpeech : virtual public DCOPObject {
           @endverbatim
         *
         * Note that backward slashes must be escaped.
-        * When %KTTSD parses the text, it tqreplaces all tabs, spaces, and formfeeds
-        * with a single space, and then tqreplaces the sentence delimiters using
+        * When %KTTSD parses the text, it replaces all tabs, spaces, and formfeeds
+        * with a single space, and then replaces the sentence delimiters using
         * the following statement:
           @verbatim
-              TQString::tqreplace(sentenceDelimiter, "\\1\t");
+              TQString::replace(sentenceDelimiter, "\\1\t");
           @endverbatim
         *
-        * which tqreplaces all sentence delimiters with a tab, but
+        * which replaces all sentence delimiters with a tab, but
         * preserving the first capture text (first parenthesis).  In other
         * words, the sentence punctuation is preserved.
         * The tab is later used to separate the text into sentences.
@@ -922,7 +922,7 @@ class KSpeech : virtual public DCOPObject {
         * @return               A TQDataStream containing information about the job.
         *                       Blank if no such job.
         *
-        * The stream tqcontains the following elements:
+        * The stream contains the following elements:
         *   - int state        - Job state.
         *   - TQCString appId   - DCOP senderId of the application that requested the speech job.
         *   - TQString talker   - Talker Code requested by application.
diff --git a/interfaces/ktexteditor/.kateconfig b/interfaces/ktexteditor/.kateconfig
index 46471127e..5b0885abe 100644
--- a/interfaces/ktexteditor/.kateconfig
+++ b/interfaces/ktexteditor/.kateconfig
@@ -1 +1 @@
-kate: space-indent on; indent-width 2; tqreplace-tabs on;
+kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/interfaces/ktexteditor/blockselectiondcopinterface.h b/interfaces/ktexteditor/blockselectiondcopinterface.h
index 66045239b..4b74fd2a0 100644
--- a/interfaces/ktexteditor/blockselectiondcopinterface.h
+++ b/interfaces/ktexteditor/blockselectiondcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent BlockSelectionInterface object
 		that will provide us with the functions for the interface.
-		@param name the TQObject's name
+		@param name the QObject's name
 		*/
 		BlockSelectionDCOPInterface( BlockSelectionInterface *Parent, const char *name );
 		/**
diff --git a/interfaces/ktexteditor/clipboarddcopinterface.h b/interfaces/ktexteditor/clipboarddcopinterface.h
index 9a75f9b97..8104e9d4d 100644
--- a/interfaces/ktexteditor/clipboarddcopinterface.h
+++ b/interfaces/ktexteditor/clipboarddcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent ClipboardInterface object
 		that will provide us with the functions for the interface.
-		@param name the TQObject's name
+		@param name the QObject's name
 		*/
 		ClipboardDCOPInterface( ClipboardInterface *Parent, const char *name );
 		/**
diff --git a/interfaces/ktexteditor/documentdcopinfo.h b/interfaces/ktexteditor/documentdcopinfo.h
index aedaee6a5..ea25284fe 100644
--- a/interfaces/ktexteditor/documentdcopinfo.h
+++ b/interfaces/ktexteditor/documentdcopinfo.h
@@ -25,7 +25,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent DocumentInfoInterface object
 		that will provide us with the functions for the interface.
-		@param name the TQObject's name
+		@param name the QObject's name
 		*/
 		DocumentInfoDCOPInterface( DocumentInfoInterface *Parent, const char *name );
 		/**
diff --git a/interfaces/ktexteditor/editdcopinterface.h b/interfaces/ktexteditor/editdcopinterface.h
index 5b4a6ebb7..f169fb15b 100644
--- a/interfaces/ktexteditor/editdcopinterface.h
+++ b/interfaces/ktexteditor/editdcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
     Construct a new interface object for the text editor.
     @param Parent the parent EditInterface object
     that will provide us with the functions for the interface.
-    @param name the TQObject's name
+    @param name the QObject's name
     */
     EditDCOPInterface( EditInterface *Parent, const char *name );
     /**
diff --git a/interfaces/ktexteditor/editinterfaceext.h b/interfaces/ktexteditor/editinterfaceext.h
index e5f2d9101..650bb9ec2 100644
--- a/interfaces/ktexteditor/editinterfaceext.h
+++ b/interfaces/ktexteditor/editinterfaceext.h
@@ -44,7 +44,7 @@ class KTEXTEDITOR_EXPORT EditInterfaceExt
     /**
 	 * Begin an editing sequence.  Edit commands during this sequence will be
 	 * bunched together such that they represent a single undo command in the
-	 * editor, and so that tqrepaint events do not occur inbetween.
+	 * editor, and so that repaint events do not occur inbetween.
 	 *
 	 * Your application should not return control to the event loop while it
 	 * has an unterminated (no matching editEnd() call) editing sequence
diff --git a/interfaces/ktexteditor/editor.h b/interfaces/ktexteditor/editor.h
index 79c731584..11f9a8c15 100644
--- a/interfaces/ktexteditor/editor.h
+++ b/interfaces/ktexteditor/editor.h
@@ -32,7 +32,7 @@ namespace KTextEditor
  * Usage: Load it, merge it's gui + be happy
  * Extensibility: Use the Document / View classes if you want
  * advanced features, interfaces, etc. This class is just a good text editor
- * widget tqreplacement for applications which just need an embedded text edtor
+ * widget replacement for applications which just need an embedded text edtor
  * and are not interested in using advanced interfaces.
  */
 
@@ -57,7 +57,7 @@ class KTEXTEDITOR_EXPORT Editor : public KParts::ReadWritePart
     unsigned int myEditorNumber;
 };     
 
-KTEXTEDITOR_EXPORT Editor *createEditor ( const char* libname, TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0 );
+KTEXTEDITOR_EXPORT Editor *createEditor ( const char* libname, TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0 );
 
 }
 
diff --git a/interfaces/ktexteditor/editorchooser.cpp b/interfaces/ktexteditor/editorchooser.cpp
index 0d48f6b75..96cf3649e 100644
--- a/interfaces/ktexteditor/editorchooser.cpp
+++ b/interfaces/ktexteditor/editorchooser.cpp
@@ -55,7 +55,7 @@ EditorChooser::EditorChooser(TQWidget *parent,const char *name) :
 
 	for (KTrader::OfferList::Iterator it = offers.begin(); it != offers.end(); ++it)
 	{
-    		if ((*it)->desktopEntryName().tqcontains(editor))
+    		if ((*it)->desktopEntryName().contains(editor))
 		{
 			d->chooser->editorCombo->insertItem(i18n("System Default (%1)").arg((*it)->name()));
 			break;
@@ -82,7 +82,7 @@ void EditorChooser::readAppSetting(const TQString& postfix){
 	if (editor.isEmpty()) d->chooser->editorCombo->setCurrentItem(0);
 	else
 	{
-		int idx=d->elements.tqfindIndex(editor);
+		int idx=d->elements.findIndex(editor);
 		idx=idx+1;
 		d->chooser->editorCombo->setCurrentItem(idx);
 	}
@@ -130,7 +130,7 @@ KTextEditor::Document *EditorChooser::createDocument(TQObject *parent,const char
 	return 0;
 }
 
-KTextEditor::Editor *EditorChooser::createEditor(TQWidget *tqparentWidget,TQObject *parent,const char* widgetName,
+KTextEditor::Editor *EditorChooser::createEditor(TQWidget *parentWidget,TQObject *parent,const char* widgetName,
 	const char* name,const TQString& postfix,bool fallBackToKatePart){
 
         KTextEditor::Editor *tmpEd=0;
@@ -151,11 +151,11 @@ KTextEditor::Editor *EditorChooser::createEditor(TQWidget *tqparentWidget,TQObje
         KService::Ptr serv=KService::serviceByDesktopName(editor);
         if (serv)
         {
-                tmpEd=KTextEditor::createEditor(serv->library().latin1(),tqparentWidget,widgetName,parent,name);
+                tmpEd=KTextEditor::createEditor(serv->library().latin1(),parentWidget,widgetName,parent,name);
                 if (tmpEd) return tmpEd;
         }
         if (fallBackToKatePart)
-                return KTextEditor::createEditor("libkatepart",tqparentWidget,widgetName,parent,name);
+                return KTextEditor::createEditor("libkatepart",parentWidget,widgetName,parent,name);
 
         return 0;
 }
diff --git a/interfaces/ktexteditor/editorchooser.h b/interfaces/ktexteditor/editorchooser.h
index bf09907d4..20fba94e1 100644
--- a/interfaces/ktexteditor/editorchooser.h
+++ b/interfaces/ktexteditor/editorchooser.h
@@ -28,7 +28,7 @@ class KTEXTEDITOR_EXPORT EditorChooser: public QWidget
     void writeAppSetting(const TQString& postfix=TQString::null);
 
     static KTextEditor::Document *createDocument(TQObject* parent=0,const char *name=0,const TQString& postfix=TQString::null, bool fallBackToKatePart=true);
-    static KTextEditor::Editor *createEditor(TQWidget *tqparentWidget,TQObject *parent,const char* widgetName=0,const char* name=0,const TQString& postfix=TQString::null,bool fallBackToKatePart=true);
+    static KTextEditor::Editor *createEditor(TQWidget *parentWidget,TQObject *parent,const char* widgetName=0,const char* name=0,const TQString& postfix=TQString::null,bool fallBackToKatePart=true);
   private:
     class PrivateEditorChooser *d;
 };
diff --git a/interfaces/ktexteditor/editorchooser_ui.ui b/interfaces/ktexteditor/editorchooser_ui.ui
index ff6b7eba3..fa1d99184 100644
--- a/interfaces/ktexteditor/editorchooser_ui.ui
+++ b/interfaces/ktexteditor/editorchooser_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>EditorChooser</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -21,7 +21,7 @@
         </property>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -31,7 +31,7 @@
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>460</width>
                             <height>0</height>
@@ -40,7 +40,7 @@
                     <property name="text">
                         <string>Please choose the default text editing component that you wish to use in this application. If you choose &lt;B&gt;System Default&lt;/B&gt;, the application will honor your changes in the Control Center. All other choices will override that setting.</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter|AlignLeft</set>
                     </property>
                 </widget>
@@ -59,6 +59,6 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/interfaces/ktexteditor/encodingdcopinterface.h b/interfaces/ktexteditor/encodingdcopinterface.h
index e13a6dff4..38de4e0aa 100644
--- a/interfaces/ktexteditor/encodingdcopinterface.h
+++ b/interfaces/ktexteditor/encodingdcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent EncodingInterface object
 		that will provide us with the functions for the interface.
-		@param name the TQObject's name
+		@param name the QObject's name
 		*/
 		EncodingDCOPInterface( EncodingInterface *Parent, const char *name );
 		/**
diff --git a/interfaces/ktexteditor/ktexteditor.cpp b/interfaces/ktexteditor/ktexteditor.cpp
index ef199c819..0b50fdaeb 100644
--- a/interfaces/ktexteditor/ktexteditor.cpp
+++ b/interfaces/ktexteditor/ktexteditor.cpp
@@ -206,9 +206,9 @@ unsigned int Editor::editorNumber () const
   return myEditorNumber;
 }                         
 
-Editor *KTextEditor::createEditor ( const char* libname, TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name )
+Editor *KTextEditor::createEditor ( const char* libname, TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name )
 {
-  return KParts::ComponentFactory::createPartInstanceFromLibrary<Editor>( libname, tqparentWidget, widgetName, parent, name );
+  return KParts::ComponentFactory::createPartInstanceFromLibrary<Editor>( libname, parentWidget, widgetName, parent, name );
 }
 
 Document *KTextEditor::createDocument ( const char* libname, TQObject *parent, const char *name )
diff --git a/interfaces/ktexteditor/markinterface.h b/interfaces/ktexteditor/markinterface.h
index 7c8b0212f..d3b3dbe7f 100644
--- a/interfaces/ktexteditor/markinterface.h
+++ b/interfaces/ktexteditor/markinterface.h
@@ -63,7 +63,7 @@ class KTEXTEDITOR_EXPORT MarkInterface
     
     /** 
     * Adds a mark of type @p markType to @p line.
-    * Has no effect if the line allready tqcontains a mark of that type. 
+    * Has no effect if the line allready contains a mark of that type. 
     */
     virtual void setMark (uint line, uint markType) = 0;
     /**
diff --git a/interfaces/ktexteditor/plugin.h b/interfaces/ktexteditor/plugin.h
index 71266d3e2..dc7978f92 100644
--- a/interfaces/ktexteditor/plugin.h
+++ b/interfaces/ktexteditor/plugin.h
@@ -33,7 +33,7 @@ class View;
  * Basic KTextEditor plugin class.
  * This plugin will be bound to a Document.
  */                     
-class KTEXTEDITOR_EXPORT Plugin : public TQObject
+class KTEXTEDITOR_EXPORT Plugin : public QObject
 {
   friend class PrivatePlugin;
 
diff --git a/interfaces/ktexteditor/printdcopinterface.h b/interfaces/ktexteditor/printdcopinterface.h
index f3d176fbd..e41e6da5d 100644
--- a/interfaces/ktexteditor/printdcopinterface.h
+++ b/interfaces/ktexteditor/printdcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent PrintInterface object
 		that will provide us with the functions for the interface.
-		@param name the TQObject's name
+		@param name the QObject's name
 		*/
 		PrintDCOPInterface( PrintInterface *Parent, const char *name );
 		/**
diff --git a/interfaces/ktexteditor/searchdcopinterface.cpp b/interfaces/ktexteditor/searchdcopinterface.cpp
index 81834cef2..ce29e4927 100644
--- a/interfaces/ktexteditor/searchdcopinterface.cpp
+++ b/interfaces/ktexteditor/searchdcopinterface.cpp
@@ -20,16 +20,16 @@ SearchDCOPInterface::~SearchDCOPInterface()
 
 }
 
-bool SearchDCOPInterface::tqfindFirstString( TQString text, bool caseSensitive)
+bool SearchDCOPInterface::findFirstString( TQString text, bool caseSensitive)
 {
 	return m_parent->searchText(0, 0, text, &m_currentrow, &m_currentcol,  &m_currentmatchlen, caseSensitive);
 }
-bool SearchDCOPInterface::tqfindNextString( TQString text, bool caseSensitive)
+bool SearchDCOPInterface::findNextString( TQString text, bool caseSensitive)
 {
 	return m_parent->searchText(m_currentrow, m_currentcol+1, text, &m_currentrow, &m_currentcol,  &m_currentmatchlen, caseSensitive);
 }
 
-bool SearchDCOPInterface::tqfindPreviousString( TQString text, bool caseSensitive)
+bool SearchDCOPInterface::findPreviousString( TQString text, bool caseSensitive)
 {
 	if( m_currentcol == 0)
 		m_currentrow--;
@@ -38,28 +38,28 @@ bool SearchDCOPInterface::tqfindPreviousString( TQString text, bool caseSensitiv
 	return m_parent->searchText(m_currentrow, m_currentcol, text, &m_currentrow, &m_currentcol,  &m_currentmatchlen, caseSensitive, true);
 }
 
-bool SearchDCOPInterface::tqfindLastString( TQString text, bool caseSensitive)
+bool SearchDCOPInterface::findLastString( TQString text, bool caseSensitive)
 {
 	return m_parent->searchText(0,0, text, &m_currentrow, &m_currentcol,  &m_currentmatchlen, caseSensitive, true);
 }
 
-bool SearchDCOPInterface::tqfindStringAt( uint  row, uint  col, TQString text, bool caseSensitive)
+bool SearchDCOPInterface::findStringAt( uint  row, uint  col, TQString text, bool caseSensitive)
 {
 	return m_parent->searchText(row,col, text, &m_currentrow, &m_currentcol,  &m_currentmatchlen, caseSensitive);
 
 }
 
-bool SearchDCOPInterface::tqfindFirstRegExp( TQString regexp)
+bool SearchDCOPInterface::findFirstRegExp( TQString regexp)
 {
 	return m_parent->searchText( 0,0, TQRegExp(regexp), &m_currentrow, &m_currentcol,  &m_currentmatchlen);
 }
 
-bool SearchDCOPInterface::tqfindNextRegExp( TQString regexp)
+bool SearchDCOPInterface::findNextRegExp( TQString regexp)
 {
 	return m_parent->searchText( m_currentrow, m_currentcol+1, TQRegExp(regexp), &m_currentrow, &m_currentcol,  &m_currentmatchlen);
 }
 
-bool SearchDCOPInterface::tqfindPreviousRegExp( TQString regexp)
+bool SearchDCOPInterface::findPreviousRegExp( TQString regexp)
 {
 	if( m_currentcol == 0)
 		m_currentrow--;
@@ -69,12 +69,12 @@ bool SearchDCOPInterface::tqfindPreviousRegExp( TQString regexp)
 
 }
 
-bool SearchDCOPInterface::tqfindLastRegExp(TQString regexp)
+bool SearchDCOPInterface::findLastRegExp(TQString regexp)
 {
 	return m_parent->searchText( 0,0, TQRegExp(regexp), &m_currentrow, &m_currentcol,  &m_currentmatchlen, true);
 }
 
-bool SearchDCOPInterface::tqfindRegExpAt( uint  row, uint  col, TQString regexp)
+bool SearchDCOPInterface::findRegExpAt( uint  row, uint  col, TQString regexp)
 {
 	return m_parent->searchText( row, col, TQRegExp(regexp), &m_currentrow, &m_currentcol, &m_currentmatchlen, false);
 }
diff --git a/interfaces/ktexteditor/searchdcopinterface.h b/interfaces/ktexteditor/searchdcopinterface.h
index 298cf8962..d4f558a26 100644
--- a/interfaces/ktexteditor/searchdcopinterface.h
+++ b/interfaces/ktexteditor/searchdcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent SearchInterface object
 		that will provide us with the functions for the interface.
-		@param name the TQObject's name
+		@param name the QObject's name
 		*/
 		SearchDCOPInterface( SearchInterface *Parent, const char *name );
 		/**
@@ -33,17 +33,17 @@ namespace KTextEditor
 		**/
 		virtual ~SearchDCOPInterface();
 	k_dcop:
-		bool tqfindFirstString(TQString text, bool caseSensitive);
-		bool tqfindNextString(TQString text, bool caseSensitive);
-		bool tqfindPreviousString( TQString text, bool caseSensitive);
-		bool tqfindLastString(TQString text, bool caseSensitive);
-		bool tqfindStringAt( uint  row, uint  col, TQString text, bool caseSensitive);
+		bool findFirstString(TQString text, bool caseSensitive);
+		bool findNextString(TQString text, bool caseSensitive);
+		bool findPreviousString( TQString text, bool caseSensitive);
+		bool findLastString(TQString text, bool caseSensitive);
+		bool findStringAt( uint  row, uint  col, TQString text, bool caseSensitive);
 
-		bool tqfindFirstRegExp( TQString regexp);
-		bool tqfindNextRegExp( TQString regexp);
-		bool tqfindPreviousRegExp( TQString regexp);
-		bool tqfindLastRegExp( TQString regexp);
-		bool tqfindRegExpAt( uint  row, uint  col, TQString regexp);
+		bool findFirstRegExp( TQString regexp);
+		bool findNextRegExp( TQString regexp);
+		bool findPreviousRegExp( TQString regexp);
+		bool findLastRegExp( TQString regexp);
+		bool findRegExpAt( uint  row, uint  col, TQString regexp);
 
 		uint currentMatchLine();
 		uint currentMatchCol();
diff --git a/interfaces/ktexteditor/selectiondcopinterface.h b/interfaces/ktexteditor/selectiondcopinterface.h
index 70e6e2f0b..aa2973540 100644
--- a/interfaces/ktexteditor/selectiondcopinterface.h
+++ b/interfaces/ktexteditor/selectiondcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent SelectionInterface object
 		that will provide us with the functions for the interface.
-		@param name the TQObject's name
+		@param name the QObject's name
 		*/
 		SelectionDCOPInterface( SelectionInterface *Parent, const char *name );
 		/**
diff --git a/interfaces/ktexteditor/templateinterface.cpp b/interfaces/ktexteditor/templateinterface.cpp
index f84ab691b..4f9f83706 100644
--- a/interfaces/ktexteditor/templateinterface.cpp
+++ b/interfaces/ktexteditor/templateinterface.cpp
@@ -74,7 +74,7 @@ bool TemplateInterface::expandMacros( TQMap<TQString, TQString> &map, TQWidget *
 {
   KABC::StdAddressBook *addrBook = 0;
   KABC::Addressee userAddress;
-  TQDateTime datetime = TQDateTime::tqcurrentDateTime();
+  TQDateTime datetime = TQDateTime::currentDateTime();
   TQDate date = datetime.date();
   TQTime time = datetime.time();
 
@@ -173,7 +173,7 @@ bool TemplateInterface::insertTemplateText ( uint line, uint column, const TQStr
         }
       }
       TQString placeholder = rx.cap( 1 );
-      if ( ! enhancedInitValues.tqcontains( placeholder ) )
+      if ( ! enhancedInitValues.contains( placeholder ) )
         enhancedInitValues[ placeholder ] = "";
 
       pos += rx.matchedLength();
diff --git a/interfaces/ktexteditor/templateinterface.h b/interfaces/ktexteditor/templateinterface.h
index f31daeb3b..ec864a5e4 100644
--- a/interfaces/ktexteditor/templateinterface.h
+++ b/interfaces/ktexteditor/templateinterface.h
@@ -43,7 +43,7 @@ class KTEXTEDITOR_EXPORT TemplateInterface //should be named AbstractTemplateInt
     virtual ~TemplateInterface();
 
     /**
-     * Parses @p templateString for macros in the form [$%]{NAME} and tqfinds
+     * Parses @p templateString for macros in the form [$%]{NAME} and finds
      * the value corresponding to NAME if any. The NAME string may contain
      * any non-whitespace character execpt '}'
      * @param initialValues a map with the keys for the macros to expand. 
@@ -101,7 +101,7 @@ class KTEXTEDITOR_EXPORT TemplateInterface //should be named AbstractTemplateInt
      * differing from the macro name is found.
      *
      * If the editor supports some kind of smart indentation, the inserted code
-     * should be tqlayouted by the indenter.
+     * should be layouted by the indenter.
      */
     bool insertTemplateText ( uint line, uint column, const TQString &templateString, const TQMap<TQString,TQString> &initialValues, TQWidget *parentWindow=0);
 
diff --git a/interfaces/ktexteditor/undodcopinterface.h b/interfaces/ktexteditor/undodcopinterface.h
index 5e324da03..b1a217036 100644
--- a/interfaces/ktexteditor/undodcopinterface.h
+++ b/interfaces/ktexteditor/undodcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent UndoInterface object
 		that will provide us with the functions for the interface.
-		@param name the TQObject's name
+		@param name the QObject's name
 		*/
 		UndoDCOPInterface( UndoInterface *Parent, const char *name );
 		/**
diff --git a/interfaces/ktexteditor/viewcursordcopinterface.h b/interfaces/ktexteditor/viewcursordcopinterface.h
index e0c956da0..4bae0b520 100644
--- a/interfaces/ktexteditor/viewcursordcopinterface.h
+++ b/interfaces/ktexteditor/viewcursordcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent ViewCursorInterface object
 		that will provide us with the functions for the interface.
-		@param name the TQObject's name
+		@param name the QObject's name
 		*/
 		ViewCursorDCOPInterface( ViewCursorInterface *Parent, const char *name );
 		/**
diff --git a/interfaces/ktexteditor/viewstatusmsgdcopinterface.cpp b/interfaces/ktexteditor/viewstatusmsgdcopinterface.cpp
index b629cfc40..d38b9b938 100644
--- a/interfaces/ktexteditor/viewstatusmsgdcopinterface.cpp
+++ b/interfaces/ktexteditor/viewstatusmsgdcopinterface.cpp
@@ -6,24 +6,24 @@
 #include <dcopclient.h>
 using namespace KTextEditor;
 
-ViewtqStatusMsgDCOPInterface::ViewtqStatusMsgDCOPInterface( ViewtqStatusMsgInterface *Parent, const char *name)
+ViewStatusMsgDCOPInterface::ViewStatusMsgDCOPInterface( ViewStatusMsgInterface *Parent, const char *name)
 	: DCOPObject(name)
 {
 	m_parent = Parent;
 }
 
-ViewtqStatusMsgDCOPInterface::~ViewtqStatusMsgDCOPInterface()
+ViewStatusMsgDCOPInterface::~ViewStatusMsgDCOPInterface()
 {
 
 }
 
-uint ViewtqStatusMsgDCOPInterface::viewtqStatusMsgInterfaceNumber ()
+uint ViewStatusMsgDCOPInterface::viewStatusMsgInterfaceNumber ()
 {
-	return m_parent->viewtqStatusMsgInterfaceNumber ();
+	return m_parent->viewStatusMsgInterfaceNumber ();
 }
 
-void ViewtqStatusMsgDCOPInterface::viewtqStatusMsg (TQString msg)
+void ViewStatusMsgDCOPInterface::viewStatusMsg (TQString msg)
 {
-	m_parent->viewtqStatusMsg(msg);
+	m_parent->viewStatusMsg(msg);
 }
 
diff --git a/interfaces/ktexteditor/viewstatusmsgdcopinterface.h b/interfaces/ktexteditor/viewstatusmsgdcopinterface.h
index 3bdba906a..b4c5cf72e 100644
--- a/interfaces/ktexteditor/viewstatusmsgdcopinterface.h
+++ b/interfaces/ktexteditor/viewstatusmsgdcopinterface.h
@@ -1,5 +1,5 @@
-#ifndef ViewtqStatusMsg_DCOP_INTERFACE_H
-#define ViewtqStatusMsg_DCOP_INTERFACE_H
+#ifndef ViewStatusMsg_DCOP_INTERFACE_H
+#define ViewStatusMsg_DCOP_INTERFACE_H
 
 #include <dcopobject.h>
 #include <dcopref.h>
@@ -8,36 +8,36 @@
 //#include "editdcopinterface.moc"
 namespace KTextEditor
 {
-	class ViewtqStatusMsgInterface;
+	class ViewStatusMsgInterface;
 	/**
-	This is the main interface to the ViewtqStatusMsgInterface of KTextEdit.
+	This is the main interface to the ViewStatusMsgInterface of KTextEdit.
 	This will provide a consistant dcop interface to all KDE applications that use it.
-	@short DCOP interface to ViewtqStatusMsgInterface.
+	@short DCOP interface to ViewStatusMsgInterface.
 	@author Ian Reinhart Geiser <geiseri@kde.org>
 	*/
-	class KTEXTEDITOR_EXPORT ViewtqStatusMsgDCOPInterface : virtual public DCOPObject
+	class KTEXTEDITOR_EXPORT ViewStatusMsgDCOPInterface : virtual public DCOPObject
 	{
 	K_DCOP
 
 	public:
 		/**
 		Construct a new interface object for the text editor.
-		@param Parent the parent ViewtqStatusMsgInterface object
+		@param Parent the parent ViewStatusMsgInterface object
 		that will provide us with the functions for the interface.
-		@param name the TQObject's name
+		@param name the QObject's name
 		*/
-		ViewtqStatusMsgDCOPInterface( ViewtqStatusMsgInterface *Parent, const char *name );
+		ViewStatusMsgDCOPInterface( ViewStatusMsgInterface *Parent, const char *name );
 		/**
 		Destructor
 		Cleans up the object.
 		*/
-		virtual ~ViewtqStatusMsgDCOPInterface();
+		virtual ~ViewStatusMsgDCOPInterface();
 	k_dcop:
-		uint viewtqStatusMsgInterfaceNumber ();
-		void viewtqStatusMsg (class TQString msg) ;
+		uint viewStatusMsgInterfaceNumber ();
+		void viewStatusMsg (class TQString msg) ;
 	
 	private:
-		ViewtqStatusMsgInterface *m_parent;
+		ViewStatusMsgInterface *m_parent;
 	};
 }
 #endif
diff --git a/interfaces/ktexteditor/viewstatusmsginterface.cpp b/interfaces/ktexteditor/viewstatusmsginterface.cpp
index 371cb15e3..ff0815c89 100644
--- a/interfaces/ktexteditor/viewstatusmsginterface.cpp
+++ b/interfaces/ktexteditor/viewstatusmsginterface.cpp
@@ -27,50 +27,50 @@
 namespace KTextEditor
 {
 
-class PrivateViewtqStatusMsgInterface
+class PrivateViewStatusMsgInterface
 {
   public:
-    PrivateViewtqStatusMsgInterface() {interface=0;}
-    ~PrivateViewtqStatusMsgInterface() {}
-    ViewtqStatusMsgDCOPInterface  *interface;
+    PrivateViewStatusMsgInterface() {interface=0;}
+    ~PrivateViewStatusMsgInterface() {}
+    ViewStatusMsgDCOPInterface  *interface;
 };
 
 }
 
 using namespace KTextEditor;
 
-unsigned int ViewtqStatusMsgInterface::globalViewtqStatusMsgInterfaceNumber = 0;
+unsigned int ViewStatusMsgInterface::globalViewStatusMsgInterfaceNumber = 0;
 
-ViewtqStatusMsgInterface::ViewtqStatusMsgInterface()
+ViewStatusMsgInterface::ViewStatusMsgInterface()
 {
-  globalViewtqStatusMsgInterfaceNumber++;
-  myViewtqStatusMsgInterfaceNumber = globalViewtqStatusMsgInterfaceNumber++;
+  globalViewStatusMsgInterfaceNumber++;
+  myViewStatusMsgInterfaceNumber = globalViewStatusMsgInterfaceNumber++;
 
-  d = new PrivateViewtqStatusMsgInterface();
-  ::TQString name = "ViewtqStatusMsgInterface#" + ::TQString::number(myViewtqStatusMsgInterfaceNumber);
-  d->interface = new ViewtqStatusMsgDCOPInterface(this, name.latin1());
+  d = new PrivateViewStatusMsgInterface();
+  ::TQString name = "ViewStatusMsgInterface#" + ::TQString::number(myViewStatusMsgInterfaceNumber);
+  d->interface = new ViewStatusMsgDCOPInterface(this, name.latin1());
 }
 
-ViewtqStatusMsgInterface::~ViewtqStatusMsgInterface()
+ViewStatusMsgInterface::~ViewStatusMsgInterface()
 {
   delete d->interface;
   delete d;
 }
 
-unsigned int ViewtqStatusMsgInterface::viewtqStatusMsgInterfaceNumber () const
+unsigned int ViewStatusMsgInterface::viewStatusMsgInterfaceNumber () const
 {
-  return myViewtqStatusMsgInterfaceNumber;
+  return myViewStatusMsgInterfaceNumber;
 }
 
-void ViewtqStatusMsgInterface::setViewtqStatusMsgInterfaceDCOPSuffix (const TQCString &suffix)
+void ViewStatusMsgInterface::setViewStatusMsgInterfaceDCOPSuffix (const TQCString &suffix)
 {
-  d->interface->setObjId ("ViewtqStatusMsgInterface#"+suffix);
+  d->interface->setObjId ("ViewStatusMsgInterface#"+suffix);
 }
 
-ViewtqStatusMsgInterface *KTextEditor::viewtqStatusMsgInterface (View *view)
+ViewStatusMsgInterface *KTextEditor::viewStatusMsgInterface (View *view)
 {           
   if (!view)
     return 0;
 
-  return static_cast<ViewtqStatusMsgInterface*>(view->qt_cast("KTextEditor::ViewtqStatusMsgInterface"));
+  return static_cast<ViewStatusMsgInterface*>(view->qt_cast("KTextEditor::ViewStatusMsgInterface"));
 }
diff --git a/interfaces/ktexteditor/viewstatusmsginterface.h b/interfaces/ktexteditor/viewstatusmsginterface.h
index 7286a9528..d692f3b7b 100644
--- a/interfaces/ktexteditor/viewstatusmsginterface.h
+++ b/interfaces/ktexteditor/viewstatusmsginterface.h
@@ -30,33 +30,33 @@ namespace KTextEditor
 /**
 *  This is an interface for retrieving status bar messages from the Document class.
 */
-class KTEXTEDITOR_EXPORT ViewtqStatusMsgInterface
+class KTEXTEDITOR_EXPORT ViewStatusMsgInterface
 {
-  friend class PrivateViewtqStatusMsgInterface;
+  friend class PrivateViewStatusMsgInterface;
 
   public:
-    ViewtqStatusMsgInterface();
-    virtual ~ViewtqStatusMsgInterface();
+    ViewStatusMsgInterface();
+    virtual ~ViewStatusMsgInterface();
 
-    unsigned int viewtqStatusMsgInterfaceNumber () const;
+    unsigned int viewStatusMsgInterfaceNumber () const;
     
   protected:  
-    void setViewtqStatusMsgInterfaceDCOPSuffix (const TQCString &suffix); 
+    void setViewStatusMsgInterfaceDCOPSuffix (const TQCString &suffix); 
 
   //
   // signals !!!
   //  
   public:
-    virtual void viewtqStatusMsg (const class TQString &msg) = 0;
+    virtual void viewStatusMsg (const class TQString &msg) = 0;
     
 
   private:
-    class PrivateViewtqStatusMsgInterface *d;
-    static unsigned int globalViewtqStatusMsgInterfaceNumber;
-    unsigned int myViewtqStatusMsgInterfaceNumber;
+    class PrivateViewStatusMsgInterface *d;
+    static unsigned int globalViewStatusMsgInterfaceNumber;
+    unsigned int myViewStatusMsgInterfaceNumber;
 };
                   
-KTEXTEDITOR_EXPORT ViewtqStatusMsgInterface *viewtqStatusMsgInterface (class View *view);
+KTEXTEDITOR_EXPORT ViewStatusMsgInterface *viewStatusMsgInterface (class View *view);
 
 }
 
diff --git a/kab/ChangeLog b/kab/ChangeLog
index 47a747e93..d3e36fcc1 100644
--- a/kab/ChangeLog
+++ b/kab/ChangeLog
@@ -62,7 +62,7 @@ Tue Dec 22 22:56:58 1998  Mirko Boehm  <mirko@kde.org>
 1998-10-24 Mirko Boehm  <mirko@kde.org>
 	I debugged the appearance of the EditEntry-dialog. It resizes now
 	automatically and more accurately.
-	The about dialog now tqcontains a KURLLabel that opens an email composer
+	The about dialog now contains a KURLLabel that opens an email composer
 	when the user clicks on it.
 
 1998-11-02 Mirko Boehm  <mirko@kde.org>
diff --git a/kab/NEWS b/kab/NEWS
index fc20a8f3a..e0c13d4a7 100644
--- a/kab/NEWS
+++ b/kab/NEWS
@@ -3,7 +3,7 @@ October 10, 1998:
 	will be derived from. It is suited with already-connected standard
 	buttons (OK, Apply, Cancel) and some nice visual features (outer
 	and inner frame, a common background pixmap for the frames) and
-	with ready-to-use tqgeometry management. Hopefully providing cute
+	with ready-to-use geometry management. Hopefully providing cute
 	dialogs will became easier now.
 	The new dialogs that use this common base class have a main widget
 	they manage inside their inner frame. I usually create this widgets 
diff --git a/kab/README b/kab/README
index 866f3fb6d..56514215b 100644
--- a/kab/README
+++ b/kab/README
@@ -9,7 +9,7 @@ Cornelius Schumacher, February 2002.
 The KDE addressbook
 ===================
 
-This directory tqcontains the sources for the kab API provided by "libkab.so".
+This directory contains the sources for the kab API provided by "libkab.so".
 kab is the KDE addressbook, users usually know it by one of the applications
 using the kab API, kab itselfes. But kab intends to do more, it tries to be
 a central database to store personal information for as much KDE
@@ -28,7 +28,7 @@ compile the sources using optimization level 6 (-O6).  Stick to -O2, and
 it should work. Note: This seems to be solved since gcc 2.95.
 
 Since this directory provides only the kab library, you will have to
-install the kdeutils package, that tqcontains the sources for kab's binary,
+install the kdeutils package, that contains the sources for kab's binary,
 also.
 
                                                    Mirko Boehm, March 2000.
diff --git a/kab/README.FORMAT b/kab/README.FORMAT
index ed31133e6..7cce2f402 100644
--- a/kab/README.FORMAT
+++ b/kab/README.FORMAT
@@ -12,7 +12,7 @@ kab handles address book entries. Each entry is meant to represent a
 person. Thus, for each entry, it is possible to store more than one
 address (like home or business addresses). 
 
-An addressbook database file tqcontains two sections, one to store the
+An addressbook database file contains two sections, one to store the
 users entries, called "entries", and one to store the configuration,
 called "config". Every subsection of the "entries" section is one
 entry, containing 
diff --git a/kab/README.KABAPI b/kab/README.KABAPI
index 5c7c1dc4c..278d787d2 100644
--- a/kab/README.KABAPI
+++ b/kab/README.KABAPI
@@ -9,9 +9,9 @@ include directory into your sources.
 
 The documentation of the kab API is contained in the header file
 (kabapi.h), you can extract it by parsing the file with kdoc. The kab
-binary source directory in the kdeutils package tqcontains a sample program
+binary source directory in the kdeutils package contains a sample program
 that tries to explain some basic functions of the API. It is important
-that you report any bugs you tqfind in the API or in the rest of kab to
+that you report any bugs you find in the API or in the rest of kab to
 
 	mirko@kde.org
 
diff --git a/kab/addressbook.cc b/kab/addressbook.cc
index d176bf29f..d5813237c 100644
--- a/kab/addressbook.cc
+++ b/kab/addressbook.cc
@@ -225,7 +225,7 @@ bool AddressBook::Entry::Address::nameOfField(const char* key, TQString& value)
       for(counter=0; counter<AddressBook::Entry::Address::NoOfFields;
 	  ++counter)
 	{
-	  pos=fields->tqfind(Fields[counter]);
+	  pos=fields->find(Fields[counter]);
 	  if(pos==fields->end())
 	    {
 	      kdDebug(KAB_KDEBUG_AREA) << "  UNDEFINED" << endl;
@@ -238,7 +238,7 @@ bool AddressBook::Entry::Address::nameOfField(const char* key, TQString& value)
 #endif
     }
   // ----- now finally do the lookup:
-  pos=fields->tqfind(key);
+  pos=fields->find(key);
   if(pos==fields->end())
     {
       return false;
@@ -354,7 +354,7 @@ bool AddressBook::Entry::nameOfField(const char* key, TQString& value)
       for(counter=0; counter<AddressBook::Entry::Address::NoOfFields;
 	  ++counter)
 	{
-	  pos=fields->tqfind(Fields[counter]);
+	  pos=fields->find(Fields[counter]);
 	  if(pos==fields->end())
 	    {
 	      kdDebug(KAB_KDEBUG_AREA) << "  UNDEFINED" << endl;
@@ -367,7 +367,7 @@ bool AddressBook::Entry::nameOfField(const char* key, TQString& value)
 #endif
     }
   // ----- now finally do the lookup:
-  pos=fields->tqfind(key);
+  pos=fields->find(key);
   if(pos==fields->end())
     {
       return false;
@@ -1148,7 +1148,7 @@ AddressBook::change(const KabKey& key, const Entry& entry)
       return PermDenied; // cannot get r/w mode
     }
   // -----
-  if(!theEntries->tqfind(key.getKey(), oldEntry))
+  if(!theEntries->find(key.getKey(), oldEntry))
     {
       rc=NoSuchEntry;
     } else {
@@ -1386,13 +1386,13 @@ AddressBook::makeEntryFromSection(Section* section, Entry& entry)
   };
   const int StringListKeySize=sizeof(StringListKeys)/sizeof(StringListKeys[0]);
   // ----- first parse "addresses" subsection:
-  if(!section->tqfind(ADDRESS_SUBSECTION, addresses))
+  if(!section->find(ADDRESS_SUBSECTION, addresses))
     {
       return InternError; // no subsection called "addresses"
     }
   for(pos=addresses->sectionsBegin(); pos!=addresses->sectionsEnd(); ++pos)
     {
-      if(!addresses->tqfind((*pos).first, addressSection))
+      if(!addresses->find((*pos).first, addressSection))
 	{
 	  return InternError; // no section we have an iterator for?
 	}
@@ -1404,7 +1404,7 @@ AddressBook::makeEntryFromSection(Section* section, Entry& entry)
 	  temp.addresses.push_back(address);
 	} else {
 	  kdDebug(KAB_KDEBUG_AREA)
-	    << "AddressBook::makeEntryFromSection: cannot tqfind all fields "
+	    << "AddressBook::makeEntryFromSection: cannot find all fields "
 	    << "in an address subsection." << endl;
 	}
     }
@@ -1505,7 +1505,7 @@ AddressBook::makeSectionFromEntry(const Entry& entry, Section& section)
 	<< " " << endl;
       return InternError;
     }
-  if(!section.tqfind(ADDRESS_SUBSECTION, addresses))
+  if(!section.find(ADDRESS_SUBSECTION, addresses))
     {
       kdDebug(KAB_KDEBUG_AREA) 
 	<< "AddressBook::makeSectionFromEntry: cannot get new section." << endl;
@@ -1522,7 +1522,7 @@ AddressBook::makeSectionFromEntry(const Entry& entry, Section& section)
 	    << "AddressBook::makeSectionFromEntry: cannot create address " << endl;
 	  return InternError;
 	}
-      if(!addresses->tqfind(key, address))
+      if(!addresses->find(key, address))
 	{
 	  kdDebug(KAB_KDEBUG_AREA) 
 	    << "AddressBook::makeSectionFromEntry: cannot get new " << endl;
@@ -1596,7 +1596,7 @@ AddressBook::createNew(const TQString& filename)
      || !db.setFileName(KabTemplateFile, true, true))
     {
       KMessageBox::error(this,
-	 i18n("Cannot tqfind kab's template file.\n"
+	 i18n("Cannot find kab's template file.\n"
 	      "You cannot create new files."),
 	 i18n("File Error"));
       return InternError;
@@ -1648,7 +1648,7 @@ AddressBook::createConfigFile()
      || !db.setFileName(ConfigTemplateFile, true, true))
     {
       KMessageBox::error(this,
-	 i18n("Cannot tqfind kab's configuration template file.\n"
+	 i18n("Cannot find kab's configuration template file.\n"
 	      "kab cannot be configured."),
 	 i18n("File Error"));
 
@@ -1705,7 +1705,7 @@ AddressBook::loadConfigFile()
 	}
     } else {
       KMessageBox::information(this,
-	 i18n("Cannot tqfind kab's local configuration file.\n"
+	 i18n("Cannot find kab's local configuration file.\n"
 	      "kab cannot be configured."),
 	 i18n("File Error"));
       return NoSuchFile;
@@ -1872,7 +1872,7 @@ AddressBook::ErrorCode AddressBook::Entry::get(const char* fieldname, TQVariant&
       field=custom;
       return NoError;
     }
-  // ----- we did not tqfind that field:
+  // ----- we did not find that field:
   return NoSuchField;
 }
 
@@ -1939,7 +1939,7 @@ AddressBook::ErrorCode AddressBook::Entry::Address::get(const char* fieldname,
       field=state;
       return NoError;
     }
-  // ----- we did not tqfind that field:
+  // ----- we did not find that field:
   return NoSuchField;
 }
 
@@ -2005,7 +2005,7 @@ AddressBook::ErrorCode AddressBook::categories(CategoriesMap& cat)
   section=categoriesSection();
   Q_CHECK_PTR(section);
   // ----- 
-  if(!section->tqfind(KAB_CATEGORY_KEY, categories))
+  if(!section->find(KAB_CATEGORY_KEY, categories))
     {
       kdDebug(KAB_KDEBUG_AREA) 
 	<< "AddressBook::categories: error in database structure."
diff --git a/kab/addressbook.h b/kab/addressbook.h
index 20ebe4379..5057c990c 100644
--- a/kab/addressbook.h
+++ b/kab/addressbook.h
@@ -127,7 +127,7 @@ class CategoriesMap : public TQMap<int, TQString>
  *  keys). Of course, in different files a key might be used twice. <BR>
  *  The keys are objects of the type KabKey and define the section in the 
  *  addressbook database where the entry is stored (see QConfigDB
- *  reference). Keys tqinvalidate on file changes, so keep track of the
+ *  reference). Keys invalidate on file changes, so keep track of the
  *  signal ::changed. <BR>
  *  kab watches file changes. If the opened file changes on disk, it is
  *  automatically reloaded and ::changed() is emitted. 
@@ -146,7 +146,7 @@ class CategoriesMap : public TQMap<int, TQString>
  *  \par The mirror map
  *  The entries are stored in the QConfigDB object ::data which represents the
  *  currently opened file. In every file there is a section with the name 
- *  <TT> entries </TT> that tqcontains a subsection for every entry. The name of
+ *  <TT> entries </TT> that contains a subsection for every entry. The name of
  *  the subsection is the key of the entry. <BR>
  *  When retrieving the sections, they are ordered alphabetically by their keys.
  *  This is not what users expect, since the keys show the insertion order of 
@@ -157,10 +157,10 @@ class CategoriesMap : public TQMap<int, TQString>
  *  created as a combination of the entry data, and then displayed in aphabetical 
  *  order in the selector combobox. This map is called the mirror map throughout 
  *  the documentation. It is created or updated every time the database changes.
- *  Thus the way to tqfind a special entry is: <OL>
+ *  Thus the way to find a special entry is: <OL>
  *  <LI> the user selects an item in the selector combo box, returning its 
  *       index, </LI>
- *  <LI> the index is used to tqfind the key of the entry in the mirror map, </LI>
+ *  <LI> the index is used to find the key of the entry in the mirror map, </LI>
  *  <LI> and finally the entry is retrieved by its key from the database. </LI>
  *  </OL>
  *  To modify the sorting order, the way to create the entry descriptors in the 
@@ -230,9 +230,9 @@ public:
    *  First of all, kab II data files (that usually end with \c .kab, while in
    *  kab 1 the fixed file name was \c addressbook.database) have two main
    *  sections (see the documentation of the QConfigDB and Section classes),
-   *  one is called \c config, it tqcontains different file specific
+   *  one is called \c config, it contains different file specific
    *  configuration settings like the last displayed entry, and one section
-   *  called \c entries that in turn tqcontains a subsection for each entry in
+   *  called \c entries that in turn contains a subsection for each entry in
    *  the database file. The keys of this subsections are the literal strings
    *  that are used in the KabKey class in the member KabKey::key. Each entry
    *  subsection has some key-value-pairs described below and another
@@ -260,15 +260,15 @@ public:
    *     ... (more entries may follow)
    *  [END] </PRE> <BR>
    *
-   *  \par The fields an entry tqcontains
-   *  An entry tqcontains all settings that are expected to be unique for all
+   *  \par The fields an entry contains
+   *  An entry contains all settings that are expected to be unique for all
    *  addresses directly as key-value-pairs. Everything that is part of a
    *  specific address of this person is part of an object of the member list
    *  \c addresses referenced in the next paragraph. <BR>
    *  The keys defined directly in the entry sections are: <DL>
    *  <DT>title<DT><DD> The title of that person. </DD>
    *  <DT>rank<DT><DD>A possible military rank of that person. </DD>
-   *  <DT>fn<DT><DD>The formatted name. If it is not empty, it tqreplaces the
+   *  <DT>fn<DT><DD>The formatted name. If it is not empty, it replaces the
    *       standard combination of the other name fields in the address
    *       display. </DD>
    *  <DT>nameprefix<DT><DD>A possible name prefix. </DD>
@@ -290,7 +290,7 @@ public:
    *  See the next section for a description of the addresses subsections.
    * 
    *  \par The fields of the addresses subsections
-   *  The section for each entry tqcontains a subsection \c addresses with
+   *  The section for each entry contains a subsection \c addresses with
    *  in turn a subsection for each address. The addresses are enumerated
    *  in the order they are inserted, their keys are the numbers of
    *  inserting converted to a string. <BR>
@@ -416,7 +416,7 @@ public:
     TQStringList emails; /**< The email addresses. */
     TQStringList keywords; /**< The user defined keywords for searching. */
     /**
-     * Telephon numbers and types. This list tqcontains combinations of telephone
+     * Telephon numbers and types. This list contains combinations of telephone
      * numbers and the types of the phones, in this order. See enum
      * Telephone above.
      */
@@ -506,7 +506,7 @@ public:
     *    firstname (add. name) last name,
     * if it is true, 
     +    last name, first name (add. name).
-    * If \a initials is true, the text tqcontains initials only:
+    * If \a initials is true, the text contains initials only:
     *    f. a. name [with reverse==false] or
     *    name, f. a. [with reverse==true].
     * If there is no entry with this key, the method returns ::NoSuchEntry.
@@ -572,7 +572,7 @@ public:
   ErrorCode createConfigFile();
   ErrorCode loadConfigFile(); /**< Load the local configuration file. */
   // ErrorCode configureKab(); /**< Open the configuration dialog for the KabAPI. */
-  // TQSize tqsizeHint();  /**< The preferred (minimal) size of the view. */ // ni
+  // TQSize sizeHint();  /**< The preferred (minimal) size of the view. */ // ni
   /**
    * This method parses a vCard and creates an Entry object from it.
    */
@@ -597,7 +597,7 @@ public:
    */
   ErrorCode categories(CategoriesMap& categories);
   /**
-   * Modify the categories for this addressbook. The map given will tqreplace the 
+   * Modify the categories for this addressbook. The map given will replace the 
    * previoulsy stored one.
    */
   ErrorCode setCategories(const CategoriesMap& categories);
@@ -630,12 +630,12 @@ protected:
   KabKey nextAvailEntryKey();
   /**
    * Returns true if both pathes point to the same file.
-   *  The method resolves relative file names to tqfind this out.
+   *  The method resolves relative file names to find this out.
    */
   bool isSameFile(const TQString& a, const TQString& b);
   /**
    * Parse the section and copy its contents into \a entry.
-   * The method expects a subsection called \e addresses that tqcontains a
+   * The method expects a subsection called \e addresses that contains a
    * number of subsections each containing data for one Entry::Address object.
    * All other fields are copied directly into the members of \a entry.
    */
diff --git a/kab/kabapi.cc b/kab/kabapi.cc
index 0910df18b..0cf97905c 100644
--- a/kab/kabapi.cc
+++ b/kab/kabapi.cc
@@ -72,9 +72,9 @@ int KabAPI::exec()
 	    {
 	      listbox->setCurrentItem(0);
 	    }
-	  listbox->setMinimumSize(listbox->tqsizeHint());
+	  listbox->setMinimumSize(listbox->sizeHint());
 	  adjustSize();
-	  resize(tqminimumSize());
+	  resize(minimumSize());
 	  return KDialogBase::exec();
 	} else {
 	  kdDebug(KAB_KDEBUG_AREA) << "KabAPI::exec: error creating interface."
diff --git a/kab/kabapi.h b/kab/kabapi.h
index cf18800a9..9289d3f98 100644
--- a/kab/kabapi.h
+++ b/kab/kabapi.h
@@ -150,7 +150,7 @@ public:
    */
   AddressBook::ErrorCode remove(const KabKey& key);
   /**
-   * Use getEntryByName to tqfind entries that look like the name given.
+   * Use getEntryByName to find entries that look like the name given.
    * The name might be incomplete or diffuse.
    * @short This method delivers the closest matches to the given name.
    * @param name The name, containing "." for abbreviations.
diff --git a/kab/qconfigDB.cc b/kab/qconfigDB.cc
index e7edfc706..a49388ff9 100644
--- a/kab/qconfigDB.cc
+++ b/kab/qconfigDB.cc
@@ -73,7 +73,7 @@ static void tokenize(list<TQCString>& res, const TQCString& text, char tr, bool
   while(zwei!=-1)
     {
       teil="";
-      zwei=text.tqfind(tr, eins);
+      zwei=text.find(tr, eins);
       if(zwei!=-1)
 	{
 	  teil=text.mid(eins, zwei-eins);
@@ -472,7 +472,7 @@ KeyValueMap::getRaw(const TQCString& key, TQCString& value) const
   // ###########################################################################
   kdDebug(GUARD, KAB_KDEBUG_AREA) <<
       "KeyValueMap::getRaw: trying to get raw value for key \"" << key << "\" ...\n";
-  StringStringMap::iterator pos=data->tqfind(key);
+  StringStringMap::iterator pos=data->find(key);
   // -----
   if(pos==data->end())
     {
@@ -503,7 +503,7 @@ KeyValueMap::insertRaw(const TQCString& key, const TQCString& value, bool force)
       kdDebug() << "KeyValueMap::insertRaw: tried to insert empty key." << endl;
       return false;
     }
-  if(force) // entry will be tqreplaced
+  if(force) // entry will be replaced
     {
       n=data->erase(key);
     }
@@ -573,7 +573,7 @@ KeyValueMap::insertLine(TQCString line, bool force, bool relax, bool encode)
       return false;
     }
   // -----
-  index=line.tqfind('=');
+  index=line.find('=');
   if(index==-1)  // not found
       {
 	  kdDebug() << "KeyValueMap::insertLine: no \"=\" found in \""<<line<<"\".\n";
@@ -680,7 +680,7 @@ KeyValueMap::get(const TQCString& key, TQString& value) const
 					<< key << " not in KeyValueMap.\n";
 	return false;
     }
-  // ----- tqfind its state:
+  // ----- find its state:
   value=TQString::fromUtf8(v); // is there a better way?
   kdDebug(GUARD, KAB_KDEBUG_AREA) <<  "KeyValueMap::get[QString]: success, value"
 	     " (in UTF8) is " << v << endl;
@@ -721,7 +721,7 @@ KeyValueMap::get(const TQCString& key, bool& value) const
 					<< key << " not in KeyValueMap.";
       return false;
     }
-  // ----- tqfind its state:
+  // ----- find its state:
   v=v.stripWhiteSpace();
   if(v=="true")
     {
@@ -1011,11 +1011,11 @@ KeyValueMap::get(const TQCString& key, list<TQCString>& values) const
     }
   // -----
   for(;;)
-    { // ----- parten the string down into a list, tqfind special characters:
+    { // ----- parten the string down into a list, find special characters:
       second=first;
       for(;;)
 	{
-	  second=raw.tqfind('\\', second);
+	  second=raw.find('\\', second);
 	  // ----- this may never be the last and also not the second last
 	  //       character in a complex string:
 	  if(second!=-1)
@@ -1120,11 +1120,11 @@ KeyValueMap::get(const TQCString& key, TQStrList& values) const
     }
   // -----
   for(;;)
-    { // ----- parten the string down into a list, tqfind special characters:
+    { // ----- parten the string down into a list, find special characters:
       second=first;
       for(;;)
 	{
-	  second=raw.tqfind('\\', second);
+	  second=raw.find('\\', second);
 	  // ----- this may never be the last and also not the second last
 	  //       character in a complex string:
 	  if(second!=-1)
@@ -1471,15 +1471,15 @@ Section::add(const TQCString& name, Section* section)
 }
 
 bool
-Section::tqfind(const TQCString& name, StringSectionMap::iterator& result)
+Section::find(const TQCString& name, StringSectionMap::iterator& result)
 {
   register bool GUARD; GUARD=false;
   // ###########################################################################
-  kdDebug(GUARD, KAB_KDEBUG_AREA) <<  "Section::tqfind: trying to get section "
+  kdDebug(GUARD, KAB_KDEBUG_AREA) <<  "Section::find: trying to get section "
       "\""<<name<<"\" ... \n";
   StringSectionMap::iterator pos;
   // -----
-  pos=sections.tqfind(name);
+  pos=sections.find(name);
   if(pos==sections.end())
     {
       kdDebug(GUARD, KAB_KDEBUG_AREA) <<  "failed, no such section." << endl;
@@ -1498,7 +1498,7 @@ Section::remove(const TQCString& name)
   // ###########################################################################
   StringSectionMap::iterator pos;
   // -----
-  if(!tqfind(name, pos))
+  if(!find(name, pos))
     {
       return false; // no such section
     } else {
@@ -1509,12 +1509,12 @@ Section::remove(const TQCString& name)
 }
 
 bool
-Section::tqfind(const TQCString& name, Section*& section)
+Section::find(const TQCString& name, Section*& section)
 {
   // ###########################################################################
   StringSectionMap::iterator pos;
   // -----
-  if(!tqfind(name, pos))
+  if(!find(name, pos))
     {
       return false;
     } else {
@@ -1637,7 +1637,7 @@ Section::readSection(TQTextStream& file, bool finish)
 	{
 	  name=nameOfSection(line);
 	  add(name);
-	  tqfind(name, temp);
+	  find(name, temp);
 	  if(!temp->readSection(file))
 	    {
 		kdDebug() << "Section::readSection: unable to read "
@@ -1675,7 +1675,7 @@ Section::isBeginOfSection(TQCString line)
       return false;
     }
   // -----
-  if(line.tqcontains("END"))
+  if(line.contains("END"))
     {
       return false;
     } else {
@@ -1708,8 +1708,8 @@ Section::isEndOfSection(TQCString line)
 		 "Section::isBeginOfSection: does not match." << endl;
       return false;
     }
-  // ----- tqfind the word inside the brackets:
-  for(first=1; line[first]==' '; ++first); // tqfind first non-whitespace character
+  // ----- find the word inside the brackets:
+  for(first=1; line[first]==' '; ++first); // find first non-whitespace character
   for(second=first; line[second]!=' ' && line[second]!=']'; ++second);
   temp=line.mid(first, second-first);
   if(temp=="END")
@@ -1744,8 +1744,8 @@ Section::nameOfSection(const TQCString& line)
     {
       return "";
     }
-  // ----- tqfind the word inside the brackets:
-  for(first=1; temp[first]==' '; ++first); // tqfind first non-whitespace character
+  // ----- find the word inside the brackets:
+  for(first=1; temp[first]==' '; ++first); // find first non-whitespace character
   for(second=first; temp[second]!=' ' && temp[second]!=']'; ++second);
   temp=temp.mid(first, second-first);
   if(temp=="END")
@@ -1864,7 +1864,7 @@ QConfigDB::get(const list<TQCString>& key, KeyValueMap*& map)
     }
   for(pos=key.begin(); pos!=key.end(); ++pos)
     {
-      if(!section->tqfind(*pos, section))
+      if(!section->find(*pos, section))
 	{
 	  kdDebug(GUARD, KAB_KDEBUG_AREA) <<
 		     "failed,\n               at least the element \""
@@ -1902,7 +1902,7 @@ QConfigDB::createSection(const list<TQCString>& key)
   pos=key.begin();
   for(index=0; index<key.size()-1; index++)
     {
-      if(!section->tqfind(*pos, section))
+      if(!section->find(*pos, section))
 	{ // this section is not declared
 	  Section* temp=new Section; // WORK_TO_DO: memory hole?
 	  if(section->add(*pos, temp))
@@ -1975,7 +1975,7 @@ QConfigDB::stringToKeylist(const TQCString& desc)
     }
   for(;;)
     {
-      second=desc.tqfind('/', first);
+      second=desc.find('/', first);
       if(second==-1)
 	{
 	  if((unsigned)first<desc.length()+1)
@@ -2020,7 +2020,7 @@ QConfigDB::get(const list<TQCString>& key, Section*& section)
   // -----
   for(pos=key.begin(); pos!=key.end(); ++pos)
     {
-      if(!temp->tqfind(*pos, temp))
+      if(!temp->find(*pos, temp))
 	{
 	  kdDebug(GUARD, KAB_KDEBUG_AREA) <<  "failure, no such section.";
 	  return false;
diff --git a/kab/qconfigDB.h b/kab/qconfigDB.h
index 94359709e..bea329887 100644
--- a/kab/qconfigDB.h
+++ b/kab/qconfigDB.h
@@ -120,9 +120,9 @@ protected:
    * complex string where control and non-printable characters get a readable
    * representation.
    * When retrieving, this strings are translated back by this method.
-   * \a orig tqcontains the string read from the file, \a index the position from 
+   * \a orig contains the string read from the file, \a index the position from 
    * where to start the translation (need not be the beginning of the string), 
-   * \a result tqcontains the transformed string, \a noOfChars the number of 
+   * \a result contains the transformed string, \a noOfChars the number of 
    * characters used to parse the string. 
    * Returns true if there where no errors while parsing.
    * @see makeComplexString
@@ -466,11 +466,11 @@ public:
   /**
    * Search for the section, returning an iterator to it.
    */
-  bool tqfind(const TQCString&, StringSectionMap::iterator&);
+  bool find(const TQCString&, StringSectionMap::iterator&);
   /**
    * Search for the section, returning a pointer to the section object.
    */
-  bool tqfind(const TQCString&, Section*&);
+  bool find(const TQCString&, Section*&);
   /**
    * Remove this subsection.
    */
@@ -741,7 +741,7 @@ protected:
   bool invariant();
   /**
    * All created lockfiles are notified in this list. 
-   * The list tqcontains the names of the lockfiles, not of the files itselfes.
+   * The list contains the names of the lockfiles, not of the files itselfes.
    */
   static list<TQString> LockFiles;
   // ----------------------------------------------------------------------------
diff --git a/kab/template.config b/kab/template.config
index 89bec9254..c925e407e 100644
--- a/kab/template.config
+++ b/kab/template.config
@@ -6,10 +6,10 @@
   # a list of supported mail clients:
   # MailCommand ... the shell command for starting the mailer
   # MailParameters ... the parameters for handing over the mail address
-  #   <person> will be tqreplaced by a single address
-  #   <persons> will be tqreplaced by a list of the selected addresses, 
+  #   <person> will be replaced by a single address
+  #   <persons> will be replaced by a list of the selected addresses, 
   #             separated by commas
-  #   <subject> will be tqreplaced by a possible subject
+  #   <subject> will be replaced by a possible subject
   [mailer]
     [kmail]
        MailCommand="kmail"
@@ -19,7 +19,7 @@
   # a list of supported talk clients:
   # TalkCommand ... the shell command for starting the talk client
   # TalkParameters ... the parameters for handing over the talk address
-  #   <person> will be tqreplaced by a single address
+  #   <person> will be replaced by a single address
   [talk]
     [ktalk]
        TalkCommand="ktalk"
diff --git a/kabc/HOWTO b/kabc/HOWTO
index 00fd3b474..37f7ccefe 100644
--- a/kabc/HOWTO
+++ b/kabc/HOWTO
@@ -55,7 +55,7 @@ and provides 2 kinds of access methods.
     With search functions you can search for contacts with special attributes
     such as "all contacts with the name 'Harald'"
 
-The class KABC::Addressee represents a single contact and tqcontains all data
+The class KABC::Addressee represents a single contact and contains all data
 a vCard could store (as specified in RFC 2426).
 
 The Storage Layer
@@ -276,7 +276,7 @@ A contact can also contain custom entries, which are not specified in the API,
 so you can add custom values with insertCustom() as shown in line 69.
 The first argument of this function should be the name of the application, so
 2 applications which use the same custom entry accidentally, do not overwrite
-the data for each other. The second argument tqcontains the name of the
+the data for each other. The second argument contains the name of the
 custom entry and the third argument the value in string representation.
 
 In line 71 we finally insert the KABC::Addressee object into the
@@ -357,7 +357,7 @@ following actions on it:
 
 In line 12 we query all email addresses of every resource and print them out.
 
-<kabc/distributionlist.h> tqcontains also the declaration for the class
+<kabc/distributionlist.h> contains also the declaration for the class
 KABC::DistributionListWatcher. This class exists only once per application and
 its only job is to emit a signal as soon as the distribution list file has
 changed. So to make your application aware of changes use the following code:
diff --git a/kabc/README b/kabc/README
index 1020ebf77..4aa9a063e 100644
--- a/kabc/README
+++ b/kabc/README
@@ -4,7 +4,7 @@ PURPOSE:
 
 libkabc provides an API for address book data. This can be used by all KDE
 application using data of this type, e.g. KAddressBook, KMail, KOrganizer,
-KPilot etc. It is meant as tqreplacement for libkab (in kdebase/kab).
+KPilot etc. It is meant as replacement for libkab (in kdebase/kab).
 
 FEATURES:
 
diff --git a/kabc/README.AddressFormat b/kabc/README.AddressFormat
index d3d75f5ce..8079e4914 100644
--- a/kabc/README.AddressFormat
+++ b/kabc/README.AddressFormat
@@ -15,10 +15,10 @@ format in a field "AddressFormat". Note that for most countries one field
 however, in some countries (eg. Hungary) business addresses differ in their
 structure. In this case you have the possibility of adding another field
 "BusinessAddressFormat" which will be preferred for formatting of business
-addresses; if libkabc can't tqfind such a field, it will fall back to
+addresses; if libkabc can't find such a field, it will fall back to
 "AddressFormat". (Please use BusinessAddressFormat ONLY if you really need to)
 
-The format consists mainly of tags that will be tqreplaced by address fields.
+The format consists mainly of tags that will be replaced by address fields.
 The list of tags may grow in the future, the format *might* change in the near
 future, but I hope not.
 
diff --git a/kabc/address.cpp b/kabc/address.cpp
index 63225a3be..0787bcc4e 100644
--- a/kabc/address.cpp
+++ b/kabc/address.cpp
@@ -390,8 +390,8 @@ bool Address::parseAddressTemplateSection( const TQString &tsection,
     TQString &result, const TQString &realName, const TQString &orgaName ) const
 {
   // This method first parses and substitutes any bracketed sections and
-  // after that tqreplaces any tags with their values. If a bracketed section
-  // or a tag evaluate to zero, they are not just removed but tqreplaced
+  // after that replaces any tags with their values. If a bracketed section
+  // or a tag evaluate to zero, they are not just removed but replaced
   // with a placeholder. This is because in the last step conditionals are
   // resolved which depend on information about zero-evaluations.
   result = tsection;
@@ -399,14 +399,14 @@ bool Address::parseAddressTemplateSection( const TQString &tsection,
   bool ret = false;
   
   // first check for brackets that have to be evaluated first 
-  int fpos = result.tqfind( KABC_FMTTAG_purgeempty, stpos );
+  int fpos = result.find( KABC_FMTTAG_purgeempty, stpos );
   while ( -1 != fpos ) {
     int bpos1 = fpos + KABC_FMTTAG_purgeempty.length();
     int bpos2;
-    // expect opening bracket and tqfind next balanced closing bracket. If 
+    // expect opening bracket and find next balanced closing bracket. If 
     // next char is no opening bracket, continue parsing (no valid tag)
     if ( '(' == result[bpos1] ) {
-      bpos2 = tqfindBalancedBracket( result, bpos1 );
+      bpos2 = findBalancedBracket( result, bpos1 );
       if ( -1 != bpos2 ) {
         // we have balanced brackets, recursively parse:
         TQString rplstr;
@@ -415,12 +415,12 @@ bool Address::parseAddressTemplateSection( const TQString &tsection,
                                                    realName, orgaName );
         if ( purge ) {
           // purge -> remove all
-          // tqreplace with !_P_!, so conditional tags work later
-          result.tqreplace( fpos, bpos2 - fpos + 1, "!_P_!" );
+          // replace with !_P_!, so conditional tags work later
+          result.replace( fpos, bpos2 - fpos + 1, "!_P_!" );
           // leave stpos as it is
         } else {
-          // no purge -> tqreplace with recursively parsed string
-          result.tqreplace( fpos, bpos2 - fpos + 1, rplstr );
+          // no purge -> replace with recursively parsed string
+          result.replace( fpos, bpos2 - fpos + 1, rplstr );
           ret = true;
           stpos = fpos + rplstr.length();
         }
@@ -430,17 +430,17 @@ bool Address::parseAddressTemplateSection( const TQString &tsection,
         stpos = bpos1; 
       }
     }
-    fpos = result.tqfind( KABC_FMTTAG_purgeempty, stpos );
+    fpos = result.find( KABC_FMTTAG_purgeempty, stpos );
   }
 
-  // after sorting out all purge tags, we just search'n'tqreplace the rest,
+  // after sorting out all purge tags, we just search'n'replace the rest,
   // keeping track of whether at least one tag evaluates to something.
   // The following macro needs TQString for R_FIELD
   // It substitutes !_P_! for empty fields so conditional tags work later
 #define REPLTAG(R_TAG,R_FIELD) \
-  if ( result.tqfind(R_TAG, false) != -1 ) { \
+  if ( result.find(R_TAG, false) != -1 ) { \
     TQString rpl = R_FIELD.isEmpty() ? TQString("!_P_!") : R_FIELD; \
-    result.tqreplace( R_TAG, rpl ); \
+    result.replace( R_TAG, rpl ); \
     if ( !R_FIELD.isEmpty() ) { \
       ret = true; \
     } \
@@ -457,32 +457,32 @@ bool Address::parseAddressTemplateSection( const TQString &tsection,
   REPLTAG( KABC_FMTTAG_LOCATION, locality().upper() );
   REPLTAG( KABC_FMTTAG_region, region() );
   REPLTAG( KABC_FMTTAG_REGION, region().upper() );
-  result.tqreplace( KABC_FMTTAG_newline, "\n" );
+  result.replace( KABC_FMTTAG_newline, "\n" );
 #undef REPLTAG
  
   // conditional comma 
-  fpos = result.tqfind( KABC_FMTTAG_condcomma, 0 );
+  fpos = result.find( KABC_FMTTAG_condcomma, 0 );
   while ( -1 != fpos ) {
     TQString str1 = result.mid( fpos - 5, 5 );
     TQString str2 = result.mid( fpos + 2, 5 );
     if ( str1 != "!_P_!" && str2 != "!_P_!" ) {
-      result.tqreplace( fpos, 2, ", " );
+      result.replace( fpos, 2, ", " );
     } else {
       result.remove( fpos, 2 );
     }
-    fpos = result.tqfind( KABC_FMTTAG_condcomma, fpos );
+    fpos = result.find( KABC_FMTTAG_condcomma, fpos );
   }
   // conditional whitespace
-  fpos = result.tqfind( KABC_FMTTAG_condwhite, 0 );
+  fpos = result.find( KABC_FMTTAG_condwhite, 0 );
   while ( -1 != fpos ) {
     TQString str1 = result.mid( fpos - 5, 5 );
     TQString str2 = result.mid( fpos + 2, 5 );
     if ( str1 != "!_P_!" && str2 != "!_P_!" ) {
-      result.tqreplace( fpos, 2, " " );
+      result.replace( fpos, 2, " " );
     } else {
       result.remove( fpos, 2 );
     }
-    fpos = result.tqfind( KABC_FMTTAG_condwhite, fpos );
+    fpos = result.find( KABC_FMTTAG_condwhite, fpos );
   }
 
   // remove purged:
@@ -491,7 +491,7 @@ bool Address::parseAddressTemplateSection( const TQString &tsection,
   return ret;
 }
 
-int Address::tqfindBalancedBracket( const TQString &tsection, int pos ) const
+int Address::findBalancedBracket( const TQString &tsection, int pos ) const
 {
   int balancecounter = 0;
   for( unsigned int i = pos + 1; i < tsection.length(); i++ ) {
@@ -516,12 +516,12 @@ TQString Address::countryToISO( const TQString &cname )
     isoMapDeleter.setObject( mISOMap, new TQMap<TQString, TQString>() );
 
   TQMap<TQString, TQString>::ConstIterator it;
-  it = mISOMap->tqfind( cname );
+  it = mISOMap->find( cname );
   if ( it != mISOMap->end() )
     return it.data();
 
   TQString mapfile = KGlobal::dirs()->findResource( "data", 
-          TQString::tqfromLatin1( "kabc/countrytransl.map" ) );
+          TQString::fromLatin1( "kabc/countrytransl.map" ) );
 
   TQFile file( mapfile );
   if ( file.open( IO_ReadOnly ) ) {
@@ -551,7 +551,7 @@ TQString Address::ISOtoCountry( const TQString &ISOname )
     return TQString::null;
 
   TQString mapfile = KGlobal::dirs()->findResource( "data", 
-          TQString::tqfromLatin1( "kabc/countrytransl.map" ) );
+          TQString::fromLatin1( "kabc/countrytransl.map" ) );
 
   TQFile file( mapfile );
   if ( file.open( IO_ReadOnly ) ) {
@@ -560,7 +560,7 @@ TQString Address::ISOtoCountry( const TQString &ISOname )
     TQString strbuf = s.readLine();
     int pos;
     while ( !strbuf.isEmpty() ) {
-      if ( (pos = strbuf.tqfind( searchStr )) != -1 ) {
+      if ( (pos = strbuf.find( searchStr )) != -1 ) {
         file.close();
         return i18n( strbuf.left( pos ).utf8() );
       }
diff --git a/kabc/address.h b/kabc/address.h
index 94af6f1ad..a7c597a40 100644
--- a/kabc/address.h
+++ b/kabc/address.h
@@ -281,7 +281,7 @@ class KABC_EXPORT Address
 
     /**
       Returns ISO code for a localized country name. Only localized country
-      names will be understood. This might be tqreplaced by a KLocale method in
+      names will be understood. This might be replaced by a KLocale method in
       the future.
       @param cname  name of the country
       @return       two digit ISO code
@@ -290,7 +290,7 @@ class KABC_EXPORT Address
 
     /**
       Returns a localized country name for a ISO code. 
-      This might be tqreplaced by a KLocale method in the future.
+      This might be replaced by a KLocale method in the future.
       @param ISOname two digit ISO code
       @return        localized name of the country
       @since 3.2
@@ -314,7 +314,7 @@ class KABC_EXPORT Address
       pos in tsection.
       @return  position of closing bracket, -1 for unbalanced brackets
     */
-    int  tqfindBalancedBracket( const TQString &tsection, int pos ) const;
+    int  findBalancedBracket( const TQString &tsection, int pos ) const;
 
     bool mEmpty;
   
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index ce0da18a5..bf6d0d17a 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -522,12 +522,12 @@ void AddressBook::insertAddressee( const Addressee &a )
     resource = standardResource();
 
   Resource::Iterator it;
-  Addressee fAddr = resource->tqfindByUid( a.uid() );
+  Addressee fAddr = resource->findByUid( a.uid() );
 
   Addressee addr( a );
   if ( !fAddr.isEmpty() ) {
     if ( fAddr != a )
-      addr.setRevision( TQDateTime::tqcurrentDateTime() );
+      addr.setRevision( TQDateTime::currentDateTime() );
     else {
       if ( fAddr.resource() == 0 ) {
         fAddr.setResource( resource );
@@ -555,7 +555,7 @@ void AddressBook::removeAddressee( const Iterator &it )
     (*it).resource()->removeAddressee( *it );
 }
 
-AddressBook::Iterator AddressBook::tqfind( const Addressee &a )
+AddressBook::Iterator AddressBook::find( const Addressee &a )
 {
   Iterator it;
   for ( it = begin(); it != end(); ++it ) {
@@ -566,11 +566,11 @@ AddressBook::Iterator AddressBook::tqfind( const Addressee &a )
   return end();
 }
 
-Addressee AddressBook::tqfindByUid( const TQString &uid )
+Addressee AddressBook::findByUid( const TQString &uid )
 {
   KRES::Manager<Resource>::ActiveIterator it;
   for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it ) {
-    Addressee addr = (*it)->tqfindByUid( uid );
+    Addressee addr = (*it)->findByUid( uid );
     if ( !addr.isEmpty() )
       return addr;
   }
@@ -589,35 +589,35 @@ Addressee::List AddressBook::allAddressees()
   return list;
 }
 
-Addressee::List AddressBook::tqfindByName( const TQString &name )
+Addressee::List AddressBook::findByName( const TQString &name )
 {
   Addressee::List results;
 
   KRES::Manager<Resource>::ActiveIterator it;
   for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it )
-    results += (*it)->tqfindByName( name );
+    results += (*it)->findByName( name );
 
   return results;
 }
 
-Addressee::List AddressBook::tqfindByEmail( const TQString &email )
+Addressee::List AddressBook::findByEmail( const TQString &email )
 {
   Addressee::List results;
 
   KRES::Manager<Resource>::ActiveIterator it;
   for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it )
-    results += (*it)->tqfindByEmail( email );
+    results += (*it)->findByEmail( email );
 
   return results;
 }
 
-Addressee::List AddressBook::tqfindByCategory( const TQString &category )
+Addressee::List AddressBook::findByCategory( const TQString &category )
 {
   Addressee::List results;
 
   KRES::Manager<Resource>::ActiveIterator it;
   for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it )
-    results += (*it)->tqfindByCategory( category );
+    results += (*it)->findByCategory( category );
 
   return results;
 }
diff --git a/kabc/addressbook.h b/kabc/addressbook.h
index 3a51736ed..0da25b30e 100644
--- a/kabc/addressbook.h
+++ b/kabc/addressbook.h
@@ -40,7 +40,7 @@ class Ticket;
 
   This class provides access to a collection of address book entries.
  */
-class KABC_EXPORT AddressBook : public TQObject
+class KABC_EXPORT AddressBook : public QObject
 {
   Q_OBJECT
 
@@ -113,7 +113,7 @@ class KABC_EXPORT AddressBook : public TQObject
       Constructs an address book object.
       The resources are loaded automatically.
 
-      @param config The config file which tqcontains the resource settings.
+      @param config The config file which contains the resource settings.
      */
     AddressBook( const TQString &config );
 
@@ -207,7 +207,7 @@ class KABC_EXPORT AddressBook : public TQObject
 
     /**
       Insert an addressee into the address book. If an addressee with the same
-      unique id already exists, it is tqreplaced by the new one, otherwise it is
+      unique id already exists, it is replaced by the new one, otherwise it is
       appended.
 
       @param addr The addressee which shall be insert.
@@ -235,7 +235,7 @@ class KABC_EXPORT AddressBook : public TQObject
 
       @param addr The addresee you are looking for.
      */
-    Iterator tqfind( const Addressee &addr ); // KDE4: const
+    Iterator find( const Addressee &addr ); // KDE4: const
 
     /**
       Searches an addressee with the specified unique identifier.
@@ -244,7 +244,7 @@ class KABC_EXPORT AddressBook : public TQObject
       @return The addressee with the specified unique identifier or an
               empty addressee.
      */
-    Addressee tqfindByUid( const TQString &uid ); // KDE4: const
+    Addressee findByUid( const TQString &uid ); // KDE4: const
 
     /**
       Returns a list of all addressees in the address book.
@@ -257,7 +257,7 @@ class KABC_EXPORT AddressBook : public TQObject
       @param name The name you are looking for.
       @return A list of all matching addressees.
      */
-    Addressee::List tqfindByName( const TQString &name ); // KDE4: const
+    Addressee::List findByName( const TQString &name ); // KDE4: const
 
     /**
       Searches all addressees which match the specified email address.
@@ -265,7 +265,7 @@ class KABC_EXPORT AddressBook : public TQObject
       @param email The email address you are looking for.
       @return A list of all matching addressees.
      */
-    Addressee::List tqfindByEmail( const TQString &email ); // KDE4: const
+    Addressee::List findByEmail( const TQString &email ); // KDE4: const
 
     /**
       Searches all addressees which belongs to the specified category.
@@ -273,7 +273,7 @@ class KABC_EXPORT AddressBook : public TQObject
       @param category The category you are looking for.
       @return A list of all matching addressees.
      */
-    Addressee::List tqfindByCategory( const TQString &category ); // KDE4: const
+    Addressee::List findByCategory( const TQString &category ); // KDE4: const
 
     /**
       Returns a string identifying this addressbook. The identifier is
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index fa15f4317..829664179 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -152,7 +152,7 @@ void AddresseeDialog::selectItem( const TQString &str )
 {
   if ( str.isEmpty() ) return;
 
-  TQListViewItem *item = mItemDict.tqfind( str );
+  TQListViewItem *item = mItemDict.find( str );
   if ( item ) {
     mAddresseeList->blockSignals( true );
     mAddresseeList->setSelected( item, true );
@@ -174,7 +174,7 @@ void AddresseeDialog::addSelected( TQListViewItem *item )
 
   Addressee a = addrItem->addressee();
 
-  TQListViewItem *selectedItem = mSelectedDict.tqfind( a.uid() );
+  TQListViewItem *selectedItem = mSelectedDict.find( a.uid() );
   if ( !selectedItem ) {
     selectedItem = new AddresseeItem( mSelectedList, a );
     mSelectedDict.insert( a.uid(), selectedItem );
diff --git a/kabc/addresseehelper.cpp b/kabc/addresseehelper.cpp
index ae60390da..df4085a02 100644
--- a/kabc/addresseehelper.cpp
+++ b/kabc/addresseehelper.cpp
@@ -38,7 +38,7 @@ AddresseeHelper *AddresseeHelper::self()
 }
 
 AddresseeHelper::AddresseeHelper()
-  : TQObject( tqApp ),
+  : TQObject( qApp ),
     DCOPObject( "KABC::AddresseeHelper" )
 {
   initSettings();
@@ -90,19 +90,19 @@ void AddresseeHelper::initSettings()
   mTradeAsFamilyName = config.readBoolEntry( "TradeAsFamilyName", true );
 }
 
-bool AddresseeHelper::tqcontainsTitle( const TQString& title ) const
+bool AddresseeHelper::containsTitle( const TQString& title ) const
 {
-  return mTitles.tqfind( title ) != mTitles.end();
+  return mTitles.find( title ) != mTitles.end();
 }
 
-bool AddresseeHelper::tqcontainsPrefix( const TQString& prefix ) const
+bool AddresseeHelper::containsPrefix( const TQString& prefix ) const
 {
-  return mPrefixes.tqfind( prefix ) != mPrefixes.end();
+  return mPrefixes.find( prefix ) != mPrefixes.end();
 }
 
-bool AddresseeHelper::tqcontainsSuffix( const TQString& suffix ) const
+bool AddresseeHelper::containsSuffix( const TQString& suffix ) const
 {
-  return mSuffixes.tqfind( suffix ) != mSuffixes.end();
+  return mSuffixes.find( suffix ) != mSuffixes.end();
 }
 
 bool AddresseeHelper::tradeAsFamilyName() const
diff --git a/kabc/addresseehelper.h b/kabc/addresseehelper.h
index 6eea08db8..5280e6b2d 100644
--- a/kabc/addresseehelper.h
+++ b/kabc/addresseehelper.h
@@ -40,9 +40,9 @@ class KABC_EXPORT AddresseeHelper : public TQObject, public DCOPObject
   public:
     static AddresseeHelper *self();
 
-    bool tqcontainsTitle( const TQString& title ) const;
-    bool tqcontainsPrefix( const TQString& prefix ) const;
-    bool tqcontainsSuffix( const TQString& suffix ) const;
+    bool containsTitle( const TQString& title ) const;
+    bool containsPrefix( const TQString& prefix ) const;
+    bool containsSuffix( const TQString& suffix ) const;
     bool tradeAsFamilyName() const;
 
   k_dcop:
diff --git a/kabc/addresseelist.cpp b/kabc/addresseelist.cpp
index 47324001c..cb9446927 100644
--- a/kabc/addresseelist.cpp
+++ b/kabc/addresseelist.cpp
@@ -208,7 +208,7 @@ void AddresseeList::sortByTrait()
     while( j1 != i2 ) {
       if ( !mReverseSorting && Trait::lt( *j2, *j1 )
            || mReverseSorting && Trait::lt( *j1, *j2 ) ) {
-        tqSwap( *j1, *j2 );
+        qSwap( *j1, *j2 );
       }
       ++j1;
       ++j2;
diff --git a/kabc/addresseelist.h b/kabc/addresseelist.h
index e5cfed09d..7c9df0275 100644
--- a/kabc/addresseelist.h
+++ b/kabc/addresseelist.h
@@ -191,7 +191,7 @@ class KABC_EXPORT AddresseeList : public TQValueList<Addressee>
      * sorting of the last <tt>sortByTrait</tt> action.
      *
      * Right now this method uses the bubble sort algorithm. This should be
-     * tqreplaced for a better one when I have time.
+     * replaced for a better one when I have time.
      */
     template<class Trait> void sortByTrait();
 
diff --git a/kabc/addresslineedit.cpp b/kabc/addresslineedit.cpp
index 07c6d76a5..b048d9f96 100644
--- a/kabc/addresslineedit.cpp
+++ b/kabc/addresslineedit.cpp
@@ -156,12 +156,12 @@ void AddressLineEdit::keyPressEvent(TQKeyEvent *e)
 {
     bool accept = false;
 
-    if (KStdAccel::shortcut(KStdAccel::SubstringCompletion).tqcontains(KKey(e)))
+    if (KStdAccel::shortcut(KStdAccel::SubstringCompletion).contains(KKey(e)))
     {
         doCompletion(true);
         accept = true;
     }
-    else if (KStdAccel::shortcut(KStdAccel::TextCompletion).tqcontains(KKey(e)))
+    else if (KStdAccel::shortcut(KStdAccel::TextCompletion).contains(KKey(e)))
     {
         int len = text().length();
         
@@ -213,21 +213,21 @@ void AddressLineEdit::insert(const TQString &t)
 
     // remove newlines in the to-be-pasted string as well as an eventual
     // mailto: protocol
-    newText.tqreplace( TQRegExp("\r?\n"), ", " );
+    newText.replace( TQRegExp("\r?\n"), ", " );
     if ( newText.startsWith( "mailto:" ) )
     {
       KURL u(newText);
       newText = u.path();
     }
-    else if (newText.tqfind(" at ") != -1)
+    else if (newText.find(" at ") != -1)
     {
        // Anti-spam stuff
-       newText.tqreplace( " at ", "@" );
-       newText.tqreplace( " dot ", "." );
+       newText.replace( " at ", "@" );
+       newText.replace( " dot ", "." );
     }
-    else if (newText.tqfind("(at)") != -1)
+    else if (newText.find("(at)") != -1)
     {
-      newText.tqreplace( TQRegExp("\\s*\\(at\\)\\s*"), "@" );
+      newText.replace( TQRegExp("\\s*\\(at\\)\\s*"), "@" );
     }
 
     TQString contents = text();
@@ -293,7 +293,7 @@ void AddressLineEdit::doCompletion(bool ctrlT)
     TQString prevAddr;    
     
     TQString s(text());    
-    int n = s.tqfindRev(',');
+    int n = s.findRev(',');
         
     if (n >= 0)
     {
@@ -343,7 +343,7 @@ void AddressLineEdit::doCompletion(bool ctrlT)
             items += s_completion->substringCompletion( '<' + s );
             uint beforeDollarCompletionCount = items.count();
 
-            if( s.tqfind( ' ' ) == -1 ) // one word, possibly given name
+            if( s.find( ' ' ) == -1 ) // one word, possibly given name
                 items += s_completion->allMatches( "$$" + s );
 
             if ( !items.isEmpty() )
@@ -355,7 +355,7 @@ void AddressLineEdit::doCompletion(bool ctrlT)
                          it != items.end();
                          ++it )
                     { 
-                        int pos = (*it).tqfind( '$', 2 );
+                        int pos = (*it).find( '$', 2 );
                         if( pos < 0 ) // ???
                             continue;
                         (*it)=(*it).mid( pos + 1 );
@@ -373,7 +373,7 @@ void AddressLineEdit::doCompletion(bool ctrlT)
                 
                 if (!autoSuggest)
                 {
-                    int index = items.first().tqfind( s );
+                    int index = items.first().find( s );
                     TQString newText = prevAddr + items.first().mid( index );
                     //kdDebug() << "OLD TEXT: " << text() << endl;
                     //kdDebug() << "NEW TEXT: " << newText << endl;
@@ -437,11 +437,11 @@ void AddressLineEdit::loadAddresses()
 void AddressLineEdit::addAddress( const TQString& adr )
 {
     s_completion->addItem( adr );
-    int pos = adr.tqfind( '<' );
+    int pos = adr.find( '<' );
     if( pos >= 0 )
     {
         ++pos;
-        int pos2 = adr.tqfind( pos, '>' );
+        int pos2 = adr.find( pos, '>' );
         if( pos2 >= 0 )
             s_completion->addItem( adr.mid( pos, pos2 - pos ));
     }
@@ -465,7 +465,7 @@ void AddressLineEdit::startLoadingLDAPEntries()
     TQString s( *s_LDAPText );
     // TODO cache last?
     TQString prevAddr;
-    int n = s.tqfindRev(',');
+    int n = s.findRev(',');
     if (n>= 0)
     {
         prevAddr = s.left(n+1) + ' ';
@@ -484,8 +484,8 @@ void AddressLineEdit::slotLDAPSearchData( const TQStringList& adrs )
         return;
     for( TQStringList::ConstIterator it = adrs.begin(); it != adrs.end(); ++it ) {
         TQString name(*it);
-        int pos = name.tqfind( " <" );
-        int pos_comma = name.tqfind( ',' );
+        int pos = name.find( " <" );
+        int pos_comma = name.find( ',' );
         // put name in quotes, if we have a comma in the name
         if (pos>0 && pos_comma>0 && pos_comma<pos) {
           name.insert(pos, '\"');
@@ -577,18 +577,18 @@ TQStringList AddressLineEdit::addresses()
     for ( mit = emails.begin(); mit != emails.end(); ++mit ) {
       email = *mit;
       if (!email.isEmpty()) {
-        if (n.isEmpty() || (email.tqfind( '<' ) != -1))
+        if (n.isEmpty() || (email.find( '<' ) != -1))
           addr = TQString::null;
         else { /* do we really need quotes around this name ? */
-                if (n.tqfind(needQuotes) != -1)
+                if (n.find(needQuotes) != -1)
             addr = '"' + n + endQuote;
           else
             addr = n + space;
         }
 
-        if (!addr.isEmpty() && (email.tqfind( '<' ) == -1)
-            && (email.tqfind( '>' ) == -1)
-            && (email.tqfind( ',' ) == -1))
+        if (!addr.isEmpty() && (email.find( '<' ) == -1)
+            && (email.find( '>' ) == -1)
+            && (email.find( ',' ) == -1))
           addr += '<' + email + '>';
         else
           addr += email;
diff --git a/kabc/addresslineedit.h b/kabc/addresslineedit.h
index ed045bd54..093acf97b 100644
--- a/kabc/addresslineedit.h
+++ b/kabc/addresslineedit.h
@@ -40,7 +40,7 @@ class LdapSearch;
  * A lineedit with LDAP and kabc completion
  *
  * This lineedit is supposed to be used wherever the user types email addresses
- * and might want a completion. You can simply use it as a tqreplacement for
+ * and might want a completion. You can simply use it as a replacement for
  * KLineEdit or TQLineEdit.
  *
  * You can enable or disable the lineedit at any time.
diff --git a/kabc/agent.cpp b/kabc/agent.cpp
index 571b7803e..d21fa2998 100644
--- a/kabc/agent.cpp
+++ b/kabc/agent.cpp
@@ -124,7 +124,7 @@ TQString Agent::asString() const
 
 TQDataStream &KABC::operator<<( TQDataStream &s, const Agent &agent )
 {
-  TQ_UINT32 hasAddressee = ( agent.mAddressee != 0 );
+  Q_UINT32 hasAddressee = ( agent.mAddressee != 0 );
 
   s << agent.mIntern << agent.mUrl << hasAddressee;
   if ( hasAddressee )
@@ -135,7 +135,7 @@ TQDataStream &KABC::operator<<( TQDataStream &s, const Agent &agent )
 
 TQDataStream &KABC::operator>>( TQDataStream &s, Agent &agent )
 {
-  TQ_UINT32 hasAddressee;
+  Q_UINT32 hasAddressee;
 
   s >> agent.mIntern >> agent.mUrl >> hasAddressee;
 
diff --git a/kabc/countrytransl.map b/kabc/countrytransl.map
index e999f576b..1459f0942 100644
--- a/kabc/countrytransl.map
+++ b/kabc/countrytransl.map
@@ -1901,32 +1901,32 @@ Kokos (Keeling) Utrawları	cc
 Iyes Cocos	cc
 科科斯群岛	cc
 ��斯群島	cc
-Congo, The Detqmocratic Republic of the	cd
+Congo, The Democratic Republic of the	cd
 Kongo, Demokratiese republiek van die	cd
 Д�макратычна� Р��публіка Конга	cd
 ДР Конго	cd
 কঙ�গোর গণতান�ত�রিক প�রজাতন�ত�র	cd
 Kongo, Demokratska republika	cd
-Congo, República Detqmocràtica del	cd
+Congo, República Democràtica del	cd
 Kongo	cd
-Congo, Gweriniaeth Detqmocrataidd y	cd
+Congo, Gweriniaeth Democrataidd y	cd
 Congo, den demokratiske republik	cd
 Kongo, Republik	cd
 Κονγκό, Δημοκ�ατία του	cd
 Kongo, la Demokratia Respubliko de la	cd
-Congo, República detqmocrática del	cd
+Congo, República democrática del	cd
 Kongo (DV)	cd
 Kongoko Errepublika Demokratikoa	cd
 Kongon demokraattinen tasavalta	cd
-République Détqmocratique du Congo	cd
-Kongo, de detqmocratische republyk van de	cd
+République Démocratique du Congo	cd
+Kongo, de democratische republyk van de	cd
 Poblacht Dhaonlathach an Chongó	cd
-Congo, República Detqmocrática do	cd
+Congo, República Democrática do	cd
 קונגו, הרפובליקה הדמוקרטית של	cd
 डेमोक�रेटिक रिपब�लिक ऑफ कॉगो	cd
 Kongói Demokratikus Köztársaság	cd
 Kongó, Austur	cd
-Congo, Repubblica Detqmocratica del	cd
+Congo, Repubblica Democratica del	cd
 コンゴ,民主共和国	cd
 សាធារណរដ្ឋ​ប្រជាធិប��យ្យ​កុងហ្គោ	cd
 Kongo demokratinÄ— respublika	cd
@@ -1935,13 +1935,13 @@ Kongo demokr�tisk� republika	cd
 Kongo (RD)	cd
 Kongo	cd
 Kongo (De demokraatsche Republiek)	cd
-Congo, Detqmocratische republiek	cd
+Congo, Democratische republiek	cd
 Kongo	cd
 ਕਾਂਗੋ, ਲੋਕਤੰਤਰੀ ਗਣਰਾਜ	cd
 Republika Demokratyczna Kongo	cd
-Congo, República Detqmocrática do	cd
-República Detqmocrática do Congo	cd
-Congo, Republica Detqmocrată	cd
+Congo, República Democrática do	cd
+República Democrática do Congo	cd
+Congo, Republica Democrată	cd
 Демократиче�ка� Ре�публика Конго	cd
 Kongo, Repubulika Iharanira Demokarasi ya	cd
 Kongo	cd
@@ -1957,7 +1957,7 @@ Demokratik Kongo Cumhuriyeti	cd
 Kongo, Demokrat Cömhüriäte	cd
 Конго, демократична ре�публіка	cd
 Конго Демократик Ре�публика�и	cd
-Congo, republike detqmocratike	cd
+Congo, republike democratike	cd
 刚果民主共和国	cd
 剛果民主共和國	cd
 Central African Republic	cf
@@ -3679,7 +3679,7 @@ Finlandiya	fi
 Finska	fi
 Finlàndia	fi
 Finsko	fi
-Y Ftqfindir	fi
+Y Ffindir	fi
 Finnland	fi
 Φινλανδία	fi
 Finnlando	fi
diff --git a/kabc/distributionlist.cpp b/kabc/distributionlist.cpp
index 2fa089bd3..ee2f2e30a 100644
--- a/kabc/distributionlist.cpp
+++ b/kabc/distributionlist.cpp
@@ -60,7 +60,7 @@ void DistributionList::insertEntry( const Addressee &a, const TQString &email )
   for( it = mEntries.begin(); it != mEntries.end(); ++it ) {
     if ( (*it).addressee.uid() == a.uid() ) {
       /**
-        We have to check if both email addresses tqcontains no data,
+        We have to check if both email addresses contains no data,
         a simple 'email1 == email2' wont work here
        */
       if ( ( (*it).email.isNull() && email.isEmpty() ) ||
@@ -211,7 +211,7 @@ bool DistributionListManager::load()
 
       kdDebug(5700) << "----- Entry " << id << endl; 
       
-      Addressee a = d->mAddressBook->tqfindByUid( id );
+      Addressee a = d->mAddressBook->findByUid( id );
       if ( !a.isEmpty() ) {
         list->insertEntry( a, email );
       } else {
@@ -250,7 +250,7 @@ bool DistributionListManager::save()
       value.append( (*it).email );
     }
 
-    if ( d->mMissingEntries.tqfind( list->name() ) != d->mMissingEntries.end() ) {
+    if ( d->mMissingEntries.find( list->name() ) != d->mMissingEntries.end() ) {
       const MissingEntryList missList = d->mMissingEntries[ list->name() ];
       MissingEntryList::ConstIterator missIt;
       for ( missIt = missList.begin(); missIt != missList.end(); ++missIt ) {
@@ -270,7 +270,7 @@ bool DistributionListManager::save()
 DistributionListWatcher* DistributionListWatcher::mSelf = 0;
 
 DistributionListWatcher::DistributionListWatcher()
- : TQObject( tqApp, "DistributionListWatcher" )
+ : TQObject( qApp, "DistributionListWatcher" )
 {
   mDirWatch = new KDirWatch;
   mDirWatch->addFile( locateLocal( "data", "kabc/distlists" ) );
@@ -287,7 +287,7 @@ DistributionListWatcher::~DistributionListWatcher()
 
 DistributionListWatcher *DistributionListWatcher::self()
 {
-  kdWarning( !tqApp ) << "No TQApplication object available, you'll get a memleak!" << endl;
+  kdWarning( !qApp ) << "No TQApplication object available, you'll get a memleak!" << endl;
 
   if ( !mSelf )
     mSelf = new DistributionListWatcher();
diff --git a/kabc/distributionlist.h b/kabc/distributionlist.h
index 78d182467..7ad8dff81 100644
--- a/kabc/distributionlist.h
+++ b/kabc/distributionlist.h
@@ -186,7 +186,7 @@ class KABC_EXPORT DistributionListManager
   \endcode
 */
 
-class KABC_EXPORT DistributionListWatcher : public TQObject
+class KABC_EXPORT DistributionListWatcher : public QObject
 {
   Q_OBJECT
 
diff --git a/kabc/errorhandler.cpp b/kabc/errorhandler.cpp
index d8ab650c7..55b0f459d 100644
--- a/kabc/errorhandler.cpp
+++ b/kabc/errorhandler.cpp
@@ -50,6 +50,6 @@ GuiErrorHandler::GuiErrorHandler( TQWidget *parent )
 
 void GuiErrorHandler::error( const TQString &msg )
 {
-  if (tqApp)
+  if (qApp)
     KMessageBox::error( mParent, msg );
 }
diff --git a/kabc/formatplugin.h b/kabc/formatplugin.h
index 643a7021e..33f4beea0 100644
--- a/kabc/formatplugin.h
+++ b/kabc/formatplugin.h
@@ -64,7 +64,7 @@ public:
   virtual void saveAll( AddressBook *, Resource *, TQFile *file ) = 0;
     
   /**
-   * Checks if given file tqcontains the right format
+   * Checks if given file contains the right format
    */
   virtual bool checkFormat( TQFile *file ) const = 0;
 };
diff --git a/kabc/formats/Makefile.am b/kabc/formats/Makefile.am
index 2443cef24..0b5978b20 100644
--- a/kabc/formats/Makefile.am
+++ b/kabc/formats/Makefile.am
@@ -11,7 +11,7 @@ kabcformat_binary_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
 # these are the headers for your project
 noinst_HEADERS = binaryformat.h
 
-# let autotqmoc handle all of the meta source files (tqmoc)
+# let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
 
 messages: rc.cpp
diff --git a/kabc/formats/binaryformat.cpp b/kabc/formats/binaryformat.cpp
index d09be306b..d5e3cf499 100644
--- a/kabc/formats/binaryformat.cpp
+++ b/kabc/formats/binaryformat.cpp
@@ -66,7 +66,7 @@ bool BinaryFormat::loadAll( AddressBook*, Resource *resource, TQFile *file )
   if ( !checkHeader( stream ) )
     return false;
 
-  TQ_UINT32 entries;
+  Q_UINT32 entries;
 
   stream >> entries;
 
@@ -89,7 +89,7 @@ void BinaryFormat::save( const Addressee &addressee, TQFile *file )
 
   writeHeader( stream );
 
-  TQ_UINT32 entries = 1;
+  Q_UINT32 entries = 1;
   stream << entries;
   saveAddressee( addressee, stream );
 }
@@ -98,7 +98,7 @@ void BinaryFormat::saveAll( AddressBook*, Resource *resource, TQFile *file )
 {
   kdDebug(5700) << "BinaryFormat::saveAll()" << endl;
 
-  TQ_UINT32 counter = 0;
+  Q_UINT32 counter = 0;
   TQDataStream stream( file );
 
   writeHeader( stream );
@@ -113,7 +113,7 @@ void BinaryFormat::saveAll( AddressBook*, Resource *resource, TQFile *file )
   }
 
   // set real number of entries
-  stream.device()->at( 2 * sizeof( TQ_UINT32 ) );
+  stream.device()->at( 2 * sizeof( Q_UINT32 ) );
   stream << counter;
 }
 
@@ -128,7 +128,7 @@ bool BinaryFormat::checkFormat( TQFile *file ) const
 
 bool BinaryFormat::checkHeader( TQDataStream &stream ) const
 {
-  TQ_UINT32 magic, version;
+  Q_UINT32 magic, version;
     
   stream >> magic >> version;
 
@@ -154,7 +154,7 @@ bool BinaryFormat::checkHeader( TQDataStream &stream ) const
 
 void BinaryFormat::writeHeader( TQDataStream &stream )
 {
-  TQ_UINT32 magic, version;
+  Q_UINT32 magic, version;
     
   magic = 0x2e93e;
   version = BINARY_FORMAT_VERSION;
diff --git a/kabc/geo.h b/kabc/geo.h
index 0da70899e..019e18199 100644
--- a/kabc/geo.h
+++ b/kabc/geo.h
@@ -72,7 +72,7 @@ class KABC_EXPORT Geo
     float longitude() const;
   
     /**
-      Returns, if this object tqcontains a valid geographical position.
+      Returns, if this object contains a valid geographical position.
     */
     bool isValid() const;
     
diff --git a/kabc/kab2kabc.cpp b/kabc/kab2kabc.cpp
index e78847b91..9d8ea75ee 100644
--- a/kabc/kab2kabc.cpp
+++ b/kabc/kab2kabc.cpp
@@ -58,7 +58,7 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
   TQString comment;
 
   if ( entry.at( entry.length() -1 ) == ')' ) {
-    int br = entry.tqfindRev( '(' );
+    int br = entry.findRev( '(' );
     if ( br >= 0 ) {
       comment = entry.mid( br + 1, entry.length() - br - 2 );
       entry.truncate( br );
@@ -68,7 +68,7 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
     }
   }
 
-  int posSpace = entry.tqfindRev( ' ' );
+  int posSpace = entry.findRev( ' ' );
   if ( posSpace < 0 ) {
     email = entry;
     if ( !comment.isEmpty() ) {
@@ -91,7 +91,7 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
   }
 
   if ( name.at( name.length() -1 ) == ')' ) {
-    int br = name.tqfindRev( '(' );
+    int br = name.findRev( '(' );
     if ( br >= 0 ) {
       comment = name.mid( br + 1, name.length() - br - 2 ) + " " + comment;
       name.truncate( br );
@@ -105,7 +105,7 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
   kdDebug() << "  NAME    : " << name    << endl;
   kdDebug() << "  COMMENT : " << comment << endl;
 
-  KABC::Addressee::List al = ab->tqfindByEmail( email );
+  KABC::Addressee::List al = ab->findByEmail( email );
   if ( al.isEmpty() ) {
     KABC::Addressee a;
     a.setNameFromString( name );
@@ -128,7 +128,7 @@ void importKMailAddressBook( KABC::AddressBook *ab )
     fileName = cfg.readPathEntry( "default", fileName );
   }
   if ( !KStandardDirs::exists( fileName ) ) {
-    kdDebug(5700) << "Couldn't tqfind KMail addressbook." << endl;
+    kdDebug(5700) << "Couldn't find KMail addressbook." << endl;
     return;
   }
 
@@ -180,7 +180,7 @@ void readKAddressBookEntries( const TQString &dataString, Addressee &a )
 
   TQStringList::ConstIterator it;
   for ( it = entries.begin(); it != entries.end(); ++it ) {
-    int pos = (*it).tqfind( "\n" );
+    int pos = (*it).find( "\n" );
     TQString fieldName = (*it).left( pos );
     TQString fieldValue = (*it).mid( pos + 2 );
 
@@ -325,7 +325,7 @@ void importKab( KABC::AddressBook *ab, bool override, bool quiet )
     TQStringList::ConstIterator customIt;
     for ( customIt = entry.custom.begin(); customIt != entry.custom.end(); ++customIt ) {
       if ( (*customIt).startsWith( "X-KABC-UID:" ) ) {
-        a.setUid( (*customIt).mid( (*customIt).tqfind( ":" ) + 1 ) );
+        a.setUid( (*customIt).mid( (*customIt).find( ":" ) + 1 ) );
         idFound = true;
       } else if ( (*customIt).startsWith( "KMail:1.0\n" ) ) {
         readKAddressBookEntries( *customIt, a );
diff --git a/kabc/key.h b/kabc/key.h
index 714a07745..ecc4492d8 100644
--- a/kabc/key.h
+++ b/kabc/key.h
@@ -99,7 +99,7 @@ public:
   TQString textData() const;
 
   /**
-   * Returns whether the key tqcontains binary or text data.
+   * Returns whether the key contains binary or text data.
    */
   bool isBinary() const;
 
diff --git a/kabc/ldapclient.cpp b/kabc/ldapclient.cpp
index 637d77da6..724f039ec 100644
--- a/kabc/ldapclient.cpp
+++ b/kabc/ldapclient.cpp
@@ -50,7 +50,7 @@ public:
 
 TQString LdapObject::toString() const
 {
-  TQString result = TQString::tqfromLatin1( "\ndn: %1\n" ).arg( dn );
+  TQString result = TQString::fromLatin1( "\ndn: %1\n" ).arg( dn );
   for ( LdapAttrMap::ConstIterator it = attrs.begin(); it != attrs.end(); ++it ) {
     TQString attr = it.key();
     for ( LdapAttrValue::ConstIterator it2 = (*it).begin(); it2 != (*it).end(); ++it2 ) {
@@ -306,11 +306,11 @@ void LdapSearch::startSearch( const TQString& txt )
 
   cancelSearch();
 
-  int pos = txt.tqfind( '\"' );
+  int pos = txt.find( '\"' );
   if( pos >= 0 )
   {
     ++pos;
-    int pos2 = txt.tqfind( '\"', pos );
+    int pos2 = txt.find( '\"', pos );
     if( pos2 >= 0 )
         mSearchText = txt.mid( pos , pos2 - pos );
     else
@@ -408,7 +408,7 @@ void LdapSearch::makeSearchData( TQStringList& ret, LdapResultList& resList )
     }
 
     LdapResult sr;
-    sr.clientNumber = mClients.tqfindIndex( (*it1).client );
+    sr.clientNumber = mClients.findIndex( (*it1).client );
     sr.name = name;
     sr.email = mail;
     resList.append( sr );
diff --git a/kabc/ldapclient.h b/kabc/ldapclient.h
index 2054b1302..b4ee9d749 100644
--- a/kabc/ldapclient.h
+++ b/kabc/ldapclient.h
@@ -82,7 +82,7 @@ class KABC_EXPORT LdapObject
   * We mean it!
   *
   */
-class KABC_EXPORT LdapClient : public TQObject
+class KABC_EXPORT LdapClient : public QObject
 {
   Q_OBJECT
 
@@ -204,7 +204,7 @@ typedef TQValueList<LdapResult> LdapResultList;
   * We mean it!
   *
   */
-class KABC_EXPORT LdapSearch : public TQObject
+class KABC_EXPORT LdapSearch : public QObject
 {
   Q_OBJECT
 
diff --git a/kabc/ldapconfigwidget.cpp b/kabc/ldapconfigwidget.cpp
index 671cac98f..a4b7fc571 100644
--- a/kabc/ldapconfigwidget.cpp
+++ b/kabc/ldapconfigwidget.cpp
@@ -129,7 +129,7 @@ void LdapConfigWidget::initWidget()
   if ( mFlags & W_PORT ) {
     label = new TQLabel( i18n( "Port:" ), this );
     mPort = new TQSpinBox( 0, 65535, 1, this, "kcfg_ldapport" );
-    mPort->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) );
+    mPort->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) );
     mPort->setValue( 389 );
 
     mainLayout->addWidget( label, row, col );
@@ -140,7 +140,7 @@ void LdapConfigWidget::initWidget()
   if ( mFlags & W_VER ) {
     label = new TQLabel( i18n( "LDAP version:" ), this );
     mVer = new TQSpinBox( 2, 3, 1, this, "kcfg_ldapver" );
-    mVer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) );
+    mVer->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) );
     mVer->setValue( 3 );
     mainLayout->addWidget( label, row, col );
     mainLayout->addWidget( mVer, row, col+1 );
@@ -151,7 +151,7 @@ void LdapConfigWidget::initWidget()
   if ( mFlags & W_SIZELIMIT ) {
     label = new TQLabel( i18n( "Size limit:" ), this );
     mSizeLimit = new TQSpinBox( 0, 9999999, 1, this, "kcfg_ldapsizelimit" );
-    mSizeLimit->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) );
+    mSizeLimit->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) );
     mSizeLimit->setValue( 0 );
     mSizeLimit->setSpecialValueText( i18n("Default") );
     mainLayout->addWidget( label, row, col );
@@ -162,7 +162,7 @@ void LdapConfigWidget::initWidget()
   if ( mFlags & W_TIMELIMIT ) {
     label = new TQLabel( i18n( "Time limit:" ), this );
     mTimeLimit = new TQSpinBox( 0, 9999999, 1, this, "kcfg_ldaptimelimit" );
-    mTimeLimit->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) );
+    mTimeLimit->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) );
     mTimeLimit->setValue( 0 );
     mTimeLimit->setSuffix( i18n(" sec") );
     mTimeLimit->setSpecialValueText( i18n("Default") );
diff --git a/kabc/ldapurl.cpp b/kabc/ldapurl.cpp
index ee08060a9..9032c16d3 100644
--- a/kabc/ldapurl.cpp
+++ b/kabc/ldapurl.cpp
@@ -58,14 +58,14 @@ void LDAPUrl::setDn( const TQString &dn)
 
 bool LDAPUrl::hasExtension( const TQString &key ) const
 {
-  return m_extensions.tqcontains( key );
+  return m_extensions.contains( key );
 }
 
 LDAPUrl::Extension LDAPUrl::extension( const TQString &key ) const
 {
   TQMap<TQString, Extension>::const_iterator it;
 
-  it = m_extensions.tqfind( key );
+  it = m_extensions.find( key );
   if ( it != m_extensions.constEnd() )
     return (*it);
   else {
@@ -195,7 +195,7 @@ void LDAPUrl::parseQuery()
       name.remove(0, 1);
     }
     kdDebug(5700) << "LDAPUrl extensions name= " << name << " value: " << value << endl;
-    ext.value = value.tqreplace( "%2", "," );
+    ext.value = value.replace( "%2", "," );
     setExtension( name, ext );
   }
 }
diff --git a/kabc/ldif.cpp b/kabc/ldif.cpp
index 2b8f4164c..19895fce5 100644
--- a/kabc/ldif.cpp
+++ b/kabc/ldif.cpp
@@ -112,9 +112,9 @@ bool LDIF::splitLine( const TQCString &line, TQString &fieldname, TQByteArray &v
 
 //  kdDebug(5700) << "splitLine line: " << TQString::fromUtf8(line) << endl;
 
-  position = line.tqfind( ":" );
+  position = line.find( ":" );
   if ( position == -1 ) {
-    // strange: we did not tqfind a fieldname
+    // strange: we did not find a fieldname
     fieldname = "";
     TQCString str;
     str = line.stripWhiteSpace();
@@ -259,7 +259,7 @@ LDIF::ParseVal LDIF::processLine()
           retval = EndEntry;
         } else if ( attrLower == "add" ) {
           mModType = Mod_Add;
-        } else if ( attrLower == "tqreplace" ) {
+        } else if ( attrLower == "replace" ) {
           mModType = Mod_Replace;
           mAttr = TQString::fromUtf8( mVal, mVal.size() );
           mVal.resize( 0 );
diff --git a/kabc/ldif.h b/kabc/ldif.h
index afdd92b4d..10cd15e18 100644
--- a/kabc/ldif.h
+++ b/kabc/ldif.h
@@ -96,7 +96,7 @@ namespace KABC {
      * Process the LDIF until a complete item can be returned
      * @returns NewEntry if a new DN encountered, 
      * Item if a new item returned, 
-     * Err if the LDIF tqcontains error,
+     * Err if the LDIF contains error,
      * EndEntry if the parser reached the end of the current entry
      * and MoreData if the parser encountered the end of the current chunk of 
      * the LDIF. If you want to finish the parsing after receiving 
diff --git a/kabc/ldifconverter.cpp b/kabc/ldifconverter.cpp
index 120e6f70a..6f875cffb 100644
--- a/kabc/ldifconverter.cpp
+++ b/kabc/ldifconverter.cpp
@@ -175,7 +175,7 @@ bool LDIFConverter::LDIFToAddressee( const TQString &str, AddresseeList &addrLis
   LDIF ldif;
   LDIF::ParseVal ret;
   const char *latinstr = str.latin1();
-  int latinstrlen = tqstrlen( latinstr );
+  int latinstrlen = qstrlen( latinstr );
   TQByteArray data;
   Addressee a;
   Address homeAddr, workAddr;
@@ -183,7 +183,7 @@ bool LDIFConverter::LDIFToAddressee( const TQString &str, AddresseeList &addrLis
   data.setRawData( latinstr, latinstrlen );
   ldif.setLDIF( data );
   if (!dt.isValid())
-    dt = TQDateTime::tqcurrentDateTime();
+    dt = TQDateTime::currentDateTime();
   a.setRevision(dt);
   homeAddr = Address( Address::Home );
   workAddr = Address( Address::Work );
@@ -235,7 +235,7 @@ bool LDIFConverter::evaluatePair( Addressee &a, Address &homeAddr,
                                   Address &workAddr,
                                   TQString &fieldname, TQString &value )
 {
-  if ( fieldname == TQString::tqfromLatin1( "dn" ) ) // ignore & return false!
+  if ( fieldname == TQString::fromLatin1( "dn" ) ) // ignore & return false!
     return false;
 
   if ( fieldname.startsWith("#") ) {
@@ -249,56 +249,56 @@ bool LDIFConverter::evaluatePair( Addressee &a, Address &homeAddr,
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "givenname" ) ) {
+  if ( fieldname == TQString::fromLatin1( "givenname" ) ) {
     a.setGivenName( value );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "xmozillanickname") ||
-       fieldname == TQString::tqfromLatin1( "nickname") ) {
+  if ( fieldname == TQString::fromLatin1( "xmozillanickname") ||
+       fieldname == TQString::fromLatin1( "nickname") ) {
     a.setNickName( value );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "sn" ) ) {
+  if ( fieldname == TQString::fromLatin1( "sn" ) ) {
     a.setFamilyName( value );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "uid" ) ) {
+  if ( fieldname == TQString::fromLatin1( "uid" ) ) {
     a.setUid( value );
     return true;
   }
-  if ( fieldname == TQString::tqfromLatin1( "mail" ) ||
-       fieldname == TQString::tqfromLatin1( "mozillasecondemail" ) ) { // mozilla
-    if ( a.emails().tqfindIndex( value ) == -1 )
+  if ( fieldname == TQString::fromLatin1( "mail" ) ||
+       fieldname == TQString::fromLatin1( "mozillasecondemail" ) ) { // mozilla
+    if ( a.emails().findIndex( value ) == -1 )
       a.insertEmail( value );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "title" ) ) {
+  if ( fieldname == TQString::fromLatin1( "title" ) ) {
     a.setTitle( value );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "vocation" ) ) {
+  if ( fieldname == TQString::fromLatin1( "vocation" ) ) {
     a.setPrefix( value );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "cn" ) ) {
+  if ( fieldname == TQString::fromLatin1( "cn" ) ) {
     a.setFormattedName( value );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "o" ) ||
-       fieldname == TQString::tqfromLatin1( "organization" ) ||      // Exchange
-       fieldname == TQString::tqfromLatin1( "organizationname" ) ) { // Exchange
+  if ( fieldname == TQString::fromLatin1( "o" ) ||
+       fieldname == TQString::fromLatin1( "organization" ) ||      // Exchange
+       fieldname == TQString::fromLatin1( "organizationname" ) ) { // Exchange
     a.setOrganization( value );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "description" ) ) {
+  if ( fieldname == TQString::fromLatin1( "description" ) ) {
 addComment:
     if ( !a.note().isEmpty() )
       a.setNote( a.note() + "\n" );
@@ -306,15 +306,15 @@ addComment:
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "custom1" ) ||
-       fieldname == TQString::tqfromLatin1( "custom2" ) ||
-       fieldname == TQString::tqfromLatin1( "custom3" ) ||
-       fieldname == TQString::tqfromLatin1( "custom4" ) ) {
+  if ( fieldname == TQString::fromLatin1( "custom1" ) ||
+       fieldname == TQString::fromLatin1( "custom2" ) ||
+       fieldname == TQString::fromLatin1( "custom3" ) ||
+       fieldname == TQString::fromLatin1( "custom4" ) ) {
     goto addComment;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "homeurl" ) ||
-       fieldname == TQString::tqfromLatin1( "workurl" ) ) {
+  if ( fieldname == TQString::fromLatin1( "homeurl" ) ||
+       fieldname == TQString::fromLatin1( "workurl" ) ) {
     if (a.url().isEmpty()) {
       a.setUrl( KURL( value ) );
       return true;
@@ -325,139 +325,139 @@ addComment:
     // TODO: change this with KDE 4
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "homephone" ) ) {
+  if ( fieldname == TQString::fromLatin1( "homephone" ) ) {
     a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Home ) );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "telephonenumber" ) ) {
+  if ( fieldname == TQString::fromLatin1( "telephonenumber" ) ) {
     a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Work ) );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "mobile" ) ) { 	// mozilla/Netscape 7
+  if ( fieldname == TQString::fromLatin1( "mobile" ) ) { 	// mozilla/Netscape 7
     a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Cell ) );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "cellphone" ) ) {
+  if ( fieldname == TQString::fromLatin1( "cellphone" ) ) {
     a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Cell ) );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "pager" )  ||       // mozilla
-       fieldname == TQString::tqfromLatin1( "pagerphone" ) ) {  // mozilla
+  if ( fieldname == TQString::fromLatin1( "pager" )  ||       // mozilla
+       fieldname == TQString::fromLatin1( "pagerphone" ) ) {  // mozilla
     a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Pager ) );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "facsimiletelephonenumber" ) ) {
+  if ( fieldname == TQString::fromLatin1( "facsimiletelephonenumber" ) ) {
     a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Fax ) );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "xmozillaanyphone" ) ) { // mozilla
+  if ( fieldname == TQString::fromLatin1( "xmozillaanyphone" ) ) { // mozilla
     a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Work ) );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "street" ) ||
-       fieldname == TQString::tqfromLatin1( "streethomeaddress" ) ) {
+  if ( fieldname == TQString::fromLatin1( "street" ) ||
+       fieldname == TQString::fromLatin1( "streethomeaddress" ) ) {
     homeAddr.setStreet( value );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "postaladdress" ) ) {  // mozilla
+  if ( fieldname == TQString::fromLatin1( "postaladdress" ) ) {  // mozilla
     workAddr.setStreet( value );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "mozillapostaladdress2" ) ) {  // mozilla
-    workAddr.setStreet( workAddr.street() + TQString::tqfromLatin1( "\n" ) + value );
+  if ( fieldname == TQString::fromLatin1( "mozillapostaladdress2" ) ) {  // mozilla
+    workAddr.setStreet( workAddr.street() + TQString::fromLatin1( "\n" ) + value );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "postalcode" ) ) {
+  if ( fieldname == TQString::fromLatin1( "postalcode" ) ) {
     workAddr.setPostalCode( value );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "postofficebox" ) ) {
+  if ( fieldname == TQString::fromLatin1( "postofficebox" ) ) {
     workAddr.setPostOfficeBox( value );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "homepostaladdress" ) ) {  // Netscape 7
+  if ( fieldname == TQString::fromLatin1( "homepostaladdress" ) ) {  // Netscape 7
     homeAddr.setStreet( value );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "mozillahomepostaladdress2" ) ) {  // mozilla
-    homeAddr.setStreet( homeAddr.street() + TQString::tqfromLatin1( "\n" ) + value );
+  if ( fieldname == TQString::fromLatin1( "mozillahomepostaladdress2" ) ) {  // mozilla
+    homeAddr.setStreet( homeAddr.street() + TQString::fromLatin1( "\n" ) + value );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "mozillahomelocalityname" ) ) {  // mozilla
+  if ( fieldname == TQString::fromLatin1( "mozillahomelocalityname" ) ) {  // mozilla
     homeAddr.setLocality( value );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "mozillahomestate" )	) { // mozilla
+  if ( fieldname == TQString::fromLatin1( "mozillahomestate" )	) { // mozilla
     homeAddr.setRegion( value );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "mozillahomepostalcode" ) ) {  // mozilla
+  if ( fieldname == TQString::fromLatin1( "mozillahomepostalcode" ) ) {  // mozilla
     homeAddr.setPostalCode( value );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "mozillahomecountryname" ) ) { // mozilla
+  if ( fieldname == TQString::fromLatin1( "mozillahomecountryname" ) ) { // mozilla
     if ( value.length() <= 2 )
       value = Address::ISOtoCountry(value);
     homeAddr.setCountry( value );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "locality" ) ) {
+  if ( fieldname == TQString::fromLatin1( "locality" ) ) {
     workAddr.setLocality( value );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "streetaddress" ) ) { // Netscape 4.x
+  if ( fieldname == TQString::fromLatin1( "streetaddress" ) ) { // Netscape 4.x
     workAddr.setStreet( value );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "countryname" ) ||
-       fieldname == TQString::tqfromLatin1( "c" ) ) {  // mozilla
+  if ( fieldname == TQString::fromLatin1( "countryname" ) ||
+       fieldname == TQString::fromLatin1( "c" ) ) {  // mozilla
     if ( value.length() <= 2 )
       value = Address::ISOtoCountry(value);
     workAddr.setCountry( value );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "l" ) ) {  // mozilla
+  if ( fieldname == TQString::fromLatin1( "l" ) ) {  // mozilla
     workAddr.setLocality( value );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "st" ) ) {
+  if ( fieldname == TQString::fromLatin1( "st" ) ) {
     workAddr.setRegion( value );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "ou" ) ) {
+  if ( fieldname == TQString::fromLatin1( "ou" ) ) {
     a.setRole( value );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "department" ) ) {
+  if ( fieldname == TQString::fromLatin1( "department" ) ) {
     a.setDepartment( value );
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "member" ) ) {
+  if ( fieldname == TQString::fromLatin1( "member" ) ) {
     // this is a mozilla list member (cn=xxx, mail=yyy)
     TQStringList list( TQStringList::split( ',', value ) );
     TQString name, email;
@@ -476,8 +476,8 @@ addComment:
     return true;
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "modifytimestamp" ) ) {
-    if (value == TQString::tqfromLatin1("0Z")) // ignore
+  if ( fieldname == TQString::fromLatin1( "modifytimestamp" ) ) {
+    if (value == TQString::fromLatin1("0Z")) // ignore
       return true;
     TQDateTime dt = VCardStringToDate( value );
     if ( dt.isValid() ) {
@@ -486,7 +486,7 @@ addComment:
     }
   }
 
-  if ( fieldname == TQString::tqfromLatin1( "objectclass" ) ) // ignore
+  if ( fieldname == TQString::fromLatin1( "objectclass" ) ) // ignore
     return true;
 
   kdWarning() << TQString("LDIFConverter: Unknown field for '%1': '%2=%3'\n")
@@ -528,7 +528,7 @@ TQString LDIFConverter::makeLDIFfieldString( TQString formatStr, TQString value,
     return TQString();
 
   // append format if not given
-  if (formatStr.tqfind(':') == -1)
+  if (formatStr.find(':') == -1)
     formatStr.append(": %1\n");
 
   // check if base64-encoding is needed
@@ -542,13 +542,13 @@ TQString LDIFConverter::makeLDIFfieldString( TQString formatStr, TQString value,
      }
   }
 
-  if (printable) // always encode if we tqfind special chars...
-    printable = (value.tqfind('\n') == -1);
+  if (printable) // always encode if we find special chars...
+    printable = (value.find('\n') == -1);
 
   if (!printable && allowEncode) {
     // encode to base64
     value = KCodecs::base64Encode( value.utf8() );
-    int p = formatStr.tqfind(':');
+    int p = formatStr.find(':');
     if (p>=0)
       formatStr.insert(p, ':');
   }
diff --git a/kabc/ldifconverter.h b/kabc/ldifconverter.h
index a2225ad2d..a8052a65f 100644
--- a/kabc/ldifconverter.h
+++ b/kabc/ldifconverter.h
@@ -44,7 +44,7 @@ namespace KABC {
    * @param dt          The date & time value of the last modification (e.g. file modification time).
    * @since 3.2
    */
-  KABC_EXPORT bool LDIFToAddressee( const TQString &str, AddresseeList &addrList, TQDateTime dt = TQDateTime::tqcurrentDateTime() );
+  KABC_EXPORT bool LDIFToAddressee( const TQString &str, AddresseeList &addrList, TQDateTime dt = TQDateTime::currentDateTime() );
 
   /**
    * Converts a list of addressees to a LDIF string.
diff --git a/kabc/lock.cpp b/kabc/lock.cpp
index fd300cfca..b5e0ea5a6 100644
--- a/kabc/lock.cpp
+++ b/kabc/lock.cpp
@@ -38,7 +38,7 @@ using namespace KABC;
 Lock::Lock( const TQString &identifier )
   : mIdentifier( identifier )
 {
-  mIdentifier.tqreplace( "/", "_" );
+  mIdentifier.replace( "/", "_" );
 }
 
 Lock::~Lock()
@@ -101,7 +101,7 @@ bool Lock::lock()
                       << endl;
     } else {
       TQString identifier( mIdentifier );
-      identifier.tqreplace( '_', '/' );
+      identifier.replace( '_', '/' );
 
       mError = i18n("The address book '%1' is locked by application '%2'.\nIf you believe this is incorrect, just remove the lock file from '%3'")
                .arg( identifier ).arg( app ).arg( locateLocal( "data", "kabc/lock/*.lock" ) );
diff --git a/kabc/lock.h b/kabc/lock.h
index b682ea9e2..95f5c87a3 100644
--- a/kabc/lock.h
+++ b/kabc/lock.h
@@ -32,7 +32,7 @@ namespace KABC {
   This class provides locking functionality for a file, directory or an
   arbitrary string-represented resource.
 */
-class KABC_EXPORT Lock : public TQObject
+class KABC_EXPORT Lock : public QObject
 {
     Q_OBJECT
   public:
diff --git a/kabc/phonenumber.cpp b/kabc/phonenumber.cpp
index ec4e79e56..31a99f9ea 100644
--- a/kabc/phonenumber.cpp
+++ b/kabc/phonenumber.cpp
@@ -53,8 +53,8 @@ void PhoneNumber::validateNumber( const TQString &number )
   mNumber = number;
 
   // remove line breaks
-  mNumber = mNumber.tqreplace( '\n', "" );
-  mNumber = mNumber.tqreplace( '\r', "" );
+  mNumber = mNumber.replace( '\n', "" );
+  mNumber = mNumber.replace( '\r', "" );
 }
 
 bool PhoneNumber::operator==( const PhoneNumber &p ) const
diff --git a/kabc/plugins/dir/resourcedir.cpp b/kabc/plugins/dir/resourcedir.cpp
index 38fdf11e3..0897c9cee 100644
--- a/kabc/plugins/dir/resourcedir.cpp
+++ b/kabc/plugins/dir/resourcedir.cpp
@@ -258,7 +258,7 @@ bool ResourceDir::asyncSave( Ticket *ticket )
 void ResourceDir::setPath( const TQString &path )
 {
   mDirWatch.stopScan();
-  if ( mDirWatch.tqcontains( mPath ) )
+  if ( mDirWatch.contains( mPath ) )
     mDirWatch.removeDir( mPath );
 
   mPath = path;
diff --git a/kabc/plugins/dir/resourcedirconfig.cpp b/kabc/plugins/dir/resourcedirconfig.cpp
index 41774b593..819d75d96 100644
--- a/kabc/plugins/dir/resourcedirconfig.cpp
+++ b/kabc/plugins/dir/resourcedirconfig.cpp
@@ -82,7 +82,7 @@ void ResourceDirConfig::loadSettings( KRES::Resource *res )
     return;
   }
 
-  mFormatBox->setCurrentItem( mFormatTypes.tqfindIndex( resource->format() ) );
+  mFormatBox->setCurrentItem( mFormatTypes.findIndex( resource->format() ) );
 
   mFileNameEdit->setURL( resource->path() );
   if ( mFileNameEdit->url().isEmpty() )
diff --git a/kabc/plugins/evolution/dbwrapper.cpp b/kabc/plugins/evolution/dbwrapper.cpp
index c7f526b47..bcc641191 100644
--- a/kabc/plugins/evolution/dbwrapper.cpp
+++ b/kabc/plugins/evolution/dbwrapper.cpp
@@ -145,7 +145,7 @@ DBIterator DBWrapper::end() {
 
     return it;
 }
-bool DBWrapper::tqfind( const TQString& _key,  TQString& _val ) {
+bool DBWrapper::find( const TQString& _key,  TQString& _val ) {
     DBT key, val;
     ::memset(&key, 0, sizeof(key) );
     ::memset(&val, 0, sizeof(val) );
diff --git a/kabc/plugins/evolution/dbwrapper.h b/kabc/plugins/evolution/dbwrapper.h
index 4c6511984..e5e0a2c33 100644
--- a/kabc/plugins/evolution/dbwrapper.h
+++ b/kabc/plugins/evolution/dbwrapper.h
@@ -44,7 +44,7 @@ namespace Evolution {
         DBIterator begin();
         DBIterator end();
 
-        bool tqfind( const TQString& key, TQString& value );
+        bool find( const TQString& key, TQString& value );
         bool add( const TQString& key,  const TQString& val );
         bool remove( const TQString& key );
     private:
diff --git a/kabc/plugins/evolution/resourceevo.cpp b/kabc/plugins/evolution/resourceevo.cpp
index 90c566925..a93d7d2a1 100644
--- a/kabc/plugins/evolution/resourceevo.cpp
+++ b/kabc/plugins/evolution/resourceevo.cpp
@@ -51,7 +51,7 @@ bool ResourceEvolution::doOpen() {
     }
 
     TQString val;
-    if (!mWrap->tqfind( "PAS-DB-VERSION", val ) )
+    if (!mWrap->find( "PAS-DB-VERSION", val ) )
         return false;
 
     if (!val.startsWith("0.2") )
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp
index 3037ec334..b391dffa5 100644
--- a/kabc/plugins/file/resourcefile.cpp
+++ b/kabc/plugins/file/resourcefile.cpp
@@ -319,7 +319,7 @@ bool ResourceFile::asyncSave( Ticket *ticket )
 void ResourceFile::setFileName( const TQString &fileName )
 {
   mDirWatch.stopScan();
-  if ( mDirWatch.tqcontains( mFileName ) )
+  if ( mDirWatch.contains( mFileName ) )
     mDirWatch.removeFile( mFileName );
 
   mFileName = fileName;
diff --git a/kabc/plugins/file/resourcefileconfig.cpp b/kabc/plugins/file/resourcefileconfig.cpp
index 51cfdcfcf..92b07594f 100644
--- a/kabc/plugins/file/resourcefileconfig.cpp
+++ b/kabc/plugins/file/resourcefileconfig.cpp
@@ -86,7 +86,7 @@ void ResourceFileConfig::loadSettings( KRES::Resource *res  )
     return;
   }
 
-  mFormatBox->setCurrentItem( mFormatTypes.tqfindIndex( resource->format() ) );
+  mFormatBox->setCurrentItem( mFormatTypes.findIndex( resource->format() ) );
 
   mFileNameEdit->setURL( resource->fileName() );
   if ( mFileNameEdit->url().isEmpty() )
diff --git a/kabc/plugins/ldapkio/resourceldapkio.cpp b/kabc/plugins/ldapkio/resourceldapkio.cpp
index 481672427..df0baf455 100644
--- a/kabc/plugins/ldapkio/resourceldapkio.cpp
+++ b/kabc/plugins/ldapkio/resourceldapkio.cpp
@@ -125,7 +125,7 @@ void ResourceLDAPKIO::enter_loop()
   TQWidget dummy(0,0,WType_Dialog | WShowModal);
   dummy.setFocusPolicy( TQWidget::NoFocus );
   qt_enter_modal(&dummy);
-  tqApp->enter_loop();
+  qApp->enter_loop();
   qt_leave_modal(&dummy);
 }
 
@@ -139,7 +139,7 @@ void ResourceLDAPKIO::entries( KIO::Job*, const KIO::UDSEntryList & list )
       if ( (*it2).m_uds == KIO::UDS_URL ) {
         KURL tmpurl( (*it2).m_str );
         d->mResultDn = tmpurl.path();
-        kdDebug(7125) << "tqfindUid(): " << d->mResultDn << endl;
+        kdDebug(7125) << "findUid(): " << d->mResultDn << endl;
         if ( d->mResultDn.startsWith("/") ) d->mResultDn.remove(0,1);
         return;
       }
@@ -154,10 +154,10 @@ void ResourceLDAPKIO::listResult( KIO::Job *job)
     mErrorMsg = job->errorString();
   else 
     mErrorMsg = "";
-  tqApp->exit_loop();
+  qApp->exit_loop();
 }
 
-TQString ResourceLDAPKIO::tqfindUid( const TQString &uid ) 
+TQString ResourceLDAPKIO::findUid( const TQString &uid ) 
 {
   LDAPUrl url( d->mLDAPUrl );
   KIO::UDSEntry entry;
@@ -168,7 +168,7 @@ TQString ResourceLDAPKIO::tqfindUid( const TQString &uid )
   url.setFilter( "(" + mAttributes[ "uid" ] + "=" + uid + ")" + mFilter );
   url.setExtension( "x-dir", "one" );
 
-  kdDebug(7125) << "ResourceLDAPKIO::tqfindUid() uid: " << uid << " url " << 
+  kdDebug(7125) << "ResourceLDAPKIO::findUid() uid: " << uid << " url " << 
     url.prettyURL() << endl;
   
   KIO::ListJob * listJob = KIO::listDir( url, false /* no GUI */ );
@@ -186,7 +186,7 @@ TQCString ResourceLDAPKIO::addEntry( const TQString &attr, const TQString &value
 {
   TQCString tmp;
   if ( !attr.isEmpty() ) {
-    if ( mod ) tmp += LDIF::assembleLine( "tqreplace", attr ) + "\n";
+    if ( mod ) tmp += LDIF::assembleLine( "replace", attr ) + "\n";
     tmp += LDIF::assembleLine( attr, value ) + "\n";
     if ( mod ) tmp += "-\n"; 
   }
@@ -278,7 +278,7 @@ bool ResourceLDAPKIO::AddresseeToLDIF( TQByteArray &ldif, const Addressee &addr,
   
   if ( !mAttributes[ "mail" ].isEmpty() ) {
     if ( mod ) tmp += 
-      LDIF::assembleLine( "tqreplace", mAttributes[ "mail" ] ) + "\n";
+      LDIF::assembleLine( "replace", mAttributes[ "mail" ] ) + "\n";
     if ( mailIt != emails.end() ) {
       tmp += LDIF::assembleLine( mAttributes[ "mail" ], *mailIt ) + "\n";
       mailIt ++;
@@ -288,7 +288,7 @@ bool ResourceLDAPKIO::AddresseeToLDIF( TQByteArray &ldif, const Addressee &addr,
     
   if ( !mAttributes[ "mailAlias" ].isEmpty() ) {
     if ( mod && mAttributes[ "mail" ] != mAttributes[ "mailAlias" ] ) tmp += 
-      LDIF::assembleLine( "tqreplace", mAttributes[ "mailAlias" ] ) + "\n";
+      LDIF::assembleLine( "replace", mAttributes[ "mailAlias" ] ) + "\n";
     for ( ; mailIt != emails.end(); ++mailIt ) {
       tmp += LDIF::assembleLine( mAttributes[ "mailAlias" ], *mailIt ) + "\n" ;
     }
@@ -302,7 +302,7 @@ bool ResourceLDAPKIO::AddresseeToLDIF( TQByteArray &ldif, const Addressee &addr,
     addr.photo().data().save( &buffer, "JPEG" );
     
     if ( mod ) tmp += 
-      LDIF::assembleLine( "tqreplace", mAttributes[ "jpegPhoto" ] ) + "\n";
+      LDIF::assembleLine( "replace", mAttributes[ "jpegPhoto" ] ) + "\n";
     tmp += LDIF::assembleLine( mAttributes[ "jpegPhoto" ], pic, 76 ) + "\n";
     if ( mod ) tmp += "-\n";
   }
@@ -330,49 +330,49 @@ void ResourceLDAPKIO::init()
     handle them in the load() method below.
     These are the default values
    */
-  if ( !mAttributes.tqcontains("objectClass") )
+  if ( !mAttributes.contains("objectClass") )
     mAttributes.insert( "objectClass", "inetOrgPerson" );
-  if ( !mAttributes.tqcontains("commonName") )
+  if ( !mAttributes.contains("commonName") )
     mAttributes.insert( "commonName", "cn" );
-  if ( !mAttributes.tqcontains("formattedName") )
+  if ( !mAttributes.contains("formattedName") )
     mAttributes.insert( "formattedName", "displayName" );
-  if ( !mAttributes.tqcontains("familyName") )
+  if ( !mAttributes.contains("familyName") )
     mAttributes.insert( "familyName", "sn" );
-  if ( !mAttributes.tqcontains("givenName") )
+  if ( !mAttributes.contains("givenName") )
     mAttributes.insert( "givenName", "givenName" );
-  if ( !mAttributes.tqcontains("mail") )
+  if ( !mAttributes.contains("mail") )
     mAttributes.insert( "mail", "mail" );
-  if ( !mAttributes.tqcontains("mailAlias") )
+  if ( !mAttributes.contains("mailAlias") )
     mAttributes.insert( "mailAlias", "" );
-  if ( !mAttributes.tqcontains("phoneNumber") )
+  if ( !mAttributes.contains("phoneNumber") )
     mAttributes.insert( "phoneNumber", "homePhone" );
-  if ( !mAttributes.tqcontains("telephoneNumber") )
+  if ( !mAttributes.contains("telephoneNumber") )
     mAttributes.insert( "telephoneNumber", "telephoneNumber" );
-  if ( !mAttributes.tqcontains("facsimileTelephoneNumber") )
+  if ( !mAttributes.contains("facsimileTelephoneNumber") )
     mAttributes.insert( "facsimileTelephoneNumber", "facsimileTelephoneNumber" );
-  if ( !mAttributes.tqcontains("mobile") )
+  if ( !mAttributes.contains("mobile") )
     mAttributes.insert( "mobile", "mobile" );
-  if ( !mAttributes.tqcontains("pager") )
+  if ( !mAttributes.contains("pager") )
     mAttributes.insert( "pager", "pager" );
-  if ( !mAttributes.tqcontains("description") )
+  if ( !mAttributes.contains("description") )
     mAttributes.insert( "description", "description" );
 
-  if ( !mAttributes.tqcontains("title") )
+  if ( !mAttributes.contains("title") )
     mAttributes.insert( "title", "title" );
-  if ( !mAttributes.tqcontains("street") )
+  if ( !mAttributes.contains("street") )
     mAttributes.insert( "street", "street" );
-  if ( !mAttributes.tqcontains("state") )
+  if ( !mAttributes.contains("state") )
     mAttributes.insert( "state", "st" );
-  if ( !mAttributes.tqcontains("city") )
+  if ( !mAttributes.contains("city") )
     mAttributes.insert( "city", "l" );
-  if ( !mAttributes.tqcontains("organization") )
+  if ( !mAttributes.contains("organization") )
     mAttributes.insert( "organization", "o" );
-  if ( !mAttributes.tqcontains("postalcode") )
+  if ( !mAttributes.contains("postalcode") )
     mAttributes.insert( "postalcode", "postalCode" );
 
-  if ( !mAttributes.tqcontains("uid") )
+  if ( !mAttributes.contains("uid") )
     mAttributes.insert( "uid", "uid" );
-  if ( !mAttributes.tqcontains("jpegPhoto") )
+  if ( !mAttributes.contains("jpegPhoto") )
     mAttributes.insert( "jpegPhoto", "jpegPhoto" );
 
   d->mLDAPUrl = KURL();
@@ -766,7 +766,7 @@ void ResourceLDAPKIO::syncLoadSaveResult( KIO::Job *job )
     mErrorMsg = "";
   activateCache();
   
-  tqApp->exit_loop();
+  qApp->exit_loop();
 }
 
 void ResourceLDAPKIO::saveResult( KIO::Job *job )
@@ -791,7 +791,7 @@ void ResourceLDAPKIO::saveData( KIO::Job*, TQByteArray& data )
   
   kdDebug(7125) << "ResourceLDAPKIO saveData: " << (*d->mSaveIt).assembledName() << endl;
   
-  AddresseeToLDIF( data, *d->mSaveIt, tqfindUid( (*d->mSaveIt).uid() ) );  
+  AddresseeToLDIF( data, *d->mSaveIt, findUid( (*d->mSaveIt).uid() ) );  
 //  kdDebug(7125) << "ResourceLDAPKIO save LDIF: " << TQString::fromUtf8(data) << endl;
   // mark as unchanged
   (*d->mSaveIt).setChanged( false );
@@ -801,7 +801,7 @@ void ResourceLDAPKIO::saveData( KIO::Job*, TQByteArray& data )
 
 void ResourceLDAPKIO::removeAddressee( const Addressee& addr )
 {
-  TQString dn = tqfindUid( addr.uid() );
+  TQString dn = findUid( addr.uid() );
   
   kdDebug(7125) << "ResourceLDAPKIO: removeAddressee: " << dn << endl;
 
diff --git a/kabc/plugins/ldapkio/resourceldapkio.h b/kabc/plugins/ldapkio/resourceldapkio.h
index 15a694af4..2b5685fdc 100644
--- a/kabc/plugins/ldapkio/resourceldapkio.h
+++ b/kabc/plugins/ldapkio/resourceldapkio.h
@@ -158,7 +158,7 @@ protected slots:
     void activateCache();
     void enter_loop();
     TQCString addEntry( const TQString &attr, const TQString &value, bool mod );
-    TQString tqfindUid( const TQString &uid );
+    TQString findUid( const TQString &uid );
     bool AddresseeToLDIF( TQByteArray &ldif, const Addressee &addr, 
       const TQString &olddn );
     
diff --git a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp b/kabc/plugins/ldapkio/resourceldapkioconfig.cpp
index 80ad121a5..271328525 100644
--- a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp
+++ b/kabc/plugins/ldapkio/resourceldapkioconfig.cpp
@@ -234,13 +234,13 @@ AttributesDialog::AttributesDialog( const TQMap<TQString, TQString> &attributes,
   mMapList.append( outlookMap );
 
   TQFrame *page = plainPage();
-  TQGridLayout *tqlayout = new TQGridLayout( page, 4, ( attributes.count() + 4 ) >> 1,
+  TQGridLayout *layout = new TQGridLayout( page, 4, ( attributes.count() + 4 ) >> 1,
                                          0, spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Template:" ), page );
-  tqlayout->addWidget( label, 0, 0 );
+  layout->addWidget( label, 0, 0 );
   mMapCombo = new KComboBox( page );
-  tqlayout->addWidget( mMapCombo, 0, 1 );
+  layout->addWidget( mMapCombo, 0, 1 );
 
   mMapCombo->insertItem( i18n( "User Defined" ) );
   mMapCombo->insertItem( i18n( "Kolab" ) );
@@ -250,9 +250,9 @@ AttributesDialog::AttributesDialog( const TQMap<TQString, TQString> &attributes,
   connect( mMapCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( mapChanged( int ) ) );
 
   label = new TQLabel( i18n( "RDN prefix attribute:" ), page );
-  tqlayout->addWidget( label, 1, 0 );
+  layout->addWidget( label, 1, 0 );
   mRDNCombo = new KComboBox( page );
-  tqlayout->addWidget( mRDNCombo, 1, 1 );
+  layout->addWidget( mRDNCombo, 1, 1 );
   mRDNCombo->insertItem( i18n( "commonName" ) );
   mRDNCombo->insertItem( i18n( "UID" ) );
   mRDNCombo->setCurrentItem( rdnprefix );
@@ -274,14 +274,14 @@ AttributesDialog::AttributesDialog( const TQMap<TQString, TQString> &attributes,
     mLineEditDict.insert( it.key(), lineedit );
     lineedit->setText( it.data() );
     label->setBuddy( lineedit );
-    tqlayout->addWidget( label, i, j );
-    tqlayout->addWidget( lineedit, i, j+1 );
+    layout->addWidget( label, i, j );
+    layout->addWidget( lineedit, i, j+1 );
   }
   
   for ( i = 1; i < mMapCombo->count(); i++ ) {
     TQDictIterator<KLineEdit> it2( mLineEditDict );
     for ( ; it2.current(); ++it2 ) {
-      if ( mMapList[ i ].tqcontains( it2.currentKey() ) ) {
+      if ( mMapList[ i ].contains( it2.currentKey() ) ) {
         if ( mMapList[ i ][ it2.currentKey() ] != it2.current()->text() ) break;
       } else {
         if ( mDefaultMap[ it2.currentKey() ] != it2.current()->text() ) break;
@@ -338,8 +338,8 @@ OfflineDialog::OfflineDialog( bool autoCache, int cachePolicy, const KURL &src,
                  Ok, parent, name, true, true )
 {
   TQFrame *page = plainPage();
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( page );
-  tqlayout->setAutoAdd( true );
+  TQVBoxLayout *layout = new TQVBoxLayout( page );
+  layout->setAutoAdd( true );
 
   mSrc = src; mDst = dst;
   mCacheGroup = new TQButtonGroup( 1, Qt::Horizontal, 
diff --git a/kabc/plugins/net/resourcenetconfig.cpp b/kabc/plugins/net/resourcenetconfig.cpp
index 325d99377..b441fbd98 100644
--- a/kabc/plugins/net/resourcenetconfig.cpp
+++ b/kabc/plugins/net/resourcenetconfig.cpp
@@ -79,7 +79,7 @@ void ResourceNetConfig::loadSettings( KRES::Resource *res )
     return;
   }
 
-  mFormatBox->setCurrentItem( mFormatTypes.tqfindIndex( resource->format() ) );
+  mFormatBox->setCurrentItem( mFormatTypes.findIndex( resource->format() ) );
 
   mUrlEdit->setURL( resource->url().url() );
 }
diff --git a/kabc/plugins/sql/resourcesql.cpp b/kabc/plugins/sql/resourcesql.cpp
index 7dae03d22..55f02bae7 100644
--- a/kabc/plugins/sql/resourcesql.cpp
+++ b/kabc/plugins/sql/resourcesql.cpp
@@ -317,8 +317,8 @@ bool ResourceSql::save( Ticket * )
       TQStringList list = (*it).customs();
       TQStringList::ConstIterator it;
       for( it = list.begin(); it != list.end(); ++it ) {
-        int dashPos = (*it).tqfind( '-' );
-        int colonPos = (*it).tqfind( ':' );
+        int dashPos = (*it).find( '-' );
+        int colonPos = (*it).find( ':' );
         TQString app = (*it).left( dashPos );
         TQString name = (*it).mid( dashPos + 1, colonPos - dashPos - 1 );
         TQString value = (*it).right( (*it).length() - colonPos - 1 );
diff --git a/kabc/plugins/sql/resourcesqlconfig.cpp b/kabc/plugins/sql/resourcesqlconfig.cpp
index 403f8a6d0..ef1651cde 100644
--- a/kabc/plugins/sql/resourcesqlconfig.cpp
+++ b/kabc/plugins/sql/resourcesqlconfig.cpp
@@ -60,7 +60,7 @@ ResourceSqlConfig::ResourceSqlConfig( TQWidget* parent,  const char* name )
   label = new TQLabel( i18n( "Port:" ), this );
   TQVBox *box = new TQVBox(this);
   mPort = new TQSpinBox(0, 65535, 1, box );
-  mPort->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred));
+  mPort->setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred));
   mPort->setValue(389);
   new TQWidget(box, "dummy");
 
diff --git a/kabc/resource.cpp b/kabc/resource.cpp
index c4ed66946..d43c68320 100644
--- a/kabc/resource.cpp
+++ b/kabc/resource.cpp
@@ -266,9 +266,9 @@ void Resource::removeAddressee( const Addressee &addr )
   mAddrMap.erase( addr.uid() );
 }
 
-Addressee Resource::tqfindByUid( const TQString &uid )
+Addressee Resource::findByUid( const TQString &uid )
 {
-  Addressee::Map::ConstIterator it = mAddrMap.tqfind( uid );
+  Addressee::Map::ConstIterator it = mAddrMap.find( uid );
 
   if ( it != mAddrMap.end() )
     return it.data();
@@ -276,7 +276,7 @@ Addressee Resource::tqfindByUid( const TQString &uid )
   return Addressee();
 }
 
-Addressee::List Resource::tqfindByName( const TQString &name )
+Addressee::List Resource::findByName( const TQString &name )
 {
   Addressee::List results;
 
@@ -289,7 +289,7 @@ Addressee::List Resource::tqfindByName( const TQString &name )
   return results;
 }
 
-Addressee::List Resource::tqfindByEmail( const TQString &email )
+Addressee::List Resource::findByEmail( const TQString &email )
 {
   Addressee::List results;
   const TQString lowerEmail = email.lower();
@@ -306,7 +306,7 @@ Addressee::List Resource::tqfindByEmail( const TQString &email )
   return results;
 }
 
-Addressee::List Resource::tqfindByCategory( const TQString &category )
+Addressee::List Resource::findByCategory( const TQString &category )
 {
   Addressee::List results;
 
diff --git a/kabc/resource.h b/kabc/resource.h
index 9028914e2..0412a22b1 100644
--- a/kabc/resource.h
+++ b/kabc/resource.h
@@ -230,7 +230,7 @@ class KABC_EXPORT Resource : public KRES::Resource
       @return The addressee with the specified unique identifier or an
               empty addressee.
      */
-    virtual Addressee tqfindByUid( const TQString &uid );
+    virtual Addressee findByUid( const TQString &uid );
 
     /**
       Searches all addressees which match the specified name.
@@ -238,7 +238,7 @@ class KABC_EXPORT Resource : public KRES::Resource
       @param name The name you are looking for.
       @return A list of all matching addressees.
      */
-    virtual Addressee::List tqfindByName( const TQString &name );
+    virtual Addressee::List findByName( const TQString &name );
 
     /**
       Searches all addressees which match the specified email address.
@@ -246,7 +246,7 @@ class KABC_EXPORT Resource : public KRES::Resource
       @param email The email address you are looking for.
       @return A list of all matching addressees.
      */
-    virtual Addressee::List tqfindByEmail( const TQString &email );
+    virtual Addressee::List findByEmail( const TQString &email );
 
     /**
       Searches all addressees which belongs to the specified category.
@@ -254,7 +254,7 @@ class KABC_EXPORT Resource : public KRES::Resource
       @param category The category you are looking for.
       @return A list of all matching addressees.
      */
-    virtual Addressee::List tqfindByCategory( const TQString &category );
+    virtual Addressee::List findByCategory( const TQString &category );
 
     /**
       Removes all addressees from the resource.
diff --git a/kabc/resourceselectdialog.cpp b/kabc/resourceselectdialog.cpp
index 91a86057e..a52754be3 100644
--- a/kabc/resourceselectdialog.cpp
+++ b/kabc/resourceselectdialog.cpp
@@ -56,7 +56,7 @@ ResourceSelectDialog::ResourceSelectDialog( AddressBook *ab, TQWidget *parent, c
   buttonBox->addStretch();
   buttonBox->addButton(  KStdGuiItem::ok(), this, TQT_SLOT( accept() ) );
   buttonBox->addButton(  KStdGuiItem::cancel(), this, TQT_SLOT( reject() ) );
-  buttonBox->tqlayout();
+  buttonBox->layout();
 
   mainLayout->addWidget( buttonBox );
 
diff --git a/kabc/scripts/addressee.src.cpp b/kabc/scripts/addressee.src.cpp
index 3665a5417..36c449f19 100644
--- a/kabc/scripts/addressee.src.cpp
+++ b/kabc/scripts/addressee.src.cpp
@@ -225,7 +225,7 @@ void Addressee::setNameFromString( const TQString &s )
   TQString emptyStr = "";
   AddresseeHelper *helper = AddresseeHelper::self();
 
-  int i = str.tqfind( ',' );
+  int i = str.find( ',' );
   if( i < 0 ) {
     TQStringList parts = TQStringList::split( spaceStr, str );
     int leftOffset = 0;
@@ -233,7 +233,7 @@ void Addressee::setNameFromString( const TQString &s )
 
     TQString suffix;
     while ( rightOffset >= 0 ) {
-      if ( helper->tqcontainsSuffix( parts[ rightOffset ] ) ) {
+      if ( helper->containsSuffix( parts[ rightOffset ] ) ) {
         suffix.prepend(parts[ rightOffset ] + (suffix.isEmpty() ? emptyStr : spaceStr));
         rightOffset--;
       } else
@@ -246,7 +246,7 @@ void Addressee::setNameFromString( const TQString &s )
 
     TQStringList inclusionList;
     for ( int n = 1; (rightOffset - n >= 0) && (n < 4); ++n ) {
-      if ( helper->tqcontainsPrefix( parts[ rightOffset - n ].lower() ) ) {
+      if ( helper->containsPrefix( parts[ rightOffset - n ].lower() ) ) {
         inclusionList.prepend( parts[ rightOffset - n ] );
       } else
         break;
@@ -264,7 +264,7 @@ void Addressee::setNameFromString( const TQString &s )
 
     TQString prefix;
     while ( leftOffset < rightOffset ) {
-      if ( helper->tqcontainsTitle( parts[ leftOffset ] ) ) {
+      if ( helper->containsTitle( parts[ leftOffset ] ) ) {
         prefix.append( ( prefix.isEmpty() ? emptyStr : spaceStr) + parts[ leftOffset ] );
         leftOffset++;
       } else
@@ -295,7 +295,7 @@ void Addressee::setNameFromString( const TQString &s )
 
       TQString suffix;
       while ( rightOffset >= 0 ) {
-        if ( helper->tqcontainsSuffix( parts[ rightOffset ] ) ) {
+        if ( helper->containsSuffix( parts[ rightOffset ] ) ) {
           suffix.prepend(parts[ rightOffset ] + (suffix.isEmpty() ? emptyStr : spaceStr));
           rightOffset--;
         } else
@@ -303,7 +303,7 @@ void Addressee::setNameFromString( const TQString &s )
       }
       setSuffix( suffix );
 
-      if ( rightOffset - 1 >= 0 && helper->tqcontainsPrefix( parts[ rightOffset - 1 ].lower() ) ) {
+      if ( rightOffset - 1 >= 0 && helper->containsPrefix( parts[ rightOffset - 1 ].lower() ) ) {
         setFamilyName( parts[ rightOffset - 1 ] + spaceStr + parts[ rightOffset ] );
         rightOffset--;
       } else
@@ -311,7 +311,7 @@ void Addressee::setNameFromString( const TQString &s )
 
       TQString prefix;
       while ( leftOffset < rightOffset ) {
-        if ( helper->tqcontainsTitle( parts[ leftOffset ] ) ) {
+        if ( helper->containsTitle( parts[ leftOffset ] ) ) {
           prefix.append( ( prefix.isEmpty() ? emptyStr : spaceStr) + parts[ leftOffset ] );
           leftOffset++;
         } else
@@ -332,7 +332,7 @@ void Addressee::setNameFromString( const TQString &s )
 
       TQString prefix;
       while ( leftOffset < rightOffset ) {
-        if ( helper->tqcontainsTitle( parts[ leftOffset ] ) ) {
+        if ( helper->containsTitle( parts[ leftOffset ] ) ) {
           prefix.append( ( prefix.isEmpty() ? emptyStr : spaceStr) + parts[ leftOffset ] );
           leftOffset++;
         } else
@@ -398,9 +398,9 @@ TQString Addressee::fullEmail( const TQString &email ) const
     text = e;
   else {
     TQRegExp needQuotes( "[^ 0-9A-Za-z\\x0080-\\xFFFF]" );
-    if ( realName().tqfind( needQuotes ) != -1 ) {
+    if ( realName().find( needQuotes ) != -1 ) {
       TQString name = realName();
-      name.tqreplace( "\"", "\\\"" );
+      name.replace( "\"", "\\\"" );
       text = "\"" + name + "\" <" + e + ">";
     } else
       text = realName() + " <" + e + ">";
@@ -417,7 +417,7 @@ void Addressee::insertEmail( const TQString &email, bool preferred )
   detach();
   mData->empty = false;
 
-  TQStringList::Iterator it = mData->emails.tqfind( email );
+  TQStringList::Iterator it = mData->emails.find( email );
 
   if ( it != mData->emails.end() ) {
     if ( !preferred || it == mData->emails.begin() ) return;
@@ -436,7 +436,7 @@ void Addressee::removeEmail( const TQString &email )
 {
   detach();
 
-  TQStringList::Iterator it = mData->emails.tqfind( email );
+  TQStringList::Iterator it = mData->emails.find( email );
   if ( it == mData->emails.end() ) return;
 
   mData->emails.remove( it );
@@ -520,7 +520,7 @@ PhoneNumber::List Addressee::phoneNumbers( int type ) const
   return list;
 }
 
-PhoneNumber Addressee::tqfindPhoneNumber( const TQString &id ) const
+PhoneNumber Addressee::findPhoneNumber( const TQString &id ) const
 {
   PhoneNumber::List::ConstIterator it;
   for( it = mData->phoneNumbers.constBegin(); it != mData->phoneNumbers.constEnd(); ++it ) {
@@ -612,7 +612,7 @@ Key::List Addressee::keys( int type, TQString customTypeString ) const
   return list;
 }
 
-Key Addressee::tqfindKey( const TQString &id ) const
+Key Addressee::findKey( const TQString &id ) const
 {
   Key::List::ConstIterator it;
   for( it = mData->keys.constBegin(); it != mData->keys.constEnd(); ++it ) {
@@ -739,7 +739,7 @@ Address::List Addressee::addresses( int type ) const
   return list;
 }
 
-Address Addressee::tqfindAddress( const TQString &id ) const
+Address Addressee::findAddress( const TQString &id ) const
 {
   Address::List::ConstIterator it;
   for( it = mData->addresses.constBegin(); it != mData->addresses.constEnd(); ++it ) {
@@ -755,7 +755,7 @@ void Addressee::insertCategory( const TQString &c )
   detach();
   mData->empty = false;
 
-  if ( mData->categories.tqfindIndex( c ) != -1 ) return;
+  if ( mData->categories.findIndex( c ) != -1 ) return;
 
   mData->categories.append( c );
 }
@@ -764,7 +764,7 @@ void Addressee::removeCategory( const TQString &c )
 {
   detach();
 
-  TQStringList::Iterator it = mData->categories.tqfind( c );
+  TQStringList::Iterator it = mData->categories.find( c );
   if ( it == mData->categories.end() ) return;
 
   mData->categories.remove( it );
@@ -772,7 +772,7 @@ void Addressee::removeCategory( const TQString &c )
 
 bool Addressee::hasCategory( const TQString &c ) const
 {
-  return ( mData->categories.tqfindIndex( c ) != -1 );
+  return ( mData->categories.findIndex( c ) != -1 );
 }
 
 void Addressee::setCategories( const TQStringList &c )
@@ -832,7 +832,7 @@ TQString Addressee::custom( const TQString &app, const TQString &name ) const
   TQStringList::ConstIterator it;
   for( it = mData->custom.constBegin(); it != mData->custom.constEnd(); ++it ) {
     if ( (*it).startsWith( qualifiedName ) ) {
-      value = (*it).mid( (*it).tqfind( ":" ) + 1 );
+      value = (*it).mid( (*it).find( ":" ) + 1 );
       break;
     }
   }
@@ -1104,7 +1104,7 @@ bool listEquals( const TQValueList<L> &list, const TQValueList<L> &pattern )
     return false;
 
   for ( uint i = 0; i < list.count(); ++i )
-    if ( pattern.tqfind( list[ i ] ) == pattern.end() )
+    if ( pattern.find( list[ i ] ) == pattern.end() )
       return false;
 
   return true;
@@ -1120,7 +1120,7 @@ bool emailsEquals( const TQStringList &list, const TQStringList &pattern )
 
   TQStringList::ConstIterator it;
   for ( it = list.begin(); it != list.end(); ++it )
-    if ( pattern.tqfind( *it ) == pattern.end() )
+    if ( pattern.find( *it ) == pattern.end() )
       return false;
 
   return true;
diff --git a/kabc/scripts/addressee.src.h b/kabc/scripts/addressee.src.h
index 4b01d9963..f87edc5ec 100644
--- a/kabc/scripts/addressee.src.h
+++ b/kabc/scripts/addressee.src.h
@@ -213,7 +213,7 @@ class KABC_EXPORT Addressee
     /**
       Return phone number with the given id.
      */
-    PhoneNumber tqfindPhoneNumber( const TQString &id ) const;
+    PhoneNumber findPhoneNumber( const TQString &id ) const;
 
     /**
       Insert a key. If a key with the same id already exists
@@ -257,7 +257,7 @@ class KABC_EXPORT Addressee
     /**
       Return key with the given id.
      */
-    Key tqfindKey( const TQString &id ) const;
+    Key findKey( const TQString &id ) const;
 
     /**
       Insert an address. If an address with the same id already exists
@@ -289,7 +289,7 @@ class KABC_EXPORT Addressee
     /**
       Return address with the given id.
      */
-    Address tqfindAddress( const TQString &id ) const;
+    Address findAddress( const TQString &id ) const;
 
     /**
       Insert category. If the category already exists it is not duplicated.
@@ -319,7 +319,7 @@ class KABC_EXPORT Addressee
     /**
       Insert custom entry. The entry is identified by the name of the inserting
       application and a unique name. If an entry with the given app and name
-      already exists its value is tqreplaced with the new given value.
+      already exists its value is replaced with the new given value.
 
       An empty value isn't allowed (nothing happens if this is called with
       any of the three arguments being empty)
diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp
index 64ffd1a03..6b574d86f 100644
--- a/kabc/stdaddressbook.cpp
+++ b/kabc/stdaddressbook.cpp
@@ -191,7 +191,7 @@ Addressee StdAddressBook::whoAmI()
   KConfig config( "kabcrc" );
   config.setGroup( "General" );
 
-  return tqfindByUid( config.readEntry( "WhoAmI" ) );
+  return findByUid( config.readEntry( "WhoAmI" ) );
 }
 
 void StdAddressBook::setWhoAmI( const Addressee &addr )
diff --git a/kabc/tests/kabcargl.cpp b/kabc/tests/kabcargl.cpp
index 2cd759d1b..b57724c15 100644
--- a/kabc/tests/kabcargl.cpp
+++ b/kabc/tests/kabcargl.cpp
@@ -56,7 +56,7 @@ int main(int argc,char **argv)
   f.close();
   
   text = TQString::fromUtf8( text.local8Bit() );
-  text.tqreplace( "\n", "\r\n" );
+  text.replace( "\n", "\r\n" );
   
   if ( !f.open( IO_WriteOnly ) ) {
     kdDebug() << "Error opening file '" << filename << "' for writing." << endl;
diff --git a/kabc/tests/testldapclient.cpp b/kabc/tests/testldapclient.cpp
index 9051bdc1c..2fa6a1c72 100644
--- a/kabc/tests/testldapclient.cpp
+++ b/kabc/tests/testldapclient.cpp
@@ -143,7 +143,7 @@ void TestLDAPClient::slotLDAPResult( const KABC::LdapObject& obj )
   assert( !obj.attrs[ "mail" ].isEmpty() );
   TQString mail = join( obj.attrs[ "mail" ], ", " );
   kdDebug() << " mail:" << mail << endl;
-  assert( mail.tqcontains( '@' ) );
+  assert( mail.contains( '@' ) );
 }
 
 void TestLDAPClient::slotLDAPError( const TQString& err )
diff --git a/kabc/tests/testldapclient.h b/kabc/tests/testldapclient.h
index 1995914c3..ea1293b51 100644
--- a/kabc/tests/testldapclient.h
+++ b/kabc/tests/testldapclient.h
@@ -24,7 +24,7 @@
 #include "../ldapclient.h"
 typedef KABC::LdapClient LdapClient;
 
-class TestLDAPClient : public TQObject
+class TestLDAPClient : public QObject
 {
     Q_OBJECT
 
diff --git a/kabc/tests/testlock.cpp b/kabc/tests/testlock.cpp
index 380c9ab3a..4674606e0 100644
--- a/kabc/tests/testlock.cpp
+++ b/kabc/tests/testlock.cpp
@@ -72,8 +72,8 @@ LockWidget::LockWidget( const TQString &identifier )
     TQLabel *resourceIdentifier = new TQLabel( identifier, this );
     identifierLayout->addWidget( resourceIdentifier );
 
-    mtqStatus = new TQLabel( "tqStatus: Unlocked", this );
-    topLayout->addWidget( mtqStatus );
+    mStatus = new TQLabel( "Status: Unlocked", this );
+    topLayout->addWidget( mStatus );
 
     TQPushButton *button = new TQPushButton( "Lock", this );
     topLayout->addWidget( button );
@@ -139,7 +139,7 @@ void LockWidget::lock()
   if ( !mLock->lock() ) {
     KMessageBox::sorry( this, mLock->error() );
   } else {
-    mtqStatus->setText( "tqStatus: Locked" );
+    mStatus->setText( "Status: Locked" );
   }
 }
 
@@ -148,7 +148,7 @@ void LockWidget::unlock()
   if ( !mLock->unlock() ) {
     KMessageBox::sorry( this, mLock->error() );
   } else {
-    mtqStatus->setText( "tqStatus: Unlocked" );
+    mStatus->setText( "Status: Unlocked" );
   }
 }
 
diff --git a/kabc/tests/testlock.h b/kabc/tests/testlock.h
index 7162bd203..92244cd30 100644
--- a/kabc/tests/testlock.h
+++ b/kabc/tests/testlock.h
@@ -44,7 +44,7 @@ class KABC_EXPORT LockWidget : public QWidget
   private:
     KABC::Lock *mLock;
 
-    TQLabel *mtqStatus;
+    TQLabel *mStatus;
     TQListView *mLockView;
 };
 
diff --git a/kabc/vcard/AdrParam.cpp b/kabc/vcard/AdrParam.cpp
index 9c06bc223..5ad56f4fb 100644
--- a/kabc/vcard/AdrParam.cpp
+++ b/kabc/vcard/AdrParam.cpp
@@ -80,7 +80,7 @@ AdrParam::operator == (AdrParam & x)
 	TQStrListIterator it(x.adrTypeList_);
 	
 	for (; it.current(); ++it)
-		if (!adrTypeList_.tqfind(it.current()))
+		if (!adrTypeList_.find(it.current()))
 			return false;
 	
 	return true;
@@ -100,7 +100,7 @@ AdrParam::_parse()
 		return;
 	}
 	
-	if (!strRep_.tqcontains('='))
+	if (!strRep_.contains('='))
 		return;
 	
 	RTokenise(strRep_, ",", adrTypeList_);
diff --git a/kabc/vcard/ContentLine.cpp b/kabc/vcard/ContentLine.cpp
index a301a0244..52bcdf4f5 100644
--- a/kabc/vcard/ContentLine.cpp
+++ b/kabc/vcard/ContentLine.cpp
@@ -122,7 +122,7 @@ ContentLine::operator == (ContentLine & x)
 	
 	TQPtrListIterator<Param> it(x.paramList());
 	
-	if (!paramList_.tqfind(it.current()))
+	if (!paramList_.find(it.current()))
 		return false;
 
 	return true;
@@ -140,9 +140,9 @@ ContentLine::_parse()
 	vDebug("parse");
 	
 	// Unqote newlines
-	strRep_ = strRep_.tqreplace( TQRegExp( "\\\\n" ), "\n" );
+	strRep_ = strRep_.replace( TQRegExp( "\\\\n" ), "\n" );
 	
-	int split = strRep_.tqfind(':');
+	int split = strRep_.find(':');
 	
 	if (split == -1) { // invalid content line
 		vDebug("No ':'");
@@ -152,7 +152,7 @@ ContentLine::_parse()
 	TQCString firstPart(strRep_.left(split));
 	TQCString valuePart(strRep_.mid(split + 1));
 	
-	split = firstPart.tqfind('.');
+	split = firstPart.find('.');
 	
 	if (split != -1) {
 		group_		= firstPart.left(split);
@@ -193,7 +193,7 @@ ContentLine::_parse()
 
 		TQCString str = *it;
 
-		split = str.tqfind("=");
+		split = str.find("=");
 		if (split < 0 ) {
 			vDebug("No '=' in parameter.");
 			continue;
@@ -275,7 +275,7 @@ ContentLine::_assemble()
         }
 
 	// Quote newlines
-	line = line.tqreplace( TQRegExp( "\n" ), "\\n" );
+	line = line.replace( TQRegExp( "\n" ), "\\n" );
 		
 	// Fold lines longer than 72 chars
 	const int maxLen = 72;
diff --git a/kabc/vcard/DateValue.cpp b/kabc/vcard/DateValue.cpp
index bc46b9536..aedfe5eba 100644
--- a/kabc/vcard/DateValue.cpp
+++ b/kabc/vcard/DateValue.cpp
@@ -152,7 +152,7 @@ DateValue::_parse()
 	// time = time-hour [":"] time-minute [":"] time-second [":"]
 	// [time-secfrac] [time-zone]
 	
-	int timeSep = strRep_.tqfind('T');
+	int timeSep = strRep_.find('T');
 	
 	TQCString dateStr;
 	TQCString timeStr;
@@ -173,7 +173,7 @@ DateValue::_parse()
 	
 	/////////////////////////////////////////////////////////////// DATE
 	
-	dateStr.tqreplace(TQRegExp("-"), "");
+	dateStr.replace(TQRegExp("-"), "");
 
 	kdDebug(5710) << "dateStr: " << dateStr << endl;
 
@@ -192,7 +192,7 @@ DateValue::_parse()
 
 	/////////////////////////////////////////////////////////////// ZONE
 	
-	int zoneSep = timeStr.tqfind('Z');
+	int zoneSep = timeStr.find('Z');
 	
 	if (zoneSep != -1 && timeStr.length() - zoneSep > 3) {
 		
@@ -208,7 +208,7 @@ DateValue::_parse()
 
 	//////////////////////////////////////////////////// SECOND FRACTION
 	
-	int secFracSep = timeStr.tqfindRev(',');
+	int secFracSep = timeStr.findRev(',');
 	
 	if (secFracSep != -1 && zoneSep != -1) { // zoneSep checked to avoid errors.
 		TQCString quirkafleeg = "0." + timeStr.mid(secFracSep + 1, zoneSep);
@@ -217,7 +217,7 @@ DateValue::_parse()
 	
 	/////////////////////////////////////////////////////////////// HMS
 
-	timeStr.tqreplace(TQRegExp(":"), "");
+	timeStr.replace(TQRegExp(":"), "");
 	
 	hour_	= timeStr.left(2).toInt();
 	minute_	= timeStr.mid(2, 2).toInt();
diff --git a/kabc/vcard/GeoValue.cpp b/kabc/vcard/GeoValue.cpp
index 3021bbdb1..2bac28c1e 100644
--- a/kabc/vcard/GeoValue.cpp
+++ b/kabc/vcard/GeoValue.cpp
@@ -84,7 +84,7 @@ GeoValue::clone()
 	void
 GeoValue::_parse()
 {
-  int semiColon = strRep_.tqfind( ";" );
+  int semiColon = strRep_.find( ";" );
 
   if ( semiColon == -1 ) // invalid
     return;
diff --git a/kabc/vcard/RToken.cpp b/kabc/vcard/RToken.cpp
index 582a9e1c7..b0e251a87 100644
--- a/kabc/vcard/RToken.cpp
+++ b/kabc/vcard/RToken.cpp
@@ -30,7 +30,7 @@
 namespace VCARD
 {
 
-	TQ_UINT32
+	Q_UINT32
 RTokenise(const char * str, const char * delim, TQStrList & l)
 {
 	// FIXME no stderr !
diff --git a/kabc/vcard/SourceParam.cpp b/kabc/vcard/SourceParam.cpp
index 7041acd9e..d66d87498 100644
--- a/kabc/vcard/SourceParam.cpp
+++ b/kabc/vcard/SourceParam.cpp
@@ -80,7 +80,7 @@ SourceParam::~SourceParam()
 	void
 SourceParam::_parse()
 {
-	int i = strRep_.tqfind('=');
+	int i = strRep_.find('=');
 	if (i == -1) // Invalid
 		return;
 	
diff --git a/kabc/vcard/URIValue.cpp b/kabc/vcard/URIValue.cpp
index ea598c5f5..98f75cb8e 100644
--- a/kabc/vcard/URIValue.cpp
+++ b/kabc/vcard/URIValue.cpp
@@ -89,7 +89,7 @@ URIValue::~URIValue()
 	void
 URIValue::_parse()
 {
-	int split = strRep_.tqfind(':');
+	int split = strRep_.find(':');
 	if (split == -1)
 		return;
 	
diff --git a/kabc/vcard/UTCValue.cpp b/kabc/vcard/UTCValue.cpp
index 445af4fd7..30473661f 100644
--- a/kabc/vcard/UTCValue.cpp
+++ b/kabc/vcard/UTCValue.cpp
@@ -93,7 +93,7 @@ UTCValue::_parse()
 
 	positive_ = ( strRep_[0] == '+' );
 	
-	int colon = strRep_.tqfind( ':' );
+	int colon = strRep_.find( ':' );
 	
 	if ( colon == -1 ) // Not valid.
 		return;
diff --git a/kabc/vcard/VCard.cpp b/kabc/vcard/VCard.cpp
index c63e978d4..50c25da59 100644
--- a/kabc/vcard/VCard.cpp
+++ b/kabc/vcard/VCard.cpp
@@ -113,7 +113,7 @@ VCard::_parse()
 	///////////////////////////////////////////////////////////////
 	// FIRST LINE
 
-	int split = beginLine.tqfind(':');
+	int split = beginLine.find(':');
 
 	if (split == -1) { // invalid, no BEGIN
 		vDebug("No split");
@@ -123,7 +123,7 @@ VCard::_parse()
 	TQCString firstPart(beginLine.left(split));
 	TQCString valuePart(beginLine.mid(split + 1));
 
-	split = firstPart.tqfind('.');
+	split = firstPart.find('.');
 
 	if (split != -1) {
 		group_		= firstPart.left(split);
@@ -188,7 +188,7 @@ VCard::_parse()
 	///////////////////////////////////////////////////////////////
 	// LAST LINE
 
-	split = endLine.tqfind(':');
+	split = endLine.find(':');
 
 	if (split == -1) // invalid, no END
 		return;
@@ -196,7 +196,7 @@ VCard::_parse()
 	firstPart = endLine.left(split);
 	valuePart = endLine.right(firstPart.length() - split - 1);
 
-	split = firstPart.tqfind('.');
+	split = firstPart.find('.');
 
 	if (split != -1) {
 		group_		= firstPart.left(split);
diff --git a/kabc/vcard/VCardEntity.cpp b/kabc/vcard/VCardEntity.cpp
index 4c987bffe..1f8cea5b1 100644
--- a/kabc/vcard/VCardEntity.cpp
+++ b/kabc/vcard/VCardEntity.cpp
@@ -76,11 +76,11 @@ VCardEntity::_parse()
 	vDebug("parse");
 	TQCString s(strRep_);
 	
-	int i = s.tqfind(TQRegExp("BEGIN:VCARD", false));
+	int i = s.find(TQRegExp("BEGIN:VCARD", false));
 	
 	while (i != -1) {
 		
-		i = s.tqfind(TQRegExp("BEGIN:VCARD", false), 11);
+		i = s.find(TQRegExp("BEGIN:VCARD", false), 11);
 		
 		TQCString cardStr(s.left(i));
 		
diff --git a/kabc/vcard/include/VCardRToken.h b/kabc/vcard/include/VCardRToken.h
index 5122ef55c..0ea380267 100644
--- a/kabc/vcard/include/VCardRToken.h
+++ b/kabc/vcard/include/VCardRToken.h
@@ -32,7 +32,7 @@
 namespace VCARD
 {
 
-KVCARD_EXPORT TQ_UINT32 RTokenise(const char * str, const char * delim, TQStrList & l);
+KVCARD_EXPORT Q_UINT32 RTokenise(const char * str, const char * delim, TQStrList & l);
 
 }
 
diff --git a/kabc/vcard21parser.cpp b/kabc/vcard21parser.cpp
index 87c498530..d7354539b 100644
--- a/kabc/vcard21parser.cpp
+++ b/kabc/vcard21parser.cpp
@@ -41,12 +41,12 @@ bool VCardLineX::isValid() const
   switch( name[0] ) {
     case 'a':
       if ( name == VCARD_ADR && qualified &&
-                   (qualifiers.tqcontains(VCARD_ADR_DOM)    ||
-                    qualifiers.tqcontains(VCARD_ADR_INTL)   ||
-                    qualifiers.tqcontains(VCARD_ADR_POSTAL) ||
-                    qualifiers.tqcontains(VCARD_ADR_HOME)   ||
-                    qualifiers.tqcontains(VCARD_ADR_WORK)   ||
-                    qualifiers.tqcontains(VCARD_ADR_PREF)
+                   (qualifiers.contains(VCARD_ADR_DOM)    ||
+                    qualifiers.contains(VCARD_ADR_INTL)   ||
+                    qualifiers.contains(VCARD_ADR_POSTAL) ||
+                    qualifiers.contains(VCARD_ADR_HOME)   ||
+                    qualifiers.contains(VCARD_ADR_WORK)   ||
+                    qualifiers.contains(VCARD_ADR_PREF)
          ) )
         return true;
 
@@ -63,18 +63,18 @@ bool VCardLineX::isValid() const
       if ( name == VCARD_CATEGORIES )
         return true;
       if ( name == VCARD_CLASS && qualified &&
-                   (qualifiers.tqcontains(VCARD_CLASS_PUBLIC)      ||
-                    qualifiers.tqcontains(VCARD_CLASS_PRIVATE)     ||
-                    qualifiers.tqcontains(VCARD_CLASS_CONFIDENTIAL)
+                   (qualifiers.contains(VCARD_CLASS_PUBLIC)      ||
+                    qualifiers.contains(VCARD_CLASS_PRIVATE)     ||
+                    qualifiers.contains(VCARD_CLASS_CONFIDENTIAL)
          ) )
         return true;
       break;
 
     case 'e':
       if ( name == VCARD_EMAIL && qualified &&
-                  (qualifiers.tqcontains(VCARD_EMAIL_INTERNET) ||
-                   qualifiers.tqcontains(VCARD_EMAIL_PREF)     ||
-                   qualifiers.tqcontains(VCARD_EMAIL_X400)
+                  (qualifiers.contains(VCARD_EMAIL_INTERNET) ||
+                   qualifiers.contains(VCARD_EMAIL_PREF)     ||
+                   qualifiers.contains(VCARD_EMAIL_X400)
          ) )
         return true;
       break;
@@ -91,8 +91,8 @@ bool VCardLineX::isValid() const
 
     case 'k':
       if ( name == VCARD_KEY && qualified &&
-                   (qualifiers.tqcontains(VCARD_KEY_X509) ||
-                    qualifiers.tqcontains(VCARD_KEY_PGP)
+                   (qualifiers.contains(VCARD_KEY_X509) ||
+                    qualifiers.contains(VCARD_KEY_PGP)
          ) )
         return true;
       break;
@@ -150,20 +150,20 @@ bool VCardLineX::isValid() const
 
     case 't':
       if ( name == VCARD_TEL && qualified &&
-                   (qualifiers.tqcontains(VCARD_TEL_HOME)  ||
-                    qualifiers.tqcontains(VCARD_TEL_WORK)  ||
-                    qualifiers.tqcontains(VCARD_TEL_PREF)  ||
-                    qualifiers.tqcontains(VCARD_TEL_VOICE) ||
-                    qualifiers.tqcontains(VCARD_TEL_FAX)   ||
-                    qualifiers.tqcontains(VCARD_TEL_MSG)   ||
-                    qualifiers.tqcontains(VCARD_TEL_CELL)  ||
-                    qualifiers.tqcontains(VCARD_TEL_PAGER) ||
-                    qualifiers.tqcontains(VCARD_TEL_BBS)   ||
-                    qualifiers.tqcontains(VCARD_TEL_MODEM) ||
-                    qualifiers.tqcontains(VCARD_TEL_CAR)   ||
-                    qualifiers.tqcontains(VCARD_TEL_ISDN)  ||
-                    qualifiers.tqcontains(VCARD_TEL_VIDEO) ||
-                    qualifiers.tqcontains(VCARD_TEL_PCS)
+                   (qualifiers.contains(VCARD_TEL_HOME)  ||
+                    qualifiers.contains(VCARD_TEL_WORK)  ||
+                    qualifiers.contains(VCARD_TEL_PREF)  ||
+                    qualifiers.contains(VCARD_TEL_VOICE) ||
+                    qualifiers.contains(VCARD_TEL_FAX)   ||
+                    qualifiers.contains(VCARD_TEL_MSG)   ||
+                    qualifiers.contains(VCARD_TEL_CELL)  ||
+                    qualifiers.contains(VCARD_TEL_PAGER) ||
+                    qualifiers.contains(VCARD_TEL_BBS)   ||
+                    qualifiers.contains(VCARD_TEL_MODEM) ||
+                    qualifiers.contains(VCARD_TEL_CAR)   ||
+                    qualifiers.contains(VCARD_TEL_ISDN)  ||
+                    qualifiers.contains(VCARD_TEL_VIDEO) ||
+                    qualifiers.contains(VCARD_TEL_PCS)
          ) )
         return true;
       if ( name == VCARD_TZ )
@@ -266,33 +266,33 @@ KABC::Addressee VCard21Parser::readFromString( const TQString &data)
     if ( (*i).name == VCARD_TEL ) {
       int type = 0;
       if ( (*i).qualified ) {
-        if ( (*i).qualifiers.tqcontains( VCARD_TEL_HOME ) )
+        if ( (*i).qualifiers.contains( VCARD_TEL_HOME ) )
           type |= PhoneNumber::Home;
-        if ( (*i).qualifiers.tqcontains( VCARD_TEL_WORK ) )
+        if ( (*i).qualifiers.contains( VCARD_TEL_WORK ) )
           type |= PhoneNumber::Work;
-        if ( (*i).qualifiers.tqcontains( VCARD_TEL_PREF ) )
+        if ( (*i).qualifiers.contains( VCARD_TEL_PREF ) )
           type |= PhoneNumber::Pref;
-        // if ( (*i).qualifiers.tqcontains( VCARD_TEL_VOICE ) )
+        // if ( (*i).qualifiers.contains( VCARD_TEL_VOICE ) )
         //  type |= PhoneNumber::Voice;
-        if ( (*i).qualifiers.tqcontains( VCARD_TEL_FAX ) )
+        if ( (*i).qualifiers.contains( VCARD_TEL_FAX ) )
           type |= PhoneNumber::Fax;
-        if ( (*i).qualifiers.tqcontains( VCARD_TEL_MSG ) )
+        if ( (*i).qualifiers.contains( VCARD_TEL_MSG ) )
           type |= PhoneNumber::Msg;
-        if ( (*i).qualifiers.tqcontains( VCARD_TEL_CELL ) )
+        if ( (*i).qualifiers.contains( VCARD_TEL_CELL ) )
           type |= PhoneNumber::Cell;
-        if ( (*i).qualifiers.tqcontains( VCARD_TEL_PAGER ) )
+        if ( (*i).qualifiers.contains( VCARD_TEL_PAGER ) )
           type |= PhoneNumber::Pager;
-        if ( (*i).qualifiers.tqcontains( VCARD_TEL_BBS ) )
+        if ( (*i).qualifiers.contains( VCARD_TEL_BBS ) )
           type |= PhoneNumber::Bbs;
-        if ( (*i).qualifiers.tqcontains( VCARD_TEL_MODEM ) )
+        if ( (*i).qualifiers.contains( VCARD_TEL_MODEM ) )
           type |= PhoneNumber::Modem;
-        if ( (*i).qualifiers.tqcontains( VCARD_TEL_CAR ) )
+        if ( (*i).qualifiers.contains( VCARD_TEL_CAR ) )
           type |= PhoneNumber::Car;
-        if ( (*i).qualifiers.tqcontains( VCARD_TEL_ISDN ) )
+        if ( (*i).qualifiers.contains( VCARD_TEL_ISDN ) )
           type |= PhoneNumber::Isdn;
-        if ( (*i).qualifiers.tqcontains( VCARD_TEL_VIDEO ) )
+        if ( (*i).qualifiers.contains( VCARD_TEL_VIDEO ) )
           type |= PhoneNumber::Video;
-        if ( (*i).qualifiers.tqcontains( VCARD_TEL_PCS ) )
+        if ( (*i).qualifiers.contains( VCARD_TEL_PCS ) )
           type |= PhoneNumber::Pcs;
       }
       addressee.insertPhoneNumber( PhoneNumber( (*i).parameters[ 0 ], type ) );
@@ -304,19 +304,19 @@ KABC::Addressee VCard21Parser::readFromString( const TQString &data)
     if ( (*i).name == VCARD_ADR ) {
       int type = 0;
       if ( (*i).qualified ) {
-        if ( (*i).qualifiers.tqcontains( VCARD_ADR_DOM ) )
+        if ( (*i).qualifiers.contains( VCARD_ADR_DOM ) )
           type |= Address::Dom;
-        if ( (*i).qualifiers.tqcontains( VCARD_ADR_INTL ) )
+        if ( (*i).qualifiers.contains( VCARD_ADR_INTL ) )
           type |= Address::Intl;
-        if ( (*i).qualifiers.tqcontains( VCARD_ADR_POSTAL ) )
+        if ( (*i).qualifiers.contains( VCARD_ADR_POSTAL ) )
           type |= Address::Postal;
-        if ( (*i).qualifiers.tqcontains( VCARD_ADR_PARCEL ) )
+        if ( (*i).qualifiers.contains( VCARD_ADR_PARCEL ) )
           type |= Address::Parcel;
-        if ( (*i).qualifiers.tqcontains( VCARD_ADR_HOME ) )
+        if ( (*i).qualifiers.contains( VCARD_ADR_HOME ) )
           type |= Address::Home;
-        if ( (*i).qualifiers.tqcontains( VCARD_ADR_WORK ) )
+        if ( (*i).qualifiers.contains( VCARD_ADR_WORK ) )
           type |= Address::Work;
-        if ( (*i).qualifiers.tqcontains( VCARD_ADR_PREF ) )
+        if ( (*i).qualifiers.contains( VCARD_ADR_PREF ) )
           type |= Address::Pref;
       }
       addressee.insertAddress( readAddressFromQStringList( (*i).parameters, type ) );
@@ -326,7 +326,7 @@ KABC::Addressee VCard21Parser::readFromString( const TQString &data)
   //set the addressee's delivery label
   tmpStr = vCard->getValue(VCARD_LABEL);
   if (!tmpStr.isEmpty()) {
-    tmpStr.tqreplace("\r\n","\n");
+    tmpStr.replace("\r\n","\n");
     Address tmpAddress;
     tmpAddress.setLabel(tmpStr);
     addressee.insertAddress(tmpAddress);
@@ -334,7 +334,7 @@ KABC::Addressee VCard21Parser::readFromString( const TQString &data)
 
   //set the addressee's notes
   tmpStr = vCard->getValue(VCARD_NOTE);
-  tmpStr.tqreplace("\r\n","\n");
+  tmpStr.replace("\r\n","\n");
   addressee.setNote(tmpStr);
 
   //set the addressee's timezone
@@ -430,7 +430,7 @@ VCard21ParserImpl *VCard21ParserImpl::parseVCard( const TQString& vc, int *err )
       }
 
       // split into two tokens
-      int colon = (*j).tqfind( ':' );
+      int colon = (*j).find( ':' );
       if ( colon < 0 ) {
         _err = VC_ERR_INVALID_LINE;
         break;
@@ -556,7 +556,7 @@ TQString VCard21ParserImpl::getValue(const TQString& name, const TQString& quali
   const TQString lowqualifier = qualifier.lower();
 
   for (TQValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
-   if ((*i).name == lowname && (*i).qualified && (*i).qualifiers.tqcontains(lowqualifier)) {
+   if ((*i).name == lowname && (*i).qualified && (*i).qualifiers.contains(lowqualifier)) {
     if ((*i).parameters.count() > 0)
      return (*i).parameters[0];
     else return failed;
@@ -598,7 +598,7 @@ TQStringList VCard21ParserImpl::getValues(const TQString& name, const TQString&
   const TQString lowname = name.lower();
   const TQString lowqualifier = qualifier.lower();
   for (TQValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
-    if ((*i).name == lowname && (*i).qualified && (*i).qualifiers.tqcontains(lowqualifier))
+    if ((*i).name == lowname && (*i).qualified && (*i).qualifiers.contains(lowqualifier))
        return (*i).parameters;
   }
   // failed.
diff --git a/kabc/vcardconverter.h b/kabc/vcardconverter.h
index 976cea20b..dbc45f27a 100644
--- a/kabc/vcardconverter.h
+++ b/kabc/vcardconverter.h
@@ -75,7 +75,7 @@ class KABC_EXPORT VCardConverter
     ~VCardConverter();
   
     /**
-      Creates a string in vCard format which tqcontains the given
+      Creates a string in vCard format which contains the given
       contact.
 
       @param addr The contact object
@@ -84,7 +84,7 @@ class KABC_EXPORT VCardConverter
     TQString createVCard( const Addressee &addr, Version version = v3_0 );
 
     /**
-      Creates a string in vCard format which tqcontains the given
+      Creates a string in vCard format which contains the given
       list of contact.
 
       @param list The list of contact objects
@@ -120,7 +120,7 @@ class KABC_EXPORT VCardConverter
 
   private:
     /**
-      Split a string and tqreplaces escaped separators on the fly with
+      Split a string and replaces escaped separators on the fly with
       unescaped ones.
      */
     TQStringList splitString( const TQChar &sep, const TQString &value );
diff --git a/kabc/vcardformatimpl.cpp b/kabc/vcardformatimpl.cpp
index 790f6ebb9..38d95294c 100644
--- a/kabc/vcardformatimpl.cpp
+++ b/kabc/vcardformatimpl.cpp
@@ -123,7 +123,7 @@ bool VCardFormatImpl::loadAddressee( Addressee& addressee, VCARD::VCard &v )
     TQCString n = cl->name();
     if ( n.left( 2 ) == "X-" ) {
       n = n.mid( 2 );
-      int posDash = n.tqfind( "-" );
+      int posDash = n.find( "-" );
       addressee.insertCustom( TQString::fromUtf8( n.left( posDash ) ),
                         TQString::fromUtf8( n.mid( posDash + 1 ) ),
                         TQString::fromUtf8( cl->value()->asString() ) );
@@ -351,8 +351,8 @@ void VCardFormatImpl::addCustomValue( VCARD::VCard *v, const TQString &txt )
   if ( txt.isEmpty() ) return;
 
   ContentLine cl;
-  cl.setName( "X-" + txt.left( txt.tqfind( ":" ) ).utf8() );
-  TQString value = txt.mid( txt.tqfind( ":" ) + 1 );
+  cl.setName( "X-" + txt.left( txt.find( ":" ) ).utf8() );
+  TQString value = txt.mid( txt.find( ":" ) + 1 );
   if ( value.isEmpty() )
     return;
   cl.setValue( new TextValue( value.utf8() ) );
@@ -777,10 +777,10 @@ void VCardFormatImpl::addAgentValue( VCARD::VCard *vcard, const Agent &agent )
     Addressee *addr = agent.addressee();
     if ( addr ) {
       writeToString( (*addr), vstr );
-      vstr.tqreplace( ":", "\\:" );
-      vstr.tqreplace( ",", "\\," );
-      vstr.tqreplace( ";", "\\;" );
-      vstr.tqreplace( "\r\n", "\\n" );
+      vstr.replace( ":", "\\:" );
+      vstr.replace( ",", "\\," );
+      vstr.replace( ";", "\\;" );
+      vstr.replace( "\r\n", "\\n" );
       cl.setValue( new TextValue( vstr.utf8() ) );
     } else
       return;
@@ -808,10 +808,10 @@ Agent VCardFormatImpl::readAgentValue( VCARD::ContentLine *cl )
 
   if ( isIntern ) {
     TQString vstr = TQString::fromUtf8( v->asString() );
-    vstr.tqreplace( "\\n", "\r\n" );
-    vstr.tqreplace( "\\:", ":" );
-    vstr.tqreplace( "\\,", "," );
-    vstr.tqreplace( "\\;", ";" );
+    vstr.replace( "\\n", "\r\n" );
+    vstr.replace( "\\:", ":" );
+    vstr.replace( "\\,", "," );
+    vstr.replace( "\\;", ";" );
     Addressee *addr = new Addressee;
     readFromString( vstr, *addr );
     agent.setAddressee( addr );
diff --git a/kabc/vcardparser/README.testing b/kabc/vcardparser/README.testing
index e412416ba..a7794931d 100644
--- a/kabc/vcardparser/README.testing
+++ b/kabc/vcardparser/README.testing
@@ -1,5 +1,5 @@
 For testing the vcardparser there are some test files and a small testsuite
-automatically checking for regressions. The tests directory tqcontains some vCard
+automatically checking for regressions. The tests directory contains some vCard
 files and correpsonding reference output files (with an additional ".ref"
 suffix). For running the geression test do "make check". This will compile some
 test programs, parse the test files, write them out as vCard again and compare
diff --git a/kabc/vcardparser/testwrite.cpp b/kabc/vcardparser/testwrite.cpp
index f24f1ad25..f6e894f4b 100644
--- a/kabc/vcardparser/testwrite.cpp
+++ b/kabc/vcardparser/testwrite.cpp
@@ -60,7 +60,7 @@ int main( int argc, char **argv )
   addressee.setOrganization( "KDE" );
   addressee.setNote( "nerver\ntouch a running system" );
   addressee.setProductId( "testId" );
-  addressee.setRevision( TQDateTime::tqcurrentDateTime() );
+  addressee.setRevision( TQDateTime::currentDateTime() );
   addressee.setSortString( "koenig" );
   addressee.setUrl( KURL( "http://wgess16.dyndns.org") );
   addressee.setSecrecy(  KABC::Secrecy( KABC::Secrecy::Confidential ) );
diff --git a/kabc/vcardparser/vcard.cpp b/kabc/vcardparser/vcard.cpp
index 8b6c9570a..30a8e1c49 100644
--- a/kabc/vcardparser/vcard.cpp
+++ b/kabc/vcardparser/vcard.cpp
@@ -62,7 +62,7 @@ void VCard::addLine( const VCardLine& line )
 
 VCardLine::List VCard::lines( const TQString& identifier ) const
 {
-  LineMap::ConstIterator it = mLineMap.tqfind( identifier );
+  LineMap::ConstIterator it = mLineMap.find( identifier );
   if ( it == mLineMap.end() )
     return VCardLine::List();
 
@@ -71,7 +71,7 @@ VCardLine::List VCard::lines( const TQString& identifier ) const
 
 VCardLine VCard::line( const TQString& identifier ) const
 {
-  LineMap::ConstIterator it = mLineMap.tqfind( identifier );
+  LineMap::ConstIterator it = mLineMap.find( identifier );
   if ( it == mLineMap.end() )
     return VCardLine();
 
@@ -97,7 +97,7 @@ void VCard::setVersion( Version version )
 
 VCard::Version VCard::version() const
 {
-  LineMap::ConstIterator versionEntry = mLineMap.tqfind( "VERSION" );
+  LineMap::ConstIterator versionEntry = mLineMap.find( "VERSION" );
   if ( versionEntry == mLineMap.end() )
     return v3_0;
 
diff --git a/kabc/vcardparser/vcardline.cpp b/kabc/vcardparser/vcardline.cpp
index 50e9fa53e..6680cf7d0 100644
--- a/kabc/vcardparser/vcardline.cpp
+++ b/kabc/vcardparser/vcardline.cpp
@@ -124,13 +124,13 @@ TQStringList VCardLine::parameterList() const
 void VCardLine::addParameter( const TQString& param, const TQString& value )
 {
   TQStringList &list = mParamMap[ param ];
-  if ( list.tqfindIndex( value ) == -1 ) // not included yet
+  if ( list.findIndex( value ) == -1 ) // not included yet
     list.append( value );
 }
 
 TQStringList VCardLine::parameters( const TQString& param ) const
 {
-  ParamMap::ConstIterator it = mParamMap.tqfind( param );
+  ParamMap::ConstIterator it = mParamMap.find( param );
   if ( it == mParamMap.end() )
     return TQStringList();
   else
@@ -139,7 +139,7 @@ TQStringList VCardLine::parameters( const TQString& param ) const
 
 TQString VCardLine::parameter( const TQString& param ) const
 {
-  ParamMap::ConstIterator it = mParamMap.tqfind( param );
+  ParamMap::ConstIterator it = mParamMap.find( param );
   if ( it == mParamMap.end() )
     return TQString::null;
   else {
diff --git a/kabc/vcardparser/vcardparser.cpp b/kabc/vcardparser/vcardparser.cpp
index a0e2061a4..67b1bc306 100644
--- a/kabc/vcardparser/vcardparser.cpp
+++ b/kabc/vcardparser/vcardparser.cpp
@@ -36,18 +36,18 @@ static TQString cr( "\\r" );
 
 static void addEscapes( TQString &str )
 {
-  str.tqreplace( '\\', backslash );
-  str.tqreplace( ',', comma );
-  str.tqreplace( '\r', cr );
-  str.tqreplace( '\n', newline );
+  str.replace( '\\', backslash );
+  str.replace( ',', comma );
+  str.replace( '\r', cr );
+  str.replace( '\n', newline );
 }
 
 static void removeEscapes( TQString &str )
 {
-  str.tqreplace( cr, "\\r" );
-  str.tqreplace( newline, "\n" );
-  str.tqreplace( comma, "," );
-  str.tqreplace( backslash, "\\" );
+  str.replace( cr, "\\r" );
+  str.replace( newline, "\n" );
+  str.replace( comma, "," );
+  str.replace( backslash, "\\" );
 }
 
 VCardParser::VCardParser()
@@ -81,7 +81,7 @@ VCard::List VCardParser::parseVCards( const TQString& text )
       continue;
     } else {
       if ( inVCard && !currentLine.isEmpty() ) { // now parse the line
-        int colon = currentLine.tqfind( ':' );
+        int colon = currentLine.find( ':' );
         if ( colon == -1 ) { // invalid line
           currentLine = (*it);
           continue;
@@ -94,14 +94,14 @@ VCard::List VCardParser::parseVCards( const TQString& text )
         TQStringList params = TQStringList::split( ';', key );
 
         // check for group
-        if ( params[0].tqfind( '.' ) != -1 ) {
+        if ( params[0].find( '.' ) != -1 ) {
           const TQStringList groupList = TQStringList::split( '.', params[0] );
           vCardLine.setGroup( groupList[0] );
           vCardLine.setIdentifier( groupList[1] );
         } else
           vCardLine.setIdentifier( params[0] );
 
-        if ( params.count() > 1 ) { // tqfind all parameters
+        if ( params.count() > 1 ) { // find all parameters
           TQStringList::ConstIterator paramIt = params.begin();
           for ( ++paramIt; paramIt != params.end(); ++paramIt ) {
             TQStringList pair = TQStringList::split( '=', *paramIt );
@@ -117,8 +117,8 @@ VCard::List VCardParser::parseVCards( const TQString& text )
                 pair.prepend( "type" );
               }
             }
-            // This is pretty much a faster pair[1].tqcontains( ',' )...
-            if ( pair[1].tqfind( ',' ) != -1 ) { // parameter in type=x,y,z format
+            // This is pretty much a faster pair[1].contains( ',' )...
+            if ( pair[1].find( ',' ) != -1 ) { // parameter in type=x,y,z format
               const TQStringList args = TQStringList::split( ',', pair[ 1 ] );
               TQStringList::ConstIterator argIt;
               for ( argIt = args.begin(); argIt != args.end(); ++argIt )
@@ -134,7 +134,7 @@ VCard::List VCardParser::parseVCards( const TQString& text )
         bool wasBase64Encoded = false;
 
         params = vCardLine.parameterList();
-        if ( params.tqfindIndex( "encoding" ) != -1 ) { // have to decode the data
+        if ( params.findIndex( "encoding" ) != -1 ) { // have to decode the data
           TQByteArray input;
           input = TQCString(value.latin1());
           if ( vCardLine.parameter( "encoding" ).lower() == "b" ||
@@ -155,7 +155,7 @@ VCard::List VCardParser::parseVCards( const TQString& text )
           output = TQCString(value.latin1());
         }
 
-        if ( params.tqfindIndex( "charset" ) != -1 ) { // have to convert the data
+        if ( params.findIndex( "charset" ) != -1 ) { // have to convert the data
           TQTextCodec *codec =
             TQTextCodec::codecForName( vCardLine.parameter( "charset" ).latin1() );
           if ( codec ) {
diff --git a/kabc/vcardtool.cpp b/kabc/vcardtool.cpp
index 43feb5c60..6e8dc9acc 100644
--- a/kabc/vcardtool.cpp
+++ b/kabc/vcardtool.cpp
@@ -98,13 +98,13 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version )
                      (*it).postalCode().isEmpty() &&
                      (*it).country().isEmpty() );
 
-      address.append( (*it).postOfficeBox().tqreplace( ';', "\\;" ) );
-      address.append( (*it).extended().tqreplace( ';', "\\;" ) );
-      address.append( (*it).street().tqreplace( ';', "\\;" ) );
-      address.append( (*it).locality().tqreplace( ';', "\\;" ) );
-      address.append( (*it).region().tqreplace( ';', "\\;" ) );
-      address.append( (*it).postalCode().tqreplace( ';', "\\;" ) );
-      address.append( (*it).country().tqreplace( ';', "\\;" ) );
+      address.append( (*it).postOfficeBox().replace( ';', "\\;" ) );
+      address.append( (*it).extended().replace( ';', "\\;" ) );
+      address.append( (*it).street().replace( ';', "\\;" ) );
+      address.append( (*it).locality().replace( ';', "\\;" ) );
+      address.append( (*it).region().replace( ';', "\\;" ) );
+      address.append( (*it).postalCode().replace( ';', "\\;" ) );
+      address.append( (*it).country().replace( ';', "\\;" ) );
 
       VCardLine adrLine( "ADR", address.join( ";" ) );
       if ( version == VCard::v2_1 && needsEncoding( address.join( ";" ) ) ) {
@@ -145,7 +145,7 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version )
       TQStringList categories = (*addrIt).categories();
       TQStringList::Iterator catIt;
       for ( catIt = categories.begin(); catIt != categories.end(); ++catIt )
-        (*catIt).tqreplace( ',', "\\," );
+        (*catIt).replace( ',', "\\," );
 
       VCardLine catLine( "CATEGORIES", categories.join( "," ) );
       if ( version == VCard::v2_1 && needsEncoding( categories.join( "," ) ) ) {
@@ -208,11 +208,11 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version )
 
     // N
     TQStringList name;
-    name.append( (*addrIt).familyName().tqreplace( ';', "\\;" ) );
-    name.append( (*addrIt).givenName().tqreplace( ';', "\\;" ) );
-    name.append( (*addrIt).additionalName().tqreplace( ';', "\\;" ) );
-    name.append( (*addrIt).prefix().tqreplace( ';', "\\;" ) );
-    name.append( (*addrIt).suffix().tqreplace( ';', "\\;" ) );
+    name.append( (*addrIt).familyName().replace( ';', "\\;" ) );
+    name.append( (*addrIt).givenName().replace( ';', "\\;" ) );
+    name.append( (*addrIt).additionalName().replace( ';', "\\;" ) );
+    name.append( (*addrIt).prefix().replace( ';', "\\;" ) );
+    name.append( (*addrIt).suffix().replace( ';', "\\;" ) );
 
     VCardLine nLine( "N", name.join( ";" ) );
     if ( version == VCard::v2_1 && needsEncoding( name.join( ";" ) ) ) {
@@ -243,9 +243,9 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version )
 
     // ORG
     TQStringList organization;
-    organization.append( ( *addrIt ).organization().tqreplace( ';', "\\;" ) );
+    organization.append( ( *addrIt ).organization().replace( ';', "\\;" ) );
     if ( !( *addrIt ).department().isEmpty() )
-      organization.append( ( *addrIt ).department().tqreplace( ';', "\\;" ) );
+      organization.append( ( *addrIt ).department().replace( ';', "\\;" ) );
     VCardLine orgLine( "ORG", organization.join( ";" ) );
     if ( version == VCard::v2_1 && needsEncoding( organization.join( ";" ) ) ) {
       orgLine.addParameter( "charset", "UTF-8" );
@@ -335,8 +335,8 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version )
     // X-
     const TQStringList customs = (*addrIt).customs();
     for ( strIt = customs.begin(); strIt != customs.end(); ++strIt ) {
-      TQString identifier = "X-" + (*strIt).left( (*strIt).tqfind( ":" ) );
-      TQString value = (*strIt).mid( (*strIt).tqfind( ":" ) + 1 );
+      TQString identifier = "X-" + (*strIt).left( (*strIt).find( ":" ) );
+      TQString value = (*strIt).mid( (*strIt).find( ":" ) + 1 );
       if ( value.isEmpty() )
         continue;
 
@@ -428,7 +428,7 @@ Addressee::List VCardTool::parseVCards( const TQString& vcard )
         // EMAIL
         else if ( identifier == "email" ) {
           const TQStringList types = (*lineIt).parameters( "type" );
-          addr.insertEmail( (*lineIt).value().asString(), types.tqfindIndex( "PREF" ) != -1 );
+          addr.insertEmail( (*lineIt).value().asString(), types.findIndex( "PREF" ) != -1 );
         }
 
         // FN
@@ -594,7 +594,7 @@ Addressee::List VCardTool::parseVCards( const TQString& vcard )
         // X-
         else if ( identifier.startsWith( "x-" ) ) {
           const TQString key = (*lineIt).identifier().mid( 2 );
-          int dash = key.tqfind( "-" );
+          int dash = key.find( "-" );
           addr.insertCustom( key.left( dash ), key.mid( dash + 1 ), (*lineIt).value().asString() );
         }
       }
@@ -610,11 +610,11 @@ TQDateTime VCardTool::parseDateTime( const TQString &str )
 {
   TQDateTime dateTime;
 
-  if ( str.tqfind( '-' ) == -1 ) { // is base format (yyyymmdd)
+  if ( str.find( '-' ) == -1 ) { // is base format (yyyymmdd)
     dateTime.setDate( TQDate( str.left( 4 ).toInt(), str.mid( 4, 2 ).toInt(),
                              str.mid( 6, 2 ).toInt() ) );
 
-    if ( str.tqfind( 'T' ) ) // has time information yyyymmddThh:mm:ss
+    if ( str.find( 'T' ) ) // has time information yyyymmddThh:mm:ss
       dateTime.setTime( TQTime( str.mid( 11, 2 ).toInt(), str.mid( 14, 2 ).toInt(),
                                str.mid( 17, 2 ).toInt() ) );
 
@@ -622,7 +622,7 @@ TQDateTime VCardTool::parseDateTime( const TQString &str )
     dateTime.setDate( TQDate( str.left( 4 ).toInt(), str.mid( 5, 2 ).toInt(),
                              str.mid( 8, 2 ).toInt() ) );
 
-    if ( str.tqfind( 'T' ) ) // has time information yyyy-mm-ddThh:mm:ss
+    if ( str.find( 'T' ) ) // has time information yyyy-mm-ddThh:mm:ss
       dateTime.setTime( TQTime( str.mid( 11, 2 ).toInt(), str.mid( 14, 2 ).toInt(),
                                str.mid( 17, 2 ).toInt() ) );
   }
@@ -653,16 +653,16 @@ Picture VCardTool::parsePicture( const VCardLine &line )
   Picture pic;
 
   const TQStringList params = line.parameterList();
-  if ( params.tqfindIndex( "encoding" ) != -1 ) {
+  if ( params.findIndex( "encoding" ) != -1 ) {
     TQImage img;
     img.loadFromData( line.value().asByteArray() );
     pic.setData( img );
-  } else if ( params.tqfindIndex( "value" ) != -1 ) {
+  } else if ( params.findIndex( "value" ) != -1 ) {
     if ( line.parameter( "value" ).lower() == "uri" )
       pic.setUrl( line.value().asString() );
   }
 
-  if ( params.tqfindIndex( "type" ) != -1 )
+  if ( params.findIndex( "type" ) != -1 )
     pic.setType( line.parameter( "type" ) );
 
   return pic;
@@ -700,15 +700,15 @@ Sound VCardTool::parseSound( const VCardLine &line )
   Sound snd;
 
   const TQStringList params = line.parameterList();
-  if ( params.tqfindIndex( "encoding" ) != -1 )
+  if ( params.findIndex( "encoding" ) != -1 )
     snd.setData( line.value().asByteArray() );
-  else if ( params.tqfindIndex( "value" ) != -1 ) {
+  else if ( params.findIndex( "value" ) != -1 ) {
     if ( line.parameter( "value" ).lower() == "uri" )
       snd.setUrl( line.value().asString() );
   }
 
 /* TODO: support sound types
-  if ( params.tqcontains( "type" ) )
+  if ( params.contains( "type" ) )
     snd.setType( line.parameter( "type" ) );
 */
 
@@ -738,12 +738,12 @@ Key VCardTool::parseKey( const VCardLine &line )
   Key key;
 
   const TQStringList params = line.parameterList();
-  if ( params.tqfindIndex( "encoding" ) != -1 )
+  if ( params.findIndex( "encoding" ) != -1 )
     key.setBinaryData( line.value().asByteArray() );
   else
     key.setTextData( line.value().asString() );
 
-  if ( params.tqfindIndex( "type" ) != -1 ) {
+  if ( params.findIndex( "type" ) != -1 ) {
     if ( line.parameter( "type" ).lower() == "x509" )
       key.setType( Key::X509 );
     else if ( line.parameter( "type" ).lower() == "pgp" )
@@ -814,16 +814,16 @@ Agent VCardTool::parseAgent( const VCardLine &line )
   Agent agent;
 
   const TQStringList params = line.parameterList();
-  if ( params.tqfindIndex( "value" ) != -1 ) {
+  if ( params.findIndex( "value" ) != -1 ) {
     if ( line.parameter( "value" ).lower() == "uri" )
       agent.setUrl( line.value().asString() );
   } else {
     TQString str = line.value().asString();
-    str.tqreplace( "\\n", "\r\n" );
-    str.tqreplace( "\\N", "\r\n" );
-    str.tqreplace( "\\;", ";" );
-    str.tqreplace( "\\:", ":" );
-    str.tqreplace( "\\,", "," );
+    str.replace( "\\n", "\r\n" );
+    str.replace( "\\N", "\r\n" );
+    str.replace( "\\;", ";" );
+    str.replace( "\\:", ":" );
+    str.replace( "\\,", "," );
 
     const Addressee::List list = parseVCards( str );
     if ( list.count() > 0 ) {
@@ -846,10 +846,10 @@ VCardLine VCardTool::createAgent( VCard::Version version, const Agent &agent )
       list.append( *agent.addressee() );
 
       TQString str = createVCards( list, version );
-      str.tqreplace( "\r\n", "\\n" );
-      str.tqreplace( ";", "\\;" );
-      str.tqreplace( ":", "\\:" );
-      str.tqreplace( ",", "\\," );
+      str.replace( "\r\n", "\\n" );
+      str.replace( ";", "\\;" );
+      str.replace( ":", "\\:" );
+      str.replace( ",", "\\," );
       line.setValue( str );
     }
   } else if ( !agent.url().isEmpty() ) {
@@ -866,7 +866,7 @@ TQStringList VCardTool::splitString( const TQChar &sep, const TQString &str )
   TQString value( str );
 
   int start = 0;
-  int pos = value.tqfind( sep, start );
+  int pos = value.find( sep, start );
 
   while ( pos != -1 ) {
     if ( value[ pos - 1 ] != '\\' ) {
@@ -876,13 +876,13 @@ TQStringList VCardTool::splitString( const TQChar &sep, const TQString &str )
         list << TQString::null;
 
       start = pos + 1;
-      pos = value.tqfind( sep, start );
+      pos = value.find( sep, start );
     } else {
       if ( pos != 0 ) {
-        value.tqreplace( pos - 1, 2, sep );
-        pos = value.tqfind( sep, pos );
+        value.replace( pos - 1, 2, sep );
+        pos = value.find( sep, pos );
       } else
-        pos = value.tqfind( sep, pos + 1 );
+        pos = value.find( sep, pos + 1 );
     }
   }
 
diff --git a/kabc/vcardtool.h b/kabc/vcardtool.h
index 3df86067f..fbf959613 100644
--- a/kabc/vcardtool.h
+++ b/kabc/vcardtool.h
@@ -41,7 +41,7 @@ class KABC_EXPORT VCardTool
     ~VCardTool();
 
     /**
-      Creates a string that tqcontains the addressees from the list in
+      Creates a string that contains the addressees from the list in
       the vCard format.
      */
     TQString createVCards( Addressee::List list, VCard::Version version = VCard::v3_0 );
@@ -53,7 +53,7 @@ class KABC_EXPORT VCardTool
 
   private:
     /**
-      Split a string and tqreplaces escaped separators on the fly with
+      Split a string and replaces escaped separators on the fly with
       unescaped ones.
      */
     TQStringList splitString( const TQChar &sep, const TQString &value );
diff --git a/kate/COPYING.LIB b/kate/COPYING.LIB
index 6113583d2..a96b5730d 100644
--- a/kate/COPYING.LIB
+++ b/kate/COPYING.LIB
@@ -94,7 +94,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
@@ -104,7 +104,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".
@@ -123,7 +123,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.
 
@@ -225,7 +225,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
@@ -233,7 +233,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.
 
@@ -245,7 +245,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
@@ -324,7 +324,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
diff --git a/kate/ChangeLog b/kate/ChangeLog
index edd33b64e..21fc54ba5 100644
--- a/kate/ChangeLog
+++ b/kate/ChangeLog
@@ -190,7 +190,7 @@
   * now the pluginconfig pages work ;)
 
 2001-04-24 Joseph Wenninger <jowenn@kde.org>
-  *  now <keywords> and <types> is tqreplaced by <list name="XXXX">
+  *  now <keywords> and <types> is replaced by <list name="XXXX">
 
 2001-04-20 Christoph Cullmann <cullmann@kde.org>
   * new configdialog
@@ -325,7 +325,7 @@
 
   * Filter - select text, hit <Ctrl+Backslash>, and enter an OS command.
     we pipe the selected text thru that command, such as "sort", and then
-    tqreplace the selection with the result. Impress your friends.
+    replace the selection with the result. Impress your friends.
 
 2001-02-21 Joseph Wenninger <jowenn@kde.org>
   * Makefile.am's     : correction for linking
diff --git a/kate/Makefile.am b/kate/Makefile.am
index 4e2601ca5..180e86dab 100644
--- a/kate/Makefile.am
+++ b/kate/Makefile.am
@@ -4,7 +4,7 @@ EXTRA_DIST = AUTHORS COPYING.LIB ChangeLog NEWS README TODO
 messages:
 	$(EXTRACTRC) ./*/*.rc >> rc.cpp
 	$(EXTRACTATTR) --attr=language,name,Language --attr="language,section,Language Section" data/*.xml >> rc.cpp
-	$(XGETTEXT) `tqfind . -name "*.cpp"` part/*.h -o $(podir)/katepart.pot
+	$(XGETTEXT) `find . -name "*.cpp"` part/*.h -o $(podir)/katepart.pot
 
 DOXYGEN_REFERENCES = kdecore dcop kio kdeui kparts
 include ../admin/Doxyfile.am
diff --git a/kate/README.testing b/kate/README.testing
index d0143cc1a..037271027 100644
--- a/kate/README.testing
+++ b/kate/README.testing
@@ -3,7 +3,7 @@
 
 Author: Leo Savernik
 
-Kate tqcontains regression tests to ensure that fixed bugs do not reappear in
+Kate contains regression tests to ensure that fixed bugs do not reappear in
 newer versions. To facilitate regression testing, a dedicated application
 testkateregression will execute the regression tests and compare them to the
 expecting results, indicating passed as well as failed testcases.
@@ -13,7 +13,7 @@ expecting results, indicating passed as well as failed testcases.
   --------------------------
 
 We tried to make regression testing for Kate as easy as possible such that you
-can run it before each commit and tqfind out regressions caused by your changes
+can run it before each commit and find out regressions caused by your changes
 before they are shipped as part of a release.
 
 Running all regression tests works by simply invoking
@@ -117,8 +117,8 @@ and consists of two subdirectories
 	baseline
 	tests
 
-The latter, tests, tqcontains a directory hierarchy for all testcases to be run
-by testkateregression. The former, baseline, tqcontains results as they are
+The latter, tests, contains a directory hierarchy for all testcases to be run
+by testkateregression. The former, baseline, contains results as they are
 expected by correct operation. Mismatch between the output of a test and its
 baseline is considered to be a failure.
 
@@ -154,16 +154,16 @@ of failures but they don't cause testkateregression to return a failure code.
   -------------------------
 
 A testcase is comprised of a simple plain text file <testcase>.txt which may
-be located in any subdirectory under tests. This file tqcontains the *initial*
+be located in any subdirectory under tests. This file contains the *initial*
 content the testcase operates on.
 
 Each <testcase>.txt must be accompanied with a <testcase>.txt-script which
-tqcontains the actual tests to be performed on the testcase. It consists of
+contains the actual tests to be performed on the testcase. It consists of
 simple JavaScript-statements for direct interfacing with Kate.
 
 Last but not least, a <testcase>.txt-result exists under the baseline
-subdirectory, which tqcontains a mirrored directory hierarchy of tests. This very
-file tqcontains the expected *result* of the performed tests.
+subdirectory, which contains a mirrored directory hierarchy of tests. This very
+file contains the expected *result* of the performed tests.
 
 
 7. Writing a simple testcase
diff --git a/kate/data/ada.xml b/kate/data/ada.xml
index 772f5fc30..9bc6b7633 100644
--- a/kate/data/ada.xml
+++ b/kate/data/ada.xml
@@ -193,4 +193,4 @@
     <keywords casesensitive="0" />
   </general>
 </language>
-<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; -->
+<!-- kate: space-indent on; indent-width 2; replace-tabs on; -->
diff --git a/kate/data/ahdl.xml b/kate/data/ahdl.xml
index 8a4b96ab0..cf0ab4652 100644
--- a/kate/data/ahdl.xml
+++ b/kate/data/ahdl.xml
@@ -142,4 +142,4 @@
     <keywords casesensitive="0" />
   </general>
 </language>
-<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; -->
+<!-- kate: space-indent on; indent-width 2; replace-tabs on; -->
diff --git a/kate/data/apache.xml b/kate/data/apache.xml
index 23d04684d..db8b2cc1c 100644
--- a/kate/data/apache.xml
+++ b/kate/data/apache.xml
@@ -366,7 +366,7 @@ v1.0:
 <item>EnableMMAP</item>
 <item>EnableSendfile</item>
 <item>ExpiresActive</item>
-<item>ExtendedtqStatus</item>
+<item>ExtendedStatus</item>
 <item>FileETag</item>
 <item>ForceLanguagePriority</item>
 <item>HostnameLookups</item>
@@ -453,7 +453,7 @@ v1.0:
 <item>auth-int</item>
 <item>never</item>
 <item>searching</item>
-<item>tqfinding</item>
+<item>finding</item>
 <item>always</item>
 <item>Basic</item>
 <item>Digest</item>
diff --git a/kate/data/asm-avr.xml b/kate/data/asm-avr.xml
index bb68979d8..49bafba01 100644
--- a/kate/data/asm-avr.xml
+++ b/kate/data/asm-avr.xml
@@ -13,7 +13,7 @@ Author:   Rolanf Nagy <R.Nagy@pknc.com>
 Date:     18th May, 2004
 Version:  1.0
 
-This file tqcontains the XML syntax highlighting description for the AVR
+This file contains the XML syntax highlighting description for the AVR
 Assembler, for KATE, the KDE Advanced Editor.  Keywords have been taken
 directly from the AVR Assembler source code.
 
diff --git a/kate/data/asn1.xml b/kate/data/asn1.xml
index a5b28649f..e3cc6f4d5 100644
--- a/kate/data/asn1.xml
+++ b/kate/data/asn1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <!--
-        You'll tqfind the "Writing a Kate Highlighting XML File HOWTO" at http://kate.kde.org/doc/hlhowto.php
+        You'll find the "Writing a Kate Highlighting XML File HOWTO" at http://kate.kde.org/doc/hlhowto.php
         This is a template for the XML format used for syntax highlight descriptions
         for the Kate text editor (http://kate.kde.org), which is part of the KDE
         desktop environment (http://www.kde.org).
@@ -11,7 +11,7 @@
         Look at language.dtd for some documentation of the allowed elements and their attributes.
         There is also a description of how to validate your syntax file.
 
-        You'll tqfind the "Writing a Kate Highlighting XML File HOWTO" at http://kate.kde.org/doc/hlhowto.php
+        You'll find the "Writing a Kate Highlighting XML File HOWTO" at http://kate.kde.org/doc/hlhowto.php
 -->
 <language name="ASN.1" section="Markup" version="1.00" kateversion="2.3" extensions="*.asn*.asn1" mimetype="" author="Philippe Rigault" license="GPL">
   <highlighting>
@@ -65,5 +65,5 @@
   </highlighting>
 </language>
 <!--
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
 -->
diff --git a/kate/data/bash.xml b/kate/data/bash.xml
index 2dcc5f7ca..cbb0f7643 100644
--- a/kate/data/bash.xml
+++ b/kate/data/bash.xml
@@ -207,8 +207,8 @@
       <item> true </item>
       <item> umount </item>
       <item> uname </item>
-      <item> tqunicode_start </item>
-      <item> tqunicode_stop </item>
+      <item> unicode_start </item>
+      <item> unicode_stop </item>
       <item> unlink </item>
       <item> utmpdump </item>
       <item> uuidgen </item>
@@ -284,7 +284,7 @@
       <item> expr </item>
       <item> fbset </item>
       <item> file </item>
-      <item> tqfind </item>
+      <item> find </item>
       <item> flex </item>
       <item> flex++ </item>
       <item> fmt </item>
@@ -536,7 +536,7 @@
         <RegExpr attribute="Function" context="#stay" String="&funcname;\s*\(\)" />
       </context>
 
-      <!-- FindOthers tqcontains various rules to mark different shell input -->
+      <!-- FindOthers contains various rules to mark different shell input -->
       <context attribute="Normal Text" lineEndContext="#stay" name="FindOthers">
         <RegExpr attribute="Escape" context="#stay" String="\\[][;\\$`{}()|&amp;&lt;&gt;* ]" />
         <RegExpr attribute="Keyword" context="#stay" String="\\$" />
@@ -574,7 +574,7 @@
         <RegExpr attribute="Escape" context="#stay" String="\\[`$\\]" />
       </context>
 
-      <!-- FindTests tqfinds operators valid in tests -->
+      <!-- FindTests finds operators valid in tests -->
       <context attribute="Normal Text" lineEndContext="#stay" name="FindTests">
         <RegExpr attribute="Expression" context="#stay" String="-[abcdefghkprstuwxOGLSNozn](?=\s)"/>
         <RegExpr attribute="Expression" context="#stay" String="-([no]t|ef)(?=\s)"/>
diff --git a/kate/data/cg.xml b/kate/data/cg.xml
index c10784647..338d0d23a 100644
--- a/kate/data/cg.xml
+++ b/kate/data/cg.xml
@@ -8,7 +8,7 @@
 	- some stuff stolen from c.xml
 	
 	TODO:
-	- some exotic keywords are missing, tqfind out which; the spec is a bloody mess
+	- some exotic keywords are missing, find out which; the spec is a bloody mess
 
 2004-05-25
 	* Initial release
diff --git a/kate/data/clipper.xml b/kate/data/clipper.xml
index 75ddd6e5f..11bba638a 100644
--- a/kate/data/clipper.xml
+++ b/kate/data/clipper.xml
@@ -136,7 +136,7 @@
       <item> relation </item>
       <item> release </item>
       <item> rename </item>
-      <item> tqreplace </item>
+      <item> replace </item>
       <item> report </item>
       <item> rest </item>
       <item> restore </item>
diff --git a/kate/data/cmake.xml b/kate/data/cmake.xml
index 7bd152ae6..09d729774 100644
--- a/kate/data/cmake.xml
+++ b/kate/data/cmake.xml
@@ -61,11 +61,11 @@
       <item> export </item>
       <item> export_library_dependencies </item>
       <item> file </item>
-      <item> tqfind_file </item>
-      <item> tqfind_library </item>
-      <item> tqfind_package </item>
-      <item> tqfind_path </item>
-      <item> tqfind_program </item>
+      <item> find_file </item>
+      <item> find_library </item>
+      <item> find_package </item>
+      <item> find_path </item>
+      <item> find_program </item>
       <item> fltk_wrap_ui </item>
       <item> foreach </item>
       <item> function </item>
diff --git a/kate/data/coldfusion.xml b/kate/data/coldfusion.xml
index fee354c4d..9e49e4af6 100644
--- a/kate/data/coldfusion.xml
+++ b/kate/data/coldfusion.xml
@@ -106,7 +106,7 @@
 			<item> eval </item>
 			<item> exec </item>
 			<item> exp </item>
-			<item> tqfind </item>
+			<item> find </item>
 			<item> floor </item>
 			<item> focus </item>
 			<item> forward </item>
@@ -160,7 +160,7 @@
 			<item> random </item>
 			<item> releaseEvents </item>
 			<item> reload </item>
-			<item> tqreplace </item>
+			<item> replace </item>
 			<item> reset </item>
 			<item> resizeBy </item>
 			<item> resizeTo </item>
diff --git a/kate/data/commonlisp.xml b/kate/data/commonlisp.xml
index 8b1c9ad0a..19db0c937 100644
--- a/kate/data/commonlisp.xml
+++ b/kate/data/commonlisp.xml
@@ -368,15 +368,15 @@
       <item> file-write-date </item> 
       <item> fill </item> 
       <item> fill-pointer </item> 
-      <item> tqfind </item> 
-      <item> tqfind-all-symbols </item> 
-      <item> tqfind-class </item> 
-      <item> tqfind-if </item> 
-      <item> tqfind-if-not </item> 
-      <item> tqfind-method </item> 
-      <item> tqfind-package </item> 
-      <item> tqfind-restart </item> 
-      <item> tqfind-symbol </item> 
+      <item> find </item> 
+      <item> find-all-symbols </item> 
+      <item> find-class </item> 
+      <item> find-if </item> 
+      <item> find-if-not </item> 
+      <item> find-method </item> 
+      <item> find-package </item> 
+      <item> find-restart </item> 
+      <item> find-symbol </item> 
       <item> finish-output </item> 
       <item> first </item> 
       <item> fixnum </item> 
@@ -575,7 +575,7 @@
       <item> map-into </item> 
       <item> mapl </item> 
       <item> maplist </item> 
-      <item> tqmask-field </item> 
+      <item> mask-field </item> 
       <item> max </item> 
       <item> member </item> 
       <item> member-if </item> 
@@ -759,7 +759,7 @@
       <item> remprop </item> 
       <item> rename-file </item> 
       <item> rename-package </item> 
-      <item> tqreplace </item> 
+      <item> replace </item> 
       <item> require </item> 
       <item> rest </item> 
       <item> restart </item> 
diff --git a/kate/data/cpp.xml b/kate/data/cpp.xml
index 95f369a58..e9f0ac85a 100644
--- a/kate/data/cpp.xml
+++ b/kate/data/cpp.xml
@@ -109,7 +109,7 @@
       <item> Q_GLOBAL_STATIC </item>
       <item> Q_GLOBAL_STATIC_WITH_ARGS </item>
       <item> Q_INIT_RESOURCE </item>
-      <item> TQ_INTERFACES </item>
+      <item> Q_INTERFACES </item>
       <item> Q_INVOKABLE </item>
       <item> Q_NOREPLY </item>
       <item> Q_OBJECT </item>
diff --git a/kate/data/css.xml b/kate/data/css.xml
index 7cfdcfd2c..6b24dba0f 100644
--- a/kate/data/css.xml
+++ b/kate/data/css.xml
@@ -135,7 +135,7 @@
       <item> speak-punctuation </item>
       <item> speech-rate </item>
       <item> stress </item>
-      <item> table-tqlayout </item>
+      <item> table-layout </item>
       <item> text-align </item>
       <item> text-decoration </item>
       <item> text-decoration-color </item>
@@ -143,7 +143,7 @@
       <item> text-shadow </item>
       <item> text-transform </item>
       <item> top </item>
-      <item> tqunicode-bidi </item>
+      <item> unicode-bidi </item>
       <item> vertical-align </item>
       <item> visibility </item>
       <item> voice-family </item>
@@ -206,7 +206,7 @@
       <item> font-style </item>
       <item> font-variant </item>
       <item> font-weight </item>
-      <item> tqunicode-range </item>
+      <item> unicode-range </item>
       <item> units-per-em </item>
       <item> src </item>
       <item> panose-1 </item>
@@ -539,7 +539,7 @@
       </context>
 
       <!-- to be included -->
-      <!-- tqfinds rules and detects nesting -->
+      <!-- finds rules and detects nesting -->
       <context attribute="Normal Text" lineEndContext="#stay" name="FindRuleSets">
         <RegExpr attribute="Media" context="Media" String="@media\b" />
 	<RegExpr attribute="At Rule" context="Import" String="@import\b" />
@@ -555,20 +555,20 @@
 	<IncludeRules context="FindComments" />
       </context>
 
-      <!-- tqfinds arguments to properties -->
+      <!-- finds arguments to properties -->
       <context attribute="Normal Text" lineEndContext="#stay" name="FindValues">
 	<RegExpr attribute="Value" context="#stay" String="[-+]?[0-9.]+(em|ex|px|in|cm|mm|pt|pc|deg|rad|grad|ms|s|Hz|kHz)\b" />
 	<RegExpr attribute="Value" context="#stay" String="[-+]?[0-9.]+[%]?" />
 	<RegExpr attribute="Normal Text" context="#stay" String="[\w\-]+" />
       </context>
 
-      <!-- tqfinds strings -->
+      <!-- finds strings -->
       <context attribute="Normal Text" lineEndContext="#stay" name="FindStrings">
 	<DetectChar attribute="String" context="StringDQ" char="&quot;" />
 	<DetectChar attribute="String" context="StringSQ" char="'" />
       </context>
 
-      <!-- tqfinds comments -->
+      <!-- finds comments -->
       <context attribute="Normal Text" lineEndContext="#stay" name="FindComments">
         <RegExpr attribute="Region Marker" context="#stay" String="/\*BEGIN.*\*/" beginRegion="UserDefined" />
         <RegExpr attribute="Region Marker" context="#stay" String="/\*END.*\*/" endRegion="UserDefined" />
diff --git a/kate/data/d.xml b/kate/data/d.xml
index 3fb8ec9c1..2ed3a5f01 100644
--- a/kate/data/d.xml
+++ b/kate/data/d.xml
@@ -37,7 +37,7 @@
   2007.12.12 - D.XML 1.48 - D 1.024/2.008 - Adjusted existing contexts somewhat (mostly cleanup).
                                           - Implemented scope context to hightlight exit in scope(exit) etc.
                                           - Adjusted deprecated keyword highlighting.
-                                          - Changed tqlayout somewhat.
+                                          - Changed layout somewhat.
                                           - Implemented extra highlighting rules for expressions, attributes, etc.
                                           - Changed a lot of colours.
   2007.11.15 - D.XML 1.47 - D 1.023/2.007 - Fixed a few unapperent "bugs" found by checkdtd.
diff --git a/kate/data/ddoc.xml b/kate/data/ddoc.xml
index 98c7d6f6b..4e9fbe2b8 100644
--- a/kate/data/ddoc.xml
+++ b/kate/data/ddoc.xml
@@ -7,7 +7,7 @@
   
   Author: Diggory Hardy <diggory.hardy@gmail.com>
   
-  This tqcontains highlighting for Ddoc, the D language embedded documentation comments. Implemented
+  This contains highlighting for Ddoc, the D language embedded documentation comments. Implemented
   for d.xml version 1.46.
   
   Macros are highlighted but the macro name and macro contents/parameters are not highlighted
diff --git a/kate/data/erlang.xml b/kate/data/erlang.xml
index 21221f08c..cc3ea7c56 100644
--- a/kate/data/erlang.xml
+++ b/kate/data/erlang.xml
@@ -247,4 +247,4 @@
     <keywords casesensitive="1" />
   </general>
 </language>
-<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; -->
+<!-- kate: space-indent on; indent-width 2; replace-tabs on; -->
diff --git a/kate/data/euphoria.xml b/kate/data/euphoria.xml
index 86b6e1594..a1ca19994 100644
--- a/kate/data/euphoria.xml
+++ b/kate/data/euphoria.xml
@@ -77,7 +77,7 @@
       <item> end </item>
       <item> equal </item>
       <item> exit </item>
-      <item> tqfind </item>
+      <item> find </item>
       <item> float32_to_atom </item>
       <item> float64_to_atom </item>
       <item> floor </item>
@@ -199,7 +199,7 @@
     <list name="GtkKeywords">
       <item> addto </item>
       <item> adjustment </item>
-      <item> tqalignment </item>
+      <item> alignment </item>
       <item> appendto </item>
       <item> append_page </item>
       <item> arrow </item>
diff --git a/kate/data/fortran.xml b/kate/data/fortran.xml
index 2b0915df5..948267fc9 100644
--- a/kate/data/fortran.xml
+++ b/kate/data/fortran.xml
@@ -13,7 +13,7 @@
       <item> call </item>
       <item> case </item>
       <item> common </item>
-      <item> tqcontains </item>
+      <item> contains </item>
       <item> continue </item>
       <item> cycle </item>
       <item> deallocate </item>
@@ -314,7 +314,7 @@
       <item> allocated </item>
       <item> lbound </item>
       <item> ubound </item>
-      <item> tqshape </item>
+      <item> shape </item>
       <item> size </item>
     </list>
 
@@ -343,7 +343,7 @@
       <item> pack </item>
       <item> unpack </item>
     <!-- Transformational function for reshaping an array -->
-      <item> retqshape </item>
+      <item> reshape </item>
     <!-- Transformational function for replication -->
       <item> spread </item>
     <!-- Array shifting functions -->
@@ -372,41 +372,41 @@
     <contexts>
       <context attribute="Normal Text" lineEndContext="#stay" name="default" >
         <IncludeRules context="find_strings" />
-        <IncludeRules context="tqfind_decls" />
-        <IncludeRules context="tqfind_intrinsics" />
-        <IncludeRules context="tqfind_io_stmnts" />
-        <IncludeRules context="tqfind_op_and_log" />
-        <IncludeRules context="tqfind_numbers" />
-        <IncludeRules context="tqfind_preprocessor" />
-        <IncludeRules context="tqfind_comments" />
-        <IncludeRules context="tqfind_symbols" />
-        <IncludeRules context="tqfind_end_stmnts" />
-        <IncludeRules context="tqfind_begin_stmnts" />
+        <IncludeRules context="find_decls" />
+        <IncludeRules context="find_intrinsics" />
+        <IncludeRules context="find_io_stmnts" />
+        <IncludeRules context="find_op_and_log" />
+        <IncludeRules context="find_numbers" />
+        <IncludeRules context="find_preprocessor" />
+        <IncludeRules context="find_comments" />
+        <IncludeRules context="find_symbols" />
+        <IncludeRules context="find_end_stmnts" />
+        <IncludeRules context="find_begin_stmnts" />
       </context>
 <!--************************END OF THE MAIN CONTEXT*************************-->
 
 
 
 <!-- This context highlights preprocessor lines -->
-      <context attribute="Normal Text" lineEndContext="#stay" name="tqfind_preprocessor">
+      <context attribute="Normal Text" lineEndContext="#stay" name="find_preprocessor">
         <RegExpr attribute="Preprocessor" context="#stay" String="(#|cDEC\$|CDEC\$).*$" column="0"/>
       </context>
 
 <!-- This context highlights operators and the logical values .true. .false. -->
-      <context attribute="Normal Text" lineEndContext="#stay" name="tqfind_op_and_log">
+      <context attribute="Normal Text" lineEndContext="#stay" name="find_op_and_log">
         <RegExpr attribute="Logical" context="#stay" String="\.(true|false)\." insensitive="TRUE"/>
         <RegExpr attribute="Operator" context="#stay" String="\.[A-Za-z]+\."/>
         <RegExpr attribute="Operator" context="#stay" String="(==|/=|&lt;|&lt;=|&gt;|&gt;=)"/>
       </context>
 
 <!-- This context highlights comments -->
-      <context attribute="Normal Text" lineEndContext="#stay" name="tqfind_comments">
+      <context attribute="Normal Text" lineEndContext="#stay" name="find_comments">
         <RegExpr attribute="Comment" context="#stay" String="[cC\*].*$" column="0"/>
         <RegExpr attribute="Comment" context="#stay" String="!.*$"/>
       </context>
 
 <!-- This context highlights symbols -->
-      <context attribute="Normal Text" lineEndContext="#stay" name="tqfind_symbols">
+      <context attribute="Normal Text" lineEndContext="#stay" name="find_symbols">
         <Detect2Chars attribute="Keyword" context="#stay" char="*" char1="*"/>
         <Detect2Chars attribute="Keyword" context="#stay" char="(" char1="/"/>
         <Detect2Chars attribute="Keyword" context="#stay" char="/" char1=")"/>
@@ -419,21 +419,21 @@
         <DetectChar attribute="Normal Text" context="inside_func_paren" char="("/>
         <DetectChar attribute="Normal Text" context="#pop" char=")"/>
         <IncludeRules context="find_strings" />
-        <IncludeRules context="tqfind_intrinsics" />
-        <IncludeRules context="tqfind_numbers" />
+        <IncludeRules context="find_intrinsics" />
+        <IncludeRules context="find_numbers" />
       </context>
 
 <!-- The following two contexts match input/output statements -->
-      <context attribute="Normal Text" lineEndContext="#stay" name="tqfind_io_stmnts">
-        <RegExpr attribute="IO Function" context="tqfind_io_paren" String="\b(read|write|backspace|rewind|end\s*file|close)\s*[(]" insensitive="TRUE"/>
-        <RegExpr attribute="IO Function" context="tqfind_io_paren" String="\bopen\s*[(]" insensitive="TRUE"/>
-        <RegExpr attribute="IO Function" context="tqfind_io_paren" String="\binquire\s*[(]" insensitive="TRUE"/>
+      <context attribute="Normal Text" lineEndContext="#stay" name="find_io_stmnts">
+        <RegExpr attribute="IO Function" context="find_io_paren" String="\b(read|write|backspace|rewind|end\s*file|close)\s*[(]" insensitive="TRUE"/>
+        <RegExpr attribute="IO Function" context="find_io_paren" String="\bopen\s*[(]" insensitive="TRUE"/>
+        <RegExpr attribute="IO Function" context="find_io_paren" String="\binquire\s*[(]" insensitive="TRUE"/>
         <RegExpr attribute="IO Function" context="format_stmnt" String="\bformat\s*[(]" insensitive="TRUE"/>
         <RegExpr attribute="IO Function" context="#stay" String="\bend\s*file\b" insensitive="TRUE"/>
         <keyword attribute="IO Function" context="#stay" String="io_functions"/>
       </context>
 <!-- This context matches parenthesis for the read, write, ... statements -->
-      <context attribute="Normal Text" lineEndContext="#stay" name="tqfind_io_paren">
+      <context attribute="Normal Text" lineEndContext="#stay" name="find_io_paren">
         <DetectChar attribute="IO Function" context="#stay" char="*"/>
         <DetectChar attribute="Normal Text" context="inside_func_paren" char="("/>
         <DetectChar attribute="IO Function" context="#pop" char=")"/>
@@ -441,9 +441,9 @@
         <keyword attribute="IO Function"  context="#stay" String="inquire_keywords"/>
         <keyword attribute="IO Function"  context="#stay" String="open_keywords"/>
         <IncludeRules context="find_strings" />
-        <IncludeRules context="tqfind_intrinsics" />
-        <IncludeRules context="tqfind_numbers" />
-        <IncludeRules context="tqfind_symbols" />
+        <IncludeRules context="find_intrinsics" />
+        <IncludeRules context="find_numbers" />
+        <IncludeRules context="find_symbols" />
       </context>
 <!-- This context highlights the text inside the parenthesis of fortran statement -->
       <context attribute="Normal Text" lineEndContext="#stay" name="format_stmnt">
@@ -452,44 +452,44 @@
         <RegExpr attribute="IO Function" context="#stay" String="[0-9]*/" insensitive="TRUE"/>
         <AnyChar attribute="IO Function" context="#stay" String=":"/>
         <IncludeRules context="find_strings" />
-        <IncludeRules context="tqfind_symbols" />
+        <IncludeRules context="find_symbols" />
       </context>
 
 <!-- The following context matches the begin of program units -->
-      <context attribute="Normal Text" lineEndContext="#stay" name="tqfind_begin_stmnts">
+      <context attribute="Normal Text" lineEndContext="#stay" name="find_begin_stmnts">
         <RegExpr attribute="Keyword" context="#stay" String="\bmodule\s+procedure\b" insensitive="TRUE"/>
         <RegExpr attribute="Keyword" context="#stay" String="\b(program|subroutine|function|module|block\s*data)\b" insensitive="TRUE" beginRegion="Unit"/>
       </context>
 <!-- The following context matches the end of program units -->
-      <context attribute="Normal Text" lineEndContext="#stay" name="tqfind_end_stmnts">
+      <context attribute="Normal Text" lineEndContext="#stay" name="find_end_stmnts">
         <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(program|subroutine|function|module|block\s*data)\b" insensitive="TRUE" endRegion="Unit"/>
         <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(do|if|select|where|forall|interface)\b" insensitive="TRUE"/>
         <RegExpr attribute="Keyword" context="#stay" String="\bend\b" insensitive="TRUE" endRegion="Unit"/>
       </context>
 
 <!-- The following two contexts match declarations -->
-      <context attribute="Normal Text" lineEndContext="#stay" name="tqfind_decls">
+      <context attribute="Normal Text" lineEndContext="#stay" name="find_decls">
         <RegExpr attribute="Data Type" context="#stay" String="\binteger[\*]\d{1,2}" insensitive="TRUE"/>
         <RegExpr attribute="Data Type" context="#stay" String="\breal[\*]\d{1,2}" insensitive="TRUE"/>
         <RegExpr attribute="Data Type" context="#stay" String="\bcomplex[\*]\d{1,2}" insensitive="TRUE"/>
         <RegExpr attribute="Data Type" context="#stay" String="\bend\s*type\b" insensitive="TRUE"/>
         <keyword attribute="Data Type" context="#stay" String="types"/>
         <RegExpr attribute="Data Type" context="#stay" String="^\s*data\b" insensitive="TRUE"/>
-        <RegExpr attribute="Data Type" context="tqfind_paren" String="^\s*real\s*[(]" insensitive="TRUE"/>
+        <RegExpr attribute="Data Type" context="find_paren" String="^\s*real\s*[(]" insensitive="TRUE"/>
         <RegExpr attribute="Data Type" context="#stay" String="^\s*real(?![\w\*])" insensitive="TRUE"/>
         <RegExpr attribute="Data Type" context="#stay" String="\bcharacter[*][0-9]+\b" insensitive="TRUE"/>
-        <RegExpr attribute="Data Type" context="tqfind_paren" String="\b(type|integer|complex|character|logical|intent|dimension)\b\s*[(]" insensitive="TRUE"/>
+        <RegExpr attribute="Data Type" context="find_paren" String="\b(type|integer|complex|character|logical|intent|dimension)\b\s*[(]" insensitive="TRUE"/>
         <RegExpr attribute="Data Type" context="#stay" String="\b(type|integer|complex|character|logical|intent|dimension)\b" insensitive="TRUE"/>
         <Detect2Chars attribute="Data Type" context="#stay" char=":" char1=":"/>
       </context>
 <!-- This context matches parenthesis in data type declarations, such as in 'real(...)'-->
-      <context attribute="Data Type" lineEndContext="#pop" name="tqfind_paren">
-        <DetectChar attribute="Data Type" context="tqfind_paren" char="("/>
+      <context attribute="Data Type" lineEndContext="#pop" name="find_paren">
+        <DetectChar attribute="Data Type" context="find_paren" char="("/>
         <DetectChar attribute="Data Type" context="#pop" char=")"/>
       </context>
 
 <!-- The following context matches intrinsic procedures -->
-      <context attribute="Normal Text" lineEndContext="#stay" name="tqfind_intrinsics">
+      <context attribute="Normal Text" lineEndContext="#stay" name="find_intrinsics">
         <keyword attribute="Keyword" context="#stay" String="keywords"/>
       <!-- INTRINSIC PROCEDURES -->
         <keyword attribute="Elemental Procedure"       context="#stay" String="elemental_procs"/>
@@ -499,7 +499,7 @@
       </context>
 
 <!-- The following context matches integer and real numbers -->
-      <context attribute="Normal Text" lineEndContext="#stay" name="tqfind_numbers">
+      <context attribute="Normal Text" lineEndContext="#stay" name="find_numbers">
         <!-- Floating-point numbers with optional kind -->
         <RegExpr attribute="Float" context="#stay" String="[0-9]*\.[0-9]+([de][+-]?[0-9]+)?([_]([0-9]+|[a-z][\w_]*))?" insensitive="TRUE"/>
         <RegExpr attribute="Float" context="#stay" String="\b[0-9]+\.[0-9]*([de][+-]?[0-9]+)?([_]([0-9]+|[a-z][\w_]*))?(?![a-z])" insensitive="TRUE"/>
diff --git a/kate/data/freebasic.xml b/kate/data/freebasic.xml
index 67e426eb5..d3bf41243 100644
--- a/kate/data/freebasic.xml
+++ b/kate/data/freebasic.xml
@@ -606,4 +606,4 @@
     </comments>
   </general>
 </language>
-<!-- // kate: space-indent on; indent-width 2; tqreplace-tabs on; -->
+<!-- // kate: space-indent on; indent-width 2; replace-tabs on; -->
diff --git a/kate/data/gap.xml b/kate/data/gap.xml
index 9eca0dbcb..5579e28f6 100644
--- a/kate/data/gap.xml
+++ b/kate/data/gap.xml
@@ -1473,7 +1473,7 @@
 			<item> GapInputPcGroup </item>
 			<item> GapInputSCTable </item>
 			<item> GasmanLimits </item>
-			<item> GasmanMessagetqStatus </item>
+			<item> GasmanMessageStatus </item>
 			<item> GasmanStatistics </item>
 			<item> GaussianIntegers </item>
 			<item> GaussianRationals </item>
@@ -5393,7 +5393,7 @@
 			<item> PrintCounters </item>
 			<item> PrintFactorsInt </item>
 			<item> PrintFormattedString </item>
-			<item> PrintFormattingtqStatus </item>
+			<item> PrintFormattingStatus </item>
 			<item> PrintGAPDocElementTemplates </item>
 			<item> PrintHashWithNames </item>
 			<item> PrintObj </item>
@@ -6167,7 +6167,7 @@
 			<item> SetGapDocHTMLOptions </item>
 			<item> SetGapDocLaTeXOptions </item>
 			<item> SetGapDocTxtOptions </item>
-			<item> SetGasmanMessagetqStatus </item>
+			<item> SetGasmanMessageStatus </item>
 			<item> SetGeneralizedPcgs </item>
 			<item> SetGeneratingPairsOfLeftMagmaCongruence </item>
 			<item> SetGeneratingPairsOfMagmaCongruence </item>
@@ -6806,7 +6806,7 @@
 			<item> SetPrimitiveElement </item>
 			<item> SetPrimitiveIdentification </item>
 			<item> SetPrimitiveRoot </item>
-			<item> SetPrintFormattingtqStatus </item>
+			<item> SetPrintFormattingStatus </item>
 			<item> SetProjectiveOrder </item>
 			<item> SetPseudoRandomSeed </item>
 			<item> SetPthPowerImages </item>
@@ -7179,7 +7179,7 @@
 			<item> StandardizeTableC </item>
 			<item> StarCyc </item>
 			<item> StateRandom </item>
-			<item> tqStatusRandom </item>
+			<item> StatusRandom </item>
 			<item> StepModGauss </item>
 			<item> StopNumConsecSiftToOne </item>
 			<item> StopNumSift </item>
@@ -7571,7 +7571,7 @@
 			<item> TzPrintPairs </item>
 			<item> TzPrintPresentation </item>
 			<item> TzPrintRelators </item>
-			<item> TzPrinttqStatus </item>
+			<item> TzPrintStatus </item>
 			<item> TzRelator </item>
 			<item> TzRemoveGenerators </item>
 			<item> TzRenumberGens </item>
diff --git a/kate/data/gdl.xml b/kate/data/gdl.xml
index 098a50a6f..a41af14c4 100644
--- a/kate/data/gdl.xml
+++ b/kate/data/gdl.xml
@@ -38,7 +38,7 @@
    <item> orchid </item>
    <item> black </item>
   </list>
-  <list name="tqshapes">
+  <list name="shapes">
    <item> box </item>
    <item> triangle </item>
    <item> circle </item>
@@ -139,7 +139,7 @@
     <RegExpr attribute="Value" context="lineid" String="(foldedge.|edge.|)linestyle *:"/>
     <RegExpr attribute="Value" context="lineid" String="(foldnode.|node.|)borderstyle *:"/>
     <RegExpr attribute="Value" context="fishid" String="view *:"/>
-    <RegExpr attribute="Value" context="tqshapeid" String="(foldnode.|node.|)tqshape"/>
+    <RegExpr attribute="Value" context="shapeid" String="(foldnode.|node.|)shape"/>
     <RegExpr attribute="Value" context="lquote" String="(source|target)(name|)"/>
     <RegExpr attribute="Value" context="lquote" String="title *:"/>
     <RegExpr attribute="Value" context="lquote" String="(foldnode.|node.|foldedge.|edge.|)label *:"/>
@@ -150,7 +150,7 @@
     <RegExpr attribute="Value" context="nodelevel" String="(foldnode.|node.|)(level|vertical_?order) *:"/>
     <RegExpr attribute="Value" context="intval" String="(foldnode.|node.|foldedge.|edge.|)horizontal_?order *:"/>
     <RegExpr attribute="Value" context="stateid" String="stat(e|us) *:"/>
-    <RegExpr attribute="Value" context="algid" String="tqlayout_?algorithm *:"/>
+    <RegExpr attribute="Value" context="algid" String="layout_?algorithm *:"/>
     <RegExpr attribute="Value" context="boolean" String="crossing_?optimization *:"/>
     <RegExpr attribute="Value" context="boolean" String="crossing_?phase2 *:"/>
     <RegExpr attribute="Value" context="boolean" String="(dirty_edge_|display_edge_|displayedge|late_edge_|subgraph_?)labels *:"/>
@@ -158,7 +158,7 @@
     <RegExpr attribute="Value" context="boolean" String="(nodes|near_?edges|edges|splines) *:"/>
     <RegExpr attribute="Value" context="classname" String="classname"/>
     <RegExpr attribute="Value" context="orient" String="orientation *:"/>
-    <RegExpr attribute="Value" context="nodealign" String="node_tqalignment *:"/>
+    <RegExpr attribute="Value" context="nodealign" String="node_alignment *:"/>
     <RegExpr attribute="Value" context="textmode" String="(foldnode.|node.|)textmode *:"/>
     <RegExpr attribute="Value" context="boolean" String="equal_y_dist *:"/>
     <RegExpr attribute="Value" context="boolean" String="equal_?ydist *:"/>
@@ -175,7 +175,7 @@
     <RegExpr attribute="Value" context="intval" String="iconcolors *:"/>
     <RegExpr attribute="Value" context="intval" String="hidden *:"/>
     <RegExpr attribute="Value" context="boolean" String="energetic *:"/>
-    <RegExpr attribute="Value" context="intval" String="tqlayout_(up|down|near|spline)factor *:"/>
+    <RegExpr attribute="Value" context="intval" String="layout_(up|down|near|spline)factor *:"/>
     <RegExpr attribute="Value" context="intval" String="border +(x|y) *:"/>
     <RegExpr attribute="Value" context="intval" String="splinefactor *:"/>
     <RegExpr attribute="Value" context="floatval" String="(gravity|tempfactor|treefactor) *:"/>
@@ -210,8 +210,8 @@
     <keyword attribute="Datatype" context="default" String="colors"/>
     <RegExpr attribute="Datatype" context="default" String="[0-9][0-9]?"/>
    </context>
-   <context name="tqshapeid" attribute="Normal" lineEndContext="#stay">
-    <keyword attribute="Datatype" context="default" String="tqshapes"/>
+   <context name="shapeid" attribute="Normal" lineEndContext="#stay">
+    <keyword attribute="Datatype" context="default" String="shapes"/>
    </context>
    <context name="lquote" attribute="Normal" lineEndContext="#stay">
     <DetectChar attribute="String" context="string" char="&quot;"/>
diff --git a/kate/data/generate-php.pl b/kate/data/generate-php.pl
index 5794ab104..c6bb3a50c 100644
--- a/kate/data/generate-php.pl
+++ b/kate/data/generate-php.pl
@@ -6,7 +6,7 @@
 # * If the name of the language is something else (say '*'), it creates the language '*/PHP'.
 #   This new language is the same as the old one, but is able to detect PHP everywhere.
 #
-# This script will correctly set extensions & mimetype, and will tqreplace
+# This script will correctly set extensions & mimetype, and will replace
 # <IncludeRules context="##*"> by <IncludeRules context="##*/PHP">
 #
 # Generated languages need a language named 'PHP/PHP', which shall take care of PHP hl itself
@@ -46,11 +46,11 @@ else
   $file =~ s/<language([^>]+)mimetype="[^"]*"/<language$1mimetype=""/s;
 }
 
-$tqfindphp = "<context name=\"FindPHP\">\n<RegExpr context=\"##PHP/PHP\" String=\"&lt;\\?(?:=|php)?\" lookAhead=\"true\" />\n</context>\n";
+$findphp = "<context name=\"FindPHP\">\n<RegExpr context=\"##PHP/PHP\" String=\"&lt;\\?(?:=|php)?\" lookAhead=\"true\" />\n</context>\n";
 
 $file =~ s/<IncludeRules\s([^>]*)context="##(?!Alerts)([^"]+)"/<IncludeRules $1context="##$2\/PHP"/g;
 $file =~ s/(<context\s[^>]*>)/$1\n<IncludeRules context="FindPHP" \/>/g;
-$file =~ s/(?=<\/contexts\s*>)/$tqfindphp/;
+$file =~ s/(?=<\/contexts\s*>)/$findphp/;
 
 print $file;
 print $warning;
diff --git a/kate/data/gnuassembler.xml b/kate/data/gnuassembler.xml
index e13285d3a..754e4fa02 100644
--- a/kate/data/gnuassembler.xml
+++ b/kate/data/gnuassembler.xml
@@ -17,7 +17,7 @@ Author:   John Zaitseff <J.Zaitseff@zap.org.au>
 Date:     15th April, 2002
 Version:  1.0
 
-This file tqcontains the XML syntax highlighting description for the GNU
+This file contains the XML syntax highlighting description for the GNU
 Assembler, for KATE, the KDE Advanced Editor.  Keywords have been taken
 directly from the GNU Assembler source code (read.c).
 
diff --git a/kate/data/idconsole.xml b/kate/data/idconsole.xml
index fb4df48de..fa2a5cffd 100644
--- a/kate/data/idconsole.xml
+++ b/kate/data/idconsole.xml
@@ -141,7 +141,7 @@
 <item> fullinfo </item>
 <item> fullserverinfo </item>
 <item> game </item>
-<item> gameCompletetqStatus </item>
+<item> gameCompleteStatus </item>
 <item> gamedir </item>
 <item> gamemap </item>
 <item> gameversion </item>
@@ -704,7 +704,7 @@
 <item> cg_drawRewards </item>
 <item> cg_drawSnapshot </item>
 <item> cg_drawSpreadScale </item>
-<item> cg_drawtqStatus </item>
+<item> cg_drawStatus </item>
 <item> cg_drawTeamOverlay </item>
 <item> cg_drawTimer </item>
 <item> cg_emptyswitch </item>
@@ -833,7 +833,7 @@
 <item> cl_rollspeed </item>
 <item> cl_run </item>
 <item> cl_running </item>
-<item> cl_servertqStatusResendTime </item>
+<item> cl_serverStatusResendTime </item>
 <item> cl_showfps </item>
 <item> cl_showSend </item>
 <item> cl_showServerCommands </item>
@@ -1699,7 +1699,7 @@
 <item> ui_prevClass </item>
 <item> ui_prevTeam </item>
 <item> ui_prevWeapon </item>
-<item> ui_servertqStatusTimeOut </item>
+<item> ui_serverStatusTimeOut </item>
 <item> ui_singlePlayerActive </item>
 <item> ui_smallFont </item>
 <item> ui_spSelection </item>
diff --git a/kate/data/ilerpg.xml b/kate/data/ilerpg.xml
index 1f7d8ded4..a7060f609 100644
--- a/kate/data/ilerpg.xml
+++ b/kate/data/ilerpg.xml
@@ -17,7 +17,7 @@
     Date:    Sometime during 2003
     Version: 1.0
 
-	This file tqcontains the XML syntax highlighting description for the IBM
+	This file contains the XML syntax highlighting description for the IBM
 	iSeries ILE RPG, for KATE, the KDE Advanced Editor.  
 	Based on information from IBM publication SC09-2508-05
 	
diff --git a/kate/data/inform.xml b/kate/data/inform.xml
index 499d02cb5..91468dcd7 100644
--- a/kate/data/inform.xml
+++ b/kate/data/inform.xml
@@ -246,7 +246,7 @@
       <item> Replace </item>
       <item> Serial </item>
       <item> Switches </item>
-      <item> tqStatusline </item>
+      <item> Statusline </item>
       <item> score </item>
       <item> System_file </item>
       <item> Verb </item>
diff --git a/kate/data/java.xml b/kate/data/java.xml
index 3264362a1..c7f0f3967 100644
--- a/kate/data/java.xml
+++ b/kate/data/java.xml
@@ -604,8 +604,8 @@
 			<item> CompilationMXBean </item>
 			<item> Compiler </item>
 			<item> CompletionService </item>
-			<item> CompletiontqStatus </item>
-			<item> CompletiontqStatusHelper </item>
+			<item> CompletionStatus </item>
+			<item> CompletionStatusHelper </item>
 			<item> Component </item>
 			<item> ComponentAdapter </item>
 			<item> ComponentColorModel </item>
@@ -2542,7 +2542,7 @@
 			<item> RoleList </item>
 			<item> RoleNotFoundException </item>
 			<item> RoleResult </item>
-			<item> RoletqStatus </item>
+			<item> RoleStatus </item>
 			<item> RoleUnresolved </item>
 			<item> RoleUnresolvedList </item>
 			<item> RootPaneContainer </item>
@@ -2594,8 +2594,8 @@
 			<item> SSLContextSpi </item>
 			<item> SSLEngine </item>
 			<item> SSLEngineResult </item>
-			<item> SSLEngineResult.HandshaketqStatus </item>
-			<item> SSLEngineResult.tqStatus </item>
+			<item> SSLEngineResult.HandshakeStatus </item>
+			<item> SSLEngineResult.Status </item>
 			<item> SSLException </item>
 			<item> SSLHandshakeException </item>
 			<item> SSLKeyException </item>
@@ -3174,7 +3174,7 @@
 			<item> VirtualMachineError </item>
 			<item> Visibility </item>
 			<item> VisibilityHelper </item>
-			<item> VoicetqStatus </item>
+			<item> VoiceStatus </item>
 			<item> Void </item>
 			<item> VolatileImage </item>
 			<item> WCharSeqHelper </item>
@@ -3303,7 +3303,7 @@
 			<item> C14NMethodParameterSpec </item>
 			<item> CanonicalizationMethod </item>
 			<item> Characters </item>
-			<item> ClientInfotqStatus </item>
+			<item> ClientInfoStatus </item>
 			<item> CollapsedStringAdapter </item>
 			<item> CollatorProvider </item>
 			<item> CommandInfo </item>
diff --git a/kate/data/javascript.xml b/kate/data/javascript.xml
index 87b9a9ec8..be2e33d8b 100644
--- a/kate/data/javascript.xml
+++ b/kate/data/javascript.xml
@@ -174,7 +174,7 @@
         <item>data</item>
         <item>defaultChecked</item>
         <item>defaultSelected</item>
-        <item>defaulttqStatus</item>
+        <item>defaultStatus</item>
         <item>defaultValue</item>
         <item>description</item>
         <item>disableExternalCapture</item>
@@ -188,7 +188,7 @@
         <item>exec</item>
         <item>fgColor</item>
         <item>filename</item>
-        <item>tqfind</item>
+        <item>find</item>
         <item>fixed</item>
         <item>focus</item>
         <item>fontcolor</item>
@@ -305,7 +305,7 @@
         <item>refresh</item>
         <item>releaseEvents</item>
         <item>reload</item>
-        <item>tqreplace</item>
+        <item>replace</item>
         <item>reset</item>
         <item>resizeBy</item>
         <item>resizeTo</item>
diff --git a/kate/data/json.xml b/kate/data/json.xml
index a740921de..8dda5c0e7 100644
--- a/kate/data/json.xml
+++ b/kate/data/json.xml
@@ -95,6 +95,6 @@
   </highlighting>
 </language>
 <!--
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
 -->
 
diff --git a/kate/data/jsp.xml b/kate/data/jsp.xml
index 796bc9ea7..da448227e 100644
--- a/kate/data/jsp.xml
+++ b/kate/data/jsp.xml
@@ -517,8 +517,8 @@
       <item> Comparable </item>
       <item> Comparator </item>
       <item> Compiler </item>
-      <item> CompletiontqStatus </item>
-      <item> CompletiontqStatusHelper </item>
+      <item> CompletionStatus </item>
+      <item> CompletionStatusHelper </item>
       <item> Component </item>
       <item> ComponentAdapter </item>
       <item> ComponentColorModel </item>
@@ -2647,7 +2647,7 @@
       <item> VirtualMachineError </item>
       <item> Visibility </item>
       <item> VisibilityHelper </item>
-      <item> VoicetqStatus </item>
+      <item> VoiceStatus </item>
       <item> Void </item>
       <item> VolatileImage </item>
       <item> WCharSeqHelper </item>
diff --git a/kate/data/katefiletyperc b/kate/data/katefiletyperc
index 596f185ff..c9490d23b 100644
--- a/kate/data/katefiletyperc
+++ b/kate/data/katefiletyperc
@@ -16,7 +16,7 @@ Wildcards=*.po;*.pot
 Mimetypes=text/x-makefile
 Priority=5
 Section=Other
-Variables=kate: space-indent off; indent-width 8; tqreplace-tabs off; tqreplace-tabs-save off;
+Variables=kate: space-indent off; indent-width 8; replace-tabs off; replace-tabs-save off;
 Wildcards=*Makefile*;*makefile*
 
 [Python]
diff --git a/kate/data/katepart.desktop b/kate/data/katepart.desktop
index f303b969b..bc7c6fd9b 100644
--- a/kate/data/katepart.desktop
+++ b/kate/data/katepart.desktop
@@ -87,4 +87,4 @@ Icon=kate
 ServiceTypes=KParts/ReadOnlyPart,Browser/View,KParts/ReadWritePart,KTextEditor/Editor,KTextEditor/Document
 Type=Service
 InitialPreference=8
-MimeType=text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-tqmoc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-diff;text/x-adasrc;text/x-chdr;text/x-csrc;text/css;application/x-desktop;text/x-diff;text/x-fortran;text/html;text/x-java;text/x-tex;text/x-makefile;text/x-objcsrc;text/x-pascal;application/x-perl;application/x-perl-module;application/x-php;text/vnd.wap.wml;application/x-python;application/x-ruby;text/sgml;text/xml;model/vrml
+MimeType=text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-diff;text/x-adasrc;text/x-chdr;text/x-csrc;text/css;application/x-desktop;text/x-diff;text/x-fortran;text/html;text/x-java;text/x-tex;text/x-makefile;text/x-objcsrc;text/x-pascal;application/x-perl;application/x-perl-module;application/x-php;text/vnd.wap.wml;application/x-python;application/x-ruby;text/sgml;text/xml;model/vrml
diff --git a/kate/data/katepartreadonlyui.rc b/kate/data/katepartreadonlyui.rc
index bd2b27f57..5c899dbfb 100644
--- a/kate/data/katepartreadonlyui.rc
+++ b/kate/data/katepartreadonlyui.rc
@@ -15,11 +15,11 @@
     <Action name="edit_deselect" group="edit_select_merge" />
     <Action name="set_verticalSelect" group="edit_select_merge" />
     <Separator group="edit_select_merge" />
-    <Action name="edit_tqfind" group="edit_tqfind_merge" />
-    <Action name="edit_tqfind_next" group="edit_tqfind_merge" />
-    <Action name="edit_tqfind_prev" group="edit_tqfind_merge" />
-    <Separator group="edit_tqfind_merge" />
-    <Action name="go_goto_line" group="edit_tqfind_merge"/>
+    <Action name="edit_find" group="edit_find_merge" />
+    <Action name="edit_find_next" group="edit_find_merge" />
+    <Action name="edit_find_prev" group="edit_find_merge" />
+    <Separator group="edit_find_merge" />
+    <Action name="go_goto_line" group="edit_find_merge"/>
   </Menu>
 
   <Menu name="view" noMerge="1"><text>&amp;View</text>
@@ -90,7 +90,7 @@
 </Menu>
 
 <ToolBar name="mainToolBar" noMerge="1"><text>Main Toolbar</text>
-  <Action name="edit_tqfind" group="tqfind_operations" />
+  <Action name="edit_find" group="find_operations" />
   <Action name="incFontSizes" group="zoom_operations" />
   <Action name="decFontSizes" group="zoom_operations" />
 </ToolBar>
diff --git a/kate/data/katepartui.rc b/kate/data/katepartui.rc
index d117f6522..13908ad14 100644
--- a/kate/data/katepartui.rc
+++ b/kate/data/katepartui.rc
@@ -25,12 +25,12 @@
     <Separator group="edit_select_merge" />
     <Action name="set_insert" group="edit_select_merge" />
     <Separator group="edit_select_merge" />
-    <Action name="edit_tqfind" group="edit_tqfind_merge" />
-    <Action name="edit_tqfind_next" group="edit_tqfind_merge" />
-    <Action name="edit_tqfind_prev" group="edit_tqfind_merge" />
-    <Action name="edit_tqreplace" group="edit_tqfind_merge" />
-    <Separator group="edit_tqfind_merge" />
-    <Action name="go_goto_line" group="edit_tqfind_merge"/>
+    <Action name="edit_find" group="edit_find_merge" />
+    <Action name="edit_find_next" group="edit_find_merge" />
+    <Action name="edit_find_prev" group="edit_find_merge" />
+    <Action name="edit_replace" group="edit_find_merge" />
+    <Separator group="edit_find_merge" />
+    <Action name="go_goto_line" group="edit_find_merge"/>
   </Menu>
 
   <Menu name="view" noMerge="1"><text>&amp;View</text>
@@ -116,7 +116,7 @@
   <Action name="edit_cut" group="edit_operations" />
   <Action name="edit_copy" group="edit_operations" />
   <Action name="edit_paste" group="edit_operations" />
-  <Action name="edit_tqfind" group="tqfind_operations" />
+  <Action name="edit_find" group="find_operations" />
   <Action name="incFontSizes" group="zoom_operations" />
   <Action name="decFontSizes" group="zoom_operations" />
 </ToolBar>
diff --git a/kate/data/language.dtd b/kate/data/language.dtd
index 5b6f586db..8830837a6 100644
--- a/kate/data/language.dtd
+++ b/kate/data/language.dtd
@@ -7,7 +7,7 @@
         This file describes the XML format used for syntax highlight descriptions
         for the Kate text editor (http://kate.kde.org), which is part of the KDE
         desktop environment (http://www.kde.org).
-        You'll tqfind the "Writing a Kate Highlighting XML File HOWTO" at
+        You'll find the "Writing a Kate Highlighting XML File HOWTO" at
         http://kate.kde.org/doc/hlhowto.php
 
         This format is identified using the SYSTEM identifier
@@ -35,7 +35,7 @@
         the new syntax file.
 
 TODO
-  - tqfind a more readable way for the - -dtdvalid stuff, it's just annoying
+  - find a more readable way for the - -dtdvalid stuff, it's just annoying
     xml comments don't allow it.
 -->
 
@@ -186,7 +186,7 @@ TODO
 >
 
 <!-- List item
-  tqcontains string used in <keyword>
+  contains string used in <keyword>
 -->
 <!ELEMENT item (#PCDATA)>
 
diff --git a/kate/data/ldif.xml b/kate/data/ldif.xml
index 2e28e952f..d0da293a1 100644
--- a/kate/data/ldif.xml
+++ b/kate/data/ldif.xml
@@ -65,7 +65,7 @@
 			<item>initials</item>
 			<item>internationaliSDNNumber</item>
 			<item>ipHostNumber</item>
-			<item>ipNettqmaskNumber</item>
+			<item>ipNetmaskNumber</item>
 			<item>ipNetworkNumber</item>
 			<item>ipProtocolNumber</item>
 			<item>ipServicePort</item>
@@ -112,7 +112,7 @@
 			<item>objectClass</item>
 			<item>oncRpcNumber</item>
 			<item>organizationName</item>
-			<item>organizationaltqStatus</item>
+			<item>organizationalStatus</item>
 			<item>organizationalUnitName</item>
 			<item>otherFacsimiletelephoneNumber</item>
 			<item>otherMailbox</item>
diff --git a/kate/data/lex.xml b/kate/data/lex.xml
index ddd539098..f2daebbb4 100644
--- a/kate/data/lex.xml
+++ b/kate/data/lex.xml
@@ -16,7 +16,7 @@
   2004.05.25 - LEX.XML 1.00        - First released.
 
   TODO:-
-  - Add a mime type (cannot tqfind it !?)
+  - Add a mime type (cannot find it !?)
   
   ========================================================================
 -->
diff --git a/kate/data/lilypond.xml b/kate/data/lilypond.xml
index 36ffb8095..481b13361 100644
--- a/kate/data/lilypond.xml
+++ b/kate/data/lilypond.xml
@@ -12,7 +12,7 @@
   <!ENTITY markupwithtextargs "markup|bigger|bold|box|bracket|caps|(center|general|left|right)-align|circle|column|combine|concat|dir-column|dynamic|fill-line|finger|fontCaps|fontsize|fraction|halign|hbracket|hcenter-in|hcenter|hspace|huge|italic|justify|larger?|line|lower|magnify|medium|normal-size-(sub|super)|normal-text|normalsize|number|on-the-fly|override|pad-(around|markup|to-box|x)|page-ref|postscript|put-adjacent|raise|roman|rotate|sans|small(er)?|smallCaps|sub|super|teeny|text|tiny|translate(-scaled)?|transparent|typewriter|underline|upright|vcenter|whiteout|with-(color|dimensions|url)|wordwrap(-string)?|(markup|column-|justified-|override-|wordwrap-)lines">
   <!ENTITY headervars "dedication|(sub){,2}title|poet|composer|meter|opus|arranger|instrument|piece|breakbefore|copyright|tagline|mutopia(title|composer|poet|opus|instrument)|date|enteredby|source|style|maintainer(Email|Web)?|moreInfo|lastupdated|texidoc">
   <!ENTITY papervars "annotate-spacing|(print-)?first-page-number|print-page-number|paper-(width|height)|(top|bottom|left|right)-margin|line-width|(head|foot)-separation|page-top-space|ragged-(bottom|last-bottom|right)|page-count|between-system-(space|padding)|page-breaking-between-system-padding|horizontal-shift|(before|after|between)-title-space|printallheaders|indent|force-assignment|input-encoding|output-scale|blank(-after-score|-last)?-page-force|page-limit-inter-system-space(-factor)?|(systemSeparator|(even|odd)(Footer|Header)|(book|score|toc)Title|tocItem)Markup">
-  <!ENTITY tqlayoutvars "system-count|indent">
+  <!ENTITY layoutvars "system-count|indent">
   <!ENTITY performer "Beam|Control_track|Drum_note|Dynamic|Key|Lyric|Note|Piano_pedal|Slur|Staff|Swallow|Tempo|Tie|Time_signature">
   <!ENTITY translator "Note_swallow|Rest_swallow|Skip_event_swallow|Timing">
   <!ENTITY engraver "Accidental|Ambitus|Arpeggio|Auto_beam|Axis_group|Balloon|Bar|Bar_number|Beam|Bend|Break_align|Breathing_sign|Chord_name|Chord_tremolo|Clef|Cluster_spanner|Collision|Completion_heads|Custos|Default_bar_line|Dot_column|Dots|Drum_notes|Dynamic|Engraver|Extender|Figured_bass|Figured_bass_position|Fingering|Font_size|Forbid_line_break|Fretboard|Glissando|Grace_beam|Grace|Grace_spacing|Grid_line_span|Grid_point|Grob_pq|Hara_kiri|Horizontal_bracket|Hyphen|Instrument_name|Instrument_switch|Key|Laissez_vibrer|Ledger_line|Ligature_bracket|Lyric|Mark|Measure_grouping|Melody|Mensural_ligature|Metronome_mark|Multi_measure_rest|New_fingering|Note_head_line|Note_heads|Note_name|Note_spacing|Ottava_spanner|Output_property|Page_turn|Paper_column|Parenthesis|Part_combine|Percent_repeat|Phrasing_slur|Piano_pedal_align|Piano_pedal|Pitch_squash|Pitched_trill|Repeat_acknowledge|Repeat_tie|Rest_collision|Rest|Rhythmic_column|Script_column|Script|Script_row|Separating_line_group|Slash_repeat|Slur|Spacing|Span_arpeggio|Span_bar|Spanner_break_forbid|Staff_collecting|Staff_symbol|Stanza_number_align|Stanza_number|Stem|String_number|Swallow|System_start_delimiter|Tab_harmonic|Tab_note_heads|Tab_staff_symbol|Text|Text_spanner|Tie|Time_signature|Translator|Trill_spanner|Tuplet|Tweak|Vaticana_ligature|Vertical_align|Vertically_spaced_contexts|Volta">
@@ -31,7 +31,7 @@
     
     - correctly parse pitches, chords, durations, etc. marking often made mistakes as invalid
     - speed up by shortening contexts, e.g. branch out on a \, instead of RegExpr'ing all \commands
-    - recognize some contexts like \tqlayout, \with, \header to colorcode variables, engravers, etc. only there
+    - recognize some contexts like \layout, \with, \header to colorcode variables, engravers, etc. only there
     - recognize lilypond words like ChoirStaff etc. only in sections and after \set, \override etc.
     - highlight some standard Scheme function names
     - add \figuremode recognition
@@ -86,7 +86,7 @@
       <item> VaticanaVoice </item> 
       <item> Voice </item>
     </list>
-    <list name="tqlayoutobjects">
+    <list name="layoutobjects">
       <item> Accidental </item> 
       <item> AccidentalCautionary </item> 
       <item> AccidentalPlacement </item> 
@@ -325,7 +325,7 @@
       <item> repeatCommands </item>
       <item> restNumberThreshold </item>
       <item> scriptDefinitions </item>
-      <item> tqshapeNoteStyles </item>
+      <item> shapeNoteStyles </item>
       <item> shortInstrumentName </item>
       <item> shortVocalName </item>
       <item> skipBars </item>
@@ -666,7 +666,7 @@
         <RegExpr String="\\(lyric(mode|s)|addlyrics)&b;" context="lyricmode"/>
         <RegExpr String="\\lyricsto&b;" context="lyricsto"/>
         <RegExpr String="\\markup(lines)?&b;" attribute="Markup" context="markup"/>
-        <RegExpr String="\\(header|paper|tqlayout|midi|with)\b" context="section"/>
+        <RegExpr String="\\(header|paper|layout|midi|with)\b" context="section"/>
         <RegExpr String="\\(new|context|change)\b" attribute="Keyword" context="context"/>
         <RegExpr String="\\(un)?set\b" attribute="Keyword" context="set"/>
         <RegExpr String="\\(override(Property)?|revert)\b" attribute="Keyword" context="override"/>
@@ -759,7 +759,7 @@
         <Detect2Chars char="#" char1="{" attribute="Scheme Keyword" context="schemelily" beginRegion="schemelily"/>
         <keyword String="musicexpressions" attribute="Scheme Keyword"/>
         <keyword String="contexts" attribute="Context"/>
-        <keyword String="tqlayoutobjects" attribute="Layout Object"/>
+        <keyword String="layoutobjects" attribute="Layout Object"/>
         <RegExpr String="[-+]?(\d+(\.\d+)?|\.\d+)" attribute="Scheme Value"/>
         <RegExpr String="#(t|f|b[-+]?[01.]+|o[-+]?[0-7.]+|d[-+]?[0-9.]+|x[-+]?[0-9a-f.]+)"
                  insensitive="true" attribute="Scheme Value"/>
@@ -938,7 +938,7 @@
         <IncludeRules context="basic"/>
       </context>
       
-      <!-- \paper, \tqlayout, \midi, \header, \with -->
+      <!-- \paper, \layout, \midi, \header, \with -->
       <context name="section" attribute="Keyword" lineEndContext="#stay"
                fallthrough="true" fallthroughContext="#pop">
         <DetectChar char="{" attribute="Keyword" context="section2" beginRegion="section"/>
@@ -954,9 +954,9 @@
         <DetectChar char="}" attribute="Keyword" context="#pop" endRegion="section"/>
         <DetectChar char="{" attribute="Keyword" context="sectionrules" beginRegion="section"/>
         <keyword String="contexts" attribute="Context"/>
-        <keyword String="tqlayoutobjects" attribute="Layout Object"/>
+        <keyword String="layoutobjects" attribute="Layout Object"/>
         <keyword String="properties" attribute="Property"/>
-        <RegExpr String="\b(&headervars;|&papervars;|&tqlayoutvars;)\b" attribute="Variable"/>
+        <RegExpr String="\b(&headervars;|&papervars;|&layoutvars;)\b" attribute="Variable"/>
         <RegExpr String="(&quot;?)\b(&engravers;)\b\1" attribute="Engraver"/>
         <IncludeRules context="default"/>
       </context>
@@ -991,7 +991,7 @@
         <DetectSpaces/>
         <keyword String="contexts" attribute="Context"/>
         <DetectChar char="."/>
-        <keyword String="tqlayoutobjects" attribute="Layout Object" context="#pop"/>
+        <keyword String="layoutobjects" attribute="Layout Object" context="#pop"/>
         <RegExpr String="[A-Za-z]+(?=\s*\.)" attribute="User Command"/>
         <RegExpr String="[A-Za-z]+" attribute="User Command" context="#pop"/>
       </context>
@@ -1039,5 +1039,5 @@
   
 </language>
 <!--
-    // kate: space-indent on; indent-width 2; tqreplace-tabs on; dynamic-word-wrap off;
+    // kate: space-indent on; indent-width 2; replace-tabs on; dynamic-word-wrap off;
     -->
diff --git a/kate/data/lpc.xml b/kate/data/lpc.xml
index 611037b40..2b13ef7ff 100644
--- a/kate/data/lpc.xml
+++ b/kate/data/lpc.xml
@@ -26,7 +26,7 @@ License:     Artistic
       <item> protected </item>
       <item> static </item>
       <item> public </item>
-      <item> notqmask </item>
+      <item> nomask </item>
       <item> varargs </item>
       <item> nosave </item>
       <item> virtual </item>
@@ -162,5 +162,5 @@ License:     Artistic
   </general>
 
 </language>
-<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; -->
+<!-- kate: space-indent on; indent-width 2; replace-tabs on; -->
 <!-- === End of file. === -->
diff --git a/kate/data/lua.xml b/kate/data/lua.xml
index f67070065..6de4c8a17 100644
--- a/kate/data/lua.xml
+++ b/kate/data/lua.xml
@@ -66,10 +66,10 @@
     </list>
     <list name="basefunc">
       <item> string.byte </item>  <item> string.char </item>
-      <item> string.tqfind </item>  <item> string.len </item>
+      <item> string.find </item>  <item> string.len </item>
       <item> string.lower </item> <item> string.rep </item>
       <item> string.sub </item>   <item> string.upper </item>
-      <item> string.format </item><item> string.gtqfind </item>
+      <item> string.format </item><item> string.gfind </item>
       <item> string.gsub </item>  <item> table.concat </item>
       <item> table.getn </item>   <item> table.sort </item>
       <item> table.insert </item> <item> table.remove </item>
@@ -148,7 +148,7 @@
       <item> strupper </item>    <item> strchar </item>
       <item> strrep </item>      <item> ascii </item>
       <item> strbyte </item>     <item> format </item>
-      <item> strtqfind </item>     <item> gsub </item>
+      <item> strfind </item>     <item> gsub </item>
       <item> openfile </item>    <item> closefile </item>
       <item> date </item>        <item> clock </item>
 
diff --git a/kate/data/makefile.xml b/kate/data/makefile.xml
index 8a55cc0d5..fc322d737 100644
--- a/kate/data/makefile.xml
+++ b/kate/data/makefile.xml
@@ -21,7 +21,7 @@
         <item> subst </item>
         <item> patsubst </item>
         <item> strip </item>
-        <item> tqfindstring </item>
+        <item> findstring </item>
         <item> filter </item>
         <item> filter-out </item>
         <item> sort </item>
diff --git a/kate/data/maxima.xml b/kate/data/maxima.xml
index 60f05da44..416810e92 100644
--- a/kate/data/maxima.xml
+++ b/kate/data/maxima.xml
@@ -455,8 +455,8 @@
             <item> file_search </item>
             <item> file_type </item>
             <item> fillarray </item>
-            <item> tqfindde </item>
-            <item> tqfind_root </item>
+            <item> findde </item>
+            <item> find_root </item>
             <item> first </item>
             <item> fix </item>
             <item> flatten </item>
@@ -1610,9 +1610,9 @@
             <item> file_search_demo </item>
             <item> file_search_lisp </item>
             <item> file_search_maxima </item>
-            <item> tqfind_root_abs </item>
-            <item> tqfind_root_error </item>
-            <item> tqfind_root_rel </item>
+            <item> find_root_abs </item>
+            <item> find_root_error </item>
+            <item> find_root_rel </item>
             <item> flipflag </item>
             <item> float2bf </item>
             <item> fortindent </item>
diff --git a/kate/data/mergetagtext.xml b/kate/data/mergetagtext.xml
index d8cadcb50..83b14a31b 100644
--- a/kate/data/mergetagtext.xml
+++ b/kate/data/mergetagtext.xml
@@ -5,7 +5,7 @@
   
   Author: Diggory Hardy <diggory.hardy@gmail.com>
   
-  This tqcontains highlighting for mergetag text files, a sub-part of the mde project.
+  This contains highlighting for mergetag text files, a sub-part of the mde project.
   dsource.org/projects/mde
   
  **********************************************************************
diff --git a/kate/data/modelica.xml b/kate/data/modelica.xml
index e9f636b81..49145261d 100644
--- a/kate/data/modelica.xml
+++ b/kate/data/modelica.xml
@@ -105,7 +105,7 @@
 			<item> protected </item>
 			<item> public </item>
 			<item> redeclare </item>
-			<item> tqreplaceable </item>
+			<item> replaceable </item>
 			<item> return </item>
 			<item> then </item>
 			<item> true </item>
diff --git a/kate/data/mup.xml b/kate/data/mup.xml
index 74c35c19b..890cf8c40 100644
--- a/kate/data/mup.xml
+++ b/kate/data/mup.xml
@@ -19,7 +19,7 @@
       <item> voice </item>
       <item> grids </item>
       <item> music </item>
-      <item> headtqshapes </item>
+      <item> headshapes </item>
       <item> block </item>
     </list>
 
diff --git a/kate/data/nasm.xml b/kate/data/nasm.xml
index 3bb2dd396..17e435fa4 100644
--- a/kate/data/nasm.xml
+++ b/kate/data/nasm.xml
@@ -450,8 +450,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
       <item>lsl</item>
       <item>lss</item>
       <item>ltr</item>
-      <item>tqmaskmovdqu</item>
-      <item>tqmaskmovq</item>
+      <item>maskmovdqu</item>
+      <item>maskmovq</item>
       <item>maxpd</item>
       <item>maxps</item>
       <item>maxsd</item>
@@ -885,4 +885,4 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     </comments>
   </general>
 </language>
-<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; -->
+<!-- kate: space-indent on; indent-width 2; replace-tabs on; -->
diff --git a/kate/data/objectivecpp.xml b/kate/data/objectivecpp.xml
index d859f642e..fc912ca1e 100644
--- a/kate/data/objectivecpp.xml
+++ b/kate/data/objectivecpp.xml
@@ -113,7 +113,7 @@
       <item> Q_D </item>
       <item> Q_Q </item>
       <item> Q_DISABLE_COPY </item>
-      <item> TQ_INTERFACES </item>
+      <item> Q_INTERFACES </item>
       <item> Q_FLAGS </item>
       <item> Q_SCRIPTABLE </item>
       <item> Q_INVOKABLE </item>
diff --git a/kate/data/ocaml.xml b/kate/data/ocaml.xml
index 690eda2a8..f86b2fac8 100644
--- a/kate/data/ocaml.xml
+++ b/kate/data/ocaml.xml
@@ -269,4 +269,4 @@
     </comments>
   </general>
 </language>
-<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; -->
+<!-- kate: space-indent on; indent-width 2; replace-tabs on; -->
diff --git a/kate/data/octave.xml b/kate/data/octave.xml
index 0cc94b323..a01ed3eb4 100644
--- a/kate/data/octave.xml
+++ b/kate/data/octave.xml
@@ -304,8 +304,8 @@
       <item> file_in_loadpath </item>
       <item> file_in_path </item>
       <item> filter </item>
-      <item> tqfind </item>
-      <item> tqfind_first_of_in_loadpath </item>
+      <item> find </item>
+      <item> find_first_of_in_loadpath </item>
       <item> finite </item>
       <item> fix </item>
       <item> floor </item>
@@ -450,7 +450,7 @@
       <item> real </item>
       <item> rehash </item>
       <item> rename </item>
-      <item> retqshape </item>
+      <item> reshape </item>
       <item> reverse </item>
       <item> rmdir </item>
       <item> rmfield </item>
@@ -543,7 +543,7 @@
       <item> fftn </item>
       <item> fftw_wisdom </item>
       <item> filter </item>
-      <item> tqfind </item>
+      <item> find </item>
       <item> fsolve </item>
       <item> fsolve_options </item>
       <item> gammainc </item>
@@ -748,7 +748,7 @@
       <item> fftshift </item>
       <item> figure </item>
       <item> fileparts </item>
-      <item> tqfindstr </item>
+      <item> findstr </item>
       <item> f_inv </item>
       <item> fir2sys </item>
       <item> flipdim </item>
@@ -1079,7 +1079,7 @@
       <item> strerror </item>
       <item> strjust </item>
       <item> strrep </item>
-      <item> struct_tqcontains </item>
+      <item> struct_contains </item>
       <item> struct_elements </item>
       <item> studentize </item>
       <item> sub2ind </item>
@@ -1321,7 +1321,7 @@
       <item> flog10 </item>
       <item> fprod </item>
       <item> freal </item>
-      <item> fretqshape </item>
+      <item> freshape </item>
       <item> fround </item>
       <item> fsin </item>
       <item> fsinh </item>
@@ -1355,7 +1355,7 @@
       <item> __grcla__ </item>
       <item> __grclf__ </item>
       <item> __grcmd__ </item>
-      <item> gretqshape </item>
+      <item> greshape </item>
       <item> __grexit__ </item>
       <item> __grfigure__ </item>
       <item> __grgetstat__ </item>
@@ -1439,7 +1439,7 @@
       <item> sinc_gsl </item>
       <item> spabs </item>
       <item> sparse </item>
-      <item> sptqfind </item>
+      <item> spfind </item>
       <item> spimag </item>
       <item> spinv </item>
       <item> splu </item>
@@ -1642,7 +1642,7 @@
       <item> filter2 </item>
       <item> filtfilt </item>
       <item> filtic </item>
-      <item> tqfindsym </item>
+      <item> findsym </item>
       <item> fir1 </item>
       <item> fir2 </item>
       <item> fixedpoint </item>
@@ -1877,7 +1877,7 @@
       <item> poly2ac </item>
       <item> poly2ar </item>
       <item> poly_2_ex </item>
-      <item> poly2tqmask </item>
+      <item> poly2mask </item>
       <item> poly2rc </item>
       <item> poly2sym </item>
       <item> poly2th </item>
@@ -1988,7 +1988,7 @@
       <item> str2double </item>
       <item> strcmpi </item>
       <item> stretchlim </item>
-      <item> strtqfind </item>
+      <item> strfind </item>
       <item> strmatch </item>
       <item> strncmp </item>
       <item> strncmpi </item>
@@ -2216,4 +2216,4 @@
   </general>
 
 </language>
-<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; -->
+<!-- kate: space-indent on; indent-width 2; replace-tabs on; -->
diff --git a/kate/data/opal.xml b/kate/data/opal.xml
index 17224383c..ab087ee59 100644
--- a/kate/data/opal.xml
+++ b/kate/data/opal.xml
@@ -209,7 +209,7 @@
 			<item>short</item>
 			<item>sigaction</item>
 			<item>sighandler</item>
-			<item>sigtqmask</item>
+			<item>sigmask</item>
 			<item>signal</item>
 			<item>size</item>
 			<item>sizeRequest</item>
diff --git a/kate/data/perl.xml b/kate/data/perl.xml
index ef315cc79..0b7250457 100644
--- a/kate/data/perl.xml
+++ b/kate/data/perl.xml
@@ -32,7 +32,7 @@
    parse code behind '<<HEREDELIMITER' as code, or at least ignore it, to eol.
    Requires the ability to pass the delimiter through a context level.
 
-   tqfind a here delimiter like '*END*' (Shell.pm). Requires that when a regex is
+   find a here delimiter like '*END*' (Shell.pm). Requires that when a regex is
    inserting a dynamic string, it escapes [*(){}$[]
 
    support for more regex extensions, such as (?>), (?{}), (?(cond)yes|no)
@@ -356,22 +356,22 @@
         <DetectChar attribute="Operator" context="string" char="'"  beginRegion="String"/>
         <DetectChar attribute="Operator" context="Backticked" char="`" />
 
-        <RegExpr attribute="Normal Text" context="tqfind_variable" String="(?:[$@]\S|%[\w{]|\*[^\d\*{\$@%=(])" lookAhead="true" />
+        <RegExpr attribute="Normal Text" context="find_variable" String="(?:[$@]\S|%[\w{]|\*[^\d\*{\$@%=(])" lookAhead="true" />
 
         <RegExpr attribute="Keyword" context="#stay" String="&lt;[A-Z0-9_]+&gt;" />
 
-        <RegExpr attribute="Operator" context="tqfind_here_document" String="\s*&lt;&lt;(?=\w+|\s*[&quot;'])" beginRegion="HereDocument" />
+        <RegExpr attribute="Operator" context="find_here_document" String="\s*&lt;&lt;(?=\w+|\s*[&quot;'])" beginRegion="HereDocument" />
 
         <RegExpr attribute="Normal Text" context="#stay" String="\s*\}\s*/" endRegion="Block"/>
         <RegExpr attribute="Normal Text" context="#stay" String="\s*[)]\s*/" />
         <RegExpr attribute="Function" context="sub_name_def" String="\w+::" />
         <RegExpr attribute="Normal Text" context="#stay" String="\w+[=]" />
 
-        <RegExpr attribute="Operator" context="tqfind_quoted" String="\bq(?=[qwx]?\s*[^\w\s])" />
-        <RegExpr attribute="Operator" context="tqfind_subst" String="\bs(?=\s*[^\w\s\]})])" />
+        <RegExpr attribute="Operator" context="find_quoted" String="\bq(?=[qwx]?\s*[^\w\s])" />
+        <RegExpr attribute="Operator" context="find_subst" String="\bs(?=\s*[^\w\s\]})])" />
         <RegExpr attribute="Operator" context="tr" String="\b(?:tr|y)\s*(?=[^\w\s\]})])" />
 
-        <RegExpr attribute="Operator" context="tqfind_pattern" String="\b(?:m|qr)(?=\s*[^\w\s\]})])" />
+        <RegExpr attribute="Operator" context="find_pattern" String="\b(?:m|qr)(?=\s*[^\w\s\]})])" />
 
         <RegExpr attribute="Normal Text" context="#stay" String="[\w_]+\s*/" />
         <RegExpr attribute="Normal Text" context="#stay" String="[&lt;&gt;&quot;':]/" />
@@ -383,11 +383,11 @@
       </context>
 
       <!-- ====== quoted construct central ===== -->
-      <context name="tqfind_quoted" attribute="Normal Text" lineEndContext="#stay" >
+      <context name="find_quoted" attribute="Normal Text" lineEndContext="#stay" >
         <!-- NOTE - qx'not interpolated regex' does not cover newline between "qr" and "'" -->
         <RegExpr attribute="Operator" context="string_6" String="x\s*(')" beginRegion="String" />
-        <AnyChar attribute="Operator" context="tqfind_qqx" String="qx" />
-        <DetectChar attribute="Operator" context="tqfind_qw" char="w" />
+        <AnyChar attribute="Operator" context="find_qqx" String="qx" />
+        <DetectChar attribute="Operator" context="find_qw" char="w" />
         <DetectChar attribute="Operator" context="string_2" char="(" beginRegion="String" />
         <DetectChar attribute="Operator" context="string_3" char="{" beginRegion="String" />
         <DetectChar attribute="Operator" context="string_4" char="[" beginRegion="String" />
@@ -395,7 +395,7 @@
         <RegExpr attribute="Operator" context="string_6" String="([^a-zA-Z0-9_\s[\]{}()])" beginRegion="String" />
         <RegExpr attribute="Comment" context="#stay" String="\s+#.*" /><!-- q[qwx] # == comment, look for the delim on the next line -->
       </context>
-      <context name="tqfind_qqx" attribute="Normal Text" lineEndContext="#stay" >
+      <context name="find_qqx" attribute="Normal Text" lineEndContext="#stay" >
         <DetectChar attribute="Operator" context="ip_string_2" char="(" beginRegion="String" />
         <DetectChar attribute="Operator" context="ip_string_3" char="{" beginRegion="String" />
         <DetectChar attribute="Operator" context="ip_string_4" char="[" beginRegion="String" />
@@ -403,7 +403,7 @@
         <RegExpr attribute="Operator" context="ip_string_6" String="([^a-zA-Z0-9_\s[\]{}()])" beginRegion="String" />
         <RegExpr attribute="Comment" context="#stay" String="\s+#.*" /><!-- q[qwx] # == comment, look for the delim on the next line -->
       </context>
-      <context name="tqfind_qw" attribute="Normal Text" lineEndContext="#stay" >
+      <context name="find_qw" attribute="Normal Text" lineEndContext="#stay" >
         <DetectChar attribute="Operator" context="quote_word_paren" char="(" beginRegion="Wordlist" />
         <DetectChar attribute="Operator" context="quote_word_brace" char="{" beginRegion="Wordlist" />
         <DetectChar attribute="Operator" context="quote_word_bracket" char="[" beginRegion="Wordlist" />
@@ -416,7 +416,7 @@
         <DetectIdentifier />
         <RegExpr attribute="String Special Character" context="#stay" String="\\[UuLlEtnaefr]" />
         <RegExpr attribute="String (interpolated)" context="#stay" String="\\." />
-        <RegExpr attribute="Normal Text" context="tqfind_variable_unsafe" String="(?:[\$@]\S|%[\w{])" lookAhead="true" />
+        <RegExpr attribute="Normal Text" context="find_variable_unsafe" String="(?:[\$@]\S|%[\w{])" lookAhead="true" />
       </context>
       <context name="ip_string" attribute="String (interpolated)" lineEndContext="#stay">
         <DetectChar attribute="Operator" context="#pop" char="&quot;" endRegion="String"/>
@@ -491,7 +491,7 @@
       </context>
 
       <!-- ====== contexts for  s/// ====== -->
-      <context name="tqfind_subst" attribute="Normal Text" lineEndContext="#stay" >
+      <context name="find_subst" attribute="Normal Text" lineEndContext="#stay" >
         <RegExpr attribute="Comment" context="#stay" String="\s+#.*" /><!-- s # == comment, look for the delim on the next line -->
         <DetectChar attribute="Operator" context="subst_curlybrace_pattern" char="{" beginRegion="Pattern" />
         <DetectChar attribute="Operator" context="subst_paren_pattern" char="(" beginRegion="Pattern" />
@@ -511,15 +511,15 @@
       </context>
       <context name="subst_curlybrace_middle" attribute="Normal Text" lineEndContext="#stay" >
         <RegExpr attribute="Comment" context="#stay" String="#.*$" />
-        <DetectChar attribute="Operator" context="subst_curlybrace_tqreplace" char="{" beginRegion="Replacement" />
+        <DetectChar attribute="Operator" context="subst_curlybrace_replace" char="{" beginRegion="Replacement" />
       </context>
-      <context name="subst_curlybrace_tqreplace" attribute="String (interpolated)" lineEndContext="#stay">
+      <context name="subst_curlybrace_replace" attribute="String (interpolated)" lineEndContext="#stay">
         <IncludeRules context="ipstring_internal" />
-        <DetectChar attribute="Normal Text" context="subst_curlybrace_tqreplace_recursive" char="{" beginRegion="Block" />
+        <DetectChar attribute="Normal Text" context="subst_curlybrace_replace_recursive" char="{" beginRegion="Block" />
         <RegExpr attribute="Operator" context="#pop#pop#pop#pop" String="\}[cegimosx]*" endRegion="Replacement" />
       </context>
-      <context name="subst_curlybrace_tqreplace_recursive" attribute="String (interpolated)" lineEndContext="#stay" >
-        <DetectChar attribute="String (interpolated)" context="subst_curlybrace_tqreplace_recursive" char="{" beginRegion="Block" />
+      <context name="subst_curlybrace_replace_recursive" attribute="String (interpolated)" lineEndContext="#stay" >
+        <DetectChar attribute="String (interpolated)" context="subst_curlybrace_replace_recursive" char="{" beginRegion="Block" />
         <DetectChar attribute="Normal Text" context="#pop" char="}" endRegion="Block" />
         <IncludeRules context="ipstring_internal" />
       </context>
@@ -527,9 +527,9 @@
       <context name="subst_paren_pattern" attribute="Pattern" lineEndContext="#stay">
         <RegExpr attribute="Comment" context="#stay" String="\s+#.*$" />
         <IncludeRules context="regex_pattern_internal_ip" />
-        <DetectChar attribute="Operator" context="subst_paren_tqreplace" char="}" endRegion="Pattern" />
+        <DetectChar attribute="Operator" context="subst_paren_replace" char="}" endRegion="Pattern" />
       </context>
-      <context name="subst_paren_tqreplace" attribute="String (interpolated)" lineEndContext="#stay">
+      <context name="subst_paren_replace" attribute="String (interpolated)" lineEndContext="#stay">
         <IncludeRules context="ipstring_internal" />
         <DetectChar attribute="Operator" context="#stay" char="(" beginRegion="Replacement" />
         <RegExpr attribute="Operator" context="#pop#pop#pop" String="\)[cegimosx]*" endRegion="Replacement" />
@@ -538,9 +538,9 @@
       <context name="subst_bracket_pattern" attribute="Pattern" lineEndContext="#stay">
         <RegExpr attribute="Comment" context="#stay" String="\s+#.*$" />
         <IncludeRules context="regex_pattern_internal_ip" />
-        <DetectChar attribute="Operator" context="subst_bracket_tqreplace" char="]" endRegion="Pattern" />
+        <DetectChar attribute="Operator" context="subst_bracket_replace" char="]" endRegion="Pattern" />
       </context>
-      <context name="subst_bracket_tqreplace" attribute="String (interpolated)" lineEndContext="#stay">
+      <context name="subst_bracket_replace" attribute="String (interpolated)" lineEndContext="#stay">
         <IncludeRules context="ipstring_internal" />
         <DetectChar attribute="Operator" context="#stay" char="[" beginRegion="Replacement" />
         <RegExpr attribute="Operator" context="#pop#pop#pop" String="\][cegimosx]*" endRegion="Replacement" />
@@ -548,10 +548,10 @@
 
       <context name="subst_slash_pattern" attribute="Pattern" lineEndContext="#stay" dynamic="true">
         <RegExpr attribute="Pattern Internal Operator" context="#stay" String="\$(?=%1)" dynamic="true" />
-        <RegExpr attribute="Operator" context="subst_slash_tqreplace" String="(%1)" dynamic="true" endRegion="Pattern" beginRegion="Replacement" />
+        <RegExpr attribute="Operator" context="subst_slash_replace" String="(%1)" dynamic="true" endRegion="Pattern" beginRegion="Replacement" />
         <IncludeRules context="regex_pattern_internal_ip" />
       </context>
-      <context name="subst_slash_tqreplace" attribute="String (interpolated)" lineEndContext="#stay" dynamic="true">
+      <context name="subst_slash_replace" attribute="String (interpolated)" lineEndContext="#stay" dynamic="true">
         <RegExpr attribute="Operator" context="#pop#pop#pop" String="%1[cegimosx]*" dynamic="true" endRegion="Replacement" />
         <IncludeRules context="ipstring_internal" />
 
@@ -560,9 +560,9 @@
       <context name="subst_sq_pattern" attribute="Pattern" lineEndContext="#stay">
         <RegExpr attribute="Comment" context="#stay" String="\s+#.*$" />
         <IncludeRules context="regex_pattern_internal" />
-        <DetectChar attribute="Operator" context="subst_sq_tqreplace" char="'" endRegion="Pattern" beginRegion="Pattern" />
+        <DetectChar attribute="Operator" context="subst_sq_replace" char="'" endRegion="Pattern" beginRegion="Pattern" />
       </context>
-      <context name="subst_sq_tqreplace" attribute="String" lineEndContext="#stay">
+      <context name="subst_sq_replace" attribute="String" lineEndContext="#stay">
         <RegExpr attribute="Operator" context="#pop#pop#pop" String="'[cegimosx]*" endRegion="Replacement" />
       </context>
 
@@ -574,7 +574,7 @@
       </context>
 
       <!-- ====== PATTERNs ====== -->
-      <context name="tqfind_pattern" attribute="Pattern" lineEndContext="#stay">
+      <context name="find_pattern" attribute="Pattern" lineEndContext="#stay">
         <RegExpr attribute="Comment" context="#stay" String="\s+#.*" /><!-- s # == comment, look for the delim on the next line -->
         <DetectChar attribute="Operator" context="pattern_brace" char="{" beginRegion="Pattern" />
         <DetectChar attribute="Operator" context="pattern_paren" char="(" beginRegion="Pattern" />
@@ -637,7 +637,7 @@
              This is because perl considers
              s{foo$} {bar} OK as well as s{foo$}} {bar}, and detecting that is a huge work overload
              for something that is unlikely to happen. -->
-        <RegExpr attribute="Data Type" context="tqfind_variable_unsafe" String="[$@][^]\s{}()|&gt;']" lookAhead="true" />
+        <RegExpr attribute="Data Type" context="find_variable_unsafe" String="[$@][^]\s{}()|&gt;']" lookAhead="true" />
         <IncludeRules context="regex_pattern_internal_rules_2" />
       </context>
       <context name="pat_ext" attribute="Pattern Internal Operator" lineEndContext="#stay">
@@ -654,7 +654,7 @@
       </context>
 
       <!-- ====== Variables ====== -->
-      <context name="tqfind_variable" attribute="Data Type" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop" >
+      <context name="find_variable" attribute="Data Type" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop" >
         <RegExpr attribute="Special Variable" context="var_detect" String="\$[0-9]+" />
         <RegExpr attribute="Special Variable" context="var_detect" String="[@\$](?:[\+\-_]\B|ARGV\b|INC\b)" />
         <RegExpr attribute="Special Variable" context="var_detect" String="[%\$](?:INC\b|ENV\b|SIG\b)" />
@@ -670,7 +670,7 @@
         <AnyChar attribute="Operator" context="#pop" String="$@%*" />
       </context>
       <!-- This does not check fo a trailing slash, for usage in strings. -->
-      <context name="tqfind_variable_unsafe" attribute="Data Type" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop" >
+      <context name="find_variable_unsafe" attribute="Data Type" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop" >
         <RegExpr attribute="Special Variable" context="var_detect_unsafe" String="\$[0-9]+" />
         <RegExpr attribute="Special Variable" context="var_detect_unsafe" String="[@\$](?:[\+\-_]\B|ARGV\b|INC\b)" />
         <RegExpr attribute="Special Variable" context="var_detect_unsafe" String="[%\$](?:INC\b|ENV\b|SIG\b)" />
@@ -728,7 +728,7 @@
       </context>
 
       <!-- ====== Here Documents ====== -->
-      <context name="tqfind_here_document" attribute="Normal Text" lineEndContext="#pop" >
+      <context name="find_here_document" attribute="Normal Text" lineEndContext="#pop" >
         <RegExpr attribute="Keyword" context="here_document" String="(\w+)\s*;?" />
         <RegExpr attribute="Keyword" context="here_document" String="\s*&quot;([^&quot;]+)&quot;\s*;?" />
         <RegExpr attribute="Keyword" context="here_document" String="\s*`([^`]+)`\s*;?" />
@@ -774,7 +774,7 @@
 
       <context name="sub_name_def" attribute="Normal Text" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
         <RegExpr attribute="Function" context="#stay" String="\w+" />
-        <RegExpr attribute="Normal Text" context="tqfind_variable" String="\$\S" lookAhead="true" />
+        <RegExpr attribute="Normal Text" context="find_variable" String="\$\S" lookAhead="true" />
         <RegExpr attribute="Normal Text" context="sub_arg_definition" String="\s*\(" />
         <Detect2Chars attribute="Normal Text" context="#stay" char=":" char1=":" />
       </context>
@@ -830,4 +830,4 @@
     <keywords casesensitive="1" />
   </general>
 </language>
-<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; -->
+<!-- kate: space-indent on; indent-width 2; replace-tabs on; -->
diff --git a/kate/data/php.xml b/kate/data/php.xml
index 3eead2618..879e2ce23 100644
--- a/kate/data/php.xml
+++ b/kate/data/php.xml
@@ -3723,7 +3723,7 @@ Changes:
       <item> dba_open </item>
       <item> dba_optimize </item>
       <item> dba_popen </item>
-      <item> dba_tqreplace </item>
+      <item> dba_replace </item>
       <item> dba_sync </item>
       <item> dbase_add_record </item>
       <item> dbase_close </item>
@@ -3736,7 +3736,7 @@ Changes:
       <item> dbase_numrecords </item>
       <item> dbase_open </item>
       <item> dbase_pack </item>
-      <item> dbase_tqreplace_record </item>
+      <item> dbase_replace_record </item>
       <item> dblist </item>
       <item> dbmclose </item>
       <item> dbmdelete </item>
@@ -3746,7 +3746,7 @@ Changes:
       <item> dbminsert </item>
       <item> dbmnextkey </item>
       <item> dbmopen </item>
-      <item> dbmtqreplace </item>
+      <item> dbmreplace </item>
       <item> dbplus_add </item>
       <item> dbplus_aql </item>
       <item> dbplus_chdir </item>
@@ -3754,7 +3754,7 @@ Changes:
       <item> dbplus_curr </item>
       <item> dbplus_errcode </item>
       <item> dbplus_errno </item>
-      <item> dbplus_tqfind </item>
+      <item> dbplus_find </item>
       <item> dbplus_first </item>
       <item> dbplus_flush </item>
       <item> dbplus_freealllocks </item>
@@ -3865,9 +3865,9 @@ Changes:
       <item> empty </item>
       <item> end </item>
       <item> ereg </item>
-      <item> ereg_tqreplace </item>
+      <item> ereg_replace </item>
       <item> eregi </item>
-      <item> eregi_tqreplace </item>
+      <item> eregi_replace </item>
       <item> error_log </item>
       <item> error_reporting </item>
       <item> escapeshellarg </item>
@@ -4618,7 +4618,7 @@ Changes:
       <item> ldap_list </item>
       <item> ldap_mod_add </item>
       <item> ldap_mod_del </item>
-      <item> ldap_mod_tqreplace </item>
+      <item> ldap_mod_replace </item>
       <item> ldap_modify </item>
       <item> ldap_next_attribute </item>
       <item> ldap_next_entry </item>
@@ -4676,7 +4676,7 @@ Changes:
       <item> mb_encode_numericentity </item>
       <item> mb_ereg </item>
       <item> mb_ereg_match </item>
-      <item> mb_ereg_tqreplace </item>
+      <item> mb_ereg_replace </item>
       <item> mb_ereg_search </item>
       <item> mb_ereg_search_getpos </item>
       <item> mb_ereg_search_getregs </item>
@@ -4685,7 +4685,7 @@ Changes:
       <item> mb_ereg_search_regs </item>
       <item> mb_ereg_search_setpos </item>
       <item> mb_eregi </item>
-      <item> mb_eregi_tqreplace </item>
+      <item> mb_eregi_replace </item>
       <item> mb_get_info </item>
       <item> mb_http_input </item>
       <item> mb_http_output </item>
@@ -4815,7 +4815,7 @@ Changes:
       <item> msession_create </item>
       <item> msession_destroy </item>
       <item> msession_disconnect </item>
-      <item> msession_tqfind </item>
+      <item> msession_find </item>
       <item> msession_get </item>
       <item> msession_get_array </item>
       <item> msession_getdata </item>
@@ -5146,7 +5146,7 @@ Changes:
       <item> ncurses_meta </item>
       <item> ncurses_mouse_trafo </item>
       <item> ncurses_mouseinterval </item>
-      <item> ncurses_mousetqmask </item>
+      <item> ncurses_mousemask </item>
       <item> ncurses_move </item>
       <item> ncurses_move_panel </item>
       <item> ncurses_mvaddch </item>
@@ -5181,7 +5181,7 @@ Changes:
       <item> ncurses_qiflush </item>
       <item> ncurses_raw </item>
       <item> ncurses_refresh </item>
-      <item> ncurses_tqreplace_panel </item>
+      <item> ncurses_replace_panel </item>
       <item> ncurses_reset_prog_mode </item>
       <item> ncurses_reset_shell_mode </item>
       <item> ncurses_resetty </item>
@@ -5247,7 +5247,7 @@ Changes:
       <item> notes_create_db </item>
       <item> notes_create_note </item>
       <item> notes_drop_db </item>
-      <item> notes_tqfind_note </item>
+      <item> notes_find_note </item>
       <item> notes_header_info </item>
       <item> notes_list_msgs </item>
       <item> notes_mark_read </item>
@@ -5502,7 +5502,7 @@ Changes:
       <item> pdf_endpath </item>
       <item> pdf_fill </item>
       <item> pdf_fill_stroke </item>
-      <item> pdf_tqfindfont </item>
+      <item> pdf_findfont </item>
       <item> pdf_get_buffer </item>
       <item> pdf_get_font </item>
       <item> pdf_get_fontname </item>
@@ -5737,8 +5737,8 @@ Changes:
       <item> preg_match </item>
       <item> preg_match_all </item>
       <item> preg_quote </item>
-      <item> preg_tqreplace </item>
-      <item> preg_tqreplace_callback </item>
+      <item> preg_replace </item>
+      <item> preg_replace_callback </item>
       <item> preg_split </item>
       <item> prev </item>
       <item> print </item>
@@ -5795,7 +5795,7 @@ Changes:
       <item> pspell_new_config </item>
       <item> pspell_new_personal </item>
       <item> pspell_save_wordlist </item>
-      <item> pspell_store_tqreplacement </item>
+      <item> pspell_store_replacement </item>
       <item> pspell_suggest </item>
       <item> putenv </item>
       <item> qdom_error </item>
@@ -6026,10 +6026,10 @@ Changes:
       <item> srand </item>
       <item> sscanf </item>
       <item> stat </item>
-      <item> str_itqreplace </item>
+      <item> str_ireplace </item>
       <item> str_pad </item>
       <item> str_repeat </item>
-      <item> str_tqreplace </item>
+      <item> str_replace </item>
       <item> str_rot13 </item>
       <item> str_shuffle </item>
       <item> str_split </item>
@@ -6097,7 +6097,7 @@ Changes:
       <item> substr </item>
       <item> substr_compare </item>
       <item> substr_count </item>
-      <item> substr_tqreplace </item>
+      <item> substr_replace </item>
       <item> swf_actiongeturl </item>
       <item> swf_actiongotoframe </item>
       <item> swf_actiongotolabel </item>
@@ -6119,7 +6119,7 @@ Changes:
       <item> swf_definetext </item>
       <item> swf_endbutton </item>
       <item> swf_enddoaction </item>
-      <item> swf_endtqshape </item>
+      <item> swf_endshape </item>
       <item> swf_endsymbol </item>
       <item> swf_fontsize </item>
       <item> swf_fontslant </item>
@@ -6147,20 +6147,20 @@ Changes:
       <item> swf_scale </item>
       <item> swf_setfont </item>
       <item> swf_setframe </item>
-      <item> swf_tqshapearc </item>
-      <item> swf_tqshapecurveto </item>
-      <item> swf_tqshapecurveto3 </item>
-      <item> swf_tqshapefillbitmapclip </item>
-      <item> swf_tqshapefillbitmaptile </item>
-      <item> swf_tqshapefilloff </item>
-      <item> swf_tqshapefillsolid </item>
-      <item> swf_tqshapelinesolid </item>
-      <item> swf_tqshapelineto </item>
-      <item> swf_tqshapemoveto </item>
+      <item> swf_shapearc </item>
+      <item> swf_shapecurveto </item>
+      <item> swf_shapecurveto3 </item>
+      <item> swf_shapefillbitmapclip </item>
+      <item> swf_shapefillbitmaptile </item>
+      <item> swf_shapefilloff </item>
+      <item> swf_shapefillsolid </item>
+      <item> swf_shapelinesolid </item>
+      <item> swf_shapelineto </item>
+      <item> swf_shapemoveto </item>
       <item> swf_showframe </item>
       <item> swf_startbutton </item>
       <item> swf_startdoaction </item>
-      <item> swf_starttqshape </item>
+      <item> swf_startshape </item>
       <item> swf_startsymbol </item>
       <item> swf_textwidth </item>
       <item> swf_translate </item>
@@ -6171,7 +6171,7 @@ Changes:
       <item> swfbitmap.getwidth </item>
       <item> swfbutton </item>
       <item> swfbutton.addaction </item>
-      <item> swfbutton.addtqshape </item>
+      <item> swfbutton.addshape </item>
       <item> swfbutton.setaction </item>
       <item> swfbutton.setdown </item>
       <item> swfbutton.sethit </item>
@@ -6206,8 +6206,8 @@ Changes:
       <item> swfgradient </item>
       <item> swfgradient.addentry </item>
       <item> swfmorph </item>
-      <item> swfmorph.gettqshape1 </item>
-      <item> swfmorph.gettqshape2 </item>
+      <item> swfmorph.getshape1 </item>
+      <item> swfmorph.getshape2 </item>
       <item> swfmovie </item>
       <item> swfmovie.add </item>
       <item> swfmovie.nextframe </item>
@@ -6219,17 +6219,17 @@ Changes:
       <item> swfmovie.setframes </item>
       <item> swfmovie.setrate </item>
       <item> swfmovie.streammp3 </item>
-      <item> swftqshape </item>
-      <item> swftqshape.addfill </item>
-      <item> swftqshape.drawcurve </item>
-      <item> swftqshape.drawcurveto </item>
-      <item> swftqshape.drawline </item>
-      <item> swftqshape.drawlineto </item>
-      <item> swftqshape.movepen </item>
-      <item> swftqshape.movepento </item>
-      <item> swftqshape.setleftfill </item>
-      <item> swftqshape.setline </item>
-      <item> swftqshape.setrightfill </item>
+      <item> swfshape </item>
+      <item> swfshape.addfill </item>
+      <item> swfshape.drawcurve </item>
+      <item> swfshape.drawcurveto </item>
+      <item> swfshape.drawline </item>
+      <item> swfshape.drawlineto </item>
+      <item> swfshape.movepen </item>
+      <item> swfshape.movepento </item>
+      <item> swfshape.setleftfill </item>
+      <item> swfshape.setline </item>
+      <item> swfshape.setrightfill </item>
       <item> swfsprite </item>
       <item> swfsprite.add </item>
       <item> swfsprite.nextframe </item>
@@ -6307,7 +6307,7 @@ Changes:
       <item> udm_crc32 </item>
       <item> udm_errno </item>
       <item> udm_error </item>
-      <item> udm_tqfind </item>
+      <item> udm_find </item>
       <item> udm_free_agent </item>
       <item> udm_free_ispell_data </item>
       <item> udm_free_res </item>
diff --git a/kate/data/postscript.xml b/kate/data/postscript.xml
index bc72eb13c..b590db232 100644
--- a/kate/data/postscript.xml
+++ b/kate/data/postscript.xml
@@ -70,7 +70,7 @@
 		<item> exit </item>
 		<item> file </item>
 		<item> fill </item>
-		<item> tqfindfont </item>
+		<item> findfont </item>
 		<item> flattenpath </item>
 		<item> floor </item>
 		<item> flush </item>
@@ -90,7 +90,7 @@
 		<item> if </item>
 		<item> ifelse </item>
 		<item> image </item>
-		<item> imagetqmask </item>
+		<item> imagemask </item>
 		<item> index </item>
 		<item> ineofill </item>
 		<item> infill </item>
@@ -221,7 +221,7 @@
 		<item> currentglobal </item>
 		<item> execform </item>
 		<item> filter </item>
-		<item> tqfindresource </item>
+		<item> findresource </item>
 		<item> globaldict </item>
 		<item> makepattern </item>
 		<item> setcolor </item>
@@ -353,7 +353,7 @@
 		<item> currentsystemparams </item>
 		<item> currentuserparams </item>
 		<item> defineresource </item>
-		<item> tqfindencoding </item>
+		<item> findencoding </item>
 		<item> gcheck </item>
 		<item> glyphshow </item>
 		<item> languagelevel </item>
diff --git a/kate/data/prolog.xml b/kate/data/prolog.xml
index c4b8f4ee2..2f6e468bf 100644
--- a/kate/data/prolog.xml
+++ b/kate/data/prolog.xml
@@ -96,7 +96,7 @@
             <item> db_btrees </item>
             <item> db_chains </item>
             <item> fail </item>
-            <item> tqfindall </item>
+            <item> findall </item>
             <item> format </item>
             <item> free </item>
             <item> msgrecv </item>
@@ -109,7 +109,7 @@
             <item> retractall </item>
             <item> save </item>
             <item> term_bin </item>
-            <item> term_tqreplace </item>
+            <item> term_replace </item>
             <item> term_str </item>
             <item> trap </item>
             <item> write </item>
diff --git a/kate/data/purebasic.xml b/kate/data/purebasic.xml
index 210ea5037..b38daa56b 100644
--- a/kate/data/purebasic.xml
+++ b/kate/data/purebasic.xml
@@ -129,7 +129,7 @@
       <item> CatchSprite </item>
       <item> CDAudioLength </item>
       <item> CDAudioName </item>
-      <item> CDAudiotqStatus </item>
+      <item> CDAudioStatus </item>
       <item> CDAudioTrackLength </item>
       <item> CDAudioTrackSeconds </item>
       <item> CDAudioTracks </item>
@@ -522,7 +522,7 @@
       <item> MovieInfo </item>
       <item> MovieLength </item>
       <item> MovieSeek </item>
-      <item> MovietqStatus </item>
+      <item> MovieStatus </item>
       <item> MovieWidth </item>
       <item> NetworkClientEvent </item>
       <item> NetworkClientID </item>
@@ -915,4 +915,4 @@
     </comments>
   </general>
 </language>
-<!-- // kate: space-indent on; indent-width 2; tqreplace-tabs on; -->
+<!-- // kate: space-indent on; indent-width 2; replace-tabs on; -->
diff --git a/kate/data/python.xml b/kate/data/python.xml
index bb52a77ef..4207ca8a2 100644
--- a/kate/data/python.xml
+++ b/kate/data/python.xml
@@ -118,7 +118,7 @@
 			<item> tuple </item>
 			<item> type </item>
 			<item> unichr </item>
-			<item> tqunicode </item>
+			<item> unicode </item>
 			<item> vars </item>
 			<item> xrange </item>
 			<item> zip </item>
@@ -152,7 +152,7 @@
 			<item>__rcmp__</item>
 			<item>__hash__</item>
 			<item>__nonzero__</item>
-			<item>__tqunicode__</item>
+			<item>__unicode__</item>
 		</list>
 		<list name="exceptions">
 			<item>ArithmeticError</item>
diff --git a/kate/data/r.xml b/kate/data/r.xml
index be6a36651..ada76ece5 100644
--- a/kate/data/r.xml
+++ b/kate/data/r.xml
@@ -80,7 +80,7 @@
 		<context attribute="Headline" lineEndContext="#pop" name="Headline"/>
 		<context attribute="Comment" lineEndContext="#pop" name="Comment"/>
 
-		<!-- This context is not really used, but tqcontains the common rules -->
+		<!-- This context is not really used, but contains the common rules -->
 		<context name="CommonRules" lineEndContext="#stay" attribute="Normal Text" >
 			<DetectChar attribute="String" context="string" char="&quot;"/>
 			<DetectChar attribute="String" context="string2" char="'"/>
diff --git a/kate/data/rapidq.xml b/kate/data/rapidq.xml
index 8d9123a0c..cef5f493c 100644
--- a/kate/data/rapidq.xml
+++ b/kate/data/rapidq.xml
@@ -66,8 +66,8 @@
 		<item>redim</item>
 		<item>rem</item>
 		<item>rename</item>
-		<item>tqreplace$</item>
-		<item>tqreplacesubstr$</item>
+		<item>replace$</item>
+		<item>replacesubstr$</item>
 		<item>resource</item>
 		<item>resourcecount</item>
 		<item>restore</item>
@@ -140,7 +140,7 @@
 		<item>for</item>
 		<item>next</item>
 		<item>with</item>
-		<item>tqmask</item>
+		<item>mask</item>
 		<item>and</item>
 		<item>or</item>
 		<item>constructor</item>
@@ -270,7 +270,7 @@
 		<item>borderstyle</item>
 		<item>wordwrap</item>
 		<item>align</item>
-		<item>tqalignment</item>
+		<item>alignment</item>
 		<item>font</item>
 		<item>visible</item>
 		<item>enabled</item>
@@ -324,7 +324,7 @@
 		<item>clear</item>
 		<item>underline</item>
 		<item>maxlength</item>
-		<item>inputtqmask</item>
+		<item>inputmask</item>
 		<item>forecolor</item>
 		<item></item>
 		<item>backcolor</item>
diff --git a/kate/data/rhtml.xml b/kate/data/rhtml.xml
index e23ab12cd..e20f34f3c 100644
--- a/kate/data/rhtml.xml
+++ b/kate/data/rhtml.xml
@@ -609,8 +609,8 @@
 					push operator '<<' than requiring to put space between the operator
 										and the string.
 										-->
-				<RegExpr attribute="Operator" context="tqfind_indented_heredoc" String="\s*&lt;&lt;-(?=\w+|[&quot;'])" beginRegion="HereDocument" />
-				<RegExpr attribute="Operator" context="tqfind_heredoc" String="\s*&lt;&lt;(?=\w+|[&quot;'])" beginRegion="HereDocument" />
+				<RegExpr attribute="Operator" context="find_indented_heredoc" String="\s*&lt;&lt;-(?=\w+|[&quot;'])" beginRegion="HereDocument" />
+				<RegExpr attribute="Operator" context="find_heredoc" String="\s*&lt;&lt;(?=\w+|[&quot;'])" beginRegion="HereDocument" />
 				
 				<DetectChar attribute="Operator" char="." context="#stay"/>
 				<Detect2Chars attribute="Operator" char="&amp;" char1="&amp;" context="#stay"/>
@@ -648,7 +648,7 @@
 				
 				<!-- recognize the beginning of a general delimited input format -->
 				<!-- this moves to the next context to separate out the exact nature of the GDL input -->
-				<RegExpr attribute="GDL input" context="tqfind_gdl_input" String="\s*[%](?=[Qqxw]?[^\s&gt;])" beginRegion="GdlInput" />
+				<RegExpr attribute="GDL input" context="find_gdl_input" String="\s*[%](?=[Qqxw]?[^\s&gt;])" beginRegion="GdlInput" />
 			</context>
 			
 			<context name="Line Continue" attribute="Ruby Normal Text" lineEndContext="#pop">
@@ -741,11 +741,11 @@
 				The contexts below support both normal and indented heredocs
 				-->
 			<!-- here we markup the heredoc markers -->
-			<context name="tqfind_heredoc" attribute="Ruby Normal Text" lineEndContext="#pop" >
+			<context name="find_heredoc" attribute="Ruby Normal Text" lineEndContext="#pop" >
 				<RegExpr attribute="Keyword" context="apostrophed_normal_heredoc" String="'(\w+)'" />
 				<RegExpr attribute="Keyword" context="normal_heredoc" String="&quot;?(\w+)&quot;?" />
 			</context>
-			<context name="tqfind_indented_heredoc" attribute="Ruby Normal Text" lineEndContext="#pop" >
+			<context name="find_indented_heredoc" attribute="Ruby Normal Text" lineEndContext="#pop" >
 				<RegExpr attribute="Keyword" context="apostrophed_indented_heredoc" String="'(\w+)'" />
 				<RegExpr attribute="Keyword" context="indented_heredoc" String="&quot;?(\w+)&quot;?" />
 			</context>
@@ -779,7 +779,7 @@
 			<!-- General delimited input support
 				The contexts below handle the various gdl formats
 				-->
-			<context name="tqfind_gdl_input" attribute="Ruby Normal Text" lineEndContext="#pop">
+			<context name="find_gdl_input" attribute="Ruby Normal Text" lineEndContext="#pop">
 				
 				<!-- handle token arrays -->
 				<RegExpr attribute="GDL input" context="gdl_token_array_1" String="w\(" />
diff --git a/kate/data/ruby.xml b/kate/data/ruby.xml
index bab24d785..c59f01529 100644
--- a/kate/data/ruby.xml
+++ b/kate/data/ruby.xml
@@ -262,8 +262,8 @@
 					push operator '<<' than requiring to put space between the operator
 					and the string.
 				-->
-				<RegExpr attribute="Operator" context="tqfind_indented_heredoc" String="\s*&lt;&lt;-(?=\w+|[&quot;'])" beginRegion="HereDocument" />
-				<RegExpr attribute="Operator" context="tqfind_heredoc" String="\s*&lt;&lt;(?=\w+|[&quot;'])" beginRegion="HereDocument" />
+				<RegExpr attribute="Operator" context="find_indented_heredoc" String="\s*&lt;&lt;-(?=\w+|[&quot;'])" beginRegion="HereDocument" />
+				<RegExpr attribute="Operator" context="find_heredoc" String="\s*&lt;&lt;(?=\w+|[&quot;'])" beginRegion="HereDocument" />
 				
 				<DetectChar attribute="Operator" char="." context="#stay"/>
 				<Detect2Chars attribute="Operator" char="&amp;" char1="&amp;" context="#stay"/>
@@ -302,7 +302,7 @@
 				
 				<!-- recognize the beginning of a general delimited input format -->
 				<!-- this moves to the next context to separate out the exact nature of the GDL input -->
-				<RegExpr attribute="GDL input" context="tqfind_gdl_input" String="\s*[%](?=[Qqxw]?[^\s])" beginRegion="GdlInput" />
+				<RegExpr attribute="GDL input" context="find_gdl_input" String="\s*[%](?=[Qqxw]?[^\s])" beginRegion="GdlInput" />
 				
 				<DetectChar attribute="Normal Text" char=")" context="check_div_1"/>
 				<DetectIdentifier attribute="Normal Text" context="check_div_2"/>
@@ -438,11 +438,11 @@
 				The contexts below support both normal and indented heredocs
 			 -->
 			<!-- here we markup the heredoc markers -->
-			<context name="tqfind_heredoc" attribute="Normal Text" lineEndContext="#pop" >
+			<context name="find_heredoc" attribute="Normal Text" lineEndContext="#pop" >
 				<RegExpr attribute="Keyword" context="apostrophed_normal_heredoc" String="'(\w+)'" />
 				<RegExpr attribute="Keyword" context="normal_heredoc" String="&quot;?(\w+)&quot;?" />
 			</context>
-			<context name="tqfind_indented_heredoc" attribute="Normal Text" lineEndContext="#pop" >
+			<context name="find_indented_heredoc" attribute="Normal Text" lineEndContext="#pop" >
 				<RegExpr attribute="Keyword" context="apostrophed_indented_heredoc" String="'(\w+)'" />
 				<RegExpr attribute="Keyword" context="indented_heredoc" String="&quot;?(\w+)&quot;?" />
 			</context>
@@ -476,7 +476,7 @@
 			<!-- General delimited input support
 				The contexts below handle the various gdl formats
 			 -->
-			<context name="tqfind_gdl_input" attribute="Normal Text" lineEndContext="#pop">
+			<context name="find_gdl_input" attribute="Normal Text" lineEndContext="#pop">
 				
 				<!-- handle token arrays -->
 				<RegExpr attribute="GDL input" context="gdl_token_array_1" String="w\(" />
diff --git a/kate/data/scala.xml b/kate/data/scala.xml
index 896df20f0..b2171842f 100644
--- a/kate/data/scala.xml
+++ b/kate/data/scala.xml
@@ -675,8 +675,8 @@ adapted from "java.xml" by Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)
       <item> CompilationMXBean </item>
       <item> Compiler </item>
       <item> CompletionService </item>
-      <item> CompletiontqStatus </item>
-      <item> CompletiontqStatusHelper </item>
+      <item> CompletionStatus </item>
+      <item> CompletionStatusHelper </item>
       <item> Component </item>
       <item> ComponentAdapter </item>
       <item> ComponentColorModel </item>
@@ -2613,7 +2613,7 @@ adapted from "java.xml" by Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)
       <item> RoleList </item>
       <item> RoleNotFoundException </item>
       <item> RoleResult </item>
-      <item> RoletqStatus </item>
+      <item> RoleStatus </item>
       <item> RoleUnresolved </item>
       <item> RoleUnresolvedList </item>
       <item> RootPaneContainer </item>
@@ -2665,8 +2665,8 @@ adapted from "java.xml" by Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)
       <item> SSLContextSpi </item>
       <item> SSLEngine </item>
       <item> SSLEngineResult </item>
-      <item> SSLEngineResult.HandshaketqStatus </item>
-      <item> SSLEngineResult.tqStatus </item>
+      <item> SSLEngineResult.HandshakeStatus </item>
+      <item> SSLEngineResult.Status </item>
       <item> SSLException </item>
       <item> SSLHandshakeException </item>
       <item> SSLKeyException </item>
@@ -3245,7 +3245,7 @@ adapted from "java.xml" by Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)
       <item> VirtualMachineError </item>
       <item> Visibility </item>
       <item> VisibilityHelper </item>
-      <item> VoicetqStatus </item>
+      <item> VoiceStatus </item>
       <item> Void </item>
       <item> VolatileImage </item>
       <item> WCharSeqHelper </item>
diff --git a/kate/data/sci.xml b/kate/data/sci.xml
index 1225766b2..0a792e1bb 100644
--- a/kate/data/sci.xml
+++ b/kate/data/sci.xml
@@ -854,11 +854,11 @@
 	<item> floor </item>
 	<item> fix </item>
 	<item> fit_dat </item>
-	<item> tqfind_path </item>
-	<item> tqfindobj </item>
-	<item> tqfindm </item>
-	<item> tqfind_freq </item>
-	<item> tqfind </item>
+	<item> find_path </item>
+	<item> findobj </item>
+	<item> findm </item>
+	<item> find_freq </item>
+	<item> find </item>
 	<item> filter </item>
 	<item> fileinfo </item>
 	<item> file </item>
diff --git a/kate/data/sql.xml b/kate/data/sql.xml
index c59a9a5da..70a9f11ce 100644
--- a/kate/data/sql.xml
+++ b/kate/data/sql.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE language SYSTEM "language.dtd">
 <!-- Oracle10g SQL and PL/SQL syntax - ANSI SQL 2003 superset -->
 <!-- This file is maintained by Anders Lund <anders@alweb.dk> since 2005-11-06 -->
-<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; -->
+<!-- kate: space-indent on; indent-width 2; replace-tabs on; -->
 <language name="SQL" version="1.13" kateversion="2.4" section="Database" extensions="*.sql;*.SQL" mimetype="text/x-sql" casesensitive="0" author="Yury Lebedev (yurylebedev@mail.ru)" license="LGPL">
   <highlighting>
     <list name="keywords">
diff --git a/kate/data/stata.xml b/kate/data/stata.xml
index dce630750..c8eb2499f 100644
--- a/kate/data/stata.xml
+++ b/kate/data/stata.xml
@@ -244,7 +244,7 @@
       <item> pkcross </item>
       <item> pkequiv </item>
       <item> pkexamine </item>
-      <item> pktqshape </item>
+      <item> pkshape </item>
       <item> pksumm </item>
       <item> plot </item>
       <item> poisson </item>
@@ -275,8 +275,8 @@
       <item> reg </item>
       <item> regress </item>
       <item> rename </item>
-      <item> tqreplace </item>
-      <item> retqshape </item>
+      <item> replace </item>
+      <item> reshape </item>
       <item> restore </item>
       <item> return </item>
       <item> roc </item>
@@ -475,4 +475,4 @@
     <keywords casesensitive="1" />
   </general>
 </language>
-<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; -->
+<!-- kate: space-indent on; indent-width 2; replace-tabs on; -->
diff --git a/kate/data/syntax.template b/kate/data/syntax.template
index 9720cdca7..1e6e571a5 100644
--- a/kate/data/syntax.template
+++ b/kate/data/syntax.template
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <!--
-        You'll tqfind the "Writing a Kate Highlighting XML File HOWTO" at http://kate.kde.org/doc/hlhowto.php
+        You'll find the "Writing a Kate Highlighting XML File HOWTO" at http://kate.kde.org/doc/hlhowto.php
         This is a template for the XML format used for syntax highlight descriptions
         for the Kate text editor (http://kate.kde.org), which is part of the KDE
         desktop environment (http://www.kde.org).
@@ -11,7 +11,7 @@
         Look at language.dtd for some documentation of the allowed elements and their attributes.
         There is also a description of how to validate your syntax file.
 
-        You'll tqfind the "Writing a Kate Highlighting XML File HOWTO" at http://kate.kde.org/doc/hlhowto.php
+        You'll find the "Writing a Kate Highlighting XML File HOWTO" at http://kate.kde.org/doc/hlhowto.php
 -->
 <language name="" section="" version="1.00" kateversion="2.3" extensions="" mimetype="" author="" license="">
   <highlighting>
@@ -24,5 +24,5 @@
   </highlighting>
 </language>
 <!--
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
 -->
diff --git a/kate/data/tcl.xml b/kate/data/tcl.xml
index c65b6358e..cb74c1f52 100644
--- a/kate/data/tcl.xml
+++ b/kate/data/tcl.xml
@@ -109,7 +109,7 @@
       <item> load  </item>
       <item> lower  </item>
       <item> lrange  </item>
-      <item> ltqreplace  </item>
+      <item> lreplace  </item>
       <item> lsearch  </item>
       <item> lsort  </item>
       <item> menu  </item>
@@ -267,7 +267,7 @@
       <item> remove </item>
       <item> rename </item>
       <item> repeat </item>
-      <item> tqreplace </item>
+      <item> replace </item>
       <item> require </item>
       <item> rootname </item>
       <item> scan </item>
@@ -344,7 +344,7 @@
       <item> entrycget </item>
       <item> entryconfigure </item>
       <item> families </item>
-      <item> tqfind </item>
+      <item> find </item>
       <item> flash </item>
       <item> focus </item>
       <item> focusmodel </item>
@@ -352,7 +352,7 @@
       <item> fraction </item>
       <item> frame </item>
       <item> generate </item>
-      <item> tqgeometry </item>
+      <item> geometry </item>
       <item> get </item>
       <item> gettags </item>
       <item> grid </item>
@@ -362,7 +362,7 @@
       <item> hide </item>
       <item> iconbitmap </item>
       <item> iconify </item>
-      <item> icontqmask </item>
+      <item> iconmask </item>
       <item> iconname </item>
       <item> iconposition </item>
       <item> iconwindow </item>
diff --git a/kate/data/winehq.xml b/kate/data/winehq.xml
index c2f74fa4d..07919a86a 100644
--- a/kate/data/winehq.xml
+++ b/kate/data/winehq.xml
@@ -33,4 +33,4 @@
     </itemDatas>
   </highlighting>
 </language>
-<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; -->
+<!-- kate: space-indent on; indent-width 2; replace-tabs on; -->
diff --git a/kate/data/xslt.xml b/kate/data/xslt.xml
index c7a83c3cc..b0462c6f8 100644
--- a/kate/data/xslt.xml
+++ b/kate/data/xslt.xml
@@ -34,7 +34,7 @@
     FIXED: axis highlighting does not work, if identifier continues directly behind axis: (self::someWord)
     
     DONE: highlight entity references
-      Do not tqreplace the <RegExpr> by <IncludeEntities>, this is a kate 2.1 workaround !
+      Do not replace the <RegExpr> by <IncludeEntities>, this is a kate 2.1 workaround !
 
     FIXED axis-names are even highlighted if there are characters in front of them, i.e. in "xxxself::", "self::" would 
       be highlighted.
@@ -126,7 +126,7 @@
       <item> current </item>
       <item> boolean </item>
       <item> number </item>
-      <item> tqcontains </item>
+      <item> contains </item>
       <item> name </item>
       <item> last </item>
       <item> unparsed-entity-uri </item>
@@ -149,7 +149,7 @@
 
     <list name="functions_2.0">
       <item> zero-or-one </item>
-      <item> tqreplace </item>
+      <item> replace </item>
       <item> namespace-uri-for-prefix </item>
       <item> current-grouping-key </item>
       <item> seconds-from-duration </item>
@@ -237,7 +237,7 @@
       <item> year-from-dateTime </item>
       <item> upper-case </item>
       <item> root </item>
-      <item> normalize-tqunicode </item>
+      <item> normalize-unicode </item>
       <item> empty </item>
       <item> insert-before </item>
       <item> document-uri </item>
diff --git a/kate/data/xul.xml b/kate/data/xul.xml
index 320cd1ed0..a93f0c066 100644
--- a/kate/data/xul.xml
+++ b/kate/data/xul.xml
@@ -176,7 +176,7 @@
       <item>data</item>
       <item>defaultChecked</item>
       <item>defaultSelected</item>
-      <item>defaulttqStatus</item>
+      <item>defaultStatus</item>
       <item>defaultValue</item>
       <item>description</item>
       <item>disableExternalCapture</item>
@@ -190,7 +190,7 @@
       <item>exec</item>
       <item>fgColor</item>
       <item>filename</item>
-      <item>tqfind</item>
+      <item>find</item>
       <item>fixed</item>
       <item>focus</item>
       <item>fontcolor</item>
@@ -307,7 +307,7 @@
       <item>refresh</item>
       <item>releaseEvents</item>
       <item>reload</item>
-      <item>tqreplace</item>
+      <item>replace</item>
       <item>reset</item>
       <item>resizeBy</item>
       <item>resizeTo</item>
diff --git a/kate/data/yacas.xml b/kate/data/yacas.xml
index e3d4498ae..f7d8ef5e4 100644
--- a/kate/data/yacas.xml
+++ b/kate/data/yacas.xml
@@ -234,4 +234,4 @@
     <keywords casesensitive="1" weakDeliminator="=`"/>
   </general>
 </language>
-<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; -->
+<!-- kate: space-indent on; indent-width 2; replace-tabs on; -->
diff --git a/kate/data/yacc.xml b/kate/data/yacc.xml
index 019eda97f..db45ed42d 100644
--- a/kate/data/yacc.xml
+++ b/kate/data/yacc.xml
@@ -16,7 +16,7 @@
   2004.05.26 - YACC.XML 1.00        - First released.
 
   TODO:-
-  - Add a mime type (cannot tqfind it !?)
+  - Add a mime type (cannot find it !?)
 
   ========================================================================
 -->
@@ -156,4 +156,4 @@
   </comments>
 </general>
 </language>
-<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; -->
+<!-- kate: space-indent on; indent-width 2; replace-tabs on; -->
diff --git a/kate/interfaces/.kateconfig b/kate/interfaces/.kateconfig
index 46471127e..5b0885abe 100644
--- a/kate/interfaces/.kateconfig
+++ b/kate/interfaces/.kateconfig
@@ -1 +1 @@
-kate: space-indent on; indent-width 2; tqreplace-tabs on;
+kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/interfaces/view.h b/kate/interfaces/view.h
index eaae98684..90c61d5ac 100644
--- a/kate/interfaces/view.h
+++ b/kate/interfaces/view.h
@@ -75,7 +75,7 @@ class KATEPARTINTERFACES_EXPORT View : public KTextEditor::View, public KTextEdi
     */
     virtual TQString currentWord() { return 0L; }
     /**
-      Gets the word at position x, y. Can be used to tqfind
+      Gets the word at position x, y. Can be used to find
       the word under the mouse cursor
     */
     virtual TQString word(int , int ) { return 0L; }
@@ -177,11 +177,11 @@ class KATEPARTINTERFACES_EXPORT View : public KTextEditor::View, public KTextEdi
     /**
       Presents a search dialog to the user.
     */
-    virtual void tqfind() { ; };
+    virtual void find() { ; };
     /**
-      Presents a tqreplace dialog to the user.
+      Presents a replace dialog to the user.
     */
-    virtual void tqreplace() { ; };
+    virtual void replace() { ; };
     /**
       Presents a "Goto Line" dialog to the user.
     */
@@ -216,17 +216,17 @@ class KATEPARTINTERFACES_EXPORT View : public KTextEditor::View, public KTextEdi
       Searches for the last searched text forward from cursor position.
       @param forward determines the search direction.
     */
-    virtual void tqfindAgain(bool forward ) { Q_UNUSED(forward); }
+    virtual void findAgain(bool forward ) { Q_UNUSED(forward); }
     /**
       Searches for the last searched text forward from cursor position.
       Searches forward from current cursor position.
     */
-    virtual void tqfindAgain () { };
+    virtual void findAgain () { };
     /**
       Searches for the last searched text forward from cursor position.
       Searches backward from current cursor position.
     */
-    virtual void tqfindPrev () { }
+    virtual void findPrev () { }
     /**
       Presents an edit command popup window, where the user can
       apply a shell command to the contents of the current window.
@@ -289,7 +289,7 @@ class KATEPARTINTERFACES_EXPORT View : public KTextEditor::View, public KTextEdi
 
   signals:
     void gotFocus (View *);
-//  void newtqStatus(); // Kate app connects to this signal, should be in the interface
+//  void newStatus(); // Kate app connects to this signal, should be in the interface
 
   public:
     virtual void setActive (bool b) = 0;
diff --git a/kate/part/.kateconfig b/kate/part/.kateconfig
index 46471127e..5b0885abe 100644
--- a/kate/part/.kateconfig
+++ b/kate/part/.kateconfig
@@ -1 +1 @@
-kate: space-indent on; indent-width 2; tqreplace-tabs on;
+kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/configure.in.in b/kate/part/configure.in.in
index 204825d34..faf0717e9 100644
--- a/kate/part/configure.in.in
+++ b/kate/part/configure.in.in
@@ -55,7 +55,7 @@ dnl	Based on the lua check used by yzis-M3
                         )
 
 
-        dnl tqfind the libs name
+        dnl find the libs name
 	if test -z "$LUALIBH_FOUND" -o -z "$LUAH_FOUND"; then
 		LUA_LIBS=""
 	else
diff --git a/kate/part/katearbitraryhighlight.cpp b/kate/part/katearbitraryhighlight.cpp
index a86f26a77..a9a4fe37c 100644
--- a/kate/part/katearbitraryhighlight.cpp
+++ b/kate/part/katearbitraryhighlight.cpp
@@ -90,7 +90,7 @@ void KateArbitraryHighlight::addHighlightToView(KateSuperRangeList* list, KateVi
 }
 
 void KateArbitraryHighlight::slotRangeListDeleted(TQObject* obj) {
-   int id=m_docHLs.tqfindRef(static_cast<KateSuperRangeList*>(obj));
+   int id=m_docHLs.findRef(static_cast<KateSuperRangeList*>(obj));
    if (id>=0) m_docHLs.take(id);
    
    for (TQMap<KateView*, TQPtrList<KateSuperRangeList>* >::Iterator it = m_viewHLs.begin(); it != m_viewHLs.end(); ++it)
@@ -152,11 +152,11 @@ KateView* KateArbitraryHighlight::viewForRange(KateSuperRange* range)
 {
   for (TQMap<KateView*, TQPtrList<KateSuperRangeList>* >::Iterator it = m_viewHLs.begin(); it != m_viewHLs.end(); ++it)
     for (KateSuperRangeList* l = (*it)->first(); l; l = (*it)->next())
-      if (l->tqcontains(range))
+      if (l->contains(range))
         return it.key();
 
   // This must belong to a document-global highlight
   return 0L;
 }
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katearbitraryhighlight.h b/kate/part/katearbitraryhighlight.h
index ef6e214a8..4dd5a362b 100644
--- a/kate/part/katearbitraryhighlight.h
+++ b/kate/part/katearbitraryhighlight.h
@@ -57,7 +57,7 @@ public:
  * - identical highlight for whole list
  * - signals for view movement
  */
-class KateArbitraryHighlight : public TQObject
+class KateArbitraryHighlight : public QObject
 {
   Q_OBJECT
 
@@ -84,4 +84,4 @@ private:
 
 #endif
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/kateattribute.cpp b/kate/part/kateattribute.cpp
index 068d0d571..9ed6349f6 100644
--- a/kate/part/kateattribute.cpp
+++ b/kate/part/kateattribute.cpp
@@ -265,4 +265,4 @@ bool operator !=(const KateAttribute& h1, const KateAttribute& h2)
   return !(h1 == h2);
 }
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/kateattribute.h b/kate/part/kateattribute.h
index 7960f06b1..a54279b24 100644
--- a/kate/part/kateattribute.h
+++ b/kate/part/kateattribute.h
@@ -144,4 +144,4 @@ private:
 
 #endif
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/kateautoindent.cpp b/kate/part/kateautoindent.cpp
index e2deea691..ed9a6169b 100644
--- a/kate/part/kateautoindent.cpp
+++ b/kate/part/kateautoindent.cpp
@@ -170,7 +170,7 @@ void KateViewIndentationAction::slotAboutToShow()
 
   popupMenu()->clear ();
   for (uint z=0; z<modes.size(); ++z)
-    popupMenu()->insertItem ( '&' + KateAutoIndent::modeDescription(z).tqreplace('&', "&&"), this, TQT_SLOT(setMode(int)), 0,  z);
+    popupMenu()->insertItem ( '&' + KateAutoIndent::modeDescription(z).replace('&', "&&"), this, TQT_SLOT(setMode(int)), 0,  z);
 
   popupMenu()->setItemChecked (doc->config()->indentationMode(), true);
 }
@@ -224,55 +224,55 @@ void KateNormalIndent::updateConfig ()
   for (uint i=0; i<items.count(); i++)
   {
     TQString name = items.at(i)->name;
-    if (name.tqfind("Comment") != -1 && commentAttrib == 255)
+    if (name.find("Comment") != -1 && commentAttrib == 255)
     {
       commentAttrib = i;
     }
-    else if (name.tqfind("Region Marker") != -1 && regionAttrib == 255)
+    else if (name.find("Region Marker") != -1 && regionAttrib == 255)
     {
       regionAttrib = i;
     }
-    else if (name.tqfind("Symbol") != -1 && symbolAttrib == 255)
+    else if (name.find("Symbol") != -1 && symbolAttrib == 255)
     {
       symbolAttrib = i;
     }
-    else if (name.tqfind("Alert") != -1)
+    else if (name.find("Alert") != -1)
     {
       alertAttrib = i;
     }
-    else if (name.tqfind("Comment") != -1 && commentAttrib != 255 && doxyCommentAttrib == 255)
+    else if (name.find("Comment") != -1 && commentAttrib != 255 && doxyCommentAttrib == 255)
     {
       doxyCommentAttrib = i;
     }
-    else if (name.tqfind("Tags") != -1 && tagAttrib == 255)
+    else if (name.find("Tags") != -1 && tagAttrib == 255)
     {
       tagAttrib = i;
     }
-    else if (name.tqfind("Word") != -1 && wordAttrib == 255)
+    else if (name.find("Word") != -1 && wordAttrib == 255)
     {
       wordAttrib = i;
     }
-    else if (name.tqfind("Keyword") != -1 && keywordAttrib == 255)
+    else if (name.find("Keyword") != -1 && keywordAttrib == 255)
     {
       keywordAttrib = i;
     }
-    else if (name.tqfind("Normal") != -1 && normalAttrib == 255)
+    else if (name.find("Normal") != -1 && normalAttrib == 255)
     {
       normalAttrib = i;
     }
-    else if (name.tqfind("Extensions") != -1 && extensionAttrib == 255)
+    else if (name.find("Extensions") != -1 && extensionAttrib == 255)
     {
       extensionAttrib = i;
     }
-    else if (name.tqfind("Preprocessor") != -1 && preprocessorAttrib == 255)
+    else if (name.find("Preprocessor") != -1 && preprocessorAttrib == 255)
     {
       preprocessorAttrib = i;
     }
-    else if (name.tqfind("String") != -1 && stringAttrib == 255)
+    else if (name.find("String") != -1 && stringAttrib == 255)
     {
       stringAttrib = i;
     }
-    else if (name.tqfind("Char") != -1 && charAttrib == 255)
+    else if (name.find("Char") != -1 && charAttrib == 255)
     {
       charAttrib = i;
     }
@@ -287,7 +287,7 @@ bool KateNormalIndent::isBalanced (KateDocCursor &begin, const KateDocCursor &en
 
   pos = doc->plainKateTextLine(begin.line())->firstChar();
 
-  // Iterate one-by-one tqfinding opening and closing chars
+  // Iterate one-by-one finding opening and closing chars
   // Assume that open and close are 'Symbol' characters
   while (begin < end)
   {
@@ -449,11 +449,11 @@ void KateCSmartIndent::processLine (KateDocCursor &line)
 
   if (first == '}')
   {
-    indent = tqfindOpeningBrace(line);
+    indent = findOpeningBrace(line);
   }
   else if (first == ')')
   {
-    indent = tqfindOpeningParen(line);
+    indent = findOpeningParen(line);
   }
   else if (first == '{')
   {
@@ -465,7 +465,7 @@ void KateCSmartIndent::processLine (KateDocCursor &line)
   else if (first == ':')
   {
     // Initialization lists (handle c++ and c#)
-    int pos = tqfindOpeningBrace(line);
+    int pos = findOpeningBrace(line);
     if (pos == 0)
       indent = indentWidth;
     else
@@ -483,7 +483,7 @@ void KateCSmartIndent::processLine (KateDocCursor &line)
         textLine->stringAtPos (firstChar, "Q_SLOTS") ||
         textLine->stringAtPos (firstChar, "slots"))
     {
-      indent = tqfindOpeningBrace(line) + indentWidth;
+      indent = findOpeningBrace(line) + indentWidth;
     }
   }
   else if (first == '*')
@@ -493,7 +493,7 @@ void KateCSmartIndent::processLine (KateDocCursor &line)
       int lineEnd = textLine->lastChar();
       if (lineEnd > 0 && textLine->getChar(lineEnd - 1) == '*')
       {
-        indent = tqfindOpeningComment(line);
+        indent = findOpeningComment(line);
         if (textLine->attribute(firstChar) == doxyCommentAttrib)
           indent++;
       }
@@ -583,7 +583,7 @@ bool KateCSmartIndent::handleDoxygen (KateDocCursor &begin)
       if (last <= 0 || !(justAfterDoxygen = textLine->stringAtPos(last-1, "*/")))
         insideDoxygen = true;
       if (justAfterDoxygen)
-        justAfterDoxygen &= textLine->string().tqfind("/**") < 0;
+        justAfterDoxygen &= textLine->string().find("/**") < 0;
       while (textLine->attribute(first) != doxyCommentAttrib && first <= textLine->lastChar())
         first++;
       if (textLine->stringAtPos(first, "//"))
@@ -595,7 +595,7 @@ bool KateCSmartIndent::handleDoxygen (KateDocCursor &begin)
     {
       textLine = doc->plainKateTextLine(begin.line());
       first = textLine->firstChar();
-      int indent = tqfindOpeningComment(begin);
+      int indent = findOpeningComment(begin);
       TQString filler = tabString (indent);
 
       bool doxygenAutoInsert = doc->config()->configFlags() & KateDocumentConfig::cfDoxygenAutoTyping;
@@ -618,7 +618,7 @@ bool KateCSmartIndent::handleDoxygen (KateDocCursor &begin)
     {
       textLine = doc->plainKateTextLine(begin.line());
       first = textLine->firstChar();
-      int indent = tqfindOpeningComment(begin);
+      int indent = findOpeningComment(begin);
       TQString filler = tabString (indent);
 
       doc->removeText (begin.line(), 0, begin.line(), first);
@@ -700,7 +700,7 @@ static inline bool colonPermitsReindent(const KateNormalIndent &indenter,
 {
   const TQString txt = line->string(0,curCol);
   // do we have any significant preceding colon?
-  for (int pos = 0; (pos = txt.tqfind(':', pos)) >= 0; pos++) {
+  for (int pos = 0; (pos = txt.find(':', pos)) >= 0; pos++) {
     if (line->attribute(pos) == indenter.symbolAttrib)
       // yes, it has already contributed to this line's indentation, don't
       // indent again
@@ -722,7 +722,7 @@ void KateCSmartIndent::processChar(TQChar c)
   static const TQString triggers("}{)/:#n");
   static const TQString firstTriggers("}{)/:#");
   static const TQString lastTriggers(":n");
-  if (triggers.tqfind(c) < 0)
+  if (triggers.find(c) < 0)
     return;
 
   KateView *view = doc->activeView();
@@ -748,7 +748,7 @@ void KateCSmartIndent::processChar(TQChar c)
 
   if (c == 'n')
   {
-    if (firstChar != '#' || textLine->string(curCol-5, 5) != TQString::tqfromLatin1("regio"))
+    if (firstChar != '#' || textLine->string(curCol-5, 5) != TQString::fromLatin1("regio"))
       return;
   }
 
@@ -775,8 +775,8 @@ void KateCSmartIndent::processChar(TQChar c)
   // of the line
   const TQChar lastChar = textLine->getChar(textLine->lastChar());
   int pos;
-  if (((c == firstChar && firstTriggers.tqfind(firstChar) >= 0)
-        || (c == lastChar && lastTriggers.tqfind(lastChar) >= 0))
+  if (((c == firstChar && firstTriggers.find(firstChar) >= 0)
+        || (c == lastChar && lastTriggers.find(lastChar) >= 0))
       && (c != ':' || colonPermitsReindent(*this, textLine, curCol)))
     processLine(begin);
 }
@@ -1094,12 +1094,12 @@ uint KateCSmartIndent::calcContinue(KateDocCursor &start, KateDocCursor &end)
   return 0;
 }
 
-uint KateCSmartIndent::tqfindOpeningBrace(KateDocCursor &start)
+uint KateCSmartIndent::findOpeningBrace(KateDocCursor &start)
 {
   KateDocCursor cur = start;
   int count = 1;
 
-  // Move backwards 1 by 1 and tqfind the opening brace
+  // Move backwards 1 by 1 and find the opening brace
   // Return the indent of that line
   while (cur.moveBackward(1))
   {
@@ -1142,12 +1142,12 @@ bool KateCSmartIndent::firstOpeningBrace(KateDocCursor &start)
   return true;
 }
 
-uint KateCSmartIndent::tqfindOpeningParen(KateDocCursor &start)
+uint KateCSmartIndent::findOpeningParen(KateDocCursor &start)
 {
   KateDocCursor cur = start;
   int count = 1;
 
-  // Move backwards 1 by 1 and tqfind the opening (
+  // Move backwards 1 by 1 and find the opening (
   // Return the indent of that line
   while (cur.moveBackward(1))
   {
@@ -1167,7 +1167,7 @@ uint KateCSmartIndent::tqfindOpeningParen(KateDocCursor &start)
   return 0;
 }
 
-uint KateCSmartIndent::tqfindOpeningComment(KateDocCursor &start)
+uint KateCSmartIndent::findOpeningComment(KateDocCursor &start)
 {
   KateDocCursor cur = start;
 
@@ -1176,7 +1176,7 @@ uint KateCSmartIndent::tqfindOpeningComment(KateDocCursor &start)
   {
     KateTextLine::Ptr textLine = doc->plainKateTextLine(cur.line());
 
-    int pos = textLine->string().tqfind("/*", false);
+    int pos = textLine->string().find("/*", false);
     if (pos >= 0)
     {
       KateDocCursor temp(cur.line(), pos, doc);
@@ -1322,7 +1322,7 @@ level; for each element that is closed, it is decreased by one.
 
 We also have a special case of opening an element on one line and then
 entering attributes on the following lines, in which case we would like
-to see the following tqlayout:
+to see the following layout:
 <elem attr="..."
       blah="..." />
 
@@ -1359,7 +1359,7 @@ void KateXmlIndent::processChar (TQChar c)
   // only alter lines that start with a close element
   KateView *view = doc->activeView();
   TQString text = doc->plainKateTextLine(view->cursorLine())->string();
-  if(text.tqfind(startsWithCloseTag) == -1) return;
+  if(text.find(startsWithCloseTag) == -1) return;
 
   // process it
   processLine(view->cursorLine());
@@ -1404,14 +1404,14 @@ void KateXmlIndent::getLineInfo (uint line, uint &prevIndent, int &numTags,
   // <a>
   // </a>              <!-- indentation *already* decreased -->
   // requires that we discount the </a> from the number of closed tags
-  if(text.tqfind(startsWithCloseTag) != -1) ++numTags;
+  if(text.find(startsWithCloseTag) != -1) ++numTags;
 
   // count the number of open and close tags
   int lastCh = 0;
   uint pos, len = text.length();
   bool seenOpen = false;
   for(pos = 0; pos < len; ++pos) {
-    int ch = text.at(pos).tqunicode();
+    int ch = text.at(pos).unicode();
     switch(ch) {
       case '<':
         seenOpen = true;
@@ -1443,12 +1443,12 @@ void KateXmlIndent::getLineInfo (uint line, uint &prevIndent, int &numTags,
           prevIndent = 0;
 
           for(uint backLine = line; backLine; ) {
-            // tqfind first line with an open tag
+            // find first line with an open tag
             KateTextLine::Ptr x = doc->plainKateTextLine(--backLine);
-            if(x->string().tqfind('<') == -1) continue;
+            if(x->string().find('<') == -1) continue;
 
             // recalculate the indent
-            if(x->string().tqfind(unclosedDoctype) != -1) --numTags;
+            if(x->string().find(unclosedDoctype) != -1) --numTags;
             getLineInfo(backLine, prevIndent, numTags, attrCol, unclosedTag);
             break;
           }
@@ -1465,13 +1465,13 @@ void KateXmlIndent::getLineInfo (uint line, uint &prevIndent, int &numTags,
   }
 
   if(unclosedTag) {
-    // tqfind the start of the next attribute, so we can align with it
+    // find the start of the next attribute, so we can align with it
     do {
-      lastCh = text.at(++attrCol).tqunicode();
+      lastCh = text.at(++attrCol).unicode();
     }while(lastCh && lastCh != ' ' && lastCh != '\t');
 
     while(lastCh == ' ' || lastCh == '\t') {
-      lastCh = text.at(++attrCol).tqunicode();
+      lastCh = text.at(++attrCol).unicode();
     }
 
     attrCol = prevLine->cursorX(attrCol, tabWidth);
@@ -1499,7 +1499,7 @@ uint KateXmlIndent::processLine (uint line)
   if(indent < 0) indent = 0;
 
   // unindent lines that start with a close tag
-  if(kateLine->string().tqfind(startsWithCloseTag) != -1) {
+  if(kateLine->string().find(startsWithCloseTag) != -1) {
     indent -= indentWidth;
   }
   if(indent < 0) indent = 0;
@@ -1597,7 +1597,7 @@ static TQString initialWhitespace(const KateTextLine::Ptr &line, int chars, bool
   return text;
 }
 
-TQString KateCSAndSIndent::tqfindOpeningCommentIndentation(const KateDocCursor &start)
+TQString KateCSAndSIndent::findOpeningCommentIndentation(const KateDocCursor &start)
 {
   KateDocCursor cur = start;
 
@@ -1606,14 +1606,14 @@ TQString KateCSAndSIndent::tqfindOpeningCommentIndentation(const KateDocCursor &
   {
     KateTextLine::Ptr textLine = doc->plainKateTextLine(cur.line());
 
-    int pos = textLine->string().tqfindRev("/*");
+    int pos = textLine->string().findRev("/*");
     // FIXME: /* inside /* is possible. This screws up in that case...
     if (pos >= 0)
       return initialWhitespace(textLine, pos);
   } while (cur.gotoPreviousLine());
 
   // should never happen.
-  kdWarning( 13030 ) << " in a comment, but can't tqfind the start of it" << endl;
+  kdWarning( 13030 ) << " in a comment, but can't find the start of it" << endl;
   return TQString::null;
 }
 
@@ -1636,13 +1636,13 @@ bool KateCSAndSIndent::handleDoxygen (KateDocCursor &begin)
   // note that we do need to check the start of the line, or lines ending with, say, @brief aren't
   // recognised.
   if ( !(textLine->attribute(textLine->lastChar()) == doxyCommentAttrib && !textLine->endingWith("*/")) &&
-       !(textLine->attribute(textLine->firstChar()) == doxyCommentAttrib && !textLine->string().tqcontains("*/")) )
+       !(textLine->attribute(textLine->firstChar()) == doxyCommentAttrib && !textLine->string().contains("*/")) )
     return false;
 
   // our line is inside a doxygen comment. align the *'s and then maybe insert one too ...
   textLine = doc->plainKateTextLine(begin.line());
   first = textLine->firstChar();
-  TQString indent = tqfindOpeningCommentIndentation(begin);
+  TQString indent = findOpeningCommentIndentation(begin);
 
   bool doxygenAutoInsert = doc->config()->configFlags() & KateDocumentConfig::cfDoxygenAutoTyping;
 
@@ -1758,9 +1758,9 @@ int KateCSAndSIndent::lastNonCommentChar( const KateDocCursor &line )
   KateTextLine::Ptr textLine = doc->plainKateTextLine( line.line() );
   TQString str = textLine->string();
 
-  // tqfind a possible start-of-comment
-  int p = -2; // so the first tqfind starts at position 0
-  do p = str.tqfind( "//", p + 2 );
+  // find a possible start-of-comment
+  int p = -2; // so the first find starts at position 0
+  do p = str.find( "//", p + 2 );
   while ( p >= 0 && textLine->attribute(p) != commentAttrib && textLine->attribute(p) != doxyCommentAttrib );
 
   // no // found? use whole string
@@ -1917,8 +1917,8 @@ TQString KateCSAndSIndent::calcIndent (const KateDocCursor &begin)
   // if the line starts with # (but isn't a c# region thingy), no indentation at all.
   if( currLineFirst >= 0 && currLine->getChar(currLineFirst) == '#' )
   {
-    if( !currLine->stringAtPos( currLineFirst+1, TQString::tqfromLatin1("region") ) &&
-        !currLine->stringAtPos( currLineFirst+1, TQString::tqfromLatin1("endregion") ) )
+    if( !currLine->stringAtPos( currLineFirst+1, TQString::fromLatin1("region") ) &&
+        !currLine->stringAtPos( currLineFirst+1, TQString::fromLatin1("endregion") ) )
       return TQString::null;
   }
 
@@ -1974,10 +1974,10 @@ TQString KateCSAndSIndent::calcIndent (const KateDocCursor &begin)
       {
         #define ARRLEN( array ) ( sizeof(array)/sizeof(array[0]) )
         for( uint n = 0; n < ARRLEN(scopeKeywords); ++n )
-          if( textLine->stringAtPos(pos, TQString::tqfromLatin1(scopeKeywords[n]) ) )
+          if( textLine->stringAtPos(pos, TQString::fromLatin1(scopeKeywords[n]) ) )
             return calcIndentAfterKeyword( begin, cur, pos, false );
         for( uint n = 0; n < ARRLEN(blockScopeKeywords); ++n )
-          if( textLine->stringAtPos(pos, TQString::tqfromLatin1(blockScopeKeywords[n]) ) )
+          if( textLine->stringAtPos(pos, TQString::fromLatin1(blockScopeKeywords[n]) ) )
             return calcIndentAfterKeyword( begin, cur, pos, true );
         #undef ARRLEN
       }
@@ -2070,7 +2070,7 @@ TQString KateCSAndSIndent::calcIndentInBrace(const KateDocCursor &indentCursor,
   //        beginning 'namespace'. that's 99% of usage, I'd guess.
   {
     if( braceFirst >= 0 && braceLine->attribute(braceFirst) == keywordAttrib &&
-        braceLine->stringAtPos( braceFirst, TQString::tqfromLatin1( "namespace" ) ) )
+        braceLine->stringAtPos( braceFirst, TQString::fromLatin1( "namespace" ) ) )
       return continuationIndent(indentCursor) + whitespaceToOpenBrace;
 
     if( braceCursor.line() > 0 )
@@ -2078,7 +2078,7 @@ TQString KateCSAndSIndent::calcIndentInBrace(const KateDocCursor &indentCursor,
       KateTextLine::Ptr prevLine = doc->plainKateTextLine(braceCursor.line() - 1);
       int firstPrev = prevLine->firstChar();
       if( firstPrev >= 0 && prevLine->attribute(firstPrev) == keywordAttrib &&
-          prevLine->stringAtPos( firstPrev, TQString::tqfromLatin1( "namespace" ) ) )
+          prevLine->stringAtPos( firstPrev, TQString::fromLatin1( "namespace" ) ) )
         return continuationIndent(indentCursor) + whitespaceToOpenBrace;
     }
   }
@@ -2112,7 +2112,7 @@ void KateCSAndSIndent::processChar(TQChar c)
 {
   // 'n' trigger is for c# regions.
   static const TQString triggers("}{)]/:;#n");
-  if (triggers.tqfind(c) == -1)
+  if (triggers.find(c) == -1)
     return;
 
   // for historic reasons, processChar doesn't get a cursor
@@ -2194,7 +2194,7 @@ void KateVarIndent::processNewline ( KateDocCursor &begin, bool /*needContinue*/
 void KateVarIndent::processChar ( TQChar c )
 {
   // process line if the c is in our list, and we are not in comment text
-  if ( d->triggers.tqcontains( c ) )
+  if ( d->triggers.contains( c ) )
   {
     KateTextLine::Ptr ln = doc->plainKateTextLine( doc->activeView()->cursorLine() );
     if ( ln->attribute( doc->activeView()->cursorColumn()-1 ) == commentAttrib )
@@ -2211,7 +2211,7 @@ void KateVarIndent::processLine ( KateDocCursor &line )
 {
   TQString indent; // store the indent string here
 
-  // tqfind the first line with content that is not starting with comment text,
+  // find the first line with content that is not starting with comment text,
   // and take the position from that
   int ln = line.line();
   int pos = -1;
@@ -2372,9 +2372,9 @@ void KateVarIndent::slotVariableChanged( const TQString &var, const TQString &va
   {
     d->couples = 0;
     TQStringList l = TQStringList::split( " ", val );
-    if ( l.tqcontains("parens") ) d->couples |= Parens;
-    if ( l.tqcontains("braces") ) d->couples |= Braces;
-    if ( l.tqcontains("brackets") ) d->couples |= Brackets;
+    if ( l.contains("parens") ) d->couples |= Parens;
+    if ( l.contains("braces") ) d->couples |= Braces;
+    if ( l.contains("brackets") ) d->couples |= Brackets;
   }
   else if ( var == "var-indent-couple-attribute" )
   {
@@ -2427,7 +2427,7 @@ bool KateVarIndent::hasRelevantOpening( const KateDocCursor &end ) const
   else if (close = ']' ) opener = '[';
   else return false;
 
-  //Move backwards 1 by 1 and tqfind the opening partner
+  //Move backwards 1 by 1 and find the opening partner
   while (cur.moveBackward(1))
   {
     if (cur.currentAttrib() == d->coupleAttrib)
@@ -2540,4 +2540,4 @@ void ScriptIndentConfigPage::apply ()
 }
 //END ScriptIndentConfigPage
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/kateautoindent.h b/kate/part/kateautoindent.h
index ead48d672..7ff1a93d2 100644
--- a/kate/part/kateautoindent.h
+++ b/kate/part/kateautoindent.h
@@ -67,7 +67,7 @@ class IndenterConfigPage : public QWidget
  * This baseclass is a real dummy, does nothing beside remembering the document it belongs too,
  * only to have the object around
  */
-class KateAutoIndent : public TQObject
+class KateAutoIndent : public QObject
 {
   Q_OBJECT
 
@@ -321,7 +321,7 @@ protected:
   TQString tabString(uint length) const;
 
   uint  tabWidth;     //!< The number of characters simulated for a tab
-  uint  indentWidth;  //!< The number of characters used when tabs are tqreplaced by spaces
+  uint  indentWidth;  //!< The number of characters used when tabs are replaced by spaces
 
 public:
     // Attributes that we should skip over or otherwise know about
@@ -366,9 +366,9 @@ class KateCSmartIndent : public KateNormalIndent
   private:
     uint calcIndent (KateDocCursor &begin, bool needContinue);
     uint calcContinue (KateDocCursor &begin, KateDocCursor &end);
-    uint tqfindOpeningBrace (KateDocCursor &start);
-    uint tqfindOpeningParen (KateDocCursor &start);
-    uint tqfindOpeningComment (KateDocCursor &start);
+    uint findOpeningBrace (KateDocCursor &start);
+    uint findOpeningParen (KateDocCursor &start);
+    uint findOpeningComment (KateDocCursor &start);
     bool firstOpeningBrace (KateDocCursor &start);
     bool handleDoxygen (KateDocCursor &begin);
 
@@ -459,7 +459,7 @@ class KateCSAndSIndent : public KateNormalIndent
     TQString calcIndentInBrace(const KateDocCursor &indentCursor, const KateDocCursor &braceCursor, int bracePos);
 
     bool handleDoxygen (KateDocCursor &begin);
-    TQString tqfindOpeningCommentIndentation (const KateDocCursor &start);
+    TQString findOpeningCommentIndentation (const KateDocCursor &start);
 
     TQString indentString;
 };
@@ -578,4 +578,4 @@ class ScriptIndentConfigPage : public IndenterConfigPage
 
 #endif
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katebookmarks.cpp b/kate/part/katebookmarks.cpp
index 40ae5470c..ac1ee73d9 100644
--- a/kate/part/katebookmarks.cpp
+++ b/kate/part/katebookmarks.cpp
@@ -169,14 +169,14 @@ void KateBookmarks::insertBookmarks( TQPopupMenu& menu )
       TQString bText = KStringHandler::rEmSqueeze
                       ( m_view->getDoc()->textLine( (*it)->line ),
                         menu.fontMetrics(), 32 );
-      bText.tqreplace(re, "&&"); // kill undesired accellerators!
-      bText.tqreplace('\t', ' '); // kill tabs, as they are interpreted as shortcuts
+      bText.replace(re, "&&"); // kill undesired accellerators!
+      bText.replace('\t', ' '); // kill tabs, as they are interpreted as shortcuts
 
       if ( m_sorting == Position )
       {
         sortArray[i] = (*it)->line;
         ssort( sortArray, i );
-        idx = sortArray.tqfind( (*it)->line ) + 3;
+        idx = sortArray.find( (*it)->line ) + 3;
       }
 
       menu.insertItem(
@@ -284,4 +284,4 @@ void KateBookmarks::marksChanged ()
   m_bookmarkClear->setEnabled( !m_view->getDoc()->marks().isEmpty() );
 }
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katebookmarks.h b/kate/part/katebookmarks.h
index c4cdf1e1f..88e90ae4f 100644
--- a/kate/part/katebookmarks.h
+++ b/kate/part/katebookmarks.h
@@ -35,7 +35,7 @@ class KActionCollection;
 class TQPopupMenu;
 class TQMenuData;
 
-class KateBookmarks : public TQObject
+class KateBookmarks : public QObject
 {
   Q_OBJECT
 
@@ -82,5 +82,5 @@ class KateBookmarks : public TQObject
 
 #endif
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
 // vim: noet ts=2
diff --git a/kate/part/katebuffer.cpp b/kate/part/katebuffer.cpp
index 33fac3325..74a9ba59e 100644
--- a/kate/part/katebuffer.cpp
+++ b/kate/part/katebuffer.cpp
@@ -46,7 +46,7 @@
  * loader block size, load 256 kb at once per default
  * if file size is smaller, fall back to file size
  */
-static const TQ_ULONG KATE_FILE_LOADER_BS  = 256 * 1024;
+static const Q_ULONG KATE_FILE_LOADER_BS  = 256 * 1024;
 
 /**
  * KATE_AVG_BLOCK_SIZE is in characters !
@@ -54,8 +54,8 @@ static const TQ_ULONG KATE_FILE_LOADER_BS  = 256 * 1024;
  * block will max contain around BLOCK_SIZE chars or
  * BLOCK_LINES lines (after load, later that won't be tracked)
  */
-static const TQ_ULONG KATE_AVG_BLOCK_SIZE  = 2048 * 80;
-static const TQ_ULONG KATE_MAX_BLOCK_LINES = 2048;
+static const Q_ULONG KATE_AVG_BLOCK_SIZE  = 2048 * 80;
+static const Q_ULONG KATE_MAX_BLOCK_LINES = 2048;
 
 /**
  * hl will look at the next KATE_HL_LOOKAHEAD lines
@@ -172,10 +172,10 @@ class KateFileLoader
     // should spaces be ignored at end of line?
     inline bool removeTrailingSpaces () const { return m_removeTrailingSpaces; }
 
-    // internal tqunicode data array
-    inline const TQChar *tqunicode () const { return m_text.tqunicode(); }
+    // internal unicode data array
+    inline const TQChar *unicode () const { return m_text.unicode(); }
 
-    // read a line, return length + offset in tqunicode data
+    // read a line, return length + offset in unicode data
     void readLine (uint &offset, uint &length)
     {
       length = 0;
@@ -402,7 +402,7 @@ void KateBuffer::editEnd ()
 
       KateBufBlock *buf2 = 0;
       bool needContinue = false;
-      while ((buf2 = tqfindBlock(editTagLineStart)))
+      while ((buf2 = findBlock(editTagLineStart)))
       {
         needContinue = doHighlight (buf2,
           (editTagLineStart > buf2->startLine()) ? editTagLineStart : buf2->startLine(),
@@ -543,7 +543,7 @@ bool KateBuffer::canEncode ()
 
   kdDebug(13020) << "ENC NAME: " << codec->name() << endl;
 
-  // hardcode some tqunicode encodings which can encode all chars
+  // hardcode some unicode encodings which can encode all chars
   if ((TQString(codec->name()) == "UTF-8") || (TQString(codec->name()) == "ISO-10646-UCS-2"))
     return true;
 
@@ -618,7 +618,7 @@ KateTextLine::Ptr KateBuffer::line_internal (KateBufBlock *buf, uint i)
 {
   // update hl until this line + max KATE_HL_LOOKAHEAD
   KateBufBlock *buf2 = 0;
-  while ((i >= m_lineHighlighted) && (buf2 = tqfindBlock(m_lineHighlighted)))
+  while ((i >= m_lineHighlighted) && (buf2 = findBlock(m_lineHighlighted)))
   {
     uint end = kMin(i + KATE_HL_LOOKAHEAD, buf2->endLine());
 
@@ -637,7 +637,7 @@ KateTextLine::Ptr KateBuffer::line_internal (KateBufBlock *buf, uint i)
   return buf->line (i - buf->startLine());
 }
 
-KateBufBlock *KateBuffer::tqfindBlock_internal (uint i, uint *index)
+KateBufBlock *KateBuffer::findBlock_internal (uint i, uint *index)
 {
   uint lastLine = m_blocks[m_lastInSyncBlock]->endLine ();
 
@@ -701,7 +701,7 @@ KateBufBlock *KateBuffer::tqfindBlock_internal (uint i, uint *index)
 
 void KateBuffer::changeLine(uint i)
 {
-  KateBufBlock *buf = tqfindBlock(i);
+  KateBufBlock *buf = findBlock(i);
 
   if (!buf)
     return;
@@ -725,9 +725,9 @@ void KateBuffer::insertLine(uint i, KateTextLine::Ptr line)
   uint index = 0;
   KateBufBlock *buf;
   if (i == m_lines)
-    buf = tqfindBlock(i-1, &index);
+    buf = findBlock(i-1, &index);
   else
-    buf = tqfindBlock(i, &index);
+    buf = findBlock(i, &index);
 
   if (!buf)
     return;
@@ -772,7 +772,7 @@ void KateBuffer::insertLine(uint i, KateTextLine::Ptr line)
 void KateBuffer::removeLine(uint i)
 {
    uint index = 0;
-   KateBufBlock *buf = tqfindBlock(i, &index);
+   KateBufBlock *buf = findBlock(i, &index);
 
    if (!buf)
      return;
@@ -849,7 +849,7 @@ void KateBuffer::setTabWidth (uint w)
     m_tabWidth = w;
 
     if (m_highlight && m_highlight->foldingIndentationSensitive())
-      tqinvalidateHighlighting();
+      invalidateHighlighting();
   }
 }
 
@@ -860,12 +860,12 @@ void KateBuffer::setHighlight(uint hlMode)
    // aha, hl will change
   if (h != m_highlight)
   {
-    bool tqinvalidate = !h->noHighlighting();
+    bool invalidate = !h->noHighlighting();
 
     if (m_highlight)
     {
       m_highlight->release();
-      tqinvalidate = true;
+      invalidate = true;
     }
 
     h->use();
@@ -880,8 +880,8 @@ void KateBuffer::setHighlight(uint hlMode)
 
     m_highlight = h;
 
-    if (tqinvalidate)
-      tqinvalidateHighlighting();
+    if (invalidate)
+      invalidateHighlighting();
 
     // inform the document that the hl was really changed
     // needed to update attributes and more ;)
@@ -889,7 +889,7 @@ void KateBuffer::setHighlight(uint hlMode)
   }
 }
 
-void KateBuffer::tqinvalidateHighlighting()
+void KateBuffer::invalidateHighlighting()
 {
   m_lineHighlightedMax = 0;
   m_lineHighlighted = 0;
@@ -906,7 +906,7 @@ void KateBuffer::updatePreviousNotEmptyLine(KateBufBlock *blk,uint current_line,
       uint line=blk->startLine()+current_line;
       if (line==0) return;
       line--;
-      blk=tqfindBlock(line);
+      blk=findBlock(line);
       if (!blk) {
         kdDebug(13020)<<"updatePreviousNotEmptyLine: block not found, this must not happen"<<endl;
         return;
@@ -949,7 +949,7 @@ void KateBuffer::addIndentBasedFoldingInformation(TQMemArray<uint> &foldingList,
   }
 }
 
-bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, bool tqinvalidate)
+bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, bool invalidate)
 {
   // no hl around, no stuff to do
   if (!m_highlight)
@@ -971,13 +971,13 @@ bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, b
   //kdDebug (13020) << "HL UNTIL LINE: " << m_lineHighlighted << " MAX: " << m_lineHighlightedMax << endl;
   //kdDebug (13020) << "HL DYN COUNT: " << KateHlManager::self()->countDynamicCtxs() << " MAX: " << m_maxDynamicContexts << endl;
 
-  // see if there are too many dynamic contexts; if yes, tqinvalidate HL of all documents
+  // see if there are too many dynamic contexts; if yes, invalidate HL of all documents
   if (KateHlManager::self()->countDynamicCtxs() >= m_maxDynamicContexts)
   {
     {
       if (KateHlManager::self()->resetDynamicCtxs())
       {
-        kdDebug (13020) << "HL tqinvalidated - too many dynamic contexts ( >= " << m_maxDynamicContexts << ")" << endl;
+        kdDebug (13020) << "HL invalidated - too many dynamic contexts ( >= " << m_maxDynamicContexts << ")" << endl;
 
         // avoid recursive invalidation
         KateHlManager::self()->setForceNoDCReset(true);
@@ -988,7 +988,7 @@ bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, b
         // doHighlight *shall* do his work. After invalidation, some highlight has
         // been recalculated, but *maybe not* until endLine ! So we shall force it manually...
         KateBufBlock *buf = 0;
-        while ((endLine > m_lineHighlighted) && (buf = tqfindBlock(m_lineHighlighted)))
+        while ((endLine > m_lineHighlighted) && (buf = findBlock(m_lineHighlighted)))
         {
           uint end = kMin(endLine, buf->endLine());
 
@@ -1240,7 +1240,7 @@ bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, b
   buf->markDirty ();
 
   // tag the changed lines !
-  if (tqinvalidate)
+  if (invalidate)
     emit tagLines (startLine, current_line + buf->startLine());
 
   // emit that we have changed the folding
@@ -1353,14 +1353,14 @@ void KateBufBlock::fillBlock (KateFileLoader *stream)
   {
     uint offset = 0, length = 0;
     stream->readLine(offset, length);
-    const TQChar *tqunicodeData = stream->tqunicode () + offset;
+    const TQChar *unicodeData = stream->unicode () + offset;
 
     // strip spaces at end of line
     if ( stream->removeTrailingSpaces() )
     {
       while (length > 0)
       {
-        if (tqunicodeData[length-1].isSpace())
+        if (unicodeData[length-1].isSpace())
           --length;
         else
           break;
@@ -1391,13 +1391,13 @@ void KateBufBlock::fillBlock (KateFileLoader *stream)
       memcpy(buf+pos, (char *) &length, sizeof(uint));
       pos += sizeof(uint);
 
-      memcpy(buf+pos, (char *) tqunicodeData, sizeof(TQChar)*length);
+      memcpy(buf+pos, (char *) unicodeData, sizeof(TQChar)*length);
       pos += sizeof(TQChar)*length;
     }
     else
     {
       KateTextLine::Ptr textLine = new KateTextLine ();
-      textLine->insertText (0, length, tqunicodeData);
+      textLine->insertText (0, length, unicodeData);
       m_stringList.push_back (textLine);
     }
 
@@ -1657,4 +1657,4 @@ void KateBufBlockList::removeInternal (KateBufBlock *buf)
 
 //END KateBufBlockList
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katebuffer.h b/kate/part/katebuffer.h
index 0f6672f0b..602571c53 100644
--- a/kate/part/katebuffer.h
+++ b/kate/part/katebuffer.h
@@ -40,7 +40,7 @@ class KateFileLoader;
 class TQTextCodec;
 
 /**
- * The KateBufBlock class tqcontains an amount of data representing
+ * The KateBufBlock class contains an amount of data representing
  * a certain number of lines.
  *
  * @author Waldo Bastian <bastian@kde.org>
@@ -116,7 +116,7 @@ class KateBufBlock
     void removeLine(uint i);
 
     /**
-     * mark this block as dirty, will tqinvalidate the swap data
+     * mark this block as dirty, will invalidate the swap data
      * insert/removeLine will mark the block dirty itself
      */
     void markDirty ();
@@ -338,7 +338,7 @@ class KateBufBlockList
  * @author Waldo Bastian <bastian@kde.org>
  * @author Christoph Cullmann <cullmann@kde.org>
  */
-class KateBuffer : public TQObject
+class KateBuffer : public QObject
 {
   Q_OBJECT
 
@@ -487,7 +487,7 @@ class KateBuffer : public TQObject
      */
     inline KateTextLine::Ptr line(uint i)
     {
-      KateBufBlock *buf = tqfindBlock(i);
+      KateBufBlock *buf = findBlock(i);
       if (!buf)
         return 0;
 
@@ -511,7 +511,7 @@ class KateBuffer : public TQObject
      */
     inline KateTextLine::Ptr plainLine(uint i)
     {
-      KateBufBlock *buf = tqfindBlock(i);
+      KateBufBlock *buf = findBlock(i);
       if (!buf)
         return 0;
 
@@ -529,7 +529,7 @@ class KateBuffer : public TQObject
      * index pointer gets filled with index of block in m_blocks
      * index only valid if returned block != 0 !
      */
-    KateBufBlock *tqfindBlock (uint i, uint *index = 0)
+    KateBufBlock *findBlock (uint i, uint *index = 0)
     {
       // out of range !
       if (i >= m_lines)
@@ -543,10 +543,10 @@ class KateBuffer : public TQObject
         return m_blocks[m_lastFoundBlock];
       }
 
-      return tqfindBlock_internal (i, index);
+      return findBlock_internal (i, index);
     }
 
-    KateBufBlock *tqfindBlock_internal (uint i, uint *index = 0);
+    KateBufBlock *findBlock_internal (uint i, uint *index = 0);
 
   public:
     /**
@@ -591,7 +591,7 @@ class KateBuffer : public TQObject
     /**
      * Invalidate highlighting of whole buffer.
      */
-    void tqinvalidateHighlighting();
+    void invalidateHighlighting();
 
     KateCodeFoldingTree *foldingTree () { return &m_regionTree; };
 
@@ -611,7 +611,7 @@ class KateBuffer : public TQObject
      * @returns true when the highlighting in the next block needs to be updated,
      * false otherwise.
      */
-    bool doHighlight (KateBufBlock *buf, uint from, uint to, bool tqinvalidate);
+    bool doHighlight (KateBufBlock *buf, uint from, uint to, bool invalidate);
 
   signals:
     /**
@@ -648,7 +648,7 @@ class KateBuffer : public TQObject
     uint m_lastInSyncBlock;
 
     /**
-     * last block found by tqfindBlock, there to make searching faster
+     * last block found by findBlock, there to make searching faster
      */
     uint m_lastFoundBlock;
 
@@ -706,4 +706,4 @@ class KateBuffer : public TQObject
 
 #endif
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katecmds.cpp b/kate/part/katecmds.cpp
index 060a8c63c..b64b5414e 100644
--- a/kate/part/katecmds.cpp
+++ b/kate/part/katecmds.cpp
@@ -74,14 +74,14 @@ TQStringList KateCommands::CoreCommands::cmds()
   TQStringList l;
   l << "indent" << "unindent" << "cleanindent"
     << "comment" << "uncomment" << "goto" << "kill-line"
-    << "set-tab-width" << "set-tqreplace-tabs" << "set-show-tabs"
+    << "set-tab-width" << "set-replace-tabs" << "set-show-tabs"
     << "set-remove-trailing-space"
     << "set-indent-spaces" << "set-indent-width" << "set-mixed-indent"
     << "set-indent-mode" << "set-auto-indent"
     << "set-line-numbers" << "set-folding-markers" << "set-icon-border"
     << "set-wrap-cursor"
     << "set-word-wrap" << "set-word-wrap-column"
-    << "set-tqreplace-tabs-save" << "set-remove-trailing-space-save"
+    << "set-replace-tabs-save" << "set-remove-trailing-space-save"
     << "set-highlight" << "run-myself" << "set-show-indent";
   return l;
 }
@@ -175,7 +175,7 @@ bool KateCommands::CoreCommands::exec(Kate::View *view,
             cmd == "set-word-wrap-column" ||
             cmd == "goto" )
   {
-    // tqfind a integer value > 0
+    // find a integer value > 0
     if ( ! args.count() )
       KCC_ERR( i18n("Missing argument. Usage: %1 <value>").arg( cmd ) );
     bool ok;
@@ -217,14 +217,14 @@ bool KateCommands::CoreCommands::exec(Kate::View *view,
   else if ( cmd == "set-icon-border" ||
             cmd == "set-folding-markers" ||
             cmd == "set-line-numbers" ||
-            cmd == "set-tqreplace-tabs" ||
+            cmd == "set-replace-tabs" ||
             cmd == "set-remove-trailing-space" ||
             cmd == "set-show-tabs" ||
             cmd == "set-indent-spaces" ||
             cmd == "set-mixed-indent" ||
             cmd == "set-word-wrap" ||
             cmd == "set-wrap-cursor" ||
-            cmd == "set-tqreplace-tabs-save" ||
+            cmd == "set-replace-tabs-save" ||
             cmd == "set-remove-trailing-space-save" ||
             cmd == "set-show-indent" )
   {
@@ -241,7 +241,7 @@ bool KateCommands::CoreCommands::exec(Kate::View *view,
         v->setLineNumbersOn( enable );
       else if ( cmd == "set-show-indent" )
         v->renderer()->setShowIndentLines( enable );
-      else if ( cmd == "set-tqreplace-tabs" )
+      else if ( cmd == "set-replace-tabs" )
         setDocFlag( KateDocumentConfig::cfReplaceTabsDyn, enable, v->doc() );
       else if ( cmd == "set-remove-trailing-space" )
         setDocFlag( KateDocumentConfig::cfRemoveTrailingDyn, enable, v->doc() );
@@ -298,14 +298,14 @@ KCompletion *KateCommands::CoreCommands::completionObject( const TQString &cmd,
 //END CoreCommands
 
 //BEGIN SedReplace
-static void tqreplace(TQString &s, const TQString &needle, const TQString &with)
+static void replace(TQString &s, const TQString &needle, const TQString &with)
 {
   int pos=0;
   while (1)
   {
-    pos=s.tqfind(needle, pos);
+    pos=s.find(needle, pos);
     if (pos==-1) break;
-    s.tqreplace(pos, needle.length(), with);
+    s.replace(pos, needle.length(), with);
     pos+=with.length();
   }
 
@@ -341,16 +341,16 @@ static int backslashString(const TQString &haystack, const TQString &needle, int
 // exchange "\t" for the actual tab character, for example
 static void exchangeAbbrevs(TQString &str)
 {
-  // the format is (tqfindtqreplace)*[nullzero]
+  // the format is (findreplace)*[nullzero]
   const char *magic="a\x07t\tn\n";
 
   while (*magic)
   {
     int index=0;
-    char tqreplace=magic[1];
+    char replace=magic[1];
     while ((index=backslashString(str, TQChar(*magic), index))!=-1)
     {
-      str.tqreplace(index, 2, TQChar(tqreplace));
+      str.replace(index, 2, TQChar(replace));
       index++;
     }
     magic++;
@@ -359,7 +359,7 @@ static void exchangeAbbrevs(TQString &str)
 }
 
 int KateCommands::SedReplace::sedMagic( KateDocument *doc, int &line,
-                                        const TQString &tqfind, const TQString &repOld, const TQString &delim,
+                                        const TQString &find, const TQString &repOld, const TQString &delim,
                                         bool noCase, bool repeat,
                                         uint startcol, int endcol )
 {
@@ -369,14 +369,14 @@ int KateCommands::SedReplace::sedMagic( KateDocument *doc, int &line,
   // HANDLING "\n"s in PATTERN
   // * Create a list of patterns, splitting PATTERN on (unescaped) "\n"
   // * insert $s and ^s to match line ends/beginnings
-  // * When matching patterhs after the first one, tqreplace \N with the captured
+  // * When matching patterhs after the first one, replace \N with the captured
   //   text.
   // * If all patterns in the list match sequentiel lines, there is a match, so
   // * remove line/start to line + patterns.count()-1/patterns.last.length
   // * handle capatures by putting them in one list.
   // * the existing insertion is fine, including the line calculation.
 
-  TQStringList patterns = TQStringList::split( TQRegExp("(^\\\\n|(?![^\\\\])\\\\n)"), tqfind, true );
+  TQStringList patterns = TQStringList::split( TQRegExp("(^\\\\n|(?![^\\\\])\\\\n)"), find, true );
 
   if ( patterns.count() > 1 )
   {
@@ -407,7 +407,7 @@ int KateCommands::SedReplace::sedMagic( KateDocument *doc, int &line,
 
     TQString rep=repOld;
 
-    // now set the backreferences in the tqreplacement
+    // now set the backreferences in the replacement
     TQStringList backrefs=matcher.capturedTexts();
     int refnum=1;
 
@@ -425,7 +425,7 @@ int KateCommands::SedReplace::sedMagic( KateDocument *doc, int &line,
         index=backslashString(rep, number, index);
         if (index>=0)
         {
-          rep.tqreplace(index, 2, *i);
+          rep.replace(index, 2, *i);
           index+=(*i).length();
         }
       }
@@ -433,16 +433,16 @@ int KateCommands::SedReplace::sedMagic( KateDocument *doc, int &line,
       refnum++;
     }
 
-    tqreplace(rep, "\\\\", "\\");
-    tqreplace(rep, "\\" + delim, delim);
+    replace(rep, "\\\\", "\\");
+    replace(rep, "\\" + delim, delim);
 
     doc->removeText( line, startcol, line, startcol + len );
     doc->insertText( line, startcol, rep );
 
-    // TODO if tqreplace tqcontains \n,
+    // TODO if replace contains \n,
     // change the line number and
     // check for text that needs be searched behind the last inserted newline.
-    int lns = rep.tqcontains('\n');
+    int lns = rep.contains('\n');
     if ( lns )
     {
       line += lns;
@@ -451,8 +451,8 @@ int KateCommands::SedReplace::sedMagic( KateDocument *doc, int &line,
       {
       //  if ( endcol  >= startcol + len )
           endcol -= (startcol + len);
-          uint sc = rep.length() - rep.tqfindRev('\n') - 1;
-        matches += sedMagic( doc, line, tqfind, repOld, delim, noCase, repeat, sc, endcol );
+          uint sc = rep.length() - rep.findRev('\n') - 1;
+        matches += sedMagic( doc, line, find, repOld, delim, noCase, repeat, sc, endcol );
       }
     }
 
@@ -486,16 +486,16 @@ bool KateCommands::SedReplace::exec (Kate::View *view, const TQString &cmd, TQSt
   TQRegExp splitter( TQString("^[$%]?s\\s*")  + d + "((?:[^\\\\\\" + d + "]|\\\\.)*)\\" + d +"((?:[^\\\\\\" + d + "]|\\\\.)*)\\" + d + "[ig]{0,2}$" );
   if (splitter.search(cmd)<0) return false;
 
-  TQString tqfind=splitter.cap(1);
-   kdDebug(13025)<< "SedReplace: tqfind=" << tqfind.latin1() <<endl;
+  TQString find=splitter.cap(1);
+   kdDebug(13025)<< "SedReplace: find=" << find.latin1() <<endl;
 
-  TQString tqreplace=splitter.cap(2);
-  exchangeAbbrevs(tqreplace);
-   kdDebug(13025)<< "SedReplace: tqreplace=" << tqreplace.latin1() <<endl;
+  TQString replace=splitter.cap(2);
+  exchangeAbbrevs(replace);
+   kdDebug(13025)<< "SedReplace: replace=" << replace.latin1() <<endl;
 
-   if ( tqfind.tqcontains("\\n") )
+   if ( find.contains("\\n") )
    {
-     msg = i18n("Sorry, but Kate is not able to tqreplace newlines, yet");
+     msg = i18n("Sorry, but Kate is not able to replace newlines, yet");
      return false;
    }
 
@@ -511,7 +511,7 @@ bool KateCommands::SedReplace::exec (Kate::View *view, const TQString &cmd, TQSt
     uint numLines=doc->numLines();
     for (int line=0; (uint)line < numLines; line++)
     {
-      res += sedMagic( doc, line, tqfind, tqreplace, d, !noCase, repeat );
+      res += sedMagic( doc, line, find, replace, d, !noCase, repeat );
       if ( ! repeat && res ) break;
     }
   }
@@ -524,7 +524,7 @@ bool KateCommands::SedReplace::exec (Kate::View *view, const TQString &cmd, TQSt
       if ( startline == doc->selEndLine() )
         endcol = doc->selEndCol();
 
-      res += sedMagic( doc, startline, tqfind, tqreplace, d, !noCase, repeat, startcol, endcol );
+      res += sedMagic( doc, startline, find, replace, d, !noCase, repeat, startcol, endcol );
 
       /*if ( startcol )*/ startcol = 0;
 
@@ -534,10 +534,10 @@ bool KateCommands::SedReplace::exec (Kate::View *view, const TQString &cmd, TQSt
   else // just this line
   {
     int line=view->cursorLine();
-    res += sedMagic(doc, line, tqfind, tqreplace, d, !noCase, repeat);
+    res += sedMagic(doc, line, find, replace, d, !noCase, repeat);
   }
 
-  msg = i18n("1 tqreplacement done", "%n tqreplacements done",res );
+  msg = i18n("1 replacement done", "%n replacements done",res );
 
   doc->editEnd();
 
@@ -562,7 +562,7 @@ bool KateCommands::Character::exec (Kate::View *view, const TQString &_cmd, TQSt
   int base=10;
   if (cmd[0]=='x' || cmd.left(2)=="0x")
   {
-    cmd.tqreplace(TQRegExp("^0?x"), "");
+    cmd.replace(TQRegExp("^0?x"), "");
     base=16;
   }
   else if (cmd[0]=='0')
@@ -578,7 +578,7 @@ bool KateCommands::Character::exec (Kate::View *view, const TQString &_cmd, TQSt
     view->insertText(TQString(buf));
   }
   else
-  { // do the tqunicode thing
+  { // do the unicode thing
     TQChar c(number);
     view->insertText(TQString(&c, 1));
   }
@@ -593,13 +593,13 @@ bool KateCommands::Date::exec (Kate::View *view, const TQString &cmd, TQString &
   if (cmd.left(4) != "date")
     return false;
 
-  if (TQDateTime::tqcurrentDateTime().toString(cmd.mid(5, cmd.length()-5)).length() > 0)
-    view->insertText(TQDateTime::tqcurrentDateTime().toString(cmd.mid(5, cmd.length()-5)));
+  if (TQDateTime::currentDateTime().toString(cmd.mid(5, cmd.length()-5)).length() > 0)
+    view->insertText(TQDateTime::currentDateTime().toString(cmd.mid(5, cmd.length()-5)));
   else
-    view->insertText(TQDateTime::tqcurrentDateTime().toString("yyyy-MM-dd hh:mm:ss"));
+    view->insertText(TQDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss"));
 
   return true;
 }
 //END Date
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katecmds.h b/kate/part/katecmds.h
index fad54e85a..55c8d807b 100644
--- a/kate/part/katecmds.h
+++ b/kate/part/katecmds.h
@@ -64,11 +64,11 @@ class CoreCommands : public Kate::Command, public Kate::CommandExtension
 
 /**
  * -- Charles Samuels <charles@kde.org>
- * Support vim/sed tqfind and tqreplace
- * s/search/tqreplace/ tqfind search, tqreplace with tqreplace on this line
- * %s/search/tqreplace/ do the same to the whole file
- * s/search/tqreplace/i do the S. and R., but case insensitively
- * $s/search/tqreplace/ do the search are tqreplacement to the selection only
+ * Support vim/sed find and replace
+ * s/search/replace/ find search, replace with replace on this line
+ * %s/search/replace/ do the same to the whole file
+ * s/search/replace/i do the S. and R., but case insensitively
+ * $s/search/replace/ do the search are replacement to the selection only
  *
  * $s/// is currently unsupported
  **/
@@ -94,17 +94,17 @@ class SedReplace : public Kate::Command
 
   private:
     /**
-     * Searches one line and does the tqreplacement in the document.
-     * If @p tqreplace tqcontains any newline characters, the reamaining part of the
+     * Searches one line and does the replacement in the document.
+     * If @p replace contains any newline characters, the reamaining part of the
      * line is searched, and the @p line set to the last line number searched.
-     * @return the number of tqreplacements performed.
+     * @return the number of replacements performed.
      * @param doc a pointer to the document to work on
      * @param line the number of the line to search. This may be changed by the
      * function, if newlines are inserted.
-     * @param tqfind A regular expression pattern to use for searching
-     * @param tqreplace a template for tqreplacement. Backspaced integers are
-     * tqreplaced with captured texts from the regular expression.
-     * @param delim the delimiter character from the command. In the tqreplacement
+     * @param find A regular expression pattern to use for searching
+     * @param replace a template for replacement. Backspaced integers are
+     * replaced with captured texts from the regular expression.
+     * @param delim the delimiter character from the command. In the replacement
      * text backsplashes preceeding this character are removed.
      * @param nocase parameter for matching the reqular expression.
      * @param repeat If false, the search is stopped after the first match.
@@ -113,13 +113,13 @@ class SedReplace : public Kate::Command
      * If it is -1, the whole line is used.
      */
     static int sedMagic(KateDocument *doc, int &line,
-                        const TQString &tqfind, const TQString &tqreplace, const TQString &delim,
+                        const TQString &find, const TQString &replace, const TQString &delim,
                         bool noCase, bool repeat,
                         uint startcol=0, int endcol=-1);
 };
 
 /**
- * insert a tqunicode or ascii character
+ * insert a unicode or ascii character
  * base 9+1: 1234
  * hex: 0x1234 or x1234
  * octal: 01231
@@ -175,4 +175,4 @@ class Date : public Kate::Command
 } // namespace KateCommands
 #endif
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katecodecompletion.cpp b/kate/part/katecodecompletion.cpp
index 6fecd4c9e..cee99f9d4 100644
--- a/kate/part/katecodecompletion.cpp
+++ b/kate/part/katecodecompletion.cpp
@@ -47,7 +47,7 @@
 
 /**
  * This class is used as the codecompletion listbox. It can be resized according to its contents,
- *  therfor the needed size is provided by tqsizeHint();
+ *  therfor the needed size is provided by sizeHint();
  *@short Listbox showing codecompletion
  *@author Jonas B. Jacobi <j.jacobi@gmx.de>
  */
@@ -61,7 +61,7 @@ class KateCCListBox : public QListBox
     {
     }
 
-    TQSize tqsizeHint()  const
+    TQSize sizeHint()  const
     {
         int count = this->count();
         int height = 20;
@@ -124,7 +124,7 @@ KateCodeCompletion::KateCodeCompletion( KateView* view )
 
   m_completionListBox->installEventFilter( this );
 
-  m_completionPopup->resize(m_completionListBox->tqsizeHint() + TQSize(2,2));
+  m_completionPopup->resize(m_completionListBox->sizeHint() + TQSize(2,2));
   m_completionPopup->installEventFilter( this );
   m_completionPopup->setFocusProxy( m_view->m_viewInternal );
 
@@ -305,7 +305,7 @@ void KateCodeCompletion::updateBox( bool )
   }
 
     kdDebug(13035)<<"KateCodeCompletion::updateBox: Resizing widget"<<endl;
-        m_completionPopup->resize(m_completionListBox->tqsizeHint() + TQSize(2,2));
+        m_completionPopup->resize(m_completionListBox->sizeHint() + TQSize(2,2));
     TQPoint p = m_view->mapToGlobal( m_view->cursorCoordinates() );
         int x = p.x();
         int y = p.y() ;
@@ -384,7 +384,7 @@ void KateCodeCompletion::showComment()
   m_completionListBox->ensureCurrentVisible();
 
   finalPoint.setY(
-    m_completionListBox->viewport()->mapToGlobal(m_completionListBox->tqitemRect(
+    m_completionListBox->viewport()->mapToGlobal(m_completionListBox->itemRect(
       m_completionListBox->item(m_completionListBox->currentItem())).topLeft()).y());
 
   m_commentLabel->move(finalPoint);
@@ -398,8 +398,8 @@ KateArgHint::KateArgHint( KateView* parent, const char* name )
     setPaletteForegroundColor( Qt::black );
 
     labelDict.setAutoDelete( true );
-    tqlayout = new TQVBoxLayout( this, 1, 2 );
-    tqlayout->setAutoAdd( true );
+    layout = new TQVBoxLayout( this, 1, 2 );
+    layout->setAutoAdd( true );
     editorView = parent;
 
     m_markCurrentFunction = true;
@@ -460,8 +460,8 @@ void KateArgHint::cursorPositionChanged( KateView* view, int line, int col )
     TQRegExp chrconst_rx( "'[^']*'" );
 
     text = text
-        .tqreplace( strconst_rx, "\"\"" )
-        .tqreplace( chrconst_rx, "''" );
+        .replace( strconst_rx, "\"\"" )
+        .replace( chrconst_rx, "''" );
 
     int index = 0;
     while( index < (int)text.length() ){
@@ -563,4 +563,4 @@ void KateArgHint::adjustSize( )
         move( screen.x() + screen.width() - width(), y() );
 }
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katecodecompletion.h b/kate/part/katecodecompletion.h
index 52fd6c70f..34d620599 100644
--- a/kate/part/katecodecompletion.h
+++ b/kate/part/katecodecompletion.h
@@ -57,14 +57,14 @@ class KateCodeCompletionCommentLabel : public QLabel
         setAutoMask( false );
         setFrameStyle( TQFrame::Plain | TQFrame::Box );
         setLineWidth( 1 );
-        tqsetAlignment( AlignAuto | AlignTop );
+        setAlignment( AlignAuto | AlignTop );
         polish();
         setText(text);
         adjustSize();
     }
 };
 
-class KateCodeCompletion : public TQObject
+class KateCodeCompletion : public QObject
 {
   Q_OBJECT
 
@@ -156,9 +156,9 @@ class KateArgHint: public QFrame
       int m_currentCol;
       KateView* editorView;
       TQIntDict<TQLabel> labelDict;
-      TQLayout* tqlayout;
+      TQLayout* layout;
 };
 
 #endif
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katecodefoldinghelpers.cpp b/kate/part/katecodefoldinghelpers.cpp
index 78db2ad15..91b4da88a 100644
--- a/kate/part/katecodefoldinghelpers.cpp
+++ b/kate/part/katecodefoldinghelpers.cpp
@@ -217,10 +217,10 @@ void KateCodeFoldingTree::getLineInfo(KateLineInfo *info, unsigned int line)
   {
     KateCodeFoldingNode *node = m_root.child(i);
 
-    if ((node->startLineRel<=line) && (line<=node->startLineRel+node->endLineRel)) // we found a node, which tqcontains the given line -> do a complete lookup
+    if ((node->startLineRel<=line) && (line<=node->startLineRel+node->endLineRel)) // we found a node, which contains the given line -> do a complete lookup
     {
       info->topLevel = false; //we are definitly not toplevel
-      tqfindAllNodesOpenedOrClosedAt(line); //lookup all nodes, which start or and at the given line
+      findAllNodesOpenedOrClosedAt(line); //lookup all nodes, which start or and at the given line
 
       for ( KateCodeFoldingNode *node = nodesForLine.first(); node; node = nodesForLine.next() )
       {
@@ -253,7 +253,7 @@ void KateCodeFoldingTree::getLineInfo(KateLineInfo *info, unsigned int line)
 }
 
 
-KateCodeFoldingNode *KateCodeFoldingTree::tqfindNodeForLine(unsigned int line)
+KateCodeFoldingNode *KateCodeFoldingTree::findNodeForLine(unsigned int line)
 {
   if (m_root.noChildren()) // does we have child list + nodes ?
     return &m_root;
@@ -266,7 +266,7 @@ KateCodeFoldingNode *KateCodeFoldingTree::tqfindNodeForLine(unsigned int line)
     if ((node->startLineRel<=line) && (line<=node->startLineRel+node->endLineRel))
     {
       // a region surounds the line, look in the next deeper hierarchy step
-      return tqfindNodeForLineDescending(node,line,0);
+      return findNodeForLineDescending(node,line,0);
     }
   }
 
@@ -274,7 +274,7 @@ KateCodeFoldingNode *KateCodeFoldingTree::tqfindNodeForLine(unsigned int line)
 }
 
 
-KateCodeFoldingNode *KateCodeFoldingTree::tqfindNodeForLineDescending ( KateCodeFoldingNode *node,
+KateCodeFoldingNode *KateCodeFoldingTree::findNodeForLineDescending ( KateCodeFoldingNode *node,
     unsigned int line, unsigned int offset, bool oneStepOnly )
 {
   if (node->noChildren())
@@ -289,22 +289,22 @@ KateCodeFoldingNode *KateCodeFoldingTree::tqfindNodeForLineDescending ( KateCode
 
     if ((subNode->startLineRel+offset<=line) && (line<=subNode->endLineRel+subNode->startLineRel+offset)) //warning fix me for invalid ends
     {
-      // a subnode tqcontains the line.
+      // a subnode contains the line.
       // if oneStepOnly is true, we don't want to search for the deepest node, just return the found one
 
       if (oneStepOnly)
         return subNode;
       else
-        return tqfindNodeForLineDescending (subNode,line,offset); // look into the next deeper hierarchy step
+        return findNodeForLineDescending (subNode,line,offset); // look into the next deeper hierarchy step
     }
   }
 
   return node; // the current node has no sub nodes, or the line couldn'te be found within a subregion
 }
 
-KateCodeFoldingNode *KateCodeFoldingTree::tqfindNodeForPosition(unsigned int line, unsigned int column)
+KateCodeFoldingNode *KateCodeFoldingTree::findNodeForPosition(unsigned int line, unsigned int column)
 {
-  KateCodeFoldingNode *node=tqfindNodeForLine(line);
+  KateCodeFoldingNode *node=findNodeForLine(line);
 
   if (node==&m_root) return &m_root;
 
@@ -395,11 +395,11 @@ void KateCodeFoldingTree::updateLine(unsigned int line,
 
   something_changed = false;
 
-  tqfindAndMarkAllNodesforRemovalOpenedOrClosedAt(line);
+  findAndMarkAllNodesforRemovalOpenedOrClosedAt(line);
 
   if (regionChanges->isEmpty())
   {
-    //  KateCodeFoldingNode *node=tqfindNodeForLine(line);
+    //  KateCodeFoldingNode *node=findNodeForLine(line);
     //  if (node->type!=0)
     //  if (getStartLine(node)+node->endLineRel==line) removeEnding(node,line);
   }
@@ -421,7 +421,7 @@ void KateCodeFoldingTree::updateLine(unsigned int line,
     regionChanges->resize (regionChanges->size()-2);
 
     int insertPos=-1;
-    KateCodeFoldingNode *node = tqfindNodeForLine(line);
+    KateCodeFoldingNode *node = findNodeForLine(line);
 
     if (data<0)
     {
@@ -445,7 +445,7 @@ void KateCodeFoldingTree::updateLine(unsigned int line,
 
       if ((getStartLine(node)==line) && (node->type!=0))
       {
-        insertPos=node->parentNode->tqfindChild(node);
+        insertPos=node->parentNode->findChild(node);
         node = node->parentNode;
       }
       else
@@ -467,7 +467,7 @@ void KateCodeFoldingTree::updateLine(unsigned int line,
       {
         if (correctEndings(data,node,line,charPos,insertPos))
         {
-          insertPos=node->parentNode->tqfindChild(node)+1;
+          insertPos=node->parentNode->findChild(node)+1;
           node=node->parentNode;
         }
         else
@@ -484,7 +484,7 @@ void KateCodeFoldingTree::updateLine(unsigned int line,
           something_changed = true;
           node->appendChild(newNode);
           addOpening(newNode, data, regionChanges, line,charPos);
-          insertPos = node->tqfindChild(newNode)+1;
+          insertPos = node->findChild(newNode)+1;
         }
         else
         {
@@ -538,7 +538,7 @@ bool KateCodeFoldingTree::removeOpening(KateCodeFoldingNode *node,unsigned int l
   }
 
   KateCodeFoldingNode *parent = node->parentNode;
-  int mypos = parent->tqfindChild(node);
+  int mypos = parent->findChild(node);
 
   if (mypos > -1)
   {
@@ -553,7 +553,7 @@ bool KateCodeFoldingTree::removeOpening(KateCodeFoldingNode *node,unsigned int l
   }
 
   // remove the node
-  //mypos = parent->tqfindChild(node);
+  //mypos = parent->findChild(node);
   bool endLineValid = node->endLineValid;
   int endLineRel = node->endLineRel;
   uint endCol=node->endCol;
@@ -583,7 +583,7 @@ bool KateCodeFoldingTree::removeEnding(KateCodeFoldingNode *node,unsigned int /*
   if (node->type < 0)
   {
     // removes + deletes
-    int i = parent->tqfindChild (node);
+    int i = parent->findChild (node);
     if (i >= 0)
     {
       KateCodeFoldingNode *child = parent->takeChild(i);
@@ -594,7 +594,7 @@ bool KateCodeFoldingTree::removeEnding(KateCodeFoldingNode *node,unsigned int /*
     return true;
   }
 
-  int mypos = parent->tqfindChild(node);
+  int mypos = parent->findChild(node);
   int count = parent->childCount();
 
   for (int i=mypos+1; i<count; i++)
@@ -681,7 +681,7 @@ bool KateCodeFoldingTree::correctEndings(signed char data, KateCodeFoldingNode *
     else
       node->insertChild(insertPos,newNode);
 
-      // tqfind correct position
+      // find correct position
     return false;
   }
   else
@@ -728,7 +728,7 @@ bool KateCodeFoldingTree::correctEndings(signed char data, KateCodeFoldingNode *
 
         if (node->parentNode)
         {
-          correctEndings(data,node->parentNode,bakEndLine, bakEndCol,node->parentNode->tqfindChild(node)+1); // ????
+          correctEndings(data,node->parentNode,bakEndLine, bakEndCol,node->parentNode->findChild(node)+1); // ????
         }
         else
         {
@@ -742,7 +742,7 @@ bool KateCodeFoldingTree::correctEndings(signed char data, KateCodeFoldingNode *
 
 void KateCodeFoldingTree::moveSubNodesUp(KateCodeFoldingNode *node)
 {
-        int mypos = node->parentNode->tqfindChild(node);
+        int mypos = node->parentNode->findChild(node);
         int removepos=-1;
         int count = node->childCount();
         for (int i=0; i<count; i++)
@@ -805,7 +805,7 @@ void KateCodeFoldingTree::addOpening(KateCodeFoldingNode *node,signed char nType
 
       if (!node->endLineValid)
       {
-        int current = parent->tqfindChild(node);
+        int current = parent->findChild(node);
         int count = parent->childCount()-(current+1);
         node->endLineRel = parent->endLineRel - node->startLineRel;
 
@@ -1007,7 +1007,7 @@ void KateCodeFoldingTree::addOpening_further_iterations(KateCodeFoldingNode *nod
         {
           something_changed = true;
           KateCodeFoldingNode *newNode = new KateCodeFoldingNode(node, data, line-startLine);
-          node->insertChild(current, newNode);  //tqfind the correct position later
+          node->insertChild(current, newNode);  //find the correct position later
         }
 
                addOpening(node->child(current), data, list, line,charPos);
@@ -1040,10 +1040,10 @@ void KateCodeFoldingTree::lineHasBeenRemoved(unsigned int line)
 #endif
 
 //line ++;
-  tqfindAndMarkAllNodesforRemovalOpenedOrClosedAt(line); //It's an ugly solution
+  findAndMarkAllNodesforRemovalOpenedOrClosedAt(line); //It's an ugly solution
   cleanupUnneededNodes(line);  //It's an ugly solution
 
-  KateCodeFoldingNode *node = tqfindNodeForLine(line);
+  KateCodeFoldingNode *node = findNodeForLine(line);
 //?????  if (node->endLineValid)
   {
     int startLine = getStartLine(node);
@@ -1083,7 +1083,7 @@ void KateCodeFoldingTree::decrementBy1(KateCodeFoldingNode *node, KateCodeFoldin
     node->endLineValid = false;
   node->endLineRel--;
 
-  for (uint i=node->tqfindChild(after)+1; i < node->childCount(); ++i)
+  for (uint i=node->findChild(after)+1; i < node->childCount(); ++i)
     node->child(i)->startLineRel--;
 
   if (node->parentNode)
@@ -1103,10 +1103,10 @@ void KateCodeFoldingTree::lineHasBeenInserted(unsigned int line)
   kdDebug(13000)<<TQString("KateCodeFoldingTree::lineHasBeenInserted: %1").arg(line)<<endl;
 #endif
 
-//  tqfindAndMarkAllNodesforRemovalOpenedOrClosedAt(line);
+//  findAndMarkAllNodesforRemovalOpenedOrClosedAt(line);
 //  cleanupUnneededNodes(line);
 
-  KateCodeFoldingNode *node = tqfindNodeForLine(line);
+  KateCodeFoldingNode *node = findNodeForLine(line);
 // ????????  if (node->endLineValid)
   {
     int startLine=getStartLine(node);
@@ -1140,7 +1140,7 @@ void KateCodeFoldingTree::incrementBy1(KateCodeFoldingNode *node, KateCodeFoldin
 {
   node->endLineRel++;
 
-  for (uint i=node->tqfindChild(after)+1; i < node->childCount(); ++i)
+  for (uint i=node->findChild(after)+1; i < node->childCount(); ++i)
     node->child(i)->startLineRel++;
 
   if (node->parentNode)
@@ -1148,14 +1148,14 @@ void KateCodeFoldingTree::incrementBy1(KateCodeFoldingNode *node, KateCodeFoldin
 }
 
 
-void KateCodeFoldingTree::tqfindAndMarkAllNodesforRemovalOpenedOrClosedAt(unsigned int line)
+void KateCodeFoldingTree::findAndMarkAllNodesforRemovalOpenedOrClosedAt(unsigned int line)
 {
 #ifdef __GNUC__
 #warning "FIXME:  make this multiple region changes per line save";
 #endif
 //  return;
   markedForDeleting.clear();
-  KateCodeFoldingNode *node = tqfindNodeForLine(line);
+  KateCodeFoldingNode *node = findNodeForLine(line);
   if (node->type == 0)
     return;
 
@@ -1186,7 +1186,7 @@ void KateCodeFoldingTree::addNodeToRemoveList(KateCodeFoldingNode *node,unsigned
   }
   if ((startLine+node->endLineRel==line) || ((node->endLineValid==false) && (node->deleteOpening)))
   {
-    int myPos=node->parentNode->tqfindChild(node); // this has to be implemented nicely
+    int myPos=node->parentNode->findChild(node); // this has to be implemented nicely
     if ((int)node->parentNode->childCount()>myPos+1)
      addNodeToRemoveList(node->parentNode->child(myPos+1),line);
     add=true;
@@ -1199,10 +1199,10 @@ void KateCodeFoldingTree::addNodeToRemoveList(KateCodeFoldingNode *node,unsigned
 }
 
 
-void KateCodeFoldingTree::tqfindAllNodesOpenedOrClosedAt(unsigned int line)
+void KateCodeFoldingTree::findAllNodesOpenedOrClosedAt(unsigned int line)
 {
   nodesForLine.clear();
-  KateCodeFoldingNode *node = tqfindNodeForLine(line);
+  KateCodeFoldingNode *node = findNodeForLine(line);
   if (node->type == 0)
     return;
 
@@ -1214,7 +1214,7 @@ void KateCodeFoldingTree::tqfindAllNodesOpenedOrClosedAt(unsigned int line)
 
   while (node->parentNode)
   {
-    addNodeToFoundList(node->parentNode, line, node->parentNode->tqfindChild(node));
+    addNodeToFoundList(node->parentNode, line, node->parentNode->findChild(node));
     node = node->parentNode;
   }
 #if JW_DEBUG
@@ -1272,7 +1272,7 @@ void KateCodeFoldingTree::cleanupUnneededNodes(unsigned int line)
 #endif
       if (node->endLineValid)    // just delete it, it has been opened and closed on this line
       {
-        int f = node->parentNode->tqfindChild (node);
+        int f = node->parentNode->findChild (node);
 
         if (f >= 0)
           delete node->parentNode->takeChild(f);
@@ -1332,7 +1332,7 @@ void KateCodeFoldingTree::toggleRegionVisibility(unsigned int line)
   hiddenLinesCountCacheValid = false;
   kdDebug(13000)<<TQString("KateCodeFoldingTree::toggleRegionVisibility() %1").arg(line)<<endl;
 
-  tqfindAllNodesOpenedOrClosedAt(line);
+  findAllNodesOpenedOrClosedAt(line);
   for (int i=0; i<(int)nodesForLine.count(); i++)
   {
     KateCodeFoldingNode *node=nodesForLine.at(i);
@@ -1417,7 +1417,7 @@ bool KateCodeFoldingTree::existsOpeningAtLineAfter(unsigned int line, KateCodeFo
     KateCodeFoldingNode *tmp2;
     unsigned int startLine=getStartLine(tmp);
 
-    if ((tmp2 = tmp->child(tmp->tqfindChild(node) + 1))
+    if ((tmp2 = tmp->child(tmp->findChild(node) + 1))
          && ((tmp2->startLineRel + startLine) == line))
       return true;
 
@@ -1650,7 +1650,7 @@ void KateCodeFoldingTree::ensureVisible( uint line )
   kdDebug(13000)<<"line "<<line<<" is really hidden ->show block"<<endl;
 
   // it looks like we really have to ensure visibility
-  KateCodeFoldingNode *n = tqfindNodeForLine( line );
+  KateCodeFoldingNode *n = findNodeForLine( line );
   do {
     if ( ! n->visible )
       toggleRegionVisibility( getStartLine( n ) );
@@ -1659,4 +1659,4 @@ void KateCodeFoldingTree::ensureVisible( uint line )
 
 }
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katecodefoldinghelpers.h b/kate/part/katecodefoldinghelpers.h
index 37f90b732..bea6a096c 100644
--- a/kate/part/katecodefoldinghelpers.h
+++ b/kate/part/katecodefoldinghelpers.h
@@ -79,7 +79,7 @@ class KateCodeFoldingNode
 
     inline KateCodeFoldingNode *child (uint index) const { return m_children[index]; }
 
-    inline int tqfindChild (KateCodeFoldingNode *node, uint start = 0) const { return m_children.tqfind (node, start); }
+    inline int findChild (KateCodeFoldingNode *node, uint start = 0) const { return m_children.find (node, start); }
 
     inline void appendChild (KateCodeFoldingNode *node) { m_children.resize(m_children.size()+1); m_children[m_children.size()-1] = node; }
 
@@ -113,7 +113,7 @@ class KateCodeFoldingNode
     TQMemArray<KateCodeFoldingNode*> m_children;
 };
 
-class KateCodeFoldingTree : public TQObject
+class KateCodeFoldingTree : public QObject
 {
   friend class KateCodeFoldingNode;
 
@@ -123,7 +123,7 @@ class KateCodeFoldingTree : public TQObject
     KateCodeFoldingTree (KateBuffer *buffer);
     ~KateCodeFoldingTree ();
 
-    KateCodeFoldingNode *tqfindNodeForLine (unsigned int line);
+    KateCodeFoldingNode *findNodeForLine (unsigned int line);
 
     unsigned int getRealLine         (unsigned int virtualLine);
     unsigned int getVirtualLine      (unsigned int realLine);
@@ -141,7 +141,7 @@ class KateCodeFoldingTree : public TQObject
     void fixRoot (int endLRel);
     void clear ();
 
-    KateCodeFoldingNode *tqfindNodeForPosition(unsigned int line, unsigned int column);
+    KateCodeFoldingNode *findNodeForPosition(unsigned int line, unsigned int column);
   private:
 
     KateCodeFoldingNode m_root;
@@ -161,7 +161,7 @@ class KateCodeFoldingTree : public TQObject
 
     static bool trueVal;
 
-    KateCodeFoldingNode *tqfindNodeForLineDescending (KateCodeFoldingNode *, unsigned int, unsigned int, bool oneStepOnly=false);
+    KateCodeFoldingNode *findNodeForLineDescending (KateCodeFoldingNode *, unsigned int, unsigned int, bool oneStepOnly=false);
 
     bool correctEndings (signed char data, KateCodeFoldingNode *node, unsigned int line, unsigned int endCol, int insertPos);
 
@@ -185,8 +185,8 @@ class KateCodeFoldingTree : public TQObject
      */
     bool removeOpening (KateCodeFoldingNode *node,unsigned int line);
 
-    void tqfindAndMarkAllNodesforRemovalOpenedOrClosedAt (unsigned int line);
-    void tqfindAllNodesOpenedOrClosedAt (unsigned int line);
+    void findAndMarkAllNodesforRemovalOpenedOrClosedAt (unsigned int line);
+    void findAllNodesOpenedOrClosedAt (unsigned int line);
 
     void addNodeToFoundList  (KateCodeFoldingNode *node,unsigned int line,int childpos);
     void addNodeToRemoveList (KateCodeFoldingNode *node,unsigned int line);
@@ -219,4 +219,4 @@ class KateCodeFoldingTree : public TQObject
 
 #endif
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/kateconfig.cpp b/kate/part/kateconfig.cpp
index 807254889..4b3c2f52b 100644
--- a/kate/part/kateconfig.cpp
+++ b/kate/part/kateconfig.cpp
@@ -422,7 +422,7 @@ TQTextCodec *KateDocumentConfig::codec ()
   if (m_encodingSet || isGlobal())
   {
     if (m_encoding.isEmpty() && isGlobal())
-      return KGlobal::charsets()->codecForName (TQString::tqfromLatin1(KGlobal::locale()->encoding()));
+      return KGlobal::charsets()->codecForName (TQString::fromLatin1(KGlobal::locale()->encoding()));
     else if (m_encoding.isEmpty())
       return s_global->codec ();
     else
@@ -1426,4 +1426,4 @@ void KateRendererConfig::setShowIndentationLines (bool on)
 
 //END
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/kateconfig.h b/kate/part/kateconfig.h
index a98afd991..56d094cd0 100644
--- a/kate/part/kateconfig.h
+++ b/kate/part/kateconfig.h
@@ -534,4 +534,4 @@ class KateRendererConfig : public KateConfig
 
 #endif
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katecursor.cpp b/kate/part/katecursor.cpp
index 2c1b0115c..dcd7c38bf 100644
--- a/kate/part/katecursor.cpp
+++ b/kate/part/katecursor.cpp
@@ -189,4 +189,4 @@ bool KateDocCursor::previousNonSpaceChar()
   return false;
 }
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katecursor.h b/kate/part/katecursor.h
index 3672262e4..c155abba4 100644
--- a/kate/part/katecursor.h
+++ b/kate/part/katecursor.h
@@ -61,7 +61,7 @@ class KateTextCursor
     }
 
 #ifndef Q_WS_WIN //not needed
-    friend void tqSwap(KateTextCursor & c1, KateTextCursor & c2) {
+    friend void qSwap(KateTextCursor & c1, KateTextCursor & c2) {
       KateTextCursor tmp = c1;
       c1 = c2;
       c2 = tmp;
@@ -200,7 +200,7 @@ class KateTextRange : public KateRange
     
     inline void normalize() {
       if( m_start > m_end )
-        tqSwap(m_start, m_end);
+        qSwap(m_start, m_end);
     }
     
   protected:
@@ -247,4 +247,4 @@ class KateBracketRange : public KateTextRange
 
 #endif
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp
index b50e30697..d3a481856 100644
--- a/kate/part/katedialogs.cpp
+++ b/kate/part/katedialogs.cpp
@@ -147,7 +147,7 @@ const int KateIndentConfigTab::flags[] = {
 KateIndentConfigTab::KateIndentConfigTab(TQWidget *parent)
   : KateConfigPage(parent)
 {
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint() );
+  TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint() );
   int configFlags = KateDocumentConfig::global()->configFlags();
 
   TQVGroupBox *gbAuto = new TQVGroupBox(i18n("Automatic Indentation"), this);
@@ -195,14 +195,14 @@ KateIndentConfigTab::KateIndentConfigTab(TQWidget *parent)
   opt[6]->setChecked(configFlags & flags[6]);
   opt[7]->setChecked(configFlags & flags[7]);
 
-  tqlayout->addWidget(gbAuto);
-  tqlayout->addWidget(gbSpaces);
-  tqlayout->addWidget(opt[1]);
-  tqlayout->addWidget(opt[2]);
-  tqlayout->addWidget(keys);
-  tqlayout->addWidget(m_tabs, 0);
+  layout->addWidget(gbAuto);
+  layout->addWidget(gbSpaces);
+  layout->addWidget(opt[1]);
+  layout->addWidget(opt[2]);
+  layout->addWidget(keys);
+  layout->addWidget(m_tabs, 0);
 
-  tqlayout->addStretch();
+  layout->addStretch();
 
   // What is this? help
   TQWhatsThis::add(opt[0], i18n(
@@ -352,7 +352,7 @@ KateSelectConfigTab::KateSelectConfigTab(TQWidget *parent)
 {
   int configFlags = KateDocumentConfig::global()->configFlags();
 
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint() );
+  TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint() );
 
   TQVGroupBox *gbCursor = new TQVGroupBox(i18n("Text Cursor Movement"), this);
 
@@ -373,18 +373,18 @@ KateSelectConfigTab::KateSelectConfigTab(TQWidget *parent)
   e4->setLabel(i18n("Autocenter cursor (lines):"), AlignVCenter);
   connect(e4, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged()));
 
-  tqlayout->addWidget(gbCursor);
+  layout->addWidget(gbCursor);
 
   TQRadioButton *rb1, *rb2;
 
   m_tabs = new TQButtonGroup( 1, Qt::Horizontal, i18n("Selection Mode"), this );
-  tqlayout->add (m_tabs);
+  layout->add (m_tabs);
 
   m_tabs->setRadioButtonExclusive( true );
   m_tabs->insert( rb1=new TQRadioButton( i18n("&Normal"), m_tabs ), 0 );
   m_tabs->insert( rb2=new TQRadioButton( i18n("&Persistent"), m_tabs ), 1 );
 
-  tqlayout->addStretch();
+  layout->addStretch();
 
   TQWhatsThis::add(rb1, i18n(
         "Selections will be overwritten by typed text and will be lost on "
@@ -712,7 +712,7 @@ KateViewDefaultsConfig::KateViewDefaultsConfig(TQWidget *parent)
         "you to set a maximum width of the screen, as a percentage, after which "
         "dynamically wrapped lines will no longer be vertically aligned.  For "
         "example, at 50%, lines whose indentation levels are deeper than 50% of "
-        "the width of the screen will not have vertical tqalignment applied to "
+        "the width of the screen will not have vertical alignment applied to "
         "subsequent wrapped lines.</p>"));
   TQWhatsThis::add(m_line,i18n(
         "If this option is checked, every new view will display line numbers "
@@ -850,10 +850,10 @@ KateSaveConfigTab::KateSaveConfigTab( TQWidget *parent )
   : KateConfigPage( parent )
 {
   int configFlags = KateDocumentConfig::global()->configFlags();
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint() );
+  TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint() );
 
   TQVGroupBox *gbEnc = new TQVGroupBox(i18n("File Format"), this);
-  tqlayout->addWidget( gbEnc );
+  layout->addWidget( gbEnc );
 
   TQHBox *e5Layout = new TQHBox(gbEnc);
   TQLabel *e5Label = new TQLabel(i18n("&Encoding:"), e5Layout);
@@ -872,7 +872,7 @@ KateSaveConfigTab::KateSaveConfigTab( TQWidget *parent )
   m_eol->insertItem (i18n("Macintosh"));
 
   TQVGroupBox *gbMem = new TQVGroupBox(i18n("Memory Usage"), this);
-  tqlayout->addWidget( gbMem );
+  layout->addWidget( gbMem );
 
   e5Layout = new TQHBox(gbMem);
   e5Layout->setSpacing (32);
@@ -883,13 +883,13 @@ KateSaveConfigTab::KateSaveConfigTab( TQWidget *parent )
   blockCountLabel->setBuddy(blockCount);
 
   TQVGroupBox *gbWhiteSpace = new TQVGroupBox(i18n("Automatic Cleanups on Load/Save"), this);
-  tqlayout->addWidget( gbWhiteSpace );
+  layout->addWidget( gbWhiteSpace );
 
   removeSpaces = new TQCheckBox(i18n("Re&move trailing spaces"), gbWhiteSpace);
   removeSpaces->setChecked(configFlags & KateDocument::cfRemoveSpaces);
 
   TQVGroupBox *dirConfigBox = new TQVGroupBox(i18n("Folder Config File"), this);
-  tqlayout->addWidget( dirConfigBox );
+  layout->addWidget( dirConfigBox );
 
   dirSearchDepth = new KIntNumInput(KateDocumentConfig::global()->searchDirConfigDepth(), dirConfigBox);
   dirSearchDepth->setRange(-1, 64, 1, false);
@@ -897,7 +897,7 @@ KateSaveConfigTab::KateSaveConfigTab( TQWidget *parent )
   dirSearchDepth->setLabel(i18n("Se&arch depth for config file:"), AlignVCenter);
 
   TQGroupBox *gb = new TQGroupBox( 1, Qt::Horizontal, i18n("Backup on Save"), this );
-  tqlayout->addWidget( gb );
+  layout->addWidget( gb );
   cbLocalFiles = new TQCheckBox( i18n("&Local files"), gb );
   cbRemoteFiles = new TQCheckBox( i18n("&Remote files"), gb );
 
@@ -911,7 +911,7 @@ KateSaveConfigTab::KateSaveConfigTab( TQWidget *parent )
   leBuSuffix = new TQLineEdit( hbBuSuffix );
   lBuSuffix->setBuddy( leBuSuffix );
 
-  tqlayout->addStretch();
+  layout->addStretch();
 
   TQWhatsThis::add(removeSpaces, i18n(
         "The editor will automatically eliminate extra spaces at the ends of "
@@ -1257,11 +1257,11 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc)
  , hlData (0)
  , m_doc (doc)
 {
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint() );
+  TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint() );
 
   // hl chooser
   TQHBox *hbHl = new TQHBox( this );
-  tqlayout->add (hbHl);
+  layout->add (hbHl);
 
   hbHl->setSpacing( KDialog::spacingHint() );
   TQLabel *lHl = new TQLabel( i18n("H&ighlight:"), hbHl );
@@ -1278,7 +1278,7 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc)
   }
 
   TQGroupBox *gbInfo = new TQGroupBox( 1, Qt::Horizontal, i18n("Information"), this );
-  tqlayout->add (gbInfo);
+  layout->add (gbInfo);
 
   // author
   TQHBox *hb1 = new TQHBox( gbInfo);
@@ -1292,7 +1292,7 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc)
   license  = new TQLabel (hb2);
 
   TQGroupBox *gbProps = new TQGroupBox( 1, Qt::Horizontal, i18n("Properties"), this );
-  tqlayout->add (gbProps);
+  layout->add (gbProps);
 
   // file & mime types
   TQHBox *hbFE = new TQHBox( gbProps);
@@ -1317,9 +1317,9 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc)
 
   // download/new buttons
   TQHBox *hbBtns = new TQHBox( this );
-  tqlayout->add (hbBtns);
+  layout->add (hbBtns);
 
-  ((TQBoxLayout*)hbBtns->tqlayout())->addStretch(1); // hmm.
+  ((TQBoxLayout*)hbBtns->layout())->addStretch(1); // hmm.
   hbBtns->setSpacing( KDialog::spacingHint() );
   TQPushButton *btnDl = new TQPushButton(i18n("Do&wnload..."), hbBtns);
   connect( btnDl, TQT_SIGNAL(clicked()), this, TQT_SLOT(hlDownload()) );
@@ -1346,7 +1346,7 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc)
         "Click this button to download new or updated syntax highlight "
         "descriptions from the Kate website.") );
 
-  tqlayout->addStretch ();
+  layout->addStretch ();
 
   connect( wildcards, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) );
   connect( mimetypes, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) );
@@ -1388,10 +1388,10 @@ void KateHlConfigPage::hlChanged(int z)
     return;
   }
 
-  if ( !hlDataDict.tqfind( z ) )
+  if ( !hlDataDict.find( z ) )
     hlDataDict.insert( z, hl->getData() );
 
-  hlData = hlDataDict.tqfind( z );
+  hlData = hlDataDict.find( z );
   wildcards->setText(hlData->wildcards);
   mimetypes->setText(hlData->mimetypes);
   priority->setValue(hlData->priority);
@@ -1737,4 +1737,4 @@ void KateModOnHdPrompt::slotUser1()
 
 //END KateModOnHdPrompt
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katedialogs.h b/kate/part/katedialogs.h
index e38c6c986..aa6f21f6d 100644
--- a/kate/part/katedialogs.h
+++ b/kate/part/katedialogs.h
@@ -253,7 +253,7 @@ class KateSaveConfigTab : public KateConfigPage
   protected:
   KComboBox *m_encoding, *m_eol;
   TQCheckBox *cbLocalFiles, *cbRemoteFiles;
-  TQCheckBox *tqreplaceTabs, *removeSpaces, *allowEolDetection;
+  TQCheckBox *replaceTabs, *removeSpaces, *allowEolDetection;
   TQLineEdit *leBuPrefix;
   TQLineEdit *leBuSuffix;
   KIntNumInput *dirSearchDepth;
@@ -371,7 +371,7 @@ class KateModOnHdPrompt : public KDialogBase
 {
   Q_OBJECT
   public:
-    enum tqStatus {
+    enum Status {
       Reload=1, // 0 is KDialogBase::Cancel
       Save,
       Overwrite,
diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp
index 77baa7bf0..fe5e22b1d 100644
--- a/kate/part/katedocument.cpp
+++ b/kate/part/katedocument.cpp
@@ -91,7 +91,7 @@ class KatePartPluginItem
 // KateDocument Constructor
 //
 KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView,
-                             bool bReadOnly, TQWidget *tqparentWidget,
+                             bool bReadOnly, TQWidget *parentWidget,
                              const char *widgetName, TQObject *parent, const char *name)
 : Kate::Document(parent, name),
   m_plugins (KateFactory::self()->plugins().count()),
@@ -214,7 +214,7 @@ KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView,
   // if single view mode, like in the konqui embedding, create a default view ;)
   if ( m_bSingleViewMode )
   {
-    KTextEditor::View *view = createView( tqparentWidget, widgetName );
+    KTextEditor::View *view = createView( parentWidget, widgetName );
     insertChildClient( view );
     view->show();
     setWidget( view );
@@ -700,7 +700,7 @@ bool KateDocument::insertText( uint line, uint col, const TQString &s, bool bloc
 
   TQString buf;
 
-  bool tqreplacetabs = ( config()->configFlags() & KateDocumentConfig::cfReplaceTabsDyn && ! m_isInUndo );
+  bool replacetabs = ( config()->configFlags() & KateDocumentConfig::cfReplaceTabsDyn && ! m_isInUndo );
   uint tw = config()->tabWidth();
   uint insertPosExpanded = insertPos;
   KateTextLine::Ptr l = m_buffer->line( line );
@@ -734,7 +734,7 @@ bool KateDocument::insertText( uint line, uint col, const TQString &s, bool bloc
     }
     else
     {
-      if ( tqreplacetabs && ch == '\t' )
+      if ( replacetabs && ch == '\t' )
       {
         uint tr = tw - ( insertPosExpanded+buf.length() )%tw;
         for ( uint i=0; i < tr; i++ )
@@ -1092,7 +1092,7 @@ bool KateDocument::wrapText (uint startLine, uint endLine)
       // Scan backwards looking for a place to break the line
       // We are not interested in breaking at the first char
       // of the line (if it is a space), but we are at the second
-      // anders: if we can't tqfind a space, try breaking on a word
+      // anders: if we can't find a space, try breaking on a word
       // boundry, using KateHighlight::canBreakAt().
       // This could be a priority (setting) in the hl/filetype/document
       int z = 0;
@@ -1176,10 +1176,10 @@ bool KateDocument::editInsertText ( uint line, uint col, const TQString &str )
       uint tw = config()->tabWidth();
       int pos = 0;
       uint l = 0;
-      while ( (pos = s.tqfind('\t')) > -1 )
+      while ( (pos = s.find('\t')) > -1 )
       {
         l = tw - ( (col + pos)%tw );
-        s.tqreplace( pos, 1, TQString().fill( ' ', l ) );
+        s.replace( pos, 1, TQString().fill( ' ', l ) );
       }
     }
 
@@ -1187,7 +1187,7 @@ bool KateDocument::editInsertText ( uint line, uint col, const TQString &str )
 
   editAddUndo (KateUndoGroup::editInsertText, line, col, s.length(), s);
 
-  l->insertText (col, s.length(), s.tqunicode());
+  l->insertText (col, s.length(), s.unicode());
 //   removeTrailingSpace(line); // ### nessecary?
 
   m_buffer->changeLine(line);
@@ -1410,7 +1410,7 @@ bool KateDocument::editInsertLine ( uint line, const TQString &s )
   removeTrailingSpace( line ); // old line
 
   KateTextLine::Ptr tl = new KateTextLine();
-  tl->insertText (0, s.length(), s.tqunicode(), 0);
+  tl->insertText (0, s.length(), s.unicode(), 0);
   m_buffer->insertLine(line, tl);
   m_buffer->changeLine(line);
 
@@ -1568,7 +1568,7 @@ void KateDocument::updateModified()
       lastRedoGroupWhenSavedIsLastUndo     BIT 7
       lastRedoGroupWhenSavedIsLastRedo     BIT 8
 
-    If you tqfind a new pattern, please add it to the patterns array
+    If you find a new pattern, please add it to the patterns array
   */
 
   unsigned char currentPattern = 0;
@@ -1833,7 +1833,7 @@ bool KateDocument::searchText (unsigned int startLine, unsigned int startCol, co
 
 uint KateDocument::hlMode ()
 {
-  return KateHlManager::self()->tqfindHl(highlight());
+  return KateHlManager::self()->findHl(highlight());
 }
 
 bool KateDocument::setHlMode (uint mode)
@@ -2050,7 +2050,7 @@ void KateDocument::clearMark( uint line )
   emit marksChanged();
   delete mark;
   tagLines( line, line );
-  tqrepaintViews(true);
+  repaintViews(true);
 }
 
 void KateDocument::addMark( uint line, uint markType )
@@ -2087,7 +2087,7 @@ void KateDocument::addMark( uint line, uint markType )
 
   emit marksChanged();
   tagLines( line, line );
-  tqrepaintViews(true);
+  repaintViews(true);
 }
 
 void KateDocument::removeMark( uint line, uint markType )
@@ -2119,7 +2119,7 @@ void KateDocument::removeMark( uint line, uint markType )
 
   emit marksChanged();
   tagLines( line, line );
-  tqrepaintViews(true);
+  repaintViews(true);
 }
 
 TQPtrList<KTextEditor::Mark> KateDocument::marks()
@@ -2146,17 +2146,17 @@ void KateDocument::clearMarks()
   m_marks.clear();
 
   emit marksChanged();
-  tqrepaintViews(true);
+  repaintViews(true);
 }
 
 void KateDocument::setPixmap( MarkInterface::MarkTypes type, const TQPixmap& pixmap )
 {
-  m_markPixmaps.tqreplace( type, new TQPixmap( pixmap ) );
+  m_markPixmaps.replace( type, new TQPixmap( pixmap ) );
 }
 
 void KateDocument::setDescription( MarkInterface::MarkTypes type, const TQString& description )
 {
-  m_markDescriptions.tqreplace( type, new TQString( description ) );
+  m_markDescriptions.replace( type, new TQString( description ) );
 }
 
 TQPixmap *KateDocument::markPixmap( MarkInterface::MarkTypes type )
@@ -2254,7 +2254,7 @@ KMimeType::Ptr KateDocument::mimeTypeForContent()
   buf.resize( bufpos );
 
   int accuracy = 0;
-  return KMimeType::tqfindByContent( buf, &accuracy );
+  return KMimeType::findByContent( buf, &accuracy );
 }
 //END KTextEditor::DocumentInfoInterface
 
@@ -2316,7 +2316,7 @@ bool KateDocument::openURL( const KURL &url )
       w = m_views.first();
 
     if (w)
-      m_job->setWindow (w->tqtopLevelWidget());
+      m_job->setWindow (w->topLevelWidget());
 
     emit started( m_job );
 
@@ -2395,7 +2395,7 @@ bool KateDocument::openFile(KIO::Job * job)
   // service type magic to get encoding right
   //
   TQString serviceType = m_extension->urlArgs().serviceType.simplifyWhiteSpace();
-  int pos = serviceType.tqfind(';');
+  int pos = serviceType.find(';');
   if (pos != -1)
     setEncoding (serviceType.mid(pos+1));
 
@@ -2589,7 +2589,7 @@ bool KateDocument::saveFile()
   //
   if (!m_buffer->canEncode ()
        && (KMessageBox::warningContinueCancel(0,
-           i18n("The selected encoding cannot encode every tqunicode character in this document. Do you really want to save it? There could be some data lost."),i18n("Possible Data Loss"),i18n("Save Nevertheless")) != KMessageBox::Continue))
+           i18n("The selected encoding cannot encode every unicode character in this document. Do you really want to save it? There could be some data lost."),i18n("Possible Data Loss"),i18n("Save Nevertheless")) != KMessageBox::Continue))
   {
     return false;
   }
@@ -2872,7 +2872,7 @@ void KateDocument::makeAttribs(bool needInvalidate)
     m_views.at(z)->renderer()->updateAttributes ();
 
   if (needInvalidate)
-    m_buffer->tqinvalidateHighlighting();
+    m_buffer->invalidateHighlighting();
 
   tagAll ();
 }
@@ -2934,7 +2934,7 @@ void KateDocument::removeSuperCursor(KateSuperCursor *cursor, bool privateC) {
 
 bool KateDocument::ownedView(KateView *view) {
   // do we own the given view?
-  return (m_views.tqcontainsRef(view) > 0);
+  return (m_views.containsRef(view) > 0);
 }
 
 bool KateDocument::isLastView(int numViews) {
@@ -3195,7 +3195,7 @@ void KateDocument::backspace( KateView *view, const KateTextCursor& c )
       if (!textLine)
         return;
 
-      if (config()->wordWrap() && textLine->endingWith(TQString::tqfromLatin1(" ")))
+      if (config()->wordWrap() && textLine->endingWith(TQString::fromLatin1(" ")))
       {
         // gg: in hard wordwrap mode, backspace must also eat the trailing space
         removeText (line-1, textLine->length()-1, line, 0);
@@ -3232,7 +3232,7 @@ void KateDocument::paste ( KateView* view )
   if (s.isEmpty())
     return;
 
-  uint lines = s.tqcontains (TQChar ('\n'));
+  uint lines = s.contains (TQChar ('\n'));
 
   m_undoDontMerge = true;
 
@@ -3399,11 +3399,11 @@ void KateDocument::optimizeLeadingSpace(uint line, int flags, int change)
     }
   }
 
-  //kdDebug(13020)  << "tqreplace With Op: " << line << " " << first_char << " " << space << endl;
-  tqreplaceWithOptimizedSpace(line, first_char, space, flags);
+  //kdDebug(13020)  << "replace With Op: " << line << " " << first_char << " " << space << endl;
+  replaceWithOptimizedSpace(line, first_char, space, flags);
 }
 
-void KateDocument::tqreplaceWithOptimizedSpace(uint line, uint upto_column, uint space, int flags)
+void KateDocument::replaceWithOptimizedSpace(uint line, uint upto_column, uint space, int flags)
 {
   uint length;
   TQString new_space;
@@ -3908,7 +3908,7 @@ void KateDocument::comment( KateView *v, uint line,uint column, int change)
         kdDebug(13020)<<"easy approach for uncommenting did not work, trying harder (folding tree)"<<endl;
         int commentRegion=(highlight()->commentRegion(startAttrib));
         if (commentRegion){
-           KateCodeFoldingNode *n=foldingTree()->tqfindNodeForPosition(line,column);
+           KateCodeFoldingNode *n=foldingTree()->findNodeForPosition(line,column);
            if (n) {
             KateTextCursor start,end;
              if ((n->nodeType()==commentRegion) && n->getBegin(foldingTree(), &start) && n->getEnd(foldingTree(), &end)) {
@@ -4112,10 +4112,10 @@ void KateDocument::tagLines(KateTextCursor start, KateTextCursor end)
     m_views.at(z)->tagLines(start, end, true);
 }
 
-void KateDocument::tqrepaintViews(bool paintOnlyDirty)
+void KateDocument::repaintViews(bool paintOnlyDirty)
 {
   for (uint z = 0; z < m_views.count(); z++)
-    m_views.at(z)->tqrepaintText(paintOnlyDirty);
+    m_views.at(z)->repaintText(paintOnlyDirty);
 }
 
 void KateDocument::tagAll()
@@ -4157,7 +4157,7 @@ void KateDocument::newBracketMark( const KateTextCursor& cursor, KateBracketRang
 
   bm.start() = cursor;
 
-  if( !tqfindMatchingBracket( bm.start(), bm.end(), maxLines ) )
+  if( !findMatchingBracket( bm.start(), bm.end(), maxLines ) )
     return;
 
   bm.setValid(true);
@@ -4168,7 +4168,7 @@ void KateDocument::newBracketMark( const KateTextCursor& cursor, KateBracketRang
   bm.setIndentMin(kMin(indentStart, indentEnd));
 }
 
-bool KateDocument::tqfindMatchingBracket( KateTextCursor& start, KateTextCursor& end, int maxLines )
+bool KateDocument::findMatchingBracket( KateTextCursor& start, KateTextCursor& end, int maxLines )
 {
   KateTextLine::Ptr textLine = m_buffer->plainLine( start.line() );
   if( !textLine )
@@ -4634,7 +4634,7 @@ void KateDocument::readVariableLine( TQString t, bool onlyViewAndRenderer )
 {
   // simple check first, no regex
   // no kate inside, no vars, simple...
-  if (t.tqfind("kate") < 0)
+  if (t.find("kate") < 0)
     return;
 
   // found vars, if any
@@ -4672,7 +4672,7 @@ void KateDocument::readVariableLine( TQString t, bool onlyViewAndRenderer )
     TQStringList types (TQStringList::split(';', kvLineMime.cap(1)));
 
     // no matching type found
-    if (!types.tqcontains (mimeType ()))
+    if (!types.contains (mimeType ()))
       return;
 
     s = kvLineMime.cap(2);
@@ -4708,7 +4708,7 @@ void KateDocument::readVariableLine( TQString t, bool onlyViewAndRenderer )
     // only apply view & renderer config stuff
     if (onlyViewAndRenderer)
     {
-      if ( vvl.tqcontains( var ) ) // FIXME define above
+      if ( vvl.contains( var ) ) // FIXME define above
         setViewVariable( var, val );
     }
     else
@@ -4722,7 +4722,7 @@ void KateDocument::readVariableLine( TQString t, bool onlyViewAndRenderer )
       // FIXME should this be optimized to only a few calls? how?
       else if ( var == "backspace-indents" && checkBoolValue( val, &state ) )
         m_config->setConfigFlags( KateDocumentConfig::cfBackspaceIndents, state );
-      else if ( var == "tqreplace-tabs" && checkBoolValue( val, &state ) )
+      else if ( var == "replace-tabs" && checkBoolValue( val, &state ) )
         m_config->setConfigFlags( KateDocumentConfig::cfReplaceTabsDyn, state );
       else if ( var == "remove-trailing-space" && checkBoolValue( val, &state ) )
         m_config->setConfigFlags( KateDocumentConfig::cfRemoveTrailingDyn, state );
@@ -4744,7 +4744,7 @@ void KateDocument::readVariableLine( TQString t, bool onlyViewAndRenderer )
         m_config->setConfigFlags( KateDocumentConfig::cfSpaceIndent, state );
       else if ( var == "smart-home" && checkBoolValue( val, &state ) )
         m_config->setConfigFlags( KateDocumentConfig::cfSmartHome, state );
-      else if ( var == "tqreplace-trailing-space-save" && checkBoolValue( val, &state ) )
+      else if ( var == "replace-trailing-space-save" && checkBoolValue( val, &state ) )
         m_config->setConfigFlags( KateDocumentConfig::cfRemoveSpaces, state );
       else if ( var == "auto-insert-doxygen" && checkBoolValue( val, &state) )
         m_config->setConfigFlags( KateDocumentConfig::cfDoxygenAutoTyping, state);
@@ -4773,7 +4773,7 @@ void KateDocument::readVariableLine( TQString t, bool onlyViewAndRenderer )
       {
         TQStringList l;
         l << "unix" << "dos" << "mac";
-        if ( (n = l.tqfindIndex( val.lower() )) != -1 )
+        if ( (n = l.findIndex( val.lower() )) != -1 )
           m_config->setEol( n );
       }
       else if ( var == "encoding" )
@@ -4791,7 +4791,7 @@ void KateDocument::readVariableLine( TQString t, bool onlyViewAndRenderer )
       }
 
       // VIEW SETTINGS
-      else if ( vvl.tqcontains( var ) )
+      else if ( vvl.contains( var ) )
         setViewVariable( var, val );
       else
       {
@@ -4862,14 +4862,14 @@ bool KateDocument::checkBoolValue( TQString val, bool *result )
   val = val.stripWhiteSpace().lower();
   TQStringList l;
   l << "1" << "on" << "true";
-  if ( l.tqcontains( val ) )
+  if ( l.contains( val ) )
   {
     *result = true;
     return true;
   }
   l.clear();
   l << "0" << "off" << "false";
-  if ( l.tqcontains( val ) )
+  if ( l.contains( val ) )
   {
     *result = false;
     return true;
@@ -4893,7 +4893,7 @@ bool KateDocument::checkColorValue( TQString val, TQColor &c )
 // KTextEditor::variable
 TQString KateDocument::variable( const TQString &name ) const
 {
-  if ( m_storedVariables.tqcontains( name ) )
+  if ( m_storedVariables.contains( name ) )
     return m_storedVariables[ name ];
 
   return "";
@@ -5172,4 +5172,4 @@ bool KateDocument::toggleBlockSelectionMode ()
 
 //END DEPRECATED STUFF
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katedocument.h b/kate/part/katedocument.h
index ec1de9f9c..46e9e87f8 100644
--- a/kate/part/katedocument.h
+++ b/kate/part/katedocument.h
@@ -91,7 +91,7 @@ class KateDocument : public Kate::Document,
 
   public:
     KateDocument (bool bSingleViewMode=false, bool bBrowserView=false, bool bReadOnly=false,
-        TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject * = 0, const char * = 0);
+        TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject * = 0, const char * = 0);
     ~KateDocument ();
 
     bool closeURL();
@@ -608,7 +608,7 @@ class KateDocument : public Kate::Document,
     void setConfigFlags (uint flags);
 
     // Repaint all of all of the views
-    void tqrepaintViews(bool paintOnlyDirty = true);
+    void repaintViews(bool paintOnlyDirty = true);
 
     inline KateHighlighting *highlight () { return m_buffer->highlight(); }
 
@@ -671,7 +671,7 @@ class KateDocument : public Kate::Document,
 
   private:
     void optimizeLeadingSpace( uint line, int flags, int change );
-    void tqreplaceWithOptimizedSpace( uint line, uint upto_column, uint space, int flags );
+    void replaceWithOptimizedSpace( uint line, uint upto_column, uint space, int flags );
 
     bool removeStringFromBegining(int line, TQString &str);
     bool removeStringFromEnd(int line, TQString &str);
@@ -749,7 +749,7 @@ class KateDocument : public Kate::Document,
     void tagAll();
 
     void newBracketMark( const KateTextCursor& start, KateBracketRange& bm, int maxLines = -1 );
-    bool tqfindMatchingBracket( KateTextCursor& start, KateTextCursor& end, int maxLines = -1 );
+    bool findMatchingBracket( KateTextCursor& start, KateTextCursor& end, int maxLines = -1 );
 
   private:
     void guiActivateEvent( KParts::GUIActivateEvent *ev );
@@ -1069,5 +1069,5 @@ class KateDocument : public Kate::Document,
 
 #endif
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
 
diff --git a/kate/part/katedocumenthelpers.cpp b/kate/part/katedocumenthelpers.cpp
index a4c41c45d..370be7684 100644
--- a/kate/part/katedocumenthelpers.cpp
+++ b/kate/part/katedocumenthelpers.cpp
@@ -53,4 +53,4 @@ void KateBrowserExtension::slotSelectionChanged()
     emit enableAction( "copy", m_doc->activeView()->hasSelection() );
 }
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katefactory.cpp b/kate/part/katefactory.cpp
index 1fbe67015..64bde8718 100644
--- a/kate/part/katefactory.cpp
+++ b/kate/part/katefactory.cpp
@@ -48,7 +48,7 @@ class KateFactoryPublic : public KParts::Factory
   public:
     /**
      * reimplemented create object method
-     * @param tqparentWidget parent widget
+     * @param parentWidget parent widget
      * @param widgetName widget name
      * @param parent TQObject parent
      * @param name object name
@@ -56,9 +56,9 @@ class KateFactoryPublic : public KParts::Factory
      * @param args additional arguments
      * @return constructed part object
      */
-    KParts::Part *createPartObject ( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args )
+    KParts::Part *createPartObject ( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args )
     {
-      return KateFactory::self()->createPartObject (tqparentWidget, widgetName, parent, name, classname, args);
+      return KateFactory::self()->createPartObject (parentWidget, widgetName, parent, name, classname, args);
     }
 };
 
@@ -206,14 +206,14 @@ KateFactory *KateFactory::self ()
   return s_self;
 }
 
-KParts::Part *KateFactory::createPartObject ( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *_classname, const TQStringList & )
+KParts::Part *KateFactory::createPartObject ( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *_classname, const TQStringList & )
 {
   TQCString classname( _classname );
   bool bWantSingleView = ( classname != "KTextEditor::Document" && classname != "Kate::Document" );
   bool bWantBrowserView = ( classname == "Browser/View" );
   bool bWantReadOnly = (bWantBrowserView || ( classname == "KParts::ReadOnlyPart" ));
 
-  KParts::ReadWritePart *part = new KateDocument (bWantSingleView, bWantBrowserView, bWantReadOnly, tqparentWidget, widgetName, parent, name);
+  KParts::ReadWritePart *part = new KateDocument (bWantSingleView, bWantBrowserView, bWantReadOnly, parentWidget, widgetName, parent, name);
   part->setReadWrite( !bWantReadOnly );
 
   return part;
@@ -273,4 +273,4 @@ KateIndentScript KateFactory::indentScript (const TQString &scriptname)
   return result;
 }
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katefactory.h b/kate/part/katefactory.h
index 1b37b20e2..0fd939ce3 100644
--- a/kate/part/katefactory.h
+++ b/kate/part/katefactory.h
@@ -71,7 +71,7 @@ class KateFactory
 
     /**
      * reimplemented create object method
-     * @param tqparentWidget parent widget
+     * @param parentWidget parent widget
      * @param widgetName widget name
      * @param parent TQObject parent
      * @param name object name
@@ -79,7 +79,7 @@ class KateFactory
      * @param args additional arguments
      * @return constructed part object
      */
-    KParts::Part *createPartObject ( TQWidget *tqparentWidget, const char *widgetName,
+    KParts::Part *createPartObject ( TQWidget *parentWidget, const char *widgetName,
                                      TQObject *parent, const char *name, const char *classname,
                                      const TQStringList &args );
 
@@ -309,4 +309,4 @@ class KateFactory
 
 #endif
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katefiletype.cpp b/kate/part/katefiletype.cpp
index 269e9972b..11d5e9a46 100644
--- a/kate/part/katefiletype.cpp
+++ b/kate/part/katefiletype.cpp
@@ -126,7 +126,7 @@ void KateFileTypeManager::save (TQPtrList<KateFileType> *v)
 
   for (uint z=0; z < g.count(); z++)
   {
-    if (newg.tqfindIndex (g[z]) == -1)
+    if (newg.findIndex (g[z]) == -1)
       config.deleteGroup (g[z]);
   }
 
@@ -187,7 +187,7 @@ int KateFileTypeManager::fileType (KateDocument *doc)
 
   for (uint z=0; z < m_types.count(); z++)
   {
-    if (m_types.at(z)->mimetypes.tqfindIndex (mt->name()) > -1)
+    if (m_types.at(z)->mimetypes.findIndex (mt->name()) > -1)
       types.append (m_types.at(z));
   }
 
@@ -264,11 +264,11 @@ KateFileTypeConfigTab::KateFileTypeConfigTab( TQWidget *parent )
   m_types.setAutoDelete (true);
   m_lastType = 0;
 
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint() );
+  TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint() );
 
   // hl chooser
   TQHBox *hbHl = new TQHBox( this );
-  tqlayout->add (hbHl);
+  layout->add (hbHl);
   hbHl->setSpacing( KDialog::spacingHint() );
   TQLabel *lHl = new TQLabel( i18n("&Filetype:"), hbHl );
   typeCombo = new TQComboBox( false, hbHl );
@@ -283,7 +283,7 @@ KateFileTypeConfigTab::KateFileTypeConfigTab( TQWidget *parent )
   connect( btndel, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteType()) );
 
   gbProps = new TQGroupBox( 2, Qt::Horizontal, i18n("Properties"), this );
-  tqlayout->add (gbProps);
+  layout->add (gbProps);
 
   // file & mime types
   TQLabel *lname = new TQLabel( i18n("N&ame:"), gbProps );
@@ -318,7 +318,7 @@ KateFileTypeConfigTab::KateFileTypeConfigTab( TQWidget *parent )
   priority = new KIntNumInput( gbProps );
   lprio->setBuddy( priority );
 
-  tqlayout->addStretch();
+  layout->addStretch();
 
   reload();
 
@@ -341,12 +341,12 @@ KateFileTypeConfigTab::KateFileTypeConfigTab( TQWidget *parent )
       "configuration option, such as highlight, indent-mode, encoding, etc.</p>"
       "<p>For a full list of known variables, see the manual.</p>") );
   TQWhatsThis::add( wildcards, i18n(
-      "The wildcards tqmask allows you to select files by filename. A typical "
-      "tqmask uses an asterisk and the file extension, for example "
+      "The wildcards mask allows you to select files by filename. A typical "
+      "mask uses an asterisk and the file extension, for example "
       "<code>*.txt; *.text</code>. The string is a semicolon-separated list "
-      "of tqmasks.") );
+      "of masks.") );
   TQWhatsThis::add( mimetypes, i18n(
-      "The mime type tqmask allows you to select files by mimetype. The string is "
+      "The mime type mask allows you to select files by mimetype. The string is "
       "a semicolon-separated list of mimetypes, for example "
       "<code>text/plain; text/english</code>.") );
   TQWhatsThis::add( btnMTW, i18n(
@@ -539,9 +539,9 @@ void KateViewFileTypeAction::slotAboutToShow()
     TQString hlName = KateFactory::self()->fileTypeManager()->list()->at(z)->name;
     TQString hlSection = KateFactory::self()->fileTypeManager()->list()->at(z)->section;
 
-    if ( !hlSection.isEmpty() && (names.tqcontains(hlName) < 1) )
+    if ( !hlSection.isEmpty() && (names.contains(hlName) < 1) )
     {
-      if (subMenusName.tqcontains(hlSection) < 1)
+      if (subMenusName.contains(hlSection) < 1)
       {
         subMenusName << hlSection;
         TQPopupMenu *menu = new TQPopupMenu ();
@@ -549,11 +549,11 @@ void KateViewFileTypeAction::slotAboutToShow()
         popupMenu()->insertItem (hlSection, menu);
       }
 
-      int m = subMenusName.tqfindIndex (hlSection);
+      int m = subMenusName.findIndex (hlSection);
       names << hlName;
       subMenus.at(m)->insertItem ( hlName, this, TQT_SLOT(setType(int)), 0,  z+1);
     }
-    else if (names.tqcontains(hlName) < 1)
+    else if (names.contains(hlName) < 1)
     {
       names << hlName;
       popupMenu()->insertItem ( hlName, this, TQT_SLOT(setType(int)), 0,  z+1);
@@ -576,7 +576,7 @@ void KateViewFileTypeAction::slotAboutToShow()
     const KateFileType *t = 0;
     if ((t = KateFactory::self()->fileTypeManager()->fileType (doc->fileType())))
     {
-      int i = subMenusName.tqfindIndex (t->section);
+      int i = subMenusName.findIndex (t->section);
       if (i >= 0 && subMenus.at(i))
         subMenus.at(i)->setItemChecked (doc->fileType()+1, true);
       else
@@ -593,4 +593,4 @@ void KateViewFileTypeAction::setType (int mode)
     doc->updateFileType(mode-1, true);
 }
 //END KateViewFileTypeAction
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katefont.cpp b/kate/part/katefont.cpp
index 26a86196c..361ce5cce 100644
--- a/kate/part/katefont.cpp
+++ b/kate/part/katefont.cpp
@@ -124,4 +124,4 @@ void KateFontStruct::setFont (const TQFont & font)
   updateFontData ();
 }
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp
index 20270bdfd..50c941c15 100644
--- a/kate/part/katehighlight.cpp
+++ b/kate/part/katehighlight.cpp
@@ -65,10 +65,10 @@ static const int KATE_DYNAMIC_CONTEXTS_RESET_DELAY = 30 * 1000;
 
 inline bool kateInsideString (const TQString &str, TQChar ch)
 {
-  const TQChar *tqunicode = str.tqunicode();
+  const TQChar *unicode = str.unicode();
   const uint len = str.length();
   for (uint i=0; i < len; i++)
-    if (tqunicode[i] == ch)
+    if (unicode[i] == ch)
       return true;
 
   return false;
@@ -445,17 +445,17 @@ void KateHlItem::dynamicSubstitute(TQString &str, const TQStringList *args)
     {
       char c = str[i + 1].latin1();
       if (c == '%')
-        str.tqreplace(i, 1, "");
+        str.replace(i, 1, "");
       else if (c >= '0' && c <= '9')
       {
         if ((uint)(c - '0') < args->size())
         {
-          str.tqreplace(i, 2, (*args)[c - '0']);
+          str.replace(i, 2, (*args)[c - '0']);
           i += ((*args)[c - '0']).length() - 1;
         }
         else
         {
-          str.tqreplace(i, 2, "");
+          str.replace(i, 2, "");
           --i;
         }
       }
@@ -661,7 +661,7 @@ int KateHlKeyword::checkHgl(const TQString& text, int offset, int len)
 
   if (wordLen < minLen) return 0;
 
-  if ( dict[wordLen] && dict[wordLen]->tqfind(TQConstString(text.tqunicode() + offset, wordLen).string()) )
+  if ( dict[wordLen] && dict[wordLen]->find(TQConstString(text.unicode() + offset, wordLen).string()) )
     return offset2;
 
   return 0;
@@ -968,7 +968,7 @@ KateHlItem *KateHlRegExpr::clone(const TQStringList *args)
 
   for (TQStringList::Iterator it = escArgs.begin(); it != escArgs.end(); ++it)
   {
-    (*it).tqreplace(TQRegExp("(\\W)"), "\\\\1");
+    (*it).replace(TQRegExp("(\\W)"), "\\\\1");
   }
 
   dynamicSubstitute(regexp, &escArgs);
@@ -1035,7 +1035,7 @@ static int checkEscapedChar(const TQString& text, int offset, int& len)
         offset++; // eat the x
         len--;
         // these for loops can probably be
-        // tqreplaced with something else but
+        // replaced with something else but
         // for right now they work
         // check for hexdigits
         for (i = 0; (len > 0) && (i < 2) && (text[offset] >= '0' && text[offset] <= '9' || (text[offset] & 0xdf) >= 'A' && (text[offset] & 0xdf) <= 'F'); i++)
@@ -1293,7 +1293,7 @@ int KateHighlighting::makeDynamicContext(KateHlContext *model, const TQStringLis
   QPair<KateHlContext *, TQString> key(model, args->front());
   short value;
 
-  if (dynamicCtxs.tqcontains(key))
+  if (dynamicCtxs.contains(key))
     value = dynamicCtxs[key];
   else
   {
@@ -1367,7 +1367,7 @@ void KateHighlighting::doHighlight ( KateTextLine *prevLine,
   }
   else
   {
-    // There does an old context stack exist -> tqfind the context at the line start
+    // There does an old context stack exist -> find the context at the line start
     ctxNum = ctx[ctx.size()-1]; //context ID of the last character in the previous line
 
     //kdDebug(13010) << "\t\tctxNum = " << ctxNum << " contextList[ctxNum] = " << contextList[ctxNum] << endl; // ellis
@@ -1931,12 +1931,12 @@ KateHlItem *KateHighlighting::createKateHlItem(KateSyntaxContextData *data,
 
   if (!beginRegionStr.isEmpty())
   {
-    regionId = RegionList->tqfindIndex(beginRegionStr);
+    regionId = RegionList->findIndex(beginRegionStr);
 
     if (regionId==-1) // if the region name doesn't already exist, add it to the list
     {
       (*RegionList)<<beginRegionStr;
-      regionId = RegionList->tqfindIndex(beginRegionStr);
+      regionId = RegionList->findIndex(beginRegionStr);
     }
 
     regionId++;
@@ -1946,12 +1946,12 @@ KateHlItem *KateHighlighting::createKateHlItem(KateSyntaxContextData *data,
 
   if (!endRegionStr.isEmpty())
   {
-    regionId2 = RegionList->tqfindIndex(endRegionStr);
+    regionId2 = RegionList->findIndex(endRegionStr);
 
     if (regionId2==-1) // if the region name doesn't already exist, add it to the list
     {
       (*RegionList)<<endRegionStr;
-      regionId2 = RegionList->tqfindIndex(endRegionStr);
+      regionId2 = RegionList->findIndex(endRegionStr);
     }
 
     regionId2 = -regionId2 - 1;
@@ -2030,7 +2030,7 @@ KateHlItem *KateHighlighting::createKateHlItem(KateSyntaxContextData *data,
                                              m_additionalData[ buildIdentifier ]->deliminator);
 
     //Get the entries for the keyword lookup list
-    keyword->addList(KateHlManager::self()->syntax->tqfinddata("highlighting",stringdata));
+    keyword->addList(KateHlManager::self()->syntax->finddata("highlighting",stringdata));
     tmpItem=keyword;
   }
   else if (dataname=="Float") tmpItem= (new KateHlFloat(attr,context,regionId,regionId2));
@@ -2072,7 +2072,7 @@ KateHlItem *KateHighlighting::createKateHlItem(KateSyntaxContextData *data,
 
 TQString KateHighlighting::hlKeyForAttrib( int i ) const
 {
-  // tqfind entry. This is faster than TQMap::tqfind. m_hlIndex always has an entry
+  // find entry. This is faster than TQMap::find. m_hlIndex always has an entry
   // for key '0' (it is "none"), so the result is always valid.
   int k = 0;
   TQMap<int,TQString>::const_iterator it = m_hlIndex.constEnd();
@@ -2088,14 +2088,14 @@ TQString KateHighlighting::hlKeyForAttrib( int i ) const
 
 bool KateHighlighting::isInWord( TQChar c, int attrib ) const
 {
-  return m_additionalData[ hlKeyForAttrib( attrib ) ]->deliminator.tqfind(c) < 0
+  return m_additionalData[ hlKeyForAttrib( attrib ) ]->deliminator.find(c) < 0
       && !c.isSpace() && c != '"' && c != '\'';
 }
 
 bool KateHighlighting::canBreakAt( TQChar c, int attrib ) const
 {
   static const TQString& sq = KGlobal::staticQString("\"'");
-  return (m_additionalData[ hlKeyForAttrib( attrib ) ]->wordWrapDeliminator.tqfind(c) != -1) && (sq.tqfind(c) == -1);
+  return (m_additionalData[ hlKeyForAttrib( attrib ) ]->wordWrapDeliminator.find(c) != -1) && (sq.find(c) == -1);
 }
 
 signed char KateHighlighting::commentRegion(int attr) const {
@@ -2206,7 +2206,7 @@ void KateHighlighting::readGlobalKeywordConfig()
     // remove any weakDelimitars (if any) from the default list and store this list.
     for (uint s=0; s < weakDeliminator.length(); s++)
     {
-      int f = deliminator.tqfind (weakDeliminator[s]);
+      int f = deliminator.find (weakDeliminator[s]);
 
       if (f > -1)
         deliminator.remove (f, 1);
@@ -2365,20 +2365,20 @@ int KateHighlighting::getIdFromString(TQStringList *ContextNameList, TQString tm
     }
   }
 
-  else if ( tmpLineEndContext.tqcontains("##"))
+  else if ( tmpLineEndContext.contains("##"))
   {
-    int o = tmpLineEndContext.tqfind("##");
+    int o = tmpLineEndContext.find("##");
     // FIXME at least with 'foo##bar'-style contexts the rules are picked up
     // but the default attribute is not
     TQString tmp=tmpLineEndContext.mid(o+2);
-    if (!embeddedHls.tqcontains(tmp))  embeddedHls.insert(tmp,KateEmbeddedHlInfo());
+    if (!embeddedHls.contains(tmp))  embeddedHls.insert(tmp,KateEmbeddedHlInfo());
     unres=tmp+':'+tmpLineEndContext.left(o);
     context=0;
   }
 
   else
   {
-    context=ContextNameList->tqfindIndex(buildPrefix+tmpLineEndContext);
+    context=ContextNameList->findIndex(buildPrefix+tmpLineEndContext);
     if (context==-1)
     {
       context=tmpLineEndContext.toInt();
@@ -2476,8 +2476,8 @@ void KateHighlighting::makeContextList()
     if (incCtx.endsWith(":")) {
       kdDebug(13010)<<"Looking up context0 for ruleset "<<incCtx<<endl;
       incCtx = incCtx.left(incCtx.length()-1);
-      //try to tqfind the context0 id for a given unresolvedReference
-      KateEmbeddedHlInfos::const_iterator hlIt=embeddedHls.tqfind(incCtx);
+      //try to find the context0 id for a given unresolvedReference
+      KateEmbeddedHlInfos::const_iterator hlIt=embeddedHls.find(incCtx);
       if (hlIt!=embeddedHls.end())
         *(unresIt.key())=hlIt.data().context0;
     }
@@ -2564,7 +2564,7 @@ void KateHighlighting::handleKateHlIncludeRulesRecursive(KateHlIncludeRules::ite
   KateHlIncludeRules::iterator it1=it;
   int ctx=(*it1)->ctx;
 
-  // tqfind the last entry for the given context in the KateHlIncludeRules list
+  // find the last entry for the given context in the KateHlIncludeRules list
   // this is need if one context includes more than one. This saves us from
   // updating all insert positions:
   // eg: context 0:
@@ -2765,7 +2765,7 @@ int KateHighlighting::addToContextList(const TQString &ident, int ctx0)
         // only context refernces of type Name, ##Name, and Subname##Name are allowed
         if (incCtx.startsWith("##") || (!incCtx.startsWith("#")))
         {
-          int incCtxi = incCtx.tqfind("##");
+          int incCtxi = incCtx.find("##");
           //#stay, #pop is not interesting here
           if (incCtxi >= 0)
           {
@@ -2777,7 +2777,7 @@ int KateHighlighting::addToContextList(const TQString &ident, int ctx0)
             KateHlIncludeRule *ir=new KateHlIncludeRule(i,m_contexts[i]->items.count(),incCtxN,includeAttrib);
 
             //use the same way to determine cross hl file references as other items do
-            if (!embeddedHls.tqcontains(incSet))
+            if (!embeddedHls.contains(incSet))
               embeddedHls.insert(incSet,KateEmbeddedHlInfo());
             else
               kdDebug(13010)<<"Skipping embeddedHls.insert for "<<incCtxN<<endl;
@@ -2850,7 +2850,7 @@ int KateHighlighting::addToContextList(const TQString &ident, int ctx0)
 
   //BEGIN Resolve multiline region if possible
   if (!m_additionalData[ ident ]->multiLineRegion.isEmpty()) {
-    long commentregionid=RegionList.tqfindIndex( m_additionalData[ ident ]->multiLineRegion );
+    long commentregionid=RegionList.findIndex( m_additionalData[ ident ]->multiLineRegion );
     if (-1==commentregionid) {
       errorsAndWarnings+=i18n(
           "<B>%1</B>: Specified multiline comment region (%2) could not be resolved<BR>"
@@ -3086,7 +3086,7 @@ int KateHlManager::realWildcardFind(const TQString &fileName)
       if (highlight->priority() > pri)
       {
         pri = highlight->priority();
-        hl = hlList.tqfindRef (highlight);
+        hl = hlList.findRef (highlight);
       }
     }
     return hl;
@@ -3124,7 +3124,7 @@ int KateHlManager::mimeFind( KateDocument *doc )
       if (highlight->priority() > pri)
       {
         pri = highlight->priority();
-        hl = hlList.tqfindRef (highlight);
+        hl = hlList.findRef (highlight);
       }
     }
 
@@ -3421,9 +3421,9 @@ void KateViewHighlightAction::slotAboutToShow()
 
     if (!KateHlManager::self()->hlHidden(z))
     {
-      if ( !hlSection.isEmpty() && (names.tqcontains(hlName) < 1) )
+      if ( !hlSection.isEmpty() && (names.contains(hlName) < 1) )
       {
-        if (subMenusName.tqcontains(hlSection) < 1)
+        if (subMenusName.contains(hlSection) < 1)
         {
           subMenusName << hlSection;
           TQPopupMenu *menu = new TQPopupMenu ();
@@ -3431,11 +3431,11 @@ void KateViewHighlightAction::slotAboutToShow()
           popupMenu()->insertItem ( '&' + hlSection, menu);
         }
 
-        int m = subMenusName.tqfindIndex (hlSection);
+        int m = subMenusName.findIndex (hlSection);
         names << hlName;
         subMenus.at(m)->insertItem ( '&' + hlName, this, TQT_SLOT(setHl(int)), 0,  z);
       }
-      else if (names.tqcontains(hlName) < 1)
+      else if (names.contains(hlName) < 1)
       {
         names << hlName;
         popupMenu()->insertItem ( '&' + hlName, this, TQT_SLOT(setHl(int)), 0,  z);
@@ -3454,7 +3454,7 @@ void KateViewHighlightAction::slotAboutToShow()
   }
   popupMenu()->setItemChecked (0, false);
 
-  int i = subMenusName.tqfindIndex (KateHlManager::self()->hlSection(doc->hlMode()));
+  int i = subMenusName.findIndex (KateHlManager::self()->hlSection(doc->hlMode()));
   if (i >= 0 && subMenus.at(i))
     subMenus.at(i)->setItemChecked (doc->hlMode(), true);
   else
@@ -3470,4 +3470,4 @@ void KateViewHighlightAction::setHl (int mode)
 }
 //END KateViewHighlightAction
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katehighlight.h b/kate/part/katehighlight.h
index c8867e2bb..b42fccb62 100644
--- a/kate/part/katehighlight.h
+++ b/kate/part/katehighlight.h
@@ -213,7 +213,7 @@ class KateHighlighting
 
     inline bool noHighlighting () const { return noHl; };
 
-    // be carefull: all documents hl should be tqinvalidated after calling this method!
+    // be carefull: all documents hl should be invalidated after calling this method!
     void dropDynamicContexts();
 
     TQString indentation () { return m_indentation; }
@@ -299,7 +299,7 @@ class KateHighlighting
      * When a highlight is added, a instance of this class is appended to
      * m_additionalData, and the current position in the attrib and context
      * arrays are stored in the indexes for look up. You can then use
-     * hlKeyForAttrib or hlKeyForContext to tqfind the relevant instance of this
+     * hlKeyForAttrib or hlKeyForContext to find the relevant instance of this
      * class from m_additionalData.
      *
      * If you need to add a property to a highlight, add it here.
@@ -338,7 +338,7 @@ class KateHighlighting
     inline bool allowsFolding(){return folding;}
 };
 
-class KateHlManager : public TQObject
+class KateHlManager : public QObject
 {
   Q_OBJECT
 
@@ -357,7 +357,7 @@ class KateHlManager : public TQObject
 
     int detectHighlighting (class KateDocument *doc);
 
-    int tqfindHl(KateHighlighting *h) {return hlList.tqfind(h);}
+    int findHl(KateHighlighting *h) {return hlList.find(h);}
     TQString identifierForName(const TQString&);
 
     // methodes to get the default style count + names
@@ -377,7 +377,7 @@ class KateHlManager : public TQObject
     uint countDynamicCtxs() { return dynamicCtxsCount; };
     void setForceNoDCReset(bool b) { forceNoDCReset = b; };
 
-    // be carefull: all documents hl should be tqinvalidated after having successfully called this method!
+    // be carefull: all documents hl should be invalidated after having successfully called this method!
     bool resetDynamicCtxs();
 
   signals:
@@ -435,4 +435,4 @@ class KateViewHighlightAction: public Kate::ActionMenu
 
 #endif
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katejscript.cpp b/kate/part/katejscript.cpp
index dc597a990..75f5fc513 100644
--- a/kate/part/katejscript.cpp
+++ b/kate/part/katejscript.cpp
@@ -62,7 +62,7 @@ UString::UString(const TQString &d)
 {
   unsigned int len = d.length();
   UChar *dat = new UChar[len];
-  memcpy(dat, d.tqunicode(), len * sizeof(UChar));
+  memcpy(dat, d.unicode(), len * sizeof(UChar));
   rep = UString::Rep::create(dat, len);
 }
 
@@ -1166,4 +1166,4 @@ void KateIndentJScriptManager::parseScriptHeader(const TQString &filePath,
   f.close();
 }
 //END
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katejscript.h b/kate/part/katejscript.h
index b439e7754..98b2ad85e 100644
--- a/kate/part/katejscript.h
+++ b/kate/part/katejscript.h
@@ -64,7 +64,7 @@ class KateJScript
 
     /**
      * creates a JS wrapper object for given KateDocument
-     * @param exec execution state, to tqfind out interpreter to use
+     * @param exec execution state, to find out interpreter to use
      * @param doc document object to wrap
      * @return new js wrapper object
      */
@@ -72,7 +72,7 @@ class KateJScript
 
     /**
      * creates a JS wrapper object for given KateView
-     * @param exec execution state, to tqfind out interpreter to use
+     * @param exec execution state, to find out interpreter to use
      * @param view view object to wrap
      * @return new js wrapper object
      */
@@ -230,4 +230,4 @@ class KateIndentJScriptManager: public KateIndentScriptManagerAbstract
 
 #endif
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katelinerange.cpp b/kate/part/katelinerange.cpp
index 212aaf921..7500b4e8a 100644
--- a/kate/part/katelinerange.cpp
+++ b/kate/part/katelinerange.cpp
@@ -72,4 +72,4 @@ bool operator<= (const KateLineRange& r, const KateTextCursor& c)
   return r.line < c.line() || r.startCol <= c.col();
 }
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/kateluaindentscript.cpp b/kate/part/kateluaindentscript.cpp
index f414b4d6d..dbc7d1fa4 100644
--- a/kate/part/kateluaindentscript.cpp
+++ b/kate/part/kateluaindentscript.cpp
@@ -367,7 +367,7 @@ void KateLUAIndentScriptManager::collectScripts (bool force)
   if (!m_scripts.isEmpty())
     return;
 
-  kdDebug()<<"================================================="<<endl<<"Trying to tqfind Lua scripts"<<endl
+  kdDebug()<<"================================================="<<endl<<"Trying to find Lua scripts"<<endl
       <<"================================================="<<endl;
 
   // We'll store the scripts list in this config
@@ -525,4 +525,4 @@ void KateLUAIndentScriptManager::parseScriptHeader(const TQString &filePath,
 //END
 
 #endif
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/kateluaindentscript.h b/kate/part/kateluaindentscript.h
index 4b1de0429..a03a85574 100644
--- a/kate/part/kateluaindentscript.h
+++ b/kate/part/kateluaindentscript.h
@@ -66,4 +66,4 @@ class KateLUAIndentScriptManager: public KateIndentScriptManagerAbstract
 #endif
 
 #endif
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/kateprinter.cpp b/kate/part/kateprinter.cpp
index f7869afef..e0dbdc728 100644
--- a/kate/part/kateprinter.cpp
+++ b/kate/part/kateprinter.cpp
@@ -184,7 +184,7 @@ bool KatePrinter::print (KateDocument *doc)
          // This retrieves all tags, ued or not, but
          // none of theese operations should be expensive,
          // and searcing each tag in the format strings is avoided.
-         TQDateTime dt = TQDateTime::tqcurrentDateTime();
+         TQDateTime dt = TQDateTime::currentDateTime();
          TQMap<TQString,TQString> tags;
 
          KUser u (KUser::UseRealUserID);
@@ -221,7 +221,7 @@ bool KatePrinter::print (KateDocument *doc)
            while ( pos > -1 )
            {
              rep = tags[reTags.cap( 1 )];
-             headerTags.tqreplace( (uint)pos, 2, rep );
+             headerTags.replace( (uint)pos, 2, rep );
              pos += rep.length();
              pos = reTags.search( headerTags, pos );
            }
@@ -248,7 +248,7 @@ bool KatePrinter::print (KateDocument *doc)
            while ( pos > -1 )
            {
              rep = tags[reTags.cap( 1 )];
-             footerTags.tqreplace( (uint)pos, 2, rep );
+             footerTags.replace( (uint)pos, 2, rep );
              pos += rep.length();
              pos = reTags.search( footerTags, pos );
            }
@@ -339,7 +339,7 @@ bool KatePrinter::print (KateDocument *doc)
 
        // now that we know the vertical amount of space needed,
        // it is possible to calculate the total number of pages
-       // if needed, that is if any header/footer tag tqcontains "%P".
+       // if needed, that is if any header/footer tag contains "%P".
        if ( headerTagList.grep("%P").count() || footerTagList.grep("%P").count() )
        {
          kdDebug(13020)<<"'%P' found! calculating number of pages..."<<endl;
@@ -378,9 +378,9 @@ bool KatePrinter::print (KateDocument *doc)
          TQString re("%P");
          TQStringList::Iterator it;
          for ( it=headerTagList.begin(); it!=headerTagList.end(); ++it )
-           (*it).tqreplace( re, TQString( "%1" ).arg( _pages ) );
+           (*it).replace( re, TQString( "%1" ).arg( _pages ) );
          for ( it=footerTagList.begin(); it!=footerTagList.end(); ++it )
-           (*it).tqreplace( re, TQString( "%1" ).arg( _pages ) );
+           (*it).replace( re, TQString( "%1" ).arg( _pages ) );
        }
      } // end prepare block
 
@@ -425,7 +425,7 @@ bool KatePrinter::print (KateDocument *doc)
                for (int i=0; i<3; i++)
                {
                  s = headerTagList[i];
-                 if (s.tqfind("%p") != -1) s.tqreplace("%p", TQString::number(currentPage));
+                 if (s.find("%p") != -1) s.replace("%p", TQString::number(currentPage));
                  paint.drawText(marg, 0, headerWidth-(marg*2), headerHeight, align, s);
                  align = valign|(i == 0 ? Qt::AlignHCenter : Qt::AlignRight);
                }
@@ -453,7 +453,7 @@ bool KatePrinter::print (KateDocument *doc)
                for (int i=0; i<3; i++)
                {
                  s = footerTagList[i];
-                 if (s.tqfind("%p") != -1) s.tqreplace("%p", TQString::number(currentPage));
+                 if (s.find("%p") != -1) s.replace("%p", TQString::number(currentPage));
                  paint.drawText(marg, maxHeight+innerMargin, headerWidth-(marg*2), footerHeight, align, s);
                  align = Qt::AlignVCenter|(i == 0 ? Qt::AlignHCenter : Qt::AlignRight);
                }
@@ -1002,4 +1002,4 @@ void KatePrintLayout::setOptions( const TQMap<TQString,TQString>& opts )
 #include "kateprinter.moc"
 #endif //!Q_WS_WIN
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katerenderer.cpp b/kate/part/katerenderer.cpp
index c5c6992c7..265a98282 100644
--- a/kate/part/katerenderer.cpp
+++ b/kate/part/katerenderer.cpp
@@ -537,13 +537,13 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i
             if (isIMSel && !isTab)
             {
               // input method selection
-              fillColor = m_view->tqcolorGroup().color(TQColorGroup::Foreground);
+              fillColor = m_view->colorGroup().color(TQColorGroup::Foreground);
             }
             else if (isIMEdit && !isTab)
             {
               // XIM support
               // input method edit area
-              const TQColorGroup& cg = m_view->tqcolorGroup();
+              const TQColorGroup& cg = m_view->colorGroup();
               int h1, s1, v1, h2, s2, v2;
               cg.color( TQColorGroup::Base ).hsv( &h1, &s1, &v1 );
               cg.color( TQColorGroup::Background ).hsv( &h2, &s2, &v2 );
@@ -576,7 +576,7 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i
             if (isIMSel && paintBackground && !isTab)
             {
               paint.save();
-              paint.setPen( m_view->tqcolorGroup().color( TQColorGroup::BrightText ) );
+              paint.setPen( m_view->colorGroup().color( TQColorGroup::BrightText ) );
             }
 
             // Draw indentation markers.
@@ -745,7 +745,7 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, int cursorCol)
 
   KateFontStruct *fs = config()->fontStruct();
 
-  const TQChar *tqunicode = textLine->text();
+  const TQChar *unicode = textLine->text();
   const TQString &textString = textLine->string();
 
   int x = 0;
@@ -763,7 +763,7 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, int cursorCol)
 
     x += width;
 
-    if (z < len && tqunicode[z] == TQChar('\t'))
+    if (z < len && unicode[z] == TQChar('\t'))
       x -= x % width;
   }
 
@@ -787,7 +787,7 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, uint startcol, u
   *needWrap = false;
 
   const uint len = textLine->length();
-  const TQChar *tqunicode = textLine->text();
+  const TQChar *unicode = textLine->text();
   const TQString &textString = textLine->string();
 
   uint z = startcol;
@@ -800,10 +800,10 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, uint startcol, u
 
     // How should tabs be treated when they word-wrap on a print-out?
     // if startcol != 0, this messes up (then again, word wrapping messes up anyway)
-    if (tqunicode[z] == TQChar('\t'))
+    if (unicode[z] == TQChar('\t'))
       x -= x % width;
 
-    if (tqunicode[z].isSpace())
+    if (unicode[z].isSpace())
     {
       lastWhiteSpace = z+1;
       lastWhiteSpaceX = x;
@@ -887,7 +887,7 @@ uint KateRenderer::textWidth( KateTextCursor &cursor, int xPos, uint startCol)
   if (!textLine) return 0;
 
   const uint len = textLine->length();
-  const TQChar *tqunicode = textLine->text();
+  const TQChar *unicode = textLine->text();
   const TQString &textString = textLine->string();
 
   x = oldX = 0;
@@ -906,7 +906,7 @@ uint KateRenderer::textWidth( KateTextCursor &cursor, int xPos, uint startCol)
 
     x += width;
 
-    if (z < len && tqunicode[z] == TQChar('\t'))
+    if (z < len && unicode[z] == TQChar('\t'))
       x -= x % width;
 
     z++;
@@ -1029,4 +1029,4 @@ uint KateRenderer::spaceWidth()
   return attribute(0)->width(*config()->fontStruct(), TQChar(' '), m_tabWidth);
 }
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp
index 9bd0738d9..6e73a9f75 100644
--- a/kate/part/kateschema.cpp
+++ b/kate/part/kateschema.cpp
@@ -244,7 +244,7 @@ uint KateSchemaManager::number (const TQString &name)
     return 1;
 
   int i;
-  if ((i = m_schemas.tqfindIndex(name)) > -1)
+  if ((i = m_schemas.findIndex(name)) > -1)
     return i;
 
   return 0;
@@ -281,19 +281,19 @@ KateSchemaConfigColorTab::KateSchemaConfigColorTab( TQWidget *parent, const char
   b = new TQHBox (gbTextArea);
   b->setSpacing(KDialog::spacingHint());
   label = new TQLabel( i18n("Normal text:"), b);
-  label->tqsetAlignment( AlignLeft|AlignVCenter);
+  label->setAlignment( AlignLeft|AlignVCenter);
   m_back = new KColorButton(b);
 
   b = new TQHBox (gbTextArea);
   b->setSpacing(KDialog::spacingHint());
   label = new TQLabel( i18n("Selected text:"), b);
-  label->tqsetAlignment( AlignLeft|AlignVCenter);
+  label->setAlignment( AlignLeft|AlignVCenter);
   m_selected = new KColorButton(b);
 
   b = new TQHBox (gbTextArea);
   b->setSpacing(KDialog::spacingHint());
   label = new TQLabel( i18n("Current line:"), b);
-  label->tqsetAlignment( AlignLeft|AlignVCenter);
+  label->setAlignment( AlignLeft|AlignVCenter);
   m_current = new KColorButton(b);
 
   // Markers from kdelibs/interfaces/ktextinterface/markinterface.h
@@ -319,31 +319,31 @@ KateSchemaConfigColorTab::KateSchemaConfigColorTab( TQWidget *parent, const char
   b = new TQHBox (gbBorder);
   b->setSpacing(KDialog::spacingHint());
   label = new TQLabel( i18n("Left border background:"), b);
-  label->tqsetAlignment( AlignLeft|AlignVCenter);
+  label->setAlignment( AlignLeft|AlignVCenter);
   m_iconborder = new KColorButton(b);
 
   b = new TQHBox (gbBorder);
   b->setSpacing(KDialog::spacingHint());
   label = new TQLabel( i18n("Line numbers:"), b);
-  label->tqsetAlignment( AlignLeft|AlignVCenter);
+  label->setAlignment( AlignLeft|AlignVCenter);
   m_linenumber = new KColorButton(b);
 
   b = new TQHBox (gbBorder);
   b->setSpacing(KDialog::spacingHint());
   label = new TQLabel( i18n("Bracket highlight:"), b);
-  label->tqsetAlignment( AlignLeft|AlignVCenter);
+  label->setAlignment( AlignLeft|AlignVCenter);
   m_bracket = new KColorButton(b);
 
   b = new TQHBox (gbBorder);
   b->setSpacing(KDialog::spacingHint());
   label = new TQLabel( i18n("Word wrap markers:"), b);
-  label->tqsetAlignment( AlignLeft|AlignVCenter);
+  label->setAlignment( AlignLeft|AlignVCenter);
   m_wwmarker = new KColorButton(b);
 
   b = new TQHBox (gbBorder);
   b->setSpacing(KDialog::spacingHint());
   label = new TQLabel( i18n("Tab markers:"), b);
-  label->tqsetAlignment( AlignLeft|AlignVCenter);
+  label->setAlignment( AlignLeft|AlignVCenter);
   m_tmarker = new KColorButton(b);
 
   blay->addWidget(gbBorder);
@@ -351,7 +351,7 @@ KateSchemaConfigColorTab::KateSchemaConfigColorTab( TQWidget *parent, const char
   blay->addStretch();
 
   // connect signal changed(); changed is emitted by a ColorButton change!
-  connect( this, TQT_SIGNAL( changed() ), parent->tqparentWidget(), TQT_SLOT( slotChanged() ) );
+  connect( this, TQT_SIGNAL( changed() ), parent->parentWidget(), TQT_SLOT( slotChanged() ) );
 
   // TQWhatsThis help
   TQWhatsThis::add(m_back, i18n("<p>Sets the background color of the editing area.</p>"));
@@ -416,7 +416,7 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema )
   m_linenumber->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) );
 
   // If we havent this schema, read in from config file
-  if ( ! m_schemas.tqcontains( newSchema ) )
+  if ( ! m_schemas.contains( newSchema ) )
   {
     // fallback defaults
     TQColor tmp0 (KGlobalSettings::baseColor());
@@ -545,7 +545,7 @@ KateSchemaConfigFontTab::KateSchemaConfigFontTab( TQWidget *parent, const char *
   m_fontchooser->enableColumn(KFontChooser::StyleList, false);
   grid->addWidget( m_fontchooser, 0, 0);
 
-  connect (this, TQT_SIGNAL( changed()), parent->tqparentWidget(), TQT_SLOT (slotChanged()));
+  connect (this, TQT_SIGNAL( changed()), parent->parentWidget(), TQT_SLOT (slotChanged()));
   m_schema = -1;
 }
 
@@ -599,7 +599,7 @@ KateSchemaConfigFontColorTab::KateSchemaConfigFontColorTab( TQWidget *parent, co
   m_defaultStyles = new KateStyleListView( this, false );
   grid->addWidget( m_defaultStyles, 0, 0);
 
-  connect (m_defaultStyles, TQT_SIGNAL (changed()), parent->tqparentWidget(), TQT_SLOT (slotChanged()));
+  connect (m_defaultStyles, TQT_SIGNAL (changed()), parent->parentWidget(), TQT_SLOT (slotChanged()));
 
   TQWhatsThis::add( m_defaultStyles,  i18n(
       "This list displays the default styles for the current schema and "
@@ -679,11 +679,11 @@ KateSchemaConfigHighlightTab::KateSchemaConfigHighlightTab( TQWidget *parent, co
 
   m_hlDict.setAutoDelete (true);
 
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint() );
+  TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint() );
 
   // hl chooser
   TQHBox *hbHl = new TQHBox( this );
-  tqlayout->add (hbHl);
+  layout->add (hbHl);
 
   hbHl->setSpacing( KDialog::spacingHint() );
   TQLabel *lHl = new TQLabel( i18n("H&ighlight:"), hbHl );
@@ -702,7 +702,7 @@ KateSchemaConfigHighlightTab::KateSchemaConfigHighlightTab( TQWidget *parent, co
 
   // styles listview
   m_styles = new KateStyleListView( this, true );
-  tqlayout->addWidget (m_styles, 999);
+  layout->addWidget (m_styles, 999);
 
   hlCombo->setCurrentItem ( hl );
   hlChanged ( hl );
@@ -716,7 +716,7 @@ KateSchemaConfigHighlightTab::KateSchemaConfigHighlightTab( TQWidget *parent, co
     "to edit from the popup menu.<p>You can unset the Background and Selected "
     "Background colors from the context menu when appropriate.") );
 
-  connect (m_styles, TQT_SIGNAL (changed()), parent->tqparentWidget(), TQT_SLOT (slotChanged()));
+  connect (m_styles, TQT_SIGNAL (changed()), parent->parentWidget(), TQT_SLOT (slotChanged()));
 }
 
 KateSchemaConfigHighlightTab::~KateSchemaConfigHighlightTab()
@@ -746,7 +746,7 @@ void KateSchemaConfigHighlightTab::schemaChanged (uint schema)
     m_hlDict[m_schema]->setAutoDelete (true);
   }
 
-  if (!m_hlDict[m_schema]->tqfind(m_hl))
+  if (!m_hlDict[m_schema]->find(m_hl))
   {
     kdDebug(13030) << "NEW HL, create list" << endl;
 
@@ -775,20 +775,20 @@ void KateSchemaConfigHighlightTab::schemaChanged (uint schema)
   m_styles->viewport()->setPalette( p );
 
   TQDict<KateStyleListCaption> prefixes;
-  for ( KateHlItemData *itemData = m_hlDict[m_schema]->tqfind(m_hl)->last();
+  for ( KateHlItemData *itemData = m_hlDict[m_schema]->find(m_hl)->last();
         itemData != 0L;
-        itemData = m_hlDict[m_schema]->tqfind(m_hl)->prev())
+        itemData = m_hlDict[m_schema]->find(m_hl)->prev())
   {
     kdDebug(13030) << "insert items " << itemData->name << endl;
 
     // All stylenames have their language mode prefixed, e.g. HTML:Comment
     // split them and put them into nice substructures.
-    int c = itemData->name.tqfind(':');
+    int c = itemData->name.find(':');
     if ( c > 0 ) {
       TQString prefix = itemData->name.left(c);
       TQString name   = itemData->name.mid(c+1);
 
-      KateStyleListCaption *parent = prefixes.tqfind( prefix );
+      KateStyleListCaption *parent = prefixes.find( prefix );
       if ( ! parent )
       {
         parent = new KateStyleListCaption( m_styles, prefix );
@@ -826,10 +826,10 @@ KateSchemaConfigPage::KateSchemaConfigPage( TQWidget *parent, KateDocument *doc
   : KateConfigPage( parent ),
     m_lastSchema (-1)
 {
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint() );
+  TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint() );
 
   TQHBox *hbHl = new TQHBox( this );
-  tqlayout->add (hbHl);
+  layout->add (hbHl);
   hbHl->setSpacing( KDialog::spacingHint() );
   TQLabel *lHl = new TQLabel( i18n("&Schema:"), hbHl );
   schemaCombo = new TQComboBox( false, hbHl );
@@ -845,7 +845,7 @@ KateSchemaConfigPage::KateSchemaConfigPage( TQWidget *parent, KateDocument *doc
 
   m_tabWidget = new TQTabWidget ( this );
   m_tabWidget->setMargin (KDialog::marginHint());
-  tqlayout->add (m_tabWidget);
+  layout->add (m_tabWidget);
 
   connect (m_tabWidget, TQT_SIGNAL (currentChanged (TQWidget *)), this, TQT_SLOT (newCurrentPage (TQWidget *)));
 
@@ -863,7 +863,7 @@ KateSchemaConfigPage::KateSchemaConfigPage( TQWidget *parent, KateDocument *doc
   m_tabWidget->addTab (m_highlightTab, i18n("Highlighting Text Styles"));
 
   hbHl = new TQHBox( this );
-  tqlayout->add (hbHl);
+  layout->add (hbHl);
   hbHl->setSpacing( KDialog::spacingHint() );
   lHl = new TQLabel( i18n("&Default schema for %1:").arg(KApplication::kApplication()->aboutData()->programName ()), hbHl );
   defaultSchemaCombo = new TQComboBox( false, hbHl );
@@ -969,7 +969,7 @@ void KateSchemaConfigPage::newSchema ()
 
   // soft update, no load from disk
   KateFactory::self()->schemaManager()->update (false);
-  int i = KateFactory::self()->schemaManager()->list ().tqfindIndex (t);
+  int i = KateFactory::self()->schemaManager()->list ().findIndex (t);
 
   update ();
   if (i > -1)
@@ -1021,7 +1021,7 @@ void KateViewSchemaAction::slotAboutToShow()
   {
     TQString hlName = KateFactory::self()->schemaManager()->list().operator[](z);
 
-    if (names.tqcontains(hlName) < 1)
+    if (names.contains(hlName) < 1)
     {
       names << hlName;
       popupMenu()->insertItem ( hlName, this, TQT_SLOT(setSchema(int)), 0,  z+1);
@@ -1088,9 +1088,9 @@ void KateStyleListView::showPopupMenu( KateStyleListItem *i, const TQPoint &glob
   TQPixmap scl(16,16);
   scl.fill( i->style()->selectedTextColor() );
   TQPixmap bgcl(16,16);
-  bgcl.fill( i->style()->itemSet(KateAttribute::BGColor) ? i->style()->bgColor() : viewport()->tqcolorGroup().base() );
+  bgcl.fill( i->style()->itemSet(KateAttribute::BGColor) ? i->style()->bgColor() : viewport()->colorGroup().base() );
   TQPixmap sbgcl(16,16);
-  sbgcl.fill( i->style()->itemSet(KateAttribute::SelectedBGColor) ? i->style()->selectedBGColor() : viewport()->tqcolorGroup().base() );
+  sbgcl.fill( i->style()->itemSet(KateAttribute::SelectedBGColor) ? i->style()->selectedBGColor() : viewport()->colorGroup().base() );
 
   if ( showtitle )
     m.insertTitle( i->contextName(), KateStyleListItem::ContextName );
@@ -1156,7 +1156,7 @@ void KateStyleListView::slotMousePressed(int btn, TQListViewItem* i, const TQPoi
   if ( dynamic_cast<KateStyleListItem*>(i) ) {
      if ( btn == Qt::LeftButton && c > 0 ) {
       // map pos to item/column and call KateStyleListItem::activate(col, pos)
-      ((KateStyleListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, tqitemRect(i).top() ) );
+      ((KateStyleListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(i).top() ) );
     }
   }
 }
@@ -1321,7 +1321,7 @@ void KateStyleListItem::activate( int column, const TQPoint &localPos )
     default:
       return;
   }
-  if ( !TQRect( x, 0, w, BoxSize ).tqcontains( localPos ) )
+  if ( !TQRect( x, 0, w, BoxSize ).contains( localPos ) )
   changeProperty( (Property)column );
 }
 
@@ -1357,7 +1357,7 @@ void KateStyleListItem::toggleDefStyle()
     delete is;
     is = new KateAttribute( *ds );
     updateStyle();
-    tqrepaint();
+    repaint();
   }
 }
 
@@ -1441,7 +1441,7 @@ void KateStyleListItem::setColor( int column )
     break;
   }
 
-  tqrepaint();
+  repaint();
 }
 
 void KateStyleListItem::unsetColor( int c )
@@ -1465,7 +1465,7 @@ void KateStyleListItem::paintCell( TQPainter *p, const TQColorGroup& /*cg*/, int
   Q_ASSERT( lv ); //###
 
   // use a private color group and set the text/highlighted text colors
-  TQColorGroup mcg = lv->viewport()->tqcolorGroup();
+  TQColorGroup mcg = lv->viewport()->colorGroup();
 
   if ( col ) // col 0 is drawn by the superclass method
     p->fillRect( 0, 0, width, height(), TQBrush( mcg.base() ) );
@@ -1492,7 +1492,7 @@ void KateStyleListItem::paintCell( TQPainter *p, const TQColorGroup& /*cg*/, int
       }
       TQFont f ( ((KateStyleListView*)lv)->docfont );
       p->setFont( is->font(f) );
-      // FIXME - tqrepainting when text is cropped, and the column is enlarged is buggy.
+      // FIXME - repainting when text is cropped, and the column is enlarged is buggy.
       // Maybe I need painting the string myself :(
       // (wilbert) it depends on the font used
       TQListViewItem::paintCell( p, mcg, col, width, align );
@@ -1602,10 +1602,10 @@ void KateStyleListCaption::paintCell( TQPainter *p, const TQColorGroup& /*cg*/,
   Q_ASSERT( lv ); //###
 
   // use the same colorgroup as the other items in the viewport
-  TQColorGroup mcg = lv->viewport()->tqcolorGroup();
+  TQColorGroup mcg = lv->viewport()->colorGroup();
 
   TQListViewItem::paintCell( p, mcg, col, width, align );
 }
 //END
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/kateschema.h b/kate/part/kateschema.h
index 021c8787a..38b15a054 100644
--- a/kate/part/kateschema.h
+++ b/kate/part/kateschema.h
@@ -198,7 +198,7 @@ class KateSchemaConfigColorTab : public QWidget
     void schemaChanged( int newSchema );
 
   signals:
-    void changed(); // connected to tqparentWidget()->tqparentWidget() TQT_SLOT(slotChanged)
+    void changed(); // connected to parentWidget()->parentWidget() TQT_SLOT(slotChanged)
 
   protected slots:
     void slotMarkerColorChanged(const TQColor&);
@@ -223,7 +223,7 @@ class KateSchemaConfigFontTab : public QWidget
     void schemaChanged( int newSchema );
 
   signals:
-    void changed(); // connected to tqparentWidget()->tqparentWidget() TQT_SLOT(slotChanged)
+    void changed(); // connected to parentWidget()->parentWidget() TQT_SLOT(slotChanged)
 
   private:
     class KFontChooser *m_fontchooser;
@@ -320,4 +320,4 @@ class KateSchemaConfigPage : public KateConfigPage
 
 #endif
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katesearch.cpp b/kate/part/katesearch.cpp
index 987fbb63b..742b57a3f 100644
--- a/kate/part/katesearch.cpp
+++ b/kate/part/katesearch.cpp
@@ -45,7 +45,7 @@
 
 //BEGIN KateSearch
 TQStringList KateSearch::s_searchList  = TQStringList();
-TQStringList KateSearch::s_tqreplaceList = TQStringList();
+TQStringList KateSearch::s_replaceList = TQStringList();
 TQString KateSearch::s_pattern = TQString();
 static const bool arbitraryHLExample = false;
 
@@ -53,12 +53,12 @@ KateSearch::KateSearch( KateView* view )
   : TQObject( view, "kate search" )
   , m_view( view )
   , m_doc( view->doc() )
-  , tqreplacePrompt( new KateReplacePrompt( view ) )
+  , replacePrompt( new KateReplacePrompt( view ) )
 {
   m_arbitraryHLList = new KateSuperRangeList();
   if (arbitraryHLExample) m_doc->arbitraryHL()->addHighlightToView(m_arbitraryHLList, m_view);
 
-  connect(tqreplacePrompt,TQT_SIGNAL(clicked()),this,TQT_SLOT(tqreplaceSlot()));
+  connect(replacePrompt,TQT_SIGNAL(clicked()),this,TQT_SLOT(replaceSlot()));
 }
 
 KateSearch::~KateSearch()
@@ -68,20 +68,20 @@ KateSearch::~KateSearch()
 
 void KateSearch::createActions( KActionCollection* ac )
 {
-  KStdAction::tqfind( this, TQT_SLOT(tqfind()), ac )->setWhatsThis(
+  KStdAction::find( this, TQT_SLOT(find()), ac )->setWhatsThis(
     i18n("Look up the first occurrence of a piece of text or regular expression."));
-  KStdAction::tqfindNext( this, TQT_SLOT(slotFindNext()), ac )->setWhatsThis(
+  KStdAction::findNext( this, TQT_SLOT(slotFindNext()), ac )->setWhatsThis(
     i18n("Look up the next occurrence of the search phrase."));
-  KStdAction::tqfindPrev( this, TQT_SLOT(slotFindPrev()), ac, "edit_tqfind_prev" )->setWhatsThis(
+  KStdAction::findPrev( this, TQT_SLOT(slotFindPrev()), ac, "edit_find_prev" )->setWhatsThis(
     i18n("Look up the previous occurrence of the search phrase."));
-  KStdAction::tqreplace( this, TQT_SLOT(tqreplace()), ac )->setWhatsThis(
-    i18n("Look up a piece of text or regular expression and tqreplace the result with some given text."));
+  KStdAction::replace( this, TQT_SLOT(replace()), ac )->setWhatsThis(
+    i18n("Look up a piece of text or regular expression and replace the result with some given text."));
 }
 
 void KateSearch::addToList( TQStringList& list, const TQString& s )
 {
   if( list.count() > 0 ) {
-    TQStringList::Iterator it = list.tqfind( s );
+    TQStringList::Iterator it = list.find( s );
     if( *it != 0L )
       list.remove( it );
     if( list.count() >= 16 )
@@ -90,30 +90,30 @@ void KateSearch::addToList( TQStringList& list, const TQString& s )
   list.prepend( s );
 }
 
-void KateSearch::tqfind()
+void KateSearch::find()
 {
   // if multiline selection around, search in it
   long searchf = KateViewConfig::global()->searchFlags();
   if (m_view->hasSelection() && m_view->selStartLine() != m_view->selEndLine())
     searchf |= KFindDialog::SelectedText;
 
-  KFindDialog *tqfindDialog = new KFindDialog (  m_view, "", searchf,
+  KFindDialog *findDialog = new KFindDialog (  m_view, "", searchf,
                                                s_searchList, m_view->hasSelection() );
 
-  tqfindDialog->setPattern (getSearchText());
+  findDialog->setPattern (getSearchText());
 
 
-  if( tqfindDialog->exec() == TQDialog::Accepted ) {
-    s_searchList =  tqfindDialog->tqfindHistory () ;
+  if( findDialog->exec() == TQDialog::Accepted ) {
+    s_searchList =  findDialog->findHistory () ;
     // Do *not* remove the TQString() wrapping, it fixes a nasty crash
-    tqfind( TQString(s_searchList.first()), tqfindDialog->options(), true, true );
+    find( TQString(s_searchList.first()), findDialog->options(), true, true );
   }
 
-  delete tqfindDialog;
-  m_view->tqrepaintText ();
+  delete findDialog;
+  m_view->repaintText ();
 }
 
-void KateSearch::tqfind( const TQString &pattern, long flags, bool add, bool shownotfound )
+void KateSearch::find( const TQString &pattern, long flags, bool add, bool shownotfound )
 {
   KateViewConfig::global()->setSearchFlags( flags );
   if( add )
@@ -130,7 +130,7 @@ void KateSearch::tqfind( const TQString &pattern, long flags, bool add, bool sho
   searchFlags.backward = KateViewConfig::global()->searchFlags() & KFindDialog::FindBackwards;
   searchFlags.selected = KateViewConfig::global()->searchFlags() & KFindDialog::SelectedText;
   searchFlags.prompt = false;
-  searchFlags.tqreplace = false;
+  searchFlags.replace = false;
   searchFlags.finished = false;
   searchFlags.regExp = KateViewConfig::global()->searchFlags() & KFindDialog::RegularExpression;
   searchFlags.useBackRefs = KateViewConfig::global()->searchFlags() & KReplaceDialog::BackReference;
@@ -151,7 +151,7 @@ void KateSearch::tqfind( const TQString &pattern, long flags, bool add, bool sho
   search( searchFlags );
 }
 
-void KateSearch::tqreplace()
+void KateSearch::replace()
 {
   if (!doc()->isReadWrite()) return;
 
@@ -160,33 +160,33 @@ void KateSearch::tqreplace()
   if (m_view->hasSelection() && m_view->selStartLine() != m_view->selEndLine())
     searchf |= KFindDialog::SelectedText;
 
-  KReplaceDialog *tqreplaceDialog = new KReplaceDialog (  m_view, "", searchf,
-                                               s_searchList, s_tqreplaceList, m_view->hasSelection() );
+  KReplaceDialog *replaceDialog = new KReplaceDialog (  m_view, "", searchf,
+                                               s_searchList, s_replaceList, m_view->hasSelection() );
 
-  tqreplaceDialog->setPattern (getSearchText());
+  replaceDialog->setPattern (getSearchText());
 
-  if( tqreplaceDialog->exec() == TQDialog::Accepted ) {
-    long opts = tqreplaceDialog->options();
-    m_tqreplacement = tqreplaceDialog->tqreplacement();
-    s_searchList = tqreplaceDialog->tqfindHistory () ;
-    s_tqreplaceList = tqreplaceDialog->tqreplacementHistory () ;
+  if( replaceDialog->exec() == TQDialog::Accepted ) {
+    long opts = replaceDialog->options();
+    m_replacement = replaceDialog->replacement();
+    s_searchList = replaceDialog->findHistory () ;
+    s_replaceList = replaceDialog->replacementHistory () ;
 
     // Do *not* remove the TQString() wrapping, it fixes a nasty crash
-    tqreplace( TQString(s_searchList.first()), m_tqreplacement, opts );
+    replace( TQString(s_searchList.first()), m_replacement, opts );
   }
 
-  delete tqreplaceDialog;
+  delete replaceDialog;
   m_view->update ();
 }
 
-void KateSearch::tqreplace( const TQString& pattern, const TQString &tqreplacement, long flags )
+void KateSearch::replace( const TQString& pattern, const TQString &replacement, long flags )
 {
   if (!doc()->isReadWrite()) return;
 
   addToList( s_searchList, pattern );
    s_pattern = pattern;
-  addToList( s_tqreplaceList, tqreplacement );
-  m_tqreplacement = tqreplacement;
+  addToList( s_replaceList, replacement );
+  m_replacement = replacement;
   KateViewConfig::global()->setSearchFlags( flags );
 
   SearchFlags searchFlags;
@@ -197,7 +197,7 @@ void KateSearch::tqreplace( const TQString& pattern, const TQString &tqreplaceme
   searchFlags.backward = KateViewConfig::global()->searchFlags() & KFindDialog::FindBackwards;
   searchFlags.selected = KateViewConfig::global()->searchFlags() & KFindDialog::SelectedText;
   searchFlags.prompt = KateViewConfig::global()->searchFlags() & KReplaceDialog::PromptOnReplace;
-  searchFlags.tqreplace = true;
+  searchFlags.replace = true;
   searchFlags.finished = false;
   searchFlags.regExp = KateViewConfig::global()->searchFlags() & KFindDialog::RegularExpression;
   searchFlags.useBackRefs = KateViewConfig::global()->searchFlags() & KReplaceDialog::BackReference;
@@ -216,7 +216,7 @@ void KateSearch::tqreplace( const TQString& pattern, const TQString &tqreplaceme
   search( searchFlags );
 }
 
-void KateSearch::tqfindAgain( bool reverseDirection )
+void KateSearch::findAgain( bool reverseDirection )
 {
   SearchFlags searchFlags;
   searchFlags.caseSensitive = KateViewConfig::global()->searchFlags() & KFindDialog::CaseSensitive;
@@ -226,7 +226,7 @@ void KateSearch::tqfindAgain( bool reverseDirection )
   searchFlags.backward = KateViewConfig::global()->searchFlags() & KFindDialog::FindBackwards;
   searchFlags.selected = KateViewConfig::global()->searchFlags() & KFindDialog::SelectedText;
   searchFlags.prompt = KateViewConfig::global()->searchFlags() & KReplaceDialog::PromptOnReplace;
-  searchFlags.tqreplace = false;
+  searchFlags.replace = false;
   searchFlags.finished = false;
   searchFlags.regExp = KateViewConfig::global()->searchFlags() & KFindDialog::RegularExpression;
   searchFlags.useBackRefs = KateViewConfig::global()->searchFlags() & KReplaceDialog::BackReference;
@@ -263,14 +263,14 @@ void KateSearch::search( SearchFlags flags )
     s.flags.finished = true;
   }
 
-  if( s.flags.tqreplace ) {
-    tqreplaces = 0;
+  if( s.flags.replace ) {
+    replaces = 0;
     if( s.flags.prompt )
       promptReplace();
     else
-      tqreplaceAll();
+      replaceAll();
   } else {
-    tqfindAgain();
+    findAgain();
   }
 }
 
@@ -301,17 +301,17 @@ void KateSearch::wrapSearch()
   }
 
   // oh, we wrapped around one time allready now !
-  // only check that on tqreplace
-  s.wrapped = s.flags.tqreplace;
+  // only check that on replace
+  s.wrapped = s.flags.replace;
 
-  tqreplaces = 0;
+  replaces = 0;
   s.flags.finished = true;
 }
 
-void KateSearch::tqfindAgain()
+void KateSearch::findAgain()
 {
   if(  s_pattern.isEmpty() ) {
-    tqfind();
+    find();
     return;
   }
 
@@ -320,7 +320,7 @@ void KateSearch::tqfindAgain()
   } else if( !s.flags.finished ) {
     if( askContinue() ) {
       wrapSearch();
-      tqfindAgain();
+      findAgain();
     } else {
       if (arbitraryHLExample) m_arbitraryHLList->clear();
     }
@@ -334,23 +334,23 @@ void KateSearch::tqfindAgain()
   }
 }
 
-void KateSearch::tqreplaceAll()
+void KateSearch::replaceAll()
 {
   doc()->editStart ();
 
   while( doSearch(  s_pattern ) )
-    tqreplaceOne();
+    replaceOne();
 
   doc()->editEnd ();
 
   if( !s.flags.finished ) {
     if( askContinue() ) {
       wrapSearch();
-      tqreplaceAll();
+      replaceAll();
     }
   } else {
     KMessageBox::information( view(),
-        i18n("%n tqreplacement made.","%n tqreplacements made.",tqreplaces),
+        i18n("%n replacement made.","%n replacements made.",replaces),
         i18n("Replace") );
   }
 }
@@ -359,30 +359,30 @@ void KateSearch::promptReplace()
 {
   if ( doSearch(  s_pattern ) ) {
     exposeFound( s.cursor, s.matchedLength );
-    tqreplacePrompt->show();
-    tqreplacePrompt->setFocus ();
+    replacePrompt->show();
+    replacePrompt->setFocus ();
   } else if( !s.flags.finished && askContinue() ) {
     wrapSearch();
     promptReplace();
   } else {
     if (arbitraryHLExample) m_arbitraryHLList->clear();
-    tqreplacePrompt->hide();
+    replacePrompt->hide();
     KMessageBox::information( view(),
-        i18n("%n tqreplacement made.","%n tqreplacements made.",tqreplaces),
+        i18n("%n replacement made.","%n replacements made.",replaces),
         i18n("Replace") );
   }
 }
 
-void KateSearch::tqreplaceOne()
+void KateSearch::replaceOne()
 {
-  TQString tqreplaceWith = m_tqreplacement;
+  TQString replaceWith = m_replacement;
   if ( s.flags.regExp && s.flags.useBackRefs ) {
     // Replace each "\0"..."\9" with the corresponding capture,
     // "\n" and "\t" with newline and tab,
     // "\\" with "\",
     // and remove the "\" for any other sequence.
     TQRegExp br("\\\\(.)");
-    int pos = br.search( tqreplaceWith );
+    int pos = br.search( replaceWith );
     int ncaps = m_re.numCaptures();
     while ( pos >= 0 ) {
       TQString substitute;
@@ -393,7 +393,7 @@ void KateSearch::tqreplaceOne()
         if (ccap <= ncaps ) {
           substitute = m_re.cap( ccap );
         } else {
-          kdDebug()<<"KateSearch::tqreplaceOne(): you don't have "<<ccap<<" backreferences in regexp '"<<m_re.pattern()<<"'"<<endl;
+          kdDebug()<<"KateSearch::replaceOne(): you don't have "<<ccap<<" backreferences in regexp '"<<m_re.pattern()<<"'"<<endl;
           break;
         }
       } else if ( argument == 'n' ) {
@@ -404,27 +404,27 @@ void KateSearch::tqreplaceOne()
         // handle a validly escaped backslash, or an invalid escape.
         substitute = argument;
       }
-      tqreplaceWith.tqreplace( pos, br.matchedLength(), substitute );
-      pos = br.search( tqreplaceWith, pos + substitute.length() );
+      replaceWith.replace( pos, br.matchedLength(), substitute );
+      pos = br.search( replaceWith, pos + substitute.length() );
     }
   }
 
   doc()->editStart();
   doc()->removeText( s.cursor.line(), s.cursor.col(),
       s.cursor.line(), s.cursor.col() + s.matchedLength );
-  doc()->insertText( s.cursor.line(), s.cursor.col(), tqreplaceWith );
+  doc()->insertText( s.cursor.line(), s.cursor.col(), replaceWith );
   doc()->editEnd(),
 
-  tqreplaces++;
+  replaces++;
 
   // if we inserted newlines, we better adjust.
-  uint newlines = tqreplaceWith.tqcontains('\n');
+  uint newlines = replaceWith.contains('\n');
   if ( newlines )
   {
     if ( ! s.flags.backward )
     {
       s.cursor.setLine( s.cursor.line() + newlines );
-      s.cursor.setCol( tqreplaceWith.length() - tqreplaceWith.tqfindRev('\n') );
+      s.cursor.setCol( replaceWith.length() - replaceWith.findRev('\n') );
     }
     // selection?
     if ( s.flags.selected )
@@ -435,17 +435,17 @@ void KateSearch::tqreplaceOne()
   // adjust selection endcursor if needed
   if( s.flags.selected && s.cursor.line() == s.selEnd.line() )
   {
-    s.selEnd.setCol(s.selEnd.col() + tqreplaceWith.length() - s.matchedLength );
+    s.selEnd.setCol(s.selEnd.col() + replaceWith.length() - s.matchedLength );
   }
 
   // adjust wrap cursor if needed
   if( s.cursor.line() == s.wrappedEnd.line() && s.cursor.col() <= s.wrappedEnd.col())
   {
-    s.wrappedEnd.setCol(s.wrappedEnd.col() + tqreplaceWith.length() - s.matchedLength );
+    s.wrappedEnd.setCol(s.wrappedEnd.col() + replaceWith.length() - s.matchedLength );
   }
 
   if( !s.flags.backward ) {
-    s.cursor.setCol(s.cursor.col() + tqreplaceWith.length());
+    s.cursor.setCol(s.cursor.col() + replaceWith.length());
   } else if( s.cursor.col() > 0 ) {
     s.cursor.setCol(s.cursor.col() - 1);
   } else {
@@ -470,12 +470,12 @@ void KateSearch::skipOne()
   }
 }
 
-void KateSearch::tqreplaceSlot() {
-  switch( (Dialog_results)tqreplacePrompt->result() ) {
-  case srCancel: tqreplacePrompt->hide();                break;
-  case srAll:    tqreplacePrompt->hide(); tqreplaceAll();  break;
-  case srYes:    tqreplaceOne(); promptReplace();        break;
-  case srLast:   tqreplacePrompt->hide(), tqreplaceOne();  break;
+void KateSearch::replaceSlot() {
+  switch( (Dialog_results)replacePrompt->result() ) {
+  case srCancel: replacePrompt->hide();                break;
+  case srAll:    replacePrompt->hide(); replaceAll();  break;
+  case srYes:    replaceOne(); promptReplace();        break;
+  case srLast:   replacePrompt->hide(), replaceOne();  break;
   case srNo:     skipOne();    promptReplace();        break;
   }
 }
@@ -483,9 +483,9 @@ void KateSearch::tqreplaceSlot() {
 bool KateSearch::askContinue()
 {
   TQString made =
-     i18n( "%n tqreplacement made.",
-           "%n tqreplacements made.",
-           tqreplaces );
+     i18n( "%n replacement made.",
+           "%n replacements made.",
+           replaces );
 
   TQString reached = !s.flags.backward ?
      i18n( "End of document reached." ) :
@@ -502,12 +502,12 @@ bool KateSearch::askContinue()
      i18n( "Continue from the beginning?" ) :
      i18n( "Continue from the end?" );
 
-  TQString text = s.flags.tqreplace ?
+  TQString text = s.flags.replace ?
      made + "\n" + reached + "\n" + question :
      reached + "\n" + question;
 
   return KMessageBox::Yes == KMessageBox::questionYesNo(
-     view(), text, s.flags.tqreplace ? i18n("Replace") : i18n("Find"),
+     view(), text, s.flags.replace ? i18n("Replace") : i18n("Find"),
      KStdGuiItem::cont(), i18n("&Stop") );
 }
 
@@ -553,8 +553,8 @@ TQString KateSearch::getSearchText()
     break;
   }
 
-  str.tqreplace( TQRegExp("^\\n"), "" );
-  str.tqreplace( TQRegExp("\\n.*"), "" );
+  str.replace( TQRegExp("^\\n"), "" );
+  str.replace( TQRegExp("\\n.*"), "" );
 
   return str;
 }
@@ -609,12 +609,12 @@ bool KateSearch::doSearch( const TQString& text )
   {
     KateDocCursor docCursor(line, col, doc());
 
-    // If we're at the top of the document, we're not gonna tqfind anything, so bail.
+    // If we're at the top of the document, we're not gonna find anything, so bail.
     if (docCursor.line() == 0 && docCursor.col() == 0)
       return false;
 
-    // Move one step backward before searching, if this is a "tqfind again", we don't
-    // want to tqfind the same match.
+    // Move one step backward before searching, if this is a "find again", we don't
+    // want to find the same match.
     docCursor.moveBackward(1);
     line = docCursor.line();
     col = docCursor.col();
@@ -816,42 +816,42 @@ void KateReplacePrompt::done (int result)
 //BEGIN SearchCommand
 bool SearchCommand::exec(class Kate::View *view, const TQString &cmd, TQString &msg)
 {
-  TQString flags, pattern, tqreplacement;
-  if ( cmd.startsWith( "tqfind" ) )
+  TQString flags, pattern, replacement;
+  if ( cmd.startsWith( "find" ) )
   {
 
-    static TQRegExp re_tqfind("tqfind(?::([bcersw]*))?\\s+(.+)");
-    if ( re_tqfind.search( cmd ) < 0 )
+    static TQRegExp re_find("find(?::([bcersw]*))?\\s+(.+)");
+    if ( re_find.search( cmd ) < 0 )
     {
-      msg = i18n("Usage: tqfind[:[bcersw]] PATTERN");
+      msg = i18n("Usage: find[:[bcersw]] PATTERN");
       return false;
     }
-    flags = re_tqfind.cap( 1 );
-    pattern = re_tqfind.cap( 2 );
+    flags = re_find.cap( 1 );
+    pattern = re_find.cap( 2 );
   }
 
-  else if ( cmd.startsWith( "itqfind" ) )
+  else if ( cmd.startsWith( "ifind" ) )
   {
-    static TQRegExp re_itqfind("itqfind(?::([bcrs]*))?\\s+(.*)");
-    if ( re_itqfind.search( cmd ) < 0 )
+    static TQRegExp re_ifind("ifind(?::([bcrs]*))?\\s+(.*)");
+    if ( re_ifind.search( cmd ) < 0 )
     {
-      msg = i18n("Usage: itqfind[:[bcrs]] PATTERN");
+      msg = i18n("Usage: ifind[:[bcrs]] PATTERN");
       return false;
     }
-    itqfindClear();
+    ifindClear();
     return true;
   }
 
-  else if ( cmd.startsWith( "tqreplace" ) )
+  else if ( cmd.startsWith( "replace" ) )
   {
-    // Try if the pattern and tqreplacement is quoted, using a quote character ["']
-    static TQRegExp re_rep("tqreplace(?::([bceprsw]*))?\\s+([\"'])((?:[^\\\\\\\\2]|\\\\.)*)\\2\\s+\\2((?:[^\\\\\\\\2]|\\\\.)*)\\2\\s*$");
+    // Try if the pattern and replacement is quoted, using a quote character ["']
+    static TQRegExp re_rep("replace(?::([bceprsw]*))?\\s+([\"'])((?:[^\\\\\\\\2]|\\\\.)*)\\2\\s+\\2((?:[^\\\\\\\\2]|\\\\.)*)\\2\\s*$");
     // Or one quoted argument
-    TQRegExp re_rep1("tqreplace(?::([bceprsw]*))?\\s+([\"'])((?:[^\\\\\\\\2]|\\\\.)*)\\2\\s*$");
+    TQRegExp re_rep1("replace(?::([bceprsw]*))?\\s+([\"'])((?:[^\\\\\\\\2]|\\\\.)*)\\2\\s*$");
     // Else, it's just one or two (space separated) words
-    TQRegExp re_rep2("tqreplace(?::([bceprsw]*))?\\s+(\\S+)(.*)");
+    TQRegExp re_rep2("replace(?::([bceprsw]*))?\\s+(\\S+)(.*)");
 #define unbackslash(s) p=0;\
-while ( (p = pattern.tqfind( '\\' + delim, p )) > -1 )\
+while ( (p = pattern.find( '\\' + delim, p )) > -1 )\
 {\
   if ( !p || pattern[p-1] != '\\' )\
     pattern.remove( p, 1 );\
@@ -862,15 +862,15 @@ while ( (p = pattern.tqfind( '\\' + delim, p )) > -1 )\
     {
       flags = re_rep.cap(1);
       pattern = re_rep.cap( 3 );
-      tqreplacement = re_rep.cap( 4 );
+      replacement = re_rep.cap( 4 );
 
       int p(0);
       // unbackslash backslashed delimiter strings
       // in pattern ..
       TQString delim = re_rep.cap( 2 );
       unbackslash(pattern);
-      // .. and in tqreplacement
-      unbackslash(tqreplacement);
+      // .. and in replacement
+      unbackslash(replacement);
     }
     else if ( re_rep1.search( cmd ) >= 0 )
     {
@@ -885,35 +885,35 @@ while ( (p = pattern.tqfind( '\\' + delim, p )) > -1 )\
     {
       flags = re_rep2.cap( 1 );
       pattern = re_rep2.cap( 2 );
-      tqreplacement = re_rep2.cap( 3 ).stripWhiteSpace();
+      replacement = re_rep2.cap( 3 ).stripWhiteSpace();
     }
     else
     {
-      msg = i18n("Usage: tqreplace[:[bceprsw]] PATTERN [REPLACEMENT]");
+      msg = i18n("Usage: replace[:[bceprsw]] PATTERN [REPLACEMENT]");
       return false;
     }
-    kdDebug()<<"tqreplace '"<<pattern<<"' with '"<<tqreplacement<<"'"<<endl;
+    kdDebug()<<"replace '"<<pattern<<"' with '"<<replacement<<"'"<<endl;
 #undef unbackslash
   }
 
   long f = 0;
-  if ( flags.tqcontains( 'b' ) ) f |= KFindDialog::FindBackwards;
-  if ( flags.tqcontains( 'c' ) ) f |= KFindDialog::FromCursor;
-  if ( flags.tqcontains( 'e' ) ) f |= KFindDialog::SelectedText;
-  if ( flags.tqcontains( 'r' ) ) f |= KFindDialog::RegularExpression;
-  if ( flags.tqcontains( 'p' ) ) f |= KReplaceDialog::PromptOnReplace;
-  if ( flags.tqcontains( 's' ) ) f |= KFindDialog::CaseSensitive;
-  if ( flags.tqcontains( 'w' ) ) f |= KFindDialog::WholeWordsOnly;
-
-  if ( cmd.startsWith( "tqfind" ) )
+  if ( flags.contains( 'b' ) ) f |= KFindDialog::FindBackwards;
+  if ( flags.contains( 'c' ) ) f |= KFindDialog::FromCursor;
+  if ( flags.contains( 'e' ) ) f |= KFindDialog::SelectedText;
+  if ( flags.contains( 'r' ) ) f |= KFindDialog::RegularExpression;
+  if ( flags.contains( 'p' ) ) f |= KReplaceDialog::PromptOnReplace;
+  if ( flags.contains( 's' ) ) f |= KFindDialog::CaseSensitive;
+  if ( flags.contains( 'w' ) ) f |= KFindDialog::WholeWordsOnly;
+
+  if ( cmd.startsWith( "find" ) )
   {
-    ((KateView*)view)->tqfind( pattern, f );
+    ((KateView*)view)->find( pattern, f );
     return true;
   }
-  else if ( cmd.startsWith( "tqreplace" ) )
+  else if ( cmd.startsWith( "replace" ) )
   {
     f |= KReplaceDialog::BackReference; // mandatory here?
-    ((KateView*)view)->tqreplace( pattern, tqreplacement, f );
+    ((KateView*)view)->replace( pattern, replacement, f );
     return true;
   }
 
@@ -922,15 +922,15 @@ while ( (p = pattern.tqfind( '\\' + delim, p )) > -1 )\
 
 bool SearchCommand::help(class Kate::View *, const TQString &cmd, TQString &msg)
 {
-  if ( cmd == "tqfind" )
-    msg = i18n("<p>Usage: <code>tqfind[:bcersw] PATTERN</code></p>");
+  if ( cmd == "find" )
+    msg = i18n("<p>Usage: <code>find[:bcersw] PATTERN</code></p>");
 
-  else if ( cmd == "itqfind" )
-    msg = i18n("<p>Usage: <code>itqfind:[:bcrs] PATTERN</code>"
-        "<br>itqfind does incremental or 'as-you-type' search</p>");
+  else if ( cmd == "ifind" )
+    msg = i18n("<p>Usage: <code>ifind:[:bcrs] PATTERN</code>"
+        "<br>ifind does incremental or 'as-you-type' search</p>");
 
   else
-    msg = i18n("<p>Usage: <code>tqreplace[:bceprsw] PATTERN REPLACEMENT</code></p>");
+    msg = i18n("<p>Usage: <code>replace[:bceprsw] PATTERN REPLACEMENT</code></p>");
 
   msg += i18n(
       "<h4><caption>Options</h4><p>"
@@ -940,15 +940,15 @@ bool SearchCommand::help(class Kate::View *, const TQString &cmd, TQString &msg)
       "<br><b>s</b> - Case sensitive search"
              );
 
-  if ( cmd == "tqfind" )
+  if ( cmd == "find" )
     msg += i18n(
         "<br><b>e</b> - Search in selected text only"
         "<br><b>w</b> - Search whole words only"
                );
 
-  if ( cmd == "tqreplace" )
+  if ( cmd == "replace" )
     msg += i18n(
-        "<br><b>p</b> - Prompt for tqreplace</p>"
+        "<br><b>p</b> - Prompt for replace</p>"
         "<p>If REPLACEMENT is not present, an empty string is used.</p>"
         "<p>If you want to have whitespace in your PATTERN, you need to "
         "quote both PATTERN and REPLACEMENT with either single or double "
@@ -962,30 +962,30 @@ bool SearchCommand::help(class Kate::View *, const TQString &cmd, TQString &msg)
 TQStringList SearchCommand::cmds()
 {
   TQStringList l;
-  l << "tqfind" << "tqreplace" << "itqfind";
+  l << "find" << "replace" << "ifind";
   return l;
 }
 
 bool SearchCommand::wantsToProcessText( const TQString &cmdname )
 {
-  return  cmdname == "itqfind";
+  return  cmdname == "ifind";
 }
 
 void SearchCommand::processText( Kate::View *view, const TQString &cmd )
 {
-  static TQRegExp re_itqfind("itqfind(?::([bcrs]*))?\\s(.*)");
-  if ( re_itqfind.search( cmd ) > -1 )
+  static TQRegExp re_ifind("ifind(?::([bcrs]*))?\\s(.*)");
+  if ( re_ifind.search( cmd ) > -1 )
   {
-    TQString flags = re_itqfind.cap( 1 );
-    TQString pattern = re_itqfind.cap( 2 );
+    TQString flags = re_ifind.cap( 1 );
+    TQString pattern = re_ifind.cap( 2 );
 
 
     // if there is no setup, or the text length is 0, set up the properties
-    if ( ! m_itqfindFlags || pattern.isEmpty() )
-      itqfindInit( flags );
+    if ( ! m_ifindFlags || pattern.isEmpty() )
+      ifindInit( flags );
     // if there is no fromCursor, add it if this is not the first character
-    else if ( ! ( m_itqfindFlags & KFindDialog::FromCursor ) && ! pattern.isEmpty() )
-      m_itqfindFlags |= KFindDialog::FromCursor;
+    else if ( ! ( m_ifindFlags & KFindDialog::FromCursor ) && ! pattern.isEmpty() )
+      m_ifindFlags |= KFindDialog::FromCursor;
 
     // search..
     if ( ! pattern.isEmpty() )
@@ -1000,25 +1000,25 @@ void SearchCommand::processText( Kate::View *view, const TQString &cmd )
            v->selection().length() + 1 == pattern.length() )
         v->setCursorPositionInternal( v->selStartLine(), v->selStartCol() );
 
-      v->tqfind( pattern, m_itqfindFlags, false );
+      v->find( pattern, m_ifindFlags, false );
     }
   }
 }
 
-void SearchCommand::itqfindInit( const TQString &flags )
+void SearchCommand::ifindInit( const TQString &flags )
 {
   long f = 0;
-  if ( flags.tqcontains( 'b' ) ) f |= KFindDialog::FindBackwards;
-  if ( flags.tqcontains( 'c' ) ) f |= KFindDialog::FromCursor;
-  if ( flags.tqcontains( 'r' ) ) f |= KFindDialog::RegularExpression;
-  if ( flags.tqcontains( 's' ) ) f |= KFindDialog::CaseSensitive;
-  m_itqfindFlags = f;
+  if ( flags.contains( 'b' ) ) f |= KFindDialog::FindBackwards;
+  if ( flags.contains( 'c' ) ) f |= KFindDialog::FromCursor;
+  if ( flags.contains( 'r' ) ) f |= KFindDialog::RegularExpression;
+  if ( flags.contains( 's' ) ) f |= KFindDialog::CaseSensitive;
+  m_ifindFlags = f;
 }
 
-void SearchCommand::itqfindClear()
+void SearchCommand::ifindClear()
 {
-  m_itqfindFlags = 0;
+  m_ifindFlags = 0;
 }
 //END SearchCommand
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katesearch.h b/kate/part/katesearch.h
index 0e9541069..ebf228dcd 100644
--- a/kate/part/katesearch.h
+++ b/kate/part/katesearch.h
@@ -39,7 +39,7 @@ class KateSuperRangeList;
 
 class KActionCollection;
 
-class KateSearch : public TQObject
+class KateSearch : public QObject
 {
   Q_OBJECT
 
@@ -55,7 +55,7 @@ class KateSearch : public TQObject
         bool backward          :1;
         bool selected          :1;
         bool prompt            :1;
-        bool tqreplace           :1;
+        bool replace           :1;
         bool finished          :1;
         bool regExp            :1;
         bool useBackRefs       :1;
@@ -66,7 +66,7 @@ class KateSearch : public TQObject
       public:
         SearchFlags flags;
         KateTextCursor cursor;
-        KateTextCursor wrappedEnd; // after wraping around, search/tqreplace until here
+        KateTextCursor wrappedEnd; // after wraping around, search/replace until here
         bool wrapped; // have we allready wrapped around ?
         bool showNotFound; // pop up annoying dialogs?
         uint matchedLength;
@@ -90,52 +90,52 @@ class KateSearch : public TQObject
     void createActions( KActionCollection* );
 
   public slots:
-    void tqfind();
+    void find();
     /**
      * Search for @p pattern given @p flags
-     * This is for the commandline "tqfind", and is forwarded by
+     * This is for the commandline "find", and is forwarded by
      * KateView.
      * @param pattern string or regex pattern to search for.
      * @param flags a OR'ed combination of KFindDialog::Options
      * @param add wether this string should be added to the recent search list
      * @param shownotfound wether to pop up "Not round: PATTERN" when that happens.
-     * That must now be explicitly required -- the tqfind dialog does, but the commandline
+     * That must now be explicitly required -- the find dialog does, but the commandline
      * incremental search does not.
      */
-    void tqfind( const TQString &pattern, long flags, bool add=true, bool shownotfound=false );
-    void tqreplace();
+    void find( const TQString &pattern, long flags, bool add=true, bool shownotfound=false );
+    void replace();
     /**
-     * Replace @p pattern with @p tqreplacement given @p flags.
-     * This is for the commandline "tqreplace" and is forwarded
+     * Replace @p pattern with @p replacement given @p flags.
+     * This is for the commandline "replace" and is forwarded
      * by KateView.
      * @param pattern string or regular expression to search for
-     * @param tqreplacement Replacement string.
+     * @param replacement Replacement string.
      * @param flags OR'd combination of KFindDialog::Options
      */
-    void tqreplace( const TQString &pattern, const TQString &tqreplacement, long flags );
-    void tqfindAgain( bool reverseDirection );
+    void replace( const TQString &pattern, const TQString &replacement, long flags );
+    void findAgain( bool reverseDirection );
 
   private slots:
-    void tqreplaceSlot();
-    void slotFindNext() { tqfindAgain( false ); }
-    void slotFindPrev() { tqfindAgain( true );  }
+    void replaceSlot();
+    void slotFindNext() { findAgain( false ); }
+    void slotFindPrev() { findAgain( true );  }
 
   private:
     static void addToList( TQStringList&, const TQString& );
     static void addToSearchList( const TQString& s )  { addToList( s_searchList, s ); }
-    static void addToReplaceList( const TQString& s ) { addToList( s_tqreplaceList, s ); }
+    static void addToReplaceList( const TQString& s ) { addToList( s_replaceList, s ); }
     static TQStringList s_searchList; ///< recent patterns
-    static TQStringList s_tqreplaceList; ///< recent tqreplacement strings
+    static TQStringList s_replaceList; ///< recent replacement strings
     static TQString s_pattern; ///< the string to search for
 
     void search( SearchFlags flags );
     void wrapSearch();
     bool askContinue();
 
-    void tqfindAgain();
+    void findAgain();
     void promptReplace();
-    void tqreplaceAll();
-    void tqreplaceOne();
+    void replaceAll();
+    void replaceOne();
     void skipOne();
 
     TQString getSearchText();
@@ -156,14 +156,14 @@ class KateSearch : public TQObject
     TQValueList<SConfig> m_searchResults;
     int                 m_resultIndex;
 
-    int           tqreplaces;
-    TQDialog*      tqreplacePrompt;
-    TQString m_tqreplacement;
+    int           replaces;
+    TQDialog*      replacePrompt;
+    TQString m_replacement;
     TQRegExp m_re;
 };
 
 /**
- * simple tqreplace prompt dialog
+ * simple replace prompt dialog
  */
 class KateReplacePrompt : public KDialogBase
 {
@@ -194,7 +194,7 @@ class KateReplacePrompt : public KDialogBase
     void slotClose ();
 
     /**
-     * tqreplace all pressed
+     * replace all pressed
      */
     void slotUser1 ();
 
@@ -218,7 +218,7 @@ class KateReplacePrompt : public KDialogBase
 class SearchCommand : public Kate::Command, public Kate::CommandExtension
 {
   public:
-    SearchCommand() : m_itqfindFlags(0) {;}
+    SearchCommand() : m_ifindFlags(0) {;}
     bool exec(class Kate::View *view, const TQString &cmd, TQString &errorMsg);
     bool help(class Kate::View *, const TQString &, TQString &);
     TQStringList cmds();
@@ -227,17 +227,17 @@ class SearchCommand : public Kate::Command, public Kate::CommandExtension
 
   private:
     /**
-     * set up properties for incremental tqfind
+     * set up properties for incremental find
      */
-    void itqfindInit( const TQString &cmd );
+    void ifindInit( const TQString &cmd );
     /**
-     * clear properties for incremental tqfind
+     * clear properties for incremental find
      */
-    void itqfindClear();
+    void ifindClear();
 
-    long m_itqfindFlags;
+    long m_ifindFlags;
 };
 
 #endif
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katespell.cpp b/kate/part/katespell.cpp
index 057b39753..6ce2b2a72 100644
--- a/kate/part/katespell.cpp
+++ b/kate/part/katespell.cpp
@@ -113,7 +113,7 @@ void KateSpell::spellcheck( const KateTextCursor &from, const KateTextCursor &to
       << "ISO 8859-9" << "ISO 8859-13" << "ISO 8859-15" << "UTF-8"
       << "KOI8-R" << "KOI8-U" << "CP1251" << "CP1255";
 
-  int enc = ksEncodings.tqfindIndex( m_view->doc()->encoding() );
+  int enc = ksEncodings.findIndex( m_view->doc()->encoding() );
   if ( enc > -1 )
   {
     ksc->setEncoding( enc );
@@ -198,7 +198,7 @@ void KateSpell::spellResult( const TQString& )
 
 void KateSpell::spellCleanDone()
 {
-  KSpell::spelltqStatus status = m_kspell->status();
+  KSpell::spellStatus status = m_kspell->status();
 
   if( status == KSpell::Error ) {
     KMessageBox::sorry( 0,
@@ -218,4 +218,4 @@ void KateSpell::spellCleanDone()
 //END
 
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katespell.h b/kate/part/katespell.h
index e815b47ea..f376ece49 100644
--- a/kate/part/katespell.h
+++ b/kate/part/katespell.h
@@ -30,7 +30,7 @@ class KateView;
 class KAction;
 class KSpell;
 
-class KateSpell : public TQObject
+class KateSpell : public QObject
 {
   Q_OBJECT
 
@@ -83,4 +83,4 @@ class KateSpell : public TQObject
 
 #endif
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katesupercursor.cpp b/kate/part/katesupercursor.cpp
index c1895abda..8a2689014 100644
--- a/kate/part/katesupercursor.cpp
+++ b/kate/part/katesupercursor.cpp
@@ -662,7 +662,7 @@ void KateSuperRangeList::slotDeleted(TQObject* range)
       m_columnBoundaries.removeRef(r->m_end);
   }
 
-  int index = tqfindRef(r);
+  int index = findRef(r);
   if (index != -1)
     take(index);
   //else kdDebug(13020)<<"Range not found in list"<<endl;
@@ -743,4 +743,4 @@ TQPtrCollection::Item KateSuperRangeList::newItem(TQPtrCollection::Item d)
   return TQPtrList<KateSuperRange>::newItem(d);
 }
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katesupercursor.h b/kate/part/katesupercursor.h
index 9b4b6a199..ef0fd378d 100644
--- a/kate/part/katesupercursor.h
+++ b/kate/part/katesupercursor.h
@@ -238,7 +238,7 @@ public:
    * @todo constrain children when their position changes deliberately;
    *       eliminate() children when they are equivalent to their parents
    *
-   * @returns true if the range tqcontains the cursor and no children
+   * @returns true if the range contains the cursor and no children
    *          also contain it; false otherwise.
    */
   bool owns(const KateTextCursor& cursor) const;
@@ -297,7 +297,7 @@ signals:
   void boundaryDeleted();
 
   /**
-   * The range now tqcontains no characters (ie. the start and end cursors are the same).
+   * The range now contains no characters (ie. the start and end cursors are the same).
    *
    * To eliminate this range under different conditions, connect the other signal directly
    * to this signal.
@@ -420,7 +420,7 @@ public:
 
 signals:
   /**
-   * The range now tqcontains no characters (ie. the start and end cursors are the same).
+   * The range now contains no characters (ie. the start and end cursors are the same).
    * If autoManage() is true, the range will be deleted after the signal has processed.
    */
   void rangeEliminated(KateSuperRange* range);
@@ -460,4 +460,4 @@ private:
 
 #endif
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katesyntaxdocument.cpp b/kate/part/katesyntaxdocument.cpp
index 0930808e9..8e391b620 100644
--- a/kate/part/katesyntaxdocument.cpp
+++ b/kate/part/katesyntaxdocument.cpp
@@ -275,7 +275,7 @@ KateSyntaxContextData* KateSyntaxDocument::getGroupInfo(const TQString& mainGrou
 /**
  * Returns a list with all the keywords inside the list type
  */
-TQStringList& KateSyntaxDocument::tqfinddata(const TQString& mainGroup, const TQString& type, bool clearList)
+TQStringList& KateSyntaxDocument::finddata(const TQString& mainGroup, const TQString& type, bool clearList)
 {
   kdDebug(13010)<<"Create a list of keywords \""<<type<<"\" from \""<<mainGroup<<"\"."<<endl;
   if (clearList)
@@ -472,4 +472,4 @@ void KateSyntaxDocument::setupModeList (bool force)
   config.sync();
 }
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katesyntaxdocument.h b/kate/part/katesyntaxdocument.h
index 4204895d0..93deb731d 100644
--- a/kate/part/katesyntaxdocument.h
+++ b/kate/part/katesyntaxdocument.h
@@ -128,7 +128,7 @@ class KateSyntaxDocument : public QDomDocument
     /**
      * Returns a list with all the keywords inside the list type
      */
-    TQStringList& tqfinddata(const TQString& mainGroup,const TQString& type,bool clearList=true);
+    TQStringList& finddata(const TQString& mainGroup,const TQString& type,bool clearList=true);
 
   private:
     /**
@@ -161,4 +161,4 @@ class KateSyntaxDocument : public QDomDocument
 
 #endif
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katetemplatehandler.cpp b/kate/part/katetemplatehandler.cpp
index a4016a0de..52e07a2e4 100644
--- a/kate/part/katetemplatehandler.cpp
+++ b/kate/part/katetemplatehandler.cpp
@@ -83,7 +83,7 @@ KateTemplateHandler::KateTemplateHandler(
       if ( rx.cap( 1 ) != "%" || placeholder == value )
         buildList.append( KateTemplateHandlerPlaceHolderInfo( pos, value.length(), placeholder ) );
 
-      insertString.tqreplace( pos, rx.matchedLength(), value );
+      insertString.replace( pos, rx.matchedLength(), value );
       pos += value.length();
       opos = pos;
     }
@@ -168,7 +168,7 @@ void KateTemplateHandler::generateRangeTable( uint insertLine, uint insertCol, c
       ph->ranges.setAutoManage( false );
     }
 
-    // FIXME handle space/tab tqreplacement correctly make it use of the indenter
+    // FIXME handle space/tab replacement correctly make it use of the indenter
     while ( colInText < ( *it ).begin )
     {
       ++col;
diff --git a/kate/part/katetextline.cpp b/kate/part/katetextline.cpp
index 6280c7300..e64b928c7 100644
--- a/kate/part/katetextline.cpp
+++ b/kate/part/katetextline.cpp
@@ -110,11 +110,11 @@ void KateTextLine::truncate(uint newLen)
 int KateTextLine::nextNonSpaceChar(uint pos) const
 {
   const uint len = m_text.length();
-  const TQChar *tqunicode = m_text.tqunicode();
+  const TQChar *unicode = m_text.unicode();
 
   for(uint i = pos; i < len; i++)
   {
-    if(!tqunicode[i].isSpace())
+    if(!unicode[i].isSpace())
       return i;
   }
 
@@ -128,11 +128,11 @@ int KateTextLine::previousNonSpaceChar(uint pos) const
   if (pos >= (uint)len)
     pos = len - 1;
 
-  const TQChar *tqunicode = m_text.tqunicode();
+  const TQChar *unicode = m_text.unicode();
 
   for(int i = pos; i >= 0; i--)
   {
-    if(!tqunicode[i].isSpace())
+    if(!unicode[i].isSpace())
       return i;
   }
 
@@ -152,20 +152,20 @@ int KateTextLine::lastChar() const
 const TQChar *KateTextLine::firstNonSpace() const
 {
   int first = firstChar();
-  return (first > -1) ? ((TQChar*)m_text.tqunicode())+first : m_text.tqunicode();
+  return (first > -1) ? ((TQChar*)m_text.unicode())+first : m_text.unicode();
 }
 
 uint KateTextLine::indentDepth (uint tabwidth) const
 {
   uint d = 0;
   const uint len = m_text.length();
-  const TQChar *tqunicode = m_text.tqunicode();
+  const TQChar *unicode = m_text.unicode();
 
   for(uint i = 0; i < len; i++)
   {
-    if(tqunicode[i].isSpace())
+    if(unicode[i].isSpace())
     {
-      if (tqunicode[i] == TQChar('\t'))
+      if (unicode[i] == TQChar('\t'))
         d += tabwidth - (d % tabwidth);
       else
         d++;
@@ -189,11 +189,11 @@ bool KateTextLine::stringAtPos(uint pos, const TQString& match) const
   // overflow again which (pos+matchlen > len) does not catch; see bugs #129263 and #129580
   Q_ASSERT(pos < len);
 
-  const TQChar *tqunicode = m_text.tqunicode();
-  const TQChar *matchUnicode = match.tqunicode();
+  const TQChar *unicode = m_text.unicode();
+  const TQChar *matchUnicode = match.unicode();
 
   for (uint i=0; i < matchlen; i++)
-    if (tqunicode[i+pos] != matchUnicode[i])
+    if (unicode[i+pos] != matchUnicode[i])
       return false;
 
   return true;
@@ -206,11 +206,11 @@ bool KateTextLine::startingWith(const TQString& match) const
   if (matchlen > m_text.length())
     return false;
 
-  const TQChar *tqunicode = m_text.tqunicode();
-  const TQChar *matchUnicode = match.tqunicode();
+  const TQChar *unicode = m_text.unicode();
+  const TQChar *matchUnicode = match.unicode();
 
   for (uint i=0; i < matchlen; i++)
-    if (tqunicode[i] != matchUnicode[i])
+    if (unicode[i] != matchUnicode[i])
       return false;
 
   return true;
@@ -223,12 +223,12 @@ bool KateTextLine::endingWith(const TQString& match) const
   if (matchlen > m_text.length())
     return false;
 
-  const TQChar *tqunicode = m_text.tqunicode();
-  const TQChar *matchUnicode = match.tqunicode();
+  const TQChar *unicode = m_text.unicode();
+  const TQChar *matchUnicode = match.unicode();
 
   uint start = m_text.length() - matchlen;
   for (uint i=0; i < matchlen; i++)
-    if (tqunicode[start+i] != matchUnicode[i])
+    if (unicode[start+i] != matchUnicode[i])
       return false;
 
   return true;
@@ -239,11 +239,11 @@ int KateTextLine::cursorX(uint pos, uint tabChars) const
   uint x = 0;
 
   const uint n = kMin (pos, m_text.length());
-  const TQChar *tqunicode = m_text.tqunicode();
+  const TQChar *unicode = m_text.unicode();
 
   for ( uint z = 0; z < n; z++)
   {
-    if (tqunicode[z] == TQChar('\t'))
+    if (unicode[z] == TQChar('\t'))
       x += tabChars - (x % tabChars);
     else
       x++;
@@ -257,11 +257,11 @@ uint KateTextLine::lengthWithTabs (uint tabChars) const
 {
   uint x = 0;
   const uint len = m_text.length();
-  const TQChar *tqunicode = m_text.tqunicode();
+  const TQChar *unicode = m_text.unicode();
 
   for ( uint z = 0; z < len; z++)
   {
-    if (tqunicode[z] == TQChar('\t'))
+    if (unicode[z] == TQChar('\t'))
       x += tabChars - (x % tabChars);
     else
       x++;
@@ -278,16 +278,16 @@ bool KateTextLine::searchText (uint startCol, const TQString &text, uint *foundA
   {
     int col = startCol;
     uint l = text.length();
-    // allow tqfinding the string ending at eol
+    // allow finding the string ending at eol
     if ( col == (int) m_text.length() ) ++startCol;
 
     do {
-      index = m_text.tqfindRev( text, col, casesensitive );
+      index = m_text.findRev( text, col, casesensitive );
       col--;
     } while ( col >= 0 && l + index >= startCol );
   }
   else
-    index = m_text.tqfind (text, startCol, casesensitive);
+    index = m_text.find (text, startCol, casesensitive);
 
   if (index > -1)
   {
@@ -309,7 +309,7 @@ bool KateTextLine::searchText (uint startCol, const TQRegExp &regexp, uint *foun
   {
     int col = startCol;
 
-    // allow tqfinding the string ending at eol
+    // allow finding the string ending at eol
     if ( col == (int) m_text.length() ) ++startCol;
     do {
       index = regexp.searchRev (m_text, col);
@@ -346,7 +346,7 @@ char *KateTextLine::dump (char *buf, bool withHighlighting) const
   memcpy(buf, &l, sizeof(uint));
   buf += sizeof(uint);
 
-  memcpy(buf, (char *) m_text.tqunicode(), sizeof(TQChar)*l);
+  memcpy(buf, (char *) m_text.unicode(), sizeof(TQChar)*l);
   buf += sizeof(TQChar) * l;
 
   if (!withHighlighting)
@@ -440,4 +440,4 @@ char *KateTextLine::restore (char *buf)
   return buf;
 }
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/katetextline.h b/kate/part/katetextline.h
index a954c87ea..3922d04d0 100644
--- a/kate/part/katetextline.h
+++ b/kate/part/katetextline.h
@@ -32,10 +32,10 @@ class KateRenderer;
 class TQTextStream;
 
 /**
- * The KateTextLine represents a line of text. A text line that tqcontains the
+ * The KateTextLine represents a line of text. A text line that contains the
  * text, an attribute for each character, an attribute for the free space
  * behind the last character and a context number for the syntax highlight.
- * The attribute stores the index to a table that tqcontains fonts and colors
+ * The attribute stores the index to a table that contains fonts and colors
  * and also if a character is selected.
  */
 class KateTextLine : public KShared
@@ -145,16 +145,16 @@ class KateTextLine : public KShared
     inline TQChar getChar (uint pos) const { return m_text[pos]; }
 
     /**
-     * Gets the text as a tqunicode representation
+     * Gets the text as a unicode representation
      * @return text of this line as TQChar array
      */
-    inline const TQChar *text() const { return m_text.tqunicode(); }
+    inline const TQChar *text() const { return m_text.unicode(); }
 
     /**
      * Highlighting array
      * The size of this is string().length()
      *
-     * This tqcontains the index for the attributes (so you can only
+     * This contains the index for the attributes (so you can only
      * have a maximum of 2^8 different highlighting styles in a document)
      *
      * To turn this into actual attributes (bold, green, etc),
@@ -211,7 +211,7 @@ class KateTextLine : public KShared
     uint lengthWithTabs (uint tabChars) const;
 
     /**
-     * Can we tqfind the given string at the given position
+     * Can we find the given string at the given position
      * @param pos startpostion of given string
      * @param match string to match at given pos
      * @return did the string match?
@@ -419,7 +419,7 @@ class KateTextLine : public KShared
    */
   private:
     /**
-     * text of line as tqunicode
+     * text of line as unicode
      */
     TQString m_text;
 
@@ -453,4 +453,4 @@ class KateTextLine : public KShared
 
 #endif
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/kateundo.cpp b/kate/part/kateundo.cpp
index da6a99474..379df16f0 100644
--- a/kate/part/kateundo.cpp
+++ b/kate/part/kateundo.cpp
@@ -389,4 +389,4 @@ bool KateUndoGroup::isOnlyType(KateUndoGroup::UndoType type)
   return true;
 }
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/kateundo.h b/kate/part/kateundo.h
index 467f5dd58..4d0141189 100644
--- a/kate/part/kateundo.h
+++ b/kate/part/kateundo.h
@@ -102,7 +102,7 @@ class KateUndoGroup
   private:
     /**
      * singleType
-     * @return the type if it's only one type, or editInvalid if it tqcontains multiple types.
+     * @return the type if it's only one type, or editInvalid if it contains multiple types.
      */
     KateUndoGroup::UndoType singleType();
 
@@ -138,4 +138,4 @@ class KateUndoGroup
 
 #endif
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp
index a3997ff70..7840e79d5 100644
--- a/kate/part/kateview.cpp
+++ b/kate/part/kateview.cpp
@@ -125,7 +125,7 @@ KateView::KateView( KateDocument *doc, TQWidget *parent, const char * name )
   setPopupMenuInterfaceDCOPSuffix (viewDCOPSuffix());
   setSessionConfigInterfaceDCOPSuffix (viewDCOPSuffix());
   setViewCursorInterfaceDCOPSuffix (viewDCOPSuffix());
-  setViewtqStatusMsgInterfaceDCOPSuffix (viewDCOPSuffix());
+  setViewStatusMsgInterfaceDCOPSuffix (viewDCOPSuffix());
 
   setInstance( KateFactory::self()->instance() );
   doc->addView( this );
@@ -194,9 +194,9 @@ void KateView::setupConnections()
            this, TQT_SLOT(slotSaveCanceled(const TQString&)) );
   connect( m_viewInternal, TQT_SIGNAL(dropEventPass(TQDropEvent*)),
            this,           TQT_SIGNAL(dropEventPass(TQDropEvent*)) );
-  connect(this,TQT_SIGNAL(cursorPositionChanged()),this,TQT_SLOT(slottqStatusMsg()));
-  connect(this,TQT_SIGNAL(newtqStatus()),this,TQT_SLOT(slottqStatusMsg()));
-  connect(m_doc, TQT_SIGNAL(undoChanged()), this, TQT_SLOT(slottqStatusMsg()));
+  connect(this,TQT_SIGNAL(cursorPositionChanged()),this,TQT_SLOT(slotStatusMsg()));
+  connect(this,TQT_SIGNAL(newStatus()),this,TQT_SLOT(slotStatusMsg()));
+  connect(m_doc, TQT_SIGNAL(undoChanged()), this, TQT_SLOT(slotStatusMsg()));
 
   if ( m_doc->browserView() )
   {
@@ -243,13 +243,13 @@ void KateView::setupActions()
     // setup Tools menu
     a=new KAction(i18n("&Indent"), "indent", Qt::CTRL+Qt::Key_I, this, TQT_SLOT(indent()), ac, "tools_indent");
     a->setWhatsThis(i18n("Use this to indent a selected block of text.<br><br>"
-        "You can configure whether tabs should be honored and used or tqreplaced with spaces, in the configuration dialog."));
+        "You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog."));
     a=new KAction(i18n("&Unindent"), "unindent", Qt::CTRL+Qt::SHIFT+Qt::Key_I, this, TQT_SLOT(unIndent()), ac, "tools_unindent");
     a->setWhatsThis(i18n("Use this to unindent a selected block of text."));
 
     a=new KAction(i18n("&Clean Indentation"), 0, this, TQT_SLOT(cleanIndent()), ac, "tools_cleanIndent");
     a->setWhatsThis(i18n("Use this to clean the indentation of a selected block of text (only tabs/only spaces)<br><br>"
-        "You can configure whether tabs should be honored and used or tqreplaced with spaces, in the configuration dialog."));
+        "You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog."));
 
     a=new KAction(i18n("&Align"), 0, this, TQT_SLOT(align()), ac, "tools_align");
     a->setWhatsThis(i18n("Use this to align the current line or block of text to its proper indent level."));
@@ -680,7 +680,7 @@ void KateView::slotGotFocus()
 {
   m_editActions->accel()->setEnabled( true );
 
-  slottqStatusMsg ();
+  slotStatusMsg ();
 }
 
 void KateView::slotLostFocus()
@@ -693,7 +693,7 @@ void KateView::setDynWrapIndicators(int mode)
   config()->setDynWordWrapIndicators (mode);
 }
 
-void KateView::slottqStatusMsg ()
+void KateView::slotStatusMsg ()
 {
   TQString ovrstr;
   if (m_doc->isReadWrite())
@@ -715,14 +715,14 @@ void KateView::slottqStatusMsg ()
   TQString modstr = m_doc->isModified() ? TQString (" * ") : TQString ("   ");
   TQString blockstr = blockSelectionMode() ? i18n(" BLK ") : i18n(" NORM ");
 
-  emit viewtqStatusMsg (s1 + s2 + " " + ovrstr + blockstr + modstr);
+  emit viewStatusMsg (s1 + s2 + " " + ovrstr + blockstr + modstr);
 }
 
 void KateView::slotSelectionTypeChanged()
 {
   m_toggleBlockSelection->setChecked( blockSelectionMode() );
 
-  emit newtqStatus();
+  emit newStatus();
 }
 
 bool KateView::isOverwriteMode() const
@@ -733,12 +733,12 @@ bool KateView::isOverwriteMode() const
 void KateView::reloadFile()
 {
   m_doc->reloadFile();
-  emit newtqStatus();
+  emit newStatus();
 }
 
 void KateView::slotUpdate()
 {
-  emit newtqStatus();
+  emit newStatus();
 
   slotNewUndo();
 }
@@ -753,7 +753,7 @@ void KateView::slotReadWriteChanged ()
 
   TQStringList l;
 
-  l << "edit_tqreplace" << "set_insert" << "tools_spelling" << "tools_indent"
+  l << "edit_replace" << "set_insert" << "tools_spelling" << "tools_indent"
       << "tools_unindent" << "tools_cleanIndent" << "tools_align"  << "tools_comment"
       << "tools_uncomment" << "tools_uppercase" << "tools_lowercase"
       << "tools_capitalize" << "tools_join_lines" << "tools_apply_wordwrap"
@@ -793,7 +793,7 @@ void KateView::contextMenuEvent( TQContextMenuEvent *ev )
   if ( !m_doc || !m_doc->browserExtension()  )
     return;
   emit m_doc->browserExtension()->popupMenu( /*this, */ev->globalPos(), m_doc->url(),
-                                        TQString::tqfromLatin1( "text/plain" ) );
+                                        TQString::fromLatin1( "text/plain" ) );
   ev->accept();
 }
 
@@ -832,7 +832,7 @@ void KateView::toggleInsert()
   m_doc->setConfigFlags(m_doc->config()->configFlags() ^ KateDocument::cfOvr);
   m_toggleInsert->setChecked (isOverwriteMode ());
 
-  emit newtqStatus();
+  emit newStatus();
 }
 
 bool KateView::canDiscard()
@@ -1089,29 +1089,29 @@ void KateView::slotNeedTextHint(int line, int col, TQString &text)
   text=TQString("test %1 %2").arg(line).arg(col);
 }
 
-void KateView::tqfind()
+void KateView::find()
 {
-  m_search->tqfind();
+  m_search->find();
 }
 
-void KateView::tqfind( const TQString& pattern, long flags, bool add )
+void KateView::find( const TQString& pattern, long flags, bool add )
 {
-  m_search->tqfind( pattern, flags, add );
+  m_search->find( pattern, flags, add );
 }
 
-void KateView::tqreplace()
+void KateView::replace()
 {
-  m_search->tqreplace();
+  m_search->replace();
 }
 
-void KateView::tqreplace( const TQString &pattern, const TQString &tqreplacement, long flags )
+void KateView::replace( const TQString &pattern, const TQString &replacement, long flags )
 {
-  m_search->tqreplace( pattern, tqreplacement, flags );
+  m_search->replace( pattern, replacement, flags );
 }
 
-void KateView::tqfindAgain( bool back )
+void KateView::findAgain( bool back )
 {
-  m_search->tqfindAgain( back );
+  m_search->findAgain( back );
 }
 
 void KateView::slotSelectionChanged ()
@@ -1233,11 +1233,11 @@ void KateView::updateRendererConfig()
 
   // update the text area
   m_viewInternal->updateView (true);
-  m_viewInternal->tqrepaint ();
+  m_viewInternal->repaint ();
 
   // update the left border right, for example linenumbers
   m_viewInternal->leftBorder->updateFont();
-  m_viewInternal->leftBorder->tqrepaint ();
+  m_viewInternal->leftBorder->repaint ();
 
 // @@ showIndentLines is not cached anymore.
 //  m_renderer->setShowIndentLines (m_renderer->config()->showIndentationLines());
@@ -1305,7 +1305,7 @@ void KateView::clear ()
   m_viewInternal->clear ();
 }
 
-void KateView::tqrepaintText (bool paintOnlyDirty)
+void KateView::repaintText (bool paintOnlyDirty)
 {
   m_viewInternal->paintText(0,0,m_viewInternal->width(),m_viewInternal->height(), paintOnlyDirty);
 }
@@ -1360,7 +1360,7 @@ bool KateView::setSelection( const KateTextCursor& start, const KateTextCursor&
 
   tagSelection(oldSelectStart, oldSelectEnd);
 
-  tqrepaintText(true);
+  repaintText(true);
 
   emit selectionChanged ();
   emit m_doc->selectionChanged ();
@@ -1405,7 +1405,7 @@ bool KateView::clearSelection(bool redraw, bool finishedChangingSelection)
   oldSelectEnd = selectEnd;
 
   if (redraw)
-    tqrepaintText(true);
+    repaintText(true);
 
   if (finishedChangingSelection)
   {
@@ -1596,7 +1596,7 @@ void KateView::paste()
 {
   m_doc->paste( this );
   emit selectionChanged();
-  m_viewInternal->tqrepaint();
+  m_viewInternal->repaint();
 }
 
 void KateView::cut()
@@ -1736,7 +1736,7 @@ void KateView::lineAsHTML (KateTextLine::Ptr line, uint startCol, uint length, T
   for (uint curPos=startCol;curPos<(length+startCol);curPos++)
   {
     if ( curPos == 0 || line->attribute( curPos ) != line->attribute( curPos - 1 ) &&
-         // Since many highlight files tqcontains itemdatas that have the exact
+         // Since many highlight files contains itemdatas that have the exact
          // same styles, join those to keep the HTML text size down
          KateAttribute(*charAttributes) != KateAttribute(*m_renderer->attribute(line->attribute(curPos))) )
     {
@@ -1748,7 +1748,7 @@ void KateView::lineAsHTML (KateTextLine::Ptr line, uint startCol, uint length, T
 
       charAttributes = m_renderer->attribute(line->attribute(curPos));
 
-      if ( ! stylecache.tqcontains( line->attribute(curPos) ) )
+      if ( ! stylecache.contains( line->attribute(curPos) ) )
       {
         TQString textdecoration;
         TQString style;
@@ -1917,4 +1917,4 @@ void KateView::getIMSelectionValue( uint *imStartLine, uint *imStart, uint *imEn
 }
 //END IM INPUT STUFF
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/kateview.h b/kate/part/kateview.h
index aab0a6035..aa428096d 100644
--- a/kate/part/kateview.h
+++ b/kate/part/kateview.h
@@ -56,7 +56,7 @@ class TQGridLayout;
 //
 class KateView : public Kate::View,
                  public KTextEditor::SessionConfigInterface,
-                 public KTextEditor::ViewtqStatusMsgInterface,
+                 public KTextEditor::ViewStatusMsgInterface,
                  public KTextEditor::TextHintInterface,
                  public KTextEditor::SelectionInterface,
                  public KTextEditor::SelectionInterfaceExt,
@@ -270,7 +270,7 @@ class KateView : public Kate::View,
 
     void clear ();
 
-    void tqrepaintText (bool paintOnlyDirty = false);
+    void repaintText (bool paintOnlyDirty = false);
 
     void updateView (bool changed = false);
   //END
@@ -376,14 +376,14 @@ class KateView : public Kate::View,
   public slots:
     int getEol();
     void setEol( int eol );
-    void tqfind();
-    void tqfind( const TQString&, long, bool add=true ); ///< proxy for KateSearch
-    void tqreplace();
-    void tqreplace( const TQString&, const TQString &, long ); ///< proxy for KateSearch
-    /** Highly confusing but KateSearch::tqfindAgain() is backwards too. */
-    void tqfindAgain( bool back );
-    void tqfindAgain()              { tqfindAgain( false );          }
-    void tqfindPrev()               { tqfindAgain( true );           }
+    void find();
+    void find( const TQString&, long, bool add=true ); ///< proxy for KateSearch
+    void replace();
+    void replace( const TQString&, const TQString &, long ); ///< proxy for KateSearch
+    /** Highly confusing but KateSearch::findAgain() is backwards too. */
+    void findAgain( bool back );
+    void findAgain()              { findAgain( false );          }
+    void findPrev()               { findAgain( true );           }
 
     void setFoldingMarkersOn( bool enable ); // Not in Kate::View, but should be
     void setIconBorder( bool enable );
@@ -420,7 +420,7 @@ class KateView : public Kate::View,
   signals:
     void gotFocus( Kate::View* );
     void lostFocus( Kate::View* );
-    void newtqStatus(); // Not in Kate::View, but should be (Kate app connects to it)
+    void newStatus(); // Not in Kate::View, but should be (Kate app connects to it)
 
   //
   // Extras
@@ -443,7 +443,7 @@ class KateView : public Kate::View,
 
   signals:
     void dropEventPass(TQDropEvent*);
-    void viewtqStatusMsg (const TQString &msg);
+    void viewStatusMsg (const TQString &msg);
 
   public:
     bool setCursorPositionInternal( uint line, uint col, uint tabwidth = 1, bool calledExternally = false );
@@ -459,7 +459,7 @@ class KateView : public Kate::View,
     void slotGotFocus();
     void slotLostFocus();
     void slotDropEventPass( TQDropEvent* ev );
-    void slottqStatusMsg();
+    void slotStatusMsg();
     void slotSaveCanceled( const TQString& error );
     void slotExpandToplevel();
     void slotCollapseLocal();
diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp
index 663255714..da88676bc 100644
--- a/kate/part/kateviewhelpers.cpp
+++ b/kate/part/kateviewhelpers.cpp
@@ -170,7 +170,7 @@ void KateScrollBar::recomputeMarksPositions(bool forceFullUpdate)
 
     if (tree)
     {
-      KateCodeFoldingNode *node = tree->tqfindNodeForLine(line);
+      KateCodeFoldingNode *node = tree->findNodeForLine(line);
 
       while (node)
       {
@@ -244,7 +244,7 @@ class KateCmdLnWhatsThis : public QWhatsThis
           Kate::Command *cmd = KateCmd::self()->queryCommand( name );
           if ( cmd )
           {
-            if ( cmd->help( (Kate::View*)m_parent->tqparentWidget(), name, s ) )
+            if ( cmd->help( (Kate::View*)m_parent->parentWidget(), name, s ) )
               return beg + name + mid + s + end;
             else
               return beg + name + mid + i18n("No help for '%1'").arg( name ) + end;
@@ -380,7 +380,7 @@ void KateCmdLine::slotReturnPressed ( const TQString& text )
 
 void KateCmdLine::hideMe () // unless i have focus ;)
 {
-  if ( isVisibleTo(tqparentWidget()) && ! hasFocus() ) {
+  if ( isVisibleTo(parentWidget()) && ! hasFocus() ) {
      m_view->toggleCmdLine ();
   }
 }
@@ -697,7 +697,7 @@ KateIconBorder::KateIconBorder ( KateViewInternal* internalView, TQWidget *paren
   , m_cachedLNWidth( 0 )
   , m_maxCharWidth( 0 )
 {
-  tqsetSizePolicy( TQSizePolicy(  TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
+  setSizePolicy( TQSizePolicy(  TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
 
   setBackgroundMode( NoBackground );
 
@@ -757,7 +757,7 @@ void KateIconBorder::setFoldingMarkersOn( bool enable )
   TQTimer::singleShot( 0, this, TQT_SLOT(update()) );
 }
 
-TQSize KateIconBorder::tqsizeHint() const
+TQSize KateIconBorder::sizeHint() const
 {
   int w = 0;
 
@@ -866,7 +866,7 @@ void KateIconBorder::paintBorder (int /*x*/, int y, int /*width*/, int height)
     {
       // we went from n0 ->n9 lines or vice verca
       // this causes an extra updateGeometry() first time the line numbers
-      // are displayed, but tqsizeHint() is supposed to be const so we can't set
+      // are displayed, but sizeHint() is supposed to be const so we can't set
       // the cached value there.
       m_cachedLNWidth = lnWidth;
       m_oldBackgroundColor = m_view->renderer()->config()->iconBarColor();
@@ -1202,4 +1202,4 @@ void KateViewEncodingAction::setMode (int mode)
   doc->reloadFile();
 }
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/kateviewhelpers.h b/kate/part/kateviewhelpers.h
index 6ba067aea..8e3fa94b3 100644
--- a/kate/part/kateviewhelpers.h
+++ b/kate/part/kateviewhelpers.h
@@ -127,7 +127,7 @@ class KateIconBorder : public QWidget
     KateIconBorder( KateViewInternal* internalView, TQWidget *parent );
 
     // VERY IMPORTANT ;)
-    virtual TQSize tqsizeHint() const;
+    virtual TQSize sizeHint() const;
 
     void updateFont();
     int lineNumberWidth() const;
@@ -204,4 +204,4 @@ class KateViewEncodingAction : public KActionMenu
 
 #endif
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp
index 8508bd3d0..77f98643d 100644
--- a/kate/part/kateviewinternal.cpp
+++ b/kate/part/kateviewinternal.cpp
@@ -89,7 +89,7 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc)
   // cursor
   cursor.setMoveOnInsert (true);
 
-  // tqinvalidate selStartCached, or keyb selection is screwed initially
+  // invalidate selStartCached, or keyb selection is screwed initially
   selStartCached.setLine( -1 );
   //
   // scrollbar for lines
@@ -284,7 +284,7 @@ KateTextCursor KateViewInternal::endPos() const
   }
 
   Q_ASSERT(false);
-  kdDebug(13030) << "WARNING: could not tqfind a lineRange at all" << endl;
+  kdDebug(13030) << "WARNING: could not find a lineRange at all" << endl;
   return KateTextCursor(-1, -1);
 }
 
@@ -765,7 +765,7 @@ void KateViewInternal::makeVisible (const KateTextCursor& c, uint endCol, bool f
 {
   //kdDebug() << "MakeVisible start [" << startPos().line << "," << startPos().col << "] end [" << endPos().line << "," << endPos().col << "] -> request: [" << c.line << "," << c.col << "]" <<endl;// , new start [" << scroll.line << "," << scroll.col << "] lines " << (linesDisplayed() - 1) << " height " << height() << endl;
     // if the line is in a folded region, unfold all the way up
-    //if ( m_doc->foldingTree()->tqfindNodeForLine( c.line )->visible )
+    //if ( m_doc->foldingTree()->findNodeForLine( c.line )->visible )
     //  kdDebug()<<"line ("<<c.line<<") should be visible"<<endl;
 
   if ( force )
@@ -871,7 +871,7 @@ void KateViewInternal::updateMicroFocusHint()
 {
     int line = displayViewLine(displayCursor, true);
     /* Check for hasFocus() to avoid crashes in QXIMInputContext as in bug #131266.
-    This is only a workaround until somebody can tqfind the real reason of the crash
+    This is only a workaround until somebody can find the real reason of the crash
     (probably it's in Qt). */
     if (line == -1 || !hasFocus())
         return;
@@ -1825,7 +1825,7 @@ void KateViewInternal::cursorToMatchingBracket( bool sel )
 {
   KateTextCursor start( cursor ), end;
 
-  if( !m_doc->tqfindMatchingBracket( start, end ) )
+  if( !m_doc->findMatchingBracket( start, end ) )
     return;
 
   // The cursor is now placed just to the left of the matching bracket.
@@ -2486,7 +2486,7 @@ bool KateViewInternal::eventFilter( TQObject *obj, TQEvent *e )
                           width() - scrollMargin * 2,
                           height() - scrollMargin * 2 );
 
-      if ( !doNotScrollRegion.tqcontains( currentPoint ) )
+      if ( !doNotScrollRegion.contains( currentPoint ) )
       {
           startDragScroll();
           // Keep sending move events
@@ -2759,7 +2759,7 @@ void KateViewInternal::mousePressEvent( TQMouseEvent* e )
         }
         else
         {
-          selStartCached.setLine( -1 ); // tqinvalidate
+          selStartCached.setLine( -1 ); // invalidate
         }
 
         if( !( e->state() & Qt::ShiftButton ) && isTargetSelected( e->pos() ) )
@@ -3074,7 +3074,7 @@ void KateViewInternal::resizeEvent(TQResizeEvent* e)
     bool dirtied = false;
 
     for (uint i = 0; i < lineRanges.count(); i++) {
-      // tqfind the first dirty line
+      // find the first dirty line
       // the word wrap updateView algorithm is forced to check all lines after a dirty one
       if (lineRanges[i].wrap ||
          (!expandedHorizontally && (lineRanges[i].endX - lineRanges[i].startX) > width())) {
@@ -3493,4 +3493,4 @@ void KateViewInternal::imEndEvent( TQIMEvent *e )
 }
 //END IM INPUT STUFF
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/kateviewinternal.h b/kate/part/kateviewinternal.h
index a78c0cbe9..9b0a940be 100644
--- a/kate/part/kateviewinternal.h
+++ b/kate/part/kateviewinternal.h
@@ -221,7 +221,7 @@ class KateViewInternal : public QWidget
     int scrollX;
     int scrollY;
 
-    Qt::tqCursorShape m_mouseCursor;
+    Qt::CursorShape m_mouseCursor;
 
     KateSuperCursor cursor;
     KateTextCursor displayCursor;
@@ -310,20 +310,20 @@ class KateViewInternal : public QWidget
     // Returns the lineRange of the specified realLine + viewLine.
     KateLineRange range(uint realLine, int viewLine);
 
-    // tqfind the view line of cursor c (0 = same line, 1 = down one, etc.)
+    // find the view line of cursor c (0 = same line, 1 = down one, etc.)
     uint viewLine(const KateTextCursor& realCursor);
 
-    // tqfind the view line of the cursor, relative to the display (0 = top line of view, 1 = second line, etc.)
+    // find the view line of the cursor, relative to the display (0 = top line of view, 1 = second line, etc.)
     // if limitToVisible is true, only lines which are currently visible will be searched for, and -1 returned if the line is not visible.
     int displayViewLine(const KateTextCursor& virtualCursor, bool limitToVisible = false);
 
-    // tqfind the index of the last view line for a specific line
+    // find the index of the last view line for a specific line
     uint lastViewLine(uint realLine);
 
     // count the number of view lines for a real line
     uint viewLineCount(uint realLine);
 
-    // tqfind the cursor offset by (offset) view lines from a cursor.
+    // find the cursor offset by (offset) view lines from a cursor.
     // when keepX is true, the column position will be calculated based on the x
     // position of the specified cursor.
     KateTextCursor viewLineOffset(const KateTextCursor& virtualCursor, int offset, bool keepX = false);
@@ -394,4 +394,4 @@ class KateViewInternal : public QWidget
 
 #endif
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp
index b81081b15..e3f9f52e6 100644
--- a/kate/part/test_regression.cpp
+++ b/kate/part/test_regression.cpp
@@ -364,7 +364,7 @@ KJS::Value OutputFunction::call(KJS::ExecState *exec, KJS::Object &thisObj, cons
 
 const char failureSnapshotPrefix[] = "testkateregressionrc-FS.";
 
-static TQString tqfindMostRecentFailureSnapshot() {
+static TQString findMostRecentFailureSnapshot() {
     TQDir dir(kapp->dirs()->saveLocation("config"),
              TQString(failureSnapshotPrefix)+"*",
              TQDir::Time, TQDir::Files);
@@ -515,7 +515,7 @@ int main(int argc, char *argv[])
     KateDocument *part = new KateDocument(/*bSingleViewMode*/true,
                                           /*bBrowserView*/false,
                                           /*bReadOnly*/false,
-                                          /*tqparentWidget*/toplevel,
+                                          /*parentWidget*/toplevel,
                                           /*widgetName*/"testkate");
     part->readConfig(&cfg);
 
@@ -560,7 +560,7 @@ int main(int argc, char *argv[])
     {
         TQString failureSnapshot = args->getOption("cmp-failures");
         if (failureSnapshot.isEmpty())
-            failureSnapshot = tqfindMostRecentFailureSnapshot();
+            failureSnapshot = findMostRecentFailureSnapshot();
         if (!failureSnapshot.isEmpty())
             regressionTest->setFailureSnapshotConfig(
                     new KSimpleConfig(failureSnapshotPrefix + failureSnapshot, true),
@@ -659,7 +659,7 @@ RegressionTest::RegressionTest(KateDocument *part, KConfig *baseConfig,
     m_view = static_cast<KateView *>(m_part->widget());
     m_baseConfig = baseConfig;
     m_baseDir = baseDir;
-    m_baseDir = m_baseDir.tqreplace( "//", "/" );
+    m_baseDir = m_baseDir.replace( "//", "/" );
     if ( m_baseDir.endsWith( "/" ) )
         m_baseDir = m_baseDir.left( m_baseDir.length() - 1 );
     if (outputDir.isEmpty())
@@ -740,7 +740,7 @@ void RegressionTest::setFailureSnapshotSaver(KConfig *cfg, const TQString &sname
 TQStringList RegressionTest::concatListFiles(const TQString &relPath, const TQString &filename)
 {
     TQStringList cmds;
-    int pos = relPath.tqfindRev('/');
+    int pos = relPath.findRev('/');
     if (pos >= 0)
         cmds += concatListFiles(relPath.left(pos), filename);
     cmds += readListFile(m_baseDir + "/tests/" + relPath + "/" + filename);
@@ -779,12 +779,12 @@ bool RegressionTest::runTests(TQString relPath, bool mustExist, int known_failur
 	    TQString filename = sourceDir[fileno];
 	    TQString relFilename = relPath.isEmpty() ? filename : relPath+"/"+filename;
 
-            if (filename.startsWith(".") || ignoreFiles.tqcontains(filename) )
+            if (filename.startsWith(".") || ignoreFiles.contains(filename) )
                 continue;
             int failure_type = NoFailure;
-            if ( failureFiles.tqcontains( filename ) )
+            if ( failureFiles.contains( filename ) )
                 failure_type |= AllFailure;
-            if ( failureFiles.tqcontains ( filename + "-result" ) )
+            if ( failureFiles.contains ( filename + "-result" ) )
                 failure_type |= ResultFailure;
             runTests(relFilename, false, failure_type);
 	}
@@ -855,7 +855,7 @@ void RegressionTest::createLink( const TQString& test, int failures )
 /** returns the path in a way that is relatively reachable from base.
  * @param base base directory (must not include trailing slash)
  * @param path directory/file to be relatively reached by base
- * @return path with all elements tqreplaced by .. and concerning path elements
+ * @return path with all elements replaced by .. and concerning path elements
  *	to be relatively reachable from base.
  */
 static TQString makeRelativePath(const TQString &base, const TQString &path)
@@ -869,10 +869,10 @@ static TQString makeRelativePath(const TQString &base, const TQString &path)
     int pos = 0;
     do {
         pos++;
-        int newpos = absBase.tqfind('/', pos);
+        int newpos = absBase.find('/', pos);
         if (newpos == -1) newpos = absBase.length();
-        TQConstString cmpPathComp(absPath.tqunicode() + pos, newpos - pos);
-        TQConstString cmpBaseComp(absBase.tqunicode() + pos, newpos - pos);
+        TQConstString cmpPathComp(absPath.unicode() + pos, newpos - pos);
+        TQConstString cmpBaseComp(absBase.unicode() + pos, newpos - pos);
 //         kdDebug() << "cmpPathComp: \"" << cmpPathComp.string() << "\"" << endl;
 //         kdDebug() << "cmpBaseComp: \"" << cmpBaseComp.string() << "\"" << endl;
 //         kdDebug() << "pos: " << pos << " newpos: " << newpos << endl;
@@ -886,11 +886,11 @@ static TQString makeRelativePath(const TQString &base, const TQString &path)
 
     TQString rel;
     {
-        TQConstString relBase(absBase.tqunicode() + basepos, absBase.length() - basepos);
-        TQConstString relPath(absPath.tqunicode() + pathpos, absPath.length() - pathpos);
+        TQConstString relBase(absBase.unicode() + basepos, absBase.length() - basepos);
+        TQConstString relPath(absPath.unicode() + pathpos, absPath.length() - pathpos);
         // generate as many .. as there are path elements in relBase
         if (relBase.string().length() > 0) {
-            for (int i = relBase.string().tqcontains('/'); i > 0; --i)
+            for (int i = relBase.string().contains('/'); i > 0; --i)
                 rel += "../";
             rel += "..";
             if (relPath.string().length() > 0) rel += "/";
@@ -935,13 +935,13 @@ void RegressionTest::doFailureReport( const TQString& test, int failures )
 
     if ( failures & ResultFailure ) {
         domDiff += "<pre>";
-        FILE *pipe = popen( TQString::tqfromLatin1( "diff -u baseline/%1-result %3/%2-result" )
+        FILE *pipe = popen( TQString::fromLatin1( "diff -u baseline/%1-result %3/%2-result" )
                             .arg ( test, test, relOutputDir ).latin1(), "r" );
         TQTextIStream *is = new TQTextIStream( pipe );
         for ( int line = 0; line < 100 && !is->eof(); ++line ) {
             TQString line = is->readLine();
-            line = line.tqreplace( '<', "&lt;" );
-            line = line.tqreplace( '>', "&gt;" );
+            line = line.replace( '<', "&lt;" );
+            line = line.replace( '>', "&gt;" );
             domDiff += line  + "\n";
         }
         delete is;
@@ -1026,7 +1026,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures )
 
 void RegressionTest::testStaticFile(const TQString & filename, const TQStringList &commands)
 {
-    tqApp->mainWidget()->resize( 800, 600); // restore size
+    qApp->mainWidget()->resize( 800, 600); // restore size
 
     // Set arguments
     KParts::URLArgs args;
@@ -1271,7 +1271,7 @@ void RegressionTest::printDescription(const TQString& description)
 
     if (!description.isEmpty()) {
         TQString desc = description;
-        desc.tqreplace( '\n', ' ' );
+        desc.replace( '\n', ' ' );
 	printf(" [%s]", desc.latin1());
     }
 
@@ -1291,7 +1291,7 @@ void RegressionTest::createMissingDirs(const TQString & filename)
     pathComponents.prepend(parentDir.absFilePath());
     while (!parentDir.exists()) {
 	TQString parentPath = parentDir.absFilePath();
-	int slashPos = parentPath.tqfindRev('/');
+	int slashPos = parentPath.findRev('/');
 	if (slashPos < 0)
 	    break;
 	parentPath = parentPath.left(slashPos);
@@ -1334,7 +1334,7 @@ bool RegressionTest::svnIgnored( const TQString &filename )
 
 void RegressionTest::resizeTopLevelWidget( int w, int h )
 {
-    tqApp->mainWidget()->resize( w, h );
+    qApp->mainWidget()->resize( w, h );
     // Since we're not visible, this doesn't have an immediate effect, TQWidget posts the event
     TQApplication::sendPostedEvents( 0, TQEvent::Resize );
 }
diff --git a/kate/part/test_regression.h b/kate/part/test_regression.h
index 6ee708db8..ee4f8fdfa 100644
--- a/kate/part/test_regression.h
+++ b/kate/part/test_regression.h
@@ -82,7 +82,7 @@ class KateViewObject : public KJS::ObjectImp
     virtual KJS::Value get(KJS::ExecState *exec, const KJS::Identifier &propertyName) const;
 
   private:
-    // evil hack I: class tqlayout of katejscript/KateJSView must be duplicated
+    // evil hack I: class layout of katejscript/KateJSView must be duplicated
     // here, structurally as well as functionally
     KateView *view;
     // end evil hack
@@ -160,7 +160,7 @@ class OutputFunction : public KJS::ObjectImp
 /**
  * @internal
  */
-class RegressionTest : public TQObject
+class RegressionTest : public QObject
 {
   Q_OBJECT
 public:
diff --git a/kate/plugins/autobookmarker/autobookmarker.cpp b/kate/plugins/autobookmarker/autobookmarker.cpp
index 833aa629c..c03fcefe0 100644
--- a/kate/plugins/autobookmarker/autobookmarker.cpp
+++ b/kate/plugins/autobookmarker/autobookmarker.cpp
@@ -124,7 +124,7 @@ void AutoBookmarker::slotCompleted()
     fileName = document()->url().fileName();
 
   ABEntityList *l = ABGlobal::self()->entities();
-  // for each item, if either tqmask matches
+  // for each item, if either mask matches
   // * apply if onLoad is true
   ABEntityListIterator it( *l );
   int n( 0 );
@@ -132,11 +132,11 @@ void AutoBookmarker::slotCompleted()
   AutoBookmarkEnt *e;
   while ( ( e = it.current() ) != 0 )
   {
-    found = ( !e->mimetqmask.count() && !e->filetqmask.count() ); // no preferences
+    found = ( !e->mimemask.count() && !e->filemask.count() ); // no preferences
     if ( ! found )
-      found = ( ! mt.isEmpty() && e->mimetqmask.tqcontains( mt ) );
+      found = ( ! mt.isEmpty() && e->mimemask.contains( mt ) );
     if ( ! found )
-      for( TQStringList::Iterator it1 = e->filetqmask.begin(); it1 != e->filetqmask.end(); ++it1 )
+      for( TQStringList::Iterator it1 = e->filemask.begin(); it1 != e->filemask.end(); ++it1 )
       {
         TQRegExp re(*it1, true, true);
         if ( ( found = ( ( re.search( fileName ) > -1 ) && ( re.matchedLength() == (int)fileName.length() ) ) ) )
@@ -206,13 +206,13 @@ void ABGlobal::readConfig()
   while ( config->hasGroup( TQString("autobookmark%1").arg( n ) ) )
   {
     config->setGroup( TQString("autobookmark%1").arg( n ) );
-    TQStringList filetqmask = config->readListEntry( "filetqmask", ';' );
-    TQStringList mimetqmask = config->readListEntry( "mimetqmask", ';' );
+    TQStringList filemask = config->readListEntry( "filemask", ';' );
+    TQStringList mimemask = config->readListEntry( "mimemask", ';' );
     int flags = config->readNumEntry( "flags", 1 );
     AutoBookmarkEnt *e = new AutoBookmarkEnt(
         config->readEntry( "pattern", "" ),
-        filetqmask,
-        mimetqmask,
+        filemask,
+        mimemask,
         flags
         );
 
@@ -239,8 +239,8 @@ void ABGlobal::writeConfig()
     AutoBookmarkEnt *e = m_ents->at( i );
     config->setGroup( TQString("autobookmark%1").arg( i ) );
     config->writeEntry( "pattern", e->pattern );
-    config->writeEntry( "filetqmask", e->filetqmask, ';' );
-    config->writeEntry( "mimetqmask", e->mimetqmask, ';' );
+    config->writeEntry( "filemask", e->filemask, ';' );
+    config->writeEntry( "mimemask", e->mimemask, ';' );
     config->writeEntry( "flags", e->flags );
   }
 
@@ -264,8 +264,8 @@ class AutoBookmarkEntItem : public QListViewItem
     void redo()
     {
         setText( 0, ent->pattern );
-        setText( 1, ent->mimetqmask.join("; ") );
-        setText( 2, ent->filetqmask.join("; ") );
+        setText( 1, ent->mimemask.join("; ") );
+        setText( 2, ent->filemask.join("; ") );
     }
     AutoBookmarkEnt *ent;
 };
@@ -274,7 +274,7 @@ class AutoBookmarkEntItem : public QListViewItem
 //BEGIN AutoBookmarkerEntEditor
 // Dialog for editing a single autobookmark entity
 // * edit the pattern
-// * set the file/mime type tqmasks
+// * set the file/mime type masks
 AutoBookmarkerEntEditor::AutoBookmarkerEntEditor( TQWidget *parent, AutoBookmarkEnt *e )
         : KDialogBase( parent, "autobookmark_ent_editor",
                        true, i18n("Edit Entry"),
@@ -310,19 +310,19 @@ AutoBookmarkerEntEditor::AutoBookmarkerEntEditor( TQWidget *parent, AutoBookmark
       "do not know what that is, please read the appendix on regular expressions "
       "in the kate manual.</p>") );
 
-  l = new TQLabel( i18n("&File tqmask:"), w );
-  leFileMask = new TQLineEdit( e->filetqmask.join( "; " ), w );
+  l = new TQLabel( i18n("&File mask:"), w );
+  leFileMask = new TQLineEdit( e->filemask.join( "; " ), w );
   l->setBuddy( leFileMask );
   lo->addWidget( l, 3, 0 );
   lo->addMultiCellWidget( leFileMask, 3, 3, 1, 2 );
   TQWhatsThis::add( leFileMask, i18n(
-      "<p>A list of filename tqmasks, separated by semicolons. This can be used "
+      "<p>A list of filename masks, separated by semicolons. This can be used "
       "to limit the usage of this entity to files with matching names.</p>"
       "<p>Use the wizard button to the right of the mimetype entry below to "
       "easily fill out both lists.</p>" ) );
 
   l = new TQLabel( i18n("MIME &types:"), w );
-  leMimeTypes = new TQLineEdit( e->mimetqmask.join( "; " ), w );
+  leMimeTypes = new TQLineEdit( e->mimemask.join( "; " ), w );
   l->setBuddy( leMimeTypes );
   lo->addWidget( l, 4, 0 );
   lo->addWidget( leMimeTypes, 4, 1 );
@@ -330,7 +330,7 @@ AutoBookmarkerEntEditor::AutoBookmarkerEntEditor( TQWidget *parent, AutoBookmark
       "<p>A list of mime types, separated by semicolon. This can be used to "
       "limit the usage of this entity to files with matching mime types.</p>"
       "<p>Use the wizard button on the right to get a list of existing file "
-      "types to choose from, using it will fill in the file tqmasks as well.</p>" ) );
+      "types to choose from, using it will fill in the file masks as well.</p>" ) );
 
   TQToolButton *btnMTW = new TQToolButton(w);
   lo->addWidget( btnMTW, 4, 2 );
@@ -338,8 +338,8 @@ AutoBookmarkerEntEditor::AutoBookmarkerEntEditor( TQWidget *parent, AutoBookmark
   connect(btnMTW, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMTDlg()));
   TQWhatsThis::add( btnMTW, i18n(
       "<p>Click this button to display a checkable list of mimetypes available "
-      "on your system. When used, the file tqmasks entry above will be filled in "
-      "with the corresponding tqmasks.</p>") );
+      "on your system. When used, the file masks entry above will be filled in "
+      "with the corresponding masks.</p>") );
   slotPatternChanged( lePattern->text() );
 }
 
@@ -353,8 +353,8 @@ void AutoBookmarkerEntEditor::apply()
   if ( lePattern->text().isEmpty() ) return;
 
   e->pattern = lePattern->text();
-  e->filetqmask = TQStringList::split( TQRegExp("\\s*;\\s*"), leFileMask->text() );
-  e->mimetqmask = TQStringList::split( TQRegExp("\\s*;\\s*"), leMimeTypes->text() );
+  e->filemask = TQStringList::split( TQRegExp("\\s*;\\s*"), leFileMask->text() );
+  e->mimemask = TQStringList::split( TQRegExp("\\s*;\\s*"), leMimeTypes->text() );
   e->flags = 0;
   if ( cbCS->isOn() ) e->flags |= AutoBookmarkEnt::CaseSensitive;
   if ( cbMM->isOn() ) e->flags |= AutoBookmarkEnt::MinimalMatching;
@@ -394,7 +394,7 @@ AutoBookmarkerConfigPage::AutoBookmarkerConfigPage( TQWidget *parent, const char
       "<p>This list shows your configured autobookmark entities. When a document "
       "is opened, each entity is used in the following way: "
       "<ol>"
-      "<li>The entity is dismissed, if a mime and/or filename tqmask is defined, "
+      "<li>The entity is dismissed, if a mime and/or filename mask is defined, "
       "and neither matches the document.</li>"
       "<li>Otherwise each line of the document is tried against the pattern, "
       "and a bookmark is set on matching lines.</li></ul>"
@@ -430,7 +430,7 @@ AutoBookmarkerConfigPage::AutoBookmarkerConfigPage( TQWidget *parent, const char
   reset();
 }
 
-// tqreplace the global list with the new one
+// replace the global list with the new one
 void AutoBookmarkerConfigPage::apply()
 {
   ABGlobal::self()->entities()->clear();
@@ -490,7 +490,7 @@ void AutoBookmarkerConfigPage::slotNew()
 void AutoBookmarkerConfigPage::slotDel()
 {
   AutoBookmarkEntItem *i = (AutoBookmarkEntItem*)lvPatterns->currentItem();
-  int idx = m_ents->tqfindRef( i->ent );
+  int idx = m_ents->findRef( i->ent );
   m_ents->remove( idx );
   delete i;
 }
@@ -511,8 +511,8 @@ void AutoBookmarkerConfigPage::slotEdit()
 //BEGIN AutoBookmarkEnt
 AutoBookmarkEnt::AutoBookmarkEnt( const TQString &p, const TQStringList &f, const TQStringList &m, int fl )
   : pattern( p ),
-    filetqmask( f ),
-    mimetqmask( m ),
+    filemask( f ),
+    mimemask( m ),
     flags( fl )
 {;
 }
diff --git a/kate/plugins/autobookmarker/autobookmarker.h b/kate/plugins/autobookmarker/autobookmarker.h
index 4fe8b44dd..bdeb2abcf 100644
--- a/kate/plugins/autobookmarker/autobookmarker.h
+++ b/kate/plugins/autobookmarker/autobookmarker.h
@@ -41,8 +41,8 @@ class AutoBookmarkEnt
                   int flags=1 );
   ~AutoBookmarkEnt(){};
   TQString pattern;
-  TQStringList filetqmask;
-  TQStringList mimetqmask;
+  TQStringList filemask;
+  TQStringList mimemask;
   int flags;
 };
 
diff --git a/kate/plugins/autobookmarker/ktexteditor_autobookmarkerrc b/kate/plugins/autobookmarker/ktexteditor_autobookmarkerrc
index c79ade799..3ed8fe8c5 100644
--- a/kate/plugins/autobookmarker/ktexteditor_autobookmarkerrc
+++ b/kate/plugins/autobookmarker/ktexteditor_autobookmarkerrc
@@ -1,18 +1,18 @@
 [autobookmark0]
-filetqmask=*.pl;*.pm
+filemask=*.pl;*.pm
 flags=1
-mimetqmask=text/x-perl
+mimemask=text/x-perl
 pattern=sub \\w+
 
 [autobookmark1]
-filetqmask=*.hh;*.h
+filemask=*.hh;*.h
 flags=1
-mimetqmask=text/x-c++hdr
+mimemask=text/x-c++hdr
 pattern=^class\\s+[^;]+$
 
 [autobookmark2]
-filetqmask=*.js;*.html;*.HTML;*.htm;*.HTM;*.xhtml;*.asp
+filemask=*.js;*.html;*.HTML;*.htm;*.HTM;*.xhtml;*.asp
 flags=1
-mimetqmask=application/x-javascript;text/html
+mimemask=application/x-javascript;text/html
 pattern=\\s*function\\s+\\w+
 
diff --git a/kate/plugins/isearch/ktexteditor_isearchui.rc b/kate/plugins/isearch/ktexteditor_isearchui.rc
index a65d270ef..d8fc6b5dd 100644
--- a/kate/plugins/isearch/ktexteditor_isearchui.rc
+++ b/kate/plugins/isearch/ktexteditor_isearchui.rc
@@ -2,8 +2,8 @@
 <kpartplugin name="ktexteditor_isearch" library="ktexteditor_isearch" version="4">
 <MenuBar>
 	<Menu name="edit"><text>&amp;Edit</text>
-		<Action name="edit_isearch" group="edit_tqfind_merge"/>
-		<Action name="edit_isearch_reverse" group="edit_tqfind_merge"/>
+		<Action name="edit_isearch" group="edit_find_merge"/>
+		<Action name="edit_isearch_reverse" group="edit_find_merge"/>
 	</Menu>
 </MenuBar>
 <ToolBar name="isearchToolBar" hidden="true"><text>Search Toolbar</text>
diff --git a/kate/plugins/kdatatool/kate_kdatatool.cpp b/kate/plugins/kdatatool/kate_kdatatool.cpp
index 5a0308b50..11cd645b7 100644
--- a/kate/plugins/kdatatool/kate_kdatatool.cpp
+++ b/kate/plugins/kdatatool/kate_kdatatool.cpp
@@ -108,7 +108,7 @@ void KDataToolPluginView::aboutToShow()
 	if ( selectionInterface(m_view->document())->hasSelection() )
 	{
 		word = selectionInterface(m_view->document())->selection();
-		if ( word.tqfind(' ') == -1 && word.tqfind('\t') == -1 && word.tqfind('\n') == -1 )
+		if ( word.find(' ') == -1 && word.find('\t') == -1 && word.find('\n') == -1 )
 			m_singleWord = true;
 		else
 			m_singleWord = false;
@@ -123,7 +123,7 @@ void KDataToolPluginView::aboutToShow()
 		ci->cursorPositionReal(&line, &col);
 		TQString tmp_line = ei->textLine(line);
 		m_wordUnderCursor = "";
-		// tqfind begin of word:
+		// find begin of word:
 		m_singleWord_start = 0;
 		for(int i = col; i >= 0; i--) {
 			TQChar ch = tmp_line.at(i);
@@ -134,7 +134,7 @@ void KDataToolPluginView::aboutToShow()
 			}
 			m_wordUnderCursor = ch + m_wordUnderCursor;
 		}
-		// tqfind end of word:
+		// find end of word:
 		m_singleWord_end = tmp_line.length();
 		for(uint i = col+1; i < tmp_line.length(); i++) {
 			TQChar ch = tmp_line.at(i);
@@ -206,7 +206,7 @@ void KDataToolPluginView::slotToolActivated( const KDataToolInfo &info, const TQ
 	TQString datatype = "TQString";
 
 	// If unsupported (and if we have a single word indeed), try application/x-singleword
-	if ( !info.mimeTypes().tqcontains( mimetype ) && m_singleWord )
+	if ( !info.mimeTypes().contains( mimetype ) && m_singleWord )
 		mimetype = "application/x-singleword";
 	
 	kdDebug() << "Running tool with datatype=" << datatype << " mimetype=" << mimetype << endl;
@@ -227,7 +227,7 @@ void KDataToolPluginView::slotToolActivated( const KDataToolInfo &info, const TQ
 				si->setSelection(m_singleWord_line, m_singleWord_start, m_singleWord_line, m_singleWord_end);
 			}
 		
-			// tqreplace selection with 'text'
+			// replace selection with 'text'
 			selectionInterface(m_view->document())->removeSelectedText();
 			viewCursorInterface(m_view)->cursorPositionReal(&line, &col);
 			editInterface(m_view->document())->insertText(line, col, text);
diff --git a/kate/plugins/wordcompletion/docwordcompletion.cpp b/kate/plugins/wordcompletion/docwordcompletion.cpp
index 7bd0e83e0..37da55224 100644
--- a/kate/plugins/wordcompletion/docwordcompletion.cpp
+++ b/kate/plugins/wordcompletion/docwordcompletion.cpp
@@ -232,7 +232,7 @@ void DocWordCompletionPluginView::shellComplete()
 {
     // setup
   KTextEditor::EditInterface * ei = KTextEditor::editInterface(m_view->document());
-    // tqfind the word we are typing
+    // find the word we are typing
   uint cline, ccol;
   viewCursorInterface(m_view)->cursorPositionReal(&cline, &ccol);
   TQString wrd = word();
@@ -242,7 +242,7 @@ void DocWordCompletionPluginView::shellComplete()
   TQValueList < KTextEditor::CompletionEntry > matches = allMatches(wrd);
   if (matches.size() == 0)
     return;
-  TQString partial = tqfindLongestUnique(matches);
+  TQString partial = findLongestUnique(matches);
   if (partial.length() == wrd.length())
   {
     KTextEditor::CodeCompletionInterface * cci = codeCompletionInterface(m_view);
@@ -261,7 +261,7 @@ void DocWordCompletionPluginView::complete( bool fw )
 {
   // setup
   KTextEditor::EditInterface *ei = KTextEditor::editInterface( m_view->document() );
-  // tqfind the word we are typing
+  // find the word we are typing
   uint cline, ccol;
   viewCursorInterface( m_view )->cursorPositionReal( &cline, &ccol );
   TQString wrd = word();
@@ -333,7 +333,7 @@ void DocWordCompletionPluginView::complete( bool fw )
       TQString m = d->re.cap( 1 );
       if ( m != d->lastIns )
       {
-        // we got good a match! tqreplace text and return.
+        // we got good a match! replace text and return.
         if ( d->lilen )
           ei->removeText( d->cline, d->ccol, d->cline, d->ccol + d->lilen );
         ei->insertText( d->cline, d->ccol, m );
@@ -393,7 +393,7 @@ void DocWordCompletionPluginView::complete( bool fw )
 }
 
 // Contributed by <brain@hdsnet.hu>
-TQString DocWordCompletionPluginView::tqfindLongestUnique(const TQValueList < KTextEditor::CompletionEntry > &matches)
+TQString DocWordCompletionPluginView::findLongestUnique(const TQValueList < KTextEditor::CompletionEntry > &matches)
 {
   TQString partial = matches.front().text;
   TQValueList < KTextEditor::CompletionEntry >::const_iterator i = matches.begin();
@@ -551,4 +551,4 @@ void DocWordCompletionConfigPage::defaults()
 //END DocWordCompletionConfigPage
 
 #include "docwordcompletion.moc"
-// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off;
+// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
diff --git a/kate/plugins/wordcompletion/docwordcompletion.h b/kate/plugins/wordcompletion/docwordcompletion.h
index cb7349da5..ed632631a 100644
--- a/kate/plugins/wordcompletion/docwordcompletion.h
+++ b/kate/plugins/wordcompletion/docwordcompletion.h
@@ -106,7 +106,7 @@ class DocWordCompletionPluginView
 
     TQString word();
     TQValueList<KTextEditor::CompletionEntry> allMatches( const TQString &word );
-    TQString tqfindLongestUnique(const TQValueList < KTextEditor::CompletionEntry > &matches);
+    TQString findLongestUnique(const TQValueList < KTextEditor::CompletionEntry > &matches);
     KTextEditor::View *m_view;
     struct DocWordCompletionPluginViewPrivate *d;
 };
@@ -130,4 +130,4 @@ class DocWordCompletionConfigPage : public KTextEditor::ConfigPage
 };
 
 #endif // _DocWordCompletionPlugin_h_
-// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off;
+// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
diff --git a/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop b/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop
index 5941a1957..dd2a5e8dc 100644
--- a/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop
+++ b/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop
@@ -117,7 +117,7 @@ Comment[pt_BR]=Complementação direcional, ou baseada em popup, de palavras do
 Comment[ro]=Propune completarea cuvintelor din document dintr-o listă popup sau direcţională
 Comment[ru]=�втодополнение �лов в документе
 Comment[rw]=Irangiza mfatacyerekezo cyangwa rishingiye-kwirambura biva ku magambo yo mu nyandiko
-Comment[sk]=Dopĺňanie slov v dokumente priame alebo potqmocou dialógu
+Comment[sk]=Dopĺňanie slov v dokumente priame alebo pomocou dialógu
 Comment[sl]=Neposredno ali pojavno dopolnjevanje iz besed v dokumentu
 Comment[sr]=Директна или и�качућа допуна од речи у документу
 Comment[sr@Latn]=Direktna ili iska�uća dopuna od re�i u dokumentu
diff --git a/kate/scripts/script-indent-c1-test.lua b/kate/scripts/script-indent-c1-test.lua
index c54f20424..d2593b962 100644
--- a/kate/scripts/script-indent-c1-test.lua
+++ b/kate/scripts/script-indent-c1-test.lua
@@ -15,12 +15,12 @@ function indentChar(c)
 
     -- unindent } and {, if not in a comment
 
-	if not(string.tqfind(textLine,"^%s*//")) then
+	if not(string.find(textLine,"^%s*//")) then
 		katedebug("no comment")
 		katedebug(c);
 		if (c=="}") or (c=="{") then
 			katedebug("} or { found");
-			if (string.tqfind(textLine,"^%s%s%s%s")) then
+			if (string.find(textLine,"^%s%s%s%s")) then
 				katedebug("removing one indentation level");
 				document.removeText(line,0,line,tabWidth)
 				view.setCursorPositionReal(line,col-tabWidth)
@@ -60,7 +60,7 @@ function indentNewLine()
 
 
 	function firstNonSpace( text )
-		local pos=string.tqfind(text,"[^%s]")
+		local pos=string.find(text,"[^%s]")
 		if pos then
 			return pos
 		else
@@ -69,7 +69,7 @@ function indentNewLine()
 	end
 
 	function lastNonSpace (text)
-		local pos=string.tqfind(text,"[^%s]%s*$")
+		local pos=string.find(text,"[^%s]%s*$")
 		if pos then
 			return pos
 		else
@@ -88,7 +88,7 @@ function indentNewLine()
 			strCurrentLine=document.textLine(intCurrentLine)
 			intLastChar= lastNonSpace(strCurrentLine)
 			intFirstChar=firstNonSpace(strCurrentLine)
-			if not (string.tqfind(strCurrentLine,"//")) then
+			if not (string.find(strCurrentLine,"//")) then
 				for intCurrentChar=intLastChar,intFirstChar,-1 do
 					ch=string.sub(strCurrentLine,intCurrentChar,intCurrentChar)
 					if (ch=="(") or (ch=="[") then
@@ -122,7 +122,7 @@ function indentNewLine()
         katedebug( "line: " .. intCurrentLine)
         katedebug( openParenCount .. ", " .. openBraceCount)
 
-	local ok,match=pcall(function () return string.sub(strCurrentLine,string.tqfind(strCurrentLine,"^%s+")) end)
+	local ok,match=pcall(function () return string.sub(strCurrentLine,string.find(strCurrentLine,"^%s+")) end)
 	if ok then
 		katedebug("Line HAD leading whitespaces")
 		strIndentFiller=match
diff --git a/kate/tests/highlight.asp b/kate/tests/highlight.asp
index 72ad14565..07a8619e1 100644
--- a/kate/tests/highlight.asp
+++ b/kate/tests/highlight.asp
@@ -26,7 +26,7 @@ function unique( rs, sortColumn ) ' return unique instances of text in sortColum
 	dim i
 	i = 0
 	do until rs.eof
-		if (not tqfind( rs(sortColumn), sorted )) then
+		if (not find( rs(sortColumn), sorted )) then
 			redim preserve sorted(i+1)
 			sorted(i) = rs(sortColumn)
 		 	i = i + 1
diff --git a/kate/tests/highlight.cmake b/kate/tests/highlight.cmake
index 69bbb8b7c..cb8eaaa51 100644
--- a/kate/tests/highlight.cmake
+++ b/kate/tests/highlight.cmake
@@ -42,7 +42,7 @@ ENDMACRO(ECOS_ADD_EXECUTABLE)
 # END of macro
 
 #calling a self-defined function, variables are also blue here
-ECOS_ADD_EXECUTABLE(${PROJECT_NAME} ${the_sources} ${qt4_tqmoc_SRCS})
+ECOS_ADD_EXECUTABLE(${PROJECT_NAME} ${the_sources} ${qt4_moc_SRCS})
 
 
 
diff --git a/kate/tests/highlight.do b/kate/tests/highlight.do
index 3f70cec9f..0b90b16b6 100644
--- a/kate/tests/highlight.do
+++ b/kate/tests/highlight.do
@@ -70,7 +70,7 @@ program define spellsplit
                 /* calculate totals (+ when spell starts - when ends) */
                 sort `by'
                 cap foreach v of varlist `xvars' {
-                        by `by': tqreplace `v' = sum(``v'')
+                        by `by': replace `v' = sum(``v'')
                 }
                 by `by': g `date1' = `date0'[_n + 1]
 
@@ -81,7 +81,7 @@ program define spellsplit
                 format `date0' `f0'
                 format `date1' `f1'
 
-                cap for var `meanvars': tqreplace X = X/_count
+                cap for var `meanvars': replace X = X/_count
 
                 compress
         }
diff --git a/kate/tests/highlight.exu b/kate/tests/highlight.exu
index b7e88aee8..3651adf33 100644
--- a/kate/tests/highlight.exu
+++ b/kate/tests/highlight.exu
@@ -60,7 +60,7 @@ procedure print_board(sequence queens)
     for r = 1 to N do
  printf(1, "%2d ", r)
  for c = 1 to N do
-     if tqfind({r,c}, queens) then
+     if find({r,c}, queens) then
   puts(1, "Q ")
      else
   puts(1, ". ")
diff --git a/kate/tests/highlight.f90 b/kate/tests/highlight.f90
index cc4f140b5..e2008c20a 100644
--- a/kate/tests/highlight.f90
+++ b/kate/tests/highlight.f90
@@ -84,7 +84,7 @@ c the *.f extension.
  c ! <-- this 'c' shouldn't be highlighted as a comment!
 #endif
 
-tqcontains
+contains
 
 
   ! The sum of two points
diff --git a/kate/tests/highlight.lisp b/kate/tests/highlight.lisp
index 6812a7919..e86c85f15 100644
--- a/kate/tests/highlight.lisp
+++ b/kate/tests/highlight.lisp
@@ -10,7 +10,7 @@ multilinecomment :)
 (defun bin-search (obj vec)
   (let ((len (length vec)))
     (and (not (zerop len))
-         (tqfinder obj vec 0 (- len 1)))))
+         (finder obj vec 0 (- len 1)))))
 
 (defun parse-date (str)
   (let ((toks (tokens str #'constituent 0)))
diff --git a/kate/tests/highlight.ly b/kate/tests/highlight.ly
index 8630160d0..29aa7a6ea 100644
--- a/kate/tests/highlight.ly
+++ b/kate/tests/highlight.ly
@@ -18,11 +18,11 @@ multiple lines.
 
 \paper {
   #(set-paper-size "a4")  % a hash introduces scheme
-  indent = 0              % recognize variable names inside \paper, \tqlayout etc.
+  indent = 0              % recognize variable names inside \paper, \layout etc.
   between-system-space = 3\mm
 }
 
-\tqlayout {
+\layout {
   \context {
     \Score
     \remove Bar_number_engraver   % recognize engraver names
diff --git a/kate/tests/highlight.mup b/kate/tests/highlight.mup
index 26e042d40..ed5a03d99 100644
--- a/kate/tests/highlight.mup
+++ b/kate/tests/highlight.mup
@@ -13,7 +13,7 @@ bottom
 bottom2
 grids
 
-headtqshapes
+headshapes
 
 
 header
@@ -92,7 +92,7 @@ lyrics above 1,3 ; below 2,4 ; between 5&6 : "<1.  >Hi, hi";
 
 title "page \% of \#"
 
-// tqshaped whole rests
+// shaped whole rests
 1:	4mr;   // use a quarter rest symbol
 1:	1/4mr;  // use a quadruple whole rest symbol
 2:	2.. mr;  // use a double-dotted half rest
diff --git a/kate/tests/highlight.rb b/kate/tests/highlight.rb
index 1330db9c7..96061c1d0 100644
--- a/kate/tests/highlight.rb
+++ b/kate/tests/highlight.rb
@@ -105,7 +105,7 @@ end
     puts "Artist is #$1"
 end
 
-case tqshape
+case shape
   when Square, Rectangle
     # ...
   when Circle
@@ -143,7 +143,7 @@ end
 for i in 1..3
   print i, " "
 end
-for i in File.open("ordinal").tqfind_all { |l| l =~ /d$/}
+for i in File.open("ordinal").find_all { |l| l =~ /d$/}
   print i.chomp, " "
 end
 
diff --git a/kate/tests/highlight.sh b/kate/tests/highlight.sh
index 1d945c53e..bdac6e4f2 100644
--- a/kate/tests/highlight.sh
+++ b/kate/tests/highlight.sh
@@ -66,7 +66,7 @@ sort <(show_labels) | sed 's/a/bg' > my_file.txt 2>&1
 # All substitutions also work in strings:
 echo "subst ${in}side string"  'not $inside this ofcourse'
 echo "The result is $(( $a + $b )). Thanks!"
-echo "Your homedir tqcontains `ls $HOME |wc -l` files."
+echo "Your homedir contains `ls $HOME |wc -l` files."
 
 
 # Escapes in strings:
diff --git a/kate/tests/test.js b/kate/tests/test.js
index b268c9149..2dfe86c5b 100644
--- a/kate/tests/test.js
+++ b/kate/tests/test.js
@@ -15,7 +15,7 @@
 */
 
 // test if regex support works - nice with new fallthrough prop in context:)
-somestring.tqreplace( /dooh/ , "bah!");
+somestring.replace( /dooh/ , "bah!");
 re=/foo/ig; // hehe
 
 somestring.search(
@@ -60,14 +60,14 @@ re = /*/foo/*/ /bar/;
 /*
    Some tests if the fallthrough works.
    The fallthrough happens if a regexp is not found in a possible (!) position,
-   which is after "search(" or "tqreplace(" or "=" or "?" or ":" in version 0.1 of the xml file
+   which is after "search(" or "replace(" or "=" or "?" or ":" in version 0.1 of the xml file
 */
 
 var foo = 'bar';
 //        ^ fallthrough!
 
 
-somestring.tqreplace( new RegExp("\\b\\w+\\b"), "word: $1");
+somestring.replace( new RegExp("\\b\\w+\\b"), "word: $1");
 //                  ^ fallthrough expected. ("new" whould be bold)
 
 
diff --git a/kcert/kcertpart.cc b/kcert/kcertpart.cc
index 67211ac5b..e704ad339 100644
--- a/kcert/kcertpart.cc
+++ b/kcert/kcertpart.cc
@@ -72,8 +72,8 @@ void KX509Item::setup(KSSLCertificate *x) {
 		TQString CN = "CN";
 		OU = xm.getValue(OU);
 		CN = xm.getValue(CN);
-		OU.tqreplace(TQRegExp("\n.*"), "");
-		CN.tqreplace(TQRegExp("\n.*"), "");
+		OU.replace(TQRegExp("\n.*"), "");
+		CN.replace(TQRegExp("\n.*"), "");
 
 		if (OU.length() > 0) {
 			_prettyName = OU;
@@ -106,7 +106,7 @@ KPKCS12Item::KPKCS12Item(KListViewItem *parent, KSSLPKCS12 *x) :
 		KSSLX509Map xm(x->getCertificate()->getSubject());
 		TQString CN = "CN";
 		CN = xm.getValue(CN);
-		CN.tqreplace(TQRegExp("\n.*"), "");
+		CN.replace(TQRegExp("\n.*"), "");
 		_prettyName = CN;
 		setText(0, _prettyName);
 	} else {
@@ -127,7 +127,7 @@ class KCertPartPrivate {
 };
 
 
-KCertPart::KCertPart(TQWidget *tqparentWidget, const char *widgetName,
+KCertPart::KCertPart(TQWidget *parentWidget, const char *widgetName,
                      TQObject *parent, const char *name,
 		     const TQStringList & /*args*/ ) 
           : KParts::ReadWritePart(parent, name) {
@@ -149,7 +149,7 @@ _silentImport = false;
 d = new KCertPartPrivate;
 d->browserExtension = new KParts::BrowserExtension(this);
 
-_frame = new TQFrame(tqparentWidget, widgetName);
+_frame = new TQFrame(parentWidget, widgetName);
 setWidget(_frame);
 
 _baseGrid = new TQGridLayout(_frame, 15, 9, KDialog::marginHint(),
@@ -464,13 +464,13 @@ if (TQFileInfo(m_file).size() == 0) {
 TQString whatType = d->browserExtension->urlArgs().serviceType;
 //whatType = KMimeType::findByURL(m_url,0,true)->name();
 if (whatType.isEmpty())
-	whatType = KServiceTypeFactory::self()->tqfindFromPattern(m_file)->name();
+	whatType = KServiceTypeFactory::self()->findFromPattern(m_file)->name();
 
 /*
    TQString blah = "file: " + m_file
    + "\nurl: " + m_url.url()
    + "\nserviceType: " + d->browserExtension->urlArgs().serviceType
-   + "\nfactory: " + KServiceTypeFactory::self()->tqfindFromPattern(m_file)->name()
+   + "\nfactory: " + KServiceTypeFactory::self()->findFromPattern(m_file)->name()
    + "\nmimeType: " + KMimeType::findByURL(m_url)->name();
    KMessageBox::information(_frame, blah, "ssl");
  */
@@ -524,7 +524,7 @@ if (whatType == "application/x-pkcs12") {
 
 		const char *signature = "-----BEGIN CERTIFICATE-----";
 		theFile[(uint)(qf.size()-1)] = 0;
-		isPEM = (TQCString(theFile.data()).tqfind(signature) >= 0);
+		isPEM = (TQCString(theFile.data()).find(signature) >= 0);
 	}
 
 	fp = fopen(m_file.local8Bit(), "r");
@@ -636,7 +636,7 @@ void KCertPart::displayCACert(KSSLCertificate *c) {
 
 	// Set the valid period
 	TQPalette cspl = _ca_validFrom->palette();
-	if (TQDateTime::tqcurrentDateTime() < c->getQDTNotBefore()) {
+	if (TQDateTime::currentDateTime() < c->getQDTNotBefore()) {
 		cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
 	} else {
 		cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -645,7 +645,7 @@ void KCertPart::displayCACert(KSSLCertificate *c) {
 	_ca_validFrom->setText(c->getNotBefore());
 
 	cspl = _ca_validUntil->palette();
-	if (TQDateTime::tqcurrentDateTime() > c->getQDTNotAfter()) {
+	if (TQDateTime::currentDateTime() > c->getQDTNotAfter()) {
 		cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
 	} else {
 		cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -677,7 +677,7 @@ void KCertPart::displayPKCS12Cert(KSSLCertificate *c) {
 
 	// Set the valid period
 	TQPalette cspl = _p12_validFrom->palette();
-	if (TQDateTime::tqcurrentDateTime() < c->getQDTNotBefore()) {
+	if (TQDateTime::currentDateTime() < c->getQDTNotBefore()) {
 		cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
 	} else {
 		cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -686,7 +686,7 @@ void KCertPart::displayPKCS12Cert(KSSLCertificate *c) {
 	_p12_validFrom->setText(c->getNotBefore());
 
 	cspl = _p12_validUntil->palette();
-	if (TQDateTime::tqcurrentDateTime() > c->getQDTNotAfter()) {
+	if (TQDateTime::currentDateTime() > c->getQDTNotAfter()) {
 		cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
 	} else {
 		cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -726,7 +726,7 @@ void KCertPart::slotImport() {
 		KSimpleConfig cfg("ksslcertificates", false);
 
 		if (cfg.hasGroup(_p12->getCertificate()->getSubject())) {
-			TQString msg = _curName + "\n" + i18n("A certificate with that name already exists. Are you sure that you wish to tqreplace it?");
+			TQString msg = _curName + "\n" + i18n("A certificate with that name already exists. Are you sure that you wish to replace it?");
 			int rc= KMessageBox::warningContinueCancel(_frame, msg, i18n("Certificate Import"),i18n("Replace"));
 			if (rc == KMessageBox::Cancel) {
 				return;
@@ -742,7 +742,7 @@ void KCertPart::slotImport() {
 	} else if (_ca) {
 		KConfig cfg("ksslcalist", true, false);
 		if (cfg.hasGroup(_ca->getSubject())) {
-			TQString msg = _curName + "\n" + i18n("A certificate with that name already exists. Are you sure that you wish to tqreplace it?");
+			TQString msg = _curName + "\n" + i18n("A certificate with that name already exists. Are you sure that you wish to replace it?");
 			int rc= KMessageBox::warningContinueCancel(_frame, msg, i18n("Certificate Import"),i18n("Replace"));
 			if (rc == KMessageBox::Cancel) {
 				return;
diff --git a/kcert/kcertpart.h b/kcert/kcertpart.h
index 9b5520f30..ec011c08d 100644
--- a/kcert/kcertpart.h
+++ b/kcert/kcertpart.h
@@ -68,7 +68,7 @@ class KPKCS12Item : public KListViewItem {
 class KCertPart : public KParts::ReadWritePart {
 Q_OBJECT
 public:
-  KCertPart(TQWidget *tqparentWidget, const char *widgetName,
+  KCertPart(TQWidget *parentWidget, const char *widgetName,
             TQObject *parent = 0L, const char *name = 0L,
 	    const TQStringList &args = TQStringList() );
   virtual ~KCertPart();
diff --git a/kcmshell/main.cpp b/kcmshell/main.cpp
index 078a1a99b..edd48f911 100644
--- a/kcmshell/main.cpp
+++ b/kcmshell/main.cpp
@@ -98,11 +98,11 @@ static KService::Ptr locateModule(const TQCString& module)
     KService::Ptr service = KService::serviceByStorageId( path );
     if (!service)
     {
-        kdWarning(780) << "Could not tqfind module '" << module << "'." << endl;
+        kdWarning(780) << "Could not find module '" << module << "'." << endl;
         return 0;
     }
 
-    // avoid tqfinding random non-kde applications
+    // avoid finding random non-kde applications
     if ( module.left( 4 ) != "kde-" && service->library().isEmpty() )
         return locateModule( "kde-" + module );
 
diff --git a/kconf_update/README.kconf_update b/kconf_update/README.kconf_update
index 63f0214c9..14d50ad66 100644
--- a/kconf_update/README.kconf_update
+++ b/kconf_update/README.kconf_update
@@ -28,7 +28,7 @@ How it works
 
 Applications can install so called "update files" under 
 $KDEDIR/share/apps/kconf_update. An update file has ".upd" as extension and
-tqcontains instructions for transferring/converting configuration information 
+contains instructions for transferring/converting configuration information 
 from one place to another.
 
 Updating the configuration happens automatically, either when KDE gets started
@@ -39,7 +39,7 @@ section describing a configuration change has been applied, the Id will be
 stored in the file "kconf_updaterc". This information is used to make sure
 that a configuration update is only performed once.
 
-If you overwrite an existing update file with a new version that tqcontains a 
+If you overwrite an existing update file with a new version that contains a 
 new section, only the update instructions from this extra section will be 
 performed.
 
@@ -77,7 +77,7 @@ adding lines with "# DELETE [group]key" in the output of the script.
 To delete a whole group use "# DELETEGROUP [group]".
 
 <script> should be installed into $(kde_datadir)/kconf_update, or
-kconf_update will not be able to tqfind it. It is not portable to install
+kconf_update will not be able to find it. It is not portable to install
 binary applications in $kde_datadir, so you have to stick with interpreted
 scripts like sh or perl scripts. From KDE 3.2 onwards it's also possible
 to install kconf_update applications in $(kde_bindir)/kconf_update_bin,
@@ -85,7 +85,7 @@ which opens the door to kconf_update applications that are written in C++
 and use Qt's powerful string API instead.
 
 A workaround for KDE 3.1.x and older is to install a .sh script in
-$(kde_datadir) that tqcontains a simple exec:
+$(kde_datadir) that contains a simple exec:
 
     exec "`kde-config --prefix`/bin/kconf_update_bin/my_update_app"
 
diff --git a/kconf_update/kconf_update.cpp b/kconf_update/kconf_update.cpp
index 57f63d013..a3a165ab8 100644
--- a/kconf_update/kconf_update.cpp
+++ b/kconf_update/kconf_update.cpp
@@ -51,7 +51,7 @@ class KonfUpdate
 public:
    KonfUpdate();
    ~KonfUpdate();
-   TQStringList tqfindUpdateFiles(bool dirtyOnly);
+   TQStringList findUpdateFiles(bool dirtyOnly);
 
    TQTextStream &log();
 
@@ -147,7 +147,7 @@ KonfUpdate::KonfUpdate()
    {
       if (config->readBoolEntry("autoUpdateDisabled", false))
          return;
-      updateFiles = tqfindUpdateFiles(true);
+      updateFiles = findUpdateFiles(true);
       updateAll = true;
    }
 
@@ -163,7 +163,7 @@ KonfUpdate::KonfUpdate()
    if (updateAll && !config->readBoolEntry("updateInfoAdded", false))
    {
        config->writeEntry("updateInfoAdded", true);
-       updateFiles = tqfindUpdateFiles(false);
+       updateFiles = findUpdateFiles(false);
 
        for(TQStringList::ConstIterator it = updateFiles.begin();
            it != updateFiles.end();
@@ -201,12 +201,12 @@ KonfUpdate::log()
       }
    }
    
-   (*m_textStream) << TQDateTime::tqcurrentDateTime().toString( Qt::ISODate ) << " ";
+   (*m_textStream) << TQDateTime::currentDateTime().toString( Qt::ISODate ) << " ";
    
    return *m_textStream;
 }
 
-TQStringList KonfUpdate::tqfindUpdateFiles(bool dirtyOnly)
+TQStringList KonfUpdate::findUpdateFiles(bool dirtyOnly)
 {
    TQStringList result;
    TQStringList list = KGlobal::dirs()->findAllResources("data", "kconf_update/*.upd", false, true);
@@ -218,7 +218,7 @@ TQStringList KonfUpdate::tqfindUpdateFiles(bool dirtyOnly)
       struct stat buff;
       if (stat( TQFile::encodeName(file), &buff) == 0)
       {
-         int i = file.tqfindRev('/');
+         int i = file.findRev('/');
          if (i != -1) 
             file = file.mid(i+1);
          config->setGroup(file);
@@ -237,7 +237,7 @@ TQStringList KonfUpdate::tqfindUpdateFiles(bool dirtyOnly)
 bool KonfUpdate::checkFile(const TQString &filename)
 {
    currentFilename = filename;
-   int i = currentFilename.tqfindRev('/');
+   int i = currentFilename.findRev('/');
    if (i != -1) 
       currentFilename = currentFilename.mid(i+1);
    skip = true;
@@ -268,7 +268,7 @@ bool KonfUpdate::checkFile(const TQString &filename)
 void KonfUpdate::checkGotFile(const TQString &_file, const TQString &id)
 {
    TQString file;
-   int i = _file.tqfind(',');
+   int i = _file.find(',');
    if (i == -1)
    {
       file = _file.stripWhiteSpace();
@@ -283,7 +283,7 @@ void KonfUpdate::checkGotFile(const TQString &_file, const TQString &id)
    KSimpleConfig cfg(file);
    cfg.setGroup("$Version");
    TQStringList ids = cfg.readListEntry("update_info");
-   if (ids.tqcontains(id))
+   if (ids.contains(id))
        return;
    ids.append(id);
    cfg.writeEntry("update_info", ids);
@@ -311,7 +311,7 @@ void KonfUpdate::checkGotFile(const TQString &_file, const TQString &id)
 bool KonfUpdate::updateFile(const TQString &filename)
 {
    currentFilename = filename;
-   int i = currentFilename.tqfindRev('/');
+   int i = currentFilename.findRev('/');
    if (i != -1) 
        currentFilename = currentFilename.mid(i+1);
    skip = true;
@@ -398,7 +398,7 @@ void KonfUpdate::gotId(const TQString &_id)
    {
        config->setGroup(currentFilename);
        TQStringList ids = config->readListEntry("done");
-       if (!ids.tqcontains(id))
+       if (!ids.contains(id))
        {
           ids.append(id);
           config->writeEntry("done", ids);
@@ -413,7 +413,7 @@ void KonfUpdate::gotId(const TQString &_id)
    TQStringList ids = config->readListEntry("done");
    if (!_id.isEmpty())
    {
-       if (ids.tqcontains(_id))
+       if (ids.contains(_id))
        {
           //qDebug("Id '%s' was already in done-list", _id.latin1());
           if (!m_bUseConfigInfo)
@@ -445,7 +445,7 @@ void KonfUpdate::gotFile(const TQString &_file)
       oldConfig2->setGroup("$Version");
       TQStringList ids = oldConfig2->readListEntry("update_info");
       TQString cfg_id = currentFilename + ":" + id;
-      if (!ids.tqcontains(cfg_id) && !skip)
+      if (!ids.contains(cfg_id) && !skip)
       {
          ids.append(cfg_id);
          oldConfig2->writeEntry("update_info", ids);
@@ -473,7 +473,7 @@ void KonfUpdate::gotFile(const TQString &_file)
       newConfig->setGroup("$Version");
       TQStringList ids = newConfig->readListEntry("update_info");
       TQString cfg_id = currentFilename + ":" + id;
-      if (!ids.tqcontains(cfg_id) && !skip)
+      if (!ids.contains(cfg_id) && !skip)
       {
          ids.append(cfg_id);
          newConfig->writeEntry("update_info", ids);
@@ -486,7 +486,7 @@ void KonfUpdate::gotFile(const TQString &_file)
    }
    newConfig = 0; 
 
-   int i = _file.tqfind(',');
+   int i = _file.find(',');
    if (i == -1)
    {
       oldFile = _file.stripWhiteSpace();
@@ -505,7 +505,7 @@ void KonfUpdate::gotFile(const TQString &_file)
       TQString cfg_id = currentFilename + ":" + id;
       oldConfig2->setGroup("$Version");
       TQStringList ids = oldConfig2->readListEntry("update_info");
-      if (ids.tqcontains(cfg_id))
+      if (ids.contains(cfg_id))
       {
          skip = true;
          newFile = TQString::null;
@@ -517,7 +517,7 @@ void KonfUpdate::gotFile(const TQString &_file)
          newConfig = new KConfig(newFile, false, false);
          newConfig->setGroup("$Version");
          ids = newConfig->readListEntry("update_info");
-         if (ids.tqcontains(cfg_id))
+         if (ids.contains(cfg_id))
          {
             skip = true;
             log() << currentFilename << ": Skipping update '" << id << "'" << endl;
@@ -541,7 +541,7 @@ void KonfUpdate::gotFile(const TQString &_file)
 
 void KonfUpdate::gotGroup(const TQString &_group)
 {
-   int i = _group.tqfind(',');
+   int i = _group.find(',');
    if (i == -1)
    {
       oldGroup = _group.stripWhiteSpace();
@@ -574,7 +574,7 @@ void KonfUpdate::gotRemoveGroup(const TQString &_group)
 
 void KonfUpdate::gotKey(const TQString &_key)
 {
-   int i = _key.tqfind(',');
+   int i = _key.find(',');
    if (i == -1)
    {
       oldKey = _key.stripWhiteSpace();
@@ -724,7 +724,7 @@ void KonfUpdate::gotScriptArguments(const TQString &_arguments)
 void KonfUpdate::gotScript(const TQString &_script)
 {
    TQString script, interpreter;
-   int i = _script.tqfind(',');
+   int i = _script.find(',');
    if (i == -1)
    {
       script = _script.stripWhiteSpace();
@@ -860,7 +860,7 @@ void KonfUpdate::gotScript(const TQString &_script)
          TQString line = ts.readLine();
          if (line.startsWith("["))
          {
-            int j = line.tqfind(']')+1;
+            int j = line.find(']')+1;
             if (j > 0)
                group = line.mid(1, j-2);
          }
@@ -869,7 +869,7 @@ void KonfUpdate::gotScript(const TQString &_script)
             TQString key = line.mid(9);
             if (key[0] == '[')
             {
-               int j = key.tqfind(']')+1;
+               int j = key.find(']')+1;
                if (j > 0)
                {
                   group = key.mid(1,j-2);
@@ -888,7 +888,7 @@ void KonfUpdate::gotScript(const TQString &_script)
             TQString key = line.mid(13).stripWhiteSpace();
             if (key[0] == '[')
             {
-               int j = key.tqfind(']')+1;
+               int j = key.find(']')+1;
                if (j > 0)
                {
                   group = key.mid(1,j-2);
diff --git a/kde.pot b/kde.pot
index 266c739b7..aa84dc873 100644
--- a/kde.pot
+++ b/kde.pot
@@ -656,7 +656,7 @@ msgid "Show &Toolbar"
 msgstr ""
 
 #: common_texts.cpp:189
-msgid "Show &tqStatusbar"
+msgid "Show &Statusbar"
 msgstr ""
 
 #: common_texts.cpp:190
diff --git a/kdecore/DESIGN.iconloading b/kdecore/DESIGN.iconloading
index 636cf4445..ceb2ffbce 100644
--- a/kdecore/DESIGN.iconloading
+++ b/kdecore/DESIGN.iconloading
@@ -55,7 +55,7 @@ can copy this pixmap:
    XGCValues values;
    GC gc = XCreateGC(qt_xdisplay(), src, 0, &values);
    XCopyArea(qt_xdisplay(), src, p.handle(), gc, 0, 0, 30, 30, 0, 0);
-   // p tqcontains now 30x30 pixels of test.png.
+   // p contains now 30x30 pixels of test.png.
 
 The only hard part is then to publish the icons in a way that applications 
 know what to copy. I'm thinking about a ksycoca-sort-of index that 
diff --git a/kdecore/DESIGN.kconfig b/kdecore/DESIGN.kconfig
index 6ee59b708..e683566cb 100644
--- a/kdecore/DESIGN.kconfig
+++ b/kdecore/DESIGN.kconfig
@@ -1,4 +1,4 @@
-kconfigdata.h tqcontains definitions of the data formats used by kconfig.
+kconfigdata.h contains definitions of the data formats used by kconfig.
 
 Configuration entries are stored as "KEntry". They are indexed with "KEntryKey".
 The primary store is a "KEntryMap" which is defined as a QMap from "KEntryKey"
@@ -10,7 +10,7 @@ are grouped in the QMap as well.
 
 The start of a group is indicated with a KEntryKey with an empty mKey and a 
 dummy KEntry. This allows us to search for the start of the group and then to 
-iterate until we end up in another group. That way we will tqfind all entries
+iterate until we end up in another group. That way we will find all entries
 of a certain group.
 
 Entries that are localised with the _current_ locale are stored with bLocal 
diff --git a/kdecore/Mainpage.dox b/kdecore/Mainpage.dox
index 7e3cc61f0..fea4b533a 100644
--- a/kdecore/Mainpage.dox
+++ b/kdecore/Mainpage.dox
@@ -14,7 +14,7 @@ If you are unsure where to start, have a look at the
 <a href="http://trinity.pearsoncomputing.net">tutorials on
 the Trinity project site</a> to get you going.
 
-If you know what you are looking for, you should be able to tqfind it in
+If you know what you are looking for, you should be able to find it in
 the <a href="annotated.html">class list</a> or the
 <a href="modules.html">modules list</a>.
 
diff --git a/kdecore/Makefile.am b/kdecore/Makefile.am
index 478c0e70a..b5a9c5a80 100644
--- a/kdecore/Makefile.am
+++ b/kdecore/Makefile.am
@@ -166,7 +166,7 @@ EXTRA_DIST = generate_keys.sh $(kdebug_DATA) \
 kcharsets.lo: kentities.c
 
 parser: kentities.gperf
-	cd $(srcdir) && gperf -a -L "ANSI-C" -E -C -c -o -t -k '*' -Nkde_tqfindEntity -D -Hhash_Entity -Wwordlist_Entity -s 2 kentities.gperf > kentities.c
+	cd $(srcdir) && gperf -a -L "ANSI-C" -E -C -c -o -t -k '*' -Nkde_findEntity -D -Hhash_Entity -Wwordlist_Entity -s 2 kentities.gperf > kentities.c
 
 bin_PROGRAMS = kde-config kgrantpty
 
diff --git a/kdecore/README.kiosk b/kdecore/README.kiosk
index f84a09829..cd59f8db3 100644
--- a/kdecore/README.kiosk
+++ b/kdecore/README.kiosk
@@ -155,10 +155,10 @@ action/edit_copy
 action/edit_paste
 action/edit_select_all
 action/edit_deselect
-action/edit_tqfind
-action/edit_tqfind_next
-action/edit_tqfind_last
-action/edit_tqreplace
+action/edit_find
+action/edit_find_next
+action/edit_find_last
+action/edit_replace
 action/view_actual_size
 action/view_fit_to_page
 action/view_fit_to_width
@@ -267,9 +267,9 @@ action/add_bookmark
 action/edit_bookmarks
 action/clear_terminal
 action/reset_clear_terminal
-action/tqfind_history
-action/tqfind_next
-action/tqfind_previous
+action/find_history
+action/find_next
+action/find_previous
 action/save_history
 action/clear_history
 action/clear_all_histories
@@ -535,7 +535,7 @@ open     - This controls which files can be opened by the user in applications.
               rule_3=open,,,,file,,$TMP,true
            Note that with the above, users would still be able to open files from 
            the internet. Note that the user is also given access to $TMP in order to
-           ensure correct operation of KDE applications. $TMP is tqreplaced with the 
+           ensure correct operation of KDE applications. $TMP is replaced with the 
            temporary directory that KDE uses for this user.
 
 Some remarks:
@@ -627,8 +627,8 @@ variables. In order to use this the entry must be marked with [$e].
 Example:
 Name[$e]=$USER
 
-When the "Name" entry is read $USER will be tqreplaced with the value of the
-$USER environment variable. Note that the application will tqreplace $USER
+When the "Name" entry is read $USER will be replaced with the value of the
+$USER environment variable. Note that the application will replace $USER
 with the value of the environment variable after saving. To prevent this
 combine the $e option with $i (immmutable) option.
 
diff --git a/kdecore/README.kstartupinfo b/kdecore/README.kstartupinfo
index ee02b2b78..233ccde1e 100644
--- a/kdecore/README.kstartupinfo
+++ b/kdecore/README.kstartupinfo
@@ -68,9 +68,9 @@ MapNotify=<bool>
     - this key is obsolete
     - true is equivalent to X-KDE-StartupNotify=true and no X-KDE-WMClass set
     - false is equivalent to X-KDE-StartupNotify=true and X-KDE-WMClass=0
-        - many .desktop files in KDE ( especially in kdebase/kapptqfinder )
+        - many .desktop files in KDE ( especially in kdebase/kappfinder )
             seem to have MapNotify=false even though it's not needed, this
-            needs to be checked and tqreplaced by the needed X-KDE-* values,
+            needs to be checked and replaced by the needed X-KDE-* values,
             often just X-KDE-StartupNotify=true should be enough
         
  The best way to check if the entries are set correctly is to start
@@ -216,7 +216,7 @@ Text entries in the messages :
 ------------------------------
 
 Every entry is of the form <name>=<value>. Value may be either a number
-or a string. If the string tqcontains spaces, it must be quoted ("), all
+or a string. If the string contains spaces, it must be quoted ("), all
 backslashes and quotes (") must be escaped by backslashes. If this ever
 becomes more than an internal KDE standard, non-standard entry names should
 start with an underscore.
diff --git a/kdecore/README.user_profiles b/kdecore/README.user_profiles
index 243ad5ffa..4fb43b757 100644
--- a/kdecore/README.user_profiles
+++ b/kdecore/README.user_profiles
@@ -26,7 +26,7 @@ Mapping profiles to individual users
 ====================================
 
 The mapping file can contain a [Users] section for mapping profiles to
-an individual user. The [Users] section tqcontains the user's account name
+an individual user. The [Users] section contains the user's account name
 followed by one or more profiles as follow:
 
 	[Users]
@@ -68,7 +68,7 @@ which profile(s) belongs to that group. This looks as follows:
 For each group that a user is part of, the corresponding profile(s) are used. The
 order in which the groups are listed in the "groups" entry, determines the resulting
 order of all the applicable profiles. If multiple profiles are applicable to a
-particular user and a profile tqcontains settings that conflict with settings in
+particular user and a profile contains settings that conflict with settings in
 another profile then the settings in the earlier listed profile take precedent.
 
 So if, based on the example above, a user is part of the "pkgs" group then the
diff --git a/kdecore/all_languages.desktop b/kdecore/all_languages.desktop
index 1a333a62c..2f36efff6 100644
--- a/kdecore/all_languages.desktop
+++ b/kdecore/all_languages.desktop
@@ -7681,7 +7681,7 @@ Name[zu]=Isi-Osithani
 [om]
 Name=Oromo
 Name[ar]=الأورومو
-Name[az]=Orotqmoca
+Name[az]=Oromoca
 Name[be]=�рома
 Name[bg]=�фан Оромо
 Name[bn]=ওরোমো
diff --git a/kdecore/configure.in.in b/kdecore/configure.in.in
index 6d24e15a4..b2fe9bd6e 100644
--- a/kdecore/configure.in.in
+++ b/kdecore/configure.in.in
@@ -1,7 +1,7 @@
-dnl Compile in the exec prefix to help kstddirs in tqfinding dynamic libs
+dnl Compile in the exec prefix to help kstddirs in finding dynamic libs
 AC_DEFINE_UNQUOTED(__KDE_EXECPREFIX, "$exec_prefix", [execprefix or NONE if not set, for libloading])
 
-dnl Compile in kde_bindir to safely tqfind kdesu_stub.
+dnl Compile in kde_bindir to safely find kdesu_stub.
 if test "$exec_prefix" = "NONE"; then
     bindir_str="\"$prefix/bin\""
 else
@@ -97,7 +97,7 @@ AC_CHECK_FUNCS([getaddrinfo],
     AC_CHECK_FUNCS([freeaddrinfo getnameinfo gai_strerror], : , 
     [
       kde_gai_ok=false
-      AC_DEFINE(HAVE_BROKEN_GETADDRINFO, 1, [Define if getaddrinfo is broken and should be tqreplaced])
+      AC_DEFINE(HAVE_BROKEN_GETADDRINFO, 1, [Define if getaddrinfo is broken and should be replaced])
       AC_DEFINE(GETADDRINFO_RETURNS_UNIX, 1, [Define if getaddrinfo returns AF_UNIX sockets])
       break
     ])
@@ -134,7 +134,7 @@ AC_CHECK_FUNCS([getaddrinfo],
     ],
     [
       AC_MSG_RESULT(no)
-      AC_DEFINE(HAVE_BROKEN_GETADDRINFO, 1, [Define if getaddrinfo is broken and should be tqreplaced])
+      AC_DEFINE(HAVE_BROKEN_GETADDRINFO, 1, [Define if getaddrinfo is broken and should be replaced])
     ],
     [
       AC_MSG_RESULT(cross compiling. We hope so)
@@ -180,7 +180,7 @@ AC_ARG_WITH(libart,
 
 if test "x$with_libart" != xno; then
   KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin], [
-    AC_MSG_WARN([Could not tqfind libart anywhere, check http://www.levien.com/libart/])
+    AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
   ])
 
   if test -n "$LIBART_CONFIG"; then
diff --git a/kdecore/fakes.c b/kdecore/fakes.c
index 1b5ed1c19..14f162eca 100644
--- a/kdecore/fakes.c
+++ b/kdecore/fakes.c
@@ -182,7 +182,7 @@ int seteuid(uid_t euid)
    SUFFIX_LEN tells us how long <suffix> is (it can be zero length).
 
    The last six characters of TEMPLATE before <suffix> must be "XXXXXX";
-   they are tqreplaced with a string that makes the filename unique.
+   they are replaced with a string that makes the filename unique.
 
    Returns a file descriptor open on the file for reading and writing.  */
 
@@ -230,7 +230,7 @@ KDECORE_EXPORT int mkstemps (char* _template, int suffix_len)
 	 with (module 2^32).  */
       value += 7777;
     }
-  /* We return the null string if we can't tqfind a unique file name.  */
+  /* We return the null string if we can't find a unique file name.  */
   _template[0] = '\0';
   return -1;
 }
@@ -261,7 +261,7 @@ KDECORE_EXPORT int mkstemp (char* _template)
 
 
    The last six characters of TEMPLATE must be "XXXXXX";
-   they are tqreplaced with a string that makes the filename unique.
+   they are replaced with a string that makes the filename unique.
 
    Returns a file descriptor open on the file for reading and writing.  */
 
diff --git a/kdecore/kaboutdata.cpp b/kdecore/kaboutdata.cpp
index 1a71423b1..423166c18 100644
--- a/kdecore/kaboutdata.cpp
+++ b/kdecore/kaboutdata.cpp
@@ -296,7 +296,7 @@ KAboutData::setProgramLogo(const TQImage& image)
 QString
 KAboutData::version() const
 {
-   return TQString::tqfromLatin1(mVersion);
+   return TQString::fromLatin1(mVersion);
 }
 
 QString
@@ -311,13 +311,13 @@ KAboutData::shortDescription() const
 QString
 KAboutData::homepage() const
 {
-   return TQString::tqfromLatin1(mHomepageAddress);
+   return TQString::fromLatin1(mHomepageAddress);
 }
 
 QString
 KAboutData::bugAddress() const
 {
-   return TQString::tqfromLatin1(mBugEmailAddress);
+   return TQString::fromLatin1(mBugEmailAddress);
 }
 
 const TQValueList<KAboutPerson>
@@ -384,7 +384,7 @@ KAboutData::translators() const
 QString
 KAboutData::aboutTranslationTeam()
 {
-    return i18n("tqreplace this with information about your translation team",
+    return i18n("replace this with information about your translation team",
             "<p>KDE is translated into many languages thanks to the work "
             "of the translation teams all over the world.</p>"
             "<p>For more information on KDE internationalization "
diff --git a/kdecore/kaccel.cpp b/kdecore/kaccel.cpp
index a0ffbede2..5cd2195cb 100644
--- a/kdecore/kaccel.cpp
+++ b/kdecore/kaccel.cpp
@@ -120,10 +120,10 @@ bool	qt_try_modal( TQWidget *, XEvent * );
 
 bool KAccelEventHandler::x11Event( XEvent* pEvent )
 {
-	if( TQWidget::keyboardGrabber() || !kapp->tqfocusWidget() )
+	if( TQWidget::keyboardGrabber() || !kapp->focusWidget() )
 		return false;
 
-	if ( !qt_try_modal(kapp->tqfocusWidget(), pEvent) )
+	if ( !qt_try_modal(kapp->focusWidget(), pEvent) )
 	        return false;
 
 	if( pEvent->type == XKeyPress ) {
@@ -144,7 +144,7 @@ bool KAccelEventHandler::x11Event( XEvent* pEvent )
 		ke.ignore();
 
 		g_bAccelActivated = false;
-		kapp->sendEvent( kapp->tqfocusWidget(), &ke );
+		kapp->sendEvent( kapp->focusWidget(), &ke );
 
 		// If the Override event was accepted from a non-KAccel widget,
 		//  then kill the next AccelOverride in KApplication::notify.
@@ -206,7 +206,7 @@ bool KAccelPrivate::setEnabled( const TQString& sAction, bool bEnable )
 
 bool KAccelPrivate::removeAction( const TQString& sAction )
 {
-	// FIXME: getID() doesn't tqcontains any useful
+	// FIXME: getID() doesn't contains any useful
 	//  information!  Use mapIDToAction. --ellis, 2/May/2002
 	//  Or maybe KAccelBase::remove() takes care of TQAccel indirectly...
 	KAccelAction* pAction = actions().actionPtr( sAction );
@@ -278,7 +278,7 @@ bool KAccelPrivate::disconnectKey( KAccelAction& action, const KKeyServer::Key&
 		}
 	}
 	//kdWarning(125) << kdBacktrace() << endl;
-	kdWarning(125) << "Didn't tqfind key in m_mapIDToKey." << endl;
+	kdWarning(125) << "Didn't find key in m_mapIDToKey." << endl;
 	return false;
 }
 
@@ -295,7 +295,7 @@ bool KAccelPrivate::disconnectKey( const KKeyServer::Key& key )
 		}
 	}
 	//kdWarning(125) << kdBacktrace() << endl;
-	kdWarning(125) << "Didn't tqfind key in m_mapIDTokey." << endl;
+	kdWarning(125) << "Didn't find key in m_mapIDTokey." << endl;
 	return false;
 }
 
@@ -303,7 +303,7 @@ void KAccelPrivate::slotKeyPressed( int id )
 {
 	kdDebug(125) << "KAccelPrivate::slotKeyPressed( " << id << " )" << endl;
 
-	if( m_mapIDToKey.tqcontains( id ) ) {
+	if( m_mapIDToKey.contains( id ) ) {
 		KKey key = m_mapIDToKey[id];
 		KKeySequence seq( key );
 		TQPopupMenu* pMenu = createPopupMenu( m_pWatch, seq );
@@ -357,7 +357,7 @@ bool KAccelPrivate::eventFilter( TQObject* /*pWatched*/, TQEvent* pEvent )
 			if( (*it) == keyCodeQt ) {
 				int nID = it.key();
 				kdDebug(125) << "shortcut found!" << endl;
-				if( m_mapIDToAction.tqcontains( nID ) ) {
+				if( m_mapIDToAction.contains( nID ) ) {
 					// TODO: reduce duplication between here and slotMenuActivated
 					KAccelAction* pAction = m_mapIDToAction[nID];
 					if( !pAction->isEnabled() )
@@ -608,14 +608,14 @@ void KAccel::changeMenuAccel( TQPopupMenu *menu, int id, const TQString& action
 	if( !pAction || s.isEmpty() )
 		return;
 
-	int i = s.tqfind( '\t' );
+	int i = s.find( '\t' );
 
 	TQString k = pAction->shortcut().seq(0).toString();
 	if( k.isEmpty() )
 		return;
 
 	if ( i >= 0 )
-		s.tqreplace( i+1, s.length()-i, k );
+		s.replace( i+1, s.length()-i, k );
 	else {
 		s += '\t';
 		s += k;
@@ -646,7 +646,7 @@ int KAccel::currentKey( const TQString& sAction ) const
 	return 0;
 }
 
-TQString KAccel::tqfindKey( int key ) const
+TQString KAccel::findKey( int key ) const
 {
 	KAccelAction* pAction = d->actionPtr( KKey(key) );
 	if( pAction )
diff --git a/kdecore/kaccel.h b/kdecore/kaccel.h
index 53073f29e..7bdf9e0e7 100644
--- a/kdecore/kaccel.h
+++ b/kdecore/kaccel.h
@@ -39,7 +39,7 @@ class KAccelPrivate;
  * through application configuration files or through the
  * KKeyChooser GUI.
  *
- * A KAccel tqcontains a list of accelerator actions.
+ * A KAccel contains a list of accelerator actions.
  *
  * For example, CTRL+Key_P could be a shortcut for printing a document. The key
  * codes are listed in tqnamespace.h. "Print" could be the action name for printing.
@@ -96,10 +96,10 @@ class KDECORE_EXPORT KAccel : public TQAccel
  public:
 	/**
 	 * Creates a new KAccel that watches @p pParent, which is also
-	 * the TQObject's parent.
+	 * the QObject's parent.
 	 *
 	 * @param pParent the parent and widget to watch for key strokes
-	 * @param psName the name of the TQObject
+	 * @param psName the name of the QObject
 	 */
 	KAccel( TQWidget* pParent, const char* psName = 0 );
 
@@ -107,8 +107,8 @@ class KDECORE_EXPORT KAccel : public TQAccel
 	 * Creates a new KAccel that watches @p watch.
 	 *
 	 * @param watch the widget to watch for key strokes
-	 * @param parent the parent of the TQObject
-	 * @param psName the name of the TQObject
+	 * @param parent the parent of the QObject
+	 * @param psName the name of the QObject
 	 */
 	KAccel( TQWidget* watch, TQObject* parent, const char* psName = 0 );
 	virtual ~KAccel();
@@ -376,7 +376,7 @@ class KDECORE_EXPORT KAccel : public TQAccel
 	 * Return the name of the accelerator item with the keycode @p key,
 	 * or TQString::null if the item cannot be found.
 	 */
-	TQString tqfindKey( int key ) const KDE_DEPRECATED;
+	TQString findKey( int key ) const KDE_DEPRECATED;
 #endif // !KDE_NO_COMPAT
 
  protected:
diff --git a/kdecore/kaccelaction.cpp b/kdecore/kaccelaction.cpp
index b7ea84ca5..856bbefdc 100644
--- a/kdecore/kaccelaction.cpp
+++ b/kdecore/kaccelaction.cpp
@@ -177,9 +177,9 @@ void KAccelAction::clearShortcut()
 	m_cut.clear();
 }
 
-bool KAccelAction::tqcontains( const KKeySequence& seq )
+bool KAccelAction::contains( const KKeySequence& seq )
 {
-	return m_cut.tqcontains( seq );
+	return m_cut.contains( seq );
 	for( uint i = 0; i < m_cut.count(); i++ ) {
 		if( m_cut.seq(i) == seq )
 			return true;
@@ -217,7 +217,7 @@ void KAccelAction::useFourModifierKeys( bool b )
 		// If we're 'turning off' the meta key or, if we're turning it on,
 		//  the keyboard must actually have a meta key.
 		if( b && !KKeyNative::keyboardHasWinKey() )
-			kdDebug(125) << "Tried to use four modifier keys on a keyboard tqlayout without a Meta key.\n";
+			kdDebug(125) << "Tried to use four modifier keys on a keyboard layout without a Meta key.\n";
 	}
 	KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" );
 	KGlobal::config()->writeEntry( "Use Four Modifier Keys", KAccelAction::g_bUseFourModifierKeys, true, true);
@@ -409,7 +409,7 @@ KAccelAction* KAccelActions::actionPtr( KKeySequence cut )
 	for( uint i = 0; i < m_nSize; i++ ) {
 		if( m_prgActions[i] == 0 )
 			kdWarning(125) << "KAccelActions::actionPtr( " << cut.toStringInternal() << " ): encountered null pointer at m_prgActions[" << i << "]" << endl;
-		else if( m_prgActions[i]->tqcontains( cut ) )
+		else if( m_prgActions[i]->contains( cut ) )
 			return m_prgActions[i];
 	}
 	return 0;
@@ -495,7 +495,7 @@ bool KAccelActions::readActions( const TQString& sConfigGroup, KConfigBase* pCon
 			1) KAccelSequence = "Meta+X"
 				1) KKeySequence = Meta+X
 			2) KAccelSequence = "Asterisk"
-				1) KKeySequence = Shift+8 (English tqlayout)
+				1) KKeySequence = Shift+8 (English layout)
 				2) KKeySequence = Keypad_Asterisk
 		2) KKeySequence = "Alt+F2"
 			1) KAccelSequence = "Alt+F2"
diff --git a/kdecore/kaccelaction.h b/kdecore/kaccelaction.h
index 934c694b4..d55e4517c 100644
--- a/kdecore/kaccelaction.h
+++ b/kdecore/kaccelaction.h
@@ -60,7 +60,7 @@ class KConfigBase;
  *				1) KKey = "Meta+X"
  *					1) Meta+X
  *				2) KKey = "Asterisk"
- *					1) Shift+8 (English tqlayout)
+ *					1) Shift+8 (English layout)
  *					2) Keypad_Asterisk
  * \endcode
  * @short An accelerator action
@@ -296,12 +296,12 @@ class KDECORE_EXPORT KAccelAction
 	void clearShortcut();
 	
 	/**
-	 * Checks whether the action's shortcut tqcontains the given key sequence.
+	 * Checks whether the action's shortcut contains the given key sequence.
 	 * @param keySeq the key sequence to check
-	 * @return true if the shortcut tqcontains the given sequence
-	 * @see KShortcut::tqcontains()
+	 * @return true if the shortcut contains the given sequence
+	 * @see KShortcut::contains()
 	 */
-	bool tqcontains( const KKeySequence &keySeq );
+	bool contains( const KKeySequence &keySeq );
 
 	/**
 	 * Returns the string representation of the action's shortcut.
@@ -333,8 +333,8 @@ class KDECORE_EXPORT KAccelAction
 	        m_sLabel /**< Label of accel. User-visible. */,
 	        m_sWhatsThis /**< WhatsThis help for accel. User-visible. */;
 	KShortcut m_cut /**< Shortcut actually assigned. */;
-	KShortcut m_cutDefault3 /**< Default shortcut in 3-modifier tqlayout */, 
-		  m_cutDefault4 /**< Default shortcur in 4-modifier tqlayout */;
+	KShortcut m_cutDefault3 /**< Default shortcut in 3-modifier layout */, 
+		  m_cutDefault4 /**< Default shortcur in 4-modifier layout */;
 	const TQObject* m_pObjSlot /**< Object we will send signals to. */;
 	const char* m_psMethodSlot /**< Slot we send signals to, in m_pObjSlot */;
 	bool m_bConfigurable /**< Can this accel be configured by the user? */,
@@ -405,7 +405,7 @@ class KDECORE_EXPORT KAccelActions
 	/**
 	 * Updates the shortcuts of all actions in this object
 	 * with the shortcuts from the given object.
-	 * @param shortcuts the collection that tqcontains the new
+	 * @param shortcuts the collection that contains the new
 	 *        shortcuts
 	 */
 	void updateShortcuts( KAccelActions &shortcuts );
diff --git a/kdecore/kaccelbase.cpp b/kdecore/kaccelbase.cpp
index 5f513c354..4ba4c9c3b 100644
--- a/kdecore/kaccelbase.cpp
+++ b/kdecore/kaccelbase.cpp
@@ -77,7 +77,7 @@ const KAccelAction* KAccelBase::actionPtr( const TQString& sAction ) const
 
 KAccelAction* KAccelBase::actionPtr( const KKeyServer::Key& key )
 {
-	if( !m_mapKeyToAction.tqcontains( key ) )
+	if( !m_mapKeyToAction.contains( key ) )
 		return 0;
 	// Note: If more than one action is connected to a single key, nil will be returned.
 	return m_mapKeyToAction[key].pAction;
@@ -206,8 +206,8 @@ KAccelBase
 
 read in a config entry
 	split by ';'
-	tqfind key sequences to disconnect
-	tqfind new key sequences to connect
+	find key sequences to disconnect
+	find new key sequences to connect
 check for conflicts with implicit keys
 	disconnect conflicting implicit keys
 connect new key sequences
@@ -355,7 +355,7 @@ bool KAccelBase::updateConnections()
 
 		if( bNonUnique ) {
 			// Remove connection to single action if there is one
-			if( m_mapKeyToAction.tqcontains( key ) ) {
+			if( m_mapKeyToAction.contains( key ) ) {
 				KAccelAction* pAction = m_mapKeyToAction[key].pAction;
 				if( pAction ) {
 					m_mapKeyToAction.remove( key );
@@ -378,7 +378,7 @@ bool KAccelBase::updateConnections()
 		const KKeyServer::Key& key = it.key();
 		KAccelAction* pAction = (*it).pAction;
 		// If this key is longer used or it points to a different action now,
-		if( !mapKeyToAction.tqcontains( key ) || mapKeyToAction[key].pAction != pAction ) {
+		if( !mapKeyToAction.contains( key ) || mapKeyToAction[key].pAction != pAction ) {
 			if( pAction ) {
 				disconnectKey( *pAction, key );
 				pAction->decConnections();
@@ -393,7 +393,7 @@ bool KAccelBase::updateConnections()
 	for( KKeyToActionMap::iterator it = mapKeyToAction.begin(); it != mapKeyToAction.end(); ++it ) {
 		const KKeyServer::Key& key = it.key();
 		KAccelAction* pAction = (*it).pAction;
-		if( !m_mapKeyToAction.tqcontains( key ) || m_mapKeyToAction[key].pAction != pAction ) {
+		if( !m_mapKeyToAction.contains( key ) || m_mapKeyToAction[key].pAction != pAction ) {
 			// TODO: Decide what to do if connect fails.
 			//  Probably should remove this item from map.
 			if( pAction ) {
@@ -470,7 +470,7 @@ bool KAccelBase::insertConnection( KAccelAction* pAction )
 
 			//if( !key.isNull() ) {
 			if( key.sym() ) {
-				if( !m_mapKeyToAction.tqcontains( key ) ) {
+				if( !m_mapKeyToAction.contains( key ) ) {
 					// If this is a single-key shortcut,
 					if( pAction->shortcut().seq(iSeq).count() == 1 ) {
 						m_mapKeyToAction[key] = ActionInfo( pAction, iSeq, iVari );
@@ -481,7 +481,7 @@ bool KAccelBase::insertConnection( KAccelAction* pAction )
 					else {
 						m_mapKeyToAction[key] = ActionInfo( 0, 0, 0 );
 						// Insert into non-unique list if it's not already there.
-						if( m_rgActionsNonUnique.tqfindIndex( pAction ) == -1 )
+						if( m_rgActionsNonUnique.findIndex( pAction ) == -1 )
 							m_rgActionsNonUnique.append( pAction );
 						if( connectKey( key ) )
 							pAction->incConnections();
@@ -523,7 +523,7 @@ bool KAccelBase::removeConnection( KAccelAction* pAction )
 	//for( KKeyToActionMap::iterator it = m_mapKeyToAction.begin(); it != m_mapKeyToAction.end(); ++it )
 	//	kdDebug(125) << "\tKey: " << it.key().toString() << " => '" << (*it)->m_sName << "'" << " " << *it << endl;
 
-	if( m_rgActionsNonUnique.tqfindIndex( pAction ) >= 0 ) {
+	if( m_rgActionsNonUnique.findIndex( pAction ) >= 0 ) {
 		mtemp_pActionRemoving = pAction;
 		bool b = updateConnections();
 		mtemp_pActionRemoving = 0;
@@ -591,7 +591,7 @@ TQPopupMenu* KAccelBase::createPopupMenu( TQWidget* pParent, const KKeySequence&
 		// If an action has already been inserted into the menu
 		//  and we have a label instead of an action here,
 		//  then indicate that we should insert a separator before the next menu entry.
-		if( bActionInserted && !pAction->isConfigurable() && pAction->name().tqcontains( ':' ) )
+		if( bActionInserted && !pAction->isConfigurable() && pAction->name().contains( ':' ) )
 			bInsertSeparator = true;
 
 		for( uint iSeq = 0; iSeq < pAction->shortcut().count(); iSeq++ ) {
diff --git a/kdecore/kaccelbase.h b/kdecore/kaccelbase.h
index d619e1bdc..07e3f4833 100644
--- a/kdecore/kaccelbase.h
+++ b/kdecore/kaccelbase.h
@@ -42,7 +42,7 @@ class TQWidget;
  * key bindings through application configuration files or through the
  * KKeyChooser GUI.
  *
- * A KAccel tqcontains a list of accelerator items. Each accelerator item
+ * A KAccel contains a list of accelerator items. Each accelerator item
  * consists of an action name and a keyboard code combined with modifiers
  * (Shift, Ctrl and Alt.)
  *
@@ -101,7 +101,7 @@ class TQWidget;
  *   id = popup->insertItem(i18n("Print &Document"),this, TQT_SLOT(printDoc()));
  * it might be a good idea to insert the standard action before as
  *          a->insertStdItem( KStdAccel::Print, i18n("Print Document") )
- * as well, so that the user can easily tqfind the corresponding function.
+ * as well, so that the user can easily find the corresponding function.
  *
  * This technique works for other actions as well.  Your "scroll up" function
  * in a menu could be done with
diff --git a/kdecore/kaccelmanager.cpp b/kdecore/kaccelmanager.cpp
index e65434c7f..1b5ea4d24 100644
--- a/kdecore/kaccelmanager.cpp
+++ b/kdecore/kaccelmanager.cpp
@@ -64,7 +64,7 @@
 
  class KAcceleratorManagerPrivate - internal helper class
 
- This class does all the work to tqfind accelerators for a hierarchy of
+ This class does all the work to find accelerators for a hierarchy of
  widgets.
 
  *********************************************************************/
@@ -144,7 +144,7 @@ bool KAcceleratorManagerPrivate::standardName(const TQString &str)
 {
     if (!kaccmp_sns)
         kaccmp_sns_d.setObject(kaccmp_sns, new TQStringList(KStdAction::internal_stdNames()));
-        return kaccmp_sns->tqcontains(str);
+        return kaccmp_sns->contains(str);
 }
 
 KAcceleratorManagerPrivate::Item::~Item()
@@ -201,8 +201,8 @@ void KAcceleratorManagerPrivate::calculateAccelerators(Item *item, TQString &use
         contents << it->m_content;
     }
 
-    // tqfind the right accelerators
-    KAccelManagerAlgorithm::tqfindAccelerators(contents, used);
+    // find the right accelerators
+    KAccelManagerAlgorithm::findAccelerators(contents, used);
 
     // write them back into the widgets
     int cnt = -1;
@@ -223,7 +223,7 @@ void KAcceleratorManagerPrivate::calculateAccelerators(Item *item, TQString &use
         {
             if (it->m_index >= 0)
             {
-                TQMenuItem *mitem = menuBar->tqfindItem(menuBar->idAt(it->m_index));
+                TQMenuItem *mitem = menuBar->findItem(menuBar->idAt(it->m_index));
                 if (mitem)
                 {
                     checkChange(contents[cnt]);
@@ -239,12 +239,12 @@ void KAcceleratorManagerPrivate::calculateAccelerators(Item *item, TQString &use
         if ( dynamic_cast<TQLabel*>( it->m_widget ) && it->m_widget->inherits("KURLLabel") )
              continue;
 
-        int tprop = it->m_widget->tqmetaObject()->tqfindProperty("text", true);
+        int tprop = it->m_widget->metaObject()->findProperty("text", true);
         if (tprop != -1)  {
             if (checkChange(contents[cnt]))
                 it->m_widget->setProperty("text", contents[cnt].accelerated());
         } else {
-            tprop = it->m_widget->tqmetaObject()->tqfindProperty("title", true);
+            tprop = it->m_widget->metaObject()->findProperty("title", true);
             if (tprop != -1 && checkChange(contents[cnt]))
                 it->m_widget->setProperty("title", contents[cnt].accelerated());
         }
@@ -265,12 +265,12 @@ void KAcceleratorManagerPrivate::traverseChildren(TQWidget *widget, Item *item)
   TQObjectList *childList = widget->queryList("TQWidget", 0, false, false);
   for ( TQObject *it = childList->first(); it; it = childList->next() )
   {
-    TQWidget *w = static_cast<TQWidget*>(static_cast<QObject*>(it));
+    TQWidget *w = static_cast<TQWidget*>(it);
 
     if ( !w->isVisibleTo( widget ) || ( w->isTopLevel() && dynamic_cast<TQPopupMenu*>(w) == NULL ) )
         continue;
 
-    if ( KAcceleratorManagerPrivate::ignored_widgets.tqfind( w ) != KAcceleratorManagerPrivate::ignored_widgets.end() )
+    if ( KAcceleratorManagerPrivate::ignored_widgets.find( w ) != KAcceleratorManagerPrivate::ignored_widgets.end() )
         continue;
 
     manageWidget(w, item);
@@ -340,9 +340,9 @@ void KAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item)
   {
     TQString content;
     TQVariant variant;
-    int tprop = w->tqmetaObject()->tqfindProperty("text", true);
+    int tprop = w->metaObject()->findProperty("text", true);
     if (tprop != -1)  {
-        const TQMetaProperty* p = w->tqmetaObject()->property( tprop, true );
+        const TQMetaProperty* p = w->metaObject()->property( tprop, true );
         if ( p && p->isValid() )
             w->qt_property( tprop, 1, &variant );
         else
@@ -350,9 +350,9 @@ void KAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item)
     }
 
     if (tprop == -1)  {
-        tprop = w->tqmetaObject()->tqfindProperty("title", true);
+        tprop = w->metaObject()->findProperty("title", true);
         if (tprop != -1)  {
-            const TQMetaProperty* p = w->tqmetaObject()->property( tprop, true );
+            const TQMetaProperty* p = w->metaObject()->property( tprop, true );
             if ( p && p->isValid() )
                 w->qt_property( tprop, 1, &variant );
         }
@@ -409,7 +409,7 @@ void KAcceleratorManagerPrivate::manageMenuBar(TQMenuBar *mbar, Item *item)
 
     for (uint i=0; i<mbar->count(); ++i)
     {
-        mitem = mbar->tqfindItem(mbar->idAt(i));
+        mitem = mbar->findItem(mbar->idAt(i));
         if (!mitem)
             continue;
 
@@ -478,18 +478,18 @@ void KAcceleratorManager::last_manage(TQString &added,  TQString &changed, TQStr
 KAccelString::KAccelString(const TQString &input, int initialWeight)
   : m_pureText(input), m_weight()
 {
-    m_orig_accel = m_pureText.tqfind("(!)&");
+    m_orig_accel = m_pureText.find("(!)&");
     if (m_orig_accel != -1)
 	m_pureText.remove(m_orig_accel, 4);
 
-    m_orig_accel = m_pureText.tqfind("(&&)");
+    m_orig_accel = m_pureText.find("(&&)");
     if (m_orig_accel != -1)
-        m_pureText.tqreplace(m_orig_accel, 4, "&");
+        m_pureText.replace(m_orig_accel, 4, "&");
 
     m_origText = m_pureText;
 
-    if (m_pureText.tqcontains('\t'))
-        m_pureText = m_pureText.left(m_pureText.tqfind('\t'));
+    if (m_pureText.contains('\t'))
+        m_pureText = m_pureText.left(m_pureText.find('\t'));
 
     m_orig_accel = m_accel = stripAccelerator(m_pureText);
 
@@ -519,7 +519,7 @@ TQString KAccelString::accelerated() const
                   oa += 4;
       }
       if (m_orig_accel >= 0)
-	  result.tqreplace(oa, 1, "(&&)");
+	  result.replace(oa, 1, "(&&)");
     }
   } else {
       if (m_accel >= 0 && m_orig_accel != m_accel) {
@@ -598,7 +598,7 @@ int KAccelString::stripAccelerator(TQString &text)
 
   while (p >= 0)
   {
-    p = text.tqfind('&', p)+1;
+    p = text.find('&', p)+1;
 
     if (p <= 0 || p >= (int)text.length())
       return -1;
@@ -626,7 +626,7 @@ int KAccelString::maxWeight(int &index, const TQString &used)
   index = -1;
 
   for (uint pos=0; pos<m_pureText.length(); ++pos)
-    if (used.tqfind(m_pureText[pos], 0, FALSE) == -1 && m_pureText[pos].latin1() != 0)
+    if (used.find(m_pureText[pos], 0, FALSE) == -1 && m_pureText[pos].latin1() != 0)
       if (m_weight[pos] > max)
       {
         max = m_weight[pos];
@@ -648,7 +648,7 @@ void KAccelString::dump()
 
 /*********************************************************************
 
- tqfindAccelerators - the algorithm determining the new accelerators
+ findAccelerators - the algorithm determining the new accelerators
 
  The algorithm is very crude:
 
@@ -666,7 +666,7 @@ void KAccelString::dump()
 
  The disadvantages:
 
-   * it does not try to tqfind as many accelerators as possible
+   * it does not try to find as many accelerators as possible
 
  TODO:
 
@@ -679,9 +679,9 @@ void KAccelString::dump()
 
  *********************************************************************/
 
-void KAccelManagerAlgorithm::tqfindAccelerators(KAccelStringList &result, TQString &used)
+void KAccelManagerAlgorithm::findAccelerators(KAccelStringList &result, TQString &used)
 {
-    kdDebug(131) << "tqfindAccelerators\n";
+    kdDebug(131) << "findAccelerators\n";
   KAccelStringList accel_strings = result;
 
   // initally remove all accelerators
@@ -694,7 +694,7 @@ void KAccelManagerAlgorithm::tqfindAccelerators(KAccelStringList &result, TQStri
   {
     int max = 0, index = -1, accel = -1;
 
-    // tqfind maximum weight
+    // find maximum weight
     for (uint i=0; i<accel_strings.count(); ++i)
     {
       int a;
@@ -747,14 +747,14 @@ void KPopupAccelManager::aboutToShow()
 
   if (m_count != (int)m_popup->count())
   {
-    tqfindMenuEntries(m_entries);
+    findMenuEntries(m_entries);
     calculateAccelerators();
     m_count = m_popup->count();
   }
   else
   {
     KAccelStringList entries;
-    tqfindMenuEntries(entries);
+    findMenuEntries(entries);
     if (entries != m_entries)
     {
       m_entries = entries;
@@ -766,16 +766,16 @@ void KPopupAccelManager::aboutToShow()
 
 void KPopupAccelManager::calculateAccelerators()
 {
-  // tqfind the new accelerators
+  // find the new accelerators
   TQString used;
-  KAccelManagerAlgorithm::tqfindAccelerators(m_entries, used);
+  KAccelManagerAlgorithm::findAccelerators(m_entries, used);
 
   // change the menu entries
   setMenuEntries(m_entries);
 }
 
 
-void KPopupAccelManager::tqfindMenuEntries(KAccelStringList &list)
+void KPopupAccelManager::findMenuEntries(KAccelStringList &list)
 {
   TQMenuItem *mitem;
   TQString s;
@@ -785,7 +785,7 @@ void KPopupAccelManager::tqfindMenuEntries(KAccelStringList &list)
   // read out the menu entries
   for (uint i=0; i<m_popup->count(); i++)
   {
-    mitem = m_popup->tqfindItem(m_popup->idAt(i));
+    mitem = m_popup->findItem(m_popup->idAt(i));
     if (mitem->isSeparator())
       continue;
 
@@ -793,7 +793,7 @@ void KPopupAccelManager::tqfindMenuEntries(KAccelStringList &list)
 
     // in full menus, look at entries with global accelerators last
     int weight = 50;
-    if (s.tqcontains('\t'))
+    if (s.contains('\t'))
         weight = 0;
 
     list.append(KAccelString(s, weight));
@@ -812,7 +812,7 @@ void KPopupAccelManager::setMenuEntries(const KAccelStringList &list)
   uint cnt = 0;
   for (uint i=0; i<m_popup->count(); i++)
   {
-    mitem = m_popup->tqfindItem(m_popup->idAt(i));
+    mitem = m_popup->findItem(m_popup->idAt(i));
     if (mitem->isSeparator())
       continue;
 
@@ -845,8 +845,8 @@ QWidgetStackAccelManager::QWidgetStackAccelManager(TQWidgetStack *stack)
 
 bool QWidgetStackAccelManager::eventFilter ( TQObject * watched, TQEvent * e )
 {
-    if ( e->type() == TQEvent::Show && tqApp->activeWindow() ) {
-        KAcceleratorManager::manage( tqApp->activeWindow() );
+    if ( e->type() == TQEvent::Show && qApp->activeWindow() ) {
+        KAcceleratorManager::manage( qApp->activeWindow() );
         watched->removeEventFilter( this );
     }
     return false;
diff --git a/kdecore/kaccelmanager.h b/kdecore/kaccelmanager.h
index ed8fd0081..21655fd9c 100644
--- a/kdecore/kaccelmanager.h
+++ b/kdecore/kaccelmanager.h
@@ -30,7 +30,7 @@ class TQString;
 /**
  * KDE Accelerator manager.
  *
- * This class can be used to tqfind a valid and working set of
+ * This class can be used to find a valid and working set of
  * accelerators for any widget.
  *
  * @author Matthias Hoelzer-Kluepfel <mhk@kde.org>
diff --git a/kdecore/kaccelmanager_private.h b/kdecore/kaccelmanager_private.h
index cd3f30a12..fbb5d1857 100644
--- a/kdecore/kaccelmanager_private.h
+++ b/kdecore/kaccelmanager_private.h
@@ -32,7 +32,7 @@ class TQWidgetStack;
 /**
  * A string class handling accelerators.
  *
- * This class tqcontains a string and knowledge about accelerators.
+ * This class contains a string and knowledge about accelerators.
  * It keeps a list weights, telling how valuable each character
  * would be as an accelerator.
  *
@@ -81,7 +81,7 @@ typedef TQValueList<KAccelString> KAccelStringList;
 
 
 /**
- * This class encapsulates the algorithm tqfinding the 'best'
+ * This class encapsulates the algorithm finding the 'best'
  * distribution of accelerators in a hierarchy of widgets.
  *
  * @author Matthias Hoelzer-Kluepfel <mhk@kde.org>
@@ -113,8 +113,8 @@ public:
     STANDARD_ACCEL = 300
   };
 
-  /// Method to call to tqfind the best distribution of accelerators.
-  static void tqfindAccelerators(KAccelStringList &result, TQString &used);
+  /// Method to call to find the best distribution of accelerators.
+  static void findAccelerators(KAccelStringList &result, TQString &used);
 
 };
 
@@ -131,7 +131,7 @@ class TQPopupMenu;
  * @author Matthias Hoelzer-Kluepfel <mhk@kde.org>
 */
 
-class KPopupAccelManager : public TQObject
+class KPopupAccelManager : public QObject
 {
   Q_OBJECT
 
@@ -154,7 +154,7 @@ private:
 
   void calculateAccelerators();
 
-  void tqfindMenuEntries(KAccelStringList &list);
+  void findMenuEntries(KAccelStringList &list);
   void setMenuEntries(const KAccelStringList &list);
 
   TQPopupMenu       *m_popup;
@@ -164,7 +164,7 @@ private:
 };
 
 
-class QWidgetStackAccelManager : public TQObject
+class QWidgetStackAccelManager : public QObject
 {
   Q_OBJECT
 
diff --git a/kdecore/kaccelprivate.h b/kdecore/kaccelprivate.h
index 7b616acbe..0a6cdc19b 100644
--- a/kdecore/kaccelprivate.h
+++ b/kdecore/kaccelprivate.h
@@ -47,7 +47,7 @@ class KDECORE_EXPORT KAccelPrivate : public TQObject, public KAccelBase
 	void slotShowMenu();
 	void slotMenuActivated( int iAction );
 	
-	bool eventFilter( TQObject* pWatched, TQEvent* pEvent ); // virtual method from TQObject
+	bool eventFilter( TQObject* pWatched, TQEvent* pEvent ); // virtual method from QObject
 };
 
 #endif // !__KACCELPRIVATE_H
diff --git a/kdecore/kallocator.cpp b/kdecore/kallocator.cpp
index 16c1b3625..c02bbf3ff 100644
--- a/kdecore/kallocator.cpp
+++ b/kdecore/kallocator.cpp
@@ -183,9 +183,9 @@ void KZoneAllocator::delBlock(MemBlock *b)
 void *
 KZoneAllocator::allocate(size_t _size)
 {
-   // Use the size of (void *) as tqalignment
-   const size_t tqalignment = sizeof(void *) - 1;
-   _size = (_size + tqalignment) & ~tqalignment;   
+   // Use the size of (void *) as alignment
+   const size_t alignment = sizeof(void *) - 1;
+   _size = (_size + alignment) & ~alignment;   
 
    if ((unsigned long) _size + blockOffset > blockSize)
    {
diff --git a/kdecore/kapplication.cpp b/kdecore/kapplication.cpp
index 08e6c7652..3dc8ca77d 100644
--- a/kdecore/kapplication.cpp
+++ b/kdecore/kapplication.cpp
@@ -170,7 +170,7 @@ static Atom kde_xdnd_drop;
 #endif
 
 // duplicated from patched Qt, so that there won't be unresolved symbols if Qt gets
-// tqreplaced by unpatched one
+// replaced by unpatched one
 KDECORE_EXPORT bool qt_qclipboard_bailout_hack = false;
 
 template class TQPtrList<KSessionManaged>;
@@ -250,7 +250,7 @@ public:
   IceIOErrorHandler oldIceIOErrorHandler;
   KCheckAccelerators* checkAccelerators;
   TQString overrideStyle;
-  TQString tqgeometry_arg;
+  TQString geometry_arg;
   TQCString startup_id;
   TQTimer* app_started_timer;
   KAppDCOPInterface *m_KAppDCOPInterface;
@@ -466,7 +466,7 @@ bool KApplication::notify(TQObject *receiver, TQEvent *event)
           // We have a keypress for a lineedit...
           TQKeyEvent *kevent = static_cast<TQKeyEvent *>(event);
           KKey key(kevent);
-          if (_selectAll.tqcontains(key))
+          if (_selectAll.contains(key))
           {
              if (t == TQEvent::KeyPress)
              {
@@ -503,7 +503,7 @@ bool KApplication::notify(TQObject *receiver, TQEvent *event)
        {
           // We have a keypress for a multilineedit...
           TQKeyEvent *kevent = static_cast<TQKeyEvent *>(event);
-          if (_selectAll.tqcontains(KKey(kevent)))
+          if (_selectAll.contains(KKey(kevent)))
           {
              if (t == TQEvent::KeyPress)
              {
@@ -519,7 +519,7 @@ bool KApplication::notify(TQObject *receiver, TQEvent *event)
     }
     if( t == TQEvent::Show && receiver->isWidgetType())
     {
-        TQWidget* w = static_cast< TQWidget* >( static_cast<QObject*>(receiver) );
+        TQWidget* w = static_cast< TQWidget* >( receiver );
 #if defined Q_WS_X11
         if( w->isTopLevel() && !startupId().isEmpty() && !static_cast<TQShowEvent*>(event)->spontaneous()) // TODO better done using window group leader?
             KStartupInfo::setWindowStartupId( w->winId(), startupId());
@@ -765,7 +765,7 @@ class KDETranslator : public TQTranslator
 {
 public:
   KDETranslator(TQObject *parent) : TQTranslator(parent, "kdetranslator") {}
-  virtual TQTranslatorMessage tqfindMessage(const char* context,
+  virtual TQTranslatorMessage findMessage(const char* context,
 					 const char *sourceText,
 					 const char* message) const
   {
@@ -832,7 +832,7 @@ void KApplication::init(bool GUIenabled)
 
   smw = 0;
 
-  // Initial KIPC event tqmask.
+  // Initial KIPC event mask.
 #if defined Q_WS_X11
   kipcEventMask = (1 << KIPC::StyleChanged) | (1 << KIPC::PaletteChanged) |
                   (1 << KIPC::FontChanged) | (1 << KIPC::BackgroundChanged) |
@@ -901,7 +901,7 @@ void KApplication::init(bool GUIenabled)
         TQMimeSourceFactory::addFactory( oldDefaultFactory );
     }
 
-    d->checkAccelerators = new KCheckAccelerators( TQT_TQOBJECT(this) );
+    d->checkAccelerators = new KCheckAccelerators( this );
   }
 
 #ifdef Q_WS_MACX
@@ -934,16 +934,16 @@ void KApplication::init(bool GUIenabled)
   // save and restore the RTL setting, as installTranslator calls qt_detectRTLLanguage,
   // which makes it impossible to use the -reverse cmdline switch with KDE apps
   bool rtl = reverseLayout();
-  installTranslator(new KDETranslator(TQT_TQOBJECT(this)));
+  installTranslator(new KDETranslator(this));
   setReverseLayout( rtl );
   if (i18n( "_: Dear Translator! Translate this string to the string 'LTR' in "
 	 "left-to-right languages (as english) or to 'RTL' in right-to-left "
-	 "languages (such as Hebrew and Arabic) to get proper widget tqlayout." ) == "RTL")
+	 "languages (such as Hebrew and Arabic) to get proper widget layout." ) == "RTL")
 	setReverseLayout( !rtl );
 
   // install appdata resource type
   KGlobal::dirs()->addResourceType("appdata", KStandardDirs::kde_default("data")
-                                   + TQString::tqfromLatin1(name()) + '/');
+                                   + TQString::fromLatin1(name()) + '/');
   pSessionConfig = 0L;
   bSessionManagement = true;
 
@@ -1179,9 +1179,9 @@ void KApplication::propagateSessionManager()
     TQCString fName = TQFile::encodeName(locateLocal("socket", "KSMserver"));
     TQCString display = ::getenv(DISPLAY);
     // strip the screen number from the display
-    display.tqreplace(TQRegExp("\\.[0-9]+$"), "");
+    display.replace(TQRegExp("\\.[0-9]+$"), "");
     int i;
-    while( (i = display.tqfind(':')) >= 0)
+    while( (i = display.find(':')) >= 0)
        display[i] = '_';
 
     fName += "_"+display;
@@ -1222,7 +1222,7 @@ void KApplication::commitData( QSessionManager& sm )
 
     if ( sm.allowsInteraction() ) {
         TQWidgetList done;
-        TQWidgetList *list = TQApplication::tqtopLevelWidgets();
+        TQWidgetList *list = TQApplication::topLevelWidgets();
         bool canceled = false;
         TQWidget* w = list->first();
         while ( !canceled && w ) {
@@ -1233,12 +1233,12 @@ void KApplication::commitData( QSessionManager& sm )
                 if ( !canceled )
                     done.append( w );
                 delete list; // one never knows...
-                list = TQApplication::tqtopLevelWidgets();
+                list = TQApplication::topLevelWidgets();
                 w = list->first();
             } else {
                 w = list->next();
             }
-            while ( w && done.tqcontainsRef( w ) )
+            while ( w && done.containsRef( w ) )
                 w = list->next();
         }
         delete list;
@@ -1380,9 +1380,9 @@ void KApplication::startKdeinit()
          return; // whoever held the lock has already started dcopserver
   }
   // Try to launch kdeinit.
-  TQString srv = KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit"));
+  TQString srv = KStandardDirs::findExe(TQString::fromLatin1("kdeinit"));
   if (srv.isEmpty())
-     srv = KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit"), KGlobal::dirs()->kfsstnd_defaultbindir());
+     srv = KStandardDirs::findExe(TQString::fromLatin1("kdeinit"), KGlobal::dirs()->kfsstnd_defaultbindir());
   if (srv.isEmpty())
      return;
   if (kapp && (Tty != kapp->type()))
@@ -1467,7 +1467,7 @@ static const KCmdLineOptions qt_options[] =
 #ifdef Q_WS_QWS
    { "qws", I18N_NOOP("forces the application to run as QWS Server"), 0},
 #endif
-   { "reverse", I18N_NOOP("mirrors the whole tqlayout of widgets"), 0},
+   { "reverse", I18N_NOOP("mirrors the whole layout of widgets"), 0},
    KCmdLineLastOption
 };
 
@@ -1481,7 +1481,7 @@ static const KCmdLineOptions kde_options[] =
    { "nocrashhandler",          I18N_NOOP("Disable crash handler, to get core dumps"), 0},
    { "waitforwm",          I18N_NOOP("Waits for a WM_NET compatible windowmanager"), 0},
    { "style <style>", I18N_NOOP("sets the application GUI style"), 0},
-   { "tqgeometry <tqgeometry>", I18N_NOOP("sets the client tqgeometry of the main widget - see man X for the argument format"), 0},
+   { "geometry <geometry>", I18N_NOOP("sets the client geometry of the main widget - see man X for the argument format"), 0},
    { "smkey <sessionKey>", 0, 0}, // this option is obsolete and exists only to allow smooth upgrades from sessions
                                   // saved under Qt 3.0.x -- Qt 3.1.x includes the session key now automatically in
 				  // the session id (Simon)
@@ -1589,9 +1589,9 @@ void KApplication::parseCommandLine( )
     // FIXME(E): Implement for Qt Embedded
 #endif
 
-    if (args->isSet("tqgeometry"))
+    if (args->isSet("geometry"))
     {
-        d->tqgeometry_arg = args->getOption("tqgeometry");
+        d->geometry_arg = args->getOption("geometry");
     }
 
     if (args->isSet("smkey"))
@@ -1603,7 +1603,7 @@ void KApplication::parseCommandLine( )
 
 TQString KApplication::geometryArgument() const
 {
-    return d->tqgeometry_arg;
+    return d->geometry_arg;
 }
 
 TQPixmap KApplication::icon() const
@@ -1883,13 +1883,13 @@ void KApplication::updateRemoteUserTimestamp( const TQCString& dcopId, unsigned
 
 void KApplication::invokeEditSlot( const char *slot )
 {
-  TQObject *object = TQT_TQOBJECT(tqfocusWidget());
+  TQObject *object = focusWidget();
   if( !object )
     return;
 
-  TQMetaObject *meta = object->tqmetaObject();
+  TQMetaObject *meta = object->metaObject();
 
-  int idx = meta->tqfindSlot( slot + 1, true );
+  int idx = meta->findSlot( slot + 1, true );
   if( idx < 0 )
     return;
 
@@ -1900,7 +1900,7 @@ void KApplication::addKipcEventMask(int id)
 {
     if (id >= 32)
     {
-        kdDebug(101) << "Cannot use KIPC event tqmask for message IDs >= 32\n";
+        kdDebug(101) << "Cannot use KIPC event mask for message IDs >= 32\n";
         return;
     }
     kipcEventMask |= (1 << id);
@@ -1910,7 +1910,7 @@ void KApplication::removeKipcEventMask(int id)
 {
     if (id >= 32)
     {
-        kdDebug(101) << "Cannot use KIPC event tqmask for message IDs >= 32\n";
+        kdDebug(101) << "Cannot use KIPC event mask for message IDs >= 32\n";
         return;
     }
     kipcEventMask &= ~(1 << id);
@@ -2452,10 +2452,10 @@ void KApplication::invokeMailer(const TQString &_to, const TQString &_cc, const
    TQString command = config.readPathEntry("EmailClient");
 
    TQString to, cc, bcc;
-   if (command.isEmpty() || command == TQString::tqfromLatin1("kmail")
+   if (command.isEmpty() || command == TQString::fromLatin1("kmail")
        || command.endsWith("/kmail"))
    {
-     command = TQString::tqfromLatin1("kmail --composer -s %s -c %c -b %b --body %B --attach %A -- %t");
+     command = TQString::fromLatin1("kmail --composer -s %s -c %c -b %b --body %B --attach %A -- %t");
      if ( !_to.isEmpty() )
      {
        // put the whole address lists into RFC2047 encoded blobs; technically
@@ -2473,7 +2473,7 @@ void KApplication::invokeMailer(const TQString &_to, const TQString &_cc, const
      to = _to;
      cc = _cc;
      bcc = _bcc;
-     if( !command.tqcontains( '%' ))
+     if( !command.contains( '%' ))
          command += " %u";
    }
 
@@ -2826,7 +2826,7 @@ TQString KApplication::tempSaveName( const TQString& pFilename ) const
         }
     }
 
-  aFilename.tqreplace( "/", "\\!" ).prepend( "#" ).append( "#" ).prepend( "/" ).prepend( aAutosaveDir.absPath() );
+  aFilename.replace( "/", "\\!" ).prepend( "#" ).append( "#" ).prepend( "/" ).prepend( aAutosaveDir.absPath() );
 
   return aFilename;
 }
@@ -2855,7 +2855,7 @@ TQString KApplication::checkRecoverFile( const TQString& pFilename,
         }
     }
 
-  aFilename.tqreplace( "/", "\\!" ).prepend( "#" ).append( "#" ).prepend( "/" ).prepend( aAutosaveDir.absPath() );
+  aFilename.replace( "/", "\\!" ).prepend( "#" ).append( "#" ).prepend( "/" ).prepend( aAutosaveDir.absPath() );
 
   if( TQFile( aFilename ).exists() )
     {
@@ -2888,7 +2888,7 @@ bool checkAccess(const TQString& pathname, int mode)
 
   //strip the filename (everything until '/' from the end
   TQString dirName(pathname);
-  int pos = dirName.tqfindRev('/');
+  int pos = dirName.findRev('/');
   if ( pos == -1 )
     return false;   // No path in argument. This is evil, we won't allow this
   else if ( pos == 0 ) // don't turn e.g. /root into an empty string
@@ -3103,18 +3103,18 @@ void KApplication::initUrlActionRestrictions()
     bool bEnabled = (strEnabled == "true");
 
     if (refPath.startsWith("$HOME"))
-       refPath.tqreplace(0, 5, TQDir::homeDirPath());
+       refPath.replace(0, 5, TQDir::homeDirPath());
     else if (refPath.startsWith("~"))
-       refPath.tqreplace(0, 1, TQDir::homeDirPath());
+       refPath.replace(0, 1, TQDir::homeDirPath());
     if (urlPath.startsWith("$HOME"))
-       urlPath.tqreplace(0, 5, TQDir::homeDirPath());
+       urlPath.replace(0, 5, TQDir::homeDirPath());
     else if (urlPath.startsWith("~"))
-       urlPath.tqreplace(0, 1, TQDir::homeDirPath());
+       urlPath.replace(0, 1, TQDir::homeDirPath());
 
     if (refPath.startsWith("$TMP"))
-       refPath.tqreplace(0, 4, KGlobal::dirs()->saveLocation("tmp"));
+       refPath.replace(0, 4, KGlobal::dirs()->saveLocation("tmp"));
     if (urlPath.startsWith("$TMP"))
-       urlPath.tqreplace(0, 4, KGlobal::dirs()->saveLocation("tmp"));
+       urlPath.replace(0, 4, KGlobal::dirs()->saveLocation("tmp"));
 
     d->urlActionRestrictions.append(new KApplicationPrivate::URLActionRule
     	( action, refProt, refHost, refPath, urlProt, urlHost, urlPath, bEnabled));
diff --git a/kdecore/kapplication.h b/kdecore/kapplication.h
index 20621bbfa..dd89de131 100644
--- a/kdecore/kapplication.h
+++ b/kdecore/kapplication.h
@@ -160,7 +160,7 @@ public:
    *
    * @param argv command line argument value(s)
    *
-   * @param rAppName application name. Will be used for tqfinding the
+   * @param rAppName application name. Will be used for finding the
    * associated message files and icon files, and as the default
    * registration name for DCOP. This is a mandatory parameter.
    *
@@ -186,7 +186,7 @@ public:
    *
    * @param argv command line argument value(s)
    *
-   * @param rAppName application name. Will be used for tqfinding the
+   * @param rAppName application name. Will be used for finding the
    * associated message files and icon files, and as the default
    * registration name for DCOP. This is a mandatory parameter.
    *
@@ -214,7 +214,7 @@ public:
   /**
    * Returns the current application object.
    *
-   * This is similar to the global TQApplication pointer tqApp. It
+   * This is similar to the global TQApplication pointer qApp. It
    * allows access to the single global KApplication object, since
    * more than one cannot be created in the same application. It
    * saves you the trouble of having to pass the pointer explicitly
@@ -237,7 +237,7 @@ public:
    *
    * @return If true, this application was restored by the session manager.
    *    Note that this may mean the config object returned by
-   * sessionConfig() tqcontains data saved by a session closedown.
+   * sessionConfig() contains data saved by a session closedown.
    * @see sessionConfig()
    */
   bool isRestored() const { return TQApplication::isSessionRestored(); }
@@ -625,10 +625,10 @@ public:
    *
    * @param _name the name of the service
    * @param URL if not empty this URL is passed to the service
-   * @param error On failure, @p error tqcontains a description of the error
+   * @param error On failure, @p error contains a description of the error
    *         that occurred. If the pointer is 0, the argument will be
    *         ignored
-   * @param dcopService On success, @p dcopService tqcontains the DCOP name
+   * @param dcopService On success, @p dcopService contains the DCOP name
    *         under which this service is available. If empty, the service does
    *         not provide DCOP services. If the pointer is 0 the argument
    *         will be ignored
@@ -648,10 +648,10 @@ public:
    *
    * @param _name the name of the service
    * @param URLs if not empty these URLs will be passed to the service
-   * @param error On failure, @p error tqcontains a description of the error
+   * @param error On failure, @p error contains a description of the error
    *         that occurred. If the pointer is 0, the argument will be
    *         ignored
-   * @param dcopService On success, @p dcopService tqcontains the DCOP name
+   * @param dcopService On success, @p dcopService contains the DCOP name
    *         under which this service is available. If empty, the service does
    *         not provide DCOP services. If the pointer is 0 the argument
    *         will be ignored
@@ -671,10 +671,10 @@ public:
    *
    * @param _name the path of the desktop file
    * @param URL if not empty this URL is passed to the service
-   * @param error On failure, @p error tqcontains a description of the error
+   * @param error On failure, @p error contains a description of the error
    *         that occurred. If the pointer is 0, the argument will be
    *         ignored
-   * @param dcopService On success, @p dcopService tqcontains the DCOP name
+   * @param dcopService On success, @p dcopService contains the DCOP name
    *         under which this service is available. If empty, the service does
    *         not provide DCOP services. If the pointer is 0 the argument
    *         will be ignored
@@ -694,10 +694,10 @@ public:
    *
    * @param _name the path of the desktop file
    * @param URLs if not empty these URLs will be passed to the service
-   * @param error On failure, @p error tqcontains a description of the error
+   * @param error On failure, @p error contains a description of the error
    *         that occurred. If the pointer is 0, the argument will be
    *         ignored
-   * @param dcopService On success, @p dcopService tqcontains the DCOP name
+   * @param dcopService On success, @p dcopService contains the DCOP name
    *         under which this service is available. If empty, the service does
    *         not provide DCOP services. If the pointer is 0 the argument
    *         will be ignored
@@ -717,10 +717,10 @@ public:
    *
    * @param _name the desktop name of the service
    * @param URL if not empty this URL is passed to the service
-   * @param error On failure, @p error tqcontains a description of the error
+   * @param error On failure, @p error contains a description of the error
    *         that occurred. If the pointer is 0, the argument will be
    *         ignored
-   * @param dcopService On success, @p dcopService tqcontains the DCOP name
+   * @param dcopService On success, @p dcopService contains the DCOP name
    *         under which this service is available. If empty, the service does
    *         not provide DCOP services. If the pointer is 0 the argument
    *         will be ignored
@@ -740,10 +740,10 @@ public:
    *
    * @param _name the desktop name of the service
    * @param URLs if not empty these URLs will be passed to the service
-   * @param error On failure, @p error tqcontains a description of the error
+   * @param error On failure, @p error contains a description of the error
    *         that occurred. If the pointer is 0, the argument will be
    *         ignored
-   * @param dcopService On success, @p dcopService tqcontains the DCOP name
+   * @param dcopService On success, @p dcopService contains the DCOP name
    *         under which this service is available. If empty, the service does
    *         not provide DCOP services. If the pointer is 0 the argument
    *         will be ignored
@@ -765,7 +765,7 @@ public:
    *
    * @param name Name of the program to start
    * @param args Arguments to pass to the program
-   * @param error On failure, @p error tqcontains a description of the error
+   * @param error On failure, @p error contains a description of the error
    *         that occurred. If the pointer is 0, the argument will be
    *         ignored
    * @param pid On success, the process id of the new service will be written
@@ -788,7 +788,7 @@ public:
    *
    * @param name Name of the program to start
    * @param args Arguments to pass to the program
-   * @param error On failure, @p error tqcontains a description of the error
+   * @param error On failure, @p error contains a description of the error
    *         that occurred. If the pointer is 0, the argument will be
    *         ignored
    * @param pid On success, the process id of the new service will be written
@@ -819,8 +819,8 @@ public:
   KDE_DEPRECATED KStyle* kstyle() const { return 0; }
 
   /**
-   * Builds a caption that tqcontains the application name along with the
-   * userCaption using a standard tqlayout.
+   * Builds a caption that contains the application name along with the
+   * userCaption using a standard layout.
    *
    * To make a compliant caption
    * for your window, simply do: @p setCaption(kapp->makeStdCaption(yourCaption));
@@ -832,7 +832,7 @@ public:
    * compliant if you set this to @p false.
    * @param modified If true, a 'modified' sign will be included in the
    * returned string. This is useful when indicating that a file is
-   * modified, i.e., it tqcontains data that has not been saved.
+   * modified, i.e., it contains data that has not been saved.
    * @return the created caption
    */
   TQString makeStdCaption( const TQString &userCaption,
@@ -915,8 +915,8 @@ public:
   static TQString randomString(int length);
 
   /**
-   * Adds a message type to the KIPC event tqmask. You can only add "system
-   * messages" to the event tqmask. These are the messages with id < 32.
+   * Adds a message type to the KIPC event mask. You can only add "system
+   * messages" to the event mask. These are the messages with id < 32.
    * Messages with id >= 32 are user messages.
    * @param id The message id. See KIPC::Message.
    * @see KIPC
@@ -926,7 +926,7 @@ public:
   void addKipcEventMask(int id);
 
   /**
-   * Removes a message type from the KIPC event tqmask. This message will
+   * Removes a message type from the KIPC event mask. This message will
    * not be handled anymore.
    * @param id The message id.
    * @see KIPC
@@ -977,9 +977,9 @@ public:
   void updateRemoteUserTimestamp( const TQCString& dcopId, unsigned long time = 0 );
   
     /**
-    * Returns the argument to --tqgeometry if any, so the tqgeometry can be set
+    * Returns the argument to --geometry if any, so the geometry can be set
     * wherever necessary
-    * @return the tqgeometry argument, or TQString::null if there is none
+    * @return the geometry argument, or TQString::null if there is none
     */
   TQString geometryArgument() const;
 
diff --git a/kdecore/kapplication_win.cpp b/kdecore/kapplication_win.cpp
index 60eecefa9..abf0694b4 100644
--- a/kdecore/kapplication_win.cpp
+++ b/kdecore/kapplication_win.cpp
@@ -66,7 +66,7 @@ public:
   IceIOErrorHandler oldIceIOErrorHandler;
   KCheckAccelerators* checkAccelerators;
   TQString overrideStyle;
-  TQString tqgeometry_arg;
+  TQString geometry_arg;
   TQCString startup_id;
   TQTimer* app_started_timer;
   KAppDCOPInterface *m_KAppDCOPInterface;
diff --git a/kdecore/kbufferedio.h b/kdecore/kbufferedio.h
index 1445179c7..234034d87 100644
--- a/kdecore/kbufferedio.h
+++ b/kdecore/kbufferedio.h
@@ -30,7 +30,7 @@ class KBufferedIOPrivate;
  * This abstract class implements basic functionality for buffered
  * input/output.
  *
- * Through the available methods, you can tqfind out how many bytes are
+ * Through the available methods, you can find out how many bytes are
  * available for reading, how many are still unsent and you can peek at
  * the buffered data.
  *
@@ -201,7 +201,7 @@ signals:
   /**
    * This signal gets sent when the stream is closed. The @p state parameter
    * will give the current state, in OR-ed bits:
-   * @li availRead:	read buffer tqcontains data to be read
+   * @li availRead:	read buffer contains data to be read
    * @li dirtyWrite:	write buffer wasn't empty when the stream closed
    * @li involuntary:	the stream wasn't closed due to user request
    *			(i.e., call to close). Probably remote end closed it
diff --git a/kdecore/kcalendarsystemfactory.h b/kdecore/kcalendarsystemfactory.h
index 0ceae43b9..ec68124d7 100644
--- a/kdecore/kcalendarsystemfactory.h
+++ b/kdecore/kcalendarsystemfactory.h
@@ -49,7 +49,7 @@ public:
    * 0 is specified.
    * @return a KCalendarSystem object
    */
-  static KCalendarSystem *create (const TQString & calType = TQString::tqfromLatin1("gregorian"),
+  static KCalendarSystem *create (const TQString & calType = TQString::fromLatin1("gregorian"),
                                   const KLocale * locale = 0);
 
   /**
diff --git a/kdecore/kcalendarsystemgregorian.cpp b/kdecore/kcalendarsystemgregorian.cpp
index 1577683ee..26a366fd6 100644
--- a/kdecore/kcalendarsystemgregorian.cpp
+++ b/kdecore/kcalendarsystemgregorian.cpp
@@ -295,7 +295,7 @@ int KCalendarSystemGregorian::weekDayOfPray() const
 
 TQString KCalendarSystemGregorian::calendarName() const
 {
-  return TQString::tqfromLatin1("gregorian");
+  return TQString::fromLatin1("gregorian");
 }
 
 bool KCalendarSystemGregorian::isLunar() const
diff --git a/kdecore/kcalendarsystemhebrew.cpp b/kdecore/kcalendarsystemhebrew.cpp
index 871ca370b..ec39fc9ca 100644
--- a/kdecore/kcalendarsystemhebrew.cpp
+++ b/kdecore/kcalendarsystemhebrew.cpp
@@ -614,7 +614,7 @@ TQDate KCalendarSystemHebrew::addYears( const TQDate & date, int nyears ) const
 // Ok
 TQString KCalendarSystemHebrew::calendarName() const
 {
-  return TQString::tqfromLatin1("hebrew");
+  return TQString::fromLatin1("hebrew");
 }
 
 // Ok
@@ -640,7 +640,7 @@ TQString KCalendarSystemHebrew::dayString(const TQDate & pDate, bool bShort) con
   TQString sResult;
 
   // Only use hebrew numbers if the hebrew setting is selected
-  if (locale()->language() == TQString::tqfromLatin1("he"))
+  if (locale()->language() == TQString::fromLatin1("he"))
     sResult = num2heb(day(pDate), false);
   else
     sResult = KCalendarSystem::dayString(pDate, bShort);
@@ -653,7 +653,7 @@ TQString KCalendarSystemHebrew::yearString(const TQDate & pDate, bool bShort) co
   TQString sResult;
 
   // Only use hebrew numbers if the hebrew setting is selected
-  if (locale()->language() == TQString::tqfromLatin1("he"))
+  if (locale()->language() == TQString::fromLatin1("he"))
     sResult = num2heb(year(pDate), !bShort);
   else
     sResult = KCalendarSystem::yearString(pDate, bShort);
@@ -684,9 +684,9 @@ static int heb2num(const TQString& str, int & iLength) {
     {
       if (s.length() > pos && s[pos + 1] >= TQChar(0x05D0) &&
           s[pos + 1] <= TQChar(0x05EA))
-        result += (c.tqunicode() - 0x05D0 + 1) * 1000;
+        result += (c.unicode() - 0x05D0 + 1) * 1000;
       else
-        result += c.tqunicode() - 0x05D0 + 1;
+        result += c.unicode() - 0x05D0 + 1;
     }
     else if (c == TQChar(0x05D8))
     {
@@ -702,11 +702,11 @@ static int heb2num(const TQString& str, int & iLength) {
       if (s.length() > pos && s[pos + 1] >= TQChar(0x05D9))
         return -1;
       else
-        result += decadeValues[c.tqunicode() - 0x05D9];
+        result += decadeValues[c.unicode() - 0x05D9];
     }
     else if (c >= TQChar(0x05E7) && c <= TQChar(0x05EA))
     {
-      result += (c.tqunicode() - 0x05E7 + 1) * 100;
+      result += (c.unicode() - 0x05E7 + 1) * 100;
     }
     else
     {
diff --git a/kdecore/kcalendarsystemhijri.cpp b/kdecore/kcalendarsystemhijri.cpp
index 564a2eaa9..8eb403685 100644
--- a/kdecore/kcalendarsystemhijri.cpp
+++ b/kdecore/kcalendarsystemhijri.cpp
@@ -577,7 +577,7 @@ TQDate KCalendarSystemHijri::addYears( const TQDate & date, int nyears ) const
 
 TQString KCalendarSystemHijri::calendarName() const
 {
-  return TQString::tqfromLatin1("hijri");
+  return TQString::fromLatin1("hijri");
 }
 
 bool KCalendarSystemHijri::isLunar() const
diff --git a/kdecore/kcalendarsystemjalali.cpp b/kdecore/kcalendarsystemjalali.cpp
index 0e0ed7662..8915c585a 100644
--- a/kdecore/kcalendarsystemjalali.cpp
+++ b/kdecore/kcalendarsystemjalali.cpp
@@ -541,7 +541,7 @@ int KCalendarSystemJalali::weekDayOfPray() const
 }
 TQString KCalendarSystemJalali::calendarName() const
 {
-  return TQString::tqfromLatin1("jalali");
+  return TQString::fromLatin1("jalali");
 }
 
 bool KCalendarSystemJalali::isLunar() const
diff --git a/kdecore/kcatalogue.cpp b/kdecore/kcatalogue.cpp
index 38cfad22c..3669b40b4 100644
--- a/kdecore/kcatalogue.cpp
+++ b/kdecore/kcatalogue.cpp
@@ -26,7 +26,7 @@
 #include "kcatalogue.h"
 #include "kstandarddirs.h"
 
-char *k_nl_tqfind_msg(struct kde_loaded_l10nfile *domain_file,
+char *k_nl_find_msg(struct kde_loaded_l10nfile *domain_file,
 	       const char *msgid);
 void k_nl_unload_domain (struct loaded_domain *domain);
 
@@ -57,12 +57,12 @@ KCatalogue::KCatalogue(const TQString & name, const TQString & language )
 {
   d->name = name;
   d->language = language;
-  // at the moment we do not know more. To tqfind out the plural type we first have to look into
+  // at the moment we do not know more. To find out the plural type we first have to look into
   // kdelibs.mo for the language. And for this we already need a catalog object. So this data
   // has to be set after we have the first catalog objects.
   d->pluralType = -1; 
 
-  TQString path = TQString::tqfromLatin1("%1/LC_MESSAGES/%2.mo")
+  TQString path = TQString::fromLatin1("%1/LC_MESSAGES/%2.mo")
     .arg( d->language )
     .arg( d->name );
 
@@ -143,7 +143,7 @@ TQString KCatalogue::fileName() const
 
 const char * KCatalogue::translate(const char * msgid) const
 {
-  return ::k_nl_tqfind_msg( &d->domain, msgid );
+  return ::k_nl_find_msg( &d->domain, msgid );
 }
 
 void KCatalogue::doUnload()
diff --git a/kdecore/kcharsets.cpp b/kdecore/kcharsets.cpp
index d55060d49..52cf87849 100644
--- a/kdecore/kcharsets.cpp
+++ b/kdecore/kcharsets.cpp
@@ -202,7 +202,7 @@ static struct Builtin
     { "ascii", "iso 8859-1" },
     { "x-utf-8", "utf-8" },
     { "x-utf-7", "utf-7" }, // ### FIXME: UTF-7 is not in Qt 
-    { "tqunicode-1-1-utf-7", "utf-7" }, // ### FIXME: UTF-7 is not in Qt
+    { "unicode-1-1-utf-7", "utf-7" }, // ### FIXME: UTF-7 is not in Qt
     { "utf-16", "iso-10646-ucs-2" },
     { "utf16", "iso-10646-ucs-2" },
     { "ucs2", "iso-10646-ucs-2" },
@@ -323,7 +323,7 @@ static struct ConversionHints
     { 0, 0 }};
 
 
-// search an array of items index/data, index is const char*, data is T, tqfind first matching index
+// search an array of items index/data, index is const char*, data is T, find first matching index
 // and return data, or return 0
 template< typename T, typename Data >
 static Data kcharsets_array_search( const T* start, const char* entry )
@@ -381,17 +381,17 @@ TQChar KCharsets::fromEntity(const TQString &str)
         if (str[pos] == (QChar)'x' || str[pos] == (QChar)'X') {
             pos++;
             // '&#x0000', hexadeciaml character reference
-            TQString tmp(str.tqunicode()+pos, str.length()-pos);
+            TQString tmp(str.unicode()+pos, str.length()-pos);
             res = tmp.toInt(&ok, 16);
         } else {
             //  '&#0000', decimal character reference
-            TQString tmp(str.tqunicode()+pos, str.length()-pos);
+            TQString tmp(str.unicode()+pos, str.length()-pos);
             res = tmp.toInt(&ok, 10);
         }
         return res;
     }
 
-    const entity *e = kde_tqfindEntity(str.ascii(), str.length());
+    const entity *e = kde_findEntity(str.ascii(), str.length());
 
     if(!e)
     {
@@ -422,14 +422,14 @@ TQChar KCharsets::fromEntity(const TQString &str, int &len)
 TQString KCharsets::toEntity(const TQChar &ch)
 {
     TQString ent;
-    ent.sprintf("&#0x%x;", ch.tqunicode());
+    ent.sprintf("&#0x%x;", ch.unicode());
     return ent;
 }
 
 TQString KCharsets::resolveEntities( const TQString &input )
 {
     TQString text = input;
-    const TQChar *p = text.tqunicode();
+    const TQChar *p = text.unicode();
     const TQChar *end = p + text.length();
     const TQChar *ampersand = 0;
     bool scanForSemicolon = false;
@@ -460,12 +460,12 @@ TQString KCharsets::resolveEntities( const TQString &input )
         if ( entityValue.isNull() )
             continue;
 
-        const uint ampersandPos = ampersand - text.tqunicode();
+        const uint ampersandPos = ampersand - text.unicode();
 
         text[ (int)ampersandPos ] = entityValue;
         text.remove( ampersandPos + 1, entityLength + 1 );
-        p = text.tqunicode() + ampersandPos;
-        end = text.tqunicode() + text.length();
+        p = text.unicode() + ampersandPos;
+        end = text.unicode() + text.length();
         ampersand = 0;
     }
 
@@ -477,7 +477,7 @@ TQStringList KCharsets::availableEncodingNames()
     TQStringList available;
     for ( const char* const* pos = charsets_for_encoding; *pos; ++pos ) {
         //kdDebug(0) << *charsets << " available" << endl;
-        available.append( TQString::tqfromLatin1( *pos ));
+        available.append( TQString::fromLatin1( *pos ));
     }
     return available;
 }
@@ -491,14 +491,14 @@ TQString KCharsets::languageForEncoding( const TQString &encoding )
 
 TQString KCharsets::encodingForName( const TQString &descriptiveName )
 {
-    const int left = descriptiveName.tqfindRev( '(' );
+    const int left = descriptiveName.findRev( '(' );
     
     if (left<0) // No parenthesis, so assume it is a normal encoding name
 	return descriptiveName.stripWhiteSpace();
     
     TQString name(descriptiveName.mid(left+1));
     
-    const int right = name.tqfindRev( ')' );
+    const int right = name.findRev( ')' );
     
     if (right<0) 
         return name;
@@ -511,7 +511,7 @@ TQStringList KCharsets::descriptiveEncodingNames()
     // As we are sorting, we can directly read the array language_for_encoding
     TQStringList encodings;
     for ( const LanguageForEncoding* pos = language_for_encoding; pos->index; ++pos ) {
-        const TQString name = TQString::tqfromLatin1( pos->index );
+        const TQString name = TQString::fromLatin1( pos->index );
         const TQString description = i18n( language_names[ pos->data ] );
         encodings.append( i18n("Descriptive Encoding Name", "%1 ( %2 )"). arg ( description ). arg( name ) );
     }
@@ -536,7 +536,7 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const
 
     if (n.isEmpty()) {
         codec = KGlobal::locale()->codecForEncoding();
-        d->codecForNameDict.tqreplace("->locale<-", codec);
+        d->codecForNameDict.replace("->locale<-", codec);
         return codec;
     }
 
@@ -553,7 +553,7 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const
     codec = TQTextCodec::codecForName(name);
 
     if(codec) {
-        d->codecForNameDict.tqreplace(key, codec);
+        d->codecForNameDict.replace(key, codec);
         return codec;
     }
 
@@ -566,14 +566,14 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const
 
     if(codec)
     {
-        d->codecForNameDict.tqreplace(key, codec);
+        d->codecForNameDict.replace(key, codec);
         return codec;
     }
 
     TQString dir;
     {
     KConfigGroupSaver cfgsav( KGlobal::config(), "i18n" );
-    dir = KGlobal::config()->readPathEntry("i18ndir", TQString::tqfromLatin1("/usr/share/i18n/charmaps"));
+    dir = KGlobal::config()->readPathEntry("i18ndir", TQString::fromLatin1("/usr/share/i18n/charmaps"));
     }
 
     // these are codecs not included in Qt. They can be build up if the corresponding charmap
@@ -584,8 +584,8 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const
         cname = name;
     cname = cname.upper();
 
-    const TQString basicName = TQString::tqfromLatin1(cname);
-    kdDebug() << k_funcinfo << endl << " Trying to tqfind " << cname << " in " << dir << endl;
+    const TQString basicName = TQString::fromLatin1(cname);
+    kdDebug() << k_funcinfo << endl << " Trying to find " << cname << " in " << dir << endl;
     
     TQString charMapFileName;
     bool gzipped = false; 
@@ -603,7 +603,7 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const
     else {
         // Check if we are asking a code page
         // If yes, then check "CP99999" and "IBM99999"
-        // First we need to tqfind the number of the codepage
+        // First we need to find the number of the codepage
         TQRegExp regexp("^(X-)?(CP|IBM)(-| )?(0-9)+");
         if ( regexp.search(basicName) != -1) {
             const TQString num = regexp.cap(4);
@@ -642,7 +642,7 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const
     }
 
     if(codec) {
-        d->codecForNameDict.tqreplace(key, codec);
+        d->codecForNameDict.replace(key, codec);
         return codec;
     }
 
@@ -654,7 +654,7 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const
         codec = TQTextCodec::codecForName(cname);
 
     if(codec) {
-        d->codecForNameDict.tqreplace(key, codec);
+        d->codecForNameDict.replace(key, codec);
         return codec;
     }
 
diff --git a/kdecore/kcharsets.h b/kdecore/kcharsets.h
index c8b82eea0..32c91148a 100644
--- a/kdecore/kcharsets.h
+++ b/kdecore/kcharsets.h
@@ -66,7 +66,7 @@ public:
     TQTextCodec *codecForName(const TQString &name) const;
 
     /**
-     * Tries to tqfind a TQTextCodec to convert the given encoding from and to
+     * Tries to find a TQTextCodec to convert the given encoding from and to
      * Unicode. If no codec could be found the latin1 codec will be returned an
      * @p ok will be set to false.
      * @return the TQTextCodec. If the desired codec could not be found,
@@ -82,7 +82,7 @@ public:
      */
     static TQChar fromEntity(const TQString &str);
     /**
-     * Overloaded member function. Tries to tqfind an entity in the
+     * Overloaded member function. Tries to find an entity in the
      * TQString str.
      * @param str the string containing entified
      * @param len is a return value, that gives the length of the decoded
diff --git a/kdecore/kcheckaccelerators.cpp b/kdecore/kcheckaccelerators.cpp
index 771e0e619..7b1d3621b 100644
--- a/kdecore/kcheckaccelerators.cpp
+++ b/kdecore/kcheckaccelerators.cpp
@@ -66,7 +66,7 @@
  even if the GUI changed (in the latter case, use manual check ). Automatic
  checks can be anytime disabled by the checkbox in the dialog presenting
  the results of the check. If you set 'AlwaysShowCheckAccelerators' to true,
- the dialog will be shown even if the automatic check didn't tqfind any conflicts,
+ the dialog will be shown even if the automatic check didn't find any conflicts,
  and all submenus will be shown, even those without conflicts.
 
  The dialog first lists the name of the window, then all results for all menus
@@ -147,8 +147,8 @@ void KCheckAccelerators::createDialog(TQWidget *actWin, bool automatic)
     drklash = new TQDialog( actWin, "kapp_accel_check_dlg", false, Qt::WDestructiveClose);
     drklash->setCaption( i18n( "Dr. Klash' Accelerator Diagnosis" ));
     drklash->resize( 500, 460 );
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( drklash, 11, 6 );
-    tqlayout->setAutoAdd( true );
+    TQVBoxLayout* layout = new TQVBoxLayout( drklash, 11, 6 );
+    layout->setAutoAdd( true );
     drklash_view = new TQTextView( drklash );
     TQCheckBox* disableAutoCheck = NULL;
     if( automatic )  {
@@ -173,7 +173,7 @@ void KCheckAccelerators::slotDisableCheck(bool on)
 
 void KCheckAccelerators::checkAccelerators( bool automatic )
 {
-    TQWidget* actWin = tqApp->activeWindow();
+    TQWidget* actWin = qApp->activeWindow();
     if ( !actWin )
         return;
 
diff --git a/kdecore/kcheckaccelerators.h b/kdecore/kcheckaccelerators.h
index ce10b31bb..f6a5b7223 100644
--- a/kdecore/kcheckaccelerators.h
+++ b/kdecore/kcheckaccelerators.h
@@ -54,7 +54,7 @@ class TQTextView;
  even if the GUI changed (in the latter case, use manual check ). Automatic
  checks can be anytime disabled by the checkbox in the dialog presenting
  the results of the check. If you set 'AlwaysShowCheckAccelerators' to true,
- the dialog will be shown even if the automatic check didn't tqfind any conflicts,
+ the dialog will be shown even if the automatic check didn't find any conflicts,
  and all submenus will be shown, even those without conflicts.
 
  The dialog first lists the name of the window, then all results for all menus
@@ -63,7 +63,7 @@ class TQTextView;
  there are shown all conflicts grouped by accelerator, and a list of all used
  accelerators.
 */
-class KDECORE_EXPORT KCheckAccelerators : public TQObject
+class KDECORE_EXPORT KCheckAccelerators : public QObject
 {
     Q_OBJECT
 public:
diff --git a/kdecore/kclipboard.cpp b/kdecore/kclipboard.cpp
index 0e17aec0c..50073cc6a 100644
--- a/kdecore/kclipboard.cpp
+++ b/kdecore/kclipboard.cpp
@@ -56,7 +56,7 @@ public:
             while ( (format = src->format( i++ )) )
             {
                 byteArray = new TQByteArray();
-                *byteArray = src->tqencodedData( format ).copy();
+                *byteArray = src->encodedData( format ).copy();
                 m_data.append( byteArray );
                 m_formats.append( format );
             }
@@ -72,11 +72,11 @@ public:
             return 0L;
     }
     virtual bool provides( const char *mimeType ) const {
-        return ( m_formats.tqfind( mimeType ) > -1 );
+        return ( m_formats.find( mimeType ) > -1 );
     }
-    virtual TQByteArray tqencodedData( const char *format ) const
+    virtual TQByteArray encodedData( const char *format ) const
     {
-        int index = m_formats.tqfind( format );
+        int index = m_formats.find( format );
         if ( index > -1 )
             return *(m_data.at( index ));
 
@@ -97,7 +97,7 @@ bool KClipboardSynchronizer::s_blocked = false;
 KClipboardSynchronizer * KClipboardSynchronizer::self()
 {
     if ( !s_self )
-        s_self = new KClipboardSynchronizer( TQT_TQOBJECT(kapp), "KDE Clipboard" );
+        s_self = new KClipboardSynchronizer( kapp, "KDE Clipboard" );
 
     return s_self;
 }
diff --git a/kdecore/kclipboard.h b/kdecore/kclipboard.h
index aecfccf52..593164f54 100644
--- a/kdecore/kclipboard.h
+++ b/kdecore/kclipboard.h
@@ -33,7 +33,7 @@
  * @since 3.1
  * @internal
  */
-class KDECORE_EXPORT KClipboardSynchronizer : public TQObject
+class KDECORE_EXPORT KClipboardSynchronizer : public QObject
 {
     Q_OBJECT
 
diff --git a/kdecore/kcmdlineargs.cpp b/kdecore/kcmdlineargs.cpp
index 1664c15dd..9600da39c 100644
--- a/kdecore/kcmdlineargs.cpp
+++ b/kdecore/kcmdlineargs.cpp
@@ -63,7 +63,7 @@ public:
      : TQAsciiDict<TQCString>( 7 ) { }
 
    // WABA: Huh?
-   // The compiler doesn't tqfind KCmdLineParsedOptions::write(s) by itself ???
+   // The compiler doesn't find KCmdLineParsedOptions::write(s) by itself ???
    // WABA: No, because there is another write function that hides the
    // write function in the base class even though this function has a
    // different signature. (obscure C++ feature)
@@ -352,7 +352,7 @@ void KCmdLineArgs::removeArgs(const char *id)
  *  +4 - no more options follow         // !fork
  */
 static int
-tqfindOption(const KCmdLineOptions *options, TQCString &opt,
+findOption(const KCmdLineOptions *options, TQCString &opt,
            const char *&opt_name, const char *&def, bool &enabled)
 {
    int result;
@@ -393,7 +393,7 @@ tqfindOption(const KCmdLineOptions *options, TQCString &opt,
                if (!options->name)
                   return result+0;
                TQCString nextOption = options->name;
-               int p = nextOption.tqfind(' ');
+               int p = nextOption.find(' ');
                if (p > 0)
                   nextOption = nextOption.left(p);
                if (nextOption[0] == '!')
@@ -403,7 +403,7 @@ tqfindOption(const KCmdLineOptions *options, TQCString &opt,
                   nextOption = nextOption.mid(2);
                   enabled = !enabled;
                }
-               result = tqfindOption(options, nextOption, opt_name, def, enabled);
+               result = findOption(options, nextOption, opt_name, def, enabled);
                assert(result);
                opt = nextOption;
                return result;
@@ -426,13 +426,13 @@ tqfindOption(const KCmdLineOptions *options, TQCString &opt,
 
 
 void
-KCmdLineArgs::tqfindOption(const char *_opt, TQCString opt, int &i, bool _enabled, bool &moreOptions)
+KCmdLineArgs::findOption(const char *_opt, TQCString opt, int &i, bool _enabled, bool &moreOptions)
 {
    KCmdLineArgs *args = argsList->first();
    const char *opt_name;
    const char *def;
    TQCString argument;
-   int j = opt.tqfind('=');
+   int j = opt.find('=');
    if (j != -1)
    {
       argument = opt.mid(j+1);
@@ -444,7 +444,7 @@ KCmdLineArgs::tqfindOption(const char *_opt, TQCString opt, int &i, bool _enable
    while (args)
    {
       enabled = _enabled;
-      result = ::tqfindOption(args->options, opt, opt_name, def, enabled);
+      result = ::findOption(args->options, opt, opt_name, def, enabled);
       if (result) break;
       args = argsList->next();
    }
@@ -461,7 +461,7 @@ KCmdLineArgs::tqfindOption(const char *_opt, TQCString opt, int &i, bool _enable
          while (args)
          {
             enabled = _enabled;
-            result = ::tqfindOption(args->options, singleCharOption, opt_name, def, enabled);
+            result = ::findOption(args->options, singleCharOption, opt_name, def, enabled);
             if (result) break;
             args = argsList->next();
          }
@@ -646,7 +646,7 @@ KCmdLineArgs::parseAllArgs()
               option += 2;
               enabled = false;
            }
-           tqfindOption(orig, option, i, enabled, inOptions);
+           findOption(orig, option, i, enabled, inOptions);
          }
       }
       else
@@ -858,7 +858,7 @@ KCmdLineArgs::usage(const char *id)
      bool hasOptions = false;
      TQString optionsHeader;
      if (args->name)
-        optionsHeader = optionHeaderString.arg(i18n("%1 options").arg(TQString::tqfromLatin1(args->name)));
+        optionsHeader = optionHeaderString.arg(i18n("%1 options").arg(TQString::fromLatin1(args->name)));
      else
         optionsHeader = i18n("\nOptions:\n");
 
@@ -1081,9 +1081,9 @@ KCmdLineArgs::setOption(const TQCString &opt, bool enabled)
    }
 
    if (enabled)
-      parsedOptionList->tqreplace( opt, new TQCString("t") );
+      parsedOptionList->replace( opt, new TQCString("t") );
    else
-      parsedOptionList->tqreplace( opt, new TQCString("f") );
+      parsedOptionList->replace( opt, new TQCString("f") );
 }
 
 void
@@ -1119,7 +1119,7 @@ KCmdLineArgs::getOption(const char *_opt) const
    TQCString *value = 0;
    if (parsedOptionList)
    {
-      value = parsedOptionList->tqfind(_opt);
+      value = parsedOptionList->find(_opt);
    }
 
    if (value)
@@ -1130,7 +1130,7 @@ KCmdLineArgs::getOption(const char *_opt) const
    const char *def;
    bool dummy = true;
    TQCString opt = _opt;
-   int result = ::tqfindOption( options, opt, opt_name, def, dummy) & ~4;
+   int result = ::findOption( options, opt, opt_name, def, dummy) & ~4;
 
    if (result != 3)
    {
@@ -1183,7 +1183,7 @@ KCmdLineArgs::isSet(const char *_opt) const
    const char *def;
    bool dummy = true;
    TQCString opt = _opt;
-   int result = ::tqfindOption( options, opt, opt_name, def, dummy) & ~4;
+   int result = ::findOption( options, opt, opt_name, def, dummy) & ~4;
 
    if (result == 0)
    {
@@ -1199,7 +1199,7 @@ KCmdLineArgs::isSet(const char *_opt) const
    TQCString *value = 0;
    if (parsedOptionList)
    {
-      value = parsedOptionList->tqfind(opt);
+      value = parsedOptionList->find(opt);
    }
 
    if (value)
diff --git a/kdecore/kcmdlineargs.h b/kdecore/kcmdlineargs.h
index aeb28528e..b4386c629 100644
--- a/kdecore/kcmdlineargs.h
+++ b/kdecore/kcmdlineargs.h
@@ -263,7 +263,7 @@ public:
    * Initialize class.
    *
    * This function should be called as the very first thing in
-   *  your application. It uses KAboutData to tqreplace some of the
+   *  your application. It uses KAboutData to replace some of the
    *  arguments that would otherwise be required.
    *
    * @param _argc As passed to @p main(...).
@@ -571,7 +571,7 @@ private:
    *
    * Checks what to do with a single option
    */
-  static void tqfindOption(const char *_opt, TQCString opt, int &i, bool enabled, bool &moreOptions);
+  static void findOption(const char *_opt, TQCString opt, int &i, bool enabled, bool &moreOptions);
 
   /**
    * @internal
diff --git a/kdecore/kcompletion.cpp b/kdecore/kcompletion.cpp
index c5db551ab..84a4cfca2 100644
--- a/kdecore/kcompletion.cpp
+++ b/kdecore/kcompletion.cpp
@@ -149,8 +149,8 @@ void KCompletion::addWeightedItem( const TQString& item )
     uint len = item.length();
     uint weight = 0;
 
-    // tqfind out the weighting of this item (appended to the string as ":num")
-    int index = item.tqfindRev(':');
+    // find out the weighting of this item (appended to the string as ":num")
+    int index = item.findRev(':');
     if ( index > 0 ) {
         bool ok;
         weight = item.mid( index + 1 ).toUInt( &ok );
@@ -206,7 +206,7 @@ TQString KCompletion::makeCompletion( const TQString& string )
         // on d->matches here would interfere with call to
         // postProcessMatch() during rotation
     
-        tqfindAllCompletions( string, &d->matches, myHasMultipleMatches );
+        findAllCompletions( string, &d->matches, myHasMultipleMatches );
         TQStringList l = d->matches.list();
         postProcessMatches( &l );
         emit matches( l );
@@ -221,12 +221,12 @@ TQString KCompletion::makeCompletion( const TQString& string )
     // in case-insensitive popup mode, we search all completions at once
     if ( myCompletionMode == KGlobalSettings::CompletionPopup ||
          myCompletionMode == KGlobalSettings::CompletionPopupAuto ) {
-        tqfindAllCompletions( string, &d->matches, myHasMultipleMatches );
+        findAllCompletions( string, &d->matches, myHasMultipleMatches );
         if ( !d->matches.isEmpty() )
             completion = d->matches.first();
     }
     else
-        completion = tqfindCompletion( string );
+        completion = findCompletion( string );
 
     if ( myHasMultipleMatches )
         emit multipleMatches();
@@ -274,7 +274,7 @@ TQStringList KCompletion::substringCompletion( const TQString& string ) const
 
     for( ; it != list.end(); ++it ) {
         TQString item = *it;
-        if ( item.tqfind( string, 0, false ) != -1 ) { // always case insensitive
+        if ( item.find( string, 0, false ) != -1 ) { // always case insensitive
             matches.append( item );
         }
     }
@@ -300,7 +300,7 @@ TQStringList KCompletion::allMatches()
     // postProcessMatch() during rotation
     KCompletionMatchesWrapper matches( myOrder == Weighted );
     bool dummy;
-    tqfindAllCompletions( myLastString, &matches, dummy );
+    findAllCompletions( myLastString, &matches, dummy );
     TQStringList l = matches.list();
     postProcessMatches( &l );
     return l;
@@ -313,7 +313,7 @@ KCompletionMatches KCompletion::allWeightedMatches()
     // postProcessMatch() during rotation
     KCompletionMatchesWrapper matches( myOrder == Weighted );
     bool dummy;
-    tqfindAllCompletions( myLastString, &matches, dummy );
+    findAllCompletions( myLastString, &matches, dummy );
     KCompletionMatches ret( matches );
     postProcessMatches( &ret );
     return ret;
@@ -323,7 +323,7 @@ TQStringList KCompletion::allMatches( const TQString &string )
 {
     KCompletionMatchesWrapper matches( myOrder == Weighted );
     bool dummy;
-    tqfindAllCompletions( string, &matches, dummy );
+    findAllCompletions( string, &matches, dummy );
     TQStringList l = matches.list();
     postProcessMatches( &l );
     return l;
@@ -333,7 +333,7 @@ KCompletionMatches KCompletion::allWeightedMatches( const TQString &string )
 {
     KCompletionMatchesWrapper matches( myOrder == Weighted );
     bool dummy;
-    tqfindAllCompletions( string, &matches, dummy );
+    findAllCompletions( string, &matches, dummy );
     KCompletionMatches ret( matches );
     postProcessMatches( &ret );
     return ret;
@@ -349,7 +349,7 @@ TQString KCompletion::nextMatch()
     myLastMatch = myCurrentMatch;
 
     if ( d->matches.isEmpty() ) {
-        tqfindAllCompletions( myLastString, &d->matches, myHasMultipleMatches );
+        findAllCompletions( myLastString, &d->matches, myHasMultipleMatches );
         completion = d->matches.first();
         myCurrentMatch = completion;
         myRotationIndex = 0;
@@ -382,7 +382,7 @@ TQString KCompletion::previousMatch()
     myLastMatch = myCurrentMatch;
 
     if ( d->matches.isEmpty() ) {
-        tqfindAllCompletions( myLastString, &d->matches, myHasMultipleMatches );
+        findAllCompletions( myLastString, &d->matches, myHasMultipleMatches );
         completion = d->matches.last();
         myCurrentMatch = completion;
         myRotationIndex = 0;
@@ -411,16 +411,16 @@ TQString KCompletion::previousMatch()
 
 
 // tries to complete "string" from the tree-root
-TQString KCompletion::tqfindCompletion( const TQString& string )
+TQString KCompletion::findCompletion( const TQString& string )
 {
     TQChar ch;
     TQString completion;
     const KCompTreeNode *node = myTreeRoot;
 
-    // start at the tree-root and try to tqfind the search-string
+    // start at the tree-root and try to find the search-string
     for( uint i = 0; i < string.length(); i++ ) {
         ch = string.at( i );
-        node = node->tqfind( ch );
+        node = node->find( ch );
 
         if ( node )
             completion += ch;
@@ -438,7 +438,7 @@ TQString KCompletion::tqfindCompletion( const TQString& string )
             completion += *node;
     }
     // if multiple matches and auto-completion mode
-    // -> tqfind the first complete match
+    // -> find the first complete match
     if ( node && node->childrenCount() > 1 ) {
         myHasMultipleMatches = true;
     
@@ -453,7 +453,7 @@ TQString KCompletion::tqfindCompletion( const TQString& string )
                 }
             }
             else {
-                // don't just tqfind the "first" match, but the one with the
+                // don't just find the "first" match, but the one with the
                 // highest priority
         
                 const KCompTreeNode* temp_node = 0L;
@@ -463,7 +463,7 @@ TQString KCompletion::tqfindCompletion( const TQString& string )
                     uint weight = temp_node->weight();
                     const KCompTreeNode* hit = temp_node;
                     for( int i = 1; i < count; i++ ) {
-                        temp_node = node->tqchildAt(i);
+                        temp_node = node->childAt(i);
                         if( temp_node->weight() > weight ) {
                             hit = temp_node;
                             weight = hit->weight();
@@ -487,11 +487,11 @@ TQString KCompletion::tqfindCompletion( const TQString& string )
 }
 
 
-void KCompletion::tqfindAllCompletions(const TQString& string,
+void KCompletion::findAllCompletions(const TQString& string,
                                      KCompletionMatchesWrapper *matches,
                                      bool& hasMultipleMatches) const
 {
-    //kdDebug(0) << "*** tqfinding all completions for " << string << endl;
+    //kdDebug(0) << "*** finding all completions for " << string << endl;
 
     if ( string.isEmpty() )
         return;
@@ -506,10 +506,10 @@ void KCompletion::tqfindAllCompletions(const TQString& string,
     TQString completion;
     const KCompTreeNode *node = myTreeRoot;
 
-    // start at the tree-root and try to tqfind the search-string
+    // start at the tree-root and try to find the search-string
     for( uint i = 0; i < string.length(); i++ ) {
         ch = string.at( i );
-        node = node->tqfind( ch );
+        node = node->find( ch );
 
         if ( node )
             completion += ch;
@@ -535,7 +535,7 @@ void KCompletion::tqfindAllCompletions(const TQString& string,
 
     else {
         // node has more than one child
-        // -> recursively tqfind all remaining completions
+        // -> recursively find all remaining completions
         hasMultipleMatches = true;
         extractStringsFromNode( node, completion, matches );
     }
@@ -579,7 +579,7 @@ void KCompletion::extractStringsFromNode( const KCompTreeNode *node,
             matches->append( node->weight(), string );
         }
 
-        // recursively tqfind all other strings.
+        // recursively find all other strings.
         if ( node && node->childrenCount() > 1 )
             extractStringsFromNode( node, string, matches, addWeight );
     }
@@ -599,19 +599,19 @@ void KCompletion::extractStringsFromNodeCI( const KCompTreeNode *node,
     TQString newRest = restString.mid(1);
     KCompTreeNode *child1, *child2;
 
-    child1 = node->tqfind( ch1 ); // the correct match
+    child1 = node->find( ch1 ); // the correct match
     if ( child1 )
         extractStringsFromNodeCI( child1, beginning + *child1, newRest,
                                   matches );
 
     // append the case insensitive matches, if available
     if ( ch1.isLetter() ) {
-        // tqfind out if we have to lower or upper it. Is there a better way?
+        // find out if we have to lower or upper it. Is there a better way?
         TQChar ch2 = ch1.lower();
         if ( ch1 == ch2 )
             ch2 = ch1.upper();
         if ( ch1 != ch2 ) {
-            child2 = node->tqfind( ch2 );
+            child2 = node->find( ch2 );
             if ( child2 )
                 extractStringsFromNodeCI( child2, beginning + *child2, newRest,
                                           matches );
@@ -628,19 +628,19 @@ void KCompletion::doBeep( BeepMode mode ) const
 
     switch ( mode ) {
         case Rotation:
-            event = TQString::tqfromLatin1("Textcompletion: rotation");
+            event = TQString::fromLatin1("Textcompletion: rotation");
             text = i18n("You reached the end of the list\nof matching items.\n");
             break;
         case PartialMatch:
             if ( myCompletionMode == KGlobalSettings::CompletionShell ||
                  myCompletionMode == KGlobalSettings::CompletionMan ) {
-                event = TQString::tqfromLatin1("Textcompletion: partial match");
+                event = TQString::fromLatin1("Textcompletion: partial match");
                 text = i18n("The completion is ambiguous, more than one\nmatch is available.\n");
             }
             break;
         case NoMatch:
             if ( myCompletionMode == KGlobalSettings::CompletionShell ) {
-                event = TQString::tqfromLatin1("Textcompletion: no match");
+                event = TQString::fromLatin1("Textcompletion: no match");
                 text = i18n("There is no matching item available.\n");
             }
             break;
@@ -676,7 +676,7 @@ KCompTreeNode::~KCompTreeNode()
 // it will not be created. Returns the new/existing node.
 KCompTreeNode * KCompTreeNode::insert( const TQChar& ch, bool sorted )
 {
-    KCompTreeNode *child = tqfind( ch );
+    KCompTreeNode *child = find( ch );
     if ( !child ) {
         child = new KCompTreeNode( ch );
 
@@ -725,7 +725,7 @@ void KCompTreeNode::remove( const TQString& str )
     uint i = 0;
     for ( ; i < string.length(); i++ )
     {
-        child = parent->tqfind( string.at( i ) );
+        child = parent->find( string.at( i ) );
         if ( child )
             deletables.insert( i + 1, child );
         else
diff --git a/kdecore/kcompletion.h b/kdecore/kcompletion.h
index 15c6ca288..95198cdb0 100644
--- a/kdecore/kcompletion.h
+++ b/kdecore/kcompletion.h
@@ -119,7 +119,7 @@ class TQPopupMenu;
  * tell the user) where a completion comes from.
  *
  * Note: KCompletion does not work with strings that contain 0x0 characters
- *       (tqunicode nul), as this is used internally as a delimiter.
+ *       (unicode nul), as this is used internally as a delimiter.
  *
  * You may inherit from KCompletion and override makeCompletion() in
  * special cases (like reading directories/urls and then supplying the
@@ -129,7 +129,7 @@ class TQPopupMenu;
  *
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class KDECORE_EXPORT KCompletion : public TQObject
+class KDECORE_EXPORT KCompletion : public QObject
 {
     Q_ENUMS( CompOrder )
     Q_PROPERTY( CompOrder order READ order WRITE setOrder )
@@ -160,7 +160,7 @@ public:
     virtual ~KCompletion();
 
     /**
-     * Attempts to tqfind an item in the list of available completions,
+     * Attempts to find an item in the list of available completions,
      * that begins with @p string. Will either return the first matching item
      * (if there is more than one match) or TQString::null, if no match was
      * found.
@@ -244,7 +244,7 @@ public:
     TQStringList items() const;
     
     /**
-     * Returns true when the completion object tqcontains no entries.
+     * Returns true when the completion object contains no entries.
      */
     bool isEmpty() const;
 
@@ -354,7 +354,7 @@ public:
 
     /**
      * Enables/disables playing a sound when
-     * @li makeCompletion() can't tqfind a match
+     * @li makeCompletion() can't find a match
      * @li there is a partial completion (= multiple matches in
      *     Shell-completion mode)
      * @li nextMatch() or previousMatch() hit the last possible
@@ -553,8 +553,8 @@ protected:
 
 private:
     void            addWeightedItem( const TQString& );
-    TQString         tqfindCompletion( const TQString& string );
-    void            tqfindAllCompletions( const TQString&,
+    TQString         findCompletion( const TQString& string );
+    void            findAllCompletions( const TQString&,
                                         KCompletionMatchesWrapper *matches,
                                         bool& hasMultipleMatches ) const;
 
@@ -829,7 +829,7 @@ public:
      *
      * @param mode Completion type:
      *   @li CompletionNone:  Disables completion feature.
-     *   @li CompletionAuto:  Attempts to tqfind a match &
+     *   @li CompletionAuto:  Attempts to find a match &
      *                        fills-in the remaining text.
      *   @li CompletionMan:   Acts the same as the above
      *                        except the action has to be
@@ -892,7 +892,7 @@ public:
      *
      * This methods returns the key-binding used to activate
      * the feature feature given by @p item.  If the binding
-     * tqcontains modifier key(s), the SUM of the modifier key
+     * contains modifier key(s), the SUM of the modifier key
      * and the actual key code are returned.
      *
      * @param item the item to check
diff --git a/kdecore/kcompletion_private.h b/kdecore/kcompletion_private.h
index 6b7151341..35c846593 100644
--- a/kdecore/kcompletion_private.h
+++ b/kdecore/kcompletion_private.h
@@ -99,7 +99,7 @@ public:
 
     // Returns a child of this node matching ch, if available.
     // Otherwise, returns 0L
-    inline KCompTreeNode * tqfind( const TQChar& ch ) const {
+    inline KCompTreeNode * find( const TQChar& ch ) const {
       KCompTreeNode * cur = myChildren.begin();
       while (cur && (*cur != ch)) cur = cur->next;
       return cur;
@@ -118,7 +118,7 @@ public:
     inline const KCompTreeChildren * children() const {
 	return &myChildren;
     }
-    inline const KCompTreeNode * tqchildAt(int index) const {
+    inline const KCompTreeNode * childAt(int index) const {
 	return myChildren.at(index);
     }
     inline const KCompTreeNode * firstChild() const {
diff --git a/kdecore/kcompletionbase.cpp b/kdecore/kcompletionbase.cpp
index 019f4ec6b..9e7f6d746 100644
--- a/kdecore/kcompletionbase.cpp
+++ b/kdecore/kcompletionbase.cpp
@@ -123,7 +123,7 @@ bool KCompletionBase::setKeyBinding( KeyBindingType item, const KShortcut& cut )
         for( KeyBindingMap::Iterator it = m_keyMap.begin(); it != m_keyMap.end(); ++it )
             if( it.data() == cut )  return false;
     }
-    m_keyMap.tqreplace( item, cut );
+    m_keyMap.replace( item, cut );
     return true;
 }
 
diff --git a/kdecore/kconfig.cpp b/kdecore/kconfig.cpp
index 3dfb018b9..2531034ee 100644
--- a/kdecore/kconfig.cpp
+++ b/kdecore/kconfig.cpp
@@ -144,7 +144,7 @@ TQMap<TQString, TQString> KConfig::entryMap(const TQString &pGroup) const
   KEntryKey groupKey( pGroup_utf, 0 );
   TQMap<TQString, TQString> tmpMap;
 
-  KEntryMapConstIterator aIt = aEntryMap.tqfind(groupKey);
+  KEntryMapConstIterator aIt = aEntryMap.find(groupKey);
   if (aIt == aEntryMap.end())
      return tmpMap;
   ++aIt; // advance past special group entry marker
@@ -183,7 +183,7 @@ KEntryMap KConfig::internalEntryMap(const TQString &pGroup) const
   KEntryKey aKey(pGroup_utf, 0);
   KEntryMap tmpEntryMap;
 
-  aIt = aEntryMap.tqfind(aKey);
+  aIt = aEntryMap.find(aKey);
   if (aIt == aEntryMap.end()) {
     // the special group key is not in the map,
     // so it must be an invalid group.  Return
@@ -215,7 +215,7 @@ void KConfig::putData(const KEntryKey &_key, const KEntry &_data, bool _checkGro
   if (bGroupImmutable && !_key.bDefault)
     return;
 
-  // now either add or tqreplace the data
+  // now either add or replace the data
   KEntry &entry = aEntryMap[_key];
   bool immutable = entry.bImmutable;
   if (immutable && !_key.bDefault)
@@ -237,7 +237,7 @@ void KConfig::putData(const KEntryKey &_key, const KEntry &_data, bool _checkGro
 
 KEntry KConfig::lookupData(const KEntryKey &_key) const
 {
-  KEntryMapConstIterator aIt = aEntryMap.tqfind(_key);
+  KEntryMapConstIterator aIt = aEntryMap.find(_key);
   if (aIt != aEntryMap.end())
   {
     const KEntry &entry = *aIt;
@@ -255,7 +255,7 @@ bool KConfig::internalHasGroup(const TQCString &group) const
 {
   KEntryKey groupKey( group, 0);
 
-  KEntryMapConstIterator aIt = aEntryMap.tqfind(groupKey);
+  KEntryMapConstIterator aIt = aEntryMap.find(groupKey);
   KEntryMapConstIterator aEnd = aEntryMap.end();
 
   if (aIt == aEnd)
@@ -290,7 +290,7 @@ void KConfig::checkUpdate(const TQString &id, const TQString &updateFile)
   setGroup("$Version");
   TQString cfg_id = updateFile+":"+id;
   TQStringList ids = readListEntry("update_info");
-  if (!ids.tqcontains(cfg_id))
+  if (!ids.contains(cfg_id))
   {
      TQStringList args;
      args << "--check" << updateFile;
diff --git a/kdecore/kconfig.h b/kdecore/kconfig.h
index 9ace7ebb9..19ff09314 100644
--- a/kdecore/kconfig.h
+++ b/kdecore/kconfig.h
@@ -136,7 +136,7 @@ public:
   bool forceGlobal() const { return bForceGlobal; }
 
   /**
-   * Checks whether the config file tqcontains the update @p id
+   * Checks whether the config file contains the update @p id
    * as contained in @p updateFile. If not, it runs kconf_update
    * to update the config file.
    *
@@ -215,9 +215,9 @@ protected:
    * Inserts a (key, value) pair into the internal storage mechanism of
    * the configuration object.
    *
-   * @param _key The key to insert.  It tqcontains information both on
+   * @param _key The key to insert.  It contains information both on
    *        the group of the key and the key itself. If the key already
-   *        exists, the old value will be tqreplaced.
+   *        exists, the old value will be replaced.
    * @param _data the KEntry that is to be stored.
    * @param _checkGroup When false, assume that the group already exists.
    */
@@ -226,7 +226,7 @@ protected:
   /**
    * Looks up an entry in the config object's internal structure.
    *
-   * @param _key The key to look up  It tqcontains information both on
+   * @param _key The key to look up  It contains information both on
    *        the group of the key and the entry's key itself.
    * @return the KEntry value (data) found for the key.  KEntry.aValue
    * will be the null string if nothing was located.
diff --git a/kdecore/kconfig_compiler/README.dox b/kdecore/kconfig_compiler/README.dox
index e6eea660d..36d9f988b 100644
--- a/kdecore/kconfig_compiler/README.dox
+++ b/kdecore/kconfig_compiler/README.dox
@@ -11,7 +11,7 @@ configuration data.
 
 The structure of the .kcfg file is described by its DTD kcfg.dtd.
 
-The \<kcfgfile\> tag tqcontains the name of the configuration file described.
+The \<kcfgfile\> tag contains the name of the configuration file described.
 Omitting the name will make the generated class use the default configuration
 file ("<appname>rc").
 
@@ -181,9 +181,9 @@ is always 0.
 A parameterized entry is expanded to a number of entries, one for each
 value in the parameter range. The name and key should contain a reference
 to the parameter in the form of $(parameter-name). When expanding the entries
-the $(parameter-name) part is tqreplaced with the value of the parameter.
-In the case of an Enum parameter it is tqreplaced with the name of the
-enumuration value. In the case of an int parameter it is tqreplaced with
+the $(parameter-name) part is replaced with the value of the parameter.
+In the case of an Enum parameter it is replaced with the name of the
+enumuration value. In the case of an int parameter it is replaced with
 the numeric value of the parameter.
 
 Parameterized entries all share the same default value unless different
diff --git a/kdecore/kconfig_compiler/example/example.kcfg b/kdecore/kconfig_compiler/example/example.kcfg
index c6716ea06..076bfb644 100644
--- a/kdecore/kconfig_compiler/example/example.kcfg
+++ b/kdecore/kconfig_compiler/example/example.kcfg
@@ -35,7 +35,7 @@
     </entry>
     <entry name="MyPath" type="Path">
       <label>This is a path</label>
-      <default code="true">QDir::homeDirPath()+QString::tqfromLatin1(".hidden_file")</default>
+      <default code="true">QDir::homeDirPath()+QString::fromLatin1(".hidden_file")</default>
     </entry>
     <entry name="MyPaths" type="PathList">
       <label>This is a list of paths</label>
diff --git a/kdecore/kconfig_compiler/example/general_base.ui b/kdecore/kconfig_compiler/example/general_base.ui
index 624d50331..9b41370c7 100644
--- a/kdecore/kconfig_compiler/example/general_base.ui
+++ b/kdecore/kconfig_compiler/example/general_base.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>GeneralBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -42,5 +42,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdecore/kconfig_compiler/example/myoptions_base.ui b/kdecore/kconfig_compiler/example/myoptions_base.ui
index ff6a80866..3c0c2e6cb 100644
--- a/kdecore/kconfig_compiler/example/myoptions_base.ui
+++ b/kdecore/kconfig_compiler/example/myoptions_base.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>MyOptionsBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -31,5 +31,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdecore/kconfig_compiler/kconfig_compiler.cpp b/kdecore/kconfig_compiler/kconfig_compiler.cpp
index d82810e48..f11394495 100644
--- a/kdecore/kconfig_compiler/kconfig_compiler.cpp
+++ b/kdecore/kconfig_compiler/kconfig_compiler.cpp
@@ -251,10 +251,10 @@ static void addQuotes( TQString &s )
 static TQString quoteString( const TQString &s )
 {
   TQString r = s;
-  r.tqreplace( "\\", "\\\\" );
-  r.tqreplace( "\"", "\\\"" );
-  r.tqreplace( "\r", "" );
-  r.tqreplace( "\n", "\\n\"\n\"" );
+  r.replace( "\\", "\\\\" );
+  r.replace( "\"", "\\\"" );
+  r.replace( "\r", "" );
+  r.replace( "\n", "\\n\"\n\"" );
   return "\"" + r + "\"";
 }
 
@@ -262,10 +262,10 @@ static TQString literalString( const TQString &s )
 {
   bool isAscii = true;
   for(int i = s.length(); i--;)
-     if (s[i].tqunicode() > 127) isAscii = false;
+     if (s[i].unicode() > 127) isAscii = false;
 
   if (isAscii)
-     return "TQString::tqfromLatin1( " + quoteString(s) + " )";
+     return "TQString::fromLatin1( " + quoteString(s) + " )";
   else
      return "TQString::fromUtf8( " + quoteString(s) + " )";
 }
@@ -284,7 +284,7 @@ static TQString dumpNode(const TQDomNode &node)
 
 static TQString filenameOnly(TQString path)
 {
-   int i = path.tqfindRev('/');
+   int i = path.findRev('/');
    if (i >= 0)
       return path.mid(i+1);
    return path;
@@ -480,13 +480,13 @@ CfgEntry *parseEntry( const TQString &group, const TQDomElement &element )
 
   if ( nameIsEmpty ) {
     name = key;
-    name.tqreplace( " ", TQString::null );
-  } else if ( name.tqcontains( ' ' ) ) {
-    kdWarning()<<"Entry '"<<name<<"' tqcontains spaces! <name> elements can't contain speces!"<<endl;
+    name.replace( " ", TQString::null );
+  } else if ( name.contains( ' ' ) ) {
+    kdWarning()<<"Entry '"<<name<<"' contains spaces! <name> elements can't contain speces!"<<endl;
     name.remove( ' ' );
   }
 
-  if (name.tqcontains("$("))
+  if (name.contains("$("))
   {
     if (param.isEmpty())
     {
@@ -513,7 +513,7 @@ CfgEntry *parseEntry( const TQString &group, const TQDomElement &element )
   {
     // Adjust name
     paramName = name;
-    name.tqreplace("$("+param+")", TQString::null);
+    name.replace("$("+param+")", TQString::null);
     // Lookup defaults for indexed entries
     for(int i = 0; i <= paramMax; i++)
     {
@@ -534,7 +534,7 @@ CfgEntry *parseEntry( const TQString &group, const TQDomElement &element )
         int i = index.toInt(&ok);
         if (!ok)
         {
-          i = paramValues.tqfindIndex(index);
+          i = paramValues.findIndex(index);
           if (i == -1)
           {
             kdError() << "Index '" << index << "' for default value is unknown." << endl;
@@ -568,7 +568,7 @@ CfgEntry *parseEntry( const TQString &group, const TQDomElement &element )
     return 0;
   }
 
-  if (allNames.tqcontains(name))
+  if (allNames.contains(name))
   {
     if (nameIsEmpty)
       kdError() << "The key '" << key << "' can not be used as name for the entry because "
@@ -619,8 +619,8 @@ TQString param( const TQString &type )
     else if ( type == "Bool" )        return "bool";
     else if ( type == "Double" )      return "double";
     else if ( type == "DateTime" )    return "const TQDateTime &";
-    else if ( type == "Int64" )       return "TQ_INT64";
-    else if ( type == "UInt64" )      return "TQ_UINT64";
+    else if ( type == "Int64" )       return "Q_INT64";
+    else if ( type == "UInt64" )      return "Q_UINT64";
     else if ( type == "IntList" )     return "const TQValueList<int> &";
     else if ( type == "Enum" )        return "int";
     else if ( type == "Path" )        return "const TQString &";
@@ -649,8 +649,8 @@ TQString cppType( const TQString &type )
     else if ( type == "Bool" )        return "bool";
     else if ( type == "Double" )      return "double";
     else if ( type == "DateTime" )    return "TQDateTime";
-    else if ( type == "Int64" )       return "TQ_INT64";
-    else if ( type == "UInt64" )      return "TQ_UINT64";
+    else if ( type == "Int64" )       return "Q_INT64";
+    else if ( type == "UInt64" )      return "Q_UINT64";
     else if ( type == "IntList" )     return "TQValueList<int>";
     else if ( type == "Enum" )        return "int";
     else if ( type == "Path" )        return "TQString";
@@ -694,7 +694,7 @@ TQString itemType( const TQString &type )
   TQString t;
 
   t = type;
-  t.tqreplace( 0, 1, t.left( 1 ).upper() );
+  t.replace( 0, 1, t.left( 1 ).upper() );
 
   return t;
 }
@@ -771,7 +771,7 @@ TQString paramString(const TQString &s, const CfgEntry *e, int i)
 {
   TQString result = s;
   TQString needle = "$("+e->param()+")";
-  if (result.tqcontains(needle))
+  if (result.contains(needle))
   {
     TQString tmp;
     if (e->paramType() == "Enum")
@@ -783,7 +783,7 @@ TQString paramString(const TQString &s, const CfgEntry *e, int i)
       tmp = TQString::number(i);
     }
 
-    result.tqreplace(needle, tmp);
+    result.replace(needle, tmp);
   }
   return result;
 }
@@ -796,18 +796,18 @@ TQString paramString(const TQString &group, const TQValueList<Param> &parameters
   for (TQValueList<Param>::ConstIterator it = parameters.begin();
        it != parameters.end(); ++it)
   {
-     if (paramString.tqcontains("$("+(*it).name+")"))
+     if (paramString.contains("$("+(*it).name+")"))
      {
        TQString tmp;
        tmp.sprintf("%%%d", i++);
-       paramString.tqreplace("$("+(*it).name+")", tmp);
+       paramString.replace("$("+(*it).name+")", tmp);
        arguments += ".arg( mParam"+(*it).name+" )";
      }
   }
   if (arguments.isEmpty())
-    return "TQString::tqfromLatin1( \""+group+"\" )";
+    return "TQString::fromLatin1( \""+group+"\" )";
 
-  return "TQString::tqfromLatin1( \""+paramString+"\" )"+arguments;
+  return "TQString::fromLatin1( \""+paramString+"\" )"+arguments;
 }
 
 /* int i is the value of the parameter */
@@ -818,7 +818,7 @@ TQString userTextsFunctions( CfgEntry *e, TQString itemVarStr=TQString::null, TQ
   if ( !e->label().isEmpty() ) {
     txt += "  " + itemVarStr + "->setLabel( i18n(";
     if ( !e->param().isEmpty() )
-      txt += quoteString(e->label().tqreplace("$("+e->param()+")", i));
+      txt += quoteString(e->label().replace("$("+e->param()+")", i));
     else
       txt+= quoteString(e->label());
     txt+= ") );\n";
@@ -826,7 +826,7 @@ TQString userTextsFunctions( CfgEntry *e, TQString itemVarStr=TQString::null, TQ
   if ( !e->whatsThis().isEmpty() ) {
     txt += "  " + itemVarStr + "->setWhatsThis( i18n(";
     if ( !e->param().isEmpty() )
-      txt += quoteString(e->whatsThis().tqreplace("$("+e->param()+")", i));
+      txt += quoteString(e->whatsThis().replace("$("+e->param()+")", i));
     else
       txt+= quoteString(e->whatsThis());
     txt+=") );\n";
@@ -883,12 +883,12 @@ TQString memberMutatorBody( CfgEntry *e )
     out << "}" << endl << endl;
   }
 
-  out << "if (!" << This << "isImmutable( TQString::tqfromLatin1( \"";
+  out << "if (!" << This << "isImmutable( TQString::fromLatin1( \"";
   if (!e->param().isEmpty())
   {
-    out << e->paramName().tqreplace("$("+e->param()+")", "%1") << "\" ).arg( ";
+    out << e->paramName().replace("$("+e->param()+")", "%1") << "\" ).arg( ";
     if ( e->paramType() == "Enum" ) {
-      out << "TQString::tqfromLatin1( ";
+      out << "TQString::fromLatin1( ";
 
       if (globalEnums)
         out << enumName(e->param()) << "ToString[i]";
@@ -1249,7 +1249,7 @@ int main( int argc, char **argv )
     TQString t = e->type();
 
     // Manipulator
-    if (allMutators || mutators.tqcontains(n))
+    if (allMutators || mutators.contains(n))
     {
       h << "    /**" << endl;
       h << "      Set " << e->label() << endl;
@@ -1518,7 +1518,7 @@ int main( int argc, char **argv )
   cpp << " )" << endl;
 
   cpp << "  : " << inherits << "(";
-  if ( !cfgFileName.isEmpty() ) cpp << " TQString::tqfromLatin1( \"" << cfgFileName << "\" ";
+  if ( !cfgFileName.isEmpty() ) cpp << " TQString::fromLatin1( \"" << cfgFileName << "\" ";
   if ( cfgFileNameArg ) cpp << " config ";
   if ( !cfgFileName.isEmpty() ) cpp << ") ";
   cpp << ")" << endl;
@@ -1560,7 +1560,7 @@ int main( int argc, char **argv )
       for( it = choices.begin(); it != choices.end(); ++it ) {
         cpp << "  {" << endl;
         cpp << "    KConfigSkeleton::ItemEnum::Choice choice;" << endl;
-        cpp << "    choice.name = TQString::tqfromLatin1( \"" << (*it).name << "\" );" << endl;
+        cpp << "    choice.name = TQString::fromLatin1( \"" << (*it).name << "\" );" << endl;
         if ( setUserTexts ) {
           if ( !(*it).label.isEmpty() )
             cpp << "    choice.label = i18n(" << quoteString((*it).label) << ");" << endl;
@@ -1592,7 +1592,7 @@ int main( int argc, char **argv )
       cpp << "  addItem( " << itemPath(e);
       TQString quotedName = e->name();
       addQuotes( quotedName );
-      if ( quotedName != key ) cpp << ", TQString::tqfromLatin1( \"" << e->name() << "\" )";
+      if ( quotedName != key ) cpp << ", TQString::fromLatin1( \"" << e->name() << "\" )";
       cpp << " );" << endl;
     }
     else
@@ -1617,15 +1617,15 @@ int main( int argc, char **argv )
         if ( setUserTexts )
           cpp << userTextsFunctions( e, itemVarStr, e->paramName() );
 
-        // Make mutators for enum parameters work by adding them with $(..) tqreplaced by the
+        // Make mutators for enum parameters work by adding them with $(..) replaced by the
         // param name. The check for isImmutable in the set* functions doesn't have the param
         // name available, just the corresponding enum value (int), so we need to store the
         // param names in a separate static list!.
-        cpp << "  addItem( " << itemVarStr << ", TQString::tqfromLatin1( \"";
+        cpp << "  addItem( " << itemVarStr << ", TQString::fromLatin1( \"";
         if ( e->paramType()=="Enum" )
-          cpp << e->paramName().tqreplace( "$("+e->param()+")", "%1").arg(e->paramValues()[i] );
+          cpp << e->paramName().replace( "$("+e->param()+")", "%1").arg(e->paramValues()[i] );
         else
-          cpp << e->paramName().tqreplace( "$("+e->param()+")", "%1").arg(i);
+          cpp << e->paramName().replace( "$("+e->param()+")", "%1").arg(i);
         cpp << "\" ) );" << endl;
       }
     }
@@ -1642,7 +1642,7 @@ int main( int argc, char **argv )
       TQString t = e->type();
   
       // Manipulator
-      if (allMutators || mutators.tqcontains(n))
+      if (allMutators || mutators.contains(n))
       {
         cpp << "void " << setFunction(n, className) << "( ";
         if (!e->param().isEmpty())
diff --git a/kdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp b/kdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp
index 3dd197b34..2f8e7eee3 100644
--- a/kdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp
+++ b/kdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp
@@ -61,7 +61,7 @@ void KConfigCompiler_Test::testExpectedOutput()
 	// Known to pass test cases
 	while (testCases[ i ])
 	{
-		performCompare(TQString::tqfromLatin1(testCases[ i ]));
+		performCompare(TQString::fromLatin1(testCases[ i ]));
 		++i;
 	}
 
@@ -69,7 +69,7 @@ void KConfigCompiler_Test::testExpectedOutput()
 	i= 0;
 	while (willFailCases[ i ])
 	{
-		performCompare(TQString::tqfromLatin1(willFailCases[ i ]), true);
+		performCompare(TQString::fromLatin1(willFailCases[ i ]), true);
 		++i;
 	}
 }
@@ -77,7 +77,7 @@ void KConfigCompiler_Test::testExpectedOutput()
 void KConfigCompiler_Test::performCompare(const TQString &fileName, bool fail)
 {
 	TQFile file(fileName);
-	TQFile fileRef(TQString::tqfromLatin1(SRCDIR) + TQString::tqfromLatin1("/") + fileName + TQString::tqfromLatin1(".ref"));
+	TQFile fileRef(TQString::fromLatin1(SRCDIR) + TQString::fromLatin1("/") + fileName + TQString::fromLatin1(".ref"));
 	
 	if ( file.open(IO_ReadOnly) && fileRef.open(IO_ReadOnly) )
 	{
diff --git a/kdecore/kconfig_compiler/tests/test1.cpp.ref b/kdecore/kconfig_compiler/tests/test1.cpp.ref
index f8c4c1189..b3050921e 100644
--- a/kdecore/kconfig_compiler/tests/test1.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test1.cpp.ref
@@ -4,66 +4,66 @@
 #include "test1.h"
 
 Test1::Test1(  const TQString & transport, const TQString & folder )
-  : KConfigSkeleton( TQString::tqfromLatin1( "examplerc" ) )
+  : KConfigSkeleton( TQString::fromLatin1( "examplerc" ) )
   , mParamtransport(transport)
   , mParamfolder(folder)
 {
-  setCurrentGroup( TQString::tqfromLatin1( "General-%1" ).arg( mParamfolder ) );
+  setCurrentGroup( TQString::fromLatin1( "General-%1" ).arg( mParamfolder ) );
 
   KConfigSkeleton::ItemBool  *itemOneOption;
-  itemOneOption = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "OneOption" ), mOneOption, true );
-  addItem( itemOneOption, TQString::tqfromLatin1( "OneOption" ) );
+  itemOneOption = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "OneOption" ), mOneOption, true );
+  addItem( itemOneOption, TQString::fromLatin1( "OneOption" ) );
   KConfigSkeleton::ItemInt  *itemAnotherOption;
-  itemAnotherOption = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Another Option" ), mAnotherOption, 5 );
-  addItem( itemAnotherOption, TQString::tqfromLatin1( "AnotherOption" ) );
+  itemAnotherOption = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Another Option" ), mAnotherOption, 5 );
+  addItem( itemAnotherOption, TQString::fromLatin1( "AnotherOption" ) );
   TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesListOption;
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "One" );
+    choice.name = TQString::fromLatin1( "One" );
     valuesListOption.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "Two" );
+    choice.name = TQString::fromLatin1( "Two" );
     valuesListOption.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "Three" );
+    choice.name = TQString::fromLatin1( "Three" );
     valuesListOption.append( choice );
   }
   KConfigSkeleton::ItemEnum  *itemListOption;
-  itemListOption = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "ListOption" ), mListOption, valuesListOption, EnumListOption::One );
-  addItem( itemListOption, TQString::tqfromLatin1( "ListOption" ) );
+  itemListOption = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "ListOption" ), mListOption, valuesListOption, EnumListOption::One );
+  addItem( itemListOption, TQString::fromLatin1( "ListOption" ) );
 
-  setCurrentGroup( TQString::tqfromLatin1( "MyOptions" ) );
+  setCurrentGroup( TQString::fromLatin1( "MyOptions" ) );
 
   KConfigSkeleton::ItemString  *itemMyString;
-  itemMyString = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "MyString" ), mMyString, TQString::tqfromLatin1( "Default String" ) );
-  addItem( itemMyString, TQString::tqfromLatin1( "MyString" ) );
+  itemMyString = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "MyString" ), mMyString, TQString::fromLatin1( "Default String" ) );
+  addItem( itemMyString, TQString::fromLatin1( "MyString" ) );
   KConfigSkeleton::ItemPath  *itemMyPath;
-  itemMyPath = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "MyPath" ), mMyPath, TQDir::homeDirPath()+TQString::tqfromLatin1(".hidden_file") );
-  addItem( itemMyPath, TQString::tqfromLatin1( "MyPath" ) );
+  itemMyPath = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "MyPath" ), mMyPath, TQDir::homeDirPath()+TQString::fromLatin1(".hidden_file") );
+  addItem( itemMyPath, TQString::fromLatin1( "MyPath" ) );
   KConfigSkeleton::ItemInt  *itemAnotherOption2;
-  itemAnotherOption2 = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Another Option" ), mAnotherOption2, 10 );
-  addItem( itemAnotherOption2, TQString::tqfromLatin1( "AnotherOption2" ) );
+  itemAnotherOption2 = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Another Option" ), mAnotherOption2, 10 );
+  addItem( itemAnotherOption2, TQString::fromLatin1( "AnotherOption2" ) );
   TQStringList defaultMyStringList;
   defaultMyStringList.append( TQString::fromUtf8( "up" ) );
   defaultMyStringList.append( TQString::fromUtf8( "down" ) );
 
   KConfigSkeleton::ItemStringList  *itemMyStringList;
-  itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::tqfromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList );
-  addItem( itemMyStringList, TQString::tqfromLatin1( "MyStringList" ) );
+  itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList );
+  addItem( itemMyStringList, TQString::fromLatin1( "MyStringList" ) );
   TQStringList defaultMyStringListHidden;
   defaultMyStringListHidden.append( TQString::fromUtf8( "up" ) );
   defaultMyStringListHidden.append( TQString::fromUtf8( "down" ) );
 
   KConfigSkeleton::ItemStringList  *itemMyStringListHidden;
-  itemMyStringListHidden = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::tqfromLatin1( "MyStringListHidden" ), mMyStringListHidden, defaultMyStringListHidden );
-  addItem( itemMyStringListHidden, TQString::tqfromLatin1( "MyStringListHidden" ) );
+  itemMyStringListHidden = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringListHidden" ), mMyStringListHidden, defaultMyStringListHidden );
+  addItem( itemMyStringListHidden, TQString::fromLatin1( "MyStringListHidden" ) );
   KConfigSkeleton::ItemInt  *itemMyNumber;
-  itemMyNumber = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "List-%1-%2" ).arg( mParamtransport ).arg( mParamfolder ), mMyNumber, 1 );
-  addItem( itemMyNumber, TQString::tqfromLatin1( "MyNumber" ) );
+  itemMyNumber = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "List-%1-%2" ).arg( mParamtransport ).arg( mParamfolder ), mMyNumber, 1 );
+  addItem( itemMyNumber, TQString::fromLatin1( "MyNumber" ) );
 }
 
 Test1::~Test1()
diff --git a/kdecore/kconfig_compiler/tests/test1.h.ref b/kdecore/kconfig_compiler/tests/test1.h.ref
index b5a66b5cd..cc2d99c69 100644
--- a/kdecore/kconfig_compiler/tests/test1.h.ref
+++ b/kdecore/kconfig_compiler/tests/test1.h.ref
@@ -24,7 +24,7 @@ class Test1 : public KConfigSkeleton
     */
     void setOneOption( bool v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "OneOption" ) ))
+      if (!isImmutable( TQString::fromLatin1( "OneOption" ) ))
         mOneOption = v;
     }
 
@@ -41,7 +41,7 @@ class Test1 : public KConfigSkeleton
     */
     void setAnotherOption( int v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "AnotherOption" ) ))
+      if (!isImmutable( TQString::fromLatin1( "AnotherOption" ) ))
         mAnotherOption = v;
     }
 
@@ -58,7 +58,7 @@ class Test1 : public KConfigSkeleton
     */
     void setListOption( int v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "ListOption" ) ))
+      if (!isImmutable( TQString::fromLatin1( "ListOption" ) ))
         mListOption = v;
     }
 
@@ -75,7 +75,7 @@ class Test1 : public KConfigSkeleton
     */
     void setMyString( const TQString & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "MyString" ) ))
+      if (!isImmutable( TQString::fromLatin1( "MyString" ) ))
         mMyString = v;
     }
 
@@ -92,7 +92,7 @@ class Test1 : public KConfigSkeleton
     */
     void setMyPath( const TQString & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "MyPath" ) ))
+      if (!isImmutable( TQString::fromLatin1( "MyPath" ) ))
         mMyPath = v;
     }
 
@@ -109,7 +109,7 @@ class Test1 : public KConfigSkeleton
     */
     void setAnotherOption2( int v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "AnotherOption2" ) ))
+      if (!isImmutable( TQString::fromLatin1( "AnotherOption2" ) ))
         mAnotherOption2 = v;
     }
 
@@ -126,7 +126,7 @@ class Test1 : public KConfigSkeleton
     */
     void setMyStringList( const TQStringList & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "MyStringList" ) ))
+      if (!isImmutable( TQString::fromLatin1( "MyStringList" ) ))
         mMyStringList = v;
     }
 
@@ -143,7 +143,7 @@ class Test1 : public KConfigSkeleton
     */
     void setMyStringListHidden( const TQStringList & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "MyStringListHidden" ) ))
+      if (!isImmutable( TQString::fromLatin1( "MyStringListHidden" ) ))
         mMyStringListHidden = v;
     }
 
@@ -160,7 +160,7 @@ class Test1 : public KConfigSkeleton
     */
     void setMyNumber( int v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "MyNumber" ) ))
+      if (!isImmutable( TQString::fromLatin1( "MyNumber" ) ))
         mMyNumber = v;
     }
 
diff --git a/kdecore/kconfig_compiler/tests/test1.kcfg b/kdecore/kconfig_compiler/tests/test1.kcfg
index 14c395a54..ce42aebfb 100644
--- a/kdecore/kconfig_compiler/tests/test1.kcfg
+++ b/kdecore/kconfig_compiler/tests/test1.kcfg
@@ -35,7 +35,7 @@
     </entry>
     <entry name="MyPath" type="Path">
       <label>This is a path</label>
-      <default code="true">QDir::homeDirPath()+QString::tqfromLatin1(".hidden_file")</default>
+      <default code="true">QDir::homeDirPath()+QString::fromLatin1(".hidden_file")</default>
     </entry>
     <entry name="AnotherOption2" type="Int" key="Another Option">
       <label>Another option</label>
diff --git a/kdecore/kconfig_compiler/tests/test2.cpp.ref b/kdecore/kconfig_compiler/tests/test2.cpp.ref
index af8db588d..2d56f7545 100644
--- a/kdecore/kconfig_compiler/tests/test2.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test2.cpp.ref
@@ -6,90 +6,90 @@
 #include <klocale.h>
 
 Test2::Test2(  )
-  : MyPrefs( TQString::tqfromLatin1( "korganizerrc" ) )
+  : MyPrefs( TQString::fromLatin1( "korganizerrc" ) )
 {
-  setCurrentGroup( TQString::tqfromLatin1( "General" ) );
+  setCurrentGroup( TQString::fromLatin1( "General" ) );
 
-  mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "Auto Save" ), mAutoSave, false );
+  mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), mAutoSave, false );
   mAutoSaveItem->setLabel( i18n("Enable automatic saving of calendar") );
   mAutoSaveItem->setWhatsThis( i18n("WhatsThis text for AutoSave option") );
-  addItem( mAutoSaveItem, TQString::tqfromLatin1( "AutoSave" ) );
-  mAutoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Auto Save Interval" ), mAutoSaveInterval, 10 );
+  addItem( mAutoSaveItem, TQString::fromLatin1( "AutoSave" ) );
+  mAutoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Auto Save Interval" ), mAutoSaveInterval, 10 );
   mAutoSaveIntervalItem->setLabel( i18n("Auto Save Interval") );
-  addItem( mAutoSaveIntervalItem, TQString::tqfromLatin1( "AutoSaveInterval" ) );
-  mConfirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "Confirm Deletes" ), mConfirm, true );
+  addItem( mAutoSaveIntervalItem, TQString::fromLatin1( "AutoSaveInterval" ) );
+  mConfirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Confirm Deletes" ), mConfirm, true );
   mConfirmItem->setLabel( i18n("Confirm deletes") );
-  addItem( mConfirmItem, TQString::tqfromLatin1( "Confirm" ) );
-  mArchiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "Archive File" ), mArchiveFile );
+  addItem( mConfirmItem, TQString::fromLatin1( "Confirm" ) );
+  mArchiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Archive File" ), mArchiveFile );
   mArchiveFileItem->setLabel( i18n("Archive File") );
-  addItem( mArchiveFileItem, TQString::tqfromLatin1( "ArchiveFile" ) );
+  addItem( mArchiveFileItem, TQString::fromLatin1( "ArchiveFile" ) );
   TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesDestination;
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "standardDestination" );
+    choice.name = TQString::fromLatin1( "standardDestination" );
     valuesDestination.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "askDestination" );
+    choice.name = TQString::fromLatin1( "askDestination" );
     valuesDestination.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "argl1" );
+    choice.name = TQString::fromLatin1( "argl1" );
     choice.label = i18n("Argl1 Label");
     valuesDestination.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "argl2" );
+    choice.name = TQString::fromLatin1( "argl2" );
     choice.whatsThis = i18n("Argl2 Whatsthis");
     valuesDestination.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "argl3" );
+    choice.name = TQString::fromLatin1( "argl3" );
     choice.label = i18n("Argl3 Label");
     choice.whatsThis = i18n("Argl3 Whatsthis");
     valuesDestination.append( choice );
   }
-  mDestinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "Destination" ), mDestination, valuesDestination, standardDestination );
+  mDestinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Destination" ), mDestination, valuesDestination, standardDestination );
   mDestinationItem->setLabel( i18n("New Events/Todos Should") );
-  addItem( mDestinationItem, TQString::tqfromLatin1( "Destination" ) );
+  addItem( mDestinationItem, TQString::fromLatin1( "Destination" ) );
 
-  setCurrentGroup( TQString::tqfromLatin1( "Views" ) );
+  setCurrentGroup( TQString::fromLatin1( "Views" ) );
 
-  mHourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Hour Size" ), mHourSize, 10 );
+  mHourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Hour Size" ), mHourSize, 10 );
   mHourSizeItem->setLabel( i18n("Hour Size") );
-  addItem( mHourSizeItem, TQString::tqfromLatin1( "HourSize" ) );
-  mSelectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "SelectionStartsEditor" ), mSelectionStartsEditor, false );
+  addItem( mHourSizeItem, TQString::fromLatin1( "HourSize" ) );
+  mSelectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SelectionStartsEditor" ), mSelectionStartsEditor, false );
   mSelectionStartsEditorItem->setLabel( i18n("Time range selection in agenda view starts event editor") );
-  addItem( mSelectionStartsEditorItem, TQString::tqfromLatin1( "SelectionStartsEditor" ) );
+  addItem( mSelectionStartsEditorItem, TQString::fromLatin1( "SelectionStartsEditor" ) );
 
-  setCurrentGroup( TQString::tqfromLatin1( "KOrganizer Plugins" ) );
+  setCurrentGroup( TQString::fromLatin1( "KOrganizer Plugins" ) );
 
   TQStringList defaultSelectedPlugins;
   defaultSelectedPlugins.append( TQString::fromUtf8( "holidays" ) );
   defaultSelectedPlugins.append( TQString::fromUtf8( "webexport" ) );
 
-  mSelectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::tqfromLatin1( "SelectedPlugins" ), mSelectedPlugins, defaultSelectedPlugins );
+  mSelectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "SelectedPlugins" ), mSelectedPlugins, defaultSelectedPlugins );
   mSelectedPluginsItem->setLabel( i18n("SelectedPlugins") );
-  addItem( mSelectedPluginsItem, TQString::tqfromLatin1( "SelectedPlugins" ) );
+  addItem( mSelectedPluginsItem, TQString::fromLatin1( "SelectedPlugins" ) );
 
-  setCurrentGroup( TQString::tqfromLatin1( "Colors" ) );
+  setCurrentGroup( TQString::fromLatin1( "Colors" ) );
 
-  mHighlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "Highlight Color" ), mHighlightColor, TQColor( 100, 100, 255 ) );
+  mHighlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Highlight Color" ), mHighlightColor, TQColor( 100, 100, 255 ) );
   mHighlightColorItem->setLabel( i18n("Highlight color") );
-  addItem( mHighlightColorItem, TQString::tqfromLatin1( "HighlightColor" ) );
-  mAgendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "Agenda Background Color" ), mAgendaBgColor, TQColor( 255, 255, 255 ) );
+  addItem( mHighlightColorItem, TQString::fromLatin1( "HighlightColor" ) );
+  mAgendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Agenda Background Color" ), mAgendaBgColor, TQColor( 255, 255, 255 ) );
   mAgendaBgColorItem->setLabel( i18n("Agenda view background color") );
-  addItem( mAgendaBgColorItem, TQString::tqfromLatin1( "AgendaBgColor" ) );
+  addItem( mAgendaBgColorItem, TQString::fromLatin1( "AgendaBgColor" ) );
 
-  setCurrentGroup( TQString::tqfromLatin1( "Fonts" ) );
+  setCurrentGroup( TQString::fromLatin1( "Fonts" ) );
 
-  mTimeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::tqfromLatin1( "TimeBar Font" ), mTimeBarFont );
+  mTimeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TimeBar Font" ), mTimeBarFont );
   mTimeBarFontItem->setLabel( i18n("Time bar") );
-  addItem( mTimeBarFontItem, TQString::tqfromLatin1( "TimeBarFont" ) );
+  addItem( mTimeBarFontItem, TQString::fromLatin1( "TimeBarFont" ) );
 }
 
 Test2::~Test2()
diff --git a/kdecore/kconfig_compiler/tests/test2.h.ref b/kdecore/kconfig_compiler/tests/test2.h.ref
index 075f48bde..6c0a74d66 100644
--- a/kdecore/kconfig_compiler/tests/test2.h.ref
+++ b/kdecore/kconfig_compiler/tests/test2.h.ref
@@ -21,7 +21,7 @@ class Test2 : public MyPrefs
     */
     void setAutoSave( bool v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "AutoSave" ) ))
+      if (!isImmutable( TQString::fromLatin1( "AutoSave" ) ))
         mAutoSave = v;
     }
 
@@ -46,7 +46,7 @@ class Test2 : public MyPrefs
     */
     void setAutoSaveInterval( int v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "AutoSaveInterval" ) ))
+      if (!isImmutable( TQString::fromLatin1( "AutoSaveInterval" ) ))
         mAutoSaveInterval = v;
     }
 
@@ -71,7 +71,7 @@ class Test2 : public MyPrefs
     */
     void setConfirm( bool v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "Confirm" ) ))
+      if (!isImmutable( TQString::fromLatin1( "Confirm" ) ))
         mConfirm = v;
     }
 
@@ -96,7 +96,7 @@ class Test2 : public MyPrefs
     */
     void setArchiveFile( const TQString & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "ArchiveFile" ) ))
+      if (!isImmutable( TQString::fromLatin1( "ArchiveFile" ) ))
         mArchiveFile = v;
     }
 
@@ -121,7 +121,7 @@ class Test2 : public MyPrefs
     */
     void setDestination( int v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "Destination" ) ))
+      if (!isImmutable( TQString::fromLatin1( "Destination" ) ))
         mDestination = v;
     }
 
@@ -146,7 +146,7 @@ class Test2 : public MyPrefs
     */
     void setHourSize( int v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "HourSize" ) ))
+      if (!isImmutable( TQString::fromLatin1( "HourSize" ) ))
         mHourSize = v;
     }
 
@@ -171,7 +171,7 @@ class Test2 : public MyPrefs
     */
     void setSelectionStartsEditor( bool v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "SelectionStartsEditor" ) ))
+      if (!isImmutable( TQString::fromLatin1( "SelectionStartsEditor" ) ))
         mSelectionStartsEditor = v;
     }
 
@@ -196,7 +196,7 @@ class Test2 : public MyPrefs
     */
     void setSelectedPlugins( const TQStringList & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "SelectedPlugins" ) ))
+      if (!isImmutable( TQString::fromLatin1( "SelectedPlugins" ) ))
         mSelectedPlugins = v;
     }
 
@@ -221,7 +221,7 @@ class Test2 : public MyPrefs
     */
     void setHighlightColor( const TQColor & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "HighlightColor" ) ))
+      if (!isImmutable( TQString::fromLatin1( "HighlightColor" ) ))
         mHighlightColor = v;
     }
 
@@ -246,7 +246,7 @@ class Test2 : public MyPrefs
     */
     void setAgendaBgColor( const TQColor & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "AgendaBgColor" ) ))
+      if (!isImmutable( TQString::fromLatin1( "AgendaBgColor" ) ))
         mAgendaBgColor = v;
     }
 
@@ -271,7 +271,7 @@ class Test2 : public MyPrefs
     */
     void setTimeBarFont( const TQFont & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "TimeBarFont" ) ))
+      if (!isImmutable( TQString::fromLatin1( "TimeBarFont" ) ))
         mTimeBarFont = v;
     }
 
diff --git a/kdecore/kconfig_compiler/tests/test3.cpp.ref b/kdecore/kconfig_compiler/tests/test3.cpp.ref
index a47fd5213..11fe6b38f 100644
--- a/kdecore/kconfig_compiler/tests/test3.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test3.cpp.ref
@@ -6,21 +6,21 @@
 using namespace TestNameSpace;
 
 Test3::Test3(  )
-  : KConfigSkeleton( TQString::tqfromLatin1( "test3rc" ) )
+  : KConfigSkeleton( TQString::fromLatin1( "test3rc" ) )
 {
-  setCurrentGroup( TQString::tqfromLatin1( "General" ) );
+  setCurrentGroup( TQString::fromLatin1( "General" ) );
 
-  mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "Auto Save" ), mAutoSave, false );
-  addItem( mAutoSaveItem, TQString::tqfromLatin1( "AutoSave" ) );
+  mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), mAutoSave, false );
+  addItem( mAutoSaveItem, TQString::fromLatin1( "AutoSave" ) );
 
-  setCurrentGroup( TQString::tqfromLatin1( "Blah" ) );
+  setCurrentGroup( TQString::fromLatin1( "Blah" ) );
 
-  mBlubbItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Blubb" ), mBlubb, 10 );
-  addItem( mBlubbItem, TQString::tqfromLatin1( "Blubb" ) );
-  mBlahBlahItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "BlahBlah" ), mBlahBlah, TQString::tqfromLatin1( "a string" ) );
-  addItem( mBlahBlahItem, TQString::tqfromLatin1( "BlahBlah" ) );
-  mMyPasswordItem = new KConfigSkeleton::ItemPassword( currentGroup(), TQString::tqfromLatin1( "MyPassword" ), mMyPassword );
-  addItem( mMyPasswordItem, TQString::tqfromLatin1( "MyPassword" ) );
+  mBlubbItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Blubb" ), mBlubb, 10 );
+  addItem( mBlubbItem, TQString::fromLatin1( "Blubb" ) );
+  mBlahBlahItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "BlahBlah" ), mBlahBlah, TQString::fromLatin1( "a string" ) );
+  addItem( mBlahBlahItem, TQString::fromLatin1( "BlahBlah" ) );
+  mMyPasswordItem = new KConfigSkeleton::ItemPassword( currentGroup(), TQString::fromLatin1( "MyPassword" ), mMyPassword );
+  addItem( mMyPasswordItem, TQString::fromLatin1( "MyPassword" ) );
 }
 
 Test3::~Test3()
diff --git a/kdecore/kconfig_compiler/tests/test3.h.ref b/kdecore/kconfig_compiler/tests/test3.h.ref
index 8e86d36b0..75b1b0929 100644
--- a/kdecore/kconfig_compiler/tests/test3.h.ref
+++ b/kdecore/kconfig_compiler/tests/test3.h.ref
@@ -20,7 +20,7 @@ class Test3 : public KConfigSkeleton
     */
     void setAutoSave( bool v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "AutoSave" ) ))
+      if (!isImmutable( TQString::fromLatin1( "AutoSave" ) ))
         mAutoSave = v;
     }
 
@@ -45,7 +45,7 @@ class Test3 : public KConfigSkeleton
     */
     void setBlubb( int v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "Blubb" ) ))
+      if (!isImmutable( TQString::fromLatin1( "Blubb" ) ))
         mBlubb = v;
     }
 
@@ -70,7 +70,7 @@ class Test3 : public KConfigSkeleton
     */
     void setBlahBlah( const TQString & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "BlahBlah" ) ))
+      if (!isImmutable( TQString::fromLatin1( "BlahBlah" ) ))
         mBlahBlah = v;
     }
 
@@ -95,7 +95,7 @@ class Test3 : public KConfigSkeleton
     */
     void setMyPassword( const TQString & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "MyPassword" ) ))
+      if (!isImmutable( TQString::fromLatin1( "MyPassword" ) ))
         mMyPassword = v;
     }
 
diff --git a/kdecore/kconfig_compiler/tests/test4.cpp.ref b/kdecore/kconfig_compiler/tests/test4.cpp.ref
index 0eee21488..6918a8c8a 100644
--- a/kdecore/kconfig_compiler/tests/test4.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test4.cpp.ref
@@ -21,57 +21,57 @@ Test4 *Test4::self()
 const char* const Test4::EnumButton::enumToString[] = { "right", "mid", "left" };
 
 Test4::Test4(  )
-  : KConfigSkeleton( TQString::tqfromLatin1( "test4rc" ) )
+  : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) )
 {
   mSelf = this;
-  setCurrentGroup( TQString::tqfromLatin1( "Foo" ) );
+  setCurrentGroup( TQString::fromLatin1( "Foo" ) );
 
 TQColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black };
   KConfigSkeleton::ItemColor  *itemColor[4];
-  itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #0" ), mColor[0], defaultColor[0] );
-  addItem( itemColor[0], TQString::tqfromLatin1( "Color0" ) );
-  itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #1" ), mColor[1], defaultColor[1] );
-  addItem( itemColor[1], TQString::tqfromLatin1( "Color1" ) );
-  itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #2" ), mColor[2], defaultColor[2] );
-  addItem( itemColor[2], TQString::tqfromLatin1( "Color2" ) );
-  itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #3" ), mColor[3], defaultColor[3] );
-  addItem( itemColor[3], TQString::tqfromLatin1( "Color3" ) );
+  itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #0" ), mColor[0], defaultColor[0] );
+  addItem( itemColor[0], TQString::fromLatin1( "Color0" ) );
+  itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #1" ), mColor[1], defaultColor[1] );
+  addItem( itemColor[1], TQString::fromLatin1( "Color1" ) );
+  itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #2" ), mColor[2], defaultColor[2] );
+  addItem( itemColor[2], TQString::fromLatin1( "Color2" ) );
+  itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #3" ), mColor[3], defaultColor[3] );
+  addItem( itemColor[3], TQString::fromLatin1( "Color3" ) );
   TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesMouseAction;
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "Encrypt" );
+    choice.name = TQString::fromLatin1( "Encrypt" );
     valuesMouseAction.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "Decrypt" );
+    choice.name = TQString::fromLatin1( "Decrypt" );
     valuesMouseAction.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "CrashNBurn" );
+    choice.name = TQString::fromLatin1( "CrashNBurn" );
     valuesMouseAction.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "PumpNDump" );
+    choice.name = TQString::fromLatin1( "PumpNDump" );
     valuesMouseAction.append( choice );
   }
   KConfigSkeleton::ItemEnum  *itemMouseAction[3];
-  itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, EnumMouseAction::Decrypt );
-  addItem( itemMouseAction[0], TQString::tqfromLatin1( "MouseActionright" ) );
-  itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, EnumMouseAction::Encrypt );
-  addItem( itemMouseAction[1], TQString::tqfromLatin1( "MouseActionmid" ) );
-  itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, EnumMouseAction::PumpNDump );
-  addItem( itemMouseAction[2], TQString::tqfromLatin1( "MouseActionleft" ) );
+  itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, EnumMouseAction::Decrypt );
+  addItem( itemMouseAction[0], TQString::fromLatin1( "MouseActionright" ) );
+  itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, EnumMouseAction::Encrypt );
+  addItem( itemMouseAction[1], TQString::fromLatin1( "MouseActionmid" ) );
+  itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, EnumMouseAction::PumpNDump );
+  addItem( itemMouseAction[2], TQString::fromLatin1( "MouseActionleft" ) );
   KConfigSkeleton::ItemString  *itemFooBar;
-  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "foo bar" ), mFooBar );
-  addItem( itemFooBar, TQString::tqfromLatin1( "FooBar" ) );
+  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
+  addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) );
   KConfigSkeleton::ItemInt  *itemAge;
-  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Age" ), mAge, 35 );
+  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
   itemAge->setMinValue(8);
   itemAge->setMaxValue(88);
-  addItem( itemAge, TQString::tqfromLatin1( "Age" ) );
+  addItem( itemAge, TQString::fromLatin1( "Age" ) );
 }
 
 Test4::~Test4()
diff --git a/kdecore/kconfig_compiler/tests/test4.h.ref b/kdecore/kconfig_compiler/tests/test4.h.ref
index dc8691b1f..d11dd3aee 100644
--- a/kdecore/kconfig_compiler/tests/test4.h.ref
+++ b/kdecore/kconfig_compiler/tests/test4.h.ref
@@ -30,7 +30,7 @@ class Test4 : public KConfigSkeleton
     static
     void setColor( int i, const TQColor & v )
     {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "Color%1" ).arg( i ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "Color%1" ).arg( i ) ))
         self()->mColor[i] = v;
     }
 
@@ -49,7 +49,7 @@ class Test4 : public KConfigSkeleton
     static
     void setMouseAction( int i, int v )
     {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "MouseAction%1" ).arg( TQString::tqfromLatin1( EnumButton::enumToString[i] ) ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "MouseAction%1" ).arg( TQString::fromLatin1( EnumButton::enumToString[i] ) ) ))
         self()->mMouseAction[i] = v;
     }
 
@@ -68,7 +68,7 @@ class Test4 : public KConfigSkeleton
     static
     void setFooBar( const TQString & v )
     {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "FooBar" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "FooBar" ) ))
         self()->mFooBar = v;
     }
 
@@ -99,7 +99,7 @@ class Test4 : public KConfigSkeleton
         v = 88;
       }
 
-      if (!self()->isImmutable( TQString::tqfromLatin1( "Age" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "Age" ) ))
         self()->mAge = v;
     }
 
diff --git a/kdecore/kconfig_compiler/tests/test5.cpp.ref b/kdecore/kconfig_compiler/tests/test5.cpp.ref
index 0fc90b387..8373eb3f6 100644
--- a/kdecore/kconfig_compiler/tests/test5.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test5.cpp.ref
@@ -21,57 +21,57 @@ Test5 *Test5::self()
 const char* const Test5::EnumButtonToString[] = { "right", "mid", "left" };
 
 Test5::Test5(  )
-  : KConfigSkeleton( TQString::tqfromLatin1( "test4rc" ) )
+  : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) )
 {
   mSelf = this;
-  setCurrentGroup( TQString::tqfromLatin1( "Foo" ) );
+  setCurrentGroup( TQString::fromLatin1( "Foo" ) );
 
 TQColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black };
   KConfigSkeleton::ItemColor  *itemColor[4];
-  itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #0" ), mColor[0], defaultColor[0] );
-  addItem( itemColor[0], TQString::tqfromLatin1( "Color0" ) );
-  itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #1" ), mColor[1], defaultColor[1] );
-  addItem( itemColor[1], TQString::tqfromLatin1( "Color1" ) );
-  itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #2" ), mColor[2], defaultColor[2] );
-  addItem( itemColor[2], TQString::tqfromLatin1( "Color2" ) );
-  itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #3" ), mColor[3], defaultColor[3] );
-  addItem( itemColor[3], TQString::tqfromLatin1( "Color3" ) );
+  itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #0" ), mColor[0], defaultColor[0] );
+  addItem( itemColor[0], TQString::fromLatin1( "Color0" ) );
+  itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #1" ), mColor[1], defaultColor[1] );
+  addItem( itemColor[1], TQString::fromLatin1( "Color1" ) );
+  itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #2" ), mColor[2], defaultColor[2] );
+  addItem( itemColor[2], TQString::fromLatin1( "Color2" ) );
+  itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #3" ), mColor[3], defaultColor[3] );
+  addItem( itemColor[3], TQString::fromLatin1( "Color3" ) );
   TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesMouseAction;
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "Encrypt" );
+    choice.name = TQString::fromLatin1( "Encrypt" );
     valuesMouseAction.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "Decrypt" );
+    choice.name = TQString::fromLatin1( "Decrypt" );
     valuesMouseAction.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "CrashNBurn" );
+    choice.name = TQString::fromLatin1( "CrashNBurn" );
     valuesMouseAction.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "PumpNDump" );
+    choice.name = TQString::fromLatin1( "PumpNDump" );
     valuesMouseAction.append( choice );
   }
   KConfigSkeleton::ItemEnum  *itemMouseAction[3];
-  itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, Decrypt );
-  addItem( itemMouseAction[0], TQString::tqfromLatin1( "MouseActionright" ) );
-  itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, Encrypt );
-  addItem( itemMouseAction[1], TQString::tqfromLatin1( "MouseActionmid" ) );
-  itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, PumpNDump );
-  addItem( itemMouseAction[2], TQString::tqfromLatin1( "MouseActionleft" ) );
+  itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, Decrypt );
+  addItem( itemMouseAction[0], TQString::fromLatin1( "MouseActionright" ) );
+  itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, Encrypt );
+  addItem( itemMouseAction[1], TQString::fromLatin1( "MouseActionmid" ) );
+  itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, PumpNDump );
+  addItem( itemMouseAction[2], TQString::fromLatin1( "MouseActionleft" ) );
   KConfigSkeleton::ItemString  *itemFooBar;
-  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "foo bar" ), mFooBar );
-  addItem( itemFooBar, TQString::tqfromLatin1( "FooBar" ) );
+  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
+  addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) );
   KConfigSkeleton::ItemInt  *itemAge;
-  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Age" ), mAge, 35 );
+  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
   itemAge->setMinValue(8);
   itemAge->setMaxValue(88);
-  addItem( itemAge, TQString::tqfromLatin1( "Age" ) );
+  addItem( itemAge, TQString::fromLatin1( "Age" ) );
 }
 
 Test5::~Test5()
diff --git a/kdecore/kconfig_compiler/tests/test5.h.ref b/kdecore/kconfig_compiler/tests/test5.h.ref
index 9fadbd0ec..efb9b448a 100644
--- a/kdecore/kconfig_compiler/tests/test5.h.ref
+++ b/kdecore/kconfig_compiler/tests/test5.h.ref
@@ -22,7 +22,7 @@ class Test5 : public KConfigSkeleton
     static
     void setColor( int i, const TQColor & v )
     {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "Color%1" ).arg( i ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "Color%1" ).arg( i ) ))
         self()->mColor[i] = v;
     }
 
@@ -41,7 +41,7 @@ class Test5 : public KConfigSkeleton
     static
     void setMouseAction( int i, int v )
     {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "MouseAction%1" ).arg( TQString::tqfromLatin1( EnumButtonToString[i] ) ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "MouseAction%1" ).arg( TQString::fromLatin1( EnumButtonToString[i] ) ) ))
         self()->mMouseAction[i] = v;
     }
 
@@ -60,7 +60,7 @@ class Test5 : public KConfigSkeleton
     static
     void setFooBar( const TQString & v )
     {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "FooBar" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "FooBar" ) ))
         self()->mFooBar = v;
     }
 
@@ -91,7 +91,7 @@ class Test5 : public KConfigSkeleton
         v = 88;
       }
 
-      if (!self()->isImmutable( TQString::tqfromLatin1( "Age" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "Age" ) ))
         self()->mAge = v;
     }
 
diff --git a/kdecore/kconfig_compiler/tests/test6.cpp.ref b/kdecore/kconfig_compiler/tests/test6.cpp.ref
index 2b8a71d50..51b96d4c4 100644
--- a/kdecore/kconfig_compiler/tests/test6.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test6.cpp.ref
@@ -4,25 +4,25 @@
 #include "test6.h"
 
 Test6::Test6(  const TQString & Number )
-  : KConfigSkeleton( TQString::tqfromLatin1( "test4rc" ) )
+  : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) )
   , mParamNumber(Number)
 {
-  setCurrentGroup( TQString::tqfromLatin1( "Foo" ) );
+  setCurrentGroup( TQString::fromLatin1( "Foo" ) );
 
   KConfigSkeleton::ItemColor  *itemColor;
-  itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) );
-  addItem( itemColor, TQString::tqfromLatin1( "Color" ) );
+  itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) );
+  addItem( itemColor, TQString::fromLatin1( "Color" ) );
 
-  setCurrentGroup( TQString::tqfromLatin1( "Bar%1" ).arg( mParamNumber ) );
+  setCurrentGroup( TQString::fromLatin1( "Bar%1" ).arg( mParamNumber ) );
 
   KConfigSkeleton::ItemString  *itemFooBar;
-  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "foo bar" ), mFooBar );
-  addItem( itemFooBar, TQString::tqfromLatin1( "FooBar" ) );
+  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
+  addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) );
   KConfigSkeleton::ItemInt  *itemAge;
-  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Age" ), mAge, 35 );
+  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
   itemAge->setMinValue(8);
   itemAge->setMaxValue(88);
-  addItem( itemAge, TQString::tqfromLatin1( "Age" ) );
+  addItem( itemAge, TQString::fromLatin1( "Age" ) );
 }
 
 Test6::~Test6()
diff --git a/kdecore/kconfig_compiler/tests/test6.h.ref b/kdecore/kconfig_compiler/tests/test6.h.ref
index 18615da38..6743d6064 100644
--- a/kdecore/kconfig_compiler/tests/test6.h.ref
+++ b/kdecore/kconfig_compiler/tests/test6.h.ref
@@ -18,7 +18,7 @@ class Test6 : public KConfigSkeleton
     */
     void setColor( const TQColor & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "Color" ) ))
+      if (!isImmutable( TQString::fromLatin1( "Color" ) ))
         mColor = v;
     }
 
@@ -35,7 +35,7 @@ class Test6 : public KConfigSkeleton
     */
     void setFooBar( const TQString & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "FooBar" ) ))
+      if (!isImmutable( TQString::fromLatin1( "FooBar" ) ))
         mFooBar = v;
     }
 
@@ -64,7 +64,7 @@ class Test6 : public KConfigSkeleton
         v = 88;
       }
 
-      if (!isImmutable( TQString::tqfromLatin1( "Age" ) ))
+      if (!isImmutable( TQString::fromLatin1( "Age" ) ))
         mAge = v;
     }
 
diff --git a/kdecore/kconfig_compiler/tests/test7.cpp.ref b/kdecore/kconfig_compiler/tests/test7.cpp.ref
index dab0ae27d..91a22e036 100644
--- a/kdecore/kconfig_compiler/tests/test7.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test7.cpp.ref
@@ -4,25 +4,25 @@
 #include "test7.h"
 
 Test7::Test7(  int Number )
-  : KConfigSkeleton( TQString::tqfromLatin1( "test7rc" ) )
+  : KConfigSkeleton( TQString::fromLatin1( "test7rc" ) )
   , mParamNumber(Number)
 {
-  setCurrentGroup( TQString::tqfromLatin1( "Foo" ) );
+  setCurrentGroup( TQString::fromLatin1( "Foo" ) );
 
   KConfigSkeleton::ItemColor  *itemColor;
-  itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) );
-  addItem( itemColor, TQString::tqfromLatin1( "Color" ) );
+  itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) );
+  addItem( itemColor, TQString::fromLatin1( "Color" ) );
 
-  setCurrentGroup( TQString::tqfromLatin1( "Bar%1" ).arg( mParamNumber ) );
+  setCurrentGroup( TQString::fromLatin1( "Bar%1" ).arg( mParamNumber ) );
 
   KConfigSkeleton::ItemString  *itemFooBar;
-  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "foo bar" ), mFooBar );
-  addItem( itemFooBar, TQString::tqfromLatin1( "FooBar" ) );
+  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
+  addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) );
   KConfigSkeleton::ItemInt  *itemAge;
-  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Age" ), mAge, 35 );
+  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
   itemAge->setMinValue(8);
   itemAge->setMaxValue(88);
-  addItem( itemAge, TQString::tqfromLatin1( "Age" ) );
+  addItem( itemAge, TQString::fromLatin1( "Age" ) );
 }
 
 Test7::~Test7()
diff --git a/kdecore/kconfig_compiler/tests/test7.h.ref b/kdecore/kconfig_compiler/tests/test7.h.ref
index f67bc30cb..8f8808da1 100644
--- a/kdecore/kconfig_compiler/tests/test7.h.ref
+++ b/kdecore/kconfig_compiler/tests/test7.h.ref
@@ -18,7 +18,7 @@ class Test7 : public KConfigSkeleton
     */
     void setColor( const TQColor & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "Color" ) ))
+      if (!isImmutable( TQString::fromLatin1( "Color" ) ))
         mColor = v;
     }
 
@@ -35,7 +35,7 @@ class Test7 : public KConfigSkeleton
     */
     void setFooBar( const TQString & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "FooBar" ) ))
+      if (!isImmutable( TQString::fromLatin1( "FooBar" ) ))
         mFooBar = v;
     }
 
@@ -64,7 +64,7 @@ class Test7 : public KConfigSkeleton
         v = 88;
       }
 
-      if (!isImmutable( TQString::tqfromLatin1( "Age" ) ))
+      if (!isImmutable( TQString::fromLatin1( "Age" ) ))
         mAge = v;
     }
 
diff --git a/kdecore/kconfig_compiler/tests/test8a.cpp.ref b/kdecore/kconfig_compiler/tests/test8a.cpp.ref
index 8d8925c57..f89b7c133 100644
--- a/kdecore/kconfig_compiler/tests/test8a.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test8a.cpp.ref
@@ -6,14 +6,14 @@
 Test8a::Test8a(  KSharedConfig::Ptr config  )
   : KConfigSkeleton( config )
 {
-  setCurrentGroup( TQString::tqfromLatin1( "Group" ) );
+  setCurrentGroup( TQString::fromLatin1( "Group" ) );
 
   KConfigSkeleton::ItemFont  *itemFont;
-  itemFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::tqfromLatin1( "Font" ), mFont, KGlobalSettings::generalFont() );
-  addItem( itemFont, TQString::tqfromLatin1( "Font" ) );
+  itemFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Font" ), mFont, KGlobalSettings::generalFont() );
+  addItem( itemFont, TQString::fromLatin1( "Font" ) );
   KConfigSkeleton::ItemFont  *itemTitleFont;
-  itemTitleFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::tqfromLatin1( "TitleFont" ), mTitleFont, KGlobalSettings::windowTitleFont() );
-  addItem( itemTitleFont, TQString::tqfromLatin1( "TitleFont" ) );
+  itemTitleFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TitleFont" ), mTitleFont, KGlobalSettings::windowTitleFont() );
+  addItem( itemTitleFont, TQString::fromLatin1( "TitleFont" ) );
 }
 
 Test8a::~Test8a()
diff --git a/kdecore/kconfig_compiler/tests/test8a.h.ref b/kdecore/kconfig_compiler/tests/test8a.h.ref
index a1ac4de64..2e947c437 100644
--- a/kdecore/kconfig_compiler/tests/test8a.h.ref
+++ b/kdecore/kconfig_compiler/tests/test8a.h.ref
@@ -19,7 +19,7 @@ class Test8a : public KConfigSkeleton
     */
     void setFont( const TQFont & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "Font" ) ))
+      if (!isImmutable( TQString::fromLatin1( "Font" ) ))
         mFont = v;
     }
 
@@ -36,7 +36,7 @@ class Test8a : public KConfigSkeleton
     */
     void setTitleFont( const TQFont & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "TitleFont" ) ))
+      if (!isImmutable( TQString::fromLatin1( "TitleFont" ) ))
         mTitleFont = v;
     }
 
diff --git a/kdecore/kconfig_compiler/tests/test8b.cpp.ref b/kdecore/kconfig_compiler/tests/test8b.cpp.ref
index 566902399..e29e3c4e7 100644
--- a/kdecore/kconfig_compiler/tests/test8b.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test8b.cpp.ref
@@ -22,20 +22,20 @@ Test8b::Test8b(  )
   : Test8a()
 {
   mSelf = this;
-  setCurrentGroup( TQString::tqfromLatin1( "Group8b1" ) );
+  setCurrentGroup( TQString::fromLatin1( "Group8b1" ) );
 
   KConfigSkeleton::ItemUInt  *itemSomething;
-  itemSomething = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::tqfromLatin1( "Something" ), mSomething, 60 );
-  addItem( itemSomething, TQString::tqfromLatin1( "Something" ) );
+  itemSomething = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::fromLatin1( "Something" ), mSomething, 60 );
+  addItem( itemSomething, TQString::fromLatin1( "Something" ) );
 
-  setCurrentGroup( TQString::tqfromLatin1( "Group8b2" ) );
+  setCurrentGroup( TQString::fromLatin1( "Group8b2" ) );
 
   KConfigSkeleton::ItemBool  *itemFooBoo;
-  itemFooBoo = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "FooBoo" ), mFooBoo, false );
-  addItem( itemFooBoo, TQString::tqfromLatin1( "FooBoo" ) );
+  itemFooBoo = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "FooBoo" ), mFooBoo, false );
+  addItem( itemFooBoo, TQString::fromLatin1( "FooBoo" ) );
   KConfigSkeleton::ItemUInt  *itemPort;
-  itemPort = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::tqfromLatin1( "Port" ), mPort, 1000 );
-  addItem( itemPort, TQString::tqfromLatin1( "Port" ) );
+  itemPort = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::fromLatin1( "Port" ), mPort, 1000 );
+  addItem( itemPort, TQString::fromLatin1( "Port" ) );
 }
 
 Test8b::~Test8b()
diff --git a/kdecore/kconfig_compiler/tests/test8b.h.ref b/kdecore/kconfig_compiler/tests/test8b.h.ref
index dfc9089e3..4ca0d5c7f 100644
--- a/kdecore/kconfig_compiler/tests/test8b.h.ref
+++ b/kdecore/kconfig_compiler/tests/test8b.h.ref
@@ -21,7 +21,7 @@ class Test8b : public Test8a
     static
     void setSomething( uint v )
     {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "Something" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "Something" ) ))
         self()->mSomething = v;
     }
 
@@ -40,7 +40,7 @@ class Test8b : public Test8a
     static
     void setFooBoo( bool v )
     {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "FooBoo" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "FooBoo" ) ))
         self()->mFooBoo = v;
     }
 
@@ -59,7 +59,7 @@ class Test8b : public Test8a
     static
     void setPort( uint v )
     {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "Port" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "Port" ) ))
         self()->mPort = v;
     }
 
diff --git a/kdecore/kconfig_compiler/tests/test9.cpp.ref b/kdecore/kconfig_compiler/tests/test9.cpp.ref
index 606f21ed1..c5d57e4d1 100644
--- a/kdecore/kconfig_compiler/tests/test9.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test9.cpp.ref
@@ -4,29 +4,29 @@
 #include "test9.h"
 
 Test9::Test9(  const TQString & transport, const TQString & folder )
-  : KConfigSkeleton( TQString::tqfromLatin1( "examplerc" ) )
+  : KConfigSkeleton( TQString::fromLatin1( "examplerc" ) )
   , mParamtransport(transport)
   , mParamfolder(folder)
 {
-  setCurrentGroup( TQString::tqfromLatin1( "MyOptionsXX" ) );
+  setCurrentGroup( TQString::fromLatin1( "MyOptionsXX" ) );
 
   TQStringList defaultMyStringList;
   defaultMyStringList.append( TQString::fromUtf8( "up" ) );
   defaultMyStringList.append( TQString::fromUtf8( "down" ) );
 
   KConfigSkeleton::ItemStringList  *itemMyStringList;
-  itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::tqfromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList );
-  addItem( itemMyStringList, TQString::tqfromLatin1( "MyStringList" ) );
+  itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList );
+  addItem( itemMyStringList, TQString::fromLatin1( "MyStringList" ) );
   TQStringList defaultMyPathList;
   defaultMyPathList.append( TQString::fromUtf8( "/home" ) );
   defaultMyPathList.append( TQString::fromUtf8( "~" ) );
 
   KConfigSkeleton::ItemPathList  *itemMyPathList;
-  itemMyPathList = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::tqfromLatin1( "MyPathList" ), mMyPathList, defaultMyPathList );
-  addItem( itemMyPathList, TQString::tqfromLatin1( "MyPathList" ) );
+  itemMyPathList = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::fromLatin1( "MyPathList" ), mMyPathList, defaultMyPathList );
+  addItem( itemMyPathList, TQString::fromLatin1( "MyPathList" ) );
   KConfigSkeleton::ItemPathList  *itemMyPathsList2;
-  itemMyPathsList2 = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::tqfromLatin1( "MyPathsList2" ), mMyPathsList2, TQStringList(TQString::tqfromLatin1("/usr/bin")) += TQDir::homeDirPath() );
-  addItem( itemMyPathsList2, TQString::tqfromLatin1( "MyPathsList2" ) );
+  itemMyPathsList2 = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::fromLatin1( "MyPathsList2" ), mMyPathsList2, TQStringList(TQString::fromLatin1("/usr/bin")) += TQDir::homeDirPath() );
+  addItem( itemMyPathsList2, TQString::fromLatin1( "MyPathsList2" ) );
 }
 
 Test9::~Test9()
diff --git a/kdecore/kconfig_compiler/tests/test9.h.ref b/kdecore/kconfig_compiler/tests/test9.h.ref
index 0476c8a19..66a629b48 100644
--- a/kdecore/kconfig_compiler/tests/test9.h.ref
+++ b/kdecore/kconfig_compiler/tests/test9.h.ref
@@ -19,7 +19,7 @@ class Test9 : public KConfigSkeleton
     */
     void setMyStringList( const TQStringList & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "MyStringList" ) ))
+      if (!isImmutable( TQString::fromLatin1( "MyStringList" ) ))
         mMyStringList = v;
     }
 
@@ -36,7 +36,7 @@ class Test9 : public KConfigSkeleton
     */
     void setMyPathList( const TQStringList & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "MyPathList" ) ))
+      if (!isImmutable( TQString::fromLatin1( "MyPathList" ) ))
         mMyPathList = v;
     }
 
@@ -53,7 +53,7 @@ class Test9 : public KConfigSkeleton
     */
     void setMyPathsList2( const TQStringList & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "MyPathsList2" ) ))
+      if (!isImmutable( TQString::fromLatin1( "MyPathsList2" ) ))
         mMyPathsList2 = v;
     }
 
diff --git a/kdecore/kconfig_compiler/tests/test9.kcfg b/kdecore/kconfig_compiler/tests/test9.kcfg
index 149a4d79f..b7495e2b6 100644
--- a/kdecore/kconfig_compiler/tests/test9.kcfg
+++ b/kdecore/kconfig_compiler/tests/test9.kcfg
@@ -18,7 +18,7 @@
     </entry>
     <entry name="MyPathsList2" type="PathList">
       <label>This is an additional test for PathList</label>
-      <default code="true">QStringList(QString::tqfromLatin1("/usr/bin")) += QDir::homeDirPath()</default>
+      <default code="true">QStringList(QString::fromLatin1("/usr/bin")) += QDir::homeDirPath()</default>
     </entry>
   </group>
 </kcfg>
diff --git a/kdecore/kconfig_compiler/tests/test9main.cpp b/kdecore/kconfig_compiler/tests/test9main.cpp
index 796ec0001..12e16e0d4 100644
--- a/kdecore/kconfig_compiler/tests/test9main.cpp
+++ b/kdecore/kconfig_compiler/tests/test9main.cpp
@@ -32,7 +32,7 @@ int main( int, char*[] )
   kdWarning() << myPathsList2 << endl;
 
   // add another path
-  TQStringList newlist = TQDir::homeDirPath() + TQString::tqfromLatin1("/.kde");
+  TQStringList newlist = TQDir::homeDirPath() + TQString::fromLatin1("/.kde");
   myPathsList2 = myPathsList2 + newlist;
   kdWarning() << myPathsList2 << endl;
 
diff --git a/kdecore/kconfig_compiler/tests/test_dpointer.cpp.ref b/kdecore/kconfig_compiler/tests/test_dpointer.cpp.ref
index 00e933564..7b5f55f03 100644
--- a/kdecore/kconfig_compiler/tests/test_dpointer.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test_dpointer.cpp.ref
@@ -60,97 +60,97 @@ TestDPointer *TestDPointer::self()
 }
 
 TestDPointer::TestDPointer(  )
-  : KConfigSkeleton( TQString::tqfromLatin1( "korganizerrc" ) )
+  : KConfigSkeleton( TQString::fromLatin1( "korganizerrc" ) )
 {
   d = new TestDPointerPrivate;
   mSelf = this;
-  setCurrentGroup( TQString::tqfromLatin1( "General" ) );
+  setCurrentGroup( TQString::fromLatin1( "General" ) );
 
-  d->autoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "Auto Save" ), d->autoSave, false );
+  d->autoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), d->autoSave, false );
   d->autoSaveItem->setLabel( i18n("Enable automatic saving of calendar") );
   d->autoSaveItem->setWhatsThis( i18n("WhatsThis text for AutoSave option") );
-  addItem( d->autoSaveItem, TQString::tqfromLatin1( "AutoSave" ) );
-  d->autoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Auto Save Interval" ), d->autoSaveInterval, 10 );
+  addItem( d->autoSaveItem, TQString::fromLatin1( "AutoSave" ) );
+  d->autoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Auto Save Interval" ), d->autoSaveInterval, 10 );
   d->autoSaveIntervalItem->setLabel( i18n("Auto Save Interval") );
-  addItem( d->autoSaveIntervalItem, TQString::tqfromLatin1( "AutoSaveInterval" ) );
-  d->confirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "Confirm Deletes" ), d->confirm, true );
+  addItem( d->autoSaveIntervalItem, TQString::fromLatin1( "AutoSaveInterval" ) );
+  d->confirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Confirm Deletes" ), d->confirm, true );
   d->confirmItem->setLabel( i18n("Confirm deletes") );
-  addItem( d->confirmItem, TQString::tqfromLatin1( "Confirm" ) );
-  d->archiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "Archive File" ), d->archiveFile );
+  addItem( d->confirmItem, TQString::fromLatin1( "Confirm" ) );
+  d->archiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Archive File" ), d->archiveFile );
   d->archiveFileItem->setLabel( i18n("Archive File") );
-  addItem( d->archiveFileItem, TQString::tqfromLatin1( "ArchiveFile" ) );
+  addItem( d->archiveFileItem, TQString::fromLatin1( "ArchiveFile" ) );
   TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesDestination;
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "standardDestination" );
+    choice.name = TQString::fromLatin1( "standardDestination" );
     valuesDestination.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "askDestination" );
+    choice.name = TQString::fromLatin1( "askDestination" );
     valuesDestination.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "argl1" );
+    choice.name = TQString::fromLatin1( "argl1" );
     choice.label = i18n("Argl1 Label");
     valuesDestination.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "argl2" );
+    choice.name = TQString::fromLatin1( "argl2" );
     choice.whatsThis = i18n("Argl2 Whatsthis");
     valuesDestination.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "argl3" );
+    choice.name = TQString::fromLatin1( "argl3" );
     choice.label = i18n("Argl3 Label");
     choice.whatsThis = i18n("Argl3 Whatsthis");
     valuesDestination.append( choice );
   }
-  d->destinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "Destination" ), d->destination, valuesDestination, EnumDestination::standardDestination );
+  d->destinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Destination" ), d->destination, valuesDestination, EnumDestination::standardDestination );
   d->destinationItem->setLabel( i18n("New Events/Todos Should") );
-  addItem( d->destinationItem, TQString::tqfromLatin1( "Destination" ) );
+  addItem( d->destinationItem, TQString::fromLatin1( "Destination" ) );
 
-  setCurrentGroup( TQString::tqfromLatin1( "Views" ) );
+  setCurrentGroup( TQString::fromLatin1( "Views" ) );
 
-  d->hourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Hour Size" ), d->hourSize, 10 );
+  d->hourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Hour Size" ), d->hourSize, 10 );
   d->hourSizeItem->setLabel( i18n("Hour Size") );
-  addItem( d->hourSizeItem, TQString::tqfromLatin1( "HourSize" ) );
-  d->selectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "SelectionStartsEditor" ), d->selectionStartsEditor, false );
+  addItem( d->hourSizeItem, TQString::fromLatin1( "HourSize" ) );
+  d->selectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SelectionStartsEditor" ), d->selectionStartsEditor, false );
   d->selectionStartsEditorItem->setLabel( i18n("Time range selection in agenda view starts event editor") );
-  addItem( d->selectionStartsEditorItem, TQString::tqfromLatin1( "SelectionStartsEditor" ) );
+  addItem( d->selectionStartsEditorItem, TQString::fromLatin1( "SelectionStartsEditor" ) );
 
-  setCurrentGroup( TQString::tqfromLatin1( "KOrganizer Plugins" ) );
+  setCurrentGroup( TQString::fromLatin1( "KOrganizer Plugins" ) );
 
   TQStringList defaultSelectedPlugins;
   defaultSelectedPlugins.append( TQString::fromUtf8( "holidays" ) );
   defaultSelectedPlugins.append( TQString::fromUtf8( "webexport" ) );
 
-  d->selectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::tqfromLatin1( "SelectedPlugins" ), d->selectedPlugins, defaultSelectedPlugins );
+  d->selectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "SelectedPlugins" ), d->selectedPlugins, defaultSelectedPlugins );
   d->selectedPluginsItem->setLabel( i18n("SelectedPlugins") );
-  addItem( d->selectedPluginsItem, TQString::tqfromLatin1( "SelectedPlugins" ) );
+  addItem( d->selectedPluginsItem, TQString::fromLatin1( "SelectedPlugins" ) );
 
-  setCurrentGroup( TQString::tqfromLatin1( "Colors" ) );
+  setCurrentGroup( TQString::fromLatin1( "Colors" ) );
 
-  d->highlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "Highlight Color" ), d->highlightColor, TQColor( 100, 100, 255 ) );
+  d->highlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Highlight Color" ), d->highlightColor, TQColor( 100, 100, 255 ) );
   d->highlightColorItem->setLabel( i18n("Highlight color") );
-  addItem( d->highlightColorItem, TQString::tqfromLatin1( "HighlightColor" ) );
-  d->agendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "Agenda Background Color" ), d->agendaBgColor, TQColor( 255, 255, 255 ) );
+  addItem( d->highlightColorItem, TQString::fromLatin1( "HighlightColor" ) );
+  d->agendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Agenda Background Color" ), d->agendaBgColor, TQColor( 255, 255, 255 ) );
   d->agendaBgColorItem->setLabel( i18n("Agenda view background color") );
-  addItem( d->agendaBgColorItem, TQString::tqfromLatin1( "AgendaBgColor" ) );
+  addItem( d->agendaBgColorItem, TQString::fromLatin1( "AgendaBgColor" ) );
 
-  setCurrentGroup( TQString::tqfromLatin1( "Fonts" ) );
+  setCurrentGroup( TQString::fromLatin1( "Fonts" ) );
 
-  d->timeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::tqfromLatin1( "TimeBar Font" ), d->timeBarFont );
+  d->timeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TimeBar Font" ), d->timeBarFont );
   d->timeBarFontItem->setLabel( i18n("Time bar") );
-  addItem( d->timeBarFontItem, TQString::tqfromLatin1( "TimeBarFont" ) );
+  addItem( d->timeBarFontItem, TQString::fromLatin1( "TimeBarFont" ) );
 }
 
 void TestDPointer::setAutoSave( bool v )
 {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "AutoSave" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "AutoSave" ) ))
         self()->d->autoSave = v;
 }
 
@@ -167,7 +167,7 @@ KConfigSkeleton::ItemBool *TestDPointer::autoSaveItem()
 
 void TestDPointer::setAutoSaveInterval( int v )
 {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "AutoSaveInterval" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "AutoSaveInterval" ) ))
         self()->d->autoSaveInterval = v;
 }
 
@@ -184,7 +184,7 @@ KConfigSkeleton::ItemInt *TestDPointer::autoSaveIntervalItem()
 
 void TestDPointer::setConfirm( bool v )
 {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "Confirm" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "Confirm" ) ))
         self()->d->confirm = v;
 }
 
@@ -201,7 +201,7 @@ KConfigSkeleton::ItemBool *TestDPointer::confirmItem()
 
 void TestDPointer::setArchiveFile( const TQString & v )
 {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "ArchiveFile" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "ArchiveFile" ) ))
         self()->d->archiveFile = v;
 }
 
@@ -218,7 +218,7 @@ KConfigSkeleton::ItemString *TestDPointer::archiveFileItem()
 
 void TestDPointer::setDestination( int v )
 {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "Destination" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "Destination" ) ))
         self()->d->destination = v;
 }
 
@@ -235,7 +235,7 @@ KConfigSkeleton::ItemEnum *TestDPointer::destinationItem()
 
 void TestDPointer::setHourSize( int v )
 {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "HourSize" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "HourSize" ) ))
         self()->d->hourSize = v;
 }
 
@@ -252,7 +252,7 @@ KConfigSkeleton::ItemInt *TestDPointer::hourSizeItem()
 
 void TestDPointer::setSelectionStartsEditor( bool v )
 {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "SelectionStartsEditor" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "SelectionStartsEditor" ) ))
         self()->d->selectionStartsEditor = v;
 }
 
@@ -269,7 +269,7 @@ KConfigSkeleton::ItemBool *TestDPointer::selectionStartsEditorItem()
 
 void TestDPointer::setSelectedPlugins( const TQStringList & v )
 {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "SelectedPlugins" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "SelectedPlugins" ) ))
         self()->d->selectedPlugins = v;
 }
 
@@ -286,7 +286,7 @@ KConfigSkeleton::ItemStringList *TestDPointer::selectedPluginsItem()
 
 void TestDPointer::setHighlightColor( const TQColor & v )
 {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "HighlightColor" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "HighlightColor" ) ))
         self()->d->highlightColor = v;
 }
 
@@ -303,7 +303,7 @@ KConfigSkeleton::ItemColor *TestDPointer::highlightColorItem()
 
 void TestDPointer::setAgendaBgColor( const TQColor & v )
 {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "AgendaBgColor" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "AgendaBgColor" ) ))
         self()->d->agendaBgColor = v;
 }
 
@@ -320,7 +320,7 @@ KConfigSkeleton::ItemColor *TestDPointer::agendaBgColorItem()
 
 void TestDPointer::setTimeBarFont( const TQFont & v )
 {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "TimeBarFont" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "TimeBarFont" ) ))
         self()->d->timeBarFont = v;
 }
 
diff --git a/kdecore/kconfigbackend.cpp b/kdecore/kconfigbackend.cpp
index 072eb97b5..234124820 100644
--- a/kdecore/kconfigbackend.cpp
+++ b/kdecore/kconfigbackend.cpp
@@ -215,8 +215,8 @@ static TQCString encodeKey(const char* key)
 {
     TQCString newKey(key);
 
-    newKey.tqreplace('[', "%5b");
-    newKey.tqreplace(']', "%5d");
+    newKey.replace('[', "%5b");
+    newKey.replace(']', "%5d");
 
     return newKey;
 }
@@ -225,8 +225,8 @@ static TQCString decodeKey(const char* key)
 {
     TQCString newKey(key);
 
-    newKey.tqreplace("%5b", "[");
-    newKey.tqreplace("%5d", "]");
+    newKey.replace("%5b", "[");
+    newKey.replace("%5d", "]");
 
     return newKey;
 }
@@ -256,7 +256,7 @@ void KConfigBackEnd::changeFileName(const TQString &_fileName,
 
    if (useKDEGlobals)
       mGlobalFileName = KGlobal::dirs()->saveLocation("config") +
-	      TQString::tqfromLatin1("kdeglobals");
+	      TQString::fromLatin1("kdeglobals");
    else
       mGlobalFileName = TQString::null;
 
@@ -347,19 +347,19 @@ bool KConfigINIBackEnd::parseConfigFiles()
   // Parse the general config files
   if (useKDEGlobals) {
     TQStringList kdercs = KGlobal::dirs()->
-      findAllResources("config", TQString::tqfromLatin1("kdeglobals"));
+      findAllResources("config", TQString::fromLatin1("kdeglobals"));
 
 #ifdef Q_WS_WIN
     TQString etc_kderc = TQFile::decodeName( TQCString(getenv("WINDIR")) + "\\kderc" );
 #else
-    TQString etc_kderc = TQString::tqfromLatin1("/etc/kderc");
+    TQString etc_kderc = TQString::fromLatin1("/etc/kderc");
 #endif
 
     if (checkAccess(etc_kderc, R_OK))
       kdercs += etc_kderc;
 
     kdercs += KGlobal::dirs()->
-      findAllResources("config", TQString::tqfromLatin1("system.kdeglobals"));
+      findAllResources("config", TQString::fromLatin1("system.kdeglobals"));
 
     TQStringList::ConstIterator it;
 
@@ -605,13 +605,13 @@ qWarning("SIGBUS while reading %s", rFile.name().latin1());
       const char *endOfKey = 0, *locale = 0, *elocale = 0;
       for (; (s < eof) && (*s != '\n'); s++)
       {
-         if (*s == '=') //tqfind the equal sign
+         if (*s == '=') //find the equal sign
          {
 	    if (!endOfKey)
         	endOfKey = s;
             goto haveeq;
 	 }
-	 if (*s == '[') //tqfind the locale or options.
+	 if (*s == '[') //find the locale or options.
 	 {
             const char *option;
             const char *eoption;
@@ -792,7 +792,7 @@ void KConfigINIBackEnd::sync(bool bMerge)
 
   bool bEntriesLeft = true;
 
-  // tqfind out the file to write to (most specific writable file)
+  // find out the file to write to (most specific writable file)
   // try local app-specific file first
 
   if (!mfileName.isEmpty()) {
@@ -999,7 +999,7 @@ bool KConfigINIBackEnd::getEntryMap(KEntryMap &aTempMap, bool bGlobal,
     const KEntry &currentEntry = *aIt;
     if(aIt.key().bDefault)
     {
-       aTempMap.tqreplace(aIt.key(), currentEntry);
+       aTempMap.replace(aIt.key(), currentEntry);
        continue;
     }
 
@@ -1017,7 +1017,7 @@ bool KConfigINIBackEnd::getEntryMap(KEntryMap &aTempMap, bool bGlobal,
 
     // put this entry from the config object into the
     // temporary map, possibly replacing an existing entry
-    KEntryMapIterator aIt2 = aTempMap.tqfind(aIt.key());
+    KEntryMapIterator aIt2 = aTempMap.find(aIt.key());
     if (aIt2 != aTempMap.end() && (*aIt2).bImmutable)
        continue; // Bail out if the on-disk entry is immutable
 
diff --git a/kdecore/kconfigbase.cpp b/kdecore/kconfigbase.cpp
index 0acd20041..1cbe1f3ab 100644
--- a/kdecore/kconfigbase.cpp
+++ b/kdecore/kconfigbase.cpp
@@ -272,7 +272,7 @@ TQString KConfigBase::readEntry( const char *pKey,
   if( expand || bExpand )
     {
       // check for environment variables and make necessary translations
-      int nDollarPos = aValue.tqfind( '$' );
+      int nDollarPos = aValue.find( '$' );
 
       while( nDollarPos != -1 && nDollarPos+1 < static_cast<int>(aValue.length())) {
         // there is at least one $
@@ -294,7 +294,7 @@ TQString KConfigBase::readEntry( const char *pKey,
              }
              pclose(fs);
           }
-          aValue.tqreplace( nDollarPos, nEndPos-nDollarPos, result );
+          aValue.replace( nDollarPos, nEndPos-nDollarPos, result );
         } else if( (aValue)[nDollarPos+1] != '$' ) {
           uint nEndPos = nDollarPos+1;
           // the next character is no $
@@ -320,7 +320,7 @@ TQString KConfigBase::readEntry( const char *pKey,
 	    // !!! Sergey A. Sukiyazov <corwin@micom.don.ru> !!!
 	    // A environment variables may contain values in 8bit
 	    // locale cpecified encoding or in UTF8 encoding.
-	    aValue.tqreplace( nDollarPos, nEndPos-nDollarPos, KStringHandler::from8Bit( pEnv ) );
+	    aValue.replace( nDollarPos, nEndPos-nDollarPos, KStringHandler::from8Bit( pEnv ) );
           } else
             aValue.remove( nDollarPos, nEndPos-nDollarPos );
         } else {
@@ -328,7 +328,7 @@ TQString KConfigBase::readEntry( const char *pKey,
           aValue.remove( nDollarPos, 1 );
           nDollarPos++;
         }
-        nDollarPos = aValue.tqfind( '$', nDollarPos );
+        nDollarPos = aValue.find( '$', nDollarPos );
       }
     }
 
@@ -697,12 +697,12 @@ unsigned long KConfigBase::readUnsignedLongNumEntry( const char *pKey, unsigned
     }
 }
 
-TQ_INT64 KConfigBase::readNum64Entry( const TQString& pKey, TQ_INT64 nDefault) const
+Q_INT64 KConfigBase::readNum64Entry( const TQString& pKey, Q_INT64 nDefault) const
 {
   return readNum64Entry(pKey.utf8().data(), nDefault);
 }
 
-TQ_INT64 KConfigBase::readNum64Entry( const char *pKey, TQ_INT64 nDefault) const
+Q_INT64 KConfigBase::readNum64Entry( const char *pKey, Q_INT64 nDefault) const
 {
   // Note that TQCString::toLongLong() is missing, we muse use a TQString instead.
   TQString aValue = readEntry( pKey );
@@ -711,18 +711,18 @@ TQ_INT64 KConfigBase::readNum64Entry( const char *pKey, TQ_INT64 nDefault) const
   else
     {
       bool ok;
-      TQ_INT64 rc = aValue.toLongLong( &ok );
+      Q_INT64 rc = aValue.toLongLong( &ok );
       return( ok ? rc : nDefault );
     }
 }
 
 
-TQ_UINT64 KConfigBase::readUnsignedNum64Entry( const TQString& pKey, TQ_UINT64 nDefault) const
+Q_UINT64 KConfigBase::readUnsignedNum64Entry( const TQString& pKey, Q_UINT64 nDefault) const
 {
   return readUnsignedNum64Entry(pKey.utf8().data(), nDefault);
 }
 
-TQ_UINT64 KConfigBase::readUnsignedNum64Entry( const char *pKey, TQ_UINT64 nDefault) const
+Q_UINT64 KConfigBase::readUnsignedNum64Entry( const char *pKey, Q_UINT64 nDefault) const
 {
   // Note that TQCString::toULongLong() is missing, we muse use a TQString instead.
   TQString aValue = readEntry( pKey );
@@ -731,7 +731,7 @@ TQ_UINT64 KConfigBase::readUnsignedNum64Entry( const char *pKey, TQ_UINT64 nDefa
   else
     {
       bool ok;
-      TQ_UINT64 rc = aValue.toULongLong( &ok );
+      Q_UINT64 rc = aValue.toULongLong( &ok );
       return( ok ? rc : nDefault );
     }
 }
@@ -793,7 +793,7 @@ TQFont KConfigBase::readFontEntry( const char *pKey, const TQFont* pDefault ) co
 
   TQString aValue = readEntry( pKey );
   if( !aValue.isNull() ) {
-    if ( aValue.tqcontains( ',' ) > 5 ) {
+    if ( aValue.contains( ',' ) > 5 ) {
       // KDE3 and upwards entry
       if ( !aRetFont.fromString( aValue ) && pDefault )
         aRetFont = *pDefault;
@@ -801,8 +801,8 @@ TQFont KConfigBase::readFontEntry( const char *pKey, const TQFont* pDefault ) co
     else {
       // backward compatibility with older font formats
       // ### remove KDE 3.1 ?
-      // tqfind first part (font family)
-      int nIndex = aValue.tqfind( ',' );
+      // find first part (font family)
+      int nIndex = aValue.find( ',' );
       if( nIndex == -1 ){
         if( pDefault )
           aRetFont = *pDefault;
@@ -810,9 +810,9 @@ TQFont KConfigBase::readFontEntry( const char *pKey, const TQFont* pDefault ) co
       }
       aRetFont.setFamily( aValue.left( nIndex ) );
 
-      // tqfind second part (point size)
+      // find second part (point size)
       int nOldIndex = nIndex;
-      nIndex = aValue.tqfind( ',', nOldIndex+1 );
+      nIndex = aValue.find( ',', nOldIndex+1 );
       if( nIndex == -1 ){
         if( pDefault )
           aRetFont = *pDefault;
@@ -822,9 +822,9 @@ TQFont KConfigBase::readFontEntry( const char *pKey, const TQFont* pDefault ) co
       aRetFont.setPointSize( aValue.mid( nOldIndex+1,
                                          nIndex-nOldIndex-1 ).toInt() );
 
-      // tqfind third part (style hint)
+      // find third part (style hint)
       nOldIndex = nIndex;
-      nIndex = aValue.tqfind( ',', nOldIndex+1 );
+      nIndex = aValue.find( ',', nOldIndex+1 );
 
       if( nIndex == -1 ){
         if( pDefault )
@@ -834,9 +834,9 @@ TQFont KConfigBase::readFontEntry( const char *pKey, const TQFont* pDefault ) co
 
       aRetFont.setStyleHint( (TQFont::StyleHint)aValue.mid( nOldIndex+1, nIndex-nOldIndex-1 ).toUInt() );
 
-      // tqfind fourth part (char set)
+      // find fourth part (char set)
       nOldIndex = nIndex;
-      nIndex = aValue.tqfind( ',', nOldIndex+1 );
+      nIndex = aValue.find( ',', nOldIndex+1 );
 
       if( nIndex == -1 ){
         if( pDefault )
@@ -846,9 +846,9 @@ TQFont KConfigBase::readFontEntry( const char *pKey, const TQFont* pDefault ) co
 
       TQString chStr=aValue.mid( nOldIndex+1,
                                 nIndex-nOldIndex-1 );
-      // tqfind fifth part (weight)
+      // find fifth part (weight)
       nOldIndex = nIndex;
-      nIndex = aValue.tqfind( ',', nOldIndex+1 );
+      nIndex = aValue.find( ',', nOldIndex+1 );
 
       if( nIndex == -1 ){
         if( pDefault )
@@ -859,7 +859,7 @@ TQFont KConfigBase::readFontEntry( const char *pKey, const TQFont* pDefault ) co
       aRetFont.setWeight( aValue.mid( nOldIndex+1,
                                       nIndex-nOldIndex-1 ).toUInt() );
 
-      // tqfind sixth part (font bits)
+      // find sixth part (font bits)
       uint nFontBits = aValue.right( aValue.length()-nIndex-1 ).toUInt();
 
       aRetFont.setItalic( nFontBits & 0x01 );
@@ -978,8 +978,8 @@ TQColor KConfigBase::readColorEntry( const char *pKey,
 
           bool bOK;
 
-          // tqfind first part (red)
-          int nIndex = aValue.tqfind( ',' );
+          // find first part (red)
+          int nIndex = aValue.find( ',' );
 
           if( nIndex == -1 ){
             // return a sensible default -- Bernd
@@ -990,9 +990,9 @@ TQColor KConfigBase::readColorEntry( const char *pKey,
 
           nRed = aValue.left( nIndex ).toInt( &bOK );
 
-          // tqfind second part (green)
+          // find second part (green)
           int nOldIndex = nIndex;
-          nIndex = aValue.tqfind( ',', nOldIndex+1 );
+          nIndex = aValue.find( ',', nOldIndex+1 );
 
           if( nIndex == -1 ){
             // return a sensible default -- Bernd
@@ -1003,7 +1003,7 @@ TQColor KConfigBase::readColorEntry( const char *pKey,
           nGreen = aValue.mid( nOldIndex+1,
                                nIndex-nOldIndex-1 ).toInt( &bOK );
 
-          // tqfind third part (blue)
+          // find third part (blue)
           nBlue = aValue.right( aValue.length()-nIndex-1 ).toInt( &bOK );
 
           aRetColor.setRgb( nRed, nGreen, nBlue );
@@ -1025,7 +1025,7 @@ TQDateTime KConfigBase::readDateTimeEntry( const TQString& pKey,
   return readDateTimeEntry(pKey.utf8().data(), pDefault);
 }
 
-// ### tqcurrentDateTime() as fallback ? (Harri)
+// ### currentDateTime() as fallback ? (Harri)
 TQDateTime KConfigBase::readDateTimeEntry( const char *pKey,
                                           const TQDateTime* pDefault ) const
 {
@@ -1034,7 +1034,7 @@ TQDateTime KConfigBase::readDateTimeEntry( const char *pKey,
       if( pDefault )
         return *pDefault;
       else
-        return TQDateTime::tqcurrentDateTime();
+        return TQDateTime::currentDateTime();
     }
 
   TQStrList list;
@@ -1048,7 +1048,7 @@ TQDateTime KConfigBase::readDateTimeEntry( const char *pKey,
     return TQDateTime( date, time );
   }
 
-  return TQDateTime::tqcurrentDateTime();
+  return TQDateTime::currentDateTime();
 }
 
 void KConfigBase::writeEntry( const TQString& pKey, const TQString& value,
@@ -1119,9 +1119,9 @@ static bool cleanHomeDirPath( TQString &path, const TQString &homeDir )
 #endif
 
    unsigned int len = homeDir.length();
-   // tqreplace by "$HOME" if possible
+   // replace by "$HOME" if possible
    if (len && (path.length() == len || path[len] == '/')) {
-        path.tqreplace(0, len, TQString::tqfromLatin1("$HOME"));
+        path.replace(0, len, TQString::fromLatin1("$HOME"));
         return true;
    } else
         return false;
@@ -1133,7 +1133,7 @@ static TQString translatePath( TQString path )
        return path;
 
    // only "our" $HOME should be interpreted
-   path.tqreplace('$', "$$");
+   path.replace('$', "$$");
 
    bool startsWithFile = path.startsWith("file:", false);
 
@@ -1160,7 +1160,7 @@ static TQString translatePath( TQString path )
    if (cleanHomeDirPath(path, homeDir0) ||
        cleanHomeDirPath(path, homeDir1) ||
        cleanHomeDirPath(path, homeDir2) ) {
-     // kdDebug() << "Path was tqreplaced\n";
+     // kdDebug() << "Path was replaced\n";
    }
 
    if (startsWithFile)
@@ -1189,7 +1189,7 @@ void KConfigBase::writePathEntry ( const char *pKey, const TQStringList &list,
 {
   if( list.isEmpty() )
     {
-      writeEntry( pKey, TQString::tqfromLatin1(""), bPersistent );
+      writeEntry( pKey, TQString::fromLatin1(""), bPersistent );
       return;
     }
   TQStringList new_list;
@@ -1402,7 +1402,7 @@ void KConfigBase::writeEntry ( const char *pKey, const TQStrList &list,
 {
   if( list.isEmpty() )
     {
-      writeEntry( pKey, TQString::tqfromLatin1(""), bPersistent );
+      writeEntry( pKey, TQString::fromLatin1(""), bPersistent );
       return;
     }
   TQString str_list;
@@ -1449,7 +1449,7 @@ void KConfigBase::writeEntry ( const char *pKey, const TQStringList &list,
 {
   if( list.isEmpty() )
     {
-      writeEntry( pKey, TQString::tqfromLatin1(""), bPersistent );
+      writeEntry( pKey, TQString::fromLatin1(""), bPersistent );
       return;
     }
   TQString str_list;
@@ -1548,14 +1548,14 @@ void KConfigBase::writeEntry( const char *pKey, unsigned long nValue,
   writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::writeEntry( const TQString& pKey, TQ_INT64 nValue,
+void KConfigBase::writeEntry( const TQString& pKey, Q_INT64 nValue,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
   writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::writeEntry( const char *pKey, TQ_INT64 nValue,
+void KConfigBase::writeEntry( const char *pKey, Q_INT64 nValue,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
@@ -1563,14 +1563,14 @@ void KConfigBase::writeEntry( const char *pKey, TQ_INT64 nValue,
 }
 
 
-void KConfigBase::writeEntry( const TQString& pKey, TQ_UINT64 nValue,
+void KConfigBase::writeEntry( const TQString& pKey, Q_UINT64 nValue,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
   writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::writeEntry( const char *pKey, TQ_UINT64 nValue,
+void KConfigBase::writeEntry( const char *pKey, Q_UINT64 nValue,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
diff --git a/kdecore/kconfigbase.h b/kdecore/kconfigbase.h
index e557aed3d..cc7ad8ffe 100644
--- a/kdecore/kconfigbase.h
+++ b/kdecore/kconfigbase.h
@@ -67,7 +67,7 @@ class KConfigGroup;
  * @see KSimpleConfig
  * @see KSharedConfig
  */
-class KDECORE_EXPORT KConfigBase : public TQObject
+class KDECORE_EXPORT KConfigBase : public QObject
 {
   Q_OBJECT
 
@@ -461,7 +461,7 @@ public:
    * the read value cannot be interpreted.
    * @return The value for this key.
    */
-  TQ_INT64 readNum64Entry( const TQString& pKey, TQ_INT64 nDefault = 0 ) const;
+  Q_INT64 readNum64Entry( const TQString& pKey, Q_INT64 nDefault = 0 ) const;
 
   /**
    * Reads a 64-bit numerical value.
@@ -474,7 +474,7 @@ public:
    * the read value cannot be interpreted.
    * @return The value for this key.
    */
-  TQ_INT64 readNum64Entry( const char *pKey, TQ_INT64 nDefault = 0 ) const;
+  Q_INT64 readNum64Entry( const char *pKey, Q_INT64 nDefault = 0 ) const;
 
   /**
    * Read an 64-bit unsigned numerical value.
@@ -487,7 +487,7 @@ public:
    * the read value cannot be interpreted.
    * @return The value for this key.
    */
-  TQ_UINT64 readUnsignedNum64Entry( const TQString& pKey, TQ_UINT64 nDefault = 0 ) const;
+  Q_UINT64 readUnsignedNum64Entry( const TQString& pKey, Q_UINT64 nDefault = 0 ) const;
 
   /**
    * Read an 64-bit unsigned numerical value.
@@ -500,7 +500,7 @@ public:
    * the read value cannot be interpreted.
    * @return The value for this key.
    */
-  TQ_UINT64 readUnsignedNum64Entry( const char *pKey, TQ_UINT64 nDefault = 0 ) const;
+  Q_UINT64 readUnsignedNum64Entry( const char *pKey, Q_UINT64 nDefault = 0 ) const;
 
   /**
    * Reads a floating point value.
@@ -692,7 +692,7 @@ public:
    * and interpret it as a date and time.
    *
    * @param pKey The key to search for.
-   * @param pDefault A default value ( tqcurrentDateTime() by default)
+   * @param pDefault A default value ( currentDateTime() by default)
    * returned if the key was not found or if the read value cannot be
    * interpreted.
    * @return The value for this key.
@@ -706,7 +706,7 @@ public:
    * and interpret it as a date and time.
    *
    * @param pKey The key to search for.
-   * @param pDefault A default value ( tqcurrentDateTime() by default)
+   * @param pDefault A default value ( currentDateTime() by default)
    * returned if the key was not found or if the read value cannot be
    * interpreted.
    * @return The value for this key.
@@ -978,7 +978,7 @@ public:
   void writeEntry( const TQString& pKey, const char *pValue,
                       bool bPersistent = true, bool bGlobal = false,
                       bool bNLS = false )
-    { writeEntry(pKey, TQString::tqfromLatin1(pValue), bPersistent, bGlobal, bNLS); }
+    { writeEntry(pKey, TQString::fromLatin1(pValue), bPersistent, bGlobal, bNLS); }
   /**
    * Write a (key/value) pair.
    *
@@ -999,7 +999,7 @@ public:
   void writeEntry( const char *pKey, const char *pValue,
                       bool bPersistent = true, bool bGlobal = false,
                       bool bNLS = false )
-    { writeEntry(pKey, TQString::tqfromLatin1(pValue), bPersistent, bGlobal, bNLS); }
+    { writeEntry(pKey, TQString::fromLatin1(pValue), bPersistent, bGlobal, bNLS); }
 
   /**
    * Write a (key/value) pair.
@@ -1159,7 +1159,7 @@ public:
    * @param bNLS        If @p bNLS is true, the locale tag is added to the key
    *  when writing it back.
    */
-  void writeEntry( const TQString& pKey, TQ_INT64 nValue,
+  void writeEntry( const TQString& pKey, Q_INT64 nValue,
                       bool bPersistent = true, bool bGlobal = false,
                       bool bNLS = false );
   /**
@@ -1176,7 +1176,7 @@ public:
    * @param bNLS        If @p bNLS is true, the locale tag is added to the key
    *  when writing it back.
    */
-  void writeEntry( const char *pKey, TQ_INT64 nValue,
+  void writeEntry( const char *pKey, Q_INT64 nValue,
                       bool bPersistent = true, bool bGlobal = false,
                       bool bNLS = false );
 
@@ -1194,7 +1194,7 @@ public:
    * @param bNLS        If @p bNLS is true, the locale tag is added to the key
    *  when writing it back.
    */
-  void writeEntry( const TQString& pKey, TQ_UINT64 nValue,
+  void writeEntry( const TQString& pKey, Q_UINT64 nValue,
                       bool bPersistent = true, bool bGlobal = false,
                       bool bNLS = false );
   /**
@@ -1211,7 +1211,7 @@ public:
    * @param bNLS        If @p bNLS is true, the locale tag is added to the key
    *  when writing it back.
    */
-  void writeEntry( const char *pKey, TQ_UINT64 nValue,
+  void writeEntry( const char *pKey, Q_UINT64 nValue,
                       bool bPersistent = true, bool bGlobal = false,
                       bool bNLS = false );
 
@@ -1538,7 +1538,7 @@ public:
    * Writes a file path.
    *
    * It is checked whether the path is located under $HOME. If so the
-   * path is written out with the user's home-directory tqreplaced with
+   * path is written out with the user's home-directory replaced with
    * $HOME. The path should be read back with readPathEntry()
    *
    * @param pKey The key to write.
@@ -1558,7 +1558,7 @@ public:
    * Writes a file path.
    *
    * It is checked whether the path is located under $HOME. If so the
-   * path is written out with the user's home-directory tqreplaced with
+   * path is written out with the user's home-directory replaced with
    * $HOME. The path should be read back with readPathEntry()
    *
    * @param pKey The key to write.
@@ -1579,7 +1579,7 @@ public:
    * writePathEntry() overridden to accept a list of paths (strings).
    *
    * It is checked whether the paths are located under $HOME. If so each of
-   * the paths are written out with the user's home-directory tqreplaced with
+   * the paths are written out with the user's home-directory replaced with
    * $HOME. The paths should be read back with readPathListEntry()
    *
    * @param pKey The key to write
@@ -1604,7 +1604,7 @@ public:
    * writePathEntry() overridden to accept a list of paths (strings).
    *
    * It is checked whether the paths are located under $HOME. If so each of
-   * the paths are written out with the user's home-directory tqreplaced with
+   * the paths are written out with the user's home-directory replaced with
    * $HOME. The paths should be read back with readPathListEntry()
    *
    * @param pKey The key to write
@@ -1942,9 +1942,9 @@ protected:
    * Do not use this function, the implementation / return type are
    * subject to change.
    *
-   * @param _key The key to insert.  It tqcontains information both on
+   * @param _key The key to insert.  It contains information both on
    *        the group of the key and the key itself. If the key already
-   *        exists, the old value will be tqreplaced.
+   *        exists, the old value will be replaced.
    * @param _data the KEntry that is to be stored.
    * @param _checkGroup When false, assume that the group already exists.
    * @internal
@@ -1959,7 +1959,7 @@ protected:
    * Do not use this function, the implementation and return type are
    * subject to change.
    *
-   * @param _key The key to look up  It tqcontains information both on
+   * @param _key The key to look up  It contains information both on
    *        the group of the key and the entry's key itself.
    * @return The KEntry value (data) found for the key.  @p KEntry.aValue
    * will be the null string if nothing was located.
diff --git a/kdecore/kconfigdialogmanager.cpp b/kdecore/kconfigdialogmanager.cpp
index c23750300..1d89bf49b 100644
--- a/kdecore/kconfigdialogmanager.cpp
+++ b/kdecore/kconfigdialogmanager.cpp
@@ -117,7 +117,7 @@ void KConfigDialogManager::init(bool trackChanges)
     changedMap.insert( "KDoubleNumInput", TQT_SIGNAL(valueChanged (double)));
   }
 
-  // Go through all of the children of the widgets and tqfind all known widgets
+  // Go through all of the children of the widgets and find all known widgets
   (void) parseChildren(m_dialog, trackChanges);
 }
 
@@ -131,13 +131,13 @@ void KConfigDialogManager::setupWidget(TQWidget *widget, KConfigSkeletonItem *it
   TQVariant minValue = item->minValue();
   if (minValue.isValid())
   {
-    if (widget->tqmetaObject()->tqfindProperty("minValue", true) != -1)
+    if (widget->metaObject()->findProperty("minValue", true) != -1)
        widget->setProperty("minValue", minValue);
   }
   TQVariant maxValue = item->maxValue();
   if (maxValue.isValid())
   {
-    if (widget->tqmetaObject()->tqfindProperty("maxValue", true) != -1)
+    if (widget->metaObject()->findProperty("maxValue", true) != -1)
        widget->setProperty("maxValue", maxValue);
   }
   if (TQWhatsThis::textFor( widget ).isEmpty())
@@ -153,12 +153,12 @@ void KConfigDialogManager::setupWidget(TQWidget *widget, KConfigSkeletonItem *it
 bool KConfigDialogManager::parseChildren(const TQWidget *widget, bool trackChanges)
 {
   bool valueChanged = false;
-  const TQObjectList listOfChildren = widget->tqchildren();
-  if(listOfChildren.isEmpty())
+  const TQObjectList *listOfChildren = widget->children();
+  if(!listOfChildren)
     return valueChanged;
 
   TQObject *object;
-  for( TQObjectListIterator it( listOfChildren );
+  for( TQObjectListIterator it( *listOfChildren );
        (object = it.current()); ++it )
   {
     if(!object->isWidgetType())
@@ -174,14 +174,14 @@ bool KConfigDialogManager::parseChildren(const TQWidget *widget, bool trackChang
     {
       // This is one of our widgets!
       TQString configId = widgetName+5;
-      KConfigSkeletonItem *item = m_conf->tqfindItem(configId);
+      KConfigSkeletonItem *item = m_conf->findItem(configId);
       if (item)
       {
         d->knownWidget.insert(configId, childWidget);
 
         setupWidget(childWidget, item);
 
-        TQMap<TQString, TQCString>::const_iterator changedIt = changedMap.tqfind(childWidget->className());
+        TQMap<TQString, TQCString>::const_iterator changedIt = changedMap.find(childWidget->className());
 
         if (changedIt == changedMap.end())
         {
@@ -189,7 +189,7 @@ bool KConfigDialogManager::parseChildren(const TQWidget *widget, bool trackChang
 		   // it again using the super class name. This fixes a problem with using QtRuby/Korundum 
 		   // widgets with KConfigXT where 'Qt::Widget' wasn't being seen a the real deal, even 
 		   // though it was a 'QWidget'.
-          changedIt = changedMap.tqfind(childWidget->tqmetaObject()->superClassName());
+          changedIt = changedMap.find(childWidget->metaObject()->superClassName());
         }
 
         if (changedIt == changedMap.end())
@@ -236,7 +236,7 @@ bool KConfigDialogManager::parseChildren(const TQWidget *widget, bool trackChang
 #ifndef NDEBUG
     else if (widgetName)
     {
-      TQMap<TQString, TQCString>::const_iterator changedIt = changedMap.tqfind(childWidget->className());
+      TQMap<TQString, TQCString>::const_iterator changedIt = changedMap.find(childWidget->className());
       if (changedIt != changedMap.end())
       {
         if ((!d->insideGroupBox || !childWidget->inherits("QRadioButton")) && 
@@ -267,7 +267,7 @@ void KConfigDialogManager::updateWidgets()
   for( TQDictIterator<TQWidget> it( d->knownWidget );
        (widget = it.current()); ++it )
   {
-     KConfigSkeletonItem *item = m_conf->tqfindItem(it.currentKey());
+     KConfigSkeletonItem *item = m_conf->findItem(it.currentKey());
      if (!item)
      {
         kdWarning(178) << "The setting '" << it.currentKey() << "' has disappeared!" << endl;
@@ -284,7 +284,7 @@ void KConfigDialogManager::updateWidgets()
      if (item->isImmutable())
      {
         widget->setEnabled(false);
-        TQWidget *buddy = d->buddyWidget.tqfind(it.currentKey());
+        TQWidget *buddy = d->buddyWidget.find(it.currentKey());
         if (buddy)
            buddy->setEnabled(false);
      }
@@ -310,7 +310,7 @@ void KConfigDialogManager::updateSettings()
   for( TQDictIterator<TQWidget> it( d->knownWidget );
        (widget = it.current()); ++it )
   {
-     KConfigSkeletonItem *item = m_conf->tqfindItem(it.currentKey());
+     KConfigSkeletonItem *item = m_conf->findItem(it.currentKey());
      if (!item)
      {
         kdWarning(178) << "The setting '" << it.currentKey() << "' has disappeared!" << endl;
@@ -370,7 +370,7 @@ bool KConfigDialogManager::hasChanged()
   for( TQDictIterator<TQWidget> it( d->knownWidget );
        (widget = it.current()); ++it )
   {
-     KConfigSkeletonItem *item = m_conf->tqfindItem(it.currentKey());
+     KConfigSkeletonItem *item = m_conf->findItem(it.currentKey());
      if (!item)
      {
         kdWarning(178) << "The setting '" << it.currentKey() << "' has disappeared!" << endl;
diff --git a/kdecore/kconfigdialogmanager.h b/kdecore/kconfigdialogmanager.h
index 309f025bc..d0b385b60 100644
--- a/kdecore/kconfigdialogmanager.h
+++ b/kdecore/kconfigdialogmanager.h
@@ -91,7 +91,7 @@ signals:
    * TODO: Verify
    * One or more of the settings have been changed.
    * @param widget - The widget group (pass in via addWidget()) that
-   * tqcontains the one or more modified setting.
+   * contains the one or more modified setting.
    * @see settingsChanged()
    */
   void settingsChanged( TQWidget *widget );
@@ -111,7 +111,7 @@ public:
   /**
    * Constructor.
    * @param parent  Dialog widget to manage
-   * @param conf Object that tqcontains settings
+   * @param conf Object that contains settings
    * @param name - Object name.
    */
    KConfigDialogManager(TQWidget *parent, KConfigSkeleton *conf, const char *name=0);
@@ -176,7 +176,7 @@ protected:
   void init(bool trackChanges);
 
   /**
-   * Recursive function that tqfinds all known children.
+   * Recursive function that finds all known children.
    * Goes through the children of widget and if any are known and not being
    * ignored, stores them in currentGroup.  Also checks if the widget
    * should be disabled because it is set immutable.
diff --git a/kdecore/kconfigskeleton.cpp b/kdecore/kconfigskeleton.cpp
index 3e0f220b6..9e6070d6a 100644
--- a/kdecore/kconfigskeleton.cpp
+++ b/kdecore/kconfigskeleton.cpp
@@ -223,8 +223,8 @@ void KConfigSkeleton::ItemInt::setMaxValue(int v)
 
 
 KConfigSkeleton::ItemInt64::ItemInt64( const TQString &group, const TQString &key,
-                              TQ_INT64 &reference, TQ_INT64 defaultValue )
-  : KConfigSkeletonGenericItem<TQ_INT64>( group, key, reference, defaultValue )
+                              Q_INT64 &reference, Q_INT64 defaultValue )
+  : KConfigSkeletonGenericItem<Q_INT64>( group, key, reference, defaultValue )
   ,mHasMin(false), mHasMax(false)
 {
 }
@@ -266,13 +266,13 @@ TQVariant KConfigSkeleton::ItemInt64::maxValue() const
   return TQVariant();
 }
 
-void KConfigSkeleton::ItemInt64::setMinValue(TQ_INT64 v)
+void KConfigSkeleton::ItemInt64::setMinValue(Q_INT64 v)
 {
   mHasMin = true;
   mMin = v;
 }
 
-void KConfigSkeleton::ItemInt64::setMaxValue(TQ_INT64 v)
+void KConfigSkeleton::ItemInt64::setMaxValue(Q_INT64 v)
 {
   mHasMax = true;
   mMax = v;
@@ -394,8 +394,8 @@ void KConfigSkeleton::ItemUInt::setMaxValue(unsigned int v)
 
 
 KConfigSkeleton::ItemUInt64::ItemUInt64( const TQString &group, const TQString &key,
-                              TQ_UINT64 &reference, TQ_UINT64 defaultValue )
-  : KConfigSkeletonGenericItem<TQ_UINT64>( group, key, reference, defaultValue )
+                              Q_UINT64 &reference, Q_UINT64 defaultValue )
+  : KConfigSkeletonGenericItem<Q_UINT64>( group, key, reference, defaultValue )
   ,mHasMin(false), mHasMax(false)
 {
 }
@@ -437,13 +437,13 @@ TQVariant KConfigSkeleton::ItemUInt64::maxValue() const
   return TQVariant();
 }
 
-void KConfigSkeleton::ItemUInt64::setMinValue(TQ_UINT64 v)
+void KConfigSkeleton::ItemUInt64::setMinValue(Q_UINT64 v)
 {
   mHasMin = true;
   mMin = v;
 }
 
-void KConfigSkeleton::ItemUInt64::setMaxValue(TQ_UINT64 v)
+void KConfigSkeleton::ItemUInt64::setMaxValue(Q_UINT64 v)
 {
   mHasMax = true;
   mMax = v;
@@ -1065,8 +1065,8 @@ KConfigSkeleton::ItemUInt *KConfigSkeleton::addItemUInt( const TQString &name, u
   return item;
 }
 
-KConfigSkeleton::ItemInt64 *KConfigSkeleton::addItemInt64( const TQString &name, TQ_INT64 &reference,
-                                    TQ_INT64 defaultValue, const TQString &key )
+KConfigSkeleton::ItemInt64 *KConfigSkeleton::addItemInt64( const TQString &name, Q_INT64 &reference,
+                                    Q_INT64 defaultValue, const TQString &key )
 {
   KConfigSkeleton::ItemInt64 *item;
   item = new KConfigSkeleton::ItemInt64( mCurrentGroup, key.isNull() ? name : key,
@@ -1075,8 +1075,8 @@ KConfigSkeleton::ItemInt64 *KConfigSkeleton::addItemInt64( const TQString &name,
   return item;
 }
 
-KConfigSkeleton::ItemUInt64 *KConfigSkeleton::addItemUInt64( const TQString &name, TQ_UINT64 &reference,
-                                     TQ_UINT64 defaultValue, const TQString &key )
+KConfigSkeleton::ItemUInt64 *KConfigSkeleton::addItemUInt64( const TQString &name, Q_UINT64 &reference,
+                                     Q_UINT64 defaultValue, const TQString &key )
 {
   KConfigSkeleton::ItemUInt64 *item;
   item = new KConfigSkeleton::ItemUInt64( mCurrentGroup, key.isNull() ? name : key,
@@ -1197,11 +1197,11 @@ KConfigSkeleton::ItemIntList *KConfigSkeleton::addItemIntList( const TQString &n
 
 bool KConfigSkeleton::isImmutable(const TQString &name)
 {
-  KConfigSkeletonItem *item = tqfindItem(name);
+  KConfigSkeletonItem *item = findItem(name);
   return !item || item->isImmutable();
 }
 
-KConfigSkeletonItem *KConfigSkeleton::tqfindItem(const TQString &name)
+KConfigSkeletonItem *KConfigSkeleton::findItem(const TQString &name)
 {
-  return mItemDict.tqfind(name);
+  return mItemDict.find(name);
 }
diff --git a/kdecore/kconfigskeleton.h b/kdecore/kconfigskeleton.h
index e6c3b8d20..82185c090 100644
--- a/kdecore/kconfigskeleton.h
+++ b/kdecore/kconfigskeleton.h
@@ -376,7 +376,7 @@ public:
 
     ItemString(const TQString & group, const TQString & key,
                TQString & reference,
-               const TQString & defaultValue = TQString::tqfromLatin1(""), // NOT TQString::null !!
+               const TQString & defaultValue = TQString::fromLatin1(""), // NOT TQString::null !!
                Type type = Normal);
 
     void writeConfig(KConfig * config);
@@ -396,7 +396,7 @@ public:
   public:
     ItemPassword(const TQString & group, const TQString & key,
                TQString & reference,
-               const TQString & defaultValue = TQString::tqfromLatin1("")); // NOT TQString::null !!
+               const TQString & defaultValue = TQString::fromLatin1("")); // NOT TQString::null !!
   };
 
   /**
@@ -469,11 +469,11 @@ public:
   /**
    * Class for handling an 64-bit integer preferences item.
    */
-  class KDECORE_EXPORT ItemInt64:public KConfigSkeletonGenericItem < TQ_INT64 >
+  class KDECORE_EXPORT ItemInt64:public KConfigSkeletonGenericItem < Q_INT64 >
   {
   public:
-    ItemInt64(const TQString & group, const TQString & key, TQ_INT64 &reference,
-            TQ_INT64 defaultValue = 0);
+    ItemInt64(const TQString & group, const TQString & key, Q_INT64 &reference,
+            Q_INT64 defaultValue = 0);
 
     void readConfig(KConfig * config);
     void setProperty(const TQVariant & p);
@@ -482,14 +482,14 @@ public:
     TQVariant minValue() const;
     TQVariant maxValue() const;
 
-    void setMinValue(TQ_INT64);
-    void setMaxValue(TQ_INT64);
+    void setMinValue(Q_INT64);
+    void setMaxValue(Q_INT64);
     
   private:  
     bool mHasMin : 1;
     bool mHasMax : 1;
-    TQ_INT64 mMin;
-    TQ_INT64 mMax;
+    Q_INT64 mMin;
+    Q_INT64 mMax;
   };
 
   /**
@@ -598,11 +598,11 @@ public:
   /**
    * Class for handling unsigned 64-bit integer preferences item.
    */
-  class KDECORE_EXPORT ItemUInt64:public KConfigSkeletonGenericItem < TQ_UINT64 >
+  class KDECORE_EXPORT ItemUInt64:public KConfigSkeletonGenericItem < Q_UINT64 >
   {
   public:
-    ItemUInt64(const TQString & group, const TQString & key, TQ_UINT64 &reference,
-            TQ_UINT64 defaultValue = 0);
+    ItemUInt64(const TQString & group, const TQString & key, Q_UINT64 &reference,
+            Q_UINT64 defaultValue = 0);
 
     void readConfig(KConfig * config);
     void setProperty(const TQVariant & p);
@@ -611,14 +611,14 @@ public:
     TQVariant minValue() const;
     TQVariant maxValue() const;
 
-    void setMinValue(TQ_UINT64);
-    void setMaxValue(TQ_UINT64);
+    void setMinValue(Q_UINT64);
+    void setMaxValue(Q_UINT64);
     
   private:  
     bool mHasMin : 1;
     bool mHasMax : 1;
-    TQ_UINT64 mMin;
-    TQ_UINT64 mMax;
+    Q_UINT64 mMin;
+    Q_UINT64 mMax;
   };
 
   /**
@@ -859,7 +859,7 @@ public:
    * @return The created item
    */
   ItemString *addItemString(const TQString & name, TQString & reference,
-                            const TQString & defaultValue = TQString::tqfromLatin1(""), // NOT TQString::null !!
+                            const TQString & defaultValue = TQString::fromLatin1(""), // NOT TQString::null !!
                             const TQString & key = TQString::null);
 
   /**
@@ -876,7 +876,7 @@ public:
    * @return The created item
    */
   ItemPassword *addItemPassword(const TQString & name, TQString & reference,
-                              const TQString & defaultValue = TQString::tqfromLatin1(""),
+                              const TQString & defaultValue = TQString::fromLatin1(""),
                               const TQString & key = TQString::null);
 
   /**
@@ -893,7 +893,7 @@ public:
    * @return The created item
    */
   ItemPath *addItemPath(const TQString & name, TQString & reference,
-                          const TQString & defaultValue = TQString::tqfromLatin1(""),
+                          const TQString & defaultValue = TQString::fromLatin1(""),
                           const TQString & key = TQString::null);
 
   /**
@@ -987,7 +987,7 @@ public:
                           const TQString & key = TQString::null);
 
   /**
-   * Register an item of type TQ_INT64.
+   * Register an item of type Q_INT64.
    * 
    * @param name Name used to indentify this setting. Names must be unique.
    * @param reference Pointer to the variable, which is set by readConfig()
@@ -997,12 +997,12 @@ public:
    * @param key Key used in config file. If key is null, name is used as key.
    * @return The created item
    */
-  ItemInt64 *addItemInt64(const TQString & name, TQ_INT64 &reference,
-                          TQ_INT64 defaultValue = 0,
+  ItemInt64 *addItemInt64(const TQString & name, Q_INT64 &reference,
+                          Q_INT64 defaultValue = 0,
                           const TQString & key = TQString::null);
 
   /**
-   * Register an item of type TQ_UINT64
+   * Register an item of type Q_UINT64
    * 
    * @param name Name used to indentify this setting. Names must be unique.
    * @param reference Pointer to the variable, which is set by readConfig()
@@ -1012,8 +1012,8 @@ public:
    * @param key Key used in config file. If key is null, name is used as key.
    * @return The created item
    */
-  ItemUInt64 *addItemUInt64(const TQString & name, TQ_UINT64 &reference,
-                            TQ_UINT64 defaultValue = 0,
+  ItemUInt64 *addItemUInt64(const TQString & name, Q_UINT64 &reference,
+                            Q_UINT64 defaultValue = 0,
                             const TQString & key = TQString::null);
 
   /**
@@ -1174,7 +1174,7 @@ public:
   /**
    * Lookup item by name
    */
-  KConfigSkeletonItem * tqfindItem(const TQString & name);
+  KConfigSkeletonItem * findItem(const TQString & name);
 
   /**
    * Indicate whether this object should reflect the actual
@@ -1187,7 +1187,7 @@ public:
 protected:
   /**
    * Implemented by subclasses that use special defaults.
-   * It should tqreplace the default values with the actual
+   * It should replace the default values with the actual
    * values and vice versa.
    */
   virtual void usrUseDefaults(bool)
diff --git a/kdecore/kcrash.cpp b/kdecore/kcrash.cpp
index 63e7351c4..5642500f8 100644
--- a/kdecore/kcrash.cpp
+++ b/kdecore/kcrash.cpp
@@ -89,27 +89,27 @@ KCrash::setCrashHandler (HandlerType handler)
   if (!handler)
     handler = SIG_DFL;
 
-  sigset_t tqmask;
-  sigemptyset(&tqmask);
+  sigset_t mask;
+  sigemptyset(&mask);
 
 #ifdef SIGSEGV
   signal (SIGSEGV, handler);
-  sigaddset(&tqmask, SIGSEGV);
+  sigaddset(&mask, SIGSEGV);
 #endif
 #ifdef SIGFPE
   signal (SIGFPE, handler);
-  sigaddset(&tqmask, SIGFPE);
+  sigaddset(&mask, SIGFPE);
 #endif
 #ifdef SIGILL
   signal (SIGILL, handler);
-  sigaddset(&tqmask, SIGILL);
+  sigaddset(&mask, SIGILL);
 #endif
 #ifdef SIGABRT
   signal (SIGABRT, handler);
-  sigaddset(&tqmask, SIGABRT);
+  sigaddset(&mask, SIGABRT);
 #endif
 
-  sigprocmask(SIG_UNBLOCK, &tqmask, 0);
+  sigprocmask(SIG_UNBLOCK, &mask, 0);
 #endif //Q_OS_UNIX
 
   _crashHandler = handler;
diff --git a/kdecore/kdcoppropertyproxy.cpp b/kdecore/kdcoppropertyproxy.cpp
index 22390a4c4..bc720736f 100644
--- a/kdecore/kdcoppropertyproxy.cpp
+++ b/kdecore/kdcoppropertyproxy.cpp
@@ -94,12 +94,12 @@ TQValueList<TQCString> KDCOPPropertyProxy::functions( TQObject *object )
   res << "bool setProperty(TQCString name,TQVariant property)";
   res << "TQValueList<TQCString> propertyNames(bool super)";
 
-  TQMetaObject *metaObj = object->tqmetaObject();
+  TQMetaObject *metaObj = object->metaObject();
   TQStrList properties = metaObj->propertyNames( true );
   TQStrListIterator it( properties );
   for (; it.current(); ++it )
   {
-    const TQMetaProperty *metaProp = metaObj->property( metaObj->tqfindProperty( it.current(), true ), true );
+    const TQMetaProperty *metaProp = metaObj->property( metaObj->findProperty( it.current(), true ), true );
 
     assert( metaProp );
 
@@ -146,18 +146,18 @@ bool KDCOPPropertyProxy::processPropertyRequest( const TQCString &fun, const TQB
 
     replyType = "bool";
     TQDataStream reply( replyData, IO_WriteOnly );
-    reply << (TQ_INT8)object->setProperty( propName, propValue );
+    reply << (Q_INT8)object->setProperty( propName, propValue );
     return true;
   }
 
   if ( fun == "propertyNames(bool)" )
   {
-    TQ_INT8 b;
+    Q_INT8 b;
     TQDataStream stream( data, IO_ReadOnly );
     stream >> b;
 
     TQValueList<TQCString> res;
-    TQStrList props = object->tqmetaObject()->propertyNames( static_cast<bool>( b ) );
+    TQStrList props = object->metaObject()->propertyNames( static_cast<bool>( b ) );
     TQStrListIterator it( props );
     for (; it.current(); ++it )
       res.append( it.current() );
@@ -228,7 +228,7 @@ bool KDCOPPropertyProxy::processPropertyRequest( const TQCString &fun, const TQB
       DEMARSHAL( UInt, uint )
       case TQVariant::Bool:
       {
-        TQ_INT8 v;
+        Q_INT8 v;
         stream >> v;
         prop = TQVariant( static_cast<bool>( v ), 1 );
       }
@@ -283,7 +283,7 @@ bool KDCOPPropertyProxy::processPropertyRequest( const TQCString &fun, const TQB
       MARSHAL( Int )
       MARSHAL( UInt )
       case TQVariant::Bool:
-        reply << (TQ_INT8)prop.toBool();
+        reply << (Q_INT8)prop.toBool();
         break;
       MARSHAL( Double )
       default:
@@ -314,7 +314,7 @@ bool KDCOPPropertyProxy::decodePropertyRequestInternal( const TQCString &fun, TQ
     propName.detach();
     set = true;
     propName = propName.mid( 3 );
-    int p1 = propName.tqfind( '(' );
+    int p1 = propName.find( '(' );
 
     uint len = propName.length();
 
@@ -328,7 +328,7 @@ bool KDCOPPropertyProxy::decodePropertyRequestInternal( const TQCString &fun, TQ
   else
     propName.truncate( propName.length() - 2 );
 
-  if ( !object->tqmetaObject()->propertyNames( true ).tqcontains( propName ) )
+  if ( !object->metaObject()->propertyNames( true ).contains( propName ) )
     return false;
 
   return true;
diff --git a/kdecore/kde-config.cpp.cmake b/kdecore/kde-config.cpp.cmake
index 291329398..f7be1e2be 100644
--- a/kdecore/kde-config.cpp.cmake
+++ b/kdecore/kde-config.cpp.cmake
@@ -32,69 +32,69 @@ bool _expandvars = false;
 
 TQString expandvars(const char *_input)
 {
-    TQString result = TQString::tqfromLatin1(_input);
+    TQString result = TQString::fromLatin1(_input);
     if (!_expandvars)
         return result;
 
     bool changed = false;
-    int index = result.tqfind("${prefix}");
+    int index = result.find("${prefix}");
     if (index >= 0) {
-        result = result.tqreplace(index, 9, "@CMAKE_INSTALL_PREFIX@");
+        result = result.replace(index, 9, "@CMAKE_INSTALL_PREFIX@");
         changed = true;
     }
-    index = result.tqfind("$(prefix)");
+    index = result.find("$(prefix)");
     if (index >= 0) {
-        result = result.tqreplace(index, 9, "@CMAKE_INSTALL_PREFIX@");
+        result = result.replace(index, 9, "@CMAKE_INSTALL_PREFIX@");
         changed = true;
     }
-    index = result.tqfind("${datadir}");
+    index = result.find("${datadir}");
     if (index >= 0) {
-        result = result.tqreplace(index, 10, "@SHARE_INSTALL_PREFIX@");
+        result = result.replace(index, 10, "@SHARE_INSTALL_PREFIX@");
         changed = true;
     }
-    index = result.tqfind("$(datadir)");
+    index = result.find("$(datadir)");
     if (index >= 0) {
-        result = result.tqreplace(index, 10, "@SHARE_INSTALL_PREFIX@");
+        result = result.replace(index, 10, "@SHARE_INSTALL_PREFIX@");
         changed = true;
     }
-    index = result.tqfind("${exec_prefix}");
+    index = result.find("${exec_prefix}");
     if (index >= 0) {
-        result = result.tqreplace(index, 14, "@EXEC_INSTALL_PREFIX@");
+        result = result.replace(index, 14, "@EXEC_INSTALL_PREFIX@");
         changed = true;
     }
-    index = result.tqfind("$(exec_prefix)");
+    index = result.find("$(exec_prefix)");
     if (index >= 0) {
-        result = result.tqreplace(index, 14, "@EXEC_INSTALL_PREFIX@");
+        result = result.replace(index, 14, "@EXEC_INSTALL_PREFIX@");
         changed = true;
     }
-    index = result.tqfind("${libdir}");
+    index = result.find("${libdir}");
     if (index >= 0) {
-        result = result.tqreplace(index, 9, "@LIB_INSTALL_DIR@");
+        result = result.replace(index, 9, "@LIB_INSTALL_DIR@");
         changed = true;
     }
-    index = result.tqfind("$(libdir)");
+    index = result.find("$(libdir)");
     if (index >= 0) {
-        result = result.tqreplace(index, 9, "@LIB_INSTALL_DIR@");
+        result = result.replace(index, 9, "@LIB_INSTALL_DIR@");
         changed = true;
     }
-    index = result.tqfind("${includedir}");
+    index = result.find("${includedir}");
     if (index >= 0) {
-        result = result.tqreplace(index, 20, "@INCLUDE_INSTALL_DIR@");
+        result = result.replace(index, 20, "@INCLUDE_INSTALL_DIR@");
         changed = true;
     }
-    index = result.tqfind("$(includedir)");
+    index = result.find("$(includedir)");
     if (index >= 0) {
-        result = result.tqreplace(index, 20, "@INCLUDE_INSTALL_DIR@");
+        result = result.replace(index, 20, "@INCLUDE_INSTALL_DIR@");
         changed = true;
     }
-    index = result.tqfind("${sysconfdir}");
+    index = result.find("${sysconfdir}");
     if (index >= 0) {
-        result = result.tqreplace(index, 13, "@SYSCONF_INSTALL_DIR@");
+        result = result.replace(index, 13, "@SYSCONF_INSTALL_DIR@");
         changed = true;
     }
-    index = result.tqfind("$(sysconfdir)");
+    index = result.find("$(sysconfdir)");
     if (index >= 0) {
-        result = result.tqreplace(index, 13, "@SYSCONF_INSTALL_DIR@");
+        result = result.replace(index, 13, "@SYSCONF_INSTALL_DIR@");
         changed = true;
     }
     if (changed)
@@ -186,7 +186,7 @@ int main(int argc, char **argv)
             "wallpaper", I18N_NOOP("Wallpapers"),
             "xdgdata-apps", I18N_NOOP("XDG Application menu (.desktop files)"),
             "xdgdata-dirs", I18N_NOOP("XDG Menu descriptions (.directory files)"),
-            "xdgconf-menu", I18N_NOOP("XDG Menu tqlayout (.menu files)"),
+            "xdgconf-menu", I18N_NOOP("XDG Menu layout (.menu files)"),
             "cmake", I18N_NOOP("CMake import modules (.cmake files)"),
             "tmp", I18N_NOOP("Temporary files (specific for both current host and current user)"),
             "socket", I18N_NOOP("UNIX Sockets (specific for both current host and current user)"),
diff --git a/kdecore/kde-config.cpp.in b/kdecore/kde-config.cpp.in
index 738686f11..da9d41782 100644
--- a/kdecore/kde-config.cpp.in
+++ b/kdecore/kde-config.cpp.in
@@ -32,69 +32,69 @@ bool _expandvars = false;
 
 TQString expandvars(const char *_input)
 {
-    TQString result = TQString::tqfromLatin1(_input);
+    TQString result = TQString::fromLatin1(_input);
     if (!_expandvars)
         return result;
 
     bool changed = false;
-    int index = result.tqfind("${prefix}");
+    int index = result.find("${prefix}");
     if (index >= 0) {
-        result = result.tqreplace(index, 9, "@prefix@");
+        result = result.replace(index, 9, "@prefix@");
         changed = true;
     }
-    index = result.tqfind("$(prefix)");
+    index = result.find("$(prefix)");
     if (index >= 0) {
-        result = result.tqreplace(index, 9, "@prefix@");
+        result = result.replace(index, 9, "@prefix@");
         changed = true;
     }
-    index = result.tqfind("${datadir}");
+    index = result.find("${datadir}");
     if (index >= 0) {
-        result = result.tqreplace(index, 10, "@datadir@");
+        result = result.replace(index, 10, "@datadir@");
         changed = true;
     }
-    index = result.tqfind("$(datadir)");
+    index = result.find("$(datadir)");
     if (index >= 0) {
-        result = result.tqreplace(index, 10, "@datadir@");
+        result = result.replace(index, 10, "@datadir@");
         changed = true;
     }
-    index = result.tqfind("${exec_prefix}");
+    index = result.find("${exec_prefix}");
     if (index >= 0) {
-        result = result.tqreplace(index, 14, "@exec_prefix@");
+        result = result.replace(index, 14, "@exec_prefix@");
         changed = true;
     }
-    index = result.tqfind("$(exec_prefix)");
+    index = result.find("$(exec_prefix)");
     if (index >= 0) {
-        result = result.tqreplace(index, 14, "@exec_prefix@");
+        result = result.replace(index, 14, "@exec_prefix@");
         changed = true;
     }
-    index = result.tqfind("${libdir}");
+    index = result.find("${libdir}");
     if (index >= 0) {
-        result = result.tqreplace(index, 9, "@libdir@");
+        result = result.replace(index, 9, "@libdir@");
         changed = true;
     }
-    index = result.tqfind("$(libdir)");
+    index = result.find("$(libdir)");
     if (index >= 0) {
-        result = result.tqreplace(index, 9, "@libdir@");
+        result = result.replace(index, 9, "@libdir@");
         changed = true;
     }
-    index = result.tqfind("${includedir}");
+    index = result.find("${includedir}");
     if (index >= 0) {
-        result = result.tqreplace(index, 20, "@includedir@");
+        result = result.replace(index, 20, "@includedir@");
         changed = true;
     }
-    index = result.tqfind("$(includedir)");
+    index = result.find("$(includedir)");
     if (index >= 0) {
-        result = result.tqreplace(index, 20, "@includedir@");
+        result = result.replace(index, 20, "@includedir@");
         changed = true;
     }
-    index = result.tqfind("${sysconfdir}");
+    index = result.find("${sysconfdir}");
     if (index >= 0) {
-        result = result.tqreplace(index, 13, "@sysconfdir@");
+        result = result.replace(index, 13, "@sysconfdir@");
         changed = true;
     }
-    index = result.tqfind("$(sysconfdir)");
+    index = result.find("$(sysconfdir)");
     if (index >= 0) {
-        result = result.tqreplace(index, 13, "@sysconfdir@");
+        result = result.replace(index, 13, "@sysconfdir@");
         changed = true;
     }
     if (changed)
@@ -186,7 +186,7 @@ int main(int argc, char **argv)
             "wallpaper", I18N_NOOP("Wallpapers"),
             "xdgdata-apps", I18N_NOOP("XDG Application menu (.desktop files)"),
             "xdgdata-dirs", I18N_NOOP("XDG Menu descriptions (.directory files)"),
-            "xdgconf-menu", I18N_NOOP("XDG Menu tqlayout (.menu files)"),
+            "xdgconf-menu", I18N_NOOP("XDG Menu layout (.menu files)"),
             "tmp", I18N_NOOP("Temporary files (specific for both current host and current user)"),
             "socket", I18N_NOOP("UNIX Sockets (specific for both current host and current user)"),
             0, 0
diff --git a/kdecore/kdebug.areas b/kdecore/kdebug.areas
index d98e54df6..d1dc1ffa1 100644
--- a/kdecore/kdebug.areas
+++ b/kdecore/kdebug.areas
@@ -81,7 +81,7 @@
 1210        kicker
 1211        konsole
 1212        kwin
-1213        kapptqfinder
+1213        kappfinder
 1214        kdesktop (icons)
 1215        ksysguard
 1216        kwin (client errors)
@@ -107,10 +107,10 @@
 1511        kdessh (kdeutils)
 1512        kdepasswd (kdeutils)
 1601        ark (kdeutils)
-1901        ktqfind
-1902        ktqfind (KtqfindWindow::updateResults)
-1903        ktqfind (KtqfindTabDialog::createQuery)
-2000        ktqfind
+1901        kfind
+1902        kfind (KfindWindow::updateResults)
+1903        kfind (KfindTabDialog::createQuery)
+2000        kfind
 2001        kregexpeditor
 2002        kfloppy
 2003        ksim
@@ -427,11 +427,11 @@
 20011        KDB (Connection)
 20012        KDB (plugin)
 
-#kfiletqreplace
-23000 	     KFileReplace (kfiletqreplacepart)
+#kfilereplace
+23000 	     KFileReplace (kfilereplacepart)
 
 #klinkstatus
-23100        KLinktqStatus
+23100        KLinkStatus
 
 # Quanta
 24000        Quanta
diff --git a/kdecore/kdebug.cpp b/kdecore/kdebug.cpp
index 60e765f29..b581b5fdd 100644
--- a/kdecore/kdebug.cpp
+++ b/kdecore/kdebug.cpp
@@ -86,7 +86,7 @@ static TQCString getDescrFromNum(unsigned int _num)
     KDebugCache->setAutoDelete(true);
   }
 
-  KDebugEntry *ent = KDebugCache->tqfind( _num );
+  KDebugEntry *ent = KDebugCache->find( _num );
   if ( ent )
     return ent->descr;
 
@@ -130,7 +130,7 @@ static TQCString getDescrFromNum(unsigned int _num)
           ch=line[++i];
       } while ( ch >= '0' && ch <= '9');
 
-      const TQ_ULONG number =line.mid(numStart,i).toULong();
+      const Q_ULONG number =line.mid(numStart,i).toULong();
 
       while (line[i] && line[i] <= ' ')
         i++;
@@ -139,7 +139,7 @@ static TQCString getDescrFromNum(unsigned int _num)
   }
   file.close();
 
-  ent = KDebugCache->tqfind( _num );
+  ent = KDebugCache->find( _num );
   if ( ent )
       return ent->descr;
 
@@ -373,7 +373,7 @@ kdbgstream& kdbgstream::operator << (TQChar ch)
 {
   if (!print) return *this;
   if (!ch.isPrint())
-    output += "\\x" + TQString::number( ch.tqunicode(), 16 ).rightJustify(2, '0');
+    output += "\\x" + TQString::number( ch.unicode(), 16 ).rightJustify(2, '0');
   else {
     output += ch;
     if (ch == (QChar)'\n') flush();
@@ -403,7 +403,7 @@ kdbgstream& kdbgstream::operator << (const TQWidget* widget)
 	} else {
 	  string += (TQString)" to widget " + widget->name() + ", ";
 	}
-      string += "tqgeometry="
+      string += "geometry="
 	+ TQString().setNum(widget->width())
 	+ "x"+TQString().setNum(widget->height())
 	+ "+"+TQString().setNum(widget->x())
@@ -567,8 +567,8 @@ TQString kdBacktrace(int levels)
 
     for (int i = 0; i < n; ++i)
         s += TQString::number(i) +
-             TQString::tqfromLatin1(": ") +
-             TQString::tqfromLatin1(strings[i]) + TQString::tqfromLatin1("\n");
+             TQString::fromLatin1(": ") +
+             TQString::fromLatin1(strings[i]) + TQString::fromLatin1("\n");
     s += "]\n";
     if (strings)
         free (strings);
diff --git a/kdecore/kdebug.h b/kdecore/kdebug.h
index cd472174c..7d9dd5957 100644
--- a/kdecore/kdebug.h
+++ b/kdecore/kdebug.h
@@ -85,7 +85,7 @@ class KDECORE_EXPORT kdbgstream {
     kdbgstream(unsigned int _area, unsigned int _level, bool _print = true) :
       area(_area), level(_level),  print(_print) { }
     kdbgstream(const char * initialString, unsigned int _area, unsigned int _level, bool _print = true) :
-      output(TQString::tqfromLatin1(initialString)), area(_area), level(_level),  print(_print) { }
+      output(TQString::fromLatin1(initialString)), area(_area), level(_level),  print(_print) { }
     /// Copy constructor
     kdbgstream(kdbgstream &str);
     kdbgstream(const kdbgstream &str) :
@@ -98,7 +98,7 @@ class KDECORE_EXPORT kdbgstream {
      */
     kdbgstream &operator<<(bool i)  {
 	if (!print) return *this;
-	output += TQString::tqfromLatin1(i ? "true" : "false");
+	output += TQString::fromLatin1(i ? "true" : "false");
 	return *this;
     }
     /**
@@ -281,7 +281,7 @@ class KDECORE_EXPORT kdbgstream {
      ;
 
     /** Operator to print out basic information about a TQWidget.
-     *  Output of class names only works if the class is tqmoc'ified.
+     *  Output of class names only works if the class is moc'ified.
      * @param widget the widget to print
      * @return this stream
      */
diff --git a/kdecore/kdelibs_export.h b/kdecore/kdelibs_export.h
index 5624fcddb..e7faabdcf 100644
--- a/kdecore/kdelibs_export.h
+++ b/kdecore/kdelibs_export.h
@@ -67,7 +67,7 @@
 
 #endif /*_KDELIBS_EXPORT_H*/
 
-/* workaround for kdecore: stupid tqmoc's grammar doesn't accept two macros
+/* workaround for kdecore: stupid moc's grammar doesn't accept two macros
    between 'class' keyword and <classname>: */
 #ifdef KDE_DEPRECATED
 # ifndef KDECORE_EXPORT_DEPRECATED
diff --git a/kdecore/kdemacros.h.cmake b/kdecore/kdemacros.h.cmake
index 9cb59ccd1..d0d8126d0 100644
--- a/kdecore/kdemacros.h.cmake
+++ b/kdecore/kdemacros.h.cmake
@@ -105,11 +105,11 @@
  * this is because usually get called by the class which they belong to,
  * and one'd assume that a class author doesn't use deprecated methods of his
  * own class. The only exception to this are signals which are connected to
- * other signals; they get invoked from tqmoc-generated code. In any case, 
+ * other signals; they get invoked from moc-generated code. In any case, 
  * printing a warning message in either case is not useful.
  * For slots, it can make sense (since slots can be invoked directly) but be
  * aware that if the slots get triggered by a signal, the will get called from
- * tqmoc code as well and thus the warnings are useless.
+ * moc code as well and thus the warnings are useless.
  *
  * \par
  * Also note that it is not possible to use KDE_DEPRECATED for classes which
@@ -148,7 +148,7 @@
  * The KDE_ISUNLIKELY macro tags an expression as unlikely evaluating to 'true'. 
  *
  * \note
- * Do NOT use ( !KDE_ISLIKELY(foo) ) as an tqreplacement for KDE_ISUNLIKELY !
+ * Do NOT use ( !KDE_ISLIKELY(foo) ) as an replacement for KDE_ISUNLIKELY !
  *
  * \code
  * if ( KDE_ISUNLIKELY( testsomething() ) )
@@ -172,7 +172,7 @@
  *
  * \note The added functions must be added to the header at the same location
  * as the macro; changing the order of virtual functions in a header is also
- * binary incompatible as it breaks the tqlayout of the vtable.
+ * binary incompatible as it breaks the layout of the vtable.
  */
 
 #define RESERVE_VIRTUAL_1 \
diff --git a/kdecore/kdemacros.h.in b/kdecore/kdemacros.h.in
index 62d905e32..00f49bbd7 100644
--- a/kdecore/kdemacros.h.in
+++ b/kdecore/kdemacros.h.in
@@ -105,11 +105,11 @@
  * this is because usually get called by the class which they belong to,
  * and one'd assume that a class author doesn't use deprecated methods of his
  * own class. The only exception to this are signals which are connected to
- * other signals; they get invoked from tqmoc-generated code. In any case, 
+ * other signals; they get invoked from moc-generated code. In any case, 
  * printing a warning message in either case is not useful.
  * For slots, it can make sense (since slots can be invoked directly) but be
  * aware that if the slots get triggered by a signal, the will get called from
- * tqmoc code as well and thus the warnings are useless.
+ * moc code as well and thus the warnings are useless.
  *
  * \par
  * Also note that it is not possible to use KDE_DEPRECATED for classes which
@@ -148,7 +148,7 @@
  * The KDE_ISUNLIKELY macro tags an expression as unlikely evaluating to 'true'. 
  *
  * \note
- * Do NOT use ( !KDE_ISLIKELY(foo) ) as an tqreplacement for KDE_ISUNLIKELY !
+ * Do NOT use ( !KDE_ISLIKELY(foo) ) as an replacement for KDE_ISUNLIKELY !
  *
  * \code
  * if ( KDE_ISUNLIKELY( testsomething() ) )
@@ -172,7 +172,7 @@
  *
  * \note The added functions must be added to the header at the same location
  * as the macro; changing the order of virtual functions in a header is also
- * binary incompatible as it breaks the tqlayout of the vtable.
+ * binary incompatible as it breaks the layout of the vtable.
  */
 
 #define RESERVE_VIRTUAL_1 \
diff --git a/kdecore/kdesktopfile.cpp b/kdecore/kdesktopfile.cpp
index c29f5b3cb..09a3f1e9b 100644
--- a/kdecore/kdesktopfile.cpp
+++ b/kdecore/kdesktopfile.cpp
@@ -42,7 +42,7 @@
 
 KDesktopFile::KDesktopFile(const TQString &fileName, bool bReadOnly,
 			   const char * resType)
-  : KConfig(TQString::tqfromLatin1(""), bReadOnly, false)
+  : KConfig(TQString::fromLatin1(""), bReadOnly, false)
 {
   // KConfigBackEnd will try to locate the filename that is provided
   // based on the resource type specified, _only_ if the filename
@@ -83,7 +83,7 @@ TQString KDesktopFile::locateLocal(const TQString &path)
       {
         // Hm, that didn't work...
         // What now? Use filename only and hope for the best.
-        local = path.mid(path.tqfindRev('/')+1);
+        local = path.mid(path.findRev('/')+1);
       }
       local = ::locateLocal("xdgdata-dirs", local);
     }
@@ -102,7 +102,7 @@ TQString KDesktopFile::locateLocal(const TQString &path)
       if (!TQDir::isRelativePath(local))
       {
         // What now? Use filename only and hope for the best.
-        local = path.mid(path.tqfindRev('/')+1);
+        local = path.mid(path.findRev('/')+1);
       }
       local = ::locateLocal("xdgdata-apps", local);
     }
@@ -114,9 +114,9 @@ bool KDesktopFile::isDesktopFile(const TQString& path)
 {
   int len = path.length();
 
-  if(len > 8 && path.right(8) == TQString::tqfromLatin1(".desktop"))
+  if(len > 8 && path.right(8) == TQString::fromLatin1(".desktop"))
     return true;
-  else if(len > 7 && path.right(7) == TQString::tqfromLatin1(".kdelnk"))
+  else if(len > 7 && path.right(7) == TQString::fromLatin1(".kdelnk"))
     return true;
   else
     return false;
@@ -155,8 +155,8 @@ TQString KDesktopFile::translatedEntry(const char* key) const
   if (hasKey(key)) {
     TQString value = readEntryUntranslated(key);
     TQString fName = fileName();
-    fName = fName.mid(fName.tqfindRev('/')+1);
-    TQString po_lookup_key = TQString::tqfromLatin1(key) + "(" + fName + "): " + value;
+    fName = fName.mid(fName.findRev('/')+1);
+    TQString po_lookup_key = TQString::fromLatin1(key) + "(" + fName + "): " + value;
     TQString po_value = KGlobal::locale()->translate(po_lookup_key.utf8().data());
 
     if (po_value == po_lookup_key)
@@ -241,33 +241,33 @@ TQStringList KDesktopFile::readActions() const
 
 void KDesktopFile::setActionGroup(const TQString &group)
 {
-    setGroup(TQString::tqfromLatin1("Desktop Action ") + group);
+    setGroup(TQString::fromLatin1("Desktop Action ") + group);
 }
 
 bool KDesktopFile::hasActionGroup(const TQString &group) const
 {
-  return hasGroup(TQString::tqfromLatin1("Desktop Action ") + group);
+  return hasGroup(TQString::fromLatin1("Desktop Action ") + group);
 }
 
 bool KDesktopFile::hasLinkType() const
 {
-  return readEntry("Type") == TQString::tqfromLatin1("Link");
+  return readEntry("Type") == TQString::fromLatin1("Link");
 }
 
 bool KDesktopFile::hasApplicationType() const
 {
-  return readEntry("Type") == TQString::tqfromLatin1("Application");
+  return readEntry("Type") == TQString::fromLatin1("Application");
 }
 
 bool KDesktopFile::hasMimeTypeType() const
 {
-  return readEntry("Type") == TQString::tqfromLatin1("MimeType");
+  return readEntry("Type") == TQString::fromLatin1("MimeType");
 }
 
 bool KDesktopFile::hasDeviceType() const
 {
-  return readEntry("Type") == TQString::tqfromLatin1("FSDev") ||
-         readEntry("Type") == TQString::tqfromLatin1("FSDevice");
+  return readEntry("Type") == TQString::fromLatin1("FSDev") ||
+         readEntry("Type") == TQString::fromLatin1("FSDevice");
 }
 
 bool KDesktopFile::tryExec() const
diff --git a/kdecore/kdesktopfile.h b/kdecore/kdesktopfile.h
index b5b4b97d1..bb705b696 100644
--- a/kdecore/kdesktopfile.h
+++ b/kdecore/kdesktopfile.h
@@ -181,9 +181,9 @@ public:
   bool hasDeviceType() const;
 
   /**
-   * Checks whether the TryExec field tqcontains a binary
+   * Checks whether the TryExec field contains a binary
    * which is found on the local system.
-   * @return true if TryExec tqcontains an existing binary
+   * @return true if TryExec contains an existing binary
    */
   bool tryExec() const;
 
diff --git a/kdecore/kentities.c b/kdecore/kentities.c
index b4cc4aeba..8181e5a6c 100644
--- a/kdecore/kentities.c
+++ b/kdecore/kentities.c
@@ -1,5 +1,5 @@
 /* ANSI-C code produced by gperf version 3.0.1 */
-/* Command-line: gperf -a -L ANSI-C -E -C -c -o -t -k '*' -Nkde_tqfindEntity -D -Hhash_Entity -Wwordlist_Entity -s 2 kentities.gperf  */
+/* Command-line: gperf -a -L ANSI-C -E -C -c -o -t -k '*' -Nkde_findEntity -D -Hhash_Entity -Wwordlist_Entity -s 2 kentities.gperf  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
       && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
@@ -53,7 +53,7 @@
   
     kentities.gperf: input file to generate a hash table for entities
     kentities.c: DO NOT EDIT! generated by the command
-    "gperf -a -L "ANSI-C" -C -G -c -o -t -k '*' -Nkde_tqfindEntity -D -s 2 khtmlentities.gperf > entities.c"
+    "gperf -a -L "ANSI-C" -C -G -c -o -t -k '*' -Nkde_findEntity -D -s 2 khtmlentities.gperf > entities.c"
     from kentities.gperf
 
     $Id$     
@@ -140,7 +140,7 @@ hash_Entity (register const char *str, register unsigned int len)
 __inline
 #endif
 const struct entity *
-kde_tqfindEntity (register const char *str, register unsigned int len)
+kde_findEntity (register const char *str, register unsigned int len)
 {
   enum
     {
diff --git a/kdecore/kentities.gperf b/kdecore/kentities.gperf
index aaaccba80..08f712707 100644
--- a/kdecore/kentities.gperf
+++ b/kdecore/kentities.gperf
@@ -22,7 +22,7 @@
   
     kentities.gperf: input file to generate a hash table for entities
     kentities.c: DO NOT EDIT! generated by the command
-    "gperf -a -L "ANSI-C" -C -G -c -o -t -k '*' -Nkde_tqfindEntity -D -s 2 khtmlentities.gperf > entities.c"
+    "gperf -a -L "ANSI-C" -C -G -c -o -t -k '*' -Nkde_findEntity -D -s 2 khtmlentities.gperf > entities.c"
     from kentities.gperf
 
     $Id$     
diff --git a/kdecore/kextsock.cpp b/kdecore/kextsock.cpp
index d0472177e..6371bb7eb 100644
--- a/kdecore/kextsock.cpp
+++ b/kdecore/kextsock.cpp
@@ -236,12 +236,12 @@ bool KExtendedSocket::reset()
   d->syserror = 0;
 }
 
-int KExtendedSocket::sockettqStatus() const
+int KExtendedSocket::socketStatus() const
 {
   return d->status;
 }
 
-void KExtendedSocket::setSockettqStatus(int newstatus)
+void KExtendedSocket::setSocketStatus(int newstatus)
 {
   d->status = newstatus;
 }
@@ -716,7 +716,7 @@ bool KExtendedSocket::setBufferSize(int rsize, int wsize)
 /*
  * Finds the local address for this socket
  * if we have done this already, we return it. Otherwise, we'll have
- * to tqfind the socket name
+ * to find the socket name
  */
 const ::KSocketAddress *KExtendedSocket::localAddress()
 {
@@ -1436,7 +1436,7 @@ void KExtendedSocket::flush()
 }
 
 
-TQ_LONG KExtendedSocket::readBlock(char *data, TQ_ULONG maxlen)
+Q_LONG KExtendedSocket::readBlock(char *data, Q_ULONG maxlen)
 {
   cleanError();
   if (d->status < connected || d->flags & passiveSocket)
@@ -1481,7 +1481,7 @@ TQ_LONG KExtendedSocket::readBlock(char *data, TQ_ULONG maxlen)
   return retval;
 }
 
-TQ_LONG KExtendedSocket::writeBlock(const char *data, TQ_ULONG len)
+Q_LONG KExtendedSocket::writeBlock(const char *data, Q_ULONG len)
 {
   cleanError();
   if (d->status < connected || d->status >= closing || d->flags & passiveSocket)
@@ -1808,7 +1808,7 @@ void KExtendedSocket::connectionEvent()
   if (sockfd != -1)
     {
       // our socket has activity
-      // tqfind out what it was
+      // find out what it was
       int retval;
       socklen_t len = sizeof(errcode);
       retval = getsockopt(sockfd, SOL_SOCKET, SO_ERROR, (char*)&errcode, &len);
@@ -2075,7 +2075,7 @@ TQPtrList<KAddressInfo> KExtendedSocket::lookup(const TQString& host, const TQSt
   struct sockaddr static_sa, *sa = &static_sa;
   ksocklen_t len = sizeof(static_sa);
 
-  /* tqfind out the socket length, in advance
+  /* find out the socket length, in advance
    * we use a sockaddr allocated on the heap just not to pass down
    * a NULL pointer to the first call. Some systems are reported to
    * set len to 0 if we pass NULL as the sockaddr */
@@ -2123,7 +2123,7 @@ TQPtrList<KAddressInfo> KExtendedSocket::lookup(const TQString& host, const TQSt
   struct sockaddr static_sa, *sa = &static_sa;
   ksocklen_t len = sizeof(static_sa);
 
-  /* tqfind out the socket length, in advance
+  /* find out the socket length, in advance
    * we use a sockaddr allocated on the heap just not to pass down
    * a NULL pointer to the first call. Some systems are reported to
    * set len to 0 if we pass NULL as the sockaddr */
diff --git a/kdecore/kextsock.h b/kdecore/kextsock.h
index c72c49cab..2bfb22bfe 100644
--- a/kdecore/kextsock.h
+++ b/kdecore/kextsock.h
@@ -82,7 +82,7 @@ class KExtendedSocketPrivate;
  *
  * @deprecated
  *	This class is now deprecated. Please use the classes in KNetwork for
- *	new programs. In particular, this class is tqreplaced by KNetwork::KStreamSocket
+ *	new programs. In particular, this class is replaced by KNetwork::KStreamSocket
  *	and @ref KNetwork::KServerSocket.
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
@@ -128,7 +128,7 @@ public:
    * The status are sequential. If a change to one status is requested,
    * all the prior status will be passed and their actions, performed
    */
-  enum SocktqStatus
+  enum SockStatus
   {
     // the numbers are scattered so that we leave room for future expansion
     error = -1,			// invalid status!
@@ -220,9 +220,9 @@ public:
   /**
    * Returns the class status.
    * @return the class status
-   * @see ::SocktqStatus
+   * @see ::SockStatus
    */
-  int sockettqStatus() const;
+  int socketStatus() const;
 
   /**
    * Returns the related system error code
@@ -285,7 +285,7 @@ public:
   bool setPort(const TQString& port);
 
   /**
-   * Returns the port/service. If it is a port, the string tqcontains a number.
+   * Returns the port/service. If it is a port, the string contains a number.
    * @return the port or TQString::null if it has not been set.
    */
   TQString port() const;
@@ -450,7 +450,7 @@ public:
    * @param enable	if true, no IPv4 translation will be performed;
    *			this socket will be restricted to IPv6 communication
    * @returns true on success, false on failure.
-   * @see localAddress to tqfind out if this is an IPv6 socket
+   * @see localAddress to find out if this is an IPv6 socket
    */
   bool setIPv6Only(bool enable);
 
@@ -681,7 +681,7 @@ public:
    * @return the length of this socket, or 0 if unsupported
    */
 #ifdef USE_QT3
-  virtual inline TQ_ULONG size() const
+  virtual inline Q_ULONG size() const
 #endif // USE_QT3
 #ifdef USE_QT4
   virtual inline qint64 size() const
@@ -692,7 +692,7 @@ public:
    * Returns relative position from start. This call is not supported on sockets.
    * @return the relative position from the start, or 0 if unsupported
    */
-  virtual inline TQ_ULONG at() const
+  virtual inline Q_ULONG at() const
   { return 0; }
 
   /**
@@ -740,7 +740,7 @@ public:
    * This function returns 0, if the function detected end-of-file condition
    * (socket was closed)
    */
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen);
+  virtual Q_LONG readBlock(char *data, Q_ULONG maxlen);
 
   /**
    * Writes a block of data to the socket.
@@ -765,7 +765,7 @@ public:
    * The return value might be less than @p len if the output buffers cannot
    * accommodate that many bytes and -1 in the case of an errro.
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len);
+  virtual Q_LONG writeBlock(const char *data, Q_ULONG len);
 
   /**
    * Peeks at a block of data from the socket.
@@ -929,7 +929,7 @@ protected:
   /**
    * Sets the socket status. For derived classes only.
    */
-  void setSockettqStatus(int status);
+  void setSocketStatus(int status);
 
 public:
   /**
diff --git a/kdecore/kgenericfactory.h b/kdecore/kgenericfactory.h
index 4d2c03615..0bdeaa846 100644
--- a/kdecore/kgenericfactory.h
+++ b/kdecore/kgenericfactory.h
@@ -133,7 +133,7 @@ KInstance *KGenericFactoryBase<T>::instance()
  *                         const TQStringList &args);</code>
  *     <li>If the class is derived from KParts::Part then it needs to have
  *         a constructor like:
- *         <code>MyPart( TQWidget *tqparentWidget, const char *widgetName,
+ *         <code>MyPart( TQWidget *parentWidget, const char *widgetName,
  *                       TQObject *parent, const char *name,
  *                       const TQStringList &args );</code>
  * </ul>
@@ -190,8 +190,8 @@ protected:
                                   const char *className, const TQStringList &args )
     {
         KGenericFactoryBase<Product>::initializeMessageCatalogue();
-        return TQT_TQOBJECT( (KDEPrivate::ConcreteFactory<Product, ParentType>
-            ::create( 0, 0, parent, name, className, args )) );
+        return KDEPrivate::ConcreteFactory<Product, ParentType>
+            ::create( 0, 0, parent, name, className, args );
     }
 };
 
@@ -216,7 +216,7 @@ protected:
  *                         const TQStringList &args);</code>
  *     <li>If the class is derived from KParts::Part then it needs to have
  *         a constructor like:
- *         <code>MyPart( TQWidget *tqparentWidget, const char *widgetName,
+ *         <code>MyPart( TQWidget *parentWidget, const char *widgetName,
  *                       TQObject *parent, const char *name,
  *                       const TQStringList &args );</code>
  * </ul>
@@ -253,7 +253,7 @@ protected:
  *     {
  *         Q_ OBJECT
  *     public:
- *         MyDialogComponent( TQWidget *tqparentWidget, const char *name,
+ *         MyDialogComponent( TQWidget *parentWidget, const char *name,
  *                            const TQStringList &args );
  *         ...
  *     };
@@ -311,7 +311,7 @@ protected:
  *                         const TQStringList &args);</code>
  *     <li>If the class is derived from KParts::Part then it needs to have
  *         a constructor like:
- *         <code>MyPart( TQWidget *tqparentWidget, const char *widgetName,
+ *         <code>MyPart( TQWidget *parentWidget, const char *widgetName,
  *                       TQObject *parent, const char *name,
  *                       const TQStringList &args );</code>
  * </ul>
@@ -348,7 +348,7 @@ protected:
  *     {
  *         Q_ OBJECT
  *     public:
- *         MyDialogComponent( TQWidget *tqparentWidget, const char *name,
+ *         MyDialogComponent( TQWidget *parentWidget, const char *name,
  *                            const TQStringList &args );
  *         ...
  *     };
diff --git a/kdecore/kgenericfactory.tcc b/kdecore/kgenericfactory.tcc
index cee230b53..41cd77824 100644
--- a/kdecore/kgenericfactory.tcc
+++ b/kdecore/kgenericfactory.tcc
@@ -112,26 +112,26 @@ namespace KDEPrivate
     // but not least the standard default constructor of parent/name .
     // the choice of the right constructor is done using an ordered inheritance
     // test.
-    template <class Product, class ParentType = TQObject>
+    template <class Product, class ParentType = QObject>
     class ConcreteFactory
     {
     public:
         typedef typename If< PartInheritanceTest< Product >::Result,
                              KParts::Part,
                              typename If< QWidgetInheritanceTest< Product >::Result,
-                                          QWidget, TQObject >::Result >::Result BaseType;
+                                          QWidget, QObject >::Result >::Result BaseType;
  
-        static inline Product *create( QWidget *tqparentWidget, const char *widgetName,
-                                       TQObject *parent, const char *name, 
+        static inline Product *create( QWidget *parentWidget, const char *widgetName,
+                                       QObject *parent, const char *name, 
                                        const char *className, const QStringList &args )
         {
-            QMetaObject *tqmetaObject = Product::staticMetaObject();
-            while ( tqmetaObject )
+            QMetaObject *metaObject = Product::staticMetaObject();
+            while ( metaObject )
             {
-                if ( !qstrcmp( className, tqmetaObject->className() ) )
-                    return create( tqparentWidget, widgetName,
+                if ( !qstrcmp( className, metaObject->className() ) )
+                    return create( parentWidget, widgetName,
                                    parent, name, args, Type2Type<BaseType>() );
-                tqmetaObject = tqmetaObject->superClass();
+                metaObject = metaObject->superClass();
             }
             return 0;
         }
@@ -139,15 +139,15 @@ namespace KDEPrivate
         typedef typename If< QWidgetInheritanceTest<ParentType>::Result,
                              ParentType, QWidget >::Result WidgetParentType;
 
-        static inline Product *create( QWidget *tqparentWidget, const char *widgetName,
-                                       TQObject *parent, const char *name,
+        static inline Product *create( QWidget *parentWidget, const char *widgetName,
+                                       QObject *parent, const char *name,
                                        const QStringList &args, Type2Type<KParts::Part> )
         { 
-            return new Product( tqparentWidget, widgetName, parent, name, args ); 
+            return new Product( parentWidget, widgetName, parent, name, args ); 
         }
 
-        static inline Product *create( QWidget* /*tqparentWidget*/, const char* /*widgetName*/,
-                                       TQObject *parent, const char *name,
+        static inline Product *create( QWidget* /*parentWidget*/, const char* /*widgetName*/,
+                                       QObject *parent, const char *name,
                                        const QStringList &args, Type2Type<QWidget> )
         {
 
@@ -157,9 +157,9 @@ namespace KDEPrivate
             return new Product( p, name, args );
         }
 
-        static inline Product *create( QWidget* /*tqparentWidget*/, const char* /*widgetName*/,
-                                       TQObject *parent, const char *name,
-                                       const QStringList &args, Type2Type<TQObject> )
+        static inline Product *create( QWidget* /*parentWidget*/, const char* /*widgetName*/,
+                                       QObject *parent, const char *name,
+                                       const QStringList &args, Type2Type<QObject> )
         { 
             ParentType *p = dynamic_cast<ParentType *>( parent );
             if ( parent && !p )
@@ -171,16 +171,16 @@ namespace KDEPrivate
     // this template is used to iterate through the typelist and call the
     // concrete factory for each type. the specializations of this template
     // are the ones actually being responsible for iterating, in fact.
-    template <class Product, class ParentType = TQObject>
+    template <class Product, class ParentType = QObject>
     class MultiFactory
     {
     public:
-        inline static TQObject *create( QWidget *tqparentWidget, const char *widgetName,
-                                       TQObject *parent, const char *name,
+        inline static QObject *create( QWidget *parentWidget, const char *widgetName,
+                                       QObject *parent, const char *name,
                                        const char *className, 
                                        const QStringList &args )
         {
-            return ConcreteFactory<Product, ParentType>::create( tqparentWidget, widgetName,
+            return ConcreteFactory<Product, ParentType>::create( parentWidget, widgetName,
                                                                  parent, name, className, 
                                                                  args );
         }
@@ -193,7 +193,7 @@ namespace KDEPrivate
     class MultiFactory<KDE::NullType>
     {
     public:
-        inline static TQObject *create( QWidget *, const char *, TQObject *, 
+        inline static QObject *create( QWidget *, const char *, QObject *, 
                                        const char *, const char *, 
                                        const QStringList & )
         { return 0; }
@@ -205,29 +205,29 @@ namespace KDEPrivate
     class MultiFactory<KDE::NullType, KDE::NullType>
     {
     public:
-        inline static TQObject *create( QWidget *, const char *, TQObject *, 
+        inline static QObject *create( QWidget *, const char *, QObject *, 
                                        const char *, const char *, 
                                        const QStringList & )
         { return 0; }
     };
  
     template <class Product, class ProductListTail>
-    class MultiFactory< KTypeList<Product, ProductListTail>, TQObject >
+    class MultiFactory< KTypeList<Product, ProductListTail>, QObject >
     {
     public:
-        inline static TQObject *create( QWidget *tqparentWidget, const char *widgetName,
-                                       TQObject *parent, const char *name,
+        inline static QObject *create( QWidget *parentWidget, const char *widgetName,
+                                       QObject *parent, const char *name,
                                        const char *className, 
                                        const QStringList &args )
         {
             // try with the head of the typelist first. the head is always
             // a concrete type.
-            TQObject *object = MultiFactory<Product>::create( tqparentWidget, widgetName,
+            QObject *object = MultiFactory<Product>::create( parentWidget, widgetName,
                                                              parent, name, className, 
                                                              args );
 
             if ( !object )
-                object = MultiFactory<ProductListTail>::create( tqparentWidget, widgetName,
+                object = MultiFactory<ProductListTail>::create( parentWidget, widgetName,
                                                                 parent, name, className, 
                                                                 args );
 
@@ -241,15 +241,15 @@ namespace KDEPrivate
                         KTypeList<ParentType, ParentTypeListTail> >
     {
     public:
-        inline static TQObject *create( QWidget *tqparentWidget, const char *widgetName,
-                                       TQObject *parent, const char *name,
+        inline static QObject *create( QWidget *parentWidget, const char *widgetName,
+                                       QObject *parent, const char *name,
                                        const char *className, 
                                        const QStringList &args )
         {
             // try with the head of the typelist first. the head is always
             // a concrete type.
-            TQObject *object = MultiFactory<Product, ParentType>
-                                  ::create( tqparentWidget, widgetName,
+            QObject *object = MultiFactory<Product, ParentType>
+                                  ::create( parentWidget, widgetName,
                                             parent, name, className, args );
 
             // if that failed continue by advancing the typelist, calling this
@@ -257,7 +257,7 @@ namespace KDEPrivate
             // at the end we reach the nulltype specialization.
             if ( !object )
                 object = MultiFactory<ProductListTail, ParentTypeListTail>
-                             ::create( tqparentWidget, widgetName,
+                             ::create( parentWidget, widgetName,
                                        parent, name, className, args );
 
             return object;
diff --git a/kdecore/kglobal.cpp b/kdecore/kglobal.cpp
index 347e8d31c..b886d8d7f 100644
--- a/kdecore/kglobal.cpp
+++ b/kdecore/kglobal.cpp
@@ -127,7 +127,7 @@ void KGlobal::setActiveInstance(KInstance *i)
 const TQString &
 KGlobal::staticQString(const char *str)
 {
-   return staticQString(TQString::tqfromLatin1(str));
+   return staticQString(TQString::fromLatin1(str));
 }
 
 class KStringDict : public TQDict<TQString>
@@ -150,7 +150,7 @@ KGlobal::staticQString(const TQString &str)
       _stringDict->setAutoDelete( true );
       kglobal_init();
     }
-   TQString *result = _stringDict->tqfind(str);
+   TQString *result = _stringDict->find(str);
    if (!result)
    {
       result = new TQString(str);
@@ -170,7 +170,7 @@ KGlobal::registerStaticDeleter(KStaticDeleterBase *obj)
 {
    if (!_staticDeleters)
       kglobal_init();
-   if (_staticDeleters->tqfind(obj) == -1)
+   if (_staticDeleters->find(obj) == -1)
       _staticDeleters->append(obj);
 }
 
diff --git a/kdecore/kglobal.h b/kdecore/kglobal.h
index 93304a281..c00279e1b 100644
--- a/kdecore/kglobal.h
+++ b/kdecore/kglobal.h
@@ -172,12 +172,12 @@ public:
 
 /**
  * \relates KGlobal
- * A typesafe function to tqfind the minimum of the two arguments.
+ * A typesafe function to find the minimum of the two arguments.
  */
 #define KMIN(a,b)	kMin(a,b)
 /**
  * \relates KGlobal
- * A typesafe function to tqfind the maximum of the two arguments.
+ * A typesafe function to find the maximum of the two arguments.
  */
 #define KMAX(a,b)	kMax(a,b)
 /**
diff --git a/kdecore/kglobalaccel.h b/kdecore/kglobalaccel.h
index 5e1ddd456..33dd5e37b 100644
--- a/kdecore/kglobalaccel.h
+++ b/kdecore/kglobalaccel.h
@@ -42,15 +42,15 @@ class KGlobalAccelPrivate;
 * @see KKeyDialog
 * @short Configurable global shortcut support
 */
-class KDECORE_EXPORT KGlobalAccel : public TQObject
+class KDECORE_EXPORT KGlobalAccel : public QObject
 {
 	Q_OBJECT
  public:
 	/**
 	 * Creates a new KGlobalAccel object with the given pParent and
 	 * psName.
-	 * @param pParent the parent of the TQObject
-	 * @param psName the name of the TQObject
+	 * @param pParent the parent of the QObject
+	 * @param psName the name of the QObject
 	 */
 	KGlobalAccel( TQObject* pParent, const char* psName = 0 );
 	virtual ~KGlobalAccel();
diff --git a/kdecore/kglobalaccel_win.cpp b/kdecore/kglobalaccel_win.cpp
index a1b6debbd..8b0c81f1a 100644
--- a/kdecore/kglobalaccel_win.cpp
+++ b/kdecore/kglobalaccel_win.cpp
@@ -116,7 +116,7 @@ bool KGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAcce
 		return false;
 	}
 
-	// Make sure that grab tqmasks have been initialized.
+	// Make sure that grab masks have been initialized.
 	if( g_keyModMaskXOnOrOff == 0 )
 		calculateGrabMasks();
 
@@ -136,7 +136,7 @@ bool KGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAcce
 
 	// We'll have to grab 8 key modifier combinations in order to cover all
 	//  combinations of CapsLock, NumLock, ScrollLock.
-	// Does anyone with more X-savvy know how to set a tqmask on qt_xrootwin so that
+	// Does anyone with more X-savvy know how to set a mask on qt_xrootwin so that
 	//  the irrelevant bits are always ignored and we can just make one XGrabKey
 	//  call per accelerator? -- ellis
 #ifndef NDEBUG
@@ -265,7 +265,7 @@ bool KGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent )
 			.arg( codemod.code, 0, 16 ).arg( pEvent->xkey.state, 0, 16 ).arg( codemod.mod, 0, 16 ) << endl;
 
 	// Search for which accelerator activated this event:
-	if( !m_rgCodeModToAction.tqcontains( codemod ) ) {
+	if( !m_rgCodeModToAction.contains( codemod ) ) {
 #ifndef NDEBUG
 		for( CodeModMap::ConstIterator it = m_rgCodeModToAction.begin(); it != m_rgCodeModToAction.end(); ++it ) {
 			KAccelAction* pAction = *it;
@@ -311,14 +311,14 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s
 	if( rexPassIndex.search( pAction->methodSlotPtr() ) >= 0 && rexIndex.search( pAction->name() ) >= 0 ) {
 		int n = rexIndex.cap(1).toInt();
 		kdDebug(125) << "Calling " << pAction->methodSlotPtr() << " int = " << n << endl;
-                int slot_id = pAction->objSlotPtr()->tqmetaObject()->tqfindSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
+                int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
                 if( slot_id >= 0 ) {
                     QUObject o[2];
                     static_QUType_int.set(o+1,n);
                     const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, o );
                 }
 	} else if( rexPassInfo.search( pAction->methodSlotPtr() ) ) {
-                int slot_id = pAction->objSlotPtr()->tqmetaObject()->tqfindSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
+                int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
                 if( slot_id >= 0 ) {
                     QUObject o[4];
                     static_QUType_QString.set(o+1,pAction->name());
@@ -327,7 +327,7 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s
                     const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, o );
                 }
 	} else {
-                int slot_id = pAction->objSlotPtr()->tqmetaObject()->tqfindSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
+                int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
                 if( slot_id >= 0 )
                     const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, 0 );
 	}
diff --git a/kdecore/kglobalaccel_x11.cpp b/kdecore/kglobalaccel_x11.cpp
index 70872c715..e9d86e576 100644
--- a/kdecore/kglobalaccel_x11.cpp
+++ b/kdecore/kglobalaccel_x11.cpp
@@ -54,10 +54,10 @@ extern "C" {
 }
 
 // g_keyModMaskXAccel
-//	tqmask of modifiers which can be used in shortcuts
+//	mask of modifiers which can be used in shortcuts
 //	(meta, alt, ctrl, shift)
 // g_keyModMaskXOnOrOff
-//	tqmask of modifiers where we don't care whether they are on or off
+//	mask of modifiers where we don't care whether they are on or off
 //	(caps lock, num lock, scroll lock)
 static uint g_keyModMaskXAccel = 0;
 static uint g_keyModMaskXOnOrOff = 0;
@@ -163,7 +163,7 @@ bool KGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAcce
 		return false;
 	}
 
-	// Make sure that grab tqmasks have been initialized.
+	// Make sure that grab masks have been initialized.
 	if( g_keyModMaskXOnOrOff == 0 )
 		calculateGrabMasks();
 
@@ -191,7 +191,7 @@ bool KGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAcce
 #endif
 	// We'll have to grab 8 key modifier combinations in order to cover all
 	//  combinations of CapsLock, NumLock, ScrollLock.
-	// Does anyone with more X-savvy know how to set a tqmask on qt_xrootwin so that
+	// Does anyone with more X-savvy know how to set a mask on qt_xrootwin so that
 	//  the irrelevant bits are always ignored and we can just make one XGrabKey
 	//  call per accelerator? -- ellis
 #ifndef NDEBUG
@@ -282,7 +282,7 @@ void KGlobalAccelPrivate::fakeKeyPressed(unsigned int keyCode) {
 			.arg( codemod.code, 0, 16 ).arg( keyCode, 0, 16 ).arg( codemod.mod, 0, 16 ) << endl;
 
 	// Search for which accelerator activated this event:
-	if( !m_rgCodeModToAction.tqcontains( codemod ) ) {
+	if( !m_rgCodeModToAction.contains( codemod ) ) {
 #ifndef NDEBUG
 		for( CodeModMap::ConstIterator it = m_rgCodeModToAction.begin(); it != m_rgCodeModToAction.end(); ++it ) {
 			KAccelAction* pAction = *it;
@@ -360,7 +360,7 @@ bool KGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent )
 			.arg( codemod.code, 0, 16 ).arg( pEvent->xkey.state, 0, 16 ).arg( codemod.mod, 0, 16 ) << endl;
 
 	// Search for which accelerator activated this event:
-	if( !m_rgCodeModToAction.tqcontains( codemod ) ) {
+	if( !m_rgCodeModToAction.contains( codemod ) ) {
 #ifndef NDEBUG
 		for( CodeModMap::ConstIterator it = m_rgCodeModToAction.begin(); it != m_rgCodeModToAction.end(); ++it ) {
 			KAccelAction* pAction = *it;
@@ -407,14 +407,14 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s
 	if( rexPassIndex.search( pAction->methodSlotPtr() ) >= 0 && rexIndex.search( pAction->name() ) >= 0 ) {
 		int n = rexIndex.cap(1).toInt();
 		kdDebug(125) << "Calling " << pAction->methodSlotPtr() << " int = " << n << endl;
-                int slot_id = pAction->objSlotPtr()->tqmetaObject()->tqfindSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
+                int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
                 if( slot_id >= 0 ) {
                     QUObject o[2];
                     static_QUType_int.set(o+1,n);
                     const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, o );
                 }
 	} else if( rexPassInfo.search( pAction->methodSlotPtr() ) ) {
-                int slot_id = pAction->objSlotPtr()->tqmetaObject()->tqfindSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
+                int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
                 if( slot_id >= 0 ) {
                     QUObject o[4];
                     static_QUType_QString.set(o+1,pAction->name());
@@ -423,7 +423,7 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s
                     const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, o );
                 }
 	} else {
-                int slot_id = pAction->objSlotPtr()->tqmetaObject()->tqfindSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
+                int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
                 if( slot_id >= 0 )
                     const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, 0 );
 	}
diff --git a/kdecore/kglobalsettings.cpp b/kdecore/kglobalsettings.cpp
index 734861663..6dfd92c9b 100644
--- a/kdecore/kglobalsettings.cpp
+++ b/kdecore/kglobalsettings.cpp
@@ -35,7 +35,7 @@
 #include <win32_utils.h>
 static QRgb qt_colorref2qrgb(COLORREF col)
 {
-    return tqRgb(GetRValue(col),GetGValue(col),GetBValue(col));
+    return qRgb(GetRValue(col),GetGValue(col),GetBValue(col));
 }
 #endif
 
@@ -98,9 +98,9 @@ void readXdgUserDirs(TQString *desktop, TQString *documents)
 	while (!line.isNull())
 	{
 		if (line.startsWith("XDG_DESKTOP_DIR="))
-			*desktop = line.remove("XDG_DESKTOP_DIR=").remove("\"").tqreplace("$HOME", TQDir::homeDirPath());
+			*desktop = line.remove("XDG_DESKTOP_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
 		else if (line.startsWith("XDG_DOCUMENTS_DIR="))
-			*documents = line.remove("XDG_DOCUMENTS_DIR=").remove("\"").tqreplace("$HOME", TQDir::homeDirPath());
+			*documents = line.remove("XDG_DOCUMENTS_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
 
 		line = s.readLine();
 	}
@@ -694,10 +694,10 @@ TQRect KGlobalSettings::splashScreenDesktopGeometry()
                 scr = dw->screenNumber(TQCursor::pos());
             return dw->screenGeometry(scr);
         } else {
-            return dw->tqgeometry();
+            return dw->geometry();
         }
     } else {
-        return dw->tqgeometry();
+        return dw->geometry();
     }
 }
 
@@ -711,10 +711,10 @@ TQRect KGlobalSettings::desktopGeometry(const TQPoint& point)
             group.readBoolEntry("XineramaPlacementEnabled", true)) {
             return dw->screenGeometry(dw->screenNumber(point));
         } else {
-            return dw->tqgeometry();
+            return dw->geometry();
         }
     } else {
-        return dw->tqgeometry();
+        return dw->geometry();
     }
 }
 
@@ -730,10 +730,10 @@ TQRect KGlobalSettings::desktopGeometry(TQWidget* w)
                 return dw->screenGeometry(dw->screenNumber(w));
             else return dw->screenGeometry(-1);
         } else {
-            return dw->tqgeometry();
+            return dw->geometry();
         }
     } else {
-        return dw->tqgeometry();
+        return dw->geometry();
     }
 }
 
diff --git a/kdecore/kglobalsettings.h b/kdecore/kglobalsettings.h
index 957190705..4925fd098 100644
--- a/kdecore/kglobalsettings.h
+++ b/kdecore/kglobalsettings.h
@@ -440,20 +440,20 @@ class KDECORE_EXPORT KGlobalSettings
     static bool wheelMouseZooms();
 
     /**
-     * This function returns the desktop tqgeometry for an application's splash
+     * This function returns the desktop geometry for an application's splash
      * screen.  It takes into account the user's display settings (number of
      * screens, Xinerama, etc), and the user's preferences (if KDE should be
      * Xinerama aware).
      *
-     * @return the tqgeometry to use for the desktop.  Note that it might not
+     * @return the geometry to use for the desktop.  Note that it might not
      *         start at (0,0).
      * @since 3.2
      */
     static TQRect splashScreenDesktopGeometry();
 
     /**
-     * This function returns the desktop tqgeometry for an application that needs
-     * to set the tqgeometry of a widget on the screen manually.  It takes into
+     * This function returns the desktop geometry for an application that needs
+     * to set the geometry of a widget on the screen manually.  It takes into
      * account the user's display settings (number of screens, Xinerama, etc),
      * and the user's preferences (if KDE should be Xinerama aware).
      *
@@ -463,22 +463,22 @@ class KDECORE_EXPORT KGlobalSettings
      * @param point a reference point for the widget, for instance one that the
      *              widget should be adjacent or on top of.
      *
-     * @return the tqgeometry to use for the desktop.  Note that it might not
+     * @return the geometry to use for the desktop.  Note that it might not
      *         start at (0,0).
      * @since 3.2
      */
     static TQRect desktopGeometry(const TQPoint& point);
 
     /**
-     * This function returns the desktop tqgeometry for an application that needs
-     * to set the tqgeometry of a widget on the screen manually.  It takes into
+     * This function returns the desktop geometry for an application that needs
+     * to set the geometry of a widget on the screen manually.  It takes into
      * account the user's display settings (number of screens, Xinerama, etc),
      * and the user's preferences (if KDE should be Xinerama aware).
      *
      * @param w the widget in question.  This is used to determine which screen
      *          to use in Xinerama or multi-head mode.
      *
-     * @return the tqgeometry to use for the desktop.  Note that it might not
+     * @return the geometry to use for the desktop.  Note that it might not
      *         start at (0,0).
      * @since 3.2
      */
@@ -525,7 +525,7 @@ class KDECORE_EXPORT KGlobalSettings
     static bool opaqueResize();
 
     /**
-     * The tqlayout scheme to use for dialog buttons
+     * The layout scheme to use for dialog buttons
      * 
      * @return Returns the number of the scheme to use.
      * @see KDialogBase::setButtonStyle()
diff --git a/kdecore/kiconeffect.cpp b/kdecore/kiconeffect.cpp
index 6cd1e81ca..8315eab6b 100644
--- a/kdecore/kiconeffect.cpp
+++ b/kdecore/kiconeffect.cpp
@@ -153,8 +153,8 @@ TQString KIconEffect::fingerprint(int group, int state) const
         cached += ':';
         cached += tmp.setNum(mValue[group][state]);
         cached += ':';
-        cached += mTrans[group][state] ? TQString::tqfromLatin1("trans")
-            : TQString::tqfromLatin1("notrans");
+        cached += mTrans[group][state] ? TQString::fromLatin1("trans")
+            : TQString::fromLatin1("notrans");
         if (mEffect[group][state] == Colorize || mEffect[group][state] == ToMonochrome)
         {
             cached += ':';
@@ -291,16 +291,16 @@ void KIconEffect::toGray(TQImage &img, float value)
     int rval, gval, bval, val, alpha, i;
     for (i=0; i<pixels; i++)
     {
-	val = tqGray(data[i]);
-	alpha = tqAlpha(data[i]);
+	val = qGray(data[i]);
+	alpha = qAlpha(data[i]);
 	if (value < 1.0)
 	{
-	    rval = static_cast<int>(value*val+(1.0-value)*tqRed(data[i]));
-	    gval = static_cast<int>(value*val+(1.0-value)*tqGreen(data[i]));
-	    bval = static_cast<int>(value*val+(1.0-value)*tqBlue(data[i]));
-	    data[i] = tqRgba(rval, gval, bval, alpha);
+	    rval = static_cast<int>(value*val+(1.0-value)*qRed(data[i]));
+	    gval = static_cast<int>(value*val+(1.0-value)*qGreen(data[i]));
+	    bval = static_cast<int>(value*val+(1.0-value)*qBlue(data[i]));
+	    data[i] = qRgba(rval, gval, bval, alpha);
 	} else
-	    data[i] = tqRgba(val, val, val, alpha);
+	    data[i] = qRgba(val, val, val, alpha);
     }
 }
 
@@ -314,7 +314,7 @@ void KIconEffect::colorize(TQImage &img, const TQColor &col, float value)
     float rcol = col.red(), gcol = col.green(), bcol = col.blue();
     for (i=0; i<pixels; i++)
     {
-        val = tqGray(data[i]);
+        val = qGray(data[i]);
         if (val < 128)
         {
              rval = static_cast<int>(rcol/128*val);
@@ -335,13 +335,13 @@ void KIconEffect::colorize(TQImage &img, const TQColor &col, float value)
 	}
 	if (value < 1.0)
 	{
-	    rval = static_cast<int>(value*rval+(1.0 - value)*tqRed(data[i]));
-	    gval = static_cast<int>(value*gval+(1.0 - value)*tqGreen(data[i]));
-	    bval = static_cast<int>(value*bval+(1.0 - value)*tqBlue(data[i]));
+	    rval = static_cast<int>(value*rval+(1.0 - value)*qRed(data[i]));
+	    gval = static_cast<int>(value*gval+(1.0 - value)*qGreen(data[i]));
+	    bval = static_cast<int>(value*bval+(1.0 - value)*qBlue(data[i]));
 	}
 
-	alpha = tqAlpha(data[i]);
-	data[i] = tqRgba(rval, gval, bval, alpha);
+	alpha = qAlpha(data[i]);
+	data[i] = qRgba(rval, gval, bval, alpha);
     }
 }
 
@@ -357,9 +357,9 @@ void KIconEffect::toMonochrome(TQImage &img, const TQColor &black, const TQColor
    bool grayscale = true;
    // Step 1: determine the average brightness
    for (i=0; i<pixels; i++) {
-       sum += tqGray(data[i])*tqAlpha(data[i]) + 255*(255-tqAlpha(data[i]));
+       sum += qGray(data[i])*qAlpha(data[i]) + 255*(255-qAlpha(data[i]));
        values += 255;
-       if ((tqRed(data[i]) != tqGreen(data[i]) ) || (tqGreen(data[i]) != tqBlue(data[i]) ))
+       if ((qRed(data[i]) != qGreen(data[i]) ) || (qGreen(data[i]) != qBlue(data[i]) ))
            grayscale = false;
    }
    double medium = sum/values;
@@ -367,30 +367,30 @@ void KIconEffect::toMonochrome(TQImage &img, const TQColor &black, const TQColor
    // Step 2: Modify the image
    if (grayscale) {
        for (i=0; i<pixels; i++) {
-           int v = tqRed(data[i]);
-           rval = static_cast<int>( ((255-v)*rb + v*rw)*value/255 + (1.0-value)*tqRed(data[i]));
-           gval = static_cast<int>( ((255-v)*gb + v*gw)*value/255 + (1.0-value)*tqGreen(data[i]));
-           bval = static_cast<int>( ((255-v)*bb + v*bw)*value/255 + (1.0-value)*tqBlue(data[i]));
+           int v = qRed(data[i]);
+           rval = static_cast<int>( ((255-v)*rb + v*rw)*value/255 + (1.0-value)*qRed(data[i]));
+           gval = static_cast<int>( ((255-v)*gb + v*gw)*value/255 + (1.0-value)*qGreen(data[i]));
+           bval = static_cast<int>( ((255-v)*bb + v*bw)*value/255 + (1.0-value)*qBlue(data[i]));
 
-           alpha = tqAlpha(data[i]);
-           data[i] = tqRgba(rval, gval, bval, alpha);
+           alpha = qAlpha(data[i]);
+           data[i] = qRgba(rval, gval, bval, alpha);
        }
    }
    else {
       for (i=0; i<pixels; i++) {
-         if (tqGray(data[i]) <= medium) {
-            rval = static_cast<int>(value*rb+(1.0-value)*tqRed(data[i]));
-            gval = static_cast<int>(value*gb+(1.0-value)*tqGreen(data[i]));
-            bval = static_cast<int>(value*bb+(1.0-value)*tqBlue(data[i]));
+         if (qGray(data[i]) <= medium) {
+            rval = static_cast<int>(value*rb+(1.0-value)*qRed(data[i]));
+            gval = static_cast<int>(value*gb+(1.0-value)*qGreen(data[i]));
+            bval = static_cast<int>(value*bb+(1.0-value)*qBlue(data[i]));
          }
          else {
-            rval = static_cast<int>(value*rw+(1.0-value)*tqRed(data[i]));
-            gval = static_cast<int>(value*gw+(1.0-value)*tqGreen(data[i]));
-            bval = static_cast<int>(value*bw+(1.0-value)*tqBlue(data[i]));
+            rval = static_cast<int>(value*rw+(1.0-value)*qRed(data[i]));
+            gval = static_cast<int>(value*gw+(1.0-value)*qGreen(data[i]));
+            bval = static_cast<int>(value*bw+(1.0-value)*qBlue(data[i]));
          }
 
-         alpha = tqAlpha(data[i]);
-         data[i] = tqRgba(rval, gval, bval, alpha);
+         alpha = qAlpha(data[i]);
+         data[i] = qRgba(rval, gval, bval, alpha);
       }
    }
 }
@@ -408,8 +408,8 @@ void KIconEffect::deSaturate(TQImage &img, float value)
         color.setRgb(data[i]);
         color.hsv(&h, &s, &v);
         color.setHsv(h, (int) (s * (1.0 - value) + 0.5), v);
-	data[i] = tqRgba(color.red(), color.green(), color.blue(),
-		tqAlpha(data[i]));
+	data[i] = qRgba(color.red(), color.green(), color.blue(),
+		qAlpha(data[i]));
     }
 }
 
@@ -431,7 +431,7 @@ void KIconEffect::toGamma(TQImage &img, float value)
         rval = static_cast<int>(pow(static_cast<float>(rval)/255 , gamma)*255);
         gval = static_cast<int>(pow(static_cast<float>(gval)/255 , gamma)*255);
         bval = static_cast<int>(pow(static_cast<float>(bval)/255 , gamma)*255);
-	data[i] = tqRgba(rval, gval, bval, tqAlpha(data[i]));
+	data[i] = qRgba(rval, gval, bval, qAlpha(data[i]));
     }
 }
 
@@ -475,8 +475,8 @@ void KIconEffect::semiTransparent(TQImage &img)
         // search for a color that is already transparent
         for (x=0; x<img.numColors(); x++)
         {
-            // try to tqfind already transparent pixel
-            if (tqAlpha(img.color(x)) < 127)
+            // try to find already transparent pixel
+            if (qAlpha(img.color(x)) < 127)
             {
                 transColor = x;
                 break;
@@ -535,9 +535,9 @@ void KIconEffect::semiTransparent(TQPixmap &pix)
 	for (int x=0; x<(img.width()+31)/32; x++)
 	    line[x] &= pattern;
     }
-    TQBitmap tqmask;
-    tqmask.convertFromImage(img);
-    pix.setMask(tqmask);
+    TQBitmap mask;
+    mask.convertFromImage(img);
+    pix.setMask(mask);
 }
 
 TQImage KIconEffect::doublePixels(TQImage src) const
@@ -631,7 +631,7 @@ void KIconEffect::overlay(TQImage &src, TQImage &overlay)
 	int trans;
 	for (trans=0; trans<overlay.numColors(); trans++)
 	{
-	    if (tqAlpha(overlay.color(trans)) == 0)
+	    if (qAlpha(overlay.color(trans)) == 0)
 	    {
 		kdDebug(265) << "transparent pixel found at " << trans << "\n";
 		break;
@@ -680,22 +680,22 @@ void KIconEffect::overlay(TQImage &src, TQImage &overlay)
 
 	    for (j=0; j<src.width(); j++)
 	    {
-		r1 = tqRed(oline[j]);
-		g1 = tqGreen(oline[j]);
-		b1 = tqBlue(oline[j]);
-		a1 = tqAlpha(oline[j]);
+		r1 = qRed(oline[j]);
+		g1 = qGreen(oline[j]);
+		b1 = qBlue(oline[j]);
+		a1 = qAlpha(oline[j]);
 
-		r2 = tqRed(sline[j]);
-		g2 = tqGreen(sline[j]);
-		b2 = tqBlue(sline[j]);
-		a2 = tqAlpha(sline[j]);
+		r2 = qRed(sline[j]);
+		g2 = qGreen(sline[j]);
+		b2 = qBlue(sline[j]);
+		a2 = qAlpha(sline[j]);
 
 		r2 = (a1 * r1 + (0xff - a1) * r2) >> 8;
 		g2 = (a1 * g1 + (0xff - a1) * g2) >> 8;
 		b2 = (a1 * b1 + (0xff - a1) * b2) >> 8;
 		a2 = QMAX(a1, a2);
 
-		sline[j] = tqRgba(r2, g2, b2, a2);
+		sline[j] = qRgba(r2, g2, b2, a2);
 	    }
 	}
     }
@@ -742,7 +742,7 @@ KIconEffect::visualActivate(TQWidget * widget, TQRect rect)
 
     TQPainter p(widget);
 
-    // Use NotROP to avoid having to tqrepaint the pixmap each time.
+    // Use NotROP to avoid having to repaint the pixmap each time.
     p.setPen(TQPen(Qt::black, 2, Qt::DotLine));
     p.setRasterOp(Qt::NotROP);
 
diff --git a/kdecore/kiconloader.cpp b/kdecore/kiconloader.cpp
index 0fff345e7..ff9243ebe 100644
--- a/kdecore/kiconloader.cpp
+++ b/kdecore/kiconloader.cpp
@@ -88,7 +88,7 @@ void KIconThemeNode::queryIconsByContext(TQStringList *result,
     *result += theme->queryIconsByContext(size, context);
 }
 
-KIcon KIconThemeNode::tqfindIcon(const TQString& name, int size,
+KIcon KIconThemeNode::findIcon(const TQString& name, int size,
 			       KIcon::MatchType match) const
 {
     return theme->iconPath(name, size, match);
@@ -194,7 +194,7 @@ void KIconLoader::init( const TQString& _appname, KStandardDirs *_dirs )
     {
         delete def;
         // warn, as this is actually a small penalty hit
-        kdDebug(264) << "Couldn't tqfind current icon theme, falling back to default." << endl;
+        kdDebug(264) << "Couldn't find current icon theme, falling back to default." << endl;
 	def = new KIconTheme(KIconTheme::defaultThemeName(), appname);
         if (!def->isValid())
         {
@@ -221,7 +221,7 @@ void KIconLoader::init( const TQString& _appname, KStandardDirs *_dirs )
     {
 	if (groups[i] == 0L)
 	    break;
-	config->setGroup(TQString::tqfromLatin1(groups[i]) + "Icons");
+	config->setGroup(TQString::fromLatin1(groups[i]) + "Icons");
 	d->mpGroups[i].size = config->readNumEntry("Size", 0);
 	d->mpGroups[i].dblPixels = config->readBoolEntry("DoublePixels", false);
 	if (TQPixmap::defaultDepth()>8)
@@ -328,7 +328,7 @@ void KIconLoader::addBaseThemes(KIconThemeNode *node, const TQString &appname)
 
     for (it=lst.begin(); it!=lst.end(); ++it)
     {
-	if( d->mThemesInTree.tqcontains(*it) && (*it) != "hicolor")
+	if( d->mThemesInTree.contains(*it) && (*it) != "hicolor")
 	    continue;
 	KIconTheme *theme = new KIconTheme(*it,appname);
 	if (!theme->isValid()) {
@@ -370,7 +370,7 @@ void KIconLoader::addExtraDesktopThemes()
 	      TQDir dir2( buf );
 	      TQString themeName=dir2.dirName();
 
-	      if (!list.tqcontains(themeName))
+	      if (!list.contains(themeName))
 		list.append(themeName);
 	    }
 	}
@@ -378,7 +378,7 @@ void KIconLoader::addExtraDesktopThemes()
 
     for (it=list.begin(); it!=list.end(); ++it)
     {
-	if ( d->mThemesInTree.tqcontains(*it) )
+	if ( d->mThemesInTree.contains(*it) )
 		continue;
 	if ( *it == TQString("default.kde") ) continue;
 
@@ -443,7 +443,7 @@ TQString KIconLoader::removeIconExtensionInternal(const TQString &name) const
     return name_noext;
 }
 
-KIcon KIconLoader::tqfindMatchingIcon(const TQString& name, int size) const
+KIcon KIconLoader::findMatchingIcon(const TQString& name, int size) const
 {
     KIcon icon;
 
@@ -495,10 +495,10 @@ inline TQString KIconLoader::unknownIconPath( int size ) const
 {
     static const TQString &str_unknown = KGlobal::staticQString("unknown");
 
-    KIcon icon = tqfindMatchingIcon(str_unknown, size);
+    KIcon icon = findMatchingIcon(str_unknown, size);
     if (!icon.isValid())
     {
-        kdDebug(264) << "Warning: could not tqfind \"Unknown\" icon for size = "
+        kdDebug(264) << "Warning: could not find \"Unknown\" icon for size = "
                      << size << endl;
         return TQString::null;
     }
@@ -557,7 +557,7 @@ TQString KIconLoader::iconPath(const TQString& _name, int group_or_size,
             return unknownIconPath(size);
     }
 
-    KIcon icon = tqfindMatchingIcon(name, size);
+    KIcon icon = findMatchingIcon(name, size);
 
     if (!icon.isValid())
     {
@@ -601,7 +601,7 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si
 	key = "$kicou_";
         key += TQString::number(size); key += '_';
 	key += name;
-	bool inCache = TQPixmapCache::tqfind(key, pix);
+	bool inCache = TQPixmapCache::find(key, pix);
 	if (inCache && (path_store == 0L))
 	    return pix;
 
@@ -615,7 +615,7 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si
 	    path = iconPath(str_unknown, KIcon::Small, true);
 	    if (path.isEmpty())
 	    {
-		kdDebug(264) << "Warning: Cannot tqfind \"unknown\" icon." << endl;
+		kdDebug(264) << "Warning: Cannot find \"unknown\" icon." << endl;
 		return pix;
 	    }
 	}
@@ -684,14 +684,14 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si
     {
 	key += d->mpEffect.fingerprint(group, state);
 	if (d->mpGroups[group].dblPixels)
-	    key += TQString::tqfromLatin1(":dblsize");
+	    key += TQString::fromLatin1(":dblsize");
     } else
-	key += TQString::tqfromLatin1("noeffect");
+	key += TQString::fromLatin1("noeffect");
     key += '_';
     key += overlayStr;
 
     // Is the icon in the cache?
-    bool inCache = TQPixmapCache::tqfind(key, pix);
+    bool inCache = TQPixmapCache::find(key, pix);
     if (inCache && (path_store == 0L))
 	return pix;
 
@@ -713,7 +713,7 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si
         else
         {
             if (!name.isEmpty())
-                icon = tqfindMatchingIcon(favIconOverlay ? TQString("www") : name, size);
+                icon = findMatchingIcon(favIconOverlay ? TQString("www") : name, size);
 
             if (!icon.isValid())
             {
@@ -725,11 +725,11 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si
                     return pix;
                 }
 
-                icon = tqfindMatchingIcon(str_unknown, size);
+                icon = findMatchingIcon(str_unknown, size);
                 if (!icon.isValid())
                 {
                     kdDebug(264)
-                        << "Warning: could not tqfind \"Unknown\" icon for size = "
+                        << "Warning: could not find \"Unknown\" icon for size = "
                         << size << endl;
                     return pix;
                 }
@@ -806,7 +806,7 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si
             {
 		QRgb *line = reinterpret_cast<QRgb *>(img->scanLine(y));
                 for (int x = 0; x < img->width();  x++)
-                    line[x] = (line[x] & 0x00ffffff) | (QMIN(0x80, tqAlpha(line[x])) << 24);
+                    line[x] = (line[x] & 0x00ffffff) | (QMIN(0x80, qAlpha(line[x])) << 24);
 	    }
 	}
     }
@@ -848,10 +848,10 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si
             for( int i = 0;
                  i < favIcon.width();
                  ++i, ++fpos, ++ipos )
-                *ipos = tqRgba( ( tqRed( *ipos ) * ( 255 - tqAlpha( *fpos )) + tqRed( *fpos ) * tqAlpha( *fpos )) / 255,
-                               ( tqGreen( *ipos ) * ( 255 - tqAlpha( *fpos )) + tqGreen( *fpos ) * tqAlpha( *fpos )) / 255,
-                               ( tqBlue( *ipos ) * ( 255 - tqAlpha( *fpos )) + tqBlue( *fpos ) * tqAlpha( *fpos )) / 255,
-                               ( tqAlpha( *ipos ) * ( 255 - tqAlpha( *fpos )) + tqAlpha( *fpos ) * tqAlpha( *fpos )) / 255 );
+                *ipos = qRgba( ( qRed( *ipos ) * ( 255 - qAlpha( *fpos )) + qRed( *fpos ) * qAlpha( *fpos )) / 255,
+                               ( qGreen( *ipos ) * ( 255 - qAlpha( *fpos )) + qGreen( *fpos ) * qAlpha( *fpos )) / 255,
+                               ( qBlue( *ipos ) * ( 255 - qAlpha( *fpos )) + qBlue( *fpos ) * qAlpha( *fpos )) / 255,
+                               ( qAlpha( *ipos ) * ( 255 - qAlpha( *fpos )) + qAlpha( *fpos ) * qAlpha( *fpos )) / 255 );
         }
     }
 
@@ -866,18 +866,18 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si
 TQImage *KIconLoader::loadOverlay(const TQString &name, int size) const
 {
     TQString key = name + '_' + TQString::number(size);
-    TQImage *image = d->imgDict.tqfind(key);
+    TQImage *image = d->imgDict.find(key);
     if (image != 0L)
 	return image;
 
-    KIcon icon = tqfindMatchingIcon(name, size);
+    KIcon icon = findMatchingIcon(name, size);
     if (!icon.isValid())
     {
 	kdDebug(264) << "Overlay " << name << "not found." << endl;
 	return 0L;
     }
     image = new TQImage(icon.path);
-    // In some cases (since size in tqfindMatchingIcon() is more a hint than a
+    // In some cases (since size in findMatchingIcon() is more a hint than a
     // constraint) image->size can be != size. If so perform rescaling.
     if ( size != image->width() )
         *image = image->smoothScale( size, size );
@@ -892,7 +892,7 @@ TQMovie KIconLoader::loadMovie(const TQString& name, KIcon::Group group, int siz
     TQString file = moviePath( name, group, size );
     if (file.isEmpty())
 	return TQMovie();
-    int dirLen = file.tqfindRev('/');
+    int dirLen = file.findRev('/');
     TQString icon = iconPath(name, size ? -size : group, true);
     if (!icon.isEmpty() && file.left(dirLen) != icon.left(dirLen))
 	return TQMovie();
@@ -968,7 +968,7 @@ TQStringList KIconLoader::loadAnimated(const TQString& name, KIcon::Group group,
     {
 	if (size == 0)
 	    size = d->mpGroups[group].size;
-	KIcon icon = tqfindMatchingIcon(file, size);
+	KIcon icon = findMatchingIcon(file, size);
 	file = icon.isValid() ? icon.path : TQString::null;
 
     }
@@ -1048,13 +1048,13 @@ TQStringList KIconLoader::queryIconsByContext(int group_or_size,
     TQStringList::ConstIterator it;
     for (it=result.begin(); it!=result.end(); ++it)
     {
-	int n = (*it).tqfindRev('/');
+	int n = (*it).findRev('/');
 	if (n == -1)
 	    name = *it;
 	else
 	    name = (*it).mid(n+1);
 	name = removeIconExtension(name);
-	if (!entries.tqcontains(name))
+	if (!entries.contains(name))
 	{
 	    entries += name;
 	    res2 += *it;
@@ -1088,13 +1088,13 @@ TQStringList KIconLoader::queryIcons(int group_or_size, KIcon::Context context)
     TQStringList::ConstIterator it;
     for (it=result.begin(); it!=result.end(); ++it)
     {
-	int n = (*it).tqfindRev('/');
+	int n = (*it).findRev('/');
 	if (n == -1)
 	    name = *it;
 	else
 	    name = (*it).mid(n+1);
 	name = removeIconExtension(name);
-	if (!entries.tqcontains(name))
+	if (!entries.contains(name))
 	{
 	    entries += name;
 	    res2 += *it;
@@ -1103,7 +1103,7 @@ TQStringList KIconLoader::queryIcons(int group_or_size, KIcon::Context context)
     return res2;
 }
 
-// used by KIconDialog to tqfind out which contexts to offer in a combobox
+// used by KIconDialog to find out which contexts to offer in a combobox
 bool KIconLoader::hasContext(KIcon::Context context) const
 {
     for ( KIconThemeNode *themeNode = d->links.first() ; themeNode ;
@@ -1173,7 +1173,7 @@ TQIconSet KIconLoader::loadIconSet( const TQString& name, KIcon::Group g, int s,
     }
 
     if(canReturnNull && immediateExistenceCheck)
-    { // we need to tqfind out if the icon actually exists
+    { // we need to find out if the icon actually exists
         TQPixmap pm = loadIcon( name, g, s, KIcon::DefaultState, NULL, true );
         if( pm.isNull())
             return TQIconSet();
@@ -1383,13 +1383,13 @@ int IconSize(KIcon::Group group, KInstance *instance)
 TQPixmap KIconLoader::unknown()
 {
     TQPixmap pix;
-    if ( TQPixmapCache::tqfind("unknown", pix) )
+    if ( TQPixmapCache::find("unknown", pix) )
             return pix;
 
     TQString path = KGlobal::iconLoader()->iconPath("unknown", KIcon::Small, true);
     if (path.isEmpty())
     {
-	kdDebug(264) << "Warning: Cannot tqfind \"unknown\" icon." << endl;
+	kdDebug(264) << "Warning: Cannot find \"unknown\" icon." << endl;
 	pix.resize(32,32);
     } else
     {
diff --git a/kdecore/kiconloader.h b/kdecore/kiconloader.h
index b9d6c7714..f8ac3fbc7 100644
--- a/kdecore/kiconloader.h
+++ b/kdecore/kiconloader.h
@@ -106,7 +106,7 @@ public:
     void addAppDir(const TQString& appname);
 
     /**
-     * Loads an icon. It will try very hard to tqfind an icon which is
+     * Loads an icon. It will try very hard to find an icon which is
      * suitable. If no exact match is found, a close match is searched.
      * If neither an exact nor a close match is found, a null pixmap or
      * the "unknown" pixmap is returned, depending on the value of the
@@ -372,10 +372,10 @@ public:
 
     /**
      * @internal
-     * tries to tqfind an icon with the name. It tries some extension and
+     * tries to find an icon with the name. It tries some extension and
      * match strategies
      */
-    KIcon tqfindMatchingIcon(const TQString& name, int size) const;
+    KIcon findMatchingIcon(const TQString& name, int size) const;
 
     /**
      * @internal
@@ -424,7 +424,7 @@ public:
      * Same as removeIconExtension except it prints a debug message
      * if an extension is removed to help catch programming errors.
      *
-     * @see tqfindMatchingIcon()
+     * @see findMatchingIcon()
      * @see iconPath()
      *
      * TODO: KDE 4 make static
diff --git a/kdecore/kiconloader_p.h b/kdecore/kiconloader_p.h
index cc7e7beb3..41083b38c 100644
--- a/kdecore/kiconloader_p.h
+++ b/kdecore/kiconloader_p.h
@@ -27,13 +27,13 @@ public:
 
     void queryIcons(TQStringList *lst, int size, KIcon::Context context) const;
     void queryIconsByContext(TQStringList *lst, int size, KIcon::Context context) const;
-    KIcon tqfindIcon(const TQString& name, int size, KIcon::MatchType match) const;
+    KIcon findIcon(const TQString& name, int size, KIcon::MatchType match) const;
     void printTree(TQString& dbgString) const;
 
     KIconTheme *theme;
 };
 
-class KIconLoaderPrivate : public TQObject
+class KIconLoaderPrivate : public QObject
 {
     Q_OBJECT
 public:
diff --git a/kdecore/kicontheme.cpp b/kdecore/kicontheme.cpp
index 5ee706422..6bbeba512 100644
--- a/kdecore/kicontheme.cpp
+++ b/kdecore/kicontheme.cpp
@@ -185,7 +185,7 @@ KIconTheme::KIconTheme(const TQString& name, const TQString& appName)
     TQMap<int,TQValueList<int> > scIcons;
     for (KIconThemeDir *dir=mDirs.first(); dir!=0L; dir=mDirs.next())
     {
-        if ((dir->type() == KIcon::Scalable) && !scIcons.tqcontains(dir->size()))
+        if ((dir->type() == KIcon::Scalable) && !scIcons.contains(dir->size()))
         {
             TQValueList<int> lst;
             for (i=dir->minSize(); i<=dir->maxSize(); i++)
@@ -209,7 +209,7 @@ KIconTheme::KIconTheme(const TQString& name, const TQString& appName)
         TQValueList<int>::ConstIterator it2;
         for (it2=lst.begin(); it2!=lst.end(); ++it2)
         {
-            if (scIcons.tqcontains(*it2))
+            if (scIcons.contains(*it2))
                 exp += scIcons[*it2];
             else
                 exp += *it2;
@@ -269,7 +269,7 @@ TQStringList KIconTheme::queryIcons(int size, KIcon::Context context) const
     TQPtrListIterator<KIconThemeDir> dirs(mDirs);
     KIconThemeDir *dir;
 
-    // Try to tqfind exact match
+    // Try to find exact match
     TQStringList result;
     for ( ; dirs.current(); ++dirs)
     {
@@ -422,13 +422,13 @@ KIcon KIconTheme::iconPath(const TQString& name, int size, KIcon::MatchType matc
 	icon.threshold = dir->threshold();
         icon.context = dir->context();
 
-        // if we got in MatchExact that far, we tqfind no better
+        // if we got in MatchExact that far, we find no better
         if (match == KIcon::MatchExact)
             return icon;
 	else
         {
 	    delta = dw;
-	    if (delta==0) return icon; // We won't tqfind a better match anyway
+	    if (delta==0) return icon; // We won't find a better match anyway
         }
     }
     return icon;
@@ -451,13 +451,13 @@ TQString KIconTheme::current()
     KConfig *config = KGlobal::config();
     KConfigGroupSaver saver(config, "Icons");
     *_theme = config->readEntry("Theme",defaultThemeName());
-    if ( *_theme == TQString::tqfromLatin1("hicolor") ) *_theme = defaultThemeName();
+    if ( *_theme == TQString::fromLatin1("hicolor") ) *_theme = defaultThemeName();
 /*    if (_theme->isEmpty())
     {
         if (TQPixmap::defaultDepth() > 8)
             *_theme = defaultThemeName();
         else
-            *_theme = TQString::tqfromLatin1("locolor");
+            *_theme = TQString::fromLatin1("locolor");
     }*/
     return *_theme;
 }
@@ -492,7 +492,7 @@ TQStringList KIconTheme::list()
 		KIconTheme oink(*it2);
 	    if (!oink.isValid()) continue;
 
-	    if (!_theme_list->tqcontains(*it2))
+	    if (!_theme_list->contains(*it2))
                 _theme_list->append(*it2);
         }
     }
@@ -511,7 +511,7 @@ void KIconTheme::reconfigure()
 // static
 TQString KIconTheme::defaultThemeName()
 {
-    return TQString::tqfromLatin1("crystalsvg");
+    return TQString::fromLatin1("crystalsvg");
 }
 
 /*** KIconThemeDir ***/
@@ -551,8 +551,8 @@ KIconThemeDir::KIconThemeDir(const TQString& dir, const KConfigBase *config)
         mContext = KIcon::International;
     else if (tmp == "Places")
         mContext = KIcon::Place;
-    else if (tmp == "tqStatus")
-        mContext = KIcon::tqStatusIcon;
+    else if (tmp == "Status")
+        mContext = KIcon::StatusIcon;
     else {
         kdDebug(264) << "Invalid Context= line for icon theme: " << mDir << "\n";
         return;
diff --git a/kdecore/kicontheme.h b/kdecore/kicontheme.h
index 643c655df..3a1f14fa4 100644
--- a/kdecore/kicontheme.h
+++ b/kdecore/kicontheme.h
@@ -59,7 +59,7 @@ public:
       Emote, ///< An icon that expresses an emotion.
       International, ///< An icon that represents a country's flag.
       Place, ///< An icon that represents a location (e.g. 'home', 'trash').
-      tqStatusIcon ///< An icon that represents an event.
+      StatusIcon ///< An icon that represents an event.
     };
 
     /**
@@ -75,7 +75,7 @@ public:
      * The type of a match.
      */
     enum MatchType {
-      MatchExact, ///< Only try to tqfind an exact match.
+      MatchExact, ///< Only try to find an exact match.
       MatchBest   ///< Take the best match if there is no exact match.
 
     };
diff --git a/kdecore/kidna.cpp b/kdecore/kidna.cpp
index 1ce2c1348..ca41fecdf 100644
--- a/kdecore/kidna.cpp
+++ b/kdecore/kidna.cpp
@@ -43,12 +43,12 @@ TQString KIDNA::toAscii(const TQString &idna)
 {
   if (idna.length() && (idna[0] == (QChar)'.'))
   {
-     TQString host = TQString::tqfromLatin1(toAsciiCString(idna.mid(1)));
+     TQString host = TQString::fromLatin1(toAsciiCString(idna.mid(1)));
      if (host.isEmpty())
         return TQString::null; // Error
      return idna[0] + host;
   }
-  return TQString::tqfromLatin1(toAsciiCString(idna));
+  return TQString::fromLatin1(toAsciiCString(idna));
 }
 
 TQString KIDNA::toUnicode(const TQString &idna)
diff --git a/kdecore/kinstance.cpp b/kdecore/kinstance.cpp
index a03d6e891..2a579de0a 100644
--- a/kdecore/kinstance.cpp
+++ b/kdecore/kinstance.cpp
@@ -40,7 +40,7 @@
   static TQPtrDict<TQCString> *allOldInstances = 0;
   #define DEBUG_ADD do { if (!allInstances) { allInstances = new TQPtrList<KInstance>(); allOldInstances = new TQPtrDict<TQCString>(); } allInstances->append(this); allOldInstances->insert( this, new TQCString( _name)); } while (false);
   #define DEBUG_REMOVE do { allInstances->removeRef(this); } while (false);
-  #define DEBUG_CHECK_ALIVE do { if (!allInstances->tqcontains((KInstance*)this)) { TQCString *old = allOldInstances->tqfind((KInstance*)this); qWarning("ACCESSING DELETED KINSTANCE! (%s)", old ? old->data() : "<unknown>"); assert(false); } } while (false);
+  #define DEBUG_CHECK_ALIVE do { if (!allInstances->contains((KInstance*)this)) { TQCString *old = allOldInstances->find((KInstance*)this); qWarning("ACCESSING DELETED KINSTANCE! (%s)", old ? old->data() : "<unknown>"); assert(false); } } while (false);
 #else
   #define DEBUG_ADD
   #define DEBUG_REMOVE
diff --git a/kdecore/kkeynative.h b/kdecore/kkeynative.h
index e77adfcb0..47b4ad677 100644
--- a/kdecore/kkeynative.h
+++ b/kdecore/kkeynative.h
@@ -48,14 +48,14 @@ class KDECORE_EXPORT KKeyNative
 #ifdef Q_WS_X11
 	/**
 	 * Extracts a new native key from the given xevent.
-	 * @param xevent the XEvent that tqcontains the key
+	 * @param xevent the XEvent that contains the key
 	 */
 	KKeyNative( const XEvent* xevent );
 #endif
 
 	/**
 	 * Creates a new native key for the given KKey code.
-	 * @param key the KKey that tqcontains the generic key
+	 * @param key the KKey that contains the generic key
 	 */
 	KKeyNative( const KKey& key );
 
@@ -80,7 +80,7 @@ class KDECORE_EXPORT KKeyNative
 	/**
 	 * Initializes the native key by extracting the information
 	 * from the given xevent.
-	 * @param xevent the XEvent that tqcontains the key
+	 * @param xevent the XEvent that contains the key
 	 * @return true if successful, false otherwise
 	 */
 	bool init( const XEvent* xevent );
@@ -88,7 +88,7 @@ class KDECORE_EXPORT KKeyNative
 
 	/**
 	 * Creates a new native key for the given KKey code.
-	 * @param key the KKey that tqcontains the generic key
+	 * @param key the KKey that contains the generic key
 	 * @return true if successful, false otherwise
 	 */
 	bool init( const KKey& key );
@@ -207,43 +207,43 @@ class KDECORE_EXPORT KKeyNative
 
 #ifdef Q_WS_X11
 	/**
-	 * Returns the equivalent X modifier tqmask of the given modifier flag.
+	 * Returns the equivalent X modifier mask of the given modifier flag.
 	 * @param modFlag the mod flags to test
 	 * @return the equivalent native flags of the window system
 	 */
 	static uint modX( KKey::ModFlag modFlag );
 
 	/**
-	 * Returns bitwise OR'ed tqmask containing Shift, Ctrl, Alt, and
+	 * Returns bitwise OR'ed mask containing Shift, Ctrl, Alt, and
 	 * Win (if available).
-	 * @return the tqmask of Shift, Ctrl, Alt and Win.
+	 * @return the mask of Shift, Ctrl, Alt and Win.
 	 */
 	static uint accelModMaskX();
 
 	/**
-	 * Returns the X11 NumLock modifier tqmask/flag.
-	 * @return the X11 NumLock modifier tqmask/flag.
+	 * Returns the X11 NumLock modifier mask/flag.
+	 * @return the X11 NumLock modifier mask/flag.
 	 * @see accelModMaskX()
 	 */
 	static uint modXNumLock();
 
 	/**
-	 * Returns the X11 Lock modifier tqmask/flag.
-	 * @return the X11 Lock modifier tqmask/flag.
+	 * Returns the X11 Lock modifier mask/flag.
+	 * @return the X11 Lock modifier mask/flag.
 	 * @see accelModMaskX()
 	 */
 	static uint modXLock();
 
 	/**
-	 * Returns the X11 ScrollLock modifier tqmask/flag.
-	 * @return the X11 ScrollLock modifier tqmask/flag.
+	 * Returns the X11 ScrollLock modifier mask/flag.
+	 * @return the X11 ScrollLock modifier mask/flag.
 	 * @see accelModMaskX()
 	 */
 	static uint modXScrollLock();
 
 	/** 
-	 * Returns the X11 Mode_switch modifier tqmask/flag. 
-	 * @return the X11 Mode_switch modifier tqmask/flag. 
+	 * Returns the X11 Mode_switch modifier mask/flag. 
+	 * @return the X11 Mode_switch modifier mask/flag. 
 	 * @see accelModMaskX() 
 	 * @since 3.5
 	 */ 
diff --git a/kdecore/kkeynative_x11.cpp b/kdecore/kkeynative_x11.cpp
index cef68022e..7733d3de7 100644
--- a/kdecore/kkeynative_x11.cpp
+++ b/kdecore/kkeynative_x11.cpp
@@ -96,7 +96,7 @@ bool KKeyNative::init( const KKey& key )
 	m_mod = key.m_mod;
 #elif !defined(Q_WS_WIN) && !defined(Q_WS_MACX)
 	// Get any extra mods required by the sym.
-	//  E.g., XK_Plus requires SHIFT on the en tqlayout.
+	//  E.g., XK_Plus requires SHIFT on the en layout.
 	m_sym = key.sym();
 	uint modExtra = KKeyServer::Sym(m_sym).getModsRequired();
 	// Get the X modifier equivalent.
@@ -108,7 +108,7 @@ bool KKeyNative::init( const KKey& key )
 
 	// XKeysymToKeycode returns the wrong keycode for XK_Print and XK_Break.
 	// Specifically, it returns the code for SysReq instead of Print
-	// Only do this for the default Xorg tqlayout, other keycode mappings
+	// Only do this for the default Xorg layout, other keycode mappings
 	// (e.g. evdev) don't need or want it.
 	if( m_sym == XK_Print && !(m_mod & Mod1Mask) &&
                 XKeycodeToKeysym( qt_xdisplay(), 111, 0 ) == XK_Print )
@@ -122,7 +122,7 @@ bool KKeyNative::init( const KKey& key )
 	if( !m_code && m_sym )
 		kdDebug(125) << "Couldn't get code for sym" << endl;
 	// Now get the true sym formed by the modifiers
-	//  E.g., Shift+Equal => Plus on the en tqlayout.
+	//  E.g., Shift+Equal => Plus on the en layout.
 	if( key.modFlags() && ( ( m_sym < XK_Home || m_sym > XK_Begin ) && 
 				  m_sym != XK_Insert && m_sym != XK_Delete ))
 		KKeyServer::codeXToSym( m_code, m_mod, m_sym );
diff --git a/kdecore/kkeyserver_x11.cpp b/kdecore/kkeyserver_x11.cpp
index 4882d5429..96411bca5 100644
--- a/kdecore/kkeyserver_x11.cpp
+++ b/kdecore/kkeyserver_x11.cpp
@@ -338,7 +338,7 @@ bool initializeMods()
         XFree( XGetKeyboardMapping( qt_xdisplay(), min_keycode, 1, &keysyms_per_keycode ));
 	// Qt assumes that Alt is always Mod1Mask, so start at Mod2Mask.
 	for( int i = Mod2MapIndex; i < 8; i++ ) {
-		uint tqmask = (1 << i);
+		uint mask = (1 << i);
 		uint keySymX = NoSymbol;
                 // This used to be only XKeycodeToKeysym( ... , 0 ), but that fails with XFree4.3.99
                 // and X.org R6.7 , where for some reason only ( ... , 1 ) works. I have absolutely no
@@ -348,13 +348,13 @@ bool initializeMods()
                     for( int k = 0; k < keysyms_per_keycode && keySymX == NoSymbol; ++k )
                         keySymX = XKeycodeToKeysym( qt_xdisplay(), xmk->modifiermap[xmk->max_keypermod * i + j], k );
 		switch( keySymX ) {
-			case XK_Num_Lock:    g_modXNumLock = tqmask; break;     // Normally Mod2Mask
+			case XK_Num_Lock:    g_modXNumLock = mask; break;     // Normally Mod2Mask
 			case XK_Super_L:
-			case XK_Super_R:     g_rgModInfo[3].modX = tqmask; break; // Win key, Normally Mod4Mask
+			case XK_Super_R:     g_rgModInfo[3].modX = mask; break; // Win key, Normally Mod4Mask
 			case XK_Meta_L:
-			case XK_Meta_R:      if( !g_rgModInfo[3].modX ) g_rgModInfo[3].modX = tqmask; break; // Win alternate
-			case XK_Scroll_Lock: g_modXScrollLock = tqmask; break;  // Normally Mod5Mask
-			case XK_Mode_switch: g_modXModeSwitch = tqmask; break; 
+			case XK_Meta_R:      if( !g_rgModInfo[3].modX ) g_rgModInfo[3].modX = mask; break; // Win alternate
+			case XK_Scroll_Lock: g_modXScrollLock = mask; break;  // Normally Mod5Mask
+			case XK_Mode_switch: g_modXModeSwitch = mask; break; 
 		}
 	}
 
@@ -406,7 +406,7 @@ bool Sym::initQt( int keyQt )
 	int symQt = keyQt & 0xffff;
 
 	if( (keyQt & Qt::UNICODE_ACCEL) || symQt < 0x1000 ) {
-		m_sym = TQChar(symQt).lower().tqunicode();
+		m_sym = TQChar(symQt).lower().unicode();
 		return true;
 	}
 
@@ -434,9 +434,9 @@ bool Sym::initQt( int keyQt )
 
 bool Sym::init( const TQString& s )
 {
-	// If it's a single character, get tqunicode value.
+	// If it's a single character, get unicode value.
 	if( s.length() == 1 ) {
-		m_sym = s[0].lower().tqunicode();
+		m_sym = s[0].lower().unicode();
 		return true;
 	}
 
@@ -498,7 +498,7 @@ TQString Sym::toString( bool bUserSpace ) const
 	if( m_sym == 0 )
 		return TQString::null;
 
-	// If it's a tqunicode character,
+	// If it's a unicode character,
 #ifdef Q_WS_WIN
 	else if( m_sym < 0x1000 ) {
 #else
@@ -536,13 +536,13 @@ uint Sym::getModsRequired() const
 {
 	uint mod = 0;
 #ifdef Q_WS_X11
-	// FIXME: This might not be true on all keyboard tqlayouts!
+	// FIXME: This might not be true on all keyboard layouts!
 	if( m_sym == XK_Sys_Req ) return KKey::ALT;
 	if( m_sym == XK_Break ) return KKey::CTRL;
 
 	if( m_sym < 0x3000 ) {
 		TQChar c(m_sym);
-		if( c.isLetter() && c.lower() != c.upper() && m_sym == c.upper().tqunicode() )
+		if( c.isLetter() && c.lower() != c.upper() && m_sym == c.upper().unicode() )
 			return KKey::SHIFT;
 	}
 
@@ -823,7 +823,7 @@ uint stringUserToMod( const TQString& mod )
 	// Get code of just the primary key
 	keySymQt = keyCombQt & 0xffff;
 
-	// If tqunicode value beneath 0x1000 (special Qt codes begin thereafter),
+	// If unicode value beneath 0x1000 (special Qt codes begin thereafter),
 	if( keySymQt < 0x1000 ) {
 		// For reasons unbeknownst to me, Qt converts 'a-z' to 'A-Z'.
 		// So convert it back to lowercase if SHIFT isn't held down.
@@ -1041,7 +1041,7 @@ void KKey::simplify()
 
 	// If this is a letter, don't remove any modifiers.
 	if( m_sym < 0x3000 && TQChar(m_sym).isLetter() )
-		m_sym = TQChar(m_sym).lower().tqunicode();
+		m_sym = TQChar(m_sym).lower().unicode();
 
 	// Remove modifers from modifier list which are implicit in the symbol.
 	// Ex. Shift+Plus => Plus (en)
diff --git a/kdecore/kkeyserver_x11.h b/kdecore/kkeyserver_x11.h
index b9a5ed811..7935c0ce4 100644
--- a/kdecore/kkeyserver_x11.h
+++ b/kdecore/kkeyserver_x11.h
@@ -110,7 +110,7 @@ namespace KKeyServer
 		uint getModsRequired() const;
 
 		/**
-		 * TODO: please tqfind out what this method does and document it
+		 * TODO: please find out what this method does and document it
 		 */
 		uint getSymVariation() const;
 
@@ -260,14 +260,14 @@ namespace KKeyServer
 	KDECORE_EXPORT bool initializeMods();
 
 	/**
-	 * Returns the equivalent X modifier tqmask of the given modifier flag.
+	 * Returns the equivalent X modifier mask of the given modifier flag.
 	 * @param modFlag the generic flags to check
 	 * @return the window system specific flags
 	 */
 	KDECORE_EXPORT uint modX( KKey::ModFlag modFlag );
 
 	/**
-	 * Returns true if the current keyboard tqlayout supports the Win key.
+	 * Returns true if the current keyboard layout supports the Win key.
 	 * Specifically, whether the Super or Meta keys are assigned to an X modifier.
 	 * @return true if the keyboard has a Win key
 	 * @see modXWin()
@@ -275,65 +275,65 @@ namespace KKeyServer
 	KDECORE_EXPORT bool keyboardHasWinKey();
 
 	/**
-	 * Returns the X11 Shift modifier tqmask/flag.
-	 * @return the X11 Shift modifier tqmask/flag.
+	 * Returns the X11 Shift modifier mask/flag.
+	 * @return the X11 Shift modifier mask/flag.
 	 * @see accelModMaskX()
 	 */
 	KDECORE_EXPORT uint modXShift();
 
 	/**
-	 * Returns the X11 Lock modifier tqmask/flag.
-	 * @return the X11 Lock modifier tqmask/flag.
+	 * Returns the X11 Lock modifier mask/flag.
+	 * @return the X11 Lock modifier mask/flag.
 	 * @see accelModMaskX()
 	 */
 	KDECORE_EXPORT uint modXLock();
 
 	/**
-	 * Returns the X11 Ctrl modifier tqmask/flag.
-	 * @return the X11 Ctrl modifier tqmask/flag.
+	 * Returns the X11 Ctrl modifier mask/flag.
+	 * @return the X11 Ctrl modifier mask/flag.
 	 * @see accelModMaskX()
 	 */
 	KDECORE_EXPORT uint modXCtrl();
 
 	/**
-	 * Returns the X11 Alt (Mod1) modifier tqmask/flag.
-	 * @return the X11 Alt (Mod1) modifier tqmask/flag.
+	 * Returns the X11 Alt (Mod1) modifier mask/flag.
+	 * @return the X11 Alt (Mod1) modifier mask/flag.
 	 * @see accelModMaskX()
 	 */
 	KDECORE_EXPORT uint modXAlt();
 
 	/**
-	 * Returns the X11 NumLock modifier tqmask/flag.
-	 * @return the X11 NumLock modifier tqmask/flag.
+	 * Returns the X11 NumLock modifier mask/flag.
+	 * @return the X11 NumLock modifier mask/flag.
 	 * @see accelModMaskX()
 	 */
 	KDECORE_EXPORT uint modXNumLock();
 
 	/**
-	 * Returns the X11 Win (Mod3) modifier tqmask/flag.
-	 * @return the X11 Win (Mod3) modifier tqmask/flag.
+	 * Returns the X11 Win (Mod3) modifier mask/flag.
+	 * @return the X11 Win (Mod3) modifier mask/flag.
 	 * @see keyboardHasWinKey()
 	 * @see accelModMaskX()
 	 */
 	KDECORE_EXPORT uint modXWin();
 
 	/**
-	 * Returns the X11 ScrollLock modifier tqmask/flag.
-	 * @return the X11 ScrollLock modifier tqmask/flag.
+	 * Returns the X11 ScrollLock modifier mask/flag.
+	 * @return the X11 ScrollLock modifier mask/flag.
 	 * @see accelModMaskX()
 	 */
 	KDECORE_EXPORT uint modXScrollLock();
 
 	/**
-	 * Returns the X11 Mode_switch modifier tqmask/flag. 
-	 * @return the X11 Mode_switch modifier tqmask/flag. 
+	 * Returns the X11 Mode_switch modifier mask/flag. 
+	 * @return the X11 Mode_switch modifier mask/flag. 
 	 * @see accelModMaskX()
 	 * @since 3.5
 	 */
 	KDECORE_EXPORT uint modXModeSwitch();
 
 	/**
-	 * Returns bitwise OR'ed tqmask containing Shift, Ctrl, Alt, and
+	 * Returns bitwise OR'ed mask containing Shift, Ctrl, Alt, and
 	 * Win (if available).
 	 * @see modXShift()
 	 * @see modXLock()
@@ -358,7 +358,7 @@ namespace KKeyServer
 
 	/**
 	 * Extracts the modifiers from the given Qt key and
-	 * converts them in a tqmask of ORed KKey::ModFlag modifiers.
+	 * converts them in a mask of ORed KKey::ModFlag modifiers.
 	 * @param keyQt the qt key code
 	 * @param mod if successful, the modifiers will be written here
 	 * @return true if successful, false otherwise
@@ -377,10 +377,10 @@ namespace KKeyServer
 	KDECORE_EXPORT bool symToKeyQt( uint sym, int& keyQt );
 
 	/**
-	 * Converts the tqmask of ORed KKey::ModFlag modifiers to
-	 * a tqmask of ORed Qt key code modifiers.
-	 * @param mod the tqmask of KKey::ModFlag modifiers
-	 * @param modQt the tqmask of Qt key code modifiers will be written here,
+	 * Converts the mask of ORed KKey::ModFlag modifiers to
+	 * a mask of ORed Qt key code modifiers.
+	 * @param mod the mask of KKey::ModFlag modifiers
+	 * @param modQt the mask of Qt key code modifiers will be written here,
 	 *        if successful
 	 * @return true if successful, false otherwise
 	 * @see Qt::Key
@@ -389,10 +389,10 @@ namespace KKeyServer
 	KDECORE_EXPORT bool modToModQt( uint mod, int& modQt );
 
 	/**
-	 * Converts the tqmask of ORed KKey::ModFlag modifiers to
-	 * a tqmask of ORed X11 modifiers.
-	 * @param mod the tqmask of KKey::ModFlag modifiers
-	 * @param modX the tqmask of X11 modifiers will be written here,
+	 * Converts the mask of ORed KKey::ModFlag modifiers to
+	 * a mask of ORed X11 modifiers.
+	 * @param mod the mask of KKey::ModFlag modifiers
+	 * @param modX the mask of X11 modifiers will be written here,
 	 *        if successful
 	 * @return true if successful, false otherwise
 	 * @see KKey
@@ -400,10 +400,10 @@ namespace KKeyServer
 	KDECORE_EXPORT bool modToModX( uint mod, uint& modX );
 
 	/**
-	 * Converts the tqmask of ORed X11 modifiers to
-	 * a tqmask of ORed Qt key code modifiers.
-	 * @param modX the tqmask of X11 modifiers
-	 * @param modQt the tqmask of Qt key code modifiers will be written here
+	 * Converts the mask of ORed X11 modifiers to
+	 * a mask of ORed Qt key code modifiers.
+	 * @param modX the mask of X11 modifiers
+	 * @param modQt the mask of Qt key code modifiers will be written here
 	 *        if successful
 	 * @return true if successful, false otherwise
 	 * @see Qt::Key
@@ -417,10 +417,10 @@ namespace KKeyServer
 	KDECORE_EXPORT int qtButtonStateToMod( TQ_ButtonState s );
 
 	/**
-	 * Converts the tqmask of ORed X11 modifiers to
-	 * a tqmask of ORed KKey::ModFlag modifiers.
-	 * @param modX the tqmask of X11 modifiers
-	 * @param mod the tqmask of KKey::ModFlag modifiers will be written here,
+	 * Converts the mask of ORed X11 modifiers to
+	 * a mask of ORed KKey::ModFlag modifiers.
+	 * @param modX the mask of X11 modifiers
+	 * @param mod the mask of KKey::ModFlag modifiers will be written here,
 	 *        if successful
 	 * @return true if successful, false otherwise
 	 * @see KKey
@@ -428,11 +428,11 @@ namespace KKeyServer
 	KDECORE_EXPORT bool modXToMod( uint modX, uint& mod );
 
 	/**
-	 * Converts a X11 key code and a tqmask of ORed X11 modifiers
+	 * Converts a X11 key code and a mask of ORed X11 modifiers
 	 * into a X11 symbol.
 	 * converts it to a symbol.
 	 * @param codeX the X11 key code
-	 * @param modX the tqmask of ORed X11 modifiers
+	 * @param modX the mask of ORed X11 modifiers
 	 * @param symX if successful, the X11 symbol will be written here
 	 * @return true if successful, false otherwise
 	 * @see Qt::Key
@@ -446,9 +446,9 @@ namespace KKeyServer
 	KDECORE_EXPORT TQString modToStringInternal( uint mod );
 
 	/**
-	 * Converts the tqmask of ORed KKey::ModFlag modifiers to a
+	 * Converts the mask of ORed KKey::ModFlag modifiers to a
 	 * user-readable string.
-	 * @param mod the tqmask of ORed KKey::ModFlag modifiers
+	 * @param mod the mask of ORed KKey::ModFlag modifiers
 	 * @return the user-readable string
 	 */
 	KDECORE_EXPORT TQString modToStringUser( uint mod );
diff --git a/kdecore/klibloader.cpp b/kdecore/klibloader.cpp
index 84482ba79..e2f55fe67 100644
--- a/kdecore/klibloader.cpp
+++ b/kdecore/klibloader.cpp
@@ -209,7 +209,7 @@ void KLibrary::slotObjectCreated( TQObject *obj )
   if ( m_timer && m_timer->isActive() )
     m_timer->stop();
 
-  if ( m_objs.tqcontainsRef( obj ) )
+  if ( m_objs.containsRef( obj ) )
       return; // we know this object already
 
   connect( obj, TQT_SIGNAL( destroyed() ),
@@ -320,7 +320,7 @@ KLibLoader::~KLibLoader()
     TQAsciiDictIterator<KLibWrapPrivate> it( m_libs );
     for (; it.current(); ++it )
     {
-      kdDebug(150) << "The KLibLoader tqcontains the library " << it.current()->name
+      kdDebug(150) << "The KLibLoader contains the library " << it.current()->name
         << " (" << it.current()->lib << ")" << endl;
       d->pending_close.append(it.current());
     }
@@ -337,10 +337,10 @@ static inline TQCString makeLibName( const char* name )
     // only append ".la" if there is no extension
     // this allows to load non-libtool libraries as well
     // (mhk, 20000228)
-    int pos = libname.tqfindRev('/');
+    int pos = libname.findRev('/');
     if (pos < 0)
       pos = 0;
-    if (libname.tqfind('.', pos) < 0)
+    if (libname.find('.', pos) < 0)
       libname += ".la";
     return libname;
 }
@@ -500,7 +500,7 @@ void KLibLoader::slotLibraryDestroyed()
 
 void KLibLoader::close_pending(KLibWrapPrivate *wrap)
 {
-  if (wrap && !d->pending_close.tqcontainsRef( wrap ))
+  if (wrap && !d->pending_close.containsRef( wrap ))
     d->pending_close.append( wrap );
 
   /* First delete all KLibrary objects in pending_close, but _don't_ unload
@@ -534,7 +534,7 @@ void KLibLoader::close_pending(KLibWrapPrivate *wrap)
 
     /* Now ensure, that the libs are only unloaded in the reverse direction
        they were loaded.  */
-    if (!d->pending_close.tqcontainsRef( wrap )) {
+    if (!d->pending_close.containsRef( wrap )) {
       if (!deleted_one)
         /* Only diagnose, if we really haven't deleted anything. */
 //        kdDebug(150) << "try to dlclose " << wrap->name << ": not yet" << endl;
diff --git a/kdecore/klibloader.h b/kdecore/klibloader.h
index d5f811faf..b1a1bc330 100644
--- a/kdecore/klibloader.h
+++ b/kdecore/klibloader.h
@@ -47,7 +47,7 @@ class KLibraryPrivate;
  * @see KLibLoader
  * @author Torben Weis <weis@kde.org>
  */
-class KDECORE_EXPORT KLibrary : public TQObject
+class KDECORE_EXPORT KLibrary : public QObject
 {
     friend class KLibLoader;
     friend class TQAsciiDict<KLibrary>;
@@ -139,7 +139,7 @@ class KLibWrapPrivate;
  * @see KLibrary
  * @author Torben Weis <weis@kde.org>
  */
-class KDECORE_EXPORT KLibLoader : public TQObject
+class KDECORE_EXPORT KLibLoader : public QObject
 {
     friend class KLibrary;
 
@@ -312,7 +312,7 @@ private:
  *     s_global = new KInstance( "kspread" );
  * \endcode
  * This KInstance is comparable to KGlobal used by normal applications.
- * It allows you to tqfind resource files (images, XML, sound etc.) belonging
+ * It allows you to find resource files (images, XML, sound etc.) belonging
  * to the library.
  *
  * If you want to load a library, use KLibLoader. You can query KLibLoader
@@ -322,7 +322,7 @@ private:
  * The KLibFactory is used to create the components, the library has to offer.
  * The factory of KSpread for example will create instances of KSpreadDoc,
  * while the Konqueror factory will create KonqView widgets.
- * All objects created by the factory must be derived from TQObject, since TQObject
+ * All objects created by the factory must be derived from TQObject, since QObject
  * offers type safe casting.
  *
  * KLibFactory is an abstract class. Reimplement the
@@ -330,7 +330,7 @@ private:
  *
  * @author Torben Weis <weis@kde.org>
  */
-class KDECORE_EXPORT KLibFactory : public TQObject
+class KDECORE_EXPORT KLibFactory : public QObject
 {
     Q_OBJECT
 public:
diff --git a/kdecore/klocale.cpp b/kdecore/klocale.cpp
index e94c631cd..91fe1c2a1 100644
--- a/kdecore/klocale.cpp
+++ b/kdecore/klocale.cpp
@@ -59,7 +59,7 @@ public:
   bool dateMonthNamePossessive;
   TQStringList languageList;
   TQStringList catalogNames; // list of all catalogs (regardless of language)
-  TQValueList<KCatalogue> catalogues; // list of all loaded catalogs, tqcontains one instance per catalog name and language
+  TQValueList<KCatalogue> catalogues; // list of all loaded catalogs, contains one instance per catalog name and language
   TQString encoding;
   TQTextCodec * codecForEncoding;
   KConfig * config;
@@ -121,9 +121,9 @@ void KLocale::initMainCatalogues(const TQString & catalog)
   TQString mainCatalogue = catalog;
 
   // don't use main catalogue if we're looking up .desktop translations
-  if (mainCatalogue.tqcontains("desktop") == 0 || mainCatalogue.tqcontains("kdesktop") == 1) {
+  if (mainCatalogue.contains("desktop") == 0 || mainCatalogue.contains("kdesktop") == 1) {
     if (maincatalogue) {
-      mainCatalogue = TQString::tqfromLatin1(maincatalogue);
+      mainCatalogue = TQString::fromLatin1(maincatalogue);
     }
   }
 
@@ -135,7 +135,7 @@ void KLocale::initMainCatalogues(const TQString & catalog)
   else {
     // do not use insertCatalogue here, that would already trigger updateCatalogs
     d->catalogNames.append( mainCatalogue );   // application catalog
-    if (mainCatalogue.tqcontains("desktop") == 0 || mainCatalogue.tqcontains("kdesktop") == 1) { //don't bother if we're looking up desktop translations
+    if (mainCatalogue.contains("desktop") == 0 || mainCatalogue.contains("kdesktop") == 1) { //don't bother if we're looking up desktop translations
       d->catalogNames.append( SYSTEM_MESSAGES ); // always include kdelibs.mo
       d->catalogNames.append( "kio" );            // always include kio.mo
       d->catalogNames.append( "xdg-user-dirs" );
@@ -312,13 +312,13 @@ void KLocale::initFormat()
   KConfigGroupSaver saver(config, "Locale");
 
   KSimpleConfig entry(locate("locale",
-                             TQString::tqfromLatin1("l10n/%1/entry.desktop")
+                             TQString::fromLatin1("l10n/%1/entry.desktop")
                              .arg(m_country)), true);
   entry.setGroup("KCM Locale");
 
   // Numeric
 #define readConfigEntry(key, default, save) \
-  save = entry.readEntry(key, TQString::tqfromLatin1(default)); \
+  save = entry.readEntry(key, TQString::fromLatin1(default)); \
   save = config->readEntry(key, save);
 
 #define readConfigNumEntry(key, default, save, type) \
@@ -331,7 +331,7 @@ void KLocale::initFormat()
 
   readConfigEntry("DecimalSymbol", ".", m_decimalSymbol);
   readConfigEntry("ThousandsSeparator", ",", m_thousandsSeparator);
-  m_thousandsSeparator.tqreplace( TQString::tqfromLatin1("$0"), TQString::null );
+  m_thousandsSeparator.replace( TQString::fromLatin1("$0"), TQString::null );
   //kdDebug(173) << "m_thousandsSeparator=" << m_thousandsSeparator << endl;
 
   readConfigEntry("PositiveSign", "", m_positiveSign);
@@ -342,7 +342,7 @@ void KLocale::initFormat()
   readConfigEntry("MonetaryDecimalSymbol", ".", m_monetaryDecimalSymbol);
   readConfigEntry("MonetaryThousandsSeparator", ",",
 		  m_monetaryThousandsSeparator);
-  m_monetaryThousandsSeparator.tqreplace(TQString::tqfromLatin1("$0"), TQString::null);
+  m_monetaryThousandsSeparator.replace(TQString::fromLatin1("$0"), TQString::null);
 
   readConfigNumEntry("FracDigits", 2, m_fracDigits, int);
   readConfigBoolEntry("PositivePrefixCurrencySymbol", true,
@@ -372,7 +372,7 @@ void KLocale::initFormat()
   //Grammatical
   //Precedence here is l10n / i18n / config file
   KSimpleConfig language(locate("locale",
-			        TQString::tqfromLatin1("%1/entry.desktop")
+			        TQString::fromLatin1("%1/entry.desktop")
                                 .arg(m_language)), true);
   language.setGroup("KCM Locale");
 #define read3ConfigBoolEntry(key, default, save) \
@@ -404,7 +404,7 @@ bool KLocale::setCountry(const TQString & country)
 TQString KLocale::catalogueFileName(const TQString & language,
 				   const KCatalogue & catalog)
 {
-  TQString path = TQString::tqfromLatin1("%1/LC_MESSAGES/%2.mo")
+  TQString path = TQString::fromLatin1("%1/LC_MESSAGES/%2.mo")
     .arg( language )
     .arg( catalog.name() );
 
@@ -417,7 +417,7 @@ TQString KLocale::catalogueFileName(const TQString & language,
 
 bool KLocale::setLanguage(const TQString & language)
 {
-  if ( d->languageList.tqcontains( language ) ) {
+  if ( d->languageList.contains( language ) ) {
  	 d->languageList.remove( language );
   }
   d->languageList.prepend( language ); // let us consider this language to be the most important one
@@ -444,14 +444,14 @@ bool KLocale::setLanguage(const TQStringList & languages)
   //    these langugage have to be dropped. Otherwise we get strange side effects, e.g. with Hebrew:
   //    the right/left switch for languages that write from
   //    right to left (like Hebrew or Arabic) is set in kdelibs.mo. If you only have kdelibs.mo
-  //    but nothing from appname.mo, you get a mostly English app with tqlayout from right to left.
+  //    but nothing from appname.mo, you get a mostly English app with layout from right to left.
   //    That was considered to be a bug by the Hebrew translators.
   for( TQStringList::Iterator it = languageList.fromLast();
     it != languageList.begin(); --it )
   {
     // kdDebug() << "checking " << (*it) << endl;
     bool bIsTranslated = isApplicationTranslatedInto( *it );
-    if ( languageList.tqcontains(*it) > 1 || (*it).isEmpty() || (!bIsTranslated) ) {
+    if ( languageList.contains(*it) > 1 || (*it).isEmpty() || (!bIsTranslated) ) {
       // kdDebug() << "removing " << (*it) << endl;
       it = languageList.remove( it );
     }
@@ -497,15 +497,15 @@ bool KLocale::isApplicationTranslatedInto( const TQString & language)
 
   TQString appName = d->appName;
   if (maincatalogue) {
-    appName = TQString::tqfromLatin1(maincatalogue);
+    appName = TQString::fromLatin1(maincatalogue);
   }
   // sorry, catalogueFileName requires catalog object,k which we do not have here
-  // path tqfinding was supposed to be moved completely to KCatalogue. The interface cannot
+  // path finding was supposed to be moved completely to KCatalogue. The interface cannot
   // be changed that far during deep freeze. So in order to fix the bug now, we have
   // duplicated code for file path evaluation. Cleanup will follow later. We could have e.g.
   // a static method in KCataloge that can translate between these file names.
   // a stat
-  TQString sFileName = TQString::tqfromLatin1("%1/LC_MESSAGES/%2.mo")
+  TQString sFileName = TQString::fromLatin1("%1/LC_MESSAGES/%2.mo")
     .arg( language )
     .arg( appName );
   // kdDebug() << "isApplicationTranslatedInto: filename " << sFileName << endl;
@@ -526,7 +526,7 @@ void KLocale::splitLocale(const TQString & aStr,
   TQString str = aStr;
 
   // just in case, there is another language appended
-  int f = str.tqfind(':');
+  int f = str.find(':');
   if (f >= 0)
     str.truncate(f);
 
@@ -534,14 +534,14 @@ void KLocale::splitLocale(const TQString & aStr,
   chrset = TQString::null;
   language = TQString::null;
 
-  f = str.tqfind('.');
+  f = str.find('.');
   if (f >= 0)
     {
       chrset = str.mid(f + 1);
       str.truncate(f);
     }
 
-  f = str.tqfind('_');
+  f = str.find('_');
   if (f >= 0)
     {
       country = str.mid(f + 1);
@@ -644,7 +644,7 @@ TQString KLocale::weekDayName (int i, bool shortName) const
 
 void KLocale::insertCatalogue( const TQString & catalog )
 {
-  if ( !d->catalogNames.tqcontains( catalog) ) {
+  if ( !d->catalogNames.contains( catalog) ) {
     d->catalogNames.append( catalog );
   }
   updateCatalogues( ); // evaluate the changed list and generate the neccessary KCatalog objects
@@ -693,7 +693,7 @@ void KLocale::updateCatalogues( )
 
 void KLocale::removeCatalogue(const TQString &catalog)
 {
-  if ( d->catalogNames.tqcontains( catalog )) {
+  if ( d->catalogNames.contains( catalog )) {
     d->catalogNames.remove( catalog );
     if (KGlobal::_instance)
       updateCatalogues();  // walk through the KCatalogue instances and weed out everything we no longer need
@@ -702,7 +702,7 @@ void KLocale::removeCatalogue(const TQString &catalog)
 
 void KLocale::setActiveCatalogue(const TQString &catalog)
 {
-  if ( d->catalogNames.tqcontains( catalog ) ) {
+  if ( d->catalogNames.contains( catalog ) ) {
     d->catalogNames.remove( catalog );
 	d->catalogNames.prepend( catalog );
 	updateCatalogues();  // walk through the KCatalogue instances and adapt to the new order
@@ -723,7 +723,7 @@ TQString KLocale::translate_priv(const char *msgid,
 				int* pluralType ) const
 {
   if ( pluralType) {
-  	*pluralType = -1; // unless we tqfind something more precise
+  	*pluralType = -1; // unless we find something more precise
   }
   if (!msgid || !msgid[0])
     {
@@ -795,10 +795,10 @@ TQString KLocale::translate( const char *index, const char *fallback) const
 static TQString put_n_in(const TQString &orig, unsigned long n)
 {
   TQString ret = orig;
-  int index = ret.tqfind("%n");
+  int index = ret.find("%n");
   if (index == -1)
     return ret;
-  ret.tqreplace(index, 2, TQString::number(n));
+  ret.replace(index, 2, TQString::number(n));
   return ret;
 }
 
@@ -830,7 +830,7 @@ TQString KLocale::translate( const char *singular, const char *plural,
 	} else {
 	  TQString tmp = TQString::fromUtf8( plural );
 #ifndef NDEBUG
-	  if (tmp.tqfind("%n") == -1) {
+	  if (tmp.find("%n") == -1) {
 			  kdDebug() << "the message for i18n should contain a '%n'! " << plural << endl;
 	  }
 #endif
@@ -1142,7 +1142,7 @@ TQString KLocale::formatMoney(double num,
   TQString res = TQString::number(neg?-num:num, 'f', precision);
 
   // Replace dot with locale decimal separator
-  res.tqreplace(TQChar('.'), monetaryDecimalSymbol());
+  res.replace(TQChar('.'), monetaryDecimalSymbol());
 
   // Insert the thousand separators
   _insertSeparator(res, monetaryThousandsSeparator(), monetaryDecimalSymbol());
@@ -1259,7 +1259,7 @@ static void _inc_by_one(TQString &str, int position)
 // Cut off if more digits in fractional part than 'precision'
 static void _round(TQString &str, int precision)
 {
-  int decimalSymbolPos = str.tqfind('.');
+  int decimalSymbolPos = str.find('.');
 
   if (decimalSymbolPos == -1)
     if (precision == 0)  return;
@@ -1294,7 +1294,7 @@ static void _round(TQString &str, int precision)
       break;
     }
 
-  decimalSymbolPos = str.tqfind('.');
+  decimalSymbolPos = str.find('.');
   str.truncate(decimalSymbolPos + precision + 1);
   
   // if precision == 0 delete also '.'
@@ -1324,7 +1324,7 @@ TQString KLocale::formatNumber(const TQString &numStr, bool round,
   if (round) _round(mantString, precision);
  
   // Replace dot with locale decimal separator
-  mantString.tqreplace(TQChar('.'), decimalSymbol());
+  mantString.replace(TQChar('.'), decimalSymbol());
   
   // Insert the thousand separators
   _insertSeparator(mantString, thousandsSeparator(), decimalSymbol());
@@ -1352,14 +1352,14 @@ TQString KLocale::formatDate(const TQDate &pDate, bool shortFormat) const
     {
       if ( !escape )
 	{
-	  if ( (QChar)(rst.at( format_index ).tqunicode()) == (QChar)'%' )
+	  if ( (QChar)(rst.at( format_index ).unicode()) == (QChar)'%' )
 	    escape = true;
 	  else
 	    buffer.append(rst.at(format_index));
 	}
       else
 	{
-	  switch ( rst.at( format_index ).tqunicode() )
+	  switch ( rst.at( format_index ).unicode() )
 	    {
 	    case '%':
 	      buffer.append('%');
@@ -1418,7 +1418,7 @@ void KLocale::setMainCatalogue(const char *catalog)
 double KLocale::readNumber(const TQString &_str, bool * ok) const
 {
   TQString str = _str.stripWhiteSpace();
-  bool neg = str.tqfind(negativeSign()) == 0;
+  bool neg = str.find(negativeSign()) == 0;
   if (neg)
     str.remove( 0, negativeSign().length() );
 
@@ -1428,7 +1428,7 @@ double KLocale::readNumber(const TQString &_str, bool * ok) const
   TQString exponentialPart;
   int EPos;
 
-  EPos = str.tqfind('E', 0, false);
+  EPos = str.find('E', 0, false);
 
   if (EPos != -1)
   {
@@ -1436,7 +1436,7 @@ double KLocale::readNumber(const TQString &_str, bool * ok) const
     str = str.left(EPos);
   }
 
-  int pos = str.tqfind(decimalSymbol());
+  int pos = str.find(decimalSymbol());
   TQString major;
   TQString minor;
   if ( pos == -1 )
@@ -1450,7 +1450,7 @@ double KLocale::readNumber(const TQString &_str, bool * ok) const
   // Remove thousand separators
   int thlen = thousandsSeparator().length();
   int lastpos = 0;
-  while ( ( pos = major.tqfind( thousandsSeparator() ) ) > 0 )
+  while ( ( pos = major.find( thousandsSeparator() ) ) > 0 )
   {
     // e.g. 12,,345,,678,,922 Acceptable positions (from the end) are 5, 10, 15... i.e. (3+thlen)*N
     int fromEnd = major.length() - pos;
@@ -1487,7 +1487,7 @@ double KLocale::readMoney(const TQString &_str, bool * ok) const
   bool currencyFound = false;
   TQString symbol = currencySymbol();
   // First try removing currency symbol from either end
-  int pos = str.tqfind(symbol);
+  int pos = str.find(symbol);
   if ( pos == 0 || pos == (int) str.length()-symbol.length() )
     {
       str.remove(pos,symbol.length());
@@ -1512,7 +1512,7 @@ double KLocale::readMoney(const TQString &_str, bool * ok) const
     }
   else
     {
-      int i1 = str.tqfind(negativeSign());
+      int i1 = str.find(negativeSign());
       if ( i1 == 0 || i1 == (int) str.length()-1 )
         {
 	  neg = true;
@@ -1521,11 +1521,11 @@ double KLocale::readMoney(const TQString &_str, bool * ok) const
     }
   if (neg) str = str.stripWhiteSpace();
 
-  // Finally try again for the currency symbol, if we didn't tqfind
+  // Finally try again for the currency symbol, if we didn't find
   // it already (because of the negative sign being in the way).
   if ( !currencyFound )
     {
-      pos = str.tqfind(symbol);
+      pos = str.find(symbol);
       if ( pos == 0 || pos == (int) str.length()-symbol.length() )
         {
 	  str.remove(pos,symbol.length());
@@ -1534,7 +1534,7 @@ double KLocale::readMoney(const TQString &_str, bool * ok) const
     }
 
   // And parse the rest as a number
-  pos = str.tqfind(monetaryDecimalSymbol());
+  pos = str.find(monetaryDecimalSymbol());
   TQString major;
   TQString minior;
   if (pos == -1)
@@ -1548,7 +1548,7 @@ double KLocale::readMoney(const TQString &_str, bool * ok) const
   // Remove thousand separators
   int thlen = monetaryThousandsSeparator().length();
   int lastpos = 0;
-  while ( ( pos = major.tqfind( monetaryThousandsSeparator() ) ) > 0 )
+  while ( ( pos = major.find( monetaryThousandsSeparator() ) ) > 0 )
   {
     // e.g. 12,,345,,678,,922 Acceptable positions (from the end) are 5, 10, 15... i.e. (3+thlen)*N
     int fromEnd = major.length() - pos;
@@ -1614,7 +1614,7 @@ TQDate KLocale::readDate(const TQString &intstr, const TQString &fmt, bool* ok)
   TQString str = intstr.simplifyWhiteSpace().lower();
   int day = -1, month = -1;
   // allow the year to be omitted if not in the format
-  int year = calendar()->year(TQDate::tqcurrentDate());
+  int year = calendar()->year(TQDate::currentDate());
   uint strpos = 0;
   uint fmtpos = 0;
 
@@ -1876,14 +1876,14 @@ TQString KLocale::formatTime(const TQTime &pTime, bool includeSecs, bool isDurat
     {
       if ( !escape )
 	{
-	  if ( (QChar)(rst.at( format_index ).tqunicode()) == (QChar)'%' )
+	  if ( (QChar)(rst.at( format_index ).unicode()) == (QChar)'%' )
 	    escape = true;
 	  else
 	    buffer[index++] = rst.at( format_index );
 	}
       else
 	{
-	  switch ( rst.at( format_index ).tqunicode() )
+	  switch ( rst.at( format_index ).unicode() )
 	    {
 	    case '%':
 	      buffer[index++] = (QChar)'%';
@@ -1915,7 +1915,7 @@ TQString KLocale::formatTime(const TQTime &pTime, bool includeSecs, bool isDurat
 	      number = pTime.hour();
 	    case 'l':
 	      // to share the code
-	      if ( (QChar)(rst.at( format_index ).tqunicode()) == (QChar)'l' )
+	      if ( (QChar)(rst.at( format_index ).unicode()) == (QChar)'l' )
 		number = isDuration ? pTime.hour() : (pTime.hour() + 11) % 12 + 1;
 	      if ( number / 10 )
 		buffer[index++] = number / 10 + '0';
@@ -1948,8 +1948,8 @@ TQString KLocale::formatTime(const TQTime &pTime, bool includeSecs, bool isDurat
 
 bool KLocale::use12Clock() const
 {
-  if ((timeFormat().tqcontains(TQString::tqfromLatin1("%I")) > 0) ||
-      (timeFormat().tqcontains(TQString::tqfromLatin1("%l")) > 0))
+  if ((timeFormat().contains(TQString::fromLatin1("%I")) > 0) ||
+      (timeFormat().contains(TQString::fromLatin1("%l")) > 0))
     return true;
   else
     return false;
@@ -1957,7 +1957,7 @@ bool KLocale::use12Clock() const
 
 TQString KLocale::languages() const
 {
-  return d->languageList.join( TQString::tqfromLatin1(":") );
+  return d->languageList.join( TQString::fromLatin1(":") );
 }
 
 TQStringList KLocale::languageList() const
@@ -2008,7 +2008,7 @@ void KLocale::initInstance()
 
   KInstance *app = KGlobal::instance();
   if (app) {
-    KGlobal::_locale = new KLocale(TQString::tqfromLatin1(app->instanceName()));
+    KGlobal::_locale = new KLocale(TQString::fromLatin1(app->instanceName()));
 
     // only do this for the global instance
     TQTextCodec::setCodecForLocale(KGlobal::_locale->codecForEncoding());
@@ -2265,12 +2265,12 @@ void KLocale::setMeasureSystem(MeasureSystem value)
 
 TQString KLocale::defaultLanguage()
 {
-  return TQString::tqfromLatin1("en_US");
+  return TQString::fromLatin1("en_US");
 }
 
 TQString KLocale::defaultCountry()
 {
-  return TQString::tqfromLatin1("C");
+  return TQString::fromLatin1("C");
 }
 
 const char * KLocale::encoding() const
@@ -2325,7 +2325,7 @@ TQStringList KLocale::languagesTwoAlpha() const
 
   TQStringList result;
 
-  KConfig config(TQString::tqfromLatin1("language.codes"), true, false);
+  KConfig config(TQString::fromLatin1("language.codes"), true, false);
   config.setGroup("TwoLetterCodes");
 
   for ( TQStringList::ConstIterator it = origList.begin();
@@ -2338,7 +2338,7 @@ TQStringList KLocale::languagesTwoAlpha() const
          langLst = config.readListEntry( lang );
       else
       {
-         int i = lang.tqfind('_');
+         int i = lang.find('_');
          if (i >= 0)
             lang.truncate(i);
          langLst << lang;
@@ -2348,7 +2348,7 @@ TQStringList KLocale::languagesTwoAlpha() const
 	    langIt != langLst.end();
 	    ++langIt )
 	{
-	  if ( !(*langIt).isEmpty() && !result.tqcontains( *langIt ) )
+	  if ( !(*langIt).isEmpty() && !result.contains( *langIt ) )
 	    result += *langIt;
 	}
     }
@@ -2370,8 +2370,8 @@ TQString KLocale::twoAlphaToLanguageName(const TQString &code) const
     d->languages = new KConfig("all_languages", true, false, "locale");
 
   TQString groupName = code;
-  const int i = groupName.tqfind('_');
-  groupName.tqreplace(0, i, groupName.left(i).lower());
+  const int i = groupName.find('_');
+  groupName.replace(0, i, groupName.left(i).lower());
 
   d->languages->setGroup(groupName);
   return d->languages->readEntry("Name");
@@ -2466,7 +2466,7 @@ KLocale & KLocale::operator=(const KLocale & rhs)
 }
 
 bool KLocale::setCharset(const TQString & ) { return true; }
-TQString KLocale::charset() const { return TQString::tqfromLatin1("UTF-8"); }
+TQString KLocale::charset() const { return TQString::fromLatin1("UTF-8"); }
 
 // KDE4: remove
 #if 0
diff --git a/kdecore/klocale.h b/kdecore/klocale.h
index a7e049595..5f8be8f7c 100644
--- a/kdecore/klocale.h
+++ b/kdecore/klocale.h
@@ -91,7 +91,7 @@ KDECORE_EXPORT TQString i18n(const char *comment, const char *text);
  *  If you want to handle plural forms, use this form of i18n.
  *  @param singular the singular form of the word, for example "file".
   * @param plural the plural form of the word. Must contain a "%n" that will
- *                be tqreplaced by the number @p n, for example "%n files"
+ *                be replaced by the number @p n, for example "%n files"
  *  @param n the number
  *  @return the correct singular or plural for the selected language,
  *          depending on n
@@ -162,7 +162,7 @@ public:
    * Translates the string into the corresponding string in
    * the national language, if available. If not, returns
    * the string itself.
-   * There is a KDE wide message file that tqcontains the most
+   * There is a KDE wide message file that contains the most
    * often used phrases, so we can avoid duplicating the
    * translation of these phrases. If a phrase is not found
    * in the catalog given to the constructor, it will search
@@ -210,7 +210,7 @@ public:
    * word.
    * @param singular the singular form of the word, for example "file".
    * @param plural the plural form of the word. Must contain a "%n" that will
-   *               be tqreplaced by the number @p n, for example "%n files"
+   *               be replaced by the number @p n, for example "%n files"
    * @param n the number
    * @return the correct singular or plural for the selected language,
    *         depending on n
@@ -533,7 +533,7 @@ public:
    *
    * @return The name of the month
    * 
-   * Typically the correct tqreplacement for this deprecated class is
+   * Typically the correct replacement for this deprecated class is
    * calendar()->monthString(), which requires a TQDate (rather than an
    * integer month) or both a month and a year.
    * This will work across different calendars.
@@ -558,7 +558,7 @@ public:
    * @return The possessive form of the name of the month
    * @since 3.1
    *
-   * Typically the correct tqreplacement for this deprecated class is
+   * Typically the correct replacement for this deprecated class is
    * calendar()->monthNamePossessive(), which requires a TQDate (rather than
    * an integer month) or both a month and a year.
    * This will work across different calendars.
@@ -801,8 +801,8 @@ public:
   /**
    * Changes the current date format.
    *
-   * The format of the date is a string which tqcontains variables that will
-   * be tqreplaced:
+   * The format of the date is a string which contains variables that will
+   * be replaced:
    * @li %Y with the century (e.g. "19" for "1984")
    * @li %y with the lower 2 digits of the year (e.g. "84" for "1984")
    * @li %n with the month (January="1", December="12")
@@ -824,8 +824,8 @@ public:
   /**
    * Changes the current short date format.
    *
-   * The format of the date is a string which tqcontains variables that will
-   * be tqreplaced:
+   * The format of the date is a string which contains variables that will
+   * be replaced:
    * @li %Y with the century (e.g. "19" for "1984")
    * @li %y with the lower 2 digits of the year (e.g. "84" for "1984")
    * @li %n with the month (January="1", December="12")
@@ -854,8 +854,8 @@ public:
   /**
    * Changes the current time format.
    *
-   * The format of the time is string a which tqcontains variables that will
-   * be tqreplaced:
+   * The format of the time is string a which contains variables that will
+   * be replaced:
    * @li %H with the hour in 24h format and 2 digits (e.g. 5pm is "17", 5am is "05")
    * @li %k with the hour in 24h format and one digits (e.g. 5pm is "17", 5am is "5")
    * @li %I with the hour in 12h format and 2 digits (e.g. 5pm is "05", 5am is "05")
@@ -1117,7 +1117,7 @@ public:
   /**
    * Finds localized resource in resourceDir( rtype ) + \<lang> + fname.
    *
-   * @param fname relative path to tqfind
+   * @param fname relative path to find
    * @param rtype resource type to use
    */
   static TQString langLookup(const TQString &fname, const char *rtype = "html");
diff --git a/kdecore/kmacroexpander.cpp b/kdecore/kmacroexpander.cpp
index 9c7e5da24..5516c1b61 100644
--- a/kdecore/kmacroexpander.cpp
+++ b/kdecore/kmacroexpander.cpp
@@ -56,7 +56,7 @@ void KMacroExpanderBase::expandMacros( TQString &str )
 
     for (pos = 0; pos < str.length(); ) {
         if (ec != (QChar)0) {
-            if (str.tqunicode()[pos] != ec)
+            if (str.unicode()[pos] != ec)
                 goto nohit;
             if (!(len = expandEscapedMacro( str, pos, rst )))
                 goto nohit;
@@ -70,7 +70,7 @@ void KMacroExpanderBase::expandMacros( TQString &str )
             }
             rsts = rst.join( " " );
             rst.clear();
-            str.tqreplace( pos, len, rsts );
+            str.replace( pos, len, rsts );
             pos += rsts.length();
             continue;
       nohit:
@@ -109,7 +109,7 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos )
     TQString rsts;
 
     while (pos < str.length()) {
-        TQChar cc( str.tqunicode()[pos] );
+        TQChar cc( str.unicode()[pos] );
         if (ec != (QChar)0) {
             if (cc != ec)
                 goto nohit;
@@ -125,13 +125,13 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos )
             }
             if (state.dquote) {
                 rsts = rst.join( " " );
-                rsts.tqreplace( TQRegExp("([$`\"\\\\])"), "\\\\1" );
+                rsts.replace( TQRegExp("([$`\"\\\\])"), "\\\\1" );
             } else if (state.current == dollarquote) {
                 rsts = rst.join( " " );
-                rsts.tqreplace( TQRegExp("(['\\\\])"), "\\\\1" );
+                rsts.replace( TQRegExp("(['\\\\])"), "\\\\1" );
             } else if (state.current == singlequote) {
                 rsts = rst.join( " " );
-                rsts.tqreplace( '\'', "'\\''");
+                rsts.replace( '\'', "'\\''");
             } else {
                 if (rst.isEmpty()) {
                     str.remove( pos, len );
@@ -140,14 +140,14 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos )
                     rsts = "'";
 #if 0 // this could pay off if join() would be cleverer and the strings were long
                     for (TQStringList::Iterator it = rst.begin(); it != rst.end(); ++it)
-                        (*it).tqreplace( '\'', "'\\''" );
+                        (*it).replace( '\'', "'\\''" );
                     rsts += rst.join( "' '" );
 #else
                     for (TQStringList::ConstIterator it = rst.begin(); it != rst.end(); ++it) {
                         if (it != rst.begin())
                             rsts += "' '";
                         TQString trsts( *it );
-                        trsts.tqreplace( '\'', "'\\''" );
+                        trsts.replace( '\'', "'\\''" );
                         rsts += trsts;
                     }
 #endif
@@ -155,7 +155,7 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos )
                 }
             }
             rst.clear();
-            str.tqreplace( pos, len, rsts );
+            str.replace( pos, len, rsts );
             pos += rsts.length();
             continue;
       nohit:
@@ -198,14 +198,14 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos )
             }
             // always swallow the char -> prevent anomalies due to expansion
         } else if (cc == (QChar)'`') {
-            str.tqreplace( pos, 1, "$( " ); // add space -> avoid creating $((
+            str.replace( pos, 1, "$( " ); // add space -> avoid creating $((
             pos2 = pos += 3;
             for (;;) {
                 if (pos2 >= str.length()) {
                     pos = pos2;
                     return false;
                 }
-                cc = str.tqunicode()[pos2];
+                cc = str.unicode()[pos2];
                 if (cc == (QChar)'`')
                     break;
                 if (cc == (QChar)'\\') {
@@ -339,7 +339,7 @@ template<class VT>
 int
 KMacroMapExpander<TQChar,VT>::expandPlainMacro( const TQString &str, uint pos, TQStringList &ret )
 {
-    TQMapConstIterator<TQChar,VT> it = macromap.tqfind(str[pos]);
+    TQMapConstIterator<TQChar,VT> it = macromap.find(str[pos]);
     if (it != macromap.end()) {
        ret += it.data();
        return 1;
@@ -355,7 +355,7 @@ KMacroMapExpander<TQChar,VT>::expandEscapedMacro( const TQString &str, uint pos,
         ret += TQString( escapeChar() );
         return 2;
     }
-    TQMapConstIterator<TQChar,VT> it = macromap.tqfind(str[pos+1]);
+    TQMapConstIterator<TQChar,VT> it = macromap.find(str[pos+1]);
     if (it != macromap.end()) {
        ret += it.data();
        return 2;
@@ -383,14 +383,14 @@ template<class VT>
 int
 KMacroMapExpander<TQString,VT>::expandPlainMacro( const TQString &str, uint pos, TQStringList &ret )
 {
-    if (isIdentifier( str[pos - 1].tqunicode() ))
+    if (isIdentifier( str[pos - 1].unicode() ))
         return 0;
     uint sl;
-    for (sl = 0; isIdentifier( str[pos + sl].tqunicode() ); sl++);
+    for (sl = 0; isIdentifier( str[pos + sl].unicode() ); sl++);
     if (!sl)
         return 0;
     TQMapConstIterator<TQString,VT> it =
-        macromap.tqfind( TQConstString( str.tqunicode() + pos, sl ).string() );
+        macromap.find( TQConstString( str.unicode() + pos, sl ).string() );
     if (it != macromap.end()) {
         ret += it.data();
         return sl;
@@ -415,13 +415,13 @@ KMacroMapExpander<TQString,VT>::expandEscapedMacro( const TQString &str, uint po
         rsl = sl + 3;
     } else {
         rpos = pos + 1;
-        for (sl = 0; isIdentifier( str[rpos + sl].tqunicode() ); sl++);
+        for (sl = 0; isIdentifier( str[rpos + sl].unicode() ); sl++);
         rsl = sl + 1;
     }
     if (!sl)
         return 0;
     TQMapConstIterator<TQString,VT> it =
-        macromap.tqfind( TQConstString( str.tqunicode() + rpos, sl ).string() );
+        macromap.find( TQConstString( str.unicode() + rpos, sl ).string() );
     if (it != macromap.end()) {
         ret += it.data();
         return rsl;
@@ -454,13 +454,13 @@ KCharMacroExpander::expandEscapedMacro( const TQString &str, uint pos, TQStringL
 int
 KWordMacroExpander::expandPlainMacro( const TQString &str, uint pos, TQStringList &ret )
 {
-    if (isIdentifier( str[pos - 1].tqunicode() ))
+    if (isIdentifier( str[pos - 1].unicode() ))
         return 0;
     uint sl;
-    for (sl = 0; isIdentifier( str[pos + sl].tqunicode() ); sl++);
+    for (sl = 0; isIdentifier( str[pos + sl].unicode() ); sl++);
     if (!sl)
         return 0;
-    if (expandMacro( TQConstString( str.tqunicode() + pos, sl ).string(), ret ))
+    if (expandMacro( TQConstString( str.unicode() + pos, sl ).string(), ret ))
         return sl;
     return 0;
 }
@@ -481,12 +481,12 @@ KWordMacroExpander::expandEscapedMacro( const TQString &str, uint pos, TQStringL
         rsl = sl + 3;
     } else {
         rpos = pos + 1;
-        for (sl = 0; isIdentifier( str[rpos + sl].tqunicode() ); sl++);
+        for (sl = 0; isIdentifier( str[rpos + sl].unicode() ); sl++);
         rsl = sl + 1;
     }
     if (!sl)
         return 0;
-    if (expandMacro( TQConstString( str.tqunicode() + rpos, sl ).string(), ret ))
+    if (expandMacro( TQConstString( str.unicode() + rpos, sl ).string(), ret ))
         return rsl;
     return 0;
 }
diff --git a/kdecore/kmacroexpander.h b/kdecore/kmacroexpander.h
index 2e86145e5..226264990 100644
--- a/kdecore/kmacroexpander.h
+++ b/kdecore/kmacroexpander.h
@@ -71,7 +71,7 @@ public:
      * The rest of the shell (incl. bash) syntax is simply ignored,
      * as it is not expected to cause problems.
      *
-     * Note that bash tqcontains a bug which makes macro expansion within 
+     * Note that bash contains a bug which makes macro expansion within 
      * double quoted substitutions ("${VAR:-%macro}") inherently insecure.
      *
      * @param str the string in which macros are expanded in-place
diff --git a/kdecore/kmanagerselection.cpp b/kdecore/kmanagerselection.cpp
index ef7110dc2..b88990dbf 100644
--- a/kdecore/kmanagerselection.cpp
+++ b/kdecore/kmanagerselection.cpp
@@ -423,9 +423,9 @@ void KSelectionWatcher::init()
         manager_atom = XInternAtom( dpy, "MANAGER", False );
         XWindowAttributes attrs;
         XGetWindowAttributes( dpy, RootWindow( dpy, screen ), &attrs );
-        long event_tqmask = attrs.your_event_mask;
+        long event_mask = attrs.your_event_mask;
         // StructureNotifyMask on the root window is needed
-        XSelectInput( dpy, RootWindow( dpy, screen ), event_tqmask | StructureNotifyMask );
+        XSelectInput( dpy, RootWindow( dpy, screen ), event_mask | StructureNotifyMask );
         }
     }    
 
diff --git a/kdecore/kmanagerselection.h b/kdecore/kmanagerselection.h
index 2560a3724..b6aefd9db 100644
--- a/kdecore/kmanagerselection.h
+++ b/kdecore/kmanagerselection.h
@@ -44,7 +44,7 @@ class KSelectionOwnerPrivate;
  @short ICCCM manager selection owner
 */
 class KDECORE_EXPORT KSelectionOwner
-    : public TQObject
+    : public QObject
     {
     Q_OBJECT
     public:
@@ -161,13 +161,13 @@ class KSelectionWatcherPrivate;
 /**
  This class implements watching manager selections, as described in the ICCCM
  section 2.8. It emits signal newOwner() when a new owner claim the selection,
- and emits lostOwner() when the selection ownership is given up. To tqfind
+ and emits lostOwner() when the selection ownership is given up. To find
  out current owner of the selection, owner() can be used.
  @since 3.2
  @short ICCCM manager selection watching
 */
 class KDECORE_EXPORT KSelectionWatcher
-    : public TQObject
+    : public QObject
     {
     Q_OBJECT
     public:
diff --git a/kdecore/kmdcodec.cpp b/kdecore/kmdcodec.cpp
index 73b868417..76c80d329 100644
--- a/kdecore/kmdcodec.cpp
+++ b/kdecore/kmdcodec.cpp
@@ -238,7 +238,7 @@ void KCodecs::quotedPrintableEncode(const TQByteArray& in, TQByteArray& out, boo
         ++lineLength;
       }
     }
-    // If we tqfind a line break, just let it through.
+    // If we find a line break, just let it through.
     else if ((useCRLF && ('\r' == c) && (i < end) && ('\n' == data[i + 1])) ||
              (!useCRLF && ('\n' == c)))
     {
@@ -787,7 +787,7 @@ void KMD5::update(const TQCString& in)
 void KMD5::update(const unsigned char* in, int len)
 {
     if (len < 0)
-        len = tqstrlen(reinterpret_cast<const char*>(in));
+        len = qstrlen(reinterpret_cast<const char*>(in));
 
     if (!len)
         return;
@@ -797,12 +797,12 @@ void KMD5::update(const unsigned char* in, int len)
         return;
     }
 
-    TQ_UINT32 in_index;
-    TQ_UINT32 buffer_index;
-    TQ_UINT32 buffer_space;
-    TQ_UINT32 in_length = static_cast<TQ_UINT32>( len );
+    Q_UINT32 in_index;
+    Q_UINT32 buffer_index;
+    Q_UINT32 buffer_space;
+    Q_UINT32 in_length = static_cast<Q_UINT32>( len );
 
-    buffer_index = static_cast<TQ_UINT32>((m_count[0] >> 3) & 0x3F);
+    buffer_index = static_cast<Q_UINT32>((m_count[0] >> 3) & 0x3F);
 
     if (  (m_count[0] += (in_length << 3))<(in_length << 3) )
         m_count[1]++;
@@ -842,8 +842,8 @@ void KMD5::finalize ()
 {
     if (m_finalized) return;
 
-    TQ_UINT8 bits[8];
-    TQ_UINT32 index, padLen;
+    Q_UINT8 bits[8];
+    Q_UINT32 index, padLen;
     static const unsigned char PADDING[64]=
     {
         0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -856,7 +856,7 @@ void KMD5::finalize ()
     //memcpy( bits, m_count, 8 );
 
     // Pad out to 56 mod 64.
-    index = static_cast<TQ_UINT32>((m_count[0] >> 3) & 0x3f);
+    index = static_cast<Q_UINT32>((m_count[0] >> 3) & 0x3f);
     padLen = (index < 56) ? (56 - index) : (120 - index);
     update (reinterpret_cast<const char*>(PADDING), padLen);
 
@@ -957,7 +957,7 @@ void KMD5::reset()
 void KMD5::transform( const unsigned char block[64] )
 {
 
-    TQ_UINT32 a = m_state[0], b = m_state[1], c = m_state[2], d = m_state[3], x[16];
+    Q_UINT32 a = m_state[0], b = m_state[1], c = m_state[2], d = m_state[3], x[16];
 
     decode (x, block, 64);
     //memcpy( x, block, 64 );
@@ -1044,91 +1044,91 @@ void KMD5::transform( const unsigned char block[64] )
     memset ( static_cast<void *>(x), 0, sizeof(x) );
 }
 
-inline TQ_UINT32 KMD5::rotate_left (TQ_UINT32 x, TQ_UINT32 n)
+inline Q_UINT32 KMD5::rotate_left (Q_UINT32 x, Q_UINT32 n)
 {
     return (x << n) | (x >> (32-n))  ;
 }
 
-inline TQ_UINT32 KMD5::F (TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z)
+inline Q_UINT32 KMD5::F (Q_UINT32 x, Q_UINT32 y, Q_UINT32 z)
 {
     return (x & y) | (~x & z);
 }
 
-inline TQ_UINT32 KMD5::G (TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z)
+inline Q_UINT32 KMD5::G (Q_UINT32 x, Q_UINT32 y, Q_UINT32 z)
 {
     return (x & z) | (y & ~z);
 }
 
-inline TQ_UINT32 KMD5::H (TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z)
+inline Q_UINT32 KMD5::H (Q_UINT32 x, Q_UINT32 y, Q_UINT32 z)
 {
     return x ^ y ^ z;
 }
 
-inline TQ_UINT32 KMD5::I (TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z)
+inline Q_UINT32 KMD5::I (Q_UINT32 x, Q_UINT32 y, Q_UINT32 z)
 {
     return y ^ (x | ~z);
 }
 
-void KMD5::FF ( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d,
-                       TQ_UINT32 x, TQ_UINT32  s, TQ_UINT32 ac )
+void KMD5::FF ( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d,
+                       Q_UINT32 x, Q_UINT32  s, Q_UINT32 ac )
 {
     a += F(b, c, d) + x + ac;
     a = rotate_left (a, s) +b;
 }
 
-void KMD5::GG ( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d,
-                 TQ_UINT32 x, TQ_UINT32 s, TQ_UINT32 ac)
+void KMD5::GG ( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d,
+                 Q_UINT32 x, Q_UINT32 s, Q_UINT32 ac)
 {
     a += G(b, c, d) + x + ac;
     a = rotate_left (a, s) +b;
 }
 
-void KMD5::HH ( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d,
-                 TQ_UINT32 x, TQ_UINT32 s, TQ_UINT32 ac )
+void KMD5::HH ( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d,
+                 Q_UINT32 x, Q_UINT32 s, Q_UINT32 ac )
 {
     a += H(b, c, d) + x + ac;
     a = rotate_left (a, s) +b;
 }
 
-void KMD5::II ( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d,
-                 TQ_UINT32 x, TQ_UINT32 s, TQ_UINT32 ac )
+void KMD5::II ( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d,
+                 Q_UINT32 x, Q_UINT32 s, Q_UINT32 ac )
 {
     a += I(b, c, d) + x + ac;
     a = rotate_left (a, s) +b;
 }
 
 
-void KMD5::encode ( unsigned char* output, TQ_UINT32 *in, TQ_UINT32 len )
+void KMD5::encode ( unsigned char* output, Q_UINT32 *in, Q_UINT32 len )
 {
 #if !defined(WORDS_BIGENDIAN)
     memcpy(output, in, len);
 
 #else
-    TQ_UINT32 i, j;
+    Q_UINT32 i, j;
     for (i = 0, j = 0; j < len; i++, j += 4)
     {
-        output[j]   = static_cast<TQ_UINT8>((in[i] & 0xff));
-        output[j+1] = static_cast<TQ_UINT8>(((in[i] >> 8) & 0xff));
-        output[j+2] = static_cast<TQ_UINT8>(((in[i] >> 16) & 0xff));
-        output[j+3] = static_cast<TQ_UINT8>(((in[i] >> 24) & 0xff));
+        output[j]   = static_cast<Q_UINT8>((in[i] & 0xff));
+        output[j+1] = static_cast<Q_UINT8>(((in[i] >> 8) & 0xff));
+        output[j+2] = static_cast<Q_UINT8>(((in[i] >> 16) & 0xff));
+        output[j+3] = static_cast<Q_UINT8>(((in[i] >> 24) & 0xff));
     }
 #endif
 }
 
-// Decodes in (TQ_UINT8) into output (TQ_UINT32). Assumes len is a
+// Decodes in (Q_UINT8) into output (Q_UINT32). Assumes len is a
 // multiple of 4.
-void KMD5::decode (TQ_UINT32 *output, const unsigned char* in, TQ_UINT32 len)
+void KMD5::decode (Q_UINT32 *output, const unsigned char* in, Q_UINT32 len)
 {
 #if !defined(WORDS_BIGENDIAN)
     memcpy(output, in, len);
 
 #else
-    TQ_UINT32 i, j;
+    Q_UINT32 i, j;
     for (i = 0, j = 0; j < len; i++, j += 4)
-        output[i] = static_cast<TQ_UINT32>(in[j]) |
-                    (static_cast<TQ_UINT32>(in[j+1]) << 8)  |
-                    (static_cast<TQ_UINT32>(in[j+2]) << 16) |
-                    (static_cast<TQ_UINT32>(in[j+3]) << 24);
+        output[i] = static_cast<Q_UINT32>(in[j]) |
+                    (static_cast<Q_UINT32>(in[j+1]) << 8)  |
+                    (static_cast<Q_UINT32>(in[j+2]) << 16) |
+                    (static_cast<Q_UINT32>(in[j+3]) << 24);
 #endif
 }
 
@@ -1180,7 +1180,7 @@ void KMD4::update(const TQCString& in)
 void KMD4::update(const unsigned char *in, int len)
 {
   if (len < 0)
-      len = tqstrlen(reinterpret_cast<const char*>(in));
+      len = qstrlen(reinterpret_cast<const char*>(in));
 
   if (!len)
       return;
@@ -1190,12 +1190,12 @@ void KMD4::update(const unsigned char *in, int len)
       return;
   }
 
-  TQ_UINT32 t;
+  Q_UINT32 t;
 
   /* Update bitcount */
 
   t = m_count[0];
-  if ((m_count[0] = t + ((TQ_UINT32) len << 3)) < t)
+  if ((m_count[0] = t + ((Q_UINT32) len << 3)) < t)
     m_count[1]++;		/* Carry from low to high */
   m_count[1] += len >> 29;
 
@@ -1205,17 +1205,17 @@ void KMD4::update(const unsigned char *in, int len)
 
   if (t)
     {
-      TQ_UINT8 *p = &m_buffer[ t ];
+      Q_UINT8 *p = &m_buffer[ t ];
 
       t = 64 - t;
-      if ((TQ_UINT32)len < t)
+      if ((Q_UINT32)len < t)
 	{
 	  memcpy (p, in, len);
 	  return;
 	}
       memcpy (p, in, t);
       byteReverse (m_buffer, 16);
-      transform (m_state, (TQ_UINT32*) m_buffer);
+      transform (m_state, (Q_UINT32*) m_buffer);
       in += t;
       len -= t;
     }
@@ -1225,7 +1225,7 @@ void KMD4::update(const unsigned char *in, int len)
     {
       memcpy (m_buffer, in, 64);
       byteReverse (m_buffer, 16);
-      transform (m_state, (TQ_UINT32 *) m_buffer);
+      transform (m_state, (Q_UINT32 *) m_buffer);
       in += 64;
       len -= 64;
     }
@@ -1272,7 +1272,7 @@ void KMD4::finalize()
       /* Two lots of padding:  Pad the first block to 64 bytes */
       memset (p, 0, count);
       byteReverse (m_buffer, 16);
-      transform (m_state, (TQ_UINT32*) m_buffer);
+      transform (m_state, (Q_UINT32*) m_buffer);
 
       /* Now fill the next block with 56 bytes */
       memset (m_buffer, 0, 56);
@@ -1285,10 +1285,10 @@ void KMD4::finalize()
   byteReverse (m_buffer, 14);
 
   /* Append length in bits and transform */
-  ((TQ_UINT32 *) m_buffer)[14] = m_count[0];
-  ((TQ_UINT32 *) m_buffer)[15] = m_count[1];
+  ((Q_UINT32 *) m_buffer)[14] = m_count[0];
+  ((Q_UINT32 *) m_buffer)[15] = m_count[1];
 
-  transform (m_state, (TQ_UINT32 *) m_buffer);
+  transform (m_state, (Q_UINT32 *) m_buffer);
   byteReverse ((unsigned char *) m_state, 4);
 
   memcpy (m_digest, m_state, 16);
@@ -1380,53 +1380,53 @@ void KMD4::reset()
   memset ( m_digest, 0, sizeof(*m_digest));
 }
 
-//#define rotl32(x,n)   (((x) << ((TQ_UINT32)(n))) | ((x) >> (32 - (TQ_UINT32)(n))))
+//#define rotl32(x,n)   (((x) << ((Q_UINT32)(n))) | ((x) >> (32 - (Q_UINT32)(n))))
 
-inline TQ_UINT32 KMD4::rotate_left (TQ_UINT32 x, TQ_UINT32 n)
+inline Q_UINT32 KMD4::rotate_left (Q_UINT32 x, Q_UINT32 n)
 {
     return (x << n) | (x >> (32-n))  ;
 }
 
-inline TQ_UINT32 KMD4::F (TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z)
+inline Q_UINT32 KMD4::F (Q_UINT32 x, Q_UINT32 y, Q_UINT32 z)
 {
     return (x & y) | (~x & z);
 }
 
-inline TQ_UINT32 KMD4::G (TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z)
+inline Q_UINT32 KMD4::G (Q_UINT32 x, Q_UINT32 y, Q_UINT32 z)
 {
     return ((x) & (y)) | ((x) & (z)) | ((y) & (z));
 }
 
-inline TQ_UINT32 KMD4::H (TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z)
+inline Q_UINT32 KMD4::H (Q_UINT32 x, Q_UINT32 y, Q_UINT32 z)
 {
     return x ^ y ^ z;
 }
 
-inline void KMD4::FF ( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d,
-                       TQ_UINT32 x, TQ_UINT32  s )
+inline void KMD4::FF ( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d,
+                       Q_UINT32 x, Q_UINT32  s )
 {
     a += F(b, c, d) + x;
     a = rotate_left (a, s);
 }
 
-inline void KMD4::GG ( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d,
-                 TQ_UINT32 x, TQ_UINT32 s)
+inline void KMD4::GG ( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d,
+                 Q_UINT32 x, Q_UINT32 s)
 {
-    a += G(b, c, d) + x + (TQ_UINT32)0x5a827999;
+    a += G(b, c, d) + x + (Q_UINT32)0x5a827999;
     a = rotate_left (a, s);
 }
 
-inline void KMD4::HH ( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d,
-                 TQ_UINT32 x, TQ_UINT32 s )
+inline void KMD4::HH ( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d,
+                 Q_UINT32 x, Q_UINT32 s )
 {
-    a += H(b, c, d) + x + (TQ_UINT32)0x6ed9eba1;
+    a += H(b, c, d) + x + (Q_UINT32)0x6ed9eba1;
     a = rotate_left (a, s);
 }
 
-void KMD4::byteReverse( unsigned char *buf, TQ_UINT32 len )
+void KMD4::byteReverse( unsigned char *buf, Q_UINT32 len )
 {
 #ifdef WORDS_BIGENDIAN
-  TQ_UINT32 *b = (TQ_UINT32*) buf;
+  Q_UINT32 *b = (Q_UINT32*) buf;
   while ( len > 0 ) {
     *b = ((((*b) & 0xff000000) >> 24) | (((*b) & 0x00ff0000) >>  8) |
          (((*b) & 0x0000ff00) <<  8) | (((*b) & 0x000000ff) << 24));
@@ -1442,9 +1442,9 @@ void KMD4::byteReverse( unsigned char *buf, TQ_UINT32 len )
 /*
  * The core of the MD4 algorithm
  */
-void KMD4::transform( TQ_UINT32 buf[4], TQ_UINT32 const in[16] )
+void KMD4::transform( Q_UINT32 buf[4], Q_UINT32 const in[16] )
 {
-  TQ_UINT32 a, b, c, d;
+  Q_UINT32 a, b, c, d;
 
   a = buf[0];
   b = buf[1];
diff --git a/kdecore/kmdcodec.h b/kdecore/kmdcodec.h
index d4bd8dfb0..ef1d49d1e 100644
--- a/kdecore/kmdcodec.h
+++ b/kdecore/kmdcodec.h
@@ -541,27 +541,27 @@ private:
   KMD5& operator=(const KMD5& md);
 
   void init();
-  void encode( unsigned char* output, TQ_UINT32 *in, TQ_UINT32 len );
-  void decode( TQ_UINT32 *output, const unsigned char* in, TQ_UINT32 len );
-
-  TQ_UINT32 rotate_left( TQ_UINT32 x, TQ_UINT32 n );
-  TQ_UINT32 F( TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z );
-  TQ_UINT32 G( TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z );
-  TQ_UINT32 H( TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z );
-  TQ_UINT32 I( TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z );
-  void FF( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, TQ_UINT32 x,
-               TQ_UINT32  s, TQ_UINT32 ac );
-  void GG( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, TQ_UINT32 x,
-                TQ_UINT32 s, TQ_UINT32 ac );
-  void HH( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, TQ_UINT32 x,
-                TQ_UINT32 s, TQ_UINT32 ac );
-  void II( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, TQ_UINT32 x,
-             TQ_UINT32 s, TQ_UINT32 ac );
+  void encode( unsigned char* output, Q_UINT32 *in, Q_UINT32 len );
+  void decode( Q_UINT32 *output, const unsigned char* in, Q_UINT32 len );
+
+  Q_UINT32 rotate_left( Q_UINT32 x, Q_UINT32 n );
+  Q_UINT32 F( Q_UINT32 x, Q_UINT32 y, Q_UINT32 z );
+  Q_UINT32 G( Q_UINT32 x, Q_UINT32 y, Q_UINT32 z );
+  Q_UINT32 H( Q_UINT32 x, Q_UINT32 y, Q_UINT32 z );
+  Q_UINT32 I( Q_UINT32 x, Q_UINT32 y, Q_UINT32 z );
+  void FF( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, Q_UINT32 x,
+               Q_UINT32  s, Q_UINT32 ac );
+  void GG( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, Q_UINT32 x,
+                Q_UINT32 s, Q_UINT32 ac );
+  void HH( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, Q_UINT32 x,
+                Q_UINT32 s, Q_UINT32 ac );
+  void II( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, Q_UINT32 x,
+             Q_UINT32 s, Q_UINT32 ac );
 
 private:
-  TQ_UINT32 m_state[4];
-  TQ_UINT32 m_count[2];
-  TQ_UINT8 m_buffer[64];
+  Q_UINT32 m_state[4];
+  Q_UINT32 m_count[2];
+  Q_UINT8 m_buffer[64];
   Digest m_digest;
   bool m_finalized;
 
@@ -704,7 +704,7 @@ protected:
    *  Performs the real update work.  Note
    *  that length is implied to be 64.
    */
-  void transform( TQ_UINT32 buf[4], TQ_UINT32 const in[16] );
+  void transform( Q_UINT32 buf[4], Q_UINT32 const in[16] );
 
   /**
    * finalizes the digest
@@ -717,23 +717,23 @@ private:
 
   void init();
 
-  void byteReverse( unsigned char *buf, TQ_UINT32 len );
+  void byteReverse( unsigned char *buf, Q_UINT32 len );
 
-  TQ_UINT32 rotate_left( TQ_UINT32 x, TQ_UINT32 n );
-  TQ_UINT32 F( TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z );
-  TQ_UINT32 G( TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z );
-  TQ_UINT32 H( TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z );
-  void FF( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, TQ_UINT32 x,
-               TQ_UINT32  s );
-  void GG( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, TQ_UINT32 x,
-                TQ_UINT32 s );
-  void HH( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, TQ_UINT32 x,
-                TQ_UINT32 s );
+  Q_UINT32 rotate_left( Q_UINT32 x, Q_UINT32 n );
+  Q_UINT32 F( Q_UINT32 x, Q_UINT32 y, Q_UINT32 z );
+  Q_UINT32 G( Q_UINT32 x, Q_UINT32 y, Q_UINT32 z );
+  Q_UINT32 H( Q_UINT32 x, Q_UINT32 y, Q_UINT32 z );
+  void FF( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, Q_UINT32 x,
+               Q_UINT32  s );
+  void GG( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, Q_UINT32 x,
+                Q_UINT32 s );
+  void HH( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, Q_UINT32 x,
+                Q_UINT32 s );
 
 private:
-  TQ_UINT32 m_state[4];
-  TQ_UINT32 m_count[2];
-  TQ_UINT8 m_buffer[64];
+  Q_UINT32 m_state[4];
+  Q_UINT32 m_count[2];
+  Q_UINT8 m_buffer[64];
   Digest m_digest;
   bool m_finalized;
 
diff --git a/kdecore/kmimesourcefactory.cpp b/kdecore/kmimesourcefactory.cpp
index 0123f3465..37745d398 100644
--- a/kdecore/kmimesourcefactory.cpp
+++ b/kdecore/kmimesourcefactory.cpp
@@ -60,7 +60,7 @@ TQString KMimeSourceFactory::makeAbsolute (const TQString& absOrRelName, const T
   TQString myName;
   TQString myContext;
 
-  const int pos = absOrRelName.tqfind ('|');
+  const int pos = absOrRelName.find ('|');
   if (pos > -1)
 	{
 	  myContext = absOrRelName.left (pos);
diff --git a/kdecore/kmimesourcefactory.h b/kdecore/kmimesourcefactory.h
index e35c13f19..536ead0b8 100644
--- a/kdecore/kmimesourcefactory.h
+++ b/kdecore/kmimesourcefactory.h
@@ -30,7 +30,7 @@ class KInstance;
 
 /**
  * An extension to TQMimeSourceFactory that uses KIconLoader to
- * tqfind images.
+ * find images.
  *
  * Normally you don't have to instantiate this class at all, KApplication does that for
  * you automagically and sets TQMimeSourceFactory::setDefaultFactory().
@@ -44,7 +44,7 @@ public:
   /**
    * Constructor.
    *
-   * @param loader is the iconloader used to tqfind images.
+   * @param loader is the iconloader used to find images.
    */
   KMimeSourceFactory (KIconLoader* loader = KGlobal::iconLoader());
 
diff --git a/kdecore/kmountpoint.cpp b/kdecore/kmountpoint.cpp
index adf353f1f..764f085a0 100644
--- a/kdecore/kmountpoint.cpp
+++ b/kdecore/kmountpoint.cpp
@@ -59,7 +59,7 @@
 #include <sys/mntctl.h>
 #include <sys/vmount.h>
 #include <sys/vfs.h>
-/* AIX does not prototype mntctl anywhere that I can tqfind */
+/* AIX does not prototype mntctl anywhere that I can find */
 #ifndef mntctl
 extern "C" {
 int mntctl(int command, int size, void* buffer);
@@ -375,7 +375,7 @@ KMountPoint::List KMountPoint::currentMountPoints(int infoNeeded)
 
 TQString KMountPoint::devNameFromOptions(const TQStringList &options)
 {
-   // Search options to tqfind the device name
+   // Search options to find the device name
    for ( TQStringList::ConstIterator it = options.begin(); it != options.end(); ++it)
    {
       if( (*it).startsWith("dev="))
diff --git a/kdecore/kmultipledrag.cpp b/kdecore/kmultipledrag.cpp
index f81b9b154..29d56bd85 100644
--- a/kdecore/kmultipledrag.cpp
+++ b/kdecore/kmultipledrag.cpp
@@ -32,24 +32,24 @@ void KMultipleDrag::addDragObject( TQDragObject *dragObject )
 {
     //kdDebug() << "KMultipleDrag::addDragObject" << endl;
     m_dragObjects.append( dragObject );
-    // We need to tqfind out how many formats this dragObject supports
+    // We need to find out how many formats this dragObject supports
     int i = 0;
     while ( dragObject->format( i ) )
         ++i;
     m_numberFormats.append( i ); // e.g. if it supports two formats, 0 and 1, store 2.
 }
 
-TQByteArray KMultipleDrag::tqencodedData( const char *mime ) const
+TQByteArray KMultipleDrag::encodedData( const char *mime ) const
 {
-    //kdDebug() << "KMultipleDrag::tqencodedData " << mime << endl;
-    // Iterate over the drag objects, and tqfind the format in the right one
+    //kdDebug() << "KMultipleDrag::encodedData " << mime << endl;
+    // Iterate over the drag objects, and find the format in the right one
     TQPtrListIterator<TQDragObject> it( m_dragObjects );
     for ( ; it.current(); ++it )
     {
         for ( int i = 0; it.current()->format( i ); ++i )
         {
             if ( ::qstrcmp( it.current()->format( i ), mime ) == 0 )
-                return it.current()->tqencodedData( mime );
+                return it.current()->encodedData( mime );
         }
     }
     return TQByteArray();
diff --git a/kdecore/kmultipledrag.h b/kdecore/kmultipledrag.h
index 5dc6e2972..47bfbd378 100644
--- a/kdecore/kmultipledrag.h
+++ b/kdecore/kmultipledrag.h
@@ -40,7 +40,7 @@ class KMultipleDragPrivate;
  * Sample code for this:
  *
  * \code
- * KMultipleDrag *drag = new KMultipleDrag( tqparentWidget );
+ * KMultipleDrag *drag = new KMultipleDrag( parentWidget );
  * drag->addDragObject( new TQImageDrag( someQImage, 0 ) );
  * drag->addDragObject( new KURLDrag( someKURL, 0 ) );
  * drag->drag();
@@ -80,7 +80,7 @@ public:
      * @return the data, or a null byte array if not found
      * @reimp
      */
-    virtual TQByteArray tqencodedData( const char *mime ) const;
+    virtual TQByteArray encodedData( const char *mime ) const;
 
     /**
      * Returns the @p i'th supported format, or 0.
diff --git a/kdecore/knotifyclient.cpp b/kdecore/knotifyclient.cpp
index 851023170..bce90d86a 100644
--- a/kdecore/knotifyclient.cpp
+++ b/kdecore/knotifyclient.cpp
@@ -84,9 +84,9 @@ static int sendNotifyEvent(const TQString &message, const TQString &text,
   int uniqueId = kMax( 1, kapp->random() ); // must not be 0 -- means failure!
 
   // knotify daemon needs toplevel window
-  TQWidget* widget = TQWidget::tqfind( (WId)winId );
+  TQWidget* widget = TQWidget::find( (WId)winId );
   if( widget )
-    winId = (int)widget->tqtopLevelWidget()->winId();
+    winId = (int)widget->topLevelWidget()->winId();
 
   TQByteArray data;
   TQDataStream ds(data, IO_WriteOnly);
@@ -126,20 +126,20 @@ int KNotifyClient::event( int winId, StandardEvent type, const TQString& text )
     TQString message;
     switch ( type ) {
     case cannotOpenFile:
-	message = TQString::tqfromLatin1("cannotopenfile");
+	message = TQString::fromLatin1("cannotopenfile");
 	break;
     case warning:
-	message = TQString::tqfromLatin1("warning");
+	message = TQString::fromLatin1("warning");
 	break;
     case fatalError:
-	message = TQString::tqfromLatin1("fatalerror");
+	message = TQString::fromLatin1("fatalerror");
 	break;
     case catastrophe:
-	message = TQString::tqfromLatin1("catastrophe");
+	message = TQString::fromLatin1("catastrophe");
 	break;
     case notification: // fall through
     default:
-	message = TQString::tqfromLatin1("notification");
+	message = TQString::fromLatin1("notification");
 	break;
     }
 
diff --git a/kdecore/knotifyclient.h b/kdecore/knotifyclient.h
index d661f5b59..2de3e297d 100644
--- a/kdecore/knotifyclient.h
+++ b/kdecore/knotifyclient.h
@@ -27,7 +27,7 @@ class KInstance;
  * This namespace provides a method for issuing events to a KNotifyServer
  * call KNotifyClient::event("eventname"); to issue it.
  * On installation, there should be a file called
- * $KDEDIR/share/apps/appname/eventsrc which tqcontains the events.
+ * $KDEDIR/share/apps/appname/eventsrc which contains the events.
  *
  * The file looks like this:
  * \code
@@ -44,7 +44,7 @@ class KInstance;
  * default_presentation=1
  *  ...
  * \endcode
- * default_presentation tqcontains these ORed events:
+ * default_presentation contains these ORed events:
  *	None=0, Sound=1, Messagebox=2, Logfile=4, Stderr=8, PassivePopup=16,
  *      Execute=32, Taskbar=64
  *
diff --git a/kdecore/kpalette.cpp b/kdecore/kpalette.cpp
index 7cb14cec0..777340ea6 100644
--- a/kdecore/kpalette.cpp
+++ b/kdecore/kpalette.cpp
@@ -66,7 +66,7 @@ KPalette::KPalette(const TQString &name)
   // Read first line
   // Expected "GIMP Palette"
   if (paletteFile.readLine(line, maxLength) == -1) return;
-  if (line.tqfind(" Palette") == -1) return;
+  if (line.find(" Palette") == -1) return;
 
   while( paletteFile.readLine(line, maxLength) != -1)
   {
diff --git a/kdecore/kpalette.h b/kdecore/kpalette.h
index a7dd5e946..4f9c74029 100644
--- a/kdecore/kpalette.h
+++ b/kdecore/kpalette.h
@@ -150,7 +150,7 @@ public:
    
    /**
     * Find index by @p color.
-    * @param color the color to tqfind
+    * @param color the color to find
     * @return The index of the color in the palette or -1 if the
     * color is not found.
     **/
diff --git a/kdecore/kprocctrl.cpp b/kdecore/kprocctrl.cpp
index 6774eee5f..d8170c0a8 100644
--- a/kdecore/kprocctrl.cpp
+++ b/kdecore/kprocctrl.cpp
@@ -214,7 +214,7 @@ void KProcessController::slotDoHousekeeping()
     if( waitpid( *uit, 0, WNOHANG ) > 0 )
     {
       uit = unixProcessList.remove( uit );
-      deref(); // counterpart to addProcess, can tqinvalidate 'this'
+      deref(); // counterpart to addProcess, can invalidate 'this'
     } else
       ++uit;
   }
diff --git a/kdecore/kprocctrl.h b/kdecore/kprocctrl.h
index 0e534f4ad..69182a344 100644
--- a/kdecore/kprocctrl.h
+++ b/kdecore/kprocctrl.h
@@ -36,7 +36,7 @@ class TQSocketNotifier;
  *
  * This class takes care of the actual (UN*X) signal handling.
  */
-class KDECORE_EXPORT KProcessController : public TQObject
+class KDECORE_EXPORT KProcessController : public QObject
 {
   Q_OBJECT
 
diff --git a/kdecore/kprocess.cpp b/kdecore/kprocess.cpp
index 9930235ab..f13813d15 100644
--- a/kdecore/kprocess.cpp
+++ b/kdecore/kprocess.cpp
@@ -809,7 +809,7 @@ KPty *KProcess::pty() const
 TQString KProcess::quote(const TQString &arg)
 {
     TQChar q('\'');
-    return TQString(arg).tqreplace(q, "'\\''").prepend(q).append(q);
+    return TQString(arg).replace(q, "'\\''").prepend(q).append(q);
 }
 
 
diff --git a/kdecore/kprocess.h b/kdecore/kprocess.h
index a07df060e..51366e3e4 100644
--- a/kdecore/kprocess.h
+++ b/kdecore/kprocess.h
@@ -127,7 +127,7 @@ class KPty;
  * @author Christian Czezatke e9025461@student.tuwien.ac.at
  *
  **/
-class KDECORE_EXPORT KProcess : public TQObject
+class KDECORE_EXPORT KProcess : public QObject
 {
   Q_OBJECT
 
@@ -606,7 +606,7 @@ signals:
    * data structures before returning from the slot.
    * Example:
    * \code
-   *     TQString myBuf = TQString::tqfromLatin1(buffer, buflen);
+   *     TQString myBuf = TQString::fromLatin1(buffer, buflen);
    * \endcode
    **/
   void receivedStdout(KProcess *proc, char *buffer, int buflen);
@@ -752,7 +752,7 @@ protected:
    * will usually do some communications cleanup, like closing in[0],
    * out[1] and out[1].
    *
-   * Furthermore, it must also create the TQSocketNotifiers innot,
+   * Furthermore, it must also create the QSocketNotifiers innot,
    * outnot and errnot and connect their Qt signals to the respective
    * KProcess slots.
    *
diff --git a/kdecore/kprocio.cpp b/kdecore/kprocio.cpp
index 91c28024f..9159edab5 100644
--- a/kdecore/kprocio.cpp
+++ b/kdecore/kprocio.cpp
@@ -231,7 +231,7 @@ int KProcIO::readln (TQString &line, bool autoAck, bool *partial)
 
   //need to reduce the size of recvbuffer at some point...
 
-  len=recvbuffer.tqfind ('\n',rbi)-rbi;
+  len=recvbuffer.find ('\n',rbi)-rbi;
 
   //kdDebug(174) << "KPIO::readln" << endl;
 
diff --git a/kdecore/kprocio.h b/kdecore/kprocio.h
index cd5bb5b92..8661699a7 100644
--- a/kdecore/kprocio.h
+++ b/kdecore/kprocio.h
@@ -35,7 +35,7 @@ class TQTextCodec;
  *        buffer and maintained/freed appropriately.  There is no need
  *        to be concerned with wroteStdin() signals _at_all_.
  *    @li readln() reads a line of data and buffers any leftovers.
- *    @li Conversion from/to tqunicode.
+ *    @li Conversion from/to unicode.
  *
  * Basically, KProcIO gives you buffered I/O similar to fgets()/fputs().
  *
@@ -146,7 +146,7 @@ public:
    * @param autoAck when true, ackRead() is called for you.
    * @param partial when provided the line is returned
    * even if it does not contain a '\\n'. *partial will be set to
-   * false if the line tqcontains a '\\n' and false otherwise.
+   * false if the line contains a '\\n' and false otherwise.
    * @return the number of characters read, or -1 if no data is available.
    **/
   int readln (TQString &line, bool autoAck=true, bool *partial=0);
diff --git a/kdecore/kprotocolinfo_kdecore.cpp b/kdecore/kprotocolinfo_kdecore.cpp
index 66ce97760..203f455a1 100644
--- a/kdecore/kprotocolinfo_kdecore.cpp
+++ b/kdecore/kprotocolinfo_kdecore.cpp
@@ -151,8 +151,8 @@ KProtocolInfo::load( TQDataStream& _str)
 {
    // You may add new fields at the end. Make sure to update the version
    // number in ksycoca.h
-   TQ_INT32 i_inputType, i_outputType;
-   TQ_INT8 i_isSourceProtocol, i_isHelperProtocol,
+   Q_INT32 i_inputType, i_outputType;
+   Q_INT8 i_isSourceProtocol, i_isHelperProtocol,
           i_supportsListing, i_supportsReading,
           i_supportsWriting, i_supportsMakeDir,
           i_supportsDeleting, i_supportsLinking,
@@ -206,8 +206,8 @@ KProtocolInfo::save( TQDataStream& _str)
 
    // You may add new fields at the end. Make sure to update the version
    // number in ksycoca.h
-   TQ_INT32 i_inputType, i_outputType;
-   TQ_INT8 i_isSourceProtocol, i_isHelperProtocol,
+   Q_INT32 i_inputType, i_outputType;
+   Q_INT8 i_isSourceProtocol, i_isHelperProtocol,
           i_supportsListing, i_supportsReading,
           i_supportsWriting, i_supportsMakeDir,
           i_supportsDeleting, i_supportsLinking,
@@ -216,8 +216,8 @@ KProtocolInfo::save( TQDataStream& _str)
           i_uriMode, i_canRenameFromFile, i_canRenameToFile,
           i_canDeleteRecursive, i_fileNameUsedForCopying;
 
-   i_inputType = (TQ_INT32) m_inputType;
-   i_outputType = (TQ_INT32) m_outputType;
+   i_inputType = (Q_INT32) m_inputType;
+   i_outputType = (Q_INT32) m_outputType;
    i_isSourceProtocol = m_isSourceProtocol ? 1 : 0;
    i_isHelperProtocol = m_isHelperProtocol ? 1 : 0;
    i_supportsListing = m_supportsListing ? 1 : 0;
@@ -392,7 +392,7 @@ TQString KProtocolInfo::icon( const TQString& _protocol )
 {
   KProtocolInfo::Ptr prot = KProtocolInfoFactory::self()->findProtocol(_protocol);
   if ( !prot )
-    return TQString::tqfromLatin1("unknown");
+    return TQString::fromLatin1("unknown");
 
   return prot->m_icon;
 }
diff --git a/kdecore/kprotocolinfofactory.cpp b/kdecore/kprotocolinfofactory.cpp
index 6d61c2d8c..e47cbb881 100644
--- a/kdecore/kprotocolinfofactory.cpp
+++ b/kdecore/kprotocolinfofactory.cpp
@@ -86,7 +86,7 @@ KProtocolInfoFactory::findProtocol(const TQString &protocol)
 {
   if (!m_sycocaDict) return 0; // Error!
 
-  TQMap<TQString,KProtocolInfo::Ptr>::iterator it = m_cache.tqfind(protocol);
+  TQMap<TQString,KProtocolInfo::Ptr>::iterator it = m_cache.find(protocol);
   if (it != m_cache.end())
      return (*it);
 
diff --git a/kdecore/kpty.cpp b/kdecore/kpty.cpp
index 22235038f..f6fc9d5cd 100644
--- a/kdecore/kpty.cpp
+++ b/kdecore/kpty.cpp
@@ -271,7 +271,7 @@ bool KPty::_attachPty(int pty_master)
 
     // set xon/xoff & control keystrokes
   // without the '::' some version of HP-UX thinks, this declares
-  // the struct in this class, in this method, and fails to tqfind
+  // the struct in this class, in this method, and fails to find
   // the correct tc[gs]etattr
   struct ::termios ttmode;
 
@@ -517,7 +517,7 @@ void KPty::setXonXoff(bool useXonXoff)
   d->xonXoff = useXonXoff;
   if (d->masterFd >= 0) {
     // without the '::' some version of HP-UX thinks, this declares
-    // the struct in this class, in this method, and fails to tqfind
+    // the struct in this class, in this method, and fails to find
     // the correct tc[gs]etattr
     struct ::termios ttmode;
 
@@ -538,7 +538,7 @@ void KPty::setUtf8Mode(bool useUtf8)
 #ifdef IUTF8
   if (d->masterFd >= 0) {
     // without the '::' some version of HP-UX thinks, this declares
-    // the struct in this class, in this method, and fails to tqfind
+    // the struct in this class, in this method, and fails to find
     // the correct tc[gs]etattr
     struct ::termios ttmode;
 
diff --git a/kdecore/kqiodevicegzip_p.cpp b/kdecore/kqiodevicegzip_p.cpp
index 9ad82a653..2f949b9ee 100644
--- a/kdecore/kqiodevicegzip_p.cpp
+++ b/kdecore/kqiodevicegzip_p.cpp
@@ -111,9 +111,9 @@ bool KQIODeviceGZip::reset(void)
     return (gzrewind(m_gzfile)>=0);
 }
 
-TQ_LONG KQIODeviceGZip::readBlock( char *data, TQ_ULONG maxlen )
+Q_LONG KQIODeviceGZip::readBlock( char *data, Q_ULONG maxlen )
 {
-    TQ_LONG result=0;
+    Q_LONG result=0;
     if (m_gzfile)
     {
         result=gzread(m_gzfile,data,maxlen);
@@ -122,9 +122,9 @@ TQ_LONG KQIODeviceGZip::readBlock( char *data, TQ_ULONG maxlen )
     return result;
 }
 
-TQ_LONG KQIODeviceGZip::writeBlock( const char *data, TQ_ULONG len )
+Q_LONG KQIODeviceGZip::writeBlock( const char *data, Q_ULONG len )
 {
-    TQ_ULONG result=0;
+    Q_ULONG result=0;
     if (m_gzfile)
     {
         result=gzwrite(m_gzfile,(char*)data,len);
diff --git a/kdecore/kqiodevicegzip_p.h b/kdecore/kqiodevicegzip_p.h
index c8a504c65..02c3fe039 100644
--- a/kdecore/kqiodevicegzip_p.h
+++ b/kdecore/kqiodevicegzip_p.h
@@ -48,8 +48,8 @@ public:
     bool atEnd(void) const;
     bool reset (void);
 
-    TQ_LONG readBlock( char *data, TQ_ULONG maxlen );
-    TQ_LONG writeBlock( const char *data, TQ_ULONG len );
+    Q_LONG readBlock( char *data, Q_ULONG maxlen );
+    Q_LONG writeBlock( const char *data, Q_ULONG len );
 
     int getch(void);
     int putch(int ch);
diff --git a/kdecore/kregexp.h b/kdecore/kregexp.h
index 88d16a3c7..c3ed8ff3d 100644
--- a/kdecore/kregexp.h
+++ b/kdecore/kregexp.h
@@ -30,7 +30,7 @@ class KRegExpPrivate;
  *
  * This was implemented
  * because TQRegExp did not support back-references. It now does and
- * is recommended over KRegExp because of the tqunicode support and the
+ * is recommended over KRegExp because of the unicode support and the
  * more powerful API.
  *
  * Back-references are parts of a regexp grouped with parentheses. If a
@@ -53,7 +53,7 @@ class KRegExpPrivate;
  *  Weis
  * \endcode
  *
- * Please notice that KRegExp does @em not support tqunicode.
+ * Please notice that KRegExp does @em not support unicode.
  *
  * @author Torben Weis <weis@kde.org>
  */
diff --git a/kdecore/krfcdate.cpp b/kdecore/krfcdate.cpp
index 809a056f2..d9a374d0c 100644
--- a/kdecore/krfcdate.cpp
+++ b/kdecore/krfcdate.cpp
@@ -362,13 +362,13 @@ KRFCDate::parseDateISO8601( const TQString& input_ )
 
   TQString input = input_;
 
-  // First tqfind the 'T' separator, if any.
-  int tPos = input.tqfind('T');
+  // First find the 'T' separator, if any.
+  int tPos = input.find('T');
 
   // If there is no time, no month or no day specified, fill those missing
   // fields so that 'input' matches YYYY-MM-DDTHH:MM:SS
   if (-1 == tPos) {
-    const int dashes = input.tqcontains('-');
+    const int dashes = input.contains('-');
     if (0 == dashes) {
       input += "-01-01";
     } else if (1 == dashes) {
@@ -400,7 +400,7 @@ KRFCDate::parseDateISO8601( const TQString& input_ )
 
   // +zone or -zone suffix (offset from UTC).
 
-  int plusPos = timeString.tqfindRev('+');
+  int plusPos = timeString.findRev('+');
 
   if (-1 != plusPos) {
     TQString offsetString = timeString.mid(plusPos + 1);
@@ -409,7 +409,7 @@ KRFCDate::parseDateISO8601( const TQString& input_ )
 
     timeString = timeString.left(plusPos);
   } else {
-    int minusPos = timeString.tqfindRev('-');
+    int minusPos = timeString.findRev('-');
 
     if (-1 != minusPos) {
       TQString offsetString = timeString.mid(minusPos + 1);
@@ -421,7 +421,7 @@ KRFCDate::parseDateISO8601( const TQString& input_ )
   }
 
   // secfrac suffix.
-  int dotPos = timeString.tqfindRev('.');
+  int dotPos = timeString.findRev('.');
 
   if (-1 != dotPos) {
     timeString = timeString.left(dotPos);
diff --git a/kdecore/krfcdate.h b/kdecore/krfcdate.h
index e0232995e..ade819622 100644
--- a/kdecore/krfcdate.h
+++ b/kdecore/krfcdate.h
@@ -25,7 +25,7 @@
 #include "kdelibs_export.h"
 
 /**
- * The KRFCDate class tqcontains functions related to the parsing of dates.
+ * The KRFCDate class contains functions related to the parsing of dates.
  *
  * @author Waldo Bastian <bastian@kde.org>
  */
diff --git a/kdecore/krootprop.cpp b/kdecore/krootprop.cpp
index 4e62b77d7..2d545f30b 100644
--- a/kdecore/krootprop.cpp
+++ b/kdecore/krootprop.cpp
@@ -118,7 +118,7 @@ void KRootProp::setProp( const TQString& rProp )
   {
     // parse the string for first key-value pair separator '\n'
 
-    i = s.tqfind("\n");
+    i = s.find("\n");
     if(i == -1)
       i = s.length();
 
@@ -131,7 +131,7 @@ void KRootProp::setProp( const TQString& rProp )
 
     keypair.simplifyWhiteSpace();
 
-    i = keypair.tqfind( "=" );
+    i = keypair.find( "=" );
     if( i != -1 )
     {
       key = keypair.left( i );
@@ -160,7 +160,7 @@ void KRootProp::destroy()
 TQString KRootProp::readEntry( const TQString& rKey,
 			    const TQString& pDefault ) const
 {
-  if( propDict.tqcontains( rKey ) )
+  if( propDict.contains( rKey ) )
       return propDict[ rKey ];
   else
       return pDefault;
@@ -217,18 +217,18 @@ TQColor KRootProp::readColorEntry( const TQString& rKey,
 
   // Support #ffffff style color naming.
   // Help ease transistion from legacy KDE setups
-  if( aValue.tqfind("#") == 0 ) {
+  if( aValue.find("#") == 0 ) {
     aRetColor.setNamedColor( aValue );
     return aRetColor;
   }
 
   // Parse "red,green,blue"
-  // tqfind first comma
-  int nIndex1 = aValue.tqfind( ',' );
+  // find first comma
+  int nIndex1 = aValue.find( ',' );
   if( nIndex1 == -1 )
     return aRetColor;
-  // tqfind second comma
-  int nIndex2 = aValue.tqfind( ',', nIndex1+1 );
+  // find second comma
+  int nIndex2 = aValue.find( ',', nIndex1+1 );
   if( nIndex2 == -1 )
     return aRetColor;
 
@@ -246,9 +246,9 @@ TQColor KRootProp::readColorEntry( const TQString& rKey,
 TQString KRootProp::writeEntry( const TQString& rKey, const TQString& rValue )
 {
     dirty = true;
-    if ( propDict.tqcontains( rKey ) ) {
+    if ( propDict.contains( rKey ) ) {
 	TQString aValue = propDict[ rKey ];
-	propDict.tqreplace( rKey, rValue );
+	propDict.replace( rKey, rValue );
 	return aValue;
     }
     else {
@@ -280,7 +280,7 @@ TQString KRootProp::writeEntry( const TQString& rKey, const TQColor& rColor )
 
 TQString KRootProp::removeEntry(const TQString& rKey)
 {
-    if (propDict.tqcontains(rKey)) {
+    if (propDict.contains(rKey)) {
 	dirty = true;
 	TQString aValue = propDict[rKey];
 	propDict.remove(rKey);
diff --git a/kdecore/ksavefile.cpp b/kdecore/ksavefile.cpp
index d5feec68f..16887a677 100644
--- a/kdecore/ksavefile.cpp
+++ b/kdecore/ksavefile.cpp
@@ -47,7 +47,7 @@ KSaveFile::KSaveFile(const TQString &filename, int mode)
    TQString real_filename = KStandardDirs::realFilePath(filename);
 
    // we only check here if the directory can be written to
-   // the actual filename isn't written to, but tqreplaced later
+   // the actual filename isn't written to, but replaced later
    // with the contents of our tempfile
    if (!checkAccess(real_filename, W_OK))
    {
@@ -55,7 +55,7 @@ KSaveFile::KSaveFile(const TQString &filename, int mode)
       return;
    }
 
-   if (mTempFile.create(real_filename, TQString::tqfromLatin1(".new"), mode))
+   if (mTempFile.create(real_filename, TQString::fromLatin1(".new"), mode))
    {
       mFileName = real_filename; // Set filename upon success
 
@@ -165,7 +165,7 @@ bool KSaveFile::backupFile( const TQString& qFilename, const TQString& backupDir
    else
    {
        TQCString nameOnly;
-       int slash = cFilename.tqfindRev('/');
+       int slash = cFilename.findRev('/');
        if (slash < 0)
 	   nameOnly = cFilename;
        else
diff --git a/kdecore/ksavefile.h b/kdecore/ksavefile.h
index 448c9ca1a..ae68b2d1f 100644
--- a/kdecore/ksavefile.h
+++ b/kdecore/ksavefile.h
@@ -140,7 +140,7 @@ public:
      */
    static bool backupFile( const TQString& filename,
                            const TQString& backupDir = TQString::null,
-                           const TQString& backupExtension = TQString::tqfromLatin1( "~" ) );
+                           const TQString& backupExtension = TQString::fromLatin1( "~" ) );
 
 private:
    TQString mFileName;
diff --git a/kdecore/kshell.cpp b/kdecore/kshell.cpp
index f7ab97683..5b92b1d5e 100644
--- a/kdecore/kshell.cpp
+++ b/kdecore/kshell.cpp
@@ -72,7 +72,7 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err )
         do {
             if (pos >= args.length())
                 goto okret;
-            c = args.tqunicode()[pos++];
+            c = args.unicode()[pos++];
         } while (c.isSpace());
         TQString cret;
         if ((flags & TildeExpand) && c == (QChar)'~') {
@@ -80,7 +80,7 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err )
             for (; ; pos++) {
                 if (pos >= args.length())
                     break;
-                c = args.tqunicode()[pos];
+                c = args.unicode()[pos];
                 if (c == (QChar)'/' || c.isSpace())
                     break;
                 if (isQuoteMeta( c )) {
@@ -91,7 +91,7 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err )
                 if ((flags & AbortOnMeta) && isMeta( c ))
                     goto metaerr;
             }
-            TQString ccret = homeDir( TQConstString( args.tqunicode() + opos, pos - opos ).string() );
+            TQString ccret = homeDir( TQConstString( args.unicode() + opos, pos - opos ).string() );
             if (ccret.isEmpty()) {
                 pos = opos;
                 c = (QChar)'~';
@@ -129,20 +129,20 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err )
                 do {
                     if (pos >= args.length())
                         goto quoteerr;
-                    c = args.tqunicode()[pos++];
+                    c = args.unicode()[pos++];
                 } while (c != (QChar)'\'');
-                cret += TQConstString( args.tqunicode() + spos, pos - spos - 1 ).string();
+                cret += TQConstString( args.unicode() + spos, pos - spos - 1 ).string();
             } else if (c == (QChar)'"') {
                 for (;;) {
                     if (pos >= args.length())
                         goto quoteerr;
-                    c = args.tqunicode()[pos++];
+                    c = args.unicode()[pos++];
                     if (c == (QChar)'"')
                         break;
                     if (c == (QChar)'\\') {
                         if (pos >= args.length())
                             goto quoteerr;
-                        c = args.tqunicode()[pos++];
+                        c = args.unicode()[pos++];
                         if (c != (QChar)'"' && c != (QChar)'\\' &&
                             !((flags & AbortOnMeta) && (c == (QChar)'$' || c == (QChar)'`')))
                             cret += (QChar)'\\';
@@ -155,13 +155,13 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err )
                 for (;;) {
                     if (pos >= args.length())
                         goto quoteerr;
-                    c = args.tqunicode()[pos++];
+                    c = args.unicode()[pos++];
                     if (c == (QChar)'\'')
                         break;
                     if (c == (QChar)'\\') {
                         if (pos >= args.length())
                             goto quoteerr;
-                        c = args.tqunicode()[pos++];
+                        c = args.unicode()[pos++];
                         switch (c) {
                         case 'a': cret += (QChar)'\a'; break;
                         case 'b': cret += (QChar)'\b'; break;
@@ -212,7 +212,7 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err )
                 if (c == (QChar)'\\') {
                     if (pos >= args.length())
                         goto quoteerr;
-                    c = args.tqunicode()[pos++];
+                    c = args.unicode()[pos++];
                     if (!c.isSpace() &&
                         !((flags & AbortOnMeta) ? isMeta( c ) : isQuoteMeta( c )))
                         cret += '\\';
@@ -222,7 +222,7 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err )
             }
             if (pos >= args.length())
                 break;
-            c = args.tqunicode()[pos++];
+            c = args.unicode()[pos++];
         } while (!c.isSpace());
         ret += cret;
         firstword = false;
@@ -265,9 +265,9 @@ TQString KShell::joinArgs( const TQStringList &args )
             ret.append( q ).append( q );
         else {
             for (uint i = 0; i < (*it).length(); i++)
-                if (isSpecial((*it).tqunicode()[i])) {
+                if (isSpecial((*it).unicode()[i])) {
                     TQString tmp(*it);
-                    tmp.tqreplace( q, "'\\''" );
+                    tmp.replace( q, "'\\''" );
                     ret += q;
                     tmp += q;
                     ret += tmp;
@@ -294,8 +294,8 @@ TQString KShell::joinArgs( const char * const *args, int nargs )
         else {
             TQString tmp( TQFile::decodeName( *argp ) );
             for (uint i = 0; i < tmp.length(); i++)
-                if (isSpecial(tmp.tqunicode()[i])) {
-                    tmp.tqreplace( q, "'\\''" );
+                if (isSpecial(tmp.unicode()[i])) {
+                    tmp.replace( q, "'\\''" );
                     ret += q;
                     tmp += q;
                     ret += tmp;
@@ -319,10 +319,10 @@ TQString KShell::joinArgsDQ( const TQStringList &args )
             ret.append( q ).append( q );
         else {
             for (uint i = 0; i < (*it).length(); i++)
-                if (isSpecial((*it).tqunicode()[i])) {
+                if (isSpecial((*it).unicode()[i])) {
                     ret.append( '$' ).append( q );
                     for (uint pos = 0; pos < (*it).length(); pos++) {
-                        int c = (*it).tqunicode()[pos];
+                        int c = (*it).unicode()[pos];
                         if (c < 32) {
                             ret += bs;
                             switch (c) {
@@ -355,12 +355,12 @@ TQString KShell::joinArgsDQ( const TQStringList &args )
 TQString KShell::tildeExpand( const TQString &fname )
 {
     if (fname[0] == (QChar)'~') {
-        int pos = fname.tqfind( '/' );
+        int pos = fname.find( '/' );
         if (pos < 0)
-            return homeDir( TQConstString( fname.tqunicode() + 1, fname.length() - 1 ).string() );
-        TQString ret = homeDir( TQConstString( fname.tqunicode() + 1, pos - 1 ).string() );
+            return homeDir( TQConstString( fname.unicode() + 1, fname.length() - 1 ).string() );
+        TQString ret = homeDir( TQConstString( fname.unicode() + 1, pos - 1 ).string() );
         if (!ret.isNull())
-            ret += TQConstString( fname.tqunicode() + pos, fname.length() - pos ).string();
+            ret += TQConstString( fname.unicode() + pos, fname.length() - pos ).string();
         return ret;
     }
     return fname;
diff --git a/kdecore/kshell.h b/kdecore/kshell.h
index 96ba4978a..2e9f3ad98 100644
--- a/kdecore/kshell.h
+++ b/kdecore/kshell.h
@@ -59,7 +59,7 @@ namespace KShell {
     };
 
     /**
-     * tqStatus codes from splitArgs()
+     * Status codes from splitArgs()
      */
     enum Errors {
         /**
@@ -81,7 +81,7 @@ namespace KShell {
 
     /**
      * Splits @p cmd according to POSIX shell word splitting and quoting rules.
-     * Can optionally perform tilde expansion and/or abort if it tqfinds shell
+     * Can optionally perform tilde expansion and/or abort if it finds shell
      * meta characters it cannot process.
      *
      * @param cmd the command to split
diff --git a/kdecore/kshortcut.cpp b/kdecore/kshortcut.cpp
index 611f7924c..4847b8742 100644
--- a/kdecore/kshortcut.cpp
+++ b/kdecore/kshortcut.cpp
@@ -526,12 +526,12 @@ int KShortcut::compare( const KShortcut& cut ) const
 	return m_nSeqs - cut.m_nSeqs;
 }
 
-bool KShortcut::tqcontains( const KKey& key ) const
+bool KShortcut::contains( const KKey& key ) const
 {
-	return tqcontains( KKeySequence(key) );
+	return contains( KKeySequence(key) );
 }
 
-bool KShortcut::tqcontains( const KKeyNative& keyNative ) const
+bool KShortcut::contains( const KKeyNative& keyNative ) const
 {
 	KKey key = keyNative.key();
 	key.simplify();
@@ -545,7 +545,7 @@ bool KShortcut::tqcontains( const KKeyNative& keyNative ) const
 	return false;
 }
 
-bool KShortcut::tqcontains( const KKeySequence& seq ) const
+bool KShortcut::contains( const KKeySequence& seq ) const
 {
 	for( uint i = 0; i < count(); i++ ) {
 		if( !m_rgseq[i].isNull() && m_rgseq[i] == seq )
@@ -607,13 +607,13 @@ bool KShortcut::append( const KShortcut& cut )
 {
 	uint seqs = m_nSeqs, co = cut.count();
 	for( uint i=0; i<co; i++ ) {
-	    if (!tqcontains(cut.seq(i))) seqs++;
+	    if (!contains(cut.seq(i))) seqs++;
 	}
 	if( seqs > MAX_SEQUENCES ) return false;
 
 	for( uint i=0; i<co; i++ ) {
 		const KKeySequence& seq = cut.seq(i);
-		if(!tqcontains(seq)) {
+		if(!contains(seq)) {
 			m_rgseq[m_nSeqs] = seq;
 			m_nSeqs++;
 		}
diff --git a/kdecore/kshortcut.h b/kdecore/kshortcut.h
index 281dcaa96..7d62a0041 100644
--- a/kdecore/kshortcut.h
+++ b/kdecore/kshortcut.h
@@ -74,7 +74,7 @@ class KDECORE_EXPORT KKey
 
 	/**
 	 * Creates a new key from the first key code of the given key sequence.
-	 * @param keySeq the key sequence that tqcontains the key
+	 * @param keySeq the key sequence that contains the key
 	 */
 	KKey( const TQKeySequence& keySeq );
 
@@ -121,7 +121,7 @@ class KDECORE_EXPORT KKey
 
 	/**
 	 * Initializes the key with the first key code of the given key sequence.
-	 * @param keySeq the key sequence that tqcontains the key
+	 * @param keySeq the key sequence that contains the key
 	 * @return true if successful, false otherwise
 	 */
 	bool init( const TQKeySequence& keySeq );
@@ -306,13 +306,13 @@ class KDECORE_EXPORT KKeySequence
 	KKeySequence( const TQKeySequence& keySeq );
 
 	/**
-	 * Create a new key sequence that only tqcontains the given key.
+	 * Create a new key sequence that only contains the given key.
 	 * @param key the key to add
 	 */
 	KKeySequence( const KKey& key );
 
 	/**
-	 * Create a new key sequence that only tqcontains the given key.
+	 * Create a new key sequence that only contains the given key.
 	 * @param key the key to add
 	 */
 	KKeySequence( const KKeyNative& key );
@@ -324,7 +324,7 @@ class KDECORE_EXPORT KKeySequence
 	KKeySequence( const KKeySequence& keySeq );
 
 	/**
-	 * Creates a new key sequence that tqcontains the given key sequence.
+	 * Creates a new key sequence that contains the given key sequence.
 	 * The description consists of comma-separated keys as
 	 * required by KKey::KKey(const TQString&).
 	 * @param keySeq the description of the key
@@ -440,7 +440,7 @@ class KDECORE_EXPORT KKeySequence
 	 * number if the given KKeySequence is larger, 0 if they are equal and
 	 * a positive number this KKeySequence is larger. Key sequences are
 	 * compared by comparing the individual keys, starting from the beginning
-	 * until an unequal key has been found. If a sequence tqcontains more
+	 * until an unequal key has been found. If a sequence contains more
 	 * keys, it is considered larger.
 	 * @param keySeq the key sequence to compare to
 	 * @return a negative number if the given KKeySequence is larger, 0 if
@@ -566,21 +566,21 @@ class KDECORE_EXPORT KShortcut
 	KShortcut( int keyQt );
 
 	/**
-	 * Creates a new shortcut that tqcontains only the given qt key
+	 * Creates a new shortcut that contains only the given qt key
 	 * sequence.
 	 * @param keySeq the qt key sequence to add
 	 */
 	KShortcut( const TQKeySequence& keySeq );
 
 	/**
-	 * Creates a new shortcut that tqcontains only the given key
+	 * Creates a new shortcut that contains only the given key
 	 * in its only sequence.
 	 * @param key the key to add
 	 */
 	KShortcut( const KKey& key );
 
 	/**
-	 * Creates a new shortcut that tqcontains only the given key
+	 * Creates a new shortcut that contains only the given key
 	 * sequence.
 	 * @param keySeq the key sequence to add
 	 */
@@ -593,7 +593,7 @@ class KDECORE_EXPORT KShortcut
 	KShortcut( const KShortcut& shortcut );
 
 	/**
-	 * Creates a new key sequence that tqcontains the given key sequence.
+	 * Creates a new key sequence that contains the given key sequence.
 	 * The description consists of semicolon-separated keys as
 	 * used in KKeySequence::KKeySequence(const TQString&).
 	 * @param shortcut the description of the key
@@ -602,7 +602,7 @@ class KDECORE_EXPORT KShortcut
 	KShortcut( const char* shortcut );
 
 	/**
-	 * Creates a new key sequence that tqcontains the given key sequence.
+	 * Creates a new key sequence that contains the given key sequence.
 	 * The description consists of semicolon-separated keys as
 	 * used in KKeySequence::KKeySequence(const TQString&).
 	 * @param shortcut the description of the key
@@ -706,7 +706,7 @@ class KDECORE_EXPORT KShortcut
 	 * a positive number this shortcut is larger. Shortcuts are
 	 * compared by comparing the individual key sequences, starting from the
 	 * beginning until an unequal key sequences has been found. If a shortcut
-	 * tqcontains more key sequences, it is considered larger.
+	 * contains more key sequences, it is considered larger.
 	 * @param shortcut the shortcut to compare to
 	 * @return a negative number if the given KShortcut is larger, 0 if
 	 * they are equal and a positive number this KShortcut is larger
@@ -737,27 +737,27 @@ class KDECORE_EXPORT KShortcut
 		{ return compare( cut ) < 0; }
 
 	/**
-	 * Checks whether this shortcut tqcontains a sequence that starts
+	 * Checks whether this shortcut contains a sequence that starts
 	 * with the given key.
 	 * @param key the key to check
 	 * @return true if a key sequence starts with the key
 	 */
-	bool tqcontains( const KKey& key ) const;
+	bool contains( const KKey& key ) const;
 
 	/**
-	 * Checks whether this shortcut tqcontains a sequence that starts
+	 * Checks whether this shortcut contains a sequence that starts
 	 * with the given key.
 	 * @param key the key to check
 	 * @return true if a key sequence starts with the key
 	 */
-	bool tqcontains( const KKeyNative& key ) const;
+	bool contains( const KKeyNative& key ) const;
 
 	/**
-	 * Checks whether this shortcut tqcontains the given sequence.
+	 * Checks whether this shortcut contains the given sequence.
 	 * @param keySeq the key sequence to check
 	 * @return true if the shortcut has the given key sequence
 	 */
-	bool tqcontains( const KKeySequence& keySeq ) const;
+	bool contains( const KKeySequence& keySeq ) const;
 
 	/**
 	 * Sets the @p i 'th key sequence of the shortcut. You can not introduce
diff --git a/kdecore/kshortcutlist.cpp b/kdecore/kshortcutlist.cpp
index b8796d350..865bdc257 100644
--- a/kdecore/kshortcutlist.cpp
+++ b/kdecore/kshortcutlist.cpp
@@ -46,7 +46,7 @@ int KShortcutList::index( const KKeySequence& seq ) const
 
 	uint nSize = count();
 	for( uint i = 0; i < nSize; i++ ) {
-		if( shortcut(i).tqcontains( seq ) )
+		if( shortcut(i).contains( seq ) )
 			return i;
 	}
 
diff --git a/kdecore/kshortcutmenu.cpp b/kdecore/kshortcutmenu.cpp
index 930095c84..3df389f07 100644
--- a/kdecore/kshortcutmenu.cpp
+++ b/kdecore/kshortcutmenu.cpp
@@ -123,7 +123,7 @@ int KShortcutMenu::searchForKey( KKey key )
 	uint iKey = m_seq.count();
 	
 	for( uint iItem = 1; iItem < count(); iItem++ ) {
-		if( m_seqs.tqcontains( iItem ) ) {
+		if( m_seqs.contains( iItem ) ) {
 			KKey keyItem = m_seqs[iItem].key( iKey );
 			//kdDebug(125) << "iItem = " << iItem << " key = " << key.toStringInternal() << " keyItem = " << keyItem.toStringInternal() << endl;
 			if( key == keyItem ) {
@@ -146,7 +146,7 @@ void KShortcutMenu::keepItemsMatching( KKey key )
 	m_seq.setKey( iKey, key );
 	
 	for( uint iItem = 1; iItem < count(); iItem++ ) {
-		if( m_seqs.tqcontains( iItem ) ) {
+		if( m_seqs.contains( iItem ) ) {
 			KKey keyItem = m_seqs[iItem].key( iKey );
 			if( key != keyItem ) {
 				m_seqs.remove( iItem );
diff --git a/kdecore/ksimpleconfig.cpp b/kdecore/ksimpleconfig.cpp
index 15597826d..6b4e13a14 100644
--- a/kdecore/ksimpleconfig.cpp
+++ b/kdecore/ksimpleconfig.cpp
@@ -38,7 +38,7 @@
 #include "ksimpleconfig.h"
 
 KSimpleConfig::KSimpleConfig(const TQString &fileName, bool bReadOnly)
-  : KConfig(TQString::tqfromLatin1(""), bReadOnly, false)
+  : KConfig(TQString::fromLatin1(""), bReadOnly, false)
 {
   // the difference between KConfig and KSimpleConfig is just that
   // for KSimpleConfig an absolute filename is guaranteed
diff --git a/kdecore/ksimpleconfig.h b/kdecore/ksimpleconfig.h
index 1a18a09a3..89d380512 100644
--- a/kdecore/ksimpleconfig.h
+++ b/kdecore/ksimpleconfig.h
@@ -32,7 +32,7 @@ class KSimpleConfigPrivate;
  * only one configuration file and no default system.
  * A difference with KConfig is that when the data in memory is written back
  * it is not merged with what is on disk.
- * Whatever is in memory simply tqreplaces what is on disk entirely.
+ * Whatever is in memory simply replaces what is on disk entirely.
  *
  * @author Kalle Dalheimer <kalle@kde.org>, Preston Brown <pbrown@kde.org>
  * @see KConfigBase KConfig
diff --git a/kdecore/ksock.h b/kdecore/ksock.h
index 7981bd233..8f2c9280c 100644
--- a/kdecore/ksock.h
+++ b/kdecore/ksock.h
@@ -84,7 +84,7 @@ class KServerSocketPrivate;
  * @author Torben Weis <weis@uni-frankfurt.de>
  * @short A TCP/IP client socket.
  */
-class KDECORE_EXPORT KSocket : public TQObject
+class KDECORE_EXPORT KSocket : public QObject
 {
     Q_OBJECT
 public:
@@ -234,7 +234,7 @@ private:
  * @deprecated
  * This class is deprecated and will be removed in the future.
  * Please use the classes in KNetwork for new programs. 
- * In special, this class is tqreplaced by KNetwork::KStreamSocket
+ * In special, this class is replaced by KNetwork::KStreamSocket
  * and KNetwork::KServerSocket. 
  *
  * You can use a KServerSocket to listen on a port for incoming
@@ -247,7 +247,7 @@ private:
  *
  * @author Torben Weis <weis@stud.uni-frankfurt.de>
 */
-class KDECORE_EXPORT KServerSocket : public TQObject
+class KDECORE_EXPORT KServerSocket : public QObject
 {
     Q_OBJECT
 public:
diff --git a/kdecore/ksockaddr.cpp b/kdecore/ksockaddr.cpp
index bc9c03059..82bed0d5c 100644
--- a/kdecore/ksockaddr.cpp
+++ b/kdecore/ksockaddr.cpp
@@ -421,7 +421,7 @@ bool KInetSocketAddress::setHost(const TQString& addr, int family)
 
 #ifdef AF_INET6
       // IPv6 addresses MUST contain colons (:) and IPv4 addresses must not
-      if (addr.tqfind(':') != -1)
+      if (addr.find(':') != -1)
 	family = AF_INET6;
       else
 	family = AF_INET;
@@ -485,7 +485,7 @@ bool KInetSocketAddress::setFamily(int _family)
   return true;
 }
 
-bool KInetSocketAddress::setFlowinfo(TQ_UINT32 flowinfo)
+bool KInetSocketAddress::setFlowinfo(Q_UINT32 flowinfo)
 {
 #ifdef AF_INET6
   if (d->sockfamily == AF_INET6)
@@ -587,7 +587,7 @@ TQString KInetSocketAddress::nodeName() const
       return i18n("<empty>");
     }
 
-  return TQString::tqfromLatin1(buf); // FIXME! What's the encoding?
+  return TQString::fromLatin1(buf); // FIXME! What's the encoding?
 }
 
 TQString KInetSocketAddress::serviceName() const
@@ -605,11 +605,11 @@ unsigned short KInetSocketAddress::port() const
 #endif
 }
 
-TQ_UINT32 KInetSocketAddress::flowinfo() const
+Q_UINT32 KInetSocketAddress::flowinfo() const
 {
 #ifdef AF_INET6
   if (d->sockfamily == AF_INET6)
-    return (TQ_UINT32)d->sin6.sin6_flowinfo;
+    return (Q_UINT32)d->sin6.sin6_flowinfo;
 #endif
   return 0;
 }
@@ -677,9 +677,9 @@ void KInetSocketAddress::fromV4()
   d->sin6.sin6_port = d->sin.sin_port;
 
   // Make this a v4-mapped address
-  ((TQ_UINT32*)&d->sin6.sin6_addr)[0] = ((TQ_UINT32*)&d->sin6.sin6_addr)[1] = 0;
-  ((TQ_UINT32*)&d->sin6.sin6_addr)[2] = htonl(0xffff);
-  ((TQ_UINT32*)&d->sin6.sin6_addr)[3] = *(TQ_UINT32*)&d->sin.sin_addr;
+  ((Q_UINT32*)&d->sin6.sin6_addr)[0] = ((Q_UINT32*)&d->sin6.sin6_addr)[1] = 0;
+  ((Q_UINT32*)&d->sin6.sin6_addr)[2] = htonl(0xffff);
+  ((Q_UINT32*)&d->sin6.sin6_addr)[3] = *(Q_UINT32*)&d->sin.sin_addr;
 
   // Clear flowinfo and scopeid
   d->sin6.sin6_flowinfo = 0;
@@ -700,7 +700,7 @@ void KInetSocketAddress::fromV6()
   if (V6_CAN_CONVERT_TO_V4(&d->sin6.sin6_addr))
     {
       d->sin.sin_port = d->sin6.sin6_port;
-      *(TQ_UINT32*)&d->sin.sin_addr = ((TQ_UINT32*)&d->sin6.sin6_addr)[3];
+      *(Q_UINT32*)&d->sin.sin_addr = ((Q_UINT32*)&d->sin6.sin6_addr)[3];
     }
   else
     {
@@ -717,7 +717,7 @@ TQString KInetSocketAddress::addrToString(int family, const void* addr)
 {
   char buf[INET6_ADDRSTRLEN+1];
 
-  return TQString::tqfromLatin1(inet_ntop(family, addr, buf, INET6_ADDRSTRLEN));
+  return TQString::fromLatin1(inet_ntop(family, addr, buf, INET6_ADDRSTRLEN));
 }
 
 bool KInetSocketAddress::stringToAddr(int family, const char *text, void *dest)
diff --git a/kdecore/ksockaddr.h b/kdecore/ksockaddr.h
index 04ae350aa..8b62f7da9 100644
--- a/kdecore/ksockaddr.h
+++ b/kdecore/ksockaddr.h
@@ -43,7 +43,7 @@ class KSocketAddressPrivate;
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  * @short a socket address.
  */
-class KDECORE_EXPORT KSocketAddress: public TQObject
+class KDECORE_EXPORT KSocketAddress: public QObject
 {
   Q_OBJECT
 protected:
@@ -391,7 +391,7 @@ public:
    * @param flowinfo	flowinfo
    * @return true if successful, false otherwise
    */
-  bool setFlowinfo(TQ_UINT32 flowinfo);
+  bool setFlowinfo(Q_UINT32 flowinfo);
 
   /**
    * Sets the scope id for this socket if this is IPv6.
@@ -461,7 +461,7 @@ public:
    * Returns flowinfo for IPv6 socket.
    * @return the flowinfo, 0 if unsupported
    */
-  TQ_UINT32 flowinfo() const;
+  Q_UINT32 flowinfo() const;
 
   /**
    * Returns the scope id for this IPv6 socket.
diff --git a/kdecore/ksocks.cpp b/kdecore/ksocks.cpp
index 2af496f7a..e596c50d9 100644
--- a/kdecore/ksocks.cpp
+++ b/kdecore/ksocks.cpp
@@ -85,7 +85,7 @@ class KSocksTable {
    KSocksTable();
   virtual ~KSocksTable();
 
-   // The name of each symbol and it's SOCKS tqreplacement
+   // The name of each symbol and it's SOCKS replacement
    TQMap<SymbolKeys,TQString>  symbols;
    // The name of this library
    TQString                   myname;
diff --git a/kdecore/kstandarddirs.cpp b/kdecore/kstandarddirs.cpp
index 54dab242a..f8b7bd307 100644
--- a/kdecore/kstandarddirs.cpp
+++ b/kdecore/kstandarddirs.cpp
@@ -144,7 +144,7 @@ bool KStandardDirs::isRestrictedResource(const char *type, const TQString& relPa
 void KStandardDirs::applyDataRestrictions(const TQString &relPath) const
 {
    TQString key;
-   int i = relPath.tqfind(QChar('/'));
+   int i = relPath.find(QChar('/'));
    if (i != -1)
       key = "data_"+relPath.left(i);
    else
@@ -159,7 +159,7 @@ TQStringList KStandardDirs::allTypes() const
 {
     TQStringList list;
     for (int i = 0; types[i] != 0; ++i)
-        list.append(TQString::tqfromLatin1(types[i]));
+        list.append(TQString::fromLatin1(types[i]));
     return list;
 }
 
@@ -192,7 +192,7 @@ void KStandardDirs::addPrefix( const TQString& _dir, bool priority )
     if (dir.at(dir.length() - 1) != QChar('/'))
 	dir += QChar('/');
 
-    if (!prefixes.tqcontains(dir)) {
+    if (!prefixes.contains(dir)) {
         priorityAdd(prefixes, dir, priority);
 	dircache.clear();
     }
@@ -212,7 +212,7 @@ void KStandardDirs::addXdgConfigPrefix( const TQString& _dir, bool priority )
     if (dir.at(dir.length() - 1) != QChar('/'))
 	dir += QChar('/');
 
-    if (!d->xdgconf_prefixes.tqcontains(dir)) {
+    if (!d->xdgconf_prefixes.contains(dir)) {
         priorityAdd(d->xdgconf_prefixes, dir, priority);
 	dircache.clear();
     }
@@ -232,7 +232,7 @@ void KStandardDirs::addXdgDataPrefix( const TQString& _dir, bool priority )
     if (dir.at(dir.length() - 1) != QChar('/'))
 	dir += QChar('/');
 
-    if (!d->xdgdata_prefixes.tqcontains(dir)) {
+    if (!d->xdgdata_prefixes.contains(dir)) {
 	priorityAdd(d->xdgdata_prefixes, dir, priority);
 	dircache.clear();
     }
@@ -265,7 +265,7 @@ bool KStandardDirs::addResourceType( const char *type,
     if (relativename.isEmpty())
        return false;
 
-    TQStringList *rels = relatives.tqfind(type);
+    TQStringList *rels = relatives.find(type);
     if (!rels) {
 	rels = new TQStringList();
 	relatives.insert(type, rels);
@@ -273,7 +273,7 @@ bool KStandardDirs::addResourceType( const char *type,
     TQString copy = relativename;
     if (copy.at(copy.length() - 1) != QChar('/'))
 	copy += QChar('/');
-    if (!rels->tqcontains(copy)) {
+    if (!rels->contains(copy)) {
         if (priority)
 	    rels->prepend(copy);
 	else
@@ -295,7 +295,7 @@ bool KStandardDirs::addResourceDir( const char *type,
 				    const TQString& absdir,
 				    bool priority)
 {
-    TQStringList *paths = absolutes.tqfind(type);
+    TQStringList *paths = absolutes.find(type);
     if (!paths) {
 	paths = new TQStringList();
 	absolutes.insert(type, paths);
@@ -304,7 +304,7 @@ bool KStandardDirs::addResourceDir( const char *type,
     if (copy.at(copy.length() - 1) != QChar('/'))
       copy += QChar('/');
 
-    if (!paths->tqcontains(copy)) {
+    if (!paths->contains(copy)) {
         if (priority)
             paths->prepend(copy);
         else
@@ -337,7 +337,7 @@ for (TQStringList::ConstIterator pit = prefixes.begin();
     else return dir + filename;
 }
 
-static TQ_UINT32 updateHash(const TQString &file, TQ_UINT32 hash)
+static Q_UINT32 updateHash(const TQString &file, Q_UINT32 hash)
 {
     TQCString cFile = TQFile::encodeName(file);
     KDE_struct_stat buff;
@@ -345,15 +345,15 @@ static TQ_UINT32 updateHash(const TQString &file, TQ_UINT32 hash)
         (KDE_stat( cFile, &buff ) == 0) &&
         (S_ISREG( buff.st_mode )))
     {
-       hash = hash + (TQ_UINT32) buff.st_ctime;
+       hash = hash + (Q_UINT32) buff.st_ctime;
     }
     return hash;
 }
 
-TQ_UINT32 KStandardDirs::calcResourceHash( const char *type,
+Q_UINT32 KStandardDirs::calcResourceHash( const char *type,
 			      const TQString& filename, bool deep) const
 {
-    TQ_UINT32 hash = 0;
+    Q_UINT32 hash = 0;
 
     if (!TQDir::isRelativePath(filename))
     {
@@ -442,7 +442,7 @@ TQString KStandardDirs::findResourceDir( const char *type,
 
 #ifndef NDEBUG
     if(false && strcmp(type, "locale"))
-      kdDebug() << "KStdDirs::tqfindResDir(): can't tqfind \"" << filename << "\" in type \"" << type << "\"." << endl;
+      kdDebug() << "KStdDirs::findResDir(): can't find \"" << filename << "\" in type \"" << type << "\"." << endl;
 #endif
 
     return TQString::null;
@@ -468,7 +468,7 @@ static void lookupDirectory(const TQString& path, const TQString &relPart,
 			    bool recursive, bool unique)
 {
   TQString pattern = regexp.pattern();
-  if (recursive || pattern.tqcontains('?') || pattern.tqcontains('*'))
+  if (recursive || pattern.contains('?') || pattern.contains('*'))
   {
     if (path.isEmpty()) //for sanity
       return;
@@ -512,7 +512,7 @@ static void lookupDirectory(const TQString& path, const TQString &relPart,
       }
       if ( S_ISREG( buff.st_mode))
       {
-        if (!unique || !relList.tqcontains(relPart + fn))
+        if (!unique || !relList.contains(relPart + fn))
         {
 	    list.append( pathfn );
 	    relList.append( relPart + fn );
@@ -531,7 +531,7 @@ static void lookupDirectory(const TQString& path, const TQString &relPart,
         return; // File not found
      if ( S_ISREG( buff.st_mode))
      {
-       if (!unique || !relList.tqcontains(relPart + fn))
+       if (!unique || !relList.contains(relPart + fn))
        {
          list.append( pathfn );
          relList.append( relPart + fn );
@@ -557,7 +557,7 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath,
 
     if (relpath.length())
     {
-       int slash = relpath.tqfind(QChar('/'));
+       int slash = relpath.find(QChar('/'));
        if (slash < 0)
 	   rest = relpath.left(relpath.length() - 1);
        else {
@@ -575,7 +575,7 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath,
 #endif
     KDE_struct_stat buff;
 
-    if (path.tqcontains('*') || path.tqcontains('?')) {
+    if (path.contains('*') || path.contains('?')) {
 
 	TQRegExp pathExp(path, true, true);
 	DIR *dp = opendir( TQFile::encodeName(prefix) );
@@ -608,7 +608,7 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath,
 
 	closedir( dp );
     } else {
-        // Don't stat, if the dir doesn't exist we will tqfind out
+        // Don't stat, if the dir doesn't exist we will find out
         // when we try to open it.
         lookupPrefix(prefix + path + QChar('/'), rest,
                      relPart + path + QChar('/'), regexp, list,
@@ -629,7 +629,7 @@ KStandardDirs::findAllResources( const char *type,
 
     if (filter.length())
     {
-       int slash = filter.tqfindRev('/');
+       int slash = filter.findRev('/');
        if (slash < 0)
 	   filterFile = filter;
        else {
@@ -688,7 +688,7 @@ KStandardDirs::realPath(const TQString &dirname)
     char realpath_buffer[MAXPATHLEN + 1];
     memset(realpath_buffer, 0, MAXPATHLEN + 1);
 
-    /* If the path tqcontains symlinks, get the real name */
+    /* If the path contains symlinks, get the real name */
     if (realpath( TQFile::encodeName(dirname).data(), realpath_buffer) != 0) {
         // success, use result from realpath
         int len = strlen(realpath_buffer);
@@ -706,7 +706,7 @@ KStandardDirs::realFilePath(const TQString &filename)
     char realpath_buffer[MAXPATHLEN + 1];
     memset(realpath_buffer, 0, MAXPATHLEN + 1);
 
-    /* If the path tqcontains symlinks, get the real name */
+    /* If the path contains symlinks, get the real name */
     if (realpath( TQFile::encodeName(filename).data(), realpath_buffer) != 0) {
         // success, use result from realpath
         return TQFile::decodeName(realpath_buffer);
@@ -762,9 +762,9 @@ void KStandardDirs::createSpecialResource(const char *type)
 #else //UNIX
    if (relink)
    {
-      TQString srv = findExe(TQString::tqfromLatin1("lnusertemp"), kfsstnd_defaultbindir());
+      TQString srv = findExe(TQString::fromLatin1("lnusertemp"), kfsstnd_defaultbindir());
       if (srv.isEmpty())
-         srv = findExe(TQString::tqfromLatin1("lnusertemp"));
+         srv = findExe(TQString::fromLatin1("lnusertemp"));
       if (!srv.isEmpty())
       {
          system(TQFile::encodeName(srv)+" "+type);
@@ -785,7 +785,7 @@ void KStandardDirs::createSpecialResource(const char *type)
 
 TQStringList KStandardDirs::resourceDirs(const char *type) const
 {
-    TQStringList *candidates = dircache.tqfind(type);
+    TQStringList *candidates = dircache.find(type);
 
     if (!candidates) { // filling cache
         if (strcmp(type, "socket") == 0)
@@ -812,7 +812,7 @@ TQStringList KStandardDirs::resourceDirs(const char *type) const
            d->dataRestrictionActive = false; // Reset
         }
 
-        dirs = relatives.tqfind(type);
+        dirs = relatives.find(type);
         if (dirs)
         {
             bool local = true;
@@ -834,7 +834,7 @@ TQStringList KStandardDirs::resourceDirs(const char *type) const
                     testdir.setPath(path);
                     if (local && restrictionActive)
                        continue;
-                    if ((local || testdir.exists()) && !candidates->tqcontains(path))
+                    if ((local || testdir.exists()) && !candidates->contains(path))
                         candidates->append(path);
                 }
 		// UGLY HACK - Chris CHeney
@@ -844,7 +844,7 @@ TQStringList KStandardDirs::resourceDirs(const char *type) const
                 local = false;
             }
         }
-        dirs = absolutes.tqfind(type);
+        dirs = absolutes.find(type);
         if (dirs)
             for (TQStringList::ConstIterator it = dirs->begin();
                  it != dirs->end(); ++it)
@@ -853,7 +853,7 @@ TQStringList KStandardDirs::resourceDirs(const char *type) const
                 if (testdir.exists())
                 {
                     TQString filename = realPath(*it);
-                    if (!candidates->tqcontains(filename))
+                    if (!candidates->contains(filename))
                         candidates->append(filename);
                 }
             }
@@ -897,19 +897,19 @@ TQStringList KStandardDirs::systemPaths( const TQString& pstr )
 
         if ( p[ 0 ] == QChar('~') )
         {
-            int len = p.tqfind( QChar('/') );
+            int len = p.find( QChar('/') );
             if ( len == -1 )
                 len = p.length();
             if ( len == 1 )
             {
-                p.tqreplace( 0, 1, TQDir::homeDirPath() );
+                p.replace( 0, 1, TQDir::homeDirPath() );
             }
             else
             {
                 TQString user = p.mid( 1, len - 1 );
                 struct passwd *dir = getpwnam( user.local8Bit().data() );
                 if ( dir && strlen( dir->pw_dir ) )
-                    p.tqreplace( 0, len, TQString::fromLocal8Bit( dir->pw_dir ) );
+                    p.replace( 0, len, TQString::fromLocal8Bit( dir->pw_dir ) );
             }
         }
 
@@ -931,7 +931,7 @@ TQString KStandardDirs::findExe( const TQString& appname,
     TQFileInfo info;
 
     // absolute or relative path given
-    if (real_appname.tqfind(TQDir::separator()) >= 0)
+    if (real_appname.find(TQDir::separator()) >= 0)
     {
         info.setFile( real_appname );
         if( info.exists() && ( ignore || info.isExecutable() )
@@ -969,7 +969,7 @@ TQString KStandardDirs::findExe( const TQString& appname,
     return TQString::null;
 }
 
-int KStandardDirs::tqfindAllExe( TQStringList& list, const TQString& appname,
+int KStandardDirs::findAllExe( TQStringList& list, const TQString& appname,
 			const TQString& pstr, bool ignore )
 {
 #ifdef Q_WS_WIN
@@ -1006,7 +1006,7 @@ static int tokenize( TQStringList& tokens, const TQString& str,
 
     for( int index = 0; index < len; index++)
     {
-	if ( delim.tqfind( str[ index ] ) >= 0 )
+	if ( delim.find( str[ index ] ) >= 0 )
 	{
 	    tokens.append( token );
 	    token = "";
@@ -1093,17 +1093,17 @@ TQString KStandardDirs::saveLocation(const char *type,
 {
     checkConfig();
 
-    TQString *pPath = savelocations.tqfind(type);
+    TQString *pPath = savelocations.find(type);
     if (!pPath)
     {
-       TQStringList *dirs = relatives.tqfind(type);
+       TQStringList *dirs = relatives.find(type);
        if (!dirs && (
                      (strcmp(type, "socket") == 0) ||
                      (strcmp(type, "tmp") == 0) ||
                      (strcmp(type, "cache") == 0) ))
        {
           (void) resourceDirs(type); // Generate socket|tmp|cache resource.
-          dirs = relatives.tqfind(type); // Search again.
+          dirs = relatives.find(type); // Search again.
        }
        if (dirs)
        {
@@ -1116,7 +1116,7 @@ TQString KStandardDirs::saveLocation(const char *type,
              pPath = new TQString(realPath(localkdedir() + dirs->last()));
        }
        else {
-          dirs = absolutes.tqfind(type);
+          dirs = absolutes.find(type);
           if (!dirs)
              qFatal("KStandardDirs: The resource type %s is not registered", type);
           pPath = new TQString(realPath(dirs->last()));
@@ -1147,7 +1147,7 @@ TQString KStandardDirs::saveLocation(const char *type,
 TQString KStandardDirs::relativeLocation(const char *type, const TQString &absPath)
 {
     TQString fullPath = absPath;
-    int i = absPath.tqfindRev('/');
+    int i = absPath.findRev('/');
     if (i != -1)
     {
        fullPath = realPath(absPath.left(i+1))+absPath.mid(i+1); // Normalize
@@ -1185,7 +1185,7 @@ bool KStandardDirs::makeDir(const TQString& dir, int mode)
     while( i < len )
     {
         KDE_struct_stat st;
-        int pos = target.tqfind(QChar('/'), i);
+        int pos = target.find(QChar('/'), i);
         base += target.mid(i - 1, pos - i + 1);
         TQCString baseEncoded = TQFile::encodeName(base);
         // bail out if we encountered a problem
@@ -1236,10 +1236,10 @@ static TQString executablePrefix()
    if(path.isEmpty())
       return TQString::null;
 
-   int pos = path.tqfindRev('/'); // Skip filename
+   int pos = path.findRev('/'); // Skip filename
    if(pos <= 0)
       return TQString::null;
-   pos = path.tqfindRev(QChar('/'), pos - 1); // Skip last directory
+   pos = path.findRev(QChar('/'), pos - 1); // Skip last directory
    if(pos <= 0)
       return TQString::null;
 
@@ -1256,7 +1256,7 @@ TQString KStandardDirs::kfsstnd_defaultprefix()
    s->defaultprefix = readEnvPath("KDEDIR");
    if (s->defaultprefix.isEmpty()) {
       s->defaultprefix = TQFile::decodeName("c:\\kde");
-      //TODO: tqfind other location (the Registry?)
+      //TODO: find other location (the Registry?)
    }
 #else //UNIX
    s->defaultprefix = KDEDIR;
@@ -1272,11 +1272,11 @@ TQString KStandardDirs::kfsstnd_defaultbindir()
    if (!s->defaultbindir.isEmpty())
       return s->defaultbindir;
 #ifdef Q_WS_WIN
-   s->defaultbindir = kfsstnd_defaultprefix() + TQString::tqfromLatin1("/bin");
+   s->defaultbindir = kfsstnd_defaultprefix() + TQString::fromLatin1("/bin");
 #else //UNIX
    s->defaultbindir = __KDE_BINDIR;
    if (s->defaultbindir.isEmpty())
-      s->defaultbindir = kfsstnd_defaultprefix() + TQString::tqfromLatin1("/bin");
+      s->defaultbindir = kfsstnd_defaultprefix() + TQString::fromLatin1("/bin");
 #endif
    if (s->defaultbindir.isEmpty())
       kdWarning() << "KStandardDirs::kfsstnd_defaultbindir(): default binary KDE dir not found!" << endl;
@@ -1543,13 +1543,13 @@ bool KStandardDirs::addCustomized(KConfig *config)
         addedCustoms = true;
 
         // reading the prefixes in
-        TQString group = TQString::tqfromLatin1("Directories");
+        TQString group = TQString::fromLatin1("Directories");
         config->setGroup(group);
 
         TQString kioskAdmin = config->readEntry("kioskAdmin");
         if (!kioskAdmin.isEmpty() && !kde_kiosk_admin)
         {
-            int i = kioskAdmin.tqfind(':');
+            int i = kioskAdmin.find(':');
             TQString user = kioskAdmin.left(i);
             TQString host = kioskAdmin.mid(i+1);
 
@@ -1603,7 +1603,7 @@ bool KStandardDirs::addCustomized(KConfig *config)
             }
 
             // iterating over all entries in the group Directories
-            // to tqfind entries that start with dir_$type
+            // to find entries that start with dir_$type
             TQMap<TQString, TQString> entries = config->entryMap(group);
             for (TQMap<TQString, TQString>::ConstIterator it2 = entries.begin();
                  it2 != entries.end(); it2++)
@@ -1623,7 +1623,7 @@ bool KStandardDirs::addCustomized(KConfig *config)
             if (profiles.isEmpty())
                 break;
             profile = profiles.back();
-            group = TQString::tqfromLatin1("Directories-%1").arg(profile);
+            group = TQString::fromLatin1("Directories-%1").arg(profile);
             profiles.pop_back();
             priority = true;
         }
@@ -1692,9 +1692,9 @@ TQString locateLocal( const char *type,
 TQString locateLocal( const char *type,
 	             const TQString& filename, bool createDir, const KInstance* inst )
 {
-    // try to tqfind slashes. If there are some, we have to
+    // try to find slashes. If there are some, we have to
     // create the subdir first
-    int slash = filename.tqfindRev('/')+1;
+    int slash = filename.findRev('/')+1;
     if (!slash) // only one filename
 	return inst->dirs()->saveLocation(type, TQString::null, createDir) + filename;
 
diff --git a/kdecore/kstandarddirs.h b/kdecore/kstandarddirs.h
index 25a6cf231..ded472d1d 100644
--- a/kdecore/kstandarddirs.h
+++ b/kdecore/kstandarddirs.h
@@ -61,7 +61,7 @@ class KStandardDirsPrivate;
  * So the search algorithm basically appends to each prefix each registered
  * suffix and tries to locate the file there.
  * To make the thing even more complex, it's also possible to register
- * absolute paths that KStandardDirs looks up after not tqfinding anything
+ * absolute paths that KStandardDirs looks up after not finding anything
  * in the former steps. They can be useful if the user wants to provide
  * specific directories that aren't in his $HOME/.kde directory for,
  * for example, icons.
@@ -205,7 +205,7 @@ public:
 			     const TQString& absdir);
 
 	/**
-	 * Tries to tqfind a resource in the following order:
+	 * Tries to find a resource in the following order:
 	 * @li All PREFIX/\<relativename> paths (most recent first).
 	 * @li All absolute paths (most recent first).
 	 *
@@ -214,7 +214,7 @@ public:
 	 * to findResource("lib", "libkdecore.la"). KStandardDirs will
 	 * then look into the subdir lib of all elements of all prefixes
 	 * ($KDEDIRS) for a file libkdecore.la and return the path to
-	 * the first one it tqfinds (e.g. /opt/kde/lib/libkdecore.la)
+	 * the first one it finds (e.g. /opt/kde/lib/libkdecore.la)
 	 *
 	 * @param type The type of the wanted resource
 	 * @param filename A relative filename of the resource.
@@ -255,11 +255,11 @@ public:
 	 * @return A number identifying the current version of the
 	 *          resource.
 	 */
-	TQ_UINT32 calcResourceHash( const char *type,
+	Q_UINT32 calcResourceHash( const char *type,
 			      const TQString& filename, bool deep) const;
 
 	/**
-	 * Tries to tqfind all directories whose names consist of the
+	 * Tries to find all directories whose names consist of the
 	 * specified type and a relative path. So would
 	 * findDirs("apps", "Settings") return
 	 * @li /opt/kde/share/applnk/Settings/
@@ -278,7 +278,7 @@ public:
                               const TQString& reldir ) const;
 
 	/**
-	 * Tries to tqfind the directory the file is in.
+	 * Tries to find the directory the file is in.
 	 * It works the same as findResource(), but it doesn't
 	 * return the filename but the name of the directory.
 	 *
@@ -302,7 +302,7 @@ public:
 
 
 	/**
-	 * Tries to tqfind all resources with the specified type.
+	 * Tries to find all resources with the specified type.
 	 *
 	 * The function will look into all specified directories
 	 * and return all filenames in these directories.
@@ -326,7 +326,7 @@ public:
 				       bool unique = false) const;
 
 	/**
-	 * Tries to tqfind all resources with the specified type.
+	 * Tries to find all resources with the specified type.
 	 *
 	 * The function will look into all specified directories
 	 * and return all filenames (full and relative paths) in
@@ -379,7 +379,7 @@ public:
 	 *
 	 * @return The path of the executable. If it was not found,
 	 *         it will return TQString::null.
-	 * @see tqfindAllExe()
+	 * @see findAllExe()
 	 */
 	static TQString findExe( const TQString& appname,
 				const TQString& pathstr=TQString::null,
@@ -403,7 +403,7 @@ public:
 	 *
 	 * @see	findExe()
 	 */
-	static int tqfindAllExe( TQStringList& list, const TQString& appname,
+	static int findAllExe( TQStringList& list, const TQString& appname,
 			       const TQString& pathstr=TQString::null,
 			       bool ignoreExecBit=false );
 
@@ -483,7 +483,7 @@ public:
          * @param absPath An absolute path to make relative.
          *
          * @return A relative path relative to resource @p type that
-         * will tqfind @p absPath. If no such relative path exists, absPath
+         * will find @p absPath. If no such relative path exists, absPath
          * will be returned unchanged.
          */
          TQString relativeLocation(const char *type, const TQString &absPath);
diff --git a/kdecore/kstartupinfo.cpp b/kdecore/kstartupinfo.cpp
index c8e47db65..673e5e6ab 100644
--- a/kdecore/kstartupinfo.cpp
+++ b/kdecore/kstartupinfo.cpp
@@ -94,9 +94,9 @@ struct KStartupInfoPrivate
     {
     public:
         TQMap< KStartupInfoId, KStartupInfo::Data > startups;
-	// tqcontains silenced ASN's only if !AnnounceSilencedChanges
+	// contains silenced ASN's only if !AnnounceSilencedChanges
         TQMap< KStartupInfoId, KStartupInfo::Data > silent_startups;
-        // tqcontains ASN's that had change: but no new: yet
+        // contains ASN's that had change: but no new: yet
         TQMap< KStartupInfoId, KStartupInfo::Data > uninited_startups;
 #ifdef Q_WS_X11
         KWinModule* wm_module;
@@ -234,7 +234,7 @@ void KStartupInfo::new_startup_info_internal( const KStartupInfoId& id_P,
         return;
     if( id_P.none())
         return;
-    if( d->startups.tqcontains( id_P ))
+    if( d->startups.contains( id_P ))
         { // already reported, update
         d->startups[ id_P ].update( data_P );
         d->startups[ id_P ].age = 0; // CHECKME
@@ -250,7 +250,7 @@ void KStartupInfo::new_startup_info_internal( const KStartupInfoId& id_P,
         emit gotStartupChange( id_P, d->startups[ id_P ] );
         return;
         }
-    if( d->silent_startups.tqcontains( id_P ))
+    if( d->silent_startups.contains( id_P ))
         { // already reported, update
         d->silent_startups[ id_P ].update( data_P );
         d->silent_startups[ id_P ].age = 0; // CHECKME
@@ -265,7 +265,7 @@ void KStartupInfo::new_startup_info_internal( const KStartupInfoId& id_P,
         emit gotStartupChange( id_P, d->silent_startups[ id_P ] );
         return;
         }
-    if( d->uninited_startups.tqcontains( id_P ))
+    if( d->uninited_startups.contains( id_P ))
         {
         d->uninited_startups[ id_P ].update( data_P );
         kdDebug( 172 ) << "updating uninited" << endl;
@@ -317,18 +317,18 @@ void KStartupInfo::remove_startup_info_internal( const KStartupInfoId& id_P )
     {
     if( d == NULL )
         return;
-    if( d->startups.tqcontains( id_P ))
+    if( d->startups.contains( id_P ))
         {
 	kdDebug( 172 ) << "removing" << endl;
 	emit gotRemoveStartup( id_P, d->startups[ id_P ]);
 	d->startups.remove( id_P );
 	}
-    else if( d->silent_startups.tqcontains( id_P ))
+    else if( d->silent_startups.contains( id_P ))
 	{
 	kdDebug( 172 ) << "removing silent" << endl;
 	d->silent_startups.remove( id_P );
 	}
-    else if( d->uninited_startups.tqcontains( id_P ))
+    else if( d->uninited_startups.contains( id_P ))
 	{
 	kdDebug( 172 ) << "removing uninited" << endl;
 	d->uninited_startups.remove( id_P );
@@ -337,7 +337,7 @@ void KStartupInfo::remove_startup_info_internal( const KStartupInfoId& id_P )
     }
 
 void KStartupInfo::remove_startup_pids( const KStartupInfoData& data_P )
-    { // first tqfind the matching info
+    { // first find the matching info
     if( d == NULL )
         return;
     for( TQMap< KStartupInfoId, Data >::Iterator it = d->startups.begin();
@@ -360,11 +360,11 @@ void KStartupInfo::remove_startup_pids( const KStartupInfoId& id_P,
         return;
     kdFatal( data_P.pids().count() == 0, 172 );
     Data* data = NULL;
-    if( d->startups.tqcontains( id_P ))
+    if( d->startups.contains( id_P ))
 	data = &d->startups[ id_P ];
-    else if( d->silent_startups.tqcontains( id_P ))
+    else if( d->silent_startups.contains( id_P ))
 	data = &d->silent_startups[ id_P ];
-    else if( d->uninited_startups.tqcontains( id_P ))
+    else if( d->uninited_startups.contains( id_P ))
         data = &d->uninited_startups[ id_P ];
     else
 	return;
@@ -381,7 +381,7 @@ bool KStartupInfo::sendStartup( const KStartupInfoId& id_P, const KStartupInfoDa
     if( id_P.none())
         return false;
     KXMessages msgs;
-    TQString msg = TQString::tqfromLatin1( "new: %1 %2" )
+    TQString msg = TQString::fromLatin1( "new: %1 %2" )
         .arg( id_P.to_text()).arg( data_P.to_text());
     msg = check_required_startup_fields( msg, data_P, qt_xscreen());
     kdDebug( 172 ) << "sending " << msg << endl;
@@ -394,7 +394,7 @@ bool KStartupInfo::sendStartupX( Display* disp_P, const KStartupInfoId& id_P,
     {
     if( id_P.none())
         return false;
-    TQString msg = TQString::tqfromLatin1( "new: %1 %2" )
+    TQString msg = TQString::fromLatin1( "new: %1 %2" )
         .arg( id_P.to_text()).arg( data_P.to_text());
     msg = check_required_startup_fields( msg, data_P, DefaultScreen( disp_P ));
 #ifdef KSTARTUPINFO_ALL_DEBUG
@@ -425,7 +425,7 @@ bool KStartupInfo::sendChange( const KStartupInfoId& id_P, const KStartupInfoDat
     if( id_P.none())
         return false;
     KXMessages msgs;
-    TQString msg = TQString::tqfromLatin1( "change: %1 %2" )
+    TQString msg = TQString::fromLatin1( "change: %1 %2" )
         .arg( id_P.to_text()).arg( data_P.to_text());
     kdDebug( 172 ) << "sending " << msg << endl;
     msgs.broadcastMessage( NET_STARTUP_MSG, msg, -1, false );
@@ -437,7 +437,7 @@ bool KStartupInfo::sendChangeX( Display* disp_P, const KStartupInfoId& id_P,
     {
     if( id_P.none())
         return false;
-    TQString msg = TQString::tqfromLatin1( "change: %1 %2" )
+    TQString msg = TQString::fromLatin1( "change: %1 %2" )
         .arg( id_P.to_text()).arg( data_P.to_text());
 #ifdef KSTARTUPINFO_ALL_DEBUG
     kdDebug( 172 ) << "sending " << msg << endl;
@@ -450,7 +450,7 @@ bool KStartupInfo::sendFinish( const KStartupInfoId& id_P )
     if( id_P.none())
         return false;
     KXMessages msgs;
-    TQString msg = TQString::tqfromLatin1( "remove: %1" ).arg( id_P.to_text());
+    TQString msg = TQString::fromLatin1( "remove: %1" ).arg( id_P.to_text());
     kdDebug( 172 ) << "sending " << msg << endl;
     msgs.broadcastMessage( NET_STARTUP_MSG, msg, -1, false );
     return true;
@@ -460,7 +460,7 @@ bool KStartupInfo::sendFinishX( Display* disp_P, const KStartupInfoId& id_P )
     {
     if( id_P.none())
         return false;
-    TQString msg = TQString::tqfromLatin1( "remove: %1" ).arg( id_P.to_text());
+    TQString msg = TQString::fromLatin1( "remove: %1" ).arg( id_P.to_text());
 #ifdef KSTARTUPINFO_ALL_DEBUG
     kdDebug( 172 ) << "sending " << msg << endl;
 #endif
@@ -472,7 +472,7 @@ bool KStartupInfo::sendFinish( const KStartupInfoId& id_P, const KStartupInfoDat
 //    if( id_P.none()) // id may be none, the pids and hostname matter then
 //        return false;
     KXMessages msgs;
-    TQString msg = TQString::tqfromLatin1( "remove: %1 %2" )
+    TQString msg = TQString::fromLatin1( "remove: %1 %2" )
         .arg( id_P.to_text()).arg( data_P.to_text());
     kdDebug( 172 ) << "sending " << msg << endl;
     msgs.broadcastMessage( NET_STARTUP_MSG, msg, -1, false );
@@ -484,7 +484,7 @@ bool KStartupInfo::sendFinishX( Display* disp_P, const KStartupInfoId& id_P,
     {
 //    if( id_P.none()) // id may be none, the pids and hostname matter then
 //        return false;
-    TQString msg = TQString::tqfromLatin1( "remove: %1 %2" )
+    TQString msg = TQString::fromLatin1( "remove: %1 %2" )
         .arg( id_P.to_text()).arg( data_P.to_text());
 #ifdef KSTARTUPINFO_ALL_DEBUG
     kdDebug( 172 ) << "sending " << msg << endl;
@@ -615,7 +615,7 @@ KStartupInfo::startup_t KStartupInfo::check_startup_internal( WId w_P, KStartupI
             kdDebug( 172 ) << "ignore" << endl;
             return NoMatch;
             }
-        return tqfind_id( id, id_O, data_O ) ? Match : NoMatch;
+        return find_id( id, id_O, data_O ) ? Match : NoMatch;
         }
 #ifdef Q_WS_X11
     NETWinInfo info( qt_xdisplay(),  w_P, qt_xrootwin(),
@@ -625,7 +625,7 @@ KStartupInfo::startup_t KStartupInfo::check_startup_internal( WId w_P, KStartupI
         {
         TQCString hostname = get_window_hostname( w_P );
         if( !hostname.isEmpty()
-            && tqfind_pid( pid, hostname, id_O, data_O ))
+            && find_pid( pid, hostname, id_O, data_O ))
             return Match;
         // try XClass matching , this PID stuff sucks :(
         }
@@ -636,7 +636,7 @@ KStartupInfo::startup_t KStartupInfo::check_startup_internal( WId w_P, KStartupI
         TQCString res_class = hint.res_class;
         XFree( hint.res_name );
         XFree( hint.res_class );
-        if( tqfind_wclass( res_name, res_class, id_O, data_O ))
+        if( find_wclass( res_name, res_class, id_O, data_O ))
             return Match;
         }
     // ignore NET::Tool and other special window types, if they can't be matched
@@ -661,15 +661,15 @@ KStartupInfo::startup_t KStartupInfo::check_startup_internal( WId w_P, KStartupI
     return CantDetect;
     }
 
-bool KStartupInfo::tqfind_id( const TQCString& id_P, KStartupInfoId* id_O,
+bool KStartupInfo::find_id( const TQCString& id_P, KStartupInfoId* id_O,
     KStartupInfoData* data_O )
     {
     if( d == NULL )
         return false;
-    kdDebug( 172 ) << "tqfind_id:" << id_P << endl;
+    kdDebug( 172 ) << "find_id:" << id_P << endl;
     KStartupInfoId id;
     id.initId( id_P );
-    if( d->startups.tqcontains( id ))
+    if( d->startups.contains( id ))
         {
         if( id_O != NULL )
             *id_O = id;
@@ -681,12 +681,12 @@ bool KStartupInfo::tqfind_id( const TQCString& id_P, KStartupInfoId* id_O,
     return false;
     }
 
-bool KStartupInfo::tqfind_pid( pid_t pid_P, const TQCString& hostname_P,
+bool KStartupInfo::find_pid( pid_t pid_P, const TQCString& hostname_P,
     KStartupInfoId* id_O, KStartupInfoData* data_O )
     {
     if( d == NULL )
         return false;
-    kdDebug( 172 ) << "tqfind_pid:" << pid_P << endl;
+    kdDebug( 172 ) << "find_pid:" << pid_P << endl;
     for( TQMap< KStartupInfoId, Data >::Iterator it = d->startups.begin();
          it != d->startups.end();
          ++it )
@@ -706,19 +706,19 @@ bool KStartupInfo::tqfind_pid( pid_t pid_P, const TQCString& hostname_P,
     return false;
     }
 
-bool KStartupInfo::tqfind_wclass( TQCString res_name, TQCString res_class,
+bool KStartupInfo::find_wclass( TQCString res_name, TQCString res_class,
     KStartupInfoId* id_O, KStartupInfoData* data_O )
     {
     if( d == NULL )
         return false;
     res_name = res_name.lower();
     res_class = res_class.lower();
-    kdDebug( 172 ) << "tqfind_wclass:" << res_name << ":" << res_class << endl;
+    kdDebug( 172 ) << "find_wclass:" << res_name << ":" << res_class << endl;
     for( TQMap< KStartupInfoId, Data >::Iterator it = d->startups.begin();
          it != d->startups.end();
          ++it )
         {
-        const TQCString wmclass = ( *it ).tqfindWMClass();
+        const TQCString wmclass = ( *it ).findWMClass();
         if( wmclass.lower() == res_name || wmclass.lower() == res_class )
             { // Found it !
             if( id_O != NULL )
@@ -941,7 +941,7 @@ TQCString KStartupInfo::createNewStartupId()
 #endif
     TQCString id = TQString( "%1;%2;%3;%4_TIME%5" ).arg( hostname ).arg( tm.tv_sec )
         .arg( tm.tv_usec ).arg( getpid()).arg( qt_x_user_time ).utf8();
-    kdDebug( 172 ) << "creating: " << id << ":" << tqAppName() << endl;
+    kdDebug( 172 ) << "creating: " << id << ":" << qAppName() << endl;
     return id;
     }
 
@@ -960,14 +960,14 @@ const TQCString& KStartupInfoId::id() const
 
 TQString KStartupInfoId::to_text() const
     {
-    return TQString::tqfromLatin1( " ID=\"%1\" " ).arg( escape_str( id()));
+    return TQString::fromLatin1( " ID=\"%1\" " ).arg( escape_str( id()));
     }
 
 KStartupInfoId::KStartupInfoId( const TQString& txt_P )
     {
     d = new KStartupInfoIdPrivate;
     TQStringList items = get_fields( txt_P );
-    const TQString id_str = TQString::tqfromLatin1( "ID=" );
+    const TQString id_str = TQString::fromLatin1( "ID=" );
     for( TQStringList::Iterator it = items.begin();
          it != items.end();
          ++it )
@@ -1074,7 +1074,7 @@ unsigned long KStartupInfoId::timestamp() const
     {
     if( none())
         return 0;
-    int pos = d->id.tqfindRev( "_TIME" );
+    int pos = d->id.findRev( "_TIME" );
     if( pos >= 0 )
         {
         bool ok;
@@ -1088,10 +1088,10 @@ unsigned long KStartupInfoId::timestamp() const
     // snprintf (s, len, "%s/%s/%lu/%d-%d-%s",
     //   canonicalized_launcher, canonicalized_launchee, (unsigned long) timestamp,
     //  (int) getpid (), (int) sequence_number, hostbuf);
-    int pos1 = d->id.tqfindRev( '/' );
+    int pos1 = d->id.findRev( '/' );
     if( pos1 > 0 )
         {
-        int pos2 = d->id.tqfindRev( '/', pos1 - 1 );
+        int pos2 = d->id.findRev( '/', pos1 - 1 );
         if( pos2 >= 0 )
             {
             bool ok;
@@ -1129,34 +1129,34 @@ TQString KStartupInfoData::to_text() const
     {
     TQString ret = "";
     if( !d->bin.isEmpty())
-        ret += TQString::tqfromLatin1( " BIN=\"%1\"" ).arg( escape_str( d->bin ));
+        ret += TQString::fromLatin1( " BIN=\"%1\"" ).arg( escape_str( d->bin ));
     if( !d->name.isEmpty())
-        ret += TQString::tqfromLatin1( " NAME=\"%1\"" ).arg( escape_str( d->name ));
+        ret += TQString::fromLatin1( " NAME=\"%1\"" ).arg( escape_str( d->name ));
     if( !d->description.isEmpty())
-        ret += TQString::tqfromLatin1( " DESCRIPTION=\"%1\"" ).arg( escape_str( d->description ));
+        ret += TQString::fromLatin1( " DESCRIPTION=\"%1\"" ).arg( escape_str( d->description ));
     if( !d->icon.isEmpty())
-        ret += TQString::tqfromLatin1( " ICON=%1" ).arg( d->icon );
+        ret += TQString::fromLatin1( " ICON=%1" ).arg( d->icon );
     if( d->desktop != 0 )
-        ret += TQString::tqfromLatin1( " DESKTOP=%1" )
+        ret += TQString::fromLatin1( " DESKTOP=%1" )
             .arg( d->desktop == NET::OnAllDesktops ? NET::OnAllDesktops : d->desktop - 1 ); // spec counts from 0
     if( !d->wmclass.isEmpty())
-        ret += TQString::tqfromLatin1( " WMCLASS=\"%1\"" ).arg( QString(d->wmclass) );
+        ret += TQString::fromLatin1( " WMCLASS=\"%1\"" ).arg( QString(d->wmclass) );
     if( !d->hostname.isEmpty())
-        ret += TQString::tqfromLatin1( " HOSTNAME=%1" ).arg( QString(d->hostname) );
+        ret += TQString::fromLatin1( " HOSTNAME=%1" ).arg( QString(d->hostname) );
     for( TQValueList< pid_t >::ConstIterator it = d->pids.begin();
          it != d->pids.end();
          ++it )
-        ret += TQString::tqfromLatin1( " PID=%1" ).arg( *it );
+        ret += TQString::fromLatin1( " PID=%1" ).arg( *it );
     if( d->silent != Unknown )
-	ret += TQString::tqfromLatin1( " SILENT=%1" ).arg( d->silent == Yes ? 1 : 0 );
+	ret += TQString::fromLatin1( " SILENT=%1" ).arg( d->silent == Yes ? 1 : 0 );
     if( d->timestamp != -1U )
-        ret += TQString::tqfromLatin1( " TIMESTAMP=%1" ).arg( d->timestamp );
+        ret += TQString::fromLatin1( " TIMESTAMP=%1" ).arg( d->timestamp );
     if( d->screen != -1 )
-        ret += TQString::tqfromLatin1( " SCREEN=%1" ).arg( d->screen );
+        ret += TQString::fromLatin1( " SCREEN=%1" ).arg( d->screen );
     if( d->xinerama != -1 )
-        ret += TQString::tqfromLatin1( " XINERAMA=%1" ).arg( d->xinerama );
+        ret += TQString::fromLatin1( " XINERAMA=%1" ).arg( d->xinerama );
     if( d->launched_by != 0 )
-        ret += TQString::tqfromLatin1( " LAUNCHED_BY=%1" ).arg( d->launched_by );
+        ret += TQString::fromLatin1( " LAUNCHED_BY=%1" ).arg( d->launched_by );
     return ret;
     }
 
@@ -1164,19 +1164,19 @@ KStartupInfoData::KStartupInfoData( const TQString& txt_P )
     {
     d = new KStartupInfoDataPrivate;
     TQStringList items = get_fields( txt_P );
-    const TQString bin_str = TQString::tqfromLatin1( "BIN=" );
-    const TQString name_str = TQString::tqfromLatin1( "NAME=" );
-    const TQString description_str = TQString::tqfromLatin1( "DESCRIPTION=" );
-    const TQString icon_str = TQString::tqfromLatin1( "ICON=" );
-    const TQString desktop_str = TQString::tqfromLatin1( "DESKTOP=" );
-    const TQString wmclass_str = TQString::tqfromLatin1( "WMCLASS=" );
-    const TQString hostname_str = TQString::tqfromLatin1( "HOSTNAME=" ); // SELI nonstd
-    const TQString pid_str = TQString::tqfromLatin1( "PID=" );  // SELI nonstd
-    const TQString silent_str = TQString::tqfromLatin1( "SILENT=" );
-    const TQString timestamp_str = TQString::tqfromLatin1( "TIMESTAMP=" );
-    const TQString screen_str = TQString::tqfromLatin1( "SCREEN=" );
-    const TQString xinerama_str = TQString::tqfromLatin1( "XINERAMA=" );
-    const TQString launched_by_str = TQString::tqfromLatin1( "LAUNCHED_BY=" );
+    const TQString bin_str = TQString::fromLatin1( "BIN=" );
+    const TQString name_str = TQString::fromLatin1( "NAME=" );
+    const TQString description_str = TQString::fromLatin1( "DESCRIPTION=" );
+    const TQString icon_str = TQString::fromLatin1( "ICON=" );
+    const TQString desktop_str = TQString::fromLatin1( "DESKTOP=" );
+    const TQString wmclass_str = TQString::fromLatin1( "WMCLASS=" );
+    const TQString hostname_str = TQString::fromLatin1( "HOSTNAME=" ); // SELI nonstd
+    const TQString pid_str = TQString::fromLatin1( "PID=" );  // SELI nonstd
+    const TQString silent_str = TQString::fromLatin1( "SILENT=" );
+    const TQString timestamp_str = TQString::fromLatin1( "TIMESTAMP=" );
+    const TQString screen_str = TQString::fromLatin1( "SCREEN=" );
+    const TQString xinerama_str = TQString::fromLatin1( "XINERAMA=" );
+    const TQString launched_by_str = TQString::fromLatin1( "LAUNCHED_BY=" );
     for( TQStringList::Iterator it = items.begin();
          it != items.end();
          ++it )
@@ -1290,7 +1290,7 @@ const TQString& KStartupInfoData::name() const
     return d->name;
     }
 
-const TQString& KStartupInfoData::tqfindName() const
+const TQString& KStartupInfoData::findName() const
     {
     if( !name().isEmpty())
         return name();
@@ -1307,7 +1307,7 @@ const TQString& KStartupInfoData::description() const
     return d->description;
     }
 
-const TQString& KStartupInfoData::tqfindDescription() const
+const TQString& KStartupInfoData::findDescription() const
     {
     if( !description().isEmpty())
         return description();
@@ -1319,7 +1319,7 @@ void KStartupInfoData::setIcon( const TQString& icon_P )
     d->icon = icon_P;
     }
 
-const TQString& KStartupInfoData::tqfindIcon() const
+const TQString& KStartupInfoData::findIcon() const
     {
     if( !icon().isEmpty())
         return icon();
@@ -1346,7 +1346,7 @@ void KStartupInfoData::setWMClass( const TQCString& wmclass_P )
     d->wmclass = wmclass_P;
     }
 
-const TQCString KStartupInfoData::tqfindWMClass() const
+const TQCString KStartupInfoData::findWMClass() const
     {
     if( !WMClass().isEmpty() && WMClass() != "0" )
         return WMClass();
@@ -1379,7 +1379,7 @@ const TQCString& KStartupInfoData::hostname() const
 
 void KStartupInfoData::addPid( pid_t pid_P )
     {
-    if( !d->pids.tqcontains( pid_P ))
+    if( !d->pids.contains( pid_P ))
         d->pids.append( pid_P );
     }
 
@@ -1395,7 +1395,7 @@ const TQValueList< pid_t >& KStartupInfoData::pids() const
 
 bool KStartupInfoData::is_pid( pid_t pid_P ) const
     {
-    return d->pids.tqcontains( pid_P );
+    return d->pids.contains( pid_P );
     }
 
 void KStartupInfoData::setSilent( TriState state_P )
@@ -1451,24 +1451,24 @@ WId KStartupInfoData::launchedBy() const
 static
 long get_num( const TQString& item_P )
     {
-    unsigned int pos = item_P.tqfind( '=' );
+    unsigned int pos = item_P.find( '=' );
     return item_P.mid( pos + 1 ).toLong();
     }
 
 static
 unsigned long get_unum( const TQString& item_P )
     {
-    unsigned int pos = item_P.tqfind( '=' );
+    unsigned int pos = item_P.find( '=' );
     return item_P.mid( pos + 1 ).toULong();
     }
 
 static
 TQString get_str( const TQString& item_P )
     {
-    unsigned int pos = item_P.tqfind( '=' );
+    unsigned int pos = item_P.find( '=' );
     if( item_P.length() > pos + 2 && item_P[ pos + 1 ] == (QChar)'\"' )
         {
-        int pos2 = item_P.left( pos + 2 ).tqfind( '\"' );
+        int pos2 = item_P.left( pos + 2 ).find( '\"' );
         if( pos2 < 0 )
             return TQString::null;                      // 01234
         return item_P.mid( pos + 2, pos2 - 2 - pos );  // A="C"
diff --git a/kdecore/kstartupinfo.h b/kdecore/kstartupinfo.h
index 147d31893..e35bdba56 100644
--- a/kdecore/kstartupinfo.h
+++ b/kdecore/kstartupinfo.h
@@ -61,7 +61,7 @@ class KStartupInfoPrivate;
  * @author Lubos Lunak <l.lunak@kde.org>
  */
 class KDECORE_EXPORT KStartupInfo
-    : public TQObject
+    : public QObject
     {
     Q_OBJECT
     public:
@@ -358,11 +358,11 @@ class KDECORE_EXPORT KStartupInfo
         void remove_startup_pids( const KStartupInfoId& id, const KStartupInfoData& data );
         void remove_startup_pids( const KStartupInfoData& data );
         startup_t check_startup_internal( WId w, KStartupInfoId* id, KStartupInfoData* data );
-        bool tqfind_id( const TQCString& id_P, KStartupInfoId* id_O,
+        bool find_id( const TQCString& id_P, KStartupInfoId* id_O,
             KStartupInfoData* data_O );
-        bool tqfind_pid( pid_t pid_P, const TQCString& hostname, KStartupInfoId* id_O,
+        bool find_pid( pid_t pid_P, const TQCString& hostname, KStartupInfoId* id_O,
             KStartupInfoData* data_O );
-        bool tqfind_wclass( TQCString res_name_P, TQCString res_class_P,
+        bool find_wclass( TQCString res_name_P, TQCString res_class_P,
             KStartupInfoId* id_O, KStartupInfoData* data_O );
         static TQCString get_window_hostname( WId w_P );
         void startups_cleanup_internal( bool age_P );
@@ -482,7 +482,7 @@ class KDECORE_EXPORT KStartupInfoData
          * it tries to use other information (binary name).
 	 * @return the name of the startup notification
 	 */
-        const TQString& tqfindName() const;
+        const TQString& findName() const;
 	/**
 	 * Returns the name of the startup notification, or empty if not available.
 	 * @return the name of the startup notification, or an empty string
@@ -502,7 +502,7 @@ class KDECORE_EXPORT KStartupInfoData
 	 * @return the description of the startup notification
          * @since 3.2
 	 */
-        const TQString& tqfindDescription() const;
+        const TQString& findDescription() const;
 	/**
 	 * Returns the name of the startup notification, or empty if not available.
 	 * @return the name of the startup notificaiton, or an empty string
@@ -521,7 +521,7 @@ class KDECORE_EXPORT KStartupInfoData
 	 * @return the name of the startup notification's icon, or the name of
 	 *         the binary if not set
 	 */
-        const TQString& tqfindIcon() const;
+        const TQString& findIcon() const;
 	/**
 	 * Returns the icon of the startup notification, or empty if not available.
 	 * @return the name of the icon, or an empty string if not set.
@@ -551,7 +551,7 @@ class KDECORE_EXPORT KStartupInfoData
 	 * @return the WM_CLASS value for the startup notification, or the binary name
 	 *         if not set
 	 */
-        const TQCString tqfindWMClass() const;
+        const TQCString findWMClass() const;
 	/**
 	 * Returns the WM_CLASS value for the startup notification, or empty if not available.
 	 * @return the WM_CLASS value for the startup notification, or empty
diff --git a/kdecore/kstdaccel.cpp b/kdecore/kstdaccel.cpp
index aa139bf99..8e1819735 100644
--- a/kdecore/kstdaccel.cpp
+++ b/kdecore/kstdaccel.cpp
@@ -191,7 +191,7 @@ StdAccel findStdAccel( const KKeySequence& seq )
 			if( id != AccelNone ) {
 				if( !g_infoStdAccel[i].bInitialized )
 					initialize( id );
-				if( g_infoStdAccel[i].cut.tqcontains( seq ) )
+				if( g_infoStdAccel[i].cut.contains( seq ) )
 					return id;
 			}
 		}
@@ -281,10 +281,10 @@ const KShortcut& deleteWordBack()        { return shortcut( DeleteWordBack ); }
 const KShortcut& deleteWordForward()     { return shortcut( DeleteWordForward ); }
 const KShortcut& undo()                  { return shortcut( Undo ); }
 const KShortcut& redo()                  { return shortcut( Redo ); }
-const KShortcut& tqfind()                  { return shortcut( Find ); }
-const KShortcut& tqfindNext()              { return shortcut( FindNext ); }
-const KShortcut& tqfindPrev()              { return shortcut( FindPrev ); }
-const KShortcut& tqreplace()               { return shortcut( Replace ); }
+const KShortcut& find()                  { return shortcut( Find ); }
+const KShortcut& findNext()              { return shortcut( FindNext ); }
+const KShortcut& findPrev()              { return shortcut( FindPrev ); }
+const KShortcut& replace()               { return shortcut( Replace ); }
 const KShortcut& home()                  { return shortcut( Home ); }
 const KShortcut& end()                   { return shortcut( End ); }
 const KShortcut& beginningOfLine()       { return shortcut( BeginningOfLine ); }
diff --git a/kdecore/kstdaccel.h b/kdecore/kstdaccel.h
index 008f71227..9f379b210 100644
--- a/kdecore/kstdaccel.h
+++ b/kdecore/kstdaccel.h
@@ -237,25 +237,25 @@ namespace KStdAccel
    * Find, search. Default: Ctrl-f
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& tqfind();
+  KDECORE_EXPORT const KShortcut& find();
 
   /**
    * Find/search next. Default: F3
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& tqfindNext();
+  KDECORE_EXPORT const KShortcut& findNext();
 
   /**
    * Find/search previous. Default: Shift-F3
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& tqfindPrev();
+  KDECORE_EXPORT const KShortcut& findPrev();
 
   /**
-   * Find and tqreplace matches. Default: Ctrl-r
+   * Find and replace matches. Default: Ctrl-r
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& tqreplace();
+  KDECORE_EXPORT const KShortcut& replace();
 
   /**
    * Zoom in. Default: Ctrl-Plus
diff --git a/kdecore/kstringhandler.cpp b/kdecore/kstringhandler.cpp
index 9b668f4ba..8b5ca1a7d 100644
--- a/kdecore/kstringhandler.cpp
+++ b/kdecore/kstringhandler.cpp
@@ -22,7 +22,7 @@
 
 static void parsePythonRange( const TQCString &range, uint &start, uint &end )
 {
-    const int colon = range.tqfind( ':' );
+    const int colon = range.find( ':' );
     if ( colon == -1 ) {
         start = range.toUInt();
         end = start;
@@ -178,7 +178,7 @@ TQString KStringHandler::remword( const TQString &text , const TQString &word )
     // Split words and add into list
     TQStringList list = TQStringList::split( " ", text, true );
 
-    TQStringList::Iterator it = list.tqfind(word);
+    TQStringList::Iterator it = list.find(word);
 
     if (it != list.end())
        list.remove( it );
@@ -200,7 +200,7 @@ TQString KStringHandler::capwords( const TQString &text )
     const TQStringList words = capwords( TQStringList::split( ' ', strippedText ) );
 
     TQString result = text;
-    result.tqreplace( strippedText, words.join( " " ) );
+    result.replace( strippedText, words.join( " " ) );
     return result;
 }
 
@@ -422,11 +422,11 @@ bool KStringHandler::matchFileName( const TQString& filename, const TQString& pa
    if ( pattern[ pattern_len - 1 ] == (QChar)'*' && len + 1 >= pattern_len ) {
       if ( pattern[ 0 ] == (QChar)'*' )
       {
-         return filename.tqfind(pattern.mid(1, pattern_len - 2)) != -1;
+         return filename.find(pattern.mid(1, pattern_len - 2)) != -1;
       }
 
-      const TQChar *c1 = pattern.tqunicode();
-      const TQChar *c2 = filename.tqunicode();
+      const TQChar *c1 = pattern.unicode();
+      const TQChar *c2 = filename.unicode();
       int cnt = 1;
       while ( cnt < pattern_len && *c1++ == *c2++ )
          ++cnt;
@@ -436,8 +436,8 @@ bool KStringHandler::matchFileName( const TQString& filename, const TQString& pa
    // Patterns like "*~", "*.extension"
    if ( pattern[ 0 ] == (QChar)'*' && len + 1 >= pattern_len )
    {
-     const TQChar *c1 = pattern.tqunicode() + pattern_len - 1;
-     const TQChar *c2 = filename.tqunicode() + len - 1;
+     const TQChar *c1 = pattern.unicode() + pattern_len - 1;
+     const TQChar *c2 = filename.unicode() + len - 1;
      int cnt = 1;
      while ( cnt < pattern_len && *c1-- == *c2-- )
         ++cnt;
@@ -457,7 +457,7 @@ KStringHandler::perlSplit(const TQString & sep, const TQString & s, uint max)
 
   int searchStart = 0;
 
-  int tokenStart = s.tqfind(sep, searchStart);
+  int tokenStart = s.find(sep, searchStart);
 
   while (-1 != tokenStart && (ignoreMax || l.count() < max - 1))
   {
@@ -465,7 +465,7 @@ KStringHandler::perlSplit(const TQString & sep, const TQString & s, uint max)
       l << s.mid(searchStart, tokenStart - searchStart);
 
     searchStart = tokenStart + sep.length();
-    tokenStart = s.tqfind(sep, searchStart);
+    tokenStart = s.find(sep, searchStart);
   }
 
   if (!s.mid(searchStart, s.length() - searchStart).isEmpty())
@@ -483,7 +483,7 @@ KStringHandler::perlSplit(const TQChar & sep, const TQString & s, uint max)
 
   int searchStart = 0;
 
-  int tokenStart = s.tqfind(sep, searchStart);
+  int tokenStart = s.find(sep, searchStart);
 
   while (-1 != tokenStart && (ignoreMax || l.count() < max - 1))
   {
@@ -491,7 +491,7 @@ KStringHandler::perlSplit(const TQChar & sep, const TQString & s, uint max)
       l << s.mid(searchStart, tokenStart - searchStart);
 
     searchStart = tokenStart + 1;
-    tokenStart = s.tqfind(sep, searchStart);
+    tokenStart = s.find(sep, searchStart);
   }
 
   if (!s.mid(searchStart, s.length() - searchStart).isEmpty())
@@ -545,7 +545,7 @@ KStringHandler::tagURLs( const TQString& text )
         }
         // Don't use TQString::arg since %01, %20, etc could be in the string
         TQString anchor = "<a href=\"" + href + "\">" + href + "</a>";
-        richText.tqreplace( urlPos, urlLen, anchor );
+        richText.replace( urlPos, urlLen, anchor );
 
 
         urlPos += anchor.length();
@@ -556,10 +556,10 @@ KStringHandler::tagURLs( const TQString& text )
 TQString KStringHandler::obscure( const TQString &str )
 {
   TQString result;
-  const TQChar *tqunicode = str.tqunicode();
+  const TQChar *unicode = str.unicode();
   for ( uint i = 0; i < str.length(); ++i )
-    result += ( tqunicode[ i ].tqunicode() < 0x21 ) ? tqunicode[ i ] :
-        TQChar( 0x1001F - tqunicode[ i ].tqunicode() );
+    result += ( unicode[ i ].unicode() < 0x21 ) ? unicode[ i ] :
+        TQChar( 0x1001F - unicode[ i ].unicode() );
 
   return result;
 }
diff --git a/kdecore/kstringhandler.h b/kdecore/kstringhandler.h
index 2986e8799..47075a066 100644
--- a/kdecore/kstringhandler.h
+++ b/kdecore/kstringhandler.h
@@ -26,7 +26,7 @@
 #include "kdelibs_export.h"
 
 /**
- * This class tqcontains utility functions for handling strings.
+ * This class contains utility functions for handling strings.
  *
  * This class is @em not a substitute for the TQString class. What
  * I tried to do with this class is provide an easy way to
@@ -45,7 +45,7 @@
  * a string. These ranges function, for the large part, as they would in
  * python. See the word(const TQString&, const char *) and remword(const TQString&, uint) functions for more detail.
  *
- * This class tqcontains no data members of its own. All strings are cut
+ * This class contains no data members of its own. All strings are cut
  * on the fly and returned as new qstrings/qstringlists.
  *
  * Quick example on how to use:
@@ -331,7 +331,7 @@ public:
      * Example:
      * \code
      * perlSplit("__", "some__string__for__you__here", 4)
-     * TQStringList tqcontains: "some", "string", "for", "you__here"
+     * TQStringList contains: "some", "string", "for", "you__here"
      * \endcode
      *
      * @param sep is the string to use to delimit s.
@@ -351,7 +351,7 @@ public:
      * Example:
      * \code
      * perlSplit(' ', "kparts reaches the parts other parts can't", 3)
-     * TQStringList tqcontains: "kparts", "reaches", "the parts other parts can't"
+     * TQStringList contains: "kparts", "reaches", "the parts other parts can't"
      * \endcode
      *
      * @param sep is the character to use to delimit s.
@@ -371,7 +371,7 @@ public:
      * Example:
      * \code
      * perlSplit(TQRegExp("[! ]", "Split me up ! I'm bored ! OK ?", 3)
-     * TQStringList tqcontains: "Split", "me", "up ! I'm bored, OK ?"
+     * TQStringList contains: "Split", "me", "up ! I'm bored, OK ?"
      * \endcode
      *
      * @param sep is the regular expression to use to delimit s.
diff --git a/kdecore/ksycoca.cpp b/kdecore/ksycoca.cpp
index 2977d609d..fd4d9aa95 100644
--- a/kdecore/ksycoca.cpp
+++ b/kdecore/ksycoca.cpp
@@ -76,7 +76,7 @@ public:
     TQString language;
     bool readError;
     bool autoRebuild;
-    TQ_UINT32 updateSig;
+    Q_UINT32 updateSig;
     TQStringList allResourceDirs;
 };
 
@@ -179,8 +179,8 @@ bool KSycoca::openDatabase( bool openDummyIfNotFound )
         TQBuffer *buffer = new TQBuffer( TQByteArray() );
         buffer->open(IO_ReadWrite);
         m_str = new TQDataStream( buffer);
-        (*m_str) << (TQ_INT32) KSYCOCA_VERSION;
-        (*m_str) << (TQ_INT32) 0;
+        (*m_str) << (Q_INT32) KSYCOCA_VERSION;
+        (*m_str) << (Q_INT32) 0;
      }
      else
      {
@@ -262,7 +262,7 @@ void KSycoca::addFactory( KSycocaFactory *factory )
 
 bool KSycoca::isChanged(const char *type)
 {
-    return self()->d->changeList.tqcontains(type);
+    return self()->d->changeList.contains(type);
 }
 
 void KSycoca::notifyDatabaseChanged(const TQStringList &changeList)
@@ -285,7 +285,7 @@ TQDataStream * KSycoca::findEntry(int offset, KSycocaType &type)
       openDatabase();
    //kdDebug(7011) << TQString("KSycoca::_findEntry(offset=%1)").arg(offset,8,16) << endl;
    m_str->device()->at(offset);
-   TQ_INT32 aType;
+   Q_INT32 aType;
    (*m_str) >> aType;
    type = (KSycocaType) aType;
    //kdDebug(7011) << TQString("KSycoca::found type %1").arg(aType) << endl;
@@ -303,7 +303,7 @@ bool KSycoca::checkVersion(bool abortOnError)
       assert(m_str);
    }
    m_str->device()->at(0);
-   TQ_INT32 aVersion;
+   Q_INT32 aVersion;
    (*m_str) >> aVersion;
    if ( aVersion < KSYCOCA_VERSION )
    {
@@ -342,8 +342,8 @@ TQDataStream * KSycoca::findFactory(KSycocaFactoryId id)
      kdWarning(7011) << "Outdated database found" << endl;
      return 0L;
    }
-   TQ_INT32 aId;
-   TQ_INT32 aOffset;
+   Q_INT32 aId;
+   Q_INT32 aOffset;
    while(true)
    {
       (*m_str) >> aId;
@@ -368,8 +368,8 @@ TQString KSycoca::kfsstnd_prefixes()
 {
    if (bNoDatabase) return "";
    if (!checkVersion(false)) return "";
-   TQ_INT32 aId;
-   TQ_INT32 aOffset;
+   Q_INT32 aId;
+   Q_INT32 aOffset;
    // skip factories offsets
    while(true)
    {
@@ -389,14 +389,14 @@ TQString KSycoca::kfsstnd_prefixes()
    return prefixes;
 }
 
-TQ_UINT32 KSycoca::timeStamp()
+Q_UINT32 KSycoca::timeStamp()
 {
    if (!m_timeStamp)
       (void) kfsstnd_prefixes();
    return m_timeStamp;
 }
 
-TQ_UINT32 KSycoca::updateSignature()
+Q_UINT32 KSycoca::updateSignature()
 {
    if (!m_timeStamp)
       (void) kfsstnd_prefixes();
@@ -424,11 +424,11 @@ TQString KSycoca::determineRelativePath( const TQString & _fullpath, const char
   TQStringList::ConstIterator dirsit = dirs.begin();
   for ( ; dirsit != dirs.end() && sRelativeFilePath.isEmpty(); ++dirsit ) {
     // might need canonicalPath() ...
-    if ( _fullpath.tqfind( *dirsit ) == 0 ) // path is dirs + relativePath
+    if ( _fullpath.find( *dirsit ) == 0 ) // path is dirs + relativePath
       sRelativeFilePath = _fullpath.mid( (*dirsit).length() ); // skip appsdirs
   }
   if ( sRelativeFilePath.isEmpty() )
-    kdFatal(7011) << TQString("Couldn't tqfind %1 in any %2 dir !!!").arg( _fullpath ).arg( _resource) << endl;
+    kdFatal(7011) << TQString("Couldn't find %1 in any %2 dir !!!").arg( _fullpath ).arg( _resource) << endl;
   //else
     // debug code
     //kdDebug(7011) << sRelativeFilePath << endl;
@@ -469,7 +469,7 @@ bool KSycoca::readError()
 
 void KSycocaEntry::read( TQDataStream &s, TQString &str )
 {
-  TQ_UINT32 bytes;
+  Q_UINT32 bytes;
   s >> bytes;                          // read size of string
   if ( bytes > 8192 ) {                // null string or too big
       if (bytes != 0xffffffff)
@@ -479,7 +479,7 @@ void KSycocaEntry::read( TQDataStream &s, TQString &str )
   else if ( bytes > 0 ) {              // not empty
       int bt = bytes/2;
       str.setLength( bt );
-      TQChar* ch = (TQChar *) str.tqunicode();
+      TQChar* ch = (TQChar *) str.unicode();
       char t[8192];
       char *b = t;
       s.readRawBytes( b, bytes );
@@ -495,14 +495,14 @@ void KSycocaEntry::read( TQDataStream &s, TQString &str )
 void KSycocaEntry::read( TQDataStream &s, TQStringList &list )
 {
   list.clear();
-  TQ_UINT32 count;
+  Q_UINT32 count;
   s >> count;                          // read size of list
   if (count >= 1024)
   {
      KSycoca::flagError();
      return;
   }
-  for(TQ_UINT32 i = 0; i < count; i++)
+  for(Q_UINT32 i = 0; i < count; i++)
   {
      TQString str;
      read(s, str);
diff --git a/kdecore/ksycoca.h b/kdecore/ksycoca.h
index aebaef41d..8cbe6eb67 100644
--- a/kdecore/ksycoca.h
+++ b/kdecore/ksycoca.h
@@ -90,10 +90,10 @@ public:
    /**
     * @internal - returns timestamp of database
     *
-    * The database tqcontains all changes made _before_ this time and
+    * The database contains all changes made _before_ this time and
     * _might_ contain changes made after that.
     */
-   TQ_UINT32 timeStamp();
+   Q_UINT32 timeStamp();
 
    /**
     * @internal - returns update signature of database
@@ -104,7 +104,7 @@ public:
     * Touching this file causes the database to be recreated
     * from scratch.
     */
-   TQ_UINT32 updateSignature();
+   Q_UINT32 updateSignature();
 
    /**
     * @internal - returns all directories with information
@@ -172,7 +172,7 @@ protected:
    bool bNoDatabase;
    size_t m_sycoca_size;
    const char *m_sycoca_mmap;
-   TQ_UINT32 m_timeStamp;
+   Q_UINT32 m_timeStamp;
 
 public:
    static KSycoca *_self; // Internal use only.
diff --git a/kdecore/ksycocadict.cpp b/kdecore/ksycocadict.cpp
index f35eadd22..ce7529682 100644
--- a/kdecore/ksycocadict.cpp
+++ b/kdecore/ksycocadict.cpp
@@ -29,7 +29,7 @@ namespace
 {
 struct string_entry {
   string_entry(TQString _key, KSycocaEntry *_payload) 
-  { keyStr = _key; key = keyStr.tqunicode(); length = keyStr.length(); payload = _payload; hash = 0; }
+  { keyStr = _key; key = keyStr.unicode(); length = keyStr.length(); payload = _payload; hash = 0; }
   uint hash;
   int length;
   const TQChar *key;
@@ -59,7 +59,7 @@ KSycocaDict::KSycocaDict()
 KSycocaDict::KSycocaDict(TQDataStream *str, int offset)
   : d(0), mStr(str), mOffset(offset)
 {
-   TQ_UINT32 test1, test2;
+   Q_UINT32 test1, test2;
    str->device()->at(offset);
    (*str) >> test1 >> test2;
    if ((test1 > 0x000fffff) || (test2 > 1024))
@@ -123,17 +123,17 @@ KSycocaDict::find_string(const TQString &key )
    }
 
    if (mHashTableSize == 0)
-      return 0; // Unlikely to tqfind anything :-]
+      return 0; // Unlikely to find anything :-]
 
    // Read hash-table data 
    uint hash = hashKey(key) % mHashTableSize;
    //kdDebug(7011) << TQString("hash is %1").arg(hash) << endl;
 
-   uint off = mOffset+sizeof(TQ_INT32)*hash;
+   uint off = mOffset+sizeof(Q_INT32)*hash;
    //kdDebug(7011) << TQString("off is %1").arg(off,8,16) << endl;
    mStr->device()->at( off );
 
-   TQ_INT32 offset;
+   Q_INT32 offset;
    (*mStr) >> offset;
 
    //kdDebug(7011) << TQString("offset is %1").arg(offset,8,16) << endl;
@@ -411,13 +411,13 @@ KSycocaDict::save(TQDataStream &str)
       //kdDebug(7011) << TQString("Writing hash table (pass #%1)").arg(pass) << endl;
       for(uint i=0; i < mHashTableSize; i++)
       {
-         TQ_INT32 tmpid;
+         Q_INT32 tmpid;
          if (!hashTable[i].entry)
-            tmpid = (TQ_INT32) 0;
+            tmpid = (Q_INT32) 0;
          else if (!hashTable[i].duplicates)
-            tmpid = (TQ_INT32) hashTable[i].entry->payload->offset(); // Positive ID
+            tmpid = (Q_INT32) hashTable[i].entry->payload->offset(); // Positive ID
          else
-            tmpid = (TQ_INT32) -hashTable[i].duplicate_offset; // Negative ID
+            tmpid = (Q_INT32) -hashTable[i].duplicate_offset; // Negative ID
          str << tmpid;
          //kdDebug(7011) << TQString("Hash table : %1").arg(tmpid,8,16) << endl;
       }
@@ -435,10 +435,10 @@ KSycocaDict::save(TQDataStream &str)
 */
             for(string_entry *dup = dups->first(); dup; dup=dups->next())
             {
-               str << (TQ_INT32) dup->payload->offset(); // Positive ID
+               str << (Q_INT32) dup->payload->offset(); // Positive ID
                str << dup->keyStr;                      // Key (TQString)
             }
-            str << (TQ_INT32) 0;               // End of list marker (0)
+            str << (Q_INT32) 0;               // End of list marker (0)
          }
       }
       //kdDebug(7011) << TQString("End of Dict, offset = %1").arg(str.device()->at(),8,16) << endl;
diff --git a/kdecore/ksycocadict.h b/kdecore/ksycocadict.h
index b83ed42db..94a2bc646 100644
--- a/kdecore/ksycocadict.h
+++ b/kdecore/ksycocadict.h
@@ -92,7 +92,7 @@ public:
     * Save the dictionary to the stream
     * A reasonable fast hash algorithm will be created.
     *
-    * Typically this will tqfind 90% of the entries directly.
+    * Typically this will find 90% of the entries directly.
     * Average hash table size: nrOfItems * 20 bytes.
     * Average duplicate list size: nrOfItms * avgKeyLength / 5.
     *
@@ -111,13 +111,13 @@ public:
    void save(TQDataStream &str);
 
 protected:
-   TQ_UINT32 hashKey( const TQString &);
+   Q_UINT32 hashKey( const TQString &);
 private:
    KSycocaDictStringList *d;
    TQDataStream *mStr;
-   TQ_INT32 mOffset;
-   TQ_UINT32 mHashTableSize;
-   TQValueList<TQ_INT32> mHashList;
+   Q_INT32 mOffset;
+   Q_UINT32 mHashTableSize;
+   TQValueList<Q_INT32> mHashList;
 };
 
 #endif
diff --git a/kdecore/ksycocaentry.h b/kdecore/ksycocaentry.h
index eca4a9bea..5f6f11bbd 100644
--- a/kdecore/ksycocaentry.h
+++ b/kdecore/ksycocaentry.h
@@ -102,7 +102,7 @@ public: // KDoc seems to barf on those typedefs and generates no docs after them
    virtual void save(TQDataStream &s)
      {
        mOffset = s.device()->at(); // store position in member variable
-       s << (TQ_INT32) sycocaType() << mPath;
+       s << (Q_INT32) sycocaType() << mPath;
      }
 
    /**
diff --git a/kdecore/ksycocafactory.cpp b/kdecore/ksycocafactory.cpp
index c224ebe79..e5816dc23 100644
--- a/kdecore/ksycocafactory.cpp
+++ b/kdecore/ksycocafactory.cpp
@@ -38,7 +38,7 @@ KSycocaFactory::KSycocaFactory(KSycocaFactoryId factory_id)
       if (m_str) // Can be 0 in case of errors
       {
           // Read position of index tables....
-          TQ_INT32 i;
+          Q_INT32 i;
           (*m_str) >> i;
           m_sycocaDictOffset = i;
           (*m_str) >> i;
@@ -79,9 +79,9 @@ KSycocaFactory::saveHeader(TQDataStream &str)
 {
    // Write header 
    str.device()->at(mOffset);
-   str << (TQ_INT32) m_sycocaDictOffset;
-   str << (TQ_INT32) m_beginEntryOffset;
-   str << (TQ_INT32) m_endEntryOffset;
+   str << (Q_INT32) m_sycocaDictOffset;
+   str << (Q_INT32) m_beginEntryOffset;
+   str << (Q_INT32) m_endEntryOffset;
 }
 
 void
@@ -114,13 +114,13 @@ KSycocaFactory::save(TQDataStream &str)
 
    // Write indices...
    // Linear index
-   str << (TQ_INT32) entryCount;
+   str << (Q_INT32) entryCount;
    for(TQDictIterator<KSycocaEntry::Ptr> it ( *m_entryDict ); 
        it.current(); 
        ++it)
    {
       KSycocaEntry *entry = (*it.current());
-      str << (TQ_INT32) entry->offset(); 
+      str << (Q_INT32) entry->offset(); 
    }
 
    // Dictionary index
@@ -170,7 +170,7 @@ KSycocaEntry::List KSycocaFactory::allEntries()
    // Assume we're NOT building a database
 
    m_str->device()->at(m_endEntryOffset);
-   TQ_INT32 entryCount;
+   Q_INT32 entryCount;
    (*m_str) >> entryCount;
    
    if (entryCount > 8192)
@@ -179,7 +179,7 @@ KSycocaEntry::List KSycocaFactory::allEntries()
       return list;
    }
 
-   TQ_INT32 *offsetList = new TQ_INT32[entryCount];
+   Q_INT32 *offsetList = new Q_INT32[entryCount];
    for(int i = 0; i < entryCount; i++)
    {
       (*m_str) >> offsetList[i];
diff --git a/kdecore/ktempdir.cpp b/kdecore/ktempdir.cpp
index 9428266c9..70a442730 100644
--- a/kdecore/ktempdir.cpp
+++ b/kdecore/ktempdir.cpp
@@ -177,7 +177,7 @@ rmtree(const TQCString& name)
              *
              * Potential problems:
              * - opendir/readdir/closedir is not re-entrant
-             * - unlink and rmdir tqinvalidates a opendir/readdir/closedir
+             * - unlink and rmdir invalidates a opendir/readdir/closedir
              * - limited number of file descriptors for opendir/readdir/closedir
              */
             if ( ::closedir( dp ) )
diff --git a/kdecore/ktempdir.h b/kdecore/ktempdir.h
index b2f3e3431..491a14c4c 100644
--- a/kdecore/ktempdir.h
+++ b/kdecore/ktempdir.h
@@ -124,7 +124,7 @@ public:
     * @brief Remove a directory and all its contents
     *
     * Remove recursively a directory, even if it is not empty
-    * or tqcontains other directories.
+    * or contains other directories.
     *
     * However the function works too when the @p path given
     * is a non-directory file. In that case it simply remove that file.
diff --git a/kdecore/ktempfile.cpp b/kdecore/ktempfile.cpp
index b2e3346b0..c04f725fe 100644
--- a/kdecore/ktempfile.cpp
+++ b/kdecore/ktempfile.cpp
@@ -107,7 +107,7 @@ KTempFile::create(const TQString &filePrefix, const TQString &fileExtension,
        return false;
    }
 
-   // got a file descriptor. nme tqcontains the name
+   // got a file descriptor. nme contains the name
    mTmpName = TQFile::decodeName(nme);
    mode_t tmp = 0;
    mode_t umsk = umask(tmp);
diff --git a/kdecore/ktimezones.cpp b/kdecore/ktimezones.cpp
index 2ec4c7e64..5ebf9bd4a 100644
--- a/kdecore/ktimezones.cpp
+++ b/kdecore/ktimezones.cpp
@@ -285,12 +285,12 @@ int KTimezone::offset(Qt::TimeSpec basisSpec) const
     char *originalZone = ::getenv("TZ");
 
     // Get the time in the current timezone.
-    TQDateTime basisTime = TQDateTime::tqcurrentDateTime(basisSpec);
+    TQDateTime basisTime = TQDateTime::currentDateTime(basisSpec);
 
-    // Set the timezone and tqfind out what time it is there compared to the basis.
+    // Set the timezone and find out what time it is there compared to the basis.
     ::setenv("TZ", m_name.utf8(), 1);
     tzset();
-    TQDateTime remoteTime = TQDateTime::tqcurrentDateTime(Qt::LocalTime);
+    TQDateTime remoteTime = TQDateTime::currentDateTime(Qt::LocalTime);
     int offset = remoteTime.secsTo(basisTime);
 
     // Now restore things
@@ -308,11 +308,11 @@ int KTimezone::offset(Qt::TimeSpec basisSpec) const
 
 int KTimezone::offset(const TQDateTime &dateTime) const
 {
-    OffsetFind tqfinder(dateTime.toTime_t());
+    OffsetFind finder(dateTime.toTime_t());
     int result = 0;
-    if (parse(tqfinder))
+    if (parse(finder))
     {
-        result = tqfinder.offset();
+        result = finder.offset();
     }
     return result;
 }
@@ -595,7 +595,7 @@ const KTimezone *KTimezones::local()
         return local;
 
     // None of the deterministic stuff above has worked: try a heuristic. We
-    // try to tqfind a pair of matching timezone abbreviations...that way, we'll
+    // try to find a pair of matching timezone abbreviations...that way, we'll
     // likely return a value in the user's own country.
     if (!m_zoneinfoDir.isEmpty())
     {
@@ -623,7 +623,7 @@ const KTimezone *KTimezones::zone(const TQString &name)
 {
     if (name.isEmpty())
         return m_UTC;
-    ZoneMap::ConstIterator it = m_zones->tqfind(name);
+    ZoneMap::ConstIterator it = m_zones->find(name);
     if (it != m_zones->end())
         return it.data();
 
@@ -695,28 +695,28 @@ bool KTimezoneSource::parse(const TQString &zone, KTimezoneDetails &dataReceiver
     }
 
     // Structures that represent the zoneinfo file.
-    TQ_UINT8 T, z, i_, f_;
+    Q_UINT8 T, z, i_, f_;
     struct
     {
-        TQ_UINT32 ttisgmtcnt;
-        TQ_UINT32 ttisstdcnt;
-        TQ_UINT32 leapcnt;
-        TQ_UINT32 timecnt;
-        TQ_UINT32 typecnt;
-        TQ_UINT32 charcnt;
+        Q_UINT32 ttisgmtcnt;
+        Q_UINT32 ttisstdcnt;
+        Q_UINT32 leapcnt;
+        Q_UINT32 timecnt;
+        Q_UINT32 typecnt;
+        Q_UINT32 charcnt;
     } tzh;
-    TQ_UINT32 transitionTime;
-    TQ_UINT8 localTimeIndex;
+    Q_UINT32 transitionTime;
+    Q_UINT8 localTimeIndex;
     struct
     {
-        TQ_INT32 gmtoff;
-        TQ_INT8 isdst;
-        TQ_UINT8 abbrind;
+        Q_INT32 gmtoff;
+        Q_INT8 isdst;
+        Q_UINT8 abbrind;
     } tt;
-    TQ_UINT32 leapTime;
-    TQ_UINT32 leapSeconds;
-    TQ_UINT8 isStandard;
-    TQ_UINT8 isUTC;
+    Q_UINT32 leapTime;
+    Q_UINT32 leapSeconds;
+    Q_UINT8 isStandard;
+    Q_UINT8 isUTC;
 
     TQDataStream str(&f);
     str >> T >> z >> i_ >> f_;
diff --git a/kdecore/ktimezones.h b/kdecore/ktimezones.h
index d07be53bb..3055f202f 100644
--- a/kdecore/ktimezones.h
+++ b/kdecore/ktimezones.h
@@ -33,7 +33,7 @@ class KTimezonePrivate;
 class KTimezonesPrivate;
 
 /**
- * The KTimezoneSource class tqcontains information source-dependent functions
+ * The KTimezoneSource class contains information source-dependent functions
  * related to a timezone. Create subclasses to implement custom sources of
  * timezone information.
  *
@@ -73,7 +73,7 @@ private:
 };
 
 /**
- * The KTimezone class tqcontains core functions related to a timezone. Instances
+ * The KTimezone class contains core functions related to a timezone. Instances
  * are created in the context of a {@link KTimezoneSource } which provides
  * extended functionality via {@link KTimezoneDetails }.
  *
@@ -201,7 +201,7 @@ private:
 };
 
 /**
- * The KTimezoneDetails class tqcontains extended functions related to a
+ * The KTimezoneDetails class contains extended functions related to a
  * timezone.
  *
  * The parser must be customised by overriding the given virtual callbacks:
diff --git a/kdecore/kurl.cpp b/kdecore/kurl.cpp
index 00ae675ea..cb396c3a5 100644
--- a/kdecore/kurl.cpp
+++ b/kdecore/kurl.cpp
@@ -172,14 +172,14 @@ static TQString lazy_encode( const TQString& segment, bool encodeAt=true )
 
   for ( int i = 0; i < old_length; i++ )
   {
-    unsigned int character = segment[i].tqunicode(); // Don't use latin1()
+    unsigned int character = segment[i].unicode(); // Don't use latin1()
                                                    // It returns 0 for non-latin1 values
     // Small set of really ambiguous chars
     if ((character < 32) ||  // Low ASCII
         ((character == '%') && // The escape character itself
            (i+2 < old_length) && // But only if part of a valid escape sequence!
-          (hex2int(segment[i+1].tqunicode())!= -1) &&
-          (hex2int(segment[i+2].tqunicode())!= -1)) ||
+          (hex2int(segment[i+1].unicode())!= -1) &&
+          (hex2int(segment[i+2].unicode())!= -1)) ||
         (character == '?') || // Start of query delimiter
         ((character == '@') && encodeAt) || // Username delimiter
         (character == '#') || // Start of reference delimiter
@@ -250,7 +250,7 @@ static void decode( const TQString& segment, TQString &decoded, TQString &encode
     {
       int a = i+1 < old_length ? hex2int( csegment[i] ) : -1;
       int b = i+1 < old_length ? hex2int( csegment[i+1] ) : -1;
-      if ((a == -1) || (b == -1)) // Only tqreplace if sequence is valid
+      if ((a == -1) || (b == -1)) // Only replace if sequence is valid
       {
          // Contains stray %, make sure to re-encode!
          bReencode = true;
@@ -291,12 +291,12 @@ static void decode( const TQString& segment, TQString &decoded, TQString &encode
   {
      decoded = textCodec->toUnicode( new_segment );
      if ( isRawURI ) {
-        int length = tqstrlen( new_segment );
+        int length = qstrlen( new_segment );
         while ( length < new_length ) {
             decoded += TQChar::null;
             length += 1;
             decoded += textCodec->toUnicode( new_segment + length );
-            length += tqstrlen( new_segment + length );
+            length += qstrlen( new_segment + length );
         }
      }
 
@@ -338,15 +338,15 @@ static TQString cleanpath(const TQString &_path, bool cleanDirSeparator, bool de
 #else
      TQString encodedDot("%2e");
 #endif
-     if (path.tqfind(encodedDot, 0, false) != -1)
+     if (path.find(encodedDot, 0, false) != -1)
      {
 #ifndef KDE_QT_ONLY
         static const TQString &encodedDOT = KGlobal::staticQString("%2E"); // Uppercase!
 #else
         TQString encodedDOT("%2E");
 #endif
-        path.tqreplace(encodedDot, ".");
-        path.tqreplace(encodedDOT, ".");
+        path.replace(encodedDot, ".");
+        path.replace(encodedDOT, ".");
         len = path.length();
      }
   }
@@ -365,7 +365,7 @@ static TQString cleanpath(const TQString &_path, bool cleanDirSeparator, bool de
 
   cdUp = 0;
   pos = orig_pos = len;
-  while ( pos && (pos = path.tqfindRev('/',--pos)) != -1 )
+  while ( pos && (pos = path.findRev('/',--pos)) != -1 )
   {
     len = orig_pos - pos - 1;
     if ( len == 2 && path[pos+1] == '.' && path[pos+2] == '.' )
@@ -404,7 +404,7 @@ bool KURL::isRelativeURL(const TQString &_url)
 {
   int len = _url.length();
   if (!len) return true; // Very short relative URL.
-  const TQChar *str = _url.tqunicode();
+  const TQChar *str = _url.unicode();
 
   // Absolute URL must start with alpha-character
   if (!isalpha(str[0].latin1()))
@@ -471,13 +471,13 @@ KURL::KURL( const TQString &url, int encoding_hint )
 KURL::KURL( const char * url, int encoding_hint )
 {
   reset();
-  parse( TQString::tqfromLatin1(url), encoding_hint );
+  parse( TQString::fromLatin1(url), encoding_hint );
 }
 
 KURL::KURL( const TQCString& url, int encoding_hint )
 {
   reset();
-  parse( TQString::tqfromLatin1(url), encoding_hint );
+  parse( TQString::fromLatin1(url), encoding_hint );
 }
 
 KURL::KURL( const KURL& _u )
@@ -493,13 +493,13 @@ TQDataStream & operator<< (TQDataStream & s, const KURL & a)
 
     s << a.m_strProtocol << a.m_strUser << a.m_strPass << a.m_strHost
       << a.m_strPath << a.m_strPath_encoded << QueryForWire << a.m_strRef_encoded
-      << TQ_INT8(a.m_bIsMalformed ? 1 : 0) << a.m_iPort;
+      << Q_INT8(a.m_bIsMalformed ? 1 : 0) << a.m_iPort;
     return s;
 }
 
 TQDataStream & operator>> (TQDataStream & s, KURL & a)
 {
-    TQ_INT8 malf;
+    Q_INT8 malf;
     TQString QueryFromWire;
     s >> a.m_strProtocol >> a.m_strUser >> a.m_strPass >> a.m_strHost
       >> a.m_strPath >> a.m_strPath_encoded >> QueryFromWire >> a.m_strRef_encoded
@@ -542,11 +542,11 @@ KURL::KURL( const KURL& _u, const TQString& _rel_url, int encoding_hint )
   TQString rUrl = _rel_url;
   int len = _u.m_strProtocol.length();
   if ( !_u.m_strHost.isEmpty() && !rUrl.isEmpty() &&
-       rUrl.tqfind( _u.m_strProtocol, 0, false ) == 0 &&
+       rUrl.find( _u.m_strProtocol, 0, false ) == 0 &&
        rUrl[len] == ':' && (rUrl[len+1] != '/' ||
        (rUrl[len+1] == '/' && rUrl[len+2] != '/')) )
   {
-    rUrl.remove( 0, rUrl.tqfind( ':' ) + 1 );
+    rUrl.remove( 0, rUrl.find( ':' ) + 1 );
   }
 
   if ( rUrl.isEmpty() )
@@ -579,13 +579,13 @@ KURL::KURL( const KURL& _u, const TQString& _rel_url, int encoding_hint )
     }
     else if ( rUrl[0] != '?' )
     {
-       int pos = m_strPath.tqfindRev( '/' );
+       int pos = m_strPath.findRev( '/' );
        if (pos >= 0)
           m_strPath.truncate(pos);
        m_strPath += '/';
        if (!m_strPath_encoded.isEmpty())
        {
-          pos = m_strPath_encoded.tqfindRev( '/' );
+          pos = m_strPath_encoded.findRev( '/' );
           if (pos >= 0)
              m_strPath_encoded.truncate(pos);
           m_strPath_encoded += '/';
@@ -643,7 +643,7 @@ void KURL::parse( const TQString& _url, int encoding_hint )
 	return;
     }
 
-    const TQChar* buf = _url.tqunicode();
+    const TQChar* buf = _url.unicode();
     const TQChar* orig = buf;
     uint len = _url.length();
     uint pos = 0;
@@ -707,7 +707,7 @@ NodeErr:
 void KURL::parseRawURI( const TQString& _url, int encoding_hint )
 {
     uint len = _url.length();
-    const TQChar* buf = _url.tqunicode();
+    const TQChar* buf = _url.unicode();
 
     uint pos = 0;
 
@@ -762,7 +762,7 @@ void KURL::parseURL( const TQString& _url, int encoding_hint )
   bool badHostName = false;
   int start = 0;
   uint len = _url.length();
-  const TQChar* buf = _url.tqunicode();
+  const TQChar* buf = _url.unicode();
 
   TQChar delim;
   TQString tmp;
@@ -1040,7 +1040,7 @@ KURL& KURL::operator=( const TQString& _url )
 KURL& KURL::operator=( const char * _url )
 {
   reset();
-  parse( TQString::tqfromLatin1(_url) );
+  parse( TQString::fromLatin1(_url) );
 
   return *this;
 }
@@ -1231,7 +1231,7 @@ void KURL::setFileName( const TQString& _txt )
     path = "/";
   else
   {
-    int lastSlash = path.tqfindRev( '/' );
+    int lastSlash = path.findRev( '/' );
     if ( lastSlash == -1)
     {
       // The first character is not a '/' ???
@@ -1347,7 +1347,7 @@ void KURL::setEncodedPath( const TQString& _txt, int encoding_hint )
 
 void KURL::setEncodedPathAndQuery( const TQString& _txt, int encoding_hint )
 {
-  int pos = _txt.tqfind( '?' );
+  int pos = _txt.find( '?' );
   if ( pos == -1 )
   {
     setEncodedPath(_txt, encoding_hint);
@@ -1490,7 +1490,7 @@ TQString KURL::url( int _trailing, int encoding_hint ) const
     }
     if ( m_iUriMode == URL )
     {
-      bool IPv6 = (m_strHost.tqfind(':') != -1);
+      bool IPv6 = (m_strHost.find(':') != -1);
       if (IPv6)
         u += '[' + m_strHost + ']';
       else
@@ -1546,7 +1546,7 @@ TQString KURL::prettyURL( int _trailing ) const
     }
     if ( m_iUriMode == URL )
     {
-    bool IPv6 = (m_strHost.tqfind(':') != -1);
+    bool IPv6 = (m_strHost.find(':') != -1);
     if (IPv6)
     {
        u += '[' + m_strHost + ']';
@@ -1704,13 +1704,13 @@ TQString KURL::fileName( bool _strip_trailing_slash ) const
      // This is hairy, we need the last unencoded slash.
      // Count in the encoded string how many encoded slashes follow the last
      // unencoded one.
-     int i = m_strPath_encoded.tqfindRev( (QChar)'/', len - 1 );
+     int i = m_strPath_encoded.findRev( (QChar)'/', len - 1 );
      TQString fileName_encoded = m_strPath_encoded.mid(i+1);
-     n += fileName_encoded.tqcontains("%2f", false);
+     n += fileName_encoded.contains("%2f", false);
   }
   int i = len;
   do {
-    i = path.tqfindRev( (QChar)'/', i - 1 );
+    i = path.findRev( (QChar)'/', i - 1 );
   }
   while (--n && (i > 0));
 
@@ -1773,7 +1773,7 @@ TQString KURL::directory( bool _strip_trailing_slash_from_result,
   if ( result.isEmpty() || result == "/" )
     return result;
 
-  int i = result.tqfindRev( "/" );
+  int i = result.findRev( "/" );
   // If ( i == -1 ) => the first character is not a '/'
   // So it's some URL like file:blah.tgz, with no path
   if ( i == -1 )
@@ -2143,17 +2143,17 @@ TQMap< TQString, TQString > KURL::queryItems( int options, int encoding_hint ) c
   TQMap< TQString, TQString > result;
   TQStringList items = TQStringList::split( '&', m_strQuery_encoded );
   for ( TQStringList::const_iterator it = items.begin() ; it != items.end() ; ++it ) {
-    int equal_pos = (*it).tqfind( '=' );
+    int equal_pos = (*it).find( '=' );
     if ( equal_pos > 0 ) { // = is not the first char...
       TQString name = (*it).left( equal_pos );
       if ( options & CaseInsensitiveKeys )
 	name = name.lower();
       TQString value = (*it).mid( equal_pos + 1 );
       if ( value.isEmpty() )
-	result.insert( name, TQString::tqfromLatin1("") );
+	result.insert( name, TQString::fromLatin1("") );
       else {
 	// ### why is decoding name not necessary?
-	value.tqreplace( '+', ' ' ); // + in queries means space
+	value.replace( '+', ' ' ); // + in queries means space
 	result.insert( name, decode_string( value, encoding_hint ) );
       }
     } else if ( equal_pos < 0 ) { // no =
@@ -2187,11 +2187,11 @@ TQString KURL::queryItem( const TQString& _item, int encoding_hint ) const
       if ( (*it).length() > _len )
       {
         TQString str = (*it).mid( _len );
-        str.tqreplace( '+', ' ' ); // + in queries means space.
+        str.replace( '+', ' ' ); // + in queries means space.
         return decode_string( str, encoding_hint );
       }
       else // empty value
-        return TQString::tqfromLatin1("");
+        return TQString::fromLatin1("");
     }
   }
 
diff --git a/kdecore/kurl.h b/kdecore/kurl.h
index 8546d3394..86c7aa169 100644
--- a/kdecore/kurl.h
+++ b/kdecore/kurl.h
@@ -171,7 +171,7 @@ public:
      */
     URL,
     /**
-     * Mailto URI. path() tqcontains an email address which should have its
+     * Mailto URI. path() contains an email address which should have its
      * domain part processed as a DNS name. The email address is accessible
      * through the path() method.
      */
@@ -179,7 +179,7 @@ public:
   };
 
   /**
-   * KURL::List is a TQValueList that tqcontains KURLs with a few
+   * KURL::List is a TQValueList that contains KURLs with a few
    * convenience methods.
    * @see KURL
    * @see QValueList
@@ -192,13 +192,13 @@ public:
      */
       List() { }
       /**
-       * @brief Creates a list that tqcontains the given URL as only item
+       * @brief Creates a list that contains the given URL as only item
        *
        * @param url the URL to add
        */
       List(const KURL &url);
       /**
-       * @brief Creates a list that tqcontains the URLs from the given list
+       * @brief Creates a list that contains the URLs from the given list
        *
        * This equivalent to iterating over the input list and using each item
        * as the argument to KURL's constructor, i.e. the resulting list will
@@ -281,7 +281,7 @@ public:
    *        See TQTextCodec::mibEnum()
    *
    * @see fromPathOrURL()
-   * @see TQString::tqfromLatin1()
+   * @see TQString::fromLatin1()
    */
   KURL( const char * url, int encoding_hint = 0 );
   /**
@@ -307,7 +307,7 @@ public:
    *        See TQTextCodec::mibEnum()
    *
    * @see fromPathOrURL()
-   * @see TQString::tqfromLatin1()
+   * @see TQString::fromLatin1()
    */
   KURL( const TQCString& url, int encoding_hint = 0 );
 
@@ -838,7 +838,7 @@ public:
    * @brief Adds file encoding information
    *
    * Adds encoding information to the URL by adding a @c "charset" parameter.
-   * If there is already a charset parameter, it will be tqreplaced.
+   * If there is already a charset parameter, it will be replaced.
    *
    * @param encoding the encoding to add or @c TQString::null to remove the
    *                 encoding
@@ -957,7 +957,7 @@ public:
   /**
    * @brief Adds an additional query item
    *
-   * To tqreplace an existing query item, the item should first be
+   * To replace an existing query item, the item should first be
    * removed with removeQueryItem()
    *
    * @param _item name of item to add
@@ -1586,7 +1586,7 @@ public:
    *
    * Convenience function.
    *
-   * Convert tqunicoded string to local encoding and use %%-style
+   * Convert unicoded string to local encoding and use %%-style
    * encoding for all common delimiters / non-ascii characters.
    *
    * @param str the string to encode (can be @c TQString::null)
@@ -1605,7 +1605,7 @@ public:
    *
    * Convenience function.
    *
-   * Convert tqunicoded string to local encoding and use %%-style
+   * Convert unicoded string to local encoding and use %%-style
    * encoding for all common delimiters and non-ascii characters
    * as well as the slash @c '/'.
    *
@@ -1623,7 +1623,7 @@ public:
    *
    * Convenience function.
    *
-   * Decode %-style encoding and convert from local encoding to tqunicode.
+   * Decode %-style encoding and convert from local encoding to unicode.
    *
    * Reverse of encode_string()
    *
diff --git a/kdecore/kurldrag.cpp b/kdecore/kurldrag.cpp
index 089d2fadb..7147f7a74 100644
--- a/kdecore/kurldrag.cpp
+++ b/kdecore/kurldrag.cpp
@@ -87,7 +87,7 @@ KURLDrag * KURLDrag::newDrag( const KURL::List &urls, const TQMap<TQString, TQSt
 bool KURLDrag::decode( const TQMimeSource *e, KURL::List &uris )
 {
     if ( e->provides( "application/x-kde-urilist" ) ) {
-        TQByteArray payload = e->tqencodedData( "application/x-kde-urilist" );
+        TQByteArray payload = e->encodedData( "application/x-kde-urilist" );
         if ( payload.size() ) {
             uint c=0;
             const char* d = payload.data();
@@ -128,7 +128,7 @@ bool KURLDrag::decode( const TQMimeSource *e, KURL::List &uris, TQMap<TQString,T
 {
     if ( decode( e, uris ) ) // first decode the URLs (see above)
     {
-        TQByteArray ba = e->tqencodedData( "application/x-kio-metadata" );
+        TQByteArray ba = e->encodedData( "application/x-kio-metadata" );
         if ( ba.size() )
         {
             TQString s = ba.data();
@@ -140,7 +140,7 @@ bool KURLDrag::decode( const TQMimeSource *e, KURL::List &uris, TQMap<TQString,T
                 if ( readingKey )
                     key = *it;
                 else
-                    metaData.tqreplace( key, *it );
+                    metaData.replace( key, *it );
                 readingKey = !readingKey;
             }
             Q_ASSERT( readingKey ); // an odd number of items would be, well, odd ;-)
@@ -187,12 +187,12 @@ const char * KURLDrag::format( int i ) const
     else return 0;
 }
 
-TQByteArray KURLDrag::tqencodedData( const char* mime ) const
+TQByteArray KURLDrag::encodedData( const char* mime ) const
 {
     TQByteArray a;
     TQCString mimetype( mime );
     if ( mimetype == "text/uri-list" )
-        return TQUriDrag::tqencodedData( mime );
+        return TQUriDrag::encodedData( mime );
     else if ( mimetype == "text/plain" )
     {
 	TQStringList uris;
diff --git a/kdecore/kurldrag.h b/kdecore/kurldrag.h
index 4cf374314..eb1f9522a 100644
--- a/kdecore/kurldrag.h
+++ b/kdecore/kurldrag.h
@@ -30,7 +30,7 @@ class KURLDragPrivate;
 /**
  * This class is to be used instead of TQUriDrag when using KURL.
  * The reason is: TQUriDrag (and the XDND/W3C standards) expect URLs to
- * be encoded in UTF-8 (tqunicode), but KURL uses the current locale
+ * be encoded in UTF-8 (unicode), but KURL uses the current locale
  * by default.
  * The other reasons for using this class are:
  * @li it exports text/plain (for dropping/pasting into lineedits, mails etc.)
@@ -52,7 +52,7 @@ public:
    * @param urls the list of URLs
    * @param dragSource the parent of the TQObject. Should be set when doing drag-n-drop,
    * but should be 0 when copying to the clipboard
-   * @param name the name of the TQObject
+   * @param name the name of the QObject
    */
   KURLDrag( const KURL::List &urls, TQWidget* dragSource = 0, const char * name = 0 );
   /**
@@ -62,7 +62,7 @@ public:
    * @param metaData a map containing meta data
    * @param dragSource the parent of the TQObject. Should be set when doing drag-n-drop,
    * but should be 0 when copying to the clipboard
-   * @param name the name of the TQObject
+   * @param name the name of the QObject
    * @see metaData()
    */
   KURLDrag( const KURL::List &urls, const TQMap<TQString, TQString>& metaData,
@@ -145,7 +145,7 @@ public:
   /// @reimp
   virtual const char * format( int i ) const;
   /// @reimp
-  virtual TQByteArray tqencodedData( const char* mime ) const;
+  virtual TQByteArray encodedData( const char* mime ) const;
 
 protected:
   /**
diff --git a/kdecore/kuser.cpp b/kdecore/kuser.cpp
index ca74700fe..3fffddf4f 100644
--- a/kdecore/kuser.cpp
+++ b/kdecore/kuser.cpp
@@ -219,7 +219,7 @@ TQValueList<KUserGroup> KUser::groups() const {
   TQValueList<KUserGroup>::const_iterator it;
   for ( it = allGroups.begin(); it != allGroups.end(); ++it ) {
     TQValueList<KUser> users = (*it).users();
-    if ( users.tqfind( *this ) != users.end()) {
+    if ( users.find( *this ) != users.end()) {
        result.append(*it);
     }
   }
@@ -232,7 +232,7 @@ TQStringList KUser::groupNames() const {
   TQValueList<KUserGroup>::const_iterator it;
   for ( it = allGroups.begin(); it != allGroups.end(); ++it ) {
     TQValueList<KUser> users = (*it).users();
-    if ( users.tqfind( *this ) != users.end()) {
+    if ( users.find( *this ) != users.end()) {
        result.append((*it).name());
     }
   }
diff --git a/kdecore/kuser.h b/kdecore/kuser.h
index be5834f09..5c43b6b69 100644
--- a/kdecore/kuser.h
+++ b/kdecore/kuser.h
@@ -52,7 +52,7 @@ public:
   };
 
   /**
-   * Creates an object that tqcontains information about the current user.
+   * Creates an object that contains information about the current user.
    * (as returned by getuid(2) or geteuid(2), taking $LOGNAME/$USER into
    * account).
    * @param mode if #UseEffectiveUID is passed the effective
@@ -76,7 +76,7 @@ public:
   KUser(long uid);
 
   /**
-   * Creates an object that tqcontains information about the user with the given
+   * Creates an object that contains information about the user with the given
    * name. If the user does not exist isValid() will return false.
    *
    * @param name the name of the user
@@ -85,7 +85,7 @@ public:
   KUser(const TQString& name);
 
   /**
-   * Creates an object that tqcontains information about the user with the given
+   * Creates an object that contains information about the user with the given
    * name. If the user does not exist isValid() will return false.
    *
    * @param name the name of the user
diff --git a/kdecore/kvmallocator.cpp b/kdecore/kvmallocator.cpp
index 031dd4304..996d55791 100644
--- a/kdecore/kvmallocator.cpp
+++ b/kdecore/kvmallocator.cpp
@@ -106,7 +106,7 @@ KVMAllocator::allocate(size_t _size)
          free_block.start += block.size;
          if (!free_block.size)
             d->free_blocks.remove(it);
-         it = d->used_blocks.tqreplace(block.start, block);
+         it = d->used_blocks.replace(block.start, block);
          return &(it.data());
       }
       ++it;
@@ -120,7 +120,7 @@ KVMAllocator::allocate(size_t _size)
    block.size = (_size + KVM_ALIGN) & ~KVM_ALIGN;
    block.mmap = 0;
    kdDebug(180)<<"VM alloc: using new block "<<(long)block.start<<" size ="<<(long)block.size<<" request = "<<_size<< endl;
-   it = d->used_blocks.tqreplace(block.start, block);
+   it = d->used_blocks.replace(block.start, block);
    d->max_length += block.size;
    return &(it.data());
 }
@@ -138,14 +138,14 @@ KVMAllocator::free(Block *block_p)
       return;
    }
    TQMap<off_t,KVMAllocator::Block>::iterator it;
-   it = d->used_blocks.tqfind(block.start);
+   it = d->used_blocks.find(block.start);
    if (it == d->used_blocks.end())
    {
       kdDebug(180)<<"VM free: Block "<<(long)block.start<<" is not allocated."<<endl;
       return;
    }
    d->used_blocks.remove(it);
-   it = d->free_blocks.tqreplace(block.start, block);
+   it = d->free_blocks.replace(block.start, block);
    TQMap<off_t,KVMAllocator::Block>::iterator before = it;
    --before;
    if (before != d->free_blocks.end())
diff --git a/kdecore/kwin.cpp b/kdecore/kwin.cpp
index 99710e810..bc9a9761b 100644
--- a/kdecore/kwin.cpp
+++ b/kdecore/kwin.cpp
@@ -108,7 +108,7 @@ static void kwin_net_create_atoms() {
 #ifdef Q_WS_X11
 static void sendClientMessageToRoot(Window w, Atom a, long x, long y = 0, long z = 0 ){
   XEvent ev;
-  long tqmask;
+  long mask;
 
   memset(&ev, 0, sizeof(ev));
   ev.xclient.type = ClientMessage;
@@ -118,8 +118,8 @@ static void sendClientMessageToRoot(Window w, Atom a, long x, long y = 0, long z
   ev.xclient.data.l[0] = x;
   ev.xclient.data.l[1] = y;
   ev.xclient.data.l[2] = z;
-  tqmask = SubstructureRedirectMask;
-  XSendEvent(qt_xdisplay(), qt_xrootwin(), False, tqmask, &ev);
+  mask = SubstructureRedirectMask;
+  XSendEvent(qt_xdisplay(), qt_xrootwin(), False, mask, &ev);
 }
 #endif
 
@@ -129,7 +129,7 @@ static void sendClientMessageToRoot(Window w, Atom a, long x, long y = 0, long z
 #ifdef Q_WS_X11
 static void sendClientMessage(Window w, Atom a, long x){
   XEvent ev;
-  long tqmask;
+  long mask;
 
   memset(&ev, 0, sizeof(ev));
   ev.xclient.type = ClientMessage;
@@ -138,10 +138,10 @@ static void sendClientMessage(Window w, Atom a, long x){
   ev.xclient.format = 32;
   ev.xclient.data.l[0] = x;
   ev.xclient.data.l[1] = CurrentTime;
-  tqmask = 0L;
+  mask = 0L;
   if (w == qt_xrootwin())
-    tqmask = SubstructureRedirectMask;        /* magic! */
-  XSendEvent(qt_xdisplay(), w, False, tqmask, &ev);
+    mask = SubstructureRedirectMask;        /* magic! */
+  XSendEvent(qt_xdisplay(), w, False, mask, &ev);
 }
 #endif
 
@@ -179,7 +179,7 @@ ContextWidget::ContextWidget()
 			      LeaveWindowMask ),
 		      GrabModeAsync, GrabModeAsync,
 		      None, c.handle(), CurrentTime );
-	tqApp->enter_loop();
+	qApp->enter_loop();
     }
 
 
@@ -205,7 +205,7 @@ bool ContextWidget::x11Event( XEvent * ev)
 	    e.xbutton.x = lx;
 	    e.xbutton.y = ly;
 	    XSendEvent( qt_xdisplay(), w, true, ButtonPressMask, &e );
-	    tqApp->exit_loop();
+	    qApp->exit_loop();
 	    return true;
 	}
 	return false;
@@ -313,7 +313,7 @@ void KWin::setMainWindow( TQWidget* subwindow, WId mainwindow )
          Grmbl. See TQDialog::show(). That should get fixed in Qt somehow.
         */
         if( tqqt_cast< TQDialog* >( subwindow ) != NULL
-            && subwindow->tqparentWidget() == NULL
+            && subwindow->parentWidget() == NULL
             && kapp->mainWidget() != NULL )
         {
             kdWarning() << "KWin::setMainWindow(): There either mustn't be kapp->mainWidget(),"
@@ -386,7 +386,7 @@ KWin::Info KWin::info( WId win )
     w.pid = inf.pid();
     NETRect frame, geom;
     inf.kdeGeometry( frame, geom );
-    w.tqgeometry.setRect( geom.pos.x, geom.pos.y, geom.size.width, geom.size.height );
+    w.geometry.setRect( geom.pos.x, geom.pos.y, geom.size.width, geom.size.height );
     w.frameGeometry.setRect( frame.pos.x, frame.pos.y, frame.size.width, frame.size.height );
 #endif
     return w;
@@ -421,14 +421,14 @@ TQPixmap KWin::icon( WId win, int width, int height, bool scale, int flags )
 
     if( flags & WMHints ) {
         Pixmap p = None;
-        Pixmap p_tqmask = None;
+        Pixmap p_mask = None;
 
         XWMHints *hints = XGetWMHints(qt_xdisplay(), win );
         if (hints && (hints->flags & IconPixmapHint)){
     	    p = hints->icon_pixmap;
         }
         if (hints && (hints->flags & IconMaskHint)){
-	    p_tqmask = hints->icon_mask;
+	    p_mask = hints->icon_mask;
         }
         if (hints)
 	    XFree((char*)hints);
@@ -448,9 +448,9 @@ TQPixmap KWin::icon( WId win, int width, int height, bool scale, int flags )
 	        XCopyArea(qt_xdisplay(), p, pm.handle(),
 		          qt_xget_temp_gc(qt_xscreen(), depth==1),
 		          0, 0, w, h, 0, 0);
-	        if (p_tqmask != None){
+	        if (p_mask != None){
 	    	    TQBitmap bm(w, h);
-		    XCopyArea(qt_xdisplay(), p_tqmask, bm.handle(),
+		    XCopyArea(qt_xdisplay(), p_mask, bm.handle(),
 			      qt_xget_temp_gc(qt_xscreen(), true),
 			      0, 0, w, h, 0, 0);
 		    pm.setMask(bm);
@@ -752,8 +752,8 @@ class KWin::WindowInfoPrivate
 	WId win_;
 	TQString name_;
         TQString iconic_name_;
-	TQRect tqgeometry_;
-        TQRect frame_tqgeometry_;
+	TQRect geometry_;
+        TQRect frame_geometry_;
 	int ref;
         bool valid;
     private:
@@ -806,8 +806,8 @@ KWin::WindowInfo::WindowInfo( WId win, unsigned long properties, unsigned long p
     if( properties & ( NET::WMGeometry | NET::WMKDEFrameStrut )) {
         NETRect frame, geom;
         d->info->kdeGeometry( frame, geom );
-        d->tqgeometry_.setRect( geom.pos.x, geom.pos.y, geom.size.width, geom.size.height );
-        d->frame_tqgeometry_.setRect( frame.pos.x, frame.pos.y, frame.size.width, frame.size.height );
+        d->geometry_.setRect( geom.pos.x, geom.pos.y, geom.size.width, geom.size.height );
+        d->frame_geometry_.setRect( frame.pos.x, frame.pos.y, frame.size.width, frame.size.height );
     }
     d->valid = !handler.error( false ); // no sync - NETWinInfo did roundtrips
 #endif
@@ -1068,12 +1068,12 @@ int KWin::WindowInfo::desktop() const
 #endif
 }
 
-TQRect KWin::WindowInfo::tqgeometry() const
+TQRect KWin::WindowInfo::geometry() const
 {
 #ifdef Q_WS_X11
     kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMGeometry ) == 0, 176 )
         << "Pass NET::WMGeometry to KWin::windowInfo()" << endl;
-    return d->tqgeometry_;
+    return d->geometry_;
 #else
     return TQRect( 100, 100, 200, 200 );
 #endif
@@ -1084,7 +1084,7 @@ TQRect KWin::WindowInfo::frameGeometry() const
 #ifdef Q_WS_X11
     kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMKDEFrameStrut ) == 0, 176 )
         << "Pass NET::WMKDEFrameStrut to KWin::windowInfo()" << endl;
-    return d->frame_tqgeometry_;
+    return d->frame_geometry_;
 #else
     return TQRect();
 #endif
diff --git a/kdecore/kwin.h b/kdecore/kwin.h
index 4e7abaf10..36cccb125 100644
--- a/kdecore/kwin.h
+++ b/kdecore/kwin.h
@@ -161,7 +161,7 @@ public:
     /**
      * Makes @p trayWin a system tray window for @p forWin.
      *
-     * A system tray window serves as an icon tqreplacement. It's
+     * A system tray window serves as an icon replacement. It's
      * displayed inside the panel's system tray.
      * @param trayWin the id of the system tray window
      * @param forWin the id of the window represented by the system
@@ -491,7 +491,7 @@ public:
       /// The process id of the window's owner
 	pid_t pid;
       /// Position and size of the window contents.
-	TQRect tqgeometry;
+	TQRect geometry;
       /// Position and size of the window's frame.
 	TQRect frameGeometry;
 
@@ -655,9 +655,9 @@ public:
      * Returns the position and size of the window contents.
      * Requires NET::WMGeometry passed to KWin::windowInfo().
      */
-    TQRect tqgeometry() const;
+    TQRect geometry() const;
     /**
-     * Returns the frame tqgeometry of the window, i.e. including the window decoration.
+     * Returns the frame geometry of the window, i.e. including the window decoration.
      * Requires NET::WMKDEFrameStrut passed to KWin::windowInfo().
      */
     TQRect frameGeometry() const;
diff --git a/kdecore/kwinmodule.cpp b/kdecore/kwinmodule.cpp
index 383bb76d5..f113570db 100644
--- a/kdecore/kwinmodule.cpp
+++ b/kdecore/kwinmodule.cpp
@@ -172,7 +172,7 @@ const TQValueList<WId>& KWinModule::stackingOrder() const
 
 bool KWinModule::hasWId(WId w) const
 {
-    return d->windows.tqfindIndex( w ) != -1;
+    return d->windows.findIndex( w ) != -1;
 }
 
 const TQValueList<WId>& KWinModule::systemTrayWindows() const
@@ -243,7 +243,7 @@ bool KWinModulePrivate::x11Event( XEvent * ev )
 	    for ( TQPtrListIterator<KWinModule> mit( modules ); mit.current(); ++mit )
 		emit (*mit)->showingDesktopChanged( showingDesktop());
         }
-    } else  if ( windows.tqfindIndex( ev->xany.window ) != -1 ){
+    } else  if ( windows.findIndex( ev->xany.window ) != -1 ){
 	NETWinInfo ni( qt_xdisplay(), ev->xany.window, qt_xrootwin(), 0 );
         unsigned long dirty[ 2 ];
 	ni.event( ev, dirty, 2 );
@@ -257,7 +257,7 @@ bool KWinModulePrivate::x11Event( XEvent * ev )
         }
 	if ( (dirty[ NETWinInfo::PROTOCOLS ] & NET::WMStrut) != 0 ) {
             removeStrutWindow( ev->xany.window );
-            if ( possibleStrutWindows.tqfindIndex( ev->xany.window ) == -1 )
+            if ( possibleStrutWindows.findIndex( ev->xany.window ) == -1 )
         	possibleStrutWindows.append( ev->xany.window );
 	}
 	if ( dirty[ NETWinInfo::PROTOCOLS ] || dirty[ NETWinInfo::PROTOCOLS2 ] ) {
@@ -295,7 +295,7 @@ void KWinModulePrivate::updateStackingOrder()
 
 void KWinModulePrivate::addClient(Window w)
 {
-    if ( (what >= KWinModule::INFO_WINDOWS) && !TQWidget::tqfind( w ) )
+    if ( (what >= KWinModule::INFO_WINDOWS) && !TQWidget::find( w ) )
 	XSelectInput( qt_xdisplay(), w, PropertyChangeMask | StructureNotifyMask );
     bool emit_strutChanged = false;
     if( strutSignalConnected && modules.count() > 0 ) {
@@ -318,7 +318,7 @@ void KWinModulePrivate::addClient(Window w)
 void KWinModulePrivate::removeClient(Window w)
 {
     bool emit_strutChanged = removeStrutWindow( w );
-    if( strutSignalConnected && possibleStrutWindows.tqfindIndex( w ) != -1 && modules.count() > 0 ) {
+    if( strutSignalConnected && possibleStrutWindows.findIndex( w ) != -1 && modules.count() > 0 ) {
         NETWinInfo info( qt_xdisplay(), w, qt_xrootwin(), NET::WMStrut );
         NETStrut strut = info.strut();
         if ( strut.left || strut.top || strut.right || strut.bottom ) {
@@ -382,16 +382,16 @@ TQRect KWinModule::workArea( int desktop ) const
 {
     int desk  = (desktop > 0 && desktop <= (int) d->numberOfDesktops() ) ? desktop : currentDesktop();
     if ( desk <= 0 )
-	return TQApplication::desktop()->tqgeometry();
+	return TQApplication::desktop()->geometry();
     NETRect r = d->workArea( desk );
     if( r.size.width <= 0 || r.size.height <= 0 ) // not set
-	return TQApplication::desktop()->tqgeometry();
+	return TQApplication::desktop()->geometry();
     return TQRect( r.pos.x, r.pos.y, r.size.width, r.size.height );
 }
 
 TQRect KWinModule::workArea( const TQValueList<WId>& exclude, int desktop ) const
 {
-    TQRect all = TQApplication::desktop()->tqgeometry();
+    TQRect all = TQApplication::desktop()->geometry();
     TQRect a = all;
 
     if (desktop == -1)
@@ -400,10 +400,10 @@ TQRect KWinModule::workArea( const TQValueList<WId>& exclude, int desktop ) cons
     TQValueList<WId>::ConstIterator it1;
     for( it1 = d->windows.begin(); it1 != d->windows.end(); ++it1 ) {
 
-	if(exclude.tqfindIndex(*it1) != -1) continue;
+	if(exclude.findIndex(*it1) != -1) continue;
         
 // Kicker (very) extensively calls this function, causing hundreds of roundtrips just
-// to repeatedly tqfind out struts of all windows. Therefore strut values for strut
+// to repeatedly find out struts of all windows. Therefore strut values for strut
 // windows are cached here.
         NETStrut strut;
         TQValueList< KWinModulePrivate::StrutData >::Iterator it2 = d->strutWindows.begin();
@@ -416,7 +416,7 @@ TQRect KWinModule::workArea( const TQValueList<WId>& exclude, int desktop ) cons
             if(!((*it2).desktop == desktop || (*it2).desktop == NETWinInfo::OnAllDesktops ))
                 continue;
             strut = (*it2).strut;
-        } else if( d->possibleStrutWindows.tqfindIndex( *it1 ) != -1 ) {
+        } else if( d->possibleStrutWindows.findIndex( *it1 ) != -1 ) {
             NETWinInfo info( qt_xdisplay(), (*it1), qt_xrootwin(), NET::WMStrut | NET::WMDesktop);
 	    strut = info.strut();
             d->possibleStrutWindows.remove( *it1 );
diff --git a/kdecore/kwinmodule.h b/kdecore/kwinmodule.h
index a15fd53a1..f680d561d 100644
--- a/kdecore/kwinmodule.h
+++ b/kdecore/kwinmodule.h
@@ -49,7 +49,7 @@ class KWinModulePrivate;
  * @short Base class for KDE Window Manager modules.
  * @author Matthias Ettrich (ettrich@kde.org)
  */
-class KDECORE_EXPORT KWinModule : public TQObject
+class KDECORE_EXPORT KWinModule : public QObject
 {
     Q_OBJECT
 
@@ -61,7 +61,7 @@ public:
     /**
      * Creates a KWinModule object and connects to the window
      * manager.
-     * @param parent the parent for the TQObject
+     * @param parent the parent for the QObject
      * @param what The information you are interested in:
      *   INFO_DESKTOP:  currentDesktop, 
      *                  numberOfDesktops, 
@@ -89,7 +89,7 @@ public:
     /**
      * Creates a KWinModule object and connects to the window
      * manager.
-     * @param parent the parent for the TQObject
+     * @param parent the parent for the QObject
      **/
     KWinModule( TQObject* parent = 0 );
 
@@ -298,7 +298,7 @@ signals:
     /**
      * The window changed.
      *
-     * The properties parameter tqcontains the NET properties that
+     * The properties parameter contains the NET properties that
      * were modified (see netwm_def.h). First element are NET::Property
      * values, second element are NET::Property2 values (i.e. the format
      * is the same like for the NETWinInfo class constructor).
@@ -311,7 +311,7 @@ signals:
      * @deprecated
      * The window changed.
      *
-     * The unsigned int parameter tqcontains the NET properties that
+     * The unsigned int parameter contains the NET properties that
      * were modified (see netwm_def.h).
      * @param id the id of the window
      * @param properties the properties that were modified
diff --git a/kdecore/kxmessages.cpp b/kdecore/kxmessages.cpp
index 85b573e81..6b6f971a2 100644
--- a/kdecore/kxmessages.cpp
+++ b/kdecore/kxmessages.cpp
@@ -150,7 +150,7 @@ bool KXMessages::sendMessageX( Display* disp, WId w_P, const char* msg_type_P,
     return true;
     }
     
-void KXMessages::send_message_internal( WId w_P, const TQString& msg_P, long tqmask_P,
+void KXMessages::send_message_internal( WId w_P, const TQString& msg_P, long mask_P,
     Display* disp, Atom atom1_P, Atom atom2_P, Window handle_P )
     {
     unsigned int pos = 0;
@@ -169,7 +169,7 @@ void KXMessages::send_message_internal( WId w_P, const TQString& msg_P, long tqm
              i < 20 && i + pos <= len;
              ++i )
             e.xclient.data.b[ i ] = msg[ i + pos ];
-        XSendEvent( disp, w_P, false, tqmask_P, &e );
+        XSendEvent( disp, w_P, false, mask_P, &e );
         e.xclient.message_type = atom2_P; // following messages
         pos += i;
         } while( pos <= len );
@@ -189,7 +189,7 @@ bool KXMessages::x11Event( XEvent* ev_P )
          ++i )
         buf[ i ] = ev_P->xclient.data.b[ i ];
     buf[ i ] = '\0';
-    if( incoming_messages.tqcontains( ev_P->xclient.window ))
+    if( incoming_messages.contains( ev_P->xclient.window ))
         {
         if( ev_P->xclient.message_type == accept_atom1 && accept_atom1 != accept_atom2 )
             // two different messages on the same window at the same time shouldn't happen anyway
diff --git a/kdecore/kxmessages.h b/kdecore/kxmessages.h
index 8b4c12270..256b69f91 100644
--- a/kdecore/kxmessages.h
+++ b/kdecore/kxmessages.h
@@ -153,7 +153,7 @@ class KDECORE_EXPORT KXMessages
 	 */
         virtual bool x11Event( XEvent* ev );
     private:
-        static void send_message_internal( WId w_P, const TQString& msg_P, long tqmask_P,
+        static void send_message_internal( WId w_P, const TQString& msg_P, long mask_P,
             Display* disp, Atom atom1_P, Atom atom2_P, Window handle_P );
         TQWidget* handle;
         Atom accept_atom2;
diff --git a/kdecore/libintl.cpp b/kdecore/libintl.cpp
index 5677dde82..aadfcd821 100644
--- a/kdecore/libintl.cpp
+++ b/kdecore/libintl.cpp
@@ -8,7 +8,7 @@ of glibc. The master sources can be found in
       dcgettext.c
       dgettext.c
       explodename.c
-      tqfinddomain.c
+      finddomain.c
       gettext.c
       gettext.h
       gettextP.h
@@ -77,7 +77,7 @@ Boston, MA 02110-1301, USA.  */
 # define W(flag, data) ((flag) ? SWAP (data) : (data))
 #endif
 
-typedef TQ_UINT32 nls_uint32;
+typedef Q_UINT32 nls_uint32;
 
 struct loaded_domain
 {
@@ -157,11 +157,11 @@ struct string_desc
 };
 
 /* Prototypes for local functions.  */
-char *k_nl_tqfind_msg  (struct kde_loaded_l10nfile *domain_file,
+char *k_nl_find_msg  (struct kde_loaded_l10nfile *domain_file,
 			const char *msgid);
 
 char *
-k_nl_tqfind_msg (struct kde_loaded_l10nfile *domain_file, const char *msgid)
+k_nl_find_msg (struct kde_loaded_l10nfile *domain_file, const char *msgid)
 {
   size_t top, act, bottom;
   struct loaded_domain *domain;
diff --git a/kdecore/libqt-mt.nmcheck b/kdecore/libqt-mt.nmcheck
index 017dc25d5..77b200029 100644
--- a/kdecore/libqt-mt.nmcheck
+++ b/kdecore/libqt-mt.nmcheck
@@ -8,8 +8,8 @@ qt_*
 qDebug
 qFatal
 qWarning
-tqApp
-tqAppName
+qApp
+qAppName
 qVersion
 qSysInfo
 qObsolete
diff --git a/kdecore/libqt-mt_weak.nmcheck b/kdecore/libqt-mt_weak.nmcheck
index 3eaf41e2d..d0b00eee4 100644
--- a/kdecore/libqt-mt_weak.nmcheck
+++ b/kdecore/libqt-mt_weak.nmcheck
@@ -6,13 +6,13 @@ Q*::*
 qstrcmp
 qstrcpy
 qstrlen
-tqAlpha
-tqRed
-tqGreen
-tqBlue
-tqGray
-tqRgba
-tqRgb
+qAlpha
+qRed
+qGreen
+qBlue
+qGray
+qRgba
+qRgb
 qSwap
 qCopy
 qHeapSort
diff --git a/kdecore/malloc/README b/kdecore/malloc/README
index 52c089e89..181c29764 100644
--- a/kdecore/malloc/README
+++ b/kdecore/malloc/README
@@ -38,7 +38,7 @@ commented out #including malloc.h
 added #include <config.h> at the top and enclosed whole file in #ifdef KDE_MALLOC
 taken posix_memalign() from glibc
 removed public icalloc(),icomalloc(),mtrim(),musable()  (they don't exist everywhere anyway)
-enclosed the pthreads part by #if 0 and tqreplaced it with spinlock from glibc CVS (in x86.h)
+enclosed the pthreads part by #if 0 and replaced it with spinlock from glibc CVS (in x86.h)
     also added :
 ----------
 static mutex_t spinlock = MUTEX_INITIALIZER;
diff --git a/kdecore/malloc/malloc.c b/kdecore/malloc/malloc.c
index 39d950a7d..dba0fdef0 100644
--- a/kdecore/malloc/malloc.c
+++ b/kdecore/malloc/malloc.c
@@ -44,7 +44,7 @@ int kde_malloc_is_used = 0;
   For convenience, an include file for code using this malloc is at:
      ftp://gee.cs.oswego.edu/pub/misc/malloc-2.7.0.h
   You don't really need this .h file unless you call functions not
-  defined in your system include files.  The .h file tqcontains only the
+  defined in your system include files.  The .h file contains only the
   excerpts from this file needed for using this malloc on ANSI C/C++
   systems, so long as you haven't changed compile-time options about
   naming and tuning parameters.  If you do, then you can create your
@@ -85,7 +85,7 @@ int kde_malloc_is_used = 0;
     calloc(size_t n_elements, size_t element_size);
     free(Void_t* p);
     realloc(Void_t* p, size_t n);
-    memalign(size_t tqalignment, size_t n);
+    memalign(size_t alignment, size_t n);
     valloc(size_t n);
     mallinfo()
     mallopt(int parameter_number, int parameter_value)
@@ -107,7 +107,7 @@ int kde_malloc_is_used = 0;
        You can adjust this by defining INTERNAL_SIZE_T
 
   Alignment:                              2 * sizeof(size_t) (default)
-       (i.e., 8 byte tqalignment with 4byte size_t). This suffices for
+       (i.e., 8 byte alignment with 4byte size_t). This suffices for
        nearly all current machines and C compilers. However, you can
        define MALLOC_ALIGNMENT to be wider than this if necessary.
 
@@ -146,7 +146,7 @@ int kde_malloc_is_used = 0;
        default used to obtain memory from system) accepts signed
        arguments, and may not be able to handle size_t-wide arguments
        with negative sign bit.  Generally, values that would
-       appear as negative after accounting for overhead and tqalignment
+       appear as negative after accounting for overhead and alignment
        are supported only via mmap(), which does not have this
        limitation.
 
@@ -393,8 +393,8 @@ extern "C" {
   defining INTERNAL_SIZE_T to be a 32 bit `unsigned int' at the
   expense of not being able to handle more than 2^32 of malloced
   space. If this limitation is acceptable, you are encouraged to set
-  this unless you are on a platform requiring 16byte tqalignments. In
-  this case the tqalignment requirements turn out to negate any
+  this unless you are on a platform requiring 16byte alignments. In
+  this case the alignment requirements turn out to negate any
   potential advantages of decreasing size_t word size.
 
   Implementors: Beware of the possible combinations of:
@@ -419,11 +419,11 @@ extern "C" {
 
 
 /*
-  MALLOC_ALIGNMENT is the minimum tqalignment for malloc'ed chunks.
+  MALLOC_ALIGNMENT is the minimum alignment for malloc'ed chunks.
   It must be a power of two at least 2 * SIZE_SZ, even on machines
-  for which smaller tqalignments would suffice. It may be defined as
+  for which smaller alignments would suffice. It may be defined as
   larger than this though. Note however that code and data structures
-  are optimized for the case of 8-byte tqalignment.
+  are optimized for the case of 8-byte alignment.
 */
 
 
@@ -431,7 +431,7 @@ extern "C" {
 #define MALLOC_ALIGNMENT       (2 * SIZE_SZ)
 #endif
 
-/* The corresponding bit tqmask value */
+/* The corresponding bit mask value */
 #define MALLOC_ALIGN_MASK      (MALLOC_ALIGNMENT - 1)
 
 
@@ -824,7 +824,7 @@ extern Void_t*     sbrk();
   there's no compelling reason to bother to do this.)
 
   The main declaration needed is the mallinfo struct that is returned
-  (by-copy) by mallinfo().  The SVID/XPG malloinfo struct tqcontains a
+  (by-copy) by mallinfo().  The SVID/XPG malloinfo struct contains a
   bunch of field that are not even meaningful in this version of
   malloc.  These fields are are instead filled by mallinfo() with
   other numbers that might be of interest.
@@ -925,7 +925,7 @@ Void_t*  public_cALLOc();
 
 /*
   realloc(Void_t* p, size_t n)
-  Returns a pointer to a chunk of size n that tqcontains the same data
+  Returns a pointer to a chunk of size n that contains the same data
   as does chunk p up to the minimum of (n, p's size) bytes, or null
   if no space is available. 
 
@@ -957,13 +957,13 @@ Void_t*  public_rEALLOc();
 #endif
 
 /*
-  memalign(size_t tqalignment, size_t n);
+  memalign(size_t alignment, size_t n);
   Returns a pointer to a newly allocated chunk of n bytes, aligned
-  in accord with the tqalignment argument.
+  in accord with the alignment argument.
 
-  The tqalignment argument should be a power of two. If the argument is
+  The alignment argument should be a power of two. If the argument is
   not a power of two, the nearest greater power is used.
-  8-byte tqalignment is guaranteed by normal malloc calls, so don't
+  8-byte alignment is guaranteed by normal malloc calls, so don't
   bother calling memalign with an argument of 8 or less.
 
   Overreliance on memalign is a sure way to fragment space.
@@ -1228,7 +1228,7 @@ int      public_mTRIm();
 
   Returns the number of bytes you can actually use in
   an allocated chunk, which may be more than you requested (although
-  often not) due to tqalignment and minimum size constraints.
+  often not) due to alignment and minimum size constraints.
   You can use this many bytes without worrying about
   overwriting other allocated objects. This is not a particularly great
   programming practice. malloc_usable_size can be more useful in
@@ -1252,8 +1252,8 @@ size_t   public_mUSABLe();
   number of bytes allocated via malloc (or realloc, etc) but not yet
   freed. Note that this is the number of bytes allocated, not the
   number requested. It will be larger than the number requested
-  because of tqalignment and bookkeeping overhead. Because it includes
-  tqalignment wastage as being in use, this figure may be greater than
+  because of alignment and bookkeeping overhead. Because it includes
+  alignment wastage as being in use, this figure may be greater than
   zero even when no user-level chunks are allocated.
 
   The reported current and maximum system memory can be inaccurate if
@@ -1290,7 +1290,7 @@ void     public_mSTATs();
   fragmentation without improving speed.
 
   M_MXFAST is set in REQUEST size units. It is internally used in
-  chunksize units, which adds padding and tqalignment.  You can reduce
+  chunksize units, which adds padding and alignment.  You can reduce
   M_MXFAST to 0 to disable all use of fastbins.  This causes the malloc
   algorithm to be a closer approximation of fifo-best-fit in all cases,
   not just for larger requests, but will generally cause it to be
@@ -1434,7 +1434,7 @@ void     public_mSTATs();
 
    1. The space cannot be reclaimed, consolidated, and then
       used to service later requests, as happens with normal chunks.
-   2. It can lead to more wastage because of mmap page tqalignment
+   2. It can lead to more wastage because of mmap page alignment
       requirements
    3. It causes malloc performance to be more dependent on host
       system memory management support routines which may vary in
@@ -1614,12 +1614,12 @@ Void_t* public_rEALLOc(Void_t* m, size_t bytes) {
   return m;
 }
 
-Void_t* public_mEMALIGn(size_t tqalignment, size_t bytes) {
+Void_t* public_mEMALIGn(size_t alignment, size_t bytes) {
   Void_t* m;
   if (MALLOC_PREACTION != 0) {
     return 0;
   }
-  m = mEMALIGn(tqalignment, bytes);
+  m = mEMALIGn(alignment, bytes);
   if (MALLOC_POSTACTION != 0) {
   }
   return m;
@@ -1928,8 +1928,8 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
     The P (PREV_INUSE) bit, stored in the unused low-order bit of the
     chunk size (which is always a multiple of two words), is an in-use
     bit for the *previous* chunk.  If that bit is *clear*, then the
-    word before the current chunk size tqcontains the previous chunk
-    size, and can be used to tqfind the front of the previous chunk.
+    word before the current chunk size contains the previous chunk
+    size, and can be used to find the front of the previous chunk.
     The very first chunk allocated always has this bit set,
     preventing access to non-existent (or non-owned) memory. If
     prev_inuse is set for any given chunk, then you CANNOT determine
@@ -1938,7 +1938,7 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 
     Note that the `foot' of the current chunk is actually represented
     as the prev_size of the NEXT chunk. This makes it easier to
-    deal with tqalignments etc but can be very confusing when trying
+    deal with alignments etc but can be very confusing when trying
     to extend or adapt this code.
 
     The two exceptions to all this are
@@ -1956,7 +1956,7 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 */
 
 /*
-  ---------- Size and tqalignment checks and conversions ----------
+  ---------- Size and alignment checks and conversions ----------
 */
 
 /* conversion from malloc headers to user pointers, and back */
@@ -1972,7 +1972,7 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 #define MINSIZE  \
   (unsigned long)(((MIN_CHUNK_SIZE+MALLOC_ALIGN_MASK) & ~MALLOC_ALIGN_MASK))
 
-/* Check if m has acceptable tqalignment */
+/* Check if m has acceptable alignment */
 
 #define aligned_OK(m)  (((unsigned long)((m)) & (MALLOC_ALIGN_MASK)) == 0)
 
@@ -2022,9 +2022,9 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 #define chunk_is_mmapped(p) ((p)->size & IS_MMAPPED)
 
 /* 
-  Bits to tqmask off when extracting size 
+  Bits to mask off when extracting size 
 
-  Note: IS_MMAPPED is intentionally not tqmasked off from size field in
+  Note: IS_MMAPPED is intentionally not masked off from size field in
   macros for which mmapped chunks should never be seen. This should
   cause helpful core dumps to occur if it is tried by accident by
   people extending or adapting this malloc.
@@ -2641,7 +2641,7 @@ static void do_check_remalloced_chunk(p, s) mchunkptr p; INTERNAL_SIZE_T s;
   /* Legal size ... */
   assert((sz & MALLOC_ALIGN_MASK) == 0);
   assert((unsigned long)(sz) >= MINSIZE);
-  /* ... and tqalignment */
+  /* ... and alignment */
   assert(aligned_OK(chunk2mem(p)));
   /* chunk is less than MINSIZE more than request */
   assert((long)(sz) - (long)(s) >= 0);
@@ -2704,7 +2704,7 @@ static void do_check_malloc_state()
   /* internal size_t must be no wider than pointer type */
   assert(sizeof(INTERNAL_SIZE_T) <= sizeof(char*));
 
-  /* tqalignment is a power of 2 */
+  /* alignment is a power of 2 */
   assert((MALLOC_ALIGNMENT & (MALLOC_ALIGNMENT-1)) == 0);
 
   /* cannot run remaining checks until fully initialized */
@@ -2843,7 +2843,7 @@ static int sYSTRIm(pad, av) size_t pad; mstate av;
       
       /*
         Attempt to release memory. We ignore MORECORE return value,
-        and instead call again to tqfind out where new end of memory is.
+        and instead call again to find out where new end of memory is.
         This avoids problems if first call releases less than we asked,
         of if failure somehow altered brk value. (We could still
         encounter problems if it altered brk in some very bad way,
@@ -3145,7 +3145,7 @@ void fREe(mem) Void_t* mem;
   sysmalloc handles malloc cases requiring more memory from the system.
   On entry, it is assumed that av->top does not have enough
   space to service request for nb bytes, thus requiring that av->top
-  be extended or tqreplaced.
+  be extended or replaced.
 */
 
 INLINE
@@ -3175,7 +3175,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av;
 
   unsigned long   sum;            /* for updating stats */
 
-  size_t          pagetqmask  = av->pagesize - 1;
+  size_t          pagemask  = av->pagesize - 1;
 
 
 #if HAVE_MMAP
@@ -3197,7 +3197,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av;
       is one SIZE_SZ unit larger than for normal chunks, because there
       is no following chunk whose prev_size field could be used.
     */
-    size = (nb + SIZE_SZ + MALLOC_ALIGN_MASK + pagetqmask) & ~pagetqmask;
+    size = (nb + SIZE_SZ + MALLOC_ALIGN_MASK + pagemask) & ~pagemask;
 
     /* Don't try if size wraps around 0 */
     if ((unsigned long)(size) > (unsigned long)(nb)) {
@@ -3209,7 +3209,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av;
         /*
           The offset to the start of the mmapped region is stored
           in the prev_size field of the chunk. This allows us to adjust
-          returned start address to meet tqalignment requirements here 
+          returned start address to meet alignment requirements here 
           and in memalign(), and still be able to compute proper
           address argument for later munmap in free() and realloc().
         */
@@ -3288,11 +3288,11 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av;
     Round to a multiple of page size.
     If MORECORE is not contiguous, this ensures that we only call it
     with whole-page arguments.  And if MORECORE is contiguous and
-    this is not first time through, this preserves page-tqalignment of
+    this is not first time through, this preserves page-alignment of
     previous calls. Otherwise, we correct to page-align below.
   */
 
-  size = (size + pagetqmask) & ~pagetqmask;
+  size = (size + pagemask) & ~pagemask;
 
   /*
     Don't try to call MORECORE if argument is so big as to appear
@@ -3317,7 +3317,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av;
 
     /* Cannot merge with old top, so add its size back in */
     if (contiguous(av))
-      size = (size + old_size + pagetqmask) & ~pagetqmask;
+      size = (size + old_size + pagemask) & ~pagemask;
 
     /* If we are relying on mmap as backup, then use larger units */
     if ((unsigned long)(size) < (unsigned long)(MMAP_AS_MORECORE_SIZE))
@@ -3330,7 +3330,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av;
       
       if (brk != (char*)(MORECORE_FAILURE)) {
         
-        /* We do not need, and cannot use, another sbrk call to tqfind end */
+        /* We do not need, and cannot use, another sbrk call to find end */
         snd_brk = brk + size;
         
         /* 
@@ -3360,7 +3360,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av;
       Otherwise, make adjustments:
       
       * If the first time through or noncontiguous, we need to call sbrk
-        just to tqfind out where the end of memory lies.
+        just to find out where the end of memory lies.
 
       * We need to ensure that all returned chunks from malloc will meet
         MALLOC_ALIGNMENT
@@ -3384,7 +3384,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av;
       /* handle contiguous cases */
       if (contiguous(av)) { 
         
-        /* Guarantee tqalignment of first new chunk made from this space */
+        /* Guarantee alignment of first new chunk made from this space */
 
         front_misalign = (INTERNAL_SIZE_T)chunk2mem(brk) & MALLOC_ALIGN_MASK;
         if (front_misalign > 0) {
@@ -3410,13 +3410,13 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av;
         
         /* Extend the end address to hit a page boundary */
         end_misalign = (INTERNAL_SIZE_T)(brk + size + correction);
-        correction += ((end_misalign + pagetqmask) & ~pagetqmask) - end_misalign;
+        correction += ((end_misalign + pagemask) & ~pagemask) - end_misalign;
         
         assert(correction >= 0);
         snd_brk = (char*)(MORECORE(correction));
         
         /*
-          If can't allocate correction, try to at least tqfind out current
+          If can't allocate correction, try to at least find out current
           brk.  It might be enough to proceed without failing.
           
           Note that if second sbrk did NOT fail, we assume that space
@@ -3454,7 +3454,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av;
           double fencepost at old_top to prevent consolidation with space
           we don't own. These fenceposts are artificial chunks that are
           marked as inuse and are in any case too small to use.  We need
-          two to make sizes and tqalignments work out.
+          two to make sizes and alignments work out.
         */
    
         if (old_size != 0) {
@@ -3554,7 +3554,7 @@ Void_t* mALLOc(size_t bytes)
 
   /*
     Convert request size to internal form by adding SIZE_SZ bytes
-    overhead plus possibly more to obtain necessary tqalignment and/or
+    overhead plus possibly more to obtain necessary alignment and/or
     to obtain a size of at least MINSIZE, the smallest allocatable
     size. Also, checked_request2size traps (returning 0) request sizes
     that are so large that they wrap around zero when padded and
@@ -3582,7 +3582,7 @@ Void_t* mALLOc(size_t bytes)
     If a small request, check regular bin.  Since these "smallbins"
     hold one size each, no searching within bins is necessary.
     (For a large request, we need to wait until unsorted chunks are
-    processed to tqfind best fit. But for small ones, fits are exact
+    processed to find best fit. But for small ones, fits are exact
     anyway, so we can check now, which is faster.)
   */
 
@@ -3718,7 +3718,7 @@ Void_t* mALLOc(size_t bytes)
    
     /*
       If a large request, scan through the chunks of current bin in
-      sorted order to tqfind smallest that fits.  This is the only step
+      sorted order to find smallest that fits.  This is the only step
       where an unbounded number of chunks might be scanned without doing
       anything useful with them. However the lists tend to be short.
     */
@@ -4066,12 +4066,12 @@ Void_t* rEALLOc(oldmem, bytes) Void_t* oldmem; size_t bytes;
 
 #if HAVE_MREMAP
     INTERNAL_SIZE_T offset = oldp->prev_size;
-    size_t pagetqmask = av->pagesize - 1;
+    size_t pagemask = av->pagesize - 1;
     char *cp;
     unsigned long sum;
     
     /* Note the extra SIZE_SZ overhead */
-    newsize = (nb + offset + SIZE_SZ + pagetqmask) & ~pagetqmask;
+    newsize = (nb + offset + SIZE_SZ + pagemask) & ~pagemask;
 
     /* don't need to remap if still within same page */
     if (oldsize == newsize - offset) 
@@ -4127,54 +4127,54 @@ Void_t* rEALLOc(oldmem, bytes) Void_t* oldmem; size_t bytes;
 
 INLINE
 #if __STD_C
-Void_t* mEMALIGn(size_t tqalignment, size_t bytes)
+Void_t* mEMALIGn(size_t alignment, size_t bytes)
 #else
-Void_t* mEMALIGn(tqalignment, bytes) size_t tqalignment; size_t bytes;
+Void_t* mEMALIGn(alignment, bytes) size_t alignment; size_t bytes;
 #endif
 {
   INTERNAL_SIZE_T nb;             /* padded  request size */
   char*           m;              /* memory returned by malloc call */
   mchunkptr       p;              /* corresponding chunk */
-  char*           brk;            /* tqalignment point within p */
+  char*           brk;            /* alignment point within p */
   mchunkptr       newp;           /* chunk to return */
   INTERNAL_SIZE_T newsize;        /* its size */
-  INTERNAL_SIZE_T leadsize;       /* leading space before tqalignment point */
+  INTERNAL_SIZE_T leadsize;       /* leading space before alignment point */
   mchunkptr       remainder;      /* spare room at end to split off */
   unsigned long   remainder_size; /* its size */
   INTERNAL_SIZE_T size;
 
-  /* If need less tqalignment than we give anyway, just relay to malloc */
+  /* If need less alignment than we give anyway, just relay to malloc */
 
-  if (tqalignment <= MALLOC_ALIGNMENT) return mALLOc(bytes);
+  if (alignment <= MALLOC_ALIGNMENT) return mALLOc(bytes);
 
   /* Otherwise, ensure that it is at least a minimum chunk size */
 
-  if (tqalignment <  MINSIZE) tqalignment = MINSIZE;
+  if (alignment <  MINSIZE) alignment = MINSIZE;
 
-  /* Make sure tqalignment is power of 2 (in case MINSIZE is not).  */
-  if ((tqalignment & (tqalignment - 1)) != 0) {
+  /* Make sure alignment is power of 2 (in case MINSIZE is not).  */
+  if ((alignment & (alignment - 1)) != 0) {
     size_t a = MALLOC_ALIGNMENT * 2;
-    while ((unsigned long)a < (unsigned long)tqalignment) a <<= 1;
-    tqalignment = a;
+    while ((unsigned long)a < (unsigned long)alignment) a <<= 1;
+    alignment = a;
   }
 
   checked_request2size(bytes, nb);
 
   /*
-    Strategy: tqfind a spot within that chunk that meets the tqalignment
+    Strategy: find a spot within that chunk that meets the alignment
     request, and then possibly free the leading and trailing space.
   */
 
 
-  /* Call malloc with worst case padding to hit tqalignment. */
+  /* Call malloc with worst case padding to hit alignment. */
 
-  m  = (char*)(mALLOc(nb + tqalignment + MINSIZE));
+  m  = (char*)(mALLOc(nb + alignment + MINSIZE));
 
   if (m == 0) return 0; /* propagate failure */
 
   p = mem2chunk(m);
 
-  if ((((unsigned long)(m)) % tqalignment) != 0) { /* misaligned */
+  if ((((unsigned long)(m)) % alignment) != 0) { /* misaligned */
 
     /*
       Find an aligned spot inside chunk.  Since we need to give back
@@ -4184,10 +4184,10 @@ Void_t* mEMALIGn(tqalignment, bytes) size_t tqalignment; size_t bytes;
       total room so that this is always possible.
     */
 
-    brk = (char*)mem2chunk(((unsigned long)(m + tqalignment - 1)) &
-                           -((signed long) tqalignment));
+    brk = (char*)mem2chunk(((unsigned long)(m + alignment - 1)) &
+                           -((signed long) alignment));
     if ((unsigned long)(brk - (char*)(p)) < MINSIZE)
-      brk += tqalignment;
+      brk += alignment;
 
     newp = (mchunkptr)brk;
     leadsize = brk - (char*)(p);
@@ -4208,7 +4208,7 @@ Void_t* mEMALIGn(tqalignment, bytes) size_t tqalignment; size_t bytes;
     p = newp;
 
     assert (newsize >= nb &&
-            (((unsigned long)(chunk2mem(p))) % tqalignment) == 0);
+            (((unsigned long)(chunk2mem(p))) % alignment) == 0);
   }
 
   /* Also give back spare room at the end */
@@ -4375,7 +4375,7 @@ static Void_t** iALLOc(n_elements, sizes, opts, chunks) size_t n_elements; size_
       contents_size += request2size(sizes[i]);     
   }
 
-  /* subtract out tqalignment bytes from total to minimize overallocation */
+  /* subtract out alignment bytes from total to minimize overallocation */
   size = contents_size + array_size - MALLOC_ALIGN_MASK;
   
   /* 
@@ -5356,7 +5356,7 @@ History:
         and Anonymous.
       * Allow override of MALLOC_ALIGNMENT (Thanks to Ruud Waij for 
         helping test this.)
-      * memalign: check tqalignment arg
+      * memalign: check alignment arg
       * realloc: don't try to shift chunks backwards, since this
         leads to  more fragmentation in some programs and doesn't
         seem to help in any others.
@@ -5382,7 +5382,7 @@ History:
          * Set 'malloc_getpagesize' for WIN32 platforms (needs more work)
          * Use 'assert' rather than 'ASSERT' in WIN32 code to conform to
            usage of 'assert' in non-WIN32 code
-         * Improve WIN32 'sbrk()' emulation's 'tqfindRegion()' routine to
+         * Improve WIN32 'sbrk()' emulation's 'findRegion()' routine to
            avoid infinite loop
       * Always call 'fREe()' rather than 'free()'
 
@@ -5394,7 +5394,7 @@ History:
       * Added 64bit pointer support mainly from Wolfram Gloger
       * Added anonymously donated WIN32 sbrk emulation
       * Malloc, calloc, getpagesize: add optimizations from Raymond Nijssen
-      * malloc_extend_top: fix tqmask error that caused wastage after
+      * malloc_extend_top: fix mask error that caused wastage after
         foreign sbrks
       * Add linux mremap support code from HJ Liu
 
@@ -5409,7 +5409,7 @@ History:
       * Support another case of realloc via move into top
       * Fix error occurring when initial sbrk_base not word-aligned.
       * Rely on page size for units instead of SBRK_UNIT to
-        avoid surprises about sbrk tqalignment conventions.
+        avoid surprises about sbrk alignment conventions.
       * Add mallinfo, mallopt. Thanks to Raymond Nijssen
         (raymond@es.ele.tue.nl) for the suggestion.
       * Add `pad' argument to malloc_trim and top_pad mallopt parameter.
@@ -5452,7 +5452,7 @@ History:
     V2.5.1 Sat Aug 14 15:40:43 1993  Doug Lea  (dl at g)
       * faster bin computation & slightly different binning
       * merged all consolidations to one part of malloc proper
-         (eliminating old malloc_tqfind_space & malloc_clean_bin)
+         (eliminating old malloc_find_space & malloc_clean_bin)
       * Scan 2 returns chunks (not just 1)
       * Propagate failure in realloc if malloc returns 0
       * Add stuff to allow compilation on non-ANSI compilers
@@ -5569,7 +5569,7 @@ Void_t* public_rEALLOc(Void_t* m, size_t bytes) {
 #endif
 }
 
-Void_t* public_mEMALIGn(size_t tqalignment, size_t bytes) {
+Void_t* public_mEMALIGn(size_t alignment, size_t bytes) {
 #ifndef KDE_MALLOC_FULL
   if( malloc_type == 1 )
     {
@@ -5578,16 +5578,16 @@ Void_t* public_mEMALIGn(size_t tqalignment, size_t bytes) {
   if (MALLOC_PREACTION != 0) {
     return 0;
   }
-  m = mEMALIGn(tqalignment, bytes);
+  m = mEMALIGn(alignment, bytes);
   if (MALLOC_POSTACTION != 0) {
   }
   return m;
 #ifndef KDE_MALLOC_FULL
     }
   if( malloc_type == 2 )
-      return libc_memalign( tqalignment, bytes );
+      return libc_memalign( alignment, bytes );
   init_malloc_type();
-  return public_mEMALIGn( tqalignment, bytes );
+  return public_mEMALIGn( alignment, bytes );
 #endif
 }
 
@@ -5728,7 +5728,7 @@ int public_mALLOPt(int p, int v) {
 #endif
 
 int
-posix_memalign (void **memptr, size_t tqalignment, size_t size)
+posix_memalign (void **memptr, size_t alignment, size_t size)
 {
   void *mem;
 
@@ -5737,7 +5737,7 @@ posix_memalign (void **memptr, size_t tqalignment, size_t size)
   if (size % sizeof (void *) != 0 || (size & (size - 1)) != 0)
     return EINVAL;
 
-  mem = memalign (tqalignment, size);
+  mem = memalign (alignment, size);
 
   if (mem != NULL) {
     *memptr = mem;
diff --git a/kdecore/netsupp.cpp b/kdecore/netsupp.cpp
index 87368c121..6d56e147d 100644
--- a/kdecore/netsupp.cpp
+++ b/kdecore/netsupp.cpp
@@ -104,7 +104,7 @@ void kde_freeaddrinfo(struct kde_addrinfo *ai)
     {
       struct addrinfo *p, *last = NULL;
       /* We've added one AF_UNIX socket in here, to the
-       * tail of the linked list. We have to tqfind it */
+       * tail of the linked list. We have to find it */
       for (p = ai->data; p; p = p->ai_next)
 	{
 	  if (p->ai_family == AF_UNIX)
@@ -324,7 +324,7 @@ int kde_getaddrinfo(const char *name, const char *service,
   if (err == 0)
     for (p = res->data; p; p = p->ai_next)
       {
-	last = p;			// we have to tqfind out which one is last anyways
+	last = p;			// we have to find out which one is last anyways
 	if (p->ai_family == AF_UNIX)
 	  // there is an Unix node
 	  goto out;
@@ -715,9 +715,9 @@ static int make_inet(const char *name, int portnum, int protonum, struct addrinf
 # endif
 	  sin->sin_port = portnum;
 	  if (hint->ai_flags & AI_PASSIVE)
-	    *(TQ_UINT32*)&sin->sin_addr = INADDR_ANY;
+	    *(Q_UINT32*)&sin->sin_addr = INADDR_ANY;
 	  else
-	    *(TQ_UINT32*)&sin->sin_addr = htonl(INADDR_LOOPBACK);
+	    *(Q_UINT32*)&sin->sin_addr = htonl(INADDR_LOOPBACK);
 	  q->ai_flags = 0;
 	  q->ai_family = AF_INET;
 	  q->ai_socktype = hint->ai_socktype;
@@ -909,7 +909,7 @@ char *gai_strerror(int errorcode)
   return buffer;
 }
 
-static void tqfindport(unsigned short port, char *serv, size_t servlen, int flags)
+static void findport(unsigned short port, char *serv, size_t servlen, int flags)
 {
   if (serv == NULL)
     return;
@@ -978,7 +978,7 @@ int getnameinfo(const struct sockaddr *sa, ksocklen_t salen,
 	    return 1;		// error
 	}
 
-      tqfindport(s.sin->sin_port, serv, servlen, flags);
+      findport(s.sin->sin_port, serv, servlen, flags);
     }
 # ifdef AF_INET6
   else if (s.sa->sa_family == AF_INET6)
@@ -1003,7 +1003,7 @@ int getnameinfo(const struct sockaddr *sa, ksocklen_t salen,
 	    return 1;		// error
 	}
 
-      tqfindport(s.sin6->sin6_port, serv, servlen, flags);
+      findport(s.sin6->sin6_port, serv, servlen, flags);
     }
 # endif // AF_INET6
 
@@ -1016,7 +1016,7 @@ int getnameinfo(const struct sockaddr *sa, ksocklen_t salen,
 
 #define KRF_inet_ntop	KRF_USING_OWN_INET_NTOP
 
-static void add_dwords(char *buf, TQ_UINT16 *dw, int count)
+static void add_dwords(char *buf, Q_UINT16 *dw, int count)
 {
   int i = 1;
   sprintf(buf + strlen(buf), "%x", ntohs(dw[0]));
@@ -1027,7 +1027,7 @@ static void add_dwords(char *buf, TQ_UINT16 *dw, int count)
 const char* inet_ntop(int af, const void *cp, char *buf, size_t len)
 {
   char buf2[sizeof "1234:5678:9abc:def0:1234:5678:255.255.255.255" + 1];
-  TQ_UINT8 *data = (TQ_UINT8*)cp;
+  Q_UINT8 *data = (Q_UINT8*)cp;
 
   if (af == AF_INET)
     {
@@ -1046,8 +1046,8 @@ const char* inet_ntop(int af, const void *cp, char *buf, size_t len)
 # ifdef AF_INET6
   if (af == AF_INET6)
     {
-      TQ_UINT16 *p = (TQ_UINT16*)data;
-      TQ_UINT16 *longest = NULL, *cur = NULL;
+      Q_UINT16 *p = (Q_UINT16*)data;
+      Q_UINT16 *longest = NULL, *cur = NULL;
       int longest_length = 0, cur_length;
       int i;
 
@@ -1057,7 +1057,7 @@ const char* inet_ntop(int af, const void *cp, char *buf, size_t len)
 		buf[12], buf[13], buf[14], buf[15]);
       else
 	{
-	  // tqfind the longest sequence of zeroes
+	  // find the longest sequence of zeroes
 	  for (i = 0; i < 8; i++)
 	    if (cur == NULL && p[i] == 0)
 	      {
@@ -1150,7 +1150,7 @@ int inet_pton(int af, const char *cp, void *buf)
 # ifdef AF_INET6
   else if (af == AF_INET6)
     {
-      TQ_UINT16 addr[8];
+      Q_UINT16 addr[8];
       const char *p = cp;
       int n = 0, start = 8;
       bool has_v4 = strchr(p, '.') != NULL;
@@ -1200,8 +1200,8 @@ int inet_pton(int af, const char *cp, void *buf)
       // n < 8 means that we have to move n - start words 8 - n words to the right
       if (start == 8 && n != 8)
 	return 0;		// bad conversion
-      memmove(addr + start + (8 - n), addr + start, (n - start) * sizeof(TQ_UINT16));
-      memset(addr + start, 0, (8 - n) * sizeof(TQ_UINT16));
+      memmove(addr + start + (8 - n), addr + start, (n - start) * sizeof(Q_UINT16));
+      memset(addr + start, 0, (8 - n) * sizeof(Q_UINT16));
 
       // check the byte order
       // The compiler should optimise this out in big endian machines
diff --git a/kdecore/netsupp.h b/kdecore/netsupp.h
index a6d2015ea..4dba3f6cc 100644
--- a/kdecore/netsupp.h
+++ b/kdecore/netsupp.h
@@ -66,63 +66,63 @@ struct kde_in6_addr
 struct kde_sockaddr_in6
 {
 #ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
-  TQ_UINT8		sin6_len;
-  TQ_UINT8		sin6_family;
+  Q_UINT8		sin6_len;
+  Q_UINT8		sin6_family;
 #else  //HAVE_STRUCT_SOCKADDR_SA_LEN
-  TQ_UINT16		sin6_family;
+  Q_UINT16		sin6_family;
 #endif
   unsigned short       	sin6_port;	/* RFC says in_port_t */
-  TQ_UINT32		sin6_flowinfo;
+  Q_UINT32		sin6_flowinfo;
   struct kde_in6_addr	sin6_addr;
-  TQ_UINT32		sin6_scope_id;
+  Q_UINT32		sin6_scope_id;
 };
 
 /* IPv6 test macros that could be missing from some implementations */
 
 #define KDE_IN6_IS_ADDR_UNSPECIFIED(a) \
-	(((TQ_UINT32 *) (a))[0] == 0 && ((TQ_UINT32 *) (a))[1] == 0 && \
-	 ((TQ_UINT32 *) (a))[2] == 0 && ((TQ_UINT32 *) (a))[3] == 0)
+	(((Q_UINT32 *) (a))[0] == 0 && ((Q_UINT32 *) (a))[1] == 0 && \
+	 ((Q_UINT32 *) (a))[2] == 0 && ((Q_UINT32 *) (a))[3] == 0)
 
 #define KDE_IN6_IS_ADDR_LOOPBACK(a) \
-	(((TQ_UINT32 *) (a))[0] == 0 && ((TQ_UINT32 *) (a))[1] == 0 && \
-	 ((TQ_UINT32 *) (a))[2] == 0 && ((TQ_UINT32 *) (a))[3] == htonl (1))
+	(((Q_UINT32 *) (a))[0] == 0 && ((Q_UINT32 *) (a))[1] == 0 && \
+	 ((Q_UINT32 *) (a))[2] == 0 && ((Q_UINT32 *) (a))[3] == htonl (1))
 
 #define KDE_IN6_IS_ADDR_MULTICAST(a) (((u_int8_t *) (a))[0] == 0xff)
 
 #define KDE_IN6_IS_ADDR_LINKLOCAL(a) \
-	((((TQ_UINT32 *) (a))[0] & htonl (0xffc00000)) == htonl (0xfe800000))
+	((((Q_UINT32 *) (a))[0] & htonl (0xffc00000)) == htonl (0xfe800000))
 
 #define KDE_IN6_IS_ADDR_SITELOCAL(a) \
-	((((TQ_UINT32 *) (a))[0] & htonl (0xffc00000)) == htonl (0xfec00000))
+	((((Q_UINT32 *) (a))[0] & htonl (0xffc00000)) == htonl (0xfec00000))
 
 #define KDE_IN6_IS_ADDR_V4MAPPED(a) \
-	((((TQ_UINT32 *) (a))[0] == 0) && (((TQ_UINT32 *) (a))[1] == 0) && \
-	 (((TQ_UINT32 *) (a))[2] == htonl (0xffff)))
+	((((Q_UINT32 *) (a))[0] == 0) && (((Q_UINT32 *) (a))[1] == 0) && \
+	 (((Q_UINT32 *) (a))[2] == htonl (0xffff)))
 
 #define KDE_IN6_IS_ADDR_V4COMPAT(a) \
-	((((TQ_UINT32 *) (a))[0] == 0) && (((TQ_UINT32 *) (a))[1] == 0) && \
-	 (((TQ_UINT32 *) (a))[2] == 0) && (ntohl (((TQ_UINT32 *) (a))[3]) > 1))
+	((((Q_UINT32 *) (a))[0] == 0) && (((Q_UINT32 *) (a))[1] == 0) && \
+	 (((Q_UINT32 *) (a))[2] == 0) && (ntohl (((Q_UINT32 *) (a))[3]) > 1))
 
 #define KDE_IN6_ARE_ADDR_EQUAL(a,b) \
-	((((TQ_UINT32 *) (a))[0] == ((TQ_UINT32 *) (b))[0]) && \
-	 (((TQ_UINT32 *) (a))[1] == ((TQ_UINT32 *) (b))[1]) && \
-	 (((TQ_UINT32 *) (a))[2] == ((TQ_UINT32 *) (b))[2]) && \
-	 (((TQ_UINT32 *) (a))[3] == ((TQ_UINT32 *) (b))[3]))
+	((((Q_UINT32 *) (a))[0] == ((Q_UINT32 *) (b))[0]) && \
+	 (((Q_UINT32 *) (a))[1] == ((Q_UINT32 *) (b))[1]) && \
+	 (((Q_UINT32 *) (a))[2] == ((Q_UINT32 *) (b))[2]) && \
+	 (((Q_UINT32 *) (a))[3] == ((Q_UINT32 *) (b))[3]))
 
 #define KDE_IN6_IS_ADDR_MC_NODELOCAL(a) \
-	(KDE_IN6_IS_ADDR_MULTICAST(a) && ((((TQ_UINT8 *) (a))[1] & 0xf) == 0x1))
+	(KDE_IN6_IS_ADDR_MULTICAST(a) && ((((Q_UINT8 *) (a))[1] & 0xf) == 0x1))
 
 #define KDE_IN6_IS_ADDR_MC_LINKLOCAL(a) \
-	(KDE_IN6_IS_ADDR_MULTICAST(a) && ((((TQ_UINT8 *) (a))[1] & 0xf) == 0x2))
+	(KDE_IN6_IS_ADDR_MULTICAST(a) && ((((Q_UINT8 *) (a))[1] & 0xf) == 0x2))
 
 #define KDE_IN6_IS_ADDR_MC_SITELOCAL(a) \
-	(KDE_IN6_IS_ADDR_MULTICAST(a) && ((((TQ_UINT8 *) (a))[1] & 0xf) == 0x5))
+	(KDE_IN6_IS_ADDR_MULTICAST(a) && ((((Q_UINT8 *) (a))[1] & 0xf) == 0x5))
 
 #define KDE_IN6_IS_ADDR_MC_ORGLOCAL(a) \
-	(KDE_IN6_IS_ADDR_MULTICAST(a) && ((((TQ_UINT8 *) (a))[1] & 0xf) == 0x8))
+	(KDE_IN6_IS_ADDR_MULTICAST(a) && ((((Q_UINT8 *) (a))[1] & 0xf) == 0x8))
 
 #define KDE_IN6_IS_ADDR_MC_GLOBAL(a) \
-	(KDE_IN6_IS_ADDR_MULTICAST(a) && ((((TQ_UINT8 *) (a))[1] & 0xf) == 0xe))
+	(KDE_IN6_IS_ADDR_MULTICAST(a) && ((((Q_UINT8 *) (a))[1] & 0xf) == 0xe))
 
 #ifdef NEED_IN6_TESTS
 # define IN6_IS_ADDR_UNSPECIFIED	KDE_IN6_IS_ADDR_UNSPECIFIED
@@ -143,8 +143,8 @@ struct kde_sockaddr_in6
 /* Special internal structure */
 
 #define KAI_SYSTEM		0	/* data is all-system */
-#define KAI_LOCALUNIX		1	/* data tqcontains a Unix addrinfo allocated by us */
-#define KAI_QDNS		2	/* data tqcontains data derived from TQDns */
+#define KAI_LOCALUNIX		1	/* data contains a Unix addrinfo allocated by us */
+#define KAI_QDNS		2	/* data contains data derived from TQDns */
 
 struct addrinfo;		/* forward declaration; this could be needed */
 
diff --git a/kdecore/netwm.cpp b/kdecore/netwm.cpp
index 404ba9aab..9c8bd1283 100644
--- a/kdecore/netwm.cpp
+++ b/kdecore/netwm.cpp
@@ -46,7 +46,7 @@ static Atom UTF8_STRING = 0;
 static Atom net_supported            = 0;
 static Atom net_client_list          = 0;
 static Atom net_client_list_stacking = 0;
-static Atom net_desktop_tqgeometry     = 0;
+static Atom net_desktop_geometry     = 0;
 static Atom net_desktop_viewport     = 0;
 static Atom net_current_desktop      = 0;
 static Atom net_desktop_names        = 0;
@@ -56,7 +56,7 @@ static Atom net_workarea             = 0;
 static Atom net_supporting_wm_check  = 0;
 static Atom net_virtual_roots        = 0;
 static Atom net_showing_desktop      = 0;
-static Atom net_desktop_tqlayout       = 0;
+static Atom net_desktop_layout       = 0;
 
 // root window messages
 static Atom net_close_window         = 0;
@@ -74,7 +74,7 @@ static Atom net_wm_window_type       = 0;
 static Atom net_wm_state             = 0;
 static Atom net_wm_strut             = 0;
 static Atom net_wm_extended_strut    = 0; // the atom is called _NET_WM_STRUT_PARTIAL
-static Atom net_wm_icon_tqgeometry     = 0;
+static Atom net_wm_icon_geometry     = 0;
 static Atom net_wm_icon              = 0;
 static Atom net_wm_pid               = 0;
 static Atom net_wm_user_time         = 0;
@@ -149,7 +149,7 @@ static Atom xa_wm_state = 0;
 static Atom net_wm_full_placement = 0;
 
 static Bool netwm_atoms_created      = False;
-const unsigned long netwm_sendevent_tqmask = (SubstructureRedirectMask|
+const unsigned long netwm_sendevent_mask = (SubstructureRedirectMask|
 					     SubstructureNotifyMask);
 
 
@@ -346,14 +346,14 @@ static void create_atoms(Display *d) {
 	    &net_client_list,
 	    &net_client_list_stacking,
 	    &net_number_of_desktops,
-	    &net_desktop_tqgeometry,
+	    &net_desktop_geometry,
 	    &net_desktop_viewport,
 	    &net_current_desktop,
 	    &net_desktop_names,
 	    &net_active_window,
 	    &net_workarea,
 	    &net_virtual_roots,
-            &net_desktop_tqlayout,
+            &net_desktop_layout,
             &net_showing_desktop,
 	    &net_close_window,
             &net_restack_window,
@@ -369,7 +369,7 @@ static void create_atoms(Display *d) {
 	    &net_wm_state,
 	    &net_wm_strut,
             &net_wm_extended_strut,
-	    &net_wm_icon_tqgeometry,
+	    &net_wm_icon_geometry,
 	    &net_wm_icon,
 	    &net_wm_pid,
 	    &net_wm_user_time,
@@ -623,9 +623,9 @@ NETRootInfo::NETRootInfo(Display *display, Window supportWindow, const char *wmN
     p->kde_system_tray_windows = 0;
     p->kde_system_tray_windows_count = 0;
     p->showing_desktop = false;
-    p->desktop_tqlayout_orientation = OrientationHorizontal;
-    p->desktop_tqlayout_corner = DesktopLayoutCornerTopLeft;
-    p->desktop_tqlayout_columns = p->desktop_tqlayout_rows = 0;
+    p->desktop_layout_orientation = OrientationHorizontal;
+    p->desktop_layout_corner = DesktopLayoutCornerTopLeft;
+    p->desktop_layout_columns = p->desktop_layout_rows = 0;
     setDefaultProperties();
     if( properties_size > PROPERTIES_SIZE ) {
         fprintf( stderr, "NETRootInfo::NETRootInfo(): properties array too large\n");
@@ -724,9 +724,9 @@ NETRootInfo::NETRootInfo(Display *display, const unsigned long properties[], int
     p->kde_system_tray_windows = 0;
     p->kde_system_tray_windows_count = 0;
     p->showing_desktop = false;
-    p->desktop_tqlayout_orientation = OrientationHorizontal;
-    p->desktop_tqlayout_corner = DesktopLayoutCornerTopLeft;
-    p->desktop_tqlayout_columns = p->desktop_tqlayout_rows = 0;
+    p->desktop_layout_orientation = OrientationHorizontal;
+    p->desktop_layout_corner = DesktopLayoutCornerTopLeft;
+    p->desktop_layout_columns = p->desktop_layout_rows = 0;
     setDefaultProperties();
     if( properties_size > 2 ) {
         fprintf( stderr, "NETWinInfo::NETWinInfo(): properties array too large\n");
@@ -785,9 +785,9 @@ NETRootInfo::NETRootInfo(Display *display, unsigned long properties, int screen,
     p->kde_system_tray_windows = 0;
     p->kde_system_tray_windows_count = 0;
     p->showing_desktop = false;
-    p->desktop_tqlayout_orientation = OrientationHorizontal;
-    p->desktop_tqlayout_corner = DesktopLayoutCornerTopLeft;
-    p->desktop_tqlayout_columns = p->desktop_tqlayout_rows = 0;
+    p->desktop_layout_orientation = OrientationHorizontal;
+    p->desktop_layout_corner = DesktopLayoutCornerTopLeft;
+    p->desktop_layout_columns = p->desktop_layout_rows = 0;
     setDefaultProperties();
     p->client_properties[ PROTOCOLS ] = properties;
     for( int i = 0; i < PROPERTIES_SIZE; ++i )
@@ -989,7 +989,7 @@ void NETRootInfo::setNumberOfDesktops(int numberOfDesktops) {
 	e.xclient.data.l[3] = 0l;
 	e.xclient.data.l[4] = 0l;
 
-	XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+	XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
     }
 }
 
@@ -1021,7 +1021,7 @@ void NETRootInfo::setCurrentDesktop(int desktop) {
 	e.xclient.data.l[3] = 0l;
 	e.xclient.data.l[4] = 0l;
 
-	XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+	XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
     }
 }
 
@@ -1062,37 +1062,37 @@ void NETRootInfo::setDesktopName(int desktop, const char *desktopName) {
 }
 
 
-void NETRootInfo::setDesktopGeometry(int , const NETSize &tqgeometry) {
+void NETRootInfo::setDesktopGeometry(int , const NETSize &geometry) {
 
 #ifdef    NETWMDEBUG
     fprintf(stderr, "NETRootInfo::setDesktopGeometry( -- , { %d, %d }) (%s)\n",
-	    tqgeometry.width, tqgeometry.height, (role == WindowManager) ? "WM" : "Client");
+	    geometry.width, geometry.height, (role == WindowManager) ? "WM" : "Client");
 #endif
 
     if (role == WindowManager) {
-	p->tqgeometry = tqgeometry;
+	p->geometry = geometry;
 
 	long data[2];
-	data[0] = p->tqgeometry.width;
-	data[1] = p->tqgeometry.height;
+	data[0] = p->geometry.width;
+	data[1] = p->geometry.height;
 
-	XChangeProperty(p->display, p->root, net_desktop_tqgeometry, XA_CARDINAL, 32,
+	XChangeProperty(p->display, p->root, net_desktop_geometry, XA_CARDINAL, 32,
 			PropModeReplace, (unsigned char *) data, 2);
     } else {
 	XEvent e;
 
 	e.xclient.type = ClientMessage;
-	e.xclient.message_type = net_desktop_tqgeometry;
+	e.xclient.message_type = net_desktop_geometry;
 	e.xclient.display = p->display;
 	e.xclient.window = p->root;
 	e.xclient.format = 32;
-	e.xclient.data.l[0] = tqgeometry.width;
-	e.xclient.data.l[1] = tqgeometry.height;
+	e.xclient.data.l[0] = geometry.width;
+	e.xclient.data.l[1] = geometry.height;
 	e.xclient.data.l[2] = 0l;
 	e.xclient.data.l[3] = 0l;
 	e.xclient.data.l[4] = 0l;
 
-	XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+	XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
     }
 }
 
@@ -1135,7 +1135,7 @@ void NETRootInfo::setDesktopViewport(int desktop, const NETPoint &viewport) {
 	e.xclient.data.l[3] = 0l;
 	e.xclient.data.l[4] = 0l;
 
-	XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+	XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
     }
 }
 
@@ -1166,7 +1166,7 @@ void NETRootInfo::setSupported() {
 	atoms[pnum++] = net_number_of_desktops;
 
     if (p->properties[ PROTOCOLS ] & DesktopGeometry)
-	atoms[pnum++] = net_desktop_tqgeometry;
+	atoms[pnum++] = net_desktop_geometry;
 
     if (p->properties[ PROTOCOLS ] & DesktopViewport)
 	atoms[pnum++] = net_desktop_viewport;
@@ -1187,7 +1187,7 @@ void NETRootInfo::setSupported() {
 	atoms[pnum++] = net_virtual_roots;
 
     if (p->properties[ PROTOCOLS2 ] & WM2DesktopLayout)
-	atoms[pnum++] = net_desktop_tqlayout;
+	atoms[pnum++] = net_desktop_layout;
 
     if (p->properties[ PROTOCOLS ] & CloseWindow)
 	atoms[pnum++] = net_close_window;
@@ -1299,7 +1299,7 @@ void NETRootInfo::setSupported() {
 	atoms[pnum++] = net_wm_extended_strut;
 
     if (p->properties[ PROTOCOLS ] & WMIconGeometry)
-	atoms[pnum++] = net_wm_icon_tqgeometry;
+	atoms[pnum++] = net_wm_icon_geometry;
 
     if (p->properties[ PROTOCOLS ] & WMIcon)
 	atoms[pnum++] = net_wm_icon;
@@ -1402,7 +1402,7 @@ void NETRootInfo::updateSupportedProperties( Atom atom )
     else if( atom == net_number_of_desktops )
         p->properties[ PROTOCOLS ] |= NumberOfDesktops;
 
-    else if( atom == net_desktop_tqgeometry )
+    else if( atom == net_desktop_geometry )
         p->properties[ PROTOCOLS ] |= DesktopGeometry;
 
     else if( atom == net_desktop_viewport )
@@ -1423,7 +1423,7 @@ void NETRootInfo::updateSupportedProperties( Atom atom )
     else if( atom == net_virtual_roots )
         p->properties[ PROTOCOLS ] |= VirtualRoots;
 
-    else if( atom == net_desktop_tqlayout )
+    else if( atom == net_desktop_layout )
         p->properties[ PROTOCOLS2 ] |= WM2DesktopLayout;
 
     else if( atom == net_close_window )
@@ -1533,7 +1533,7 @@ void NETRootInfo::updateSupportedProperties( Atom atom )
     else if( atom == net_wm_extended_strut )
         p->properties[ PROTOCOLS2 ] |= WM2ExtendedStrut;
 
-    else if( atom == net_wm_icon_tqgeometry )
+    else if( atom == net_wm_icon_geometry )
         p->properties[ PROTOCOLS ] |= WMIconGeometry;
 
     else if( atom == net_wm_icon )
@@ -1631,7 +1631,7 @@ void NETRootInfo::setActiveWindow(Window window, NET::RequestSource src,
 	e.xclient.data.l[3] = 0l;
 	e.xclient.data.l[4] = 0l;
 
-	XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+	XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
     }
 }
 
@@ -1685,10 +1685,10 @@ void NETRootInfo::setVirtualRoots(Window *windows, unsigned int count) {
 void NETRootInfo::setDesktopLayout(NET::Orientation orientation, int columns, int rows,
     NET::DesktopLayoutCorner corner)
 {
-    p->desktop_tqlayout_orientation = orientation;
-    p->desktop_tqlayout_columns = columns;
-    p->desktop_tqlayout_rows = rows;
-    p->desktop_tqlayout_corner = corner;
+    p->desktop_layout_orientation = orientation;
+    p->desktop_layout_columns = columns;
+    p->desktop_layout_rows = rows;
+    p->desktop_layout_corner = corner;
 
 #ifdef   NETWMDEBUG
     fprintf(stderr, "NETRootInfo::setDesktopLayout: %d %d %d %d\n",
@@ -1700,7 +1700,7 @@ void NETRootInfo::setDesktopLayout(NET::Orientation orientation, int columns, in
     data[ 1 ] = columns;
     data[ 2 ] = rows;
     data[ 3 ] = corner;
-    XChangeProperty(p->display, p->root, net_desktop_tqlayout, XA_CARDINAL, 32,
+    XChangeProperty(p->display, p->root, net_desktop_layout, XA_CARDINAL, 32,
 		    PropModeReplace, (unsigned char *) &data, 4);
 }
 
@@ -1724,7 +1724,7 @@ void NETRootInfo::setShowingDesktop( bool showing ) {
 	e.xclient.data.l[3] = 0;
 	e.xclient.data.l[4] = 0;
 
-	XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+	XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
     }
 }
 
@@ -1754,7 +1754,7 @@ void NETRootInfo::closeWindowRequest(Window window) {
     e.xclient.data.l[3] = 0l;
     e.xclient.data.l[4] = 0l;
 
-    XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+    XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
 }
 
 
@@ -1781,7 +1781,7 @@ void NETRootInfo::moveResizeRequest(Window window, int x_root, int y_root,
     e.xclient.data.l[3] = 0l;
     e.xclient.data.l[4] = 0l;
 
-    XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+    XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
 }
 
 void NETRootInfo::moveResizeWindowRequest(Window window, int flags, int x, int y, int width, int height )
@@ -1806,7 +1806,7 @@ void NETRootInfo::moveResizeWindowRequest(Window window, int flags, int x, int y
     e.xclient.data.l[3] = width;
     e.xclient.data.l[4] = height;
 
-    XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+    XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
 }
 
 void NETRootInfo::restackRequest(Window window, Window above, int detail)
@@ -1835,7 +1835,7 @@ void NETRootInfo::restackRequest(Window window, RequestSource src, Window above,
     e.xclient.data.l[3] = timestamp;
     e.xclient.data.l[4] = 0l;
 
-    XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+    XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
 }
 
 void NETRootInfo2::sendPing( Window window, Time timestamp )
@@ -1937,7 +1937,7 @@ void NETRootInfo::event(XEvent *event, unsigned long* properties, int properties
 #endif
 
 	    changeNumberOfDesktops(event->xclient.data.l[0]);
-	} else if (event->xclient.message_type == net_desktop_tqgeometry) {
+	} else if (event->xclient.message_type == net_desktop_geometry) {
 	    dirty = DesktopGeometry;
 
 	    NETSize sz;
@@ -2125,7 +2125,7 @@ void NETRootInfo::event(XEvent *event, unsigned long* properties, int properties
 		dirty |= WorkArea;
 	    else if (pe.xproperty.atom == net_number_of_desktops)
 		dirty |= NumberOfDesktops;
-	    else if (pe.xproperty.atom == net_desktop_tqgeometry)
+	    else if (pe.xproperty.atom == net_desktop_geometry)
 		dirty |= DesktopGeometry;
 	    else if (pe.xproperty.atom == net_desktop_viewport)
 		dirty |= DesktopViewport;
@@ -2141,7 +2141,7 @@ void NETRootInfo::event(XEvent *event, unsigned long* properties, int properties
                 dirty |= SupportingWMCheck;
             else if (pe.xproperty.atom == net_virtual_roots )
                 dirty |= VirtualRoots;
-            else if (pe.xproperty.atom == net_desktop_tqlayout )
+            else if (pe.xproperty.atom == net_desktop_layout )
                 dirty2 |= WM2DesktopLayout;
 	    else {
 
@@ -2396,8 +2396,8 @@ void NETRootInfo::update( const unsigned long dirty_props[] )
     }
 
     if (dirty & DesktopGeometry) {
-        p->tqgeometry = p->rootSize;
-	if (XGetWindowProperty(p->display, p->root, net_desktop_tqgeometry,
+        p->geometry = p->rootSize;
+	if (XGetWindowProperty(p->display, p->root, net_desktop_geometry,
 			       0l, 2l, False, XA_CARDINAL, &type_ret, &format_ret,
 			       &nitems_ret, &unused, &data_ret)
 	    == Success) {
@@ -2405,11 +2405,11 @@ void NETRootInfo::update( const unsigned long dirty_props[] )
 		nitems_ret == 2) {
 		long *data = (long *) data_ret;
 
-		p->tqgeometry.width  = data[0];
-		p->tqgeometry.height = data[1];
+		p->geometry.width  = data[0];
+		p->geometry.height = data[1];
 
 #ifdef    NETWMDEBUG
-		fprintf(stderr, "NETRootInfo::update: desktop tqgeometry updated\n");
+		fprintf(stderr, "NETRootInfo::update: desktop geometry updated\n");
 #endif
 	    }
 	    if ( data_ret )
@@ -2609,29 +2609,29 @@ void NETRootInfo::update( const unsigned long dirty_props[] )
     }
 
     if (dirty2 & WM2DesktopLayout) {
-        p->desktop_tqlayout_orientation = OrientationHorizontal;
-        p->desktop_tqlayout_corner = DesktopLayoutCornerTopLeft;
-        p->desktop_tqlayout_columns = p->desktop_tqlayout_rows = 0;
-	if (XGetWindowProperty(p->display, p->root, net_desktop_tqlayout,
+        p->desktop_layout_orientation = OrientationHorizontal;
+        p->desktop_layout_corner = DesktopLayoutCornerTopLeft;
+        p->desktop_layout_columns = p->desktop_layout_rows = 0;
+	if (XGetWindowProperty(p->display, p->root, net_desktop_layout,
 			       0, MAX_PROP_SIZE, False, XA_CARDINAL, &type_ret,
 			       &format_ret, &nitems_ret, &unused, &data_ret)
 	    == Success) {
 	    if (type_ret == XA_CARDINAL && format_ret == 32) {
                 long* data = (long*) data_ret;
                 if( nitems_ret >= 4 && data[ 3 ] >= 0 && data[ 3 ] <= 3 )
-                    p->desktop_tqlayout_corner = (NET::DesktopLayoutCorner)data[ 3 ];
+                    p->desktop_layout_corner = (NET::DesktopLayoutCorner)data[ 3 ];
                 if( nitems_ret >= 3 ) {
                     if( data[ 0 ] >= 0 && data[ 0 ] <= 1 )
-                        p->desktop_tqlayout_orientation = (NET::Orientation)data[ 0 ];
-                    p->desktop_tqlayout_columns = data[ 1 ];
-                    p->desktop_tqlayout_rows = data[ 2 ];
+                        p->desktop_layout_orientation = (NET::Orientation)data[ 0 ];
+                    p->desktop_layout_columns = data[ 1 ];
+                    p->desktop_layout_rows = data[ 2 ];
                 }
 	    }
 
 #ifdef    NETWMDEBUG
-	    fprintf(stderr, "NETRootInfo::updated: desktop tqlayout updated (%d %d %d %d)\n",
-                p->desktop_tqlayout_orientation, p->desktop_tqlayout_columns,
-                p->desktop_tqlayout_rows, p->desktop_tqlayout_corner );
+	    fprintf(stderr, "NETRootInfo::updated: desktop layout updated (%d %d %d %d)\n",
+                p->desktop_layout_orientation, p->desktop_layout_columns,
+                p->desktop_layout_rows, p->desktop_layout_corner );
 #endif
 	    if ( data_ret )
 		XFree(data_ret);
@@ -2750,7 +2750,7 @@ int NETRootInfo::kdeSystemTrayWindowsCount() const {
 
 
 NETSize NETRootInfo::desktopGeometry(int) const {
-    return p->tqgeometry.width != 0 ? p->tqgeometry : p->rootSize;
+    return p->geometry.width != 0 ? p->geometry : p->rootSize;
 }
 
 
@@ -2794,17 +2794,17 @@ int NETRootInfo::virtualRootsCount() const {
 
 
 NET::Orientation NETRootInfo::desktopLayoutOrientation() const {
-    return p->desktop_tqlayout_orientation;
+    return p->desktop_layout_orientation;
 }
 
 
 TQSize NETRootInfo::desktopLayoutColumnsRows() const {
-    return TQSize( p->desktop_tqlayout_columns, p->desktop_tqlayout_rows );
+    return TQSize( p->desktop_layout_columns, p->desktop_layout_rows );
 }
 
 
 NET::DesktopLayoutCorner NETRootInfo::desktopLayoutCorner() const {
-    return p->desktop_tqlayout_corner;
+    return p->desktop_layout_corner;
 }
 
 
@@ -2982,16 +2982,16 @@ const NETWinInfo &NETWinInfo::operator=(const NETWinInfo &wininfo) {
 }
 
 
-void NETWinInfo::setIcon(NETIcon icon, Bool tqreplace) {
-    setIconInternal( p->icons, p->icon_count, net_wm_icon, icon, tqreplace );
+void NETWinInfo::setIcon(NETIcon icon, Bool replace) {
+    setIconInternal( p->icons, p->icon_count, net_wm_icon, icon, replace );
 }
 
-void NETWinInfo::setIconInternal(NETRArray<NETIcon>& icons, int& icon_count, Atom property, NETIcon icon, Bool tqreplace) {
+void NETWinInfo::setIconInternal(NETRArray<NETIcon>& icons, int& icon_count, Atom property, NETIcon icon, Bool replace) {
     if (role != Client) return;
 
     int proplen, i, sz, j;
 
-    if (tqreplace) {
+    if (replace) {
 
 	for (i = 0; i < icons.size(); i++) {
 	    delete [] icons[i].data;
@@ -3040,21 +3040,21 @@ void NETWinInfo::setIconInternal(NETRArray<NETIcon>& icons, int& icon_count, Ato
 }
 
 
-void NETWinInfo::setIconGeometry(NETRect tqgeometry) {
+void NETWinInfo::setIconGeometry(NETRect geometry) {
     if (role != Client) return;
 
-    p->icon_geom = tqgeometry;
+    p->icon_geom = geometry;
 
-    if( tqgeometry.size.width == 0 ) // empty
-        XDeleteProperty(p->display, p->window, net_wm_icon_tqgeometry);
+    if( geometry.size.width == 0 ) // empty
+        XDeleteProperty(p->display, p->window, net_wm_icon_geometry);
     else {
         long data[4];
-        data[0] = tqgeometry.pos.x;
-        data[1] = tqgeometry.pos.y;
-        data[2] = tqgeometry.size.width;
-        data[3] = tqgeometry.size.height;
+        data[0] = geometry.pos.x;
+        data[1] = geometry.pos.y;
+        data[2] = geometry.size.width;
+        data[3] = geometry.size.height;
 
-        XChangeProperty(p->display, p->window, net_wm_icon_tqgeometry, XA_CARDINAL,
+        XChangeProperty(p->display, p->window, net_wm_icon_geometry, XA_CARDINAL,
 		    32, PropModeReplace, (unsigned char *) data, 4);
     }
 }
@@ -3100,7 +3100,7 @@ void NETWinInfo::setStrut(NETStrut strut) {
 }
 
 
-void NETWinInfo::setState(unsigned long state, unsigned long tqmask) {
+void NETWinInfo::setState(unsigned long state, unsigned long mask) {
     if (p->mapping_state_dirty)
 	updateWMState();
 
@@ -3117,7 +3117,7 @@ void NETWinInfo::setState(unsigned long state, unsigned long tqmask) {
 
 #ifdef NETWMDEBUG
         fprintf(stderr, "NETWinInfo::setState (0x%lx, 0x%lx) (Client)\n",
-                state, tqmask);
+                state, mask);
 #endif // NETWMDEBUG
 
 	XEvent e;
@@ -3129,141 +3129,141 @@ void NETWinInfo::setState(unsigned long state, unsigned long tqmask) {
 	e.xclient.data.l[3] = 0l;
 	e.xclient.data.l[4] = 0l;
 
-	if ((tqmask & Modal) && ((p->state & Modal) != (state & Modal))) {
+	if ((mask & Modal) && ((p->state & Modal) != (state & Modal))) {
 	    e.xclient.data.l[0] = (state & Modal) ? 1 : 0;
 	    e.xclient.data.l[1] = net_wm_state_modal;
 	    e.xclient.data.l[2] = 0l;
 
-	    XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+	    XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
 	}
 
-	if ((tqmask & Sticky) && ((p->state & Sticky) != (state & Sticky))) {
+	if ((mask & Sticky) && ((p->state & Sticky) != (state & Sticky))) {
 	    e.xclient.data.l[0] = (state & Sticky) ? 1 : 0;
 	    e.xclient.data.l[1] = net_wm_state_sticky;
 	    e.xclient.data.l[2] = 0l;
 
-	    XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+	    XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
 	}
 
-	if ((tqmask & Max) && (( (p->state&tqmask) & Max) != (state & Max))) {
+	if ((mask & Max) && (( (p->state&mask) & Max) != (state & Max))) {
 
-	    unsigned long wishstate = (p->state & ~tqmask) | (state & tqmask);
+	    unsigned long wishstate = (p->state & ~mask) | (state & mask);
 	    if ( ( (wishstate & MaxHoriz) != (p->state & MaxHoriz) )
 		 && ( (wishstate & MaxVert) != (p->state & MaxVert) ) ) {
 		if ( (wishstate & Max) == Max ) {
 		    e.xclient.data.l[0] = 1;
 		    e.xclient.data.l[1] = net_wm_state_max_horiz;
 		    e.xclient.data.l[2] = net_wm_state_max_vert;
-		    XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+		    XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
 		} else if ( (wishstate & Max) == 0 ) {
 		    e.xclient.data.l[0] = 0;
 		    e.xclient.data.l[1] = net_wm_state_max_horiz;
 		    e.xclient.data.l[2] = net_wm_state_max_vert;
-		    XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+		    XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
 		} else {
 		    e.xclient.data.l[0] = ( wishstate & MaxHoriz ) ? 1 : 0;
 		    e.xclient.data.l[1] = net_wm_state_max_horiz;
 		    e.xclient.data.l[2] = 0;
-		    XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+		    XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
 		    e.xclient.data.l[0] = ( wishstate & MaxVert ) ? 1 : 0;
 		    e.xclient.data.l[1] = net_wm_state_max_vert;
 		    e.xclient.data.l[2] = 0;
-		    XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+		    XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
 		}
 	    } else	if ( (wishstate & MaxVert) != (p->state & MaxVert) ) {
 		e.xclient.data.l[0] = ( wishstate & MaxVert ) ? 1 : 0;
 		e.xclient.data.l[1] = net_wm_state_max_vert;
 		e.xclient.data.l[2] = 0;
-		XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+		XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
 	    } else if ( (wishstate & MaxHoriz) != (p->state & MaxHoriz) ) {
 		e.xclient.data.l[0] = ( wishstate & MaxHoriz ) ? 1 : 0;
 		e.xclient.data.l[1] = net_wm_state_max_horiz;
 		e.xclient.data.l[2] = 0;
-		XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+		XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
 	    }
 	}
 
-	if ((tqmask & Shaded) && ((p->state & Shaded) != (state & Shaded))) {
+	if ((mask & Shaded) && ((p->state & Shaded) != (state & Shaded))) {
 	    e.xclient.data.l[0] = (state & Shaded) ? 1 : 0;
 	    e.xclient.data.l[1] = net_wm_state_shaded;
 	    e.xclient.data.l[2] = 0l;
 
-	    XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+	    XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
 	}
 
-	if ((tqmask & SkipTaskbar) &&
+	if ((mask & SkipTaskbar) &&
 	    ((p->state & SkipTaskbar) != (state & SkipTaskbar))) {
 	    e.xclient.data.l[0] = (state & SkipTaskbar) ? 1 : 0;
 	    e.xclient.data.l[1] = net_wm_state_skip_taskbar;
 	    e.xclient.data.l[2] = 0l;
 
-	    XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+	    XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
 	}
 
-        if ((tqmask & SkipPager) &&
+        if ((mask & SkipPager) &&
 	    ((p->state & SkipPager) != (state & SkipPager))) {
             e.xclient.data.l[0] = (state & SkipPager) ? 1 : 0;
             e.xclient.data.l[1] = net_wm_state_skip_pager;
             e.xclient.data.l[2] = 0l;
 
-            XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+            XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
         }
 
-        if ((tqmask & Hidden) &&
+        if ((mask & Hidden) &&
 	    ((p->state & Hidden) != (state & Hidden))) {
             e.xclient.data.l[0] = (state & Hidden) ? 1 : 0;
             e.xclient.data.l[1] = net_wm_state_hidden;
             e.xclient.data.l[2] = 0l;
 
-            XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+            XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
         }
 
-        if ((tqmask & FullScreen) &&
+        if ((mask & FullScreen) &&
 	    ((p->state & FullScreen) != (state & FullScreen))) {
             e.xclient.data.l[0] = (state & FullScreen) ? 1 : 0;
             e.xclient.data.l[1] = net_wm_state_fullscreen;
             e.xclient.data.l[2] = 0l;
 
-            XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+            XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
         }
 
-        if ((tqmask & KeepAbove) &&
+        if ((mask & KeepAbove) &&
 	    ((p->state & KeepAbove) != (state & KeepAbove))) {
             e.xclient.data.l[0] = (state & KeepAbove) ? 1 : 0;
             e.xclient.data.l[1] = net_wm_state_above;
             e.xclient.data.l[2] = 0l;
 
-            XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+            XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
         }
 
-        if ((tqmask & KeepBelow) &&
+        if ((mask & KeepBelow) &&
 	    ((p->state & KeepBelow) != (state & KeepBelow))) {
             e.xclient.data.l[0] = (state & KeepBelow) ? 1 : 0;
             e.xclient.data.l[1] = net_wm_state_below;
             e.xclient.data.l[2] = 0l;
 
-            XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+            XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
         }
 
-	if ((tqmask & StaysOnTop) && ((p->state & StaysOnTop) != (state & StaysOnTop))) {
+	if ((mask & StaysOnTop) && ((p->state & StaysOnTop) != (state & StaysOnTop))) {
 	    e.xclient.data.l[0] = (state & StaysOnTop) ? 1 : 0;
 	    e.xclient.data.l[1] = net_wm_state_stays_on_top;
 	    e.xclient.data.l[2] = 0l;
 
-	    XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+	    XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
 	}
 
-        if ((tqmask & DemandsAttention) &&
+        if ((mask & DemandsAttention) &&
 	    ((p->state & DemandsAttention) != (state & DemandsAttention))) {
             e.xclient.data.l[0] = (state & DemandsAttention) ? 1 : 0;
             e.xclient.data.l[1] = net_wm_state_demands_attention;
             e.xclient.data.l[2] = 0l;
 
-            XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+            XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
         }
 
     } else {
-	p->state &= ~tqmask;
+	p->state &= ~mask;
 	p->state |= state;
 
 	long data[50];
@@ -3497,7 +3497,7 @@ void NETWinInfo::setDesktop(int desktop) {
 	e.xclient.data.l[3] = 0l;
 	e.xclient.data.l[4] = 0l;
 
-	XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+	XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
     } else {
 	// otherwise we just set or remove the property directly
 	p->desktop = desktop;
@@ -3651,7 +3651,7 @@ NETIcon NETWinInfo::iconInternal(NETRArray<NETIcon>& icons, int icon_count, int
 	return result;
     }
 
-    // tqfind the largest icon
+    // find the largest icon
     result = icons[0];
     for (int i = 1; i < icons.size(); i++) {
 	if( icons[i].size.width >= result.size.width &&
@@ -3662,7 +3662,7 @@ NETIcon NETWinInfo::iconInternal(NETRArray<NETIcon>& icons, int icon_count, int
     // return the largest icon if w and h are -1
     if (width == -1 && height == -1) return result;
 
-    // tqfind the icon that's closest in size to w x h...
+    // find the icon that's closest in size to w x h...
     for (int i = 0; i < icons.size(); i++) {
 	if ((icons[i].size.width >= width &&
 	     icons[i].size.width < result.size.width) &&
@@ -3708,15 +3708,15 @@ void NETWinInfo::event(XEvent *event, unsigned long* properties, int properties_
 	if (event->xclient.message_type == net_wm_state) {
 	    dirty = WMState;
 
-	    // we need to generate a change tqmask
+	    // we need to generate a change mask
 
 #ifdef NETWMDEBUG
 	    fprintf(stderr,
-		    "NETWinInfo::event: state client message, getting new state/tqmask\n");
+		    "NETWinInfo::event: state client message, getting new state/mask\n");
 #endif
 
 	    int i;
-	    long state = 0, tqmask = 0;
+	    long state = 0, mask = 0;
 
 	    for (i = 1; i < 3; i++) {
 #ifdef NETWMDEBUG
@@ -3728,43 +3728,43 @@ void NETWinInfo::event(XEvent *event, unsigned long* properties, int properties_
 #endif
 
 		if ((Atom) event->xclient.data.l[i] == net_wm_state_modal)
-		    tqmask |= Modal;
+		    mask |= Modal;
 		else if ((Atom) event->xclient.data.l[i] == net_wm_state_sticky)
-		    tqmask |= Sticky;
+		    mask |= Sticky;
 		else if ((Atom) event->xclient.data.l[i] == net_wm_state_max_vert)
-		    tqmask |= MaxVert;
+		    mask |= MaxVert;
 		else if ((Atom) event->xclient.data.l[i] == net_wm_state_max_horiz)
-		    tqmask |= MaxHoriz;
+		    mask |= MaxHoriz;
 		else if ((Atom) event->xclient.data.l[i] == net_wm_state_shaded)
-		    tqmask |= Shaded;
+		    mask |= Shaded;
 		else if ((Atom) event->xclient.data.l[i] == net_wm_state_skip_taskbar)
-		    tqmask |= SkipTaskbar;
+		    mask |= SkipTaskbar;
                 else if ((Atom) event->xclient.data.l[i] == net_wm_state_skip_pager)
-		    tqmask |= SkipPager;
+		    mask |= SkipPager;
                 else if ((Atom) event->xclient.data.l[i] == net_wm_state_hidden)
-		    tqmask |= Hidden;
+		    mask |= Hidden;
                 else if ((Atom) event->xclient.data.l[i] == net_wm_state_fullscreen)
-		    tqmask |= FullScreen;
+		    mask |= FullScreen;
                 else if ((Atom) event->xclient.data.l[i] == net_wm_state_above)
-		    tqmask |= KeepAbove;
+		    mask |= KeepAbove;
                 else if ((Atom) event->xclient.data.l[i] == net_wm_state_below)
-		    tqmask |= KeepBelow;
+		    mask |= KeepBelow;
                 else if ((Atom) event->xclient.data.l[i] == net_wm_state_demands_attention)
-		    tqmask |= DemandsAttention;
+		    mask |= DemandsAttention;
 		else if ((Atom) event->xclient.data.l[i] == net_wm_state_stays_on_top)
-		    tqmask |= StaysOnTop;
+		    mask |= StaysOnTop;
 	    }
 
 	    // when removing, we just leave newstate == 0
 	    switch (event->xclient.data.l[0]) {
 	    case 1: // set
-		// to set... the change state should be the same as the tqmask
-		state = tqmask;
+		// to set... the change state should be the same as the mask
+		state = mask;
 		break;
 
 	    case 2: // toggle
 		// to toggle, we need to xor the current state with the new state
-		state = (p->state & tqmask) ^ tqmask;
+		state = (p->state & mask) ^ mask;
 		break;
 
 	    default:
@@ -3774,10 +3774,10 @@ void NETWinInfo::event(XEvent *event, unsigned long* properties, int properties_
 
 #ifdef NETWMDEBUG
 	    fprintf(stderr, "NETWinInfo::event: calling changeState(%lx, %lx)\n",
-		    state, tqmask);
+		    state, mask);
 #endif
 
-	    changeState(state, tqmask);
+	    changeState(state, mask);
 	} else if (event->xclient.message_type == net_wm_desktop) {
 	    dirty = WMDesktop;
 
@@ -3818,7 +3818,7 @@ void NETWinInfo::event(XEvent *event, unsigned long* properties, int properties_
 		dirty |= WMStrut;
 	    else if (pe.xproperty.atom == net_wm_extended_strut)
 		dirty2 |= WM2ExtendedStrut;
-	    else if (pe.xproperty.atom == net_wm_icon_tqgeometry)
+	    else if (pe.xproperty.atom == net_wm_icon_geometry)
 		dirty |= WMIconGeometry;
 	    else if (pe.xproperty.atom == net_wm_icon)
 		dirty |= WMIcon;
@@ -3880,7 +3880,7 @@ void NETWinInfo::event(XEvent *event, unsigned long* properties, int properties_
 
 	dirty |= WMGeometry;
 
-	// update window tqgeometry
+	// update window geometry
 	p->win_geom.pos.x = event->xconfigure.x;
 	p->win_geom.pos.y = event->xconfigure.y;
 	p->win_geom.size.width = event->xconfigure.width;
@@ -4218,7 +4218,7 @@ void NETWinInfo::update(const unsigned long dirty_props[]) {
 
     if (dirty & WMIconGeometry) {
         p->icon_geom = NETRect();
-	if (XGetWindowProperty(p->display, p->window, net_wm_icon_tqgeometry, 0l, 4l,
+	if (XGetWindowProperty(p->display, p->window, net_wm_icon_geometry, 0l, 4l,
 			       False, XA_CARDINAL, &type_ret, &format_ret,
 			       &nitems_ret, &unused, &data_ret)
 	    == Success) {
@@ -4466,11 +4466,11 @@ NETExtendedStrut NETWinInfo::extendedStrut() const {
     return p->extended_strut;
 }
 
-bool NET::typeMatchesMask( WindowType type, unsigned long tqmask ) {
+bool NET::typeMatchesMask( WindowType type, unsigned long mask ) {
     switch( type ) {
 #define CHECK_TYPE_MASK( type ) \
         case type: \
-    	    if( tqmask & type##Mask ) \
+    	    if( mask & type##Mask ) \
 	        return true; \
 	    break;
         CHECK_TYPE_MASK( Normal )
@@ -4626,18 +4626,18 @@ Time NET::timestampDiff( Time time1, Time time2 ) // returns time2 - time1
 #else
 int NET::timestampCompare( unsigned long time1_, unsigned long time2_ ) // like strcmp()
     {
-    TQ_UINT32 time1 = time1_;
-    TQ_UINT32 time2 = time2_;
+    Q_UINT32 time1 = time1_;
+    Q_UINT32 time2 = time2_;
     if( time1 == time2 )
         return 0;
-    return TQ_UINT32( time1 - time2 ) < 0x7fffffffU ? 1 : -1; // time1 > time2 -> 1, handle wrapping
+    return Q_UINT32( time1 - time2 ) < 0x7fffffffU ? 1 : -1; // time1 > time2 -> 1, handle wrapping
     }
 
 int NET::timestampDiff( unsigned long time1_, unsigned long time2_ ) // returns time2 - time1
     { // no need to handle wrapping?
-    TQ_UINT32 time1 = time1_;
-    TQ_UINT32 time2 = time2_;
-    return TQ_UINT32( time2 - time1 );
+    Q_UINT32 time1 = time1_;
+    Q_UINT32 time2 = time2_;
+    return Q_UINT32( time2 - time1 );
     }
 #endif
 
diff --git a/kdecore/netwm.h b/kdecore/netwm.h
index 3fc86e955..cc39ada1d 100644
--- a/kdecore/netwm.h
+++ b/kdecore/netwm.h
@@ -86,7 +86,7 @@ public:
        [1]= NET::WindowTypeMask (not NET::WindowType!), [2]= NET::State,
        [3]= NET::Property2, [4]= NET::Action.
        In future versions, the list may be extended. In case you pass less elements,
-       the missing ones will be tqreplaced with default values.
+       the missing ones will be replaced with default values.
        
        @param properties_size The number of elements in the properties array.
 
@@ -251,7 +251,7 @@ public:
        to the first element of the properties argument, for the constructor
        for Clients, it's the properties argument.
        
-       Clients willing to tqfind out all properties and protocols supported
+       Clients willing to find out all properties and protocols supported
        by the WindowManager should use supportedProperties().
        
        @return an OR'ed list of protocols
@@ -316,7 +316,7 @@ public:
     int kdeSystemTrayWindowsCount() const;
 
     /**
-       Returns the desktop tqgeometry size.
+       Returns the desktop geometry size.
 
        The desktop argument is ignored. Early drafts of the NET WM
        Specification were unclear about the semantics of this property.
@@ -373,18 +373,18 @@ public:
     int virtualRootsCount() const;
 
     /**
-       Returns the desktop tqlayout orientation.
+       Returns the desktop layout orientation.
     **/
     NET::Orientation desktopLayoutOrientation() const;
 
     /**
-       Returns the desktop tqlayout number of columns and rows. Note that
+       Returns the desktop layout number of columns and rows. Note that
        either may be 0 (see _NET_DESKTOP_LAYOUT).
     **/
     TQSize desktopLayoutColumnsRows() const;
 
     /**
-       Returns the desktop tqlayout starting corner.
+       Returns the desktop layout starting corner.
     **/
     NET::DesktopLayoutCorner desktopLayoutCorner() const;
 
@@ -456,16 +456,16 @@ public:
     void setCurrentDesktop(int desktop);
 
     /**
-       Sets the desktop tqgeometry to the specified tqgeometry.
+       Sets the desktop geometry to the specified geometry.
 
        The desktop argument is ignored. Early drafts of the NET WM
        Specification were unclear about the semantics of this property.
 
        @param desktop the number of the desktop
 
-       @param tqgeometry the new size of the desktop
+       @param geometry the new size of the desktop
     **/
-    void setDesktopGeometry(int desktop, const NETSize &tqgeometry);
+    void setDesktopGeometry(int desktop, const NETSize &geometry);
 
     /**
        Sets the viewport for the current desktop to the specified point.
@@ -534,7 +534,7 @@ public:
     void setVirtualRoots(Window *windows, unsigned int count);
     
     /**
-       Sets the desktop tqlayout. This is set by the pager. When setting, the pager must
+       Sets the desktop layout. This is set by the pager. When setting, the pager must
        own the _NET_DESKTOP_LAYOUT_Sn manager selection. See _NET_DESKTOP_LAYOUT for details.
     **/
     void setDesktopLayout(NET::Orientation orientation, int columns, int rows,
@@ -633,7 +633,7 @@ public:
        This function takes the passed XEvent and returns an OR'ed list of
        NETRootInfo properties that have changed.  The new information will be
        read immediately by the class. This overloaded version returns
-       only a single tqmask, and therefore cannot check state of all properties
+       only a single mask, and therefore cannot check state of all properties
        like the other variant.
 
        @param event the event
@@ -690,7 +690,7 @@ protected:
     /**
        A Window Manager should subclass NETRootInfo and reimplement this function
        when it wants to know when a Client made a request to change the specified
-       desktop tqgeometry.
+       desktop geometry.
 
        @param desktop the number of the desktop
 
@@ -960,7 +960,7 @@ public:
        from the NET base class, in the following order: [0]= NET::Property,
        [1]= NET::Property2.
        In future versions, the list may be extended. In case you pass less elements,
-       the missing ones will be tqreplaced with default values.
+       the missing ones will be replaced with default values.
        
        @param properties_size The number of elements in the properties array.
 
@@ -1032,9 +1032,9 @@ public:
     unsigned long properties() const KDE_DEPRECATED;
 
     /**
-       Returns the icon tqgeometry.
+       Returns the icon geometry.
 
-       @return the tqgeometry of the icon
+       @return the geometry of the icon
     **/
     NETRect iconGeometry() const;
 
@@ -1067,7 +1067,7 @@ public:
        in order to support backwards compatibility and extensions
        not available in the NETWM spec, you should specify all
        window types you application supports (see the NET::WindowTypeMask
-       tqmask values for various window types). This method will
+       mask values for various window types). This method will
        return the first window type that is listed in the supported types,
        or NET::Unknown if none of the window types is supported.
 
@@ -1161,22 +1161,22 @@ public:
     MappingState mappingState() const;
 
     /**
-       Set icons for the application window.  If tqreplace is True, then
-       the specified icon is defined to be the only icon.  If tqreplace is False,
+       Set icons for the application window.  If replace is True, then
+       the specified icon is defined to be the only icon.  If replace is False,
        then the specified icon is added to a list of icons.
 
        @param icon the new icon
        
-       @param tqreplace true to tqreplace, false to append to the list of icons
+       @param replace true to replace, false to append to the list of icons
     **/
-    void setIcon(NETIcon icon, Bool tqreplace = True);
+    void setIcon(NETIcon icon, Bool replace = True);
 
     /**
-       Set the icon tqgeometry for the application window.
+       Set the icon geometry for the application window.
 
-       @param tqgeometry the new icon tqgeometry
+       @param geometry the new icon geometry
     **/
-    void setIconGeometry(NETRect tqgeometry);
+    void setIconGeometry(NETRect geometry);
 
     /**
        Set the extended (partial) strut for the application window.
@@ -1201,9 +1201,9 @@ public:
 
        @param state the name state
 
-       @param tqmask the tqmask for the state
+       @param mask the mask for the state
     **/
-    void setState(unsigned long state, unsigned long tqmask);
+    void setState(unsigned long state, unsigned long mask);
 
     /**
        Sets the window type for this client (see the NET base class
@@ -1291,7 +1291,7 @@ public:
 
     /**
        Returns an icon.  If width and height are passed, the icon returned will be
-       the closest it can tqfind (the next biggest).  If width and height are omitted,
+       the closest it can find (the next biggest).  If width and height are omitted,
        then the largest icon in the list is returned.
 
        @param width the preferred width for the icon, -1 to ignore
@@ -1382,12 +1382,12 @@ public:
     const char* clientMachine() const;
 
     /**
-       Places the window frame tqgeometry in frame, and the application window
-       tqgeometry in window.  Both geometries are relative to the root window.
+       Places the window frame geometry in frame, and the application window
+       geometry in window.  Both geometries are relative to the root window.
 
-       @param frame the tqgeometry for the frame
+       @param frame the geometry for the frame
 
-       @param window the tqgeometry for the window
+       @param window the geometry for the window
     **/
     void kdeGeometry(NETRect &frame, NETRect &window);
 
@@ -1412,7 +1412,7 @@ public:
        This function takes the pass XEvent and returns an OR'ed list of NETWinInfo
        properties that have changed.  The new information will be read
        immediately by the class. This overloaded version returns
-       only a single tqmask, and therefore cannot check state of all properties
+       only a single mask, and therefore cannot check state of all properties
        like the other variant.
 
        @param event the event
@@ -1447,14 +1447,14 @@ protected:
 
        @param state the new state
 
-       @param tqmask the tqmask for the state
+       @param mask the mask for the state
     **/
-    virtual void changeState(unsigned long state, unsigned long tqmask) { Q_UNUSED(state); Q_UNUSED(tqmask); }
+    virtual void changeState(unsigned long state, unsigned long mask) { Q_UNUSED(state); Q_UNUSED(mask); }
 
 private:
     void update( const unsigned long[] );
     void updateWMState();
-    void setIconInternal(NETRArray<NETIcon>& icons, int& icon_count, Atom property, NETIcon icon, Bool tqreplace);
+    void setIconInternal(NETRArray<NETIcon>& icons, int& icon_count, Atom property, NETIcon icon, Bool replace);
     NETIcon iconInternal(NETRArray<NETIcon>& icons, int icon_count, int width, int height) const;
     Role role;
 
diff --git a/kdecore/netwm_def.h b/kdecore/netwm_def.h
index fce97c445..1f6860243 100644
--- a/kdecore/netwm_def.h
+++ b/kdecore/netwm_def.h
@@ -340,10 +340,10 @@ public:
     enum { AllTypesMask = 0LU-1 };
 
     /**
-     * Returns true if the given window type matches the tqmask given
+     * Returns true if the given window type matches the mask given
      * using WindowTypeMask flags.
      */    
-    static bool typeMatchesMask( WindowType type, unsigned long tqmask );
+    static bool typeMatchesMask( WindowType type, unsigned long mask );
 
     /**
        Window state.
@@ -643,7 +643,7 @@ public:
     };
     
     /**
-     Starting corner for desktop tqlayout.
+     Starting corner for desktop layout.
     **/
     enum DesktopLayoutCorner {
         DesktopLayoutCornerTopLeft = 0,
diff --git a/kdecore/netwm_p.h b/kdecore/netwm_p.h
index 17afca698..a2395c4ac 100644
--- a/kdecore/netwm_p.h
+++ b/kdecore/netwm_p.h
@@ -93,7 +93,7 @@ struct NETRootInfoPrivate {
     // and requires updates
     NETRArray<NETPoint> viewport;
     NETRArray<NETRect> workarea;
-    NETSize tqgeometry;
+    NETSize geometry;
     Window active;
     Window *clients, *stacking, *virtual_roots, *kde_system_tray_windows;
     NETRArray<const char *> desktop_names;
@@ -103,9 +103,9 @@ struct NETRootInfoPrivate {
     unsigned long clients_count, stacking_count, virtual_roots_count,
 	kde_system_tray_windows_count;
     bool showing_desktop;
-    NET::Orientation desktop_tqlayout_orientation;
-    NET::DesktopLayoutCorner desktop_tqlayout_corner;
-    int desktop_tqlayout_columns, desktop_tqlayout_rows;
+    NET::Orientation desktop_layout_orientation;
+    NET::DesktopLayoutCorner desktop_layout_corner;
+    int desktop_layout_columns, desktop_layout_rows;
 
     unsigned long properties[ 5 ];
     unsigned long client_properties[ 5 ]; // properties the client is interested in
diff --git a/kdecore/network/Makefile.am b/kdecore/network/Makefile.am
index b82eaa715..71ed013d9 100644
--- a/kdecore/network/Makefile.am
+++ b/kdecore/network/Makefile.am
@@ -55,5 +55,5 @@ noinst_HEADERS = kresolver_p.h \
 configdir = $(kde_confdir)
 config_DATA = ipv6blacklist
 
-# let autotqmoc handle all of the meta source files (tqmoc)
+# let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/kdecore/network/kbufferedsocket.cpp b/kdecore/network/kbufferedsocket.cpp
index 85b433193..04115c051 100644
--- a/kdecore/network/kbufferedsocket.cpp
+++ b/kdecore/network/kbufferedsocket.cpp
@@ -94,7 +94,7 @@ void KBufferedSocket::close()
 }
 
 #ifdef USE_QT3
-TQ_LONG KBufferedSocket::bytesAvailable() const
+Q_LONG KBufferedSocket::bytesAvailable() const
 #endif
 #ifdef USE_QT4
 qint64 KBufferedSocket::bytesAvailable() const
@@ -106,9 +106,9 @@ qint64 KBufferedSocket::bytesAvailable() const
   return d->input->length();
 }
 
-TQ_LONG KBufferedSocket::waitForMore(int msecs, bool *timeout)
+Q_LONG KBufferedSocket::waitForMore(int msecs, bool *timeout)
 {
-  TQ_LONG retval = KStreamSocket::waitForMore(msecs, timeout);
+  Q_LONG retval = KStreamSocket::waitForMore(msecs, timeout);
   if (d->input)
     {
       resetError();
@@ -118,7 +118,7 @@ TQ_LONG KBufferedSocket::waitForMore(int msecs, bool *timeout)
   return retval;
 }
 
-TQ_LONG KBufferedSocket::readBlock(char *data, TQ_ULONG maxlen)
+Q_LONG KBufferedSocket::readBlock(char *data, Q_ULONG maxlen)
 {
   if (d->input)
     {
@@ -134,13 +134,13 @@ TQ_LONG KBufferedSocket::readBlock(char *data, TQ_ULONG maxlen)
   return KStreamSocket::readBlock(data, maxlen);
 }
 
-TQ_LONG KBufferedSocket::readBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from)
+Q_LONG KBufferedSocket::readBlock(char *data, Q_ULONG maxlen, KSocketAddress& from)
 {
   from = peerAddress();
   return readBlock(data, maxlen);
 }
 
-TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen)
+Q_LONG KBufferedSocket::peekBlock(char *data, Q_ULONG maxlen)
 {
   if (d->input)
     {
@@ -156,13 +156,13 @@ TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen)
   return KStreamSocket::peekBlock(data, maxlen);
 }
 
-TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from)
+Q_LONG KBufferedSocket::peekBlock(char *data, Q_ULONG maxlen, KSocketAddress& from)
 {
   from = peerAddress();
   return peekBlock(data, maxlen);
 }
 
-TQ_LONG KBufferedSocket::writeBlock(const char *data, TQ_ULONG len)
+Q_LONG KBufferedSocket::writeBlock(const char *data, Q_ULONG len)
 {
   if (state() != Connected)
     {
@@ -192,7 +192,7 @@ TQ_LONG KBufferedSocket::writeBlock(const char *data, TQ_ULONG len)
   return KStreamSocket::writeBlock(data, len);
 }
 
-TQ_LONG KBufferedSocket::writeBlock(const char *data, TQ_ULONG maxlen,
+Q_LONG KBufferedSocket::writeBlock(const char *data, Q_ULONG maxlen,
 				   const KSocketAddress&)
 {
   // ignore the third parameter
@@ -285,7 +285,7 @@ KIOBufferBase* KBufferedSocket::outputBuffer()
 }
 
 #ifdef USE_QT3
-TQ_ULONG KBufferedSocket::bytesToWrite() const
+Q_ULONG KBufferedSocket::bytesToWrite() const
 #endif
 #ifdef USE_QT4
 qint64 KBufferedSocket::bytesToWrite() const
@@ -332,7 +332,7 @@ void KBufferedSocket::slotReadActivity()
   if (d->input && state() == Connected)
     {
       mutex()->lock();
-      TQ_LONG len = d->input->receiveFrom(socketDevice());
+      Q_LONG len = d->input->receiveFrom(socketDevice());
 
       if (len == -1)
 	{
@@ -380,7 +380,7 @@ void KBufferedSocket::slotWriteActivity()
       (state() == Connected || state() == Closing))
     {
       mutex()->lock();
-      TQ_LONG len = d->output->sendTo(socketDevice());
+      Q_LONG len = d->output->sendTo(socketDevice());
 
       if (len == -1)
 	{
diff --git a/kdecore/network/kbufferedsocket.h b/kdecore/network/kbufferedsocket.h
index 3dd09af43..bca034002 100644
--- a/kdecore/network/kbufferedsocket.h
+++ b/kdecore/network/kbufferedsocket.h
@@ -99,7 +99,7 @@ public:
    * Make use of the buffers.
    */
 #ifdef USE_QT3
-  virtual TQ_LONG bytesAvailable() const;
+  virtual Q_LONG bytesAvailable() const;
 #endif
 #ifdef USE_QT4
   virtual qint64 bytesAvailable() const;
@@ -108,12 +108,12 @@ public:
   /**
    * Make use of buffers.
    */
-  virtual TQ_LONG waitForMore(int msecs, bool *timeout = 0L);
+  virtual Q_LONG waitForMore(int msecs, bool *timeout = 0L);
 
   /**
    * Reads data from the socket. Make use of buffers.
    */
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen);
+  virtual Q_LONG readBlock(char *data, Q_ULONG maxlen);
 
   /**
    * @overload
@@ -121,12 +121,12 @@ public:
    *
    * The @p from parameter is always set to @ref peerAddress()
    */
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from);
+  virtual Q_LONG readBlock(char *data, Q_ULONG maxlen, KSocketAddress& from);
 
   /**
    * Peeks data from the socket.
    */
-  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen);
+  virtual Q_LONG peekBlock(char *data, Q_ULONG maxlen);
 
   /**
    * @overload
@@ -134,12 +134,12 @@ public:
    *
    * The @p from parameter is always set to @ref peerAddress()
    */
-  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress &from);
+  virtual Q_LONG peekBlock(char *data, Q_ULONG maxlen, KSocketAddress &from);
 
   /**
    * Writes data to the socket.
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len);
+  virtual Q_LONG writeBlock(const char *data, Q_ULONG len);
 
   /**
    * @overload
@@ -147,7 +147,7 @@ public:
    *
    * The @p to parameter is discarded.
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to);
+  virtual Q_LONG writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to);
 
   /**
    * Catch changes.
@@ -183,7 +183,7 @@ public:
    * Returns the length of the output buffer.
    */
 #ifdef USE_QT3
-  virtual TQ_ULONG bytesToWrite() const;
+  virtual Q_ULONG bytesToWrite() const;
 #endif
 #ifdef USE_QT4
   virtual qint64 bytesToWrite() const;
diff --git a/kdecore/network/kclientsocketbase.cpp b/kdecore/network/kclientsocketbase.cpp
index 5cb87d391..7ac3ca3b1 100644
--- a/kdecore/network/kclientsocketbase.cpp
+++ b/kdecore/network/kclientsocketbase.cpp
@@ -140,7 +140,7 @@ bool KClientSocketBase::lookup()
     {
       if (d->localResolver.serviceName().isNull() &&
 	  !d->localResolver.nodeName().isNull())
-	d->localResolver.setServiceName(TQString::tqfromLatin1(""));
+	d->localResolver.setServiceName(TQString::fromLatin1(""));
 
       // don't restart the lookups if they had succeeded and
       // the input values weren't changed
@@ -279,7 +279,7 @@ void KClientSocketBase::close()
 
 // This function is unlike all the others because it is const
 #ifdef USE_QT3
-TQ_LONG KClientSocketBase::bytesAvailable() const
+Q_LONG KClientSocketBase::bytesAvailable() const
 #endif
 #ifdef USE_QT4
 qint64 KClientSocketBase::bytesAvailable() const
@@ -291,10 +291,10 @@ qint64 KClientSocketBase::bytesAvailable() const
 // All the functions below look really alike
 // Should I use a macro to define them?
 
-TQ_LONG KClientSocketBase::waitForMore(int msecs, bool *timeout)
+Q_LONG KClientSocketBase::waitForMore(int msecs, bool *timeout)
 {
   resetError();
-  TQ_LONG retval = socketDevice()->waitForMore(msecs, timeout);
+  Q_LONG retval = socketDevice()->waitForMore(msecs, timeout);
   if (retval == -1)
     {
       copyError();
@@ -303,10 +303,10 @@ TQ_LONG KClientSocketBase::waitForMore(int msecs, bool *timeout)
   return retval;
 }
 
-TQ_LONG KClientSocketBase::readBlock(char *data, TQ_ULONG maxlen)
+Q_LONG KClientSocketBase::readBlock(char *data, Q_ULONG maxlen)
 {
   resetError();
-  TQ_LONG retval = socketDevice()->readBlock(data, maxlen);
+  Q_LONG retval = socketDevice()->readBlock(data, maxlen);
   if (retval == -1)
     {
       copyError();
@@ -315,10 +315,10 @@ TQ_LONG KClientSocketBase::readBlock(char *data, TQ_ULONG maxlen)
   return retval;
 }
 
-TQ_LONG KClientSocketBase::readBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from)
+Q_LONG KClientSocketBase::readBlock(char *data, Q_ULONG maxlen, KSocketAddress& from)
 {
   resetError();
-  TQ_LONG retval = socketDevice()->readBlock(data, maxlen, from);
+  Q_LONG retval = socketDevice()->readBlock(data, maxlen, from);
   if (retval == -1)
     {
       copyError();
@@ -327,10 +327,10 @@ TQ_LONG KClientSocketBase::readBlock(char *data, TQ_ULONG maxlen, KSocketAddress
   return retval;
 }
 
-TQ_LONG KClientSocketBase::peekBlock(char *data, TQ_ULONG maxlen)
+Q_LONG KClientSocketBase::peekBlock(char *data, Q_ULONG maxlen)
 {
   resetError();
-  TQ_LONG retval = socketDevice()->peekBlock(data, maxlen);
+  Q_LONG retval = socketDevice()->peekBlock(data, maxlen);
   if (retval == -1)
     {
       copyError();
@@ -339,10 +339,10 @@ TQ_LONG KClientSocketBase::peekBlock(char *data, TQ_ULONG maxlen)
   return retval;
 }
 
-TQ_LONG KClientSocketBase::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from)
+Q_LONG KClientSocketBase::peekBlock(char *data, Q_ULONG maxlen, KSocketAddress& from)
 {
   resetError();
-  TQ_LONG retval = socketDevice()->peekBlock(data, maxlen, from);
+  Q_LONG retval = socketDevice()->peekBlock(data, maxlen, from);
   if (retval == -1)
     {
       copyError();
@@ -351,10 +351,10 @@ TQ_LONG KClientSocketBase::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress
   return retval;
 }
 
-TQ_LONG KClientSocketBase::writeBlock(const char *data, TQ_ULONG len)
+Q_LONG KClientSocketBase::writeBlock(const char *data, Q_ULONG len)
 {
   resetError();
-  TQ_LONG retval = socketDevice()->writeBlock(data, len);
+  Q_LONG retval = socketDevice()->writeBlock(data, len);
   if (retval == -1)
     {
       copyError();
@@ -363,10 +363,10 @@ TQ_LONG KClientSocketBase::writeBlock(const char *data, TQ_ULONG len)
   return retval;
 }
 
-TQ_LONG KClientSocketBase::writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to)
+Q_LONG KClientSocketBase::writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to)
 {
   resetError();
-  TQ_LONG retval = socketDevice()->writeBlock(data, len, to);
+  Q_LONG retval = socketDevice()->writeBlock(data, len, to);
   if (retval == -1)
     {
       copyError();
diff --git a/kdecore/network/kclientsocketbase.h b/kdecore/network/kclientsocketbase.h
index 4883e6a5b..d4e31b6b3 100644
--- a/kdecore/network/kclientsocketbase.h
+++ b/kdecore/network/kclientsocketbase.h
@@ -257,7 +257,7 @@ public:
    * This is a convenience function provided to ease migrating from
    * Qt 3.x's TQSocket class.
    */
-  inline void connectToHost(const TQString& host, TQ_UINT16 port)
+  inline void connectToHost(const TQString& host, Q_UINT16 port)
   { connect(host, TQString::number(port)); }
 
   /**
@@ -293,7 +293,7 @@ public:
    * Reimplemented from KSocketBase.
    */
 #ifdef USE_QT3
-  virtual TQ_LONG bytesAvailable() const;
+  virtual Q_LONG bytesAvailable() const;
 #endif
 #ifdef USE_QT4
   virtual qint64 bytesAvailable() const;
@@ -302,40 +302,40 @@ public:
   /**
    * Waits for more data. Reimplemented from KSocketBase.
    */
-  virtual TQ_LONG waitForMore(int msecs, bool *timeout = 0L);
+  virtual Q_LONG waitForMore(int msecs, bool *timeout = 0L);
 
   /**
    * Reads data from a socket. Reimplemented from KSocketBase.
    */
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen);
+  virtual Q_LONG readBlock(char *data, Q_ULONG maxlen);
 
   /**
    * @overload
    * Reads data from a socket. Reimplemented from KSocketBase.
    */
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from);
+  virtual Q_LONG readBlock(char *data, Q_ULONG maxlen, KSocketAddress& from);
 
   /**
    * Peeks data from the socket. Reimplemented from KSocketBase.
    */
-  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen);
+  virtual Q_LONG peekBlock(char *data, Q_ULONG maxlen);
 
   /**
    * @overload
    * Peeks data from the socket. Reimplemented from KSocketBase.
    */
-  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress &from);
+  virtual Q_LONG peekBlock(char *data, Q_ULONG maxlen, KSocketAddress &from);
 
   /**
    * Writes data to the socket. Reimplemented from KSocketBase.
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len);
+  virtual Q_LONG writeBlock(const char *data, Q_ULONG len);
 
   /**
    * @overload
    * Writes data to the socket. Reimplemented from KSocketBase.
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to);
+  virtual Q_LONG writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to);
 
   /**
    * Returns the local socket address. Reimplemented from KSocketBase.
@@ -413,8 +413,8 @@ signals:
   void stateChanged(int newstate);
 
   /**
-   * This signal is emitted when this object tqfinds an error.
-   * The @p code parameter tqcontains the error code that can
+   * This signal is emitted when this object finds an error.
+   * The @p code parameter contains the error code that can
    * also be found by calling @ref error.
    */
   void gotError(int code);
diff --git a/kdecore/network/kdatagramsocket.cpp b/kdecore/network/kdatagramsocket.cpp
index ff6ea04b3..d598d2d14 100644
--- a/kdecore/network/kdatagramsocket.cpp
+++ b/kdecore/network/kdatagramsocket.cpp
@@ -133,7 +133,7 @@ bool KDatagramSocket::connect(const TQString& node, const TQString& service)
 
 KDatagramPacket KDatagramSocket::receive()
 {
-  TQ_LONG size = bytesAvailable();
+  Q_LONG size = bytesAvailable();
   if (size == 0)
     {
       // nothing available yet to read
@@ -165,12 +165,12 @@ KDatagramPacket KDatagramSocket::receive()
   return KDatagramPacket(data, address);
 }
 
-TQ_LONG KDatagramSocket::send(const KDatagramPacket& packet)
+Q_LONG KDatagramSocket::send(const KDatagramPacket& packet)
 {
   return writeBlock(packet.data(), packet.size(), packet.address());
 }
 
-TQ_LONG KDatagramSocket::writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to)
+Q_LONG KDatagramSocket::writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to)
 {
   if (to.family() != AF_UNSPEC)
     {
diff --git a/kdecore/network/kdatagramsocket.h b/kdecore/network/kdatagramsocket.h
index a58b7c4fd..6b94c1d42 100644
--- a/kdecore/network/kdatagramsocket.h
+++ b/kdecore/network/kdatagramsocket.h
@@ -222,7 +222,7 @@ public:
    *
    * Connecting means only to designate the given address as the default
    * destination address for datagrams sent without destination addresses
-   * ( writeBlock(const char *, TQ_ULONG) ).
+   * ( writeBlock(const char *, Q_ULONG) ).
    *
    * @note Calling connect will not cause the socket to be bound. You have
    *       to call @ref bind explicitly.
@@ -240,7 +240,7 @@ public:
   /**
    * Writes data to the socket. Reimplemented from KClientSocketBase.
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to);
+  virtual Q_LONG writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to);
 
   /**
    * Receives one datagram from the stream. The reading process is guaranteed
@@ -260,7 +260,7 @@ public:
    *
    * @returns the number of bytes written or -1 in case of error.
    */
-  virtual TQ_LONG send(const KDatagramPacket& packet);
+  virtual Q_LONG send(const KDatagramPacket& packet);
 
 private slots:
   void lookupFinishedLocal();
diff --git a/kdecore/network/khttpproxysocketdevice.cpp b/kdecore/network/khttpproxysocketdevice.cpp
index 55b69a2b3..09d8dd7a5 100644
--- a/kdecore/network/khttpproxysocketdevice.cpp
+++ b/kdecore/network/khttpproxysocketdevice.cpp
@@ -153,12 +153,12 @@ bool KHttpProxySocketDevice::connect(const TQString& node, const TQString& servi
       setState(0);		// unset open flag
 
       // prepare the request
-      TQString request = TQString::tqfromLatin1("CONNECT %1:%2 HTTP/1.1\r\n"
+      TQString request = TQString::fromLatin1("CONNECT %1:%2 HTTP/1.1\r\n"
 					    "Cache-Control: no-cache\r\n"
 					    "Host: \r\n"
 					    "\r\n");
       TQString node2 = node;
-      if (node.tqcontains(':'))
+      if (node.contains(':'))
 	node2 = '[' + node + ']';
 
       d->request = request.arg(node2).arg(service).latin1();
@@ -179,7 +179,7 @@ bool KHttpProxySocketDevice::parseServerReply()
   if (!d->request.isEmpty())
     {
       // send request
-      TQ_LONG written = writeBlock(d->request, d->request.length());
+      Q_LONG written = writeBlock(d->request, d->request.length());
       if (written < 0)
 	{
 	  qDebug("KHttpProxySocketDevice: would block writing request!");
@@ -205,7 +205,7 @@ bool KHttpProxySocketDevice::parseServerReply()
   int index;
   if (!blocking())
     {
-      TQ_LONG avail = bytesAvailable();
+      Q_LONG avail = bytesAvailable();
       qDebug("KHttpProxySocketDevice: %ld bytes available", avail);
       setState(0);
       if (avail == 0)
@@ -222,7 +222,7 @@ bool KHttpProxySocketDevice::parseServerReply()
 
       TQCString fullHeaders = d->reply + buf.data();
       // search for the end of the headers
-      index = fullHeaders.tqfind("\r\n\r\n");
+      index = fullHeaders.find("\r\n\r\n");
       if (index == -1)
 	{
 	  // no, headers not yet finished...
@@ -265,9 +265,9 @@ bool KHttpProxySocketDevice::parseServerReply()
 
   // now really parse the reply
   qDebug("KHttpProxySocketDevice: get reply: %s\n",
-	 d->reply.left(d->reply.tqfind('\r')).data());
+	 d->reply.left(d->reply.find('\r')).data());
   if (d->reply.left(7) != "HTTP/1." ||
-      (index = d->reply.tqfind(' ')) == -1 ||
+      (index = d->reply.find(' ')) == -1 ||
       d->reply[index + 1] != '2')
     {
       setError(IO_ConnectError, NetFailure);
diff --git a/kdecore/network/kiobuffer.h b/kdecore/network/kiobuffer.h
index 02f75a420..839899b18 100644
--- a/kdecore/network/kiobuffer.h
+++ b/kdecore/network/kiobuffer.h
@@ -85,7 +85,7 @@ public:
    *
    * @sa size
    */
-  virtual TQ_LONG length() const = 0;
+  virtual Q_LONG length() const = 0;
 
   /**
    * Returns true if the buffer is empty of data.
@@ -99,7 +99,7 @@ public:
    *
    * @sa length for the length of the data stored
    */
-  virtual TQ_LONG size() const = 0;
+  virtual Q_LONG size() const = 0;
 
   /**
    * Returns true if the buffer is full (i.e., cannot receive more data)
@@ -114,7 +114,7 @@ public:
    * @returns true on success, false if an error occurred.
    * @note if the new size is less than length(), the buffer will be truncated
    */
-  virtual bool setSize(TQ_LONG size) = 0;
+  virtual bool setSize(Q_LONG size) = 0;
 
   /**
    * Adds data to the end of the buffer.
@@ -123,7 +123,7 @@ public:
    * @param len		the data length, in bytes
    * @returns the number of bytes added to the end of the buffer.
    */
-  virtual TQ_LONG feedBuffer(const char *data, TQ_LONG len) = 0;
+  virtual Q_LONG feedBuffer(const char *data, Q_LONG len) = 0;
 
   /**
    * Consumes data from the beginning of the buffer.
@@ -133,7 +133,7 @@ public:
    * @param discard	if true, the bytes copied will be discarded
    * @returns the number of bytes copied from the buffer
    */
-  virtual TQ_LONG consumeBuffer(char *data, TQ_LONG maxlen, bool discard = true) = 0;
+  virtual Q_LONG consumeBuffer(char *data, Q_LONG maxlen, bool discard = true) = 0;
 
   /**
    * Clears the buffer.
diff --git a/kdecore/network/knetworkinterface.h b/kdecore/network/knetworkinterface.h
index c9dd1b145..74fd52d55 100644
--- a/kdecore/network/knetworkinterface.h
+++ b/kdecore/network/knetworkinterface.h
@@ -30,7 +30,7 @@ namespace KNetwork {
 
 /**
  * A place-holder class for a future network interface class.
- * This class is to be tqreplaced with a more powerful version, inspired
+ * This class is to be replaced with a more powerful version, inspired
  * by:
  *  - KInetInterface (kdenetwork/krfb/srvloc)
  *  - NWInterface (kdenonbeta/knot/lib)
diff --git a/kdecore/network/kresolver.cpp b/kdecore/network/kresolver.cpp
index 013d1e335..cfb87e3ef 100644
--- a/kdecore/network/kresolver.cpp
+++ b/kdecore/network/kresolver.cpp
@@ -105,7 +105,7 @@ KResolverEntry::KResolverEntry(const KSocketAddress& addr, int socktype, int pro
 }
 
 // constructor with even more stuff
-KResolverEntry::KResolverEntry(const struct sockaddr* sa, TQ_UINT16 salen, int socktype,
+KResolverEntry::KResolverEntry(const struct sockaddr* sa, Q_UINT16 salen, int socktype,
 			       int protocol, const TQString& canonName,
 			       const TQCString& encodedName) :
   d(new KResolverEntryPrivate)
@@ -141,7 +141,7 @@ KSocketAddress KResolverEntry::address() const
 }
 
 // returns the length
-TQ_UINT16 KResolverEntry::length() const
+Q_UINT16 KResolverEntry::length() const
 {
   return d ? d->addr.length() : 0;
 }
@@ -393,7 +393,7 @@ int KResolver::setFlags(int flags)
   return oldflags;
 }
 
-// sets the family tqmask
+// sets the family mask
 void KResolver::setFamily(int families)
 {
   if (!isRunning())
@@ -546,7 +546,7 @@ void KResolver::emitFinished()
   emit finished(d->results);
 
   if (p && d->deleteWhenDone)
-    deleteLater();		// in TQObject
+    deleteLater();		// in QObject
 }
 
 TQString KResolver::errorString(int errorcode, int syserror)
@@ -587,7 +587,7 @@ KResolverResults
 KResolver::resolve(const TQString& host, const TQString& service, int flags,
 		  int families)
 {
-  KResolver qres(host, service, TQT_TQOBJECT(tqApp), "synchronous KResolver");
+  KResolver qres(host, service, qApp, "synchronous KResolver");
   qres.setFlags(flags);
   qres.setFamily(families);
   qres.start();
@@ -599,7 +599,7 @@ bool KResolver::resolveAsync(TQObject* userObj, const char *userSlot,
 			     const TQString& host, const TQString& service,
 			     int flags, int families)
 {
-  KResolver* qres = new KResolver(host, service, TQT_TQOBJECT(tqApp), "asynchronous KResolver");
+  KResolver* qres = new KResolver(host, service, qApp, "asynchronous KResolver");
   TQObject::connect(qres, TQT_SIGNAL(finished(KResolverResults)), userObj, userSlot);
   qres->setFlags(flags);
   qres->setFamily(families);
@@ -915,16 +915,16 @@ TQString KResolver::localHostName()
     }
 
   if (name.isEmpty())
-    return TQString::tqfromLatin1("localhost");
+    return TQString::fromLatin1("localhost");
 
-  if (name.tqfind('.') == -1)
+  if (name.find('.') == -1)
     {
       // not fully qualified
       // must resolve
       KResolverResults results = resolve(name, "0", CanonName);
       if (results.isEmpty())
-	// cannot tqfind a valid hostname!
-	return TQString::tqfromLatin1("localhost");
+	// cannot find a valid hostname!
+	return TQString::fromLatin1("localhost");
       else
 	return results.first().canonicalName();
     }
@@ -934,7 +934,7 @@ TQString KResolver::localHostName()
 
 
 // forward declaration
-static TQStringList splitLabels(const TQString& tqunicodeDomain);
+static TQStringList splitLabels(const TQString& unicodeDomain);
 static TQCString ToASCII(const TQString& label);
 static TQString ToUnicode(const TQString& label);
 
@@ -943,11 +943,11 @@ static TQStringList *KResolver_initIdnDomains()
   const char *kde_use_idn = getenv("KDE_USE_IDN");
   if (!kde_use_idn)
      kde_use_idn = "ac:at:br:cat:ch:cl:cn:de:dk:fi:gr:hu:info:io:is:jp:kr:li:lt:museum:org:no:se:sh:th:tm:tw:vn";
-  return new TQStringList(TQStringList::split(':', TQString::tqfromLatin1(kde_use_idn).lower()));
+  return new TQStringList(TQStringList::split(':', TQString::fromLatin1(kde_use_idn).lower()));
 }
 
 // implement the ToAscii function, as described by IDN documents
-TQCString KResolver::domainToAscii(const TQString& tqunicodeDomain)
+TQCString KResolver::domainToAscii(const TQString& unicodeDomain)
 {
   if (!idnDomains)
     idnDomains = KResolver_initIdnDomains();
@@ -958,10 +958,10 @@ TQCString KResolver::domainToAscii(const TQString& tqunicodeDomain)
 
   // 2) split the domain into individual labels, without
   // separators.
-  TQStringList input = splitLabels(tqunicodeDomain);
+  TQStringList input = splitLabels(unicodeDomain);
 
   // Do we allow IDN names for this TLD?
-  if (input.count() && !idnDomains->tqcontains(input[input.count()-1].lower()))
+  if (input.count() && !idnDomains->contains(input[input.count()-1].lower()))
     return input.join(".").lower().latin1(); // No IDN allowed for this TLD
 
   // 3) decide whether to enforce the STD3 rules for chars < 0x7F
@@ -987,7 +987,7 @@ TQCString KResolver::domainToAscii(const TQString& tqunicodeDomain)
 
 TQString KResolver::domainToUnicode(const TQCString& asciiDomain)
 {
-  return domainToUnicode(TQString::tqfromLatin1(asciiDomain));
+  return domainToUnicode(TQString::fromLatin1(asciiDomain));
 }
 
 // implement the ToUnicode function, as described by IDN documents
@@ -1009,7 +1009,7 @@ TQString KResolver::domainToUnicode(const TQString& asciiDomain)
   TQStringList input = splitLabels(asciiDomain);
 
   // Do we allow IDN names for this TLD?
-  if (input.count() && !idnDomains->tqcontains(input[input.count()-1].lower()))
+  if (input.count() && !idnDomains->contains(input[input.count()-1].lower()))
     return asciiDomain.lower(); // No TLDs allowed
 
   // 3) decide whether to enforce the STD3 rules for chars < 0x7F
@@ -1048,7 +1048,7 @@ void KResolver::virtual_hook( int, void* )
 //  RFC 3492 - Punycode: A Bootstring encoding of Unicode
 //          for Internationalized Domain Names in Applications (IDNA)
 
-static TQStringList splitLabels(const TQString& tqunicodeDomain)
+static TQStringList splitLabels(const TQString& unicodeDomain)
 {
   // From RFC 3490 section 3.1:
   // "Whenever dots are used as label separators, the following characters
@@ -1060,9 +1060,9 @@ static TQStringList splitLabels(const TQString& tqunicodeDomain)
   TQStringList lst;
   int start = 0;
   uint i;
-  for (i = 0; i < tqunicodeDomain.length(); i++)
+  for (i = 0; i < unicodeDomain.length(); i++)
     {
-      unsigned int c = tqunicodeDomain[i].tqunicode();
+      unsigned int c = unicodeDomain[i].unicode();
 
       if (c == separators[0] ||
 	  c == separators[1] ||
@@ -1070,13 +1070,13 @@ static TQStringList splitLabels(const TQString& tqunicodeDomain)
 	  c == separators[3])
 	{
 	  // found a separator!
-	  lst << tqunicodeDomain.mid(start, i - start);
+	  lst << unicodeDomain.mid(start, i - start);
 	  start = i + 1;
 	}
     }
   if ((long)i >= start)
     // there is still one left
-    lst << tqunicodeDomain.mid(start, i - start);
+    lst << unicodeDomain.mid(start, i - start);
 
   return lst;
 }
@@ -1097,11 +1097,11 @@ static TQCString ToASCII(const TQString& label)
   TQCString retval;
   char buf[65];
 
-  TQ_UINT32* ucs4 = new TQ_UINT32[label.length() + 1];
+  Q_UINT32* ucs4 = new Q_UINT32[label.length() + 1];
 
   uint i;
   for (i = 0; i < label.length(); i++)
-    ucs4[i] = (unsigned long)label[i].tqunicode();
+    ucs4[i] = (unsigned long)label[i].unicode();
   ucs4[i] = 0;			// terminate with NUL, just to be on the safe side
 
   if (idna_to_ascii_4i(ucs4, label.length(), buf, 0) == IDNA_SUCCESS)
@@ -1118,18 +1118,18 @@ static TQCString ToASCII(const TQString& label)
 static TQString ToUnicode(const TQString& label)
 {
 #ifdef HAVE_IDNA_H
-  // We have idna.h, so we can use the idna_to_tqunicode
+  // We have idna.h, so we can use the idna_to_unicode
   // function :)
 
-  TQ_UINT32 *ucs4_input, *ucs4_output;
+  Q_UINT32 *ucs4_input, *ucs4_output;
   size_t outlen;
 
-  ucs4_input = new TQ_UINT32[label.length() + 1];
+  ucs4_input = new Q_UINT32[label.length() + 1];
   for (uint i = 0; i < label.length(); i++)
-    ucs4_input[i] = (unsigned long)label[i].tqunicode();
+    ucs4_input[i] = (unsigned long)label[i].unicode();
 
   // try the same length for output
-  ucs4_output = new TQ_UINT32[outlen = label.length()];
+  ucs4_output = new Q_UINT32[outlen = label.length()];
 
   idna_to_unicode_44i(ucs4_input, label.length(),
 		      ucs4_output, &outlen,
@@ -1139,7 +1139,7 @@ static TQString ToUnicode(const TQString& label)
     {
       // it must have failed
       delete [] ucs4_output;
-      ucs4_output = new TQ_UINT32[outlen];
+      ucs4_output = new Q_UINT32[outlen];
 
       idna_to_unicode_44i(ucs4_input, label.length(),
 			  ucs4_output, &outlen,
diff --git a/kdecore/network/kresolver.h b/kdecore/network/kresolver.h
index f17ac840f..5b66f362c 100644
--- a/kdecore/network/kresolver.h
+++ b/kdecore/network/kresolver.h
@@ -51,11 +51,11 @@ class KResolverEntryPrivate;
  *  @brief One resolution entry.
  *
  * This class is one element in the resolution results list.
- * It tqcontains the socket address for connecting, as well as
+ * It contains the socket address for connecting, as well as
  * a bit more of information: the socket type, address family
  * and protocol numbers.
  *
- * This class tqcontains all the information required for creating,
+ * This class contains all the information required for creating,
  * binding and connecting a socket.
  *
  * KResolverEntry objects implicitly share data, so copying them
@@ -101,7 +101,7 @@ public:
    * @param canonName	the canonical name of the resolved hostname
    * @param encodedName	the ASCII-compatible encoding of the hostname
    */
-  KResolverEntry(const struct sockaddr *sa, TQ_UINT16 salen, int socktype,
+  KResolverEntry(const struct sockaddr *sa, Q_UINT16 salen, int socktype,
 		int protocol, const TQString& canonName = TQString::null,
 		const TQCString& encodedName = TQCString());
 
@@ -128,7 +128,7 @@ public:
   /**
    * Retrieves the length of the socket address structure.
    */
-  TQ_UINT16 length() const;
+  Q_UINT16 length() const;
 
   /**
    * Retrieves the family associated with this socket address.
@@ -180,7 +180,7 @@ class KResolverResultsPrivate;
  * @class KResolverResults kresolver.h kresolver.h
  * @brief Name and service resolution results.
  *
- * This object tqcontains the results of a name and service resolution, as
+ * This object contains the results of a name and service resolution, as
  * those performed by @ref KResolver. It is also a descendant of TQValueList, so
  * you may use all its member functions here to access the elements.
  *
@@ -292,7 +292,7 @@ class KResolverPrivate;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KResolver: public TQObject
+class KDECORE_EXPORT KResolver: public QObject
 {
   Q_OBJECT
 
@@ -398,7 +398,7 @@ public:
     };
 
   /**
-   * tqStatus codes.
+   * Status codes.
    *
    * These are the possible status for a Resolver object. A value
    * greater than zero indicates normal behaviour, while negative
@@ -417,7 +417,7 @@ public:
    * Note 2: the status Queued and InProgress might not be distinguishable.
    * Some implementations might not differentiate one from the other.
    */
-  enum tqStatusCodes
+  enum StatusCodes
     {
       Idle = 0,
       Queued = 1,
@@ -462,7 +462,7 @@ public:
   /**
    * Retrieve the current status of this object.
    *
-   * @see tqStatusCodes for the possible status codes.
+   * @see StatusCodes for the possible status codes.
    */
   int status() const;
 
@@ -470,8 +470,8 @@ public:
    * Retrieve the error code in this object.
    *
    * This function will return NoError if we are not in
-   * an error condition. See @ref status and @ref tqStatusCodes to
-   * tqfind out what the current status is.
+   * an error condition. See @ref status and @ref StatusCodes to
+   * find out what the current status is.
    *
    * @see errorString for getting a textual representation of
    * this error
@@ -668,7 +668,7 @@ public:
    * an empty object.
    *
    * @return the resolved data
-   * @see status for information on tqfinding out if the resolution was successful
+   * @see status for information on finding out if the resolution was successful
    */
   KResolverResults results() const;
 
@@ -795,11 +795,11 @@ public:
    * Note that the encoding is illegible and, thus, should not be presented
    * to the user, except if requested.
    *
-   * @param tqunicodeDomain	the domain name to be encoded
+   * @param unicodeDomain	the domain name to be encoded
    * @return the ACE-encoded suitable for DNS queries if successful, a null
    *	     TQCString if failure.
    */
-  static TQCString domainToAscii(const TQString& tqunicodeDomain);
+  static TQCString domainToAscii(const TQString& unicodeDomain);
 
   /**
    * Does the inverse of @ref domainToAscii and return an Unicode domain
diff --git a/kdecore/network/kresolver_p.h b/kdecore/network/kresolver_p.h
index b4ab61108..e29304383 100644
--- a/kdecore/network/kresolver_p.h
+++ b/kdecore/network/kresolver_p.h
@@ -283,14 +283,14 @@ namespace KNetwork
 
     private:
       /*
-       * tqfinds a suitable worker for this request
+       * finds a suitable worker for this request
        */
-      KNetwork::KResolverWorkerBase *tqfindWorker(KNetwork::KResolverPrivate *p);
+      KNetwork::KResolverWorkerBase *findWorker(KNetwork::KResolverPrivate *p);
 
       /*
-       * tqfinds data for this request
+       * finds data for this request
        */
-      RequestData* tqfindData(KResolverThread*);
+      RequestData* findData(KResolverThread*);
 
       /*
        * Handle completed requests.
diff --git a/kdecore/network/kresolvermanager.cpp b/kdecore/network/kresolvermanager.cpp
index b97f58005..b3c7172ae 100644
--- a/kdecore/network/kresolvermanager.cpp
+++ b/kdecore/network/kresolvermanager.cpp
@@ -85,11 +85,11 @@ using namespace KNetwork::Internal;
    process, which means it will lock and unlock the manager mutex in
    the process.
 
-   If it tqfinds no new data, it'll wait on the feedWorkers condition
+   If it finds no new data, it'll wait on the feedWorkers condition
    for a certain maximum time. If that time expires and there's still
    no data, the thread will exit, in order to save system resources.
 
-   If it tqfinds data, however, it'll set up and call the worker class
+   If it finds data, however, it'll set up and call the worker class
    that has been selected by the manager. Once that worker is done,
    the thread releases the data through KResolverManager::releaseData.
 
@@ -99,7 +99,7 @@ using namespace KNetwork::Internal;
 
    When data is being requested, the KResolverManager::requestData
    function will look the currentRequests list and return the first
-   Queued request it tqfinds, while marking it to be InProgress.
+   Queued request it finds, while marking it to be InProgress.
 
    When the worker class has returned, the worker thread will release
    that data through the KResolverManager::releaseData function. If the
@@ -367,7 +367,7 @@ RequestData* KResolverManager::requestData(KResolverThread *th, int maxWaitTime)
   // lock the mutex, so that the manager thread or other threads won't
   // interfere.
   TQMutexLocker locker(&mutex);
-  RequestData *data = tqfindData(th);
+  RequestData *data = findData(th);
 
   if (data)
     // it found something, that's good
@@ -378,18 +378,18 @@ RequestData* KResolverManager::requestData(KResolverThread *th, int maxWaitTime)
   feedWorkers.wait(&mutex, maxWaitTime);
   availableThreads--;
 
-  data = tqfindData(th);
+  data = findData(th);
   return data;
 }
 
-RequestData* KResolverManager::tqfindData(KResolverThread* th)
+RequestData* KResolverManager::findData(KResolverThread* th)
 {
   /////
   // This function is called by @ref requestData above and must
   // always be called with a locked mutex
   /////
 
-  // now tqfind data to be processed
+  // now find data to be processed
   for (RequestData *curr = newRequests.first(); curr; curr = newRequests.next())
     if (!curr->worker->m_finished)
       {
@@ -504,7 +504,7 @@ void KResolverManager::registerNewWorker(KResolverWorkerFactoryBase *factory)
   workerFactories.append(factory);
 }
 
-KResolverWorkerBase* KResolverManager::tqfindWorker(KResolverPrivate* p)
+KResolverWorkerBase* KResolverManager::findWorker(KResolverPrivate* p)
 {
   /////
   // this function can be called on any user thread
@@ -514,7 +514,7 @@ KResolverWorkerBase* KResolverManager::tqfindWorker(KResolverPrivate* p)
   // thread-safe!
   // but the factory list is expected not to be changed asynchronously
 
-  // This function is responsible for tqfinding a suitable worker for the given
+  // This function is responsible for finding a suitable worker for the given
   // input. That means we have to do a costly operation to create each worker
   // class and call their preprocessing functions. The first one that
   // says they can process (i.e., preprocess() returns true) will get the job.
@@ -653,12 +653,12 @@ void KResolverManager::enqueue(KResolver *obj, RequestData *requestor)
   newrequest->input = &obj->d->input;
   newrequest->requestor = requestor;
 
-  // when processing a new request, tqfind the most
+  // when processing a new request, find the most
   // suitable worker
-  if ((newrequest->worker = tqfindWorker(obj->d)) == 0L)
+  if ((newrequest->worker = findWorker(obj->d)) == 0L)
     {
       // oops, problem
-      // cannot tqfind a worker class for this guy
+      // cannot find a worker class for this guy
       obj->d->status = KResolver::Failed;
       obj->d->errorcode = KResolver::UnsupportedFamily;
       obj->d->syserror = 0;
@@ -668,7 +668,7 @@ void KResolverManager::enqueue(KResolver *obj, RequestData *requestor)
     }
 
   // no, queue it
-  // p->status was set in tqfindWorker!
+  // p->status was set in findWorker!
   if (requestor)
     requestor->nRequests++;
 
@@ -728,7 +728,7 @@ void KResolverManager::dispatch(RequestData *data)
     {
       // yes, a new thread should be started
 
-      // tqfind if there's a finished one
+      // find if there's a finished one
       KResolverThread *th = workers.first();
       while (th && th->running())
 	th = workers.next();
diff --git a/kdecore/network/kresolverstandardworkers.cpp b/kdecore/network/kresolverstandardworkers.cpp
index 401158cab..f64803ced 100644
--- a/kdecore/network/kresolverstandardworkers.cpp
+++ b/kdecore/network/kresolverstandardworkers.cpp
@@ -140,11 +140,11 @@ bool KBlacklistWorker::isBlacklisted(const TQString& host)
     return false;
 
   // KDE4: QLatin1String
-  TQString ascii = TQString::tqfromLatin1(KResolver::domainToAscii(host));
+  TQString ascii = TQString::fromLatin1(KResolver::domainToAscii(host));
 
   TQMutexLocker locker(&blacklistMutex);
 
-  // now tqfind out if this hostname is present
+  // now find out if this hostname is present
   TQStringList::ConstIterator it = blacklist.constBegin(),
     end = blacklist.constEnd();
   for ( ; it != end; ++it)
@@ -208,12 +208,12 @@ namespace
   {
   public:
     TQCString m_hostname;	// might be different!
-    TQ_UINT16 m_port;
+    Q_UINT16 m_port;
     int m_scopeid;
     int m_af;
     KResolverResults& results;
 
-    GetHostByNameThread(const char * hostname, TQ_UINT16 port,
+    GetHostByNameThread(const char * hostname, Q_UINT16 port,
 			int scopeid, int af, KResolverResults* res) :
       m_hostname(hostname), m_port(port), m_scopeid(scopeid), m_af(af),
       results(*res)
@@ -251,7 +251,7 @@ namespace
 
 	// check blacklist
 	if (m_af != AF_INET && 
-	    KBlacklistWorker::isBlacklisted(TQString::tqfromLatin1(m_hostname)))
+	    KBlacklistWorker::isBlacklisted(TQString::fromLatin1(m_hostname)))
 	  break;
 
 # ifdef USE_GETHOSTBYNAME2_R
@@ -358,7 +358,7 @@ namespace
     if (socktype == 0)
       socktype = SOCK_STREAM;	// default
 
-    TQString canon = KResolver::domainToUnicode(TQString::tqfromLatin1(he->h_name));
+    TQString canon = KResolver::domainToUnicode(TQString::fromLatin1(he->h_name));
     KInetSocketAddress sa;
     sa.setPort(m_port);
     if (he->h_addrtype != AF_INET)
@@ -404,7 +404,7 @@ namespace
   {
     // check blacklist
     if ((m_af != AF_INET && m_af != AF_UNSPEC) && 
-	KBlacklistWorker::isBlacklisted(TQString::tqfromLatin1(m_node)))
+	KBlacklistWorker::isBlacklisted(TQString::fromLatin1(m_node)))
       {
 	results.setError(KResolver::NoName);
 	finished();
@@ -547,11 +547,11 @@ bool KStandardWorker::sanityCheck()
   if (!nodeName().isEmpty())
     {
       TQString node = nodeName();
-      if (node.tqfind('%') != -1)
-	node.truncate(node.tqfind('%'));
+      if (node.find('%') != -1)
+	node.truncate(node.find('%'));
 
-      if (node.isEmpty() || node == TQString::tqfromLatin1("*") ||
-	  node == TQString::tqfromLatin1("localhost"))
+      if (node.isEmpty() || node == TQString::fromLatin1("*") ||
+	  node == TQString::fromLatin1("localhost"))
 	m_encodedName.truncate(0);
       else
 	{
@@ -584,7 +584,7 @@ bool KStandardWorker::resolveScopeId()
 {
   // we must test the original name, not the encoded one
   scopeid = 0;
-  int pos = nodeName().tqfindRev('%');
+  int pos = nodeName().findRev('%');
   if (pos == -1)
     return true;
 
@@ -608,7 +608,7 @@ bool KStandardWorker::resolveScopeId()
 
 bool KStandardWorker::resolveService()
 {
-  // tqfind the service first
+  // find the service first
   bool ok;
   port = serviceName().toUInt(&ok);
   if (!ok)
@@ -616,7 +616,7 @@ bool KStandardWorker::resolveService()
       // service name does not contain a port number
       // must be a name
 
-      if (serviceName().isEmpty() || serviceName().compare(TQString::tqfromLatin1("*")) == 0)
+      if (serviceName().isEmpty() || serviceName().compare(TQString::fromLatin1("*")) == 0)
 	port = 0;
       else
 	{
@@ -648,7 +648,7 @@ bool KStandardWorker::resolveService()
 	    }
 
 	  // it worked, we have a port number
-	  port = (TQ_UINT16)result;
+	  port = (Q_UINT16)result;
 	}
     }
 
@@ -704,7 +704,7 @@ bool KStandardWorker::resolveNumerically()
     // no Internet address is wanted!
     return (flags() & KResolver::NoResolve);
 
-  // now try to tqfind results
+  // now try to find results
   if (!resolveScopeId() || !resolveService())
     return (flags() & KResolver::NoResolve);
 
@@ -712,7 +712,7 @@ bool KStandardWorker::resolveNumerically()
   // now try to resolve the hostname numerically
   KInetSocketAddress sa;
   setError(KResolver::NoError);
-  sa.setHost(KIpAddress(TQString::tqfromLatin1(m_encodedName)));
+  sa.setHost(KIpAddress(TQString::fromLatin1(m_encodedName)));
   
   // if it failed, the length was reset to 0
   bool ok = sa.length() != 0;
@@ -827,16 +827,16 @@ bool KStandardWorker::preprocess()
 
   // check if the user wants something we know about
 #ifdef AF_INET6
-# define tqmask	(KResolver::IPv6Family | KResolver::IPv4Family | KResolver::UnixFamily)
+# define mask	(KResolver::IPv6Family | KResolver::IPv4Family | KResolver::UnixFamily)
 #else
-# define tqmask	(KResolver::IPv4Family | KResolver::UnixFamily)
+# define mask	(KResolver::IPv4Family | KResolver::UnixFamily)
 #endif
 
-  if ((familyMask() & tqmask) == 0)
+  if ((familyMask() & mask) == 0)
     // errr... nothing we know about
     return false;
 
-#undef tqmask
+#undef mask
 
   return true;			// it's ok
 }
@@ -862,7 +862,7 @@ bool KStandardWorker::run()
   // these are the family types that we know of
   struct
   {
-    KResolver::SocketFamilies tqmask;
+    KResolver::SocketFamilies mask;
     int af;
   } families[] = { { KResolver::IPv4Family, AF_INET }
 #ifdef AF_INET6					  
@@ -874,7 +874,7 @@ bool KStandardWorker::run()
   resultList.setAutoDelete(true);
 
   for (int i = 0; i < familyCount; i++)
-    if (familyMask() & families[i].tqmask)
+    if (familyMask() & families[i].mask)
       {
 #ifdef AF_INET6
 	if (skipIPv6 && families[i].af == AF_INET6)
diff --git a/kdecore/network/kresolverstandardworkers_p.h b/kdecore/network/kresolverstandardworkers_p.h
index 2db460bef..310849bf3 100644
--- a/kdecore/network/kresolverstandardworkers_p.h
+++ b/kdecore/network/kresolverstandardworkers_p.h
@@ -66,7 +66,7 @@ namespace KNetwork { namespace Internal
   {
   protected:
     mutable TQCString m_encodedName;
-    TQ_UINT16 port;
+    Q_UINT16 port;
     int scopeid;
     TQPtrList<KNetwork::KResolverResults> resultList;
 
diff --git a/kdecore/network/kresolverworkerbase.h b/kdecore/network/kresolverworkerbase.h
index a4f352da6..4dee33239 100644
--- a/kdecore/network/kresolverworkerbase.h
+++ b/kdecore/network/kresolverworkerbase.h
@@ -119,7 +119,7 @@ public:
    * Derived classes will put their resolved data in this list, or will
    * leave it empty in case of error.
    *
-   * tqStatus and error codes should also be stored in this object (the
+   * Status and error codes should also be stored in this object (the
    * @ref setError function does that).
    */
   KResolverResults results;
@@ -147,7 +147,7 @@ public:
   int flags() const;
 
   /**
-   * gets the family tqmask
+   * gets the family mask
    */
   int familyMask() const;
 
diff --git a/kdecore/network/kreverseresolver.cpp b/kdecore/network/kreverseresolver.cpp
index d781e5f18..639f6dbe4 100644
--- a/kdecore/network/kreverseresolver.cpp
+++ b/kdecore/network/kreverseresolver.cpp
@@ -203,7 +203,7 @@ bool KReverseResolver::resolve(const KSocketAddress& addr, TQString& node,
   return false;
 }
 
-bool KReverseResolver::resolve(const struct sockaddr* sa, TQ_UINT16 salen,
+bool KReverseResolver::resolve(const struct sockaddr* sa, Q_UINT16 salen,
 			       TQString& node, TQString& serv, int flags)
 {
   return resolve(KSocketAddress(sa, salen), node, serv, flags);
@@ -238,8 +238,8 @@ bool ReverseThread::run()
 
   if (err == 0)
     {
-      node = KResolver::domainToUnicode(TQString::tqfromLatin1(h));
-      service = TQString::tqfromLatin1(s);
+      node = KResolver::domainToUnicode(TQString::fromLatin1(h));
+      service = TQString::fromLatin1(s);
       success = true;
     }
   else
diff --git a/kdecore/network/kreverseresolver.h b/kdecore/network/kreverseresolver.h
index bf338c075..26274e586 100644
--- a/kdecore/network/kreverseresolver.h
+++ b/kdecore/network/kreverseresolver.h
@@ -47,7 +47,7 @@ class KReverseResolverPrivate;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KReverseResolver: public TQObject
+class KDECORE_EXPORT KReverseResolver: public QObject
 {
   Q_OBJECT
 
@@ -144,7 +144,7 @@ signals:
   /**
    * This signal is emitted when the resolution has finished.
    *
-   * @param obj		this class, which tqcontains the results
+   * @param obj		this class, which contains the results
    */
   void finished(const KReverseResolver& obj);
 
@@ -183,7 +183,7 @@ public:
    * @return true if the resolution succeeded, false if not
    * @see ReverseFlags for the possible values for @p flags
    */
-  static bool resolve(const struct sockaddr* sa, TQ_UINT16 salen, 
+  static bool resolve(const struct sockaddr* sa, Q_UINT16 salen, 
 		      TQString& node, TQString& serv, int flags = 0);
 
 private:
diff --git a/kdecore/network/kserversocket.cpp b/kdecore/network/kserversocket.cpp
index 084418cf1..49facb12c 100644
--- a/kdecore/network/kserversocket.cpp
+++ b/kdecore/network/kserversocket.cpp
@@ -155,7 +155,7 @@ bool KServerSocket::lookup()
   // make sure we have at least one parameter for lookup
   if (d->resolver.serviceName().isNull() &&
       !d->resolver.nodeName().isNull())
-    d->resolver.setServiceName(TQString::tqfromLatin1(""));
+    d->resolver.setServiceName(TQString::fromLatin1(""));
 
   // don't restart the lookups if they had succeeded and
   // the input values weren't changed
@@ -326,7 +326,7 @@ KActiveSocketBase* KServerSocket::accept()
   streamsocket->setSocketDevice(accepted);
 
   // FIXME!
-  // when KStreamSocket can tqfind out the state of the socket passed through
+  // when KStreamSocket can find out the state of the socket passed through
   // setSocketDevice, this will probably be unnecessary:
   streamsocket->setState(KStreamSocket::Connected);
   streamsocket->setFlags(IO_Sequential | IO_Raw | IO_ReadWrite | IO_Open | IO_Async);
diff --git a/kdecore/network/kserversocket.h b/kdecore/network/kserversocket.h
index d4c7fea96..30d8b40b0 100644
--- a/kdecore/network/kserversocket.h
+++ b/kdecore/network/kserversocket.h
@@ -380,8 +380,8 @@ private slots:
 
 signals:
   /**
-   * This signal is emitted when this object tqfinds an error.
-   * The @p code parameter tqcontains the error code that can
+   * This signal is emitted when this object finds an error.
+   * The @p code parameter contains the error code that can
    * also be found by calling @ref error.
    */
   void gotError(int code);
diff --git a/kdecore/network/ksocketaddress.cpp b/kdecore/network/ksocketaddress.cpp
index a6fd14cf5..adfc76b06 100644
--- a/kdecore/network/ksocketaddress.cpp
+++ b/kdecore/network/ksocketaddress.cpp
@@ -74,7 +74,7 @@ const KIpAddress KIpAddress::anyhostV4(0L, 4);
 const KIpAddress KIpAddress::anyhostV6(0L, 6);
 
 // helper function to test if an IPv6 v4-mapped address is equal to its IPv4 counterpart
-static bool check_v4mapped(const TQ_UINT32* v6addr, TQ_UINT32 v4addr)
+static bool check_v4mapped(const Q_UINT32* v6addr, Q_UINT32 v4addr)
 {
   // check that the v6 is a v4-mapped address
   if (!(v6addr[0] == 0 && v6addr[1] == 0 && v6addr[2] == htonl(0x0000ffff)))
@@ -131,12 +131,12 @@ bool KIpAddress::setAddress(const TQString& address)
   m_version = 0;
 
   // try to guess the address version
-  if (address.tqfind(':') != -1)
+  if (address.find(':') != -1)
     {
 #ifdef AF_INET6
       // guessing IPv6
 
-      TQ_UINT32 buf[4];
+      Q_UINT32 buf[4];
       if (inet_pton(AF_INET6, address.latin1(), buf))
 	{
 	  memcpy(m_data, buf, sizeof(m_data));
@@ -149,7 +149,7 @@ bool KIpAddress::setAddress(const TQString& address)
     }
   else
     {
-      TQ_UINT32 buf;
+      Q_UINT32 buf;
       if (inet_pton(AF_INET, address.latin1(), &buf))
 	{
 	  *m_data = buf;
@@ -165,7 +165,7 @@ bool KIpAddress::setAddress(const TQString& address)
 
 bool KIpAddress::setAddress(const char* address)
 {
-  return setAddress(TQString::tqfromLatin1(address));
+  return setAddress(TQString::fromLatin1(address));
 }
 
 // set from binary data
@@ -194,21 +194,21 @@ TQString KIpAddress::toString() const
     {
     case 4:
       inet_ntop(AF_INET, m_data, buf, sizeof(buf) - 1);
-      return TQString::tqfromLatin1(buf);
+      return TQString::fromLatin1(buf);
 
     case 6:
 #ifdef AF_INET6
       inet_ntop(AF_INET6, m_data, buf, sizeof(buf) - 1);
 #endif
-      return TQString::tqfromLatin1(buf);
+      return TQString::fromLatin1(buf);
     }
 
   return TQString::null;
 }
 
-TQ_UINT32 KIpAddress::hostIPv4Addr(bool convertMapped) const
+Q_UINT32 KIpAddress::hostIPv4Addr(bool convertMapped) const
 {
-    TQ_UINT32 addr = IPv4Addr(convertMapped);
+    Q_UINT32 addr = IPv4Addr(convertMapped);
     return ntohl(addr);
 }
 
@@ -219,23 +219,23 @@ TQ_UINT32 KIpAddress::hostIPv4Addr(bool convertMapped) const
 struct our_sockaddr_in6
 {
 # ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
-  TQ_UINT8		sin6_len;
-  TQ_UINT8		sin6_family;
+  Q_UINT8		sin6_len;
+  Q_UINT8		sin6_family;
 # else  //!HAVE_STRUCT_SOCKADDR_SA_LEN
-  TQ_UINT16		sin6_family;
+  Q_UINT16		sin6_family;
 # endif
-  TQ_UINT16       	sin6_port;	/* RFC says in_port_t */
-  TQ_UINT32		sin6_flowinfo;
-  TQ_UINT8		sin6_addr[16]; // 24 bytes up to here
-  TQ_UINT32		sin6_scope_id; // 28 bytes total
+  Q_UINT16       	sin6_port;	/* RFC says in_port_t */
+  Q_UINT32		sin6_flowinfo;
+  Q_UINT8		sin6_addr[16]; // 24 bytes up to here
+  Q_UINT32		sin6_scope_id; // 28 bytes total
 };
 
 // useful definitions
-#define MIN_SOCKADDR_LEN	sizeof(TQ_UINT16)
+#define MIN_SOCKADDR_LEN	sizeof(Q_UINT16)
 #define SOCKADDR_IN_LEN		sizeof(sockaddr_in)
 #define MIN_SOCKADDR_IN6_LEN	((unsigned long) &(((our_sockaddr_in6*)0)->sin6_scope_id))
 #define SOCKADDR_IN6_LEN	sizeof(our_sockaddr_in6)
-#define MIN_SOCKADDR_UN_LEN	(sizeof(TQ_UINT16) + sizeof(char))
+#define MIN_SOCKADDR_UN_LEN	(sizeof(Q_UINT16) + sizeof(char))
 
 
 class KNetwork::KSocketAddressData
@@ -263,14 +263,14 @@ public:
     struct our_sockaddr_in6 *in6;
     struct sockaddr_un      *un;
   } addr;
-  TQ_UINT16 curlen, reallen;
+  Q_UINT16 curlen, reallen;
 
   KSocketAddressData()
     : ref(this)
   {
     addr.generic = 0L;
     curlen = 0;
-    tqinvalidate();
+    invalidate();
   }
 
   ~KSocketAddressData()
@@ -282,10 +282,10 @@ public:
   inline bool invalid() const
   { return reallen == 0; }
 
-  inline void tqinvalidate()
+  inline void invalidate()
   { reallen = 0; }
 
-  void dup(const sockaddr* sa, TQ_UINT16 len, bool clear = true);
+  void dup(const sockaddr* sa, Q_UINT16 len, bool clear = true);
 
   void makeipv4()
   {
@@ -343,12 +343,12 @@ public:
 };
 
 // create duplicates of
-void KSocketAddressData::dup(const sockaddr* sa, TQ_UINT16 len, bool clear)
+void KSocketAddressData::dup(const sockaddr* sa, Q_UINT16 len, bool clear)
 {
   if (len < MIN_SOCKADDR_LEN)
     {
       // certainly invalid
-      tqinvalidate();
+      invalidate();
       return;
     }
 
@@ -359,7 +359,7 @@ void KSocketAddressData::dup(const sockaddr* sa, TQ_UINT16 len, bool clear)
 	     (sa->sa_family == AF_UNIX && len < MIN_SOCKADDR_UN_LEN)))
     {
       // also invalid
-      tqinvalidate();
+      invalidate();
       return;
     }
 
@@ -411,7 +411,7 @@ KSocketAddress::KSocketAddress()
 }
 
 // constructor from binary data
-KSocketAddress::KSocketAddress(const sockaddr *sa, TQ_UINT16 len)
+KSocketAddress::KSocketAddress(const sockaddr *sa, Q_UINT16 len)
   : d(new KSocketAddressData)
 {
   setAddress(sa, len);
@@ -444,7 +444,7 @@ KSocketAddress& KSocketAddress::operator =(const KSocketAddress& other)
   if (other.d && !other.d->invalid())
     d->dup(other.d->addr.generic, other.d->reallen);
   else
-    d->tqinvalidate();
+    d->invalidate();
   return *this;
 }
 
@@ -462,24 +462,24 @@ sockaddr* KSocketAddress::address()
   return d->addr.generic;
 }
 
-KSocketAddress& KSocketAddress::setAddress(const sockaddr* sa, TQ_UINT16 len)
+KSocketAddress& KSocketAddress::setAddress(const sockaddr* sa, Q_UINT16 len)
 {
   if (sa != 0L && len >= MIN_SOCKADDR_LEN)
     d->dup(sa, len);
   else
-    d->tqinvalidate();
+    d->invalidate();
 
   return *this;
 }
 
-TQ_UINT16 KSocketAddress::length() const
+Q_UINT16 KSocketAddress::length() const
 {
   if (d->invalid())
     return 0;
   return d->reallen;
 }
 
-KSocketAddress& KSocketAddress::setLength(TQ_UINT16 len)
+KSocketAddress& KSocketAddress::setLength(Q_UINT16 len)
 {
   d->dup((sockaddr*)0L, len, false);
 
@@ -619,7 +619,7 @@ TQString KSocketAddress::toString() const
     fmt = "[%1]:%2";
 #endif
   else if (d->addr.generic->sa_family == AF_UNIX)
-    return TQString::tqfromLatin1("unix:%1").arg(serviceName());
+    return TQString::fromLatin1("unix:%1").arg(serviceName());
   else
     return i18n("1: the unknown socket address family number",
 		"Unknown family %1").arg(d->addr.generic->sa_family);
@@ -687,7 +687,7 @@ KInetSocketAddress::KInetSocketAddress()
 }
 
 // binary data constructor
-KInetSocketAddress::KInetSocketAddress(const sockaddr* sa, TQ_UINT16 len)
+KInetSocketAddress::KInetSocketAddress(const sockaddr* sa, Q_UINT16 len)
   : KSocketAddress(sa, len)
 {
   if (!d->invalid())
@@ -695,7 +695,7 @@ KInetSocketAddress::KInetSocketAddress(const sockaddr* sa, TQ_UINT16 len)
 }
 
 // create from IP and port
-KInetSocketAddress::KInetSocketAddress(const KIpAddress& host, TQ_UINT16 port)
+KInetSocketAddress::KInetSocketAddress(const KIpAddress& host, Q_UINT16 port)
 {
   setHost(host);
   setPort(port);
@@ -788,14 +788,14 @@ KInetSocketAddress& KInetSocketAddress::setHost(const KIpAddress& ip)
 
     default:
       // empty
-      d->tqinvalidate();
+      d->invalidate();
     }
 
   return *this;
 }
 
 // returns the port
-TQ_UINT16 KInetSocketAddress::port() const
+Q_UINT16 KInetSocketAddress::port() const
 {
   if (d->invalid())
     return 0;
@@ -814,7 +814,7 @@ TQ_UINT16 KInetSocketAddress::port() const
   return 0;
 }
 
-KInetSocketAddress& KInetSocketAddress::setPort(TQ_UINT16 port)
+KInetSocketAddress& KInetSocketAddress::setPort(Q_UINT16 port)
 {
   if (d->invalid())
     makeIPv4();
@@ -832,7 +832,7 @@ KInetSocketAddress& KInetSocketAddress::setPort(TQ_UINT16 port)
 #endif
       
     default:
-      d->tqinvalidate();		// setting the port on something else
+      d->invalidate();		// setting the port on something else
     }
 
   return *this;
@@ -850,7 +850,7 @@ KInetSocketAddress& KInetSocketAddress::makeIPv6()
   return *this;
 }
 
-TQ_UINT32 KInetSocketAddress::flowinfo() const
+Q_UINT32 KInetSocketAddress::flowinfo() const
 {
 #ifndef AF_INET6
   return 0;
@@ -862,7 +862,7 @@ TQ_UINT32 KInetSocketAddress::flowinfo() const
 #endif
 }
 
-KInetSocketAddress& KInetSocketAddress::setFlowinfo(TQ_UINT32 flowinfo)
+KInetSocketAddress& KInetSocketAddress::setFlowinfo(Q_UINT32 flowinfo)
 {
   makeIPv6();			// must set here
   d->addr.in6->sin6_flowinfo = flowinfo;
@@ -897,18 +897,18 @@ void KInetSocketAddress::update()
     return;
 #endif
   else
-    d->tqinvalidate();
+    d->invalidate();
 }
 
 KUnixSocketAddress::KUnixSocketAddress()
 {
 }
 
-KUnixSocketAddress::KUnixSocketAddress(const sockaddr* sa, TQ_UINT16 len)
+KUnixSocketAddress::KUnixSocketAddress(const sockaddr* sa, Q_UINT16 len)
   : KSocketAddress(sa, len)
 {
   if (!d->invalid() && d->addr.un->sun_family != AF_UNIX)
-    d->tqinvalidate();
+    d->invalidate();
 }
 
 KUnixSocketAddress::KUnixSocketAddress(const KUnixSocketAddress& other)
diff --git a/kdecore/network/ksocketaddress.h b/kdecore/network/ksocketaddress.h
index 2d44a0909..6889527e3 100644
--- a/kdecore/network/ksocketaddress.h
+++ b/kdecore/network/ksocketaddress.h
@@ -119,7 +119,7 @@ public:
    *
    * @param ip4addr		the IPv4 address
    */
-  inline KIpAddress(TQ_UINT32 ip4addr)
+  inline KIpAddress(Q_UINT32 ip4addr)
   { setAddress(&ip4addr, 4); }
 
   /**
@@ -232,7 +232,7 @@ public:
    * system's in_addr type.
    *
    */
-  inline TQ_UINT32 IPv4Addr(bool convertMapped = true) const
+  inline Q_UINT32 IPv4Addr(bool convertMapped = true) const
   {
     return (convertMapped && isV4Mapped()) ? m_data[3] : m_data[0];
   }
@@ -245,7 +245,7 @@ public:
    * valid. The address returned is in host byte order.
    *
    */
-  TQ_UINT32 hostIPv4Addr(bool convertMapped = true) const;
+  Q_UINT32 hostIPv4Addr(bool convertMapped = true) const;
 
 public:
   /*-- tests --*/
@@ -310,7 +310,7 @@ public:
   inline bool isMulticast() const
   {
     if (version() == 4) return isClassD();
-    if (version() == 6) return ((TQ_UINT8*)addr())[0] == 0xff;
+    if (version() == 6) return ((Q_UINT8*)addr())[0] == 0xff;
     return false;
   }
 
@@ -320,7 +320,7 @@ public:
   inline bool isLinkLocal() const
   { 
     if (version() != 6) return false;
-    TQ_UINT8* addr = (TQ_UINT8*)this->addr();
+    Q_UINT8* addr = (Q_UINT8*)this->addr();
     return (addr[0] & 0xff) == 0xfe &&
       (addr[1] & 0xc0) == 0x80;
   }
@@ -331,7 +331,7 @@ public:
   inline bool isSiteLocal() const
   {
     if (version() != 6) return false;
-    TQ_UINT8* addr = (TQ_UINT8*)this->addr();
+    Q_UINT8* addr = (Q_UINT8*)this->addr();
     return (addr[0] & 0xff) == 0xfe &&
       (addr[1] & 0xc0) == 0xc0;
   }
@@ -348,10 +348,10 @@ public:
   inline bool isV4Mapped() const
   {
     if (version() != 6) return false;
-    TQ_UINT32* addr = (TQ_UINT32*)this->addr();
+    Q_UINT32* addr = (Q_UINT32*)this->addr();
     return addr[0] == 0 && addr[1] == 0 &&
-      ((TQ_UINT16*)&addr[2])[0] == 0 &&
-      ((TQ_UINT16*)&addr[2])[1] == 0xffff;
+      ((Q_UINT16*)&addr[2])[0] == 0 &&
+      ((Q_UINT16*)&addr[2])[1] == 0xffff;
   }
 
   /**
@@ -360,7 +360,7 @@ public:
   inline bool isV4Compat() const
   {
     if (version() != 6 || isLocalhost()) return false;
-    TQ_UINT32* addr = (TQ_UINT32*)this->addr();
+    Q_UINT32* addr = (Q_UINT32*)this->addr();
     return addr[0] == 0 && addr[1] == 0 && addr[2] == 0 && addr[3] != 0;
   }
 
@@ -368,34 +368,34 @@ public:
    * Returns true if this is an IPv6 node-local multicast address.
    */
   inline bool isMulticastNodeLocal() const
-  { return version() == 6 && isMulticast() && (((TQ_UINT32*)addr())[0] & 0xf) == 0x1; }
+  { return version() == 6 && isMulticast() && (((Q_UINT32*)addr())[0] & 0xf) == 0x1; }
 
   /**
    * Returns true if this is an IPv6 link-local multicast address.
    */
   inline bool isMulticastLinkLocal() const
-  { return version() == 6 && isMulticast() && (((TQ_UINT32*)addr())[0] & 0xf) == 0x2; }
+  { return version() == 6 && isMulticast() && (((Q_UINT32*)addr())[0] & 0xf) == 0x2; }
       
   /**
    * Returns true if this is an IPv6 site-local multicast address.
    */
   inline bool isMulticastSiteLocal() const
-  { return version() == 6 && isMulticast() && (((TQ_UINT32*)addr())[0] & 0xf) == 0x5; }
+  { return version() == 6 && isMulticast() && (((Q_UINT32*)addr())[0] & 0xf) == 0x5; }
 
   /**
    * Returns true if this is an IPv6 organisational-local multicast address.
    */
   inline bool isMulticastOrgLocal() const
-  { return version() == 6 && isMulticast() && (((TQ_UINT32*)addr())[0] & 0xf) == 0x8; }
+  { return version() == 6 && isMulticast() && (((Q_UINT32*)addr())[0] & 0xf) == 0x8; }
 
   /**
    * Returns true if this is an IPv6 global multicast address.
    */
   inline bool isMulticastGlobal() const
-  { return version() == 6 && isMulticast() && (((TQ_UINT32*)addr())[0] & 0xf) == 0xe; }
+  { return version() == 6 && isMulticast() && (((Q_UINT32*)addr())[0] & 0xf) == 0xe; }
 
 protected:
-  TQ_UINT32 m_data[4];	       // 16 bytes, needed for an IPv6 address
+  Q_UINT32 m_data[4];	       // 16 bytes, needed for an IPv6 address
 
   char m_version;
 
@@ -437,7 +437,7 @@ public:
    * @param sa		the socket address structure
    * @param len		the socket address length
    */
-  KSocketAddress(const sockaddr* sa, TQ_UINT16 len);
+  KSocketAddress(const sockaddr* sa, Q_UINT16 len);
 
   /**
    * Copy constructor. This creates a copy of the other
@@ -490,7 +490,7 @@ public:
    * @param sa		the socket address structure
    * @param len		the socket address length
    */
-  KSocketAddress& setAddress(const sockaddr *sa, TQ_UINT16 len);
+  KSocketAddress& setAddress(const sockaddr *sa, Q_UINT16 len);
 
   /**
    * Returns the socket address structure, to be passed down to
@@ -502,7 +502,7 @@ public:
   /**
    * Returns the length of this socket address structure.
    */
-  TQ_UINT16 length() const;
+  Q_UINT16 length() const;
 
   /**
    * Sets the length of this socket structure.
@@ -511,7 +511,7 @@ public:
    * buffer to fit needs. This function should not be used except for handling
    * unknown socket address structures.
    *
-   * Also note that this function may tqinvalidate the socket if a known
+   * Also note that this function may invalidate the socket if a known
    * family is set (Internet or Unix socket) and the new length would be
    * too small to hold the system's sockaddr_* structure. If unsure, reset
    * the family:
@@ -524,7 +524,7 @@ public:
    *
    * @param len		the new length
    */
-  KSocketAddress& setLength(TQ_UINT16 len);
+  KSocketAddress& setLength(Q_UINT16 len);
 
   /**
    * Returns the family of this address.
@@ -535,7 +535,7 @@ public:
   /**
    * Sets the family of this object.
    *
-   * Note: setting the family will probably tqinvalidate any address data
+   * Note: setting the family will probably invalidate any address data
    * contained in this object. Use this function with care.
    *
    * @param family	the new family to set
@@ -666,7 +666,7 @@ public:
    * @param sa		the sockaddr structure
    * @param len		the structure's length
    */
-  KInetSocketAddress(const sockaddr* sa, TQ_UINT16 len);
+  KInetSocketAddress(const sockaddr* sa, Q_UINT16 len);
 
   /**
    * Creates an object from an IP address and port.
@@ -674,7 +674,7 @@ public:
    * @param host	the IP address
    * @param port	the port number
    */
-  KInetSocketAddress(const KIpAddress& host, TQ_UINT16 port);
+  KInetSocketAddress(const KIpAddress& host, Q_UINT16 port);
 
   /**
    * Copy constructor.
@@ -688,7 +688,7 @@ public:
   /**
    * Copy constructor.
    *
-   * If the other, generic socket address tqcontains an Internet address,
+   * If the other, generic socket address contains an Internet address,
    * it will be copied. Otherwise, this object will be empty.
    *
    * @param other	the other object
@@ -750,7 +750,7 @@ public:
    * @return a port number in the range 0 to 65535, inclusive. An empty or 
    * invalid object will have a port number of 0.
    */
-  TQ_UINT16 port() const;
+  Q_UINT16 port() const;
 
   /**
    * Sets the port number. If this object is empty, this function will default to
@@ -759,7 +759,7 @@ public:
    * @param port	the port number to set
    * @return a reference to itself
    */
-  KInetSocketAddress& setPort(TQ_UINT16 port);
+  KInetSocketAddress& setPort(Q_UINT16 port);
 
   /**
    * Converts this object to an IPv4 socket address. It has no effect if the object
@@ -787,7 +787,7 @@ public:
    *
    * @return the flowinfo information or 0 if this object is empty or IPv4
    */
-  TQ_UINT32 flowinfo() const;
+  Q_UINT32 flowinfo() const;
 
   /**
    * Sets the flowinfo information for an IPv6 socket address. If this is not
@@ -796,7 +796,7 @@ public:
    * @param flowinfo		the flowinfo to set
    * @return a reference to itself
    */
-  KInetSocketAddress& setFlowinfo(TQ_UINT32 flowinfo);
+  KInetSocketAddress& setFlowinfo(Q_UINT32 flowinfo);
 
   /**
    * Returns the scope id this IPv6 socket is bound to.
@@ -854,7 +854,7 @@ public:
    * @param sa		the socket address structure
    * @param len		the structure's length
    */
-  KUnixSocketAddress(const sockaddr* sa, TQ_UINT16 len);
+  KUnixSocketAddress(const sockaddr* sa, Q_UINT16 len);
 
   /**
    * Copy constructor. Creates a copy of the other object,
diff --git a/kdecore/network/ksocketbase.h b/kdecore/network/ksocketbase.h
index fe8812cde..133086114 100644
--- a/kdecore/network/ksocketbase.h
+++ b/kdecore/network/ksocketbase.h
@@ -128,7 +128,7 @@ public:
    * Possible socket error codes.
    *
    * This is a list of possible error conditions that socket classes may
-   * be expected to tqfind.
+   * be expected to find.
    *
    * - NoError: no error has been detected
    * - LookupFailure: if a name lookup has failed
@@ -191,11 +191,11 @@ protected:
   /**
    * Set the given socket options.
    *
-   * The default implementation does nothing but store the tqmask internally.
+   * The default implementation does nothing but store the mask internally.
    * Descended classes must override this function to achieve functionality and
    * must also call this implementation.
    *
-   * @param opts	a tqmask of @ref SocketOptions or-ed bits of options to set
+   * @param opts	a mask of @ref SocketOptions or-ed bits of options to set
    *			or unset
    * @returns true on success
    * @note this function sets the options corresponding to the bits enabled in @p opts
@@ -206,11 +206,11 @@ protected:
   /**
    * Retrieves the socket options that have been set.
    *
-   * The default implementation just retrieves the tqmask from an internal variable.
+   * The default implementation just retrieves the mask from an internal variable.
    * Descended classes may choose to override this function to read the values
    * from the operating system.
    *
-   * @returns the tqmask of the options set
+   * @returns the mask of the options set
    */
   virtual int socketOptions() const;
 
@@ -350,9 +350,9 @@ public:
    *       should test the object returned by @ref socketDevice (through
    *       @ref KSocketDevice::capabilities, for instance) the availability.
    *
-   * @param add		tqmask of @ref KSocketDevice::Capabilities to add
-   * @param remove	tqmask of bits to remove from the requirements
-   * @return the current tqmask of requested capabilities
+   * @param add		mask of @ref KSocketDevice::Capabilities to add
+   * @param remove	mask of bits to remove from the requirements
+   * @return the current mask of requested capabilities
    */
   int setRequestedCapabilities(int add, int remove = 0);
 
@@ -533,7 +533,7 @@ public:
    * blocking.
    */
 #ifdef USE_QT3
-  virtual TQ_LONG bytesAvailable() const = 0;
+  virtual Q_LONG bytesAvailable() const = 0;
 #endif
 #ifdef USE_QT4
   virtual qint64 bytesAvailable() const = 0;
@@ -550,7 +550,7 @@ public:
    *
    * @returns the number of bytes available
    */
-  virtual TQ_LONG waitForMore(int msecs, bool *timeout = 0L) = 0;
+  virtual Q_LONG waitForMore(int msecs, bool *timeout = 0L) = 0;
 
   /**
    * Reads data from the socket.
@@ -558,7 +558,7 @@ public:
    * Reimplemented from TQIODevice. See TQIODevice::readBlock for
    * more information.
    */
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG len) = 0;
+  virtual Q_LONG readBlock(char *data, Q_ULONG len) = 0;
 
   /** @overload
    * Receives data and the source address.
@@ -571,7 +571,7 @@ public:
    * @param from		the address of the sender will be stored here
    * @returns the actual number of bytes read
    */
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from) = 0;
+  virtual Q_LONG readBlock(char *data, Q_ULONG maxlen, KSocketAddress& from) = 0;
 
   /**
    * Peeks the data in the socket.
@@ -584,7 +584,7 @@ public:
    * @param maxlen		the maximum number of bytes to peek
    * @returns the actual number of bytes copied into @p data
    */
-  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen) = 0;
+  virtual Q_LONG peekBlock(char *data, Q_ULONG maxlen) = 0;
 
   /** @overload
    * Peeks the data in the socket and the source address.
@@ -598,7 +598,7 @@ public:
    * @param from		the address of the sender will be stored here
    * @returns the actual number of bytes copied into @p data
    */
-  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from) = 0;
+  virtual Q_LONG peekBlock(char *data, Q_ULONG maxlen, KSocketAddress& from) = 0;
 
   /**
    * Writes the given data to the socket.
@@ -606,7 +606,7 @@ public:
    * Reimplemented from TQIODevice. See TQIODevice::writeBlock for
    * more information.
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len) = 0;
+  virtual Q_LONG writeBlock(const char *data, Q_ULONG len) = 0;
 
   /** @overload
    * Writes the given data to the destination address.
@@ -619,7 +619,7 @@ public:
    * @param to			the address to send to
    * @returns the number of bytes actually sent
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to) = 0;
+  virtual Q_LONG writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to) = 0;
 
   /**
    * Reads one character from the socket.
diff --git a/kdecore/network/ksocketbuffer.cpp b/kdecore/network/ksocketbuffer.cpp
index ca47bef9a..18c926c83 100644
--- a/kdecore/network/ksocketbuffer.cpp
+++ b/kdecore/network/ksocketbuffer.cpp
@@ -33,7 +33,7 @@
 using namespace KNetwork;
 using namespace KNetwork::Internal;
 
-KSocketBuffer::KSocketBuffer(TQ_LONG size)
+KSocketBuffer::KSocketBuffer(Q_LONG size)
   : m_mutex(true), m_offset(0), m_size(size), m_length(0)
 {
 }
@@ -75,9 +75,9 @@ bool KSocketBuffer::canReadLine() const
   // walk the buffer
   for ( ; it != end; ++it)
     {
-      if ((*it).tqfind('\n', offset) != -1)
+      if ((*it).find('\n', offset) != -1)
 	return true;
-      if ((*it).tqfind('\r', offset) != -1)
+      if ((*it).find('\r', offset) != -1)
 	return true;
       offset = 0;
     }
@@ -92,7 +92,7 @@ TQCString KSocketBuffer::readLine()
 
   TQMutexLocker locker(&m_mutex);
 
-  // tqfind the offset of the newline in the buffer
+  // find the offset of the newline in the buffer
   int newline = 0;
   TQValueListConstIterator<TQByteArray> it = m_list.constBegin(),
     end = m_list.constEnd();
@@ -101,7 +101,7 @@ TQCString KSocketBuffer::readLine()
   // walk the buffer
   for ( ; it != end; ++it)
     {
-      int posnl = (*it).tqfind('\n', offset);
+      int posnl = (*it).find('\n', offset);
       if (posnl == -1)
 	{
 	  // not found in this one
@@ -120,17 +120,17 @@ TQCString KSocketBuffer::readLine()
   return result;
 }
 
-TQ_LONG KSocketBuffer::length() const
+Q_LONG KSocketBuffer::length() const
 {
   return m_length;
 }
 
-TQ_LONG KSocketBuffer::size() const
+Q_LONG KSocketBuffer::size() const
 {
   return m_size;
 }
 
-bool KSocketBuffer::setSize(TQ_LONG size)
+bool KSocketBuffer::setSize(Q_LONG size)
 {
   m_size = size;
   if (size == -1 || m_length < m_size)
@@ -147,7 +147,7 @@ bool KSocketBuffer::setSize(TQ_LONG size)
   return (m_length - m_size) == consumeBuffer(0L, m_length - m_size, true);
 }
 
-TQ_LONG KSocketBuffer::feedBuffer(const char *data, TQ_LONG len)
+Q_LONG KSocketBuffer::feedBuffer(const char *data, Q_LONG len)
 {
   if (data == 0L || len == 0)
     return 0;			// nothing to write
@@ -168,7 +168,7 @@ TQ_LONG KSocketBuffer::feedBuffer(const char *data, TQ_LONG len)
   return len;
 }
 
-TQ_LONG KSocketBuffer::consumeBuffer(char *destbuffer, TQ_LONG maxlen, bool discard)
+Q_LONG KSocketBuffer::consumeBuffer(char *destbuffer, Q_LONG maxlen, bool discard)
 {
   if (maxlen == 0 || isEmpty())
     return 0;
@@ -176,7 +176,7 @@ TQ_LONG KSocketBuffer::consumeBuffer(char *destbuffer, TQ_LONG maxlen, bool disc
   TQValueListIterator<TQByteArray> it = m_list.begin(),
     end = m_list.end();
   TQIODevice::Offset offset = m_offset;
-  TQ_LONG copied = 0;
+  Q_LONG copied = 0;
 
   // walk the buffer
   while (it != end && maxlen)
@@ -228,7 +228,7 @@ void KSocketBuffer::clear()
   m_length = 0;
 }
 
-TQ_LONG KSocketBuffer::sendTo(KActiveSocketBase* dev, TQ_LONG len)
+Q_LONG KSocketBuffer::sendTo(KActiveSocketBase* dev, Q_LONG len)
 {
   if (len == 0 || isEmpty())
     return 0;
@@ -238,7 +238,7 @@ TQ_LONG KSocketBuffer::sendTo(KActiveSocketBase* dev, TQ_LONG len)
   TQValueListIterator<TQByteArray> it = m_list.begin(),
     end = m_list.end();
   TQIODevice::Offset offset = m_offset;
-  TQ_LONG written = 0;
+  Q_LONG written = 0;
   
   // walk the buffer
   while (it != end && (len || len == -1))
@@ -248,11 +248,11 @@ TQ_LONG KSocketBuffer::sendTo(KActiveSocketBase* dev, TQ_LONG len)
       // better by concatenating a few of them into a big buffer
       // question is: how big should that buffer be? 2 kB should be enough
 
-      TQ_ULONG bufsize = 1460;
+      Q_ULONG bufsize = 1460;
       if (len != -1 && len < bufsize)
 	bufsize = len;
       TQByteArray buf(bufsize);
-      TQ_LONG count = 0;
+      Q_LONG count = 0;
 
       while (it != end && count + ((*it).size() - offset) <= bufsize)
 	{
@@ -273,7 +273,7 @@ TQ_LONG KSocketBuffer::sendTo(KActiveSocketBase* dev, TQ_LONG len)
 	}
 
       // now try to write those bytes
-      TQ_LONG wrote = dev->writeBlock(buf, count);
+      Q_LONG wrote = dev->writeBlock(buf, count);
 
       if (wrote == -1)
 	// error?
@@ -293,7 +293,7 @@ TQ_LONG KSocketBuffer::sendTo(KActiveSocketBase* dev, TQ_LONG len)
   return written;
 }
 
-TQ_LONG KSocketBuffer::receiveFrom(KActiveSocketBase* dev, TQ_LONG len)
+Q_LONG KSocketBuffer::receiveFrom(KActiveSocketBase* dev, Q_LONG len)
 {
   if (len == 0 || isFull())
     return 0;
@@ -310,7 +310,7 @@ TQ_LONG KSocketBuffer::receiveFrom(KActiveSocketBase* dev, TQ_LONG len)
   if (m_size != -1 && len > (m_size - m_length))
     len = m_size - m_length;
 
-  // here, len tqcontains just as many bytes as we're supposed to read
+  // here, len contains just as many bytes as we're supposed to read
 
   // now do the reading
   TQByteArray a(len);
diff --git a/kdecore/network/ksocketbuffer_p.h b/kdecore/network/ksocketbuffer_p.h
index 0b8e96205..a4a0d6a9e 100644
--- a/kdecore/network/ksocketbuffer_p.h
+++ b/kdecore/network/ksocketbuffer_p.h
@@ -53,7 +53,7 @@ public:
    *
    * @param size	the maximum size of the buffer
    */
-  KSocketBuffer(TQ_LONG size = -1);
+  KSocketBuffer(Q_LONG size = -1);
 
   /**
    * Copy constructor.
@@ -86,7 +86,7 @@ public:
    *
    * @sa size
    */
-  virtual TQ_LONG length() const;
+  virtual Q_LONG length() const;
 
   /**
    * Retrieves the buffer size. The value of -1 indicates that
@@ -94,7 +94,7 @@ public:
    *
    * @sa length for the length of the data stored
    */
-  virtual TQ_LONG size() const;
+  virtual Q_LONG size() const;
 
   /**
    * Sets the size of the buffer, if allowed.
@@ -103,7 +103,7 @@ public:
    * @returns true on success, false if an error occurred.
    * @note if the new size is less than length(), the buffer will be truncated
    */
-  virtual bool setSize(TQ_LONG size);
+  virtual bool setSize(Q_LONG size);
 
   /**
    * Adds data to the end of the buffer.
@@ -112,7 +112,7 @@ public:
    * @param len		the data length, in bytes
    * @returns the number of bytes added to the end of the buffer.
    */
-  virtual TQ_LONG feedBuffer(const char *data, TQ_LONG len);
+  virtual Q_LONG feedBuffer(const char *data, Q_LONG len);
 
   /**
    * Clears the buffer.
@@ -127,7 +127,7 @@ public:
    * @param discard	if true, the bytes copied will be discarded
    * @returns the number of bytes copied from the buffer
    */
-  virtual TQ_LONG consumeBuffer(char *data, TQ_LONG maxlen, bool discard = true);
+  virtual Q_LONG consumeBuffer(char *data, Q_LONG maxlen, bool discard = true);
 
   /**
    * Sends at most @p len bytes of data to the I/O Device.
@@ -137,7 +137,7 @@ public:
    * @returns the number of bytes sent and discarded from the buffer, -1
    *          indicates an error.
    */
-  virtual TQ_LONG sendTo(KActiveSocketBase* device, TQ_LONG len = -1);
+  virtual Q_LONG sendTo(KActiveSocketBase* device, Q_LONG len = -1);
 
   /**
    * Tries to receive @p len bytes of data from the I/O device.
@@ -148,15 +148,15 @@ public:
    * @returns the number of bytes received and copied into the buffer,
    *	      -1 indicates an error.
    */
-  virtual TQ_LONG receiveFrom(KActiveSocketBase* device, TQ_LONG len = -1);
+  virtual Q_LONG receiveFrom(KActiveSocketBase* device, Q_LONG len = -1);
 
 protected:
   mutable TQMutex m_mutex;
   TQValueList<TQByteArray> m_list;
   TQIODevice::Offset m_offset;	///< offset of the start of data in the first element
 
-  TQ_LONG m_size;		///< the maximum length of the buffer
-  mutable TQ_LONG m_length;
+  Q_LONG m_size;		///< the maximum length of the buffer
+  mutable Q_LONG m_length;
 };
 
 } }			// namespace KNetwork::Internal
diff --git a/kdecore/network/ksocketdevice.cpp b/kdecore/network/ksocketdevice.cpp
index 793642bf9..53a16ca0a 100644
--- a/kdecore/network/ksocketdevice.cpp
+++ b/kdecore/network/ksocketdevice.cpp
@@ -365,7 +365,7 @@ bool KSocketDevice::disconnect()
 }
 
 #ifdef USE_QT3
-TQ_LONG KSocketDevice::bytesAvailable() const
+Q_LONG KSocketDevice::bytesAvailable() const
 #endif
 #ifdef USE_QT4
 qint64 KSocketDevice::bytesAvailable() const
@@ -381,7 +381,7 @@ qint64 KSocketDevice::bytesAvailable() const
   return nchars;
 }
 
-TQ_LONG KSocketDevice::waitForMore(int msecs, bool *timeout)
+Q_LONG KSocketDevice::waitForMore(int msecs, bool *timeout)
 {
   if (m_sockfd == -1)
     return -1;			// there won't ever be anything to read...
@@ -393,7 +393,7 @@ TQ_LONG KSocketDevice::waitForMore(int msecs, bool *timeout)
   return bytesAvailable();
 }
 
-static int do_read_common(int sockfd, char *data, TQ_ULONG maxlen, KSocketAddress* from, ssize_t &retval, bool peek = false)
+static int do_read_common(int sockfd, char *data, Q_ULONG maxlen, KSocketAddress* from, ssize_t &retval, bool peek = false)
 {
   socklen_t len;
   if (from)
@@ -419,7 +419,7 @@ static int do_read_common(int sockfd, char *data, TQ_ULONG maxlen, KSocketAddres
   return 0;
 }
 
-TQ_LONG KSocketDevice::readBlock(char *data, TQ_ULONG maxlen)
+Q_LONG KSocketDevice::readBlock(char *data, Q_ULONG maxlen)
 {
   resetError();
   if (m_sockfd == -1)
@@ -440,7 +440,7 @@ TQ_LONG KSocketDevice::readBlock(char *data, TQ_ULONG maxlen)
   return retval;
 }
 
-TQ_LONG KSocketDevice::readBlock(char *data, TQ_ULONG maxlen, KSocketAddress &from)
+Q_LONG KSocketDevice::readBlock(char *data, Q_ULONG maxlen, KSocketAddress &from)
 {
   resetError();
   if (m_sockfd == -1)
@@ -461,7 +461,7 @@ TQ_LONG KSocketDevice::readBlock(char *data, TQ_ULONG maxlen, KSocketAddress &fr
   return retval;
 }
 
-TQ_LONG KSocketDevice::peekBlock(char *data, TQ_ULONG maxlen)
+Q_LONG KSocketDevice::peekBlock(char *data, Q_ULONG maxlen)
 {
   resetError();
   if (m_sockfd == -1)
@@ -482,7 +482,7 @@ TQ_LONG KSocketDevice::peekBlock(char *data, TQ_ULONG maxlen)
   return retval;
 }
 
-TQ_LONG KSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from)
+Q_LONG KSocketDevice::peekBlock(char *data, Q_ULONG maxlen, KSocketAddress& from)
 {
   resetError();
   if (m_sockfd == -1)
@@ -503,12 +503,12 @@ TQ_LONG KSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& fr
   return retval;
 }
 
-TQ_LONG KSocketDevice::writeBlock(const char *data, TQ_ULONG len)
+Q_LONG KSocketDevice::writeBlock(const char *data, Q_ULONG len)
 {
   return writeBlock(data, len, KSocketAddress());
 }
 
-TQ_LONG KSocketDevice::writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to)
+Q_LONG KSocketDevice::writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to)
 {
   resetError();
   if (m_sockfd == -1)
@@ -884,7 +884,7 @@ KSocketDevice::setDefaultImpl(KSocketDeviceFactoryBase* factory)
 void KSocketDevice::addNewImpl(KSocketDeviceFactoryBase* factory, int capabilities)
 {
   TQMutexLocker locker(&defaultImplFactoryMutex);
-  if (factories.tqcontains(capabilities))
+  if (factories.contains(capabilities))
     delete factories[capabilities];
   factories.insert(capabilities, factory);
 }
diff --git a/kdecore/network/ksocketdevice.h b/kdecore/network/ksocketdevice.h
index a6dd4c4d0..5f86687b2 100644
--- a/kdecore/network/ksocketdevice.h
+++ b/kdecore/network/ksocketdevice.h
@@ -124,7 +124,7 @@ public:
 
   /**
    * Returns the set of capabilities this socket class implements.
-   * The set of capabilities is defined as an OR-ed tqmask of 
+   * The set of capabilities is defined as an OR-ed mask of 
    * @ref Capabilities bits.
    *
    * The default implementation is guaranteed to always return 0. That
@@ -199,7 +199,7 @@ public:
    * Returns the number of bytes available for reading without blocking.
    */
 #ifdef USE_QT3
-  virtual TQ_LONG bytesAvailable() const;
+  virtual Q_LONG bytesAvailable() const;
 #endif
 #ifdef USE_QT4
   virtual qint64 bytesAvailable() const;
@@ -211,37 +211,37 @@ public:
    * This function is a wrapper against @ref poll. This function will wait
    * for any read events.
    */
-  virtual TQ_LONG waitForMore(int msecs, bool *timeout = 0L);
+  virtual Q_LONG waitForMore(int msecs, bool *timeout = 0L);
 
   /**
    * Reads data from this socket.
    */
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen);
+  virtual Q_LONG readBlock(char *data, Q_ULONG maxlen);
 
   /**
    * Reads data and the source address from this socket.
    */
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from);
+  virtual Q_LONG readBlock(char *data, Q_ULONG maxlen, KSocketAddress& from);
 
   /**
    * Peeks data in the socket.
    */
-  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen);
+  virtual Q_LONG peekBlock(char *data, Q_ULONG maxlen);
 
   /**
    * Peeks the data in the socket and the source address.
    */
-  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from);
+  virtual Q_LONG peekBlock(char *data, Q_ULONG maxlen, KSocketAddress& from);
 
   /**
    * Writes data to the socket.
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len);
+  virtual Q_LONG writeBlock(const char *data, Q_ULONG len);
 
   /**
    * Writes the given data to the given destination address.
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to);
+  virtual Q_LONG writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to);
 
   /**
    * Returns this socket's local address.
diff --git a/kdecore/network/ksockssocketdevice.cpp b/kdecore/network/ksockssocketdevice.cpp
index b9fcb6cdd..f67b90bc9 100644
--- a/kdecore/network/ksockssocketdevice.cpp
+++ b/kdecore/network/ksockssocketdevice.cpp
@@ -190,7 +190,7 @@ KSocksSocketDevice* KSocksSocketDevice::accept()
   return new KSocksSocketDevice(newfd);
 }
 
-static int socks_read_common(int sockfd, char *data, TQ_ULONG maxlen, KSocketAddress* from, ssize_t &retval, bool peek = false)
+static int socks_read_common(int sockfd, char *data, Q_ULONG maxlen, KSocketAddress* from, ssize_t &retval, bool peek = false)
 {
   kde_socklen_t len;
   if (from)
@@ -214,7 +214,7 @@ static int socks_read_common(int sockfd, char *data, TQ_ULONG maxlen, KSocketAdd
   return 0;
 }
 
-TQ_LONG KSocksSocketDevice::readBlock(char *data, TQ_ULONG maxlen)
+Q_LONG KSocksSocketDevice::readBlock(char *data, Q_ULONG maxlen)
 {
   resetError();
   if (m_sockfd == -1)
@@ -235,7 +235,7 @@ TQ_LONG KSocksSocketDevice::readBlock(char *data, TQ_ULONG maxlen)
   return retval;
 }
 
-TQ_LONG KSocksSocketDevice::readBlock(char *data, TQ_ULONG maxlen, KSocketAddress &from)
+Q_LONG KSocksSocketDevice::readBlock(char *data, Q_ULONG maxlen, KSocketAddress &from)
 {
   resetError();
   if (m_sockfd == -1)
@@ -256,7 +256,7 @@ TQ_LONG KSocksSocketDevice::readBlock(char *data, TQ_ULONG maxlen, KSocketAddres
   return retval;
 }
 
-TQ_LONG KSocksSocketDevice::peekBlock(char *data, TQ_ULONG maxlen)
+Q_LONG KSocksSocketDevice::peekBlock(char *data, Q_ULONG maxlen)
 {
   resetError();
   if (m_sockfd == -1)
@@ -277,7 +277,7 @@ TQ_LONG KSocksSocketDevice::peekBlock(char *data, TQ_ULONG maxlen)
   return retval;
 }
 
-TQ_LONG KSocksSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from)
+Q_LONG KSocksSocketDevice::peekBlock(char *data, Q_ULONG maxlen, KSocketAddress& from)
 {
   resetError();
   if (m_sockfd == -1)
@@ -298,12 +298,12 @@ TQ_LONG KSocksSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddres
   return retval;
 }
 
-TQ_LONG KSocksSocketDevice::writeBlock(const char *data, TQ_ULONG len)
+Q_LONG KSocksSocketDevice::writeBlock(const char *data, Q_ULONG len)
 {
   return writeBlock(data, len, KSocketAddress());
 }
 
-TQ_LONG KSocksSocketDevice::writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to)
+Q_LONG KSocksSocketDevice::writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to)
 {
   resetError();
   if (m_sockfd == -1)
diff --git a/kdecore/network/ksockssocketdevice.h b/kdecore/network/ksockssocketdevice.h
index 1f8453836..62de23f05 100644
--- a/kdecore/network/ksockssocketdevice.h
+++ b/kdecore/network/ksockssocketdevice.h
@@ -83,20 +83,20 @@ public:
   /**
    * Overrides reading.
    */
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen);
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from);
+  virtual Q_LONG readBlock(char *data, Q_ULONG maxlen);
+  virtual Q_LONG readBlock(char *data, Q_ULONG maxlen, KSocketAddress& from);
 
   /**
    * Overrides peeking.
    */
-  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen);
-  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from);
+  virtual Q_LONG peekBlock(char *data, Q_ULONG maxlen);
+  virtual Q_LONG peekBlock(char *data, Q_ULONG maxlen, KSocketAddress& from);
 
   /**
    * Overrides writing.
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len);
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to);
+  virtual Q_LONG writeBlock(const char *data, Q_ULONG len);
+  virtual Q_LONG writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to);
 
   /**
    * Overrides getting socket address.
diff --git a/kdecore/network/ksrvresolverworker.cpp b/kdecore/network/ksrvresolverworker.cpp
index abb9edaaa..07e3555fa 100644
--- a/kdecore/network/ksrvresolverworker.cpp
+++ b/kdecore/network/ksrvresolverworker.cpp
@@ -51,11 +51,11 @@ bool KSrvResolverWorker::preprocess()
     return false;
 
   TQString node = nodeName();
-  if (node.tqfind('%') != -1)
-    node.truncate(node.tqfind('%'));
+  if (node.find('%') != -1)
+    node.truncate(node.find('%'));
 
-  if (node.isEmpty() || node == TQString::tqfromLatin1("*") ||
-      node == TQString::tqfromLatin1("localhost"))
+  if (node.isEmpty() || node == TQString::fromLatin1("*") ||
+      node == TQString::fromLatin1("localhost"))
     return false;		// empty == localhost
 
   encodedName = KResolver::domainToAscii(node);
@@ -225,7 +225,7 @@ bool KSrvResolverWorker::postprocess()
 
 void KSrvResolverWorker::customEvent(TQCustomEvent*)
 {
-  dns = new TQDns(TQString::tqfromLatin1(encodedName), TQDns::Srv);
+  dns = new TQDns(TQString::fromLatin1(encodedName), TQDns::Srv);
   TQObject::connect(dns, TQT_SIGNAL(resultsReady()), this, TQT_SLOT(dnsResultsReady()));
 }
 
diff --git a/kdecore/network/ksrvresolverworker_p.h b/kdecore/network/ksrvresolverworker_p.h
index df79f6c16..90074214f 100644
--- a/kdecore/network/ksrvresolverworker_p.h
+++ b/kdecore/network/ksrvresolverworker_p.h
@@ -47,8 +47,8 @@ namespace KNetwork
       struct Entry
       {
 	TQString name;
-	TQ_UINT16 port;
-	TQ_UINT16 weight;
+	Q_UINT16 port;
+	Q_UINT16 weight;
 	KNetwork::KResolver* resolver;
       };
 
@@ -57,7 +57,7 @@ namespace KNetwork
 	PriorityClass() : totalWeight(0) { }
 
 	TQValueList<Entry> entries;
-	TQ_UINT16 totalWeight;
+	Q_UINT16 totalWeight;
       };
 
     private:
@@ -66,7 +66,7 @@ namespace KNetwork
       TQCString encodedName;
       TQSemaphore *sem;
 
-      typedef TQMap<TQ_UINT16, PriorityClass> Results;
+      typedef TQMap<Q_UINT16, PriorityClass> Results;
       Results myResults;
 
     public:
diff --git a/kdecore/network/kstreamsocket.cpp b/kdecore/network/kstreamsocket.cpp
index 5f4fa6a0d..8ca4f91f6 100644
--- a/kdecore/network/kstreamsocket.cpp
+++ b/kdecore/network/kstreamsocket.cpp
@@ -246,7 +246,7 @@ void KStreamSocket::connectionEvent()
       // try to bind
       if (!bindLocallyFor(r))
 	{
-	  // could not tqfind a matching family
+	  // could not find a matching family
 	  ++d->peer;
 	  continue;
 	}
diff --git a/kdecore/svgicons/ksvgiconengine.cpp b/kdecore/svgicons/ksvgiconengine.cpp
index 858a210bb..dd54e99be 100644
--- a/kdecore/svgicons/ksvgiconengine.cpp
+++ b/kdecore/svgicons/ksvgiconengine.cpp
@@ -64,7 +64,7 @@ public:
 			oldOffset = newOffset;
 			TQString temp = element.attribute("offset");
 
-			if(temp.tqcontains("%"))
+			if(temp.contains("%"))
 			{
 				temp = temp.left(temp.length() - 1);
 				newOffset = temp.toFloat() / 100.0;
@@ -127,12 +127,12 @@ public:
 			TQColor qStopColor = m_engine->painter()->parseColor(parseColor);
 
 			// Convert in a libart suitable form
-			TQ_UINT32 stopColor = m_engine->painter()->toArtColor(qStopColor);
+			Q_UINT32 stopColor = m_engine->painter()->toArtColor(qStopColor);
 
 			int opacity = m_engine->painter()->parseOpacity(parseOpacity);
 
-			TQ_UINT32 rgba = (stopColor << 8) | opacity;
-			TQ_UINT32 r, g, b, a;
+			Q_UINT32 rgba = (stopColor << 8) | opacity;
+			Q_UINT32 r, g, b, a;
 
 			// Convert from separated to premultiplied alpha
 			a = rgba & 0xff;
@@ -170,12 +170,12 @@ public:
 
 		points = points.simplifyWhiteSpace();
 
-		if(points.tqcontains(",,") || points.tqcontains(", ,"))
+		if(points.contains(",,") || points.contains(", ,"))
 			return TQPointArray();
 
-		points.tqreplace(',', ' ');
-		points.tqreplace('\r', TQString::null);
-		points.tqreplace('\n', TQString::null);
+		points.replace(',', ' ');
+		points.replace('\r', TQString::null);
+		points.replace('\n', TQString::null);
 
 		points = points.simplifyWhiteSpace();
 
@@ -201,7 +201,7 @@ public:
 		// Combine new and old matrix
 		TQWMatrix matrix = m_engine->painter()->parseTransform(transform);
 
-		TQWMatrix *current = m_engine->painter()->tqworldMatrix();
+		TQWMatrix *current = m_engine->painter()->worldMatrix();
 		*current = matrix * *current;
 	}
 
@@ -221,9 +221,9 @@ public:
 		TQPtrList<TQDomNamedNodeMap> applyList;
 		applyList.setAutoDelete(true);
 
-		TQDomNode tqshape = node.parentNode();
-		for(; !tqshape.isNull() ; tqshape = tqshape.parentNode())
-			applyList.prepend(new TQDomNamedNodeMap(tqshape.attributes()));
+		TQDomNode shape = node.parentNode();
+		for(; !shape.isNull() ; shape = shape.parentNode())
+			applyList.prepend(new TQDomNamedNodeMap(shape.attributes()));
 
 		// Apply parent attributes
 		for(TQDomNamedNodeMap *map = applyList.first(); map != 0; map = applyList.next())
@@ -403,10 +403,10 @@ public:
 		{
 			bool filled = true;
 
-			if(element.hasAttribute("fill") && element.attribute("fill").tqcontains("none"))
+			if(element.hasAttribute("fill") && element.attribute("fill").contains("none"))
 				filled = false;
 
-			if(element.attribute("style").tqcontains("fill") && element.attribute("style").stripWhiteSpace().tqcontains("fill:none"))
+			if(element.attribute("style").contains("fill") && element.attribute("style").stripWhiteSpace().contains("fill:none"))
 				filled = false;
 
 			m_engine->painter()->drawPath(element.attribute("d"), filled);
@@ -622,7 +622,7 @@ bool KSVGIconEngine::load(int width, int height, const TQString &path)
 		d->width = w;
 		d->height = h;
 
-		d->painter->tqworldMatrix()->scale(vratiow, vratioh);
+		d->painter->worldMatrix()->scale(vratiow, vratioh);
 	}
 	else
 	{
@@ -631,10 +631,10 @@ bool KSVGIconEngine::load(int width, int height, const TQString &path)
 		double ratiow = width / d->width;
 		double ratioh = height / d->height;
 
-		d->painter->tqworldMatrix()->scale(ratiow, ratioh);
+		d->painter->worldMatrix()->scale(ratiow, ratioh);
 	}
 
-	TQWMatrix initialMatrix = *d->painter->tqworldMatrix();
+	TQWMatrix initialMatrix = *d->painter->worldMatrix();
 	d->helper->m_initialMatrix = initialMatrix;
 
 	// Apply transform
diff --git a/kdecore/svgicons/ksvgiconpainter.cpp b/kdecore/svgicons/ksvgiconpainter.cpp
index d24f56662..811dfe918 100644
--- a/kdecore/svgicons/ksvgiconpainter.cpp
+++ b/kdecore/svgicons/ksvgiconpainter.cpp
@@ -65,7 +65,7 @@ public:
 		m_useFillGradient = false;
 		m_useStrokeGradient = false;
 
-		m_tqworldMatrix = new TQWMatrix();
+		m_worldMatrix = new TQWMatrix();
 
 		// Create new image with alpha support
 		m_image = new TQImage(width, height, 32);
@@ -102,7 +102,7 @@ public:
 		art_free(m_buffer);
 
 		delete m_image;
-		delete m_tqworldMatrix;
+		delete m_worldMatrix;
 
 		for(TQMap<TQString, ArtGradientLinear *>::Iterator it = m_linearGradientMap.begin(); it != m_linearGradientMap.end(); ++it)
 		{
@@ -185,7 +185,7 @@ public:
 		m_tempBuffer = 0;
 	}
 
-	TQ_UINT32 toArtColor(const TQColor &color)
+	Q_UINT32 toArtColor(const TQColor &color)
 	{
 		// Convert in a libart suitable form
 		TQString tempName = color.name();
@@ -211,7 +211,7 @@ public:
 		return result;
 	}
 
-	void drawSVP(ArtSVP *svp, TQ_UINT32 rgb, int opacity)
+	void drawSVP(ArtSVP *svp, Q_UINT32 rgb, int opacity)
 	{
 		if(!svp)
 			return;
@@ -233,12 +233,12 @@ public:
 	void drawBPath(ArtBpath *bpath)
 	{
 		double affine[6];
-		affine[0] = m_tqworldMatrix->m11();
-		affine[1] = m_tqworldMatrix->m12();
-		affine[2] = m_tqworldMatrix->m21();
-		affine[3] = m_tqworldMatrix->m22();
-		affine[4] = m_tqworldMatrix->dx();
-		affine[5] = m_tqworldMatrix->dy();
+		affine[0] = m_worldMatrix->m11();
+		affine[1] = m_worldMatrix->m12();
+		affine[2] = m_worldMatrix->m21();
+		affine[3] = m_worldMatrix->m22();
+		affine[4] = m_worldMatrix->dx();
+		affine[5] = m_worldMatrix->dy();
 
 		ArtBpath *temp = art_bpath_affine_transform(bpath, affine);
 		ArtVpath *vec = art_bez_path_to_vec(temp, 0.25);
@@ -249,12 +249,12 @@ public:
 	void drawVPath(ArtVpath *vec)
 	{
 		double affine[6];
-		affine[0] = m_tqworldMatrix->m11();
-		affine[1] = m_tqworldMatrix->m12();
-		affine[2] = m_tqworldMatrix->m21();
-		affine[3] = m_tqworldMatrix->m22();
-		affine[4] = m_tqworldMatrix->dx();
-		affine[5] = m_tqworldMatrix->dy();
+		affine[0] = m_worldMatrix->m11();
+		affine[1] = m_worldMatrix->m12();
+		affine[2] = m_worldMatrix->m21();
+		affine[3] = m_worldMatrix->m22();
+		affine[4] = m_worldMatrix->dx();
+		affine[5] = m_worldMatrix->dy();
 
 		ArtVpath *temp = art_vpath_affine_transform(vec, affine);
 		art_free(vec);
@@ -267,7 +267,7 @@ public:
 		ArtSVP *svp;
 		ArtSVP *fillSVP = 0, *strokeSVP = 0;
 
-		TQ_UINT32 fillColor = 0, strokeColor = 0;
+		Q_UINT32 fillColor = 0, strokeColor = 0;
 
 		// Filling
 		{
@@ -461,10 +461,10 @@ public:
 			m.map(x1, y1, &x1, &y1);
 			m.map(x2, y2, &x2, &y2);
 
-			double x1n = x1 * m_tqworldMatrix->m11() + y1 * m_tqworldMatrix->m21() + m_tqworldMatrix->dx();
-			double y1n = x1 * m_tqworldMatrix->m12() + y1 * m_tqworldMatrix->m22() + m_tqworldMatrix->dy();
-			double x2n = x2 * m_tqworldMatrix->m11() + y2 * m_tqworldMatrix->m21() + m_tqworldMatrix->dx();
-			double y2n = x2 * m_tqworldMatrix->m12() + y2 * m_tqworldMatrix->m22() + m_tqworldMatrix->dy();
+			double x1n = x1 * m_worldMatrix->m11() + y1 * m_worldMatrix->m21() + m_worldMatrix->dx();
+			double y1n = x1 * m_worldMatrix->m12() + y1 * m_worldMatrix->m22() + m_worldMatrix->dy();
+			double x2n = x2 * m_worldMatrix->m11() + y2 * m_worldMatrix->m21() + m_worldMatrix->dx();
+			double y2n = x2 * m_worldMatrix->m12() + y2 * m_worldMatrix->m22() + m_worldMatrix->dy();
 
 			double dx = x2n - x1n;
 			double dy = y2n - y1n;
@@ -515,12 +515,12 @@ public:
 			else
 				fy = cy;
 
-			radial->affine[0] = m_tqworldMatrix->m11();
-			radial->affine[1] = m_tqworldMatrix->m12();
-			radial->affine[2] = m_tqworldMatrix->m21();
-			radial->affine[3] = m_tqworldMatrix->m22();
-			radial->affine[4] = m_tqworldMatrix->dx();
-			radial->affine[5] = m_tqworldMatrix->dy();
+			radial->affine[0] = m_worldMatrix->m11();
+			radial->affine[1] = m_worldMatrix->m12();
+			radial->affine[2] = m_worldMatrix->m21();
+			radial->affine[3] = m_worldMatrix->m22();
+			radial->affine[4] = m_worldMatrix->dx();
+			radial->affine[5] = m_worldMatrix->dy();
 
 			radial->fx = (fx - cx) / r;
 			radial->fy = (fy - cy) / r;
@@ -674,7 +674,7 @@ public:
 		  {
 			  QRgb *sl = reinterpret_cast<QRgb *>(m_image->scanLine(y));
 			  for(int x = 0; x < m_width; x++)
-				  sl[x] = tqRgba(line[x * 4], line[x * 4 + 1], line[x * 4 + 2], line[x * 4 + 3]);
+				  sl[x] = qRgba(line[x * 4], line[x * 4 + 1], line[x * 4 + 2], line[x * 4 + 3]);
 
 			  line += m_rowstride;
 		  }
@@ -1123,7 +1123,7 @@ private:
 	ArtSVP *m_clipSVP;
 
 	TQImage *m_image;
-	TQWMatrix *m_tqworldMatrix;
+	TQWMatrix *m_worldMatrix;
 
 	TQString m_fillRule;
 	TQString m_joinStyle;
@@ -1211,17 +1211,17 @@ TQImage *KSVGIconPainter::image()
 	return new TQImage(*d->helper->m_image);
 }
 
-TQWMatrix *KSVGIconPainter::tqworldMatrix()
+TQWMatrix *KSVGIconPainter::worldMatrix()
 {
-	return d->helper->m_tqworldMatrix;
+	return d->helper->m_worldMatrix;
 }
 
 void KSVGIconPainter::setWorldMatrix(TQWMatrix *matrix)
 {
-	if(d->helper->m_tqworldMatrix)
-		delete d->helper->m_tqworldMatrix;
+	if(d->helper->m_worldMatrix)
+		delete d->helper->m_worldMatrix;
 
-	d->helper->m_tqworldMatrix = matrix;
+	d->helper->m_worldMatrix = matrix;
 }
 
 void KSVGIconPainter::setStrokeWidth(double width)
@@ -1263,8 +1263,8 @@ void KSVGIconPainter::setStrokeColor(const TQString &stroke)
 
 		TQString url = stroke;
 
-		unsigned int start = url.tqfind("#") + 1;
-		unsigned int end = url.tqfindRev(")");
+		unsigned int start = url.find("#") + 1;
+		unsigned int end = url.findRev(")");
 
 		d->helper->m_strokeGradientReference = url.mid(start, end - start);
 	}
@@ -1291,8 +1291,8 @@ void KSVGIconPainter::setFillColor(const TQString &fill)
 
 		TQString url = fill;
 
-		unsigned int start = url.tqfind("#") + 1;
-		unsigned int end = url.tqfindRev(")");
+		unsigned int start = url.find("#") + 1;
+		unsigned int end = url.findRev(")");
 
 		d->helper->m_fillGradientReference = url.mid(start, end - start);
 	}
@@ -1315,7 +1315,7 @@ void KSVGIconPainter::setFillRule(const TQString &fillRule)
 	d->helper->m_fillRule = fillRule;
 }
 
-TQ_UINT32 KSVGIconPainter::parseOpacity(const TQString &data)
+Q_UINT32 KSVGIconPainter::parseOpacity(const TQString &data)
 {
 	int opacity = 255;
 
@@ -1323,7 +1323,7 @@ TQ_UINT32 KSVGIconPainter::parseOpacity(const TQString &data)
 	{
 		double temp;
 
-		if(data.tqcontains("%"))
+		if(data.contains("%"))
 		{
 			TQString tempString = data.left(data.length() - 1);
 			temp = double(255 * tempString.toDouble()) / 100.0;
@@ -1736,7 +1736,7 @@ void KSVGIconPainter::drawPath(const TQString &data, bool filled)
 	double curx = 0.0, cury = 0.0, contrlx = 0.0, contrly = 0.0, xc, yc;
 	unsigned int lastCommand = 0;
 
-	TQString _d = value.tqreplace(",", " ");
+	TQString _d = value.replace(",", " ");
 	_d = _d.simplifyWhiteSpace();
 	const char *ptr = _d.latin1();
 	const char *end = _d.latin1() + _d.length() + 1;
@@ -1759,12 +1759,12 @@ void KSVGIconPainter::drawPath(const TQString &data, bool filled)
 				if(index != -1 && lastCommand != 'z')
 				{
 					// Find last subpath
-					int tqfind = -1;
+					int find = -1;
 					for(int i = index; i >= 0; i--)
 					{
 						if(vec[i].code == ART_MOVETO_OPEN || vec[i].code == ART_MOVETO)
 						{
-							tqfind = i;
+							find = i;
 							break;
 						}
 					}
@@ -1775,8 +1775,8 @@ void KSVGIconPainter::drawPath(const TQString &data, bool filled)
 						vec.resize(index + 1);
 
 					vec[index].code = (ArtPathcode)ART_END2;
-					vec[index].x3 = vec[tqfind].x3;
-					vec[index].y3 = vec[tqfind].y3;
+					vec[index].x3 = vec[find].x3;
+					vec[index].y3 = vec[find].y3;
 				}
 
 				curx += tox;
@@ -1798,12 +1798,12 @@ void KSVGIconPainter::drawPath(const TQString &data, bool filled)
 				if(index != -1 && lastCommand != 'z')
 				{
 					// Find last subpath
-					int tqfind = -1;
+					int find = -1;
 					for(int i = index; i >= 0; i--)
 					{
 						if(vec[i].code == ART_MOVETO_OPEN || vec[i].code == ART_MOVETO)
 						{
-							tqfind = i;
+							find = i;
 							break;
 						}
 					}
@@ -1814,8 +1814,8 @@ void KSVGIconPainter::drawPath(const TQString &data, bool filled)
 						vec.resize(index + 1);
 
 					vec[index].code = (ArtPathcode)ART_END2;
-					vec[index].x3 = vec[tqfind].x3;
-					vec[index].y3 = vec[tqfind].y3;
+					vec[index].x3 = vec[find].x3;
+					vec[index].y3 = vec[find].y3;
 				}
 
 				curx = tox;
@@ -2137,34 +2137,34 @@ void KSVGIconPainter::drawPath(const TQString &data, bool filled)
 				break;
 			case 'z':
 			case 'Z':
-				int tqfind;
-				tqfind = -1;
+				int find;
+				find = -1;
 				for(int i = index; i >= 0; i--)
 				{
 					if(vec[i].code == ART_MOVETO_OPEN || vec[i].code == ART_MOVETO)
 					{
-						tqfind = i;
+						find = i;
 						break;
 					}
 				}
 
-				if(tqfind != -1)
+				if(find != -1)
 				{
-					if(vec[tqfind].x3 != curx || vec[tqfind].y3 != cury)
+					if(vec[find].x3 != curx || vec[find].y3 != cury)
 					{
 						index++;
 
 						d->helper->ensureSpace(vec, index);
 
 						vec[index].code = ART_LINETO;
-						vec[index].x3 = vec[tqfind].x3;
-						vec[index].y3 = vec[tqfind].y3;
+						vec[index].x3 = vec[find].x3;
+						vec[index].y3 = vec[find].y3;
 					}
 				}
 
 				// reset for next (sub)path
-				curx = vec[tqfind].x3;
-				cury = vec[tqfind].y3;
+				curx = vec[find].x3;
+				cury = vec[find].y3;
 
 				lastCommand = 'z';
 				break;
@@ -2231,20 +2231,20 @@ void KSVGIconPainter::drawPath(const TQString &data, bool filled)
 	}
 
 	// Find last subpath
-	int tqfind = -1;
+	int find = -1;
 	for(int i = index; i >= 0; i--)
 	{
 		if(vec[i].code == ART_MOVETO_OPEN || vec[i].code == ART_MOVETO)
 		{
-			tqfind = i;
+			find = i;
 			break;
 		}
 	}
 
 	// Fix a problem where the .svg file used doubles as values... (sofico.svg)
-	if(curx != vec[tqfind].x3 && cury != vec[tqfind].y3)
+	if(curx != vec[find].x3 && cury != vec[find].y3)
 	{
-		if((int) curx == (int) vec[tqfind].x3 && (int) cury == (int) vec[tqfind].y3)
+		if((int) curx == (int) vec[find].x3 && (int) cury == (int) vec[find].y3)
 		{
 			index++;
 
@@ -2252,18 +2252,18 @@ void KSVGIconPainter::drawPath(const TQString &data, bool filled)
 				vec.resize(index + 1);
 
 			vec[index].code = ART_LINETO;
-			vec[index].x3 = vec[tqfind].x3;
-			vec[index].y3 = vec[tqfind].y3;
+			vec[index].x3 = vec[find].x3;
+			vec[index].y3 = vec[find].y3;
 
-			curx = vec[tqfind].x3;
-			cury = vec[tqfind].y3;
+			curx = vec[find].x3;
+			cury = vec[find].y3;
 		}
 	}
 
 	// Handle filled paths that are not closed explicitly
 	if(filled)
 	{
-		if((int) curx != (int) vec[tqfind].x3 || (int) cury != (int) vec[tqfind].y3)
+		if((int) curx != (int) vec[find].x3 || (int) cury != (int) vec[find].y3)
 		{
 			index++;
 
@@ -2271,11 +2271,11 @@ void KSVGIconPainter::drawPath(const TQString &data, bool filled)
 				vec.resize(index + 1);
 
 			vec[index].code = (ArtPathcode)ART_END2;
-			vec[index].x3 = vec[tqfind].x3;
-			vec[index].y3 = vec[tqfind].y3;
+			vec[index].x3 = vec[find].x3;
+			vec[index].y3 = vec[find].y3;
 
-			curx = vec[tqfind].x3;
-			cury = vec[tqfind].y3;
+			curx = vec[find].x3;
+			cury = vec[find].y3;
 		}
 	}
 
@@ -2310,12 +2310,12 @@ void KSVGIconPainter::drawImage(double x, double y, TQImage &image)
 		image = image.convertDepth(32);
 
 	double affine[6];
-	affine[0] = d->helper->m_tqworldMatrix->m11();
-	affine[1] = d->helper->m_tqworldMatrix->m12();
-	affine[2] = d->helper->m_tqworldMatrix->m21();
-	affine[3] = d->helper->m_tqworldMatrix->m22();
+	affine[0] = d->helper->m_worldMatrix->m11();
+	affine[1] = d->helper->m_worldMatrix->m12();
+	affine[2] = d->helper->m_worldMatrix->m21();
+	affine[3] = d->helper->m_worldMatrix->m22();
 	// use the world matrix to convert the coordinates
-	d->helper->m_tqworldMatrix->map(x, y, &affine[4], &affine[5]);
+	d->helper->m_worldMatrix->map(x, y, &affine[4], &affine[5]);
 
 	d->helper->art_rgba_rgba_affine(d->helper->m_buffer, 0, 0, d->helper->m_width, d->helper->m_height,
 									d->helper->m_rowstride, image.bits(), image.width(), image.height(),
@@ -2338,19 +2338,19 @@ TQColor KSVGIconPainter::parseColor(const TQString &param)
 		TQString g = colors[1];
 		TQString b = colors[2].left((colors[2].length() - 1));
 
-		if(r.tqcontains("%"))
+		if(r.contains("%"))
 		{
 			r = r.left(r.length() - 1);
 			r = TQString::number(int((double(255 * r.toDouble()) / 100.0)));
 		}
 
-		if(g.tqcontains("%"))
+		if(g.contains("%"))
 		{
 			g = g.left(g.length() - 1);
 			g = TQString::number(int((double(255 * g.toDouble()) / 100.0)));
 		}
 
-		if(b.tqcontains("%"))
+		if(b.contains("%"))
 		{
 			b = b.left(b.length() - 1);
 			b = TQString::number(int((double(255 * b.toDouble()) / 100.0)));
@@ -2560,7 +2560,7 @@ TQColor KSVGIconPainter::parseColor(const TQString &param)
 			return TQColor(245, 255, 250);
 		else if(rgbColor == "mistyrose")
 			return TQColor(255, 228, 225);
-		else if(rgbColor == "tqmoccasin")
+		else if(rgbColor == "moccasin")
 			return TQColor(255, 228, 181);
 		else if(rgbColor == "navajowhite")
 			return TQColor(255, 222, 173);
@@ -2753,7 +2753,7 @@ void KSVGIconPainter::addRadialGradientElement(ArtGradientRadial *gradient, TQDo
 	d->helper->m_radialGradientElementMap.insert(gradient, element);
 }
 
-TQ_UINT32 KSVGIconPainter::toArtColor(const TQColor &color)
+Q_UINT32 KSVGIconPainter::toArtColor(const TQColor &color)
 {
 	return d->helper->toArtColor(color);
 }
diff --git a/kdecore/svgicons/ksvgiconpainter.h b/kdecore/svgicons/ksvgiconpainter.h
index 6b00d9d7c..9ba44d2cf 100644
--- a/kdecore/svgicons/ksvgiconpainter.h
+++ b/kdecore/svgicons/ksvgiconpainter.h
@@ -41,7 +41,7 @@ public:
 
 	TQImage *image();
 
-	TQWMatrix *tqworldMatrix();
+	TQWMatrix *worldMatrix();
 
 	void finish();
 
@@ -61,7 +61,7 @@ public:
 	void setStrokeDashOffset(const TQString &dashOffset);
 	void setStrokeDashArray(const TQString &dashes);
 
-	void setWorldMatrix(TQWMatrix *tqworldMatrix);
+	void setWorldMatrix(TQWMatrix *worldMatrix);
 	void setClippingRect(int x, int y, int w, int h);
 
 	void drawRectangle(double x, double y, double w, double h, double rx, double ry);
@@ -73,8 +73,8 @@ public:
 	void drawImage(double x, double y, TQImage &image);
 
 	TQColor parseColor(const TQString &param);
-	TQ_UINT32 toArtColor(const TQColor &color);
-	TQ_UINT32 parseOpacity(const TQString &data);
+	Q_UINT32 toArtColor(const TQColor &color);
+	Q_UINT32 parseOpacity(const TQString &data);
 
 	double toPixel(const TQString &s, bool hmode);
 	double dpi();
diff --git a/kdecore/tests/kcalendartest.cpp b/kdecore/tests/kcalendartest.cpp
index 8b6e8eea4..51a40b892 100644
--- a/kdecore/tests/kcalendartest.cpp
+++ b/kdecore/tests/kcalendartest.cpp
@@ -67,7 +67,7 @@ int main(int argc, char **argv) {
     		option = args->getOption("date");
                 date = KGlobal::locale()->readDate(option);
   	} else 
-    		date = TQDate::tqcurrentDate();
+    		date = TQDate::currentDate();
 
 	args->clear(); // Free up some memory.
 	
diff --git a/kdecore/tests/kconfigtestgui.cpp b/kdecore/tests/kconfigtestgui.cpp
index af560b496..abd476396 100644
--- a/kdecore/tests/kconfigtestgui.cpp
+++ b/kdecore/tests/kconfigtestgui.cpp
@@ -121,7 +121,7 @@ KConfigTestView::KConfigTestView( TQWidget *parent, const char *name )
   pQuitButton = new TQPushButton( this, "quitbutton" );
   pQuitButton->setText( "Quit" );
   pQuitButton->setGeometry( 340, 60, 60, 60 );
-  connect( pQuitButton, TQT_SIGNAL(clicked()), tqApp, TQT_SLOT(quit()) );
+  connect( pQuitButton, TQT_SIGNAL(clicked()), qApp, TQT_SLOT(quit()) );
 
   // create a default KConfig object in order to be able to start right away
   pConfig = new KConfig( TQString::null );
diff --git a/kdecore/tests/kconfigtestgui.h b/kdecore/tests/kconfigtestgui.h
index d7e4089bf..8311952b5 100644
--- a/kdecore/tests/kconfigtestgui.h
+++ b/kdecore/tests/kconfigtestgui.h
@@ -36,7 +36,7 @@
 #include <kconfig.h>
 
 //
-// KConfigTestView tqcontains lots of Qt widgets.
+// KConfigTestView contains lots of Qt widgets.
 //
 
 class KConfigTestView : public QDialog
diff --git a/kdecore/tests/kipctest.h b/kdecore/tests/kipctest.h
index 17122fbd8..a8abd2e76 100644
--- a/kdecore/tests/kipctest.h
+++ b/kdecore/tests/kipctest.h
@@ -3,7 +3,7 @@
 
 #include <tqobject.h>
 
-class MyObject: public TQObject
+class MyObject: public QObject
 {
     Q_OBJECT
 public:
diff --git a/kdecore/tests/klocaletest.cpp b/kdecore/tests/klocaletest.cpp
index a81d867b1..a980359b0 100644
--- a/kdecore/tests/klocaletest.cpp
+++ b/kdecore/tests/klocaletest.cpp
@@ -53,7 +53,7 @@ Test::Test( TQWidget *parent, const char *name )
 {
   setCaption("Testing KLocale");
 
-  TQWidget *d = tqApp->desktop();
+  TQWidget *d = qApp->desktop();
   setGeometry((d->width()-320)>>1, (d->height()-160)>>1, 420, 420);
 
   createFields();
@@ -77,19 +77,19 @@ void Test::createFields()
   string+="Used language: ";
   string+=KGlobal::locale()->language()+"\n";
   string+="Locale encoding: ";
-  string+=TQString::tqfromLatin1(KGlobal::locale()->encoding())+"\n";
+  string+=TQString::fromLatin1(KGlobal::locale()->encoding())+"\n";
 
   string+="Localized date and time: ";
-  string+=KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime());
+  string+=KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime());
   string+="\nLocalized monetary numbers: ";
   string+=KGlobal::locale()->formatMoney(1234567.89) + " / \n" +KGlobal::locale()->formatMoney(-1234567.89);
   // This will not work
   // but you can copy other *.mo file
   string+="\nSome localized strings:\n";
-  string+=TQString::tqfromLatin1("Yes = ")+i18n("Yes")+"\n";
-  string+=TQString::tqfromLatin1("No = ")+i18n("No")+"\n";
-  string+=TQString::tqfromLatin1("Help = ")+i18n("Help")+"\n";
-  string+=TQString::tqfromLatin1("Cancel = ")+i18n("Cancel")+"\n";
+  string+=TQString::fromLatin1("Yes = ")+i18n("Yes")+"\n";
+  string+=TQString::fromLatin1("No = ")+i18n("No")+"\n";
+  string+=TQString::fromLatin1("Help = ")+i18n("Help")+"\n";
+  string+=TQString::fromLatin1("Cancel = ")+i18n("Cancel")+"\n";
 
   label=new TQLabel(string,this,"Label");
   label->setGeometry(10,10,400,400);
@@ -102,9 +102,9 @@ int main( int argc, char ** argv )
   KLocale::setMainCatalogue("kdelibs");
   KApplication a( argc, argv, "klocaletest" );
 
-  KGlobal::locale()->setLanguage(TQString::tqfromLatin1("en_US"));
-  KGlobal::locale()->setCountry(TQString::tqfromLatin1("C"));
-  KGlobal::locale()->setThousandsSeparator(TQString::tqfromLatin1(","));
+  KGlobal::locale()->setLanguage(TQString::fromLatin1("en_US"));
+  KGlobal::locale()->setCountry(TQString::fromLatin1("C"));
+  KGlobal::locale()->setThousandsSeparator(TQString::fromLatin1(","));
 
   TQString formatted;
   formatted = KGlobal::locale()->formatNumber( 70 ); check("formatNumber(70)",formatted,"70.00");
@@ -152,8 +152,8 @@ int main( int argc, char ** argv )
   TQDate date;
   date.setYMD( 2002, 5, 3 );
   checkDate("readDate( 3, 5, 2002 )",date,KGlobal::locale()->readDate( KGlobal::locale()->formatDate( date ) ) );
-  date = TQDate::tqcurrentDate();
-  checkDate("readDate( TQDate::tqcurrentDate() )",date,KGlobal::locale()->readDate( KGlobal::locale()->formatDate( date ) ) );
+  date = TQDate::currentDate();
+  checkDate("readDate( TQDate::currentDate() )",date,KGlobal::locale()->readDate( KGlobal::locale()->formatDate( date ) ) );
 
   TQTime time;
   time = KGlobal::locale()->readTime( "11:22:33", &ok );
@@ -181,11 +181,11 @@ int main( int argc, char ** argv )
   check("formatTime(\"0:22\", as duration)", timeStr, "00:22" );
 
   kdDebug() << "setLanguage C\n";
-  KGlobal::locale()->setLanguage(TQString::tqfromLatin1("C"));
+  KGlobal::locale()->setLanguage(TQString::fromLatin1("C"));
   kdDebug() << "C: " << i18n("yes") << " " << i18n("TQAccel", "Space") << endl;
 
   kdDebug() << "setLanguage de\n";
-  KGlobal::locale()->setLanguage(TQString::tqfromLatin1("de"));
+  KGlobal::locale()->setLanguage(TQString::fromLatin1("de"));
   kdDebug() << "de: " << i18n("yes") << " " << i18n("TQAccel", "Space") << endl;
 
 
diff --git a/kdecore/tests/kmacroexpandertest.cpp b/kdecore/tests/kmacroexpandertest.cpp
index 672d1ad6a..0c41a309b 100644
--- a/kdecore/tests/kmacroexpandertest.cpp
+++ b/kdecore/tests/kmacroexpandertest.cpp
@@ -79,26 +79,26 @@ int main(int argc, char *argv[])
   s = "kedit --caption %n %f";
   check( "KMacroExpander::expandMacrosShellQuote", s, KMacroExpander::expandMacrosShellQuote(s, map), "kedit --caption 'Restaurant \"Chew It\"' 'filename.txt'");
 
-  map.tqreplace('n', "Restaurant 'Chew It'");
+  map.replace('n', "Restaurant 'Chew It'");
   s = "kedit --caption %n %f";
   check( "KMacroExpander::expandMacrosShellQuote", s, KMacroExpander::expandMacrosShellQuote(s, map), "kedit --caption 'Restaurant '\\''Chew It'\\''' 'filename.txt'");
 
   s = "kedit --caption \"%n\" %f";
   check( "KMacroExpander::expandMacrosShellQuote", s, KMacroExpander::expandMacrosShellQuote(s, map), "kedit --caption \"Restaurant 'Chew It'\" 'filename.txt'");
 
-  map.tqreplace('n', "Restaurant \"Chew It\"");
+  map.replace('n', "Restaurant \"Chew It\"");
   s = "kedit --caption \"%n\" %f";
   check( "KMacroExpander::expandMacrosShellQuote", s, KMacroExpander::expandMacrosShellQuote(s, map), "kedit --caption \"Restaurant \\\"Chew It\\\"\" 'filename.txt'");
 
-  map.tqreplace('n', "Restaurant $HOME");
+  map.replace('n', "Restaurant $HOME");
   s = "kedit --caption \"%n\" %f";
   check( "KMacroExpander::expandMacrosShellQuote", s, KMacroExpander::expandMacrosShellQuote(s, map), "kedit --caption \"Restaurant \\$HOME\" 'filename.txt'");
 
-  map.tqreplace('n', "Restaurant `echo hello`");
+  map.replace('n', "Restaurant `echo hello`");
   s = "kedit --caption \"%n\" %f";
   check( "KMacroExpander::expandMacrosShellQuote", s, KMacroExpander::expandMacrosShellQuote(s, map), "kedit --caption \"Restaurant \\`echo hello\\`\" 'filename.txt'");
 
-  map.tqreplace('n', "Restaurant `echo hello`");
+  map.replace('n', "Restaurant `echo hello`");
   s = "kedit --caption \"`echo %n`\" %f";
   check( "KMacroExpander::expandMacrosShellQuote", s, KMacroExpander::expandMacrosShellQuote(s, map), "kedit --caption \"$( echo 'Restaurant `echo hello`')\" 'filename.txt'");
 
diff --git a/kdecore/tests/kmdcodectest.cpp b/kdecore/tests/kmdcodectest.cpp
index 8ebd03888..243d0d289 100644
--- a/kdecore/tests/kmdcodectest.cpp
+++ b/kdecore/tests/kmdcodectest.cpp
@@ -96,7 +96,7 @@ void testCodec (const char* msg, Codec type, bool isFile)
 
         if (!f.exists())
         {
-          kdError() << "Could not tqfind: " << f.name () << endl;
+          kdError() << "Could not find: " << f.name () << endl;
           return;
         }
 
@@ -192,15 +192,15 @@ void MD5_timeTrial ()
     time_t endTime;
     time_t startTime;
 
-    TQ_UINT8 block[TEST_BLOCK_LEN];
-    TQ_UINT32 i;
+    Q_UINT8 block[TEST_BLOCK_LEN];
+    Q_UINT32 i;
 
     cout << "Timing test. Digesting " << TEST_BLOCK_COUNT << " blocks of "
          << TEST_BLOCK_LEN << "-byte..." << endl;
 
     // Initialize block
     for (i = 0; i < TEST_BLOCK_LEN; i++)
-        block[i] = (TQ_UINT8)(i & 0xff);
+        block[i] = (Q_UINT8)(i & 0xff);
 
     // Start timer
     time (&startTime);
@@ -308,7 +308,7 @@ void MD5_string (const char *input, const char* expected, bool rawOutput )
   if ( expected )
   {
     cout << "Expected: " << expected << endl;
-    cout << "tqStatus: " << context.verify (expected) << endl;
+    cout << "Status: " << context.verify (expected) << endl;
   }
 }
 
diff --git a/kdecore/tests/kprocesstest.h b/kdecore/tests/kprocesstest.h
index 23ac443dd..3e5d989ec 100644
--- a/kdecore/tests/kprocesstest.h
+++ b/kdecore/tests/kprocesstest.h
@@ -15,7 +15,7 @@
 #include <tqobject.h>
 #include "kprocess.h"
 
-class Dummy : public TQObject
+class Dummy : public QObject
 {
  Q_OBJECT
 
diff --git a/kdecore/tests/kprociotest.h b/kdecore/tests/kprociotest.h
index 9f948e644..6392fc708 100644
--- a/kdecore/tests/kprociotest.h
+++ b/kdecore/tests/kprociotest.h
@@ -15,7 +15,7 @@
 #include <tqobject.h>
 #include "kprocio.h"
 
-class Dummy : public TQObject
+class Dummy : public QObject
 {
  Q_OBJECT
 
diff --git a/kdecore/tests/kresolvertest.cpp b/kdecore/tests/kresolvertest.cpp
index 1b2f5148d..f1d3c11f9 100644
--- a/kdecore/tests/kresolvertest.cpp
+++ b/kdecore/tests/kresolvertest.cpp
@@ -75,8 +75,8 @@ public:
 bool tryLookup(const char* node, const char *serv)
 {
   int error;
-  TQString _node = TQString::tqfromLatin1(node);
-  TQString _serv = TQString::tqfromLatin1(serv);
+  TQString _node = TQString::fromLatin1(node);
+  TQString _serv = TQString::fromLatin1(serv);
 
   printf("\tTrying to lookup %s|%s... ", node, serv);
   TQPtrList<KAddressInfo> list = KExtendedSocket::lookup(_node, _serv, 0, &error);
@@ -138,8 +138,8 @@ bool try_pton()
 bool tryLookup6(const char *node, const char *serv)
 {
   int error;
-  TQString _node = TQString::tqfromLatin1(node);
-  TQString _serv = TQString::tqfromLatin1(serv);
+  TQString _node = TQString::fromLatin1(node);
+  TQString _serv = TQString::fromLatin1(serv);
 
   printf("\tTrying to lookup IPv6 of %s|%s... ", node, serv);
   TQPtrList<KAddressInfo> list = KExtendedSocket::lookup(_node, _serv, KExtendedSocket::ipv6Socket, &error);
diff --git a/kdecore/tests/kstddirstest.cpp b/kdecore/tests/kstddirstest.cpp
index 21b08f687..fa797d665 100644
--- a/kdecore/tests/kstddirstest.cpp
+++ b/kdecore/tests/kstddirstest.cpp
@@ -18,7 +18,7 @@ int main(int argc, char **argv)
   s = t.findResource("icon", "xv.xpm");
   if (!s.isNull()) kdDebug() << s << endl;
 
-  list = t.findAllResources("data", "ktqfind/toolbar", true);
+  list = t.findAllResources("data", "kfind/toolbar", true);
   for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) {
     kdDebug() << "data " << (*it).ascii() << endl;
   }
diff --git a/kdecore/tests/ktimezonestest.cpp b/kdecore/tests/ktimezonestest.cpp
index 69ea7c8a1..650cc0512 100644
--- a/kdecore/tests/ktimezonestest.cpp
+++ b/kdecore/tests/ktimezonestest.cpp
@@ -17,7 +17,7 @@ int main(int argc, char *argv[])
 
      // Find the current offset of the UTC timezone.
      timezone = timezones.zone("UTC");
-     printf( "UTC timezone offset should be 0: %d\n", timezone->offset(TQDateTime::tqcurrentDateTime()) );
+     printf( "UTC timezone offset should be 0: %d\n", timezone->offset(TQDateTime::currentDateTime()) );
 
      // Find some offsets for Europe/London.
      char *london = "Europe/London";
diff --git a/kdecore/tests/kurltest.cpp b/kdecore/tests/kurltest.cpp
index 535a66b9a..e80561d2c 100644
--- a/kdecore/tests/kurltest.cpp
+++ b/kdecore/tests/kurltest.cpp
@@ -1003,16 +1003,16 @@ int main(int argc, char *argv[])
   check("com2.url()", com2.url(), "http://server.com/dir/blubb/blah/");
 
   KURL utf8_1("audiocd:/By%20Name/15%20Geantra%C3%AE.wav", 106);
-  check("utf8_1.fileName()", utf8_1.fileName(), TQString::tqfromLatin1("15 Geantraî.wav"));
+  check("utf8_1.fileName()", utf8_1.fileName(), TQString::fromLatin1("15 Geantraî.wav"));
 
   KURL utf8_2("audiocd:/By%20Name/15%2fGeantra%C3%AE.wav", 106);
-  check("utf8_2.fileName()", utf8_2.fileName(), TQString::tqfromLatin1("15/Geantraî.wav"));
+  check("utf8_2.fileName()", utf8_2.fileName(), TQString::fromLatin1("15/Geantraî.wav"));
 
   KURL url_newline_1("http://www.foo.bar/foo/bar\ngnork");
-  check("url_newline_1.url()", url_newline_1.url(), TQString::tqfromLatin1("http://www.foo.bar/foo/bar%0Agnork"));
+  check("url_newline_1.url()", url_newline_1.url(), TQString::fromLatin1("http://www.foo.bar/foo/bar%0Agnork"));
 
   KURL url_newline_2("http://www.foo.bar/foo?bar\ngnork");
-  check("url_newline_2.url()", url_newline_2.url(), TQString::tqfromLatin1("http://www.foo.bar/foo?bar%0Agnork"));
+  check("url_newline_2.url()", url_newline_2.url(), TQString::fromLatin1("http://www.foo.bar/foo?bar%0Agnork"));
 
   KURL local_file_1("file://localhost/my/file");
   check("local_file_1.isLocalFile()", local_file_1.isLocalFile() ? "true" : "false", "true");
diff --git a/kdecore/tests/testqtargs.cpp b/kdecore/tests/testqtargs.cpp
index 00682e9ff..2b3606a59 100644
--- a/kdecore/tests/testqtargs.cpp
+++ b/kdecore/tests/testqtargs.cpp
@@ -35,7 +35,7 @@
   { "background <color>", I18N_NOOP("sets the default background color and an\n
 application palette (light and dark shades are\ncalculated)."), 0},
 
-  it looks for "background"  instead of "-background" so never tqfind the arg.
+  it looks for "background"  instead of "-background" so never find the arg.
 
   Software:  g++ 2.95, kdelibs from CVS Jan 28, Qt 3.01
   OS: Debian GNU/Linux 3.0 (sid)
diff --git a/kdecore/vsnprintf.c b/kdecore/vsnprintf.c
index 9001206c6..257392aa4 100644
--- a/kdecore/vsnprintf.c
+++ b/kdecore/vsnprintf.c
@@ -120,7 +120,7 @@ vsnprintf(str, n, fmt, ap)
 
 	memset(&nsa, 0, sizeof nsa);
 	nsa.sa_handler = mcatch;
-	sigemptyset(&nsa.sa_tqmask);
+	sigemptyset(&nsa.sa_mask);
 
 	p = msetup(str, n);
 	if (p == NULL) {
diff --git a/kded/DESIGN b/kded/DESIGN
index 1e0c09a14..702fca853 100644
--- a/kded/DESIGN
+++ b/kded/DESIGN
@@ -59,7 +59,7 @@ Offer list
 | * servicetype offset, service offset
 | * servicetype offset, service offset
 | * 0
-This allows to quickly tqfind services associated with a servicetype.
+This allows to quickly find services associated with a servicetype.
 It does NOT reflect the user profile, which is stored in profilerc and
 implemented in KServiceTypeProfile.
 
diff --git a/kded/HOWTO b/kded/HOWTO
index 990ce9909..d1596b8cd 100644
--- a/kded/HOWTO
+++ b/kded/HOWTO
@@ -15,4 +15,4 @@ the name of the DCOP object that is implemented by the module.
 The desktop file needs to define the library in which the module is 
 implemented. The name of the library always starts with kded_.
 
-The kdelibs/kded/test/ directory tqcontains a sample implementation.
+The kdelibs/kded/test/ directory contains a sample implementation.
diff --git a/kded/README.kded b/kded/README.kded
index 65231b6ca..b530d707d 100644
--- a/kded/README.kded
+++ b/kded/README.kded
@@ -121,7 +121,7 @@ Further it should contain:
 	X-KDE-Library=foo
 	X-KDE-FactoryName=foo
 
-Which means that kded_foo.la is the name of the library that tqcontains 
+Which means that kded_foo.la is the name of the library that contains 
 the module and KDEDModule *create_foo(const QCString &) is the factory 
 function that should be called.
 
diff --git a/kded/kbuildservicefactory.cpp b/kded/kbuildservicefactory.cpp
index 9dab1fdf6..f8f8c34f1 100644
--- a/kded/kbuildservicefactory.cpp
+++ b/kded/kbuildservicefactory.cpp
@@ -57,7 +57,7 @@ KBuildServiceFactory::~KBuildServiceFactory()
    delete m_resourceList;
 }
 
-KService * KBuildServiceFactory::tqfindServiceByName(const TQString &_name)
+KService * KBuildServiceFactory::findServiceByName(const TQString &_name)
 {
    return m_serviceDict[_name];
 }
@@ -67,7 +67,7 @@ KSycocaEntry *
 KBuildServiceFactory::createEntry( const TQString& file, const char *resource )
 {
   TQString name = file;
-  int pos = name.tqfindRev('/');
+  int pos = name.findRev('/');
   if (pos != -1)
   {
      name = name.mid(pos+1);
@@ -101,11 +101,11 @@ KBuildServiceFactory::saveHeader(TQDataStream &str)
 {
    KSycocaFactory::saveHeader(str);
 
-   str << (TQ_INT32) m_nameDictOffset;
-   str << (TQ_INT32) m_relNameDictOffset;
-   str << (TQ_INT32) m_offerListOffset;
-   str << (TQ_INT32) m_initListOffset;
-   str << (TQ_INT32) m_menuIdDictOffset;
+   str << (Q_INT32) m_nameDictOffset;
+   str << (Q_INT32) m_relNameDictOffset;
+   str << (Q_INT32) m_offerListOffset;
+   str << (Q_INT32) m_initListOffset;
+   str << (Q_INT32) m_menuIdDictOffset;
 }
 
 void
@@ -190,12 +190,12 @@ KBuildServiceFactory::saveOfferList(TQDataStream &str)
           it2 != services.end(); ++it2)
       {
          KService *service = *it2;
-         str << (TQ_INT32) entry->offset();
-         str << (TQ_INT32) service->offset();
+         str << (Q_INT32) entry->offset();
+         str << (Q_INT32) service->offset();
       }
    }
 
-   str << (TQ_INT32) 0;               // End of list marker (0)
+   str << (Q_INT32) 0;               // End of list marker (0)
 }
 
 void
@@ -215,19 +215,19 @@ KBuildServiceFactory::saveInitList(TQDataStream &str)
           initList.append(service); 
       }
    }
-   str << (TQ_INT32) initList.count(); // Nr of init services.
+   str << (Q_INT32) initList.count(); // Nr of init services.
    for(KService::List::Iterator it = initList.begin();
        it != initList.end();
        ++it)
    {
-      str << (TQ_INT32) (*it)->offset();
+      str << (Q_INT32) (*it)->offset();
    }
 }
 
 void
 KBuildServiceFactory::addEntry(KSycocaEntry *newEntry, const char *resource)
 {
-   if (m_dupeDict.tqfind(newEntry))
+   if (m_dupeDict.find(newEntry))
       return;
 
    KSycocaFactory::addEntry(newEntry, resource);
@@ -244,7 +244,7 @@ KBuildServiceFactory::addEntry(KSycocaEntry *newEntry, const char *resource)
 
    TQString name = service->desktopEntryName();
    m_nameDict->add( name, newEntry );
-   m_serviceDict.tqreplace(name, service);
+   m_serviceDict.replace(name, service);
 
    TQString relName = service->desktopEntryPath();
    m_relNameDict->add( relName, newEntry );
diff --git a/kded/kbuildservicefactory.h b/kded/kbuildservicefactory.h
index 3b6e416ae..eca439c5d 100644
--- a/kded/kbuildservicefactory.h
+++ b/kded/kbuildservicefactory.h
@@ -43,7 +43,7 @@ public:
 
   virtual ~KBuildServiceFactory();
 
-  KService *tqfindServiceByName(const TQString &_name);
+  KService *findServiceByName(const TQString &_name);
 
   /**
    * Construct a KService from a config file.
diff --git a/kded/kbuildservicegroupfactory.cpp b/kded/kbuildservicegroupfactory.cpp
index b4a9ca8e6..e75931182 100644
--- a/kded/kbuildservicegroupfactory.cpp
+++ b/kded/kbuildservicegroupfactory.cpp
@@ -59,7 +59,7 @@ KBuildServiceGroupFactory::createEntry( const TQString&, const char * )
 void KBuildServiceGroupFactory::addNewEntryTo( const TQString &menuName, KService *newEntry)
 {
   KServiceGroup *entry = 0;
-  KSycocaEntry::Ptr *ptr = m_entryDict->tqfind(menuName);
+  KSycocaEntry::Ptr *ptr = m_entryDict->find(menuName);
   if (ptr)
      entry = dynamic_cast<KServiceGroup *>(ptr->data());
 
@@ -74,7 +74,7 @@ void KBuildServiceGroupFactory::addNewEntryTo( const TQString &menuName, KServic
 KServiceGroup *
 KBuildServiceGroupFactory::addNew( const TQString &menuName, const TQString& file, KServiceGroup *entry, bool isDeleted)
 {
-  KSycocaEntry::Ptr *ptr = m_entryDict->tqfind(menuName);
+  KSycocaEntry::Ptr *ptr = m_entryDict->find(menuName);
   if (ptr)
   {
     kdWarning(7021) << "KBuildServiceGroupFactory::addNew( " << menuName << ", " << file << " ): menu already exists!" << endl;
@@ -94,14 +94,14 @@ KBuildServiceGroupFactory::addNew( const TQString &menuName, const TQString& fil
      // Make sure parent dir exists.
      KServiceGroup *parentEntry = 0;
      TQString parent = menuName.left(menuName.length()-1);
-     int i = parent.tqfindRev('/');
+     int i = parent.findRev('/');
      if (i > 0) {
         parent = parent.left(i+1);
      } else {
         parent = "/";
      }
      parentEntry = 0;
-     ptr = m_entryDict->tqfind(parent);
+     ptr = m_entryDict->find(parent);
      if (ptr)
         parentEntry = dynamic_cast<KServiceGroup *>(ptr->data());
      if (!parentEntry)
@@ -123,7 +123,7 @@ KBuildServiceGroupFactory::addNewChild( const TQString &parent, const char *reso
   TQString name = "#parent#"+parent;
 
   KServiceGroup *entry = 0;
-  KSycocaEntry::Ptr *ptr = m_entryDict->tqfind(name);
+  KSycocaEntry::Ptr *ptr = m_entryDict->find(name);
   if (ptr)
      entry = dynamic_cast<KServiceGroup *>(ptr->data());
 
@@ -157,7 +157,7 @@ KBuildServiceGroupFactory::saveHeader(TQDataStream &str)
 {
    KSycocaFactory::saveHeader(str);
 
-   str << (TQ_INT32) m_baseGroupDictOffset;
+   str << (Q_INT32) m_baseGroupDictOffset;
 }
 
 void
diff --git a/kded/kbuildservicetypefactory.cpp b/kded/kbuildservicetypefactory.cpp
index ddeff23fe..b5259c5cd 100644
--- a/kded/kbuildservicetypefactory.cpp
+++ b/kded/kbuildservicetypefactory.cpp
@@ -54,7 +54,7 @@ KBuildServiceTypeFactory::~KBuildServiceTypeFactory()
    delete m_resourceList;
 }
 
-KServiceType * KBuildServiceTypeFactory::tqfindServiceTypeByName(const TQString &_name)
+KServiceType * KBuildServiceTypeFactory::findServiceTypeByName(const TQString &_name)
 {
    assert (KSycoca::self()->isBuilding());
    // We're building a database - the service type must be in memory
@@ -69,7 +69,7 @@ KSycocaEntry *
 KBuildServiceTypeFactory::createEntry(const TQString &file, const char *resource)
 {
   TQString name = file;
-  int pos = name.tqfindRev('/');
+  int pos = name.findRev('/');
   if (pos != -1)
   {
      name = name.mid(pos+1);
@@ -133,14 +133,14 @@ void
 KBuildServiceTypeFactory::saveHeader(TQDataStream &str)
 {
    KSycocaFactory::saveHeader(str);
-   str << (TQ_INT32) m_fastPatternOffset;
-   str << (TQ_INT32) m_otherPatternOffset;
-   str << (TQ_INT32) m_propertyTypeDict.count();
+   str << (Q_INT32) m_fastPatternOffset;
+   str << (Q_INT32) m_otherPatternOffset;
+   str << (Q_INT32) m_propertyTypeDict.count();
 
    TQMapIterator<TQString, int> it;
    for (it = m_propertyTypeDict.begin(); it != m_propertyTypeDict.end(); ++it)
    {
-     str << it.key() << (TQ_INT32)it.data();
+     str << it.key() << (Q_INT32)it.data();
    }
 
 }
@@ -183,8 +183,8 @@ KBuildServiceTypeFactory::savePatternLists(TQDataStream &str)
         for ( ; patit != pat.end() ; ++patit )
         {
            const TQString &pattern = *patit;
-           if ( pattern.tqfindRev('*') == 0
-                && pattern.tqfindRev('.') == 1
+           if ( pattern.findRev('*') == 0
+                && pattern.findRev('.') == 1
                 && pattern.length() <= 6 )
               // it starts with "*.", has no other '*' and no other '.', and is max 6 chars
               // => fast patttern
@@ -193,15 +193,15 @@ KBuildServiceTypeFactory::savePatternLists(TQDataStream &str)
               otherPatterns.append( pattern );
            // Assumption : there is only one mimetype for that pattern
            // It doesn't really make sense otherwise, anyway.
-           dict.tqreplace( pattern, mimeType );
+           dict.replace( pattern, mimeType );
         }
       }
    }
    // Sort the list - the fast one, useless for the other one
    fastPatterns.sort();
 
-   TQ_INT32 entrySize = 0;
-   TQ_INT32 nrOfEntries = 0;
+   Q_INT32 entrySize = 0;
+   Q_INT32 nrOfEntries = 0;
 
    m_fastPatternOffset = str.device()->at();
 
@@ -267,7 +267,7 @@ KBuildServiceTypeFactory::addEntry(KSycocaEntry *newEntry, const char *resource)
    TQMap<TQString,TQVariant::Type>::ConstIterator pit = pd.begin();
    for( ; pit != pd.end(); ++pit )
    {
-     if (!m_propertyTypeDict.tqcontains(pit.key()))
+     if (!m_propertyTypeDict.contains(pit.key()))
        m_propertyTypeDict.insert(pit.key(), pit.data());
      else if (m_propertyTypeDict[pit.key()] != pit.data())
        kdWarning(7021) << "Property '"<< pit.key() << "' is defined multiple times ("<< serviceType->name() <<")" <<endl;
diff --git a/kded/kbuildservicetypefactory.h b/kded/kbuildservicetypefactory.h
index 311ae4120..a68b8851b 100644
--- a/kded/kbuildservicetypefactory.h
+++ b/kded/kbuildservicetypefactory.h
@@ -41,7 +41,7 @@ public:
    * Find a service type in the database file 
    * @return a pointer to the servicetype in the memory dict (don't free!)
    */
-  virtual KServiceType * tqfindServiceTypeByName(const TQString &_name);
+  virtual KServiceType * findServiceTypeByName(const TQString &_name);
 
   /**
    * Construct a KServiceType from a config file.
diff --git a/kded/kbuildsycoca.cpp b/kded/kbuildsycoca.cpp
index f8fb35cf4..9df927ca8 100644
--- a/kded/kbuildsycoca.cpp
+++ b/kded/kbuildsycoca.cpp
@@ -68,13 +68,13 @@
 typedef TQDict<KSycocaEntry> KBSEntryDict;
 typedef TQValueList<KSycocaEntry::List> KSycocaEntryListList;
 
-static TQ_UINT32 newTimestamp = 0;
+static Q_UINT32 newTimestamp = 0;
 
 static KBuildServiceFactory *g_bsf = 0;
 static KBuildServiceGroupFactory *g_bsgf = 0;
 static KSycocaFactory *g_factory = 0;
 static KCTimeInfo *g_ctimeInfo = 0;
-static TQDict<TQ_UINT32> *g_ctimeDict = 0;
+static TQDict<Q_UINT32> *g_ctimeDict = 0;
 static const char *g_resource = 0;
 static KBSEntryDict *g_entryDict = 0;
 static KBSEntryDict *g_serviceGroupEntryDict = 0;
@@ -160,15 +160,15 @@ void KBuildSycoca::processGnomeVfs()
 
       if (line[0] != '\t')
       {
-          app = TQString::tqfromLatin1(line);
+          app = TQString::fromLatin1(line);
           app.truncate(app.length()-1);
       }
       else if (strncmp(line+1, "mime_types=", 11) == 0)
       {
-          TQString mimetypes = TQString::tqfromLatin1(line+12);
+          TQString mimetypes = TQString::fromLatin1(line+12);
           mimetypes.truncate(mimetypes.length()-1);
-          mimetypes.tqreplace(TQRegExp("\\*"), "all");
-          KService *s = g_bsf->tqfindServiceByName(app);
+          mimetypes.replace(TQRegExp("\\*"), "all");
+          KService *s = g_bsf->findServiceByName(app);
           if (!s)
              continue;
 
@@ -186,7 +186,7 @@ void KBuildSycoca::processGnomeVfs()
 
 KSycocaEntry *KBuildSycoca::createEntry(const TQString &file, bool addToFactory)
 {
-   TQ_UINT32 timeStamp = g_ctimeInfo->ctime(file);
+   Q_UINT32 timeStamp = g_ctimeInfo->ctime(file);
    if (!timeStamp)
    {
       timeStamp = KGlobal::dirs()->calcResourceHash( g_resource, file, true);
@@ -195,23 +195,23 @@ KSycocaEntry *KBuildSycoca::createEntry(const TQString &file, bool addToFactory)
    if (g_allEntries)
    {
       assert(g_ctimeDict);
-      TQ_UINT32 *timeP = (*g_ctimeDict)[file];
-      TQ_UINT32 oldTimestamp = timeP ? *timeP : 0;
+      Q_UINT32 *timeP = (*g_ctimeDict)[file];
+      Q_UINT32 oldTimestamp = timeP ? *timeP : 0;
 
       if (timeStamp && (timeStamp == oldTimestamp))
       {
          // Re-use old entry
          if (g_factory == g_bsgf) // Strip .directory from service-group entries
          {
-            entry = g_entryDict->tqfind(file.left(file.length()-10));
+            entry = g_entryDict->find(file.left(file.length()-10));
          }
          else if (g_factory == g_bsf)
          {
-            entry = g_entryDict->tqfind(file);
+            entry = g_entryDict->find(file);
          }
          else
          {
-            entry = g_entryDict->tqfind(file);
+            entry = g_entryDict->find(file);
          }
          // remove from g_ctimeDict; if g_ctimeDict is not empty
          // after all files have been processed, it means
@@ -300,7 +300,7 @@ bool KBuildSycoca::build()
          ++it1 )
     {
       KSycocaResource res = (*it1);
-      if (!allResources.tqcontains(res.resource))
+      if (!allResources.contains(res.resource))
          allResources.append(res.resource);
     }
   }
@@ -324,7 +324,7 @@ bool KBuildSycoca::build()
                                                relFiles);
 
 
-     // Now tqfind all factories that use this resource....
+     // Now find all factories that use this resource....
      // For each factory
      g_entryDict = entryDictList->first();
      for (g_factory = m_lstFactories->first();
@@ -382,7 +382,7 @@ bool KBuildSycoca::build()
      VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
 
      KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false);
-     entry->setLayoutInfo(kdeMenu->tqlayoutList);
+     entry->setLayoutInfo(kdeMenu->layoutList);
      createMenu(TQString::null, TQString::null, kdeMenu);
 
      KServiceGroup::Ptr g(entry);
@@ -414,7 +414,7 @@ void KBuildSycoca::createMenu(TQString caption, TQString name, VFolderMenu::SubM
      TQString directoryFile = subMenu->directoryFile;
      if (directoryFile.isEmpty())
         directoryFile = subName+".directory";
-     TQ_UINT32 timeStamp = g_ctimeInfo->ctime(directoryFile);
+     Q_UINT32 timeStamp = g_ctimeInfo->ctime(directoryFile);
      if (!timeStamp)
      {
         timeStamp = KGlobal::dirs()->calcResourceHash( g_resource, directoryFile, true);
@@ -423,12 +423,12 @@ void KBuildSycoca::createMenu(TQString caption, TQString name, VFolderMenu::SubM
      KServiceGroup* entry = 0;
      if (g_allEntries)
      {
-        TQ_UINT32 *timeP = (*g_ctimeDict)[directoryFile];
-        TQ_UINT32 oldTimestamp = timeP ? *timeP : 0;
+        Q_UINT32 *timeP = (*g_ctimeDict)[directoryFile];
+        Q_UINT32 oldTimestamp = timeP ? *timeP : 0;
 
         if (timeStamp && (timeStamp == oldTimestamp))
         {
-            entry = dynamic_cast<KServiceGroup *> (g_serviceGroupEntryDict->tqfind(subName));
+            entry = dynamic_cast<KServiceGroup *> (g_serviceGroupEntryDict->find(subName));
             if (entry && (entry->directoryEntryPath() != directoryFile))
                 entry = 0; // Can't reuse this one!
         }
@@ -436,7 +436,7 @@ void KBuildSycoca::createMenu(TQString caption, TQString name, VFolderMenu::SubM
      g_ctimeInfo->addCTime(directoryFile, timeStamp);
 
      entry = g_bsgf->addNew(subName, subMenu->directoryFile, entry, subMenu->isDeleted);
-     entry->setLayoutInfo(subMenu->tqlayoutList);
+     entry->setLayoutInfo(subMenu->layoutList);
      if (! (bMenuTest && entry->noDisplay()) )
         createMenu(caption + entry->caption() + "/", subName, subMenu);
   }
@@ -543,15 +543,15 @@ void KBuildSycoca::save()
    // Write header (#pass 1)
    m_str->device()->at(0);
 
-   (*m_str) << (TQ_INT32) KSycoca::version();
+   (*m_str) << (Q_INT32) KSycoca::version();
    KSycocaFactory * servicetypeFactory = 0L;
    KSycocaFactory * serviceFactory = 0L;
    for(KSycocaFactory *factory = m_lstFactories->first();
        factory;
        factory = m_lstFactories->next())
    {
-      TQ_INT32 aId;
-      TQ_INT32 aOffset;
+      Q_INT32 aId;
+      Q_INT32 aOffset;
       aId = factory->factoryId();
       if ( aId == KST_KServiceTypeFactory )
          servicetypeFactory = factory;
@@ -561,7 +561,7 @@ void KBuildSycoca::save()
       (*m_str) << aId;
       (*m_str) << aOffset;
    }
-   (*m_str) << (TQ_INT32) 0; // No more factories.
+   (*m_str) << (Q_INT32) 0; // No more factories.
    // Write KDEDIRS
    (*m_str) << KGlobal::dirs()->kfsstnd_prefixes();
    (*m_str) << newTimestamp;
@@ -584,19 +584,19 @@ void KBuildSycoca::save()
    // Write header (#pass 2)
    m_str->device()->at(0);
 
-   (*m_str) << (TQ_INT32) KSycoca::version();
+   (*m_str) << (Q_INT32) KSycoca::version();
    for(KSycocaFactory *factory = m_lstFactories->first();
        factory;
        factory = m_lstFactories->next())
    {
-      TQ_INT32 aId;
-      TQ_INT32 aOffset;
+      Q_INT32 aId;
+      Q_INT32 aOffset;
       aId = factory->factoryId();
       aOffset = factory->offset();
       (*m_str) << aId;
       (*m_str) << aOffset;
    }
-   (*m_str) << (TQ_INT32) 0; // No more factories.
+   (*m_str) << (Q_INT32) 0; // No more factories.
 
    // Jump to end of database
    m_str->device()->at(endOfData);
@@ -640,7 +640,7 @@ bool KBuildSycoca::checkDirTimestamps( const TQString& dirname, const TQDateTime
 // and also their directories
 // if all of them all older than the timestamp in file ksycocastamp, this
 // means that there's no need to rebuild ksycoca
-bool KBuildSycoca::checkTimestamps( TQ_UINT32 timestamp, const TQStringList &dirs )
+bool KBuildSycoca::checkTimestamps( Q_UINT32 timestamp, const TQStringList &dirs )
 {
    kdDebug( 7021 ) << "checking file timestamps" << endl;
    TQDateTime stamp;
@@ -709,7 +709,7 @@ static KCmdLineOptions options[] = {
 static const char appName[] = "kbuildsycoca";
 static const char appVersion[] = "1.1";
 
-class WaitForSignal : public TQObject
+class WaitForSignal : public QObject
 {
 public:
    ~WaitForSignal() { kapp->eventLoop()->exitLoop(); }
@@ -806,8 +806,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
      KSycoca::self()->disableAutoRebuild(); // Prevent deadlock
      TQString current_language = KGlobal::locale()->language();
      TQString ksycoca_language = KSycoca::self()->language();
-     TQ_UINT32 current_update_sig = KGlobal::dirs()->calcResourceHash("services", "update_ksycoca", true);
-     TQ_UINT32 ksycoca_update_sig = KSycoca::self()->updateSignature();
+     Q_UINT32 current_update_sig = KGlobal::dirs()->calcResourceHash("services", "update_ksycoca", true);
+     Q_UINT32 ksycoca_update_sig = KSycoca::self()->updateSignature();
 
      if ((current_update_sig != ksycoca_update_sig) ||
          (current_language != ksycoca_language) ||
@@ -822,7 +822,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
    g_changeList = new TQStringList;
 
    bool checkstamps = incremental && args->isSet("checkstamps") && checkfiles;
-   TQ_UINT32 filestamp = 0;
+   Q_UINT32 filestamp = 0;
    TQStringList oldresourcedirs;
    if( checkstamps && incremental )
    {
@@ -859,7 +859,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
        cSycocaPath = 0;
    }
 
-   newTimestamp = (TQ_UINT32) time(0);
+   newTimestamp = (Q_UINT32) time(0);
 
    if( checkfiles && ( !checkstamps || !KBuildSycoca::checkTimestamps( filestamp, oldresourcedirs )))
    {
@@ -874,7 +874,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
          KSycoca *oldSycoca = KSycoca::self();
          KSycocaFactoryList *factories = new KSycocaFactoryList;
          g_allEntries = new KSycocaEntryListList;
-         g_ctimeDict = new TQDict<TQ_UINT32>(523);
+         g_ctimeDict = new TQDict<Q_UINT32>(523);
 
          // Must be in same order as in KBuildSycoca::recreate()!
          factories->append( new KServiceTypeFactory );
diff --git a/kded/kbuildsycoca.h b/kded/kbuildsycoca.h
index f98001781..0f90c3df6 100644
--- a/kded/kbuildsycoca.h
+++ b/kded/kbuildsycoca.h
@@ -47,7 +47,7 @@ public:
     */
    bool recreate();
 
-   static bool checkTimestamps( TQ_UINT32 timestamp, const TQStringList &dirs );
+   static bool checkTimestamps( Q_UINT32 timestamp, const TQStringList &dirs );
 
    static TQStringList existingResourceDirs();
    
diff --git a/kded/kctimefactory.cpp b/kded/kctimefactory.cpp
index 15e43767a..25d78bab0 100644
--- a/kded/kctimefactory.cpp
+++ b/kded/kctimefactory.cpp
@@ -54,13 +54,13 @@ KCTimeInfo::save(TQDataStream &str)
   KSycocaFactory::save(str);
 
   m_dictOffset = str.device()->at();
-  TQDictIterator<TQ_UINT32> it(ctimeDict);
+  TQDictIterator<Q_UINT32> it(ctimeDict);
   while( it.current())
   {
      str << it.currentKey() << *(it.current());
      ++it;
   }   
-  str << TQString::null << (TQ_UINT32) 0;
+  str << TQString::null << (Q_UINT32) 0;
 
   int endOfFactoryData = str.device()->at();
 
@@ -69,31 +69,31 @@ KCTimeInfo::save(TQDataStream &str)
 }
 
 void 
-KCTimeInfo::addCTime(const TQString &path, TQ_UINT32 ctime)
+KCTimeInfo::addCTime(const TQString &path, Q_UINT32 ctime)
 {
   assert(!path.isEmpty());
-  ctimeDict.tqreplace(path, new TQ_UINT32(ctime));
+  ctimeDict.replace(path, new Q_UINT32(ctime));
 }
 
-TQ_UINT32
+Q_UINT32
 KCTimeInfo::ctime(const TQString &path)
 {
-  TQ_UINT32 *ctimeP = ctimeDict[path];
+  Q_UINT32 *ctimeP = ctimeDict[path];
   return ctimeP ? *ctimeP : 0;
 }
 
 void
-KCTimeInfo::fillCTimeDict(TQDict<TQ_UINT32> &dict)
+KCTimeInfo::fillCTimeDict(TQDict<Q_UINT32> &dict)
 {
     assert(m_str);
     m_str->device()->at(m_dictOffset);
     TQString path;
-    TQ_UINT32 ctime;
+    Q_UINT32 ctime;
     while(true)
     {
       KSycocaEntry::read(*m_str, path);
       (*m_str) >> ctime;
       if (path.isEmpty()) break;
-      dict.tqreplace(path, new TQ_UINT32(ctime));
+      dict.replace(path, new Q_UINT32(ctime));
     }
 }
diff --git a/kded/kctimefactory.h b/kded/kctimefactory.h
index 64cfe6c19..b878b3033 100644
--- a/kded/kctimefactory.h
+++ b/kded/kctimefactory.h
@@ -50,14 +50,14 @@ public:
   KSycocaEntry * createEntry(const TQString &, const char *) { return 0; }
   KSycocaEntry * createEntry(int) { return 0; }
   
-  void addCTime(const TQString &path, TQ_UINT32 ctime);
+  void addCTime(const TQString &path, Q_UINT32 ctime);
 
-  TQ_UINT32 ctime(const TQString &path);
+  Q_UINT32 ctime(const TQString &path);
 
-  void fillCTimeDict(TQDict<TQ_UINT32> &dict);
+  void fillCTimeDict(TQDict<Q_UINT32> &dict);
 
 protected:
-  TQDict<TQ_UINT32> ctimeDict;
+  TQDict<Q_UINT32> ctimeDict;
   int m_dictOffset;
 };
 
diff --git a/kded/kde-menu.cpp b/kded/kde-menu.cpp
index 142ed3916..89ee5a857 100644
--- a/kded/kde-menu.cpp
+++ b/kded/kde-menu.cpp
@@ -34,8 +34,8 @@
 
 static KCmdLineOptions options[] = {
    { "utf8", I18N_NOOP("Output data in UTF-8 instead of local encoding"), 0 },
-   { "print-menu-id", I18N_NOOP("Print menu-id of the menu that tqcontains\nthe application"), 0 },
-   { "print-menu-name", I18N_NOOP("Print menu name (caption) of the menu that\ntqcontains the application"), 0 },
+   { "print-menu-id", I18N_NOOP("Print menu-id of the menu that contains\nthe application"), 0 },
+   { "print-menu-name", I18N_NOOP("Print menu name (caption) of the menu that\ncontains the application"), 0 },
    { "highlight", I18N_NOOP("Highlight the entry in the menu"), 0 },
    { "nocache-update", I18N_NOOP("Do not check if sycoca database is up to date"), 0 },
    { "+<application-id>", I18N_NOOP("The id of the menu entry to locate"), 0 },
@@ -64,7 +64,7 @@ static void error(int exitCode, const TQString &txt)
    exit(exitCode);
 }
 
-static void tqfindMenuEntry(KServiceGroup::Ptr parent, const TQString &name, const TQString &menuId)
+static void findMenuEntry(KServiceGroup::Ptr parent, const TQString &name, const TQString &menuId)
 {
    KServiceGroup::List list = parent->entries(true, true, false);
    KServiceGroup::List::ConstIterator it = list.begin();
@@ -76,7 +76,7 @@ static void tqfindMenuEntry(KServiceGroup::Ptr parent, const TQString &name, con
       {
          KServiceGroup::Ptr g(static_cast<KServiceGroup *>(e));
          
-         tqfindMenuEntry(g, name.isEmpty() ? g->caption() : name+"/"+g->caption(), menuId);
+         findMenuEntry(g, name.isEmpty() ? g->caption() : name+"/"+g->caption(), menuId);
       }
       else if (e->isType(KST_KService))
       {
@@ -109,7 +109,7 @@ int main(int argc, char **argv)
 {
    KLocale::setMainCatalogue("kdelibs");
    const char *description = I18N_NOOP("KDE Menu query tool.\n"
-   "This tool can be used to tqfind in which menu a specific application is shown.\n"
+   "This tool can be used to find in which menu a specific application is shown.\n"
    "The --highlight option can be used to visually indicate to the user where\n"
    "in the KDE menu a specific application is located.");
    
@@ -163,7 +163,7 @@ int main(int argc, char **argv)
    if (!s)
       error(1, i18n("No menu item '%1'.").arg(menuId));
 
-   tqfindMenuEntry(KServiceGroup::root(), "", menuId);
+   findMenuEntry(KServiceGroup::root(), "", menuId);
 
    error(2, i18n("Menu item '%1' not found in menu.").arg(menuId));
    return 2;
diff --git a/kded/kded.cpp b/kded/kded.cpp
index 59933c8f3..d33bfc6b3 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -247,7 +247,7 @@ void Kded::noDemandLoad(const TQString &obj)
 
 KDEDModule *Kded::loadModule(const TQCString &obj, bool onDemand)
 {
-  KDEDModule *module = m_modules.tqfind(obj);
+  KDEDModule *module = m_modules.find(obj);
   if (module)
      return module;
   KService::Ptr s = KService::serviceByDesktopPath("kded/"+obj+".desktop");
@@ -260,7 +260,7 @@ KDEDModule *Kded::loadModule(const KService *s, bool onDemand)
   if (s && !s->library().isEmpty())
   {
     TQCString obj = s->desktopEntryName().latin1();
-    KDEDModule *oldModule = m_modules.tqfind(obj);
+    KDEDModule *oldModule = m_modules.find(obj);
     if (oldModule)
        return oldModule;
 
@@ -374,7 +374,7 @@ void Kded::slotApplicationRemoved(const TQCString &appId)
      it.current()->removeAll(appId);
   }
 
-  TQValueList<long> *windowIds = m_windowIdList.tqfind(appId);
+  TQValueList<long> *windowIds = m_windowIdList.find(appId);
   if (windowIds)
   {
      for( TQValueList<long>::ConstIterator it = windowIds->begin();
@@ -428,7 +428,7 @@ void Kded::updateResourceList()
        it != dirs.end();
        ++it )
   {
-     if (m_allResourceDirs.tqfind(*it) == m_allResourceDirs.end())
+     if (m_allResourceDirs.find(*it) == m_allResourceDirs.end())
      {
         m_allResourceDirs.append(*it);
         readDirectory(*it);
@@ -562,7 +562,7 @@ void Kded::readDirectory( const TQString& _path )
   if ( path.right(1) != "/" )
     path += "/";
 
-  if ( m_pDirWatch->tqcontains( path ) ) // Already seen this one?
+  if ( m_pDirWatch->contains( path ) ) // Already seen this one?
      return;
 
   TQDir d( _path, TQString::null, TQDir::Unsorted, TQDir::Readable | TQDir::Executable | TQDir::Dirs | TQDir::Hidden );
@@ -603,18 +603,18 @@ void Kded::readDirectory( const TQString& _path )
 
 bool Kded::isWindowRegistered(long windowId)
 {
-  return m_globalWindowIdList.tqfind(windowId) != 0;
+  return m_globalWindowIdList.find(windowId) != 0;
 
 }
 
 // DCOP
 void Kded::registerWindowId(long windowId)
 {
-  m_globalWindowIdList.tqreplace(windowId, &windowId);
+  m_globalWindowIdList.replace(windowId, &windowId);
   TQCString sender = callingDcopClient()->senderId();
   if( sender.isEmpty()) // local call
       sender = callingDcopClient()->appId();
-  TQValueList<long> *windowIds = m_windowIdList.tqfind(sender);
+  TQValueList<long> *windowIds = m_windowIdList.find(sender);
   if (!windowIds)
   {
     windowIds = new TQValueList<long>;
@@ -636,7 +636,7 @@ void Kded::unregisterWindowId(long windowId)
   TQCString sender = callingDcopClient()->senderId();
   if( sender.isEmpty()) // local call
       sender = callingDcopClient()->appId();
-  TQValueList<long> *windowIds = m_windowIdList.tqfind(sender);
+  TQValueList<long> *windowIds = m_windowIdList.find(sender);
   if (windowIds)
   {
      windowIds->remove(windowId);
@@ -674,7 +674,7 @@ KUpdateD::KUpdateD()
        if (path[path.length()-1] != '/')
           path += "/";
 
-       if (!m_pDirWatch->tqcontains(path))
+       if (!m_pDirWatch->contains(path))
           m_pDirWatch->addDir(path);
     }
 }
diff --git a/kded/kded.h b/kded/kded.h
index b30549083..1b6ebe481 100644
--- a/kded/kded.h
+++ b/kded/kded.h
@@ -173,7 +173,7 @@ private:
    static Kded *_self;
 };
 
-class KUpdateD : public TQObject
+class KUpdateD : public QObject
 {
    Q_OBJECT
 public:
@@ -200,7 +200,7 @@ private:
    TQTimer* m_pTimer;
 };
 
-class KHostnameD : public TQObject
+class KHostnameD : public QObject
 {
    Q_OBJECT
 public:
diff --git a/kded/kdedmodule.cpp b/kded/kdedmodule.cpp
index cc65abcde..ca28a5c62 100644
--- a/kded/kdedmodule.cpp
+++ b/kded/kdedmodule.cpp
@@ -69,24 +69,24 @@ void KDEDModule::insert(const TQCString &app, const TQCString &key, KShared *obj
 
    // appKey acts as a placeholder
    KEntryKey appKey(app, 0);
-   d->objMap->tqreplace(appKey, 0);
+   d->objMap->replace(appKey, 0);
 
    KEntryKey indexKey(app, key);
 
    // Prevent deletion in case the same object is inserted again.
    KSharedPtr<KShared> _obj = obj; 
 
-   d->objMap->tqreplace(indexKey, _obj);
+   d->objMap->replace(indexKey, _obj);
    resetIdle();
 }
 
-KShared * KDEDModule::tqfind(const TQCString &app, const TQCString &key)
+KShared * KDEDModule::find(const TQCString &app, const TQCString &key)
 {
    if (!d->objMap)
       return 0;
    KEntryKey indexKey(app, key);
 
-   KDEDObjectMap::Iterator it = d->objMap->tqfind(indexKey);
+   KDEDObjectMap::Iterator it = d->objMap->find(indexKey);
    if (it == d->objMap->end())
       return 0;
 
@@ -111,7 +111,7 @@ void KDEDModule::removeAll(const TQCString &app)
    KEntryKey indexKey(app, 0);
    // Search for placeholder.
 
-   KDEDObjectMap::Iterator it = d->objMap->tqfind(indexKey);
+   KDEDObjectMap::Iterator it = d->objMap->find(indexKey);
    while (it != d->objMap->end())
    {
       KDEDObjectMap::Iterator it2 = it++;
diff --git a/kded/kdedmodule.h b/kded/kdedmodule.h
index 1bd0eeebc..041f50303 100644
--- a/kded/kdedmodule.h
+++ b/kded/kdedmodule.h
@@ -36,7 +36,7 @@ class Kded;
  * libraries that are loaded on-demand into kded at runtime.
  *
  * To write a config module, you have to create a library
- * that tqcontains at least one factory function like this:
+ * that contains at least one factory function like this:
  *
  * \code
  *   extern "C" {
@@ -96,7 +96,7 @@ public:
   /**
    * Lookup object indexed with @p app and @p key
    */
-  KShared *tqfind(const TQCString &app, const TQCString &key);
+  KShared *find(const TQCString &app, const TQCString &key);
   
   /**
    * remove object indexed with @p app and @p key.
diff --git a/kded/khostname.cpp b/kded/khostname.cpp
index 3e9740054..0fa837a2c 100644
--- a/kded/khostname.cpp
+++ b/kded/khostname.cpp
@@ -82,7 +82,7 @@ KHostName::KHostName()
 
    display = ::getenv("DISPLAY");
    // strip the screen number from the display
-   display.tqreplace(TQRegExp("\\.[0-9]+$"), "");
+   display.replace(TQRegExp("\\.[0-9]+$"), "");
    if (display.isEmpty())
    {
       fprintf(stderr, "%s", i18n("Error: DISPLAY environment variable not set.\n").local8Bit().data());
@@ -145,14 +145,14 @@ void KHostName::changeX()
       TQCString authName = entries[1];
       TQCString authKey = entries[2];
 
-      int i = netId.tqfindRev(':');
+      int i = netId.findRev(':');
       if (i == -1)
          continue;
       TQCString netDisplay = netId.mid(i);
       if (netDisplay != display)
          continue;
 
-      i = netId.tqfind('/');
+      i = netId.find('/');
       if (i == -1)
          continue;
 
@@ -208,7 +208,7 @@ void KHostName::changeDcop()
 
    if (!newName.isEmpty())
    {
-      int i = line1.tqfindRev(':');
+      int i = line1.findRev(':');
       if (i == -1)
       {
          fprintf(stderr, "Warning: File '%s' has unexpected format.\n", fname.data());
@@ -286,7 +286,7 @@ void KHostName::changeDcop()
    // Remove old entries, but only if XAUTHLOCALHOSTNAME doesn't point
    // to it
    char* xauthlocalhostname = getenv("XAUTHLOCALHOSTNAME");
-   if (!xauthlocalhostname || !oldNetId.tqcontains(xauthlocalhostname))
+   if (!xauthlocalhostname || !oldNetId.contains(xauthlocalhostname))
    {
       TQString cmd = "iceauth remove "+KProcess::quote("netid="+oldNetId);
       system(TQFile::encodeName(cmd));
@@ -340,7 +340,7 @@ void KHostName::changeSessionManager()
       fprintf(stderr, "Warning: No session management specified.\n");
       return;
    }
-   int i = sm.tqfindRev(':');
+   int i = sm.findRev(':');
    if ((i == -1) || (sm.left(6) != "local/"))
    {
       fprintf(stderr, "Warning: Session Management socket '%s' has unexpected format.\n", sm.data());
diff --git a/kded/vfolder_menu.cpp b/kded/vfolder_menu.cpp
index e939d40e9..b48662cb2 100644
--- a/kded/vfolder_menu.cpp
+++ b/kded/vfolder_menu.cpp
@@ -39,7 +39,7 @@ static void foldNode(TQDomElement &docElem, TQDomElement &e, TQMap<TQString,TQDo
 {
    if (s.isEmpty())
       s = e.text();
-   TQMap<TQString,TQDomElement>::iterator it = dupeList.tqfind(s);
+   TQMap<TQString,TQDomElement>::iterator it = dupeList.find(s);
    if (it != dupeList.end())
    {
       kdDebug(7021) << e.tagName() << " and " << s << " requires combining!" << endl;
@@ -50,7 +50,7 @@ static void foldNode(TQDomElement &docElem, TQDomElement &e, TQMap<TQString,TQDo
    dupeList.insert(s, e);
 }
 
-static void tqreplaceNode(TQDomElement &docElem, TQDomNode &n, const TQStringList &list, const TQString &tag)
+static void replaceNode(TQDomElement &docElem, TQDomNode &n, const TQStringList &list, const TQString &tag)
 {
    for(TQStringList::ConstIterator it = list.begin();
        it != list.end(); ++it)
@@ -69,7 +69,7 @@ static void tqreplaceNode(TQDomElement &docElem, TQDomNode &n, const TQStringLis
 
 void VFolderMenu::registerFile(const TQString &file)
 {
-   int i = file.tqfindRev('/');
+   int i = file.findRev('/');
    if (i < 0)
       return;
 
@@ -108,8 +108,8 @@ TQStringList VFolderMenu::allDirectories()
 static void
 track(const TQString &menuId, const TQString &menuName, TQDict<KService> *includeList, TQDict<KService> *excludeList, TQDict<KService> *itemList, const TQString &comment)
 {
-   if (itemList->tqfind(menuId))
-      printf("%s: %s INCL %d EXCL %d\n", menuName.latin1(), comment.latin1(), includeList->tqfind(menuId) ? 1 : 0, excludeList->tqfind(menuId) ? 1 : 0);
+   if (itemList->find(menuId))
+      printf("%s: %s INCL %d EXCL %d\n", menuName.latin1(), comment.latin1(), includeList->find(menuId) ? 1 : 0, excludeList->find(menuId) ? 1 : 0);
 }
 
 void
@@ -117,7 +117,7 @@ VFolderMenu::includeItems(TQDict<KService> *items1, TQDict<KService> *items2)
 {
    for(TQDictIterator<KService> it(*items2); it.current(); ++it)
    {
-       items1->tqreplace(it.current()->menuId(), it.current());
+       items1->replace(it.current()->menuId(), it.current());
    }
 }
 
@@ -128,7 +128,7 @@ VFolderMenu::matchItems(TQDict<KService> *items1, TQDict<KService> *items2)
    {
        TQString id = it.current()->menuId();
        ++it;
-       if (!items2->tqfind(id))
+       if (!items2->find(id))
           items1->remove(id);
    }
 }
@@ -145,7 +145,7 @@ VFolderMenu::excludeItems(TQDict<KService> *items1, TQDict<KService> *items2)
 VFolderMenu::SubMenu*
 VFolderMenu::takeSubMenu(SubMenu *parentMenu, const TQString &menuName)
 {
-   int i = menuName.tqfind('/');
+   int i = menuName.find('/');
    TQString s1 = i > 0 ? menuName.left(i) : menuName;
    TQString s2 = menuName.mid(i+1);
 
@@ -205,8 +205,8 @@ VFolderMenu::mergeMenu(SubMenu *menu1, SubMenu *menu2, bool reversePriority)
          menu1->directoryFile = menu2->directoryFile;
       if (menu1->defaultLayoutNode.isNull())
          menu1->defaultLayoutNode = menu2->defaultLayoutNode;
-      if (menu1->tqlayoutNode.isNull())
-         menu1->tqlayoutNode = menu2->tqlayoutNode;
+      if (menu1->layoutNode.isNull())
+         menu1->layoutNode = menu2->layoutNode;
    }
    else
    {
@@ -215,8 +215,8 @@ VFolderMenu::mergeMenu(SubMenu *menu1, SubMenu *menu2, bool reversePriority)
          menu1->directoryFile = menu2->directoryFile;
       if (!menu2->defaultLayoutNode.isNull())
          menu1->defaultLayoutNode = menu2->defaultLayoutNode;
-      if (!menu2->tqlayoutNode.isNull())
-         menu1->tqlayoutNode = menu2->tqlayoutNode;
+      if (!menu2->layoutNode.isNull())
+         menu1->layoutNode = menu2->layoutNode;
    }
 
    if (m_track)
@@ -231,7 +231,7 @@ VFolderMenu::mergeMenu(SubMenu *menu1, SubMenu *menu2, bool reversePriority)
 void
 VFolderMenu::insertSubMenu(SubMenu *parentMenu, const TQString &menuName, SubMenu *newMenu, bool reversePriority)
 {
-   int i = menuName.tqfind('/');
+   int i = menuName.find('/');
 
    TQString s1 = menuName.left(i);
    TQString s2 = menuName.mid(i+1);
@@ -271,12 +271,12 @@ VFolderMenu::insertSubMenu(SubMenu *parentMenu, const TQString &menuName, SubMen
 void
 VFolderMenu::insertService(SubMenu *parentMenu, const TQString &name, KService *newService)
 {
-   int i = name.tqfind('/');
+   int i = name.find('/');
 
    if (i == -1)
    {
      // Add it here
-     parentMenu->items.tqreplace(newService->menuId(), newService);
+     parentMenu->items.replace(newService->menuId(), newService);
      return;
    }
 
@@ -324,19 +324,19 @@ VFolderMenu::~VFolderMenu()
    for(appsInfo *info = m_appsInfoStack.first(); \
        info; info = m_appsInfoStack.next()) \
    { \
-      KService::List *list = info->dictCategories.tqfind(category); \
+      KService::List *list = info->dictCategories.find(category); \
       if (list) for(KService::List::ConstIterator it = list->begin(); \
              it != list->end(); ++it) \
       {
 #define FOR_CATEGORY_END } }
 
 KService *
-VFolderMenu::tqfindApplication(const TQString &relPath)
+VFolderMenu::findApplication(const TQString &relPath)
 {
    for(appsInfo *info = m_appsInfoStack.first();
        info; info = m_appsInfoStack.next())
    {
-      KService *s = info->applications.tqfind(relPath);
+      KService *s = info->applications.find(relPath);
       if (s)
          return s;
    }
@@ -347,7 +347,7 @@ void
 VFolderMenu::addApplication(const TQString &id, KService *service)
 {
    service->setMenuId(id);
-   m_appsInfo->applications.tqreplace(id, service);
+   m_appsInfo->applications.replace(id, service);
 }
 
 void
@@ -364,7 +364,7 @@ VFolderMenu::buildApplicationIndex(bool unusedOnly)
          KService *s = it.current();
          TQDictIterator<KService> tmpIt = it;
          ++it;
-         if (unusedOnly && m_usedAppsDict.tqfind(s->menuId()))
+         if (unusedOnly && m_usedAppsDict.find(s->menuId()))
          {
             // Remove and skip this one
             info->applications.remove(tmpIt.currentKey());
@@ -376,7 +376,7 @@ VFolderMenu::buildApplicationIndex(bool unusedOnly)
              it2 != cats.end(); ++it2)
          {
             const TQString &cat = *it2;
-            KService::List *list = info->dictCategories.tqfind(cat);
+            KService::List *list = info->dictCategories.find(cat);
             if (!list)
             {
                list = new KService::List();
@@ -546,7 +546,7 @@ VFolderMenu::mergeMenus(TQDomElement &docElem, TQString &name)
    TQMap<TQString,TQDomElement> directoryDirNodes;
    TQMap<TQString,TQDomElement> legacyDirNodes;
    TQDomElement defaultLayoutNode;
-   TQDomElement tqlayoutNode;
+   TQDomElement layoutNode;
 
    TQDomNode n = docElem.firstChild();
    while( !n.isNull() ) {
@@ -556,17 +556,17 @@ VFolderMenu::mergeMenus(TQDomElement &docElem, TQString &name)
       }
       else if( e.tagName() == "DefaultAppDirs") {
          // Replace with m_defaultAppDirs
-         tqreplaceNode(docElem, n, m_defaultAppDirs, "AppDir");
+         replaceNode(docElem, n, m_defaultAppDirs, "AppDir");
          continue;
       }
       else if( e.tagName() == "DefaultDirectoryDirs") {
          // Replace with m_defaultDirectoryDirs
-         tqreplaceNode(docElem, n, m_defaultDirectoryDirs, "DirectoryDir");
+         replaceNode(docElem, n, m_defaultDirectoryDirs, "DirectoryDir");
          continue;
       }
       else if( e.tagName() == "DefaultMergeDirs") {
          // Replace with m_defaultMergeDirs
-         tqreplaceNode(docElem, n, m_defaultMergeDirs, "MergeDir");
+         replaceNode(docElem, n, m_defaultMergeDirs, "MergeDir");
          continue;
       }
       else if( e.tagName() == "AppDir") {
@@ -603,7 +603,7 @@ VFolderMenu::mergeMenus(TQDomElement &docElem, TQString &name)
       else if( e.tagName() == "Menu") {
          TQString name;
          mergeMenus(e, name);
-         TQMap<TQString,TQDomElement>::iterator it = menuNodes.tqfind(name);
+         TQMap<TQString,TQDomElement>::iterator it = menuNodes.find(name);
          if (it != menuNodes.end())
          {
            TQDomElement docElem2 = *it;
@@ -684,9 +684,9 @@ VFolderMenu::mergeMenus(TQDomElement &docElem, TQString &name)
          defaultLayoutNode = e;
       }
       else if( e.tagName() == "Layout") {
-         if (!tqlayoutNode.isNull())
-            docElem.removeChild(tqlayoutNode);
-         tqlayoutNode = e;
+         if (!layoutNode.isNull())
+            docElem.removeChild(layoutNode);
+         layoutNode = e;
       }
       n = n.nextSibling();
    }
@@ -719,7 +719,7 @@ VFolderMenu::pushDocInfo(const TQString &fileName, const TQString &baseDir)
       return;
    }
    int i;
-   i = baseName.tqfindRev('/');
+   i = baseName.findRev('/');
    if (i > 0)
    {
       m_docInfo.baseDir = baseName.left(i+1);
@@ -739,7 +739,7 @@ VFolderMenu::pushDocInfoParent(const TQString &basePath, const TQString &baseDir
 
    m_docInfo.baseDir = baseDir;
 
-   TQString fileName = basePath.mid(basePath.tqfindRev('/')+1);
+   TQString fileName = basePath.mid(basePath.findRev('/')+1);
    m_docInfo.baseName = fileName.left( fileName.length() - 5 );
    TQString baseName = TQDir::cleanDirPath(m_docInfo.baseDir + fileName);
 
@@ -937,7 +937,7 @@ VFolderMenu::processCondition(TQDomElement &domElem, TQDict<KService> *items)
       FOR_ALL_APPLICATIONS(it)
       {
          KService *s = it.current();
-         items->tqreplace(s->menuId(), s);
+         items->replace(s->menuId(), s);
       }
       FOR_ALL_APPLICATIONS_END
 
@@ -958,7 +958,7 @@ VFolderMenu::processCondition(TQDomElement &domElem, TQDict<KService> *items)
       FOR_CATEGORY(domElem.text(), it)
       {
          KService *s = *it;
-         items->tqreplace(s->menuId(), s);
+         items->replace(s->menuId(), s);
       }
       FOR_CATEGORY_END
    }
@@ -967,7 +967,7 @@ VFolderMenu::processCondition(TQDomElement &domElem, TQDict<KService> *items)
       FOR_ALL_APPLICATIONS(it)
       {
          KService *s = it.current();
-         items->tqreplace(s->menuId(), s);
+         items->replace(s->menuId(), s);
       }
       FOR_ALL_APPLICATIONS_END
    }
@@ -975,9 +975,9 @@ VFolderMenu::processCondition(TQDomElement &domElem, TQDict<KService> *items)
    {
       TQString filename = domElem.text();
 kdDebug(7021) << "Adding file " << filename << endl;
-      KService *s = tqfindApplication(filename);
+      KService *s = findApplication(filename);
       if (s)
-         items->tqreplace(filename, s);
+         items->replace(filename, s);
    }
 }
 
@@ -1071,7 +1071,7 @@ kdDebug(7021) << "processKDELegacyDirs()" << endl;
          {
             TQString id = name;
             // Strip path from id
-            int i = id.tqfindRev('/');
+            int i = id.findRev('/');
             if (i >= 0)
                id = id.mid(i+1);
 
@@ -1079,7 +1079,7 @@ kdDebug(7021) << "processKDELegacyDirs()" << endl;
 
             // TODO: add Legacy category
             addApplication(id, service);
-            items.tqreplace(service->menuId(), service);
+            items.replace(service->menuId(), service);
             if (service->categories().isEmpty())
                insertService(m_currentMenu, name, service);
 
@@ -1144,10 +1144,10 @@ kdDebug(7021) << "processLegacyDir(" << dir << ", " << relDir << ", " << prefix
 
             // TODO: Add legacy category
             addApplication(id, service);
-            items.tqreplace(service->menuId(), service);
+            items.replace(service->menuId(), service);
 
             if (service->categories().isEmpty())
-               m_currentMenu->items.tqreplace(id, service);
+               m_currentMenu->items.replace(id, service);
          }
       }
     }
@@ -1169,7 +1169,7 @@ VFolderMenu::processMenu(TQDomElement &docElem, int pass)
    bool isDeleted = false;
    bool kdeLegacyDirsDone = false;
    TQDomElement defaultLayoutNode;
-   TQDomElement tqlayoutNode;
+   TQDomElement layoutNode;
 
    TQDomElement query;
    TQDomNode n = docElem.firstChild();
@@ -1211,7 +1211,7 @@ VFolderMenu::processMenu(TQDomElement &docElem, int pass)
       }
       else if (e.tagName() == "Layout")
       {
-         tqlayoutNode = e;
+         layoutNode = e;
       }
       n = n.nextSibling();
    }
@@ -1256,7 +1256,7 @@ VFolderMenu::processMenu(TQDomElement &docElem, int pass)
       m_currentMenu->isDeleted = isDeleted;
 
       m_currentMenu->defaultLayoutNode = defaultLayoutNode;
-      m_currentMenu->tqlayoutNode = tqlayoutNode;
+      m_currentMenu->layoutNode = layoutNode;
    }
    else
    {
@@ -1305,7 +1305,7 @@ kdDebug(7021) << "Processing KDE Legacy dirs for <KDE>" << endl;
 
                processKDELegacyDirs();
 
-               m_legacyNodes.tqreplace("<KDE>", m_currentMenu);
+               m_legacyNodes.replace("<KDE>", m_currentMenu);
                m_currentMenu = oldMenu;
 
                kdeLegacyDirsDone = true;
@@ -1318,7 +1318,7 @@ kdDebug(7021) << "Processing KDE Legacy dirs for <KDE>" << endl;
 
             TQString prefix = e.attributes().namedItem("prefix").toAttr().value();
 
-            if (m_defaultLegacyDirs.tqcontains(dir))
+            if (m_defaultLegacyDirs.contains(dir))
             {
                if (!kdeLegacyDirsDone)
                {
@@ -1328,7 +1328,7 @@ kdDebug(7021) << "Processing KDE Legacy dirs for " << dir << endl;
 
                   processKDELegacyDirs();
 
-                  m_legacyNodes.tqreplace("<KDE>", m_currentMenu);
+                  m_legacyNodes.replace("<KDE>", m_currentMenu);
                   m_currentMenu = oldMenu;
 
                   kdeLegacyDirsDone = true;
@@ -1343,7 +1343,7 @@ kdDebug(7021) << "Processing KDE Legacy dirs for " << dir << endl;
 
                processLegacyDir(dir, TQString::null, prefix);
 
-               m_legacyNodes.tqreplace(dir, m_currentMenu);
+               m_legacyNodes.replace(dir, m_currentMenu);
                m_currentMenu = oldMenu;
             }
          }
@@ -1421,7 +1421,7 @@ kdDebug(7021) << "Processing KDE Legacy dirs for " << dir << endl;
          {
             // Add legacy nodes to Menu structure
             TQString dir = absoluteDir(e.text(), e.attribute("__BaseDir"));
-            SubMenu *legacyMenu = m_legacyNodes.tqfind(dir);
+            SubMenu *legacyMenu = m_legacyNodes.find(dir);
             if (legacyMenu)
             {
                mergeMenu(m_currentMenu, legacyMenu);
@@ -1432,7 +1432,7 @@ kdDebug(7021) << "Processing KDE Legacy dirs for " << dir << endl;
          {
             // Add legacy nodes to Menu structure
             TQString dir = "<KDE>";
-            SubMenu *legacyMenu = m_legacyNodes.tqfind(dir);
+            SubMenu *legacyMenu = m_legacyNodes.find(dir);
             if (legacyMenu)
             {
                mergeMenu(m_currentMenu, legacyMenu);
@@ -1546,70 +1546,70 @@ static TQString parseAttribute( const TQDomElement &e)
 
 static TQStringList parseLayoutNode(const TQDomElement &docElem)
 {
-   TQStringList tqlayout;
+   TQStringList layout;
 
    TQString optionDefaultLayout;
    if( docElem.tagName()=="DefaultLayout")
        optionDefaultLayout =  parseAttribute( docElem);
    if ( !optionDefaultLayout.isEmpty() )
-       tqlayout.append( optionDefaultLayout );
+       layout.append( optionDefaultLayout );
 
    TQDomNode n = docElem.firstChild();
    while( !n.isNull() ) {
       TQDomElement e = n.toElement(); // try to convert the node to an element.
       if (e.tagName() == "Separator")
       {
-         tqlayout.append(":S");
+         layout.append(":S");
       }
       else if (e.tagName() == "Filename")
       {
-         tqlayout.append(e.text());
+         layout.append(e.text());
       }
       else if (e.tagName() == "Menuname")
       {
-         tqlayout.append("/"+e.text());
+         layout.append("/"+e.text());
          TQString option = parseAttribute( e );
          if( !option.isEmpty())
-             tqlayout.append( option );
+             layout.append( option );
       }
       else if (e.tagName() == "Merge")
       {
          TQString type = e.attributeNode("type").value();
          if (type == "files")
-            tqlayout.append(":F");
+            layout.append(":F");
          else if (type == "menus")
-            tqlayout.append(":M");
+            layout.append(":M");
          else if (type == "all")
-            tqlayout.append(":A");
+            layout.append(":A");
       }
 
       n = n.nextSibling();
    }
-   return tqlayout;
+   return layout;
 }
 
 void
-VFolderMenu::tqlayoutMenu(VFolderMenu::SubMenu *menu, TQStringList defaultLayout)
+VFolderMenu::layoutMenu(VFolderMenu::SubMenu *menu, TQStringList defaultLayout)
 {
    if (!menu->defaultLayoutNode.isNull())
    {
       defaultLayout = parseLayoutNode(menu->defaultLayoutNode);
    }
 
-   if (menu->tqlayoutNode.isNull())
+   if (menu->layoutNode.isNull())
    {
-     menu->tqlayoutList = defaultLayout;
+     menu->layoutList = defaultLayout;
    }
    else
    {
-     menu->tqlayoutList = parseLayoutNode(menu->tqlayoutNode);
-     if (menu->tqlayoutList.isEmpty())
-        menu->tqlayoutList = defaultLayout;
+     menu->layoutList = parseLayoutNode(menu->layoutNode);
+     if (menu->layoutList.isEmpty())
+        menu->layoutList = defaultLayout;
    }
 
    for(VFolderMenu::SubMenu *subMenu = menu->subMenus.first(); subMenu; subMenu = menu->subMenus.next())
    {
-      tqlayoutMenu(subMenu, defaultLayout);
+      layoutMenu(subMenu, defaultLayout);
    }
 }
 
@@ -1618,7 +1618,7 @@ VFolderMenu::markUsedApplications(TQDict<KService> *items)
 {
    for(TQDictIterator<KService> it(*items); it.current(); ++it)
    {
-      m_usedAppsDict.tqreplace(it.current()->menuId(), it.current());
+      m_usedAppsDict.replace(it.current()->menuId(), it.current());
    }
 }
 
@@ -1660,7 +1660,7 @@ VFolderMenu::parseMenu(const TQString &file, bool forceLegacyLoad)
          TQStringList defaultLayout;
          defaultLayout << ":M"; // Sub-Menus
          defaultLayout << ":F"; // Individual entries
-         tqlayoutMenu(m_rootMenu, defaultLayout);
+         layoutMenu(m_rootMenu, defaultLayout);
       }
    }
 
diff --git a/kded/vfolder_menu.h b/kded/vfolder_menu.h
index 83d6dab64..ce7183056 100644
--- a/kded/vfolder_menu.h
+++ b/kded/vfolder_menu.h
@@ -29,7 +29,7 @@
 
 #include <kservice.h>
 
-class VFolderMenu : public TQObject
+class VFolderMenu : public QObject
 {
   Q_OBJECT
 public:
@@ -46,9 +46,9 @@ public:
      TQDict<KService> items;
      TQDict<KService> excludeItems; // Needed when merging due to Move.
      TQDomElement defaultLayoutNode;
-     TQDomElement tqlayoutNode;
+     TQDomElement layoutNode;
      bool isDeleted;
-     TQStringList tqlayoutList;
+     TQStringList layoutList;
      appsInfo *apps_info;
   };
 
@@ -56,7 +56,7 @@ public:
   ~VFolderMenu();
 
   /**
-   * Parses VFolder menu defintion and generates a menu tqlayout.
+   * Parses VFolder menu defintion and generates a menu layout.
    * The newService signals is used as callback to load
    * a specific service description.
    *
@@ -148,12 +148,12 @@ private:
   /**
    * Lookup application by relative path
    */
-  KService *tqfindApplication(const TQString &relPath);
+  KService *findApplication(const TQString &relPath);
 
   /**
    * Lookup applications by category
    */
-  TQPtrList<KService::List> tqfindCategory(const TQString &category);
+  TQPtrList<KService::List> findCategory(const TQString &category);
   
   /**
    * Add new application
@@ -253,7 +253,7 @@ private:
   void processKDELegacyDirs();
   void processLegacyDir(const TQString &dir, const TQString &relDir, const TQString &prefix);
   void processMenu(TQDomElement &docElem, int pass);
-  void tqlayoutMenu(VFolderMenu::SubMenu *menu, TQStringList defaultLayout);
+  void layoutMenu(VFolderMenu::SubMenu *menu, TQStringList defaultLayout);
   void processCondition(TQDomElement &docElem, TQDict<KService> *items);
 
   void initDirs();
diff --git a/kdefx/kcpuinfo.h b/kdefx/kcpuinfo.h
index 085b9c55a..ce39ded82 100644
--- a/kdefx/kcpuinfo.h
+++ b/kdefx/kcpuinfo.h
@@ -40,7 +40,7 @@ class KDEFX_EXPORT KCPUInfo
 {
     public:
        /**
-         * This enum tqcontains the list of architecture extensions you
+         * This enum contains the list of architecture extensions you
          * can query.
          */
         enum Extensions {
diff --git a/kdefx/kdrawutil.cpp b/kdefx/kdrawutil.cpp
index 83ea81008..0fccb94f1 100644
--- a/kdefx/kdrawutil.cpp
+++ b/kdefx/kdrawutil.cpp
@@ -228,7 +228,7 @@ KDEFX_EXPORT void kColorBitmaps(TQPainter *p, const TQColorGroup &g, int x, int
     int i;
     for(i=0; i < 6; ++i){
         if(bitmaps[i]){
-            if(!bitmaps[i]->tqmask())
+            if(!bitmaps[i]->mask())
                 bitmaps[i]->setMask(*bitmaps[i]);
             p->setPen(colors[i]);
             p->drawPixmap(x, y, *bitmaps[i]);
diff --git a/kdefx/kdrawutil.h b/kdefx/kdrawutil.h
index 033e0edf4..27be8ac58 100644
--- a/kdefx/kdrawutil.h
+++ b/kdefx/kdrawutil.h
@@ -86,7 +86,7 @@ KDEFX_EXPORT void kDrawBeButton(TQPainter *p, int x, int y, int w, int h,
  * @c \#include @c <kdrawutil.h>
  *
  * Draws a rounded oval button. This function doesn't fill the button.
- * See kRoundMaskRegion() for setting tqmasks for fills.
+ * See kRoundMaskRegion() for setting masks for fills.
  *
  * @param p       The painter to use for drawing the button.
  * @param r       Specifies the rect in which to draw the button.
@@ -125,7 +125,7 @@ KDEFX_EXPORT void kRoundMaskRegion(TQRegion &r, int x, int y, int w, int h);
  * @c \#include @c <kdrawutil.h>
  *
  * Paints the pixels covered by a round button of the given size with
- * Qt::color1. This function is useful in TQStyle::tqdrawControlMask().
+ * Qt::color1. This function is useful in TQStyle::drawControlMask().
  *
  * @param p      The painter to use for drawing the button.
  * @param x      The X coordinate of the button.
@@ -133,7 +133,7 @@ KDEFX_EXPORT void kRoundMaskRegion(TQRegion &r, int x, int y, int w, int h);
  * @param w      The width of the button.
  * @param h      The height of the button.
  * @param clear  Whether to clear the rectangle specified by @p (x, y, w, h) to
- *               Qt::color0 before drawing the tqmask.
+ *               Qt::color0 before drawing the mask.
  */
 KDEFX_EXPORT void kDrawRoundMask(TQPainter *p, int x, int y, int w, int h, bool clear=false);
 
@@ -145,7 +145,7 @@ KDEFX_EXPORT void kDrawRoundMask(TQPainter *p, int x, int y, int w, int h, bool
  * the foreground colors. There's one bitmap for each color. If you want to skip
  * a color, pass @a null for the corresponding bitmap.
  *
- * @note The bitmaps will be self-tqmasked automatically if not tqmasked
+ * @note The bitmaps will be self-masked automatically if not masked
  *       prior to calling this routine.
  *
  * @param p             The painter to use for drawing the bitmaps.
diff --git a/kdefx/kimageeffect.cpp b/kdefx/kimageeffect.cpp
index 63d83eca5..eee05b497 100644
--- a/kdefx/kimageeffect.cpp
+++ b/kdefx/kimageeffect.cpp
@@ -84,9 +84,9 @@ inline const T& fxClamp( const T& x, const T& low, const T& high )
 
 static inline unsigned int intensityValue(unsigned int color)
 {
-    return((unsigned int)((0.299*tqRed(color) +
-                           0.587*tqGreen(color) +
-                           0.1140000000000001*tqBlue(color))));
+    return((unsigned int)((0.299*qRed(color) +
+                           0.587*qGreen(color) +
+                           0.1140000000000001*qBlue(color))));
 }
 
 template<typename T>
@@ -164,7 +164,7 @@ TQImage KImageEffect::gradient(const TQSize &size, const TQColor &ca,
                 gl += gcdelta;
                 bl += bcdelta;
 
-                rgb = tqRgb( (rl>>16), (gl>>16), (bl>>16) );
+                rgb = qRgb( (rl>>16), (gl>>16), (bl>>16) );
 
                 for( x = 0; x < size.width(); x++ ) {
                     *p = rgb;
@@ -188,7 +188,7 @@ TQImage KImageEffect::gradient(const TQSize &size, const TQColor &ca,
                 gl += gcdelta;
                 bl += bcdelta;
 
-                *src++ = tqRgb( (rl>>16), (gl>>16), (bl>>16));
+                *src++ = qRgb( (rl>>16), (gl>>16), (bl>>16));
             }
 
             src = o_src;
@@ -253,7 +253,7 @@ TQImage KImageEffect::gradient(const TQSize &size, const TQColor &ca,
             for (y = 0; y < size.height(); y++) {
                 unsigned int *scanline = (unsigned int *)image.scanLine(y);
                 for (x = 0; x < size.width(); x++) {
-                    scanline[x] = tqRgb(xtable[0][x] + ytable[0][y],
+                    scanline[x] = qRgb(xtable[0][x] + ytable[0][y],
                                        xtable[1][x] + ytable[1][y],
                                        xtable[2][x] + ytable[2][y]);
                 }
@@ -310,12 +310,12 @@ TQImage KImageEffect::gradient(const TQSize &size, const TQColor &ca,
                 for (x = 0; x < w; x++, x2--) {
 		    unsigned int rgb = 0;
                     if (eff == PyramidGradient) {
-                        rgb = tqRgb(rcb-rSign*(xtable[0][x]+ytable[0][y]),
+                        rgb = qRgb(rcb-rSign*(xtable[0][x]+ytable[0][y]),
                                    gcb-gSign*(xtable[1][x]+ytable[1][y]),
                                    bcb-bSign*(xtable[2][x]+ytable[2][y]));
                     }
                     if (eff == RectangleGradient) {
-                        rgb = tqRgb(rcb - rSign *
+                        rgb = qRgb(rcb - rSign *
                                    QMAX(xtable[0][x], ytable[0][y]) * 2,
                                    gcb - gSign *
                                    QMAX(xtable[1][x], ytable[1][y]) * 2,
@@ -323,7 +323,7 @@ TQImage KImageEffect::gradient(const TQSize &size, const TQColor &ca,
                                    QMAX(xtable[2][x], ytable[2][y]) * 2);
                     }
                     if (eff == PipeCrossGradient) {
-                        rgb = tqRgb(rcb - rSign *
+                        rgb = qRgb(rcb - rSign *
                                    QMIN(xtable[0][x], ytable[0][y]) * 2,
                                    gcb - gSign *
                                    QMIN(xtable[1][x], ytable[1][y]) * 2,
@@ -331,7 +331,7 @@ TQImage KImageEffect::gradient(const TQSize &size, const TQColor &ca,
                                    QMIN(xtable[2][x], ytable[2][y]) * 2);
                     }
                     if (eff == EllipticGradient) {
-                        rgb = tqRgb(rcb - rSign *
+                        rgb = qRgb(rcb - rSign *
                                    (int)sqrt((xtable[0][x]*xtable[0][x] +
                                               ytable[0][y]*ytable[0][y])*2.0),
                                    gcb - gSign *
@@ -463,7 +463,7 @@ TQImage KImageEffect::unbalancedGradient(const TQSize &size, const TQColor &ca,
 	      dir = _xanti ? x : size.width() - 1 - x;
 	      rat = 1 - exp( - (float)x  * xbal );
 
-              src[dir] = tqRgb(rcb - (int) ( rDiff * rat ),
+              src[dir] = qRgb(rcb - (int) ( rDiff * rat ),
                               gcb - (int) ( gDiff * rat ),
                               bcb - (int) ( bDiff * rat ));
           }
@@ -516,7 +516,7 @@ TQImage KImageEffect::unbalancedGradient(const TQSize &size, const TQColor &ca,
 	  for (y = 0; y < h; y++) {
               unsigned int *scanline = (unsigned int *)image.scanLine(y);
               for (x = 0; x < w; x++) {
-                  scanline[x] = tqRgb(rcb - (xtable[0][x] + ytable[0][y]),
+                  scanline[x] = qRgb(rcb - (xtable[0][x] + ytable[0][y]),
                                      gcb - (xtable[1][x] + ytable[1][y]),
                                      bcb - (xtable[2][x] + ytable[2][y]));
               }
@@ -558,13 +558,13 @@ TQImage KImageEffect::unbalancedGradient(const TQSize &size, const TQColor &ca,
               for (x = 0; x < w; x++) {
                   if (eff == PyramidGradient)
                   {
-                      scanline[x] = tqRgb(rcb-rSign*(xtable[0][x]+ytable[0][y]),
+                      scanline[x] = qRgb(rcb-rSign*(xtable[0][x]+ytable[0][y]),
                                          gcb-gSign*(xtable[1][x]+ytable[1][y]),
                                          bcb-bSign*(xtable[2][x]+ytable[2][y]));
                   }
                   else if (eff == RectangleGradient)
                   {
-                      scanline[x] = tqRgb(rcb - rSign *
+                      scanline[x] = qRgb(rcb - rSign *
                                          QMAX(xtable[0][x], ytable[0][y]) * 2,
                                          gcb - gSign *
                                          QMAX(xtable[1][x], ytable[1][y]) * 2,
@@ -573,7 +573,7 @@ TQImage KImageEffect::unbalancedGradient(const TQSize &size, const TQColor &ca,
                   }
                   else if (eff == PipeCrossGradient)
                   {
-                      scanline[x] = tqRgb(rcb - rSign *
+                      scanline[x] = qRgb(rcb - rSign *
                                          QMIN(xtable[0][x], ytable[0][y]) * 2,
                                          gcb - gSign *
                                          QMIN(xtable[1][x], ytable[1][y]) * 2,
@@ -582,7 +582,7 @@ TQImage KImageEffect::unbalancedGradient(const TQSize &size, const TQColor &ca,
                   }
                   else if (eff == EllipticGradient)
                   {
-                      scanline[x] = tqRgb(rcb - rSign *
+                      scanline[x] = qRgb(rcb - rSign *
                                          (int)sqrt((xtable[0][x]*xtable[0][x] +
                                                     ytable[0][y]*ytable[0][y])*2.0),
                                          gcb - gSign *
@@ -628,12 +628,12 @@ namespace {
 
 struct KIE4Pack
 {
-    TQ_UINT16 data[4];
+    Q_UINT16 data[4];
 };
 
 struct KIE8Pack
 {
-    TQ_UINT16 data[8];
+    Q_UINT16 data[8];
 };
 
 }
@@ -675,7 +675,7 @@ TQImage& KImageEffect::intensity(TQImage &image, float percent)
 
     if(haveMMX)
     {
-        TQ_UINT16 p = TQ_UINT16(256.0f*(percent));
+        Q_UINT16 p = Q_UINT16(256.0f*(percent));
         KIE4Pack mult = {{p,p,p,0}};
 
         __asm__ __volatile__(
@@ -685,7 +685,7 @@ TQImage& KImageEffect::intensity(TQImage &image, float percent)
 
         unsigned int rem = pixels % 4;
         pixels -= rem;
-        TQ_UINT32 *end = ( data + pixels );
+        Q_UINT32 *end = ( data + pixels );
 
         if (brighten)
         {
@@ -815,26 +815,26 @@ TQImage& KImageEffect::intensity(TQImage &image, float percent)
 
         if(brighten){ // same here
             for(int i=0; i < pixels; ++i){
-                int r = tqRed(data[i]);
-                int g = tqGreen(data[i]);
-                int b = tqBlue(data[i]);
-                int a = tqAlpha(data[i]);
+                int r = qRed(data[i]);
+                int g = qGreen(data[i]);
+                int b = qBlue(data[i]);
+                int a = qAlpha(data[i]);
                 r = r + segTbl[r] > 255 ? 255 : r + segTbl[r];
                 g = g + segTbl[g] > 255 ? 255 : g + segTbl[g];
                 b = b + segTbl[b] > 255 ? 255 : b + segTbl[b];
-                data[i] = tqRgba(r, g, b,a);
+                data[i] = qRgba(r, g, b,a);
             }
         }
         else{
             for(int i=0; i < pixels; ++i){
-                int r = tqRed(data[i]);
-                int g = tqGreen(data[i]);
-                int b = tqBlue(data[i]);
-                int a = tqAlpha(data[i]);
+                int r = qRed(data[i]);
+                int g = qGreen(data[i]);
+                int b = qBlue(data[i]);
+                int a = qAlpha(data[i]);
                 r = r - segTbl[r] < 0 ? 0 : r - segTbl[r];
                 g = g - segTbl[g] < 0 ? 0 : g - segTbl[g];
                 b = b - segTbl[b] < 0 ? 0 : b - segTbl[b];
-                data[i] = tqRgba(r, g, b, a);
+                data[i] = qRgba(r, g, b, a);
             }
         }
         delete [] segTbl;
@@ -883,23 +883,23 @@ TQImage& KImageEffect::channelIntensity(TQImage &image, float percent,
     if(brighten){ // same here
         if(channel == Red){ // and here ;-)
             for(int i=0; i < pixels; ++i){
-                int c = tqRed(data[i]);
+                int c = qRed(data[i]);
                 c = c + segTbl[c] > 255 ? 255 : c + segTbl[c];
-                data[i] = tqRgba(c, tqGreen(data[i]), tqBlue(data[i]), tqAlpha(data[i]));
+                data[i] = qRgba(c, qGreen(data[i]), qBlue(data[i]), qAlpha(data[i]));
             }
         }
         else if(channel == Green){
             for(int i=0; i < pixels; ++i){
-                int c = tqGreen(data[i]);
+                int c = qGreen(data[i]);
                 c = c + segTbl[c] > 255 ? 255 : c + segTbl[c];
-                data[i] = tqRgba(tqRed(data[i]), c, tqBlue(data[i]), tqAlpha(data[i]));
+                data[i] = qRgba(qRed(data[i]), c, qBlue(data[i]), qAlpha(data[i]));
             }
         }
         else{
             for(int i=0; i < pixels; ++i){
-                int c = tqBlue(data[i]);
+                int c = qBlue(data[i]);
                 c = c + segTbl[c] > 255 ? 255 : c + segTbl[c];
-                data[i] = tqRgba(tqRed(data[i]), tqGreen(data[i]), c, tqAlpha(data[i]));
+                data[i] = qRgba(qRed(data[i]), qGreen(data[i]), c, qAlpha(data[i]));
             }
         }
 
@@ -907,23 +907,23 @@ TQImage& KImageEffect::channelIntensity(TQImage &image, float percent,
     else{
         if(channel == Red){
             for(int i=0; i < pixels; ++i){
-                int c = tqRed(data[i]);
+                int c = qRed(data[i]);
                 c = c - segTbl[c] < 0 ? 0 : c - segTbl[c];
-                data[i] = tqRgba(c, tqGreen(data[i]), tqBlue(data[i]), tqAlpha(data[i]));
+                data[i] = qRgba(c, qGreen(data[i]), qBlue(data[i]), qAlpha(data[i]));
             }
         }
         else if(channel == Green){
             for(int i=0; i < pixels; ++i){
-                int c = tqGreen(data[i]);
+                int c = qGreen(data[i]);
                 c = c - segTbl[c] < 0 ? 0 : c - segTbl[c];
-                data[i] = tqRgba(tqRed(data[i]), c, tqBlue(data[i]), tqAlpha(data[i]));
+                data[i] = qRgba(qRed(data[i]), c, qBlue(data[i]), qAlpha(data[i]));
             }
         }
         else{
             for(int i=0; i < pixels; ++i){
-                int c = tqBlue(data[i]);
+                int c = qBlue(data[i]);
                 c = c - segTbl[c] < 0 ? 0 : c - segTbl[c];
-                data[i] = tqRgba(tqRed(data[i]), tqGreen(data[i]), c, tqAlpha(data[i]));
+                data[i] = qRgba(qRed(data[i]), qGreen(data[i]), c, qAlpha(data[i]));
             }
         }
     }
@@ -982,22 +982,22 @@ TQImage& KImageEffect::modulate(TQImage &image, TQImage &modImage, bool reverse,
 	      color1 = *data1;
 
 	  if (type == Intensity || type == Contrast) {
-              r = tqRed(color1);
-	      g = tqGreen(color1);
-	      b = tqBlue(color1);
+              r = qRed(color1);
+	      g = qGreen(color1);
+	      b = qBlue(color1);
 	      if (channel != All) {
-      	        mod = (channel == Red) ? tqRed(color2) :
-		    (channel == Green) ? tqGreen(color2) :
-	    	    (channel == Blue) ? tqBlue(color2) :
-		    (channel == Gray) ? tqGray(color2) : 0;
+      	        mod = (channel == Red) ? qRed(color2) :
+		    (channel == Green) ? qGreen(color2) :
+	    	    (channel == Blue) ? qBlue(color2) :
+		    (channel == Gray) ? qGray(color2) : 0;
 	        mod = mod*factor/50;
 	      }
 
 	      if (type == Intensity) {
 	        if (channel == All) {
-	          r += r * factor/50 * tqRed(color2)/256;
-	          g += g * factor/50 * tqGreen(color2)/256;
-	          b += b * factor/50 * tqBlue(color2)/256;
+	          r += r * factor/50 * qRed(color2)/256;
+	          g += g * factor/50 * qGreen(color2)/256;
+	          b += b * factor/50 * qBlue(color2)/256;
 	        }
 	        else {
 	          r += r * mod/256;
@@ -1007,9 +1007,9 @@ TQImage& KImageEffect::modulate(TQImage &image, TQImage &modImage, bool reverse,
 	      }
 	      else { // Contrast
 	        if (channel == All) {
-		  r += (r-128) * factor/50 * tqRed(color2)/128;
-	          g += (g-128) * factor/50 * tqGreen(color2)/128;
-	          b += (b-128) * factor/50 * tqBlue(color2)/128;
+		  r += (r-128) * factor/50 * qRed(color2)/128;
+	          g += (g-128) * factor/50 * qGreen(color2)/128;
+	          b += (b-128) * factor/50 * qBlue(color2)/128;
 	        }
 	        else {
 	          r += (r-128) * mod/128;
@@ -1021,16 +1021,16 @@ TQImage& KImageEffect::modulate(TQImage &image, TQImage &modImage, bool reverse,
 	      if (r<0) r=0; if (r>255) r=255;
 	      if (g<0) g=0; if (g>255) g=255;
 	      if (b<0) b=0; if (b>255) b=255;
-	      a = tqAlpha(*data1);
-	      *data1 = tqRgba(r, g, b, a);
+	      a = qAlpha(*data1);
+	      *data1 = qRgba(r, g, b, a);
 	  }
 	  else if (type == Saturation || type == HueShift) {
 	      clr.setRgb(color1);
 	      clr.hsv(&h, &s, &v);
-      	      mod = (channel == Red) ? tqRed(color2) :
-		    (channel == Green) ? tqGreen(color2) :
-	    	    (channel == Blue) ? tqBlue(color2) :
-		    (channel == Gray) ? tqGray(color2) : 0;
+      	      mod = (channel == Red) ? qRed(color2) :
+		    (channel == Green) ? qGreen(color2) :
+	    	    (channel == Blue) ? qBlue(color2) :
+		    (channel == Gray) ? qGray(color2) : 0;
 	      mod = mod*factor/50;
 
 	      if (type == Saturation) {
@@ -1044,7 +1044,7 @@ TQImage& KImageEffect::modulate(TQImage &image, TQImage &modImage, bool reverse,
 	      }
 
 	      clr.setHsv(h, s, v);
-	      a = tqAlpha(*data1);
+	      a = qAlpha(*data1);
 	      *data1 = clr.rgb() | ((uint)(a & 0xff) << 24);
 	  }
 	  data1++; data2++; data2b++; x++;
@@ -1083,14 +1083,14 @@ TQImage& KImageEffect::blend(const TQColor& clr, TQImage& dst, float opacity)
 
 #ifdef USE_SSE2_INLINE_ASM
     if ( KCPUInfo::haveExtension( KCPUInfo::IntelSSE2 ) && pixels > 16 ) {
-        TQ_UINT16 alpha = TQ_UINT16( ( 1.0 - opacity ) * 256.0 );
+        Q_UINT16 alpha = Q_UINT16( ( 1.0 - opacity ) * 256.0 );
 
         KIE8Pack packedalpha = { { alpha, alpha, alpha, 256,
                                    alpha, alpha, alpha, 256 } };
 
-        TQ_UINT16 red   = TQ_UINT16( clr.red()   * 256 * opacity );
-        TQ_UINT16 green = TQ_UINT16( clr.green() * 256 * opacity );
-        TQ_UINT16 blue  = TQ_UINT16( clr.blue()  * 256 * opacity );
+        Q_UINT16 red   = Q_UINT16( clr.red()   * 256 * opacity );
+        Q_UINT16 green = Q_UINT16( clr.green() * 256 * opacity );
+        Q_UINT16 blue  = Q_UINT16( clr.blue()  * 256 * opacity );
 
         KIE8Pack packedcolor = { { blue, green, red, 0,
                                    blue, green, red, 0 } };
@@ -1103,10 +1103,10 @@ TQImage& KImageEffect::blend(const TQColor& clr, TQImage& dst, float opacity)
         : : "r"(&packedalpha), "r"(&packedcolor),
             "m"(packedcolor),  "m"(packedalpha) );
 
-        TQ_UINT32 *data = reinterpret_cast<TQ_UINT32*>( dst.bits() );
+        Q_UINT32 *data = reinterpret_cast<Q_UINT32*>( dst.bits() );
 
-        // Check how many pixels we need to process to achieve 16 byte tqalignment
-        int offset = (16 - (TQ_UINT32( data ) & 0x0f)) / 4;
+        // Check how many pixels we need to process to achieve 16 byte alignment
+        int offset = (16 - (Q_UINT32( data ) & 0x0f)) / 4;
 
         // The main loop processes 8 pixels / iteration
         int remainder = (pixels - offset) % 8;
@@ -1188,12 +1188,12 @@ TQImage& KImageEffect::blend(const TQColor& clr, TQImage& dst, float opacity)
 
 #ifdef USE_MMX_INLINE_ASM
     if ( KCPUInfo::haveExtension( KCPUInfo::IntelMMX ) && pixels > 1 ) {
-        TQ_UINT16 alpha = TQ_UINT16( ( 1.0 - opacity ) * 256.0 );
+        Q_UINT16 alpha = Q_UINT16( ( 1.0 - opacity ) * 256.0 );
         KIE4Pack packedalpha = { { alpha, alpha, alpha, 256 } };
 
-        TQ_UINT16 red   = TQ_UINT16( clr.red()   * 256 * opacity );
-        TQ_UINT16 green = TQ_UINT16( clr.green() * 256 * opacity );
-        TQ_UINT16 blue  = TQ_UINT16( clr.blue()  * 256 * opacity );
+        Q_UINT16 red   = Q_UINT16( clr.red()   * 256 * opacity );
+        Q_UINT16 green = Q_UINT16( clr.green() * 256 * opacity );
+        Q_UINT16 blue  = Q_UINT16( clr.blue()  * 256 * opacity );
 
         KIE4Pack packedcolor = { { blue, green, red, 0 } };
 
@@ -1203,7 +1203,7 @@ TQImage& KImageEffect::blend(const TQColor& clr, TQImage& dst, float opacity)
         "movq         (%1),    %%mm5\n\t"       // Set up color * alpha * 256 in MM5
         : : "r"(&packedalpha), "r"(&packedcolor), "m"(packedcolor), "m"(packedalpha) );
 
-        TQ_UINT32 *data = reinterpret_cast<TQ_UINT32*>( dst.bits() );
+        Q_UINT32 *data = reinterpret_cast<Q_UINT32*>( dst.bits() );
 
         // The main loop processes 4 pixels / iteration
         int remainder = pixels % 4;
@@ -1333,7 +1333,7 @@ TQImage& KImageEffect::blend(TQImage& src, TQImage& dst, float opacity)
 
 #ifdef USE_SSE2_INLINE_ASM
     if ( KCPUInfo::haveExtension( KCPUInfo::IntelSSE2 ) && pixels > 16 ) {
-        TQ_UINT16 alpha = TQ_UINT16( opacity * 256.0 );
+        Q_UINT16 alpha = Q_UINT16( opacity * 256.0 );
         KIE8Pack packedalpha = { { alpha, alpha, alpha, 0,
                                    alpha, alpha, alpha, 0 } };
 
@@ -1343,11 +1343,11 @@ TQImage& KImageEffect::blend(TQImage& src, TQImage& dst, float opacity)
         "movdqu      (%0), %%xmm6\n\t" // Set up alpha * 256 in XMM6
         : : "r"(&packedalpha), "m"(packedalpha) );
 
-        TQ_UINT32 *data1 = reinterpret_cast<TQ_UINT32*>( src.bits() );
-        TQ_UINT32 *data2 = reinterpret_cast<TQ_UINT32*>( dst.bits() );
+        Q_UINT32 *data1 = reinterpret_cast<Q_UINT32*>( src.bits() );
+        Q_UINT32 *data2 = reinterpret_cast<Q_UINT32*>( dst.bits() );
 
-        // Check how many pixels we need to process to achieve 16 byte tqalignment
-        int offset = (16 - (TQ_UINT32( data2 ) & 0x0f)) / 4;
+        // Check how many pixels we need to process to achieve 16 byte alignment
+        int offset = (16 - (Q_UINT32( data2 ) & 0x0f)) / 4;
 
         // The main loop processes 4 pixels / iteration
         int remainder = (pixels - offset) % 4;
@@ -1428,7 +1428,7 @@ TQImage& KImageEffect::blend(TQImage& src, TQImage& dst, float opacity)
 
 #ifdef USE_MMX_INLINE_ASM
     if ( KCPUInfo::haveExtension( KCPUInfo::IntelMMX ) && pixels > 1 ) {
-        TQ_UINT16 alpha = TQ_UINT16( opacity * 256.0 );
+        Q_UINT16 alpha = Q_UINT16( opacity * 256.0 );
         KIE4Pack packedalpha = { { alpha, alpha, alpha, 0 } };
 
         // Prepare the MM6 and MM7 registers for blending and unpacking
@@ -1437,8 +1437,8 @@ TQImage& KImageEffect::blend(TQImage& src, TQImage& dst, float opacity)
         "movq        (%0),   %%mm6\n\t"      // Set up alpha * 256 in MM6
         : : "r"(&packedalpha), "m"(packedalpha) );
 
-        TQ_UINT32 *data1 = reinterpret_cast<TQ_UINT32*>( src.bits() );
-        TQ_UINT32 *data2 = reinterpret_cast<TQ_UINT32*>( dst.bits() );
+        Q_UINT32 *data1 = reinterpret_cast<Q_UINT32*>( src.bits() );
+        Q_UINT32 *data2 = reinterpret_cast<Q_UINT32*>( dst.bits() );
 
         // The main loop processes 2 pixels / iteration
         int remainder = pixels % 2;
@@ -1602,17 +1602,17 @@ TQImage& KImageEffect::blend(TQImage &image, float initial_intensity,
             for (x = xi; x < (int)xf ; x++) {
                 if (eff == HorizontalGradient) intensity += var;
                 ind = x + ind_base;
-                r = tqRed  (data[ind]) + (int)(intensity *
-                                              (r_bgnd - tqRed  (data[ind])));
-                g = tqGreen(data[ind]) + (int)(intensity *
-                                              (g_bgnd - tqGreen(data[ind])));
-                b = tqBlue (data[ind]) + (int)(intensity *
-                                              (b_bgnd - tqBlue (data[ind])));
+                r = qRed  (data[ind]) + (int)(intensity *
+                                              (r_bgnd - qRed  (data[ind])));
+                g = qGreen(data[ind]) + (int)(intensity *
+                                              (g_bgnd - qGreen(data[ind])));
+                b = qBlue (data[ind]) + (int)(intensity *
+                                              (b_bgnd - qBlue (data[ind])));
                 if (r > 255) r = 255; if (r < 0 ) r = 0;
                 if (g > 255) g = 255; if (g < 0 ) g = 0;
                 if (b > 255) b = 255; if (b < 0 ) b = 0;
-                a = tqAlpha(data[ind]);
-                data[ind] = tqRgba(r, g, b, a);
+                a = qAlpha(data[ind]);
+                data[ind] = qRgba(r, g, b, a);
             }
         }
     }
@@ -1627,17 +1627,17 @@ TQImage& KImageEffect::blend(TQImage &image, float initial_intensity,
             for (y = 0; y < image_height ; y++) {
                 intensity = initial_intensity + tmp + yvar * y;
 
-                r = tqRed  (data[ind]) + (int)(intensity *
-                                              (r_bgnd - tqRed  (data[ind])));
-                g = tqGreen(data[ind]) + (int)(intensity *
-                                              (g_bgnd - tqGreen(data[ind])));
-                b = tqBlue (data[ind]) + (int)(intensity *
-                                              (b_bgnd - tqBlue (data[ind])));
+                r = qRed  (data[ind]) + (int)(intensity *
+                                              (r_bgnd - qRed  (data[ind])));
+                g = qGreen(data[ind]) + (int)(intensity *
+                                              (g_bgnd - qGreen(data[ind])));
+                b = qBlue (data[ind]) + (int)(intensity *
+                                              (b_bgnd - qBlue (data[ind])));
                 if (r > 255) r = 255; if (r < 0 ) r = 0;
                 if (g > 255) g = 255; if (g < 0 ) g = 0;
                 if (b > 255) b = 255; if (b < 0 ) b = 0;
-                a = tqAlpha(data[ind]);
-                data[ind] = tqRgba(r, g, b, a);
+                a = qAlpha(data[ind]);
+                data[ind] = qRgba(r, g, b, a);
 
                 ind += image_width;
             }
@@ -1662,31 +1662,31 @@ TQImage& KImageEffect::blend(TQImage &image, float initial_intensity,
 
                 //NW
                 ind = x + image_width  * y ;
-                r = tqRed  (data[ind]) + (int)(intensity *
-                                              (r_bgnd - tqRed  (data[ind])));
-                g = tqGreen(data[ind]) + (int)(intensity *
-                                              (g_bgnd - tqGreen(data[ind])));
-                b = tqBlue (data[ind]) + (int)(intensity *
-                                              (b_bgnd - tqBlue (data[ind])));
+                r = qRed  (data[ind]) + (int)(intensity *
+                                              (r_bgnd - qRed  (data[ind])));
+                g = qGreen(data[ind]) + (int)(intensity *
+                                              (g_bgnd - qGreen(data[ind])));
+                b = qBlue (data[ind]) + (int)(intensity *
+                                              (b_bgnd - qBlue (data[ind])));
                 if (r > 255) r = 255; if (r < 0 ) r = 0;
                 if (g > 255) g = 255; if (g < 0 ) g = 0;
                 if (b > 255) b = 255; if (b < 0 ) b = 0;
-                a = tqAlpha(data[ind]);
-                data[ind] = tqRgba(r, g, b, a);
+                a = qAlpha(data[ind]);
+                data[ind] = qRgba(r, g, b, a);
 
                 //NE
                 ind = image_width - x - 1 + image_width  * y ;
-                r = tqRed  (data[ind]) + (int)(intensity *
-                                              (r_bgnd - tqRed  (data[ind])));
-                g = tqGreen(data[ind]) + (int)(intensity *
-                                              (g_bgnd - tqGreen(data[ind])));
-                b = tqBlue (data[ind]) + (int)(intensity *
-                                              (b_bgnd - tqBlue (data[ind])));
+                r = qRed  (data[ind]) + (int)(intensity *
+                                              (r_bgnd - qRed  (data[ind])));
+                g = qGreen(data[ind]) + (int)(intensity *
+                                              (g_bgnd - qGreen(data[ind])));
+                b = qBlue (data[ind]) + (int)(intensity *
+                                              (b_bgnd - qBlue (data[ind])));
                 if (r > 255) r = 255; if (r < 0 ) r = 0;
                 if (g > 255) g = 255; if (g < 0 ) g = 0;
                 if (b > 255) b = 255; if (b < 0 ) b = 0;
-                a = tqAlpha(data[ind]);
-                data[ind] = tqRgba(r, g, b, a);
+                a = qAlpha(data[ind]);
+                data[ind] = qRgba(r, g, b, a);
             }
         }
 
@@ -1706,31 +1706,31 @@ TQImage& KImageEffect::blend(TQImage &image, float initial_intensity,
 
                 //SW
                 ind = x + image_width  * (image_height - y -1) ;
-                r = tqRed  (data[ind]) + (int)(intensity *
-                                              (r_bgnd - tqRed  (data[ind])));
-                g = tqGreen(data[ind]) + (int)(intensity *
-                                              (g_bgnd - tqGreen(data[ind])));
-                b = tqBlue (data[ind]) + (int)(intensity *
-                                              (b_bgnd - tqBlue (data[ind])));
+                r = qRed  (data[ind]) + (int)(intensity *
+                                              (r_bgnd - qRed  (data[ind])));
+                g = qGreen(data[ind]) + (int)(intensity *
+                                              (g_bgnd - qGreen(data[ind])));
+                b = qBlue (data[ind]) + (int)(intensity *
+                                              (b_bgnd - qBlue (data[ind])));
                 if (r > 255) r = 255; if (r < 0 ) r = 0;
                 if (g > 255) g = 255; if (g < 0 ) g = 0;
                 if (b > 255) b = 255; if (b < 0 ) b = 0;
-                a = tqAlpha(data[ind]);
-                data[ind] = tqRgba(r, g, b, a);
+                a = qAlpha(data[ind]);
+                data[ind] = qRgba(r, g, b, a);
 
                 //SE
                 ind = image_width-x-1 + image_width * (image_height - y - 1) ;
-                r = tqRed  (data[ind]) + (int)(intensity *
-                                              (r_bgnd - tqRed  (data[ind])));
-                g = tqGreen(data[ind]) + (int)(intensity *
-                                              (g_bgnd - tqGreen(data[ind])));
-                b = tqBlue (data[ind]) + (int)(intensity *
-                                              (b_bgnd - tqBlue (data[ind])));
+                r = qRed  (data[ind]) + (int)(intensity *
+                                              (r_bgnd - qRed  (data[ind])));
+                g = qGreen(data[ind]) + (int)(intensity *
+                                              (g_bgnd - qGreen(data[ind])));
+                b = qBlue (data[ind]) + (int)(intensity *
+                                              (b_bgnd - qBlue (data[ind])));
                 if (r > 255) r = 255; if (r < 0 ) r = 0;
                 if (g > 255) g = 255; if (g < 0 ) g = 0;
                 if (b > 255) b = 255; if (b < 0 ) b = 0;
-                a = tqAlpha(data[ind]);
-                data[ind] = tqRgba(r, g, b, a);
+                a = qAlpha(data[ind]);
+                data[ind] = qRgba(r, g, b, a);
             }
         }
     }
@@ -1809,16 +1809,16 @@ TQImage& KImageEffect::blend(TQImage &image1, TQImage &image2,
 	while(x < (int)x1) {
 	  color3 = (colorTable3) ? colorTable3[data3b[ind3]] : data3[ind3];
 
-          a = (channel == Red) ? tqRed(color3) :
-              (channel == Green) ? tqGreen(color3) :
-	      (channel == Blue) ? tqBlue(color3) : tqGray(color3);
+          a = (channel == Red) ? qRed(color3) :
+              (channel == Green) ? qGreen(color3) :
+	      (channel == Blue) ? qBlue(color3) : qGray(color3);
 
-	  r = (a*tqRed(data1[ind1]) + (256-a)*tqRed(data2[ind2]))/256;
-	  g = (a*tqGreen(data1[ind1]) + (256-a)*tqGreen(data2[ind2]))/256;
-	  b = (a*tqBlue(data1[ind1]) + (256-a)*tqBlue(data2[ind2]))/256;
+	  r = (a*qRed(data1[ind1]) + (256-a)*qRed(data2[ind2]))/256;
+	  g = (a*qGreen(data1[ind1]) + (256-a)*qGreen(data2[ind2]))/256;
+	  b = (a*qBlue(data1[ind1]) + (256-a)*qBlue(data2[ind2]))/256;
 
-	  a = tqAlpha(data1[ind1]);
-	  data1[ind1] = tqRgba(r, g, b, a);
+	  a = qAlpha(data1[ind1]);
+	  data1[ind1] = qRgba(r, g, b, a);
 
 	  ind1++; ind2++; ind3++; x++;
 	  if ( (x%x2) ==0) ind2 -= x2;
@@ -1837,13 +1837,13 @@ TQImage& KImageEffect::blend(TQImage &image1, TQImage &image2,
 
 unsigned int KImageEffect::lHash(unsigned int c)
 {
-    unsigned char r = tqRed(c), g = tqGreen(c), b = tqBlue(c), a = tqAlpha(c);
+    unsigned char r = qRed(c), g = qGreen(c), b = qBlue(c), a = qAlpha(c);
     unsigned char nr, ng, nb;
     nr =(r >> 1) + (r >> 2); nr = nr > r ? 0 : nr;
     ng =(g >> 1) + (g >> 2); ng = ng > g ? 0 : ng;
     nb =(b >> 1) + (b >> 2); nb = nb > b ? 0 : nb;
 
-    return tqRgba(nr, ng, nb, a);
+    return qRgba(nr, ng, nb, a);
 }
 
 
@@ -1851,13 +1851,13 @@ unsigned int KImageEffect::lHash(unsigned int c)
 
 unsigned int KImageEffect::uHash(unsigned int c)
 {
-    unsigned char r = tqRed(c), g = tqGreen(c), b = tqBlue(c), a = tqAlpha(c);
+    unsigned char r = qRed(c), g = qGreen(c), b = qBlue(c), a = qAlpha(c);
     unsigned char nr, ng, nb;
     nr = r + (r >> 3); nr = nr < r ? ~0 : nr;
     ng = g + (g >> 3); ng = ng < g ? ~0 : ng;
     nb = b + (b >> 3); nb = nb < b ? ~0 : nb;
 
-    return tqRgba(nr, ng, nb, a);
+    return qRgba(nr, ng, nb, a);
 }
 
 
@@ -1969,7 +1969,7 @@ TQImage& KImageEffect::flatten(TQImage &img, const TQColor &ca,
 	// pseudocolor
 	for (int i = 0; i < img.numColors(); i++) {
 	    col = img.color(i);
-	    int mean = (tqRed(col) + tqGreen(col) + tqBlue(col)) / 3;
+	    int mean = (qRed(col) + qGreen(col) + qBlue(col)) / 3;
 	    min = QMIN(min, mean);
 	    max = QMAX(max, mean);
 	}
@@ -1978,7 +1978,7 @@ TQImage& KImageEffect::flatten(TQImage &img, const TQColor &ca,
 	for (int y=0; y < img.height(); y++)
 	    for (int x=0; x < img.width(); x++) {
 		col = img.pixel(x, y);
-		int mean = (tqRed(col) + tqGreen(col) + tqBlue(col)) / 3;
+		int mean = (qRed(col) + qGreen(col) + qBlue(col)) / 3;
 		min = QMIN(min, mean);
 		max = QMAX(max, mean);
 	    }
@@ -1994,21 +1994,21 @@ TQImage& KImageEffect::flatten(TQImage &img, const TQColor &ca,
     if (img.numColors()) {
 	for (int i=0; i < img.numColors(); i++) {
 	    col = img.color(i);
-	    int mean = (tqRed(col) + tqGreen(col) + tqBlue(col)) / 3;
+	    int mean = (qRed(col) + qGreen(col) + qBlue(col)) / 3;
 	    int r = (int) (sr * (mean - min) + r1 + 0.5);
 	    int g = (int) (sg * (mean - min) + g1 + 0.5);
 	    int b = (int) (sb * (mean - min) + b1 + 0.5);
-	    img.setColor(i, tqRgba(r, g, b, tqAlpha(col)));
+	    img.setColor(i, qRgba(r, g, b, qAlpha(col)));
 	}
     } else {
 	for (int y=0; y < img.height(); y++)
 	    for (int x=0; x < img.width(); x++) {
 		col = img.pixel(x, y);
-		int mean = (tqRed(col) + tqGreen(col) + tqBlue(col)) / 3;
+		int mean = (qRed(col) + qGreen(col) + qBlue(col)) / 3;
 		int r = (int) (sr * (mean - min) + r1 + 0.5);
 		int g = (int) (sg * (mean - min) + g1 + 0.5);
 		int b = (int) (sb * (mean - min) + b1 + 0.5);
-		img.setPixel(x, y, tqRgba(r, g, b, tqAlpha(col)));
+		img.setPixel(x, y, qRgba(r, g, b, qAlpha(col)));
 	    }
     }
 
@@ -2065,7 +2065,7 @@ TQImage& KImageEffect::fade(TQImage &img, float val, const TQColor &color)
 	// pseudo color
 	for (int i=0; i<img.numColors(); i++) {
 	    col = img.color(i);
-	    cr = tqRed(col); cg = tqGreen(col); cb = tqBlue(col);
+	    cr = qRed(col); cg = qGreen(col); cb = qBlue(col);
 	    if (cr > red)
 		r = cr - tbl[cr - red];
 	    else
@@ -2078,7 +2078,7 @@ TQImage& KImageEffect::fade(TQImage &img, float val, const TQColor &color)
 		b = cb - tbl[cb - blue];
 	    else
 		b = cb + tbl[blue - cb];
-	    img.setColor(i, tqRgba(r, g, b, tqAlpha(col)));
+	    img.setColor(i, qRgba(r, g, b, qAlpha(col)));
 	}
 
     } else {
@@ -2087,7 +2087,7 @@ TQImage& KImageEffect::fade(TQImage &img, float val, const TQColor &color)
             QRgb *data = (QRgb *) img.scanLine(y);
             for (int x=0; x<img.width(); x++) {
                 col = *data;
-                cr = tqRed(col); cg = tqGreen(col); cb = tqBlue(col);
+                cr = qRed(col); cg = qGreen(col); cb = qBlue(col);
                 if (cr > red)
                     r = cr - tbl[cr - red];
                 else
@@ -2100,7 +2100,7 @@ TQImage& KImageEffect::fade(TQImage &img, float val, const TQColor &color)
                     b = cb - tbl[cb - blue];
                 else
                     b = cb + tbl[blue - cb];
-                *data++ = tqRgba(r, g, b, tqAlpha(col));
+                *data++ = qRgba(r, g, b, qAlpha(col));
             }
         }
     }
@@ -2116,7 +2116,7 @@ TQImage& KImageEffect::fade(TQImage &img, float val, const TQColor &color)
 
 // This code is adapted from code (C) Rik Hemsley <rik@kde.org>
 //
-// The formula used (r + b + g) /3 is different from the tqGray formula
+// The formula used (r + b + g) /3 is different from the qGray formula
 // used by Qt.  This is because our formula is much much faster.  If,
 // however, it turns out that this is producing sub-optimal images,
 // then it will have to change (kurt)
@@ -2149,12 +2149,12 @@ TQImage& KImageEffect::toGray(TQImage &img, bool fast)
         {
             for (int i = 0; i < img.numColors(); i++)
             {
-                register uint r = tqRed(img.color(i));
-                register uint g = tqGreen(img.color(i));
-                register uint b = tqBlue(img.color(i));
+                register uint r = qRed(img.color(i));
+                register uint g = qGreen(img.color(i));
+                register uint b = qBlue(img.color(i));
 
                 register uint gray = (((r + g) >> 1) + b) >> 1;
-                img.setColor(i, tqRgba(gray, gray, gray, tqAlpha(img.color(i))));
+                img.setColor(i, qRgba(gray, gray, gray, qAlpha(img.color(i))));
             }
         }
     }
@@ -2165,8 +2165,8 @@ TQImage& KImageEffect::toGray(TQImage &img, bool fast)
             (unsigned int *)img.tqcolorTable();
         int val, i;
         for(i=0; i < pixels; ++i){
-            val = tqGray(data[i]);
-            data[i] = tqRgba(val, val, val, tqAlpha(data[i]));
+            val = qGray(data[i]);
+            data[i] = qRgba(val, val, val, qAlpha(data[i]));
         }
     }
     return img;
@@ -2211,10 +2211,10 @@ TQImage& KImageEffect::contrast(TQImage &img, int c)
         (unsigned int *)img.tqcolorTable();
     int i, r, g, b;
     for(i=0; i < pixels; ++i){
-        r = tqRed(data[i]);
-        g = tqGreen(data[i]);
-        b = tqBlue(data[i]);
-        if(tqGray(data[i]) <= 127){
+        r = qRed(data[i]);
+        g = qGreen(data[i]);
+        b = qBlue(data[i]);
+        if(qGray(data[i]) <= 127){
             if(r - c > 0)
                 r -= c;
             else
@@ -2242,7 +2242,7 @@ TQImage& KImageEffect::contrast(TQImage &img, int c)
             else
                 b = 255;
         }
-        data[i] = tqRgba(r, g, b, tqAlpha(data[i]));
+        data[i] = qRgba(r, g, b, qAlpha(data[i]));
     }
     return(img);
 }
@@ -2290,11 +2290,11 @@ TQImage& KImageEffect::dither(TQImage &img, const TQColor *palette, int size)
 
         for ( i = 0; i < img.width(); i++ )
         {
-            rerr1[i] = rerr2[i] + tqRed( *ip );
+            rerr1[i] = rerr2[i] + qRed( *ip );
             rerr2[i] = 0;
-            gerr1[i] = gerr2[i] + tqGreen( *ip );
+            gerr1[i] = gerr2[i] + qGreen( *ip );
             gerr2[i] = 0;
-            berr1[i] = berr2[i] + tqBlue( *ip );
+            berr1[i] = berr2[i] + qBlue( *ip );
             berr2[i] = 0;
             ip++;
         }
@@ -2492,7 +2492,7 @@ bool KImageEffect::blend(
     --b; --i; --o;
     do
     {
-      while ( !(a=tqAlpha(*i)) && k>0 )
+      while ( !(a=qAlpha(*i)) && k>0 )
       {
         i--;
 //	*o=0;
@@ -2501,9 +2501,9 @@ bool KImageEffect::blend(
 	k--;
       };
 //      *o=0xFF;
-      *o = tqRgb(tqRed(*b) + (((tqRed(*i) - tqRed(*b)) * a) >> 8),
-                tqGreen(*b) + (((tqGreen(*i) - tqGreen(*b)) * a) >> 8),
-                tqBlue(*b) + (((tqBlue(*i) - tqBlue(*b)) * a) >> 8));
+      *o = qRgb(qRed(*b) + (((qRed(*i) - qRed(*b)) * a) >> 8),
+                qGreen(*b) + (((qGreen(*i) - qGreen(*b)) * a) >> 8),
+                qBlue(*b) + (((qBlue(*i) - qBlue(*b)) * a) >> 8));
       --i; --o; --b;
     } while (k--);
   }
@@ -2595,10 +2595,10 @@ void KImageEffect::blendOnLower(const TQImage &upper, const TQPoint &upperOffset
         for (int x = 0; x < lr.width(); x++) {
             QRgb *b = reinterpret_cast<QRgb*>(lower.scanLine(lr.y() + y)+ (lr.x() + x) * sizeof(QRgb));
             QRgb *d = reinterpret_cast<QRgb*>(upper.scanLine(upperOffset.y() + y) + (upperOffset.x() + x) * sizeof(QRgb));
-            int a = tqAlpha(*d);
-            *b = tqRgb(tqRed(*b) - (((tqRed(*b) - tqRed(*d)) * a) >> 8),
-                      tqGreen(*b) - (((tqGreen(*b) - tqGreen(*d)) * a) >> 8),
-                      tqBlue(*b) - (((tqBlue(*b) - tqBlue(*d)) * a) >> 8));
+            int a = qAlpha(*d);
+            *b = qRgb(qRed(*b) - (((qRed(*b) - qRed(*d)) * a) >> 8),
+                      qGreen(*b) - (((qGreen(*b) - qGreen(*d)) * a) >> 8),
+                      qBlue(*b) - (((qBlue(*b) - qBlue(*d)) * a) >> 8));
         }
     }
 }
@@ -2617,10 +2617,10 @@ void KImageEffect::blendOnLower(const TQImage &upper, const TQPoint &upperOffset
         for (int x = 0; x < lr.width(); x++) {
             QRgb *b = reinterpret_cast<QRgb*>(lower.scanLine(lr.y() + y)+ (lr.x() + x) * sizeof(QRgb));
             QRgb *d = reinterpret_cast<QRgb*>(upper.scanLine(upperOffset.y() + y) + (upperOffset.x() + x) * sizeof(QRgb));
-            int a = tqRound(opacity * tqAlpha(*d));
-            *b = tqRgb(tqRed(*b) - (((tqRed(*b) - tqRed(*d)) * a) >> 8),
-                      tqGreen(*b) - (((tqGreen(*b) - tqGreen(*d)) * a) >> 8),
-                      tqBlue(*b) - (((tqBlue(*b) - tqBlue(*d)) * a) >> 8));
+            int a = qRound(opacity * qAlpha(*d));
+            *b = qRgb(qRed(*b) - (((qRed(*b) - qRed(*d)) * a) >> 8),
+                      qGreen(*b) - (((qGreen(*b) - qGreen(*d)) * a) >> 8),
+                      qBlue(*b) - (((qBlue(*b) - qBlue(*d)) * a) >> 8));
         }
     }
 }
@@ -2940,10 +2940,10 @@ TQImage KImageEffect::despeckle(TQImage &src)
             srcData = (unsigned int *)src.scanLine(y);
             ++j;
             for(x=0; x < src.width(); ++x){
-                red_channel[j] = tqRed(srcData[x]);
-                green_channel[j] = tqGreen(srcData[x]);
-                blue_channel[j] = tqBlue(srcData[x]);
-                alpha_channel[j] = tqAlpha(srcData[x]);
+                red_channel[j] = qRed(srcData[x]);
+                green_channel[j] = qGreen(srcData[x]);
+                blue_channel[j] = qBlue(srcData[x]);
+                alpha_channel[j] = qAlpha(srcData[x]);
                 ++j;
             }
             ++j;
@@ -2958,10 +2958,10 @@ TQImage KImageEffect::despeckle(TQImage &src)
             ++j;
             for(x=0; x < src.width(); ++x){
                 pixel = *(cTable+srcData[x]);
-                red_channel[j] = tqRed(pixel);
-                green_channel[j] = tqGreen(pixel);
-                blue_channel[j] = tqBlue(pixel);
-                alpha_channel[j] = tqAlpha(pixel);
+                red_channel[j] = qRed(pixel);
+                green_channel[j] = qGreen(pixel);
+                blue_channel[j] = qBlue(pixel);
+                alpha_channel[j] = qAlpha(pixel);
                 ++j;
             }
             ++j;
@@ -3000,7 +3000,7 @@ TQImage KImageEffect::despeckle(TQImage &src)
         ++j;
         for (x=0; x < dest.width(); ++x)
         {
-            destData[x] = tqRgba(red_channel[j], green_channel[j],
+            destData[x] = qRgba(red_channel[j], green_channel[j],
                                 blue_channel[j], alpha_channel[j]);
             ++j;
         }
@@ -3121,10 +3121,10 @@ TQImage KImageEffect::addNoise(TQImage &src, NoiseType noise_type)
             srcData = (unsigned int *)src.scanLine(y);
             destData = (unsigned int *)dest.scanLine(y);
             for(x=0; x < src.width(); ++x){
-                destData[x] = tqRgba(generateNoise(tqRed(srcData[x]), noise_type),
-                                    generateNoise(tqGreen(srcData[x]), noise_type),
-                                    generateNoise(tqBlue(srcData[x]), noise_type),
-                                    tqAlpha(srcData[x]));
+                destData[x] = qRgba(generateNoise(qRed(srcData[x]), noise_type),
+                                    generateNoise(qGreen(srcData[x]), noise_type),
+                                    generateNoise(qBlue(srcData[x]), noise_type),
+                                    qAlpha(srcData[x]));
             }
         }
     }
@@ -3137,10 +3137,10 @@ TQImage KImageEffect::addNoise(TQImage &src, NoiseType noise_type)
             destData = (unsigned int *)dest.scanLine(y);
             for(x=0; x < src.width(); ++x){
                 pixel = *(cTable+srcData[x]);
-                destData[x] = tqRgba(generateNoise(tqRed(pixel), noise_type),
-                                    generateNoise(tqGreen(pixel), noise_type),
-                                    generateNoise(tqBlue(pixel), noise_type),
-                                    tqAlpha(pixel));
+                destData[x] = qRgba(generateNoise(qRed(pixel), noise_type),
+                                    generateNoise(qGreen(pixel), noise_type),
+                                    generateNoise(qBlue(pixel), noise_type),
+                                    qAlpha(pixel));
             }
         }
 
@@ -3233,10 +3233,10 @@ unsigned int KImageEffect::interpolateColor(TQImage *image, double x_offset,
     alpha = 1.0-x_offset;
     beta = 1.0-y_offset;
 
-    return(tqRgba((unsigned char)(beta*(alpha*tqRed(p)+x_offset*tqRed(q))+y_offset*(alpha*tqRed(r)+x_offset*tqRed(s))),
-                 (unsigned char)(beta*(alpha*tqGreen(p)+x_offset*tqGreen(q))+y_offset*(alpha*tqGreen(r)+x_offset*tqGreen(s))),
-                 (unsigned char)(beta*(alpha*tqBlue(p)+x_offset*tqBlue(q))+y_offset*(alpha*tqBlue(r)+x_offset*tqBlue(s))),
-                 (unsigned char)(beta*(alpha*tqAlpha(p)+x_offset*tqAlpha(q))+y_offset*(alpha*tqAlpha(r)+x_offset*tqAlpha(s)))));
+    return(qRgba((unsigned char)(beta*(alpha*qRed(p)+x_offset*qRed(q))+y_offset*(alpha*qRed(r)+x_offset*qRed(s))),
+                 (unsigned char)(beta*(alpha*qGreen(p)+x_offset*qGreen(q))+y_offset*(alpha*qGreen(r)+x_offset*qGreen(s))),
+                 (unsigned char)(beta*(alpha*qBlue(p)+x_offset*qBlue(q))+y_offset*(alpha*qBlue(r)+x_offset*qBlue(s))),
+                 (unsigned char)(beta*(alpha*qAlpha(p)+x_offset*qAlpha(q))+y_offset*(alpha*qAlpha(r)+x_offset*qAlpha(s)))));
 }
 
 TQImage KImageEffect::implode(TQImage &src, double factor,
@@ -3434,10 +3434,10 @@ void KImageEffect::solarize(TQImage &img, double factor)
         count = img.width()*img.height();
     }
     for(i=0; i < count; ++i){
-        data[i] = tqRgba(tqRed(data[i]) > threshold ? MaxRGB-tqRed(data[i]) : tqRed(data[i]),
-                        tqGreen(data[i]) > threshold ? MaxRGB-tqGreen(data[i]) : tqGreen(data[i]),
-                        tqBlue(data[i]) > threshold ? MaxRGB-tqBlue(data[i]) : tqBlue(data[i]),
-                        tqAlpha(data[i]));
+        data[i] = qRgba(qRed(data[i]) > threshold ? MaxRGB-qRed(data[i]) : qRed(data[i]),
+                        qGreen(data[i]) > threshold ? MaxRGB-qGreen(data[i]) : qGreen(data[i]),
+                        qBlue(data[i]) > threshold ? MaxRGB-qBlue(data[i]) : qBlue(data[i]),
+                        qAlpha(data[i]));
     }
 }
 
@@ -3694,7 +3694,7 @@ void KImageEffect::normalize(TQImage &image)
 {
     struct double_packet high, low, intensity, *histogram;
     struct short_packet *normalize_map;
-    TQ_INT64 number_pixels;
+    Q_INT64 number_pixels;
     int x, y;
     unsigned int *p, *q;
     register long i;
@@ -3725,10 +3725,10 @@ void KImageEffect::normalize(TQImage &image)
     for(y=0; y < image.height(); ++y){
         p = (unsigned int *)image.scanLine(y);
         for(x=0; x < image.width(); ++x){
-            histogram[(unsigned char)(tqRed(*p))].red++;
-            histogram[(unsigned char)(tqGreen(*p))].green++;
-            histogram[(unsigned char)(tqBlue(*p))].blue++;
-            histogram[(unsigned char)(tqAlpha(*p))].alpha++;
+            histogram[(unsigned char)(qRed(*p))].red++;
+            histogram[(unsigned char)(qGreen(*p))].green++;
+            histogram[(unsigned char)(qBlue(*p))].blue++;
+            histogram[(unsigned char)(qAlpha(*p))].alpha++;
             p++;
         }
     }
@@ -3736,7 +3736,7 @@ void KImageEffect::normalize(TQImage &image)
     /*
     Find the histogram boundaries by locating the 0.1 percent levels.
     */
-    number_pixels = (TQ_INT64)image.width()*image.height();
+    number_pixels = (Q_INT64)image.width()*image.height();
     threshold_intensity = number_pixels/1000;
 
     /* red */
@@ -3879,22 +3879,22 @@ void KImageEffect::normalize(TQImage &image)
         q = (unsigned int *)image.scanLine(y);
         for(x=0; x < image.width(); ++x){
             if(low.red != high.red)
-                r = (normalize_map[(unsigned short)(tqRed(q[x]))].red)/257;
+                r = (normalize_map[(unsigned short)(qRed(q[x]))].red)/257;
             else
-                r = tqRed(q[x]);
+                r = qRed(q[x]);
             if(low.green != high.green)
-                g = (normalize_map[(unsigned short)(tqGreen(q[x]))].green)/257;
+                g = (normalize_map[(unsigned short)(qGreen(q[x]))].green)/257;
             else
-                g = tqGreen(q[x]);
+                g = qGreen(q[x]);
             if(low.blue != high.blue)
-                b = (normalize_map[(unsigned short)(tqBlue(q[x]))].blue)/257;
+                b = (normalize_map[(unsigned short)(qBlue(q[x]))].blue)/257;
             else
-                b = tqBlue(q[x]);
+                b = qBlue(q[x]);
             if(low.alpha != high.alpha)
-                a = (normalize_map[(unsigned short)(tqAlpha(q[x]))].alpha)/257;
+                a = (normalize_map[(unsigned short)(qAlpha(q[x]))].alpha)/257;
             else
-                a = tqAlpha(q[x]);
-            q[x] = tqRgba(r, g, b, a);
+                a = qAlpha(q[x]);
+            q[x] = qRgba(r, g, b, a);
         }
     }
     liberateMemory(&normalize_map);
@@ -3933,10 +3933,10 @@ void KImageEffect::equalize(TQImage &image)
     for(y=0; y < image.height(); ++y){
         p = (unsigned int *)image.scanLine(y);
         for(x=0; x < image.width(); ++x){
-            histogram[(unsigned char)(tqRed(*p))].red++;
-            histogram[(unsigned char)(tqGreen(*p))].green++;
-            histogram[(unsigned char)(tqBlue(*p))].blue++;
-            histogram[(unsigned char)(tqAlpha(*p))].alpha++;
+            histogram[(unsigned char)(qRed(*p))].red++;
+            histogram[(unsigned char)(qGreen(*p))].green++;
+            histogram[(unsigned char)(qBlue(*p))].blue++;
+            histogram[(unsigned char)(qAlpha(*p))].alpha++;
             p++;
         }
     }
@@ -3978,22 +3978,22 @@ void KImageEffect::equalize(TQImage &image)
         q = (unsigned int *)image.scanLine(y);
         for(x=0; x < image.width(); ++x){
             if(low.red != high.red)
-                r = (equalize_map[(unsigned short)(tqRed(q[x]))].red/257);
+                r = (equalize_map[(unsigned short)(qRed(q[x]))].red/257);
             else
-                r = tqRed(q[x]);
+                r = qRed(q[x]);
             if(low.green != high.green)
-                g = (equalize_map[(unsigned short)(tqGreen(q[x]))].green/257);
+                g = (equalize_map[(unsigned short)(qGreen(q[x]))].green/257);
             else
-                g = tqGreen(q[x]);
+                g = qGreen(q[x]);
             if(low.blue != high.blue)
-                b = (equalize_map[(unsigned short)(tqBlue(q[x]))].blue/257);
+                b = (equalize_map[(unsigned short)(qBlue(q[x]))].blue/257);
             else
-                b = tqBlue(q[x]);
+                b = qBlue(q[x]);
             if(low.alpha != high.alpha)
-                a = (equalize_map[(unsigned short)(tqAlpha(q[x]))].alpha/257);
+                a = (equalize_map[(unsigned short)(qAlpha(q[x]))].alpha/257);
             else
-                a = tqAlpha(q[x]);
-            q[x] = tqRgba(r, g, b, a);
+                a = qAlpha(q[x]);
+            q[x] = qRgba(r, g, b, a);
         }
     }
     liberateMemory(&equalize_map);
@@ -4102,10 +4102,10 @@ void KImageEffect::blurScanLine(double *kernel, int width,
             q = src;
             for(i=0; i < columns; ++i){
                 if((i >= (x-width/2)) && (i <= (x+width/2))){
-                    red += (*p)*(tqRed(*q)*257);
-                    green += (*p)*(tqGreen(*q)*257);
-                    blue += (*p)*(tqBlue(*q)*257);
-                    alpha += (*p)*(tqAlpha(*q)*257);
+                    red += (*p)*(qRed(*q)*257);
+                    green += (*p)*(qGreen(*q)*257);
+                    blue += (*p)*(qBlue(*q)*257);
+                    alpha += (*p)*(qAlpha(*q)*257);
                 }
                 if(((i+width/2-x) >= 0) && ((i+width/2-x) < width))
                     scale+=kernel[i+width/2-x];
@@ -4123,7 +4123,7 @@ void KImageEffect::blurScanLine(double *kernel, int width,
             blue = blue < 0 ? 0 : blue > 65535 ? 65535 : blue;
             alpha = alpha < 0 ? 0 : alpha > 65535 ? 65535 : alpha;
 
-            dest[x] = tqRgba((unsigned char)(red/257UL),
+            dest[x] = qRgba((unsigned char)(red/257UL),
                             (unsigned char)(green/257UL),
                             (unsigned char)(blue/257UL),
                             (unsigned char)(alpha/257UL));
@@ -4137,10 +4137,10 @@ void KImageEffect::blurScanLine(double *kernel, int width,
         p = kernel+width/2-x;
         q = src;
         for(i=width/2-x; i < width; ++i){
-            red += (*p)*(tqRed(*q)*257);
-            green += (*p)*(tqGreen(*q)*257);
-            blue += (*p)*(tqBlue(*q)*257);
-            alpha += (*p)*(tqAlpha(*q)*257);
+            red += (*p)*(qRed(*q)*257);
+            green += (*p)*(qGreen(*q)*257);
+            blue += (*p)*(qBlue(*q)*257);
+            alpha += (*p)*(qAlpha(*q)*257);
             scale += (*p);
             p++;
             q++;
@@ -4157,7 +4157,7 @@ void KImageEffect::blurScanLine(double *kernel, int width,
         blue = blue < 0 ? 0 : blue > 65535 ? 65535 : blue;
         alpha = alpha < 0 ? 0 : alpha > 65535 ? 65535 : alpha;
 
-        dest[x] = tqRgba((unsigned char)(red/257UL),
+        dest[x] = qRgba((unsigned char)(red/257UL),
                         (unsigned char)(green/257UL),
                         (unsigned char)(blue/257UL),
                         (unsigned char)(alpha/257UL));
@@ -4168,10 +4168,10 @@ void KImageEffect::blurScanLine(double *kernel, int width,
         p = kernel;
         q = src+(x-width/2);
         for (i=0; i < (long) width; ++i){
-            red += (*p)*(tqRed(*q)*257);
-            green += (*p)*(tqGreen(*q)*257);
-            blue += (*p)*(tqBlue(*q)*257);
-            alpha += (*p)*(tqAlpha(*q)*257);
+            red += (*p)*(qRed(*q)*257);
+            green += (*p)*(qGreen(*q)*257);
+            blue += (*p)*(qBlue(*q)*257);
+            alpha += (*p)*(qAlpha(*q)*257);
             p++;
             q++;
         }
@@ -4185,7 +4185,7 @@ void KImageEffect::blurScanLine(double *kernel, int width,
         blue = blue < 0 ? 0 : blue > 65535 ? 65535 : blue;
         alpha = alpha < 0 ? 0 : alpha > 65535 ? 65535 : alpha;
 
-        dest[x] = tqRgba((unsigned char)(red/257UL),
+        dest[x] = qRgba((unsigned char)(red/257UL),
                         (unsigned char)(green/257UL),
                         (unsigned char)(blue/257UL),
                         (unsigned char)(alpha/257UL));
@@ -4197,10 +4197,10 @@ void KImageEffect::blurScanLine(double *kernel, int width,
         p = kernel;
         q = src+(x-width/2);
         for(i=0; i < columns-x+width/2; ++i){
-            red += (*p)*(tqRed(*q)*257);
-            green += (*p)*(tqGreen(*q)*257);
-            blue += (*p)*(tqBlue(*q)*257);
-            alpha += (*p)*(tqAlpha(*q)*257);
+            red += (*p)*(qRed(*q)*257);
+            green += (*p)*(qGreen(*q)*257);
+            blue += (*p)*(qBlue(*q)*257);
+            alpha += (*p)*(qAlpha(*q)*257);
             scale += (*p);
             p++;
             q++;
@@ -4216,7 +4216,7 @@ void KImageEffect::blurScanLine(double *kernel, int width,
         blue = blue < 0 ? 0 : blue > 65535 ? 65535 : blue;
         alpha = alpha < 0 ? 0 : alpha > 65535 ? 65535 : alpha;
 
-        dest[x] = tqRgba((unsigned char)(red/257UL),
+        dest[x] = qRgba((unsigned char)(red/257UL),
                         (unsigned char)(green/257UL),
                         (unsigned char)(blue/257UL),
                         (unsigned char)(alpha/257UL));
@@ -4381,10 +4381,10 @@ bool KImageEffect::convolveImage(TQImage *image, TQImage *dest,
                 for(mcx=0; mcx < width; ++mcx, ++sx){
                     mx = sx < 0 ? 0 : sx > image->width()-1 ?
                         image->width()-1 : sx;
-                    red += (*k)*(tqRed(jumpTable[my][mx])*257);
-                    green += (*k)*(tqGreen(jumpTable[my][mx])*257);
-                    blue += (*k)*(tqBlue(jumpTable[my][mx])*257);
-                    alpha += (*k)*(tqAlpha(jumpTable[my][mx])*257);
+                    red += (*k)*(qRed(jumpTable[my][mx])*257);
+                    green += (*k)*(qGreen(jumpTable[my][mx])*257);
+                    blue += (*k)*(qBlue(jumpTable[my][mx])*257);
+                    alpha += (*k)*(qAlpha(jumpTable[my][mx])*257);
                     ++k;
                 }
             }
@@ -4394,7 +4394,7 @@ bool KImageEffect::convolveImage(TQImage *image, TQImage *dest,
             blue = blue < 0 ? 0 : blue > 65535 ? 65535 : blue+0.5;
             alpha = alpha < 0 ? 0 : alpha > 65535 ? 65535 : alpha+0.5;
 
-            *q++ = tqRgba((unsigned char)(red/257UL),
+            *q++ = qRgba((unsigned char)(red/257UL),
                          (unsigned char)(green/257UL),
                          (unsigned char)(blue/257UL),
                          (unsigned char)(alpha/257UL));
@@ -4528,16 +4528,16 @@ TQImage KImageEffect::shade(TQImage &src, bool color_shading, double azimuth,
                     }
                 }
                 if(!color_shading){
-                    *q = tqRgba((unsigned char)(shade),
+                    *q = qRgba((unsigned char)(shade),
                                (unsigned char)(shade),
                                (unsigned char)(shade),
-                               tqAlpha(*s1));
+                               qAlpha(*s1));
                 }
                 else{
-                    *q = tqRgba((unsigned char)((shade*tqRed(*s1))/(MaxRGB+1)),
-                               (unsigned char)((shade*tqGreen(*s1))/(MaxRGB+1)),
-                               (unsigned char)((shade*tqBlue(*s1))/(MaxRGB+1)),
-                               tqAlpha(*s1));
+                    *q = qRgba((unsigned char)((shade*qRed(*s1))/(MaxRGB+1)),
+                               (unsigned char)((shade*qGreen(*s1))/(MaxRGB+1)),
+                               (unsigned char)((shade*qBlue(*s1))/(MaxRGB+1)),
+                               qAlpha(*s1));
                 }
                 ++s0;
                 ++s1;
@@ -4585,16 +4585,16 @@ TQImage KImageEffect::shade(TQImage &src, bool color_shading, double azimuth,
                     }
                 }
                 if(!color_shading){
-                    *q = tqRgba((unsigned char)(shade),
+                    *q = qRgba((unsigned char)(shade),
                                (unsigned char)(shade),
                                (unsigned char)(shade),
-                               tqAlpha(*(cTable+(*s1))));
+                               qAlpha(*(cTable+(*s1))));
                 }
                 else{
-                    *q = tqRgba((unsigned char)((shade*tqRed(*(cTable+(*s1))))/(MaxRGB+1)),
-                               (unsigned char)((shade*tqGreen(*(cTable+(*s1))))/(MaxRGB+1)),
-                               (unsigned char)((shade*tqBlue(*(cTable+(*s1))))/(MaxRGB+1)),
-                               tqAlpha(*s1));
+                    *q = qRgba((unsigned char)((shade*qRed(*(cTable+(*s1))))/(MaxRGB+1)),
+                               (unsigned char)((shade*qGreen(*(cTable+(*s1))))/(MaxRGB+1)),
+                               (unsigned char)((shade*qBlue(*(cTable+(*s1))))/(MaxRGB+1)),
+                               qAlpha(*s1));
                 }
                 ++s0;
                 ++s1;
@@ -4643,7 +4643,7 @@ void KImageEffect::contrastHSV(TQImage &img, bool sharpen)
                 brightness=0.0;
         v = (int)(brightness*255);
         c.setHsv(h, s, v);
-        data[i] = tqRgba(c.red(), c.green(), c.blue(), tqAlpha(data[i]));
+        data[i] = qRgba(c.red(), c.green(), c.blue(), qAlpha(data[i]));
     }
 }
 
@@ -4726,7 +4726,7 @@ static void bumpmap_convert_row( uint *row,
               unsigned int idx = (unsigned int)(intensityValue( *row ) + 0.5);
               *p++ = lut[(unsigned int) ( waterlevel +
                                           ( ( idx -
-                                              waterlevel) * tqBlue( *row )) / 255.0 )];
+                                              waterlevel) * qBlue( *row )) / 255.0 )];
           } else {
               unsigned int idx = (unsigned int)(intensityValue( *row ) + 0.5);
               *p++ = lut[idx];
@@ -4807,19 +4807,19 @@ static void bumpmap_row( uint           *src,
          * also change
          */
         if (compensate) {
-            int red = (int)((tqRed( *src ) * shade) / (params->compensation * 255));
-            int green = (int)((tqGreen( *src ) * shade) / (params->compensation * 255));
-            int blue = (int)((tqBlue( *src ) * shade) / (params->compensation * 255));
-            int alpha = (int)((tqAlpha( *src ) * shade) / (params->compensation * 255));
+            int red = (int)((qRed( *src ) * shade) / (params->compensation * 255));
+            int green = (int)((qGreen( *src ) * shade) / (params->compensation * 255));
+            int blue = (int)((qBlue( *src ) * shade) / (params->compensation * 255));
+            int alpha = (int)((qAlpha( *src ) * shade) / (params->compensation * 255));
             ++src;
-            *dest++ = tqRgba( red, green, blue, alpha );
+            *dest++ = qRgba( red, green, blue, alpha );
         } else {
-            int red = tqRed( *src ) * shade / 255;
-            int green = tqGreen( *src ) * shade / 255;
-            int blue = tqBlue( *src ) * shade / 255;
-            int alpha = tqAlpha( *src ) * shade / 255;
+            int red = qRed( *src ) * shade / 255;
+            int green = qGreen( *src ) * shade / 255;
+            int blue = qBlue( *src ) * shade / 255;
+            int alpha = qAlpha( *src ) * shade / 255;
             ++src;
-            *dest++ = tqRgba( red, green, blue, alpha );
+            *dest++ = qRgba( red, green, blue, alpha );
         }
 
         /* Next pixel */
diff --git a/kdefx/kimageeffect.h b/kdefx/kimageeffect.h
index b6b8d4f83..155df71b1 100644
--- a/kdefx/kimageeffect.h
+++ b/kdefx/kimageeffect.h
@@ -640,7 +640,7 @@ public:
 
     /**
      * Detects edges in an image using pixel neighborhoods and an edge
-     * detection tqmask.
+     * detection mask.
      *
      * @param src The TQImage to process.
      * @param radius The radius of the gaussian not counting the
@@ -783,7 +783,7 @@ private:
     static unsigned int uHash(unsigned int c);
 
     /**
-     * Helper function to tqfind the nearest color to the RBG triplet
+     * Helper function to find the nearest color to the RBG triplet
      */
     static int nearestColor( int r, int g, int b, const TQColor *pal, int size );
 
diff --git a/kdefx/kpixmap.cpp b/kdefx/kpixmap.cpp
index 698f986af..eeccb6213 100644
--- a/kdefx/kpixmap.cpp
+++ b/kdefx/kpixmap.cpp
@@ -56,7 +56,7 @@ static bool kdither_32_to_8( const TQImage *src, TQImage *dst )
         for ( gc=0; gc<=MAX_G; gc++ )
 	    for ( bc=0; bc<=MAX_B; bc++ ) {
 		dst->setColor( INDEXOF(rc,gc,bc),
-		tqRgb( rc*255/MAX_R, gc*255/MAX_G, bc*255/MAX_B ) );
+		qRgb( rc*255/MAX_R, gc*255/MAX_G, bc*255/MAX_B ) );
 	    }	
 
     int sw = src->width();
@@ -259,7 +259,7 @@ bool KPixmap::convertFromImage( const TQImage &img, int conversion_flags  )
 		return TQPixmap::convertFromImage( img, TQPixmap::Auto );
 	}
 	
-	TQBitmap tqmask;
+	TQBitmap mask;
 	bool isMask = false;
 
 	TQImage  image = img.convertDepth(32);
@@ -268,13 +268,13 @@ bool KPixmap::convertFromImage( const TQImage &img, int conversion_flags  )
 	if( img.hasAlphaBuffer() ) {
 	    image.setAlphaBuffer( true );
 	    tImage.setAlphaBuffer( true );
-	    isMask = tqmask.convertFromImage( img.createAlphaMask() );
+	    isMask = mask.convertFromImage( img.createAlphaMask() );
 	}
 	
 	kdither_32_to_8( &image, &tImage );
 		
 	if( TQPixmap::convertFromImage( tImage ) ) {
-	    if ( isMask ) TQPixmap::setMask( tqmask );
+	    if ( isMask ) TQPixmap::setMask( mask );
 		return true;
 	} else
 	    return false;
@@ -367,9 +367,9 @@ bool KPixmap::checkColorTable( const TQImage &image )
 
     for ( i=0; i<ncols; i++ ) {
 	for ( j=0; j<40; j++ ) {
-	    if ( kpixmap_iconPalette[j].red() == tqRed( ctable[i] ) &&
-		 kpixmap_iconPalette[j].green() == tqGreen( ctable[i] ) &&
-		 kpixmap_iconPalette[j].blue() == tqBlue( ctable[i] ) ) {
+	    if ( kpixmap_iconPalette[j].red() == qRed( ctable[i] ) &&
+		 kpixmap_iconPalette[j].green() == qGreen( ctable[i] ) &&
+		 kpixmap_iconPalette[j].blue() == qBlue( ctable[i] ) ) {
 		break;
 	    }
 	}
diff --git a/kdefx/kpixmap.h b/kdefx/kpixmap.h
index cf7022571..8b76e87af 100644
--- a/kdefx/kpixmap.h
+++ b/kdefx/kpixmap.h
@@ -102,16 +102,16 @@ public:
 	 *
 	 * Color/Mono preference
 	 *
-	 * @li WebColor -  If the image has depth 1 and tqcontains
+	 * @li WebColor -  If the image has depth 1 and contains
 	 * only black and white pixels then the pixmap becomes monochrome. If
 	 * the pixmap has a depth of 8 bits per pixel then the Netscape
 	 * palette is used for the pixmap color table.
-	 * @li LowColor - If the image has depth 1 and tqcontains only black and
+	 * @li LowColor - If the image has depth 1 and contains only black and
 	 * white pixels then the pixmap becomes monochrome. If the pixmap has a
 	 * depth of 8 bits per pixel and the image does not posess a color table
 	 * that matches the Icon palette a 3x3x3 color cube is used for the
 	 * pixmap color table.
-	 * @li AutoColor (default) - If the image has depth 1 and tqcontains
+	 * @li AutoColor (default) - If the image has depth 1 and contains
 	 * only black and white pixels, then the pixmap becomes
 	 * monochrome.
 	 * @li ColorOnly - The pixmap is dithered/converted to the native
@@ -145,7 +145,7 @@ public:
 	 * options.
 	 *
 	 * @param img the image to convert
-	 * @param conversion_flags bittqmask, described above
+	 * @param conversion_flags bitmask, described above
 	 * @return @p true if successful.
 	 **/
 	bool convertFromImage( const TQImage &img, int conversion_flags );
@@ -173,7 +173,7 @@ public:
 	 *
 	 * @param fileName the name of the file to load the image from
 	 * @param format the format for the image
-	 * @param conversion_flags a bittqmask, as described in 
+	 * @param conversion_flags a bitmask, as described in 
 	 *        convertFromImage()
 	 * @return @p true if successful, or false if the pixmap
 	 *         could not be loaded.
diff --git a/kdefx/kstyle.cpp b/kdefx/kstyle.cpp
index fbff928a8..6ebabf681 100644
--- a/kdefx/kstyle.cpp
+++ b/kdefx/kstyle.cpp
@@ -117,14 +117,14 @@ namespace
 
 	static bool useDropShadow(TQWidget* w)
 	{
-		return w && w->tqmetaObject() && 
-			w->tqmetaObject()->tqfindProperty("KStyleMenuDropShadow") != -1;
+		return w && w->metaObject() && 
+			w->metaObject()->findProperty("KStyleMenuDropShadow") != -1;
 	}
 }
 
 namespace
 {
-class TransparencyHandler : public TQObject
+class TransparencyHandler : public QObject
 {
 	public:
 		TransparencyHandler(KStyle* style, TransparencyEngine tEngine,
@@ -257,8 +257,8 @@ void KStyle::polish( TQWidget* widget )
 	if ( d->useFilledFrameWorkaround )
 	{
 		if ( TQFrame *frame = tqqt_cast< TQFrame* >( widget ) ) {
-			TQFrame::Shape tqshape = frame->frameShape();
-			if (tqshape == TQFrame::ToolBarPanel || tqshape == TQFrame::MenuBarPanel)
+			TQFrame::Shape shape = frame->frameShape();
+			if (shape == TQFrame::ToolBarPanel || shape == TQFrame::MenuBarPanel)
 				widget->installEventFilter(this);
 		} 
 	}
@@ -278,8 +278,8 @@ void KStyle::unPolish( TQWidget* widget )
 	if ( d->useFilledFrameWorkaround )
 	{
 		if ( TQFrame *frame = tqqt_cast< TQFrame* >( widget ) ) {
-			TQFrame::Shape tqshape = frame->frameShape();
-			if (tqshape == TQFrame::ToolBarPanel || tqshape == TQFrame::MenuBarPanel)
+			TQFrame::Shape shape = frame->frameShape();
+			if (shape == TQFrame::ToolBarPanel || shape == TQFrame::MenuBarPanel)
 				widget->removeEventFilter(this);
 		}
 	}
@@ -365,7 +365,7 @@ void KStyle::drawKStylePrimitive( KStylePrimitive kpe,
 			else
 				pix.resize( w-2, h-2 );
 
-			TQString title = wid->tqparentWidget()->caption();
+			TQString title = wid->parentWidget()->caption();
 			TQPainter p2;
 			p2.begin(&pix);
 			p2.fillRect(pix.rect(), cg.brush(TQColorGroup::Highlight));
@@ -547,7 +547,7 @@ void KStyle::drawPrimitive( ControlElement pe,
 	// What should "widget" be in actuality?  How should I get it?  From where?
 	// Almost certainly it should not be null!
 	TQWidget *widget = 0;
-	tqdrawControl(pe, p, widget, r, cg, flags, opt);
+	drawControl(pe, p, widget, r, cg, flags, opt);
 }
 
 // #endif // USE_QT4
@@ -570,7 +570,7 @@ void KStyle::drawPrimitive( PrimitiveElement pe,
 
 		if (p && p->device()->devType() == TQInternal::Widget) {
 			widget = static_cast<TQWidget*>(p->device());
-			parent = widget->tqparentWidget();
+			parent = widget->parentWidget();
 		} else
 			return;		// Don't paint on non-widgets
 
@@ -647,7 +647,7 @@ void KStyle::drawPrimitive( PrimitiveElement pe,
 
 
 
-void KStyle::tqdrawControl( ControlElement element,
+void KStyle::drawControl( ControlElement element,
 						  TQPainter* p,
 						  const TQWidget* widget,
 						  const TQRect &r,
@@ -661,7 +661,7 @@ void KStyle::tqdrawControl( ControlElement element,
 		// ------------------------------------------------------------------------
 		case CE_TabBarTab: {
 			const TQTabBar* tb  = (const TQTabBar*) widget;
-			TQTabBar::Shape tbs = tb->tqshape();
+			TQTabBar::Shape tbs = tb->shape();
 			bool selected      = flags & Style_Selected;
 			int x = r.x(), y=r.y(), bottom=r.bottom(), right=r.right();
 
@@ -945,7 +945,7 @@ void KStyle::tqdrawControl( ControlElement element,
 		}
 
 		default:
-			TQCommonStyle::tqdrawControl(element, p, widget, r, cg, flags, opt);
+			TQCommonStyle::drawControl(element, p, widget, r, cg, flags, opt);
 	}
 }
 
@@ -972,7 +972,7 @@ TQRect KStyle::subRect(SubRect r, const TQWidget* widget) const
 }
 
 
-int KStyle::tqpixelMetric(PixelMetric m, const TQWidget* widget) const
+int KStyle::pixelMetric(PixelMetric m, const TQWidget* widget) const
 {
 	switch(m)
 	{
@@ -987,13 +987,13 @@ int KStyle::tqpixelMetric(PixelMetric m, const TQWidget* widget) const
 			TQWidget* parent = 0;
 			// Check that we are not a normal toolbar or a hidden dockwidget,
 			// in which case we need to adjust the height for font size
-			if (widget && (parent = widget->tqparentWidget() )
+			if (widget && (parent = widget->parentWidget() )
 				&& !parent->inherits("QToolBar")
 				&& !parent->inherits("QMainWindow")
 				&& widget->inherits("QDockWindowHandle") )
 					return widget->fontMetrics().lineSpacing();
 			else
-				return TQCommonStyle::tqpixelMetric(m, widget);
+				return TQCommonStyle::pixelMetric(m, widget);
 		}
 
 		// TABS
@@ -1003,8 +1003,8 @@ int KStyle::tqpixelMetric(PixelMetric m, const TQWidget* widget) const
 
 		case PM_TabBarTabVSpace: {
 			const TQTabBar * tb = (const TQTabBar *) widget;
-			if ( tb->tqshape() == TQTabBar::RoundedAbove ||
-				 tb->tqshape() == TQTabBar::RoundedBelow )
+			if ( tb->shape() == TQTabBar::RoundedAbove ||
+				 tb->shape() == TQTabBar::RoundedBelow )
 				return 10;
 			else
 				return 4;
@@ -1012,7 +1012,7 @@ int KStyle::tqpixelMetric(PixelMetric m, const TQWidget* widget) const
 
 		case PM_TabBarTabOverlap: {
 			const TQTabBar* tb = (const TQTabBar*)widget;
-			TQTabBar::Shape tbs = tb->tqshape();
+			TQTabBar::Shape tbs = tb->shape();
 
 			if ( (tbs == TQTabBar::RoundedAbove) ||
 				 (tbs == TQTabBar::RoundedBelow) )
@@ -1077,14 +1077,14 @@ int KStyle::tqpixelMetric(PixelMetric m, const TQWidget* widget) const
 			return 0;
 
 		case PM_PopupMenuScrollerHeight:
-			return tqpixelMetric( PM_ScrollBarExtent, 0);
+			return pixelMetric( PM_ScrollBarExtent, 0);
 
 		default:
-			return TQCommonStyle::tqpixelMetric( m, widget );
+			return TQCommonStyle::pixelMetric( m, widget );
 	}
 }
 
-//Helper to tqfind the next sibling that's not hidden
+//Helper to find the next sibling that's not hidden
 static TQListViewItem* nextVisibleSibling(TQListViewItem* item)
 {
     TQListViewItem* sibling = item;
@@ -1097,7 +1097,7 @@ static TQListViewItem* nextVisibleSibling(TQListViewItem* item)
     return sibling;
 }
 
-void KStyle::tqdrawComplexControl( ComplexControl control,
+void KStyle::drawComplexControl( ComplexControl control,
 								 TQPainter* p,
 								 const TQWidget* widget,
 								 const TQRect &r,
@@ -1201,10 +1201,10 @@ void KStyle::tqdrawComplexControl( ComplexControl control,
 			TQPainter p2;
 			p2.begin(&pix);
 
-			if ( slider->tqparentWidget() &&
-				 slider->tqparentWidget()->backgroundPixmap() &&
-				 !slider->tqparentWidget()->backgroundPixmap()->isNull() ) {
-				TQPixmap pixmap = *(slider->tqparentWidget()->backgroundPixmap());
+			if ( slider->parentWidget() &&
+				 slider->parentWidget()->backgroundPixmap() &&
+				 !slider->parentWidget()->backgroundPixmap()->isNull() ) {
+				TQPixmap pixmap = *(slider->parentWidget()->backgroundPixmap());
 				p2.drawTiledPixmap(r, pixmap, slider->pos());
 			} else
 				pix.fill(cg.background());
@@ -1220,7 +1220,7 @@ void KStyle::tqdrawComplexControl( ComplexControl control,
 
 			// Draw the tickmarks
 			if (controls & SC_SliderTickmarks)
-				TQCommonStyle::tqdrawComplexControl(control, &p2, widget,
+				TQCommonStyle::drawComplexControl(control, &p2, widget,
 						r, cg, flags, SC_SliderTickmarks, active, opt);
 
 			// Draw the slider handle
@@ -1246,7 +1246,7 @@ void KStyle::tqdrawComplexControl( ComplexControl control,
 
 			// Paint the icon and text.
 			if ( controls & SC_ListView )
-				TQCommonStyle::tqdrawComplexControl( control, p, widget, r, cg, flags, controls, active, opt );
+				TQCommonStyle::drawComplexControl( control, p, widget, r, cg, flags, controls, active, opt );
 
 			// If we're have a branch or are expanded...
 			if ( controls & (SC_ListViewBranch | SC_ListViewExpand) )
@@ -1386,7 +1386,7 @@ void KStyle::tqdrawComplexControl( ComplexControl control,
 		}
 
 		default:
-			TQCommonStyle::tqdrawComplexControl( control, p, widget, r, cg,
+			TQCommonStyle::drawComplexControl( control, p, widget, r, cg,
 											  flags, controls, active, opt );
 			break;
 	}
@@ -1425,7 +1425,7 @@ TQRect KStyle::querySubControlMetrics( ComplexControl control,
 		const TQScrollBar *sb = (const TQScrollBar*)widget;
 		bool horizontal = sb->orientation() == Qt::Horizontal;
 		int sliderstart = sb->sliderStart();
-		int sbextent    = tqpixelMetric(PM_ScrollBarExtent, widget);
+		int sbextent    = pixelMetric(PM_ScrollBarExtent, widget);
 		int maxlen      = (horizontal ? sb->width() : sb->height())
 						  - (sbextent * (threeButtonScrollBar ? 3 : 2));
 		int sliderlen;
@@ -1436,7 +1436,7 @@ TQRect KStyle::querySubControlMetrics( ComplexControl control,
 			uint range = sb->maxValue() - sb->minValue();
 			sliderlen = (sb->pageStep() * maxlen) /	(range + sb->pageStep());
 
-			int slidermin = tqpixelMetric( PM_ScrollBarSliderMin, widget );
+			int slidermin = pixelMetric( PM_ScrollBarSliderMin, widget );
 			if ( sliderlen < slidermin || range > INT_MAX / 2 )
 				sliderlen = slidermin;
 			if ( sliderlen > maxlen )
@@ -1826,7 +1826,7 @@ TQPixmap KStyle::stylePixmap( StylePixmap stylepixmap,
 }
 
 
-int KStyle::tqstyleHint( StyleHint sh, const TQWidget* w,
+int KStyle::styleHint( StyleHint sh, const TQWidget* w,
 					   const TQStyleOption &opt, QStyleHintReturn* shr) const
 {
 	switch (sh)
@@ -1841,7 +1841,7 @@ int KStyle::tqstyleHint( StyleHint sh, const TQWidget* w,
 			return d->menuAltKeyNavigation ? 1 : 0;
 
 		case SH_PopupMenu_SubMenuPopupDelay:
-			if ( tqstyleHint( SH_PopupMenu_SloppySubMenus, w ) )
+			if ( styleHint( SH_PopupMenu_SloppySubMenus, w ) )
 				return QMIN( 100, d->popupMenuDelay );
 			else
 				return d->popupMenuDelay;
@@ -1877,7 +1877,7 @@ int KStyle::tqstyleHint( StyleHint sh, const TQWidget* w,
 		}
 
 		default:
-			return TQCommonStyle::tqstyleHint(sh, w, opt, shr);
+			return TQCommonStyle::styleHint(sh, w, opt, shr);
 	}
 }
 
@@ -1890,7 +1890,7 @@ bool KStyle::eventFilter( TQObject* object, TQEvent* event )
 		// ensure that the filled frame contents are properly painted.
 		// We essentially modify the paintEvent's rect to include the
 		// panel border, which also paints the widget's interior.
-		// This is nasty, but I see no other way to properly tqrepaint
+		// This is nasty, but I see no other way to properly repaint
 		// filled frames in all QMenuBars and QToolBars.
 		// -- Karol.
 		TQFrame *frame = 0;
@@ -2082,7 +2082,7 @@ void TransparencyHandler::createShadowWindows(const TQWidget* p)
 void TransparencyHandler::removeShadowWindows(const TQWidget* p)
 {
 #ifdef Q_WS_X11
-	ShadowMap::iterator it = shadowMap().tqfind(p);
+	ShadowMap::iterator it = shadowMap().find(p);
 	if (it != shadowMap().end())
 	{
 		ShadowElements se = it.data();
@@ -2128,24 +2128,24 @@ bool TransparencyHandler::eventFilter( TQObject* object, TQEvent* event )
 				case XRender:
 #endif
 				case SoftwareBlend:
-					blendToPixmap(p->tqcolorGroup(), p);
+					blendToPixmap(p->colorGroup(), p);
 					break;
 
 				case SoftwareTint:
 				default:
-					blendToColor(p->tqcolorGroup().button());
+					blendToColor(p->colorGroup().button());
 			};
 
 			p->setErasePixmap(pix);
 		}
 
 		// Handle drop shadow
-		// * FIXME : !shadowMap().tqcontains(p) is a workaround for leftover
+		// * FIXME : !shadowMap().contains(p) is a workaround for leftover
 		// * shadows after duplicate show events.
 		// * TODO : determine real cause for duplicate events
 		// * till 20021005
 		if ((dropShadow  || useDropShadow(p))
-		    && p->width() > 16 && p->height() > 16 && !shadowMap().tqcontains( p ))
+		    && p->width() > 16 && p->height() > 16 && !shadowMap().contains( p ))
 			createShadowWindows(p);
 	}
         else if (et == TQEvent::Resize && p->isShown() && p->isTopLevel())
@@ -2221,10 +2221,10 @@ void TransparencyHandler::XRenderBlendToPixmap(const TQWidget* p)
 
 	// Allow styles to define the blend pixmap - allows for some interesting effects.
 	if (::qt_cast<TQPopupMenu*>(p))
-	   kstyle->renderMenuBlendPixmap( renderPix, p->tqcolorGroup(),
+	   kstyle->renderMenuBlendPixmap( renderPix, p->colorGroup(),
 			   ::qt_cast<TQPopupMenu*>(p) );
 	else
-		renderPix.fill(p->tqcolorGroup().button());	// Just tint as the default behavior
+		renderPix.fill(p->colorGroup().button());	// Just tint as the default behavior
 
 	Display* dpy = qt_xdisplay();
 	Pixmap   alphaPixmap;
@@ -2248,9 +2248,9 @@ void TransparencyHandler::XRenderBlendToPixmap(const TQWidget* p)
 	XRenderFillRectangle(dpy, PictOpSrc, alphaPicture, &clr, 0, 0, 1, 1);
 
 	XRenderComposite(dpy, PictOpOver,
-			renderPix.x11RenderHandle(), alphaPicture, pix.x11RenderHandle(), // src, tqmask, dst
+			renderPix.x11RenderHandle(), alphaPicture, pix.x11RenderHandle(), // src, mask, dst
 			0, 0, 	// srcx,  srcy
-			0, 0,	// tqmaskx, tqmasky
+			0, 0,	// maskx, masky
 			0, 0,	// dstx,  dsty
 			pix.width(), pix.height());
 
@@ -2271,6 +2271,6 @@ void kde_kstyle_set_scrollbar_type_windows( void* style )
 }
 
 // vim: set noet ts=4 sw=4:
-// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off;
+// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off;
 
 #include "kstyle.moc"
diff --git a/kdefx/kstyle.h b/kdefx/kstyle.h
index 618074c4e..1e8b0df2c 100644
--- a/kdefx/kstyle.h
+++ b/kdefx/kstyle.h
@@ -70,7 +70,7 @@ class KDEFX_EXPORT KStyle: public QCommonStyle
 		 * internal menu transparency engine.
 		 * 
 		 * @li FilledFrameWorkaround - Enable this flag to facilitate 
-		 * proper tqrepaints of QMenuBars and QToolBars when the style chooses 
+		 * proper repaints of QMenuBars and QToolBars when the style chooses 
 		 * to paint the interior of a TQFrame. The style primitives in question 
 		 * are PE_PanelMenuBar and PE_PanelDockWindow. The HighColor style uses
 		 * this workaround to enable painting of gradients in menubars and 
@@ -171,7 +171,7 @@ class KDEFX_EXPORT KStyle: public QCommonStyle
 		 * This virtual function defines the pixmap used to blend between the popup
 		 * menu and the background to create different menu transparency effects.
 		 * For example, you can fill the pixmap "pix" with a gradient based on the
-		 * popup's tqcolorGroup, a texture, or some other fancy painting routine.
+		 * popup's colorGroup, a texture, or some other fancy painting routine.
 		 * KStyle will then internally blend this pixmap with a snapshot of the
 		 * background behind the popupMenu to create the illusion of transparency.
 		 * 
@@ -243,7 +243,7 @@ class KDEFX_EXPORT KStyle: public QCommonStyle
 		 *
 		 * @see KStyle::KStylePrimitive
 		 * @see TQStyle::drawPrimitive
-		 * @see TQStyle::tqdrawComplexControl
+		 * @see TQStyle::drawComplexControl
 		 */
 		virtual void drawKStylePrimitive( KStylePrimitive kpe,
 					TQPainter* p,
@@ -292,7 +292,7 @@ class KDEFX_EXPORT KStyle: public QCommonStyle
 
 // #endif // USE_QT4
 
-		void tqdrawControl( ControlElement element,
+		void drawControl( ControlElement element,
 					TQPainter* p,
 					const TQWidget* widget,
 					const TQRect &r,
@@ -300,7 +300,7 @@ class KDEFX_EXPORT KStyle: public QCommonStyle
 					SFlags flags = Style_Default,
 					const TQStyleOption& = TQStyleOption::TQSO_Default ) const;
 
-		void tqdrawComplexControl( ComplexControl control,
+		void drawComplexControl( ComplexControl control,
 					TQPainter *p,
 					const TQWidget* widget,
 					const TQRect &r,
@@ -320,7 +320,7 @@ class KDEFX_EXPORT KStyle: public QCommonStyle
 					SubControl sc,
 					const TQStyleOption& = TQStyleOption::TQSO_Default ) const;
 
-		int tqpixelMetric( PixelMetric m, 
+		int pixelMetric( PixelMetric m, 
 					const TQWidget* widget = 0 ) const;
 
 		TQRect subRect( SubRect r, 
@@ -330,7 +330,7 @@ class KDEFX_EXPORT KStyle: public QCommonStyle
 					const TQWidget* widget = 0,
 					const TQStyleOption& = TQStyleOption::TQSO_Default ) const;
 
-		int tqstyleHint( StyleHint sh, 
+		int styleHint( StyleHint sh, 
 					const TQWidget* w = 0,
 					const TQStyleOption &opt = TQStyleOption::TQSO_Default,
 					QStyleHintReturn* shr = 0 ) const;
diff --git a/kdeprint/ChangeLog b/kdeprint/ChangeLog
index 42ca0b863..182044501 100644
--- a/kdeprint/ChangeLog
+++ b/kdeprint/ChangeLog
@@ -93,7 +93,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
 
 18/10/2001 Michael Goffioul <kdeprint@swing.be>
   * kdeprintfax: don't hardcode program path, use the $PATH variable
-    first to tqfind the program. Default to /usr/bin if not found.
+    first to find the program. Default to /usr/bin if not found.
 
 02/11/2001 Michael Goffioul <kdeprint@swing.be>
   * CUPS plugin:
@@ -116,7 +116,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
 	  of page selection on application-side.
 	. set KPrinter object in KPrintDialog before adding other
 	  dialog pages (some pages may need it)
-  * wizard: changed button tqlayout and added a side graphic. Not
+  * wizard: changed button layout and added a side graphic. Not
     committed as the graphic comes from HP driver (copyright).
 
 08/11/2001 Michael Goffioul <kdeprint@swing.be>
@@ -234,7 +234,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
 	. pseudo-printers and filters are completely based on new XML
 	  object, though old style is supported (only requirements from
 	  previous mechanism are not used).
-	. KPrintFilter and KMFilterManager are now obsolete and tqreplaced
+	. KPrintFilter and KMFilterManager are now obsolete and replaced
 	  by KXmlCommand and KXmlCommandManager respectively.
   * kdeprintfax: made the log window a "real" log window. It is dynamically
     refreshed on new debug output arrival (suggested by user).
@@ -299,7 +299,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
 10/01/2002 Michael Goffioul <kdeprint@swing.be>
   * general: added (temporary) workaround for drawing problems in fixed
     toolbars, until a real fix gets implemented:
-    	static_cast<QWidget*>(tb)->tqlayout()->setMargin(1);
+    	static_cast<QWidget*>(tb)->layout()->setMargin(1);
   * general: started to used new icons provided by Bogdan, for the toolbar
   * general: added KPrinter::autoConfigure(), to automatically configure
     a KPrinter object without the need for a print dialog.
@@ -391,7 +391,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
 15/02/2002 Michael Goffioul <kdeprint@swing.be>
   * general: fixed infinite recursion bug in KIconSelectAction
   * CUPS: temporarily disabled edition of page-ranges as it seems CUPS is
-    buggy. I should tqfind a workaround.
+    buggy. I should find a workaround.
   * general (CUPS): enable some actions for jobs on remote hosts. It seems
     to work OK between my local LM-8.1 and a remote LM-7.2.
 
@@ -401,7 +401,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
 
 17/02/2002 Michael GOffioul <kdeprint@swing.be>
   * preview:
-  	. better algorithm to tqfind a preview object
+  	. better algorithm to find a preview object
 	. more comprehensive error report
 	. possibility to cancel printing even with external PS viewers
   * general: added the backend stuff for printer filtering, needs GUI
diff --git a/kdeprint/Makefile.am b/kdeprint/Makefile.am
index 81a200601..06f3a583c 100644
--- a/kdeprint/Makefile.am
+++ b/kdeprint/Makefile.am
@@ -107,8 +107,8 @@ update_DATA = kdeprintrc.upd
 updatedir = $(kde_datadir)/kconf_update
 
 messages: rc.cpp
-	$(EXTRACTRC) `tqfind . -name "*.rc" -o -name "*.ui" | grep -v /cupsdconf` >> rc.cpp
-	$(XGETTEXT) `tqfind . -name "*.cpp" | grep -v /cupsdconf` -o $(podir)/kdeprint.pot
+	$(EXTRACTRC) `find . -name "*.rc" -o -name "*.ui" | grep -v /cupsdconf` >> rc.cpp
+	$(XGETTEXT) `find . -name "*.cpp" | grep -v /cupsdconf` -o $(podir)/kdeprint.pot
 
 include ../admin/Doxyfile.am
 
diff --git a/kdeprint/TODO b/kdeprint/TODO
index ffda7f229..8531c0380 100644
--- a/kdeprint/TODO
+++ b/kdeprint/TODO
@@ -51,7 +51,7 @@ WISHES
   he wants
 
 - support new options for N-up printing in CUPS, put everything in
-  a separate page with graphical widgets, and tqreplace the N-up zone
+  a separate page with graphical widgets, and replace the N-up zone
   of the "General" page with Color/GrayScale.
 
 - allow to set the job title in kprinter
diff --git a/kdeprint/cups/cupsaddsmb2.cpp b/kdeprint/cups/cupsaddsmb2.cpp
index acb384abc..ef1b0f4e8 100644
--- a/kdeprint/cups/cupsaddsmb2.cpp
+++ b/kdeprint/cups/cupsaddsmb2.cpp
@@ -156,7 +156,7 @@ void CupsAddSmb::slotReceived(KProcess*, char *buf, int buflen)
 	while (1)
 	{
 		// read a line
-		line = TQString::tqfromLatin1("");
+		line = TQString::fromLatin1("");
 		partial = true;
 		while (index < buflen)
 		{
@@ -191,7 +191,7 @@ void CupsAddSmb::slotReceived(KProcess*, char *buf, int buflen)
 			if (line.startsWith("smb:") || line.startsWith("rpcclient $"))
 			{
 				kdDebug(500) << "END OF ACTION" << endl;
-				checkActiontqStatus();
+				checkActionStatus();
 				if (m_status)
 					nextAction();
 				else
@@ -216,7 +216,7 @@ void CupsAddSmb::slotReceived(KProcess*, char *buf, int buflen)
 	}
 }
 
-void CupsAddSmb::checkActiontqStatus()
+void CupsAddSmb::checkActionStatus()
 {
 	m_status = false;
 	// when checking the status, we need to take into account the
@@ -231,7 +231,7 @@ void CupsAddSmb::checkActiontqStatus()
 			m_status = (m_buffer.count() == 0);
 			break;
 		case MkDir:
-			m_status = (m_buffer.count() == 1 || m_buffer[1].tqfind("ERRfilexists") != -1);
+			m_status = (m_buffer.count() == 1 || m_buffer[1].find("ERRfilexists") != -1);
 			break;
 		case AddDriver:
 		case AddPrinter:
@@ -315,7 +315,7 @@ void CupsAddSmb::slotProcessExited(KProcess*)
 	if (m_proc.normalExit() && m_state != Start && m_status)
 	{
 		// last process went OK. If it was smbclient, then switch to rpcclient
-		if (tqstrncmp(m_proc.args().first(), "smbclient", 9) == 0)
+		if (qstrncmp(m_proc.args().first(), "smbclient", 9) == 0)
 		{
 			doInstall();
 			return;
@@ -433,7 +433,7 @@ bool CupsAddSmb::doExport()
 	m_actions << "quit";
 
 	m_proc.clearArguments();
-	m_proc << "smbclient" << TQString::tqfromLatin1("//")+m_servered->text()+"/print$";
+	m_proc << "smbclient" << TQString::fromLatin1("//")+m_servered->text()+"/print$";
 	return startProcess();
 }
 
diff --git a/kdeprint/cups/cupsaddsmb2.h b/kdeprint/cups/cupsaddsmb2.h
index 3ef9cbc48..1f396840f 100644
--- a/kdeprint/cups/cupsaddsmb2.h
+++ b/kdeprint/cups/cupsaddsmb2.h
@@ -50,7 +50,7 @@ protected slots:
 	void slotActionClicked();
 
 protected:
-	void checkActiontqStatus();
+	void checkActionStatus();
 	void nextAction();
 	bool startProcess();
 	bool doExport();
diff --git a/kdeprint/cups/cupsdconf2/addressdialog.cpp b/kdeprint/cups/cupsdconf2/addressdialog.cpp
index d4f5b900f..1811abf68 100644
--- a/kdeprint/cups/cupsdconf2/addressdialog.cpp
+++ b/kdeprint/cups/cupsdconf2/addressdialog.cpp
@@ -76,7 +76,7 @@ TQString AddressDialog::newAddress(TQWidget *parent)
 TQString AddressDialog::editAddress(const TQString& addr, TQWidget *parent)
 {
 	AddressDialog	dlg(parent);
-	int p = addr.tqfind(' ');
+	int p = addr.find(' ');
 	if (p != -1)
 	{
 		dlg.type_->setCurrentItem(addr.left(p).lower() == "deny" ? 1 : 0);
diff --git a/kdeprint/cups/cupsdconf2/cups-util.c b/kdeprint/cups/cupsdconf2/cups-util.c
index f568d1bdc..cb6ddcf92 100644
--- a/kdeprint/cups/cupsdconf2/cups-util.c
+++ b/kdeprint/cups/cupsdconf2/cups-util.c
@@ -250,7 +250,7 @@ cupsGetConf(void)
   return (filename);
 }
 
-int					/* O - tqStatus of operation */
+int					/* O - Status of operation */
 cupsPutConf(const char *name)		/* I - Name of the config file to send */
 {
   int		fd;			/* PPD file */
diff --git a/kdeprint/cups/cupsdconf2/cupsd.conf.template b/kdeprint/cups/cupsdconf2/cupsd.conf.template
index bd8f5f573..ae1a4c362 100644
--- a/kdeprint/cups/cupsdconf2/cupsd.conf.template
+++ b/kdeprint/cups/cupsdconf2/cupsd.conf.template
@@ -450,7 +450,7 @@ $$
 # default browsing information is broadcast to all active interfaces.</p>
 # <p>
 # Note: HP-UX 10.20 and earlier do not properly handle broadcast unless
-# you have a Class A, B, C, or D nettqmask (i.e. no CIDR support).</p>
+# you have a Class A, B, C, or D netmask (i.e. no CIDR support).</p>
 # <p>
 # <i>ex</i>: x.y.z.255, x.y.255.255</p>
 $$
@@ -462,10 +462,10 @@ $$
 %%browseallow
 # <b>Browse allow/deny (BrowseAllow/BrowseDeny)</b>
 # <p>
-# <u>BrowseAllow</u>: specifies an address tqmask to allow for incoming browser
+# <u>BrowseAllow</u>: specifies an address mask to allow for incoming browser
 # packets. The default is to allow packets from all addresses.</p>
 # <p>
-# <u>BrowseDeny</u>: specifies an address tqmask to deny for incoming browser
+# <u>BrowseDeny</u>: specifies an address mask to deny for incoming browser
 # packets. The default is to deny packets from no addresses.</p>
 # <p>
 # Both "BrowseAllow" and "BrowseDeny" accept the following notations for
diff --git a/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp b/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp
index a93a05e5e..7c2b6276a 100644
--- a/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp
+++ b/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp
@@ -127,8 +127,8 @@ bool CupsdBrowsingPage::loadConfig(CupsdConf *conf, TQString&)
 {
 	conf_ = conf;
 	browsing_->setChecked(conf_->browsing_);
-	cups_->setChecked(conf_->browseprotocols_.tqfindIndex("CUPS") != -1);
-	slp_->setChecked(conf_->browseprotocols_.tqfindIndex("SLP") != -1);
+	cups_->setChecked(conf_->browseprotocols_.findIndex("CUPS") != -1);
+	slp_->setChecked(conf_->browseprotocols_.findIndex("SLP") != -1);
 	browseport_->setValue(conf_->browseport_);
 	browseinterval_->setValue(conf_->browseinterval_);
 	browsetimeout_->setValue(conf_->browsetimeout_);
diff --git a/kdeprint/cups/cupsdconf2/cupsdcomment.cpp b/kdeprint/cups/cupsdconf2/cupsdcomment.cpp
index fbef47b16..43847299b 100644
--- a/kdeprint/cups/cupsdconf2/cupsdcomment.cpp
+++ b/kdeprint/cups/cupsdconf2/cupsdcomment.cpp
@@ -27,7 +27,7 @@
 TQString Comment::comment()
 {
         TQString str = comment_;
-        str.tqreplace(TQRegExp("<[^>]*>"), "");
+        str.replace(TQRegExp("<[^>]*>"), "");
         str += ("#\n" + example_);
         return str;
 }
@@ -35,7 +35,7 @@ TQString Comment::comment()
 TQString Comment::toolTip()
 {
         TQString str = comment_;
-        str.tqreplace(TQRegExp("^#[\\s]*"), "").tqreplace(TQRegExp("\n#[\\s]*"), "\n");
+        str.replace(TQRegExp("^#[\\s]*"), "").replace(TQRegExp("\n#[\\s]*"), "\n");
         return i18n("Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, etc.)", str.utf8());
 }
 
@@ -92,7 +92,7 @@ TQString CupsdComment::comment(const TQString& key)
 {
         if (comments_.count() != 0 || loadComments())
 	{
-		Comment *comm = comments_.tqfind(key);
+		Comment *comm = comments_.find(key);
 		if (comm)
 			return comm->comment();
 	}
@@ -103,7 +103,7 @@ TQString CupsdComment::toolTip(const TQString& key)
 {
         if (comments_.count() != 0 || loadComments())
 	{
-		Comment *comm = comments_.tqfind(key);
+		Comment *comm = comments_.find(key);
 		if (comm)
 			return comm->toolTip();
 	}
diff --git a/kdeprint/cups/cupsdconf2/cupsdconf.cpp b/kdeprint/cups/cupsdconf2/cupsdconf.cpp
index 3742656a5..f500d219c 100644
--- a/kdeprint/cups/cupsdconf2/cupsdconf.cpp
+++ b/kdeprint/cups/cupsdconf2/cupsdconf.cpp
@@ -31,7 +31,7 @@
 #include <cups/ipp.h>
 #include <cups/language.h>
 
-TQString tqfindDir(const TQStringList& list)
+TQString findDir(const TQStringList& list)
 {
 	for (TQStringList::ConstIterator it=list.begin(); it!=list.end(); ++it)
 		if (TQFile::exists(*it))
@@ -42,7 +42,7 @@ TQString tqfindDir(const TQStringList& list)
 
 void splitSizeSpec(const TQString& s, int& sz, int& suff)
 {
-	int	p = s.tqfind(TQRegExp("\\D"));
+	int	p = s.find(TQRegExp("\\D"));
 	sz = s.mid(0, p).toInt();
 	if (p != -1)
 	{
@@ -61,21 +61,21 @@ void splitSizeSpec(const TQString& s, int& sz, int& suff)
 
 CupsdConf::CupsdConf()
 {
-	// start by trying to tqfind CUPS directories (useful later)
-	datadir_ = tqfindDir(TQStringList("/usr/share/cups")
+	// start by trying to find CUPS directories (useful later)
+	datadir_ = findDir(TQStringList("/usr/share/cups")
 			<< "/usr/local/share/cups"
 			<< "/opt/share/cups"
 			<< "/opt/local/share/cups");
-	documentdir_ = tqfindDir(TQStringList(datadir_+"/doc-root")
+	documentdir_ = findDir(TQStringList(datadir_+"/doc-root")
 			<< datadir_.left(datadir_.length()-5)+"/doc/cups");
 	//fontpath_ << (datadir_+"/fonts");
-	requestdir_ = tqfindDir(TQStringList("/var/spool/cups")
+	requestdir_ = findDir(TQStringList("/var/spool/cups")
 			<< "/var/cups");
-	serverbin_ = tqfindDir(TQStringList("/usr/lib" KDELIBSUFF "/cups")
+	serverbin_ = findDir(TQStringList("/usr/lib" KDELIBSUFF "/cups")
 			<< "/usr/local/lib" KDELIBSUFF "/cups"
 			<< "/opt/lib" KDELIBSUFF "/cups"
 			<< "/opt/local/lib" KDELIBSUFF "/cups");
-	serverfiles_ = tqfindDir(TQStringList("/etc/cups")
+	serverfiles_ = findDir(TQStringList("/etc/cups")
 			<< "/usr/local/etc/cups");
 	tmpfiles_ = requestdir_+"/tmp";
 
@@ -100,7 +100,7 @@ CupsdConf::CupsdConf()
 	maxrequestsize_ = "0";
 	clienttimeout_ = 300;
 	// listenaddresses_
-	QString	logdir = tqfindDir(TQStringList("/var/log/cups")
+	QString	logdir = findDir(TQStringList("/var/log/cups")
 			<< "/var/spool/cups/log"
 			<< "/var/cups/log");
 	accesslog_ = logdir+"/access_log";
@@ -484,7 +484,7 @@ bool CupsdConf::parseOption(const TQString& line)
 	int p(-1);
 	TQString keyword, value, l(line.simplifyWhiteSpace());
 
-	if ((p=l.tqfind(' ')) != -1)
+	if ((p=l.find(' ')) != -1)
 	{
 		keyword = l.left(p).lower();
 		value = l.mid(p+1);
@@ -508,7 +508,7 @@ bool CupsdConf::parseOption(const TQString& line)
 	{
 		browseprotocols_.clear();
 		TQStringList prots = TQStringList::split(TQRegExp("\\s"), value, false);
-		if (prots.tqfind("all") != prots.end())
+		if (prots.find("all") != prots.end())
 			browseprotocols_ << "CUPS" << "SLP";
 		else
 			for (TQStringList::ConstIterator it=prots.begin(); it!=prots.end(); ++it)
@@ -718,7 +718,7 @@ CupsLocation::CupsLocation(const CupsLocation& loc)
 bool CupsLocation::parseResource(const TQString& line)
 {
 	QString	str = line.simplifyWhiteSpace();
-	int	p1 = line.tqfind(' '), p2 = line.tqfind('>');
+	int	p1 = line.find(' '), p2 = line.find('>');
 	if (p1 != -1 && p2 != -1)
 	{
 		resourcename_ = str.mid(p1+1,p2-p1-1);
@@ -732,7 +732,7 @@ bool CupsLocation::parseOption(const TQString& line)
 	int p(-1);
 	TQString keyword, value, l(line.simplifyWhiteSpace());
 
-	if ((p=l.tqfind(' ')) != -1)
+	if ((p=l.find(' ')) != -1)
 	{
 		keyword = l.left(p).lower();
 		value = l.mid(p+1);
@@ -760,7 +760,7 @@ bool CupsLocation::parseOption(const TQString& line)
 	else if (keyword == "authgroupname") authname_ = value;
 	else if (keyword == "require")
 	{
-		int p = value.tqfind(' ');
+		int p = value.find(' ');
 		if (p != -1)
 		{
 			authname_ = value.mid(p+1);
@@ -810,8 +810,8 @@ int CupsResource::typeFromText(const TQString& text)
 {
 	if (text == i18n("Base", "Root") || text == i18n("All printers") || text == i18n("All classes") || text == i18n("Print jobs")) return RESOURCE_GLOBAL;
 	else if (text == i18n("Administration")) return RESOURCE_ADMIN;
-	else if (text.tqfind(i18n("Class")) == 0) return RESOURCE_CLASS;
-	else if (text.tqfind(i18n("Printer")) == 0) return RESOURCE_PRINTER;
+	else if (text.find(i18n("Class")) == 0) return RESOURCE_CLASS;
+	else if (text.find(i18n("Printer")) == 0) return RESOURCE_PRINTER;
 	else return RESOURCE_PRINTER;
 }
 
@@ -832,12 +832,12 @@ TQString CupsResource::textToPath(const TQString& text)
 	else if (text == i18n("All classes")) path = "/classes";
 	else if (text == i18n("Print jobs")) path = "/jobs";
 	else if (text == i18n("Base", "Root")) path = "/";
-	else if (text.tqfind(i18n("Printer")) == 0)
+	else if (text.find(i18n("Printer")) == 0)
 	{
 		path = "/printers/";
 		path.append(text.right(text.length()-i18n("Printer").length()-1));
 	}
-	else if (text.tqfind(i18n("Class")) == 0)
+	else if (text.find(i18n("Class")) == 0)
 	{
 		path = "/classes/";
 		path.append(text.right(text.length()-i18n("Class").length()-1));
@@ -853,13 +853,13 @@ TQString CupsResource::pathToText(const TQString& path)
 	else if (path == "/classes") text = i18n("All classes");
 	else if (path == "/") text = i18n("Root");
 	else if (path == "/jobs") text = i18n("Print jobs");
-	else if (path.tqfind("/printers/") == 0)
+	else if (path.find("/printers/") == 0)
 	{
 		text = i18n("Printer");
 		text.append(" ");
 		text.append(path.right(path.length()-10));
 	}
-	else if (path.tqfind("/classes/") == 0)
+	else if (path.find("/classes/") == 0)
 	{
 		text = i18n("Class");
 		text.append(" ");
diff --git a/kdeprint/cups/cupsdconf2/cupsddialog.cpp b/kdeprint/cups/cupsdconf2/cupsddialog.cpp
index 65d7aca0c..8023aeef7 100644
--- a/kdeprint/cups/cupsdconf2/cupsddialog.cpp
+++ b/kdeprint/cups/cupsdconf2/cupsddialog.cpp
@@ -202,7 +202,7 @@ bool CupsdDialog::restartServer(TQString& msg)
         msg.truncate(0);
 	if (serverPid <= 0)
 	{
-		msg = i18n("Unable to tqfind a running CUPS server");
+		msg = i18n("Unable to find a running CUPS server");
 	}
 	else
 	{
@@ -337,7 +337,7 @@ int CupsdDialog::serverOwner()
 			while (!t.eof())
 			{
 				str = t.readLine();
-				if (str.tqfind("Uid:",0,false) == 0)
+				if (str.find("Uid:",0,false) == 0)
 				{
 					QStringList	list = TQStringList::split('\t', str, false);
 					if (list.count() >= 2)
diff --git a/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp b/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp
index dc16f9b36..0bf290fb9 100644
--- a/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp
+++ b/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp
@@ -125,7 +125,7 @@ void CupsdSecurityPage::slotAdd()
 		for (locs_.first(); locs_.current(); locs_.next())
 			if (locs_.current()->resource_ == loc->resource_)
 			{
-				if (KMessageBox::warningContinueCancel(this, i18n("This location is already defined. Do you want to tqreplace the existing one?"),TQString::null,i18n("Replace")) == KMessageBox::Continue)
+				if (KMessageBox::warningContinueCancel(this, i18n("This location is already defined. Do you want to replace the existing one?"),TQString::null,i18n("Replace")) == KMessageBox::Continue)
 				{
 					index = locs_.at();
 					locs_.remove();
diff --git a/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp b/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp
index 2ef255c76..cc0804f5b 100644
--- a/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp
+++ b/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp
@@ -29,7 +29,7 @@
 
 #include <klocale.h>
 
-int tqfindComboItem(TQComboBox *cb, const TQString& str)
+int findComboItem(TQComboBox *cb, const TQString& str)
 {
 	for (int i=0; i<cb->count(); i++)
 		if (cb->text(i) == str)
@@ -133,7 +133,7 @@ bool CupsdServerPage::loadConfig(CupsdConf *conf, TQString&)
 		classoverride_->setChecked(conf_->classoverride_);
 	if (conf->classification_ == CLASS_OTHER)
 		otherclassname_->setText(conf_->otherclassname_);
-	int index = tqfindComboItem(charset_, conf_->charset_.upper());
+	int index = findComboItem(charset_, conf_->charset_.upper());
 	if (index != -1)
 		charset_->setCurrentItem(index);
 	language_->setText(conf_->language_);
diff --git a/kdeprint/cups/cupsdconf2/cupsdsplash.cpp b/kdeprint/cups/cupsdconf2/cupsdsplash.cpp
index 754e7cbd5..9dd7581a8 100644
--- a/kdeprint/cups/cupsdconf2/cupsdsplash.cpp
+++ b/kdeprint/cups/cupsdconf2/cupsdsplash.cpp
@@ -39,11 +39,11 @@ CupsdSplash::CupsdSplash(TQWidget *parent, const char *name)
 	QLabel	*cupslogo_ = new TQLabel(this);
 	QString	logopath = locate("data", TQString("kdeprint/cups_logo.png"));
 	cupslogo_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath));
-	cupslogo_->tqsetAlignment(Qt::AlignCenter);
+	cupslogo_->setAlignment(Qt::AlignCenter);
 	QLabel	*kupslogo_ = new TQLabel(this);
 	logopath = locate("data", TQString("kdeprint/kde_logo.png"));
 	kupslogo_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath));
-	kupslogo_->tqsetAlignment(Qt::AlignCenter);
+	kupslogo_->setAlignment(Qt::AlignCenter);
 
 	QLabel	*helptxt_ = new TQLabel(this);
 	helptxt_->setText(i18n( "<p>This tool will help you to configure graphically the server of the CUPS printing system. "
diff --git a/kdeprint/cups/cupsdconf2/editlist.cpp b/kdeprint/cups/cupsdconf2/editlist.cpp
index d65edaeff..a91fdc3d3 100644
--- a/kdeprint/cups/cupsdconf2/editlist.cpp
+++ b/kdeprint/cups/cupsdconf2/editlist.cpp
@@ -81,7 +81,7 @@ void EditList::setText(int index, const TQString& s)
 {
 	if (list_->text(index) != s)
 	{
-		QListBoxItem	*it = list_->tqfindItem(s, Qt::ExactMatch);
+		QListBoxItem	*it = list_->findItem(s, Qt::ExactMatch);
 		if (!it)
 			list_->changeItem(s, index);
 		else
@@ -97,13 +97,13 @@ void EditList::clear()
 
 void EditList::insertItem(const TQString& s)
 {
-	if (!list_->tqfindItem(s, Qt::ExactMatch))
+	if (!list_->findItem(s, Qt::ExactMatch))
 		list_->insertItem(s);
 }
 
 void EditList::insertItem(const TQPixmap& icon, const TQString& s)
 {
-	if (!list_->tqfindItem(s, Qt::ExactMatch))
+	if (!list_->findItem(s, Qt::ExactMatch))
 		list_->insertItem(icon, s);
 }
 
diff --git a/kdeprint/cups/cupsdconf2/locationdialog.cpp b/kdeprint/cups/cupsdconf2/locationdialog.cpp
index 1ea94d66f..d360d62e2 100644
--- a/kdeprint/cups/cupsdconf2/locationdialog.cpp
+++ b/kdeprint/cups/cupsdconf2/locationdialog.cpp
@@ -141,7 +141,7 @@ void LocationDialog::fillLocation(CupsLocation *loc)
 
 void LocationDialog::setLocation(CupsLocation *loc)
 {
-	int	index = conf_->resources_.tqfindRef(loc->resource_);
+	int	index = conf_->resources_.findRef(loc->resource_);
 	resource_->setCurrentItem(index);
 	authtype_->setCurrentItem(loc->authtype_);
 	authclass_->setCurrentItem(loc->authclass_);
diff --git a/kdeprint/cups/cupsdconf2/portdialog.cpp b/kdeprint/cups/cupsdconf2/portdialog.cpp
index 184005c13..e17e2b081 100644
--- a/kdeprint/cups/cupsdconf2/portdialog.cpp
+++ b/kdeprint/cups/cupsdconf2/portdialog.cpp
@@ -93,12 +93,12 @@ TQString PortDialog::editListen(const TQString& s, TQWidget *parent, CupsdConf *
 {
 	PortDialog	dlg(parent);
 	dlg.setInfos(conf);
-	int	p = s.tqfind(' ');
+	int	p = s.find(' ');
 	if (p != -1)
 	{
 		dlg.usessl_->setChecked(s.left(p).startsWith("SSL"));
 		QString	addr = s.mid(p+1).stripWhiteSpace();
-		int p1 = addr.tqfind(':');
+		int p1 = addr.find(':');
 		if (p1 == -1)
 		{
 			dlg.address_->setText(addr);
diff --git a/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp b/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
index 7b96d4ef9..1daca81cb 100644
--- a/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
+++ b/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
@@ -44,7 +44,7 @@ QDirMultiLineEdit::QDirMultiLineEdit(TQWidget *parent, const char *name)
 	connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveClicked()));
 	m_remove->setEnabled(false);
 
-	m_view->setFixedHeight(QMAX(m_view->fontMetrics().lineSpacing()*3+m_view->lineWidth()*2, m_add->tqsizeHint().height()*2));
+	m_view->setFixedHeight(QMAX(m_view->fontMetrics().lineSpacing()*3+m_view->lineWidth()*2, m_add->sizeHint().height()*2));
 
 	QHBoxLayout	*l0 = new TQHBoxLayout(this, 0, 3);
 	QVBoxLayout	*l1 = new TQVBoxLayout(0, 0, 0);
diff --git a/kdeprint/cups/cupsdconf2/sizewidget.cpp b/kdeprint/cups/cupsdconf2/sizewidget.cpp
index 5920c30a9..d77fe5aaa 100644
--- a/kdeprint/cups/cupsdconf2/sizewidget.cpp
+++ b/kdeprint/cups/cupsdconf2/sizewidget.cpp
@@ -45,7 +45,7 @@ SizeWidget::SizeWidget( TQWidget *parent, const char *name )
 
 void SizeWidget::setSizeString( const TQString& sz )
 {
-	int p = sz.tqfind( TQRegExp( "\\D" ) );
+	int p = sz.find( TQRegExp( "\\D" ) );
 	m_size->setValue( sz.left( p ).toInt() );
 	switch( sz[ p ].latin1() )
 	{
diff --git a/kdeprint/cups/cupsinfos.cpp b/kdeprint/cups/cupsinfos.cpp
index 78bbeb458..839f83612 100644
--- a/kdeprint/cups/cupsinfos.cpp
+++ b/kdeprint/cups/cupsinfos.cpp
@@ -119,9 +119,9 @@ void CupsInfos::load()
 {
 	KConfig	*conf_ = KMFactory::self()->printConfig();
 	conf_->setGroup("CUPS");
-	host_ = conf_->readEntry("Host",TQString::tqfromLatin1(cupsServer()));
+	host_ = conf_->readEntry("Host",TQString::fromLatin1(cupsServer()));
 	port_ = conf_->readNumEntry("Port",ippPort());
-	login_ = conf_->readEntry("Login",TQString::tqfromLatin1(cupsUser()));
+	login_ = conf_->readEntry("Login",TQString::fromLatin1(cupsUser()));
 	savepwd_ = conf_->readBoolEntry( "SavePassword", false );
 	if ( savepwd_ )
 	{
diff --git a/kdeprint/cups/image.cpp b/kdeprint/cups/image.cpp
index 9e32ce771..4fe214bc1 100644
--- a/kdeprint/cups/image.cpp
+++ b/kdeprint/cups/image.cpp
@@ -267,9 +267,9 @@ TQImage convertImage(const TQImage& image, int hue, int saturation, int brightne
 	   for (int j=0;j<image.height();j++)
 	   {
 	   	c = image.pixel(i,j);
-	   	r = tqRed(c);
-	   	g = tqGreen(c);
-	   	b = tqBlue(c);
+	   	r = qRed(c);
+	   	g = qGreen(c);
+	   	b = qBlue(c);
 
 	   	v = lut[0][0][r] + lut[1][0][g] + lut[2][0][b];
 	   	if (gamma != 1000) v = (int)rint(pow(v,gam));
@@ -289,7 +289,7 @@ TQImage convertImage(const TQImage& image, int hue, int saturation, int brightne
 	   	else if (v > 255) b2 = 255;
 	   	else b2 = v;
 
-	   	img.setPixel(i,j,tqRgb(r2,g2,b2));
+	   	img.setPixel(i,j,qRgb(r2,g2,b2));
 	   }
 	return img;
 }
diff --git a/kdeprint/cups/imageposition.cpp b/kdeprint/cups/imageposition.cpp
index 9e0ab4941..bc2b207fd 100644
--- a/kdeprint/cups/imageposition.cpp
+++ b/kdeprint/cups/imageposition.cpp
@@ -44,8 +44,8 @@ ImagePosition::ImagePosition(TQWidget *parent, const char *name)
 	: TQWidget(parent,name)
 {
 	position_ = Center;
-	setMinimumSize(tqsizeHint());
-	tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
+	setMinimumSize(sizeHint());
+	setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
 	pix_.load(locate("data", "kdeprint/preview-mini.png"));
 }
 
@@ -147,7 +147,7 @@ void ImagePosition::paintEvent(TQPaintEvent*)
 	p.end();
 }
 
-TQSize ImagePosition::tqsizeHint() const
+TQSize ImagePosition::sizeHint() const
 {
 	return TQSize(60, 80);
 }
diff --git a/kdeprint/cups/imageposition.h b/kdeprint/cups/imageposition.h
index b54415189..caaa63ca2 100644
--- a/kdeprint/cups/imageposition.h
+++ b/kdeprint/cups/imageposition.h
@@ -45,7 +45,7 @@ public:
 	void setPosition(int horiz = 1, int vert = 1);
 	PositionType position() const { return (PositionType)position_; }
 	TQString positionString() const;
-	TQSize tqsizeHint() const;
+	TQSize sizeHint() const;
 
 protected:
 	void paintEvent(TQPaintEvent *);
diff --git a/kdeprint/cups/imagepreview.cpp b/kdeprint/cups/imagepreview.cpp
index 9272399e4..7ae5dabf0 100644
--- a/kdeprint/cups/imagepreview.cpp
+++ b/kdeprint/cups/imagepreview.cpp
@@ -51,7 +51,7 @@ void ImagePreview::setParameters(int brightness, int hue, int saturation, int ga
 	hue_ = hue;
 	saturation_ = saturation;
 	gamma_ = gamma;
-	tqrepaint();
+	repaint();
 }
 
 void ImagePreview::paintEvent(TQPaintEvent*){
@@ -59,7 +59,7 @@ void ImagePreview::paintEvent(TQPaintEvent*){
 	int	x = (width()-tmpImage.width())/2, y = (height()-tmpImage.height())/2;
 
 	QPixmap	buffer(width(), height());
-	buffer.fill(tqparentWidget(), 0, 0);
+	buffer.fill(parentWidget(), 0, 0);
 	QPainter	p(&buffer);
 	p.drawImage(x,y,tmpImage);
 	p.end();
@@ -72,7 +72,7 @@ void ImagePreview::setBlackAndWhite(bool on){
 	update();
 }
 
-TQSize ImagePreview::tqminimumSizeHint() const
+TQSize ImagePreview::minimumSizeHint() const
 {
 	return image_.size();
 }
diff --git a/kdeprint/cups/imagepreview.h b/kdeprint/cups/imagepreview.h
index dfbdf742d..1967efdc2 100644
--- a/kdeprint/cups/imagepreview.h
+++ b/kdeprint/cups/imagepreview.h
@@ -32,7 +32,7 @@ public:
 	void setParameters(int brightness, int hue, int saturation, int gamma);
 	void setImage(const TQImage& image);
 	void setBlackAndWhite(bool on);
-	TQSize tqminimumSizeHint() const;
+	TQSize minimumSizeHint() const;
 
 private: // Private attributes
 	int brightness_;
diff --git a/kdeprint/cups/ippreportdlg.cpp b/kdeprint/cups/ippreportdlg.cpp
index 20882d8c4..343cd4118 100644
--- a/kdeprint/cups/ippreportdlg.cpp
+++ b/kdeprint/cups/ippreportdlg.cpp
@@ -59,7 +59,7 @@ void IppReportDlg::slotUser1()
 		int	hh = rich.height(), page(1);
 		while (1)
 		{
-			rich.draw(&painter, margin, margin, r, tqcolorGroup());
+			rich.draw(&painter, margin, margin, r, colorGroup());
 			QString	s = caption() + ": " + TQString::number(page);
 			QRect	br = painter.fontMetrics().boundingRect(s);
 			painter.drawText(r.right()-br.width()-5, r.top()-br.height()-4, br.width()+5, br.height()+4, Qt::AlignRight|Qt::AlignTop, s);
diff --git a/kdeprint/cups/ipprequest.cpp b/kdeprint/cups/ipprequest.cpp
index 2310b7f5f..0b32e45e7 100644
--- a/kdeprint/cups/ipprequest.cpp
+++ b/kdeprint/cups/ipprequest.cpp
@@ -55,8 +55,8 @@ void dumpRequest(ipp_t *req, bool answer = false, const TQString& s = TQString::
 	kdDebug(500) << "ID = 0x" << TQString::number(req->request.status.request_id, 16) << endl;
 	if (answer)
 	{
-		kdDebug(500) << "tqStatus = 0x" << TQString::number(req->request.status.status_code, 16) << endl;
-		kdDebug(500) << "tqStatus message = " << ippErrorString(req->request.status.status_code) << endl;
+		kdDebug(500) << "Status = 0x" << TQString::number(req->request.status.status_code, 16) << endl;
+		kdDebug(500) << "Status message = " << ippErrorString(req->request.status.status_code) << endl;
 	}
 	else
 		kdDebug(500) << "Operation = 0x" << TQString::number(req->request.op.operation_id, 16) << endl;
@@ -66,7 +66,7 @@ void dumpRequest(ipp_t *req, bool answer = false, const TQString& s = TQString::
 	ipp_attribute_t *attr = req->attrs;
 	while (attr)
 	{
-		TQString s = TQString::tqfromLatin1("%1 (0x%2) = ").arg(attr->name).arg(attr->value_tag, 0, 16);
+		TQString s = TQString::fromLatin1("%1 (0x%2) = ").arg(attr->name).arg(attr->value_tag, 0, 16);
 		for (int i=0;i<attr->num_values;i++)
 		{
 			switch (attr->value_tag)
@@ -504,7 +504,7 @@ void IppRequest::setMap(const TQMap<TQString,TQString>& opts)
 		if (it.key().startsWith("kde-") || it.key().startsWith("app-"))
 			continue;
 		QString	value = it.data().stripWhiteSpace(), lovalue;
-		value.tqreplace(re, "");
+		value.replace(re, "");
 		lovalue = value.lower();
 
 		// handles specific cases: boolean, empty strings, or option that has that boolean
@@ -522,7 +522,7 @@ void IppRequest::setMap(const TQMap<TQString,TQString>& opts)
 		cupsEncodeOptions(request_, n, options);
 	cupsFreeOptions(n, options);
 
-	// tqfind an remove that annoying "document-format" attribute
+	// find an remove that annoying "document-format" attribute
 #if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2
     ipp_attribute_t *attr = ippFindAttribute(request_, "document-format", IPP_TAG_NAME);
     ippDeleteAttribute(request_, attr);
diff --git a/kdeprint/cups/kcupsprinterimpl.cpp b/kdeprint/cups/kcupsprinterimpl.cpp
index 7fa6da140..1bf6d55bf 100644
--- a/kdeprint/cups/kcupsprinterimpl.cpp
+++ b/kdeprint/cups/kcupsprinterimpl.cpp
@@ -37,9 +37,9 @@ TQSize rangeToSize(const TQString& s)
 	int	p(-1);
 	int	from, to;
 
-	if ((p=range.tqfind(',')) != -1)
+	if ((p=range.find(',')) != -1)
 		range.truncate(p);
-	if ((p=range.tqfind('-')) != -1)
+	if ((p=range.find('-')) != -1)
 	{
 		from = range.left(p).toInt();
 		to = range.right(range.length()-p-1).toInt();
@@ -67,8 +67,8 @@ bool KCupsPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
 	// check printer object
 	if (!printer) return false;
 
-	QString	hoststr = TQString::tqfromLatin1("%1:%2").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port());
-	cmd = TQString::tqfromLatin1("cupsdoprint -P %1 -J %3 -H %2").arg(quote(printer->printerName())).arg(quote(hoststr)).arg(quote(printer->docName()));
+	QString	hoststr = TQString::fromLatin1("%1:%2").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port());
+	cmd = TQString::fromLatin1("cupsdoprint -P %1 -J %3 -H %2").arg(quote(printer->printerName())).arg(quote(hoststr)).arg(quote(printer->docName()));
 	if (!CupsInfos::self()->login().isEmpty())
 	{
 		QString	userstr(CupsInfos::self()->login());
@@ -127,7 +127,7 @@ void KCupsPrinterImpl::broadcastOption(const TQString& key, const TQString& valu
 		KPrinterImpl::broadcastOption("orientation-requested",(value == "Landscape" ? "4" : "3"));
 	else if (key == "kde-pagesize")
 	{
-		QString	pagename = TQString::tqfromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt()));
+		QString	pagename = TQString::fromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt()));
 		KPrinterImpl::broadcastOption("PageSize",pagename);
 		// simple hack for classes
 		KPrinterImpl::broadcastOption("media",pagename);
diff --git a/kdeprint/cups/kmconfigcupsdir.cpp b/kdeprint/cups/kmconfigcupsdir.cpp
index 7bbef9db4..5e6958565 100644
--- a/kdeprint/cups/kmconfigcupsdir.cpp
+++ b/kdeprint/cups/kmconfigcupsdir.cpp
@@ -44,7 +44,7 @@ KMConfigCupsDir::KMConfigCupsDir(TQWidget *parent)
 	TQVBoxLayout *lay0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 	lay0->addWidget(m_dirbox);
 	lay0->addStretch(1);
-	TQVBoxLayout *lay1 = new TQVBoxLayout(m_dirbox->tqlayout(), 10);
+	TQVBoxLayout *lay1 = new TQVBoxLayout(m_dirbox->layout(), 10);
 	lay1->addWidget(m_stddir);
 	lay1->addWidget(m_installdir);
 
diff --git a/kdeprint/cups/kmcupsconfigwidget.cpp b/kdeprint/cups/kmcupsconfigwidget.cpp
index ad27d9652..684d8b850 100644
--- a/kdeprint/cups/kmcupsconfigwidget.cpp
+++ b/kdeprint/cups/kmcupsconfigwidget.cpp
@@ -83,17 +83,17 @@ KMCupsConfigWidget::KMCupsConfigWidget(TQWidget *parent, const char *name)
 	m_loginlabel->setBuddy(m_login);
 	m_passwordlabel->setBuddy(m_password);
 
-	// tqlayout creation
+	// layout creation
 	QVBoxLayout	*lay0 = new TQVBoxLayout(this, 0, 10);
 	lay0->addWidget(m_hostbox,1);
 	lay0->addWidget(m_loginbox,1);
-	QGridLayout	*lay2 = new TQGridLayout(m_hostbox->tqlayout(), 2, 2, 10);
+	QGridLayout	*lay2 = new TQGridLayout(m_hostbox->layout(), 2, 2, 10);
 	lay2->setColStretch(1,1);
 	lay2->addWidget(m_hostlabel,0,0);
 	lay2->addWidget(m_portlabel,1,0);
 	lay2->addWidget(m_host,0,1);
 	lay2->addWidget(m_port,1,1);
-	QGridLayout	*lay3 = new TQGridLayout(m_loginbox->tqlayout(), 4, 2, 10);
+	QGridLayout	*lay3 = new TQGridLayout(m_loginbox->layout(), 4, 2, 10);
 	lay3->setColStretch(1,1);
 	lay3->addWidget(m_loginlabel,0,0);
 	lay3->addWidget(m_passwordlabel,1,0);
diff --git a/kdeprint/cups/kmcupsjobmanager.cpp b/kdeprint/cups/kmcupsjobmanager.cpp
index 4e083c38a..011256cd6 100644
--- a/kdeprint/cups/kmcupsjobmanager.cpp
+++ b/kdeprint/cups/kmcupsjobmanager.cpp
@@ -93,7 +93,7 @@ bool KMCupsJobManager::sendCommandSystemJob(const TQPtrList<KMJob>& jobs, int ac
 				if (argstr.isEmpty()) return false;
 				req.setOperation(CUPS_MOVE_JOB);
 				uri =
-				    TQString::tqfromLatin1("ipp://%1/printers/%2").arg(CupsInfos::self()->hostaddr(),
+				    TQString::fromLatin1("ipp://%1/printers/%2").arg(CupsInfos::self()->hostaddr(),
 					    argstr);
 				req.addURI(IPP_TAG_OPERATION, "job-printer-uri", uri);
 				break;
@@ -131,7 +131,7 @@ bool KMCupsJobManager::listJobs(const TQString& prname, KMJobManager::JobType ty
 	req.setOperation(IPP_GET_JOBS);
 
 	// add printer-uri
-	KMPrinter *mp = KMManager::self()->tqfindPrinter(prname);
+	KMPrinter *mp = KMManager::self()->findPrinter(prname);
 	if (!mp)
 		return false;
 
@@ -150,7 +150,7 @@ bool KMCupsJobManager::listJobs(const TQString& prname, KMJobManager::JobType ty
 	// other attributes
 	req.addKeyword(IPP_TAG_OPERATION, "requested-attributes", keys);
 	if (type == KMJobManager::CompletedJobs)
-		req.addKeyword(IPP_TAG_OPERATION,"which-jobs",TQString::tqfromLatin1("completed"));
+		req.addKeyword(IPP_TAG_OPERATION,"which-jobs",TQString::fromLatin1("completed"));
 	if (limit > 0)
 		req.addInteger(IPP_TAG_OPERATION,"limit",limit);
 
@@ -212,13 +212,13 @@ void KMCupsJobManager::parseListAnswer(IppRequest& req, KMPrinter *pr)
 		else if (name == "job-printer-uri" && !pr->isRemote())
 		{
 			QString	str(attr->values[0].string.text);
-			int	p = str.tqfindRev('/');
+			int	p = str.findRev('/');
 			if (p != -1)
 				job->setPrinter(str.mid(p+1));
 		}
 		else if (name == "job-priority")
 		{
-			job->setAttribute(0, TQString::tqfromLatin1("%1").arg(attr->values[0].integer, 3));
+			job->setAttribute(0, TQString::fromLatin1("%1").arg(attr->values[0].integer, 3));
 		}
 		else if (name == "job-billing")
 		{
@@ -356,7 +356,7 @@ static TQString processRange(const TQString& range)
 	for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it)
 	{
 		s.append(*it);
-		if ((*it).tqfind('-') == -1)
+		if ((*it).find('-') == -1)
 			s.append("-").append(*it);
 		s.append(",");
 	}
@@ -387,22 +387,22 @@ bool KMCupsJobManager::editJobAttributes(KMJob *j)
 
 	TQMap<TQString,TQString>	opts = req.toMap(IPP_TAG_JOB);
 	// translate the "Copies" option to non-CUPS syntax
-	if (opts.tqcontains("copies"))
+	if (opts.contains("copies"))
 		opts["kde-copies"] = opts["copies"];
-	if (opts.tqcontains("page-set"))
+	if (opts.contains("page-set"))
 		opts["kde-pageset"] = (opts["page-set"] == "even" ? "2" : (opts["page-set"] == "odd" ? "1" : "0"));
-	if (opts.tqcontains("OutputOrder"))
+	if (opts.contains("OutputOrder"))
 		opts["kde-pageorder"] = opts["OutputOrder"];
-	if (opts.tqcontains("multiple-document-handling"))
+	if (opts.contains("multiple-document-handling"))
 		opts["kde-collate"] = (opts["multiple-document-handling"] == "separate-documents-collated-copies" ? "Collate" : "Uncollate");
-	if (opts.tqcontains("page-ranges"))
+	if (opts.contains("page-ranges"))
 		opts["kde-range"] = opts["page-ranges"];
 
-	// tqfind printer and construct dialog
-	KMPrinter	*prt = KMManager::self()->tqfindPrinter(j->printer());
+	// find printer and construct dialog
+	KMPrinter	*prt = KMManager::self()->findPrinter(j->printer());
 	if (!prt)
 	{
-		KMManager::self()->setErrorMsg(i18n("Unable to tqfind printer %1.").arg(j->printer()));
+		KMManager::self()->setErrorMsg(i18n("Unable to find printer %1.").arg(j->printer()));
 		return false;
 	}
 	KMManager::self()->completePrinterShort(prt);
diff --git a/kdeprint/cups/kmcupsmanager.cpp b/kdeprint/cups/kmcupsmanager.cpp
index 2b1f14ddd..2d923a371 100644
--- a/kdeprint/cups/kmcupsmanager.cpp
+++ b/kdeprint/cups/kmcupsmanager.cpp
@@ -95,7 +95,7 @@ KMCupsManager::~KMCupsManager()
 
 TQString KMCupsManager::driverDbCreationProgram()
 {
-	return TQString::tqfromLatin1("/opt/kde3/bin/make_driver_db_cups");
+	return TQString::fromLatin1("/opt/kde3/bin/make_driver_db_cups");
 }
 
 TQString KMCupsManager::driverDirectory()
@@ -148,7 +148,7 @@ bool KMCupsManager::createPrinter(KMPrinter *p)
 		req.setOperation(CUPS_ADD_PRINTER);
 		// only set the device-uri if needed, otherwise you may loose authentification
 		// data (login/password in URI's like smb or ipp).
-		KMPrinter	*otherP = tqfindPrinter(p->printerName());
+		KMPrinter	*otherP = findPrinter(p->printerName());
 		if (!otherP || otherP->device() != p->device())
 		{
 			/**
@@ -173,7 +173,7 @@ bool KMCupsManager::createPrinter(KMPrinter *p)
 		else if (!p->option("requesting-user-name-allowed").isEmpty())
 			req.addName(IPP_TAG_PRINTER,"requesting-user-name-allowed",TQStringList::split(",",p->option("requesting-user-name-allowed"),false));
 		else
-			req.addName(IPP_TAG_PRINTER,"requesting-user-name-allowed",TQString::tqfromLatin1("all"));
+			req.addName(IPP_TAG_PRINTER,"requesting-user-name-allowed",TQString::fromLatin1("all"));
 	}
 	req.addText(IPP_TAG_PRINTER,"printer-info",p->description());
 	req.addText(IPP_TAG_PRINTER,"printer-location",p->location());
@@ -287,9 +287,9 @@ bool KMCupsManager::completePrinterShort(KMPrinter *p)
 	delete kes;
 	m_hostSuccess = false;
 	} else {
-	TQDateTime tm = TQDateTime::tqcurrentDateTime().addSecs(2);
-	while (!m_lookupDone && (TQDateTime::tqcurrentDateTime() < tm))
-	tqApp->processEvents();
+	TQDateTime tm = TQDateTime::currentDateTime().addSecs(2);
+	while (!m_lookupDone && (TQDateTime::currentDateTime() < tm))
+	qApp->processEvents();
 
 	kes->cancelAsyncConnect();
 
@@ -347,7 +347,7 @@ bool KMCupsManager::completePrinterShort(KMPrinter *p)
 				QStringList	members;
 				for (TQStringList::ConstIterator it=values.begin(); it!=values.end(); ++it)
 				{
-				int	p = (*it).tqfindRev('/');
+				int	p = (*it).findRev('/');
 				if (p != -1)
 				members.append((*it).right((*it).length()-p-1));
 				}
@@ -358,8 +358,8 @@ bool KMCupsManager::completePrinterShort(KMPrinter *p)
 		// banners
 		req.name("job-sheets-default",values);
 		while (values.count() < 2) values.append("none");
-		p->setOption("kde-banners",values.join(TQString::tqfromLatin1(",")));
-		if (req.name("job-sheets-supported",values)) p->setOption("kde-banners-supported",values.join(TQString::tqfromLatin1(",")));
+		p->setOption("kde-banners",values.join(TQString::fromLatin1(",")));
+		if (req.name("job-sheets-supported",values)) p->setOption("kde-banners-supported",values.join(TQString::fromLatin1(",")));
 
 		// quotas
 		int	ival;
@@ -405,7 +405,7 @@ bool KMCupsManager::testPrinter(KMPrinter *p)
 	   req.addURI(IPP_TAG_OPERATION,"printer-uri",uri);
 	   req.addMime(IPP_TAG_OPERATION,"document-format","application/postscript");
 	   if (!CupsInfos::self()->login().isEmpty()) req.addName(IPP_TAG_OPERATION,"requesting-user-name",CupsInfos::self()->login());
-	   req.addName(IPP_TAG_OPERATION,"job-name",TQString::tqfromLatin1("KDE Print Test"));
+	   req.addName(IPP_TAG_OPERATION,"job-name",TQString::fromLatin1("KDE Print Test"));
 	   if (req.doFileRequest("/printers/",testpage))
 	   return true;
 	   reportIppError(&req);
@@ -453,12 +453,12 @@ void KMCupsManager::loadServerPrinters()
 			// load default
 			req.init();
 			req.setOperation(CUPS_GET_DEFAULT);
-			req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",TQString::tqfromLatin1("printer-name"));
+			req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",TQString::fromLatin1("printer-name"));
 			if (req.doRequest("/printers/"))
 			{
 				QString	s = TQString::null;
 				req.name("printer-name",s);
-				setHardDefault(tqfindPrinter(s));
+				setHardDefault(findPrinter(s));
 			}
 			// This request may fails for example if no printer is defined. Just
 			// discard the error message. Indeed as we successfully got printers
@@ -536,12 +536,12 @@ DrMain* KMCupsManager::loadPrinterDriver(KMPrinter *p, bool)
 	if (p->isClass(true)) 
 	{
 		KMPrinter *first_class_member = NULL;
-		/* tqfind the first printer in the class */
- 		first_class_member = tqfindPrinter(p->members().first());
+		/* find the first printer in the class */
+ 		first_class_member = findPrinter(p->members().first());
 	  
 		if (first_class_member == NULL) 
 		{
-			/* we didn't tqfind a printer in the class */
+			/* we didn't find a printer in the class */
 			return NULL;
 		}
 		else
@@ -576,11 +576,11 @@ DrMain* KMCupsManager::loadMaticDriver(const TQString& drname)
 {
 	QStringList	comps = TQStringList::split('/', drname, false);
 	QString	tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8));
-	QString	PATH = getenv("PATH") + TQString::tqfromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
+	QString	PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
 	QString	exe = KStandardDirs::findExe("foomatic-datafile", PATH);
 	if (exe.isEmpty())
 	{
-		setErrorMsg(i18n("Unable to tqfind the executable foomatic-datafile "
+		setErrorMsg(i18n("Unable to find the executable foomatic-datafile "
 					"in your PATH. Check that Foomatic is correctly installed."));
 		return NULL;
 	}
@@ -655,30 +655,30 @@ void KMCupsManager::saveDriverFile(DrMain *driver, const TQString& filename)
 			if (line.startsWith("*% COMDATA #"))
 			{
 				int	p(-1), q(-1);
-				if ((p=line.tqfind("'name'")) != -1)
+				if ((p=line.find("'name'")) != -1)
 				{
-					p = line.tqfind('\'',p+6)+1;
-					q = line.tqfind('\'',p);
+					p = line.find('\'',p+6)+1;
+					q = line.find('\'',p);
 					keyword = line.mid(p,q-p);
-					opt = driver->tqfindOption(keyword);
+					opt = driver->findOption(keyword);
 					if (opt && (opt->type() == DrBase::Integer || opt->type() == DrBase::Float))
 						isnumeric = true;
 					else
 						isnumeric = false;
 				}
-				/*else if ((p=line.tqfind("'type'")) != -1)
+				/*else if ((p=line.find("'type'")) != -1)
 				{
-					p = line.tqfind('\'',p+6)+1;
-					if (line.tqfind("float",p) != -1 || line.tqfind("int",p) != -1)
+					p = line.find('\'',p+6)+1;
+					if (line.find("float",p) != -1 || line.find("int",p) != -1)
 						isnumeric = true;
 					else
 						isnumeric = false;
 				}*/
-				else if ((p=line.tqfind("'default'")) != -1 && !keyword.isEmpty() && opt && isnumeric)
+				else if ((p=line.find("'default'")) != -1 && !keyword.isEmpty() && opt && isnumeric)
 				{
 					QString	prefix = line.left(p+9);
 					tout << prefix << " => '" << opt->valueText() << '\'';
-					if (line.tqfind(',',p) != -1)
+					if (line.find(',',p) != -1)
 						tout << ',';
 					tout << endl;
 					continue;
@@ -687,13 +687,13 @@ void KMCupsManager::saveDriverFile(DrMain *driver, const TQString& filename)
 			}
 			else if (line.startsWith("*Default"))
 			{
-				int	p = line.tqfind(':',8);
+				int	p = line.find(':',8);
 				keyword = line.mid(8,p-8);
 				DrBase *bopt = 0;
 				if ( keyword == "PageRegion" || keyword == "ImageableArea" || keyword == "PaperDimension" )
-					bopt = driver->tqfindOption( TQString::tqfromLatin1( "PageSize" ) );
+					bopt = driver->findOption( TQString::fromLatin1( "PageSize" ) );
 				else
-					bopt = driver->tqfindOption( keyword );
+					bopt = driver->findOption( keyword );
 				if (bopt)
 					switch (bopt->type())
 					{
@@ -938,7 +938,7 @@ void KMCupsManager::slotConnectionSuccess()
 
 	IppRequest req;
 	req.setOperation( CUPS_GET_PRINTERS );
-	req.addKeyword( IPP_TAG_OPERATION, "requested-attributes", TQString::tqfromLatin1( "printer-name" ) );
+	req.addKeyword( IPP_TAG_OPERATION, "requested-attributes", TQString::fromLatin1( "printer-name" ) );
 	if ( req.doRequest( "/printers/" ) )
 		setUpdatePossible( true );
 	else
@@ -1056,7 +1056,7 @@ static TQString downloadDriver(KMPrinter *p)
 		cupsSetServer(p->uri().host().local8Bit());
 		ippSetPort(p->uri().port());
 		// strip any "@..." from the printer name
-		prname = prname.tqreplace(TQRegExp("@.*"), "");
+		prname = prname.replace(TQRegExp("@.*"), "");
 		changed = true;
 	}
 	*/
diff --git a/kdeprint/cups/kmpropquota.cpp b/kdeprint/cups/kmpropquota.cpp
index 9c6b34565..12e360746 100644
--- a/kdeprint/cups/kmpropquota.cpp
+++ b/kdeprint/cups/kmpropquota.cpp
@@ -27,7 +27,7 @@
 
 // some forward declarations (see kmwquota.cpp)
 const char* unitKeyword(int);
-int tqfindUnit(int&);
+int findUnit(int&);
 
 KMPropQuota::KMPropQuota(TQWidget *parent, const char *name)
 : KMPropWidget(parent,name)
@@ -74,7 +74,7 @@ void KMPropQuota::setPrinter(KMPrinter *p)
 		if (si == 0 && pa == 0)
 			qu = -1;
 		if (qu > 0)
-			un = tqfindUnit(qu);
+			un = findUnit(qu);
 		m_period->setText(qu == -1 ? i18n("No quota") : TQString::number(qu).append(" ").append(i18n(unitKeyword(un))));
 		m_sizelimit->setText(si ? TQString::number(si) : i18n("None"));
 		m_pagelimit->setText(pa ? TQString::number(pa) : i18n("None"));
diff --git a/kdeprint/cups/kmpropusers.cpp b/kdeprint/cups/kmpropusers.cpp
index 35d6f0fe1..3f0792d9c 100644
--- a/kdeprint/cups/kmpropusers.cpp
+++ b/kdeprint/cups/kmpropusers.cpp
@@ -29,7 +29,7 @@ KMPropUsers::KMPropUsers(TQWidget *parent, const char *name)
 : KMPropWidget(parent,name)
 {
 	m_text = new TQTextView(this);
-	m_text->setPaper(tqcolorGroup().background());
+	m_text->setPaper(colorGroup().background());
 	m_text->setFrameStyle(TQFrame::NoFrame);
 
 	QVBoxLayout	*l0 = new TQVBoxLayout(this, 10, 0);
diff --git a/kdeprint/cups/kmwbanners.cpp b/kdeprint/cups/kmwbanners.cpp
index a92381b21..80a21a37c 100644
--- a/kdeprint/cups/kmwbanners.cpp
+++ b/kdeprint/cups/kmwbanners.cpp
@@ -70,7 +70,7 @@ TQString mapBanner( const TQString& ban )
 	if ( map.size() == 0 )
 		for ( int i=0; bannermap[ i ].banner; i++ )
 			map[ bannermap[ i ].banner ] = bannermap[ i ].name;
-	TQMap<TQString,TQString>::ConstIterator it = map.tqfind( ban );
+	TQMap<TQString,TQString>::ConstIterator it = map.find( ban );
 	if ( it == map.end() )
 		return ban;
 	else
@@ -120,7 +120,7 @@ void KMWBanners::initPrinter(KMPrinter *p)
 			m_bans = TQStringList::split(',',p->option("kde-banners-supported"),false);
 			if (m_bans.count() == 0)
 				m_bans = defaultBanners();
-			if (m_bans.tqfind("none") == m_bans.end())
+			if (m_bans.find("none") == m_bans.end())
 				m_bans.prepend("none");
 			for ( TQStringList::Iterator it=m_bans.begin(); it!=m_bans.end(); ++it )
 			{
@@ -131,8 +131,8 @@ void KMWBanners::initPrinter(KMPrinter *p)
 		QStringList	l = TQStringList::split(',',p->option("kde-banners"),false);
 		while (l.count() < 2)
 			l.append("none");
-		m_start->setCurrentItem(m_bans.tqfindIndex(l[0]));
-		m_end->setCurrentItem(m_bans.tqfindIndex(l[1]));
+		m_start->setCurrentItem(m_bans.findIndex(l[0]));
+		m_end->setCurrentItem(m_bans.findIndex(l[1]));
 	}
 }
 
diff --git a/kdeprint/cups/kmwfax.cpp b/kdeprint/cups/kmwfax.cpp
index 45cd502fd..ea5b98f3b 100644
--- a/kdeprint/cups/kmwfax.cpp
+++ b/kdeprint/cups/kmwfax.cpp
@@ -48,7 +48,7 @@ KMWFax::KMWFax(TQWidget *parent, const char *name)
 	// initialize
 	IppRequest	req;
 	req.setOperation(CUPS_GET_DEVICES);
-	QString	uri = TQString::tqfromLatin1("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr());
+	QString	uri = TQString::fromLatin1("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr());
 	req.addURI(IPP_TAG_OPERATION,"printer-uri",uri);
 	if (req.doRequest("/"))
 	{
@@ -57,7 +57,7 @@ KMWFax::KMWFax(TQWidget *parent, const char *name)
 		{
 			if (attr->name && strcmp(attr->name,"device-uri") == 0 && strncmp(attr->values[0].string.text,"fax",3) == 0)
 			{
-				m_list->insertItem(SmallIcon("blockdevice"),TQString::tqfromLatin1(attr->values[0].string.text));
+				m_list->insertItem(SmallIcon("blockdevice"),TQString::fromLatin1(attr->values[0].string.text));
 			}
 			attr = attr->next;
 		}
diff --git a/kdeprint/cups/kmwipp.cpp b/kdeprint/cups/kmwipp.cpp
index 81bcf584c..c0d30c452 100644
--- a/kdeprint/cups/kmwipp.cpp
+++ b/kdeprint/cups/kmwipp.cpp
@@ -41,7 +41,7 @@ KMWIpp::KMWIpp(TQWidget *parent, const char *name)
 		     "before continuing.</p>"));
 	setLabel(0,i18n("Host:"));
 	setLabel(1,i18n("Port:"));
-	setText( 1, TQString::tqfromLatin1( "631" ) );
+	setText( 1, TQString::fromLatin1( "631" ) );
 }
 
 bool KMWIpp::isValid(TQString& msg)
diff --git a/kdeprint/cups/kmwippprinter.cpp b/kdeprint/cups/kmwippprinter.cpp
index 417bb4a77..4900a584b 100644
--- a/kdeprint/cups/kmwippprinter.cpp
+++ b/kdeprint/cups/kmwippprinter.cpp
@@ -59,7 +59,7 @@ KMWIppPrinter::KMWIppPrinter(TQWidget *parent, const char *name)
 	l1->setBuddy(m_uri);
 
 	m_info = new TQTextView(this);
-	m_info->setPaper(tqcolorGroup().background());
+	m_info->setPaper(colorGroup().background());
 	m_info->setMinimumHeight(100);
 	m_info->setText(i18n("<p>Either enter the printer URI directly, or use the network scanning facility.</p>"));
 	m_ippreport = new KPushButton(KGuiItem(i18n("&IPP Report"), "kdeprint_report"), this);
@@ -77,7 +77,7 @@ KMWIppPrinter::KMWIppPrinter(TQWidget *parent, const char *name)
 	connect( m_scanner, TQT_SIGNAL( scanFinished() ), parent, TQT_SLOT( enableWizard() ) );
 	connect(m_ippreport, TQT_SIGNAL(clicked()), TQT_SLOT(slotIppReport()));
 
-	// tqlayout
+	// layout
 	QHBoxLayout	*lay3 = new TQHBoxLayout(this, 0, 10);
 	QVBoxLayout	*lay2 = new TQVBoxLayout(0, 0, 0);
 	QHBoxLayout	*lay4 = new TQHBoxLayout(0, 0, 0);
@@ -157,7 +157,7 @@ void KMWIppPrinter::slotPrinterSelected(TQListViewItem *item)
 	req.setOperation(IPP_GET_PRINTER_ATTRIBUTES);
 	req.setHost(item->text(1));
 	req.setPort(item->text(2).toInt());
-	uri = TQString::tqfromLatin1("ipp://%1:%2/ipp").arg(item->text(1)).arg(item->text(2));
+	uri = TQString::fromLatin1("ipp://%1:%2/ipp").arg(item->text(1)).arg(item->text(2));
 	req.addURI(IPP_TAG_OPERATION,"printer-uri",uri);
 	keys.append("printer-name");
 	keys.append("printer-state");
@@ -172,11 +172,11 @@ void KMWIppPrinter::slotPrinterSelected(TQListViewItem *item)
 		int 	state;
 		if (req.name("printer-name",value)) txt.append(i18n("<b>Name</b>: %1<br>").arg(value));
 		if (req.text("printer-location",value) && !value.isEmpty()) txt.append(i18n("<b>Location</b>: %1<br>").arg(value));
-		if (req.text("printer-info",value) && !value.isEmpty()) txt.append(i18n("<b>Description</b>: %1<br>").arg(value.tqreplace(TQRegExp(";"),"<br>")));
+		if (req.text("printer-info",value) && !value.isEmpty()) txt.append(i18n("<b>Description</b>: %1<br>").arg(value.replace(TQRegExp(";"),"<br>")));
 		if (req.uri("printer-uri-supported",value))
 		{
 			if (value[0] == '/')
-				value.prepend(TQString::tqfromLatin1("ipp://%1:%2").arg(item->text(1)).arg(item->text(2)));
+				value.prepend(TQString::fromLatin1("ipp://%1:%2").arg(item->text(1)).arg(item->text(2)));
 			m_uri->setText(value);
 		}
 		if (req.text("printer-make-and-model",value) && !value.isEmpty()) txt.append(i18n("<b>Model</b>: %1<br>").arg(value));
diff --git a/kdeprint/cups/kmwippselect.cpp b/kdeprint/cups/kmwippselect.cpp
index 38fff88df..fbfa597c7 100644
--- a/kdeprint/cups/kmwippselect.cpp
+++ b/kdeprint/cups/kmwippselect.cpp
@@ -75,16 +75,16 @@ void KMWIppSelect::initPrinter(KMPrinter *p)
 	IppRequest	req;
 	QString		uri;
 	req.setOperation(CUPS_GET_PRINTERS);
-	uri = TQString::tqfromLatin1("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr());
+	uri = TQString::fromLatin1("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr());
 	req.addURI(IPP_TAG_OPERATION,"printer-uri",uri);
-	req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",TQString::tqfromLatin1("printer-name"));
+	req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",TQString::fromLatin1("printer-name"));
 	if (req.doRequest("/printers/"))
 	{
 		ipp_attribute_t	*attr = req.first();
 		while (attr)
 		{
 			if (attr->name && strcmp(attr->name,"printer-name") == 0)
-				m_list->insertItem(SmallIcon("kdeprint_printer"),TQString::tqfromLatin1(attr->values[0].string.text));
+				m_list->insertItem(SmallIcon("kdeprint_printer"),TQString::fromLatin1(attr->values[0].string.text));
 			attr = attr->next;
 		}
 		m_list->sort();
diff --git a/kdeprint/cups/kmwother.cpp b/kdeprint/cups/kmwother.cpp
index f7c91cca0..36e80c76d 100644
--- a/kdeprint/cups/kmwother.cpp
+++ b/kdeprint/cups/kmwother.cpp
@@ -89,7 +89,7 @@ void KMWOther::initPrinter(KMPrinter *p)
 			TQString prt = *( ++it );
 			if ( !prt.isEmpty() )
 				desc.append( " [" + prt + "]" );
-			TQListViewItem *parent = parents.tqfind( cl );
+			TQListViewItem *parent = parents.find( cl );
 			if ( !parent )
 			{
 				parent = new TQListViewItem( root, lastparent, cl );
@@ -105,7 +105,7 @@ void KMWOther::initPrinter(KMPrinter *p)
 				lastparent = parent;
 				parents.insert( cl, parent );
 			}
-			item = new TQListViewItem( parent, last.tqfind( cl ), desc, uri);
+			item = new TQListViewItem( parent, last.find( cl ), desc, uri);
 			last.insert( cl, item );
 		}
 	}
diff --git a/kdeprint/cups/kmwquota.cpp b/kdeprint/cups/kmwquota.cpp
index cb4b93ca1..f9c34c04a 100644
--- a/kdeprint/cups/kmwquota.cpp
+++ b/kdeprint/cups/kmwquota.cpp
@@ -51,7 +51,7 @@ static const char* time_keywords[] = {
 	I18N_NOOP("month(s)")
 };
 
-int tqfindUnit(int& period)
+int findUnit(int& period)
 {
 	int	unit(0);
 	for (int i=N_TIME_LIMITS-1;i>=0;i--)
@@ -146,7 +146,7 @@ void KMWQuota::initPrinter(KMPrinter *p)
 	m_pagelimit->setValue(pa);
 	if (qu > 0)
 	{
-		un = tqfindUnit(qu);
+		un = findUnit(qu);
 	}
 	m_timeunit->setCurrentItem(un);
 	m_period->setValue(qu);
diff --git a/kdeprint/cups/kphpgl2page.cpp b/kdeprint/cups/kphpgl2page.cpp
index 7abb40de5..7ec413e52 100644
--- a/kdeprint/cups/kphpgl2page.cpp
+++ b/kdeprint/cups/kphpgl2page.cpp
@@ -128,7 +128,7 @@ KPHpgl2Page::KPHpgl2Page(TQWidget *parent, const char *name)
 	l0->addWidget(box);
 	l0->addStretch(1);
 
-	QVBoxLayout	*l1 = new TQVBoxLayout(box->tqlayout(), 10);
+	QVBoxLayout	*l1 = new TQVBoxLayout(box->layout(), 10);
 	l1->addWidget(m_blackplot);
 	l1->addWidget(m_fitplot);
 	l1->addWidget(m_penwidth);
@@ -142,9 +142,9 @@ KPHpgl2Page::~KPHpgl2Page()
 void KPHpgl2Page::setOptions(const TQMap<TQString,TQString>& opts)
 {
 	QString	value;
-	if (opts.tqcontains("blackplot") && ((value=opts["blackplot"]).isEmpty() || value == "true"))
+	if (opts.contains("blackplot") && ((value=opts["blackplot"]).isEmpty() || value == "true"))
 		m_blackplot->setChecked(true);
-	if (opts.tqcontains("fitplot") && ((value=opts["fitplot"]).isEmpty() || value == "true"))
+	if (opts.contains("fitplot") && ((value=opts["fitplot"]).isEmpty() || value == "true"))
 		m_fitplot->setChecked(true);
 	if (!(value=opts["penwidth"]).isEmpty())
 		m_penwidth->setValue(value.toInt());
diff --git a/kdeprint/cups/kpimagepage.cpp b/kdeprint/cups/kpimagepage.cpp
index 03ea4b984..c4cf50e48 100644
--- a/kdeprint/cups/kpimagepage.cpp
+++ b/kdeprint/cups/kpimagepage.cpp
@@ -192,7 +192,7 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name)
 	TQString whatsThisPreviewPositionImagePage = i18n( " <qt> "
 			" <p><b>Position Preview Thumbnail</b></p> "
 			" <p>This position preview thumbnail indicates the position of the image on the paper sheet. "
-			" <p>Click on horizontal and vertical radio buttons to move image tqalignment on paper around. Options are: "
+			" <p>Click on horizontal and vertical radio buttons to move image alignment on paper around. Options are: "
 			" <ul> "
 			" <li> center      </li>"
 			" <li> top         </li>"
@@ -313,7 +313,7 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name)
 	QRadioButton	*left = new TQRadioButton(positionbox);
 	QRadioButton	*right = new TQRadioButton(positionbox);
 	QRadioButton	*hcenter = new TQRadioButton(positionbox);
-	QSize	sz = bottom->tqsizeHint();
+	QSize	sz = bottom->sizeHint();
 	bottom->setFixedSize(sz);
 	vcenter->setFixedSize(sz);
 	top->setFixedSize(sz);
@@ -353,7 +353,7 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name)
 	l0->addWidget(sizebox, 1, 0);
 	l0->addWidget(positionbox, 1, 1);
 	l0->setColStretch(0, 1);
-	QGridLayout	*l1 = new TQGridLayout(colorbox->tqlayout(), 5, 2, 10);
+	QGridLayout	*l1 = new TQGridLayout(colorbox->layout(), 5, 2, 10);
 	l1->addWidget(m_brightness, 0, 0);
 	l1->addWidget(m_hue, 1, 0);
 	l1->addWidget(m_saturation, 2, 0);
@@ -361,14 +361,14 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name)
 	l1->addWidget(m_gamma, 4, 0);
 	l1->addMultiCellWidget(m_preview, 0, 3, 1, 1);
 	l1->addWidget(defbtn, 4, 1);
-	QVBoxLayout	*l2 = new TQVBoxLayout(sizebox->tqlayout(), 3);
+	QVBoxLayout	*l2 = new TQVBoxLayout(sizebox->layout(), 3);
 	l2->addStretch(1);
 	l2->addWidget(lab);
 	l2->addWidget(m_sizetype);
 	l2->addSpacing(10);
 	l2->addWidget(m_size);
 	l2->addStretch(1);
-	QGridLayout	*l3 = new TQGridLayout(positionbox->tqlayout(), 2, 2, 10);
+	QGridLayout	*l3 = new TQGridLayout(positionbox->layout(), 2, 2, 10);
 	QHBoxLayout	*l4 = new TQHBoxLayout(0, 0, 10);
 	QVBoxLayout	*l5 = new TQVBoxLayout(0, 0, 10);
 	l3->addLayout(l4, 0, 1);
diff --git a/kdeprint/cups/kpschedulepage.cpp b/kdeprint/cups/kpschedulepage.cpp
index 4ee29438f..3c2edaf0f 100644
--- a/kdeprint/cups/kpschedulepage.cpp
+++ b/kdeprint/cups/kpschedulepage.cpp
@@ -233,10 +233,10 @@ void KPSchedulePage::setOptions(const TQMap<TQString,TQString>& opts)
 	}
 	QRegExp	re("^\"|\"$");
 	t = opts["job-billing"].stripWhiteSpace();
-	t.tqreplace(re, "");
+	t.replace(re, "");
 	m_billing->setText(t);
 	t = opts["page-label"].stripWhiteSpace();
-	t.tqreplace(re, "");
+	t.replace(re, "");
 	m_pagelabel->setText(t);
 	int	val = opts["job-priority"].toInt();
 	if (val != 0)
diff --git a/kdeprint/cups/kptagspage.cpp b/kdeprint/cups/kptagspage.cpp
index b817b4e8b..7a1fd0924 100644
--- a/kdeprint/cups/kptagspage.cpp
+++ b/kdeprint/cups/kptagspage.cpp
@@ -93,7 +93,7 @@ KPTagsPage::KPTagsPage(bool ro, TQWidget *parent, const char *name)
 		QFont	f = lab->font();
 		f.setBold(true);
 		lab->setFont(f);
-		lab->tqsetAlignment(AlignVCenter|AlignRight);
+		lab->setAlignment(AlignVCenter|AlignRight);
 		l0->addWidget(lab);
 	}
 }
@@ -110,7 +110,7 @@ bool KPTagsPage::isValid(TQString& msg)
 		QString	tag(m_tags->text(r, 0));
 		if (tag.isEmpty())
 			continue;
-		else if (tag.tqfind(re) != -1)
+		else if (tag.find(re) != -1)
 		{
 			msg = i18n("The tag name must not contain any spaces, tabs or quotes: <b>%1</b>.").arg(tag);
 			return false;
@@ -129,7 +129,7 @@ void KPTagsPage::setOptions(const TQMap<TQString,TQString>& opts)
 		{
 			m_tags->setText(r, 0, it.key().mid(9));
 			QString	data = it.data();
-			m_tags->setText(r, 1, data.tqreplace(re, ""));
+			m_tags->setText(r, 1, data.replace(re, ""));
 			r++;
 		}
 	}
@@ -153,12 +153,12 @@ void KPTagsPage::getOptions(TQMap<TQString,TQString>& opts, bool)
 	}
 }
 
-TQSize KPTagsPage::tqsizeHint() const
+TQSize KPTagsPage::sizeHint() const
 {
 	return TQSize(-1, -1);
 }
 
-TQSize KPTagsPage::tqminimumSizeHint() const
+TQSize KPTagsPage::minimumSizeHint() const
 {
 	return TQSize(-1, -1);
 }
diff --git a/kdeprint/cups/kptagspage.h b/kdeprint/cups/kptagspage.h
index fc5c88046..46b85c000 100644
--- a/kdeprint/cups/kptagspage.h
+++ b/kdeprint/cups/kptagspage.h
@@ -34,8 +34,8 @@ public:
 	void setOptions(const TQMap<TQString,TQString>& opts);
 	bool isValid(TQString& msg);
 
-	TQSize tqsizeHint() const;
-	TQSize tqminimumSizeHint() const;
+	TQSize sizeHint() const;
+	TQSize minimumSizeHint() const;
 
 private:
 	QTable	*m_tags;
diff --git a/kdeprint/cups/kptextpage.cpp b/kdeprint/cups/kptextpage.cpp
index d6de3e0a1..75fc838cc 100644
--- a/kdeprint/cups/kptextpage.cpp
+++ b/kdeprint/cups/kptextpage.cpp
@@ -108,7 +108,7 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name)
 	TQString whatsThisMarginsTextPage = i18n( " <qt> "
 			" <p><b>Margins</b></p> "
 			" <p>These settings control the margins of printouts on the paper. They are not valid for "
-			" jobs originating from applications which define their own page tqlayout internally and "
+			" jobs originating from applications which define their own page layout internally and "
 			" send PostScript to KDEPrint (such as KOffice or OpenOffice.org). </p> "
 			" <p>When printing from KDE applications, such as KMail and Konqueror, or printing an ASCII text "
 			" file through kprinter, you can choose your preferred margin settings here. </p> "
@@ -134,7 +134,7 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name)
 	TQString whatsThisPrettyprintButtonOnTextPage = i18n( " <qt> "
 			" <p><b>Turn Text Printing with Syntax Highlighting (Prettyprint) On!</b></p> "
 			" <p>ASCII text file printouts can be 'prettyfied' by enabling this option. If you do so, "
-			" a header is printed at the top of each page. The header tqcontains "
+			" a header is printed at the top of each page. The header contains "
 			" the page number, job title (usually the filename), and the date. In addition, C and "
 			" C++ keywords are highlighted, and comment lines are italicized.</p>"
 			" <p>This prettyprint option is handled by CUPS.</p> "
@@ -167,7 +167,7 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name)
 	TQString whatsThisPrettyprintFrameTextPage = i18n( " <qt> "
 			" <p><b>Print Text with Syntax Highlighting (Prettyprint)</b></p> "
 			" <p>ASCII file printouts can be 'prettyfied' by enabling this option. If you do so, "
-			" a header is printed at the top of each page. The header tqcontains "
+			" a header is printed at the top of each page. The header contains "
 			" the page number, job title (usually the filename), and the date. In addition, C and "
 			" C++ keywords are highlighted, and comment lines are italicized.</p>"
 			" <p>This prettyprint option is handled by CUPS.</p> "
@@ -212,7 +212,7 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name)
 
 	m_prettypix = new TQLabel(prettybox);
 	  TQWhatsThis::add(m_prettypix, whatsThisPrettyprintPreviewIconTextPage);
-	m_prettypix->tqsetAlignment(Qt::AlignCenter);
+	m_prettypix->setAlignment(Qt::AlignCenter);
 	QRadioButton	*off = new TQRadioButton(i18n("&Disabled"), prettybox);
 	  TQWhatsThis::add(off, whatsThisPrettyprintButtonOffTextPage);
 	QRadioButton	*on = new TQRadioButton(i18n("&Enabled"), prettybox);
@@ -233,16 +233,16 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name)
 	l0->addWidget(formatbox, 0, 0);
 	l0->addWidget(prettybox, 0, 1);
 	l0->addMultiCellWidget(marginbox, 1, 1, 0, 1);
-	QVBoxLayout	*l1 = new TQVBoxLayout(formatbox->tqlayout(), 5);
+	QVBoxLayout	*l1 = new TQVBoxLayout(formatbox->layout(), 5);
 	l1->addWidget(m_cpi);
 	l1->addWidget(m_lpi);
 	l1->addWidget(sep);
 	l1->addWidget(m_columns);
-	QGridLayout	*l2 = new TQGridLayout(prettybox->tqlayout(), 2, 2, 10);
+	QGridLayout	*l2 = new TQGridLayout(prettybox->layout(), 2, 2, 10);
 	l2->addWidget(off, 0, 0);
 	l2->addWidget(on, 1, 0);
 	l2->addMultiCellWidget(m_prettypix, 0, 1, 1, 1);
-	QVBoxLayout	*l3 = new TQVBoxLayout(marginbox->tqlayout(), 10);
+	QVBoxLayout	*l3 = new TQVBoxLayout(marginbox->layout(), 10);
 	l3->addWidget(m_margin);
 }
 
@@ -261,7 +261,7 @@ void KPTextPage::setOptions(const TQMap<TQString,TQString>& opts)
 	if (!(value=opts["columns"]).isEmpty())
 		m_columns->setValue(value.toInt());
 	int	ID(0);
-	if (opts.tqcontains("prettyprint") && (opts["prettyprint"].isEmpty() || opts["prettyprint"] == "true"))
+	if (opts.contains("prettyprint") && (opts["prettyprint"].isEmpty() || opts["prettyprint"] == "true"))
 		ID = 1;
 	m_prettyprint->setButton(ID);
 	slotPrettyChanged(ID);
@@ -348,13 +348,13 @@ void KPTextPage::initPageSize(bool landscape)
 	{
 		if (m_currentps.isEmpty())
 		{
-			DrListOption	*o = (DrListOption*)driver()->tqfindOption("PageSize");
+			DrListOption	*o = (DrListOption*)driver()->findOption("PageSize");
 			if (o)
 				m_currentps = o->get("default");
 		}
 		if (!m_currentps.isEmpty())
 		{
-			DrPageSize	*ps = driver()->tqfindPageSize(m_currentps);
+			DrPageSize	*ps = driver()->findPageSize(m_currentps);
 			if (ps)
 			{
 				w = ps->pageWidth();
diff --git a/kdeprint/driver.cpp b/kdeprint/driver.cpp
index 39ca77e06..ce411f0a4 100644
--- a/kdeprint/driver.cpp
+++ b/kdeprint/driver.cpp
@@ -61,7 +61,7 @@ DriverItem* DrBase::createItem(DriverItem *parent, DriverItem *after)
 
 void DrBase::setOptions(const TQMap<TQString,TQString>& opts)
 {
-	if (opts.tqcontains(name())) setValueText(opts[name()]);
+	if (opts.contains(name())) setValueText(opts[name()]);
 }
 
 void DrBase::getOptions(TQMap<TQString,TQString>& opts, bool incldef)
@@ -138,7 +138,7 @@ void DrMain::addPageSize(DrPageSize *ps)
 void DrMain::removeOptionGlobally(const TQString& name)
 {
 	DrGroup	*grp(0);
-	DrBase	*opt = tqfindOption(name, &grp);
+	DrBase	*opt = findOption(name, &grp);
 
 	if (opt && grp)
 	{
@@ -151,7 +151,7 @@ void DrMain::removeOptionGlobally(const TQString& name)
 void DrMain::removeGroupGlobally(DrGroup *grp)
 {
 	DrGroup	*parent(0);
-	if (tqfindGroup(grp, &parent) && parent)
+	if (findGroup(grp, &parent) && parent)
 	{
 		parent->removeGroup(grp);
 		if (parent->isEmpty() && parent != this)
@@ -224,7 +224,7 @@ void DrGroup::addObject(DrBase *optgrp)
 
 void DrGroup::removeOption(const TQString& name)
 {
-	DrBase	*opt = m_options.tqfind(name);
+	DrBase	*opt = m_options.find(name);
 	if (opt)
 	{
 		m_listoptions.removeRef(opt);
@@ -262,28 +262,28 @@ void DrGroup::createTree(DriverItem *parent)
 		item = dit.current()->createItem(parent, item);
 }
 
-DrBase* DrGroup::tqfindOption(const TQString& name, DrGroup **parentGroup)
+DrBase* DrGroup::findOption(const TQString& name, DrGroup **parentGroup)
 {
-	DrBase	*opt = m_options.tqfind(name);
+	DrBase	*opt = m_options.find(name);
 	if (!opt)
 	{
 		TQPtrListIterator<DrGroup>	it(m_subgroups);
 		for (;it.current() && !opt; ++it)
-			opt = it.current()->tqfindOption(name, parentGroup);
+			opt = it.current()->findOption(name, parentGroup);
 	}
 	else if (parentGroup)
 		*parentGroup = this;
 	return opt;
 }
 
-DrGroup* DrGroup::tqfindGroup(DrGroup *grp, DrGroup ** parentGroup)
+DrGroup* DrGroup::findGroup(DrGroup *grp, DrGroup ** parentGroup)
 {
-	DrGroup	*group = (m_subgroups.tqfindRef(grp) == -1 ? 0 : grp);
+	DrGroup	*group = (m_subgroups.findRef(grp) == -1 ? 0 : grp);
 	if (!group)
 	{
 		TQPtrListIterator<DrGroup>	it(m_subgroups);
 		for (;it.current() && !group; ++it)
-			group = it.current()->tqfindGroup(grp, parentGroup);
+			group = it.current()->findGroup(grp, parentGroup);
 	}
 	else if (parentGroup)
 		*parentGroup = this;
@@ -334,7 +334,7 @@ void DrGroup::flattenGroup(TQMap<TQString, DrBase*>& optmap, int& index)
 		optmap[oit.current()->name()] = oit.current();
 
 	if (name().isEmpty())
-		optmap[TQString::tqfromLatin1("group%1").arg(index++)] = this;
+		optmap[TQString::fromLatin1("group%1").arg(index++)] = this;
 	else
 		optmap[name()] = this;
 
@@ -567,7 +567,7 @@ TQString DrListOption::prettyText()
 
 void DrListOption::setValueText(const TQString& s)
 {
-	m_current = tqfindChoice(s);
+	m_current = findChoice(s);
 	if (!m_current)
 	{
 		bool	ok;
@@ -577,7 +577,7 @@ void DrListOption::setValueText(const TQString& s)
 	}
 }
 
-DrBase* DrListOption::tqfindChoice(const TQString& txt)
+DrBase* DrListOption::findChoice(const TQString& txt)
 {
 	TQPtrListIterator<DrBase>	it(m_choices);
 	for (;it.current();++it)
@@ -647,8 +647,8 @@ DrConstraint::DrConstraint(const DrConstraint& d)
 
 bool DrConstraint::check(DrMain *driver)
 {
-	if (!m_option1) m_option1 = (DrListOption*)driver->tqfindOption(m_opt1);
-	if (!m_option2) m_option2 = (DrListOption*)driver->tqfindOption(m_opt2);
+	if (!m_option1) m_option1 = (DrListOption*)driver->findOption(m_opt1);
+	if (!m_option2) m_option2 = (DrListOption*)driver->findOption(m_opt2);
 	if (m_option1 && m_option2 && m_option1->currentChoice() && m_option2->currentChoice())
 	{
 		bool	f1(false), f2(false);
diff --git a/kdeprint/driver.h b/kdeprint/driver.h
index 485024460..a2ccab8a8 100644
--- a/kdeprint/driver.h
+++ b/kdeprint/driver.h
@@ -71,7 +71,7 @@ public:
 
 	const TQString& get(const TQString& key) const 		{ return m_map[key]; }
 	void set(const TQString& key, const TQString& val)	{ m_map[key] = val; }
-	bool has(const TQString& key) const 			{ return m_map.tqcontains(key); }
+	bool has(const TQString& key) const 			{ return m_map.contains(key); }
 	const TQString& name() const				{ return m_name; }
 	void setName(const TQString& s)				{ m_name = s; }
 	bool conflict() const 					{ return m_conflict; }
@@ -118,8 +118,8 @@ public:
 	bool isEmpty();
 
 	virtual DriverItem* createItem(DriverItem *parent, DriverItem *after = 0);
-	DrBase* tqfindOption(const TQString& name, DrGroup **parentGroup = 0);
-	DrGroup* tqfindGroup(DrGroup *grp, DrGroup **parentGroup = 0);
+	DrBase* findOption(const TQString& name, DrGroup **parentGroup = 0);
+	DrGroup* findGroup(DrGroup *grp, DrGroup **parentGroup = 0);
 	void setOptions(const TQMap<TQString,TQString>& opts);
 	void getOptions(TQMap<TQString,TQString>& opts, bool incldef = false);
 	DrBase* clone();
@@ -159,7 +159,7 @@ public:
 	DriverItem* createTreeView(TQListView *parent);
 	void addConstraint(DrConstraint *c)		{ m_constraints.append(c); }
 	int checkConstraints();
-	DrPageSize* tqfindPageSize(const TQString& name)	{ return m_pagesizes.tqfind(name); }
+	DrPageSize* findPageSize(const TQString& name)	{ return m_pagesizes.find(name); }
 	void addPageSize(DrPageSize *sz);
 	void removeOptionGlobally(const TQString& name);
 	void removeGroupGlobally(DrGroup *grp);
@@ -285,7 +285,7 @@ public:
 	void addChoice(DrBase *ch)	{ m_choices.append(ch); }
 	TQPtrList<DrBase>* choices()	{ return &m_choices; }
 	DrBase* currentChoice() const 	{ return m_current; }
-	DrBase* tqfindChoice(const TQString& txt);
+	DrBase* findChoice(const TQString& txt);
 	void setChoice(int choicenum);
 
 	virtual TQString valueText();
diff --git a/kdeprint/driveritem.cpp b/kdeprint/driveritem.cpp
index 8bbfff6a4..7bb1715aa 100644
--- a/kdeprint/driveritem.cpp
+++ b/kdeprint/driveritem.cpp
@@ -46,7 +46,7 @@ void DriverItem::updateText()
 	{
 		QString	s(m_item->get("text"));
 		if (m_item->isOption())
-			s.append(TQString::tqfromLatin1(": <%1>").arg(m_item->prettyText()));
+			s.append(TQString::fromLatin1(": <%1>").arg(m_item->prettyText()));
 		if (m_item->type() == DrBase::List)
 		{
 			// remove all children: something has changed (otherwise this
@@ -107,7 +107,7 @@ void DriverItem::paintCell(TQPainter *p, const TQColorGroup& cg, int, int width,
 		p->drawText(w,0,w1,height(),Qt::AlignLeft|Qt::AlignVCenter,s);
 		w += w1;
 		p->setPen(cg.text());
-		s = TQString::tqfromLatin1(">");
+		s = TQString::fromLatin1(">");
 		w1 = p->fontMetrics().width(s);
 		p->drawText(w,0,w1,height(),Qt::AlignLeft|Qt::AlignVCenter,s);
 	}
@@ -133,7 +133,7 @@ bool DriverItem::updateConflict()
 			m_conflict = (m_item->conflict());
 		}
 	}
-	tqrepaint();
+	repaint();
 	return m_conflict;
 }
 
diff --git a/kdeprint/driverview.cpp b/kdeprint/driverview.cpp
index 90656681e..8b1ad67c7 100644
--- a/kdeprint/driverview.cpp
+++ b/kdeprint/driverview.cpp
@@ -46,7 +46,7 @@ DriverView::DriverView(TQWidget *parent, const char *name)
 	//WhatsThis strings.... (added by pfeifle@kde.org)
 	TQString whatsThisPPDOptionsDriverPage = i18n( " <qt> "
 			" <b>List of Driver Options (from PPD)</b>. "
-			" <p>The upper pane of this dialog page tqcontains all printjob options as laid "
+			" <p>The upper pane of this dialog page contains all printjob options as laid "
 			" down in the printer's description file (PostScript Printer Description == 'PPD') </p>"
 			" <p>Click on any item in the list and watch the lower pane of this dialog page "
 			" display the available values. </p> "
@@ -70,7 +70,7 @@ DriverView::DriverView(TQWidget *parent, const char *name)
 
 	TQString whatsThisOptionSettingsDriverPage = i18n( " <qt> "
 			" <b>List of Possible Values for given Option (from PPD)</b>. "
-			" <p>The lower pane of this dialog page tqcontains all possible values of the printoption "
+			" <p>The lower pane of this dialog page contains all possible values of the printoption "
 			" highlighted above, as laid "
 			" down in the printer's description file (PostScript Printer Description == 'PPD') </p>"
 			" <p>Select the value you want and proceed. </p> "
diff --git a/kdeprint/droptionview.cpp b/kdeprint/droptionview.cpp
index 468ee11c8..f4ccedca4 100644
--- a/kdeprint/droptionview.cpp
+++ b/kdeprint/droptionview.cpp
@@ -219,7 +219,7 @@ void OptionListView::setOption(DrBase *opt)
 
 void OptionListView::setValue(const TQString& val)
 {
-	m_list->setCurrentItem(m_choices.tqfindIndex(val));
+	m_list->setCurrentItem(m_choices.findIndex(val));
 }
 
 void OptionListView::slotSelectionChanged()
@@ -255,9 +255,9 @@ void OptionBooleanView::setOption(DrBase *opt)
 	{
 		TQPtrListIterator<DrBase>	it(*(((DrBooleanOption*)opt)->choices()));
 		m_choices.clear();
-		m_group->tqfind(0)->setText(it.toFirst()->get("text"));
+		m_group->find(0)->setText(it.toFirst()->get("text"));
 		m_choices.append(it.toFirst()->name());
-		m_group->tqfind(1)->setText(it.toLast()->get("text"));
+		m_group->find(1)->setText(it.toLast()->get("text"));
 		m_choices.append(it.toLast()->name());
 		setValue(opt->valueText());
 	}
@@ -265,7 +265,7 @@ void OptionBooleanView::setOption(DrBase *opt)
 
 void OptionBooleanView::setValue(const TQString& val)
 {
-	int	ID = m_choices.tqfindIndex(val);
+	int	ID = m_choices.findIndex(val);
 	m_group->setButton(ID);
 }
 
@@ -306,9 +306,9 @@ DrOptionView::DrOptionView(TQWidget *parent, const char *name)
 	setTitle(i18n("No Option Selected"));
 
 	setColumnLayout(0, Qt::Vertical );
-	tqlayout()->setSpacing( KDialog::spacingHint() );
-	tqlayout()->setMargin( KDialog::marginHint() );
-	QVBoxLayout	*main_ = new TQVBoxLayout(tqlayout(), KDialog::marginHint());
+	layout()->setSpacing( KDialog::spacingHint() );
+	layout()->setMargin( KDialog::marginHint() );
+	QVBoxLayout	*main_ = new TQVBoxLayout(layout(), KDialog::marginHint());
 	main_->addWidget(m_stack);
 
 	m_item = 0;
diff --git a/kdeprint/ext/ext.print b/kdeprint/ext/ext.print
index 195d9b51a..ce300e5ae 100644
--- a/kdeprint/ext/ext.print
+++ b/kdeprint/ext/ext.print
@@ -8,7 +8,7 @@ Comment[be]=Друкаваць праз вонкавую праграму (прÐ
 Comment[bn]=বহিঃস�থ প�রোগ�রামের (generic) সাহায�যে ছাপানো হোক
 Comment[bs]=Štampajte pomoću eksternog programa (generic)
 Comment[ca]=Impressió mitjançant un programa extern (genèric)
-Comment[cs]=Tisk potqmocí externího programu (obecné)
+Comment[cs]=Tisk pomocí externího programu (obecné)
 Comment[csb]=Drëkùjë brëkùjąc bùtnowi programë
 Comment[cy]=Argraffu drwy Raglen Allanol (cyffredinol)
 Comment[da]=Udskriv gennem et eksternt program (generisk)
@@ -58,7 +58,7 @@ Comment[ro]=Tipăreşte prin intermediul unui program extern (generic)
 Comment[ru]=Печать по�ред�твом внешней программы (обща�)
 Comment[rw]=Gucapa uciye muri Porogaramu y'Inyuma (rusange)
 Comment[se]=Čálit olggoldas prográmma bokte (oppalaš)
-Comment[sk]=Tla� potqmocou externého programu (generické)
+Comment[sk]=Tla� pomocou externého programu (generické)
 Comment[sl]=Tiskanje skozi zunanji program (splošno)
 Comment[sq]=Shtyp përmes një programi të jashtëm (përgjithshëm)
 Comment[sr]=Штампање преко �пољњег програма (генерички)
diff --git a/kdeprint/filters/poster.desktop b/kdeprint/filters/poster.desktop
index 79d44ab4f..843290fab 100644
--- a/kdeprint/filters/poster.desktop
+++ b/kdeprint/filters/poster.desktop
@@ -92,8 +92,8 @@ Description[ca]=Utilitat per a imprimir grans pòsters en diversos fulls de pape
 Description[cs]=Nástroj pro tisk velkých plakátů na více menších listů. Aby bylo možné použít tento nástroj, je nutné aby byl dostupný program  <b>poster</b>, tj. aby byl k nalezení v cestě udané promněnnou <tt>PATH</tt>. Zdrojový kó tohoto nástroje je možné nalézt na  <a href="http://printing.kde.org/downloads">www stránce nástroje KDEPrint</a>. <p><b><u>VAROV�N�:</u></b> Balík, který je možné nalézt na webové stránce KDEPrintu je upravená verze originálu, který je k nalezení na každém archívu CTANu. Originální balík <b>nebude</b> s KDE fungovat. <b>Musíte</b> požít balík ze stránky<a href="http://printing.kde.org/downloads">KDEPrintu</a>.
 Description[csb]=Nôrzãdze do drëkòwaniô wiôldżich plakatów (pòsterów) na wielu môłëch kôrtkach papióru. Bë gó brëkòwac na stegnie (zmiennô <tt>PATH</tt>) mòszi bëc przistãpnô programa <b>poster</b>. Zdrojowi kòd do ti programë je mòżno nalezc <a href="http://printing.kde.org/downloads"> na internetowi starnie Systemë Drëkù KDE</a>. <p><b><u>BÔCZËNK:</u></b> Paczét na starnie Systemë Drëkù KDE je zmòdifikòwóną wersëją paczétu, chtërnegò originał przistãpny je w kôżdim archiwùm CPAN. Òriginôł równak <b>nie</b> dzałô pòd KDE. Mùszebnô je wersëjô ze <a href="http://printing.kde.org/downloads">staronë Systemë Drëkù KDE</a>.
 Description[cy]=Cyleuster i argraffu posteri mawr ar dalennau bach lluosol o bapur.  Er mwyn defnyddio'r gorchymyn yma, rhaid i'r gweithredadwyn <b>poster</b> fod yn gyraeddadwy yn eich <tt>PATH</tt>.  Gall côd tarddiad i'r cyfleuster yma fod ar y <a href="http://printing.kde.org/downloads">wefan KDEPrint</a>. <p><b><u>RHYBUDD:</u></b>Mae'r pecyn sydd ar gael ar y wefan KDEPrint yn fersiwn addasiedig o'r un gwreiddiol sydd i'w ganfod ar unrhyw drych archif CTAN, ond <b>ni fydd</b> y pecyn gwreiddiol yn gweithio efo KDE.  <b>Rhaid</b> i chi ddefnyddio'r pecyn sydd ar gael ar y <a href="http://printing.kde.org/downloads">wefan KDEPrint</a>.
-Description[da]=Værktøj til udskrift af store plakater på flere små ark papir. Programmet <b>poster</b> skal være tilgængelig fra din sti (<tt>PATH</tt>) for at du kan bruge denne kommando. Værktøjets kildekode kan tqfindes på <a href="http://printing.kde.org/downloads">KDEPrint's hjemmeside</a>. <p><b><u>ADVARSEL:</u></b> Pakken der tqfindes på KDEPrint's hjemmeside, er en ændret version af den oprindelige som kan tqfindes på enhver CTAN-arkivspejlside, men den oprindelige pakke vil <b>ikke</b> fungere med KDE. Du er <b>nødt til</b> at bruge pakken fra <a href="http://printing.kde.org/downloads">KDEPrint's hjemmeside</a>.
-Description[de]=Dienstprogramm zum Drucken von Plakaten auf mehreren kleineren Blättern. Um diesen Befehl verwenden zu können, muss sich das Programm <b>poster</b> in Ihrem <tt>PATH</tt> betqfinden. Der Quellcode dafür lässt sich über die <a href="http://printing.kde.org/downloads">Webseiten des KDEPrint-Projekts</a> herunterladen.<p><b><u>Achtung:</u></b> Das Paket auf den KDEPrint-Seiten weist einige Veränderungen gegenüber dem Original auf. Letzeres ist beziehbar über jeden Spiegelserver des CTAN-Archivs, aber leider funktioniert diese Originalversion <b>nicht</b> mit KDE. Verwenden Sie also bitte die Version auf den <a href="http://printing.kde.org/downloads">KDEPrint-Seiten</a>.
+Description[da]=Værktøj til udskrift af store plakater på flere små ark papir. Programmet <b>poster</b> skal være tilgængelig fra din sti (<tt>PATH</tt>) for at du kan bruge denne kommando. Værktøjets kildekode kan findes på <a href="http://printing.kde.org/downloads">KDEPrint's hjemmeside</a>. <p><b><u>ADVARSEL:</u></b> Pakken der findes på KDEPrint's hjemmeside, er en ændret version af den oprindelige som kan findes på enhver CTAN-arkivspejlside, men den oprindelige pakke vil <b>ikke</b> fungere med KDE. Du er <b>nødt til</b> at bruge pakken fra <a href="http://printing.kde.org/downloads">KDEPrint's hjemmeside</a>.
+Description[de]=Dienstprogramm zum Drucken von Plakaten auf mehreren kleineren Blättern. Um diesen Befehl verwenden zu können, muss sich das Programm <b>poster</b> in Ihrem <tt>PATH</tt> befinden. Der Quellcode dafür lässt sich über die <a href="http://printing.kde.org/downloads">Webseiten des KDEPrint-Projekts</a> herunterladen.<p><b><u>Achtung:</u></b> Das Paket auf den KDEPrint-Seiten weist einige Veränderungen gegenüber dem Original auf. Letzeres ist beziehbar über jeden Spiegelserver des CTAN-Archivs, aber leider funktioniert diese Originalversion <b>nicht</b> mit KDE. Verwenden Sie also bitte die Version auf den <a href="http://printing.kde.org/downloads">KDEPrint-Seiten</a>.
 Description[el]=Ε�γαλείο για εκτ�πωση μεγάλων αφισών σε πολλές μικ�ές σελίδες. Για να χ�ησιμοποιήσετε αυτή την εντολή, το εκτελέσιμο <b>poster</b> π�έπει να β�ίσκεται στο <tt>PATH</tt> σας. Ο πηγαίος κώδικας γι' αυτό το ε�γαλείο μπο�εί να β�εθεί στο <a href="http://printing.kde.org/downloads">Δικτυακός τόπος του KDEPrint</a>. <p><b><u>ΠΡΟΕΙΔΟΠΟΙΗΣΗ:</u></b> Το πακέτο που β�ίσκεται στο δικτυακό τόπο του KDEPrint είναι μια τ�οποποιημένη έκδοση του π�ωτότυπου που μπο�εί να β�εθεί σε οποιοδήποτε α�χειοθήκη CTAN, αλλά το α�χικό πακέτο <b>δε</b> θα δουλέψει με το KDE. <b>Π�έπει</b> να χ�ησιμοποιήσετε το πακέτο που β�ίσκεται στο <a href="http://printing.kde.org/downloads">Δικτυακός τόπος του KDEPrint</a>.
 Description[eo]=Ilo por presi grandajn plakatojn al multaj malgrandaj paperfolioj. Vi bezonas la programon <b>poster</b>. La kodon por tiu programo troveblas ĉe: <a href="http://printing.kde.org/downloads">KDEPresado ttt-pa�o</a>. <p><b><u>AVERTO:</u></b> la programo trovebla sur la KDEPresado ttt-pa�o estas �an�ita versio de tiu sur la CTAN-ttt-pa�o. La origina pakaĵo de CTAN ne laborus sub la KDE sistemo. Vi <b>devas</b> uzi la pakaĵon trovebla ĉe <a href="http://printing.kde.org/downloads">KDEPresado ttt-pa�o</a>.
 Description[es]=Aplicación para imprimir posters grandes en varias hojas de papel. Para usar esta orden, el ejecutable <b>poster</b> debe estar accesible en su <tt>PATH</tt>. El código fuente de esta utilidad puede encontrarse en la <a href="http://printing.kde.org/downloads">página web de KDEPrint</a>. <p><b><u>AVISO:</u></b> el paquete en la página web KDEPrint es una versión modificada de la original que se puede encontrar en cualquier réplica de archivos de CTAN. Pero el paquete original <b>no</b> funciona con KDE,. Usted <b>debe</b> usar el paquete que se encuentra en <a href="http://printing.kde.org/downloads">el servidor web de KDEPrint</a>.
diff --git a/kdeprint/filters/psnup.xml b/kdeprint/filters/psnup.xml
index 7e2477455..54b71531f 100644
--- a/kdeprint/filters/psnup.xml
+++ b/kdeprint/filters/psnup.xml
@@ -16,7 +16,7 @@
 			<value name="-l" description="Landscape" />
 			<value name="-r" description="Seascape" />
 		</filterarg>
-		<filterarg name="tqlayout" description="Layout" format="%value" type="list" default="">
+		<filterarg name="layout" description="Layout" format="%value" type="list" default="">
 			<value name="" description="Row-Major" />
 			<value name="-c" description="Column-Major" />
 		</filterarg>
diff --git a/kdeprint/foomatic/kfoomaticprinterimpl.cpp b/kdeprint/foomatic/kfoomaticprinterimpl.cpp
index 7e47a505f..b72fbd191 100644
--- a/kdeprint/foomatic/kfoomaticprinterimpl.cpp
+++ b/kdeprint/foomatic/kfoomaticprinterimpl.cpp
@@ -44,7 +44,7 @@ bool KFoomaticPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
 	QString		exe = executable();
 	if (!exe.isEmpty())
 	{
-		cmd = exe + TQString::tqfromLatin1(" -P %1 -# %2").arg(quote(printer->printerName())).arg(printer->numCopies());
+		cmd = exe + TQString::fromLatin1(" -P %1 -# %2").arg(quote(printer->printerName())).arg(printer->numCopies());
 		return true;
 	}
 	else
diff --git a/kdeprint/foomatic/kmfoomaticmanager.cpp b/kdeprint/foomatic/kmfoomaticmanager.cpp
index 76ca31a4e..57edf07c9 100644
--- a/kdeprint/foomatic/kmfoomaticmanager.cpp
+++ b/kdeprint/foomatic/kmfoomaticmanager.cpp
@@ -97,10 +97,10 @@ KMPrinter* KMFoomaticManager::createPrinterFromElement(TQDomElement *elem)
 		printer->setName(e.text());
 		printer->setPrinterName(e.text());
 		printer->setState(KMPrinter::Idle);
-		/*if (printer->name().tqfind('/') != -1)
+		/*if (printer->name().find('/') != -1)
 		{
 			QString	s(printer->name());
-			int	p = s.tqfind('/');
+			int	p = s.find('/');
 			printer->setPrinterName(s.left(p));
 			printer->setInstanceName(s.mid(p+1));
 			printer->addType(KMPrinter::Virtual);
@@ -136,7 +136,7 @@ DrMain* KMFoomaticManager::createDriverFromXML(TQDomElement *elem)
 	{
 		driver->set("manufacturer", pelem.namedItem("make").toElement().text());
 		driver->set("model", pelem.namedItem("model").toElement().text());
-		QString	s = TQString::tqfromLatin1("%1 %2 (%3)").arg(driver->get("manufacturer")).arg(driver->get("model")).arg(delem.namedItem("name").toElement().text());
+		QString	s = TQString::fromLatin1("%1 %2 (%3)").arg(driver->get("manufacturer")).arg(driver->get("model")).arg(delem.namedItem("name").toElement().text());
 		driver->set("description", s);
 		driver->set("text", s);
 
diff --git a/kdeprint/foomatic2loader.cpp b/kdeprint/foomatic2loader.cpp
index 2e00feae3..4ca1464dd 100644
--- a/kdeprint/foomatic2loader.cpp
+++ b/kdeprint/foomatic2loader.cpp
@@ -141,7 +141,7 @@ DrMain* Foomatic2Loader::buildDriver() const
 	if ( m_foodata.isEmpty() )
 		return NULL;
 
-	TQVariant v = m_foodata.tqfind( "VAR" ).data();
+	TQVariant v = m_foodata.find( "VAR" ).data();
 	if ( !v.isNull() && v.type() == TQVariant::Map )
 	{
 		DrMain *driver = new DrMain;
@@ -151,8 +151,8 @@ DrMain* Foomatic2Loader::buildDriver() const
 		driver->set( "matic_printer", v.mapFind( "id" ).data().toString() );
 		driver->set( "matic_driver", v.mapFind( "driver" ).data().toString() );
 		driver->set( "text", TQString( "%1 %2 (%3)" ).arg( driver->get( "manufacturer" ) ).arg( driver->get( "model" ) ).arg( driver->get( "matic_driver" ) ) );
-		if ( m_foodata.tqcontains( "POSTPIPE" ) )
-			driver->set( "postpipe", m_foodata.tqfind( "POSTPIPE" ).data().toString() );
+		if ( m_foodata.contains( "POSTPIPE" ) )
+			driver->set( "postpipe", m_foodata.find( "POSTPIPE" ).data().toString() );
 		v = v.mapFind( "args" ).data();
 		if ( !v.isNull() && v.type() == TQVariant::List )
 		{
@@ -166,7 +166,7 @@ DrMain* Foomatic2Loader::buildDriver() const
 				{
 					TQString group = DrGroup::groupForOption( opt->name() );
 					DrGroup *grp = NULL;
-					if ( !groups.tqcontains( group ) )
+					if ( !groups.contains( group ) )
 					{
 						grp = new DrGroup;
 						grp->set( "text", group );
@@ -211,7 +211,7 @@ DrMain* Foomatic2Loader::modifyDriver( DrMain *driver ) const
 		TQValueList<DrBase*> optList;
 		DrGroup *grp = NULL;
 
-		TQVariant V = m_foodata.tqfind( "VAR" ).data();
+		TQVariant V = m_foodata.find( "VAR" ).data();
 		if ( !V.isNull() && V.type() == TQVariant::Map )
 		{
 			TQVariant v = V.mapFind( "args" ).data();
@@ -268,7 +268,7 @@ DrMain* Foomatic2Loader::modifyDriver( DrMain *driver ) const
 								grp->set( "text", i18n( "Adjustments" ) );
 								driver->addGroup( grp );
 							}
-							DrBase *oldOpt = driver->tqfindOption( opt->name() );
+							DrBase *oldOpt = driver->findOption( opt->name() );
 							if ( oldOpt && oldOpt->type() == DrBase::List )
 							{
 								TQPtrListIterator<DrBase> it( *( static_cast<DrListOption*>( oldOpt )->choices() ) );
diff --git a/kdeprint/fooparser.cpp b/kdeprint/fooparser.cpp
index 099aef1c2..329f80ca5 100644
--- a/kdeprint/fooparser.cpp
+++ b/kdeprint/fooparser.cpp
@@ -261,7 +261,7 @@ static const short yycheck[] = {     4,
 #endif
 
 /* Note: there must be only one dollar sign in this file.
-   It is tqreplaced by the list of actions, each action
+   It is replaced by the list of actions, each action
    as one case of the switch.  */
 
 #define yyerrok		(yyerrstatus = 0)
diff --git a/kdeprint/fooscanner.cpp b/kdeprint/fooscanner.cpp
index ecbdca705..cab7426ab 100644
--- a/kdeprint/fooscanner.cpp
+++ b/kdeprint/fooscanner.cpp
@@ -681,7 +681,7 @@ yy_match:
 			}
 		while ( yy_base[yy_current_state] != 94 );
 
-yy_tqfind_action:
+yy_find_action:
 		yy_act = yy_accept[yy_current_state];
 		if ( yy_act == 0 )
 			{ /* have to back up */
@@ -703,7 +703,7 @@ do_action:	/* This label is used only to access EOF actions. */
 			*yy_cp = yy_hold_char;
 			yy_cp = yy_last_accepting_cpos;
 			yy_current_state = yy_last_accepting_state;
-			goto yy_tqfind_action;
+			goto yy_find_action;
 
 case 1:
 *yy_cp = yy_hold_char; /* undo effects of setting up yytext */
@@ -878,7 +878,7 @@ case YY_STATE_EOF(INITIAL):
 			else
 				{
 				yy_cp = yy_c_buf_p;
-				goto yy_tqfind_action;
+				goto yy_find_action;
 				}
 			}
 
@@ -931,7 +931,7 @@ case YY_STATE_EOF(INITIAL):
 
 				yy_cp = yy_c_buf_p;
 				yy_bp = yytext_ptr + YY_MORE_ADJ;
-				goto yy_tqfind_action;
+				goto yy_find_action;
 			}
 		break;
 		}
diff --git a/kdeprint/kdeprintcheck.cpp b/kdeprint/kdeprintcheck.cpp
index 114477191..5c807ae9b 100644
--- a/kdeprint/kdeprintcheck.cpp
+++ b/kdeprint/kdeprintcheck.cpp
@@ -101,8 +101,8 @@ bool KdeprintChecker::checkConfig(const KURL& url)
 		const char* const *p = config_stddirs;
 		while (*p)
 		{
-			// kdDebug( 500 ) << "checkConfig() with " << TQString::tqfromLatin1( *p ) + f << endl;
-			if ( TQFile::exists( TQString::tqfromLatin1( *p ) + f ) )
+			// kdDebug( 500 ) << "checkConfig() with " << TQString::fromLatin1( *p ) + f << endl;
+			if ( TQFile::exists( TQString::fromLatin1( *p ) + f ) )
 			{
 				state = true;
 				break;
diff --git a/kdeprint/kdeprintd.cpp b/kdeprint/kdeprintd.cpp
index 1d1231467..198147463 100644
--- a/kdeprint/kdeprintd.cpp
+++ b/kdeprint/kdeprintd.cpp
@@ -48,10 +48,10 @@ extern "C"
 	}
 }
 
-class tqStatusWindow : public QWidget
+class StatusWindow : public QWidget
 {
 public:
-	tqStatusWindow(int pid = -1);
+	StatusWindow(int pid = -1);
 	void setMessage(const TQString&);
 	int pid() const { return m_pid; }
 
@@ -62,15 +62,15 @@ private:
 	QLabel		*m_icon;
 };
 
-tqStatusWindow::tqStatusWindow(int pid)
-: TQWidget(NULL, "tqStatusWindow", WType_TopLevel|WStyle_DialogBorder|WStyle_StaysOnTop|WDestructiveClose), m_pid(pid)
+StatusWindow::StatusWindow(int pid)
+: TQWidget(NULL, "StatusWindow", WType_TopLevel|WStyle_DialogBorder|WStyle_StaysOnTop|WDestructiveClose), m_pid(pid)
 {
 	m_label = new TQLabel(this);
-	m_label->tqsetAlignment(AlignCenter);
+	m_label->setAlignment(AlignCenter);
 	m_button = new KPushButton(KStdGuiItem::close(), this);
 	m_icon = new TQLabel(this);
 	m_icon->setPixmap(DesktopIcon("fileprint"));
-	m_icon->tqsetAlignment(AlignCenter);
+	m_icon->setAlignment(AlignCenter);
 	KWin::setIcons(winId(), *(m_icon->pixmap()), SmallIcon("fileprint"));
 	QGridLayout	*l0 = new TQGridLayout(this, 2, 3, 10, 10);
 	l0->setRowStretch(0, 1);
@@ -82,17 +82,17 @@ tqStatusWindow::tqStatusWindow(int pid)
 	resize(200, 50);
 }
 
-void tqStatusWindow::setMessage(const TQString& msg)
+void StatusWindow::setMessage(const TQString& msg)
 {
 	//QSize	oldSz = size();
 	m_label->setText(msg);
-	//QSize	sz = m_label->tqsizeHint();
-	//sz += TQSize(tqlayout()->margin()*2, tqlayout()->margin()*2+tqlayout()->spacing()+m_button->tqsizeHint().height());
+	//QSize	sz = m_label->sizeHint();
+	//sz += TQSize(layout()->margin()*2, layout()->margin()*2+layout()->spacing()+m_button->sizeHint().height());
 	// dialog will never be smaller
 	//sz = sz.expandedTo(oldSz);
 	//resize(sz);
 	//setFixedSize(sz);
-	//tqlayout()->activate();
+	//layout()->activate();
 }
 
 //*****************************************************************************************************
@@ -124,12 +124,12 @@ int KDEPrintd::print(const TQString& cmd, const TQStringList& files, bool remfla
 		if ( !url.isLocalFile() )
 		{
 			TQString tmpFilename = locateLocal( "tmp", "kdeprint_" + kapp->randomString( 8 ) );
-			command.tqreplace( re, KProcess::quote( tmpFilename ) );
+			command.replace( re, KProcess::quote( tmpFilename ) );
 			proc->setOutput( re.cap( 1 ) );
 			proc->setTempOutput( tmpFilename );
 		}
 		else
-			command.tqreplace( re, KProcess::quote( re.cap( 1 ) ) );
+			command.replace( re, KProcess::quote( re.cap( 1 ) ) );
 	}
 
 	if ( checkFiles( command, files ) )
@@ -192,14 +192,14 @@ bool KDEPrintd::checkFiles(TQString& cmd, const TQStringList& files)
 
 void KDEPrintd::statusMessage(const TQString& msg, int pid, const TQString& appName)
 {
-	tqStatusWindow	*w = m_windows.tqfind(pid);
+	StatusWindow	*w = m_windows.find(pid);
 	if (!w && !msg.isEmpty())
 	{
-		w = new tqStatusWindow(pid);
+		w = new StatusWindow(pid);
 		if (appName.isEmpty())
-			w->setCaption(i18n("Printing tqStatus - %1").arg("(pid="+TQString::number(pid)+")"));
+			w->setCaption(i18n("Printing Status - %1").arg("(pid="+TQString::number(pid)+")"));
 		else
-			w->setCaption(i18n("Printing tqStatus - %1").arg(appName));
+			w->setCaption(i18n("Printing Status - %1").arg(appName));
 		connect(w, TQT_SIGNAL(destroyed()), TQT_SLOT(slotClosed()));
 		w->show();
 		m_windows.insert(pid, w);
@@ -215,7 +215,7 @@ void KDEPrintd::statusMessage(const TQString& msg, int pid, const TQString& appN
 
 void KDEPrintd::slotClosed()
 {
-	const tqStatusWindow	*w = static_cast<const tqStatusWindow*>(sender());
+	const StatusWindow	*w = static_cast<const StatusWindow*>(sender());
 	if (w)
 	{
 		m_windows.remove(w->pid());
diff --git a/kdeprint/kdeprintd.h b/kdeprint/kdeprintd.h
index 2d7ff38a5..48fcdd021 100644
--- a/kdeprint/kdeprintd.h
+++ b/kdeprint/kdeprintd.h
@@ -29,7 +29,7 @@
 
 class KPrintProcess;
 class KProcess;
-class tqStatusWindow;
+class StatusWindow;
 
 class KDEPrintd : public KDEDModule
 {
@@ -59,7 +59,7 @@ protected:
 private:
 	class Request;
 	TQPtrList<KPrintProcess>	m_processpool;
-	TQIntDict<tqStatusWindow>	m_windows;
+	TQIntDict<StatusWindow>	m_windows;
 	TQPtrList<Request>       m_requestsPending;
 };
 
diff --git a/kdeprint/kfilelist.cpp b/kdeprint/kfilelist.cpp
index c32c20ab7..c61f3b948 100644
--- a/kdeprint/kfilelist.cpp
+++ b/kdeprint/kfilelist.cpp
@@ -123,7 +123,7 @@ KFileList::KFileList(TQWidget *parent, const char *name)
 	m_remove->setEnabled(false);
 
 	m_open = new TQToolButton(this);
-	m_open->setIconSet(SmallIconSet("filetqfind"));
+	m_open->setIconSet(SmallIconSet("filefind"));
 	connect(m_open, TQT_SIGNAL(clicked()), TQT_SLOT(slotOpenFile()));
 	TQToolTip::add(m_open, i18n("Open file"));
 	TQWhatsThis::add(m_open, whatsThisOpenFileButton);
@@ -263,7 +263,7 @@ void KFileList::slotOpenFile()
 	}
 }
 
-TQSize KFileList::tqsizeHint() const
+TQSize KFileList::sizeHint() const
 {
 	return TQSize(100, 100);
 }
diff --git a/kdeprint/kfilelist.h b/kdeprint/kfilelist.h
index 9df1c3037..ca4d925c8 100644
--- a/kdeprint/kfilelist.h
+++ b/kdeprint/kfilelist.h
@@ -37,7 +37,7 @@ public:
 
 	void setFileList(const TQStringList&);
 	TQStringList fileList() const;
-	TQSize tqsizeHint() const;
+	TQSize sizeHint() const;
 
 protected slots:
 	void slotAddFile();
diff --git a/kdeprint/kmdbentry.cpp b/kdeprint/kmdbentry.cpp
index 9c57b5220..9402dd02c 100644
--- a/kdeprint/kmdbentry.cpp
+++ b/kdeprint/kmdbentry.cpp
@@ -27,7 +27,7 @@ KMDBEntry::KMDBEntry() : recommended(false)
 
 bool KMDBEntry::validate(bool checkIt)
 {
-	// check model: if one of "model" or "modelname" is empty, tqreplace
+	// check model: if one of "model" or "modelname" is empty, replace
 	// by the other one. At the end, "model" must be non empty.
 	if (model.isEmpty())
 	{
@@ -43,13 +43,13 @@ bool KMDBEntry::validate(bool checkIt)
 	// check manufacturer
 	if (manufacturer.isEmpty())
 	{
-		int	p = model.tqfind(' ',0);
+		int	p = model.find(' ',0);
 		if (p != -1) manufacturer = model.left(p);
 		if (manufacturer.isEmpty()) return false;
 	}
 
 	// extract manufacturer from model
-	if (model.tqfind(manufacturer,0,false) == 0)
+	if (model.find(manufacturer,0,false) == 0)
 	{
 		model = model.right(model.length()-manufacturer.length()-1).stripWhiteSpace();
 		if (model.isEmpty()) return false;
diff --git a/kdeprint/kmfactory.cpp b/kdeprint/kmfactory.cpp
index 407fc485f..96397adc4 100644
--- a/kdeprint/kmfactory.cpp
+++ b/kdeprint/kmfactory.cpp
@@ -213,7 +213,7 @@ void KMFactory::loadFactory(const TQString& syst)
 		if (sys.isEmpty())
 			// load default configured print plugin
 			sys = printSystem();
-		QString	libname = TQString::tqfromLatin1("kdeprint_%1").arg(sys);
+		QString	libname = TQString::fromLatin1("kdeprint_%1").arg(sys);
 		m_factory = KLibLoader::self()->factory(TQFile::encodeName(libname));
                 if (!m_factory)
                 {
@@ -311,7 +311,7 @@ KMFactory::PluginInfo KMFactory::pluginInfo(const TQString& name)
 {
 	QString	path(name);
 	if (path[0] != '/')
-		path = locate("data", TQString::tqfromLatin1("kdeprint/plugins/%1.print").arg(name));
+		path = locate("data", TQString::fromLatin1("kdeprint/plugins/%1.print").arg(name));
 	KSimpleConfig	conf(path);
 	PluginInfo	info;
 
@@ -333,7 +333,7 @@ KMFactory::PluginInfo KMFactory::pluginInfo(const TQString& name)
 void KMFactory::registerObject(KPReloadObject *obj, bool priority)
 {
 	// check if object already registered, then add it
-	if (m_objects.tqfindRef(obj) == -1)
+	if (m_objects.findRef(obj) == -1)
 	{
 		if (priority)
 			m_objects.prepend(obj);
@@ -363,7 +363,7 @@ TQString KMFactory::autoDetect()
 			currentPrecedence = plugins[i].detectPrecedence;
 		}
 	}
-	return (pluginIndex == -1 ? TQString::tqfromLatin1("lpdunix") : plugins[pluginIndex].name);
+	return (pluginIndex == -1 ? TQString::fromLatin1("lpdunix") : plugins[pluginIndex].name);
 }
 
 void KMFactory::slot_pluginChanged(pid_t pid)
diff --git a/kdeprint/kmjob.cpp b/kdeprint/kmjob.cpp
index 5c904538b..0576303e2 100644
--- a/kdeprint/kmjob.cpp
+++ b/kdeprint/kmjob.cpp
@@ -75,7 +75,7 @@ TQString KMJob::pixmap()
 {
 	// special case
 	if (m_type == KMJob::Threaded)
-		return TQString::tqfromLatin1("exec");
+		return TQString::fromLatin1("exec");
 
 	// normal case
 	QString	str("kdeprint_job");
diff --git a/kdeprint/kmjobmanager.cpp b/kdeprint/kmjobmanager.cpp
index ef6b56632..afbca7a2f 100644
--- a/kdeprint/kmjobmanager.cpp
+++ b/kdeprint/kmjobmanager.cpp
@@ -60,7 +60,7 @@ void KMJobManager::removeDiscardedJobs()
 		}
 }
 
-/*KMJob* KMJobManager::tqfindJob(int ID)
+/*KMJob* KMJobManager::findJob(int ID)
 {
 	TQPtrListIterator<KMJob>	it(m_jobs);
 	for (;it.current();++it)
@@ -69,7 +69,7 @@ void KMJobManager::removeDiscardedJobs()
 	return 0;
 }*/
 
-KMJob* KMJobManager::tqfindJob(const TQString& uri)
+KMJob* KMJobManager::findJob(const TQString& uri)
 {
 	TQPtrListIterator<KMJob>	it(m_jobs);
 	for (;it.current();++it)
@@ -83,7 +83,7 @@ void KMJobManager::addJob(KMJob *job)
 	// only keep it if "printer" is not empty, and in printer filter
 	if (!job->uri().isEmpty() && !job->printer().isEmpty())
 	{
-		KMJob	*aJob = tqfindJob(job->uri());
+		KMJob	*aJob = findJob(job->uri());
 		if (aJob)
 		{
 			aJob->copy(*job);
@@ -101,7 +101,7 @@ void KMJobManager::addJob(KMJob *job)
 
 /*bool KMJobManager::sendCommand(int ID, int action, const TQString& arg)
 {
-	KMJob	*job = tqfindJob(ID);
+	KMJob	*job = findJob(ID);
 	if (job)
 	{
 		TQPtrList<KMJob>	l;
@@ -114,7 +114,7 @@ void KMJobManager::addJob(KMJob *job)
 
 bool KMJobManager::sendCommand(const TQString& uri, int action, const TQString& arg)
 {
-	KMJob	*job = tqfindJob(uri);
+	KMJob	*job = findJob(uri);
 	if (job)
 	{
 		TQPtrList<KMJob>	l;
@@ -214,7 +214,7 @@ void KMJobManager::validatePluginActions(KActionCollection*, const TQPtrList<KMJ
 
 void KMJobManager::addPrinter(const TQString& pr, KMJobManager::JobType type, bool isSpecial)
 {
-	struct JobFilter	*jf = m_filter.tqfind(pr);
+	struct JobFilter	*jf = m_filter.find(pr);
 	if (!jf)
 	{
 		jf = new JobFilter;
@@ -226,7 +226,7 @@ void KMJobManager::addPrinter(const TQString& pr, KMJobManager::JobType type, bo
 
 void KMJobManager::removePrinter(const TQString& pr, KMJobManager::JobType type)
 {
-	struct JobFilter	*jf = m_filter.tqfind(pr);
+	struct JobFilter	*jf = m_filter.find(pr);
 	if (jf)
 	{
 		jf->m_type[type] = QMAX(0, jf->m_type[type]-1);
diff --git a/kdeprint/kmjobmanager.h b/kdeprint/kmjobmanager.h
index a4eae0835..643be34d1 100644
--- a/kdeprint/kmjobmanager.h
+++ b/kdeprint/kmjobmanager.h
@@ -43,7 +43,7 @@ class KAction;
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT KMJobManager : public TQObject
+class KDEPRINT_EXPORT KMJobManager : public QObject
 {
 	Q_OBJECT
 
@@ -68,8 +68,8 @@ public:
 	int limit();
 	void setLimit(int val);
 
-	//KMJob* tqfindJob(int ID);
-	KMJob* tqfindJob(const TQString& uri);
+	//KMJob* findJob(int ID);
+	KMJob* findJob(const TQString& uri);
 	//bool sendCommand(int ID, int action, const TQString& arg = TQString::null);
 	bool sendCommand(const TQString& uri, int action, const TQString& arg = TQString::null);
 	bool sendCommand(const TQPtrList<KMJob>& jobs, int action, const TQString& arg = TQString::null);
diff --git a/kdeprint/kmmanager.cpp b/kdeprint/kmmanager.cpp
index 82136ca78..ec161d755 100644
--- a/kdeprint/kmmanager.cpp
+++ b/kdeprint/kmmanager.cpp
@@ -42,8 +42,8 @@ KMManager::KMManager(TQObject *parent, const char *name)
 	m_printers.setAutoDelete(true);
 	m_fprinters.setAutoDelete(false);
 	m_hasmanagement = false;
-	m_printeroperationtqmask = 0;
-	m_serveroperationtqmask = 0;
+	m_printeroperationmask = 0;
+	m_serveroperationmask = 0;
 	m_printerfilter = new PrinterFilter(this);
 
 	m_specialmgr = new KMSpecialManager(this);
@@ -98,7 +98,7 @@ bool KMManager::removePrinter(KMPrinter*)
 
 bool KMManager::removePrinter(const TQString& name)
 {
-	KMPrinter	*p = tqfindPrinter(name);
+	KMPrinter	*p = findPrinter(name);
 	return (p ? removePrinter(p) : false);
 }
 
@@ -109,7 +109,7 @@ bool KMManager::enablePrinter(KMPrinter*, bool)
 
 bool KMManager::enablePrinter(const TQString& name, bool state)
 {
-	KMPrinter	*p = tqfindPrinter(name);
+	KMPrinter	*p = findPrinter(name);
 	return (p ? enablePrinter(p, state) : false);
 }
 
@@ -120,7 +120,7 @@ bool KMManager::startPrinter(KMPrinter*, bool)
 
 bool KMManager::startPrinter(const TQString& name, bool state)
 {
-	KMPrinter	*p = tqfindPrinter(name);
+	KMPrinter	*p = findPrinter(name);
 	return (p ? startPrinter(p, state) : false);
 }
 
@@ -145,7 +145,7 @@ bool KMManager::completePrinterShort(KMPrinter *p)
 
 bool KMManager::completePrinter(const TQString& name)
 {
-	KMPrinter	*p = tqfindPrinter(name);
+	KMPrinter	*p = findPrinter(name);
 	return (p ? completePrinter(p) : false);
 }
 
@@ -156,7 +156,7 @@ bool KMManager::setDefaultPrinter(KMPrinter*)
 
 bool KMManager::setDefaultPrinter(const TQString& name)
 {
-	KMPrinter	*p = tqfindPrinter(name);
+	KMPrinter	*p = findPrinter(name);
 	return (p ? setDefaultPrinter(p) : false);
 }
 
@@ -170,7 +170,7 @@ bool KMManager::testPrinter(KMPrinter *prt)
 		return false;
 	}
 	KPrinter	pr;
-	bool		prExist = (tqfindPrinter(prt->printerName()) != 0), result(false);
+	bool		prExist = (findPrinter(prt->printerName()) != 0), result(false);
 	pr.setPrinterName(prt->printerName());
 	pr.setSearchName(prt->name());
 	pr.setDocName("KDE Print Test");
@@ -186,7 +186,7 @@ bool KMManager::testPrinter(KMPrinter *prt)
 	// return notImplemented();
 }
 
-KMPrinter* KMManager::tqfindPrinter(const TQString& name)
+KMPrinter* KMManager::findPrinter(const TQString& name)
 {
 	TQPtrListIterator<KMPrinter>	it(m_printers);
 	for (;it.current();++it)
@@ -263,12 +263,12 @@ TQPtrList<KMPrinter>* KMManager::printerList(bool reload)
 				m_fprinters.append(prt);
 		}
 
-		// try to tqfind the default printer from these situations:
+		// try to find the default printer from these situations:
 		//   - it already exists from .lpoptions file
 		//   - use the PRINTER variable
 		if (!softDefault())
 		{
-			KMPrinter	*defprinter = tqfindPrinter(TQString::tqfromLatin1(getenv("PRINTER")));
+			KMPrinter	*defprinter = findPrinter(TQString::fromLatin1(getenv("PRINTER")));
 			if (defprinter)
 				setSoftDefault(defprinter);
 		}
@@ -297,7 +297,7 @@ void KMManager::addPrinter(KMPrinter *p)
 			delete p;
 		else
 		{
-			KMPrinter	*other = tqfindPrinter(p->name());
+			KMPrinter	*other = findPrinter(p->name());
 			if (other)
 			{
 				other->copy(*p);
@@ -400,7 +400,7 @@ void KMManager::setSoftDefault(KMPrinter *p)
 	if (p)
         {
                 p->setSoftDefault(true);
-                KMPrinter       *pp = tqfindPrinter(p->printerName());
+                KMPrinter       *pp = findPrinter(p->printerName());
                 if (pp)
                         pp->setOwnSoftDefault(true);
         }
@@ -443,7 +443,7 @@ bool KMManager::createSpecialPrinter(KMPrinter *p)
 {
 	if (p && p->isSpecial())
 	{
-		KMPrinter	*old = tqfindPrinter(p->name());
+		KMPrinter	*old = findPrinter(p->name());
 		if (old && !old->isSpecial())
 		{
 			setErrorMsg(i18n("Can't overwrite regular printer with special printer settings."));
@@ -458,7 +458,7 @@ bool KMManager::createSpecialPrinter(KMPrinter *p)
 
 bool KMManager::removeSpecialPrinter(KMPrinter *p)
 {
-	if (p && p->isSpecial() && m_printers.tqfindRef(p) != -1)
+	if (p && p->isSpecial() && m_printers.findRef(p) != -1)
 	{
 		m_printers.removeRef(p);
 		return m_specialmgr->savePrinters();
@@ -475,7 +475,7 @@ TQStringList KMManager::detectLocalPrinters()
 {
 	QStringList	list;
 	for (int i=0; i<3; i++)
-		list << TQString::null << TQString::tqfromLatin1("parallel:/dev/lp%1").arg(i) << i18n("Parallel Port #%1").arg(i+1) << TQString::null;
+		list << TQString::null << TQString::fromLatin1("parallel:/dev/lp%1").arg(i) << i18n("Parallel Port #%1").arg(i+1) << TQString::null;
 	return list;
 }
 
@@ -488,7 +488,7 @@ int KMManager::addPrinterWizard(TQWidget *parent)
 	{
 		int (*func)(TQWidget*) = (int(*)(TQWidget*))lib->symbol("add_printer_wizard");
 		if (!func)
-			setErrorMsg(i18n("Unable to tqfind wizard object in management library."));
+			setErrorMsg(i18n("Unable to find wizard object in management library."));
 		else
 			return func(parent);
 	}
@@ -504,7 +504,7 @@ bool KMManager::invokeOptionsDialog(TQWidget *parent)
 	{
 		bool (*func)(TQWidget*) = (bool(*)(TQWidget*))lib->symbol("config_dialog");
 		if (!func)
-			setErrorMsg(i18n("Unable to tqfind options dialog in management library."));
+			setErrorMsg(i18n("Unable to find options dialog in management library."));
 		else
 			return func(parent);
 	}
diff --git a/kdeprint/kmmanager.h b/kdeprint/kmmanager.h
index 304245730..8826273a0 100644
--- a/kdeprint/kmmanager.h
+++ b/kdeprint/kmmanager.h
@@ -45,7 +45,7 @@ class PrinterFilter;
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT KMManager : public TQObject
+class KDEPRINT_EXPORT KMManager : public QObject
 {
 	Q_OBJECT
 
@@ -97,7 +97,7 @@ public:
 	bool startPrinter(const TQString& name, bool state);
 	bool completePrinter(const TQString& name);
 	bool setDefaultPrinter(const TQString& name);
-	int printerOperationMask() const 	{ return m_printeroperationtqmask; }
+	int printerOperationMask() const 	{ return m_printeroperationmask; }
 	int addPrinterWizard(TQWidget *parent = 0);
 
 	// special printer management functions
@@ -105,7 +105,7 @@ public:
 	bool removeSpecialPrinter(KMPrinter *p);
 
 	// printer listing functions
-	KMPrinter* tqfindPrinter(const TQString& name);
+	KMPrinter* findPrinter(const TQString& name);
 	TQPtrList<KMPrinter>* printerList(bool reload = true);
 	TQPtrList<KMPrinter>* printerListComplete(bool reload = true);
 	KMPrinter* defaultPrinter();
@@ -129,7 +129,7 @@ public:
 	virtual TQString stateInformation();
 
 	// server functions
-	int serverOperationMask() const 	{ return m_serveroperationtqmask; }
+	int serverOperationMask() const 	{ return m_serveroperationmask; }
 	virtual bool restartServer();
 	virtual bool configureServer(TQWidget *parent = 0);
 	virtual TQStringList detectLocalPrinters();
@@ -161,8 +161,8 @@ protected:
 	bool uncompressFile(const TQString& srcname, TQString& destname);
 	bool notImplemented();
 	void setHasManagement(bool on)		{ m_hasmanagement = on; }
-	void setPrinterOperationMask(int m)	{ m_printeroperationtqmask = m; }
-	void setServerOperationMask(int m)	{ m_serveroperationtqmask = m; }
+	void setPrinterOperationMask(int m)	{ m_printeroperationmask = m; }
+	void setServerOperationMask(int m)	{ m_serveroperationmask = m; }
 	TQString testPage();
 	void discardAllPrinters(bool);
 	void setUpdatePossible( bool );
@@ -172,8 +172,8 @@ protected:
 	QString			m_errormsg;
 	KMPrinterList		m_printers, m_fprinters;	// filtered printers
 	bool 			m_hasmanagement;
-	int			m_printeroperationtqmask;
-	int 			m_serveroperationtqmask;
+	int			m_printeroperationmask;
+	int 			m_serveroperationmask;
 	KMSpecialManager	*m_specialmgr;
 	KMVirtualManager	*m_virtualmgr;
 	PrinterFilter	*m_printerfilter;
diff --git a/kdeprint/kmprinter.cpp b/kdeprint/kmprinter.cpp
index f08cf4109..5749a47c5 100644
--- a/kdeprint/kmprinter.cpp
+++ b/kdeprint/kmprinter.cpp
@@ -165,7 +165,7 @@ bool KMPrinter::autoConfigure(KPrinter *printer, TQWidget *parent)
 				fName = ( printer->docName() + "." + ext );
 			else
 			{
-				int p = fName.tqfindRev( '.' );
+				int p = fName.findRev( '.' );
 				if ( p == -1 )
 					fName.append( "." ).append( ext );
 				else
@@ -216,7 +216,7 @@ bool KMPrinter::autoConfigure(KPrinter *printer, TQWidget *parent)
 
 TQString KMPrinter::deviceProtocol() const
 {
-	int p = m_device.tqfind( ':' );
+	int p = m_device.find( ':' );
 	if ( p != -1 )
 		return m_device.left( p );
 	else
diff --git a/kdeprint/kmprinter.h b/kdeprint/kmprinter.h
index 0c8465ad3..8a43e7b13 100644
--- a/kdeprint/kmprinter.h
+++ b/kdeprint/kmprinter.h
@@ -147,7 +147,7 @@ public:
 	void setOwnSoftDefault(bool on)	{ m_ownsoftdefault = on; }
 	static int compare(KMPrinter *p1, KMPrinter *p2);
 	const TQString& option(const TQString& key) const 		{ return m_options[key]; }
-	bool hasOption(const TQString& key) const 			{ return m_options.tqcontains(key); }
+	bool hasOption(const TQString& key) const 			{ return m_options.contains(key); }
 	void setOption(const TQString& key, const TQString& value)	{ if (!key.isEmpty()) m_options[key] = value; }
 	void removeOption(const TQString& key) 				{ m_options.remove(key); }
 	TQMap<TQString,TQString> options() const 				{ return m_options; }
diff --git a/kdeprint/kmspecialmanager.cpp b/kdeprint/kmspecialmanager.cpp
index bb2caea24..7ccebedff 100644
--- a/kdeprint/kmspecialmanager.cpp
+++ b/kdeprint/kmspecialmanager.cpp
@@ -66,7 +66,7 @@ bool KMSpecialManager::savePrinters()
 	conf.setGroup("General");
 	int	n = conf.readNumEntry("Number",0);
 	for (int i=0;i<n;i++)
-		conf.deleteGroup(TQString::tqfromLatin1("Printer %1").arg(i),true);
+		conf.deleteGroup(TQString::fromLatin1("Printer %1").arg(i),true);
 
 	// then add printers
 	n = 0;
@@ -74,7 +74,7 @@ bool KMSpecialManager::savePrinters()
 	for (;it.current();++it)
 	{
 		if (!it.current()->isSpecial() || it.current()->isVirtual()) continue;
-		conf.setGroup(TQString::tqfromLatin1("Printer %1").arg(n));
+		conf.setGroup(TQString::fromLatin1("Printer %1").arg(n));
 		conf.writeEntry("Name",it.current()->name());
 		conf.writeEntry("Description",it.current()->description());
 		conf.writeEntry("Comment",it.current()->location());
@@ -139,7 +139,7 @@ bool KMSpecialManager::loadDesktopFile(const TQString& filename)
 	int	n = conf.readNumEntry("Number",0);
 	for (int i=0;i<n;i++)
 	{
-		QString	grpname = TQString::tqfromLatin1("Printer %1").arg(i);
+		QString	grpname = TQString::fromLatin1("Printer %1").arg(i);
 		if (!conf.hasGroup(grpname)) continue;
 		conf.setGroup(grpname);
 		KMPrinter	*printer = new KMPrinter;
diff --git a/kdeprint/kmspecialmanager.h b/kdeprint/kmspecialmanager.h
index 47adec6b2..f8619a6f9 100644
--- a/kdeprint/kmspecialmanager.h
+++ b/kdeprint/kmspecialmanager.h
@@ -28,7 +28,7 @@ class KMManager;
 class KXmlCommand;
 class DrMain;
 
-class KMSpecialManager : public TQObject
+class KMSpecialManager : public QObject
 {
 public:
 	KMSpecialManager(KMManager *parent, const char *name = 0);
diff --git a/kdeprint/kmthreadjob.cpp b/kdeprint/kmthreadjob.cpp
index b3c3b4a28..bea9382db 100644
--- a/kdeprint/kmthreadjob.cpp
+++ b/kdeprint/kmthreadjob.cpp
@@ -104,18 +104,18 @@ bool KMThreadJob::checkJob(int ID)
 	return (kill((pid_t)ID,0) == 0 || errno == EPERM);
 }
 
-KMJob* KMThreadJob::tqfindJob(int ID)
+KMJob* KMThreadJob::findJob(int ID)
 {
-	return m_jobs.tqfind(ID);
+	return m_jobs.find(ID);
 }
 
-KMJob* KMThreadJob::tqfindJob(const TQString& uri)
+KMJob* KMThreadJob::findJob(const TQString& uri)
 {
 	if (uri.startsWith("proc:/"))
 	{
 		int	pid = uri.mid(6).toInt();
 		if (pid > 0)
-			return m_jobs.tqfind(pid);
+			return m_jobs.find(pid);
 	}
 	return NULL;
 }
@@ -150,7 +150,7 @@ void KMThreadJob::createJob(KMJob *job)
 	if (job->id() > 0)
 	{
 		loadJobs();
-		if (!m_jobs.tqfind(job->id()))
+		if (!m_jobs.find(job->id()))
 		{
 			m_jobs.insert(job->id(),job);
 			saveJobs();
diff --git a/kdeprint/kmthreadjob.h b/kdeprint/kmthreadjob.h
index d967c08bf..3d2e6cf2f 100644
--- a/kdeprint/kmthreadjob.h
+++ b/kdeprint/kmthreadjob.h
@@ -26,14 +26,14 @@
 class KMJob;
 class KMJobManager;
 
-class KMThreadJob : public TQObject
+class KMThreadJob : public QObject
 {
 public:
 	KMThreadJob(TQObject *parent = 0, const char *name = 0);
 	~KMThreadJob();
 
-	KMJob* tqfindJob(int ID);
-	KMJob* tqfindJob(const TQString& uri);
+	KMJob* findJob(int ID);
+	KMJob* findJob(const TQString& uri);
 	bool removeJob(int ID);
 	void createJob(KMJob*);
 	void updateManager(KMJobManager*);
diff --git a/kdeprint/kmuimanager.h b/kdeprint/kmuimanager.h
index 478dbc0df..3c6a74719 100644
--- a/kdeprint/kmuimanager.h
+++ b/kdeprint/kmuimanager.h
@@ -33,7 +33,7 @@ class KPrinterPropertyDialog;
 class KMConfigDialog;
 class TQListView;
 
-class KDEPRINT_EXPORT KMUiManager : public TQObject
+class KDEPRINT_EXPORT KMUiManager : public QObject
 {
 	Q_OBJECT
 public:
diff --git a/kdeprint/kmvirtualmanager.cpp b/kdeprint/kmvirtualmanager.cpp
index 349a8ae21..268da3eac 100644
--- a/kdeprint/kmvirtualmanager.cpp
+++ b/kdeprint/kmvirtualmanager.cpp
@@ -53,22 +53,22 @@ KMVirtualManager::~KMVirtualManager()
 {
 }
 
-KMPrinter* KMVirtualManager::tqfindPrinter(const TQString& name)
+KMPrinter* KMVirtualManager::findPrinter(const TQString& name)
 {
-        return m_manager->tqfindPrinter(name);
+        return m_manager->findPrinter(name);
 }
 
-KMPrinter* KMVirtualManager::tqfindInstance(KMPrinter *p, const TQString& name)
+KMPrinter* KMVirtualManager::findInstance(KMPrinter *p, const TQString& name)
 {
 	QString	instname(instanceName(p->printerName(),name));
-	return tqfindPrinter(instname);
+	return findPrinter(instname);
 }
 
 void KMVirtualManager::addPrinter(KMPrinter *p)
 {
 	if (p && p->isValid())
 	{
-		KMPrinter	*other = tqfindPrinter(p->name());
+		KMPrinter	*other = findPrinter(p->name());
 		if (other)
 		{
 			other->copy(*p);
@@ -97,7 +97,7 @@ void KMVirtualManager::setDefault(KMPrinter *p, bool saveflag)
 bool KMVirtualManager::isDefault(KMPrinter *p, const TQString& name)
 {
 	QString	instname(instanceName(p->printerName(),name));
-	KMPrinter	*printer = tqfindPrinter(instname);
+	KMPrinter	*printer = findPrinter(instname);
 	if (printer)
 		return printer->isSoftDefault();
 	else
@@ -107,7 +107,7 @@ bool KMVirtualManager::isDefault(KMPrinter *p, const TQString& name)
 void KMVirtualManager::create(KMPrinter *p, const TQString& name)
 {
 	QString	instname = instanceName(p->printerName(),name);
-	if (tqfindPrinter(instname) != NULL) return;
+	if (findPrinter(instname) != NULL) return;
 	KMPrinter	*printer = new KMPrinter;
 	printer->setName(instname);
 	printer->setPrinterName(p->printerName());
@@ -124,8 +124,8 @@ void KMVirtualManager::create(KMPrinter *p, const TQString& name)
 void KMVirtualManager::copy(KMPrinter *p, const TQString& src, const TQString& name)
 {
 	QString	instsrc(instanceName(p->printerName(),src)), instname(instanceName(p->printerName(),name));
-	KMPrinter	*prsrc = tqfindPrinter(instsrc);
-	if (!prsrc || tqfindPrinter(instname) != NULL) return;
+	KMPrinter	*prsrc = findPrinter(instsrc);
+	if (!prsrc || findPrinter(instname) != NULL) return;
 	KMPrinter	*printer = new KMPrinter;
 	printer->copy(*prsrc);
 	printer->setName(instname);
@@ -138,7 +138,7 @@ void KMVirtualManager::copy(KMPrinter *p, const TQString& src, const TQString& n
 void KMVirtualManager::remove(KMPrinter *p, const TQString& name)
 {
         QString	instname = instanceName(p->printerName(),name);
-	KMPrinter	*printer = tqfindPrinter(instname);
+	KMPrinter	*printer = findPrinter(instname);
 	if (!printer) return;
         if (name.isEmpty())
         { // remove default instance => only remove options, keep the KMPrinter object
@@ -167,11 +167,11 @@ void KMVirtualManager::setAsDefault(KMPrinter *p, const TQString& name, TQWidget
 			return;
 	}
 
-	KMPrinter	*printer = tqfindPrinter(instname);
+	KMPrinter	*printer = findPrinter(instname);
 	if (!printer)
 	{ // create it if necessary
 		create(p,name);
-		printer = tqfindPrinter(instname);
+		printer = findPrinter(instname);
 	}
 	if (printer)
 		setDefault(printer,true);
@@ -210,7 +210,7 @@ void KMVirtualManager::refresh()
 
 void KMVirtualManager::checkPrinter(KMPrinter *p)
 {
-	KMPrinter	*realprinter = m_manager->tqfindPrinter(p->printerName());
+	KMPrinter	*realprinter = m_manager->findPrinter(p->printerName());
 	if (!realprinter || realprinter->isDiscarded())
 	{
 		p->setType(KMPrinter::Invalid);
@@ -263,7 +263,7 @@ void KMVirtualManager::loadFile(const TQString& filename)
 			words = TQStringList::split(' ',line,false);
 			if (words.count() < 2) continue;
 			pair = TQStringList::split('/',words[1],false);
-			realprinter = m_manager->tqfindPrinter(KURL::decode_string(pair[0]));
+			realprinter = m_manager->findPrinter(KURL::decode_string(pair[0]));
 			if (realprinter && !realprinter->isDiscarded())
 			{ // keep only instances corresponding to an existing and
 			  // non discarded printer.
@@ -286,7 +286,7 @@ void KMVirtualManager::loadFile(const TQString& filename)
 				addPrinter(printer);	// don't use "printer" after this point !!!
 				// check default state
 				if (words[0].lower().startsWith("default"))
-					setDefault(tqfindPrinter(KURL::decode_string(words[1])),false);
+					setDefault(findPrinter(KURL::decode_string(words[1])),false);
 			}
 		}
 	}
diff --git a/kdeprint/kmvirtualmanager.h b/kdeprint/kmvirtualmanager.h
index 4ace8d609..5725854e2 100644
--- a/kdeprint/kmvirtualmanager.h
+++ b/kdeprint/kmvirtualmanager.h
@@ -43,8 +43,8 @@ public:
 	void virtualList(TQPtrList<KMPrinter>& list, const TQString& prname);
 	void triggerSave();
 
-	KMPrinter* tqfindPrinter(const TQString& name);
-	KMPrinter* tqfindInstance(KMPrinter *p, const TQString& name);
+	KMPrinter* findPrinter(const TQString& name);
+	KMPrinter* findInstance(KMPrinter *p, const TQString& name);
 	void setDefault(KMPrinter *p, bool save = true);
 	TQString defaultPrinterName();
 	bool isDefault(KMPrinter *p, const TQString& name);
diff --git a/kdeprint/kpcopiespage.cpp b/kdeprint/kpcopiespage.cpp
index a19d6744b..1a7756913 100644
--- a/kdeprint/kpcopiespage.cpp
+++ b/kdeprint/kpcopiespage.cpp
@@ -186,7 +186,7 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name)
 	m_order = new TQCheckBox(i18n("Re&verse"), m_copybox);
 	TQWhatsThis::add(m_order, whatsThisReverseLabel);
 	m_collatepix = new TQLabel(m_copybox);
-	m_collatepix->tqsetAlignment(Qt::AlignCenter);
+	m_collatepix->setAlignment(Qt::AlignCenter);
 	m_collatepix->setMinimumHeight(70);
 	QLabel	*m_copieslabel = new TQLabel(i18n("Cop&ies:"), m_copybox);
 	m_copies = new TQSpinBox(m_copybox);
@@ -213,14 +213,14 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name)
 	TQWidget::setTabOrder( m_copies, m_collate );
 	TQWidget::setTabOrder( m_collate, m_order );
 
-	// tqlayout creation
+	// layout creation
 	QGridLayout	*l1 = new TQGridLayout(this, 2, 2, 0, 5);
 	l1->setRowStretch(1,1);
 	l1->setColStretch(0,1);
 	l1->setColStretch(1,1);
 	l1->addWidget(m_pagebox,0,0);
 	l1->addWidget(m_copybox,0,1);
-	QVBoxLayout	*l3 = new TQVBoxLayout(m_pagebox->tqlayout(), 5);
+	QVBoxLayout	*l3 = new TQVBoxLayout(m_pagebox->layout(), 5);
 	l3->addWidget(m_all);
 	l3->addWidget(m_current);
 	QHBoxLayout	*l4 = new TQHBoxLayout(0, 0, 5);
@@ -233,7 +233,7 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name)
 	l3->addLayout(l2);
 	l2->addWidget(m_pagesetlabel,0);
 	l2->addWidget(m_pageset,1);
-	QGridLayout	*l5 = new TQGridLayout(m_copybox->tqlayout(), 4, 2, 10);
+	QGridLayout	*l5 = new TQGridLayout(m_copybox->layout(), 4, 2, 10);
 	l5->setRowStretch(4,1);
 	l5->addWidget(m_copieslabel,0,0);
 	l5->addWidget(m_copies,0,1);
@@ -336,7 +336,7 @@ void KPCopiesPage::getOptions(TQMap<TQString,TQString>& options, bool incldef)
 	options["kde-collate"] = (m_collate->isChecked() ? "Collate" : "Uncollate");
 	// ranges
 	options["kde-current"] = (m_current->isChecked() ? "1" : "0");
-	options["kde-range"] = (m_range->isChecked() ? m_rangeedit->text() : (incldef ? TQString::tqfromLatin1("1-") : TQString::tqfromLatin1("")));
+	options["kde-range"] = (m_range->isChecked() ? m_rangeedit->text() : (incldef ? TQString::fromLatin1("1-") : TQString::fromLatin1("")));
 	// page set
 	options["kde-pageset"] = TQString::number(m_pageset->currentItem());
 }
diff --git a/kdeprint/kpfilterpage.cpp b/kdeprint/kpfilterpage.cpp
index a55b0bbe2..d7906a290 100644
--- a/kdeprint/kpfilterpage.cpp
+++ b/kdeprint/kpfilterpage.cpp
@@ -100,7 +100,7 @@ KPFilterPage::KPFilterPage(TQWidget *parent, const char *name)
 						" the filtering chain fail. For example: if your file is ASCII text, and you want the "
 						" output being processed by the 'Multipage per Sheet' filter, the first filter must be "
 						" one that processes ASCII into PostScript. </p> "
-						" <p>KDEPrint can utilize <em>any</em> external filtering program which you may tqfind useful "
+						" <p>KDEPrint can utilize <em>any</em> external filtering program which you may find useful "
 						" through this interface. </p> "
 						" <p>KDEPrint ships preconfigured with support for a selection of common filters. These "
 						" filters however need to be "
@@ -295,7 +295,7 @@ void KPFilterPage::setOptions(const TQMap<TQString,TQString>& opts)
 	TQDictIterator<KXmlCommand>	dit(m_activefilters);
 	for (;dit.current();)
 	{
-		if (filters.tqfind(dit.currentKey()) == filters.end())
+		if (filters.find(dit.currentKey()) == filters.end())
 			m_activefilters.remove(dit.currentKey());
 		else
 		{
@@ -309,7 +309,7 @@ void KPFilterPage::setOptions(const TQMap<TQString,TQString>& opts)
 	for (TQStringList::ConstIterator sit=filters.begin(); sit!=filters.end(); ++sit)
 	{
 		KXmlCommand	*f(0);
-		if ((f=m_activefilters.tqfind(*sit)) == 0)
+		if ((f=m_activefilters.find(*sit)) == 0)
 		{
 			f = KXmlCommandManager::self()->loadCommand(*sit);
 			if (f)
@@ -329,7 +329,7 @@ void KPFilterPage::getOptions(TQMap<TQString,TQString>& opts, bool incldef)
 	QStringList	filters = activeList();
 	for (TQStringList::ConstIterator it=filters.begin(); it!=filters.end(); ++it)
 	{
-		KXmlCommand	*f = m_activefilters.tqfind(*it);
+		KXmlCommand	*f = m_activefilters.find(*it);
 		if (f)
 			f->getOptions(opts, incldef);
 	}
@@ -355,7 +355,7 @@ KXmlCommand* KPFilterPage::currentFilter()
 {
 	KXmlCommand	*filter(0);
 	if (m_view->selectedItem())
-		filter = m_activefilters.tqfind(m_view->selectedItem()->text(1));
+		filter = m_activefilters.find(m_view->selectedItem()->text(1));
 	return filter;
 }
 
@@ -367,10 +367,10 @@ void KPFilterPage::checkFilterChain()
 	while (item)
 	{
 		item->setPixmap(0, (ok ? SmallIcon("filter") : SmallIcon("filterstop")));
-		KXmlCommand	*f1 = m_activefilters.tqfind(item->text(1));
+		KXmlCommand	*f1 = m_activefilters.find(item->text(1));
 		if (f1 && item->nextSibling())
 		{
-			KXmlCommand	*f2 = m_activefilters.tqfind(item->nextSibling()->text(1));
+			KXmlCommand	*f2 = m_activefilters.find(item->nextSibling()->text(1));
 			if (f2)
 			{
 				if (!f2->acceptMimeType(f1->mimeType()))
diff --git a/kdeprint/kpgeneralpage.cpp b/kdeprint/kpgeneralpage.cpp
index 7452ba785..73f21f4af 100644
--- a/kdeprint/kpgeneralpage.cpp
+++ b/kdeprint/kpgeneralpage.cpp
@@ -71,7 +71,7 @@ static void setComboItem(TQComboBox *cb, const TQString& txt)
 		}
 }
 
-static int tqfindOption(const char *strs[], int n, const TQString& txt)
+static int findOption(const char *strs[], int n, const TQString& txt)
 {
 	for (int i=0;i<n;i+=2)
 		if (txt == strs[i]) return (i/2);
@@ -122,7 +122,7 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const
 	//WhatsThis strings.... (added by pfeifle@kde.org)
 	TQString whatsThisPrintPropertiesGeneralPage = i18n( " <qt> "
 			" <p><b>\"General\"</b> </p> "
-			" <p>This dialog page tqcontains <em>general</em> print job settings."
+			" <p>This dialog page contains <em>general</em> print job settings."
 			" General settings are applicable to most printers, most jobs "
 			" and most job file types. "
                         " <p>To get more specific help, enable the \"WhatsThis\" cursor and click on any of the "
@@ -244,7 +244,7 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const
                         " The page image does not get scaled if you print 1 page per sheet (the default setting.). "
                         " <p><b>Note 2:</b> If you select multiple pages per sheet here, the scaling and re-arranging is done "
                         " by your printing system. Be aware, that some printers can by themselves print multiple pages per sheet. "
-                        " In this case you tqfind the option in the printer driver settings. Be careful: if you enable multiple "
+                        " In this case you find the option in the printer driver settings. Be careful: if you enable multiple "
                         " pages per sheet in both places, your printout will not look as you intended. </p>"
                         " <br> "
                         " <hr> "
@@ -261,15 +261,15 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const
 
 	// widget creation
 	QLabel	*m_pagesizelabel = new TQLabel(i18n("Page s&ize:"), this);
-	m_pagesizelabel->tqsetAlignment(Qt::AlignVCenter|Qt::AlignRight);
+	m_pagesizelabel->setAlignment(Qt::AlignVCenter|Qt::AlignRight);
           TQWhatsThis::add(m_pagesizelabel, whatsThisGeneralPageSizeLabel);
 
 	QLabel	*m_papertypelabel = new TQLabel(i18n("Paper t&ype:"), this);
-	m_papertypelabel->tqsetAlignment(Qt::AlignVCenter|Qt::AlignRight);
+	m_papertypelabel->setAlignment(Qt::AlignVCenter|Qt::AlignRight);
           TQWhatsThis::add(m_papertypelabel, whatsThisGeneralPaperTypeLabel);
 
 	QLabel	*m_inputslotlabel = new TQLabel(i18n("Paper so&urce:"), this);
-	m_inputslotlabel->tqsetAlignment(Qt::AlignVCenter|Qt::AlignRight);
+	m_inputslotlabel->setAlignment(Qt::AlignVCenter|Qt::AlignRight);
           TQWhatsThis::add(m_inputslotlabel, whatsThisGeneralPaperSourceLabel);
 
 	m_pagesize = new TQComboBox(this);
@@ -304,19 +304,19 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const
 
 	m_portrait->setChecked(true);
 	m_orientpix = new TQLabel(m_orientbox);
-	m_orientpix->tqsetAlignment(Qt::AlignCenter);
+	m_orientpix->setAlignment(Qt::AlignCenter);
 	QRadioButton	*m_dupnone = new TQRadioButton(i18n("duplex orientation", "&None"), m_duplexbox);
 	QRadioButton	*m_duplong = new TQRadioButton(i18n("duplex orientation", "Lon&g side"), m_duplexbox);
 	QRadioButton	*m_dupshort = new TQRadioButton(i18n("duplex orientation", "S&hort side"), m_duplexbox);
 	m_dupnone->setChecked(true);
 	m_duplexpix = new TQLabel(m_duplexbox);
-	m_duplexpix->tqsetAlignment(Qt::AlignCenter);
+	m_duplexpix->setAlignment(Qt::AlignCenter);
 	QRadioButton	*m_nup1 = new TQRadioButton("&1", m_nupbox);
 	QRadioButton	*m_nup2 = new TQRadioButton("&2", m_nupbox);
 	QRadioButton	*m_nup4 = new TQRadioButton("&4", m_nupbox);
 	m_nup1->setChecked(true);
 	m_nuppix = new TQLabel(m_nupbox);
-	m_nuppix->tqsetAlignment(Qt::AlignCenter);
+	m_nuppix->setAlignment(Qt::AlignCenter);
 	m_startbanner = new TQComboBox(m_bannerbox);
 	m_endbanner = new TQComboBox(m_bannerbox);
 	QLabel	*m_startbannerlabel = new TQLabel(i18n("S&tart:"), m_bannerbox);
@@ -324,7 +324,7 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const
 	m_startbannerlabel->setBuddy(m_startbanner);
 	m_endbannerlabel->setBuddy(m_endbanner);
 
-	// tqlayout creation
+	// layout creation
 	QVBoxLayout	*lay0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
           TQWhatsThis::add(this, whatsThisPrintPropertiesGeneralPage);
 	QGridLayout	*lay1 = new TQGridLayout(0, 3, 2, 0, KDialog::spacingHint());
@@ -346,27 +346,27 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const
 	lay2->addWidget(m_nupbox, 1, 1);
 	lay2->setColStretch(0, 1);
 	lay2->setColStretch(1, 1);
-	QGridLayout	*lay3 = new TQGridLayout(m_orientbox->tqlayout(), 4, 2,
+	QGridLayout	*lay3 = new TQGridLayout(m_orientbox->layout(), 4, 2,
 		KDialog::spacingHint());
 	lay3->addWidget(m_portrait, 0, 0);
 	lay3->addWidget(m_landscape, 1, 0);
 	lay3->addWidget(m_revland, 2, 0);
 	lay3->addWidget(m_revport, 3, 0);
 	lay3->addMultiCellWidget(m_orientpix, 0, 3, 1, 1);
-	QGridLayout	*lay4 = new TQGridLayout(m_duplexbox->tqlayout(), 3, 2,
+	QGridLayout	*lay4 = new TQGridLayout(m_duplexbox->layout(), 3, 2,
 		KDialog::spacingHint());
 	lay4->addWidget(m_dupnone, 0, 0);
 	lay4->addWidget(m_duplong, 1, 0);
 	lay4->addWidget(m_dupshort, 2, 0);
 	lay4->addMultiCellWidget(m_duplexpix, 0, 2, 1, 1);
 	lay4->setRowStretch( 0, 1 );
-	QGridLayout	*lay5 = new TQGridLayout(m_nupbox->tqlayout(), 3, 2,
+	QGridLayout	*lay5 = new TQGridLayout(m_nupbox->layout(), 3, 2,
 		KDialog::spacingHint());
 	lay5->addWidget(m_nup1, 0, 0);
 	lay5->addWidget(m_nup2, 1, 0);
 	lay5->addWidget(m_nup4, 2, 0);
 	lay5->addMultiCellWidget(m_nuppix, 0, 2, 1, 1);
-	QGridLayout	*lay6 = new TQGridLayout(m_bannerbox->tqlayout(), 2, 2,
+	QGridLayout	*lay6 = new TQGridLayout(m_bannerbox->layout(), 2, 2,
 		KDialog::spacingHint());
 	lay6->addWidget(m_startbannerlabel, 0, 0);
 	lay6->addWidget(m_endbannerlabel, 1, 0);
@@ -392,28 +392,28 @@ void KPGeneralPage::initialize()
 	if (driver())
 	{
 		// Size, Type and Source
-		DrListOption	*opt = (DrListOption*)driver()->tqfindOption("PageSize");
+		DrListOption	*opt = (DrListOption*)driver()->findOption("PageSize");
 		if (opt) initCombo(m_pagesize,opt);
 		else m_pagesize->setEnabled(false);
-		opt = (DrListOption*)driver()->tqfindOption("MediaType");
+		opt = (DrListOption*)driver()->findOption("MediaType");
 		if (opt) initCombo(m_papertype,opt);
 		else m_papertype->setEnabled(false);
-		opt = (DrListOption*)driver()->tqfindOption("InputSlot");
+		opt = (DrListOption*)driver()->findOption("InputSlot");
 		if (opt) initCombo(m_inputslot,opt);
 		else m_inputslot->setEnabled(false);
 		// Duplex
-		opt = (DrListOption*)driver()->tqfindOption("Duplex");
+		opt = (DrListOption*)driver()->findOption("Duplex");
 		if (opt)
 		{
 			if ( opt->choices()->count() == 2 )
 			{
 				// probably a On/Off option instead of the standard PS one
-				TQButton *btn = m_duplexbox->tqfind( DUPLEX_SHORT_ID );
+				TQButton *btn = m_duplexbox->find( DUPLEX_SHORT_ID );
 				m_duplexbox->remove( btn );
 				btn->hide();
 				//delete btn;
-				m_duplexbox->tqfind( DUPLEX_NONE_ID )->setText( i18n( "Disabled" ) );
-				m_duplexbox->tqfind( DUPLEX_LONG_ID )->setText( i18n( "Enabled" ) );
+				m_duplexbox->find( DUPLEX_NONE_ID )->setText( i18n( "Disabled" ) );
+				m_duplexbox->find( DUPLEX_LONG_ID )->setText( i18n( "Enabled" ) );
 				m_duplexpix->hide();
 			}
 			if (opt->currentChoice())
@@ -440,7 +440,7 @@ void KPGeneralPage::initialize()
 				m_pagesize->insertItem(i18n(default_size[i]));
 		// set default page size using locale settings
 		QString	psname = pageSizeToPageName((KPrinter::PageSize)(KGlobal::locale()->pageSize()));
-		int index = tqfindOption(default_size, DEFAULT_SIZE, psname);
+		int index = findOption(default_size, DEFAULT_SIZE, psname);
 		if (index >= 0)
 			m_pagesize->setCurrentItem(index);
 		// MediaType
@@ -487,20 +487,20 @@ void KPGeneralPage::setOptions(const TQMap<TQString,TQString>& opts)
 		{
 			value = *it;
 			DrBase	*ch;
-			if ((ch = (driver()->tqfindOption("PageSize"))) &&
-                            (ch = (static_cast<DrListOption*>(ch))->tqfindChoice(value)))
+			if ((ch = (driver()->findOption("PageSize"))) &&
+                            (ch = (static_cast<DrListOption*>(ch))->findChoice(value)))
 			{
 				if (m_pagesize->isEnabled())
 					setComboItem(m_pagesize, ch->get("text"));
 			}
-			else if ((ch = (driver()->tqfindOption("MediaType"))) &&
-                                 (ch = (static_cast<DrListOption*>(ch))->tqfindChoice(value)))
+			else if ((ch = (driver()->findOption("MediaType"))) &&
+                                 (ch = (static_cast<DrListOption*>(ch))->findChoice(value)))
 			{
 				if (m_papertype->isEnabled())
 					setComboItem(m_papertype, ch->get("text"));
 			}
-			else if ((ch = (driver()->tqfindOption("InputSlot"))) &&
-                                 (ch = static_cast<DrListOption*>(ch)->tqfindChoice(value)))
+			else if ((ch = (driver()->findOption("InputSlot"))) &&
+                                 (ch = static_cast<DrListOption*>(ch)->findChoice(value)))
 			{
 				if (m_inputslot)
 					setComboItem(m_inputslot, ch->get("text"));
@@ -513,19 +513,19 @@ void KPGeneralPage::setOptions(const TQMap<TQString,TQString>& opts)
 		value = opts["PageSize"];
 		if (m_pagesize->isEnabled() && !value.isEmpty())
 		{
-			DrBase	*ch = ((DrListOption*)driver()->tqfindOption("PageSize"))->tqfindChoice(value);
+			DrBase	*ch = ((DrListOption*)driver()->findOption("PageSize"))->findChoice(value);
 			if (ch) setComboItem(m_pagesize, ch->get("text"));
 		}
 		value = opts["MediaType"];
 		if (m_papertype->isEnabled() && !value.isEmpty())
 		{
-			DrBase	*ch = ((DrListOption*)driver()->tqfindOption("MediaType"))->tqfindChoice(value);
+			DrBase	*ch = ((DrListOption*)driver()->findOption("MediaType"))->findChoice(value);
 			if (ch) setComboItem(m_papertype, ch->get("text"));
 		}
 		value = opts["InputSlot"];
 		if (m_inputslot && m_inputslot->isEnabled() && !value.isEmpty())
 		{
-			DrBase	*ch = ((DrListOption*)driver()->tqfindOption("InputSlot"))->tqfindChoice(value);
+			DrBase	*ch = ((DrListOption*)driver()->findOption("InputSlot"))->findChoice(value);
 			if (ch) setComboItem(m_inputslot, ch->get("text"));
 		}
 
@@ -541,7 +541,7 @@ void KPGeneralPage::setOptions(const TQMap<TQString,TQString>& opts)
 	}
 	else
 	{
-		// Try to tqfind "media" option
+		// Try to find "media" option
 		value = opts["media"];
 		if (!value.isEmpty())
 		{
@@ -551,18 +551,18 @@ void KPGeneralPage::setOptions(const TQMap<TQString,TQString>& opts)
 			{
 				value = *it;
 
-				if ((index=tqfindOption(default_size,DEFAULT_SIZE,value)) >= 0)
+				if ((index=findOption(default_size,DEFAULT_SIZE,value)) >= 0)
 					m_pagesize->setCurrentItem(index);
-				else if ((index=tqfindOption(default_type,DEFAULT_TYPE,value)) >= 0)
+				else if ((index=findOption(default_type,DEFAULT_TYPE,value)) >= 0)
 					m_papertype->setCurrentItem(index);
-				else if ((index=tqfindOption(default_source,DEFAULT_SOURCE,value)) >= 0)
+				else if ((index=findOption(default_source,DEFAULT_SOURCE,value)) >= 0)
 					m_inputslot->setCurrentItem(index);
 				else
 					kdWarning() << "media option '" << value << "' not handled." << endl;
 			}
 		}
 
-		// Try to tqfind "sides" option
+		// Try to find "sides" option
 		value = opts["sides"];
 		int	ID(0);
 		if (value == "two-sided-long-edge") ID = 1;
@@ -619,23 +619,23 @@ void KPGeneralPage::getOptions(TQMap<TQString,TQString>& opts, bool incldef)
 	if (driver())
 	{
 		DrListOption	*opt;
-		if ((opt=(DrListOption*)driver()->tqfindOption("PageSize")) != NULL)
+		if ((opt=(DrListOption*)driver()->findOption("PageSize")) != NULL)
 		{
 			DrBase	*ch = opt->choices()->at(m_pagesize->currentItem());
 			if (incldef || ch->name() != opt->get("default")) opts["PageSize"] = ch->name();
 		}
-		if ((opt=(DrListOption*)driver()->tqfindOption("MediaType")) != NULL)
+		if ((opt=(DrListOption*)driver()->findOption("MediaType")) != NULL)
 		{
 			DrBase	*ch = opt->choices()->at(m_papertype->currentItem());
 			if (incldef || ch->name() != opt->get("default")) opts["MediaType"] = ch->name();
 		}
-		if ((opt=(DrListOption*)driver()->tqfindOption("InputSlot")) != NULL)
+		if ((opt=(DrListOption*)driver()->findOption("InputSlot")) != NULL)
 		{
 			DrBase	*ch = opt->choices()->at(m_inputslot->currentItem());
 			if (incldef || ch->name() != opt->get("default")) opts["InputSlot"] = ch->name();
 		}
 
-		if (m_duplexbox->isEnabled() && (opt=(DrListOption*)driver()->tqfindOption("Duplex")) != NULL)
+		if (m_duplexbox->isEnabled() && (opt=(DrListOption*)driver()->findOption("Duplex")) != NULL)
 		{
 			bool twoChoices = ( m_duplexbox->count() == 2 );
 			switch (m_duplexbox->id(m_duplexbox->selected()))
diff --git a/kdeprint/kpmarginpage.cpp b/kdeprint/kpmarginpage.cpp
index b1c5f4390..9b91ce56f 100644
--- a/kdeprint/kpmarginpage.cpp
+++ b/kdeprint/kpmarginpage.cpp
@@ -79,13 +79,13 @@ void KPMarginPage::initPageSize(const TQString& ps, bool landscape)
 
 		if (pageSize.isEmpty())
 		{
-			DrListOption	*o = (DrListOption*)driver()->tqfindOption("PageSize");
+			DrListOption	*o = (DrListOption*)driver()->findOption("PageSize");
 			if (o)
 				pageSize = o->get("default");
 		}
 		if (!pageSize.isEmpty())
 		{
-			DrPageSize	*dps = driver()->tqfindPageSize(pageSize);
+			DrPageSize	*dps = driver()->findPageSize(pageSize);
 			if (dps)
 			{
 				w = dps->pageWidth();
diff --git a/kdeprint/kpposterpage.cpp b/kdeprint/kpposterpage.cpp
index f29f3cd4e..fa4b1481b 100644
--- a/kdeprint/kpposterpage.cpp
+++ b/kdeprint/kpposterpage.cpp
@@ -194,7 +194,7 @@ KPPosterPage::KPPosterPage( TQWidget *parent, const char *name )
 	m_lockbtn->setToggleButton( true );
 	m_lockbtn->setPixmap( SmallIcon( "encrypted" ) );
 	m_lockbtn->setOn( true );
-	m_lockbtn->setFixedSize( m_lockbtn->tqsizeHint() );
+	m_lockbtn->setFixedSize( m_lockbtn->sizeHint() );
 	TQToolTip::add( m_lockbtn, i18n( "Link/unlink poster and print size" ) );
 
 	for ( int i=0; i<KPrinter::NPageSize-1; i++ )
@@ -202,7 +202,7 @@ KPPosterPage::KPPosterPage( TQWidget *parent, const char *name )
 		m_postersize->insertItem( page_sizes[ i ].text );
 		m_printsize->insertItem( page_sizes[ i ].text );
 	}
-	m_postersize->setCurrentItem( tqfindIndex( KPrinter::A3 ) );
+	m_postersize->setCurrentItem( findIndex( KPrinter::A3 ) );
 	slotPosterSizeChanged( m_postersize->currentItem() );
 
 	connect( m_postercheck, TQT_SIGNAL( toggled( bool ) ), dummy, TQT_SLOT( setEnabled( bool ) ) );
@@ -265,18 +265,18 @@ void KPPosterPage::setOptions( const TQMap<TQString,TQString>& opts )
 		m_mediasize->setText( ps );
 	m_preview->setMediaSize( ps );
 
-	if ( opts[ "_kde-filters" ].tqfind( "poster" ) != -1 )
+	if ( opts[ "_kde-filters" ].find( "poster" ) != -1 )
 	{
 		m_postercheck->setChecked( true );
 		ps = opts[ "_kde-poster-size" ];
 		TQString prtsize = opts[ "kde-printsize" ];
 		if ( !ps.isEmpty() )
 		{
-			m_postersize->setCurrentItem( tqfindIndex( pageNameToPageSize( ps ) ) );
+			m_postersize->setCurrentItem( findIndex( pageNameToPageSize( ps ) ) );
 			m_lockbtn->setOn( !prtsize.isEmpty() && 
 					page_sizes[ m_postersize->currentItem() ].ID == prtsize.toInt() );
 			if ( !m_lockbtn->isOn() )
-				m_printsize->setCurrentItem( tqfindIndex( prtsize.toInt() ) );
+				m_printsize->setCurrentItem( findIndex( prtsize.toInt() ) );
 			slotPosterSizeChanged( m_postersize->currentItem() );
 		}
 		if ( !opts[ "_kde-poster-cut" ].isEmpty() )
@@ -302,7 +302,7 @@ void KPPosterPage::getOptions( TQMap<TQString,TQString>& opts, bool )
 	}
 	else
 	{
-		if ( !o.tqcontains( "poster" ) )
+		if ( !o.contains( "poster" ) )
 			o.append( "poster" );
 		opts[ "_kde-filters" ] = o.join( "," );
 		opts[ "_kde-poster-media" ] = m_mediasize->text();
diff --git a/kdeprint/kpqtpage.cpp b/kdeprint/kpqtpage.cpp
index 54955a834..c6d19a506 100644
--- a/kdeprint/kpqtpage.cpp
+++ b/kdeprint/kpqtpage.cpp
@@ -55,7 +55,7 @@ KPQtPage::KPQtPage(TQWidget *parent, const char *name)
 }
 
 KPQtPage::KPQtPage(DrMain *driver, TQWidget *parent, const char *name)
-: KPrintDialogPage(0, (driver && driver->tqfindOption("PageSize") ? driver : 0), parent, name)
+: KPrintDialogPage(0, (driver && driver->findOption("PageSize") ? driver : 0), parent, name)
 {
 	init();
 }
@@ -116,7 +116,7 @@ void KPQtPage::init()
 	m_pagesize = new TQComboBox(this);
           TQWhatsThis::add(m_pagesize, whatsThisPageSizeOtPageLabel);
 	QLabel	*m_pagesizelabel = new TQLabel(i18n("Page s&ize:"), this);
-	m_pagesizelabel->tqsetAlignment(Qt::AlignVCenter|Qt::AlignRight);
+	m_pagesizelabel->setAlignment(Qt::AlignVCenter|Qt::AlignRight);
 	m_pagesizelabel->setBuddy(m_pagesize);
 	m_orientbox = new TQButtonGroup(0, Qt::Vertical, i18n("Orientation"), this);
           TQWhatsThis::add(m_orientbox, whatsThisOrientationOtPageLabel);
@@ -129,7 +129,7 @@ void KPQtPage::init()
           TQWhatsThis::add(m_landscape, whatsThisOrientationOtPageLabel);
 
 	m_orientpix = new TQLabel(m_orientbox);
-	m_orientpix->tqsetAlignment(Qt::AlignCenter);
+	m_orientpix->setAlignment(Qt::AlignCenter);
           TQWhatsThis::add(m_orientpix, whatsThisOrientationOtPageLabel);
 
 	QRadioButton	*m_color = new TQRadioButton(i18n("Colo&r"), m_colorbox);
@@ -137,7 +137,7 @@ void KPQtPage::init()
 
 	QRadioButton	*m_grayscale = new TQRadioButton(i18n("&Grayscale"), m_colorbox);
 	m_colorpix = new TQLabel(m_colorbox);
-	m_colorpix->tqsetAlignment(Qt::AlignCenter);
+	m_colorpix->setAlignment(Qt::AlignCenter);
           TQWhatsThis::add(m_colorpix, whatsThisColorModeOtPageLabel);
 
 	m_nupbox = new TQButtonGroup(0, Qt::Vertical, i18n("Pages per Sheet"), this);
@@ -152,10 +152,10 @@ void KPQtPage::init()
           TQWhatsThis::add(m_nupother, whatsThisPagesPerSheetOtPageLabel);
 
 	m_nuppix = new TQLabel(m_nupbox);
-	m_nuppix->tqsetAlignment(Qt::AlignCenter);
+	m_nuppix->setAlignment(Qt::AlignCenter);
           TQWhatsThis::add(m_nuppix, whatsThisPagesPerSheetOtPageLabel);
 
-	// tqlayout creation
+	// layout creation
 	QGridLayout	*lay0 = new TQGridLayout(this, 3, 2, 0, 10);
 	lay0->setRowStretch(1,1);
 	lay0->setRowStretch(2,1);
@@ -164,15 +164,15 @@ void KPQtPage::init()
 	lay0->addWidget(m_orientbox,1,0);
 	lay0->addWidget(m_colorbox,1,1);
 	lay0->addWidget(m_nupbox,2,0);
-	QGridLayout	*lay1 = new TQGridLayout(m_orientbox->tqlayout(), 2, 2, 10);
+	QGridLayout	*lay1 = new TQGridLayout(m_orientbox->layout(), 2, 2, 10);
 	lay1->addWidget(m_portrait,0,0);
 	lay1->addWidget(m_landscape,1,0);
 	lay1->addMultiCellWidget(m_orientpix,0,1,1,1);
-	QGridLayout	*lay2 = new TQGridLayout(m_colorbox->tqlayout(), 2, 2, 10);
+	QGridLayout	*lay2 = new TQGridLayout(m_colorbox->layout(), 2, 2, 10);
 	lay2->addWidget(m_color,0,0);
 	lay2->addWidget(m_grayscale,1,0);
 	lay2->addMultiCellWidget(m_colorpix,0,1,1,1);
-	QGridLayout	*lay3 = new TQGridLayout(m_nupbox->tqlayout(), 4, 2, 5);
+	QGridLayout	*lay3 = new TQGridLayout(m_nupbox->layout(), 4, 2, 5);
 	lay3->addWidget(m_nup1,0,0);
 	lay3->addWidget(m_nup2,1,0);
 	lay3->addWidget(m_nup4,2,0);
@@ -203,11 +203,11 @@ void KPQtPage::init()
 		for (int i=0; i<KPrinter::NPageSize-1; i++)
 			m_pagesize->insertItem(i18n(page_sizes[i].text));
 		// default page size to locale settings
-		m_pagesize->setCurrentItem(tqfindIndex((KPrinter::PageSize)(KGlobal::locale()->pageSize())));
+		m_pagesize->setCurrentItem(findIndex((KPrinter::PageSize)(KGlobal::locale()->pageSize())));
 	}
 	else
 	{
-		DrListOption	*lopt = static_cast<DrListOption*>(driver()->tqfindOption("PageSize"));
+		DrListOption	*lopt = static_cast<DrListOption*>(driver()->findOption("PageSize"));
 		TQPtrListIterator<DrBase>	it(*(lopt->choices()));
 		for (; it.current(); ++it)
 		{
@@ -259,18 +259,18 @@ void KPQtPage::setOptions(const TQMap<TQString,TQString>& opts)
 		QString	val = opts["PageSize"];
 		if (!val.isEmpty())
 		{
-			DrListOption	*opt = static_cast<DrListOption*>(driver()->tqfindOption("PageSize"));
-			DrBase	*ch = opt->tqfindChoice(val);
+			DrListOption	*opt = static_cast<DrListOption*>(driver()->findOption("PageSize"));
+			DrBase	*ch = opt->findChoice(val);
 			if (ch)
-				m_pagesize->setCurrentItem(opt->choices()->tqfindRef(ch));
+				m_pagesize->setCurrentItem(opt->choices()->findRef(ch));
 		}
 	}
 	else if (!opts["kde-pagesize"].isEmpty())
-		m_pagesize->setCurrentItem(tqfindIndex(opts["kde-pagesize"].toInt()));
+		m_pagesize->setCurrentItem(findIndex(opts["kde-pagesize"].toInt()));
 	ID = NUP_1;
-	if (opts["_kde-filters"].tqfind("psnup") != -1)
+	if (opts["_kde-filters"].find("psnup") != -1)
 	{
-               if (opts.tqcontains("_kde-psnup-nup")) {
+               if (opts.contains("_kde-psnup-nup")) {
                        ID = opts["_kde-psnup-nup"].toInt();
                        if (ID == 1 || ID == 2 || ID == 4)
                        {
@@ -302,7 +302,7 @@ void KPQtPage::getOptions(TQMap<TQString,TQString>& opts, bool incldef)
 	opts["kde-colormode"] = (m_colorbox->id(m_colorbox->selected()) == COLORMODE_GRAYSCALE_ID ? "GrayScale" : "Color");
 	if (driver())
 	{
-		DrListOption	*opt = static_cast<DrListOption*>(driver()->tqfindOption("PageSize"));
+		DrListOption	*opt = static_cast<DrListOption*>(driver()->findOption("PageSize"));
 		if (opt)
 		{
 			DrBase	*ch = opt->choices()->at(m_pagesize->currentItem());
@@ -323,7 +323,7 @@ void KPQtPage::getOptions(TQMap<TQString,TQString>& opts, bool incldef)
 	else if (ID != NUP_OTHER)
 	{
 		int	nup(ID == NUP_2 ? 2 : 4);
-		if (s.tqfind("psnup") == -1)
+		if (s.find("psnup") == -1)
 		{
 			QStringList	fl = TQStringList::split(',', s, false);
 			KXmlCommandManager::self()->insertCommand(fl, "psnup");
diff --git a/kdeprint/kprintaction.cpp b/kdeprint/kprintaction.cpp
index a319e64eb..4e62e791b 100644
--- a/kdeprint/kprintaction.cpp
+++ b/kdeprint/kprintaction.cpp
@@ -31,33 +31,33 @@ public:
 	KPrintActionPrivate()
 	{
 		type = All;
-		tqparentWidget = 0;
+		parentWidget = 0;
 	}
 
 	PrinterType	type;
 	QStringList	printers;
-	TQWidget *tqparentWidget;
+	TQWidget *parentWidget;
 };
 
-KPrintAction::KPrintAction(const TQString& text, PrinterType type, TQWidget *tqparentWidget, TQObject *parent, const char *name)
+KPrintAction::KPrintAction(const TQString& text, PrinterType type, TQWidget *parentWidget, TQObject *parent, const char *name)
 : KActionMenu(text, parent, name)
 {
 	d = new KPrintActionPrivate();
-	initialize(type, tqparentWidget);
+	initialize(type, parentWidget);
 }
 
-KPrintAction::KPrintAction(const TQString& text, const TQIconSet& icon, PrinterType type, TQWidget *tqparentWidget, TQObject *parent, const char *name)
+KPrintAction::KPrintAction(const TQString& text, const TQIconSet& icon, PrinterType type, TQWidget *parentWidget, TQObject *parent, const char *name)
 : KActionMenu(text, icon, parent, name)
 {
 	d = new KPrintActionPrivate();
-	initialize(type, tqparentWidget);
+	initialize(type, parentWidget);
 }
 
-KPrintAction::KPrintAction(const TQString& text, const TQString& icon, PrinterType type, TQWidget *tqparentWidget, TQObject *parent, const char *name)
+KPrintAction::KPrintAction(const TQString& text, const TQString& icon, PrinterType type, TQWidget *parentWidget, TQObject *parent, const char *name)
 : KActionMenu(text, icon, parent, name)
 {
 	d = new KPrintActionPrivate();
-	initialize(type, tqparentWidget);
+	initialize(type, parentWidget);
 }
 
 KPrintAction::~KPrintAction()
@@ -65,13 +65,13 @@ KPrintAction::~KPrintAction()
 	delete d;
 }
 
-void KPrintAction::initialize(PrinterType type, TQWidget *tqparentWidget)
+void KPrintAction::initialize(PrinterType type, TQWidget *parentWidget)
 {
 	connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow()));
 	connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int)));
 
 	d->type = type;
-	d->tqparentWidget = tqparentWidget;
+	d->parentWidget = parentWidget;
 }
 
 void KPrintAction::slotAboutToShow()
@@ -104,27 +104,27 @@ void KPrintAction::slotAboutToShow()
 void KPrintAction::slotActivated(int ID)
 {
 	KPrinter	printer(false);
-	KMPrinter	*mprt = KMManager::self()->tqfindPrinter(d->printers[ID]);
-	if (mprt && mprt->autoConfigure(&printer, d->tqparentWidget))
+	KMPrinter	*mprt = KMManager::self()->findPrinter(d->printers[ID]);
+	if (mprt && mprt->autoConfigure(&printer, d->parentWidget))
 	{
 		// emit the signal
 		emit print(&printer);
 	}
 }
 
-KPrintAction* KPrintAction::exportAll(TQWidget *tqparentWidget, TQObject *parent, const char *name)
+KPrintAction* KPrintAction::exportAll(TQWidget *parentWidget, TQObject *parent, const char *name)
 {
-	return new KPrintAction(i18n("&Export..."), All, tqparentWidget, parent, (name ? name : "export_all"));
+	return new KPrintAction(i18n("&Export..."), All, parentWidget, parent, (name ? name : "export_all"));
 }
 
-KPrintAction* KPrintAction::exportRegular(TQWidget *tqparentWidget, TQObject *parent, const char *name)
+KPrintAction* KPrintAction::exportRegular(TQWidget *parentWidget, TQObject *parent, const char *name)
 {
-	return new KPrintAction(i18n("&Export..."), Regular, tqparentWidget, parent, (name ? name : "export_regular"));
+	return new KPrintAction(i18n("&Export..."), Regular, parentWidget, parent, (name ? name : "export_regular"));
 }
 
-KPrintAction* KPrintAction::exportSpecial(TQWidget *tqparentWidget, TQObject *parent, const char *name)
+KPrintAction* KPrintAction::exportSpecial(TQWidget *parentWidget, TQObject *parent, const char *name)
 {
-	return new KPrintAction(i18n("&Export..."), Specials, tqparentWidget, parent, (name ? name : "export_special"));
+	return new KPrintAction(i18n("&Export..."), Specials, parentWidget, parent, (name ? name : "export_special"));
 }
 
 #include "kprintaction.moc"
diff --git a/kdeprint/kprintaction.h b/kdeprint/kprintaction.h
index b9ba54add..eb23d6e31 100644
--- a/kdeprint/kprintaction.h
+++ b/kdeprint/kprintaction.h
@@ -30,14 +30,14 @@ class KDEPRINT_EXPORT KPrintAction : public KActionMenu
 public:
 	enum PrinterType { All, Regular, Specials };
 
-	KPrintAction(const TQString& text, PrinterType type = All, TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0);
-	KPrintAction(const TQString& text, const TQIconSet& icon, PrinterType type = All, TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0);
-	KPrintAction(const TQString& text, const TQString& icon, PrinterType type = All, TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0);
+	KPrintAction(const TQString& text, PrinterType type = All, TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0);
+	KPrintAction(const TQString& text, const TQIconSet& icon, PrinterType type = All, TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0);
+	KPrintAction(const TQString& text, const TQString& icon, PrinterType type = All, TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0);
 	virtual ~KPrintAction();
 
-	static KPrintAction* exportAll(TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0);
-	static KPrintAction* exportRegular(TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0);
-	static KPrintAction* exportSpecial(TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0);
+	static KPrintAction* exportAll(TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0);
+	static KPrintAction* exportRegular(TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0);
+	static KPrintAction* exportSpecial(TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0);
 
 signals:
 	void print(KPrinter*);
@@ -47,7 +47,7 @@ protected slots:
 	void slotActivated(int);
 
 protected:
-	void initialize(PrinterType type, TQWidget *tqparentWidget);
+	void initialize(PrinterType type, TQWidget *parentWidget);
 
 private:
 	class KPrintActionPrivate;
diff --git a/kdeprint/kprintdialog.cpp b/kdeprint/kprintdialog.cpp
index ac3fc1d18..c84472677 100644
--- a/kdeprint/kprintdialog.cpp
+++ b/kdeprint/kprintdialog.cpp
@@ -111,7 +111,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name)
 						" </qt>" );
 	TQString whatsThisPrinterSelect = i18n(  " <qt><b>Printer Selection Menu:</b> "
 						" <p>Use this combo box to select the printer to which you want to print."
-						" Initially (if you run KDEPrint for the first time), you may only tqfind the "
+						" Initially (if you run KDEPrint for the first time), you may only find the "
 						"  <em>KDE special printers</em> (which save"
 						" jobs to disk [as PostScript- or PDF-files], or deliver jobs via"
 						" email (as a PDF"
@@ -237,7 +237,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name)
 	TQString whatsThisPreviewCheckBox = i18n(" <qt><b>Print Preview</b>"
 						" Enable this checkbox if you want to see a preview of"
 						" your printout. A preview lets you check if, for instance,"
- 						" your intended \"poster\" or \"pamphlet\" tqlayout"
+ 						" your intended \"poster\" or \"pamphlet\" layout"
 						" looks like you expected, without wasting paper first. It"
 						" also lets you cancel the job if something looks wrong. "
 						" <p><b>Note:</b> The preview feature (and therefore this checkbox) "
@@ -277,7 +277,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name)
 	d->m_printers->setMinimumHeight(25);
 	QLabel	*m_printerlabel = new TQLabel(i18n("&Name:"), m_pbox);
 	TQWhatsThis::add(m_printerlabel, whatsThisPrinterSelect);
-	QLabel	*m_statelabel = new TQLabel(i18n("tqStatus", "State:"), m_pbox);
+	QLabel	*m_statelabel = new TQLabel(i18n("Status", "State:"), m_pbox);
 	TQWhatsThis::add(m_statelabel, whatsThisPrinterState);
 	QLabel	*m_typelabel = new TQLabel(i18n("Type:"), m_pbox);
 	TQWhatsThis::add(m_typelabel, whatsThisPrinterType);
@@ -347,7 +347,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name)
 	TQWidget::setTabOrder( m_help, d->m_ok );
 	TQWidget::setTabOrder( d->m_ok, m_cancel );
 
-	// tqlayout creation
+	// layout creation
 	QVBoxLayout	*l1 = new TQVBoxLayout(this, 10, 10);
 	l1->addWidget(m_pbox,0);
 	l1->addWidget(d->m_dummy,1);
@@ -361,7 +361,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name)
 	l2->addStretch(1);
 	l2->addWidget(d->m_ok,0);
 	l2->addWidget(m_cancel,0);
-	QGridLayout	*l3 = new TQGridLayout(m_pbox->tqlayout(),3,3,7);
+	QGridLayout	*l3 = new TQGridLayout(m_pbox->layout(),3,3,7);
 	l3->setColStretch(1,1);
 	l3->setRowStretch(0,1);
 	QGridLayout	*l4 = new TQGridLayout(0, 5, 2, 0, 5);
@@ -546,7 +546,7 @@ void KPrintDialog::initialize(KPrinter *printer)
 	TQPtrList<KMPrinter>	*plist = KMFactory::self()->manager()->printerList();
 	if (!KMManager::self()->errorMsg().isEmpty())
 	{
-		KMessageBox::error(tqparentWidget(),
+		KMessageBox::error(parentWidget(),
 			"<qt><nobr>"+
 			i18n("An error occurred while retrieving the printer list:")
 			+"</nobr><br><br>"+KMManager::self()->errorMsg()+"</qt>");
@@ -568,7 +568,7 @@ void KPrintDialog::initialize(KPrinter *printer)
 			if (!sep && it.current()->isSpecial())
 			{
 				sep = true;
-				d->m_printers->insertItem(TQPixmap(), TQString::tqfromLatin1("--------"));
+				d->m_printers->insertItem(TQPixmap(), TQString::fromLatin1("--------"));
 			}
 			d->m_printers->insertItem(SmallIcon(it.current()->pixmap(),0,(it.current()->isValid() ? (int)KIcon::DefaultState : (int)KIcon::LockOverlay)),it.current()->name(),false/*sep*/);
 			if (it.current()->isSoftDefault())
@@ -580,9 +580,9 @@ void KPrintDialog::initialize(KPrinter *printer)
 			else if (defsearch == -1 && it.current()->name() == printer->searchName())
 				defsearch = d->m_printers->count()-1;
 		}
-		int	detqfindex = (defsearch != -1 ? defsearch : (defsoft != -1 ? defsoft : QMAX(defhard,0)));
-		d->m_printers->setCurrentItem(detqfindex);
-		//slotPrinterSelected(detqfindex);
+		int	defindex = (defsearch != -1 ? defsearch : (defsoft != -1 ? defsoft : QMAX(defhard,0)));
+		d->m_printers->setCurrentItem(defindex);
+		//slotPrinterSelected(defindex);
 	}
 
 	// Initialize output filename
@@ -614,7 +614,7 @@ void KPrintDialog::slotPrinterSelected(int index)
 	if (index >= 0 && index < d->m_printers->count())
 	{
 		KMManager	*mgr = KMFactory::self()->manager();
-		KMPrinter	*p = mgr->tqfindPrinter(d->m_printers->text(index));
+		KMPrinter	*p = mgr->findPrinter(d->m_printers->text(index));
 		if (p)
 		{
 			if (!p->isSpecial()) mgr->completePrinterShort(p);
@@ -638,14 +638,14 @@ void KPrintDialog::slotProperties()
 {
 	if (!d->m_printer) return;
 
-	KMPrinter	*prt = KMFactory::self()->manager()->tqfindPrinter(d->m_printers->currentText());
+	KMPrinter	*prt = KMFactory::self()->manager()->findPrinter(d->m_printers->currentText());
 	if (prt)
 		KPrinterPropertyDialog::setupPrinter(prt, this);
 }
 
 void KPrintDialog::slotSetDefault()
 {
-	KMPrinter	*p = KMFactory::self()->manager()->tqfindPrinter(d->m_printers->currentText());
+	KMPrinter	*p = KMFactory::self()->manager()->findPrinter(d->m_printers->currentText());
 	if (p)
 		KMFactory::self()->virtualManager()->setDefault(p);
 }
@@ -674,7 +674,7 @@ void KPrintDialog::done(int result)
 
 		// add options from the dialog itself
 		// TODO: ADD PRINTER CHECK MECHANISM !!!
-		prt = KMFactory::self()->manager()->tqfindPrinter(d->m_printers->currentText());
+		prt = KMFactory::self()->manager()->findPrinter(d->m_printers->currentText());
 		if (prt->isSpecial() && prt->option("kde-special-file") == "1")
 		{
 			if (!checkOutputFile()) return;
@@ -800,7 +800,7 @@ void KPrintDialog::setOutputFileExtension(const TQString& ext)
 	{
 		KURL url( d->m_file->url() );
 		TQString f( url.fileName() );
-		int p = f.tqfindRev( '.' );
+		int p = f.findRev( '.' );
 		// change "file.ext"; don't change "file", "file." or ".file" but do change ".file.ext"
 		if ( p > 0 && p != int (f.length () - 1) )
 		{
@@ -863,7 +863,7 @@ void KPrintDialog::expandDialog(bool on)
 
 	if (on)
 	{
-		sz.setHeight(sz.height()+d->m_dummy->tqminimumSize().height()+d->m_plugin->tqminimumSize().height()+2*tqlayout()->spacing());
+		sz.setHeight(sz.height()+d->m_dummy->minimumSize().height()+d->m_plugin->minimumSize().height()+2*layout()->spacing());
 		if (isVisible() || !d->m_dummy->isVisible() || !d->m_plugin->isVisible())
 		{
 			d->m_dummy->show();
@@ -876,7 +876,7 @@ void KPrintDialog::expandDialog(bool on)
 	}
 	else
 	{
-		sz.setHeight(sz.height()-d->m_dummy->height()-d->m_plugin->height()-2*tqlayout()->spacing());
+		sz.setHeight(sz.height()-d->m_dummy->height()-d->m_plugin->height()-2*layout()->spacing());
 		if (!isVisible() || d->m_dummy->isVisible() || d->m_plugin->isVisible())
 		{
 			d->m_dummy->hide();
@@ -890,7 +890,7 @@ void KPrintDialog::expandDialog(bool on)
 
 	if (needResize)
 	{
-		tqlayout()->activate();
+		layout()->activate();
 		resize(sz);
 	}
 }
@@ -934,7 +934,7 @@ void KPrintDialog::slotUpdatePossible( bool flag )
 {
 	MessageWindow::remove( this );
 	if ( !flag )
-		KMessageBox::error(tqparentWidget(),
+		KMessageBox::error(parentWidget(),
 			"<qt><nobr>"+
 			i18n("An error occurred while retrieving the printer list:")
 			+"</nobr><br><br>"+KMManager::self()->errorMsg()+"</qt>");
@@ -966,7 +966,7 @@ void KPrintDialog::slotOpenFileDialog()
 	dialog->setMode(d->m_file->fileDialog()->mode() & ~KFile::LocalOnly);
 	dialog->setOperationMode( KFileDialog::Saving );
 
-	KMPrinter *prt = KMFactory::self()->manager()->tqfindPrinter(d->m_printers->currentText());
+	KMPrinter *prt = KMFactory::self()->manager()->findPrinter(d->m_printers->currentText());
 	if (prt)
 	{
 		QString	mimetype(prt->option("kde-special-mimetype"));
diff --git a/kdeprint/kprinter.cpp b/kdeprint/kprinter.cpp
index 3bdbfd92b..c96db7a8d 100644
--- a/kdeprint/kprinter.cpp
+++ b/kdeprint/kprinter.cpp
@@ -486,7 +486,7 @@ TQValueList<int> KPrinter::pageList() const
 				QStringList	ranges = TQStringList::split(',',option("kde-range"),false);
 				for (TQStringList::ConstIterator it=ranges.begin();it!=ranges.end();++it)
 				{
-					int	p = (*it).tqfind('-');
+					int	p = (*it).find('-');
 					bool	ok;
 					if (p == -1)
 					{
@@ -519,7 +519,7 @@ TQValueList<int> KPrinter::pageList() const
 			if (pageOrder() == LastPageFirst)
 			{
 				for (uint i=0;i<(list.count()/2);i++)
-					tqSwap(list[i],list[list.count()-1-i]);
+					qSwap(list[i],list[list.count()-1-i]);
 			}
 
 			// select page set if needed
@@ -638,7 +638,7 @@ void KPrinter::setOptions(const TQMap<TQString,TQString>& opts)
 	tmpset.remove( "kde-resolution" );
 	tmpset.remove( "kde-fonts" );
 	for (TQMap<TQString,TQString>::ConstIterator it=tmpset.begin();it!=tmpset.end();++it)
-		if (it.key().left(4) == "kde-" && !(d->m_options.tqcontains(it.key())))
+		if (it.key().left(4) == "kde-" && !(d->m_options.contains(it.key())))
 			d->m_options[it.key()] = it.data();
 }
 
@@ -673,7 +673,7 @@ bool KPrinter::autoConfigure(const TQString& prname, TQWidget *parent)
 	if (prname.isEmpty())
 		mprt = mgr->defaultPrinter();
 	else
-		mprt = mgr->tqfindPrinter(prname);
+		mprt = mgr->findPrinter(prname);
 
 	if (mprt)
 		return mprt->autoConfigure(this, parent);
@@ -846,7 +846,7 @@ int KPrinter::toPage() const
 { return (option("kde-topage").isEmpty() ? 0 : option("kde-topage").toInt()); }
 
 void KPrinter::setFromTo(int m, int M)
-{ setOption("kde-frompage",TQString::number(m)); setOption("kde-topage",TQString::number(M)); setOption("kde-range",(m>0 && M>0 ? TQString("%1-%2").arg(m).arg(M) : TQString::tqfromLatin1(""))); }
+{ setOption("kde-frompage",TQString::number(m)); setOption("kde-topage",TQString::number(M)); setOption("kde-range",(m>0 && M>0 ? TQString("%1-%2").arg(m).arg(M) : TQString::fromLatin1(""))); }
 
 // if no page size defined, use the localized one
 KPrinter::PageSize KPrinter::pageSize() const
@@ -880,16 +880,16 @@ void KPrinter::setPrintProgram(const TQString& prg)
 	else
 	{
 		QString	s(prg);
-		if (s.tqfind("%in") == -1)
+		if (s.find("%in") == -1)
 			s.append(" %in");
-		setOutputToFile( s.tqfind( "%out" ) != -1 );
+		setOutputToFile( s.find( "%out" ) != -1 );
 		setOption("kde-isspecial", "1");
 		setOption("kde-special-command", s);
 	}
 }
 
 TQString KPrinter::printerSelectionOption() const
-{ return TQString::tqfromLatin1(""); }
+{ return TQString::fromLatin1(""); }
 
 void KPrinter::setPrinterSelectionOption(const TQString&)
 {}
diff --git a/kdeprint/kprinterimpl.cpp b/kdeprint/kprinterimpl.cpp
index 1e6f10837..94750b607 100644
--- a/kdeprint/kprinterimpl.cpp
+++ b/kdeprint/kprinterimpl.cpp
@@ -69,11 +69,11 @@ KPrinterImpl::~KPrinterImpl()
 
 void KPrinterImpl::preparePrinting(KPrinter *printer)
 {
-	// page size -> try to tqfind page size and margins from driver file
-	// use "PageSize" as option name to tqfind the wanted page size. It's
+	// page size -> try to find page size and margins from driver file
+	// use "PageSize" as option name to find the wanted page size. It's
 	// up to the driver loader to use that option name.
 	KMManager	*mgr = KMFactory::self()->manager();
-	DrMain	*driver = mgr->loadPrinterDriver(mgr->tqfindPrinter(printer->printerName()), false);
+	DrMain	*driver = mgr->loadPrinterDriver(mgr->findPrinter(printer->printerName()), false);
 	if (driver)
 	{
 		// Find the page size:
@@ -82,13 +82,13 @@ void KPrinterImpl::preparePrinting(KPrinter *printer)
 		QString	psname = printer->option("PageSize");
 		if (psname.isEmpty())
 		{
-			DrListOption	*opt = (DrListOption*)driver->tqfindOption("PageSize");
+			DrListOption	*opt = (DrListOption*)driver->findOption("PageSize");
 			if (opt) psname = opt->get("default");
 		}
 		if (!psname.isEmpty())
 		{
 			printer->setOption("kde-pagesize",TQString::number((int)pageNameToPageSize(psname)));
-			DrPageSize	*ps = driver->tqfindPageSize(psname);
+			DrPageSize	*ps = driver->findPageSize(psname);
 			if (ps)
 			{
 				printer->setRealPageSize( ps );
@@ -104,7 +104,7 @@ void KPrinterImpl::preparePrinting(KPrinter *printer)
 		TQString res = printer->option( "Resolution" );
 		if ( res.isEmpty() )
 		{
-			DrBase *opt = driver->tqfindOption( "Resolution" );
+			DrBase *opt = driver->findOption( "Resolution" );
 			if ( opt )
 				res = opt->get( "default" );
 			if ( res.isEmpty() )
@@ -225,7 +225,7 @@ void KPrinterImpl::statusMessage(const TQString& msg, KPrinter *printer)
 	kdDebug(500) << "kdeprint: status message: " << msg << endl;
 	KConfig	*conf = KMFactory::self()->printConfig();
 	conf->setGroup("General");
-	if (!conf->readBoolEntry("ShowtqStatusMsg", true))
+	if (!conf->readBoolEntry("ShowStatusMsg", true))
 		return;
 
 	QString	message(msg);
@@ -252,7 +252,7 @@ bool KPrinterImpl::startPrinting(const TQString& cmd, KPrinter *printer, const T
 
 	QString	command(cmd), filestr;
 	QStringList	printfiles;
-	if (command.tqfind("%in") == -1) command.append(" %in");
+	if (command.find("%in") == -1) command.append(" %in");
 
 	for (TQStringList::ConstIterator it=files.begin(); it!=files.end(); ++it)
 		if (TQFile::exists(*it))
@@ -266,7 +266,7 @@ bool KPrinterImpl::startPrinting(const TQString& cmd, KPrinter *printer, const T
 
 	if (printfiles.count() > 0)
 	{
-		command.tqreplace("%in",filestr);
+		command.replace("%in",filestr);
 		int pid = dcopPrint(command,files,flag);
 		if (pid > 0)
 		{
@@ -317,7 +317,7 @@ int KPrinterImpl::filterFiles(KPrinter *printer, TQStringList& files, bool flag)
 	     !printer->option("kde-range").isEmpty() ||
 	     printer->pageSet() != KPrinter::AllPages))
 	{
-		if (flist.tqfindIndex("psselect") == -1)
+		if (flist.findIndex("psselect") == -1)
 		{
 			int	index = KXmlCommandManager::self()->insertCommand(flist, "psselect", false);
 			if (index == -1 || !KXmlCommandManager::self()->checkCommand("psselect"))
@@ -378,8 +378,8 @@ int KPrinterImpl::doFilterFiles(KPrinter *printer, TQStringList& files, const TQ
 	QString	ps = pageSizeToPageName( printer->option( "kde-printsize" ).isEmpty() ? printer->pageSize() : ( KPrinter::PageSize )printer->option( "kde-printsize" ).toInt() );
 	for (TQStringList::Iterator it=files.begin(); it!=files.end(); ++it)
 	{
-		QString	mime = KMimeMagic::self()->tqfindFileType(*it)->mimeType();
-		if (inputMimeTypes.tqfind(mime) == inputMimeTypes.end())
+		QString	mime = KMimeMagic::self()->findFileType(*it)->mimeType();
+		if (inputMimeTypes.find(mime) == inputMimeTypes.end())
 		{
 			if (KMessageBox::warningContinueCancel(0,
 				"<p>" + i18n("The MIME type %1 is not supported as input of the filter chain "
@@ -434,10 +434,10 @@ int KPrinterImpl::doFilterFiles(KPrinter *printer, TQStringList& files, const TQ
 
 		QString	tmpfile = tempFile();
 		QString	cmd(filtercmd);
-		cmd.tqreplace(rout,quote(tmpfile));
-		cmd.tqreplace(rpsl,ps.lower());
-		cmd.tqreplace(rpsu,ps);
-		cmd.tqreplace(rin,quote(*it)); // Replace as last, filename could contain "%psl"
+		cmd.replace(rout,quote(tmpfile));
+		cmd.replace(rpsl,ps.lower());
+		cmd.replace(rpsu,ps);
+		cmd.replace(rin,quote(*it)); // Replace as last, filename could contain "%psl"
 		statusMessage(i18n("Filtering print data"), printer);
 		int status = system(TQFile::encodeName(cmd));
 		if (status < 0 || WEXITSTATUS(status) == 127)
@@ -479,7 +479,7 @@ int KPrinterImpl::autoConvertFiles(KPrinter *printer, TQStringList& files, bool
 	int		status(0), result;
 	for (TQStringList::Iterator it=files.begin(); it!=files.end(); )
 	{
-		QString	mime = KMimeMagic::self()->tqfindFileType(*it)->mimeType();
+		QString	mime = KMimeMagic::self()->findFileType(*it)->mimeType();
 		if ( mime == "application/x-zerosize" )
 		{
 			// special case of empty file
@@ -491,7 +491,7 @@ int KPrinterImpl::autoConvertFiles(KPrinter *printer, TQStringList& files, bool
 			it = files.remove( it );
 			continue;
 		}
-		else if (mimeTypes.tqfindIndex(mime) == -1)
+		else if (mimeTypes.findIndex(mime) == -1)
 		{
 			if ((result=KMessageBox::warningYesNoCancel(NULL,
 					       i18n("<qt>The file format <em> %1 </em> is not directly supported by the current print system. You "
@@ -508,9 +508,9 @@ int KPrinterImpl::autoConvertFiles(KPrinter *printer, TQStringList& files, bool
 					       TQString::null,
 					       i18n("Convert"),
 					       i18n("Keep"),
-					       TQString::tqfromLatin1("kdeprintAutoConvert"))) == KMessageBox::Yes)
+					       TQString::fromLatin1("kdeprintAutoConvert"))) == KMessageBox::Yes)
 			{
-				// tqfind the filter chain
+				// find the filter chain
 				QStringList	flist = KXmlCommandManager::self()->autoConvert(mime, primaryMimeType);
 				if (flist.count() == 0)
 				{
@@ -565,9 +565,9 @@ bool KPrinterImpl::setupSpecialCommand(TQString& cmd, KPrinter *p, const TQStrin
 	s = KMFactory::self()->specialManager()->setupCommand(s, p->options());
 
 	QString	ps = pageSizeToPageName( p->option( "kde-printsize" ).isEmpty() ? p->pageSize() : ( KPrinter::PageSize )p->option( "kde-printsize" ).toInt() );
-	s.tqreplace("%psl", ps.lower());
-	s.tqreplace("%psu", ps);
-	s.tqreplace("%out", "$out{" + p->outputFileName() + "}"); // Replace as last
+	s.replace("%psl", ps.lower());
+	s.replace("%psu", ps);
+	s.replace("%out", "$out{" + p->outputFileName() + "}"); // Replace as last
 	cmd = s;
 	return true;
 }
diff --git a/kdeprint/kprinterimpl.h b/kdeprint/kprinterimpl.h
index b06d77706..ae6b8b75d 100644
--- a/kdeprint/kprinterimpl.h
+++ b/kdeprint/kprinterimpl.h
@@ -31,7 +31,7 @@
 class KPrinter;
 class KMPrinter;
 
-class KDEPRINT_EXPORT KPrinterImpl : public TQObject
+class KDEPRINT_EXPORT KPrinterImpl : public QObject
 {
 	Q_OBJECT
 public:
diff --git a/kdeprint/kprintpreview.cpp b/kdeprint/kprintpreview.cpp
index 034285543..5ad8a428f 100644
--- a/kdeprint/kprintpreview.cpp
+++ b/kdeprint/kprintpreview.cpp
@@ -111,7 +111,7 @@ static KLibFactory* componentFactory()
 	factory = KLibLoader::self()->factory("libkghostviewpart");
         if( factory )
             return factory;
-	KTrader::OfferList	offers = KTrader::self()->query(TQString::tqfromLatin1("application/postscript"), TQString::tqfromLatin1("KParts/ReadOnlyPart"), TQString::null, TQString::null);
+	KTrader::OfferList	offers = KTrader::self()->query(TQString::fromLatin1("application/postscript"), TQString::fromLatin1("KParts/ReadOnlyPart"), TQString::null, TQString::null);
 	for (KTrader::OfferList::ConstIterator it = offers.begin(); it != offers.end(); ++it)
 	{
 		KService::Ptr	service = *it;
@@ -217,7 +217,7 @@ void KPrintPreview::initView(KLibFactory *factory)
 	d->toolbar_->setMovingEnabled(false);
 	//d->adjustSize();
 
-	// construct the tqlayout
+	// construct the layout
 	QVBoxLayout	*l0 = new TQVBoxLayout(d->mainwidget_, 0, 0);
 	l0->addWidget(d->toolbar_, AlignTop);
 	if (d->gvpart_)
@@ -239,7 +239,7 @@ bool KPrintPreview::isValid() const
 
 bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId)
 {
-	KMimeType::Ptr mime = KMimeType::tqfindByPath( file );
+	KMimeType::Ptr mime = KMimeType::findByPath( file );
 	bool isPS = ( mime->name() == "application/postscript" );
 	if ( !isPS )
 		kdDebug( 500 ) << "Previewing a non PostScript file, built-in preview disabled" << endl;
@@ -248,7 +248,7 @@ bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId
 	conf->setGroup("General");
 	KLibFactory	*factory(0);
 	bool	externalPreview = conf->readBoolEntry("ExternalPreview", false);
-	QWidget	*parentW = TQWidget::tqfind(parentId);
+	QWidget	*parentW = TQWidget::find(parentId);
 	QString	exe;
 	if (!externalPreview && isPS && (factory = componentFactory()) != 0)
 	{
@@ -304,7 +304,7 @@ bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId
 			               "viewer (KGhostView) nor any other external PostScript "
 			               "viewer could be found.");
 			else
-				msg = i18n( "Preview failed: KDE could not tqfind any application "
+				msg = i18n( "Preview failed: KDE could not find any application "
 						    "to preview files of type %1." ).arg( mime->name() );
 
 			return continuePrint(msg, parentW, previewOnly);
diff --git a/kdeprint/kxmlcommand.cpp b/kdeprint/kxmlcommand.cpp
index 7a1949885..27f8c6642 100644
--- a/kdeprint/kxmlcommand.cpp
+++ b/kdeprint/kxmlcommand.cpp
@@ -161,7 +161,7 @@ void KXmlCommand::setMimeType(const TQString& s)
 bool KXmlCommand::acceptMimeType(const TQString& s)
 {
 	check();
-	return (d->m_inputMime.tqfind(s) != d->m_inputMime.end());
+	return (d->m_inputMime.find(s) != d->m_inputMime.end());
 }
 
 TQStringList KXmlCommand::inputMimeTypes()
@@ -378,31 +378,31 @@ TQString KXmlCommand::buildCommand(const TQMap<TQString,TQString>& opts, bool pi
 		d->m_driver->getOptions(fopts, false);
 		for (TQMap<TQString,TQString>::ConstIterator it=fopts.begin(); it!=fopts.end(); ++it)
 		{
-			DrBase	*dopt = d->m_driver->tqfindOption(it.key());
+			DrBase	*dopt = d->m_driver->findOption(it.key());
 			if (dopt)
 			{
 				QString	format = dopt->get("format");
 				TQString value = dopt->valueText();
-				if ( format.tqfind( quotedRe ) != -1 )
+				if ( format.find( quotedRe ) != -1 )
 				{
 					if ( ( value.right( 1 ) == "'" && value.left( 1 ) == "'" )  ||
 					     ( value.right( 1 ) == "\"" && value.left( 1 ) == "\"" ) )
-						format.tqreplace( quotedRe, value );
+						format.replace( quotedRe, value );
 					else
-						format.tqreplace( re, value );
+						format.replace( re, value );
 				}
 				else
 				{
-					format.tqreplace( re, KProcess::quote( dopt->valueText() ) );
+					format.replace( re, KProcess::quote( dopt->valueText() ) );
 				}
 				str.append(format).append(" ");
 			}
 		}
-		cmd.tqreplace("%filterargs", str);
+		cmd.replace("%filterargs", str);
 	}
 
-	cmd.tqreplace("%filterinput", d->m_io[0].m_format[(pipein?1:0)]);
-	cmd.tqreplace("%filteroutput", d->m_io[1].m_format[(pipeout?1:0)]);
+	cmd.replace("%filterinput", d->m_io[0].m_format[(pipein?1:0)]);
+	cmd.replace("%filteroutput", d->m_io[1].m_format[(pipeout?1:0)]);
 
 	return cmd;
 }
@@ -463,7 +463,7 @@ void KXmlCommand::saveXml()
 TQDomElement KXmlCommand::createIO(TQDomDocument& doc, int n, const TQString& tag)
 {
 	QDomElement	elem = doc.createElement(tag);
-	if (d->m_command.tqfind("%"+tag) != -1)
+	if (d->m_command.find("%"+tag) != -1)
 	{
 		for (int i=0; i<2; i++)
 		{
@@ -499,7 +499,7 @@ TQDomElement KXmlCommand::createElement(TQDomDocument& doc, DrBase *opt)
 	QDomElement	elem = doc.createElement("filterarg");
 	QString	elemName = opt->name();
 	if (elemName.startsWith("_kde-"))
-		elemName.tqreplace(0, name().length()+6, "");
+		elemName.replace(0, name().length()+6, "");
 	elem.setAttribute("name", elemName);
 	elem.setAttribute("format", opt->get("format"));
 	elem.setAttribute("description", opt->get("text"));
@@ -632,7 +632,7 @@ TQStringList KXmlCommandManager::commandList()
 			for (TQStringList::ConstIterator it2=list.begin(); it2!=list.end(); ++it2)
 			{
 				QString	cmdName = (*it2).left((*it2).length()-8);
-				if (d->m_cmdlist.tqfind(cmdName) == d->m_cmdlist.end())
+				if (d->m_cmdlist.find(cmdName) == d->m_cmdlist.end())
 					d->m_cmdlist.append(cmdName);
 			}
 		}
@@ -666,7 +666,7 @@ TQString KXmlCommandManager::selectCommand(TQWidget *parent)
 		TQString ( *func )( TQWidget* ) = ( TQString( * )( TQWidget* ) )lib->symbol( "select_command" );
 		if ( !func )
 		{
-			KMessageBox::error( parent, i18n( "Unable to tqfind wizard object in management library." ) );
+			KMessageBox::error( parent, i18n( "Unable to find wizard object in management library." ) );
 			return TQString::null;
 		}
 		else
@@ -676,7 +676,7 @@ TQString KXmlCommandManager::selectCommand(TQWidget *parent)
 
 KXmlCommand* KXmlCommandManager::command(const TQString& xmlId) const
 {
-	return (d->m_cmdmap.tqcontains(xmlId) ? d->m_cmdmap[xmlId] : 0);
+	return (d->m_cmdmap.contains(xmlId) ? d->m_cmdmap[xmlId] : 0);
 }
 
 int KXmlCommandManager::insertCommand(TQStringList& list, const TQString& filtername, bool defaultToStart)
@@ -728,7 +728,7 @@ TQStringList KXmlCommandManager::autoConvert(const TQString& mimesrc, const TQSt
 
 	preload();
 
-	if (d->m_mimemap.tqcontains(mimesrc))
+	if (d->m_mimemap.contains(mimesrc))
 	{
 		const TQValueList<KXmlCommand*>	l = d->m_mimemap[mimesrc];
 		for (TQValueList<KXmlCommand*>::ConstIterator it=l.begin(); it!=l.end(); ++it)
@@ -743,16 +743,16 @@ TQStringList KXmlCommandManager::autoConvert(const TQString& mimesrc, const TQSt
 				chain = TQStringList((*it)->name());
 				break;
 			}
-			// non direct filter: tqfind the shortest way between
+			// non direct filter: find the shortest way between
 			// its output and mimedest (do not consider cyling filters)
 			else if ((*it)->mimeType() != mimesrc)
 			{
 				QStringList	subchain = autoConvert((*it)->mimeType(), mimedest);
 				// If chain length is 0, then there's no possible filter between those 2
-				// mime types. Just discard it. If the subchain tqcontains also the current
+				// mime types. Just discard it. If the subchain contains also the current
 				// considered filter, then discard it: it denotes of a cycle in filter
 				// chain.
-				if (subchain.count() > 0 && subchain.tqfindIndex((*it)->name()) == -1)
+				if (subchain.count() > 0 && subchain.findIndex((*it)->name()) == -1)
 				{
 					subchain.prepend((*it)->name());
 					if (subchain.count() < score || score == 0)
@@ -791,12 +791,12 @@ bool KXmlCommandManager::checkCommand(const TQString& xmlId, int inputCheck, int
 	QString	cmd = (xmlCmd ? xmlCmd->command() : xmlId);
 	if (status && !cmd.isEmpty() && (inputCheck > None || outputCheck > None))
 	{
-		if (inputCheck > None && (cmd.tqfind("%in") == -1 || inputCheck == Advanced) && cmd.tqfind("%filterinput") == -1)
+		if (inputCheck > None && (cmd.find("%in") == -1 || inputCheck == Advanced) && cmd.find("%filterinput") == -1)
 		{
 			status = false;
 			errmsg = i18n("The command does not contain the required tag %1.").arg(inputCheck == Advanced ? "%filterinput" : "{%in,%filterinput}");
 		}
-		if (status && outputCheck > None && (cmd.tqfind("%out") == -1 || outputCheck == Advanced) && cmd.tqfind("filteroutput") == -1)
+		if (status && outputCheck > None && (cmd.find("%out") == -1 || outputCheck == Advanced) && cmd.find("filteroutput") == -1)
 		{
 			status = false;
 			errmsg = i18n("The command does not contain the required tag %1.").arg(outputCheck == Advanced ? "%filteroutput" : "{%out,%filteroutput}");
diff --git a/kdeprint/kxmlcommand.h b/kdeprint/kxmlcommand.h
index e24266f49..c6e4c25fc 100644
--- a/kdeprint/kxmlcommand.h
+++ b/kdeprint/kxmlcommand.h
@@ -30,7 +30,7 @@ class DrMain;
 class DrGroup;
 class DrBase;
 
-class KDEPRINT_EXPORT KXmlCommand : public TQObject
+class KDEPRINT_EXPORT KXmlCommand : public QObject
 {
 	friend class KXmlCommandManager;
 
@@ -86,7 +86,7 @@ private:
 	KXmlCommandPrivate	*d;
 };
 
-class KDEPRINT_EXPORT KXmlCommandManager : public TQObject
+class KDEPRINT_EXPORT KXmlCommandManager : public QObject
 {
 public:
 	enum IO_CheckType	{ None = 0, Basic, Advanced };
diff --git a/kdeprint/lpd/gschecker.cpp b/kdeprint/lpd/gschecker.cpp
index d9f58b859..8f23fcc32 100644
--- a/kdeprint/lpd/gschecker.cpp
+++ b/kdeprint/lpd/gschecker.cpp
@@ -32,7 +32,7 @@ bool GsChecker::checkGsDriver(const TQString& name)
 {
 	if (m_driverlist.count() == 0)
 		loadDriverList();
-	return m_driverlist.tqcontains(name);
+	return m_driverlist.contains(name);
 }
 
 void GsChecker::loadDriverList()
@@ -48,12 +48,12 @@ void GsChecker::loadDriverList()
 			line = t.readLine().stripWhiteSpace();
 			if (ok)
 			{
-				if (line.tqfind(':') != -1)
+				if (line.find(':') != -1)
 					break;
 				else
 					buffer.append(line).append(" ");
 			}
-			else if (line.startsWith(TQString::tqfromLatin1("Available devices:")))
+			else if (line.startsWith(TQString::fromLatin1("Available devices:")))
 				ok = true;
 		}
 		m_driverlist = TQStringList::split(' ',buffer,false);
diff --git a/kdeprint/lpd/gschecker.h b/kdeprint/lpd/gschecker.h
index 1814ca1d7..65f247380 100644
--- a/kdeprint/lpd/gschecker.h
+++ b/kdeprint/lpd/gschecker.h
@@ -24,7 +24,7 @@
 #include <tqstringlist.h>
 #include <tqobject.h>
 
-class GsChecker : public TQObject
+class GsChecker : public QObject
 {
 public:
 	GsChecker(TQObject *parent = 0, const char *name = 0);
diff --git a/kdeprint/lpd/klpdprinterimpl.cpp b/kdeprint/lpd/klpdprinterimpl.cpp
index 8b365cbd1..8a04927e6 100644
--- a/kdeprint/lpd/klpdprinterimpl.cpp
+++ b/kdeprint/lpd/klpdprinterimpl.cpp
@@ -46,6 +46,6 @@ bool KLpdPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
 		printer->setErrorMessage(i18n("The <b>%1</b> executable could not be found in your path. Check your installation.").arg("lpr"));
 		return false;
 	}
-	cmd = TQString::tqfromLatin1("%1 -P %2 '-#%3'").arg(exestr).arg(quote(printer->printerName())).arg(printer->numCopies());
+	cmd = TQString::fromLatin1("%1 -P %2 '-#%3'").arg(exestr).arg(quote(printer->printerName())).arg(printer->numCopies());
 	return true;
 }
diff --git a/kdeprint/lpd/kmlpdmanager.cpp b/kdeprint/lpd/kmlpdmanager.cpp
index e7e640bc9..95623a56f 100644
--- a/kdeprint/lpd/kmlpdmanager.cpp
+++ b/kdeprint/lpd/kmlpdmanager.cpp
@@ -65,12 +65,12 @@ KMLpdManager::~KMLpdManager()
 
 TQString KMLpdManager::driverDbCreationProgram()
 {
-	return TQString::tqfromLatin1("make_driver_db_lpd");
+	return TQString::fromLatin1("make_driver_db_lpd");
 }
 
 TQString KMLpdManager::driverDirectory()
 {
-	return TQString::tqfromLatin1("/usr/lib/rhs/rhs-printfilters");
+	return TQString::fromLatin1("/usr/lib/rhs/rhs-printfilters");
 }
 
 bool KMLpdManager::completePrinter(KMPrinter *printer)
@@ -80,7 +80,7 @@ bool KMLpdManager::completePrinter(KMPrinter *printer)
 
 bool KMLpdManager::completePrinterShort(KMPrinter *printer)
 {
-	PrintcapEntry	*entry = m_entries.tqfind(printer->name());
+	PrintcapEntry	*entry = m_entries.find(printer->name());
 	if (entry)
 	{
 		QString	type(entry->comment(2)), driver(entry->comment(7)), lp(entry->arg("lp"));
@@ -91,11 +91,11 @@ bool KMLpdManager::completePrinterShort(KMPrinter *printer)
 		KURL	url;
 		if (!entry->arg("rm").isEmpty())
 		{
-			url = TQString::tqfromLatin1("lpd://%1/%2").arg(entry->arg("rm")).arg(entry->arg("rp"));
+			url = TQString::fromLatin1("lpd://%1/%2").arg(entry->arg("rm")).arg(entry->arg("rp"));
 			printer->setDescription(i18n("Remote LPD queue %1@%2").arg(entry->arg("rp")).arg(entry->arg("rm")));
 		}
 		else if (!lp.isEmpty() && lp != "/dev/null")
-			url = TQString::tqfromLatin1("parallel:%1").arg(lp);
+			url = TQString::fromLatin1("parallel:%1").arg(lp);
 		else if (TQFile::exists(entry->arg("sd")+"/.config"))
 		{
 			TQMap<TQString,TQString>	map = loadPrinttoolCfgFile(entry->arg("sd")+"/.config");
@@ -103,17 +103,17 @@ bool KMLpdManager::completePrinterShort(KMPrinter *printer)
 			{
 				QStringList	l = TQStringList::split('\\',map["share"],false);
 				if (map["workgroup"].isEmpty())
-					url = TQString::tqfromLatin1("smb://%1/%2").arg(l[0]).arg(l[1]);
+					url = TQString::fromLatin1("smb://%1/%2").arg(l[0]).arg(l[1]);
 				else
-					url = TQString::tqfromLatin1("smb://%1/%2/%3").arg(map["workgroup"]).arg(l[0]).arg(l[1]);
+					url = TQString::fromLatin1("smb://%1/%2/%3").arg(map["workgroup"]).arg(l[0]).arg(l[1]);
 				url.setUser(map["user"]);
 				url.setPass(map["password"]);
 			}
 			else if (type == "DIRECT")
-				url = TQString::tqfromLatin1("socket://%1:%2").arg(map["printer_ip"]).arg(map["port"]);
+				url = TQString::fromLatin1("socket://%1:%2").arg(map["printer_ip"]).arg(map["port"]);
 			else if (type == "NCP")
 			{
-				url = TQString::tqfromLatin1("ncp://%1/%2").arg(map["server"]).arg(map["queue"]);
+				url = TQString::fromLatin1("ncp://%1/%2").arg(map["server"]).arg(map["queue"]);
 				url.setUser(map["user"]);
 				url.setPass(map["password"]);
 			}
@@ -127,7 +127,7 @@ bool KMLpdManager::completePrinterShort(KMPrinter *printer)
 bool KMLpdManager::createPrinter(KMPrinter *printer)
 {
 	// 1) create the printcap entry
-	PrintcapEntry	*ent = tqfindPrintcapEntry(printer->printerName());
+	PrintcapEntry	*ent = findPrintcapEntry(printer->printerName());
 	if (!ent)
 	{
 		ent = new PrintcapEntry();
@@ -146,9 +146,9 @@ bool KMLpdManager::createPrinter(KMPrinter *printer)
 	{
 		// remote lpd queue
 		ent->m_args["rm"] = printer->device().host();
-		ent->m_args["rp"] = printer->device().path().tqreplace("/",TQString::tqfromLatin1(""));
+		ent->m_args["rp"] = printer->device().path().replace("/",TQString::fromLatin1(""));
 		ent->m_args["lpd_bounce"] = "true";
-		ent->m_comment = TQString::tqfromLatin1("##PRINTTOOL3## REMOTE");
+		ent->m_comment = TQString::fromLatin1("##PRINTTOOL3## REMOTE");
 	}
 	ent->m_args["mx"] = (printer->option("mx").isEmpty() ? "#0" : printer->option("mx"));
 	ent->m_args["sh"] = TQString::null;
@@ -199,7 +199,7 @@ bool KMLpdManager::createPrinter(KMPrinter *printer)
 
 bool KMLpdManager::removePrinter(KMPrinter *printer)
 {
-	PrintcapEntry	*ent = tqfindPrintcapEntry(printer->printerName());
+	PrintcapEntry	*ent = findPrintcapEntry(printer->printerName());
 	if (ent)
 	{
 		ent = m_entries.take(printer->printerName());
@@ -259,7 +259,7 @@ bool KMLpdManager::disablePrinter(KMPrinter *printer)
 void KMLpdManager::listPrinters()
 {
 	m_entries.clear();
-	loadPrintcapFile(TQString::tqfromLatin1("%1/etc/printcap").arg(lpdprefix));
+	loadPrintcapFile(TQString::fromLatin1("%1/etc/printcap").arg(lpdprefix));
 
 	TQDictIterator<PrintcapEntry>	it(m_entries);
 	for (;it.current();++it)
@@ -268,7 +268,7 @@ void KMLpdManager::listPrinters()
 		addPrinter(printer);
 	}
 
-	checktqStatus();
+	checkStatus();
 }
 
 TQString KMLpdManager::programName(int f)
@@ -284,7 +284,7 @@ TQString KMLpdManager::programName(int f)
 	return TQString::null;
 }
 
-void KMLpdManager::checktqStatus()
+void KMLpdManager::checkStatus()
 {
 	KPipeProcess	proc;
 	QString		cmd = programName(0) + " status all";
@@ -299,11 +299,11 @@ void KMLpdManager::checktqStatus()
 			line = t.readLine().stripWhiteSpace();
 			if (line.isEmpty())
 				continue;
-			if ((p=line.tqfind(':')) != -1)
-				printer = tqfindPrinter(line.left(p));
+			if ((p=line.find(':')) != -1)
+				printer = findPrinter(line.left(p));
 			else if (line.startsWith("printing") && printer)
-				printer->setState(line.tqfind("enabled") != -1 ? KMPrinter::Idle : KMPrinter::Stopped);
-			else if (line.tqfind("entries") != -1 && printer)
+				printer->setState(line.find("enabled") != -1 ? KMPrinter::Idle : KMPrinter::Stopped);
+			else if (line.find("entries") != -1 && printer)
 				if (!line.startsWith("no") && printer->state() == KMPrinter::Idle)
 					printer->setState(KMPrinter::Processing);
 		}
@@ -312,7 +312,7 @@ void KMLpdManager::checktqStatus()
 
 bool KMLpdManager::writePrinters()
 {
-	if (!writePrintcapFile(TQString::tqfromLatin1("%1/etc/printcap").arg(lpdprefix)))
+	if (!writePrintcapFile(TQString::fromLatin1("%1/etc/printcap").arg(lpdprefix)))
 	{
 		setErrorMsg(i18n("Unable to write printcap file."));
 		return false;
@@ -363,13 +363,13 @@ bool KMLpdManager::writePrintcapFile(const TQString& filename)
 	return false;
 }
 
-PrinttoolEntry* KMLpdManager::tqfindPrinttoolEntry(const TQString& name)
+PrinttoolEntry* KMLpdManager::findPrinttoolEntry(const TQString& name)
 {
 	if (m_ptentries.count() == 0)
 		loadPrinttoolDb(driverDirectory()+"/printerdb");
-	PrinttoolEntry	*ent = m_ptentries.tqfind(name);
+	PrinttoolEntry	*ent = m_ptentries.find(name);
 	if (!ent)
-		setErrorMsg(i18n("Couldn't tqfind driver <b>%1</b> in printtool database.").arg(name));
+		setErrorMsg(i18n("Couldn't find driver <b>%1</b> in printtool database.").arg(name));
 	return ent;
 }
 
@@ -394,7 +394,7 @@ DrMain* KMLpdManager::loadDbDriver(KMDBEntry *entry)
 	QString	ptdbfilename = driverDirectory() + "/printerdb";
 	if (entry->file == ptdbfilename)
 	{
-		PrinttoolEntry	*ptentry = tqfindPrinttoolEntry(entry->modelname);
+		PrinttoolEntry	*ptentry = findPrinttoolEntry(entry->modelname);
 		if (ptentry)
 		{
 			DrMain	*dr = ptentry->createDriver();
@@ -404,17 +404,17 @@ DrMain* KMLpdManager::loadDbDriver(KMDBEntry *entry)
 	return NULL;
 }
 
-PrintcapEntry* KMLpdManager::tqfindPrintcapEntry(const TQString& name)
+PrintcapEntry* KMLpdManager::findPrintcapEntry(const TQString& name)
 {
-	PrintcapEntry	*ent = m_entries.tqfind(name);
+	PrintcapEntry	*ent = m_entries.find(name);
 	if (!ent)
-		setErrorMsg(i18n("Couldn't tqfind printer <b>%1</b> in printcap file.").arg(name));
+		setErrorMsg(i18n("Couldn't find printer <b>%1</b> in printcap file.").arg(name));
 	return ent;
 }
 
 DrMain* KMLpdManager::loadPrinterDriver(KMPrinter *printer, bool config)
 {
-	PrintcapEntry	*entry = tqfindPrintcapEntry(printer->name());
+	PrintcapEntry	*entry = findPrintcapEntry(printer->name());
 	if (!entry)
 		return NULL;
 
@@ -423,7 +423,7 @@ DrMain* KMLpdManager::loadPrinterDriver(KMPrinter *printer, bool config)
 	if (TQFile::exists(sd+"/postscript.cfg") && config && !dr.isEmpty())
 	{
 		TQMap<TQString,TQString>	map = loadPrinttoolCfgFile(sd+"/postscript.cfg");
-		PrinttoolEntry	*ptentry = tqfindPrinttoolEntry(dr);
+		PrinttoolEntry	*ptentry = findPrinttoolEntry(dr);
 		if (!ptentry)
 			return NULL;
 		DrMain	*dr = ptentry->createDriver();
@@ -470,13 +470,13 @@ TQMap<TQString,TQString> KMLpdManager::loadPrinttoolCfgFile(const TQString& file
 			if (line.isEmpty())
 				break;
 			if (line.startsWith("export "))
-				line.tqreplace(0,7,"");
-			if ((p=line.tqfind('=')) != -1)
+				line.replace(0,7,"");
+			if ((p=line.find('=')) != -1)
 			{
 				name = line.left(p);
 				val = line.right(line.length()-p-1);
-				val.tqreplace("\"","");
-				val.tqreplace("'","");
+				val.replace("\"","");
+				val.replace("'","");
 				if (!name.isEmpty() && !val.isEmpty())
 					map[name] = val;
 			}
@@ -489,7 +489,7 @@ bool KMLpdManager::savePrinttoolCfgFile(const TQString& templatefile, const TQSt
 {
 	// defines input and output file
 	QString	fname = TQFileInfo(templatefile).fileName();
-	fname.tqreplace(TQRegExp("\\.in$"),TQString::tqfromLatin1(""));
+	fname.replace(TQRegExp("\\.in$"),TQString::fromLatin1(""));
 	QFile	fin(templatefile);
 	QFile	fout(dirname + "/" + fname);
 	if (fin.exists() && fin.open(IO_ReadOnly) && fout.open(IO_WriteOnly))
@@ -508,9 +508,9 @@ bool KMLpdManager::savePrinttoolCfgFile(const TQString& templatefile, const TQSt
 			if (line.startsWith("export "))
 			{
 				tout << "export ";
-				line.tqreplace(0,7,TQString::tqfromLatin1(""));
+				line.replace(0,7,TQString::fromLatin1(""));
 			}
-			if ((p=line.tqfind('=')) != -1)
+			if ((p=line.find('=')) != -1)
 			{
 				name = line.left(p);
 				tout << name << '=' << options[name] << endl;
@@ -526,7 +526,7 @@ bool KMLpdManager::savePrinterDriver(KMPrinter *printer, DrMain *driver)
 	// To be able to save a printer driver, a printcap entry MUST exist.
 	// We can then retrieve the spool directory from it.
 	QString	spooldir;
-	PrintcapEntry	*ent = tqfindPrintcapEntry(printer->printerName());
+	PrintcapEntry	*ent = findPrintcapEntry(printer->printerName());
 	if (!ent)
 		return false;
 	spooldir = ent->arg("sd");
@@ -543,8 +543,8 @@ bool KMLpdManager::savePrinterDriver(KMPrinter *printer, DrMain *driver)
 			return false;
 		QString	resol(options["RESOLUTION"]), color(options["COLOR"]);
 		// update entry comment to make printtool happy and save printcap file
-		ent->m_comment = TQString::tqfromLatin1("##PRINTTOOL3## %1 %2 %3 %4 {} {%5} %6 {}").arg(options["PRINTER_TYPE"]).arg(options["GSDEVICE"]).arg((resol.isEmpty() ? TQString::tqfromLatin1("NAxNA") : resol)).arg(options["PAPERSIZE"]).arg(driver->name()).arg((color.isEmpty() ? TQString::tqfromLatin1("Default") : color.right(color.length()-15)));
-		ent->m_args["if"] = spooldir+TQString::tqfromLatin1("/filter");
+		ent->m_comment = TQString::fromLatin1("##PRINTTOOL3## %1 %2 %3 %4 {} {%5} %6 {}").arg(options["PRINTER_TYPE"]).arg(options["GSDEVICE"]).arg((resol.isEmpty() ? TQString::fromLatin1("NAxNA") : resol)).arg(options["PAPERSIZE"]).arg(driver->name()).arg((color.isEmpty() ? TQString::fromLatin1("Default") : color.right(color.length()-15)));
+		ent->m_args["if"] = spooldir+TQString::fromLatin1("/filter");
 		if (!writePrinters())
 			return false;
 		// write various driver files using templates
@@ -566,11 +566,11 @@ bool KMLpdManager::createPrinttoolEntry(KMPrinter *printer, PrintcapEntry *entry
 {
 	KURL	dev(printer->device());
 	QString	prot = dev.protocol(), sd(entry->arg("sd"));
-	entry->m_comment = TQString::tqfromLatin1("##PRINTTOOL3## %1").arg(ptPrinterType(printer));
+	entry->m_comment = TQString::fromLatin1("##PRINTTOOL3## %1").arg(ptPrinterType(printer));
 	if (prot == "smb" || prot == "ncp" || prot == "socket")
 	{
-		entry->m_args["af"] = sd+TQString::tqfromLatin1("/acct");
-		QFile	f(sd+TQString::tqfromLatin1("/.config"));
+		entry->m_args["af"] = sd+TQString::fromLatin1("/acct");
+		QFile	f(sd+TQString::fromLatin1("/.config"));
 		if (f.open(IO_WriteOnly))
 		{
 			QTextStream	t(&f);
@@ -578,7 +578,7 @@ bool KMLpdManager::createPrinttoolEntry(KMPrinter *printer, PrintcapEntry *entry
 			{
 				t << "printer_ip=" << dev.host() << endl;
 				t << "port=" << dev.port() << endl;
-				entry->m_args["if"] = driverDirectory()+TQString::tqfromLatin1("/directprint");
+				entry->m_args["if"] = driverDirectory()+TQString::fromLatin1("/directprint");
 			}
 			else if (prot == "smb")
 			{
@@ -594,20 +594,20 @@ bool KMLpdManager::createPrinttoolEntry(KMPrinter *printer, PrintcapEntry *entry
 				t << "hostip=" << endl;
 				t << "user='" << dev.user() << '\'' << endl;
 				t << "password='" << dev.pass() << '\'' << endl;
-				t << "workgroup='" << (l.count() == 2 ? dev.host() : TQString::tqfromLatin1("")) << '\'' << endl;
-				entry->m_args["if"] = driverDirectory()+TQString::tqfromLatin1("/smbprint");
+				t << "workgroup='" << (l.count() == 2 ? dev.host() : TQString::fromLatin1("")) << '\'' << endl;
+				entry->m_args["if"] = driverDirectory()+TQString::fromLatin1("/smbprint");
 			}
 			else if (prot == "ncp")
 			{
 				t << "server=" << dev.host() << endl;
-				t << "queue=" << dev.path().tqreplace("/",TQString::tqfromLatin1("")) << endl;
+				t << "queue=" << dev.path().replace("/",TQString::fromLatin1("")) << endl;
 				t << "user=" << dev.user() << endl;
 				t << "password=" << dev.pass() << endl;
-				entry->m_args["if"] = driverDirectory()+TQString::tqfromLatin1("/ncpprint");
+				entry->m_args["if"] = driverDirectory()+TQString::fromLatin1("/ncpprint");
 			}
 		}
 		else return false;
-		entry->m_args["lp"] = TQString::tqfromLatin1("/dev/null");
+		entry->m_args["lp"] = TQString::fromLatin1("/dev/null");
 	}
 	else if (prot != "lpd")
 		entry->m_args["lp"] = dev.path();
@@ -618,7 +618,7 @@ bool KMLpdManager::createSpooldir(PrintcapEntry *entry)
 {
 	// first check if it has a "sd" defined
 	if (entry->arg("sd").isEmpty())
-		entry->m_args["sd"] = TQString::tqfromLatin1("/var/spool/lpd/")+entry->m_name;
+		entry->m_args["sd"] = TQString::fromLatin1("/var/spool/lpd/")+entry->m_name;
 	QString	sd = entry->arg("sd");
 	if (!KStandardDirs::exists(sd))
 	{
@@ -633,7 +633,7 @@ bool KMLpdManager::createSpooldir(PrintcapEntry *entry)
 
 bool KMLpdManager::validateDbDriver(KMDBEntry *entry)
 {
-	PrinttoolEntry	*ptentry = tqfindPrinttoolEntry(entry->modelname);
+	PrinttoolEntry	*ptentry = findPrinttoolEntry(entry->modelname);
 	return (ptentry && checkGsDriver(ptentry->m_gsdriver));
 }
 
diff --git a/kdeprint/lpd/kmlpdmanager.h b/kdeprint/lpd/kmlpdmanager.h
index be7aa4ab1..0af2d1e15 100644
--- a/kdeprint/lpd/kmlpdmanager.h
+++ b/kdeprint/lpd/kmlpdmanager.h
@@ -61,10 +61,10 @@ protected:
 	bool checkGsDriver(const TQString& gsdriver);
 	bool createSpooldir(PrintcapEntry*);
 	bool createPrinttoolEntry(KMPrinter*, PrintcapEntry*);
-	PrintcapEntry* tqfindPrintcapEntry(const TQString& name);
-	PrinttoolEntry* tqfindPrinttoolEntry(const TQString& name);
+	PrintcapEntry* findPrintcapEntry(const TQString& name);
+	PrinttoolEntry* findPrinttoolEntry(const TQString& name);
 	TQString programName(int);
-	void checktqStatus();
+	void checkStatus();
 	bool enablePrinter(KMPrinter*, bool);
 
 private:
diff --git a/kdeprint/lpd/lpdtools.cpp b/kdeprint/lpd/lpdtools.cpp
index ee919ff95..3b1651337 100644
--- a/kdeprint/lpd/lpdtools.cpp
+++ b/kdeprint/lpd/lpdtools.cpp
@@ -60,7 +60,7 @@ TQString nextWord(const TQString& s, int& pos)
 	if (s[p1] == '{')
 	{
 		p1++;
-		p2 = s.tqfind('}',p1);
+		p2 = s.find('}',p1);
 	}
 	else
 	{
@@ -81,12 +81,12 @@ bool PrintcapEntry::readLine(const TQString& line)
 		m_name = l[0];
 		int	p(-1);
 		// discard aliases
-		if ((p=m_name.tqfind('|')) != -1)
+		if ((p=m_name.find('|')) != -1)
 			m_name = m_name.left(p);
 		m_args.clear();
 		for (uint i=1; i<l.count(); i++)
 		{
-			int	p = l[i].tqfind('=');
+			int	p = l[i].find('=');
 			if (p == -1) p = 2;
 			QString	key = l[i].left(p);
 			QString	value = l[i].right(l[i].length()-(l[i][p] == '=' ? p+1 : p));
@@ -140,22 +140,22 @@ KMPrinter* PrintcapEntry::createPrinter()
 TQStringList splitPrinttoolLine(const TQString& line)
 {
 	QStringList	l;
-	int 		p = line.tqfind(':');
+	int 		p = line.find(':');
 	if (p != -1)
 	{
 		l.append(line.left(p));
-		p = line.tqfind('{',p);
+		p = line.find('{',p);
 		if (p == -1)
 			l.append(line.right(line.length()-l[0].length()-1).stripWhiteSpace());
 		else
 		{
 			while (p != -1)
 			{
-				int 	q = line.tqfind('}',p);
+				int 	q = line.find('}',p);
 				if (q != -1)
 				{
 					l.append(line.mid(p+1,q-p-1));
-					p = line.tqfind('{',q);
+					p = line.find('{',q);
 				}
 				else break;
 			}
@@ -257,11 +257,11 @@ DrMain* PrinttoolEntry::createDriver()
 			for (int i=0;it.current();++it,i++)
 			{
 				ch = new DrBase;
-				ch->setName(TQString::tqfromLatin1("%1x%2").arg(it.current()->xdpi).arg(it.current()->ydpi));
+				ch->setName(TQString::fromLatin1("%1x%2").arg(it.current()->xdpi).arg(it.current()->ydpi));
 				if (it.current()->comment.isEmpty())
-					ch->set("text",TQString::tqfromLatin1("%1x%2 DPI").arg(it.current()->xdpi).arg(it.current()->ydpi));
+					ch->set("text",TQString::fromLatin1("%1x%2 DPI").arg(it.current()->xdpi).arg(it.current()->ydpi));
 				else
-					ch->set("text",TQString::tqfromLatin1("%2x%3 DPI (%1)").arg(it.current()->comment).arg(it.current()->xdpi).arg(it.current()->ydpi));
+					ch->set("text",TQString::fromLatin1("%2x%3 DPI (%1)").arg(it.current()->comment).arg(it.current()->xdpi).arg(it.current()->ydpi));
 				lopt->addChoice(ch);
 			}
 			QString	defval = lopt->choices()->first()->name();
@@ -281,13 +281,13 @@ DrMain* PrinttoolEntry::createDriver()
 			{
 				ch = new DrBase;
 				if (m_gsdriver != "uniprint")
-					ch->setName(TQString::tqfromLatin1("-dBitsPerPixel=%1").arg(it.current()->bpp));
+					ch->setName(TQString::fromLatin1("-dBitsPerPixel=%1").arg(it.current()->bpp));
 				else
 					ch->setName(it.current()->bpp);
 				if (it.current()->comment.isEmpty())
 					ch->set("text",it.current()->bpp);
 				else
-					ch->set("text",TQString::tqfromLatin1("%1 - %2").arg(it.current()->bpp).arg(it.current()->comment));
+					ch->set("text",TQString::fromLatin1("%1 - %2").arg(it.current()->bpp).arg(it.current()->comment));
 				lopt->addChoice(ch);
 			}
 			QString	defval = lopt->choices()->first()->name();
diff --git a/kdeprint/lpdunix/klpdunixprinterimpl.cpp b/kdeprint/lpdunix/klpdunixprinterimpl.cpp
index 8a680ae6e..7a9a3ad81 100644
--- a/kdeprint/lpdunix/klpdunixprinterimpl.cpp
+++ b/kdeprint/lpdunix/klpdunixprinterimpl.cpp
@@ -36,12 +36,12 @@ KLpdUnixPrinterImpl::~KLpdUnixPrinterImpl()
 
 void KLpdUnixPrinterImpl::initLpPrint(TQString& cmd, KPrinter *printer)
 {
-	cmd += TQString::tqfromLatin1(" -d %1 -n%2").arg(quote(printer->printerName())).arg(printer->numCopies());
+	cmd += TQString::fromLatin1(" -d %1 -n%2").arg(quote(printer->printerName())).arg(printer->numCopies());
 }
 
 void KLpdUnixPrinterImpl::initLprPrint(TQString& cmd, KPrinter *printer)
 {
-	cmd += TQString::tqfromLatin1(" -P %1 '-#%2'").arg(quote(printer->printerName())).arg(printer->numCopies());
+	cmd += TQString::fromLatin1(" -P %1 '-#%2'").arg(quote(printer->printerName())).arg(printer->numCopies());
 }
 
 // look for executable, starting with "lpr"
diff --git a/kdeprint/lpdunix/kmlpdunixmanager.cpp b/kdeprint/lpdunix/kmlpdunixmanager.cpp
index 0985a487c..f288702eb 100644
--- a/kdeprint/lpdunix/kmlpdunixmanager.cpp
+++ b/kdeprint/lpdunix/kmlpdunixmanager.cpp
@@ -114,12 +114,12 @@ TQMap<TQString,TQString> readEntry(KTextBuffer& t)
 		if (l.count() > 0)
 		{
 			int 	p(-1);
-			if ((p=l[0].tqfind('|')) != -1)
+			if ((p=l[0].find('|')) != -1)
 				entry["printer-name"] = l[0].left(p);	// only keep first name (discard aliases
 			else
 				entry["printer-name"] = l[0];
 			for (uint i=1; i<l.count(); i++)
-				if ((p=l[i].tqfind('=')) != -1)
+				if ((p=l[i].find('=')) != -1)
 					entry[l[i].left(p).stripWhiteSpace()] = l[i].right(l[i].length()-p-1).stripWhiteSpace();
 				else
 					entry[l[i].stripWhiteSpace()] = TQString::null;
@@ -168,7 +168,7 @@ TQString getPrintcapFileName()
 				if (pcentry[0] == '|')
 				{ // printcap through pipe
 					printcap = locateLocal("tmp","printcap");
-					QString	cmd = TQString::tqfromLatin1("echo \"all\" | %1 > %2").arg(pcentry.mid(1)).arg(printcap);
+					QString	cmd = TQString::fromLatin1("echo \"all\" | %1 > %2").arg(pcentry.mid(1)).arg(printcap);
 					kdDebug() << "printcap obtained through pipe" << endl << "executing: " << cmd << endl;
 					::system(cmd.local8Bit());
 				}
@@ -192,14 +192,14 @@ void KMLpdUnixManager::parseEtcPrintcap()
 		while (!t.eof())
 		{
 			entry = readEntry(t);
-			if (entry.isEmpty() || !entry.tqcontains("printer-name") || entry.tqcontains("server"))
+			if (entry.isEmpty() || !entry.contains("printer-name") || entry.contains("server"))
 				continue;
 			if (entry["printer-name"] == "all")
 			{
-				if (entry.tqcontains("all"))
+				if (entry.contains("all"))
 				{
-					// tqfind separator
-					int	p = entry["all"].tqfind(TQRegExp("[^a-zA-Z0-9_\\s-]"));
+					// find separator
+					int	p = entry["all"].find(TQRegExp("[^a-zA-Z0-9_\\s-]"));
 					if (p != -1)
 					{
 						QChar	c = entry["all"][p];
@@ -216,7 +216,7 @@ void KMLpdUnixManager::parseEtcPrintcap()
 			else
 			{
 				KMPrinter	*printer = ::createPrinter(entry);
-				if (entry.tqcontains("rm"))
+				if (entry.contains("rm"))
 					printer->setDescription(i18n("Remote printer queue on %1").arg(entry["rm"]));
 				else
 					printer->setDescription(i18n("Local printer"));
@@ -234,7 +234,7 @@ TQString getEtcPrintersConfName()
 	{
 		// standard file not found, try NIS
 		printersconf = locateLocal("tmp","printers.conf");
-		QString	cmd = TQString::tqfromLatin1("ypcat printers.conf.byname > %1").arg(printersconf);
+		QString	cmd = TQString::fromLatin1("ypcat printers.conf.byname > %1").arg(printersconf);
 		kdDebug() << "printers.conf obtained from NIS server: " << cmd << endl;
 		::system(TQFile::encodeName(cmd));
 	}
@@ -254,18 +254,18 @@ void KMLpdUnixManager::parseEtcPrintersConf()
 		while (!t.eof())
 		{
 			entry = readEntry(t);
-			if (entry.isEmpty() || !entry.tqcontains("printer-name"))
+			if (entry.isEmpty() || !entry.contains("printer-name"))
 				continue;
 			QString	prname = entry["printer-name"];
 			if (prname == "_default")
 			{
-				if (entry.tqcontains("use"))
+				if (entry.contains("use"))
 					default_printer = entry["use"];
 			}
 			else if (prname != "_all")
 			{
 				KMPrinter	*printer = ::createPrinter(entry);
-				if (entry.tqcontains("bsdaddr"))
+				if (entry.contains("bsdaddr"))
 				{
 					QStringList	l = TQStringList::split(',',entry["bsdaddr"],false);
 					printer->setDescription(i18n("Remote printer queue on %1").arg(l[0]));
@@ -277,7 +277,7 @@ void KMLpdUnixManager::parseEtcPrintersConf()
 		}
 
 		if (!default_printer.isEmpty())
-			setSoftDefault(tqfindPrinter(default_printer));
+			setSoftDefault(findPrinter(default_printer));
 	}
 }
 
diff --git a/kdeprint/lpr/apshandler.cpp b/kdeprint/lpr/apshandler.cpp
index fb8a47fed..fc6ade276 100644
--- a/kdeprint/lpr/apshandler.cpp
+++ b/kdeprint/lpr/apshandler.cpp
@@ -50,8 +50,8 @@ bool ApsHandler::validate(PrintcapEntry *entry)
 
 KMPrinter* ApsHandler::createPrinter(PrintcapEntry *entry)
 {
-	entry->comment = TQString::tqfromLatin1("# APS%1_BEGIN:printer%2").arg(m_counter).arg(m_counter);
-	entry->postcomment = TQString::tqfromLatin1("# APS%1_END - don't delete this").arg(m_counter);
+	entry->comment = TQString::fromLatin1("# APS%1_BEGIN:printer%2").arg(m_counter).arg(m_counter);
+	entry->postcomment = TQString::fromLatin1("# APS%1_END - don't delete this").arg(m_counter);
 	m_counter++;
 	return LprHandler::createPrinter(entry);
 }
@@ -63,7 +63,7 @@ bool ApsHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, bool shor
 		if (!shortmode)
 		{
 			TQMap<TQString,TQString>	opts = loadResources(entry);
-			if (opts.tqcontains("PRINTER"))
+			if (opts.contains("PRINTER"))
 			{
 				prt->setDescription(i18n("APS Driver (%1)").arg(opts["PRINTER"]));
 				prt->setDriverInfo(prt->description());
@@ -103,7 +103,7 @@ bool ApsHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, bool shor
 							opts[ "NCP_PRINTER" ],
 							opts[ "NCP_USER" ],
 							opts[ "NCP_PASSWD" ] );
-					uri.tqreplace( 0, 3, "ncp" );
+					uri.replace( 0, 3, "ncp" );
 					prt->setDevice(uri);
 				}
 				prot = "ncp";
@@ -148,7 +148,7 @@ TQMap<TQString,TQString> ApsHandler::loadVarFile(const TQString& filename)
 		while (!t.atEnd())
 		{
 			line = t.readLine().stripWhiteSpace();
-			if (line.isEmpty() || line[0] == '#' || (p = line.tqfind('=')) == -1)
+			if (line.isEmpty() || line[0] == '#' || (p = line.find('=')) == -1)
 				continue;
 			QString	variable = line.left(p).stripWhiteSpace();
 			QString	value = line.mid(p+1).stripWhiteSpace();
@@ -166,7 +166,7 @@ DrMain* ApsHandler::loadDriver(KMPrinter *prt, PrintcapEntry *entry, bool config
 	if (driver /* && config */ )    // Load resources in all case, to get the correct page size
 	{
 		TQMap<TQString,TQString>	opts = loadResources(entry);
-		if ( !config && opts.tqcontains( "PAPERSIZE" ) )
+		if ( !config && opts.contains( "PAPERSIZE" ) )
 		{
 			// this is needed to keep applications informed
 			// about the current selected page size
@@ -175,7 +175,7 @@ DrMain* ApsHandler::loadDriver(KMPrinter *prt, PrintcapEntry *entry, bool config
 			// default page size needs to be set to the actual
 			// value of the printer driver, otherwise it's blocked
 			// to A4
-			DrBase *opt = driver->tqfindOption( "PageSize" );
+			DrBase *opt = driver->findOption( "PageSize" );
 			if ( opt )
 				opt->set( "default", opts[ "PageSize" ] );
 		}
@@ -187,7 +187,7 @@ DrMain* ApsHandler::loadDriver(KMPrinter *prt, PrintcapEntry *entry, bool config
 
 DrMain* ApsHandler::loadDbDriver(const TQString& s)
 {
-	int	p = s.tqfind('/');
+	int	p = s.find('/');
 	DrMain	*driver = loadApsDriver(true);
 	if (driver)
 		driver->set("gsdriver", s.mid(p+1));
@@ -272,7 +272,7 @@ PrintcapEntry* ApsHandler::createEntry(KMPrinter *prt)
 			{
 				TQString work, server, printer, user, passwd;
 				TQString uri = prt->device();
-				uri.tqreplace( 0, 3, "smb" );
+				uri.replace( 0, 3, "smb" );
 				if ( splitSmbURI( uri, work, server, printer, user, passwd ) )
 				{
 					QTextStream	t(&f);
@@ -309,8 +309,8 @@ PrintcapEntry* ApsHandler::createEntry(KMPrinter *prt)
 	entry->addField("af", Field::String, sd + "/acct");
 	entry->addField("lf", Field::String, sd + "/log");
 	entry->addField("if", Field::String, sysconfDir() + "/basedir/bin/apsfilter");
-	entry->comment = TQString::tqfromLatin1("# APS%1_BEGIN:printer%2").arg(m_counter).arg(m_counter);
-	entry->postcomment = TQString::tqfromLatin1("# APS%1_END").arg(m_counter);
+	entry->comment = TQString::fromLatin1("# APS%1_BEGIN:printer%2").arg(m_counter).arg(m_counter);
+	entry->postcomment = TQString::fromLatin1("# APS%1_END").arg(m_counter);
 	m_counter++;
 	return entry;
 }
diff --git a/kdeprint/lpr/klprprinterimpl.cpp b/kdeprint/lpr/klprprinterimpl.cpp
index 9f0956ff3..1d77b166c 100644
--- a/kdeprint/lpr/klprprinterimpl.cpp
+++ b/kdeprint/lpr/klprprinterimpl.cpp
@@ -41,7 +41,7 @@ bool KLprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
 	if (!printer || m_exepath.isEmpty())
 		return false;
 
-	cmd = TQString::tqfromLatin1("%1 -P %1 '-#%1'").arg(m_exepath).arg(quote(printer->printerName())).arg( printer->numCopies() );
+	cmd = TQString::fromLatin1("%1 -P %1 '-#%1'").arg(m_exepath).arg(quote(printer->printerName())).arg( printer->numCopies() );
 	QString	opts = static_cast<KMLprManager*>(KMManager::self())->printOptions(printer);
 	if (!opts.isEmpty())
 		cmd += (" " + opts);
@@ -53,7 +53,7 @@ void KLprPrinterImpl::broadcastOption(const TQString& key, const TQString& value
 	KPrinterImpl::broadcastOption(key,value);
 	if (key == "kde-pagesize")
 	{
-		QString	pagename = TQString::tqfromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt()));
+		QString	pagename = TQString::fromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt()));
 		KPrinterImpl::broadcastOption("PageSize",pagename);
 	}
 }
diff --git a/kdeprint/lpr/kmlprmanager.cpp b/kdeprint/lpr/kmlprmanager.cpp
index 787504064..65b08eb67 100644
--- a/kdeprint/lpr/kmlprmanager.cpp
+++ b/kdeprint/lpr/kmlprmanager.cpp
@@ -148,7 +148,7 @@ void KMLprManager::initHandlers()
 			if (func)
 				insertHandler(func(this));
 			else
-				kdDebug() << "couldn't tqfind the symbol 'create_handler'" << endl;
+				kdDebug() << "couldn't find the symbol 'create_handler'" << endl;
 		}
 	}
 
@@ -156,11 +156,11 @@ void KMLprManager::initHandlers()
 	insertHandler(new LprHandler("default", this));
 }
 
-LprHandler* KMLprManager::tqfindHandler(KMPrinter *prt)
+LprHandler* KMLprManager::findHandler(KMPrinter *prt)
 {
 	QString	handlerstr(prt->option("kde-lpr-handler"));
 	LprHandler	*handler(0);
-	if (handlerstr.isEmpty() || (handler = m_handlers.tqfind(handlerstr)) == NULL)
+	if (handlerstr.isEmpty() || (handler = m_handlers.find(handlerstr)) == NULL)
 	{
 		return NULL;
 	}
@@ -169,7 +169,7 @@ LprHandler* KMLprManager::tqfindHandler(KMPrinter *prt)
 
 PrintcapEntry* KMLprManager::findEntry(KMPrinter *prt)
 {
-	PrintcapEntry	*entry = m_entries.tqfind(prt->printerName());
+	PrintcapEntry	*entry = m_entries.find(prt->printerName());
 	if (!entry)
 	{
 		return NULL;
@@ -179,7 +179,7 @@ PrintcapEntry* KMLprManager::findEntry(KMPrinter *prt)
 
 bool KMLprManager::completePrinter(KMPrinter *prt)
 {
-	LprHandler	*handler = tqfindHandler(prt);
+	LprHandler	*handler = findHandler(prt);
 	PrintcapEntry	*entry = findEntry(prt);
 	if (handler && entry)
 		return handler->completePrinter(prt, entry, false);
@@ -188,7 +188,7 @@ bool KMLprManager::completePrinter(KMPrinter *prt)
 
 bool KMLprManager::completePrinterShort(KMPrinter *prt)
 {
-	LprHandler	*handler = tqfindHandler(prt);
+	LprHandler	*handler = findHandler(prt);
 	PrintcapEntry	*entry = findEntry(prt);
 	if (!handler || !entry)
 		return false;
@@ -216,7 +216,7 @@ DrMain* KMLprManager::loadPrinterDriver(KMPrinter *prt, bool config)
 	if (!prt)
 		return NULL;
 
-	LprHandler	*handler = tqfindHandler(prt);
+	LprHandler	*handler = findHandler(prt);
 	PrintcapEntry	*entry = findEntry(prt);
 	if (handler && entry)
 	{
@@ -230,9 +230,9 @@ DrMain* KMLprManager::loadPrinterDriver(KMPrinter *prt, bool config)
 
 DrMain* KMLprManager::loadFileDriver(const TQString& filename)
 {
-	int	p = filename.tqfind('/');
-	QString	handler_str = (p != -1 ? filename.left(p) : TQString::tqfromLatin1("default"));
-	LprHandler	*handler = m_handlers.tqfind(handler_str);
+	int	p = filename.find('/');
+	QString	handler_str = (p != -1 ? filename.left(p) : TQString::fromLatin1("default"));
+	LprHandler	*handler = m_handlers.find(handler_str);
 	if (handler)
 	{
 		DrMain	*driver = handler->loadDbDriver(filename);
@@ -267,7 +267,7 @@ bool KMLprManager::startPrinter(KMPrinter *prt, bool state)
 
 bool KMLprManager::savePrinterDriver(KMPrinter *prt, DrMain *driver)
 {
-	LprHandler	*handler = tqfindHandler(prt);
+	LprHandler	*handler = findHandler(prt);
 	PrintcapEntry	*entry = findEntry(prt);
 	if (handler && entry)
 	{
@@ -311,7 +311,7 @@ bool KMLprManager::savePrintcapFile()
 bool KMLprManager::createPrinter(KMPrinter *prt)
 {
 	// remove existing printcap entry
-	PrintcapEntry	*oldEntry = m_entries.tqfind(prt->printerName());
+	PrintcapEntry	*oldEntry = m_entries.find(prt->printerName());
 
 	// look for the handler and re-create entry
 	LprHandler	*handler(0);
@@ -320,11 +320,11 @@ bool KMLprManager::createPrinter(KMPrinter *prt)
 	// or we use the handler of the existing printer
 	// (modifying something else, handler stays the same)
 	if (prt->driver())
-		handler = m_handlers.tqfind(prt->driver()->get("handler"));
+		handler = m_handlers.find(prt->driver()->get("handler"));
 	else if (oldEntry)
-		handler = tqfindHandler(prt);
+		handler = findHandler(prt);
 	else
-		handler = m_handlers.tqfind("default");
+		handler = m_handlers.find("default");
 	if (!handler)
 	{
 		setErrorMsg(i18n("Internal error: no handler defined."));
@@ -390,7 +390,7 @@ bool KMLprManager::createPrinter(KMPrinter *prt)
 
 bool KMLprManager::removePrinter(KMPrinter *prt)
 {
-	LprHandler	*handler = tqfindHandler(prt);
+	LprHandler	*handler = findHandler(prt);
 	PrintcapEntry	*entry = findEntry(prt);
 	if (handler && entry)
 	{
@@ -422,7 +422,7 @@ bool KMLprManager::removePrinter(KMPrinter *prt)
 
 TQString KMLprManager::driverDbCreationProgram()
 {
-	return TQString::tqfromLatin1("make_driver_db_lpr");
+	return TQString::fromLatin1("make_driver_db_lpr");
 }
 
 TQString KMLprManager::driverDirectory()
@@ -442,11 +442,11 @@ TQString KMLprManager::driverDirectory()
 
 TQString KMLprManager::printOptions(KPrinter *prt)
 {
-	KMPrinter	*mprt = tqfindPrinter(prt->printerName());
+	KMPrinter	*mprt = findPrinter(prt->printerName());
 	QString	opts;
 	if (mprt)
 	{
-		LprHandler	*handler = tqfindHandler(mprt);
+		LprHandler	*handler = findHandler(mprt);
 		if (handler)
 			return handler->printOptions(prt);
 	}
diff --git a/kdeprint/lpr/kmlprmanager.h b/kdeprint/lpr/kmlprmanager.h
index f7b31ba28..516494f95 100644
--- a/kdeprint/lpr/kmlprmanager.h
+++ b/kdeprint/lpr/kmlprmanager.h
@@ -66,7 +66,7 @@ protected:
 	void initHandlers();
 	void insertHandler(LprHandler*);
 	PrintcapEntry* findEntry(KMPrinter*);
-	LprHandler* tqfindHandler(KMPrinter*);
+	LprHandler* findHandler(KMPrinter*);
 	void checkPrinterState(KMPrinter*);
 	bool savePrintcapFile();
 
diff --git a/kdeprint/lpr/lpchelper.cpp b/kdeprint/lpr/lpchelper.cpp
index 1ef43ed79..516e85af3 100644
--- a/kdeprint/lpr/lpchelper.cpp
+++ b/kdeprint/lpr/lpchelper.cpp
@@ -62,7 +62,7 @@ LpcHelper::~LpcHelper()
 
 KMPrinter::PrinterState LpcHelper::state(const TQString& prname) const
 {
-	if (m_state.tqcontains(prname))
+	if (m_state.contains(prname))
 		return m_state[prname];
 	return KMPrinter::Unknown;
 }
@@ -72,7 +72,7 @@ KMPrinter::PrinterState LpcHelper::state(KMPrinter *prt) const
 	return state(prt->printerName());
 }
 
-void LpcHelper::parsetqStatusLPR(TQTextStream &t)
+void LpcHelper::parseStatusLPR(TQTextStream &t)
 {
 	QString		printer, line;
 	int		p(-1);
@@ -82,32 +82,32 @@ void LpcHelper::parsetqStatusLPR(TQTextStream &t)
 		line = t.readLine();
 		if (line.isEmpty())
 			continue;
-		else if (!line[0].isSpace() && (p = line.tqfind(':')) != -1)
+		else if (!line[0].isSpace() && (p = line.find(':')) != -1)
 		{
 			printer = line.left(p);
 			m_state[printer] = KMPrinter::Idle;
 		}
-		else if (line.tqfind("printing is disabled") != -1)
+		else if (line.find("printing is disabled") != -1)
 		{
 			if (!printer.isEmpty())
 				m_state[printer] = KMPrinter::PrinterState((KMPrinter::Stopped) | (m_state[printer] & ~KMPrinter::StateMask));
 		}
-		else if (line.tqfind("queuing is disabled") != -1)
+		else if (line.find("queuing is disabled") != -1)
 		{
 			if (!printer.isEmpty())
 				m_state[printer] = KMPrinter::PrinterState((KMPrinter::Rejecting) | (m_state[printer] & KMPrinter::StateMask));
 		}
-		else if (line.tqfind("entries") != -1)
+		else if (line.find("entries") != -1)
 		{
 			if (!printer.isEmpty() &&
 			    (m_state[printer] & KMPrinter::StateMask) != KMPrinter::Stopped &&
-			    line.tqfind("no entries") == -1)
+			    line.find("no entries") == -1)
 				m_state[printer] = KMPrinter::PrinterState((m_state[printer] & ~KMPrinter::StateMask) | KMPrinter::Processing);
 		}
 	}
 }
 
-void LpcHelper::parsetqStatusLPRng(TQTextStream& t)
+void LpcHelper::parseStatusLPRng(TQTextStream& t)
 {
 	QStringList	l;
 	int	p(-1);
@@ -121,7 +121,7 @@ void LpcHelper::parsetqStatusLPRng(TQTextStream& t)
 		l = TQStringList::split(TQRegExp("\\s"), t.readLine(), false);
 		if (l.count() < 4)
 			continue;
-		p = l[0].tqfind('@');
+		p = l[0].find('@');
 		if (p == 0)
 			printer = l[0];
 		else
@@ -152,10 +152,10 @@ void LpcHelper::updateStates()
 		{
 			default:
 			case LprSettings::LPR:
-				parsetqStatusLPR(t);
+				parseStatusLPR(t);
 				break;
 			case LprSettings::LPRng:
-				parsetqStatusLPRng(t);
+				parseStatusLPRng(t);
 				break;
 		}
 		proc.close();
@@ -206,11 +206,11 @@ static TQString lprngAnswer(const TQString& result, const TQString& printer)
 {
 	int	p, q;
 
-	p = result.tqfind("\n" + printer);
+	p = result.find("\n" + printer);
 	if (p != -1)
 	{
-		q = result.tqfind(':', p)+2;
-		p = result.tqfind('\n', q);
+		q = result.find(':', p)+2;
+		p = result.find('\n', q);
 		QString	answer = result.mid(q, p-q).stripWhiteSpace();
 		return answer;
 	}
@@ -260,7 +260,7 @@ bool LpcHelper::changeState(const TQString& printer, const TQString& op, TQStrin
 			break;
 		default:
 		case 1:
-			msg = i18n("Unknown error: %1").arg(result.tqreplace(TQRegExp("\\n"), " "));
+			msg = i18n("Unknown error: %1").arg(result.replace(TQRegExp("\\n"), " "));
 			break;
 	}
 	return (status == 0);
@@ -274,9 +274,9 @@ bool LpcHelper::removeJob(KMJob *job, TQString& msg)
 		return false;
 	}
 	QString	result = execute(m_lprmpath + " -P " + KProcess::quote(job->printer()) + " " + TQString::number(job->id()));
-	if (result.tqfind("dequeued") != -1)
+	if (result.find("dequeued") != -1)
 		return true;
-	else if (result.tqfind("Permission denied") != -1 || result.tqfind("no permissions") != -1)
+	else if (result.find("Permission denied") != -1 || result.find("no permissions") != -1)
 		msg = i18n("Permission denied.");
 	else
 		msg = i18n("Execution of lprm failed: %1").arg(result);
diff --git a/kdeprint/lpr/lpchelper.h b/kdeprint/lpr/lpchelper.h
index ee0182a5a..d7e6c7897 100644
--- a/kdeprint/lpr/lpchelper.h
+++ b/kdeprint/lpr/lpchelper.h
@@ -27,7 +27,7 @@
 
 class KMJob;
 
-class LpcHelper : public TQObject
+class LpcHelper : public QObject
 {
 public:
 	LpcHelper(TQObject *parent = 0, const char *name = 0);
@@ -46,8 +46,8 @@ public:
 
 protected:
 	bool changeState(const TQString&, const TQString&, TQString&);
-	void parsetqStatusLPR(TQTextStream&);
-	void parsetqStatusLPRng(TQTextStream&);
+	void parseStatusLPR(TQTextStream&);
+	void parseStatusLPRng(TQTextStream&);
 	int parseStateChangeLPR(const TQString&, const TQString&);
 	int parseStateChangeLPRng(const TQString&, const TQString&);
 
diff --git a/kdeprint/lpr/lpqhelper.cpp b/kdeprint/lpr/lpqhelper.cpp
index aa8e19879..2675c9d41 100644
--- a/kdeprint/lpr/lpqhelper.cpp
+++ b/kdeprint/lpr/lpqhelper.cpp
@@ -46,7 +46,7 @@ KMJob* LpqHelper::parseLineLpr(const TQString& line)
 	job->setOwner(line.mid(7, 11).stripWhiteSpace());
 	job->setId(line.mid(18, 5).toInt());
 	job->setName(line.mid(23, 38).stripWhiteSpace());
-	int	p = line.tqfind(' ', 61);
+	int	p = line.find(' ', 61);
 	if (p != -1)
 	{
 		job->setSize(line.mid(61, p-61).toInt() / 1000);
@@ -61,14 +61,14 @@ KMJob* LpqHelper::parseLineLPRng(const TQString& line)
 		return NULL;
 	KMJob	*job = new KMJob;
 	job->setState((rank[0].isDigit() ? KMJob::Queued : (rank == "hold" ? KMJob::Held : KMJob::Printing)));
-	int	p = line.tqfind('@', 7), q = line.tqfind(' ', 7);
+	int	p = line.find('@', 7), q = line.find(' ', 7);
 	job->setOwner(line.mid(7, QMIN(p,q)-7));
 	while (line[q].isSpace())
 		q++;
 	q++;
 	while (line[q].isSpace())
 		q++;
-	p = line.tqfind(' ', q);
+	p = line.find(' ', q);
 	job->setId(line.mid(q, p-q).toInt());
 	while (line[p].isSpace())
 		p++;
diff --git a/kdeprint/lpr/lpqhelper.h b/kdeprint/lpr/lpqhelper.h
index d79903f57..b41521f66 100644
--- a/kdeprint/lpr/lpqhelper.h
+++ b/kdeprint/lpr/lpqhelper.h
@@ -25,7 +25,7 @@
 
 class KMJob;
 
-class LpqHelper : public TQObject
+class LpqHelper : public QObject
 {
 public:
 	LpqHelper(TQObject *parent = 0, const char *name = 0);
diff --git a/kdeprint/lpr/lprhandler.cpp b/kdeprint/lpr/lprhandler.cpp
index 4a2a96b0f..600df4796 100644
--- a/kdeprint/lpr/lprhandler.cpp
+++ b/kdeprint/lpr/lprhandler.cpp
@@ -61,7 +61,7 @@ bool LprHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, bool)
 	KURL uri;
 	if (!val.isEmpty() && val != "/dev/null")
 	{
-		int	p = val.tqfind('@');
+		int	p = val.find('@');
 		if (p != -1)
 		{
 			prt->setLocation(i18n("Remote queue (%1) on %2").arg(val.left(p)).arg(val.mid(p+1)));
@@ -69,7 +69,7 @@ bool LprHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, bool)
 			uri.setHost(val.mid(p+1));
 			uri.setPath("/" + val.left(p));
 		}
-		else if ((p = val.tqfind('%')) != -1)
+		else if ((p = val.find('%')) != -1)
 		{
 			prt->setLocation(i18n("Network printer (%1)").arg("socket"));
 			uri.setProtocol("socket");
diff --git a/kdeprint/lpr/lprngtoolhandler.cpp b/kdeprint/lpr/lprngtoolhandler.cpp
index d4e448ad4..3710496a9 100644
--- a/kdeprint/lpr/lprngtoolhandler.cpp
+++ b/kdeprint/lpr/lprngtoolhandler.cpp
@@ -40,7 +40,7 @@ LPRngToolHandler::LPRngToolHandler(KMManager *mgr)
 bool LPRngToolHandler::validate(PrintcapEntry *entry)
 {
 	if (entry->comment.startsWith("##LPRNGTOOL##") &&
-	    entry->comment.tqfind("UNKNOWN") == -1)
+	    entry->comment.find("UNKNOWN") == -1)
 		return true;
 	return false;
 }
@@ -82,14 +82,14 @@ bool LPRngToolHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, boo
 		if (!(str=entry->field("ifhp")).isEmpty())
 		{
 			QString	model;
-			int	p = str.tqfind("model");
+			int	p = str.find("model");
 			if (p != -1)
 			{
-				p = str.tqfind('=', p);
+				p = str.find('=', p);
 				if (p != -1)
 				{
 					p++;
-					int	q = str.tqfind(',', p);
+					int	q = str.find(',', p);
 					if (q == -1)
 						model = str.mid(p);
 					else
@@ -142,7 +142,7 @@ void LPRngToolHandler::loadAuthFile(const TQString& filename, TQString& user, TQ
 			line = t.readLine().stripWhiteSpace();
 			if (line.isEmpty())
 				continue;
-			int	p = line.tqfind('=');
+			int	p = line.find('=');
 			if (p != -1)
 			{
 				QString	key = line.left(p);
@@ -182,7 +182,7 @@ DrMain* LPRngToolHandler::loadDriver(KMPrinter *prt, PrintcapEntry *entry, bool
 
 DrMain* LPRngToolHandler::loadDbDriver(const TQString& s)
 {
-	int	p = s.tqfind('/');
+	int	p = s.find('/');
 	DrMain*	driver = loadToolDriver(locate("data", "kdeprint/lprngtooldriver1"));
 	if (driver)
 		driver->set("driverID", s.mid(p+1));
@@ -207,15 +207,15 @@ TQValueList< QPair<TQString,TQStringList> > LPRngToolHandler::loadChoiceDict(con
 					dict << QPair<TQString,TQStringList>(key, l);
 				l.clear();
 				key = TQString::null;
-				if (line.tqcontains('|') == 2 || line.right(7) == "BOOLEAN")
+				if (line.contains('|') == 2 || line.right(7) == "BOOLEAN")
 				{
-					int	p = line.tqfind('|', 7);
+					int	p = line.find('|', 7);
 					key = line.mid(7, p-7);
 				}
 			}
 			else if (line.startsWith("CHOICE"))
 			{
-				int	p = line.tqfind('|', 7);
+				int	p = line.find('|', 7);
 				l << line.mid(7, p-7);
 			}
 		}
@@ -239,7 +239,7 @@ TQMap<TQString,TQString> LPRngToolHandler::parseZOptions(const TQString& optstr)
 		bool	found(false);
 		for (TQValueList< QPair<TQString,TQStringList> >::ConstIterator p=m_dict.begin(); p!=m_dict.end() && !found; ++p)
 		{
-			if ((*p).second.tqfind(*it) != (*p).second.end())
+			if ((*p).second.find(*it) != (*p).second.end())
 			{
 				opts[(*p).first] = (*it);
 				found = true;
@@ -308,7 +308,7 @@ PrintcapEntry* LPRngToolHandler::createEntry(KMPrinter *prt)
 		QString	work, server, printer, user, passwd;
 		if ( splitSmbURI( prt->device(), work, server, printer, user, passwd ) )
 		{
-			entry->addField("xfer_options", Field::String, TQString::tqfromLatin1("authfile=\"auth\" crlf=\"0\" hostip=\"\" host=\"%1\" printer=\"%2\" remote_mode=\"SMB\" share=\"//%3/%4\" workgroup=\"%5\"").arg(server).arg(printer).arg(server).arg(printer).arg(work));
+			entry->addField("xfer_options", Field::String, TQString::fromLatin1("authfile=\"auth\" crlf=\"0\" hostip=\"\" host=\"%1\" printer=\"%2\" remote_mode=\"SMB\" share=\"//%3/%4\" workgroup=\"%5\"").arg(server).arg(printer).arg(server).arg(printer).arg(work));
 			QFile	authfile(LprSettings::self()->baseSpoolDir() + "/" + prt->printerName() + "/auth");
 			if (authfile.open(IO_WriteOnly))
 			{
@@ -331,8 +331,8 @@ PrintcapEntry* LPRngToolHandler::createEntry(KMPrinter *prt)
 		DrMain	*driver = prt->driver();
 		comment.append("filtertype=IFHP ifhp_options=status@,sync@,pagecount@,waitend@ printerdb_entry=");
 		comment.append(driver->get("driverID"));
-		entry->addField("ifhp", Field::String, TQString::tqfromLatin1("model=%1,status@,sync@,pagecount@,waitend@").arg(driver->get("driverID")));
-		entry->addField("lprngtooloptions", Field::String, TQString::tqfromLatin1("FILTERTYPE=\"IFHP\" IFHP_OPTIONS=\"status@,sync@,pagecount@,waitend@\" PRINTERDB_ENTRY=\"%1\"").arg(driver->get("driverID")));
+		entry->addField("ifhp", Field::String, TQString::fromLatin1("model=%1,status@,sync@,pagecount@,waitend@").arg(driver->get("driverID")));
+		entry->addField("lprngtooloptions", Field::String, TQString::fromLatin1("FILTERTYPE=\"IFHP\" IFHP_OPTIONS=\"status@,sync@,pagecount@,waitend@\" PRINTERDB_ENTRY=\"%1\"").arg(driver->get("driverID")));
 		TQMap<TQString,TQString>	opts;
 		QString	optstr;
 		driver->getOptions(opts, false);
diff --git a/kdeprint/lpr/matichandler.cpp b/kdeprint/lpr/matichandler.cpp
index cf1a55f56..f3f0d4cdc 100644
--- a/kdeprint/lpr/matichandler.cpp
+++ b/kdeprint/lpr/matichandler.cpp
@@ -85,7 +85,7 @@ bool MaticHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, bool sh
 	{
 		prt->setLocation(i18n("Local printer on %1").arg(val));
 		KURL	url(val);
-		if (val.tqfind("usb") != -1)
+		if (val.find("usb") != -1)
 			url.setProtocol("usb");
 		else
 			url.setProtocol("parallel");
@@ -104,7 +104,7 @@ bool MaticHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, bool sh
 				KURL	url ( parsePostpipe(postpipe) );
 				if (!url.isEmpty())
 				{
-					QString	ds = TQString::tqfromLatin1("%1 (%2)").arg(prt->location()).arg(url.protocol());
+					QString	ds = TQString::fromLatin1("%1 (%2)").arg(prt->location()).arg(url.protocol());
 					prt->setDevice(url.url());
 					prt->setLocation(ds);
 				}
@@ -115,7 +115,7 @@ bool MaticHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, bool sh
 			{
 				prt->setManufacturer(m["make"].toString());
 				prt->setModel(m["model"].toString());
-				prt->setDriverInfo(TQString::tqfromLatin1("%1 %2 (%3)").arg(prt->manufacturer()).arg(prt->model()).arg(m["driver"].toString()));
+				prt->setDriverInfo(TQString::fromLatin1("%1 %2 (%3)").arg(prt->manufacturer()).arg(prt->model()).arg(m["driver"].toString()));
 			}
 		}
 	}
@@ -126,7 +126,7 @@ bool MaticHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, bool sh
 TQString MaticHandler::parsePostpipe(const TQString& s)
 {
 	QString	url;
-	int	p = s.tqfindRev('|');
+	int	p = s.findRev('|');
 	QStringList	args = TQStringList::split(" ", s.right(s.length()-p-1));
 
 	if (args.count() != 0)
@@ -167,7 +167,7 @@ TQString MaticHandler::parsePostpipe(const TQString& s)
 				else
 				{
 					QString	host = (args[i].length() == 2 ? args[i+1] : args[i].right(args[i].length()-2));
-					int	p = host.tqfind("\\@");
+					int	p = host.find("\\@");
 					if (p != -1)
 					{
 						url = "lpd://" + host.right(host.length()-p-2) + "/" + host.left(p);
@@ -247,11 +247,11 @@ DrMain* MaticHandler::loadDbDriver(const TQString& path)
 	}
 
 	QString	tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8));
-	QString	PATH = getenv("PATH") + TQString::tqfromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
+	QString	PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
 	QString	exe = KStandardDirs::findExe("foomatic-datafile", PATH);
 	if (exe.isEmpty())
 	{
-		manager()->setErrorMsg(i18n("Unable to tqfind the executable foomatic-datafile "
+		manager()->setErrorMsg(i18n("Unable to find the executable foomatic-datafile "
 		                            "in your PATH. Check that Foomatic is correctly installed."));
 		return NULL;
 	}
@@ -309,15 +309,15 @@ bool MaticHandler::savePrinterDriver(KMPrinter *prt, PrintcapEntry *entry, DrMai
 			line = tin.readLine();
 			if (line.stripWhiteSpace().startsWith("$postpipe"))
 				continue;
-			else if ((p = line.tqfind("'name'")) != -1)
+			else if ((p = line.find("'name'")) != -1)
 			{
-				p = line.tqfind('\'', p+6)+1;
-				q = line.tqfind('\'', p);
+				p = line.find('\'', p+6)+1;
+				q = line.find('\'', p);
 				optname = line.mid(p, q-p);
 			}
-			else if ((p = line.tqfind("'default'")) != -1)
+			else if ((p = line.find("'default'")) != -1)
 			{
-				DrBase	*opt = driver->tqfindOption(optname);
+				DrBase	*opt = driver->findOption(optname);
 				if (opt)
 				{
 					tout << line.left(p+9) << " => '" << opt->valueText() << "'," << endl;
@@ -351,11 +351,11 @@ bool MaticHandler::savePpdFile(DrMain *driver, const TQString& filename)
 	if (mdriver.isEmpty() || mprinter.isEmpty())
 		return true;
 
-	QString	PATH = getenv("PATH") + TQString::tqfromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
+	QString	PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
 	QString	exe = KStandardDirs::findExe("foomatic-datafile", PATH);
 	if (exe.isEmpty())
 	{
-		manager()->setErrorMsg(i18n("Unable to tqfind the executable foomatic-datafile "
+		manager()->setErrorMsg(i18n("Unable to find the executable foomatic-datafile "
 		                            "in your PATH. Check that Foomatic is correctly installed."));
 		return false;
 	}
@@ -372,12 +372,12 @@ bool MaticHandler::savePpdFile(DrMain *driver, const TQString& filename)
 			line = tin.readLine();
 			if (line.startsWith("*% COMDATA #"))
 			{
-				if (line.tqfind("'default'") != -1)
+				if (line.find("'default'") != -1)
 				{
-					DrBase	*opt = (optname.isEmpty() ? NULL : driver->tqfindOption(optname));
+					DrBase	*opt = (optname.isEmpty() ? NULL : driver->findOption(optname));
 					if (opt)
 					{
-						line.tqreplace(foo2, "'"+opt->valueText()+"',");
+						line.replace(foo2, "'"+opt->valueText()+"',");
 					}
 				}
 				else if (foo.search(line) != -1)
@@ -385,7 +385,7 @@ bool MaticHandler::savePpdFile(DrMain *driver, const TQString& filename)
 			}
 			else if (re.search(line) != -1)
 			{
-				DrBase	*opt = driver->tqfindOption(re.cap(1));
+				DrBase	*opt = driver->findOption(re.cap(1));
 				if (opt)
 				{
 					QString	val = opt->valueText();
@@ -423,7 +423,7 @@ PrintcapEntry* MaticHandler::createEntry(KMPrinter *prt)
 	}
 	if (m_exematicpath.isEmpty())
 	{
-		manager()->setErrorMsg(i18n("Unable to tqfind executable lpdomatic. "
+		manager()->setErrorMsg(i18n("Unable to find executable lpdomatic. "
 		                            "Check that Foomatic is correctly installed "
 		                            "and that lpdomatic is installed in a standard "
 		                            "location."));
diff --git a/kdeprint/lpr/matichelper.cpp b/kdeprint/lpr/matichelper.cpp
index 918d8f22d..544db8c71 100644
--- a/kdeprint/lpr/matichelper.cpp
+++ b/kdeprint/lpr/matichelper.cpp
@@ -29,7 +29,7 @@ TQString maticFile(PrintcapEntry *entry)
 		s = entry->field("filter_options");
 		if (!s.isEmpty())
 		{
-			int	p = s.tqfindRev(' ');
+			int	p = s.findRev(' ');
 			if (p != -1)
 				s = s.mid(p+1);
 		}
diff --git a/kdeprint/lpr/printcapentry.h b/kdeprint/lpr/printcapentry.h
index e3617a34f..15adafddd 100644
--- a/kdeprint/lpr/printcapentry.h
+++ b/kdeprint/lpr/printcapentry.h
@@ -72,7 +72,7 @@ public:
 	TQMap<TQString,Field>	fields;
 	QString			postcomment;
 
-	bool has(const TQString& f) const	{ return fields.tqcontains(f); }
+	bool has(const TQString& f) const	{ return fields.contains(f); }
 	TQString field(const TQString& f) const	{ return fields[f].value; }
 	bool writeEntry(TQTextStream&);
 	void addField(const TQString& name, Field::Type type = Field::Boolean, const TQString& value = TQString::null);
diff --git a/kdeprint/lpr/printcapreader.cpp b/kdeprint/lpr/printcapreader.cpp
index 7abd094f9..a3ab30e8f 100644
--- a/kdeprint/lpr/printcapreader.cpp
+++ b/kdeprint/lpr/printcapreader.cpp
@@ -101,7 +101,7 @@ PrintcapEntry* PrintcapReader::nextEntry()
     // now parse the entry
     kdDebug() << "COMMENT: " << comment << endl;
     kdDebug() << "LINE: " << buf << endl;
-    int p = buf.tqfind(':');
+    int p = buf.find(':');
     if (p == -1)
         name = buf;
     else
@@ -132,14 +132,14 @@ PrintcapEntry* PrintcapReader::nextEntry()
             for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it)
             {
                 Field f;
-                int p = (*it).tqfind('=');
+                int p = (*it).find('=');
                 if (p == -1)
                 {
-                    p = (*it).tqfind('#');
+                    p = (*it).find('#');
                     if (p == -1)
                     {
                         f.type = Field::Boolean;
-			p = (*it).tqfind('@');
+			p = (*it).find('@');
 			if (p == -1)
 			{
 				f.name = (*it);
diff --git a/kdeprint/management/cjanuswidget.cpp b/kdeprint/management/cjanuswidget.cpp
index 1cb6693e8..7bad07264 100644
--- a/kdeprint/management/cjanuswidget.cpp
+++ b/kdeprint/management/cjanuswidget.cpp
@@ -118,7 +118,7 @@ void CJanusWidget::CListBox::computeWidth()
 		item = item->next();
 	}
 	if (verticalScrollBar()->isVisible())
-		w += verticalScrollBar()->tqsizeHint().width();
+		w += verticalScrollBar()->sizeHint().width();
 	w += (frameWidth()*2);
 	setFixedWidth(w);
 }
@@ -169,7 +169,7 @@ void CJanusWidget::addPage(TQWidget *w, const TQString& text, const TQString& he
 	page->m_text = text;
 	page->m_header = header;
 	page->m_pixmap = pix;
-	page->m_item = new CListBoxItem(m_iconlist,tqfindPrevItem(page),pix,text);
+	page->m_item = new CListBoxItem(m_iconlist,findPrevItem(page),pix,text);
 	m_iconlist->computeWidth();
 	m_stack->addWidget(w,m_pages.count());
 
@@ -179,10 +179,10 @@ void CJanusWidget::addPage(TQWidget *w, const TQString& text, const TQString& he
 
 void CJanusWidget::enablePage(TQWidget *w)
 {
-	CPage	*page = tqfindPage(w);
+	CPage	*page = findPage(w);
 	if (page && !page->m_item)
 	{
-		page->m_item = new CListBoxItem(m_iconlist,tqfindPrevItem(page),page->m_pixmap,page->m_text);
+		page->m_item = new CListBoxItem(m_iconlist,findPrevItem(page),page->m_pixmap,page->m_text);
 		m_iconlist->computeWidth();
 		if (m_iconlist->count() == 1)
 			m_iconlist->setSelected(page->m_item,true);
@@ -191,7 +191,7 @@ void CJanusWidget::enablePage(TQWidget *w)
 
 void CJanusWidget::disablePage(TQWidget *w)
 {
-	CPage	*page = tqfindPage(w);
+	CPage	*page = findPage(w);
 	if (page && page->m_item)
 	{
 		bool	needReselect(m_iconlist->isSelected(page->m_item));
@@ -208,7 +208,7 @@ void CJanusWidget::disablePage(TQWidget *w)
 
 void CJanusWidget::slotSelected(TQListBoxItem *item)
 {
-	CPage	*page = tqfindPage(item);
+	CPage	*page = findPage(item);
 	if (page)
 	{
 		m_stack->raiseWidget(page->m_widget);
@@ -221,7 +221,7 @@ void CJanusWidget::slotSelected(TQListBoxItem *item)
 	}
 }
 
-CJanusWidget::CPage* CJanusWidget::tqfindPage(TQWidget *w)
+CJanusWidget::CPage* CJanusWidget::findPage(TQWidget *w)
 {
 	TQPtrListIterator<CPage>	it(m_pages);
 	for (;it.current();++it)
@@ -230,7 +230,7 @@ CJanusWidget::CPage* CJanusWidget::tqfindPage(TQWidget *w)
 	return 0;
 }
 
-CJanusWidget::CPage* CJanusWidget::tqfindPage(TQListBoxItem *i)
+CJanusWidget::CPage* CJanusWidget::findPage(TQListBoxItem *i)
 {
 	TQPtrListIterator<CPage>	it(m_pages);
 	for (;it.current();++it)
@@ -239,9 +239,9 @@ CJanusWidget::CPage* CJanusWidget::tqfindPage(TQListBoxItem *i)
 	return 0;
 }
 
-TQListBoxItem* CJanusWidget::tqfindPrevItem(CPage *p)
+TQListBoxItem* CJanusWidget::findPrevItem(CPage *p)
 {
-	if (m_pages.tqfindRef(p) == -1)
+	if (m_pages.findRef(p) == -1)
 		m_pages.last();
 	else
 		m_pages.prev();
diff --git a/kdeprint/management/cjanuswidget.h b/kdeprint/management/cjanuswidget.h
index 5ed401e49..2b06aed21 100644
--- a/kdeprint/management/cjanuswidget.h
+++ b/kdeprint/management/cjanuswidget.h
@@ -49,9 +49,9 @@ public:
 	class CListBoxItem;
 
 private:
-	CPage* tqfindPage(TQWidget *w);
-	CPage* tqfindPage(TQListBoxItem *i);
-	TQListBoxItem* tqfindPrevItem(CPage*);
+	CPage* findPage(TQWidget *w);
+	CPage* findPage(TQListBoxItem *i);
+	TQListBoxItem* findPrevItem(CPage*);
 
 private:
 	TQPtrList<CPage>		m_pages;
diff --git a/kdeprint/management/kiconselectaction.cpp b/kdeprint/management/kiconselectaction.cpp
index 538d6660b..d2c4c873f 100644
--- a/kdeprint/management/kiconselectaction.cpp
+++ b/kdeprint/management/kiconselectaction.cpp
@@ -85,7 +85,7 @@ int KIconSelectAction::plug(TQWidget* widget, int index)
 	{
 		KToolBar* bar = static_cast<KToolBar*>(widget);
 		int id = KAction::getToolButtonID();
-		// To have a correct tqlayout in the toolbar, a non
+		// To have a correct layout in the toolbar, a non
 		// empty icon has to be used. Use "unknown" by default.
 		QString	iconName = (currentItem() != -1 ? d->m_iconlst[currentItem()] : "unknown");
 
diff --git a/kdeprint/management/kmconfigcommand.cpp b/kdeprint/management/kmconfigcommand.cpp
index 5a1d1b54b..21a1a330b 100644
--- a/kdeprint/management/kmconfigcommand.cpp
+++ b/kdeprint/management/kmconfigcommand.cpp
@@ -47,7 +47,7 @@ KMConfigCommand::KMConfigCommand(TQWidget *parent, const char *name)
 	QVBoxLayout	*l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 	l0->addWidget(gb);
 	l0->addStretch(1);
-	QVBoxLayout	*l2 = new TQVBoxLayout(gb->tqlayout(), KDialog::spacingHint());
+	QVBoxLayout	*l2 = new TQVBoxLayout(gb->layout(), KDialog::spacingHint());
 	l2->addWidget(lab);
 	l2->addWidget(sel);
 }
diff --git a/kdeprint/management/kmconfigfilter.cpp b/kdeprint/management/kmconfigfilter.cpp
index bfcf2bf81..10dff4749 100644
--- a/kdeprint/management/kmconfigfilter.cpp
+++ b/kdeprint/management/kmconfigfilter.cpp
@@ -63,7 +63,7 @@ KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name)
 
 	QVBoxLayout	*l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 	l0->addWidget(box, 1);
-	QVBoxLayout	*l1 = new TQVBoxLayout(box->tqlayout(), KDialog::spacingHint());
+	QVBoxLayout	*l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint());
 	l1->addWidget(lab);
 	QGridLayout	*l2 = new TQGridLayout(0, 4, 3, 0, KDialog::spacingHint());
 	l1->addLayout(l2);
@@ -97,7 +97,7 @@ void KMConfigFilter::loadConfig(KConfig *conf)
 	{
 		if (!it.current()->isSpecial() && !it.current()->isVirtual())
 		{
-			KListBox	*lb = (m_plist.tqfind(it.current()->printerName()) == m_plist.end() ? m_list1 : m_list2);
+			KListBox	*lb = (m_plist.find(it.current()->printerName()) == m_plist.end() ? m_list1 : m_list2);
 			lb->insertItem(SmallIcon(it.current()->pixmap()), it.current()->printerName());
 		}
 	}
diff --git a/kdeprint/management/kmconfigfonts.cpp b/kdeprint/management/kmconfigfonts.cpp
index 16006b2bb..e59f75728 100644
--- a/kdeprint/management/kmconfigfonts.cpp
+++ b/kdeprint/management/kmconfigfonts.cpp
@@ -61,9 +61,9 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name)
 	QLabel	*lab0 = new TQLabel(i18n("Additional director&y:"), box2);
 	lab0->setBuddy(m_addpath);
 
-	QVBoxLayout	*l0 = new TQVBoxLayout(box->tqlayout(), KDialog::spacingHint());
+	QVBoxLayout	*l0 = new TQVBoxLayout(box->layout(), KDialog::spacingHint());
 	l0->addWidget(m_embedfonts);
-	QVBoxLayout	*l1 = new TQVBoxLayout(box2->tqlayout(), KDialog::spacingHint());
+	QVBoxLayout	*l1 = new TQVBoxLayout(box2->layout(), KDialog::spacingHint());
 	l1->addWidget(m_fontpath);
 	QHBoxLayout	*l2 = new TQHBoxLayout(0, 0, KDialog::spacingHint());
 	l1->addLayout(l2);
diff --git a/kdeprint/management/kmconfiggeneral.cpp b/kdeprint/management/kmconfiggeneral.cpp
index d6f35b071..c729c6516 100644
--- a/kdeprint/management/kmconfiggeneral.cpp
+++ b/kdeprint/management/kmconfiggeneral.cpp
@@ -57,7 +57,7 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent)
 	QGroupBox	*m_testpagebox = new TQGroupBox(0, Qt::Vertical, i18n("Test Page"), this);
 	m_defaulttestpage = new TQCheckBox(i18n("&Specify personal test page"), m_testpagebox, "TestPageCheck");
 	m_testpage = new KURLRequester(m_testpagebox,"TestPage");
-	m_preview = new KPushButton(KGuiItem(i18n("Preview..."), "filetqfind"), m_testpagebox);
+	m_preview = new KPushButton(KGuiItem(i18n("Preview..."), "filefind"), m_testpagebox);
 	connect(m_defaulttestpage,TQT_SIGNAL(toggled(bool)),m_testpage,TQT_SLOT(setEnabled(bool)));
 	connect(m_defaulttestpage,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(setEnabledPreviewButton(bool)));
 	connect(m_preview,TQT_SIGNAL(clicked()),TQT_SLOT(slotTestPagePreview()));
@@ -70,16 +70,16 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent)
 	m_statusmsg = new TQCheckBox(i18n("Sho&w printing status message box"), m_statusbox);
 	m_uselast = new TQCheckBox(i18n("De&faults to the last printer used in the application"), m_statusbox);
 
-	//tqlayout
+	//layout
 	QVBoxLayout	*lay0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 	lay0->addWidget(m_timerbox);
 	lay0->addWidget(m_testpagebox);
 	lay0->addWidget(m_statusbox);
 	lay0->addStretch(1);
-	QVBoxLayout	*lay1 = new TQVBoxLayout(m_timerbox->tqlayout(),
+	QVBoxLayout	*lay1 = new TQVBoxLayout(m_timerbox->layout(),
 		KDialog::spacingHint());
 	lay1->addWidget(m_timer);
-	QVBoxLayout	*lay2 = new TQVBoxLayout(m_testpagebox->tqlayout(),
+	QVBoxLayout	*lay2 = new TQVBoxLayout(m_testpagebox->layout(),
 		KDialog::spacingHint());
 	QHBoxLayout	*lay3 = new TQHBoxLayout(0, 0, 0);
 	lay2->addWidget(m_defaulttestpage);
@@ -87,7 +87,7 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent)
 	lay2->addLayout(lay3);
 	lay3->addStretch(1);
 	lay3->addWidget(m_preview);
-	QVBoxLayout	*lay4 = new TQVBoxLayout(m_statusbox->tqlayout(),
+	QVBoxLayout	*lay4 = new TQVBoxLayout(m_statusbox->layout(),
 		KDialog::spacingHint());
 	lay4->addWidget(m_statusmsg);
 	lay4->addWidget(m_uselast);
@@ -114,7 +114,7 @@ void KMConfigGeneral::loadConfig(KConfig *conf)
 		m_defaulttestpage->setChecked(true);
 		m_testpage->setURL(tpage);
 	}
-	m_statusmsg->setChecked(conf->readBoolEntry("ShowtqStatusMsg", true));
+	m_statusmsg->setChecked(conf->readBoolEntry("ShowStatusMsg", true));
 	m_uselast->setChecked(conf->readBoolEntry("UseLast", true));
 }
 
@@ -123,10 +123,10 @@ void KMConfigGeneral::saveConfig(KConfig *conf)
 	conf->setGroup("General");
 	conf->writeEntry("TimerDelay",m_timer->value());
 	conf->writePathEntry("TestPage",(m_defaulttestpage->isChecked() ? m_testpage->url() : TQString::null));
-	if (m_defaulttestpage->isChecked() && KMimeMagic::self()->tqfindFileType(m_testpage->url())->mimeType() != "application/postscript")
+	if (m_defaulttestpage->isChecked() && KMimeMagic::self()->findFileType(m_testpage->url())->mimeType() != "application/postscript")
 		KMessageBox::sorry(this, i18n("The selected test page is not a PostScript file. You may not "
 		                              "be able to test your printer anymore."));
-	conf->writeEntry("ShowtqStatusMsg", m_statusmsg->isChecked());
+	conf->writeEntry("ShowStatusMsg", m_statusmsg->isChecked());
 	conf->writeEntry("UseLast", m_uselast->isChecked());
 }
 
@@ -136,7 +136,7 @@ void KMConfigGeneral::slotTestPagePreview()
 	if (tpage.isEmpty())
 		KMessageBox::error(this, i18n("Empty file name."));
 	else
-		KRun::runURL(KURL( tpage ), KMimeMagic::self()->tqfindFileType(tpage)->mimeType());
+		KRun::runURL(KURL( tpage ), KMimeMagic::self()->findFileType(tpage)->mimeType());
 }
 
 #include "kmconfiggeneral.moc"
diff --git a/kdeprint/management/kmconfigjobs.cpp b/kdeprint/management/kmconfigjobs.cpp
index b28cf46da..1aaf0ec26 100644
--- a/kdeprint/management/kmconfigjobs.cpp
+++ b/kdeprint/management/kmconfigjobs.cpp
@@ -44,7 +44,7 @@ KMConfigJobs::KMConfigJobs(TQWidget *parent, const char *name)
 	QVBoxLayout	*l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 	l0->addWidget(box, 0);
 	l0->addStretch(1);
-	QVBoxLayout	*l1 = new TQVBoxLayout(box->tqlayout(), KDialog::spacingHint());
+	QVBoxLayout	*l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint());
 	l1->addWidget(m_limit);
 }
 
diff --git a/kdeprint/management/kmconfigpreview.cpp b/kdeprint/management/kmconfigpreview.cpp
index a84df457a..1bd9f46e5 100644
--- a/kdeprint/management/kmconfigpreview.cpp
+++ b/kdeprint/management/kmconfigpreview.cpp
@@ -34,7 +34,7 @@ KMConfigPreview::KMConfigPreview(TQWidget *parent, const char *name)
 {
 	setPageName(i18n("Preview"));
 	setPageHeader(i18n("Preview Settings"));
-	setPagePixmap("filetqfind");
+	setPagePixmap("filefind");
 
 	TQGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("Preview Program"), this);
 
@@ -43,14 +43,14 @@ KMConfigPreview::KMConfigPreview(TQWidget *parent, const char *name)
 	QLabel	*lab = new TQLabel(box);
 	lab->setText(i18n("You can use an external preview program (PS viewer) instead of the "
 					  "KDE built-in preview system. Note that if the KDE default PS viewer "
-					  "(KGhostView) cannot be found, KDE tries automatically to tqfind another "
+					  "(KGhostView) cannot be found, KDE tries automatically to find another "
 					  "external PostScript viewer"));
 	lab->setTextFormat(Qt::RichText);
 
 	QVBoxLayout	*l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 	l0->addWidget(box);
 	l0->addStretch(1);
-	QVBoxLayout	*l1 = new TQVBoxLayout(box->tqlayout(), KDialog::spacingHint());
+	QVBoxLayout	*l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint());
 	l1->addWidget(lab);
 	l1->addWidget(m_useext);
 	l1->addWidget(m_program);
diff --git a/kdeprint/management/kmdbcreator.cpp b/kdeprint/management/kmdbcreator.cpp
index cce83605d..3b271ff00 100644
--- a/kdeprint/management/kmdbcreator.cpp
+++ b/kdeprint/management/kmdbcreator.cpp
@@ -109,7 +109,7 @@ bool KMDBCreator::createDriverDB(const TQString& dirname, const TQString& filena
 	{
 		if (!m_dlg)
 		{
-			m_dlg = new TQProgressDialog(parent->tqtopLevelWidget(),"progress-dialog",true);
+			m_dlg = new TQProgressDialog(parent->topLevelWidget(),"progress-dialog",true);
 			m_dlg->setLabelText(i18n("Please wait while KDE rebuilds a driver database."));
 			m_dlg->setCaption(i18n("Driver Database"));
 			connect(m_dlg,TQT_SIGNAL(canceled()),TQT_SLOT(slotCancelled()));
@@ -133,7 +133,7 @@ void KMDBCreator::slotReceivedStdout(KProcess*, char *buf, int len)
 	// the toInt() will return 0. If that occurs for the first number,
 	// then the number of steps will be also 0.
 	bool	ok;
-	int	p = str.tqfind('\n');
+	int	p = str.find('\n');
 	int	n = str.mid(0, p).toInt(&ok);
 
 	// process the number received
diff --git a/kdeprint/management/kmdbcreator.h b/kdeprint/management/kmdbcreator.h
index d4281a51d..82fa5469e 100644
--- a/kdeprint/management/kmdbcreator.h
+++ b/kdeprint/management/kmdbcreator.h
@@ -28,7 +28,7 @@
 class TQWidget;
 class TQProgressDialog;
 
-class KMDBCreator : public TQObject
+class KMDBCreator : public QObject
 {
 	Q_OBJECT
 public:
diff --git a/kdeprint/management/kmdriverdb.cpp b/kdeprint/management/kmdriverdb.cpp
index adb7fb807..6e275a6d4 100644
--- a/kdeprint/management/kmdriverdb.cpp
+++ b/kdeprint/management/kmdriverdb.cpp
@@ -60,7 +60,7 @@ KMDriverDB::~KMDriverDB()
 TQString KMDriverDB::dbFile()
 {
 	// this calls insure missing directories creation
-	QString	filename = locateLocal("data",TQString::tqfromLatin1("kdeprint/printerdb_%1.txt").arg(KMFactory::self()->printSystem()));
+	QString	filename = locateLocal("data",TQString::fromLatin1("kdeprint/printerdb_%1.txt").arg(KMFactory::self()->printSystem()));
 	return filename;
 }
 
@@ -110,23 +110,23 @@ void KMDriverDB::slotDbCreated()
 
 KMDBEntryList* KMDriverDB::findEntry(const TQString& manu, const TQString& model)
 {
-	TQDict<KMDBEntryList>	*models = m_entries.tqfind(manu);
+	TQDict<KMDBEntryList>	*models = m_entries.find(manu);
 	if (models)
-		return models->tqfind(model);
+		return models->find(model);
 	return 0;
 }
 
-KMDBEntryList* KMDriverDB::tqfindPnpEntry(const TQString& manu, const TQString& model)
+KMDBEntryList* KMDriverDB::findPnpEntry(const TQString& manu, const TQString& model)
 {
-	TQDict<KMDBEntryList>	*models = m_pnpentries.tqfind(manu);
+	TQDict<KMDBEntryList>	*models = m_pnpentries.find(manu);
 	if (models)
-		return models->tqfind(model);
+		return models->find(model);
 	return 0;
 }
 
-TQDict<KMDBEntryList>* KMDriverDB::tqfindModels(const TQString& manu)
+TQDict<KMDBEntryList>* KMDriverDB::findModels(const TQString& manu)
 {
-	return m_entries.tqfind(manu);
+	return m_entries.find(manu);
 }
 
 void KMDriverDB::insertEntry(KMDBEntry *entry)
@@ -140,14 +140,14 @@ void KMDriverDB::insertEntry(KMDBEntry *entry)
 	}
 
 	// insert it in normal entries
-	TQDict<KMDBEntryList>	*models = m_entries.tqfind(entry->manufacturer);
+	TQDict<KMDBEntryList>	*models = m_entries.find(entry->manufacturer);
 	if (!models)
 	{
 		models = new TQDict<KMDBEntryList>(17,false);
 		models->setAutoDelete(true);
 		m_entries.insert(entry->manufacturer,models);
 	}
-	KMDBEntryList	*list = models->tqfind(entry->model);
+	KMDBEntryList	*list = models->find(entry->model);
 	if (!list)
 	{
 		list = new KMDBEntryList;
@@ -159,14 +159,14 @@ void KMDriverDB::insertEntry(KMDBEntry *entry)
 	if (!entry->pnpmanufacturer.isEmpty() && !entry->pnpmodel.isEmpty())
 	{
 		// insert it in PNP entries
-		models = m_pnpentries.tqfind(entry->manufacturer);
+		models = m_pnpentries.find(entry->manufacturer);
 		if (!models)
 		{
 			models = new TQDict<KMDBEntryList>(17,false);
 			models->setAutoDelete(true);
 			m_pnpentries.insert(entry->manufacturer,models);
 		}
-		list = models->tqfind(entry->model);
+		list = models->find(entry->model);
 		if (!list)
 		{
 			list = new KMDBEntryList;
@@ -209,7 +209,7 @@ void KMDriverDB::loadDbFile()
 			line = t.readLine().stripWhiteSpace();
 			if (line.isEmpty())
 				continue;
-			int	p = line.tqfind('=');
+			int	p = line.find('=');
 			if (p == -1)
 				continue;
 			words.clear();
@@ -235,7 +235,7 @@ void KMDriverDB::loadDbFile()
 			else if (words[0] == "RECOMMANDED" && entry && words[1].lower() == "yes")
 				entry->recommended = true;
 			else if (words[0] == "DRIVERCOMMENT" && entry)
-				entry->drivercomment = ("<qt>"+words[1].tqreplace("&lt;", "<").tqreplace("&gt;", ">")+"</qt>");
+				entry->drivercomment = ("<qt>"+words[1].replace("&lt;", "<").replace("&gt;", ">")+"</qt>");
 		}
 		if (entry)
 			insertEntry(entry);
diff --git a/kdeprint/management/kmdriverdb.h b/kdeprint/management/kmdriverdb.h
index e18ce971e..1ffecdc0a 100644
--- a/kdeprint/management/kmdriverdb.h
+++ b/kdeprint/management/kmdriverdb.h
@@ -29,7 +29,7 @@
 
 class KMDBCreator;
 
-class KMDriverDB : public TQObject
+class KMDriverDB : public QObject
 {
 	Q_OBJECT
 public:
@@ -40,8 +40,8 @@ public:
 
 	void init(TQWidget *parent = 0);
 	KMDBEntryList* findEntry(const TQString& manu, const TQString& model);
-	KMDBEntryList* tqfindPnpEntry(const TQString& manu, const TQString& model);
-	TQDict<KMDBEntryList>* tqfindModels(const TQString& manu);
+	KMDBEntryList* findPnpEntry(const TQString& manu, const TQString& model);
+	TQDict<KMDBEntryList>* findModels(const TQString& manu);
 	const TQDict< TQDict<KMDBEntryList> >& manufacturers() const	{ return m_entries; }
 
 protected:
diff --git a/kdeprint/management/kmdriverdbwidget.cpp b/kdeprint/management/kmdriverdbwidget.cpp
index 45b305087..fdd3d263c 100644
--- a/kdeprint/management/kmdriverdbwidget.cpp
+++ b/kdeprint/management/kmdriverdbwidget.cpp
@@ -58,7 +58,7 @@ KMDriverDbWidget::KMDriverDbWidget(TQWidget *parent, const char *name)
 	l1->setBuddy(m_manu);
 	l2->setBuddy(m_model);
 
-	// build tqlayout
+	// build layout
 	QVBoxLayout	*main_ = new TQVBoxLayout(this, 0, 10);
 	QGridLayout	*sub1_ = new TQGridLayout(0, 2, 3, 0, 0);
 	QHBoxLayout	*sub2_ = new TQHBoxLayout(0, 0, 10);
@@ -95,17 +95,17 @@ KMDriverDbWidget::~KMDriverDbWidget()
 
 void KMDriverDbWidget::setDriver(const TQString& manu, const TQString& model)
 {
-	QListBoxItem	*item = m_manu->tqfindItem(manu);
+	QListBoxItem	*item = m_manu->findItem(manu);
 	QString		model_(model);
 	if (item)
 	{
 		m_manu->setCurrentItem(item);
-		item = m_model->tqfindItem(model_);
+		item = m_model->findItem(model_);
 		if (!item)
 			// try by stripping the manufacturer name from
 			// the beginning of the model string. This is
 			// often the case with PPD files
-			item = m_model->tqfindItem(model_.tqreplace(0,manu.length()+1,TQString::tqfromLatin1("")));
+			item = m_model->findItem(model_.replace(0,manu.length()+1,TQString::fromLatin1("")));
 		if (item)
 			m_model->setCurrentItem(item);
 	}
@@ -186,7 +186,7 @@ void KMDriverDbWidget::slotError(const TQString& msg)
 void KMDriverDbWidget::slotManufacturerSelected(const TQString& name)
 {
 	m_model->clear();
-	TQDict<KMDBEntryList>	*models = KMDriverDB::self()->tqfindModels(name);
+	TQDict<KMDBEntryList>	*models = KMDriverDB::self()->findModels(name);
 	if (models)
 	{
 		QStrIList	ilist(true);
@@ -203,18 +203,18 @@ void KMDriverDbWidget::slotPostscriptToggled(bool on)
 {
 	if (on)
 	{
-		QListBoxItem	*item = m_manu->tqfindItem("GENERIC");
+		QListBoxItem	*item = m_manu->findItem("GENERIC");
 		if (item)
 		{
 			m_manu->setCurrentItem(item);
-			item = m_model->tqfindItem( "POSTSCRIPT PRINTER" );
+			item = m_model->findItem( "POSTSCRIPT PRINTER" );
 			if ( item )
 			{
 				m_model->setCurrentItem( item );
 				return;
 			}
 		}
-		KMessageBox::error(this,i18n("Unable to tqfind the PostScript driver."));
+		KMessageBox::error(this,i18n("Unable to find the PostScript driver."));
 		m_postscript->setChecked(false);
 	}
 }
diff --git a/kdeprint/management/kmiconview.cpp b/kdeprint/management/kmiconview.cpp
index 8fbe0ecea..5d16e34d0 100644
--- a/kdeprint/management/kmiconview.cpp
+++ b/kdeprint/management/kmiconview.cpp
@@ -99,7 +99,7 @@ void KMIconViewItem::updatePrinter(KMPrinter *p, int mode)
 			setText(TQString::null);
 			setText(p->name());
 		}
-		setKey(TQString::tqfromLatin1("%1_%2").arg((p->isSpecial() ? "special" : (p->isClass(false) ? "class" : "printer"))).arg(p->name()));
+		setKey(TQString::fromLatin1("%1_%2").arg((p->isSpecial() ? "special" : (p->isClass(false) ? "class" : "printer"))).arg(p->name()));
 		m_isclass = p->isClass(false);
 	}
 	if (mode != m_mode || ((oldstate&0x4) != (m_state&0x4)) || (p && p->pixmap() != m_pixmap))
@@ -114,7 +114,7 @@ void KMIconViewItem::updatePrinter(KMPrinter *p, int mode)
 			setPixmap(SmallIcon(m_pixmap, 0, iconstate));
 	}
 	//if (update)
-	//	tqrepaint();
+	//	repaint();
 	setDiscarded(false);
 }
 
@@ -137,7 +137,7 @@ KMIconView::~KMIconView()
 {
 }
 
-KMIconViewItem* KMIconView::tqfindItem(KMPrinter *p)
+KMIconViewItem* KMIconView::findItem(KMPrinter *p)
 {
 	if (p)
 	{
@@ -167,7 +167,7 @@ void KMIconView::setPrinterList(TQPtrList<KMPrinter> *list)
                         // only keep real printers (no instances)
                         if (!it.current()->instanceName().isEmpty())
                                 continue;
-			item = tqfindItem(it.current());
+			item = findItem(it.current());
 			if (!item)
 			{
 				item = new KMIconViewItem(this,it.current());
diff --git a/kdeprint/management/kmiconview.h b/kdeprint/management/kmiconview.h
index 96bf92b84..1c3aeb542 100644
--- a/kdeprint/management/kmiconview.h
+++ b/kdeprint/management/kmiconview.h
@@ -68,7 +68,7 @@ protected slots:
 	void slotSelectionChanged();
 
 private:
-	KMIconViewItem* tqfindItem(KMPrinter *p);
+	KMIconViewItem* findItem(KMPrinter *p);
 
 private:
 	TQPtrList<KMIconViewItem>	m_items;
diff --git a/kdeprint/management/kminfopage.cpp b/kdeprint/management/kminfopage.cpp
index d6db9ec43..e06fa3c28 100644
--- a/kdeprint/management/kminfopage.cpp
+++ b/kdeprint/management/kminfopage.cpp
@@ -32,7 +32,7 @@ KMInfoPage::KMInfoPage(TQWidget *parent, const char *name)
 {
 	m_title = new TQLabel(this);
 	m_titlepixmap = new TQLabel(this);
-	m_titlepixmap->tqsetAlignment(Qt::AlignCenter);
+	m_titlepixmap->setAlignment(Qt::AlignCenter);
         KSeparator* sep = new KSeparator( KSeparator::HLine, this);
 	m_type = new TQLabel(this);
 	m_description = new TQLabel(this);
@@ -42,19 +42,19 @@ KMInfoPage::KMInfoPage(TQWidget *parent, const char *name)
 	m_uri = new TQLabel(this);
 	m_device = new TQLabel(this);
 	QLabel	*m_loclabel = new TQLabel(i18n("Physical Location", "Location:"), this);
-	m_loclabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter);
+	m_loclabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
 	QLabel	*m_desclabel = new TQLabel(i18n("Description:"), this);
-	m_desclabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter);
+	m_desclabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
 	QLabel	*m_typelabel = new TQLabel(i18n("Type:"), this);
-	m_typelabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter);
-	QLabel	*m_statelabel = new TQLabel(i18n("tqStatus", "State:"), this);
-	m_statelabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter);
+	m_typelabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
+	QLabel	*m_statelabel = new TQLabel(i18n("Status", "State:"), this);
+	m_statelabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
 	QLabel	*m_urilabel = new TQLabel(i18n("URI:"), this);
-	m_urilabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter);
+	m_urilabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
 	m_devlabel = new TQLabel(i18n("Device:"), this);
-	m_devlabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter);
+	m_devlabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
 	QLabel	*m_modellabel = new TQLabel(i18n("Model:"), this);
-	m_modellabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter);
+	m_modellabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
 
 	QGridLayout	*lay0 = new TQGridLayout(this, 11, 2, 0, 5);
 	QHBoxLayout	*lay1 = new TQHBoxLayout(0, 0, 10);
@@ -107,7 +107,7 @@ void KMInfoPage::setPrinter(KMPrinter *p)
 	}
 	else
 	{
-		m_title->setText(TQString::tqfromLatin1("<b>%1</b>").arg(p->name()));
+		m_title->setText(TQString::fromLatin1("<b>%1</b>").arg(p->name()));
 		m_titlepixmap->setPixmap(SmallIcon(p->pixmap()));
 		if (p->isImplicit()) m_type->setText(i18n("Implicit class"));
 		else if (p->isClass(false))
@@ -133,7 +133,7 @@ void KMInfoPage::setPrinter(KMPrinter *p)
 		}
 		else
 		{
-			// double decoding in case printer name tqcontains
+			// double decoding in case printer name contains
 			// annoying chars like '#'
                         KURL dev(p->device());
 			m_device->setText(KURL::decode_string(dev.prettyURL()));
diff --git a/kdeprint/management/kminstancepage.cpp b/kdeprint/management/kminstancepage.cpp
index 8089c3890..6e6fcc391 100644
--- a/kdeprint/management/kminstancepage.cpp
+++ b/kdeprint/management/kminstancepage.cpp
@@ -121,9 +121,9 @@ void KMInstancePage::setPrinter(KMPrinter *p)
 
 	//iif (!oldText.isEmpty())
 	//{
-		QListBoxItem	*item = m_view->tqfindItem(oldText);
+		QListBoxItem	*item = m_view->findItem(oldText);
 		if (!item)
-			item = m_view->tqfindItem(i18n("(Default)"));
+			item = m_view->findItem(i18n("(Default)"));
 		if (item)
 			m_view->setSelected(item,true);
 	//}
@@ -138,7 +138,7 @@ void KMInstancePage::slotNew()
 			                     i18n("(Default)"),&ok,this);
 	if (ok)
 	{
-		if (name.tqfind(TQRegExp("[/\\s]")) != -1)
+		if (name.find(TQRegExp("[/\\s]")) != -1)
 			KMessageBox::error(this, i18n("Instance name must not contain any spaces or slashes."));
 		else
 		{
@@ -183,7 +183,7 @@ void KMInstancePage::slotCopy()
 				                     i18n("(Default)"),&ok,this);
 		if (ok)
 		{
-			if (name.tqfind(TQRegExp("[/\\s]")) != -1)
+			if (name.find(TQRegExp("[/\\s]")) != -1)
 				KMessageBox::error(this, i18n("Instance name must not contain any spaces or slashes."));
 			else
 			{
@@ -208,9 +208,9 @@ void KMInstancePage::slotSettings()
 	if (!src.isEmpty())
 	{
 		if (src == i18n("(Default)")) src = TQString::null;
-		KMPrinter	*pr = KMFactory::self()->virtualManager()->tqfindInstance(m_printer,src);
+		KMPrinter	*pr = KMFactory::self()->virtualManager()->findInstance(m_printer,src);
 		if ( !pr )
-			KMessageBox::error( this, i18n( "Unable to tqfind instance %1." ).arg( m_view->currentText() ) );
+			KMessageBox::error( this, i18n( "Unable to find instance %1." ).arg( m_view->currentText() ) );
 		else if ( !pr->isSpecial() && !KMFactory::self()->manager()->completePrinterShort( pr ) )
 			KMessageBox::error( this, i18n( "Unable to retrieve printer information. Message from printing system: %1." ).arg( KMFactory::self()->manager()->errorMsg() ) );
 		else
@@ -259,7 +259,7 @@ void KMInstancePage::slotTest()
 	{
 		if (src == i18n("(Default)"))
 			src = TQString::null;
-		KMPrinter	*mpr = KMFactory::self()->virtualManager()->tqfindInstance(m_printer,src);
+		KMPrinter	*mpr = KMFactory::self()->virtualManager()->findInstance(m_printer,src);
 		if (!mpr)
 			KMessageBox::error(this,i18n("Internal error: printer not found."));
 		else if (KMessageBox::warningContinueCancel(this, i18n("You are about to print a test page on %1. Do you want to continue?").arg(mpr->printerName()), TQString::null, i18n("Print Test Page"), "printTestPage") == KMessageBox::Continue)
diff --git a/kdeprint/management/kmjobviewer.cpp b/kdeprint/management/kmjobviewer.cpp
index 03c3dc620..a5e419fc6 100644
--- a/kdeprint/management/kmjobviewer.cpp
+++ b/kdeprint/management/kmjobviewer.cpp
@@ -149,7 +149,7 @@ void KMJobViewer::updateCaption()
 	if (!m_prname.isEmpty())
 	{
 		setCaption(i18n("Print Jobs for %1").arg(m_prname));
-		KMPrinter	*prt = KMManager::self()->tqfindPrinter(m_prname);
+		KMPrinter	*prt = KMManager::self()->findPrinter(m_prname);
 		if (prt)
 			pixname = prt->pixmap();
 	}
@@ -183,7 +183,7 @@ void KMJobViewer::addToManager()
 	}
 	else if (!m_prname.isEmpty())
 	{
-		KMPrinter *prt = KMManager::self()->tqfindPrinter( m_prname );
+		KMPrinter *prt = KMManager::self()->findPrinter( m_prname );
 		bool isSpecial = ( prt ? prt->isSpecial() : false );
 		m_manager->addPrinter(m_prname, (KMJobManager::JobType)m_type, isSpecial);
 	}
@@ -235,7 +235,7 @@ void KMJobViewer::init()
 		m_view->addColumn(i18n("Job ID"));
 		m_view->addColumn(i18n("Owner"));
 		m_view->addColumn(i18n("Name"), 150);
-		m_view->addColumn(i18n("tqStatus", "State"));
+		m_view->addColumn(i18n("Status", "State"));
 		m_view->addColumn(i18n("Size (KB)"));
 		m_view->addColumn(i18n("Page(s)"));
 		m_view->setColumnAlignment(5,Qt::AlignRight|Qt::AlignVCenter);
@@ -280,7 +280,7 @@ void KMJobViewer::initActions()
 	connect(m_userfield, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotUserChanged()));
 	connect(uact, TQT_SIGNAL(toggled(bool)), m_userfield, TQT_SLOT(setEnabled(bool)));
 	m_userfield->setEnabled(false);
-	m_userfield->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+	m_userfield->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
 	KWidgetAction	*ufact = new KWidgetAction(m_userfield, i18n("User Name"), 0, 0, 0, actionCollection(), "view_username");
 
 	if (!m_pop)
@@ -387,7 +387,7 @@ void KMJobViewer::updateJobs()
 	for (;it.current();++it)
 	{
 		KMJob	*j(it.current());
-		JobItem	*item = tqfindItem(j->uri());
+		JobItem	*item = findItem(j->uri());
 		if (item)
 		{
 			item->setDiscarded(false);
@@ -407,7 +407,7 @@ void KMJobViewer::updateJobs()
 	slotSelectionChanged();
 }
 
-JobItem* KMJobViewer::tqfindItem(const TQString& uri)
+JobItem* KMJobViewer::findItem(const TQString& uri)
 {
 	TQPtrListIterator<JobItem>	it(m_items);
 	for (;it.current();++it)
@@ -586,7 +586,7 @@ void KMJobViewer::loadPluginActions()
 		KAction	*act = actionCollection()->action("job_restart");
 		for (int i=0;i<act->containerCount();i++)
 		{
-			if (menuBar()->tqfindItem(act->itemId(i), &menu))
+			if (menuBar()->findItem(act->itemId(i), &menu))
 			{
 				menuindex = mpopindex = menu->indexOf(act->itemId(i))+1;
 				break;
diff --git a/kdeprint/management/kmjobviewer.h b/kdeprint/management/kmjobviewer.h
index 2838ee17e..98cd73656 100644
--- a/kdeprint/management/kmjobviewer.h
+++ b/kdeprint/management/kmjobviewer.h
@@ -91,7 +91,7 @@ protected:
 	void init();
 	void updateJobs();
 	void initActions();
-	JobItem* tqfindItem(const TQString& uri);
+	JobItem* findItem(const TQString& uri);
 	void jobSelection(TQPtrList<KMJob>& l);
 	void send(int cmd, const TQString& name, const TQString& arg = TQString::null);
 	void loadPrinters();
diff --git a/kdeprint/management/kmlistview.cpp b/kdeprint/management/kmlistview.cpp
index 2ffc9b730..e754cfe1d 100644
--- a/kdeprint/management/kmlistview.cpp
+++ b/kdeprint/management/kmlistview.cpp
@@ -89,7 +89,7 @@ void KMListViewItem::updatePrinter(KMPrinter *p)
 	}
 	setDiscarded(false);
 	if (update)
-		tqrepaint();
+		repaint();
 }
 
 void KMListViewItem::paintCell(TQPainter *p, const TQColorGroup& cg, int c, int w, int a)
@@ -147,7 +147,7 @@ void KMListView::slotRightButtonClicked(TQListViewItem *item, const TQPoint& p,
 	emit rightButtonClicked(item && item->depth() == 2 ? item->text(0) : TQString::null, p);
 }
 
-KMListViewItem* KMListView::tqfindItem(KMPrinter *p)
+KMListViewItem* KMListView::findItem(KMPrinter *p)
 {
 	if (p)
 	{
@@ -169,7 +169,7 @@ KMListViewItem* KMListView::tqfindItem(KMPrinter *p)
 	return 0;
 }
 
-KMListViewItem* KMListView::tqfindItem(const TQString& prname)
+KMListViewItem* KMListView::findItem(const TQString& prname)
 {
 	TQPtrListIterator<KMListViewItem>	it(m_items);
 	for (; it.current(); ++it)
@@ -192,12 +192,12 @@ void KMListView::setPrinterList(TQPtrList<KMPrinter> *list)
 		KMListViewItem			*item (0);
 		for (;it.current();++it)
 		{
-			item = tqfindItem(it.current());
+			item = findItem(it.current());
 			if (!item)
 			{
 				if (it.current()->isVirtual())
 				{
-					KMListViewItem	*pItem = tqfindItem(it.current()->printerName());
+					KMListViewItem	*pItem = findItem(it.current()->printerName());
 					if (!pItem)
 						continue;
 					item = new KMListViewItem(pItem, it.current());
diff --git a/kdeprint/management/kmlistview.h b/kdeprint/management/kmlistview.h
index c037eba4f..e9a6b29e5 100644
--- a/kdeprint/management/kmlistview.h
+++ b/kdeprint/management/kmlistview.h
@@ -48,8 +48,8 @@ protected slots:
 	void slotOnViewport();
 
 protected:
-	KMListViewItem* tqfindItem(KMPrinter*);
-	KMListViewItem* tqfindItem(const TQString&);
+	KMListViewItem* findItem(KMPrinter*);
+	KMListViewItem* findItem(const TQString&);
 
 private:
 	TQPtrList<KMListViewItem>	m_items;
diff --git a/kdeprint/management/kmmainview.cpp b/kdeprint/management/kmmainview.cpp
index 11b77a48e..f422832cc 100644
--- a/kdeprint/management/kmmainview.cpp
+++ b/kdeprint/management/kmmainview.cpp
@@ -68,7 +68,7 @@ int kdeprint_management_add_printer_wizard( TQWidget* parent )
 		{
 			flag = 1;
 			// check if the printer already exists, and ask confirmation if needed.
-			if (KMFactory::self()->manager()->tqfindPrinter(dlg.printer()->name()) != 0)
+			if (KMFactory::self()->manager()->findPrinter(dlg.printer()->name()) != 0)
 				if (KMessageBox::warningContinueCancel(parent,i18n("The printer %1 already exists. Continuing will overwrite existing printer. Do you want to continue?").arg(dlg.printer()->name())) == KMessageBox::Cancel)
 					flag = 0;
 			// try to add printer only if flag is true.
@@ -99,16 +99,16 @@ KMMainView::KMMainView(TQWidget *parent, const char *name, KActionCollection *co
 	m_menubar->setIconText( KToolBar::IconTextRight );
 	m_menubar->setMovingEnabled( false );
 
-	// tqlayout
-	QVBoxLayout	*m_tqlayout = new TQVBoxLayout(this, 0, 0);
-	m_tqlayout->addWidget(m_toolbar);
-	m_tqlayout->addWidget( m_menubar );
-	m_boxtqlayout = new TQBoxLayout(TQBoxLayout::TopToBottom, 0, 0);
-	m_tqlayout->addLayout(m_boxtqlayout);
-	m_boxtqlayout->addWidget(m_printerview);
-	m_boxtqlayout->addWidget(m_printerpages);
-	m_tqlayout->addSpacing(5);
-	m_tqlayout->addWidget(m_plugin, 0);
+	// layout
+	QVBoxLayout	*m_layout = new TQVBoxLayout(this, 0, 0);
+	m_layout->addWidget(m_toolbar);
+	m_layout->addWidget( m_menubar );
+	m_boxlayout = new TQBoxLayout(TQBoxLayout::TopToBottom, 0, 0);
+	m_layout->addLayout(m_boxlayout);
+	m_boxlayout->addWidget(m_printerview);
+	m_boxlayout->addWidget(m_printerpages);
+	m_layout->addSpacing(5);
+	m_layout->addWidget(m_plugin, 0);
 
 	// connections
 	connect(KMTimer::self(),TQT_SIGNAL(timeout()),TQT_SLOT(slotTimer()));
@@ -374,7 +374,7 @@ void KMMainView::slotTimer()
 
 void KMMainView::slotPrinterSelected(const TQString& prname)
 {
-	KMPrinter	*p = KMManager::self()->tqfindPrinter(prname);
+	KMPrinter	*p = KMManager::self()->findPrinter(prname);
 	m_current = p;
 	if (p && !p->isSpecial())
 		KMFactory::self()->manager()->completePrinter(p);
@@ -384,26 +384,26 @@ void KMMainView::slotPrinterSelected(const TQString& prname)
 	// problem).
 	//if (m_toolbar->isEnabled())
 	//{
-		int 	tqmask = (m_manager->hasManagement() ? m_manager->printerOperationMask() : 0);
+		int 	mask = (m_manager->hasManagement() ? m_manager->printerOperationMask() : 0);
 		bool	sp = !(p && p->isSpecial());
-//		m_actions->action("printer_remove")->setEnabled(!sp || ((tqmask & KMManager::PrinterRemoval) && p && p->isLocal() && !p->isImplicit()));
-		m_actions->action("printer_remove")->setEnabled(!sp || ((tqmask & KMManager::PrinterRemoval) && p && !p->isImplicit()));
-		m_actions->action("printer_configure")->setEnabled(!sp || ((tqmask & KMManager::PrinterConfigure) && p && !p->isClass(true) /*&& p->isLocal()*/));
-		m_actions->action("printer_hard_default")->setEnabled((sp && (tqmask & KMManager::PrinterDefault) && p && !p->isClass(true) && !p->isHardDefault() && p->isLocal()));
+//		m_actions->action("printer_remove")->setEnabled(!sp || ((mask & KMManager::PrinterRemoval) && p && p->isLocal() && !p->isImplicit()));
+		m_actions->action("printer_remove")->setEnabled(!sp || ((mask & KMManager::PrinterRemoval) && p && !p->isImplicit()));
+		m_actions->action("printer_configure")->setEnabled(!sp || ((mask & KMManager::PrinterConfigure) && p && !p->isClass(true) /*&& p->isLocal()*/));
+		m_actions->action("printer_hard_default")->setEnabled((sp && (mask & KMManager::PrinterDefault) && p && !p->isClass(true) && !p->isHardDefault() && p->isLocal()));
 		m_actions->action("printer_soft_default")->setEnabled((p && !p->isSoftDefault()));
-		m_actions->action("printer_test")->setEnabled((sp && (tqmask & KMManager::PrinterTesting) && p && !p->isClass(true)));
-		bool	sttqmask = (sp && (tqmask & KMManager::PrinterEnabling) && p);
-		m_actions->action("printer_state_change")->setEnabled(sttqmask && p->isLocal());
-		m_actions->action("printer_spool_change")->setEnabled(sttqmask);
-		m_actions->action("printer_start")->setEnabled((sttqmask && p->state() == KMPrinter::Stopped));
-		m_actions->action("printer_stop")->setEnabled((sttqmask && p->state() != KMPrinter::Stopped));
-		m_actions->action("printer_enable")->setEnabled((sttqmask && !p->acceptJobs()));
-		m_actions->action("printer_disable")->setEnabled((sttqmask && p->acceptJobs()));
-
-		m_actions->action("printer_add")->setEnabled((tqmask & KMManager::PrinterCreation));
-		tqmask = m_manager->serverOperationMask();
-		m_actions->action("server_restart")->setEnabled((tqmask & KMManager::ServerRestarting));
-		m_actions->action("server_configure")->setEnabled((tqmask & KMManager::ServerConfigure));
+		m_actions->action("printer_test")->setEnabled((sp && (mask & KMManager::PrinterTesting) && p && !p->isClass(true)));
+		bool	stmask = (sp && (mask & KMManager::PrinterEnabling) && p);
+		m_actions->action("printer_state_change")->setEnabled(stmask && p->isLocal());
+		m_actions->action("printer_spool_change")->setEnabled(stmask);
+		m_actions->action("printer_start")->setEnabled((stmask && p->state() == KMPrinter::Stopped));
+		m_actions->action("printer_stop")->setEnabled((stmask && p->state() != KMPrinter::Stopped));
+		m_actions->action("printer_enable")->setEnabled((stmask && !p->acceptJobs()));
+		m_actions->action("printer_disable")->setEnabled((stmask && p->acceptJobs()));
+
+		m_actions->action("printer_add")->setEnabled((mask & KMManager::PrinterCreation));
+		mask = m_manager->serverOperationMask();
+		m_actions->action("server_restart")->setEnabled((mask & KMManager::ServerRestarting));
+		m_actions->action("server_configure")->setEnabled((mask & KMManager::ServerConfigure));
 
 		KMFactory::self()->manager()->validatePluginActions(m_actions, p);
 	//}
@@ -428,7 +428,7 @@ void KMMainView::slotChangeView(int ID)
 
 void KMMainView::slotRightButtonClicked(const TQString& prname, const TQPoint& p)
 {
-	KMPrinter	*printer = KMManager::self()->tqfindPrinter(prname);
+	KMPrinter	*printer = KMManager::self()->findPrinter(prname);
 	// construct popup menu
 	m_pop->clear();
 	if (printer)
@@ -622,11 +622,11 @@ void KMMainView::setOrientation(int o)
 }
 
 int KMMainView::orientation() const
-{ return (m_boxtqlayout->direction() == TQBoxLayout::LeftToRight ? Qt::Horizontal : Qt::Vertical);  }
+{ return (m_boxlayout->direction() == TQBoxLayout::LeftToRight ? Qt::Horizontal : Qt::Vertical);  }
 
 void KMMainView::slotChangeDirection(int d)
 {
-	m_boxtqlayout->setDirection(d == 1 ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom);
+	m_boxlayout->setDirection(d == 1 ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom);
 }
 
 void KMMainView::slotTest()
@@ -807,7 +807,7 @@ void KMMainView::loadPluginActions()
 	KMFactory::self()->manager()->createPluginActions(m_actions);
 	TQValueList<KAction*>	pactions = m_actions->actions("plugin");
 	int	index = m_pactionsindex;
-	//TQPopupMenu *menu = m_menubar->tqfindItem( m_menubar->idAt( 1 ) )->popup();
+	//TQPopupMenu *menu = m_menubar->findItem( m_menubar->idAt( 1 ) )->popup();
 	TQPopupMenu *menu = m_menubar->getButton( 1 )->popup();
 	for (TQValueList<KAction*>::Iterator it=pactions.begin(); it!=pactions.end(); ++it)
 	{
diff --git a/kdeprint/management/kmmainview.h b/kdeprint/management/kmmainview.h
index 597b44663..8f60aec2d 100644
--- a/kdeprint/management/kmmainview.h
+++ b/kdeprint/management/kmmainview.h
@@ -122,7 +122,7 @@ private:
 	int		m_pactionsindex;
 	QStringList	m_toollist;
 	bool		m_first;
-	QBoxLayout	*m_boxtqlayout;
+	QBoxLayout	*m_boxlayout;
 	class KMainWindowPrivate;
 	KMainWindowPrivate *d;
 	KToolBar *m_menubar;
diff --git a/kdeprint/management/kmprinterview.cpp b/kdeprint/management/kmprinterview.cpp
index f43f8f62a..794683f54 100644
--- a/kdeprint/management/kmprinterview.cpp
+++ b/kdeprint/management/kmprinterview.cpp
@@ -47,7 +47,7 @@ KMPrinterView::KMPrinterView(TQWidget *parent, const char *name)
 	connect(m_listview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SLOT(slotPrinterSelected(const TQString&)));
 
 	setViewType(m_type);
-	tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
+	setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
 }
 
 KMPrinterView::~KMPrinterView()
@@ -105,9 +105,9 @@ void KMPrinterView::slotPrinterSelected(const TQString& p)
 	m_current = p;
 }
 
-TQSize KMPrinterView::tqminimumSizeHint() const
+TQSize KMPrinterView::minimumSizeHint() const
 {
-	return TQWidgetStack::tqminimumSizeHint();
+	return TQWidgetStack::minimumSizeHint();
 }
 
 #include "kmprinterview.moc"
diff --git a/kdeprint/management/kmprinterview.h b/kdeprint/management/kmprinterview.h
index d6cf04de3..5ea565dba 100644
--- a/kdeprint/management/kmprinterview.h
+++ b/kdeprint/management/kmprinterview.h
@@ -42,7 +42,7 @@ public:
 	void setViewType(ViewType t);
 	ViewType viewType() const 	{ return m_type; }
 
-	TQSize tqminimumSizeHint() const;
+	TQSize minimumSizeHint() const;
 
 signals:
 	void printerSelected(const TQString&);
diff --git a/kdeprint/management/kmpropbackend.cpp b/kdeprint/management/kmpropbackend.cpp
index 468f5e84a..ea6434563 100644
--- a/kdeprint/management/kmpropbackend.cpp
+++ b/kdeprint/management/kmpropbackend.cpp
@@ -34,7 +34,7 @@ KMPropBackend::KMPropBackend(TQWidget *parent, const char *name)
 	QLabel	*l1 = new TQLabel(i18n("Printer type:"), this);
 	QLabel	*l2 = new TQLabel(i18n("URI:"), this);
 
-	// tqlayout
+	// layout
 	QGridLayout	*main_ = new TQGridLayout(this, 3, 2, 10, 7);
 	main_->setColStretch(0,0);
 	main_->setColStretch(1,1);
diff --git a/kdeprint/management/kmpropcontainer.cpp b/kdeprint/management/kmpropcontainer.cpp
index 363fd7029..90be6da19 100644
--- a/kdeprint/management/kmpropcontainer.cpp
+++ b/kdeprint/management/kmpropcontainer.cpp
@@ -56,7 +56,7 @@ void KMPropContainer::setWidget(KMPropWidget *w)
 		connect(m_button,TQT_SIGNAL(clicked()),m_widget,TQT_SLOT(slotChange()));
 		connect(m_widget,TQT_SIGNAL(enable(bool)),TQT_SIGNAL(enable(bool)));
 		connect(m_widget,TQT_SIGNAL(enableChange(bool)),TQT_SLOT(slotEnableChange(bool)));
-		QVBoxLayout	*lay = dynamic_cast<TQVBoxLayout*>(tqlayout());
+		QVBoxLayout	*lay = dynamic_cast<TQVBoxLayout*>(layout());
 		if (lay)
 		{
 			lay->insertWidget(0,m_widget,1);
diff --git a/kdeprint/management/kmpropdriver.cpp b/kdeprint/management/kmpropdriver.cpp
index c20a8c4e0..6b88f63ea 100644
--- a/kdeprint/management/kmpropdriver.cpp
+++ b/kdeprint/management/kmpropdriver.cpp
@@ -37,7 +37,7 @@ KMPropDriver::KMPropDriver(TQWidget *parent, const char *name)
 	QLabel	*l2 = new TQLabel(i18n("Printer model:"), this);
 	QLabel	*l3 = new TQLabel(i18n("Driver info:"), this);
 
-	// tqlayout
+	// layout
 	QGridLayout	*main_ = new TQGridLayout(this, 4, 2, 10, 7);
 	main_->setColStretch(0,0);
 	main_->setColStretch(1,1);
diff --git a/kdeprint/management/kmpropgeneral.cpp b/kdeprint/management/kmpropgeneral.cpp
index 3691076ab..1c9389941 100644
--- a/kdeprint/management/kmpropgeneral.cpp
+++ b/kdeprint/management/kmpropgeneral.cpp
@@ -38,7 +38,7 @@ KMPropGeneral::KMPropGeneral(TQWidget *parent, const char *name)
 	QLabel	*l2 = new TQLabel(i18n("Physical Location", "Location:"), this);
 	QLabel	*l3 = new TQLabel(i18n("Description:"), this);
 
-	// tqlayout
+	// layout
 	QGridLayout	*main_ = new TQGridLayout(this, 4, 2, 10, 7);
 	main_->setColStretch(0,0);
 	main_->setColStretch(1,1);
diff --git a/kdeprint/management/kmpropmembers.cpp b/kdeprint/management/kmpropmembers.cpp
index 6fa76cba9..775c71f89 100644
--- a/kdeprint/management/kmpropmembers.cpp
+++ b/kdeprint/management/kmpropmembers.cpp
@@ -29,7 +29,7 @@ KMPropMembers::KMPropMembers(TQWidget *parent, const char *name)
 : KMPropWidget(parent,name)
 {
 	m_members = new TQTextView(this);
-	m_members->setPaper(tqcolorGroup().background());
+	m_members->setPaper(colorGroup().background());
 	m_members->setFrameStyle(TQFrame::NoFrame);
 
 	QVBoxLayout	*main_ = new TQVBoxLayout(this, 10, 0);
diff --git a/kdeprint/management/kmspecialprinterdlg.cpp b/kdeprint/management/kmspecialprinterdlg.cpp
index c9cd1eb2d..20d8d17b7 100644
--- a/kdeprint/management/kmspecialprinterdlg.cpp
+++ b/kdeprint/management/kmspecialprinterdlg.cpp
@@ -103,7 +103,7 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name)
 
 	TQWhatsThis::add(m_usefile,
 		i18n("<p>The command will use an output file. If checked, make sure the "
-		     "command tqcontains an output tag.</p>"));
+		     "command contains an output tag.</p>"));
 	TQWhatsThis::add(m_command,
 		i18n("<p>The command to execute when printing on this special printer. Either enter "
 			 "the command to execute directly, or associate/create a command object with/for "
@@ -122,7 +122,7 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name)
 	TQWhatsThis::add(m_extensionlabel, extensionWhatsThis);
 	TQWhatsThis::add(m_extension, extensionWhatsThis);
 
-	// tqlayout creation
+	// layout creation
 	QVBoxLayout	*l0 = new TQVBoxLayout(dummy, 0, 10);
 	QGridLayout	*l1 = new TQGridLayout(0, 3, 3, 0, 5);
 	l0->addLayout(l1);
@@ -138,7 +138,7 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name)
 	l0->addWidget(sep);
 	l0->addWidget(m_gb);
 	l0->addWidget(m_outfile_gb);
-	QGridLayout	*l6 = new TQGridLayout(m_outfile_gb->tqlayout(), 3, 2, 10);
+	QGridLayout	*l6 = new TQGridLayout(m_outfile_gb->layout(), 3, 2, 10);
 	l6->addMultiCellWidget( m_usefile, 0, 0, 0, 1 );
 	l6->addWidget(m_mimetypelabel, 1, 0);
 	l6->addWidget(m_mimetype, 1, 1);
@@ -186,7 +186,7 @@ void KMSpecialPrinterDlg::setPrinter(KMPrinter *printer)
 	{
 		m_command->setCommand(printer->option("kde-special-command"));
 		m_usefile->setChecked(printer->option("kde-special-file") == "1");
-		int	index = m_mimelist.tqfindIndex(printer->option("kde-special-mimetype"));
+		int	index = m_mimelist.findIndex(printer->option("kde-special-mimetype"));
 		m_mimetype->setCurrentItem(index == -1 ? 0 : index);
 		m_extension->setText(printer->option("kde-special-extension"));
 		m_name->setText(printer->name());
diff --git a/kdeprint/management/kmwbackend.cpp b/kdeprint/management/kmwbackend.cpp
index eb5c6e4b9..53803d383 100644
--- a/kdeprint/management/kmwbackend.cpp
+++ b/kdeprint/management/kmwbackend.cpp
@@ -56,8 +56,8 @@ KMWBackend::KMWBackend(TQWidget *parent, const char *name)
 	m_buttons = new TQButtonGroup(this);
 	m_buttons->hide();
 
-	m_tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
-	m_tqlayout->addStretch(1);
+	m_layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+	m_layout->addStretch(1);
 	m_count = 0;
 }
 
@@ -91,7 +91,7 @@ void KMWBackend::initPrinter(KMPrinter *p)
 		else if (p->members().count() > 0) ID = KMWizard::Class;
 	}
 
-	if (m_buttons->tqfind(ID))
+	if (m_buttons->find(ID))
 		m_buttons->setButton(ID);
 }
 
@@ -102,9 +102,9 @@ void KMWBackend::updatePrinter(KMPrinter *p)
 	else p->setType(KMPrinter::Printer);
 	p->setOption("kde-backend",TQString::number(ID));
 	QString	s = m_buttons->selected()->text();
-	s.tqreplace(TQRegExp("&(?=\\w)"), TQString::tqfromLatin1(""));
+	s.replace(TQRegExp("&(?=\\w)"), TQString::fromLatin1(""));
 	p->setOption("kde-backend-description",s);
-	setNextPage((m_map.tqcontains(ID) ? m_map[ID] : KMWizard::Error));
+	setNextPage((m_map.contains(ID) ? m_map[ID] : KMWizard::Error));
 }
 
 void KMWBackend::addBackend( int ID, bool on, int nextpage )
@@ -154,7 +154,7 @@ void KMWBackend::addBackend(int ID, const TQString& txt, bool on, const TQString
 	if (ID == -1)
 	{
 		KSeparator* sep = new KSeparator( KSeparator::HLine, this);
-		m_tqlayout->insertWidget(m_count, sep);
+		m_layout->insertWidget(m_count, sep);
 	}
 	else
 	{
@@ -164,14 +164,14 @@ void KMWBackend::addBackend(int ID, const TQString& txt, bool on, const TQString
 			TQWhatsThis::add( btn, whatsThis );
 		m_buttons->insert(btn, ID);
 		m_map[ID] = (nextpage == -1 ? ID : nextpage);	// use nextpage if specified, default to ID
-		m_tqlayout->insertWidget(m_count, btn);
+		m_layout->insertWidget(m_count, btn);
 	}
 	m_count++;
 }
 
 void KMWBackend::enableBackend(int ID, bool on)
 {
-	QButton	*btn = m_buttons->tqfind(ID);
+	QButton	*btn = m_buttons->find(ID);
 	if (btn)
 		btn->setEnabled(on);
 }
diff --git a/kdeprint/management/kmwbackend.h b/kdeprint/management/kmwbackend.h
index 421ce4db4..2013b8035 100644
--- a/kdeprint/management/kmwbackend.h
+++ b/kdeprint/management/kmwbackend.h
@@ -42,7 +42,7 @@ public:
 
 private:
 	QButtonGroup	*m_buttons;
-	QVBoxLayout	*m_tqlayout;
+	QVBoxLayout	*m_layout;
 	// keep a map between button ID and the real next page to switch to. This enables
 	// to have different backends switching to the same page (like backends requiring
 	// a password). If the next page is not given when adding the backend, the ID is
diff --git a/kdeprint/management/kmwclass.cpp b/kdeprint/management/kmwclass.cpp
index c308d5aa2..d432af8e1 100644
--- a/kdeprint/management/kmwclass.cpp
+++ b/kdeprint/management/kmwclass.cpp
@@ -94,7 +94,7 @@ void KMWClass::initPrinter(KMPrinter *p)
 	{
 		TQPtrListIterator<KMPrinter>	it(*list);
 		for (;it.current();++it)
-			if (it.current()->instanceName().isEmpty() && !it.current()->isClass(true) && !it.current()->isSpecial() && !members.tqcontains(it.current()->name()))
+			if (it.current()->instanceName().isEmpty() && !it.current()->isClass(true) && !it.current()->isSpecial() && !members.contains(it.current()->name()))
 				m_list1->insertItem(SmallIcon(it.current()->pixmap()), it.current()->name());
 		m_list1->sort();
 	}
@@ -103,7 +103,7 @@ void KMWClass::initPrinter(KMPrinter *p)
 	m_list2->clear();
 	for (TQStringList::ConstIterator it=members.begin(); it!=members.end(); ++it)
 	{
-		KMPrinter	*pr = mgr->tqfindPrinter(*it);
+		KMPrinter	*pr = mgr->findPrinter(*it);
 		if (pr) m_list2->insertItem(SmallIcon(pr->pixmap()), *it);
 	}
 	m_list2->sort();
diff --git a/kdeprint/management/kmwdriver.cpp b/kdeprint/management/kmwdriver.cpp
index eae9d4ef9..a50454d0b 100644
--- a/kdeprint/management/kmwdriver.cpp
+++ b/kdeprint/management/kmwdriver.cpp
@@ -49,11 +49,11 @@ void KMWDriver::initPrinter(KMPrinter *p)
 		{
 			// use auto-detection info instead: split the string
 			// into make/model pair at the first space character
-			int p = autoDetect.tqfind( ' ' );
+			int p = autoDetect.find( ' ' );
 			if ( p != -1 )
 			{
 				TQString manu = autoDetect.left( p ), model = autoDetect.mid( p+1 );
-				KMDBEntryList *l = KMDriverDB::self()->tqfindPnpEntry( manu, model );
+				KMDBEntryList *l = KMDriverDB::self()->findPnpEntry( manu, model );
 				if ( l && l->count() > 0 )
 				{
 					m_widget->setDriver( l->getFirst()->manufacturer, l->getFirst()->model );
diff --git a/kdeprint/management/kmwend.cpp b/kdeprint/management/kmwend.cpp
index 3616cb1ce..5fd3c7fc0 100644
--- a/kdeprint/management/kmwend.cpp
+++ b/kdeprint/management/kmwend.cpp
@@ -42,11 +42,11 @@ KMWEnd::KMWEnd(TQWidget *parent, const char *name)
 void KMWEnd::initPrinter(KMPrinter *p)
 {
 	QString	txt;
-	QString	s(TQString::tqfromLatin1("<li><u>%1</u>: %2</li>"));
+	QString	s(TQString::fromLatin1("<li><u>%1</u>: %2</li>"));
 	int	ID = p->option("kde-backend").toInt();
 
 	// general information
-	txt.append(TQString::tqfromLatin1("<b>%1</b><ul type=circle>").arg(i18n("General")));
+	txt.append(TQString::fromLatin1("<b>%1</b><ul type=circle>").arg(i18n("General")));
 	txt.append(s.arg(i18n("Type")).arg(p->option("kde-backend-description")));
 	txt.append(s.arg(i18n("Name")).arg(p->name()));
 	txt.append(s.arg(i18n("Location")).arg(p->location()));
@@ -56,9 +56,9 @@ void KMWEnd::initPrinter(KMPrinter *p)
 	if (ID == KMWizard::Class)
 	{
 		// class members
-		txt.append(TQString::tqfromLatin1("<b>%1</b><ul type=circle>").arg(i18n("Members")));
+		txt.append(TQString::fromLatin1("<b>%1</b><ul type=circle>").arg(i18n("Members")));
 		QStringList	m(p->members());
-		QString		s1(TQString::tqfromLatin1("<li>%1</li>"));
+		QString		s1(TQString::fromLatin1("<li>%1</li>"));
 		for (TQStringList::ConstIterator it=m.begin(); it!=m.end(); ++it)
 			txt.append(s1.arg(*it));
 		txt.append("</ul><br>");
@@ -66,7 +66,7 @@ void KMWEnd::initPrinter(KMPrinter *p)
 	else
 	{
 		// backend information
-		txt.append(TQString::tqfromLatin1("<b>%1</b><ul type=circle>").arg(i18n("Backend")));
+		txt.append(TQString::fromLatin1("<b>%1</b><ul type=circle>").arg(i18n("Backend")));
 		KURL url ( p->device() );
 		switch (ID)
 		{
@@ -91,7 +91,7 @@ void KMWEnd::initPrinter(KMPrinter *p)
 				if (url.hasUser()) txt.append(s.arg(i18n("Account")).arg(url.user()));
 				break;
 			default:
-				// double decoding in case the printer name tqcontains chars like '#' that are
+				// double decoding in case the printer name contains chars like '#' that are
 				// not decoded by "prettyURL".
 				txt.append(s.arg(i18n("URI")).arg(KURL( p->device()).prettyURL()));
 				break;
@@ -101,7 +101,7 @@ void KMWEnd::initPrinter(KMPrinter *p)
 		if (p->option("kde-driver") == "raw" || p->driver())
 		{
 			// driver information
-			txt.append(TQString::tqfromLatin1("<b>%1</b><ul type=circle>").arg(i18n("Driver")));
+			txt.append(TQString::fromLatin1("<b>%1</b><ul type=circle>").arg(i18n("Driver")));
 			if (p->option("kde-driver") == "raw")
 				txt.append(s.arg(i18n("Type")).arg(i18n("Raw printer")));
 			else
diff --git a/kdeprint/management/kmwfile.cpp b/kdeprint/management/kmwfile.cpp
index 33deb0836..9daeee77b 100644
--- a/kdeprint/management/kmwfile.cpp
+++ b/kdeprint/management/kmwfile.cpp
@@ -72,6 +72,6 @@ bool KMWFile::isValid(TQString& msg)
 
 void KMWFile::updatePrinter(KMPrinter *p)
 {
-	QString	dev = TQString::tqfromLatin1("file:%1").arg(m_url->url());
+	QString	dev = TQString::fromLatin1("file:%1").arg(m_url->url());
 	p->setDevice(dev);
 }
diff --git a/kdeprint/management/kmwizard.cpp b/kdeprint/management/kmwizard.cpp
index 7a4fa3aa8..6a793dd5a 100644
--- a/kdeprint/management/kmwizard.cpp
+++ b/kdeprint/management/kmwizard.cpp
@@ -86,7 +86,7 @@ KMWizard::KMWizard(TQWidget *parent, const char *name)
 		m_side = 0;
 	}
 
-	// tqlayout
+	// layout
 	TQVBoxLayout *main0_ = new TQVBoxLayout(this, 10, 10);
 	QVBoxLayout	*main_ = new TQVBoxLayout(0, 0, 0);
 	TQHBoxLayout *main1_ = new TQHBoxLayout(0, 0, 10);
@@ -178,17 +178,17 @@ void KMWizard::configure(int start, int end, bool inclusive)
 
 void KMWizard::setNextPage(int page, int next)
 {
-	KMWizardPage	*p = m_pagepool.tqfind(page);
+	KMWizardPage	*p = m_pagepool.find(page);
 	if (p)
 		p->setNextPage(next);
 }
 
 void KMWizard::setCurrentPage(int ID, bool back)
 {
-	KMWizardPage	*page = m_pagepool.tqfind(ID);
+	KMWizardPage	*page = m_pagepool.find(ID);
 	if (!page)
 	{
-		KMessageBox::error(this,i18n("Unable to tqfind the requested page."),i18n("Add Printer Wizard"));
+		KMessageBox::error(this,i18n("Unable to find the requested page."),i18n("Add Printer Wizard"));
 		return;
 	}
 
diff --git a/kdeprint/management/kmwlocal.cpp b/kdeprint/management/kmwlocal.cpp
index cb5ac7bb1..1a89babe0 100644
--- a/kdeprint/management/kmwlocal.cpp
+++ b/kdeprint/management/kmwlocal.cpp
@@ -78,7 +78,7 @@ bool KMWLocal::isValid(TQString& msg)
 		msg = i18n("The URI is empty","Empty URI.");
 		return false;
 	}
-	else if (m_uris.tqfindIndex(m_localuri->text()) == -1)
+	else if (m_uris.findIndex(m_localuri->text()) == -1)
 	{
 		if (KMessageBox::warningContinueCancel(this, i18n("The local URI doesn't correspond to a detected port. Continue?")) == KMessageBox::Cancel)
 		{
@@ -173,7 +173,7 @@ void KMWLocal::initialize()
 		++it;
 
 		QString	uri = *it;
-		int p = uri.tqfind( ':' );
+		int p = uri.find( ':' );
 		QString	desc = *(++it), prot = ( p != -1 ? uri.left( p ) : TQString::null );
 		QString	printer = *(++it);
 		int	index(-1);
diff --git a/kdeprint/management/kmwlpd.cpp b/kdeprint/management/kmwlpd.cpp
index ef223a55a..c2686b481 100644
--- a/kdeprint/management/kmwlpd.cpp
+++ b/kdeprint/management/kmwlpd.cpp
@@ -58,7 +58,7 @@ bool KMWLpd::isValid(TQString& msg)
 	// check LPD queue
 	if (!checkLpdQueue(text(0).latin1(),text(1).latin1()))
 	{
-		if (KMessageBox::warningContinueCancel(this, i18n("Cannot tqfind queue %1 on server %2; do you want to continue anyway?").arg(text(1)).arg(text(0))) == KMessageBox::Cancel)
+		if (KMessageBox::warningContinueCancel(this, i18n("Cannot find queue %1 on server %2; do you want to continue anyway?").arg(text(1)).arg(text(0))) == KMessageBox::Cancel)
 			return false;
 	}
 	return true;
@@ -66,7 +66,7 @@ bool KMWLpd::isValid(TQString& msg)
 
 void KMWLpd::updatePrinter(KMPrinter *p)
 {
-	QString	dev = TQString::tqfromLatin1("lpd://%1/%2").arg(text(0)).arg(text(1));
+	QString	dev = TQString::fromLatin1("lpd://%1/%2").arg(text(0)).arg(text(1));
 	p->setDevice(dev);
 }
 
@@ -81,7 +81,7 @@ bool checkLpdQueue(const char *host, const char *queue)
 
 	char	res[64] = {0};
 	snprintf(res,64,"%c%s\n",(char)4,queue);
-	if (sock.writeBlock(res, strlen(res)) != (TQ_LONG)(strlen(res)))
+	if (sock.writeBlock(res, strlen(res)) != (Q_LONG)(strlen(res)))
 		return false;
 
 	char	buf[1024] = {0};
diff --git a/kdeprint/management/kmwname.cpp b/kdeprint/management/kmwname.cpp
index 709b986ea..d46b104a7 100644
--- a/kdeprint/management/kmwname.cpp
+++ b/kdeprint/management/kmwname.cpp
@@ -48,10 +48,10 @@ bool KMWName::isValid(TQString& msg)
 		msg = i18n("You must supply at least a name.");
 		return false;
 	}
-	else if (text(0).tqfind(TQRegExp("\\s")) != -1)
+	else if (text(0).find(TQRegExp("\\s")) != -1)
 	{
 		QString	conv = text(0);
-		conv.tqreplace(TQRegExp("\\s"), "");
+		conv.replace(TQRegExp("\\s"), "");
 		int result = KMessageBox::warningYesNoCancel(this,
 					i18n("It is usually not a good idea to include spaces "
 					     "in printer name: it may prevent your printer from "
diff --git a/kdeprint/management/kmwpassword.cpp b/kdeprint/management/kmwpassword.cpp
index ef3e74011..a84b8f904 100644
--- a/kdeprint/management/kmwpassword.cpp
+++ b/kdeprint/management/kmwpassword.cpp
@@ -66,7 +66,7 @@ KMWPassword::KMWPassword(TQWidget *parent, const char *name)
 	connect(btn3,TQT_SIGNAL(toggled(bool)),m_login,TQT_SLOT(setEnabled(bool)));
 	connect(btn3,TQT_SIGNAL(toggled(bool)),m_password,TQT_SLOT(setEnabled(bool)));
 
-	// tqlayout
+	// layout
 	TQVBoxLayout *main_ = new TQVBoxLayout( this, 0, 0 );
 	main_->addWidget( infotext_ );
 	main_->addSpacing( 10 );
@@ -99,12 +99,12 @@ void KMWPassword::initPrinter( KMPrinter* p )
 	if ( p->option( "kde-backend" ).toInt() != KMWizard::SMB )
 	{
 		int ID = m_btngroup->selectedId();
-		m_btngroup->tqfind( 1 )->hide();
+		m_btngroup->find( 1 )->hide();
 		if ( ID == 1 )
 			m_btngroup->setButton( 0 );
 	}
 	else
-		m_btngroup->tqfind( 1 )->show();
+		m_btngroup->find( 1 )->show();
 }
 
 void KMWPassword::updatePrinter(KMPrinter *p)
@@ -121,7 +121,7 @@ void KMWPassword::updatePrinter(KMPrinter *p)
 			p->setOption( "kde-password", TQString::null );
 			break;
 		case 1:
-			p->setOption( "kde-login", TQString::tqfromLatin1( "guest" ) );
+			p->setOption( "kde-login", TQString::fromLatin1( "guest" ) );
 			p->setOption( "kde-password", TQString::null );
 			break;
 		case 2:
diff --git a/kdeprint/management/kmwsocket.cpp b/kdeprint/management/kmwsocket.cpp
index f50c5c6b6..749ab8ea7 100644
--- a/kdeprint/management/kmwsocket.cpp
+++ b/kdeprint/management/kmwsocket.cpp
@@ -66,7 +66,7 @@ KMWSocket::KMWSocket(TQWidget *parent, const char *name)
 	connect( m_scanner, TQT_SIGNAL( scanStarted() ), parent, TQT_SLOT( disableWizard() ) );
 	connect( m_scanner, TQT_SIGNAL( scanFinished() ), parent, TQT_SLOT( enableWizard() ) );
 
-	// tqlayout
+	// layout
 	QHBoxLayout	*lay3 = new TQHBoxLayout(this, 0, 10);
 	QVBoxLayout	*lay2 = new TQVBoxLayout(0, 0, 0);
 
@@ -88,7 +88,7 @@ KMWSocket::~KMWSocket()
 
 void KMWSocket::updatePrinter(KMPrinter *p)
 {
-	QString	dev = TQString::tqfromLatin1("socket://%1:%2").arg(m_printer->text()).arg(m_port->text());
+	QString	dev = TQString::fromLatin1("socket://%1:%2").arg(m_printer->text()).arg(m_port->text());
 	p->setDevice(dev);
 }
 
diff --git a/kdeprint/management/kmwsocketutil.cpp b/kdeprint/management/kmwsocketutil.cpp
index 658a3c4a7..d3f838ce7 100644
--- a/kdeprint/management/kmwsocketutil.cpp
+++ b/kdeprint/management/kmwsocketutil.cpp
@@ -49,27 +49,27 @@ SocketConfig::SocketConfig(KMWSocketUtil *util, TQWidget *parent, const char *na
 	QWidget	*dummy = new TQWidget(this);
 	setMainWidget(dummy);
         KIntValidator *val = new KIntValidator( this );
-	QLabel	*tqmasklabel = new TQLabel(i18n("&Subnetwork:"),dummy);
+	QLabel	*masklabel = new TQLabel(i18n("&Subnetwork:"),dummy);
 	QLabel	*portlabel = new TQLabel(i18n("&Port:"),dummy);
 	QLabel	*toutlabel = new TQLabel(i18n("&Timeout (ms):"),dummy);
 	QLineEdit	*mm = new TQLineEdit(dummy);
-	mm->setText(TQString::tqfromLatin1(".[0-255]"));
+	mm->setText(TQString::fromLatin1(".[0-255]"));
 	mm->setReadOnly(true);
 	mm->setFixedWidth(fontMetrics().width(mm->text())+10);
 
-	tqmask_ = new TQLineEdit(dummy);
-	tqmask_->tqsetAlignment(Qt::AlignRight);
+	mask_ = new TQLineEdit(dummy);
+	mask_->setAlignment(Qt::AlignRight);
 	port_ = new TQComboBox(true,dummy);
         if ( port_->lineEdit() )
             port_->lineEdit()->setValidator( val );
 	tout_ = new TQLineEdit(dummy);
         tout_->setValidator( val );
 
-	tqmasklabel->setBuddy(tqmask_);
+	masklabel->setBuddy(mask_);
 	portlabel->setBuddy(port_);
 	toutlabel->setBuddy(tout_);
 
-	tqmask_->setText(util->root_);
+	mask_->setText(util->root_);
 	port_->insertItem("631");
 	port_->insertItem("9100");
 	port_->insertItem("9101");
@@ -79,13 +79,13 @@ SocketConfig::SocketConfig(KMWSocketUtil *util, TQWidget *parent, const char *na
 
 	QGridLayout	*main_ = new TQGridLayout(dummy, 3, 2, 0, 10);
 	QHBoxLayout	*lay1 = new TQHBoxLayout(0, 0, 5);
-	main_->addWidget(tqmasklabel, 0, 0);
+	main_->addWidget(masklabel, 0, 0);
 	main_->addWidget(portlabel, 1, 0);
 	main_->addWidget(toutlabel, 2, 0);
 	main_->addLayout(lay1, 0, 1);
 	main_->addWidget(port_, 1, 1);
 	main_->addWidget(tout_, 2, 1);
-	lay1->addWidget(tqmask_,1);
+	lay1->addWidget(mask_,1);
 	lay1->addWidget(mm,0);
 
 	resize(250,130);
@@ -100,7 +100,7 @@ void SocketConfig::slotOk()
 {
 	QString	msg;
 	QRegExp	re("(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})");
-	if (!re.exactMatch(tqmask_->text()))
+	if (!re.exactMatch(mask_->text()))
 		msg = i18n("Wrong subnetwork specification.");
 	else
 	{
@@ -189,7 +189,7 @@ void KMWSocketUtil::configureScan(TQWidget *parent)
 	SocketConfig	*dlg = new SocketConfig(this,parent);
 	if (dlg->exec())
 	{
-		root_ = dlg->tqmask_->text();
+		root_ = dlg->mask_->text();
 		port_ = dlg->port_->currentText().toInt();
 		timeout_ = dlg->tout_->text().toInt();
 	}
@@ -209,7 +209,7 @@ TQString localRootIP()
 	if (infos.count() > 0)
 	{
 		QString	IPstr = infos.first()->address()->nodeName();
-		int	p = IPstr.tqfindRev('.');
+		int	p = IPstr.findRev('.');
 		IPstr.truncate(p);
 		return IPstr;
 	}
diff --git a/kdeprint/management/kmwsocketutil.h b/kdeprint/management/kmwsocketutil.h
index 563dd3712..ad17b8113 100644
--- a/kdeprint/management/kmwsocketutil.h
+++ b/kdeprint/management/kmwsocketutil.h
@@ -48,7 +48,7 @@ protected slots:
 	void slotOk();
 
 private:
-	QLineEdit	*tqmask_, *tout_;
+	QLineEdit	*mask_, *tout_;
 	QComboBox	*port_;
 };
 
diff --git a/kdeprint/management/kxmlcommanddlg.cpp b/kdeprint/management/kxmlcommanddlg.cpp
index 029143753..24e6f4adf 100644
--- a/kdeprint/management/kxmlcommanddlg.cpp
+++ b/kdeprint/management/kxmlcommanddlg.cpp
@@ -52,11 +52,11 @@
 TQString generateId(const TQMap<TQString, DrBase*>& map)
 {
 	int	index(-1);
-	while (map.tqcontains(TQString::tqfromLatin1("item%1").arg(++index))) ;
-	return TQString::tqfromLatin1("item%1").arg(index);
+	while (map.contains(TQString::fromLatin1("item%1").arg(++index))) ;
+	return TQString::fromLatin1("item%1").arg(index);
 }
 
-TQListViewItem* tqfindPrev(TQListViewItem *item)
+TQListViewItem* findPrev(TQListViewItem *item)
 {
 	QListViewItem	*prev = item->itemAbove();
 	while (prev && prev->depth() > item->depth())
@@ -67,7 +67,7 @@ TQListViewItem* tqfindPrev(TQListViewItem *item)
 		return 0;
 }
 
-TQListViewItem* tqfindNext(TQListViewItem *item)
+TQListViewItem* findNext(TQListViewItem *item)
 {
 	QListViewItem	*next = item->itemBelow();
 	while (next && next->depth() > item->depth())
@@ -230,9 +230,9 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
 	l5->addWidget(m_edit1, 0, 1);
 	l5->addWidget(m_edit2, 1, 1);
 
-	QGridLayout	*l8 = new TQGridLayout(gb_input->tqlayout(), 2, 2,
+	QGridLayout	*l8 = new TQGridLayout(gb_input->layout(), 2, 2,
 		KDialog::spacingHint());
-	QGridLayout	*l9 = new TQGridLayout(gb_output->tqlayout(), 2, 2,
+	QGridLayout	*l9 = new TQGridLayout(gb_output->layout(), 2, 2,
 		KDialog::spacingHint());
 	l8->addWidget(m_inputfilelab, 0, 0);
 	l8->addWidget(m_inputpipelab, 1, 0);
@@ -243,7 +243,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
 	l9->addWidget(m_outputfile, 0, 1);
 	l9->addWidget(m_outputpipe, 1, 1);
 
-	QVBoxLayout	*l11 = new TQVBoxLayout(gb->tqlayout());
+	QVBoxLayout	*l11 = new TQVBoxLayout(gb->layout());
 	l11->addWidget(m_stack);
 
 	TQVBoxLayout *l12 = new TQVBoxLayout( 0, 0, 0 );
@@ -296,7 +296,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
 	TQWhatsThis::add( m_format, i18n(
 				"The format of the option. This determines how the option is formatted "
 				"for inclusion in the global command line. The tag <b>%value</b> can be used "
-				"to represent the user selection. This tag will be tqreplaced at run-time by a "
+				"to represent the user selection. This tag will be replaced at run-time by a "
 				"string representation of the option value." ) );
 	TQWhatsThis::add( m_formatlab, TQWhatsThis::textFor( m_format ) );
 	TQWhatsThis::add( m_default, i18n(
@@ -311,7 +311,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
 				"value does not match with the actual default value of the underlying utility." ) );
 	TQWhatsThis::add( m_command, i18n(
 				"The full command line to execute the associated underlying utility. This "
-				"command line is based on a mechanism of tags that are tqreplaced at run-time. "
+				"command line is based on a mechanism of tags that are replaced at run-time. "
 				"The supported tags are:<ul>"
 				"<li><b>%filterargs</b>: command options</li>"
 				"<li><b>%filterinput</b>: input specification</li>"
@@ -454,7 +454,7 @@ void KXmlCommandAdvancedDlg::viewItem(TQListViewItem *item)
 		m_name->setText(item->text(1));
 		m_desc->setText(item->text(0));
 
-		DrBase	*opt = (m_opts.tqcontains(item->text(1)) ? m_opts[item->text(1)] : 0);
+		DrBase	*opt = (m_opts.contains(item->text(1)) ? m_opts[item->text(1)] : 0);
 		if (opt)
 		{
 			bool	isgroup = (opt->type() < DrBase::String);
@@ -497,9 +497,9 @@ void KXmlCommandAdvancedDlg::viewItem(TQListViewItem *item)
 			m_addgrp->setEnabled(isgroup);
 			m_addopt->setEnabled(isgroup);
 
-			QListViewItem	*prevItem = tqfindPrev(item), *nextItem = tqfindNext(item);
-			DrBase	*prevOpt = (prevItem && m_opts.tqcontains(prevItem->text(1)) ? m_opts[prevItem->text(1)] : 0);
-			DrBase	*nextOpt = (nextItem && m_opts.tqcontains(nextItem->text(1)) ? m_opts[nextItem->text(1)] : 0);
+			QListViewItem	*prevItem = findPrev(item), *nextItem = findNext(item);
+			DrBase	*prevOpt = (prevItem && m_opts.contains(prevItem->text(1)) ? m_opts[prevItem->text(1)] : 0);
+			DrBase	*nextOpt = (nextItem && m_opts.contains(nextItem->text(1)) ? m_opts[nextItem->text(1)] : 0);
 			m_up->setEnabled(prevOpt && !(prevOpt->type() < DrBase::String && opt->type() >= DrBase::String));
 			m_down->setEnabled(nextOpt && !(isgroup && nextOpt->type() >= DrBase::String));
 
@@ -571,7 +571,7 @@ void KXmlCommandAdvancedDlg::slotApplyChanges()
 
 		m_apply->setEnabled(false);
 
-		DrBase	*opt = (m_opts.tqcontains(item->text(1)) ? m_opts[item->text(1)] : 0);
+		DrBase	*opt = (m_opts.contains(item->text(1)) ? m_opts[item->text(1)] : 0);
 		m_opts.remove(item->text(1));
 		delete opt;
 
@@ -706,10 +706,10 @@ void KXmlCommandAdvancedDlg::removeItem(TQListViewItem *item)
 void KXmlCommandAdvancedDlg::slotMoveUp()
 {
 	QListViewItem	*item = m_view->currentItem(), *prev = 0;
-	if (item && (prev=tqfindPrev(item)))
+	if (item && (prev=findPrev(item)))
 	{
 		QListViewItem	*after(0);
-		if ((after=tqfindPrev(prev)) != 0)
+		if ((after=findPrev(prev)) != 0)
 			item->moveItem(after);
 		else
 		{
@@ -725,7 +725,7 @@ void KXmlCommandAdvancedDlg::slotMoveUp()
 void KXmlCommandAdvancedDlg::slotMoveDown()
 {
 	QListViewItem	*item = m_view->currentItem(), *next = 0;
-	if (item && (next=tqfindNext(item)))
+	if (item && (next=findNext(item)))
 	{
 		item->moveItem(next);
 		m_view->setSelected(item, true);
@@ -735,10 +735,10 @@ void KXmlCommandAdvancedDlg::slotMoveDown()
 
 void KXmlCommandAdvancedDlg::slotCommandChanged(const TQString& cmd)
 {
-	m_inputfile->tqparentWidget()->setEnabled(cmd.tqfind("%filterinput") != -1);
-	m_outputfile->tqparentWidget()->setEnabled(cmd.tqfind("%filteroutput") != -1);
-	m_view->setEnabled(cmd.tqfind("%filterargs") != -1);
-	m_name->tqparentWidget()->setEnabled(m_view->isEnabled());
+	m_inputfile->parentWidget()->setEnabled(cmd.find("%filterinput") != -1);
+	m_outputfile->parentWidget()->setEnabled(cmd.find("%filteroutput") != -1);
+	m_view->setEnabled(cmd.find("%filterargs") != -1);
+	m_name->parentWidget()->setEnabled(m_view->isEnabled());
 	slotSelectionChanged((m_view->isEnabled() ? m_view->currentItem() : 0));
 	m_view->setOpen(m_view->firstChild(), m_view->isEnabled());
 }
@@ -751,7 +751,7 @@ void KXmlCommandAdvancedDlg::slotValueSelected(TQListViewItem *item)
 
 void KXmlCommandAdvancedDlg::slotOptionRenamed(TQListViewItem *item, int)
 {
-	if (item && m_opts.tqcontains(item->text(1)))
+	if (item && m_opts.contains(item->text(1)))
 	{
 		DrBase	*opt = m_opts[item->text(1)];
 		opt->set("text", item->text(0));
@@ -767,7 +767,7 @@ void KXmlCommandAdvancedDlg::recreateGroup(TQListViewItem *item, DrGroup *grp)
 	QListViewItem	*child = item->firstChild();
 	while (child)
 	{
-		DrBase	*opt = (m_opts.tqcontains(child->text(1)) ? m_opts[child->text(1)] : 0);
+		DrBase	*opt = (m_opts.contains(child->text(1)) ? m_opts[child->text(1)] : 0);
 		if (opt)
 		{
 			if (opt->type() == DrBase::Group)
@@ -804,10 +804,10 @@ bool KXmlCommandAdvancedDlg::editCommand(KXmlCommand *xmlcmd, TQWidget *parent)
 		xmlcmd->setIo(xmldlg->m_inputpipe->text(), true, true);
 		xmlcmd->setIo(xmldlg->m_outputfile->text(), false, false);
 		xmlcmd->setIo(xmldlg->m_outputpipe->text(), false, true);
-		xmlcmd->setComment( xmldlg->m_comment->text().tqreplace( TQRegExp( "\n" ), " " ) );
+		xmlcmd->setComment( xmldlg->m_comment->text().replace( TQRegExp( "\n" ), " " ) );
 
 		// need to recreate the driver tree structure
-		DrMain	*driver = (xmldlg->m_opts.tqcontains("__root__") ? static_cast<DrMain*>(xmldlg->m_opts["__root__"]) : 0);
+		DrMain	*driver = (xmldlg->m_opts.contains("__root__") ? static_cast<DrMain*>(xmldlg->m_opts["__root__"]) : 0);
 		if (!driver && xmldlg->m_opts.count() > 0)
 		{
 			kdDebug() << "KXmlCommandAdvancedDlg: driver structure not found, creating one" << endl;
@@ -895,14 +895,14 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name)
 	l6->addWidget(m_mimetypelab, 0);
 	l6->addWidget(m_mimetype, 1);
 	l7->addWidget(m_gb1);
-	QGridLayout	*l2 = new TQGridLayout(m_gb1->tqlayout(), 4, 3, 10);
+	QGridLayout	*l2 = new TQGridLayout(m_gb1->layout(), 4, 3, 10);
 	l2->addMultiCellWidget(m_availablemime, 0, 3, 2, 2);
 	l2->addMultiCellWidget(m_selectedmime, 0, 3, 0, 0);
 	l2->addWidget(m_addmime, 1, 1);
 	l2->addWidget(m_removemime, 2, 1);
 	l2->setRowStretch(0, 1);
 	l2->setRowStretch(3, 1);
-	QHBoxLayout	*l4 = new TQHBoxLayout(m_gb2->tqlayout(), 10);
+	QHBoxLayout	*l4 = new TQHBoxLayout(m_gb2->layout(), 10);
 	l4->addWidget(m_requirements);
 	QVBoxLayout	*l8 = new TQVBoxLayout(0, 0, 0);
 	l4->addLayout(l8);
@@ -951,7 +951,7 @@ void KXmlCommandDlg::setCommand(KXmlCommand *xmlCmd)
 		item->setRenameEnabled(0, true);
 	}
 
-	int	index = m_mimelist.tqfindIndex(xmlCmd->mimeType());
+	int	index = m_mimelist.findIndex(xmlCmd->mimeType());
 	if (index != -1)
 		m_mimetype->setCurrentItem(index);
 	else
@@ -964,7 +964,7 @@ void KXmlCommandDlg::setCommand(KXmlCommand *xmlCmd)
 	for (TQStringList::ConstIterator it=list.begin(); it!=list.end(); ++it)
 	{
 		m_selectedmime->insertItem(*it);
-		delete m_availablemime->tqfindItem(*it, Qt::ExactMatch);
+		delete m_availablemime->findItem(*it, Qt::ExactMatch);
 	}
 }
 
@@ -1025,7 +1025,7 @@ void KXmlCommandDlg::slotRemoveMime()
 
 void KXmlCommandDlg::slotEditCommand()
 {
-	KXmlCommandAdvancedDlg::editCommand(m_cmd, tqparentWidget());
+	KXmlCommandAdvancedDlg::editCommand(m_cmd, parentWidget());
 }
 
 void KXmlCommandDlg::slotAddReq()
diff --git a/kdeprint/management/kxmlcommandselector.cpp b/kdeprint/management/kxmlcommandselector.cpp
index c6eccda28..4e57b3922 100644
--- a/kdeprint/management/kxmlcommandselector.cpp
+++ b/kdeprint/management/kxmlcommandselector.cpp
@@ -137,7 +137,7 @@ void KXmlCommandSelector::loadCommands()
 	}
 	m_cmd->insertStringList(desclist);
 
-	int	index = m_cmdlist.tqfindIndex(thisCmd);
+	int	index = m_cmdlist.findIndex(thisCmd);
 	if (index != -1)
 		m_cmd->setCurrentItem(index);
 	if (m_cmd->currentItem() != -1 && m_cmd->isEnabled())
@@ -156,7 +156,7 @@ TQString KXmlCommandSelector::command() const
 
 void KXmlCommandSelector::setCommand(const TQString& cmd)
 {
-	int	index = m_cmdlist.tqfindIndex(cmd);
+	int	index = m_cmdlist.findIndex(cmd);
 
 	if (m_usefilter)
 		m_usefilter->setChecked(index != -1);
@@ -176,7 +176,7 @@ void KXmlCommandSelector::slotAddCommand()
 	{
 		bool	added(true);
 
-		if (m_cmdlist.tqfindIndex(cmdId) != -1)
+		if (m_cmdlist.findIndex(cmdId) != -1)
 		{
 			if (KMessageBox::warningContinueCancel(
 				this,
@@ -275,7 +275,7 @@ void KXmlCommandSelector::slotHelpCommand()
 {
 	KPopupFrame *pop = new KPopupFrame( m_helpbtn );
 	KActiveLabel *lab = new KActiveLabel( m_help, pop );
-	lab->resize( lab->tqsizeHint() );
+	lab->resize( lab->sizeHint() );
 	pop->setMainWidget( lab );
 	pop->exec( m_helpbtn->mapToGlobal( TQPoint( m_helpbtn->width(), 0 ) ) );
 	pop->close( 0 );
diff --git a/kdeprint/management/networkscanner.cpp b/kdeprint/management/networkscanner.cpp
index 72d2ad68d..41b368ab0 100644
--- a/kdeprint/management/networkscanner.cpp
+++ b/kdeprint/management/networkscanner.cpp
@@ -80,7 +80,7 @@ TQString NetworkScanner::NetworkScannerPrivate::localPrefix()
 	if (infos.count() > 0)
 	{
 		QString	IPstr = infos.first()->address()->nodeName();
-		int	p = IPstr.tqfindRev('.');
+		int	p = IPstr.findRev('.');
 		IPstr.truncate(p);
 		return IPstr;
 	}
@@ -157,7 +157,7 @@ void NetworkScanner::slotScanClicked()
 	if ( !d->scanning )
 	{
 		if ( d->localPrefix() == d->prefixaddress ||
-				KMessageBox::warningContinueCancel( this->tqparentWidget(),
+				KMessageBox::warningContinueCancel( this->parentWidget(),
 					i18n( "You are about to scan a subnet (%1.*) that does not "
 						  "correspond to the current subnet of this computer (%2.*). Do you want "
 						  "to scan the specified subnet anyway?" ).arg( d->prefixaddress ).arg( d->localPrefix() ),
@@ -312,7 +312,7 @@ void NetworkScanner::setPort( int p )
 
 bool NetworkScanner::checkPrinter( const TQString& host, int port )
 {
-	// try first to tqfind it in the SocketInfo list
+	// try first to find it in the SocketInfo list
 	TQPtrListIterator<NetworkScanner::SocketInfo> it( d->printers );
 	for ( ; it.current(); ++it )
 	{
@@ -335,27 +335,27 @@ NetworkScannerConfig::NetworkScannerConfig(NetworkScanner *scanner, const char *
 	QWidget	*dummy = new TQWidget(this);
 	setMainWidget(dummy);
         KIntValidator *val = new KIntValidator( this );
-	QLabel	*tqmasklabel = new TQLabel(i18n("&Subnetwork:"),dummy);
+	QLabel	*masklabel = new TQLabel(i18n("&Subnetwork:"),dummy);
 	QLabel	*portlabel = new TQLabel(i18n("&Port:"),dummy);
 	QLabel	*toutlabel = new TQLabel(i18n("&Timeout (ms):"),dummy);
 	QLineEdit	*mm = new TQLineEdit(dummy);
-	mm->setText(TQString::tqfromLatin1(".[0-255]"));
+	mm->setText(TQString::fromLatin1(".[0-255]"));
 	mm->setReadOnly(true);
 	mm->setFixedWidth(fontMetrics().width(mm->text())+10);
 
-	tqmask_ = new TQLineEdit(dummy);
-	tqmask_->tqsetAlignment(Qt::AlignRight);
+	mask_ = new TQLineEdit(dummy);
+	mask_->setAlignment(Qt::AlignRight);
 	port_ = new TQComboBox(true,dummy);
         if ( port_->lineEdit() )
             port_->lineEdit()->setValidator( val );
 	tout_ = new TQLineEdit(dummy);
         tout_->setValidator( val );
 
-	tqmasklabel->setBuddy(tqmask_);
+	masklabel->setBuddy(mask_);
 	portlabel->setBuddy(port_);
 	toutlabel->setBuddy(tout_);
 
-	tqmask_->setText(scanner_->subnet());
+	mask_->setText(scanner_->subnet());
 	port_->insertItem("631");
 	port_->insertItem("9100");
 	port_->insertItem("9101");
@@ -365,13 +365,13 @@ NetworkScannerConfig::NetworkScannerConfig(NetworkScanner *scanner, const char *
 
 	QGridLayout	*main_ = new TQGridLayout(dummy, 3, 2, 0, 10);
 	QHBoxLayout	*lay1 = new TQHBoxLayout(0, 0, 5);
-	main_->addWidget(tqmasklabel, 0, 0);
+	main_->addWidget(masklabel, 0, 0);
 	main_->addWidget(portlabel, 1, 0);
 	main_->addWidget(toutlabel, 2, 0);
 	main_->addLayout(lay1, 0, 1);
 	main_->addWidget(port_, 1, 1);
 	main_->addWidget(tout_, 2, 1);
-	lay1->addWidget(tqmask_,1);
+	lay1->addWidget(mask_,1);
 	lay1->addWidget(mm,0);
 
 	resize(250,130);
@@ -386,7 +386,7 @@ void NetworkScannerConfig::slotOk()
 {
 	QString	msg;
 	QRegExp	re("(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})");
-	if (!re.exactMatch(tqmask_->text()))
+	if (!re.exactMatch(mask_->text()))
 		msg = i18n("Wrong subnetwork specification.");
 	else
 	{
@@ -412,7 +412,7 @@ void NetworkScannerConfig::slotOk()
 	}
 
 	scanner_->setTimeout( tout_->text().toInt() );
-	scanner_->setSubnet( tqmask_->text() );
+	scanner_->setSubnet( mask_->text() );
 	scanner_->setPort( port_->currentText().toInt() );
 
 	KDialogBase::slotOk();
diff --git a/kdeprint/management/networkscanner.h b/kdeprint/management/networkscanner.h
index 19996c163..462d26427 100644
--- a/kdeprint/management/networkscanner.h
+++ b/kdeprint/management/networkscanner.h
@@ -87,7 +87,7 @@ protected slots:
 	void slotOk();
 
 private:
-	QLineEdit	*tqmask_, *tout_;
+	QLineEdit	*mask_, *tout_;
 	QComboBox	*port_;
 	NetworkScanner *scanner_;
 };
diff --git a/kdeprint/management/sidepixmap.cpp b/kdeprint/management/sidepixmap.cpp
index 696d7b025..99a1e6198 100644
--- a/kdeprint/management/sidepixmap.cpp
+++ b/kdeprint/management/sidepixmap.cpp
@@ -32,7 +32,7 @@ SidePixmap::SidePixmap(TQWidget *parent, const char *name)
 	m_tileup.load(locate("data", "kdeprint/tileup.png"));
 	m_tiledown.load(locate("data", "kdeprint/tiledown.png"));
 
-	tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum));
+	setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum));
 }
 
 bool SidePixmap::isValid()
@@ -42,7 +42,7 @@ bool SidePixmap::isValid()
 			&& (m_side.width() == m_tiledown.width()));
 }
 
-TQSize SidePixmap::tqsizeHint() const
+TQSize SidePixmap::sizeHint() const
 {
 	return (TQSize(m_side.width()+lineWidth(), 300+lineWidth()));
 }
diff --git a/kdeprint/management/sidepixmap.h b/kdeprint/management/sidepixmap.h
index 93324a251..33db2275c 100644
--- a/kdeprint/management/sidepixmap.h
+++ b/kdeprint/management/sidepixmap.h
@@ -29,7 +29,7 @@ class KDEPRINT_EXPORT SidePixmap : public QFrame
 {
 public:
 	SidePixmap(TQWidget *parent = 0, const char *name = 0);
-	TQSize tqsizeHint() const;
+	TQSize sizeHint() const;
 	bool isValid();
 
 protected:
diff --git a/kdeprint/management/smbview.cpp b/kdeprint/management/smbview.cpp
index 104820193..08f8487f7 100644
--- a/kdeprint/management/smbview.cpp
+++ b/kdeprint/management/smbview.cpp
@@ -140,7 +140,7 @@ void SmbView::init()
 		while (!smb_stream.atEnd ())
 		{
 			TQString smb_line = smb_stream.readLine ();
-			if (smb_line.tqcontains (wins_keyword, FALSE) > 0)
+			if (smb_line.contains (wins_keyword, FALSE) > 0)
 			{
 				TQString key = smb_line.section ('=', 0, 0);
 				key = key.stripWhiteSpace();
@@ -216,7 +216,7 @@ void SmbView::processGroups()
 	clear();
 	for (TQStringList::ConstIterator it=grps.begin(); it!=grps.end(); ++it)
 	{
-		int	p = (*it).tqfind("<1d>");
+		int	p = (*it).find("<1d>");
 		if (p == -1)
 			continue;
 		QListViewItem	*item = new TQListViewItem(this,(*it).left(p).stripWhiteSpace());
diff --git a/kdeprint/messagewindow.cpp b/kdeprint/messagewindow.cpp
index 553d78e21..d4c4ae40d 100644
--- a/kdeprint/messagewindow.cpp
+++ b/kdeprint/messagewindow.cpp
@@ -55,13 +55,13 @@ MessageWindow::MessageWindow( const TQString& txt, int delay, TQWidget *parent,
 
 MessageWindow::~MessageWindow()
 {
-	m_windows.remove( tqparentWidget() );
+	m_windows.remove( parentWidget() );
 }
 
 void MessageWindow::slotTimer()
 {
-	TQSize psz = tqparentWidget()->size(), sz = tqsizeHint();
-	move( tqparentWidget()->mapToGlobal( TQPoint( (psz.width()-sz.width())/2, (psz.height()-sz.height())/2 ) ) );
+	TQSize psz = parentWidget()->size(), sz = sizeHint();
+	move( parentWidget()->mapToGlobal( TQPoint( (psz.width()-sz.width())/2, (psz.height()-sz.height())/2 ) ) );
 	if ( !isVisible() )
 	{
 		show();
@@ -85,7 +85,7 @@ void MessageWindow::add( TQWidget *parent, const TQString& txt, int delay )
 		kdWarning( 500 ) << "Cannot add a message window to a null parent" << endl;
 	else
 	{
-		MessageWindow *w = m_windows.tqfind( parent );
+		MessageWindow *w = m_windows.find( parent );
 		if ( w )
 			w->setText( txt );
 		else
@@ -96,14 +96,14 @@ void MessageWindow::add( TQWidget *parent, const TQString& txt, int delay )
 void MessageWindow::remove( TQWidget *parent )
 {
 	if ( parent )
-		delete m_windows.tqfind( parent );
+		delete m_windows.find( parent );
 }
 
 void MessageWindow::change( TQWidget *parent, const TQString& txt )
 {
 	if ( parent )
 	{
-		MessageWindow *w = m_windows.tqfind( parent );
+		MessageWindow *w = m_windows.find( parent );
 		if ( w )
 			w->setText( txt );
 		else
diff --git a/kdeprint/plugincombobox.cpp b/kdeprint/plugincombobox.cpp
index 768ac0fa6..038e9ddbd 100644
--- a/kdeprint/plugincombobox.cpp
+++ b/kdeprint/plugincombobox.cpp
@@ -44,7 +44,7 @@ PluginComboBox::PluginComboBox(TQWidget *parent, const char *name)
         TQWhatsThis::add(m_combo, whatsThisCurrentPrintsystem);
 	QLabel	*m_label = new TQLabel(i18n("Print s&ystem currently used:"), this);
         TQWhatsThis::add(m_label, whatsThisCurrentPrintsystem);
-	m_label->tqsetAlignment(AlignVCenter|AlignRight);
+	m_label->setAlignment(AlignVCenter|AlignRight);
 	m_label->setBuddy(m_combo);
 	m_plugininfo = new TQLabel("Plugin information", this);
 	QGridLayout	*l0 = new TQGridLayout(this, 2, 2, 0, 5);
@@ -81,7 +81,7 @@ void PluginComboBox::reload()
 {
 	QString	syst = KMFactory::self()->printSystem();
 	int	index(-1);
-	if ((index=m_pluginlist.tqfindIndex(syst)) != -1)
+	if ((index=m_pluginlist.findIndex(syst)) != -1)
 		m_combo->setCurrentItem(index);
 	configChanged();
 }
diff --git a/kdeprint/posterpreview.cpp b/kdeprint/posterpreview.cpp
index 608431b15..fbdfe5200 100644
--- a/kdeprint/posterpreview.cpp
+++ b/kdeprint/posterpreview.cpp
@@ -106,7 +106,7 @@ void PosterPreview::drawContents( TQPainter *painter )
 	TQPixmap pix( width(), height() );
 	TQPainter *p = new TQPainter( &pix );
 
-	p->fillRect( 0, 0, width(), height(), tqcolorGroup().background() );
+	p->fillRect( 0, 0, width(), height(), colorGroup().background() );
 
 	if ( isEnabled() )
 	{
@@ -120,7 +120,7 @@ void PosterPreview::drawContents( TQPainter *painter )
 			int x = ( width()-richtext.widthUsed() )/2, y = ( height()-richtext.height() )/2;
 			x = QMAX( x, 0 );
 			y = QMAX( y, 0 );
-			richtext.draw( p, x, y, TQRect( x, y, richtext.widthUsed(), richtext.height() ), tqcolorGroup() );
+			richtext.draw( p, x, y, TQRect( x, y, richtext.widthUsed(), richtext.height() ), colorGroup() );
 			m_boundingrect = TQRect();
 		}
 		else
@@ -139,7 +139,7 @@ void PosterPreview::drawContents( TQPainter *painter )
 			{
 				for ( int j=0; j<m_cols; j++, x+=m_pw )
 				{
-					bool selected = ( m_selectedpages.tqfind( i*m_cols+j+1 ) != m_selectedpages.end() );
+					bool selected = ( m_selectedpages.find( i*m_cols+j+1 ) != m_selectedpages.end() );
 					p->fillRect( x+1, y+1, m_pw-2, m_ph-2, ( selected ? KGlobalSettings::highlightColor() : white ) );
 					p->drawRect( x, y, m_pw, m_ph );
 					if ( pw > 0 && ph > 0 )
@@ -169,7 +169,7 @@ void PosterPreview::mouseMoveEvent( TQMouseEvent *e )
 {
 	if ( m_boundingrect.isValid() )
 	{
-		if ( m_boundingrect.tqcontains( e->pos() ) )
+		if ( m_boundingrect.contains( e->pos() ) )
 			setCursor( KCursor::handCursor() );
 		else
 			setCursor( KCursor::arrowCursor() );
@@ -180,14 +180,14 @@ void PosterPreview::mousePressEvent( TQMouseEvent *e )
 {
 	if ( e->button() == Qt::LeftButton && m_boundingrect.isValid() )
 	{
-		if ( m_boundingrect.tqcontains( e->pos() ) )
+		if ( m_boundingrect.contains( e->pos() ) )
 		{
 			int c, r;
 			c = ( e->pos().x()-m_boundingrect.x() )/( m_boundingrect.width()/m_cols ) + 1;
 			r = m_rows - ( e->pos().y()-m_boundingrect.y() )/( m_boundingrect.height()/m_rows );
 			int pagenum = ( r-1 )*m_cols+c;
 
-			if ( m_selectedpages.tqfind( pagenum ) == m_selectedpages.end() ||
+			if ( m_selectedpages.find( pagenum ) == m_selectedpages.end() ||
 					!( e->state() & Qt::ShiftButton ) )
 			{
 				if ( !( e->state() & Qt::ShiftButton ) )
@@ -267,7 +267,7 @@ void PosterPreview::setSelectedPages( const TQString& s )
 	for ( TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it )
 	{
 		int p;
-		if ( ( p = ( *it ).tqfind( '-' ) ) == -1 )
+		if ( ( p = ( *it ).find( '-' ) ) == -1 )
 			m_selectedpages.append( ( *it ).toInt() );
 		else
 		{
diff --git a/kdeprint/ppdloader.cpp b/kdeprint/ppdloader.cpp
index c6ef9154b..9fbecc774 100644
--- a/kdeprint/ppdloader.cpp
+++ b/kdeprint/ppdloader.cpp
@@ -78,7 +78,7 @@ static TQValueList<float> splitNumberString( const TQString& _s )
 	int p1 = 1, p2 = 0;
 	while ( true )
 	{
-		p2 = s.tqfind( ' ', p1 );
+		p2 = s.find( ' ', p1 );
 		if ( p2 != -1 )
 		{
 			l.append( s.mid( p1, p2-p1 ).toFloat() );
@@ -215,12 +215,12 @@ bool PPDLoader::endUi( const TQString& name )
 			{
 				// we don't have any group defined, create the
 				// most adapted one.
-				grp = tqfindOrCreateGroupForOption( m_option->name() );
+				grp = findOrCreateGroupForOption( m_option->name() );
 			}
 			else
 				grp = m_groups.top();
 			grp->addOption( m_option );
-			if ( grp->get( "text" ).tqcontains( "install", false ) )
+			if ( grp->get( "text" ).contains( "install", false ) )
 				m_option->set( "fixed", "1" );
 		}
 		m_option = 0;
@@ -402,7 +402,7 @@ bool PPDLoader::putFooProcessedData( const TQVariant& var )
 				o->setValueText( o->get( "default" ) );
 
 				DrGroup *grp = 0;
-				DrBase *old = m_groups.top()->tqfindOption( o->name(), &grp );
+				DrBase *old = m_groups.top()->findOption( o->name(), &grp );
 				if ( old )
 				{
 					if ( old->type() == DrBase::List )
@@ -431,7 +431,7 @@ bool PPDLoader::putPaperDimension( const TQString& name, const TQString& s )
 {
 	TQValueList<float> l = splitNumberString( s );
 
-	PS_private *ps = m_ps.tqfind( name );
+	PS_private *ps = m_ps.find( name );
 	if ( !ps )
 	{
 		ps = new PS_private;
@@ -448,7 +448,7 @@ bool PPDLoader::putImageableArea( const TQString& name, const TQString& s )
 {
 	TQValueList<float> l = splitNumberString( s );
 
-	PS_private *ps = m_ps.tqfind( name );
+	PS_private *ps = m_ps.find( name );
 	if ( !ps )
 	{
 		ps = new PS_private;
@@ -463,7 +463,7 @@ bool PPDLoader::putImageableArea( const TQString& name, const TQString& s )
 	return true;
 }
 
-DrGroup* PPDLoader::tqfindOrCreateGroupForOption( const TQString& optname )
+DrGroup* PPDLoader::findOrCreateGroupForOption( const TQString& optname )
 {
 	TQString grpname;
 	if ( optname == "PageSize" ||
diff --git a/kdeprint/ppdloader.h b/kdeprint/ppdloader.h
index 9d33ac9c6..703303fe8 100644
--- a/kdeprint/ppdloader.h
+++ b/kdeprint/ppdloader.h
@@ -67,7 +67,7 @@ private:
 	TQString               m_errormsg;
 
 	friend int kdeprint_ppdparse(void*);
-	DrGroup* tqfindOrCreateGroupForOption( const TQString& );
+	DrGroup* findOrCreateGroupForOption( const TQString& );
 	void processPageSizes( DrMain* );
 };
 
diff --git a/kdeprint/ppdscanner.cpp b/kdeprint/ppdscanner.cpp
index 4f94eb186..1b138a491 100644
--- a/kdeprint/ppdscanner.cpp
+++ b/kdeprint/ppdscanner.cpp
@@ -788,7 +788,7 @@ yy_match:
 			}
 		while ( yy_base[yy_current_state] != 303 );
 
-yy_tqfind_action:
+yy_find_action:
 		yy_act = yy_accept[yy_current_state];
 		if ( yy_act == 0 )
 			{ /* have to back up */
@@ -810,7 +810,7 @@ do_action:	/* This label is used only to access EOF actions. */
 			*yy_cp = yy_hold_char;
 			yy_cp = yy_last_accepting_cpos;
 			yy_current_state = yy_last_accepting_state;
-			goto yy_tqfind_action;
+			goto yy_find_action;
 
 case 1:
 #line 65 "./ppdscanner.l"
@@ -933,7 +933,7 @@ YY_RULE_SETUP
 case 24:
 YY_RULE_SETUP
 #line 100 "./ppdscanner.l"
-{ yylval = yytext; kdeprint_ppdscanner_lno += yylval[0].tqcontains('\n'); QDEBUG1("Quoted value: %s",yytext); return QUOTED; }
+{ yylval = yytext; kdeprint_ppdscanner_lno += yylval[0].contains('\n'); QDEBUG1("Quoted value: %s",yytext); return QUOTED; }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
@@ -1079,7 +1079,7 @@ case YY_STATE_EOF(constr):
 			else
 				{
 				yy_cp = yy_c_buf_p;
-				goto yy_tqfind_action;
+				goto yy_find_action;
 				}
 			}
 
@@ -1132,7 +1132,7 @@ case YY_STATE_EOF(constr):
 
 				yy_cp = yy_c_buf_p;
 				yy_bp = yytext_ptr + YY_MORE_ADJ;
-				goto yy_tqfind_action;
+				goto yy_find_action;
 			}
 		break;
 		}
diff --git a/kdeprint/ppdscanner.l b/kdeprint/ppdscanner.l
index 079e34c1d..b71edcd89 100644
--- a/kdeprint/ppdscanner.l
+++ b/kdeprint/ppdscanner.l
@@ -97,7 +97,7 @@ L        [[:alnum:]]
 	/**
 	 * Value state
 	 */
-<value>\"[^\"]*\"    { yylval = yytext; kdeprint_ppdscanner_lno += yylval[0].tqcontains('\n'); QDEBUG1("Quoted value: %s",yytext); return QUOTED; }
+<value>\"[^\"]*\"    { yylval = yytext; kdeprint_ppdscanner_lno += yylval[0].contains('\n'); QDEBUG1("Quoted value: %s",yytext); return QUOTED; }
 <value>{WORD}        { yylval = yytext; QDEBUG1("String part: %s",yytext); return STRINGPART; }
 <value>"/"           { BEGIN(translation_2); return '/'; }
 <value>"\n"          { kdeprint_ppdscanner_lno++; BEGIN(INITIAL); }
diff --git a/kdeprint/printerfilter.cpp b/kdeprint/printerfilter.cpp
index 2590f41a4..a6f02f077 100644
--- a/kdeprint/printerfilter.cpp
+++ b/kdeprint/printerfilter.cpp
@@ -62,7 +62,7 @@ bool PrinterFilter::filter(KMPrinter *prt)
 	if (m_enabled)
 	{
 		if ((!m_locationRe.isEmpty() && m_locationRe.exactMatch(prt->location())) ||
-		    m_printers.tqfind(prt->printerName()) != m_printers.end())
+		    m_printers.find(prt->printerName()) != m_printers.end())
 			return true;
 		else
 			return false;
diff --git a/kdeprint/printerfilter.h b/kdeprint/printerfilter.h
index 4d1798890..7deb9d345 100644
--- a/kdeprint/printerfilter.h
+++ b/kdeprint/printerfilter.h
@@ -26,7 +26,7 @@
 
 class KMPrinter;
 
-class PrinterFilter : TQObject
+class PrinterFilter : QObject
 {
 public:
 	PrinterFilter(TQObject *parent = 0, const char *name = 0);
diff --git a/kdeprint/rlpr/kmproprlpr.cpp b/kdeprint/rlpr/kmproprlpr.cpp
index 46906fd83..3296949a3 100644
--- a/kdeprint/rlpr/kmproprlpr.cpp
+++ b/kdeprint/rlpr/kmproprlpr.cpp
@@ -34,7 +34,7 @@ KMPropRlpr::KMPropRlpr(TQWidget *parent, const char *name)
 	QLabel	*l1 = new TQLabel(i18n("Host:"), this);
 	QLabel	*l2 = new TQLabel(i18n("Queue:"), this);
 
-	// tqlayout
+	// layout
 	QGridLayout	*main_ = new TQGridLayout(this, 3, 2, 10, 7);
 	main_->setColStretch(0,0);
 	main_->setColStretch(1,1);
diff --git a/kdeprint/rlpr/kmproxywidget.cpp b/kdeprint/rlpr/kmproxywidget.cpp
index 49e6f29ee..c6dd59189 100644
--- a/kdeprint/rlpr/kmproxywidget.cpp
+++ b/kdeprint/rlpr/kmproxywidget.cpp
@@ -46,7 +46,7 @@ KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name)
 	m_proxyhost->setEnabled(false);
 	m_proxyport->setEnabled(false);
 
-	QGridLayout	*lay0 = new TQGridLayout(tqlayout(), 3, 2, 10);
+	QGridLayout	*lay0 = new TQGridLayout(layout(), 3, 2, 10);
 	lay0->setColStretch(1,1);
 	lay0->addMultiCellWidget(m_useproxy,0,0,0,1);
 	lay0->addWidget(m_hostlabel,1,0);
diff --git a/kdeprint/rlpr/kmrlprmanager.cpp b/kdeprint/rlpr/kmrlprmanager.cpp
index 3ed7a48cb..f455fd1ff 100644
--- a/kdeprint/rlpr/kmrlprmanager.cpp
+++ b/kdeprint/rlpr/kmrlprmanager.cpp
@@ -59,7 +59,7 @@ bool KMRlprManager::createPrinter(KMPrinter *p)
 
 bool KMRlprManager::removePrinter(KMPrinter *p)
 {
-	if (m_printers.tqfindRef(p) == -1)
+	if (m_printers.findRef(p) == -1)
 		setErrorMsg(i18n("Printer not found."));
 	else
 	{
@@ -116,7 +116,7 @@ void KMRlprManager::loadPrintersConf(const TQString& filename)
 				if (w.count() > 4) printer->setLocation(w[4]);
 			}
 			printer->setState(KMPrinter::Idle);
-			printer->setDevice(TQString::tqfromLatin1("lpd://%1/%2").arg(w[1]).arg(w[2]));
+			printer->setDevice(TQString::fromLatin1("lpd://%1/%2").arg(w[1]).arg(w[2]));
 
 			addPrinter(printer);
 		}
diff --git a/kdeprint/rlpr/kmwrlpr.cpp b/kdeprint/rlpr/kmwrlpr.cpp
index 784fa2fa1..78f483db6 100644
--- a/kdeprint/rlpr/kmwrlpr.cpp
+++ b/kdeprint/rlpr/kmwrlpr.cpp
@@ -32,7 +32,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 
-static TQListViewItem* tqfindChild(TQListViewItem *c, const TQString& txt)
+static TQListViewItem* findChild(TQListViewItem *c, const TQString& txt)
 {
 	QListViewItem	*item(c);
 	while (item)
@@ -53,7 +53,7 @@ KMWRlpr::KMWRlpr(TQWidget *parent, const char *name)
 	m_view = new KListView(this);
 	m_view->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken);
 	m_view->setLineWidth(1);
-	m_view->addColumn(TQString::tqfromLatin1(""));
+	m_view->addColumn(TQString::fromLatin1(""));
 	m_view->header()->hide();
 	m_view->setRootIsDecorated(true);
 	m_view->setSorting(0);
@@ -94,10 +94,10 @@ void KMWRlpr::initPrinter(KMPrinter *p)
 {
 	m_host->setText(p->option("host"));
 	m_queue->setText(p->option("queue"));
-	QListViewItem	*item = tqfindChild(m_view->firstChild(),m_host->text());
+	QListViewItem	*item = findChild(m_view->firstChild(),m_host->text());
 	if (item)
 	{
-		item = tqfindChild(item->firstChild(),m_queue->text());
+		item = findChild(item->firstChild(),m_queue->text());
 		if (item)
 		{
 			item->parent()->setOpen(true);
@@ -109,7 +109,7 @@ void KMWRlpr::initPrinter(KMPrinter *p)
 
 void KMWRlpr::updatePrinter(KMPrinter *p)
 {
-	QString	uri = TQString::tqfromLatin1("lpd://%1/%2").arg(m_host->text()).arg(m_queue->text());
+	QString	uri = TQString::fromLatin1("lpd://%1/%2").arg(m_host->text()).arg(m_queue->text());
 	p->setDevice(uri);
 	p->setOption("host",m_host->text());
 	p->setOption("queue",m_queue->text());
@@ -140,7 +140,7 @@ void KMWRlpr::initialize()
 			line = t.readLine().stripWhiteSpace();
 			if (line.isEmpty())
 				continue;
-			if ((p=line.tqfind(':')) != -1)
+			if ((p=line.find(':')) != -1)
 			{
 				host = line.left(p).stripWhiteSpace();
 				QListViewItem	*hitem = new TQListViewItem(m_view,host);
@@ -180,7 +180,7 @@ void KMWRlpr::initialize()
 			}
 			if (buffer.isEmpty())
 				continue;
-			int	p = buffer.tqfind(':');
+			int	p = buffer.find(':');
 			if (p != -1)
 			{
 				QString	name = buffer.left(p);
diff --git a/kdeprint/rlpr/krlprprinterimpl.cpp b/kdeprint/rlpr/krlprprinterimpl.cpp
index e51908b62..1d4845bde 100644
--- a/kdeprint/rlpr/krlprprinterimpl.cpp
+++ b/kdeprint/rlpr/krlprprinterimpl.cpp
@@ -40,7 +40,7 @@ KRlprPrinterImpl::~KRlprPrinterImpl()
 bool KRlprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
 {
 	// retrieve the KMPrinter object, to get host and queue name
-	KMPrinter	*rpr = KMFactory::self()->manager()->tqfindPrinter(printer->printerName());
+	KMPrinter	*rpr = KMFactory::self()->manager()->findPrinter(printer->printerName());
 	if (!rpr)
 		return false;
 
@@ -54,7 +54,7 @@ bool KRlprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
 			return false;
 		}
 
-		cmd = TQString::tqfromLatin1("%1 -H %2 -P %3 -\\#%4").arg(exestr).arg(quote(host)).arg(quote(queue)).arg(printer->numCopies());
+		cmd = TQString::fromLatin1("%1 -H %2 -P %3 -\\#%4").arg(exestr).arg(quote(host)).arg(quote(queue)).arg(printer->numCopies());
 
 		// proxy settings
 		KConfig	*conf = KMFactory::self()->printConfig();
diff --git a/kdeprint/signal_proc.c b/kdeprint/signal_proc.c
index 432f7d155..40fac6049 100644
--- a/kdeprint/signal_proc.c
+++ b/kdeprint/signal_proc.c
@@ -21,7 +21,7 @@ void commandFromPid(int pid, char *name)
 	name[i] = 0;
 }
 
-int tqfindPid(const char *progname)
+int findPid(const char *progname)
 {
 	char	name[256];
 	DIR	*dir;
@@ -89,7 +89,7 @@ int main(int argc, char **argv)
 		return -1;
 	}
 
-	pid = tqfindPid(progname);
+	pid = findPid(progname);
 	if (pid == -1)
 	{
 		fprintf(stderr, "no such program: %s\n", progname);
diff --git a/kdeprint/testprint.ps b/kdeprint/testprint.ps
index 1a9167ba7..bcebfcb21 100644
--- a/kdeprint/testprint.ps
+++ b/kdeprint/testprint.ps
@@ -110,13 +110,13 @@
 /CUPSLOGO {			% Draw the CUPS logo
 				% height CUPSLOGO
   % Start with a big C...
-  /Helvetica tqfindfont 1 index scalefont setfont
+  /Helvetica findfont 1 index scalefont setfont
   0 setgray
   0 0 moveto
   (C) show
 
   % Then "UNIX Printing System" much smaller...
-  /Helvetica-Bold tqfindfont 1 index 9 div scalefont setfont
+  /Helvetica-Bold findfont 1 index 9 div scalefont setfont
   0.25 mul
   dup dup 2.0 mul moveto
   (UNIX) show
@@ -186,14 +186,14 @@
 
   0 setgray rectstroke
 
-  /Helvetica-BoldOblique tqfindfont 1 index 3 div scalefont setfont
+  /Helvetica-BoldOblique findfont 1 index 3 div scalefont setfont
   dup 40 div
 
   dup 4 mul 1 index 25 mul moveto (E) show
   dup 10 mul 1 index 15 mul moveto (S) show
   dup 16 mul 1 index 5 mul moveto (P) show
 
-  /Helvetica-BoldOblique tqfindfont 2 index 5 div scalefont setfont
+  /Helvetica-BoldOblique findfont 2 index 5 div scalefont setfont
   dup 14 mul 1 index 29 mul moveto (asy) show
   dup 20 mul 1 index 19 mul moveto (oftware) show
   dup 26 mul 1 index 9 mul moveto (roducts) show
@@ -231,13 +231,13 @@ gsave
   ifelse def
 
   % Create fonts...
-  /bigFont /Helvetica-Bold tqfindfont	% bigFont = Helvetica-Bold
+  /bigFont /Helvetica-Bold findfont	% bigFont = Helvetica-Bold
   pageHeight 3 mul scalefont def	% size = pageHeight * 3 (nominally 33)
 
-  /mediumFont /Helvetica tqfindfont	% mediumFont = Helvetica
+  /mediumFont /Helvetica findfont	% mediumFont = Helvetica
   pageHeight 1.5 mul scalefont def	% size = pageHeight * 1.5 (nominally 16.5)
 
-  /smallFont /Times-Roman tqfindfont	% smallFont = Times-Roman
+  /smallFont /Times-Roman findfont	% smallFont = Times-Roman
   pageHeight scalefont def		% size = pageHeight (nominally 11)
 
   % Offset page to account for lower-left margin...
diff --git a/kdeprint/tests/drawdemo.cpp b/kdeprint/tests/drawdemo.cpp
index 20fc3d12e..443cc89e8 100644
--- a/kdeprint/tests/drawdemo.cpp
+++ b/kdeprint/tests/drawdemo.cpp
@@ -78,7 +78,7 @@ void drawFonts( TQPainter *p )
 
 
 //
-// This function draws some tqshapes
+// This function draws some shapes
 //
 
 void drawShapes( TQPainter *p )
@@ -115,7 +115,7 @@ struct DrawThing {
 DrawThing ourDrawFunctions[] = {
     { drawColorWheel,	"Draw color wheel" },
     { drawFonts,	"Draw fonts" },
-    { drawShapes,	"Draw tqshapes" },
+    { drawShapes,	"Draw shapes" },
     { 0,		0 } };
 
 
diff --git a/kdeprint/tests/helpwindow.cpp b/kdeprint/tests/helpwindow.cpp
index f4c76555a..c2cdb1b22 100644
--- a/kdeprint/tests/helpwindow.cpp
+++ b/kdeprint/tests/helpwindow.cpp
@@ -67,7 +67,7 @@ HelpWindow::HelpWindow( const TQString& home_, const TQString& _path,
     file->insertItem( "&Print", this, TQT_SLOT( print() ), ALT | Key_P );
     file->insertSeparator();
     file->insertItem( "&Close", this, TQT_SLOT( close() ), ALT | Key_Q );
-    file->insertItem( "E&xit", tqApp, TQT_SLOT( closeAllWindows() ), ALT | Key_X );
+    file->insertItem( "E&xit", qApp, TQT_SLOT( closeAllWindows() ), ALT | Key_X );
 
     // The same three icons are used twice each.
     TQIconSet icon_back( TQPixmap("back.xpm") );
@@ -278,7 +278,7 @@ void HelpWindow::print()
 	TQRect view( body );
 	int page = 1;
 	do {
-	    richText.draw( &p, body.left(), body.top(), view, tqcolorGroup() );
+	    richText.draw( &p, body.left(), body.top(), view, colorGroup() );
 	    view.moveBy( 0, body.height() );
 	    p.translate( 0 , -body.height() );
 	    p.setFont( font );
@@ -333,13 +333,13 @@ void HelpWindow::readBookmarks()
 
 void HelpWindow::histChosen( int i )
 {
-    if ( mHistory.tqcontains( i ) )
+    if ( mHistory.contains( i ) )
 	browser->setSource( mHistory[ i ] );
 }
 
 void HelpWindow::bookmChosen( int i )
 {
-    if ( mBookmarks.tqcontains( i ) )
+    if ( mBookmarks.contains( i ) )
 	browser->setSource( mBookmarks[ i ] );
 }
 
diff --git a/kdeprint/tests/richpage.cpp b/kdeprint/tests/richpage.cpp
index 38569c1a3..f12040b71 100644
--- a/kdeprint/tests/richpage.cpp
+++ b/kdeprint/tests/richpage.cpp
@@ -23,7 +23,7 @@ RichPage::RichPage(TQWidget *parent, const char *name)
 	QFontDatabase	db;
 	QStringList	fonts = db.families();
 	fontname_->insertStringList(fonts);
-	fontname_->setCurrentItem(fonts.tqfindIndex(TQString::tqfromLatin1("times")));
+	fontname_->setCurrentItem(fonts.findIndex(TQString::fromLatin1("times")));
 	if (fontname_->currentItem() < 0) fontname_->setCurrentItem(0);
 
 	QLabel	*l1 = new TQLabel("Margin:",this);
diff --git a/kdeprint/tools/escputil/escpwidget.cpp b/kdeprint/tools/escputil/escpwidget.cpp
index 4a65a380d..ef0e2390b 100644
--- a/kdeprint/tools/escputil/escpwidget.cpp
+++ b/kdeprint/tools/escputil/escpwidget.cpp
@@ -97,20 +97,20 @@ EscpWidget::EscpWidget(TQWidget *parent, const char *name)
 	connect(identbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked()));
 
 	QLabel	*printerlab = new TQLabel(i18n("Printer:"), this);
-	printerlab->tqsetAlignment(AlignRight|AlignVCenter);
+	printerlab->setAlignment(AlignRight|AlignVCenter);
 	QLabel	*devicelab = new TQLabel(i18n("Device:"), this);
-	devicelab->tqsetAlignment(AlignRight|AlignVCenter);
+	devicelab->setAlignment(AlignRight|AlignVCenter);
 	QLabel	*cleanlab = new TQLabel(i18n("Clea&n print head"), this);
 	QLabel	*nozzlelab = new TQLabel(i18n("&Print a nozzle test pattern"), this);
 	QLabel	*alignlab = new TQLabel(i18n("&Align print head"), this);
 	QLabel	*inklab = new TQLabel(i18n("&Ink level"), this);
 	QLabel	*identlab = new TQLabel(i18n("P&rinter identification"), this);
 
-	cleanlab->tqsetAlignment(AlignLeft|AlignVCenter|ShowPrefix);
-	nozzlelab->tqsetAlignment(AlignLeft|AlignVCenter|ShowPrefix);
-	alignlab->tqsetAlignment(AlignLeft|AlignVCenter|ShowPrefix);
-	inklab->tqsetAlignment(AlignLeft|AlignVCenter|ShowPrefix);
-	identlab->tqsetAlignment(AlignLeft|AlignVCenter|ShowPrefix);
+	cleanlab->setAlignment(AlignLeft|AlignVCenter|ShowPrefix);
+	nozzlelab->setAlignment(AlignLeft|AlignVCenter|ShowPrefix);
+	alignlab->setAlignment(AlignLeft|AlignVCenter|ShowPrefix);
+	inklab->setAlignment(AlignLeft|AlignVCenter|ShowPrefix);
+	identlab->setAlignment(AlignLeft|AlignVCenter|ShowPrefix);
 
 	cleanbtn->setAccel(TQAccel::shortcutKey(cleanlab->text()));
 	nozzlebtn->setAccel(TQAccel::shortcutKey(nozzlelab->text()));
diff --git a/kdeprint/treecombobox.cpp b/kdeprint/treecombobox.cpp
index e41a028f1..1e4f1b694 100644
--- a/kdeprint/treecombobox.cpp
+++ b/kdeprint/treecombobox.cpp
@@ -44,7 +44,7 @@ TreeListBoxItem::TreeListBoxItem(TQListBox *lb, const TQPixmap& pix, const TQStr
 	else
 	{
 		QString	parentStr = txt.left(txt.length()-m_path[m_depth].length()-1);
-		TreeListBoxItem	*parentItem = static_cast<TreeListBoxItem*>(lb->tqfindItem(parentStr, Qt::ExactMatch));
+		TreeListBoxItem	*parentItem = static_cast<TreeListBoxItem*>(lb->findItem(parentStr, Qt::ExactMatch));
 		if (!parentItem)
 		{
 			// parent not found, add parent first into QListBox
@@ -102,7 +102,7 @@ void TreeListBoxItem::paint(TQPainter *p)
 	if (m_depth > 0)
 	{
 		QPen	oldPen = p->pen();
-		p->setPen(listBox()->tqcolorGroup().mid());
+		p->setPen(listBox()->colorGroup().mid());
 
 		TreeListBoxItem	*item = this;
 		int	s = xo-stepSize()/2;
diff --git a/kdeprint/util.cpp b/kdeprint/util.cpp
index 343f52d45..d95ca2c0c 100644
--- a/kdeprint/util.cpp
+++ b/kdeprint/util.cpp
@@ -44,11 +44,11 @@ KURL smbToUrl(const TQString& s)
 {
 	// allow to handle non-encoded chars in login/password
 	KURL	url;
-	int	p = s.tqfind('@');
+	int	p = s.find('@');
 	if (p == -1)
 	{
 		// assumes url starts with "smb://". Use encoding in
-		// case the printer name tqcontains chars like '#'.
+		// case the printer name contains chars like '#'.
 		url = KURL("smb://" + KURL::encode_string(s.mid(6)));
 	}
 	else
@@ -56,7 +56,7 @@ KURL smbToUrl(const TQString& s)
 		// assumes URL starts with "smb://"
 		QString	username = s.mid(6, p-6);
 		url = KURL("smb://" + KURL::encode_string(s.mid(p+1)));
-		int	q = username.tqfind(':');
+		int	q = username.find(':');
 		if (q == -1)
 			url.setUser(username);
 		else
@@ -68,7 +68,7 @@ KURL smbToUrl(const TQString& s)
 	return url;
 }
 
-int tqfindIndex(int ID)
+int findIndex(int ID)
 {
 	for (int i=0; i<KPrinter::NPageSize-1; i++)
 		if (page_sizes[i].ID == ID)
@@ -99,14 +99,14 @@ bool splitSmbURI( const TQString& uri, TQString& work, TQString& server, TQStrin
 		return false;
 	p = 6;
 
-	int p1 = uri.tqfind( '/', p );
+	int p1 = uri.find( '/', p );
 	if ( p1 != -1 )
 	{
-		int p2 = uri.tqfind( '@', p );
+		int p2 = uri.find( '@', p );
 		if ( p2 != -1 && p2 < p1 )
 		{
 			// Got a user
-			int p3 = uri.tqfind( ':', p );
+			int p3 = uri.find( ':', p );
 			if ( p3 != -1 && p3 < p2 )
 			{
 				// Got a password
diff --git a/kdeprint/util.h b/kdeprint/util.h
index 716e16ce5..d51f248cf 100644
--- a/kdeprint/util.h
+++ b/kdeprint/util.h
@@ -71,6 +71,6 @@ static const struct pagesizestruct
 	{ I18N_NOOP("US Legal"), KPrinter::Legal },
 	{ I18N_NOOP("US Letter"), KPrinter::Letter }
 };
-int tqfindIndex(int ID);
+int findIndex(int ID);
 
 #endif
diff --git a/kdesu/client.cpp b/kdesu/client.cpp
index 30d6cf3e3..5261886fc 100644
--- a/kdesu/client.cpp
+++ b/kdesu/client.cpp
@@ -59,7 +59,7 @@ KDEsuClient::KDEsuClient()
     }
 
     // strip the screen number from the display
-    display.tqreplace(TQRegExp("\\.[0-9]+$"), "");
+    display.replace(TQRegExp("\\.[0-9]+$"), "");
 #else
     TQCString display("QWS");
 #endif
@@ -169,13 +169,13 @@ TQCString KDEsuClient::escape(const TQCString &str)
 {
     TQCString copy = str;
     int n = 0;
-    while ((n = copy.tqfind("\\", n)) != -1)
+    while ((n = copy.find("\\", n)) != -1)
     {
         copy.insert(n, '\\');
         n += 2;
     }
     n = 0;
-    while ((n = copy.tqfind("\"", n)) != -1)
+    while ((n = copy.find("\"", n)) != -1)
     {
         copy.insert(n, '\\');
         n += 2;
@@ -313,7 +313,7 @@ TQValueList<TQCString> KDEsuClient::getKeys(const TQCString &group)
         // kdDebug(900) << "Found a matching entry: " << reply << endl;
         while (1)
         {
-            pos = reply.tqfind( '\007', index );
+            pos = reply.find( '\007', index );
             if( pos == -1 )
             {
                 if( index == 0 )
@@ -332,7 +332,7 @@ TQValueList<TQCString> KDEsuClient::getKeys(const TQCString &group)
     return list;
 }
 
-bool KDEsuClient::tqfindGroup(const TQCString &group)
+bool KDEsuClient::findGroup(const TQCString &group)
 {
     TQCString cmd = "CHKG ";
     cmd += escape(group);
@@ -385,7 +385,7 @@ int KDEsuClient::stopServer()
     return command("STOP\n");
 }
 
-static TQString tqfindDaemon()
+static TQString findDaemon()
 {
     TQString daemon = locate("bin", "kdesud");
     if (daemon.isEmpty()) // if not in KDEDIRS, rely on PATH
@@ -401,7 +401,7 @@ static TQString tqfindDaemon()
 bool KDEsuClient::isServerSGID()
 {
     if (d->daemon.isEmpty())
-       d->daemon = tqfindDaemon();
+       d->daemon = findDaemon();
     if (d->daemon.isEmpty())
        return false;
    
@@ -417,7 +417,7 @@ bool KDEsuClient::isServerSGID()
 int KDEsuClient::startServer()
 {
     if (d->daemon.isEmpty())
-       d->daemon = tqfindDaemon();
+       d->daemon = findDaemon();
     if (d->daemon.isEmpty())
        return -1;
 
diff --git a/kdesu/client.h b/kdesu/client.h
index a75e56331..c1df06ff1 100644
--- a/kdesu/client.h
+++ b/kdesu/client.h
@@ -134,7 +134,7 @@ public:
      * @param group the group key
      * @return true if the group is found
      */
-    bool tqfindGroup(const TQCString &group);
+    bool findGroup(const TQCString &group);
 
     /**
      * Delete a persistent variable.
diff --git a/kdesu/kcookie.cpp b/kdesu/kcookie.cpp
index 60ddcfe3e..f60ec7314 100644
--- a/kdesu/kcookie.cpp
+++ b/kdesu/kcookie.cpp
@@ -54,7 +54,7 @@ QCStringList KCookie::split(const TQCString &line, char ch)
     QCStringList result;
 
     int i=0, pos;
-    while ((pos = line.tqfind(ch, i)) != -1) 
+    while ((pos = line.find(ch, i)) != -1) 
     {
 	result += line.mid(i, pos-i);
 	i = pos+1;
diff --git a/kdesu/kdesu_pty.cpp b/kdesu/kdesu_pty.cpp
index 3ab39e4f7..8f48f0b88 100644
--- a/kdesu/kdesu_pty.cpp
+++ b/kdesu/kdesu_pty.cpp
@@ -5,7 +5,7 @@
  * This file is part of the KDE project, module kdesu.
  * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
  *
- * This file tqcontains code from TEShell.C of the KDE konsole.
+ * This file contains code from TEShell.C of the KDE konsole.
  * Copyright (c) 1997,1998 by Lars Doelle <lars.doelle@on-line.de>
  *
  * This is free software; you can use this library under the GNU Library
diff --git a/kdesu/process.cpp b/kdesu/process.cpp
index 9f23f36fd..06558ce04 100644
--- a/kdesu/process.cpp
+++ b/kdesu/process.cpp
@@ -5,7 +5,7 @@
  * This file is part of the KDE project, module kdesu.
  * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
  * 
- * This file tqcontains code from TEShell.C of the KDE konsole. 
+ * This file contains code from TEShell.C of the KDE konsole. 
  * Copyright (c) 1997,1998 by Lars Doelle <lars.doelle@on-line.de> 
  *
  * This is free software; you can use this library under the GNU Library 
@@ -179,7 +179,7 @@ TQCString PtyProcess::readLine(bool block)
 
     if (!m_Inbuf.isEmpty()) 
     {
-        pos = m_Inbuf.tqfind('\n');
+        pos = m_Inbuf.find('\n');
         if (pos == -1) 
         {
             ret = m_Inbuf;
@@ -228,7 +228,7 @@ TQCString PtyProcess::readLine(bool block)
         buf[nbytes] = '\000';
         m_Inbuf += buf;
 
-        pos = m_Inbuf.tqfind('\n');
+        pos = m_Inbuf.find('\n');
         if (pos == -1) 
         {
             ret = m_Inbuf;
@@ -371,7 +371,7 @@ int PtyProcess::exec(const TQCString &command, const QCStringList &args)
     // From now on, terminal output goes through the tty.
 
     TQCString path;
-    if (command.tqcontains('/'))
+    if (command.contains('/'))
         path = command;
     else 
     {
@@ -513,7 +513,7 @@ int PtyProcess::waitForChild()
                 if (!m_Exit.isEmpty())
                 {
                     // match exit string only at line starts
-                    int pos = output.tqfind(m_Exit);
+                    int pos = output.find(m_Exit);
                     if ((pos >= 0) && ((pos == 0 && lineStart) || (output.at (pos - 1) == '\n')))
                     {
                         kill(m_Pid, SIGTERM);
diff --git a/kdesu/process.h b/kdesu/process.h
index 536cb1f4a..c45132a9c 100644
--- a/kdesu/process.h
+++ b/kdesu/process.h
@@ -159,7 +159,7 @@ public: /* static */
     ** (which may be zero).
     ** If child @p has not exited, return -2.
     */
-    enum checkPidtqStatus { Error=-1, NotExited=-2, Killed=-3 } ;
+    enum checkPidStatus { Error=-1, NotExited=-2, Killed=-3 } ;
     static int checkPidExited(pid_t pid);
 
 
diff --git a/kdesu/ssh.cpp b/kdesu/ssh.cpp
index 03051b826..d39634ac5 100644
--- a/kdesu/ssh.cpp
+++ b/kdesu/ssh.cpp
@@ -156,12 +156,12 @@ TQCString SshProcess::dcopForward()
     if (srv.isEmpty())
         return result;
 
-    int i = srv.tqfind('/');
+    int i = srv.find('/');
     if (i == -1)
         return result;
     if (srv.left(i) != "tcp")
         return result;
-    int j = srv.tqfind(':', ++i);
+    int j = srv.find(':', ++i);
     if (j == -1)
         return result;
     TQCString host = srv.mid(i, j-i);
diff --git a/kdesu/stub.cpp b/kdesu/stub.cpp
index c7f39c4a8..2af171d72 100644
--- a/kdesu/stub.cpp
+++ b/kdesu/stub.cpp
@@ -145,7 +145,7 @@ int StubProcess::ConverseStub(int check)
 		 it != env.end();
 		 ++it )
 	    {
-		if( (*it).tqfind( "DESKTOP_STARTUP_ID=" ) == 0 )
+		if( (*it).find( "DESKTOP_STARTUP_ID=" ) == 0 )
 		    tmp = (*it).mid( strlen( "DESKTOP_STARTUP_ID=" ));
 	    }
 	    if( tmp.isEmpty())
diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt
index 7597b0f69..4003f02a5 100644
--- a/kdeui/CMakeLists.txt
+++ b/kdeui/CMakeLists.txt
@@ -150,7 +150,7 @@ set( ${target}_SRCS
   ktoolbarlabelaction.cpp
 )
 
-tde_add_library( ${target} SHARED AUTOTQMOC
+tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 4.2.0
   LINK kdecore-shared ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES}
diff --git a/kdeui/Mainpage.dox b/kdeui/Mainpage.dox
index 1961e82ed..bf6f6596d 100644
--- a/kdeui/Mainpage.dox
+++ b/kdeui/Mainpage.dox
@@ -35,7 +35,7 @@
 * KSpell usually works asynchronously. If you do not need that, you should
 * simply use KSpell::modalCheck(). It won't return until the
 * passed string is processed or the spell checking canceled.
-* During modal spell checking your GUI is still tqrepainted, but the user may
+* During modal spell checking your GUI is still repainted, but the user may
 * only interact with the KSpell dialog.
 *
 * @see KSpell, KSpellConfig
diff --git a/kdeui/TODO.kspell b/kdeui/TODO.kspell
index f68e156d3..99c9df408 100644
--- a/kdeui/TODO.kspell
+++ b/kdeui/TODO.kspell
@@ -22,10 +22,10 @@ old todo from David Sweet
 
 properly handle capitalization on "Replace All" (in parseOneResponse())
 
-ensure that KSpell is reusable with the same tqreplace/ignore lists
+ensure that KSpell is reusable with the same replace/ignore lists
  for multiple spellchecks in a single editing session
 
-allow saving of ignore/tqreplace lists for multiple spellchecks of a
+allow saving of ignore/replace lists for multiple spellchecks of a
   given document across multiple sessions
 
 add a "move()" function to move the dialog box (calling app should use this
diff --git a/kdeui/TODO.xmlgui b/kdeui/TODO.xmlgui
index dd41a785a..3c3d4f8a4 100644
--- a/kdeui/TODO.xmlgui
+++ b/kdeui/TODO.xmlgui
@@ -41,7 +41,7 @@ So ui_standards.rc needs to be turned into <MergeAction>s and <MergeGroup>s only
 like separators and tearoffhandle etc.) in a container, in which case it should
 not appear in the GUI. For that, ContainerNode must be improved so that it supports
 having no real GUI container attached to it.
-Big problem here. This means not building a container until we tqfind that it
+Big problem here. This means not building a container until we find that it
 really has an action (and the other way round: deleting a container when
 removing its last action, as we do, but still keeping a ContainerNode around...)
 (A ContainerNode is destroyed when its owner guiclient is removed from the factory,
diff --git a/kdeui/colors/rgb.txt b/kdeui/colors/rgb.txt
index 44abf9730..62eb8961e 100644
--- a/kdeui/colors/rgb.txt
+++ b/kdeui/colors/rgb.txt
@@ -21,7 +21,7 @@
 255 218 185		PeachPuff
 255 222 173		navajo white
 255 222 173		NavajoWhite
-255 228 181		tqmoccasin
+255 228 181		moccasin
 255 248 220		cornsilk
 255 255 240		ivory
 255 250 205		lemon chiffon
diff --git a/kdeui/kaboutapplication.h b/kdeui/kaboutapplication.h
index fc545bc7f..d8356ce66 100644
--- a/kdeui/kaboutapplication.h
+++ b/kdeui/kaboutapplication.h
@@ -79,7 +79,7 @@ class KDEUI_EXPORT KAboutApplication : public KAboutDialog
     KAboutApplication( const KAboutData *aboutData, TQWidget *parent=0, const char *name=0, bool modal=true );
 
 /*
- FIXME: The two constructors should be tqreplaced with the following  after the lib freeze:
+ FIXME: The two constructors should be replaced with the following  after the lib freeze:
 
     KAboutApplication( const KAboutData *aboutData=0, TQWidget *parent=0, const char *name=0, bool modal=true );
 
diff --git a/kdeui/kaboutdialog.cpp b/kdeui/kaboutdialog.cpp
index 2ef4caa24..12e610791 100644
--- a/kdeui/kaboutdialog.cpp
+++ b/kdeui/kaboutdialog.cpp
@@ -41,15 +41,15 @@
 #include <kaboutdialog_private.h>
 #include <kdebug.h>
 
-//TQMOC_SKIP_BEGIN
+//MOC_SKIP_BEGIN
 template class TQPtrList<KAboutContributor>;
-//TQMOC_SKIP_END
+//MOC_SKIP_END
 
 #define WORKTEXT_IDENTATION 16
 #define Grid 3
 
 // ##############################################################
-// TQMOC OUTPUT FILES:
+// MOC OUTPUT FILES:
 #include "kaboutdialog.moc"
 #include "kaboutdialog_private.moc"
 // ##############################################################
@@ -58,8 +58,8 @@ class KAboutTabWidget : public QTabWidget
 {
 public:
     KAboutTabWidget( TQWidget* parent ) : TQTabWidget( parent ) {}
-    TQSize tqsizeHint() const {
-	return TQTabWidget::tqsizeHint().expandedTo( tabBar()->tqsizeHint() + TQSize(4,4) );
+    TQSize sizeHint() const {
+	return TQTabWidget::sizeHint().expandedTo( tabBar()->sizeHint() + TQSize(4,4) );
     }
 };
 
@@ -106,7 +106,7 @@ KAboutContributor::KAboutContributor( TQWidget *_parent, const char *wname,
   connect(kurl, TQT_SIGNAL(leftClickedURL(const TQString &)),
 	  TQT_SLOT(urlClickedSlot(const TQString &)));
 
-  mLabel[3]->tqsetAlignment( AlignTop );
+  mLabel[3]->setAlignment( AlignTop );
 
   fontChange( font() );
   updateLayout();
@@ -180,7 +180,7 @@ TQString KAboutContributor::getWork( void ) const
 
 void KAboutContributor::updateLayout( void )
 {
-  delete tqlayout();
+  delete layout();
 
   int row = 0;
   if( !mText[0]->text().isEmpty() ) { ++row; }
@@ -256,7 +256,7 @@ void KAboutContributor::updateLayout( void )
   }
 
   gbox->activate();
-  setMinimumSize( tqsizeHint() );
+  setMinimumSize( sizeHint() );
 }
 
 
@@ -272,9 +272,9 @@ void KAboutContributor::fontChange( const TQFont &/*oldFont*/ )
 }
 
 
-TQSize KAboutContributor::tqsizeHint( void ) const
+TQSize KAboutContributor::sizeHint( void ) const
 {
-  return tqminimumSizeHint();
+  return minimumSizeHint();
 }
 
 
@@ -293,7 +293,7 @@ void KAboutContributor::emailClickedSlot( const TQString &e )
 //
 // Internal widget for the KAboutDialog class.
 //
-KAboutContainerBase::KAboutContainerBase( int tqlayoutType, TQWidget *_parent,
+KAboutContainerBase::KAboutContainerBase( int layoutType, TQWidget *_parent,
 					  char *_name )
   : TQWidget( _parent, _name ),
     mImageLabel(0), mTitleLabel(0), mIconLabel(0),mVersionLabel(0),
@@ -302,24 +302,24 @@ KAboutContainerBase::KAboutContainerBase( int tqlayoutType, TQWidget *_parent,
   mTopLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
   if( !mTopLayout ) { return; }
 
-  if( tqlayoutType & AbtImageOnly )
+  if( layoutType & AbtImageOnly )
   {
-    tqlayoutType &= ~(AbtImageLeft|AbtImageRight|AbtTabbed|AbtPlain);
+    layoutType &= ~(AbtImageLeft|AbtImageRight|AbtTabbed|AbtPlain);
   }
-  if( tqlayoutType & AbtImageLeft )
+  if( layoutType & AbtImageLeft )
   {
-    tqlayoutType &= ~AbtImageRight;
+    layoutType &= ~AbtImageRight;
   }
 
-  if( tqlayoutType & AbtTitle )
+  if( layoutType & AbtTitle )
   {
     mTitleLabel = new TQLabel( this, "title" );
-    mTitleLabel->tqsetAlignment(AlignCenter);
+    mTitleLabel->setAlignment(AlignCenter);
     mTopLayout->addWidget( mTitleLabel );
     mTopLayout->addSpacing( KDialog::spacingHint() );
   }
 
-  if( tqlayoutType & AbtProduct )
+  if( layoutType & AbtProduct )
   {
     TQWidget* const productArea = new  TQWidget( this, "area" );
     mTopLayout->addWidget( productArea, 0, TQApplication::reverseLayout() ? AlignRight : AlignLeft );
@@ -347,7 +347,7 @@ KAboutContainerBase::KAboutContainerBase( int tqlayoutType, TQWidget *_parent,
   if( !hbox ) { return; }
   mTopLayout->addLayout( hbox, 10 );
 
-  if( tqlayoutType & AbtImageLeft )
+  if( layoutType & AbtImageLeft )
   {
     TQVBoxLayout* vbox = new TQVBoxLayout();
     hbox->addLayout(vbox);
@@ -367,13 +367,13 @@ KAboutContainerBase::KAboutContainerBase( int tqlayoutType, TQWidget *_parent,
     vbox->activate();
   }
 
-  if( tqlayoutType & AbtTabbed )
+  if( layoutType & AbtTabbed )
   {
     mPageTab = new KAboutTabWidget( this );
     if( !mPageTab ) { return; }
     hbox->addWidget( mPageTab, 10 );
   }
-  else if( tqlayoutType & AbtImageOnly )
+  else if( layoutType & AbtImageOnly )
   {
     mImageFrame = new TQFrame( this );
     setImageFrame( true );
@@ -398,7 +398,7 @@ KAboutContainerBase::KAboutContainerBase( int tqlayoutType, TQWidget *_parent,
     hbox->addWidget( mPlainSpace, 10 );
   }
 
-  if( tqlayoutType & AbtImageRight )
+  if( layoutType & AbtImageRight )
   {
     TQVBoxLayout *vbox = new TQVBoxLayout();
     hbox->addLayout(vbox);
@@ -427,9 +427,9 @@ void KAboutContainerBase::show( void )
     TQWidget::show();
 }
 
-TQSize KAboutContainerBase::tqsizeHint( void ) const
+TQSize KAboutContainerBase::sizeHint( void ) const
 {
-    return tqminimumSize().expandedTo( TQSize( TQWidget::tqsizeHint().width(), 0 ) );
+    return minimumSize().expandedTo( TQSize( TQWidget::sizeHint().width(), 0 ) );
 }
 
 void KAboutContainerBase::fontChange( const TQFont &/*oldFont*/ )
@@ -451,7 +451,7 @@ void KAboutContainerBase::fontChange( const TQFont &/*oldFont*/ )
     f.setBold( true );
     mVersionLabel->setFont(f);
     mAuthorLabel->setFont(f);
-    mVersionLabel->tqparentWidget()->tqlayout()->activate();
+    mVersionLabel->parentWidget()->layout()->activate();
   }
 
   update();
@@ -518,7 +518,7 @@ KAboutContainer *KAboutContainerBase::addContainerPage( const TQString &title,
 {
   if( !mPageTab )
   {
-    kdDebug(291) << "addPage: " << "Invalid tqlayout" << endl;
+    kdDebug(291) << "addPage: " << "Invalid layout" << endl;
     return 0;
   }
 
@@ -543,7 +543,7 @@ KAboutContainer *KAboutContainerBase::addScrolledContainerPage(
 {
   if( !mPageTab )
   {
-    kdDebug(291) << "addPage: " << "Invalid tqlayout" << endl;
+    kdDebug(291) << "addPage: " << "Invalid layout" << endl;
     return 0;
   }
 
@@ -572,7 +572,7 @@ TQFrame *KAboutContainerBase::addEmptyPage( const TQString &title )
 {
   if( !mPageTab )
   {
-    kdDebug(291) << "addPage: " << "Invalid tqlayout" << endl;
+    kdDebug(291) << "addPage: " << "Invalid layout" << endl;
     return 0;
   }
 
@@ -605,7 +605,7 @@ void KAboutContainerBase::setTitle( const TQString &title )
 {
   if( !mTitleLabel )
   {
-    kdDebug(291) << "setTitle: " << "Invalid tqlayout" << endl;
+    kdDebug(291) << "setTitle: " << "Invalid layout" << endl;
     return;
   }
   mTitleLabel->setText(title);
@@ -616,7 +616,7 @@ void KAboutContainerBase::setImage( const TQString &fileName )
 {
   if( !mImageLabel )
   {
-    kdDebug(291) << "setImage: " << "Invalid tqlayout" << endl;
+    kdDebug(291) << "setImage: " << "Invalid layout" << endl;
     return;
   }
   if( fileName.isNull() )
@@ -628,7 +628,7 @@ void KAboutContainerBase::setImage( const TQString &fileName )
   if( !logo.isNull() )
     mImageLabel->setPixmap( logo );
 
-  mImageFrame->tqlayout()->activate();
+  mImageFrame->layout()->activate();
 }
 
 void KAboutContainerBase::setProgramLogo( const TQString &fileName )
@@ -646,7 +646,7 @@ void KAboutContainerBase::setProgramLogo( const TQPixmap &pixmap )
 {
   if( !mIconLabel )
   {
-    kdDebug(291) << "setProgramLogo: " << "Invalid tqlayout" << endl;
+    kdDebug(291) << "setProgramLogo: " << "Invalid layout" << endl;
     return;
   }
   if( !pixmap.isNull() )
@@ -689,7 +689,7 @@ void KAboutContainerBase::setProduct( const TQString &appName,
 {
   if( !mIconLabel )
   {
-    kdDebug(291) << "setProduct: " << "Invalid tqlayout" << endl;
+    kdDebug(291) << "setProduct: " << "Invalid layout" << endl;
     return;
   }
 
@@ -702,9 +702,9 @@ void KAboutContainerBase::setProduct( const TQString &appName,
     kdDebug(291) << "no kapp" << endl;
 
   const TQString msg1 = i18n("%1 %2 (Using KDE %3)").arg(appName).arg(version).
-    arg(TQString::tqfromLatin1(KDE_VERSION_STRING));
+    arg(TQString::fromLatin1(KDE_VERSION_STRING));
   const TQString msg2 = !year.isEmpty() ? i18n("%1 %2, %3").arg('©').arg(year).
-    arg(author) : TQString::tqfromLatin1("");
+    arg(author) : TQString::fromLatin1("");
 
   //if (!year.isEmpty())
   //  msg2 = i18n("%1 %2, %3").arg('©').arg(year).arg(author);
@@ -716,7 +716,7 @@ void KAboutContainerBase::setProduct( const TQString &appName,
     mAuthorLabel->hide();
   }
 
-  mIconLabel->tqparentWidget()->tqlayout()->activate();
+  mIconLabel->parentWidget()->layout()->activate();
 }
 
 
@@ -790,7 +790,7 @@ void KAboutContainer::childEvent( TQChildEvent *e )
 
   TQWidget* const w = static_cast<TQWidget *>(e->child());
   mVbox->addWidget( w, 0, mAlignment );
-  const TQSize s( tqsizeHint() );
+  const TQSize s( sizeHint() );
   setMinimumSize( s );
 
   TQObjectList* const l = const_cast<TQObjectList *>(children()); // silence please
@@ -806,12 +806,12 @@ void KAboutContainer::childEvent( TQChildEvent *e )
 }
 
 
-TQSize KAboutContainer::tqsizeHint( void ) const
+TQSize KAboutContainer::sizeHint( void ) const
 {
   //
-  // The size is computed by adding the tqsizeHint().height() of all
+  // The size is computed by adding the sizeHint().height() of all
   // widget children and taking the width of the widest child and adding
-  // tqlayout()->margin() and tqlayout()->spacing()
+  // layout()->margin() and layout()->spacing()
   //
 
   TQSize total_size;
@@ -828,13 +828,13 @@ TQSize KAboutContainer::tqsizeHint( void ) const
       ++numChild;
       TQWidget* const w= static_cast<TQWidget *>(o);
 
-      TQSize s = w->tqminimumSize();
+      TQSize s = w->minimumSize();
       if( s.isEmpty() )
       {
-	s = w->tqminimumSizeHint();
+	s = w->minimumSizeHint();
 	if( s.isEmpty() )
 	{
-	  s = w->tqsizeHint();
+	  s = w->sizeHint();
 	  if( s.isEmpty() )
 	  {
 	    s = TQSize( 100, 100 ); // Default size
@@ -850,11 +850,11 @@ TQSize KAboutContainer::tqsizeHint( void ) const
   {
     //
     // Seems I have to add 1 to the height to properly show the border
-    // of the last entry if tqlayout()->margin() is 0
+    // of the last entry if layout()->margin() is 0
     //
 
-    total_size.setHeight( total_size.height() + tqlayout()->spacing()*(numChild-1) );
-    total_size += TQSize( tqlayout()->margin()*2, tqlayout()->margin()*2 + 1 );
+    total_size.setHeight( total_size.height() + layout()->spacing()*(numChild-1) );
+    total_size += TQSize( layout()->margin()*2, layout()->margin()*2 + 1 );
   }
   else
   {
@@ -864,9 +864,9 @@ TQSize KAboutContainer::tqsizeHint( void ) const
 }
 
 
-TQSize KAboutContainer::tqminimumSizeHint( void ) const
+TQSize KAboutContainer::minimumSizeHint( void ) const
 {
-  return tqsizeHint();
+  return sizeHint();
 }
 
 
@@ -890,7 +890,7 @@ void KAboutContainer::addPerson( const TQString &_name, const TQString &_email,
 }
 
 
-void KAboutContainer::addTitle( const TQString &title, int tqalignment,
+void KAboutContainer::addTitle( const TQString &title, int alignment,
 				bool showFrame, bool showBold )
 {
 
@@ -905,11 +905,11 @@ void KAboutContainer::addTitle( const TQString &title, int tqalignment,
   {
     label->setFrameStyle(TQFrame::Panel | TQFrame::Raised);
   }
-  label->tqsetAlignment( tqalignment );
+  label->setAlignment( alignment );
 }
 
 
-void KAboutContainer::addImage( const TQString &fileName, int tqalignment )
+void KAboutContainer::addImage( const TQString &fileName, int alignment )
 {
   if( fileName.isNull() )
   {
@@ -924,11 +924,11 @@ void KAboutContainer::addImage( const TQString &fileName, int tqalignment )
     pix = logo;
     label->setPixmap( pix );
   }
-  label->tqsetAlignment( tqalignment );
+  label->setAlignment( alignment );
 }
 
 #if 0
-//TQMOC_SKIP_BEGIN
+//MOC_SKIP_BEGIN
 
 /** Every person displayed is stored in a KAboutContributor object.
  *  Every contributor, the author and/or the maintainer of the application are
@@ -959,9 +959,9 @@ public:
    *  possible, but very long texts might look ugly. */
   void setWork(const TQString&);
   /** The size hint. Very important here, since KAboutWidget relies on it for
-   *  tqgeometry management. */
-  TQSize tqsizeHint();
-  TQSize tqminimumSizeHint(void);
+   *  geometry management. */
+  TQSize sizeHint();
+  TQSize minimumSizeHint(void);
   virtual void show( void );
 
   // ----------------------------------------------------------------------------
@@ -1007,7 +1007,7 @@ KAboutContributor::KAboutContributor(TQWidget* parent, const char* n)
   if(name==0 || email==0)
     { // this will nearly never happen (out of memory in about box?)
       kdDebug() << "KAboutContributor::KAboutContributor: Out of memory." << endl;
-      tqApp->quit();
+      qApp->quit();
     }
   setFrameStyle(TQFrame::Panel | TQFrame::Raised);
   // -----
@@ -1096,7 +1096,7 @@ KAboutContributor::setWork(const TQString& w)
 
 #if 0
 QSize
-KAboutContributor::tqsizeHint()
+KAboutContributor::sizeHint()
 {
   // ############################################################################
   const int FrameWidth=frameWidth();
@@ -1104,8 +1104,8 @@ KAboutContributor::tqsizeHint()
   int maxx, maxy;
   TQRect rect;
   // ----- first calculate name and email width:
-  maxx=name->tqsizeHint().width();
-  maxx=QMAX(maxx, email->tqsizeHint().width()+WORKTEXT_IDENTATION);
+  maxx=name->sizeHint().width();
+  maxx=QMAX(maxx, email->sizeHint().width()+WORKTEXT_IDENTATION);
   // ----- now determine "work" text rectangle:
   if(!work.isEmpty()) // save time
     {
@@ -1116,10 +1116,10 @@ KAboutContributor::tqsizeHint()
   {
     maxx=WorkTextWidth+WORKTEXT_IDENTATION;
   }
-  maxx=QMAX(maxx, url->tqsizeHint().width()+WORKTEXT_IDENTATION);
+  maxx=QMAX(maxx, url->sizeHint().width()+WORKTEXT_IDENTATION);
   // -----
-  maxy=2*(name->tqsizeHint().height()+Grid); // need a space above the KURLLabels
-  maxy+=/* email */ name->tqsizeHint().height();
+  maxy=2*(name->sizeHint().height()+Grid); // need a space above the KURLLabels
+  maxy+=/* email */ name->sizeHint().height();
   maxy+=rect.height();
   // -----
   maxx+=2*FrameWidth;
@@ -1128,16 +1128,16 @@ KAboutContributor::tqsizeHint()
   // ############################################################################
 }
 
-TQSize KAboutContributor::tqminimumSizeHint(void)
+TQSize KAboutContributor::minimumSizeHint(void)
 {
-  return( tqsizeHint() );
+  return( sizeHint() );
 }
 
 
 void KAboutContributor::show( void )
 {
   TQFrame::show();
-  setMinimumSize( tqsizeHint() );
+  setMinimumSize( sizeHint() );
 }
 
 
@@ -1151,15 +1151,15 @@ KAboutContributor::resizeEvent(TQResizeEvent*)
   int cy=framewidth;
   // -----
   name->setGeometry
-    (framewidth, framewidth, childwidth, name->tqsizeHint().height());
+    (framewidth, framewidth, childwidth, name->sizeHint().height());
   cy=name->height()+Grid;
   email->setGeometry
     (framewidth+WORKTEXT_IDENTATION, cy,
-     childwidth-WORKTEXT_IDENTATION, /* email */ name->tqsizeHint().height());
+     childwidth-WORKTEXT_IDENTATION, /* email */ name->sizeHint().height());
   cy+=name->height()+Grid;
   url->setGeometry
     (framewidth+WORKTEXT_IDENTATION, cy,
-     childwidth-WORKTEXT_IDENTATION, /* url */ name->tqsizeHint().height());
+     childwidth-WORKTEXT_IDENTATION, /* url */ name->sizeHint().height());
   // the work text is drawn in the paint event
   // ############################################################################
 }
@@ -1181,20 +1181,20 @@ KAboutContributor::paintEvent(TQPaintEvent* e)
   paint.drawText(WORKTEXT_IDENTATION, cy, w, h, AlignLeft | WordBreak, work);
   // ############################################################################
 }
-// TQMOC_SKIP_END
+// MOC_SKIP_END
 #endif
 
 
 #if 0
-TQSize KAboutContributor::tqsizeHint( void )
+TQSize KAboutContributor::sizeHint( void )
 {
   int s = KDialog::spacingHint();
   int h = fontMetrics().lineSpacing()*3 + 2*s;
   int m = frameWidth();
 
-  int w = name->tqsizeHint().width();
-  w = QMAX( w, email->tqsizeHint().width()+s);
-  w = QMAX( w, url->tqsizeHint().width()+s);
+  int w = name->sizeHint().width();
+  w = QMAX( w, email->sizeHint().width()+s);
+  w = QMAX( w, url->sizeHint().width()+s);
 
   if( work.isEmpty() == false )
   {
@@ -1214,10 +1214,10 @@ TQSize KAboutContributor::tqsizeHint( void )
   int s = 3;
   int m = frameWidth() + KDialog::spacingHint();
   int h = ls * 3 + s * 2;
-  int w = name->tqsizeHint().width();
+  int w = name->sizeHint().width();
 
-  w = QMAX( w, email->tqsizeHint().width()+WORKTEXT_IDENTATION);
-  w = QMAX( w, url->tqsizeHint().width()+WORKTEXT_IDENTATION);
+  w = QMAX( w, email->sizeHint().width()+WORKTEXT_IDENTATION);
+  w = QMAX( w, url->sizeHint().width()+WORKTEXT_IDENTATION);
   if( work.isEmpty() == false )
   {
     const int WorkTextWidth=200;
@@ -1257,7 +1257,7 @@ void KAboutContributor::resizeEvent(TQResizeEvent*)
   int x = frameWidth() + KDialog::spacingHint();
   int y = x;
   int w = width() - 2*x;
-  int h = name->tqsizeHint().height();
+  int h = name->sizeHint().height();
   int s = 3;
 
   name->setGeometry( x, y, w, h );
@@ -1291,7 +1291,7 @@ void KAboutContributor::paintEvent( TQPaintEvent *e )
   int s = 3;
   int x = frameWidth() + KDialog::spacingHint() + WORKTEXT_IDENTATION;
   int w = width()-WORKTEXT_IDENTATION-2*(frameWidth()+KDialog::spacingHint());
-  int y = frameWidth()+KDialog::spacingHint()+(name->tqsizeHint().height()+s)*3;
+  int y = frameWidth()+KDialog::spacingHint()+(name->sizeHint().height()+s)*3;
   int h = height()-y-frameWidth();
 
   TQPainter paint( this );
@@ -1320,13 +1320,13 @@ KAboutWidget::KAboutWidget(TQWidget *_parent, const char *_name)
   {
     // this will nearly never happen (out of memory in about box?)
     kdDebug() << "KAboutWidget::KAboutWidget: Out of memory." << endl;
-    tqApp->quit();
+    qApp->quit();
   }
   // -----
   cont->setText(i18n("Other Contributors:"));
   logo->setText(i18n("(No logo available)"));
   logo->setFrameStyle(TQFrame::Panel | TQFrame::Raised);
-  version->tqsetAlignment(AlignCenter);
+  version->setAlignment(AlignCenter);
   // -----
   connect(author, TQT_SIGNAL(sendEmail(const TQString&, const TQString&)),
 	  TQT_SLOT(sendEmailSlot(const TQString&, const TQString&)));
@@ -1350,33 +1350,33 @@ KAboutWidget::adjust()
   // -----
   if(showMaintainer)
     {
-      total_size=maintainer->tqsizeHint();
+      total_size=maintainer->sizeHint();
       maintWidth=total_size.width();
       maintHeight=total_size.height();
     } else {
       maintWidth=0;
       maintHeight=0;
     }
-  total_size=author->tqsizeHint();
+  total_size=author->sizeHint();
   logo->adjustSize();
-  cy=version->tqsizeHint().height()+Grid;
+  cy=version->sizeHint().height()+Grid;
   cx=logo->width();
   tempx=QMAX(total_size.width(), maintWidth);
   cx+=Grid+tempx;
-  cx=QMAX(cx, version->tqsizeHint().width());
+  cx=QMAX(cx, version->sizeHint().width());
   cy+=QMAX(logo->height(),
 	   total_size.height()+(showMaintainer ? Grid+maintHeight : 0));
   // -----
   if(!contributors.isEmpty())
     {
-      cx=QMAX(cx, cont->tqsizeHint().width());
-      cy+=cont->tqsizeHint().height()+Grid;
+      cx=QMAX(cx, cont->sizeHint().width());
+      cy+=cont->sizeHint().height()+Grid;
       TQPtrListIterator<KAboutContributor> _pos(contributors);
       KAboutContributor* currEntry;
       while ( (currEntry = _pos.current()) )
 	{
 	  ++_pos;
-	  cy+=currEntry->tqsizeHint().height();
+	  cy+=currEntry->sizeHint().height();
 	}
     }
   // -----
@@ -1458,8 +1458,8 @@ KAboutWidget::resizeEvent(TQResizeEvent*)
 {
   // ############################################################################
   int _x=0, _y, cx, tempx, tempy;
-  // ----- set version label tqgeometry:
-  version->setGeometry(0, 0, width(), version->tqsizeHint().height());
+  // ----- set version label geometry:
+  version->setGeometry(0, 0, width(), version->sizeHint().height());
   _y=version->height()+Grid;
   // ----- move logo to correct position:
   logo->adjustSize();
@@ -1468,16 +1468,16 @@ KAboutWidget::resizeEvent(TQResizeEvent*)
   tempx=logo->width()+Grid;
   cx=width()-tempx;
   author->setGeometry
-    (tempx, _y, cx, author->tqsizeHint().height());
+    (tempx, _y, cx, author->sizeHint().height());
   maintainer->setGeometry
-    (tempx, _y+author->height()+Grid, cx, maintainer->tqsizeHint().height());
+    (tempx, _y+author->height()+Grid, cx, maintainer->sizeHint().height());
 
   _y+=QMAX(logo->height(),
 	  author->height()+(showMaintainer ? Grid+maintainer->height() : 0));
   // -----
   if(!contributors.isEmpty())
     {
-      tempy=cont->tqsizeHint().height();
+      tempy=cont->sizeHint().height();
       cont->setGeometry(0, _y, width(), tempy);
       cont->show();
       _y+=tempy+Grid;
@@ -1489,7 +1489,7 @@ KAboutWidget::resizeEvent(TQResizeEvent*)
   while( (currEntry = _pos.current()) )
     {
       ++_pos;
-      tempy=currEntry->tqsizeHint().height();
+      tempy=currEntry->sizeHint().height();
       // y+=Grid;
       currEntry->setGeometry(_x, _y, width(), tempy);
       _y+=tempy;
@@ -1512,7 +1512,7 @@ KAboutDialog::KAboutDialog(TQWidget *_parent, const char *_name, bool modal)
   {
     // this will nearly never happen (out of memory in about box?)
     kdDebug() << "KAboutDialog::KAboutDialog: Out of memory." << endl;
-    tqApp->quit();
+    qApp->quit();
   }
   setMainWidget(about);
   connect(about, TQT_SIGNAL(sendEmail(const TQString&, const TQString&)),
@@ -1523,7 +1523,7 @@ KAboutDialog::KAboutDialog(TQWidget *_parent, const char *_name, bool modal)
 }
 
 
-KAboutDialog::KAboutDialog( int tqlayoutType, const TQString &_caption,
+KAboutDialog::KAboutDialog( int layoutType, const TQString &_caption,
 			    int buttonMask, ButtonCode defaultButton,
 			    TQWidget *_parent, const char *_name, bool modal,
 			    bool separator, const TQString &user1,
@@ -1534,7 +1534,7 @@ KAboutDialog::KAboutDialog( int tqlayoutType, const TQString &_caption,
 {
   setPlainCaption( i18n("About %1").arg(_caption) );
 
-  mContainerBase = new KAboutContainerBase( tqlayoutType, this );
+  mContainerBase = new KAboutContainerBase( layoutType, this );
   setMainWidget(mContainerBase);
 
   connect( mContainerBase, TQT_SIGNAL(urlClick(const TQString &)),
@@ -1567,7 +1567,7 @@ void KAboutDialog::adjust()
   if( !about ) { return; }
   about->adjust();
   //initializeGeometry();
-  resize( tqsizeHint() );
+  resize( sizeHint() );
 }
 
 
diff --git a/kdeui/kaboutdialog.h b/kdeui/kaboutdialog.h
index ccad3c0dc..8d732cdbe 100644
--- a/kdeui/kaboutdialog.h
+++ b/kdeui/kaboutdialog.h
@@ -22,7 +22,7 @@
 
 /*
  * This file declares a class for creating "About ..." dialogs
- * in a general way. It provides tqgeometry management and some
+ * in a general way. It provides geometry management and some
  * options to connect for, like emailing the author or maintainer.
  */
 
@@ -62,12 +62,12 @@ class KDEUI_EXPORT KAboutContainer : public QFrame
 		    const TQString &url, const TQString &task,
 		    bool showHeader = false, bool showframe = false,
 		    bool showBold = false );
-    void addTitle(  const TQString &title, int tqalignment=AlignLeft,
+    void addTitle(  const TQString &title, int alignment=AlignLeft,
 		    bool showframe = false, bool showBold = false );
-    void addImage( const TQString &fileName, int tqalignment=AlignLeft );
+    void addImage( const TQString &fileName, int alignment=AlignLeft );
 
-    virtual TQSize tqsizeHint( void ) const;
-    virtual TQSize tqminimumSizeHint( void ) const;
+    virtual TQSize sizeHint( void ) const;
+    virtual TQSize minimumSizeHint( void ) const;
 
   protected:
     virtual void childEvent( TQChildEvent *e );
@@ -115,7 +115,7 @@ class KDEUI_EXPORT KAboutContributor : public QFrame
     TQString getURL( void ) const;
     TQString getWork( void ) const;
 
-    virtual TQSize tqsizeHint( void ) const;
+    virtual TQSize sizeHint( void ) const;
 
   protected:
     virtual void fontChange( const TQFont &oldFont );
@@ -265,12 +265,12 @@ class KAboutDialogPrivate;
  * can be used to build the contents of the dialog. The first (Constructor I)
  * provides a number of easy to use methods. Basically it allows you
  * to add the components of choice, and the components are placed in a
- * predefined tqlayout. You do not have to plan the tqlayout. Everything is
+ * predefined layout. You do not have to plan the layout. Everything is
  * taken care of.
  *
  * The second constructor (Constructor II) works in quite the same manner
  * as the first, but you have better control on where the components
- * are postioned in the tqlayout and you have access to an extended number
+ * are postioned in the layout and you have access to an extended number
  * of components you can install such as titles, product information,
  * a tabbed pages (where you can display rich text with url links) and
  * a person (developer) information field. The "About KDE" dialog box is
@@ -321,7 +321,7 @@ class KDEUI_EXPORT KAboutDialog : public KDialogBase
     * setImageFrame(), setProduct(), addTextPage(),
     * addContainerPage(), addContainer(), or addPage().
     *
-    * @param dialogLayout Use a tqmask of LayoutType flags.
+    * @param dialogLayout Use a mask of LayoutType flags.
     * @param caption The dialog caption. The text you specify is prepended
     *        by i18n("About").
     * @param buttonMask Specifies what buttons will be visible.
@@ -467,7 +467,7 @@ class KDEUI_EXPORT KAboutDialog : public KDialogBase
    * @param richText Set this to @p true if 'text' is rich text.
    * @param numLines The text area height will be adjusted so that this
    *        is the minimum number of lines of text that are visible.
-   * @return The frame that tqcontains the page.
+   * @return The frame that contains the page.
    */
   TQFrame *addTextPage( const TQString &title, const TQString &text,
                        bool richText=false, int numLines=10 );
@@ -480,7 +480,7 @@ class KDEUI_EXPORT KAboutDialog : public KDialogBase
    * @param text The text to display.
    * @param numLines The text area height will be adjusted so that this
    *        is the minimum number of lines of text that are visible.
-   * @return The frame that tqcontains the page.
+   * @return The frame that contains the page.
    */
   TQFrame *addLicensePage( const TQString &title, const TQString &text,
                           int numLines=10 );
diff --git a/kdeui/kaboutdialog_private.h b/kdeui/kaboutdialog_private.h
index 48441fc0c..563eb825b 100644
--- a/kdeui/kaboutdialog_private.h
+++ b/kdeui/kaboutdialog_private.h
@@ -86,9 +86,9 @@ class KAboutContainerBase : public QWidget
     };
 
   public:
-    KAboutContainerBase( int tqlayoutType, TQWidget *parent = 0, char *name = 0 );
+    KAboutContainerBase( int layoutType, TQWidget *parent = 0, char *name = 0 );
     virtual void show( void );
-    virtual TQSize tqsizeHint( void ) const;
+    virtual TQSize sizeHint( void ) const;
 
     void setTitle( const TQString &title );
     void setImage( const TQString &fileName );
diff --git a/kdeui/kaboutkde.cpp b/kdeui/kaboutkde.cpp
index 7ab50dca6..1d05e289c 100644
--- a/kdeui/kaboutkde.cpp
+++ b/kdeui/kaboutkde.cpp
@@ -27,7 +27,7 @@
 
 
 KAboutKDE::KAboutKDE( TQWidget *parent, const char *name, bool modal )
-  :KAboutDialog( KAboutDialog::AbtKDEStandard, TQString::tqfromLatin1("KDE"),
+  :KAboutDialog( KAboutDialog::AbtKDEStandard, TQString::fromLatin1("KDE"),
 		 KDialogBase::Help|KDialogBase::Close, KDialogBase::Close,
 		 parent, name, modal )
 {
@@ -75,13 +75,13 @@ KAboutKDE::KAboutKDE( TQWidget *parent, const char *name, bool modal )
     "donation, using one of the ways described at "
     "<a href=\"http://trinity.pearsoncomputing.net/support/\">http://trinity.pearsoncomputing.net/support/</a>."
     "<br><br>Thank you very much in advance for your support!");
-  setHelp( TQString::tqfromLatin1("khelpcenter/main.html"), TQString::null );
+  setHelp( TQString::fromLatin1("khelpcenter/main.html"), TQString::null );
   setTitle(i18n("Trinity Desktop Environment. Release %1").
-	   arg(TQString::tqfromLatin1(KDE_VERSION_STRING)) );
+	   arg(TQString::fromLatin1(KDE_VERSION_STRING)) );
   addTextPage( i18n("About Trinity","&About"), text1, true );
   addTextPage( i18n("&Report Bugs or Wishes"), text2, true );
   addTextPage( i18n("&Join the Trinity Team"), text3, true );
   addTextPage( i18n("&Support Trinity"), text4, true );
-  setImage( locate( "data", TQString::tqfromLatin1("kdeui/pics/aboutkde.png")) );
+  setImage( locate( "data", TQString::fromLatin1("kdeui/pics/aboutkde.png")) );
   setImageBackgroundColor( white );
 }
diff --git a/kdeui/kaccelgen.h b/kdeui/kaccelgen.h
index e3b28f10f..8f0c50bed 100644
--- a/kdeui/kaccelgen.h
+++ b/kdeui/kaccelgen.h
@@ -47,7 +47,7 @@
  * importance (it may seem like these are implementation details, but
  * IMHO the policy is an important part of the interface):
  *
- * 1. If the string already tqcontains an '&' character, skip this
+ * 1. If the string already contains an '&' character, skip this
  * string, because we consider such strings to be "user-specified"
  * accelerators.
  *
@@ -131,9 +131,9 @@ loadPredefined(Iter begin, Iter end, TQMap<TQChar,bool>& keys)
 {
     for (Iter i = begin; i != end; ++i) {
         TQString item = Deref::deref(i);
-        int user_ampersand = item.tqfind(TQChar('&'));
+        int user_ampersand = item.find(TQChar('&'));
         if( user_ampersand >= 0 ) {
-            // Sanity check.  Note that we don't try to tqfind an
+            // Sanity check.  Note that we don't try to find an
             // accelerator if the user shoots him/herself in the foot
             // by adding a bad '&'.
             if( isLegalAccelerator(item, user_ampersand+1) ) {
@@ -176,9 +176,9 @@ generate(Iter begin, Iter end, TQStringList& target)
     for (Iter i = begin; i != end; ++i) {
         TQString item = Iter_Deref::deref(i);
 
-        // Attempt to tqfind a good accelerator, but only if the user
+        // Attempt to find a good accelerator, but only if the user
         // has not manually hardcoded one.
-        int user_ampersand = item.tqfind(TQChar('&'));
+        int user_ampersand = item.find(TQChar('&'));
         if( user_ampersand < 0 || item[user_ampersand+1] == '&') {
             bool found = false;
             uint found_idx;
@@ -187,7 +187,7 @@ generate(Iter begin, Iter end, TQStringList& target)
             // Check word-starting letters first.
             for( j=0; j < item.length(); ++j ) {
                 if( isLegalAccelerator(item, j)
-                    && !used_accels.tqcontains(item[j])
+                    && !used_accels.contains(item[j])
                     && (0 == j || (j > 0 && item[j-1].isSpace())) ) {
                     found = true;
                     found_idx = j;
@@ -199,7 +199,7 @@ generate(Iter begin, Iter end, TQStringList& target)
                 // No word-starting letter; search for any letter.
                 for( j=0; j < item.length(); ++j ) {
                     if( isLegalAccelerator(item, j)
-                        && !used_accels.tqcontains(item[j]) ) {
+                        && !used_accels.contains(item[j]) ) {
                         found = true;
                         found_idx = j;
                         break;
diff --git a/kdeui/kaction.cpp b/kdeui/kaction.cpp
index 5689427d5..9bfd23468 100644
--- a/kdeui/kaction.cpp
+++ b/kdeui/kaction.cpp
@@ -277,18 +277,18 @@ bool KAction::isPlugged() const
 
 bool KAction::isPlugged( const TQWidget *container ) const
 {
-  return tqfindContainer( container ) > -1;
+  return findContainer( container ) > -1;
 }
 
 bool KAction::isPlugged( const TQWidget *container, int id ) const
 {
-  int i = tqfindContainer( container );
+  int i = findContainer( container );
   return ( i > -1 && itemId( i ) == id );
 }
 
 bool KAction::isPlugged( const TQWidget *container, const TQWidget *_representative ) const
 {
-  int i = tqfindContainer( container );
+  int i = findContainer( container );
   return ( i > -1 && representative( i ) == _representative );
 }
 
@@ -309,7 +309,7 @@ We have two KoView objects which both point to the same KoDoc object
 Undo and Redo should be available in both KoView objects, and
 	calling the undo->setEnabled() should affect both KoViews
 
-When addClient is called, it needs to be able to tqfind the undo and redo actions
+When addClient is called, it needs to be able to find the undo and redo actions
 When it calls plug() on them, they need to be inserted into the KAccel object of the appropriate KoView
 
 In this case, the actionCollection belongs to KoDoc and we need to let it know that its shortcuts
@@ -482,7 +482,7 @@ void KAction::insertKAccel( KAccel* kaccel )
     }
   }
   else
-    kdWarning(129) << "KAction::insertKAccel( kaccel = " << kaccel << " ): KAccel object already tqcontains an action name \"" << name() << "\"" << endl; // -- ellis
+    kdWarning(129) << "KAction::insertKAccel( kaccel = " << kaccel << " ): KAccel object already contains an action name \"" << name() << "\"" << endl; // -- ellis
 }
 
 void KAction::removeKAccel( KAccel* kaccel )
@@ -530,9 +530,9 @@ void KAction::updateShortcut( TQPopupMenu* menu, int id )
   //  show the string representation of its shortcut.
   if ( d->m_kaccel || d->m_kaccelList.count() ) {
     TQString s = menu->text( id );
-    int i = s.tqfind( '\t' );
+    int i = s.find( '\t' );
     if ( i >= 0 )
-      s.tqreplace( i+1, s.length()-i, d->m_cut.seq(0).toString() );
+      s.replace( i+1, s.length()-i, d->m_cut.seq(0).toString() );
     else
       s += "\t" + d->m_cut.seq(0).toString();
 
@@ -744,7 +744,7 @@ int KAction::plug( TQWidget *w, int index )
 
 void KAction::unplug( TQWidget *w )
 {
-  int i = tqfindContainer( w );
+  int i = findContainer( w );
   if ( i == -1 )
     return;
   int id = itemId( i );
@@ -795,7 +795,7 @@ void KAction::plugAccel(KAccel *kacc, bool configurable)
     //connect(d->m_kaccel, TQT_SIGNAL(keycodeChanged()), this, TQT_SLOT(slotKeycodeChanged()));
   }
   else
-    kdWarning(129) << "KAction::plugAccel( kacc = " << kacc << " ): KAccel object already tqcontains an action name \"" << name() << "\"" << endl; // -- ellis
+    kdWarning(129) << "KAction::plugAccel( kacc = " << kacc << " ): KAccel object already contains an action name \"" << name() << "\"" << endl; // -- ellis
 }
 
 void KAction::unplugAccel()
@@ -810,10 +810,10 @@ void KAction::unplugAccel()
 
 void KAction::plugMainWindowAccel( TQWidget *w )
 {
-  // Note: tqtopLevelWidget() stops too early, we can't use it.
+  // Note: topLevelWidget() stops too early, we can't use it.
   TQWidget * tl = w;
   TQWidget * n;
-  while ( !tl->isDialog() && ( n = tl->tqparentWidget() ) ) // lookup parent and store
+  while ( !tl->isDialog() && ( n = tl->parentWidget() ) ) // lookup parent and store
     tl = n;
 
   KMainWindow * mw = dynamic_cast<KMainWindow *>(tl); // try to see if it's a kmainwindow
@@ -1039,7 +1039,7 @@ TQString KAction::whatsThisWithIcon() const
 {
     TQString text = whatsThis();
     if (!d->iconName().isEmpty())
-      return TQString::tqfromLatin1("<img source=\"small|%1\"> %2").arg(d->iconName() ).arg(text);
+      return TQString::fromLatin1("<img source=\"small|%1\"> %2").arg(d->iconName() ).arg(text);
     return text;
 }
 
@@ -1121,7 +1121,7 @@ void KAction::slotPopupActivated()
   if( ::qt_cast<TQSignal *>(sender()))
   {
     int id = dynamic_cast<const TQSignal *>(sender())->value().toInt();
-    int pos = tqfindContainer(id);
+    int pos = findContainer(id);
     if(pos != -1)
     {
       TQPopupMenu* qpm = dynamic_cast<TQPopupMenu *>( container(pos) );
@@ -1187,13 +1187,13 @@ void KAction::slotDestroyed()
   int i;
   do
   {
-    i = tqfindContainer( static_cast<const TQWidget*>( o ) );
+    i = findContainer( static_cast<const TQWidget*>( o ) );
     if ( i != -1 )
       removeContainer( i );
   } while ( i != -1 );
 }
 
-int KAction::tqfindContainer( const TQWidget* widget ) const
+int KAction::findContainer( const TQWidget* widget ) const
 {
   int pos = 0;
 
@@ -1213,7 +1213,7 @@ int KAction::tqfindContainer( const TQWidget* widget ) const
   return -1;
 }
 
-int KAction::tqfindContainer( const int id ) const
+int KAction::findContainer( const int id ) const
 {
   int pos = 0;
 
diff --git a/kdeui/kaction.h b/kdeui/kaction.h
index 7f0da031f..85be6e3dc 100644
--- a/kdeui/kaction.h
+++ b/kdeui/kaction.h
@@ -199,7 +199,7 @@ class KMainWindow;
  *
  * @see KStdAction
  */
-class KDEUI_EXPORT KAction : public TQObject
+class KDEUI_EXPORT KAction : public QObject
 {
   friend class KActionCollection;
   Q_OBJECT
@@ -576,8 +576,8 @@ protected:
     KToolBar* toolBar( int index ) const;
     TQPopupMenu* popupMenu( int index ) const;
     void removeContainer( int index );
-    int tqfindContainer( const TQWidget* widget ) const;
-    int tqfindContainer( int id ) const;
+    int findContainer( const TQWidget* widget ) const;
+    int findContainer( int id ) const;
     void plugMainWindowAccel( TQWidget *w );
 
     void addContainer( TQWidget* parent, int id );
diff --git a/kdeui/kactionclasses.cpp b/kdeui/kactionclasses.cpp
index 3974496c6..f5a031869 100644
--- a/kdeui/kactionclasses.cpp
+++ b/kdeui/kactionclasses.cpp
@@ -627,8 +627,8 @@ void KSelectAction::updateItems( int id )
       TQStringList::ConstIterator it = lst.begin();
       for( ; it != lst.end(); ++it )
         cb->insertItem( *it );
-      // qt caches and never recalculates the tqsizeHint()
-      // qcombobox.cpp recommends calling setFont to tqinvalidate the tqsizeHint
+      // qt caches and never recalculates the sizeHint()
+      // qcombobox.cpp recommends calling setFont to invalidate the sizeHint
       // setFont sets own_font = True, so we're a bit mean and calll
       // unsetFont which calls setFont and then overwrites the own_font
       cb->unsetFont();
@@ -678,7 +678,7 @@ int KSelectAction::plug( TQWidget *widget, int index )
     if ( cb )
     {
       if (!isEditable()) cb->setFocusPolicy(TQWidget::NoFocus);
-      cb->setMinimumWidth( cb->tqsizeHint().width() );
+      cb->setMinimumWidth( cb->sizeHint().width() );
       if ( d->m_comboWidth > 0 )
       {
         cb->setMinimumWidth( d->m_comboWidth );
@@ -730,7 +730,7 @@ TQStringList KSelectAction::comboItems() const
     for( ; it != d->m_list.end(); ++it )
     {
       TQString item = *it;
-      int i = item.tqfind( '&' );
+      int i = item.find( '&' );
       if ( i > -1 )
         item = item.remove( i, 1 );
       lst.append( item );
@@ -779,18 +779,18 @@ void KSelectAction::slotActivated( const TQString &text )
   if ( isEditable() )
   {
     TQStringList lst = d->m_list;
-    if(!lst.tqcontains(text))
+    if(!lst.contains(text))
     {
       lst.append( text );
       setItems( lst );
     }
   }
 
-  int i = d->m_list.tqfindIndex( text );
+  int i = d->m_list.findIndex( text );
   if ( i > -1 )
       setCurrentItem( i );
   else
-      setCurrentItem( comboItems().tqfindIndex( text ) );
+      setCurrentItem( comboItems().findIndex( text ) );
   // Delay this. Especially useful when the slot connected to activated() will re-create
   // the menu, e.g. in the recent files action. This prevents a crash.
   TQTimer::singleShot( 0, this, TQT_SLOT( slotActivated() ) );
@@ -1476,7 +1476,7 @@ void KFontAction::setFont( const TQString &family )
           return;
        }
     }
-    i = lowerName.tqfind(" [");
+    i = lowerName.find(" [");
     if (i>-1)
     {
        lowerName = lowerName.left(i);
@@ -1513,7 +1513,7 @@ void KFontAction::setFont( const TQString &family )
     FcConfigSubstitute (config, pattern, FcMatchPattern);
     pattern = FcFontMatch(NULL, pattern, NULL);
     realFamily = (char*)FcNameUnparse(pattern);
-    realFamily.remove(realFamily.tqfind(regExp), realFamily.length());
+    realFamily.remove(realFamily.find(regExp), realFamily.length());
 
     if ( !realFamily.isEmpty() && realFamily != family )
        setFont( realFamily );
@@ -1534,7 +1534,7 @@ int KFontAction::plug( TQWidget *w, int index )
              TQT_SLOT( slotActivated( const TQString & ) ) );
     cb->setEnabled( isEnabled() );
     bar->insertWidget( id_, comboWidth(), cb, index );
-    cb->setMinimumWidth( cb->tqsizeHint().width() );
+    cb->setMinimumWidth( cb->sizeHint().width() );
 
     addContainer( bar, id_ );
 
@@ -1637,7 +1637,7 @@ void KFontSizeAction::init()
 void KFontSizeAction::setFontSize( int size )
 {
     if ( size == fontSize() ) {
-        setCurrentItem( items().tqfindIndex( TQString::number( size ) ) );
+        setCurrentItem( items().findIndex( TQString::number( size ) ) );
         return;
     }
 
@@ -1646,7 +1646,7 @@ void KFontSizeAction::setFontSize( int size )
         return;
     }
 
-    int index = items().tqfindIndex( TQString::number( size ) );
+    int index = items().findIndex( TQString::number( size ) );
     if ( index == -1 ) {
         // Insert at the correct position in the list (to keep sorting)
         TQValueList<int> lst;
@@ -1664,7 +1664,7 @@ void KFontSizeAction::setFontSize( int size )
             strLst.append( TQString::number(*it) );
         KSelectAction::setItems( strLst );
         // Find new current item
-        index = lst.tqfindIndex( size );
+        index = lst.findIndex( size );
         setCurrentItem( index );
     }
     else
@@ -2021,10 +2021,10 @@ int KToggleToolBarAction::plug( TQWidget* w, int index )
       return -1;
 
   if ( !m_toolBar ) {
-    // Note: tqtopLevelWidget() stops too early, we can't use it.
+    // Note: topLevelWidget() stops too early, we can't use it.
     TQWidget * tl = w;
     TQWidget * n;
-    while ( !tl->isDialog() && ( n = tl->tqparentWidget() ) ) // lookup parent and store
+    while ( !tl->isDialog() && ( n = tl->parentWidget() ) ) // lookup parent and store
       tl = n;
 
     KMainWindow * mw = dynamic_cast<KMainWindow *>(tl); // try to see if it's a kmainwindow
@@ -2139,7 +2139,7 @@ void KWidgetAction::setAutoSized( bool autoSized )
     return;
 
   KToolBar* toolBar = (KToolBar*)m_widget->parent();
-  int i = tqfindContainer( toolBar );
+  int i = findContainer( toolBar );
   if ( i == -1 )
     return;
   int id = itemId( i );
@@ -2326,14 +2326,14 @@ void KPasteTextAction::menuAboutToShow()
       if (reply.isValid())
         list = reply;
     }
-    TQString clipboardText = tqApp->clipboard()->text(QClipboard::Clipboard);
+    TQString clipboardText = qApp->clipboard()->text(QClipboard::Clipboard);
     if (list.isEmpty())
         list << clipboardText;
     bool found = false;
     for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it )
     {
       TQString text = KStringHandler::cEmSqueeze((*it).simplifyWhiteSpace(), m_popup->fontMetrics(), 20);
-      text.tqreplace("&", "&&");
+      text.replace("&", "&&");
       int id = m_popup->insertItem(text);
       if (!found && *it == clipboardText)
       {
@@ -2354,7 +2354,7 @@ void KPasteTextAction::menuItemActivated( int id)
       TQString clipboardText = reply;
       reply = klipper.call("setClipboardContents(TQString)", clipboardText);
       if (reply.isValid())
-        kdDebug(129) << "Clipboard: " << tqApp->clipboard()->text(QClipboard::Clipboard) << endl;
+        kdDebug(129) << "Clipboard: " << qApp->clipboard()->text(QClipboard::Clipboard) << endl;
     }
     TQTimer::singleShot(20, this, TQT_SLOT(slotActivated()));
 }
@@ -2362,7 +2362,7 @@ void KPasteTextAction::menuItemActivated( int id)
 void KPasteTextAction::slotActivated()
 {
   if (!m_mixedMode) {
-    TQWidget *w = tqApp->widgetAt(TQCursor::pos(), true);
+    TQWidget *w = qApp->widgetAt(TQCursor::pos(), true);
     TQMimeSource *data = TQApplication::clipboard()->data();
     if (!data->provides("text/plain") && w) {
       m_popup->popup(w->mapToGlobal(TQPoint(0, w->height())));
diff --git a/kdeui/kactionclasses.h b/kdeui/kactionclasses.h
index 0c2cf5bef..9a0ffbbae 100644
--- a/kdeui/kactionclasses.h
+++ b/kdeui/kactionclasses.h
@@ -186,7 +186,7 @@ public:
     /**
      * Defines the text (and icon, tooltip, whatsthis) that should be displayed
      * instead of the normal text, when the action is checked.
-     * This feature tqreplaces the checkmark that usually appears in front of the text, in menus.
+     * This feature replaces the checkmark that usually appears in front of the text, in menus.
      * It is useful when the text is mainly a verb: e.g. "Show <foo>"
      * should turn into "Hide <foo>" when activated.
      *
@@ -1393,7 +1393,7 @@ public:
     /**
     * Controls the behavior of the clipboard history menu popup.
     *
-    * @param mode If false and the clipboard tqcontains a non-text object
+    * @param mode If false and the clipboard contains a non-text object
     *             the popup menu with the clipboard history will appear
     *             immediately as the user clicks the toolbar action; if
     *             true, the action works like the standard paste action
diff --git a/kdeui/kactioncollection.cpp b/kdeui/kactioncollection.cpp
index b22f4fe13..e383809c6 100644
--- a/kdeui/kactioncollection.cpp
+++ b/kdeui/kactioncollection.cpp
@@ -426,7 +426,7 @@ TQStringList KActionCollection::groups() const
 
   TQAsciiDictIterator<KAction> it( d->m_actionDict );
   for( ; it.current(); ++it )
-    if ( !it.current()->group().isEmpty() && !lst.tqcontains( it.current()->group() ) )
+    if ( !it.current()->group().isEmpty() && !lst.contains( it.current()->group() ) )
       lst.append( it.current()->group() );
 
   return lst;
@@ -549,12 +549,12 @@ void KActionCollection::slotMenuItemHighlighted( int id )
 
   TQWidget *container = static_cast<TQWidget *>( const_cast<TQObject *>( sender() ) );
 
-  d->m_currentHighlightAction = tqfindAction( container, id );
+  d->m_currentHighlightAction = findAction( container, id );
 
   if ( !d->m_currentHighlightAction )
   {
       if ( !d->m_statusCleared )
-          emit cleartqStatusText();
+          emit clearStatusText();
       d->m_statusCleared = true;
       return;
   }
@@ -562,7 +562,7 @@ void KActionCollection::slotMenuItemHighlighted( int id )
   d->m_statusCleared = false;
   emit actionHighlighted( d->m_currentHighlightAction );
   emit actionHighlighted( d->m_currentHighlightAction, true );
-  emit actiontqStatusText( d->m_currentHighlightAction->toolTip() );
+  emit actionStatusText( d->m_currentHighlightAction->toolTip() );
 }
 
 void KActionCollection::slotMenuAboutToHide()
@@ -572,7 +572,7 @@ void KActionCollection::slotMenuAboutToHide()
     d->m_currentHighlightAction = 0;
 
     if ( !d->m_statusCleared )
-        emit cleartqStatusText();
+        emit clearStatusText();
     d->m_statusCleared = true;
 }
 
@@ -583,13 +583,13 @@ void KActionCollection::slotToolBarButtonHighlighted( int id, bool highlight )
 
   TQWidget *container = static_cast<TQWidget *>( const_cast<TQObject *>( sender() ) );
 
-  KAction *action = tqfindAction( container, id );
+  KAction *action = findAction( container, id );
 
   if ( !action )
   {
       d->m_currentHighlightAction = 0;
       // use tooltip groups for toolbar status text stuff instead (Simon)
-//      emit cleartqStatusText();
+//      emit clearStatusText();
       return;
   }
 
@@ -600,7 +600,7 @@ void KActionCollection::slotToolBarButtonHighlighted( int id, bool highlight )
   else
   {
     d->m_currentHighlightAction = 0;
-//    emit cleartqStatusText();
+//    emit clearStatusText();
   }
 }
 
@@ -609,7 +609,7 @@ void KActionCollection::slotDestroyed()
     d->m_dctHighlightContainers.remove( reinterpret_cast<void *>( const_cast<TQObject *>(sender()) ) );
 }
 
-KAction *KActionCollection::tqfindAction( TQWidget *container, int id )
+KAction *KActionCollection::findAction( TQWidget *container, int id )
 {
   TQPtrList<KAction> *actionList = d->m_dctHighlightContainers[ reinterpret_cast<void *>( container ) ];
 
@@ -713,8 +713,8 @@ bool KActionShortcutList::save() const
 	if( m_actions.xmlFile().isEmpty() )
 		return writeSettings();
 
-	TQString attrShortcut  = TQString::tqfromLatin1("shortcut");
-	TQString attrAccel     = TQString::tqfromLatin1("accel"); // Depricated attribute
+	TQString attrShortcut  = TQString::fromLatin1("shortcut");
+	TQString attrAccel     = TQString::fromLatin1("accel"); // Depricated attribute
 
 	// Read XML file
 	TQString sXml( KXMLGUIFactory::readConfigFile( xmlFile, false, instance() ) );
@@ -736,7 +736,7 @@ bool KActionShortcutList::save() const
 
 		// now see if this element already exists
                 // and create it if necessary (unless bSameAsDefault)
-		TQDomElement act_elem = KXMLGUIFactory::tqfindActionByName( elem, sName, !bSameAsDefault );
+		TQDomElement act_elem = KXMLGUIFactory::findActionByName( elem, sName, !bSameAsDefault );
                 if ( act_elem.isNull() )
                     continue;
 
diff --git a/kdeui/kactioncollection.h b/kdeui/kactioncollection.h
index 836a58c14..7ce10052c 100644
--- a/kdeui/kactioncollection.h
+++ b/kdeui/kactioncollection.h
@@ -69,13 +69,13 @@ typedef TQValueList<KAction *> KActionPtrList;
  *
  * \code
  * actionCollection()->setHighlightingEnabled(true);  
- * connect(actionCollection(), TQT_SIGNAL( actiontqStatusText( const TQString & ) ),
+ * connect(actionCollection(), TQT_SIGNAL( actionStatusText( const TQString & ) ),
  *           statusBar(), TQT_SLOT( message( const TQString & ) ) );
- * connect(actionCollection(), TQT_SIGNAL( cleartqStatusText() ),
+ * connect(actionCollection(), TQT_SIGNAL( clearStatusText() ),
  *           statusBar(), TQT_SLOT( clear() ) );
  * \endcode
  */
-class KDEUI_EXPORT KActionCollection : public TQObject
+class KDEUI_EXPORT KActionCollection : public QObject
 {
   friend class KAction;
   friend class KXMLGUIClient;
@@ -298,13 +298,13 @@ signals:
    *  
    * @see setHighlightingEnabled()
    */
-  void actiontqStatusText( const TQString &text );
+  void actionStatusText( const TQString &text );
   /** Emitted when an action loses highlighting.
    *  This is only emitted if you have setHighlightingEnabled()
    *  
    * @see setHighlightingEnabled()
    */
-  void cleartqStatusText();
+  void clearStatusText();
 
 private:
   /**
@@ -331,7 +331,7 @@ private slots:
    void slotDestroyed();
 
 private:
-   KAction *tqfindAction( TQWidget *container, int id );
+   KAction *findAction( TQWidget *container, int id );
 
 #ifndef KDE_NO_COMPAT
 public:
diff --git a/kdeui/kactivelabel.cpp b/kdeui/kactivelabel.cpp
index e0841bb06..c01a91d41 100644
--- a/kdeui/kactivelabel.cpp
+++ b/kdeui/kactivelabel.cpp
@@ -111,9 +111,9 @@ void KActiveLabel::keyPressEvent( TQKeyEvent *e )
     }
 }
 
-TQSize KActiveLabel::tqminimumSizeHint() const
+TQSize KActiveLabel::minimumSizeHint() const
 {
-   TQSize ms = tqminimumSize();
+   TQSize ms = minimumSize();
    if ((ms.width() > 0) && (ms.height() > 0))
       return ms;
 
@@ -134,9 +134,9 @@ TQSize KActiveLabel::tqminimumSizeHint() const
    return TQSize(w, h);
 }
 
-TQSize KActiveLabel::tqsizeHint() const
+TQSize KActiveLabel::sizeHint() const
 {
-   return tqminimumSizeHint();
+   return minimumSizeHint();
 }
 
 #include "kactivelabel.moc"
diff --git a/kdeui/kactivelabel.h b/kdeui/kactivelabel.h
index a04e3af27..8ab2bacf2 100644
--- a/kdeui/kactivelabel.h
+++ b/kdeui/kactivelabel.h
@@ -56,8 +56,8 @@ public:
      */
     KActiveLabel(const TQString & text, TQWidget * parent, const char * name = 0);
 
-    TQSize tqminimumSizeHint() const;
-    TQSize tqsizeHint() const;
+    TQSize minimumSizeHint() const;
+    TQSize sizeHint() const;
 
 public slots:
     /**
diff --git a/kdeui/kanimwidget.cpp b/kdeui/kanimwidget.cpp
index 1f1972ca4..5ff1037d5 100644
--- a/kdeui/kanimwidget.cpp
+++ b/kdeui/kanimwidget.cpp
@@ -74,7 +74,7 @@ void KAnimWidget::stop()
 {
   d->current_frame = 0;
   d->timer.stop();
-  tqrepaint();
+  repaint();
 }
 
 void KAnimWidget::setSize( int size )
@@ -143,7 +143,7 @@ void KAnimWidget::mousePressEvent( TQMouseEvent *e )
 void KAnimWidget::mouseReleaseEvent( TQMouseEvent *e )
 {
   if ( e->button() == LeftButton &&
-       rect().tqcontains( e->pos() ) )
+       rect().contains( e->pos() ) )
     emit clicked();
 
   TQFrame::mouseReleaseEvent( e );
@@ -159,10 +159,10 @@ void KAnimWidget::slotTimerUpdate()
      d->current_frame = 0;
 
   // TODO
-  // We have to clear the widget when tqrepainting a transparent image
+  // We have to clear the widget when repainting a transparent image
   // By doing it like this we get a bit of flicker though. A better
   // way might be to merge it with the background in drawContents.
-  tqrepaint(d->transparent);
+  repaint(d->transparent);
 }
 
 void KAnimWidget::drawContents( TQPainter *p )
diff --git a/kdeui/karrowbutton.cpp b/kdeui/karrowbutton.cpp
index 22d221bcb..fd9624b67 100644
--- a/kdeui/karrowbutton.cpp
+++ b/kdeui/karrowbutton.cpp
@@ -40,7 +40,7 @@ KArrowButton::~KArrowButton()
 	delete d;
 }
 
-TQSize KArrowButton::tqsizeHint() const
+TQSize KArrowButton::sizeHint() const
 {
 	return TQSize( 12, 12 );
 }
@@ -49,7 +49,7 @@ void KArrowButton::setArrowType(Qt::ArrowType a)
 {
 	if (d->arrow != a) {
 		d->arrow = a;
-		tqrepaint();
+		repaint();
 	}
 }
 Qt::ArrowType KArrowButton::arrowType() const
@@ -62,9 +62,9 @@ void KArrowButton::drawButton(TQPainter *p)
 	const unsigned int arrowSize = 8;
 	const unsigned int margin = 2;
 	
-        p->fillRect( rect(), tqcolorGroup().brush( TQColorGroup::Background ) );
+        p->fillRect( rect(), colorGroup().brush( TQColorGroup::Background ) );
 	style().drawPrimitive( TQStyle::PE_Panel, p, TQRect( 0, 0, width(), height() ),
-			       tqcolorGroup(), 
+			       colorGroup(), 
 			       isDown() ? TQStyle::Style_Sunken : TQStyle::Style_Default,
 			       TQStyleOption( 2, 0 ) );
 
@@ -104,7 +104,7 @@ void KArrowButton::drawButton(TQPainter *p)
 	if ( isDown() )
 		flags |= TQStyle::Style_Down;
 	style().drawPrimitive( e, p, TQRect( TQPoint( x, y ), TQSize( arrowSize, arrowSize ) ),
-			       tqcolorGroup(), flags );
+			       colorGroup(), flags );
 }
 
 void KArrowButton::virtual_hook( int, void* )
diff --git a/kdeui/karrowbutton.h b/kdeui/karrowbutton.h
index d85b6f914..e20278692 100644
--- a/kdeui/karrowbutton.h
+++ b/kdeui/karrowbutton.h
@@ -28,7 +28,7 @@ class KArrowButtonPrivate;
  * @short Draws a button with an arrow.
  *
  * Draws a button which shows an arrow pointing into a certain direction. The
- * arrow's tqalignment on the button depends on the direction it's pointing to,
+ * arrow's alignment on the button depends on the direction it's pointing to,
  * e.g. a left arrow is aligned at the left border, a upwards arrow at the top
  * border. This class honors the currently configured KStyle when drawing
  * the arrow.
@@ -59,7 +59,7 @@ class KDEUI_EXPORT KArrowButton : public QPushButton
 		/**
 		 * Reimplemented from TQPushButton.
 		 */
-		virtual TQSize tqsizeHint() const;
+		virtual TQSize sizeHint() const;
 
 		/**
 		* Returns the arrow type
@@ -67,12 +67,12 @@ class KDEUI_EXPORT KArrowButton : public QPushButton
 		*/
 		Qt::ArrowType arrowType() const;
 
-		// hacks for tqmoc braindamages with enums
+		// hacks for moc braindamages with enums
 		int arrowTp() const { return (int) arrowType(); }
 		void setArrowTp( int tp ) { setArrowType( (Qt::ArrowType) tp ); }
 	public slots:
 		/**
-		 * Defines in what direction the arrow is pointing to. Will tqrepaint the
+		 * Defines in what direction the arrow is pointing to. Will repaint the
 		 * button if necessary.
 		 *
 		 * @param a The direction this arrow should be pointing in
diff --git a/kdeui/kauthicon.cpp b/kdeui/kauthicon.cpp
index 2e9f2f69c..d4c18a114 100644
--- a/kdeui/kauthicon.cpp
+++ b/kdeui/kauthicon.cpp
@@ -102,7 +102,7 @@ KAuthIcon::KAuthIcon(TQWidget *parent, const char *name)
   lockBox = new TQLabel(this);
   lockBox->setFrameStyle(TQFrame::WinPanel|TQFrame::Raised);
   lockBox->setPixmap(lockPM);
-  lockBox->setFixedSize(lockBox->tqsizeHint());
+  lockBox->setFixedSize(lockBox->sizeHint());
 
   lockLabel = new TQLabel(this);
   lockLabel->setFrameStyle(TQFrame::NoFrame);
@@ -113,18 +113,18 @@ KAuthIcon::KAuthIcon(TQWidget *parent, const char *name)
     lockLabel->setText(lockText);
   else
     lockLabel->setText(openLockText);
-  lockLabel->tqsetAlignment(AlignCenter);
-  lockLabel->setMinimumSize(lockLabel->tqsizeHint());
+  lockLabel->setAlignment(AlignCenter);
+  lockLabel->setMinimumSize(lockLabel->sizeHint());
   lockLabel->setText(lockText);
 
-  tqlayout = new TQHBoxLayout(this);
+  layout = new TQHBoxLayout(this);
 
-  tqlayout->addWidget(lockBox, 0, AlignLeft|AlignVCenter);
-  tqlayout->addSpacing(5);
-  tqlayout->addWidget(lockLabel, 0, AlignRight|AlignVCenter);
+  layout->addWidget(lockBox, 0, AlignLeft|AlignVCenter);
+  layout->addSpacing(5);
+  layout->addWidget(lockLabel, 0, AlignRight|AlignVCenter);
 
-  tqlayout->activate();
-  resize(tqsizeHint());
+  layout->activate();
+  resize(sizeHint());
 }
 
 KAuthIcon::~KAuthIcon()
@@ -132,9 +132,9 @@ KAuthIcon::~KAuthIcon()
 }
 
 
-TQSize KAuthIcon::tqsizeHint() const
+TQSize KAuthIcon::sizeHint() const
 {
-  return tqlayout->tqminimumSize();
+  return layout->minimumSize();
 }
 
 
@@ -143,7 +143,7 @@ TQSize KAuthIcon::tqsizeHint() const
 KRootPermsIcon::KRootPermsIcon(TQWidget *parent, const char *name)
   : KAuthIcon(parent, name)
 {
-  updatetqStatus();
+  updateStatus();
 }
 
 
@@ -151,7 +151,7 @@ KRootPermsIcon::~KRootPermsIcon()
 {
 }
 
-void KRootPermsIcon::updatetqStatus()
+void KRootPermsIcon::updateStatus()
 {
   const bool newRoot = (geteuid() == 0);
   lockBox->setPixmap(newRoot ? openLockPM : lockPM);
@@ -170,7 +170,7 @@ KWritePermsIcon::KWritePermsIcon(const TQString & fileName,
   : KAuthIcon(parent, name)
 {
   fi.setFile(fileName);
-  updatetqStatus();
+  updateStatus();
 }
 
 
@@ -178,7 +178,7 @@ KWritePermsIcon::~KWritePermsIcon()
 {
 }
 
-void KWritePermsIcon::updatetqStatus()
+void KWritePermsIcon::updateStatus()
 {
   bool newwrite;
   newwrite = fi.isWritable();
diff --git a/kdeui/kauthicon.h b/kdeui/kauthicon.h
index 398d1fcb0..0bfe0cc22 100644
--- a/kdeui/kauthicon.h
+++ b/kdeui/kauthicon.h
@@ -55,7 +55,7 @@ public:
   KAuthIcon(TQWidget *parent = 0, const char *name = 0);
   ~KAuthIcon();
 
-  virtual TQSize tqsizeHint() const;
+  virtual TQSize sizeHint() const;
   /**
    * return the status of whatever is being monitored.
    */
@@ -66,7 +66,7 @@ public slots:
    * Re-implement this method if you want the icon to update itself
    * when something external has changed (i.e. a file on disk, uid/gid).
    */
-  virtual void updatetqStatus() = 0;
+  virtual void updateStatus() = 0;
 
 signals:
   /**
@@ -78,7 +78,7 @@ signals:
   void authChanged(bool authorized);
 
 protected:
-  TQHBoxLayout *tqlayout;
+  TQHBoxLayout *layout;
 
   TQLabel *lockBox;
   TQLabel *lockLabel;
@@ -114,7 +114,7 @@ public:
   bool status() const { return root; }
 
 public slots:
-  void updatetqStatus();
+  void updateStatus();
 
 protected:
   bool root;
@@ -149,7 +149,7 @@ public:
    * make the icon watch a new filename.
    * @param fileName the new file to monitor / display status for.
    */
-  void setFileName(const TQString & fileName) { fi.setFile(fileName); updatetqStatus(); }
+  void setFileName(const TQString & fileName) { fi.setFile(fileName); updateStatus(); }
 
   /**
   * return the filename of the currently watched file.
@@ -158,7 +158,7 @@ public:
   TQString fileName() const { return fi.fileName(); }
 
 public slots:
-  void updatetqStatus();
+  void updateStatus();
 
 protected:
   bool writable;
diff --git a/kdeui/kbugreport.cpp b/kdeui/kbugreport.cpp
index 28b917ed6..3d7898861 100644
--- a/kdeui/kbugreport.cpp
+++ b/kdeui/kbugreport.cpp
@@ -88,7 +88,7 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD
   TQWidget * parent = plainPage();
   d->submitBugButton = 0;
 
-  //if ( m_aboutData->bugAddress() == TQString::tqfromLatin1("submit@bugs.pearsoncomputing.net") )
+  //if ( m_aboutData->bugAddress() == TQString::fromLatin1("submit@bugs.pearsoncomputing.net") )
   //{
   //  // This is a core KDE application -> redirect to the web form
     // Always redirect to the Web form for Trinity
@@ -153,9 +153,9 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD
   TQWhatsThis::add( d->appcombo, qwtstr );
   d->appcombo->insertStrList((const char**)packages);
   connect(d->appcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(appChanged(int)));
-  d->appname = TQString::tqfromLatin1( m_aboutData
+  d->appname = TQString::fromLatin1( m_aboutData
                                     ? m_aboutData->productName()
-                                    : tqApp->name() );
+                                    : qApp->name() );
   glay->addWidget( d->appcombo, row, 1 );
   int index = 0;
   for (; index < d->appcombo->count(); index++) {
@@ -179,8 +179,8 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD
       m_strVersion = m_aboutData->version();
   else
       m_strVersion = i18n("no version set (programmer error!)");
-  d->kde_version = TQString::tqfromLatin1( KDE_VERSION_STRING );
-  d->kde_version += ", " + TQString::tqfromLatin1( KDE_DISTRIBUTION_TEXT );
+  d->kde_version = TQString::fromLatin1( KDE_VERSION_STRING );
+  d->kde_version += ", " + TQString::fromLatin1( KDE_DISTRIBUTION_TEXT );
   if ( !d->submitBugButton )
       m_strVersion += " " + d->kde_version;
   m_version = new TQLabel( m_strVersion, parent );
@@ -193,16 +193,16 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD
 
   struct utsname unameBuf;
   uname( &unameBuf );
-  d->os = TQString::tqfromLatin1( unameBuf.sysname ) +
-          " (" + TQString::tqfromLatin1( unameBuf.machine ) + ") "
-          "release " + TQString::tqfromLatin1( unameBuf.release );
+  d->os = TQString::fromLatin1( unameBuf.sysname ) +
+          " (" + TQString::fromLatin1( unameBuf.machine ) + ") "
+          "release " + TQString::fromLatin1( unameBuf.release );
 
   tmpLabel = new TQLabel(d->os, parent);
   glay->addMultiCellWidget( tmpLabel, row, row, 1, 2 );
 
   tmpLabel = new TQLabel(i18n("Compiler:"), parent);
   glay->addWidget( tmpLabel, ++row, 0 );
-  tmpLabel = new TQLabel(TQString::tqfromLatin1(KDE_COMPILER_VERSION), parent);
+  tmpLabel = new TQLabel(TQString::fromLatin1(KDE_COMPILER_VERSION), parent);
   glay->addMultiCellWidget( tmpLabel, row, row, 1, 2 );
 
   if ( !d->submitBugButton )
@@ -251,7 +251,7 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD
 
     lay->addSpacing(10);
     TQString text = i18n("To submit a bug report, click on the button below.\n"
-                        "This will open a web browser window on http://bugs.pearsoncomputing.net where you will tqfind a form to fill in.\n"
+                        "This will open a web browser window on http://bugs.pearsoncomputing.net where you will find a form to fill in.\n"
                         "The information displayed above will be transferred to that server.");
     TQLabel * label = new TQLabel( text, parent, "label");
     lay->addWidget( label );
@@ -259,7 +259,7 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD
 
     updateURL();
     d->submitBugButton->setText( i18n("&Launch Bug Report Wizard") );
-    d->submitBugButton->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed);
+    d->submitBugButton->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed);
     lay->addWidget( d->submitBugButton );
     lay->addSpacing(10);
 
@@ -289,7 +289,7 @@ void KBugReport::updateURL()
 void KBugReport::appChanged(int i)
 {
     TQString appName = d->appcombo->text(i);
-    int index = appName.tqfind( '/' );
+    int index = appName.find( '/' );
     if ( index > 0 )
         appName = appName.left( index );
     kdDebug() << "appName " << appName << endl;
@@ -311,7 +311,7 @@ void KBugReport::slotConfigureEmail()
 {
   if (m_process) return;
   m_process = new KProcess;
-  *m_process << TQString::tqfromLatin1("kcmshell") << TQString::tqfromLatin1("kcm_useraccount");
+  *m_process << TQString::fromLatin1("kcmshell") << TQString::fromLatin1("kcm_useraccount");
   connect(m_process, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(slotSetFrom()));
   if (!m_process->start())
   {
@@ -330,24 +330,24 @@ void KBugReport::slotSetFrom()
   m_configureEmail->setEnabled(true);
 
   // ### KDE4: why oh why is KEmailSettings in kio?
-  KConfig emailConf( TQString::tqfromLatin1("emaildefaults") );
+  KConfig emailConf( TQString::fromLatin1("emaildefaults") );
 
-  // tqfind out the default profile
-  emailConf.setGroup( TQString::tqfromLatin1("Defaults") );
-  TQString profile = TQString::tqfromLatin1("PROFILE_");
-  profile += emailConf.readEntry( TQString::tqfromLatin1("Profile"),
-                                  TQString::tqfromLatin1("Default") );
+  // find out the default profile
+  emailConf.setGroup( TQString::fromLatin1("Defaults") );
+  TQString profile = TQString::fromLatin1("PROFILE_");
+  profile += emailConf.readEntry( TQString::fromLatin1("Profile"),
+                                  TQString::fromLatin1("Default") );
 
   emailConf.setGroup( profile );
-  TQString fromaddr = emailConf.readEntry( TQString::tqfromLatin1("EmailAddress") );
+  TQString fromaddr = emailConf.readEntry( TQString::fromLatin1("EmailAddress") );
   if (fromaddr.isEmpty()) {
      struct passwd *p;
      p = getpwuid(getuid());
-     fromaddr = TQString::tqfromLatin1(p->pw_name);
+     fromaddr = TQString::fromLatin1(p->pw_name);
   } else {
-     TQString name = emailConf.readEntry( TQString::tqfromLatin1("FullName"));
+     TQString name = emailConf.readEntry( TQString::fromLatin1("FullName"));
      if (!name.isEmpty())
-        fromaddr = name + TQString::tqfromLatin1(" <") + fromaddr + TQString::tqfromLatin1(">");
+        fromaddr = name + TQString::fromLatin1(" <") + fromaddr + TQString::fromLatin1(">");
   }
   m_from->setText( fromaddr );
 }
@@ -438,9 +438,9 @@ TQString KBugReport::text() const
 {
     kdDebug() << m_bgSeverity->selected()->name() << endl;
     // Prepend the pseudo-headers to the contents of the mail
-  TQString severity = TQString::tqfromLatin1(m_bgSeverity->selected()->name());
+  TQString severity = TQString::fromLatin1(m_bgSeverity->selected()->name());
   TQString appname = d->appcombo->currentText();
-  TQString os = TQString::tqfromLatin1("OS: %1 (%2)\n").
+  TQString os = TQString::fromLatin1("OS: %1 (%2)\n").
                arg(KDE_COMPILING_OS).
                arg(KDE_DISTRIBUTION_TEXT);
   TQString bodyText;
@@ -452,25 +452,25 @@ TQString KBugReport::text() const
      bodyText += line;
   }
 
-  if (severity == TQString::tqfromLatin1("i18n") && KGlobal::locale()->language() != KLocale::defaultLanguage()) {
+  if (severity == TQString::fromLatin1("i18n") && KGlobal::locale()->language() != KLocale::defaultLanguage()) {
       // Case 1 : i18n bug
-      TQString package = TQString::tqfromLatin1("i18n_%1").arg(KGlobal::locale()->language());
-      package = package.tqreplace(TQString::tqfromLatin1("_"), TQString::tqfromLatin1("-"));
-      return TQString::tqfromLatin1("Package: %1").arg(package) +
-          TQString::tqfromLatin1("\n"
+      TQString package = TQString::fromLatin1("i18n_%1").arg(KGlobal::locale()->language());
+      package = package.replace(TQString::fromLatin1("_"), TQString::fromLatin1("-"));
+      return TQString::fromLatin1("Package: %1").arg(package) +
+          TQString::fromLatin1("\n"
                               "Application: %1\n"
                               // not really i18n's version, so better here IMHO
                               "Version: %2\n").arg(appname).arg(m_strVersion)+
-          os+TQString::tqfromLatin1("\n")+bodyText;
+          os+TQString::fromLatin1("\n")+bodyText;
   } else {
-      appname = appname.tqreplace(TQString::tqfromLatin1("_"), TQString::tqfromLatin1("-"));
+      appname = appname.replace(TQString::fromLatin1("_"), TQString::fromLatin1("-"));
       // Case 2 : normal bug
-      return TQString::tqfromLatin1("Package: %1\n"
+      return TQString::fromLatin1("Package: %1\n"
                                  "Version: %2\n"
                                  "Severity: %3\n")
           .arg(appname).arg(m_strVersion).arg(severity)+
-          TQString::tqfromLatin1("Compiler: %1\n").arg(KDE_COMPILER_VERSION)+
-          os+TQString::tqfromLatin1("\n")+bodyText;
+          TQString::fromLatin1("Compiler: %1\n").arg(KDE_COMPILER_VERSION)+
+          os+TQString::fromLatin1("\n")+bodyText;
   }
 }
 
@@ -478,12 +478,12 @@ bool KBugReport::sendBugReport()
 {
   TQString recipient ( m_aboutData ?
     m_aboutData->bugAddress() :
-    TQString::tqfromLatin1("submit@bugs.pearsoncomputing.net") );
+    TQString::fromLatin1("submit@bugs.pearsoncomputing.net") );
 
   TQString command;
   command = locate("exe", "ksendbugmail");
   if (command.isEmpty())
-      command = KStandardDirs::findExe( TQString::tqfromLatin1("ksendbugmail") );
+      command = KStandardDirs::findExe( TQString::fromLatin1("ksendbugmail") );
 
   KTempFile outputfile;
   outputfile.close();
diff --git a/kdeui/kbuttonbox.cpp b/kdeui/kbuttonbox.cpp
index dc5f2674b..eb0e27827 100644
--- a/kdeui/kbuttonbox.cpp
+++ b/kdeui/kbuttonbox.cpp
@@ -20,7 +20,7 @@
 /*
  * KButtonBox class
  *
- * A container widget for buttons. Uses Qt tqlayout control to place the
+ * A container widget for buttons. Uses Qt layout control to place the
  * buttons, can handle both vertical and horizontal button placement.
 *
  * HISTORY
@@ -39,7 +39,7 @@
  * which makes the buttons look better.
  *
  * 01/17/98  Mario Weilguni <mweilguni@sime.com>
- * Fixed a bug in tqsizeHint()
+ * Fixed a bug in sizeHint()
  * Improved the handling of Motif default buttons
  *
  * 01/09/98  Mario Weilguni <mweilguni@sime.com>
@@ -160,7 +160,7 @@ void KButtonBox::addStretch(int scale) {
   }
 }
 
-void KButtonBox::tqlayout() {
+void KButtonBox::layout() {
   // resize all buttons
   const TQSize bs = bestButtonSize();
 
@@ -178,7 +178,7 @@ void KButtonBox::tqlayout() {
     ++itr;
   }
 
-  setMinimumSize(tqsizeHint());
+  setMinimumSize(sizeHint());
 }
 
 void KButtonBox::placeButtons() {
@@ -300,7 +300,7 @@ TQSize KButtonBox::bestButtonSize() const {
   return s;
 }
 
-TQSize KButtonBox::tqsizeHint() const {
+TQSize KButtonBox::sizeHint() const {
   unsigned int dw;
 
   if(data->buttons.isEmpty())
@@ -355,8 +355,8 @@ TQSizePolicy KButtonBox::sizePolicy() const
  * as minimum width
  */
 TQSize KButtonBox::buttonSizeHint(TQPushButton *b) const {
-  TQSize s = b->tqsizeHint();
-  const TQSize ms = b->tqminimumSize();
+  TQSize s = b->sizeHint();
+  const TQSize ms = b->minimumSize();
   if(s.width() < minButtonWidth)
     s.setWidth(minButtonWidth);
 
diff --git a/kdeui/kbuttonbox.h b/kdeui/kbuttonbox.h
index 0d4b36b67..7eda45577 100644
--- a/kdeui/kbuttonbox.h
+++ b/kdeui/kbuttonbox.h
@@ -30,9 +30,9 @@ class KButtonBoxPrivate;
 /**
  * Container widget for buttons.
  *
- * This class uses Qt tqlayout control to place the buttons; can handle
+ * This class uses Qt layout control to place the buttons; can handle
  * both vertical and horizontal button placement.  The default border
- * is now @p 0 (making it easier to deal with tqlayouts). The space
+ * is now @p 0 (making it easier to deal with layouts). The space
  * between buttons is now more Motif compliant.
  *
  * @author Mario Weilguni <mweilguni@sime.com>
@@ -65,7 +65,7 @@ public:
     * This size is
     * calculated by the width/height of all buttons plus border/autoborder.
     */
-  virtual TQSize tqsizeHint() const;
+  virtual TQSize sizeHint() const;
   virtual TQSizePolicy sizePolicy() const;
   virtual void resizeEvent(TQResizeEvent *);
 
@@ -146,9 +146,9 @@ public:
     * This function must be called @em once after all buttons have been
     * inserted.
     *
-    * It will start tqlayout control.
+    * It will start layout control.
     */
-  void tqlayout();
+  void layout();
 
 public: // as PrivateData needs Item, it has to be exported
   class Item;
diff --git a/kdeui/kcharselect.cpp b/kdeui/kcharselect.cpp
index a0486b42f..1eb707c4d 100644
--- a/kdeui/kcharselect.cpp
+++ b/kdeui/kcharselect.cpp
@@ -45,7 +45,7 @@
 class KCharSelect::KCharSelectPrivate
 {
 public:
-    TQLineEdit *tqunicodeLine;
+    TQLineEdit *unicodeLine;
 };
 
 TQFontDatabase * KCharSelect::fontDataBase = 0;
@@ -66,7 +66,7 @@ KCharSelectTable::KCharSelectTable( TQWidget *parent, const char *name, const TQ
     : TQGridView( parent, name ), vFont( _font ), vChr( _chr ),
       vTableNum( _tableNum ), vPos( 0, 0 ), focusItem( _chr ), focusPos( 0, 0 ), d(0)
 {
-    setBackgroundColor( tqcolorGroup().base() );
+    setBackgroundColor( colorGroup().base() );
 
     setCellWidth( 20 );
     setCellHeight( 25 );
@@ -74,7 +74,7 @@ KCharSelectTable::KCharSelectTable( TQWidget *parent, const char *name, const TQ
     setNumCols( 32 );
     setNumRows( 8 );
 
-    tqrepaintContents( false );
+    repaintContents( false );
     
     setToolTips();
 
@@ -86,7 +86,7 @@ KCharSelectTable::KCharSelectTable( TQWidget *parent, const char *name, const TQ
 void KCharSelectTable::setFont( const TQString &_font )
 {
     vFont = _font;
-    tqrepaintContents( false );
+    repaintContents( false );
 
     setToolTips();
 }
@@ -95,7 +95,7 @@ void KCharSelectTable::setFont( const TQString &_font )
 void KCharSelectTable::setChar( const TQChar &_chr )
 {
     vChr = _chr;
-    tqrepaintContents( false );
+    repaintContents( false );
 }
 
 //==================================================================
@@ -104,13 +104,13 @@ void KCharSelectTable::setTableNum( int _tableNum )
     focusItem = TQChar( _tableNum * 256 );
 
     vTableNum = _tableNum;
-    tqrepaintContents( false );
+    repaintContents( false );
 
     setToolTips();
 }
 
 //==================================================================
-TQSize KCharSelectTable::tqsizeHint() const
+TQSize KCharSelectTable::sizeHint() const
 {
     int w = cellWidth();
     int h = cellHeight();
@@ -155,26 +155,26 @@ void KCharSelectTable::paintCell( class TQPainter* p, int row, int col )
     c += row * numCols();
     c += col;
 
-    if ( c == vChr.tqunicode() ) {
-	p->setBrush( TQBrush( tqcolorGroup().highlight() ) );
+    if ( c == vChr.unicode() ) {
+	p->setBrush( TQBrush( colorGroup().highlight() ) );
 	p->setPen( NoPen );
 	p->drawRect( 0, 0, w, h );
-	p->setPen( tqcolorGroup().highlightedText() );
+	p->setPen( colorGroup().highlightedText() );
 	vPos = TQPoint( col, row );
     } else {
 	TQFontMetrics fm = TQFontMetrics( font );
 	if( fm.inFont( c ) )
-		p->setBrush( TQBrush( tqcolorGroup().base() ) );
+		p->setBrush( TQBrush( colorGroup().base() ) );
 	else
-		p->setBrush( TQBrush( tqcolorGroup().button() ) );
+		p->setBrush( TQBrush( colorGroup().button() ) );
 	p->setPen( NoPen );
 	p->drawRect( 0, 0, w, h );
-	p->setPen( tqcolorGroup().text() );
+	p->setPen( colorGroup().text() );
     }
 
-    if ( c == focusItem.tqunicode() && hasFocus() ) {
+    if ( c == focusItem.unicode() && hasFocus() ) {
 	style().drawPrimitive( TQStyle::PE_FocusRect, p, TQRect( 2, 2, w - 4, h - 4 ), 
-			       tqcolorGroup() );
+			       colorGroup() );
 	focusPos = TQPoint( col, row );
     }
 
@@ -182,7 +182,7 @@ void KCharSelectTable::paintCell( class TQPainter* p, int row, int col )
 
     p->drawText( 0, 0, x2, y2, AlignHCenter | AlignVCenter, TQString( TQChar( c ) ) );
 
-    p->setPen( tqcolorGroup().text() );
+    p->setPen( colorGroup().text() );
     p->drawLine( x2, 0, x2, y2 );
     p->drawLine( 0, y2, x2, y2 );
 
@@ -210,9 +210,9 @@ void KCharSelectTable::mouseMoveEvent( TQMouseEvent *e )
 	focusPos = vPos;
 	focusItem = vChr;
 
-	tqrepaintCell( oldFocus.y(), oldFocus.x(), true );
-	tqrepaintCell( oldPos.y(), oldPos.x(), true );
-	tqrepaintCell( vPos.y(), vPos.x(), true );
+	repaintCell( oldFocus.y(), oldFocus.x(), true );
+	repaintCell( oldPos.y(), oldPos.x(), true );
+	repaintCell( vPos.y(), vPos.x(), true );
 
 	emit highlighted( vChr );
 	emit highlighted();
@@ -256,8 +256,8 @@ void KCharSelectTable::keyPressEvent( TQKeyEvent *e )
 	vPos = focusPos;
 	vChr = focusItem;
 
-	tqrepaintCell( oldPos.y(), oldPos.x(), true );
-	tqrepaintCell( vPos.y(), vPos.x(), true );
+	repaintCell( oldPos.y(), oldPos.x(), true );
+	repaintCell( vPos.y(), vPos.x(), true );
 
 	emit activated( vChr );
 	emit activated();
@@ -277,8 +277,8 @@ void KCharSelectTable::gotoLeft()
 
 	focusItem = TQChar( vTableNum * 256 + numCols() * focusPos.y() + focusPos.x() );
 
-	tqrepaintCell( oldPos.y(), oldPos.x(), true );
-	tqrepaintCell( focusPos.y(), focusPos.x(), true );
+	repaintCell( oldPos.y(), oldPos.x(), true );
+	repaintCell( focusPos.y(), focusPos.x(), true );
 
 	emit focusItemChanged( vChr );
 	emit focusItemChanged();
@@ -295,8 +295,8 @@ void KCharSelectTable::gotoRight()
 
 	focusItem = TQChar( vTableNum * 256 + numCols() * focusPos.y() + focusPos.x() );
 
-	tqrepaintCell( oldPos.y(), oldPos.x(), true );
-	tqrepaintCell( focusPos.y(), focusPos.x(), true );
+	repaintCell( oldPos.y(), oldPos.x(), true );
+	repaintCell( focusPos.y(), focusPos.x(), true );
 
 	emit focusItemChanged( vChr );
 	emit focusItemChanged();
@@ -313,8 +313,8 @@ void KCharSelectTable::gotoUp()
 
 	focusItem = TQChar( vTableNum * 256 + numCols() * focusPos.y() + focusPos.x() );
 
-	tqrepaintCell( oldPos.y(), oldPos.x(), true );
-	tqrepaintCell( focusPos.y(), focusPos.x(), true );
+	repaintCell( oldPos.y(), oldPos.x(), true );
+	repaintCell( focusPos.y(), focusPos.x(), true );
 
 	emit focusItemChanged( vChr );
 	emit focusItemChanged();
@@ -331,8 +331,8 @@ void KCharSelectTable::gotoDown()
 
 	focusItem = TQChar( vTableNum * 256 + numCols() * focusPos.y() + focusPos.x() );
 
-	tqrepaintCell( oldPos.y(), oldPos.x(), true );
-	tqrepaintCell( focusPos.y(), focusPos.x(), true );
+	repaintCell( oldPos.y(), oldPos.x(), true );
+	repaintCell( focusPos.y(), focusPos.x(), true );
 
 	emit focusItemChanged( vChr );
 	emit focusItemChanged();
@@ -381,41 +381,41 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f
     bar->setSpacing( KDialog::spacingHint() );
 
     TQLabel* const lFont = new TQLabel( i18n( "Font:" ), bar );
-    lFont->resize( lFont->tqsizeHint() );
-    lFont->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter );
-    lFont->setMaximumWidth( lFont->tqsizeHint().width() );
+    lFont->resize( lFont->sizeHint() );
+    lFont->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
+    lFont->setMaximumWidth( lFont->sizeHint().width() );
 
     fontCombo = new TQComboBox( true, bar );
     fillFontCombo();
-    fontCombo->resize( fontCombo->tqsizeHint() );
+    fontCombo->resize( fontCombo->sizeHint() );
 
     connect( fontCombo, TQT_SIGNAL( activated( const TQString & ) ), this, TQT_SLOT( fontSelected( const TQString & ) ) );
 
     TQLabel* const lTable = new TQLabel( i18n( "Table:" ), bar );
-    lTable->resize( lTable->tqsizeHint() );
-    lTable->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter );
-    lTable->setMaximumWidth( lTable->tqsizeHint().width() );
+    lTable->resize( lTable->sizeHint() );
+    lTable->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
+    lTable->setMaximumWidth( lTable->sizeHint().width() );
 
     tableSpinBox = new TQSpinBox( 0, 255, 1, bar );
-    tableSpinBox->resize( tableSpinBox->tqsizeHint() );
+    tableSpinBox->resize( tableSpinBox->sizeHint() );
 
     connect( tableSpinBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( tableChanged( int ) ) );
 
     TQLabel* const lUnicode = new TQLabel( i18n( "&Unicode code point:" ), bar );
-    lUnicode->resize( lUnicode->tqsizeHint() );
-    lUnicode->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter );
-    lUnicode->setMaximumWidth( lUnicode->tqsizeHint().width() );
+    lUnicode->resize( lUnicode->sizeHint() );
+    lUnicode->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
+    lUnicode->setMaximumWidth( lUnicode->sizeHint().width() );
 
     const TQRegExp rx( "[a-fA-F0-9]{1,4}" );
     TQValidator* const validator = new TQRegExpValidator( rx, this );
 
-    d->tqunicodeLine = new KLineEdit( bar );
-    d->tqunicodeLine->setValidator(validator);
-    lUnicode->setBuddy(d->tqunicodeLine);
-    d->tqunicodeLine->resize( d->tqunicodeLine->tqsizeHint() );
+    d->unicodeLine = new KLineEdit( bar );
+    d->unicodeLine->setValidator(validator);
+    lUnicode->setBuddy(d->unicodeLine);
+    d->unicodeLine->resize( d->unicodeLine->sizeHint() );
     slotUpdateUnicode(_chr);
 
-    connect( d->tqunicodeLine, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotUnicodeEntered() ) );
+    connect( d->unicodeLine, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotUnicodeEntered() ) );
 
     charTable = new KCharSelectTable( this, name, _font.isEmpty() ? TQVBox::font().family() : _font, _chr, _tableNum );
     const TQSize sz( charTable->contentsWidth()  +  4 ,
@@ -452,15 +452,15 @@ KCharSelect::~KCharSelect()
 }
 
 //==================================================================
-TQSize KCharSelect::tqsizeHint() const
+TQSize KCharSelect::sizeHint() const
 {
-    return TQVBox::tqsizeHint();
+    return TQVBox::sizeHint();
 }
 
 //==================================================================
 void KCharSelect::setFont( const TQString &_font )
 {
-    const TQValueList<TQString>::Iterator it = fontList.tqfind( _font );
+    const TQValueList<TQString>::Iterator it = fontList.find( _font );
     if ( it != fontList.end() ) {
 	TQValueList<TQString>::Iterator it2 = fontList.begin();
 	int pos = 0;
@@ -469,7 +469,7 @@ void KCharSelect::setFont( const TQString &_font )
 	charTable->setFont( _font );
     }
     else
-	kdWarning() << "Can't tqfind Font: " << _font << endl;
+	kdWarning() << "Can't find Font: " << _font << endl;
 }
 
 //==================================================================
@@ -513,7 +513,7 @@ void KCharSelect::tableChanged( int _value )
 //==================================================================
 void KCharSelect::slotUnicodeEntered( )
 {
-    const TQString s = d->tqunicodeLine->text();
+    const TQString s = d->unicodeLine->text();
     if (s.isEmpty())
         return;
     
@@ -532,10 +532,10 @@ void KCharSelect::slotUnicodeEntered( )
 
 void KCharSelect::slotUpdateUnicode( const TQChar &c )
 {
-    const int uc = c.tqunicode();
+    const int uc = c.unicode();
     TQString s;
     s.sprintf("%04X", uc);
-    d->tqunicodeLine->setText(s);
+    d->unicodeLine->setText(s);
 }
 
 void KCharSelectTable::virtual_hook( int, void*)
diff --git a/kdeui/kcharselect.h b/kdeui/kcharselect.h
index 79ea61820..526d594b6 100644
--- a/kdeui/kcharselect.h
+++ b/kdeui/kcharselect.h
@@ -56,7 +56,7 @@ public:
     KCharSelectTable( TQWidget *parent, const char *name, const TQString &_font,
 		      const TQChar &_chr, int _tableNum );
 
-    virtual TQSize tqsizeHint() const;
+    virtual TQSize sizeHint() const;
     virtual void resizeEvent( TQResizeEvent * );
 
     virtual void setFont( const TQString &_font );
@@ -127,7 +127,7 @@ private:
  * KCharSelect supports keyboard and mouse navigation. Click+Move
  * always selects the character below the mouse cursor. Using the
  * arrow keys moves the focus mark around and pressing RETURN
- * or SPACE selects the cell which tqcontains the focus mark.
+ * or SPACE selects the cell which contains the focus mark.
  *
  * To get the current selected character, use the chr()
  * method. You can set the character which should be displayed with
@@ -157,7 +157,7 @@ public:
     /**
      * Reimplemented.
      */
-    virtual TQSize tqsizeHint() const;
+    virtual TQSize sizeHint() const;
 
     /**
      * Sets the font which is displayed to @p font
diff --git a/kdeui/kcmenumngr.cpp b/kdeui/kcmenumngr.cpp
index d0774ae44..9cd9d6288 100644
--- a/kdeui/kcmenumngr.cpp
+++ b/kdeui/kcmenumngr.cpp
@@ -35,10 +35,10 @@ KContextMenuManager* KContextMenuManager::manager = 0;
 KContextMenuManager::KContextMenuManager( TQObject* parent, const char* name )
     : TQObject( parent, name)
 {
-    KConfigGroupSaver saver ( KGlobal::config(), TQString::tqfromLatin1("Shortcuts") ) ;
-    menuKey = KShortcut( saver.config()->readEntry(TQString::tqfromLatin1("PopupContextMenu"), TQString::tqfromLatin1("Menu") ) ).keyCodeQt();
-    saver.config()->setGroup( TQString::tqfromLatin1("ContextMenus") ) ;
-    showOnPress = saver.config()->readBoolEntry(TQString::tqfromLatin1("ShowOnPress"), true );
+    KConfigGroupSaver saver ( KGlobal::config(), TQString::fromLatin1("Shortcuts") ) ;
+    menuKey = KShortcut( saver.config()->readEntry(TQString::fromLatin1("PopupContextMenu"), TQString::fromLatin1("Menu") ) ).keyCodeQt();
+    saver.config()->setGroup( TQString::fromLatin1("ContextMenus") ) ;
+    showOnPress = saver.config()->readBoolEntry(TQString::fromLatin1("ShowOnPress"), true );
 }
 
 KContextMenuManager::~KContextMenuManager()
@@ -122,7 +122,7 @@ bool KContextMenuManager::eventFilter( TQObject *o, TQEvent * e)
 
 void KContextMenuManager::widgetDestroyed()
 {
-    if ( menus.tqfind( (TQObject*)sender() ) )
+    if ( menus.find( (TQObject*)sender() ) )
 	menus.remove( (TQObject*)sender() );
 }
 
diff --git a/kdeui/kcmenumngr.h b/kdeui/kcmenumngr.h
index 63a3217e6..cd478e494 100644
--- a/kdeui/kcmenumngr.h
+++ b/kdeui/kcmenumngr.h
@@ -75,7 +75,7 @@ If the popup menu is invoked with the keyboard shortcut, it's shown at
 the position of the micro focus hint of the widget ( TQWidget::microFocusHint() ).
 */
 
-class KDEUI_EXPORT KContextMenuManager : public TQObject
+class KDEUI_EXPORT KContextMenuManager : public QObject
 {
     Q_OBJECT
 public:
diff --git a/kdeui/kcmodule.h b/kdeui/kcmodule.h
index 54c4af6e3..3791f950a 100644
--- a/kdeui/kcmodule.h
+++ b/kdeui/kcmodule.h
@@ -49,7 +49,7 @@ class KInstance;
  * the module author.
  *
  * To write a config module, you have to create a library
- * that tqcontains at one factory function like this:
+ * that contains at one factory function like this:
  *
  * \code
  * #include <kgenericfactory.h>
@@ -312,7 +312,7 @@ protected:
    * Sets the RootOnly message.
    *
    * This message will be shown at the top of the module of the
-   * corresponding desktop file tqcontains the line X-KDE-RootOnly=true.
+   * corresponding desktop file contains the line X-KDE-RootOnly=true.
    * If no message is set, a default one will be used.
    *
    * @see KCModule::rootOnlyMsg
diff --git a/kdeui/kcolorbutton.cpp b/kdeui/kcolorbutton.cpp
index e4d8f3340..3cccbe1df 100644
--- a/kdeui/kcolorbutton.cpp
+++ b/kdeui/kcolorbutton.cpp
@@ -85,7 +85,7 @@ void KColorButton::setColor( const TQColor &c )
 {
   if ( col != c ) {
     col = c;
-    tqrepaint( false );
+    repaint( false );
     emit changed( col );
   }
 }
@@ -108,29 +108,29 @@ void KColorButton::drawButtonLabel( TQPainter *painter )
   TQRect r = style().subRect( TQStyle::SR_PushButtonContents, this );
   r.rect(&x, &y, &w, &h);
 
-  int margin = style().tqpixelMetric( TQStyle::PM_ButtonMargin, this );
+  int margin = style().pixelMetric( TQStyle::PM_ButtonMargin, this );
   x += margin;
   y += margin;
   w -= 2*margin;
   h -= 2*margin;
 
   if (isOn() || isDown()) {
-    x += style().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal, this );
-    y += style().tqpixelMetric( TQStyle::PM_ButtonShiftVertical, this );
+    x += style().pixelMetric( TQStyle::PM_ButtonShiftHorizontal, this );
+    y += style().pixelMetric( TQStyle::PM_ButtonShiftVertical, this );
   }
 
   TQColor fillCol = isEnabled() ? col : backgroundColor();
-  qDrawShadePanel( painter, x, y, w, h, tqcolorGroup(), true, 1, NULL);
+  qDrawShadePanel( painter, x, y, w, h, colorGroup(), true, 1, NULL);
   if ( fillCol.isValid() )
     painter->fillRect( x+1, y+1, w-2, h-2, fillCol );
 
   if ( hasFocus() ) {
     TQRect focusRect = style().subRect( TQStyle::SR_PushButtonFocusRect, this );
-    style().drawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, tqcolorGroup() );
+    style().drawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() );
   }
 }
 
-TQSize KColorButton::tqsizeHint() const
+TQSize KColorButton::sizeHint() const
 {
   return style().sizeFromContents(TQStyle::CT_PushButton, this, TQSize(40, 15)).
 	  	expandedTo(TQApplication::globalStrut());
@@ -153,11 +153,11 @@ void KColorButton::keyPressEvent( TQKeyEvent *e )
 {
   KKey key( e );
 
-  if ( KStdAccel::copy().tqcontains( key ) ) {
+  if ( KStdAccel::copy().contains( key ) ) {
     TQMimeSource* mime = new KColorDrag( color() );
     TQApplication::clipboard()->setData( mime, QClipboard::Clipboard );
   }
-  else if ( KStdAccel::paste().tqcontains( key ) ) {
+  else if ( KStdAccel::paste().contains( key ) ) {
     TQColor color;
     KColorDrag::decode( TQApplication::clipboard()->data( QClipboard::Clipboard ), color );
     setColor( color );
diff --git a/kdeui/kcolorbutton.h b/kdeui/kcolorbutton.h
index ebd4ece58..cff929156 100644
--- a/kdeui/kcolorbutton.h
+++ b/kdeui/kcolorbutton.h
@@ -80,7 +80,7 @@ public:
      */
     void setDefaultColor( const TQColor &c );
 
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
 
 signals:
     /**
diff --git a/kdeui/kcolorcombo.cpp b/kdeui/kcolorcombo.cpp
index 4f9f35713..c418b6a81 100644
--- a/kdeui/kcolorcombo.cpp
+++ b/kdeui/kcolorcombo.cpp
@@ -21,10 +21,10 @@
 //
 // 1999-09-27 Espen Sand <espensa@online.no>
 // KColorDialog is now subclassed from KDialogBase. I have also extended
-// KColorDialog::getColor() so that in tqcontains a parent argument. This
+// KColorDialog::getColor() so that in contains a parent argument. This
 // improves centering capability.
 //
-// tqlayout management added Oct 1997 by Mario Weilguni
+// layout management added Oct 1997 by Mario Weilguni
 // <mweilguni@sime.com>
 //
 
@@ -175,7 +175,7 @@ void KColorCombo::slotActivated( int index )
 			TQRect rect( 0, 0, width(), TQFontMetrics(painter.font()).height()+4);
 			TQPixmap pixmap( rect.width(), rect.height() );
 
-			if ( tqGray( customColor.rgb() ) < 128 )
+			if ( qGray( customColor.rgb() ) < 128 )
 				pen.setColor( white );
 			else
 				pen.setColor( black );
@@ -228,7 +228,7 @@ void KColorCombo::addColors()
 	if ( i == STANDARD_PAL_SIZE )
 		customColor = internalcolor;
 
-	if ( tqGray( customColor.rgb() ) < 128 )
+	if ( qGray( customColor.rgb() ) < 128 )
 		pen.setColor( white );
 	else
 		pen.setColor( black );
diff --git a/kdeui/kcolorcombo.h b/kdeui/kcolorcombo.h
index fcbfda4cf..8ef33f5c9 100644
--- a/kdeui/kcolorcombo.h
+++ b/kdeui/kcolorcombo.h
@@ -19,7 +19,7 @@
 //-----------------------------------------------------------------------------
 // KDE color selection combo box
 
-// tqlayout management added Oct 1997 by Mario Weilguni
+// layout management added Oct 1997 by Mario Weilguni
 // <mweilguni@sime.com>
 
 
diff --git a/kdeui/kcolordialog.cpp b/kdeui/kcolordialog.cpp
index 5b9596e2a..64decd2c5 100644
--- a/kdeui/kcolordialog.cpp
+++ b/kdeui/kcolordialog.cpp
@@ -21,10 +21,10 @@
 //
 // 1999-09-27 Espen Sand <espensa@online.no>
 // KColorDialog is now subclassed from KDialogBase. I have also extended
-// KColorDialog::getColor() so that it tqcontains a parent argument. This
+// KColorDialog::getColor() so that it contains a parent argument. This
 // improves centering capability.
 //
-// tqlayout management added Oct 1997 by Mario Weilguni
+// layout management added Oct 1997 by Mario Weilguni
 // <mweilguni@sime.com>
 //
 
@@ -376,7 +376,7 @@ void KColorCells::paintCell( TQPainter *painter, int row, int col )
 	if (shade)
         {
 		qDrawShadePanel( painter, 1, 1, cellWidth()-2,
-		    cellHeight()-2, tqcolorGroup(), true, 1, &brush );
+		    cellHeight()-2, colorGroup(), true, 1, &brush );
 		w = 2;
         }
         TQColor color = colors[ row * numCols() + col ];
@@ -565,7 +565,7 @@ KPaletteTable::KPaletteTable( TQWidget *parent, int minWidth, int cols)
   TQStringList diskPaletteList = KPalette::getPaletteList();
   TQStringList paletteList;
 
-  // We must tqreplace the untranslated file names by translate names (of course only for KDE's standard palettes)
+  // We must replace the untranslated file names by translate names (of course only for KDE's standard palettes)
   for ( int i = 0; colorPaletteName[i].m_fileName; ++i )
   {
       diskPaletteList.remove( colorPaletteName[i].m_fileName );
@@ -574,11 +574,11 @@ KPaletteTable::KPaletteTable( TQWidget *parent, int minWidth, int cols)
   paletteList += diskPaletteList;
   paletteList.append( i18n_namedColors );
 
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+  TQVBoxLayout *layout = new TQVBoxLayout( this );
 
   combo = new TQComboBox( false, this );
   combo->insertStringList( paletteList );
-  tqlayout->addWidget(combo);
+  layout->addWidget(combo);
 
   sv = new TQScrollView( this );
   TQSize cellSize = TQSize( mMinWidth, 120);
@@ -588,16 +588,16 @@ KPaletteTable::KPaletteTable( TQWidget *parent, int minWidth, int cols)
   minSize += TQSize(sv->frameWidth(), 0);
   minSize += TQSize(cellSize);
   sv->setFixedSize(minSize);
-  tqlayout->addWidget(sv);
+  layout->addWidget(sv);
 
   mNamedColorList = new KListBox( this, "namedColorList", 0 );
   mNamedColorList->setFixedSize(minSize);
   mNamedColorList->hide();
-  tqlayout->addWidget(mNamedColorList);
+  layout->addWidget(mNamedColorList);
   connect( mNamedColorList, TQT_SIGNAL(highlighted( const TQString & )),
 	   this, TQT_SLOT( slotColorTextSelected( const TQString & )) );
 
-  setFixedSize( tqsizeHint());
+  setFixedSize( sizeHint());
   connect( combo, TQT_SIGNAL(activated(const TQString &)),
 	this, TQT_SLOT(slotSetPalette( const TQString &)));
 }
@@ -674,8 +674,8 @@ KPaletteTable::readNamedColor( void )
 	// that start with "gray".
 	//
 	TQString name = line.mid(pos).stripWhiteSpace();
-	if( name.isNull() || name.tqfind(' ') != -1 ||
-	    name.tqfind( "gray" ) != -1 ||  name.tqfind( "grey" ) != -1 )
+	if( name.isNull() || name.find(' ') != -1 ||
+	    name.find( "gray" ) != -1 ||  name.find( "grey" ) != -1 )
 	{
 	  continue;
 	}
@@ -782,7 +782,7 @@ KPaletteTable::setPalette( const TQString &_paletteName )
      }
   }
 
-  // We must again tqfind the file name of the palette from the eventual translation
+  // We must again find the file name of the palette from the eventual translation
   for ( int i = 0; colorPaletteName[i].m_fileName; ++i )
   {
       if ( paletteName == i18n( "palette name", colorPaletteName[i].m_displayName ) )
@@ -926,7 +926,7 @@ public:
     KPalette *palette;
     KValueSelector *valuePal;
     TQVBoxLayout* l_right;
-    TQGridLayout* tl_tqlayout;
+    TQGridLayout* tl_layout;
     TQCheckBox *cbDefaultColor;
     KColor defaultColor;
     KColor selColor;
@@ -954,21 +954,21 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
   TQLabel *label;
 
   //
-  // Create the top level page and its tqlayout
+  // Create the top level page and its layout
   //
   TQWidget *page = new TQWidget( this );
   setMainWidget( page );
 
-  TQGridLayout *tl_tqlayout = new TQGridLayout( page, 3, 3, 0, spacingHint() );
-  d->tl_tqlayout = tl_tqlayout;
-  tl_tqlayout->addColSpacing( 1, spacingHint() * 2 );
+  TQGridLayout *tl_layout = new TQGridLayout( page, 3, 3, 0, spacingHint() );
+  d->tl_layout = tl_layout;
+  tl_layout->addColSpacing( 1, spacingHint() * 2 );
 
   //
   // the more complicated part: the left side
   // add a V-box
   //
   TQVBoxLayout *l_left = new TQVBoxLayout();
-  tl_tqlayout->addLayout(l_left, 0, 0);
+  tl_layout->addLayout(l_left, 0, 0);
 
   //
   // add a H-Box for the XY-Selector and a grid for the
@@ -1003,7 +1003,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
   // add the HSV fields
   //
   label = new TQLabel( i18n("H:"), page );
-  label->tqsetAlignment(AlignRight | AlignVCenter);
+  label->setAlignment(AlignRight | AlignVCenter);
   l_lbot->addWidget(label, 0, 2);
   d->hedit = new KColorSpinBox( 0, 359, 1, page );
   d->hedit->setValidator( new TQIntValidator( d->hedit ) );
@@ -1012,7 +1012,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
   	TQT_SLOT( slotHSVChanged() ) );
 
   label = new TQLabel( i18n("S:"), page );
-  label->tqsetAlignment(AlignRight | AlignVCenter);
+  label->setAlignment(AlignRight | AlignVCenter);
   l_lbot->addWidget(label, 1, 2);
   d->sedit = new KColorSpinBox( 0, 255, 1, page );
   d->sedit->setValidator( new TQIntValidator( d->sedit ) );
@@ -1021,7 +1021,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
   	TQT_SLOT( slotHSVChanged() ) );
 
   label = new TQLabel( i18n("V:"), page );
-  label->tqsetAlignment(AlignRight | AlignVCenter);
+  label->setAlignment(AlignRight | AlignVCenter);
   l_lbot->addWidget(label, 2, 2);
   d->vedit = new KColorSpinBox( 0, 255, 1, page );
   d->vedit->setValidator( new TQIntValidator( d->vedit ) );
@@ -1033,7 +1033,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
   // add the RGB fields
   //
   label = new TQLabel( i18n("R:"), page );
-  label->tqsetAlignment(AlignRight | AlignVCenter);
+  label->setAlignment(AlignRight | AlignVCenter);
   l_lbot->addWidget(label, 0, 4);
   d->redit = new KColorSpinBox( 0, 255, 1, page );
   d->redit->setValidator( new TQIntValidator( d->redit ) );
@@ -1042,7 +1042,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
   	TQT_SLOT( slotRGBChanged() ) );
 
   label = new TQLabel( i18n("G:"), page );
-  label->tqsetAlignment(AlignRight | AlignVCenter);
+  label->setAlignment(AlignRight | AlignVCenter);
   l_lbot->addWidget( label, 1, 4);
   d->gedit = new KColorSpinBox( 0, 255,1, page );
   d->gedit->setValidator( new TQIntValidator( d->gedit ) );
@@ -1051,7 +1051,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
   	TQT_SLOT( slotRGBChanged() ) );
 
   label = new TQLabel( i18n("B:"), page );
-  label->tqsetAlignment(AlignRight | AlignVCenter);
+  label->setAlignment(AlignRight | AlignVCenter);
   l_lbot->addWidget(label, 2, 4);
   d->bedit = new KColorSpinBox( 0, 255, 1, page );
   d->bedit->setValidator( new TQIntValidator( d->bedit ) );
@@ -1072,10 +1072,10 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
   d->bedit->setFixedWidth(w);
 
   //
-  // add a tqlayout for the right side
+  // add a layout for the right side
   //
   d->l_right = new TQVBoxLayout;
-  tl_tqlayout->addLayout(d->l_right, 0, 2);
+  tl_layout->addLayout(d->l_right, 0, 2);
 
   //
   // Add the palette table
@@ -1143,7 +1143,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
   d->htmlName = new KLineEdit( page );
   d->htmlName->setMaxLength( 13 ); // Qt's TQColor allows 12 hexa-digits
   d->htmlName->setText("#FFFFFF"); // But HTML uses only 6, so do not worry about the size
-  w = d->htmlName->fontMetrics().width(TQString::tqfromLatin1("#DDDDDDD"));
+  w = d->htmlName->fontMetrics().width(TQString::fromLatin1("#DDDDDDD"));
   d->htmlName->setFixedWidth(w);
   l_grid->addWidget(d->htmlName, 1, 2, AlignLeft);
 
@@ -1156,8 +1156,8 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
   connect( d->patch, TQT_SIGNAL( colorChanged( const TQColor&)),
 	   TQT_SLOT( setColor( const TQColor&)));
 
-  tl_tqlayout->activate();
-  page->setMinimumSize( page->tqsizeHint() );
+  tl_layout->activate();
+  page->setMinimumSize( page->sizeHint() );
 
   readSettings();
   d->bRecursion = false;
@@ -1195,7 +1195,7 @@ KColorDialog::eventFilter( TQObject *obj, TQEvent *ev )
       case TQEvent::DragLeave:
       case TQEvent::Drop:
       case TQEvent::DragResponse:
-            tqApp->sendEvent(d->patch, ev);
+            qApp->sendEvent(d->patch, ev);
             return true;
       default:
             break;
@@ -1222,8 +1222,8 @@ KColorDialog::setDefaultColor( const TQColor& col )
         d->l_right->addWidget( d->cbDefaultColor );
 
         mainWidget()->setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX ); // cancel setFixedSize()
-        d->tl_tqlayout->activate();
-        mainWidget()->setMinimumSize( mainWidget()->tqsizeHint() );
+        d->tl_layout->activate();
+        mainWidget()->setMinimumSize( mainWidget()->sizeHint() );
         disableResize();
 
         connect( d->cbDefaultColor, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDefaultColorClicked() ) );
@@ -1479,7 +1479,7 @@ void KColorDialog::showColor( const KColor &color, const TQString &name )
   d->valuePal->setValue( v );
   d->valuePal->updateContents();
   d->valuePal->blockSignals(false);
-  d->valuePal->tqrepaint( false );
+  d->valuePal->repaint( false );
   d->bRecursion = false;
 }
 
diff --git a/kdeui/kcolordialog.h b/kdeui/kcolordialog.h
index 9fa2a05a9..c3a6fabf3 100644
--- a/kdeui/kcolordialog.h
+++ b/kdeui/kcolordialog.h
@@ -19,7 +19,7 @@
 //----------------------------------------------------------------------
 // KDE color selection dialog.
 
-// tqlayout management added Oct 1997 by Mario Weilguni
+// layout management added Oct 1997 by Mario Weilguni
 // <mweilguni@sime.com>
 
 #ifndef KDELIBS_KCOLORDIALOG_H
diff --git a/kdeui/kcolordrag.cpp b/kdeui/kcolordrag.cpp
index d364b585e..1c56d9ccd 100644
--- a/kdeui/kcolordrag.cpp
+++ b/kdeui/kcolordrag.cpp
@@ -40,7 +40,7 @@ void
 KColorDrag::setColor( const TQColor &color)
 {
      TQColorDrag tmp(color, 0, 0);
-     setEncodedData(tmp.tqencodedData(color_mime_string));
+     setEncodedData(tmp.encodedData(color_mime_string));
 
      TQPixmap colorpix( 25, 20);
      colorpix.fill( color);
@@ -59,7 +59,7 @@ const char *KColorDrag::format(int i) const
         return TQStoredDrag::format(i);
 }
 
-TQByteArray KColorDrag::tqencodedData ( const char * m ) const
+TQByteArray KColorDrag::encodedData ( const char * m ) const
 {
      if (!qstrcmp(m, text_mime_string) )
      {
@@ -69,7 +69,7 @@ TQByteArray KColorDrag::tqencodedData ( const char * m ) const
         ((TQByteArray&)result).resize(result.length());
         return result;
      }
-     return TQStoredDrag::tqencodedData(m);
+     return TQStoredDrag::encodedData(m);
 }
 
 bool
@@ -91,8 +91,8 @@ KColorDrag::decode( TQMimeSource *e, TQColor &color)
      if (TQColorDrag::decode(e, color))
         return true;
 
-     TQByteArray data = e->tqencodedData( text_mime_string);
-     TQString colorName = TQString::tqfromLatin1(data.data(), data.size());
+     TQByteArray data = e->encodedData( text_mime_string);
+     TQString colorName = TQString::fromLatin1(data.data(), data.size());
      if ((colorName.length() < 4) || (colorName[0] != '#'))
         return false;
      color.setNamedColor(colorName);
diff --git a/kdeui/kcolordrag.h b/kdeui/kcolordrag.h
index 3cec28f7c..7f0cd1ba3 100644
--- a/kdeui/kcolordrag.h
+++ b/kdeui/kcolordrag.h
@@ -48,14 +48,14 @@ public:
     virtual ~KColorDrag() {}
 
     virtual const char *format(int i) const;
-    virtual TQByteArray tqencodedData ( const char * m ) const;
+    virtual TQByteArray encodedData ( const char * m ) const;
 
     /**
      * Sets the color of the drag to @p col.
      */
     void setColor(const TQColor &col);
     /**
-     * Returns true if the MIME source @p e tqcontains a color object.
+     * Returns true if the MIME source @p e contains a color object.
      */
     static bool canDecode(TQMimeSource *e);
     /**
diff --git a/kdeui/kcombobox.cpp b/kdeui/kcombobox.cpp
index e4188c9c8..c3cc4c402 100644
--- a/kdeui/kcombobox.cpp
+++ b/kdeui/kcombobox.cpp
@@ -91,7 +91,7 @@ void KComboBox::init()
 }
 
 
-bool KComboBox::tqcontains( const TQString& _text ) const
+bool KComboBox::contains( const TQString& _text ) const
 {
     if ( _text.isEmpty() )
         return false;
@@ -163,7 +163,7 @@ void KComboBox::makeCompletion( const TQString& text )
         if( text.isNull() || !listBox() )
             return;
 
-        const int index = listBox()->index( listBox()->tqfindItem( text ) );
+        const int index = listBox()->index( listBox()->findItem( text ) );
         if( index >= 0 )
             setCurrentItem( index );
     }
@@ -508,7 +508,7 @@ void KHistoryCombo::addToHistory( const TQString& item )
         // anymore available at all in the combobox.
         const TQString rmItem = text( rmIndex );
         removeItem( rmIndex );
-        if ( useComp && !tqcontains( rmItem ) )
+        if ( useComp && !contains( rmItem ) )
             completionObject()->removeItem( rmItem );
     }
 
@@ -616,12 +616,12 @@ void KHistoryCombo::keyPressEvent( TQKeyEvent *e )
     KKey event_key( e );
 
     // going up in the history, rotating when reaching TQListBox::count()
-    if ( KStdAccel::rotateUp().tqcontains(event_key) )
+    if ( KStdAccel::rotateUp().contains(event_key) )
         rotateUp();
 
     // going down in the history, no rotation possible. Last item will be
     // the text that was in the lineedit before Up was called.
-    else if ( KStdAccel::rotateDown().tqcontains(event_key) )
+    else if ( KStdAccel::rotateDown().contains(event_key) )
         rotateDown();
     else
         KComboBox::keyPressEvent( e );
@@ -764,14 +764,14 @@ KHistoryComboEditor::KHistoryComboEditor( const TQStringList& entries, TQWidget
         new TQListViewItem( m_pListView, *it );
     }
 
-    m_pListView->setMinimumSize( m_pListView->tqsizeHint() );
+    m_pListView->setMinimumSize( m_pListView->sizeHint() );
 
     connect( m_pListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ),
              this, TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) );
 
     enableButton( KDialogBase::User1, false );
 
-    resize( tqsizeHint() );
+    resize( sizeHint() );
 }
 
 KHistoryComboEditor::~KHistoryComboEditor()
diff --git a/kdeui/kcombobox.h b/kdeui/kcombobox.h
index 0a23fe85a..d7d07e4b6 100644
--- a/kdeui/kcombobox.h
+++ b/kdeui/kcombobox.h
@@ -234,7 +234,7 @@ public:
     *
     * If @p true, the completion mode will be set to automatic.
     * Otherwise, it is defaulted to the global setting.  This
-    * method has been tqreplaced by the more comprehensive
+    * method has been replaced by the more comprehensive
     * setCompletionMode().
     *
     * @param autocomplete Flag to enable/disable automatic completion mode.
@@ -245,7 +245,7 @@ public:
     * Re-implemented from TQComboBox.
     *
     * Returns @p true if the current completion mode is set
-    * to automatic.  See its more comprehensive tqreplacement
+    * to automatic.  See its more comprehensive replacement
     * completionMode().
     *
     * @return @p true when completion mode is automatic.
@@ -299,7 +299,7 @@ public:
      *
      * @return @p true if an item with the string @p text is in the combobox.
      */
-    bool tqcontains( const TQString& text ) const;
+    bool contains( const TQString& text ) const;
 
     /**
      * By default, KComboBox recognizes Key_Return and Key_Enter
@@ -360,7 +360,7 @@ signals:
     * Emitted when the user presses the Enter key.
     *
     * The argument is the current text being edited.  This signal is just like
-    * returnPressed() except it tqcontains the current text as its argument.
+    * returnPressed() except it contains the current text as its argument.
     *
     * Note that this signal is only emitted when the
     * widget is editable.
diff --git a/kdeui/kcommand.cpp b/kdeui/kcommand.cpp
index 4960c8016..2c76b21cd 100644
--- a/kdeui/kcommand.cpp
+++ b/kdeui/kcommand.cpp
@@ -133,7 +133,7 @@ void KCommandHistory::addCommand(KCommand *command, bool execute) {
         return;
 
     int index;
-    if(d->m_present && (index=m_commands.tqfindRef(d->m_present))!=-1) {
+    if(d->m_present && (index=m_commands.findRef(d->m_present))!=-1) {
         if (m_first)
             --index;
         m_commands.insert(index+1, command);
@@ -192,7 +192,7 @@ void KCommandHistory::undo() {
         m_redo->setText(i18n("&Redo: %1").arg(d->m_present->name()));
     }
     int index;
-    if((index=m_commands.tqfindRef(d->m_present))!=-1 && m_commands.prev()) {
+    if((index=m_commands.findRef(d->m_present))!=-1 && m_commands.prev()) {
         d->m_present=m_commands.current();
         if (m_undo) {
             m_undo->setEnabled(true);
@@ -226,7 +226,7 @@ void KCommandHistory::redo() {
         if(!d->m_savedAt)
             emit documentRestored();
     }
-    else if((index=m_commands.tqfindRef(d->m_present))!=-1 && m_commands.next()) {
+    else if((index=m_commands.findRef(d->m_present))!=-1 && m_commands.next()) {
         d->m_present=m_commands.current();
         d->m_present->execute();
         emit commandExecuted();
@@ -257,7 +257,7 @@ void KCommandHistory::redo() {
 
 void KCommandHistory::documentSaved() {
     if(d->m_present && !m_first)
-        d->m_savedAt=m_commands.tqfindRef(d->m_present);
+        d->m_savedAt=m_commands.findRef(d->m_present);
     else if(!d->m_present && !m_first)
         d->m_savedAt=-42;  // this value signals that the document has
                         // been saved with an empty history.
@@ -287,7 +287,7 @@ void KCommandHistory::clipCommands() {
     if(count<=m_undoLimit && count<=m_redoLimit)
         return;
 
-    int index=m_commands.tqfindRef(d->m_present);
+    int index=m_commands.findRef(d->m_present);
     if(index>=m_undoLimit) {
         for(int i=0; i<=(index-m_undoLimit); ++i) {
             m_commands.removeFirst();
@@ -295,7 +295,7 @@ void KCommandHistory::clipCommands() {
             if(d->m_savedAt==-1)
                 d->m_savedAt=-42;
         }
-        index=m_commands.tqfindRef(d->m_present); // calculate the new
+        index=m_commands.findRef(d->m_present); // calculate the new
         count=m_commands.count();            // values (for the redo-branch :)
         // make it easier for us... d->m_savedAt==-1 -> invalid
         if(d->m_savedAt!=-42 && d->m_savedAt<-1)
@@ -316,7 +316,7 @@ void KCommandHistory::slotUndoAboutToShow()
 {
     m_undoPopup->clear();
     int i = 0;
-    if (m_commands.tqfindRef(d->m_present)!=-1)
+    if (m_commands.findRef(d->m_present)!=-1)
         while ( m_commands.current() && i<10 ) // TODO make number of items configurable ?
         {
             m_undoPopup->insertItem( i18n("Undo: %1").arg(m_commands.current()->name()), i++ );
@@ -340,7 +340,7 @@ void KCommandHistory::slotRedoAboutToShow()
         d->m_present = m_commands.first();
         m_redoPopup->insertItem( i18n("Redo: %1").arg(d->m_present->name()), i++ );
     }
-    if (m_commands.tqfindRef(d->m_present)!=-1 && m_commands.next())
+    if (m_commands.findRef(d->m_present)!=-1 && m_commands.next())
         while ( m_commands.current() && i<10 ) // TODO make number of items configurable ?
         {
             m_redoPopup->insertItem( i18n("Redo: %1").arg(m_commands.current()->name()), i++ );
@@ -360,7 +360,7 @@ void KCommandHistory::updateActions()
     if ( m_undo && m_redo )
     {
         m_undo->setEnabled( !m_first && ( d->m_present ) );
-        m_redo->setEnabled(m_first || (m_commands.tqfindRef(d->m_present)!=-1 && m_commands.next()));
+        m_redo->setEnabled(m_first || (m_commands.findRef(d->m_present)!=-1 && m_commands.next()));
     }
 }
 
diff --git a/kdeui/kcommand.h b/kdeui/kcommand.h
index a9b8e4f6c..97fa3c2e2 100644
--- a/kdeui/kcommand.h
+++ b/kdeui/kcommand.h
@@ -180,7 +180,7 @@ public:
 
     /**
      * Erases all the undo/redo history.
-     * Use this when reloading the data, for instance, since this tqinvalidates
+     * Use this when reloading the data, for instance, since this invalidates
      * all the commands.
      */
     void clear();
diff --git a/kdeui/kcompletionbox.cpp b/kdeui/kcompletionbox.cpp
index c830a7b21..ed75ecd21 100644
--- a/kdeui/kcompletionbox.cpp
+++ b/kdeui/kcompletionbox.cpp
@@ -231,7 +231,7 @@ bool KCompletionBox::eventFilter( TQObject *o, TQEvent *e )
     // any mouse-click on something else than "this" makes us hide
     else if ( type == TQEvent::MouseButtonPress ) {
         TQMouseEvent *ev = static_cast<TQMouseEvent *>( e );
-        if ( !rect().tqcontains( ev->pos() )) // this widget
+        if ( !rect().contains( ev->pos() )) // this widget
             hide();
 
         if ( !d->emitSelected && currentItem() && !::qt_cast<TQScrollBar*>(o) )
@@ -260,7 +260,7 @@ void KCompletionBox::popup()
         clearSelection();
         if ( !isVisible() )
             show();
-        else if ( size().height() != tqsizeHint().height() )
+        else if ( size().height() != sizeHint().height() )
             sizeAndPosition();
     }
 }
@@ -302,7 +302,7 @@ void KCompletionBox::show()
     d->upwardBox = false;
     if ( d->m_parent ) {
         sizeAndPosition();
-        tqApp->installEventFilter( this );
+        qApp->installEventFilter( this );
     }
 
     // ### we shouldn't need to call this, but without this, the scrollbars
@@ -310,21 +310,21 @@ void KCompletionBox::show()
     //triggerUpdate( true );
 
     // Workaround for I'm not sure whose bug - if this KCompletionBox' parent
-    // is in a tqlayout, that tqlayout will detect inserting new child (posted
-    // ChildInserted event), and will trigger retqlayout (post LayoutHint event).
+    // is in a layout, that layout will detect inserting new child (posted
+    // ChildInserted event), and will trigger relayout (post LayoutHint event).
     // TQWidget::show() sends also posted ChildInserted events for the parent,
-    // and later all LayoutHint events, which causes tqlayout updating.
+    // and later all LayoutHint events, which causes layout updating.
     // The problem is, KCompletionBox::eventFilter() detects resizing
     // of the parent, and calls hide() - and this hide() happen in the middle
     // of show(), causing inconsistent state. I'll try to submit a Qt patch too.
-    tqApp->sendPostedEvents();
+    qApp->sendPostedEvents();
     KListBox::show();
 }
 
 void KCompletionBox::hide()
 {
     if ( d->m_parent )
-        tqApp->removeEventFilter( this );
+        qApp->removeEventFilter( this );
     d->cancelText = TQString::null;
     KListBox::hide();
 }
@@ -335,8 +335,8 @@ TQRect KCompletionBox::calculateGeometry() const
     int ih = itemHeight();
     int h = QMIN( 15 * ih, (int) count() * ih ) + 2*frameWidth();
 
-    int w = (d->m_parent) ? d->m_parent->width() : KListBox::tqminimumSizeHint().width();
-    w = QMAX( KListBox::tqminimumSizeHint().width(), w );
+    int w = (d->m_parent) ? d->m_parent->width() : KListBox::minimumSizeHint().width();
+    w = QMAX( KListBox::minimumSizeHint().width(), w );
 
     //If we're inside a combox, Qt by default makes the dropdown
     // as wide as the combo, and gives the style a chance
@@ -373,7 +373,7 @@ TQRect KCompletionBox::calculateGeometry() const
     return TQRect(x, y, w, h);
 }
 
-TQSize KCompletionBox::tqsizeHint() const
+TQSize KCompletionBox::sizeHint() const
 {
     return calculateGeometry().size();
 }
@@ -485,7 +485,7 @@ void KCompletionBox::setItems( const TQStringList& items )
     }
     else {
         //Keep track of whether we need to change anything,
-        //so we can avoid a tqrepaint for identical updates,
+        //so we can avoid a repaint for identical updates,
         //to reduce flicker
         bool dirty = false;
 
@@ -520,7 +520,7 @@ void KCompletionBox::setItems( const TQStringList& items )
             triggerUpdate( false );
     }
 
-    if ( isVisible() && size().height() != tqsizeHint().height() )
+    if ( isVisible() && size().height() != sizeHint().height() )
         sizeAndPosition();
 
     blockSignals( block );
diff --git a/kdeui/kcompletionbox.h b/kdeui/kcompletionbox.h
index da6ecf49b..4e981bf86 100644
--- a/kdeui/kcompletionbox.h
+++ b/kdeui/kcompletionbox.h
@@ -61,7 +61,7 @@ public:
      */
     ~KCompletionBox();
 
-    virtual TQSize tqsizeHint() const;
+    virtual TQSize sizeHint() const;
 
     /**
      * @returns true if selecting an item results in the emition of the selected signal.
@@ -191,7 +191,7 @@ public slots:
 
 signals:
     /**
-     * Emitted when an item was selected, tqcontains the text of
+     * Emitted when an item was selected, contains the text of
      * the selected item.
      */
     void activated( const TQString& );
@@ -205,7 +205,7 @@ signals:
 protected:
     /**
      * This calculates the size of the dropdown and the relative position of the top
-     * left corner with respect to the parent widget. This matches the tqgeometry and position
+     * left corner with respect to the parent widget. This matches the geometry and position
      * normally used by K/TQComboBox when used with one.
      */
     TQRect calculateGeometry() const;
diff --git a/kdeui/kconfigdialog.cpp b/kdeui/kconfigdialog.cpp
index dba91712f..3d5bfd697 100644
--- a/kdeui/kconfigdialog.cpp
+++ b/kdeui/kconfigdialog.cpp
@@ -160,7 +160,7 @@ void KConfigDialog::setupManagerConnections(KConfigDialogManager *manager)
 
 KConfigDialog* KConfigDialog::exists(const char* name)
 {
-  return openDialogs.tqfind(name);
+  return openDialogs.find(name);
 }
 
 bool KConfigDialog::showDialog(const char* name)
diff --git a/kdeui/kcursor.cpp b/kdeui/kcursor.cpp
index f0df154d5..02f8723f5 100644
--- a/kdeui/kcursor.cpp
+++ b/kdeui/kcursor.cpp
@@ -49,7 +49,7 @@ TQCursor KCursor::handCursor()
                 KConfig *config = KGlobal::config();
                 KConfigGroupSaver saver( config, "General" );
 
-#ifndef Q_WS_WIN // this tqmask doesn't work too well on win32
+#ifndef Q_WS_WIN // this mask doesn't work too well on win32
                 if ( config->readEntry("handCursorStyle", "Windows") == "Windows" )
                 {
                         static const unsigned char HAND_BITS[] = {
@@ -67,8 +67,8 @@ TQCursor KCursor::handCursor()
                                 0x07, 0xf8, 0xff, 0x07, 0xf0, 0xff, 0x07, 0xf0, 0xff, 0x07, 0xe0,
                                 0xff, 0x03, 0xc0, 0xff, 0x03, 0xc0, 0xff, 0x01, 0xc0, 0xff, 0x01};
                         TQBitmap hand_bitmap(22, 22, HAND_BITS, true);
-                        TQBitmap hand_tqmask(22, 22, HAND_MASK_BITS, true);
-                        hand_cursor = new TQCursor(hand_bitmap, hand_tqmask, 7, 0);
+                        TQBitmap hand_mask(22, 22, HAND_MASK_BITS, true);
+                        hand_cursor = new TQCursor(hand_bitmap, hand_mask, 7, 0);
                         // Hack to force TQCursor to call XCreatePixmapCursor() immediately
                         // so the bitmaps don't get pushed out of the Xcursor LRU cache.
                         hand_cursor->handle();
@@ -294,7 +294,7 @@ void KCursorPrivateAutoHideEventFilter::unhideCursor()
 
     TQWidget* w = actualWidget();
 
-    if ( w->cursor().tqshape() != Qt::BlankCursor ) // someone messed with the cursor already
+    if ( w->cursor().shape() != Qt::BlankCursor ) // someone messed with the cursor already
 	return;
 
     if ( m_isOwnCursor )
@@ -370,9 +370,9 @@ KCursorPrivate::KCursorPrivate()
     hideCursorDelay = 5000; // 5s default value
 
     KConfig *kc = KGlobal::config();
-    KConfigGroupSaver ks( kc, TQString::tqfromLatin1("KDE") );
+    KConfigGroupSaver ks( kc, TQString::fromLatin1("KDE") );
     enabled = kc->readBoolEntry(
-		  TQString::tqfromLatin1("Autohiding cursor enabled"), true );
+		  TQString::fromLatin1("Autohiding cursor enabled"), true );
 }
 
 KCursorPrivate::~KCursorPrivate()
@@ -386,7 +386,7 @@ void KCursorPrivate::setAutoHideCursor( TQWidget *w, bool enable, bool customEve
 
     if ( enable )
     {
-        if ( m_eventFilters.tqfind( w ) != NULL )
+        if ( m_eventFilters.find( w ) != NULL )
             return;
         KCursorPrivateAutoHideEventFilter* filter = new KCursorPrivateAutoHideEventFilter( w );
         m_eventFilters.insert( w, filter );
@@ -412,7 +412,7 @@ bool KCursorPrivate::eventFilter( TQObject *o, TQEvent *e )
     if ( !enabled )
         return false;
 
-    KCursorPrivateAutoHideEventFilter* filter = m_eventFilters.tqfind( o );
+    KCursorPrivateAutoHideEventFilter* filter = m_eventFilters.find( o );
 
     Q_ASSERT( filter != NULL );
     if ( filter == NULL )
diff --git a/kdeui/kcursor.h b/kdeui/kcursor.h
index 84c38c318..ddef7a1cf 100644
--- a/kdeui/kcursor.h
+++ b/kdeui/kcursor.h
@@ -33,7 +33,7 @@ class TQWidget;
  *
  * A wrapper around TQCursor that allows for "themed" cursors.
  *
- * Currently, the only themed cursor is a hand tqshaped cursor.
+ * Currently, the only themed cursor is a hand shaped cursor.
  *
  * A typical usage would be
  * \code
diff --git a/kdeui/kcursor_private.h b/kdeui/kcursor_private.h
index 0ed1789e6..839350c8c 100644
--- a/kdeui/kcursor_private.h
+++ b/kdeui/kcursor_private.h
@@ -36,7 +36,7 @@ class TQWidget;
  * @author John Firebaugh <jfirebaugh@kde.org>
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
 */
-class KCursorPrivateAutoHideEventFilter : public TQObject
+class KCursorPrivateAutoHideEventFilter : public QObject
 {
     Q_OBJECT
 
@@ -68,7 +68,7 @@ private:
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  * @author John Firebaugh <jfirebaugh@kde.org>
 */
-class KCursorPrivate : public TQObject
+class KCursorPrivate : public QObject
 {
     friend class KCursor; // to shut up the compiler
     Q_OBJECT
diff --git a/kdeui/kdatepicker.cpp b/kdeui/kdatepicker.cpp
index 3fa6fd5da..af9dede01 100644
--- a/kdeui/kdatepicker.cpp
+++ b/kdeui/kdatepicker.cpp
@@ -111,7 +111,7 @@ KDatePicker::KDatePicker(TQWidget *parent, TQDate dt, const char *name, WFlags f
 KDatePicker::KDatePicker( TQWidget *parent, const char *name )
   : TQFrame(parent,name)
 {
-  init( TQDate::tqcurrentDate() );
+  init( TQDate::currentDate() );
 }
 
 void KDatePicker::init( const TQDate &dt )
@@ -175,17 +175,17 @@ void KDatePicker::init( const TQDate &dt )
   line->installEventFilter( this );
   if (  TQApplication::reverseLayout() )
   {
-      yearForward->setIconSet(BarIconSet(TQString::tqfromLatin1("2leftarrow")));
-      yearBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("2rightarrow")));
-      monthForward->setIconSet(BarIconSet(TQString::tqfromLatin1("1leftarrow")));
-      monthBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("1rightarrow")));
+      yearForward->setIconSet(BarIconSet(TQString::fromLatin1("2leftarrow")));
+      yearBackward->setIconSet(BarIconSet(TQString::fromLatin1("2rightarrow")));
+      monthForward->setIconSet(BarIconSet(TQString::fromLatin1("1leftarrow")));
+      monthBackward->setIconSet(BarIconSet(TQString::fromLatin1("1rightarrow")));
   }
   else
   {
-      yearForward->setIconSet(BarIconSet(TQString::tqfromLatin1("2rightarrow")));
-      yearBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("2leftarrow")));
-      monthForward->setIconSet(BarIconSet(TQString::tqfromLatin1("1rightarrow")));
-      monthBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("1leftarrow")));
+      yearForward->setIconSet(BarIconSet(TQString::fromLatin1("2rightarrow")));
+      yearBackward->setIconSet(BarIconSet(TQString::fromLatin1("2leftarrow")));
+      monthForward->setIconSet(BarIconSet(TQString::fromLatin1("1rightarrow")));
+      monthBackward->setIconSet(BarIconSet(TQString::fromLatin1("1leftarrow")));
   }
   connect(table, TQT_SIGNAL(dateChanged(TQDate)), TQT_SLOT(dateChangedSlot(TQDate)));
   connect(table, TQT_SIGNAL(tableClicked()), TQT_SLOT(tableClickedSlot()));
@@ -390,7 +390,7 @@ KDatePicker::selectYearClicked()
   KPopupFrame* popup = new KPopupFrame(this);
   KDateInternalYearSelector* picker = new KDateInternalYearSelector(popup);
   // -----
-  picker->resize(picker->tqsizeHint());
+  picker->resize(picker->sizeHint());
   picker->setYear( table->getDate().year() );
   picker->selectAll();
   popup->setMainWidget(picker);
@@ -463,13 +463,13 @@ KDatePicker::lineEnterPressed()
 void
 KDatePicker::todayButtonClicked()
 {
-  setDate(TQDate::tqcurrentDate());
+  setDate(TQDate::currentDate());
 }
 
 QSize
-KDatePicker::tqsizeHint() const
+KDatePicker::sizeHint() const
 {
-  return TQWidget::tqsizeHint();
+  return TQWidget::sizeHint();
 }
 
 void
@@ -529,7 +529,7 @@ KDatePicker::setCloseButton( bool enable )
         TQToolTip::add(d->closeButton, i18n("Close"));
         d->closeButton->setPixmap( SmallIcon("remove") );
         connect( d->closeButton, TQT_SIGNAL( clicked() ),
-                 tqtopLevelWidget(), TQT_SLOT( close() ) );
+                 topLevelWidget(), TQT_SLOT( close() ) );
     }
     else {
         delete d->closeButton;
diff --git a/kdeui/kdatepicker.h b/kdeui/kdatepicker.h
index a11b0f720..6a4e93537 100644
--- a/kdeui/kdatepicker.h
+++ b/kdeui/kdatepicker.h
@@ -60,7 +60,7 @@ public:
    * initially.
    **/
   KDatePicker(TQWidget *parent=0,
-	      QDate=TQDate::tqcurrentDate(),
+	      QDate=TQDate::currentDate(),
 	      const char *name=0);
 
   /** The usual constructor.  The given date will be displayed
@@ -90,7 +90,7 @@ public:
    *  size hint, try adding 28 to each of the reported numbers of
    *  pixels.
    **/
-  TQSize tqsizeHint() const;
+  TQSize sizeHint() const;
 
   /**
    * Sets the date.
@@ -136,7 +136,7 @@ public:
   /**
    * By calling this method with @p enable = true, KDatePicker will show
    * a little close-button in the upper button-row. Clicking the
-   * close-button will cause the KDatePicker's tqtopLevelWidget()'s close()
+   * close-button will cause the KDatePicker's topLevelWidget()'s close()
    * method being called. This is mostly useful for toplevel datepickers
    * without a window manager decoration.
    * @see hasCloseButton
diff --git a/kdeui/kdatetbl.cpp b/kdeui/kdatetbl.cpp
index 17f9bdfb8..bbf673a15 100644
--- a/kdeui/kdatetbl.cpp
+++ b/kdeui/kdatetbl.cpp
@@ -122,7 +122,7 @@ KDateTable::KDateTable(TQWidget *parent, TQDate date_, const char* name, WFlags
   if(!date_.isValid())
     {
       kdDebug() << "KDateTable ctor: WARNING: Given date is invalid, using current date." << endl;
-      date_=TQDate::tqcurrentDate();
+      date_=TQDate::currentDate();
     }
   setFocusPolicy( TQWidget::StrongFocus );
   setNumRows(7); // 6 weeks max + headline
@@ -146,7 +146,7 @@ KDateTable::KDateTable(TQWidget *parent, const char* name, WFlags f)
   setHScrollBarMode(AlwaysOff);
   setVScrollBarMode(AlwaysOff);
   viewport()->setEraseColor(KGlobalSettings::baseColor());
-  setDate(TQDate::tqcurrentDate()); // this initializes firstday, numdays, numDaysPrevMonth
+  setDate(TQDate::currentDate()); // this initializes firstday, numdays, numDaysPrevMonth
   initAccels();
 }
 
@@ -233,7 +233,7 @@ KDateTable::paintCell(TQPainter *painter, int row, int col)
          ( daynum == 6 && calendar->calendarName() == "gregorian" ) )
           normalday=false;
 
-			TQBrush brushInvertTitle(tqcolorGroup().base());
+			TQBrush brushInvertTitle(colorGroup().base());
 			TQColor titleColor(isEnabled()?( KGlobalSettings::activeTitleColor() ):( KGlobalSettings::inactiveTitleColor() ) );
 			TQColor textColor(isEnabled()?( KGlobalSettings::activeTextColor() ):( KGlobalSettings::inactiveTextColor() ) );
       if (!normalday)
@@ -250,7 +250,7 @@ KDateTable::paintCell(TQPainter *painter, int row, int col)
         }
       painter->drawText(0, 0, w, h-1, AlignCenter,
                         calendar->weekDayName(daynum, true), -1, &rect);
-      painter->setPen(tqcolorGroup().text());
+      painter->setPen(colorGroup().text());
       painter->moveTo(0, h-1);
       painter->lineTo(w-1, h-1);
       // ----- draw the weekday:
@@ -267,7 +267,7 @@ KDateTable::paintCell(TQPainter *painter, int row, int col)
           // ° painting a day of the previous month or
           // ° painting a day of the following month
           // TODO: don't hardcode gray here! Use a color with less contrast to the background than normal text.
-          painter->setPen( tqcolorGroup().mid() );
+          painter->setPen( colorGroup().mid() );
 //          painter->setPen(gray);
         } else { // paint a day of the current month
           if ( d->useCustomColors )
@@ -292,9 +292,9 @@ KDateTable::paintCell(TQPainter *painter, int row, int col)
               }
               painter->setPen( mode->fgColor );
             } else
-              painter->setPen(tqcolorGroup().text());
+              painter->setPen(colorGroup().text());
           } else //if ( firstWeekDay < 4 ) // <- this doesn' make sense at all!
-          painter->setPen(tqcolorGroup().text());
+          painter->setPen(colorGroup().text());
         }
 
       pen=painter->pen();
@@ -308,25 +308,25 @@ KDateTable::paintCell(TQPainter *painter, int row, int col)
            // draw the currently selected date
 	   if (isEnabled())
 	   {
-           painter->setPen(tqcolorGroup().highlight());
-           painter->setBrush(tqcolorGroup().highlight());
+           painter->setPen(colorGroup().highlight());
+           painter->setBrush(colorGroup().highlight());
 	   }
 	   else
 	   {
-	   painter->setPen(tqcolorGroup().text());
-           painter->setBrush(tqcolorGroup().text());
+	   painter->setPen(colorGroup().text());
+           painter->setBrush(colorGroup().text());
 	   }
-           pen=tqcolorGroup().highlightedText();
+           pen=colorGroup().highlightedText();
         } else {
           painter->setBrush(paletteBackgroundColor());
           painter->setPen(paletteBackgroundColor());
-//          painter->setBrush(tqcolorGroup().base());
-//          painter->setPen(tqcolorGroup().base());
+//          painter->setBrush(colorGroup().base());
+//          painter->setPen(colorGroup().base());
         }
 
-      if ( pCellDate == TQDate::tqcurrentDate() )
+      if ( pCellDate == TQDate::currentDate() )
       {
-         painter->setPen(tqcolorGroup().text());
+         painter->setPen(colorGroup().text());
       }
 
       if ( paintRect ) painter->drawRect(0, 0, w, h);
@@ -392,7 +392,7 @@ KDateTable::keyPressEvent( TQKeyEvent *e )
         setDate(date.addDays(1));
 	break;
     case Key_N:
-        setDate(TQDate::tqcurrentDate());
+        setDate(TQDate::currentDate());
 	break;
     case Key_Return:
     case Key_Enter:
@@ -428,7 +428,7 @@ KDateTable::setFontSize(int size)
   TQRect rect;
   // ----- store rectangles:
   fontsize=size;
-  // ----- tqfind largest day name:
+  // ----- find largest day name:
   maxCell.setWidth(0);
   maxCell.setHeight(0);
   for(count=0; count<7; ++count)
@@ -439,7 +439,7 @@ KDateTable::setFontSize(int size)
       maxCell.setHeight(QMAX(maxCell.height(), rect.height()));
     }
   // ----- compare with a real wide number and add some space:
-  rect=metrics.boundingRect(TQString::tqfromLatin1("88"));
+  rect=metrics.boundingRect(TQString::fromLatin1("88"));
   maxCell.setWidth(QMAX(maxCell.width()+2, rect.width()));
   maxCell.setHeight(QMAX(maxCell.height()+4, rect.height()));
 }
@@ -536,7 +536,7 @@ KDateTable::setDate(const TQDate& date_)
   numDaysPrevMonth=calendar->daysInMonth(temp);
   if(changed)
     {
-      tqrepaintContents(false);
+      repaintContents(false);
     }
   return true;
 }
@@ -547,28 +547,28 @@ KDateTable::getDate() const
   return date;
 }
 
-// what are those tqrepaintContents() good for? (pfeiffer)
+// what are those repaintContents() good for? (pfeiffer)
 void KDateTable::focusInEvent( TQFocusEvent *e )
 {
-//    tqrepaintContents(false);
+//    repaintContents(false);
     TQGridView::focusInEvent( e );
 }
 
 void KDateTable::focusOutEvent( TQFocusEvent *e )
 {
-//    tqrepaintContents(false);
+//    repaintContents(false);
     TQGridView::focusOutEvent( e );
 }
 
 QSize
-KDateTable::tqsizeHint() const
+KDateTable::sizeHint() const
 {
   if(maxCell.height()>0 && maxCell.width()>0)
     {
       return TQSize(maxCell.width()*numCols()+2*frameWidth(),
              (maxCell.height()+2)*numRows()+2*frameWidth());
     } else {
-      kdDebug() << "KDateTable::tqsizeHint: obscure failure - " << endl;
+      kdDebug() << "KDateTable::sizeHint: obscure failure - " << endl;
       return TQSize(-1, -1);
     }
 }
@@ -596,7 +596,7 @@ void KDateTable::setCustomDatePainting(const TQDate &date, const TQColor &fgColo
     mode->fgColor=fgColor;
     mode->bgColor=bgColor;
 
-    d->customPaintingModes.tqreplace( date.toString(), mode );
+    d->customPaintingModes.replace( date.toString(), mode );
     d->useCustomColors=true;
     update();
 }
@@ -660,7 +660,7 @@ KDateInternalWeekSelector::setMaxWeek(int max)
 }
 
 // ### CFM To avoid binary incompatibility.
-//     In future releases, remove this and tqreplace by  a QDate
+//     In future releases, remove this and replace by  a QDate
 //     private member, needed in KDateInternalMonthPicker::paintCell
 class KDateInternalMonthPicker::KDateInternalMonthPrivate {
 public:
@@ -695,10 +695,10 @@ KDateInternalMonthPicker::KDateInternalMonthPicker
   d = new KDateInternalMonthPrivate(date.year(), date.month(), date.day());
   // For monthsInYear != 12
   setNumRows( (KGlobal::locale()->calendar()->monthsInYear(date) + 2) / 3);
-  // enable to tqfind drawing failures:
+  // enable to find drawing failures:
   // setTableFlags(Tbl_clipCellPainting);
   viewport()->setEraseColor(KGlobalSettings::baseColor()); // for consistency with the datepicker
-  // ----- tqfind the preferred size
+  // ----- find the preferred size
   //       (this is slow, possibly, but unfortunately it is needed here):
   TQFontMetrics metrics(font);
   for(int i = 1; ; ++i)
@@ -713,7 +713,7 @@ KDateInternalMonthPicker::KDateInternalMonthPicker
 }
 
 QSize
-KDateInternalMonthPicker::tqsizeHint() const
+KDateInternalMonthPicker::sizeHint() const
 {
   return TQSize((max.width()+6)*numCols()+2*frameWidth(),
          (max.height()+6)*numRows()+2*frameWidth());
@@ -743,7 +743,7 @@ KDateInternalMonthPicker::paintCell(TQPainter* painter, int row, int col)
 {
   int index;
   TQString text;
-  // ----- tqfind the number of the cell:
+  // ----- find the number of the cell:
   index=3*row+col+1;
   text=KGlobal::locale()->calendar()->monthName(index,
     KGlobal::locale()->calendar()->year(TQDate(d->year, d->month,
@@ -815,7 +815,7 @@ KDateInternalMonthPicker::contentsMouseMoveEvent(TQMouseEvent *e)
               updateCell( row, col /*, false */ ); // mark the new active cell
             }
         }
-      if ( tmpRow > -1 ) // tqrepaint the former active cell
+      if ( tmpRow > -1 ) // repaint the former active cell
           updateCell( tmpRow, tmpCol /*, true */ );
     }
 }
@@ -935,7 +935,7 @@ KPopupFrame::keyPressEvent(TQKeyEvent* e)
     {
       result=0; // rejected
       d->exec = false;
-      tqApp->exit_loop();
+      qApp->exit_loop();
     }
 }
 
@@ -944,7 +944,7 @@ KPopupFrame::close(int r)
 {
   result=r;
   d->exec = false;
-  tqApp->exit_loop();
+  qApp->exit_loop();
 }
 
 void
@@ -954,7 +954,7 @@ KPopupFrame::hide()
     if (d->exec)
     {
         d->exec = false;
-        tqApp->exit_loop();
+        qApp->exit_loop();
     }
 }
 
@@ -1006,10 +1006,10 @@ int
 KPopupFrame::exec(TQPoint pos)
 {
   popup(pos);
-  tqrepaint();
+  repaint();
   d->exec = true;
   const TQGuardedPtr<TQObject> that = this;
-  tqApp->enter_loop();
+  qApp->enter_loop();
   if ( !that )
     return TQDialog::Rejected;
   hide();
diff --git a/kdeui/kdatetbl.h b/kdeui/kdatetbl.h
index 7cf76dc1c..8827c0a00 100644
--- a/kdeui/kdatetbl.h
+++ b/kdeui/kdatetbl.h
@@ -98,7 +98,7 @@ public:
   /**
    * The size hint.
    */
-  TQSize tqsizeHint() const;
+  TQSize sizeHint() const;
   /**
    * Return the result. 0 means no selection (reject()), 1..12 are the
    * months.
@@ -270,7 +270,7 @@ public:
     /**
      * The constructor.
      */
-    KDateTable(TQWidget *parent=0, TQDate date=TQDate::tqcurrentDate(),
+    KDateTable(TQWidget *parent=0, TQDate date=TQDate::currentDate(),
 	       const char* name=0, WFlags f=0);
 
     /**
@@ -289,9 +289,9 @@ public:
      * To save some time, the size of the largest used cell content is
      * calculated in each paintCell() call, since all calculations have
      * to be done there anyway. The size is stored in maxCell. The
-     * tqsizeHint() simply returns a multiple of maxCell.
+     * sizeHint() simply returns a multiple of maxCell.
      */
-    virtual TQSize tqsizeHint() const;
+    virtual TQSize sizeHint() const;
     /**
      * Set the font size of the date table.
      */
diff --git a/kdeui/kdatetimewidget.cpp b/kdeui/kdatetimewidget.cpp
index 22dbbd6d9..76d92edd2 100644
--- a/kdeui/kdatetimewidget.cpp
+++ b/kdeui/kdatetimewidget.cpp
@@ -38,8 +38,8 @@ void KDateTimeWidget::init()
 {
   d = new KDateTimeWidgetPrivate;
 
-  TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
-  tqlayout->setAutoAdd(true);
+  TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
+  layout->setAutoAdd(true);
 
   d->dateWidget = new KDateWidget(this);
   d->timeWidget = new KTimeWidget(this);
diff --git a/kdeui/kdatewidget.cpp b/kdeui/kdatewidget.cpp
index e4228d81b..ad6683e7f 100644
--- a/kdeui/kdatewidget.cpp
+++ b/kdeui/kdatewidget.cpp
@@ -37,7 +37,7 @@ public:
   KDateWidgetSpinBox(int min, int max, TQWidget *parent)
     : TQSpinBox(min, max, 1, parent)
   {
-     editor()->tqsetAlignment(AlignRight);
+     editor()->setAlignment(AlignRight);
   }
 };
 
@@ -73,8 +73,8 @@ void KDateWidget::init()
 {
   d = new KDateWidgetPrivate;
   KLocale *locale = KGlobal::locale();
-  TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
-  tqlayout->setAutoAdd(true);
+  TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
+  layout->setAutoAdd(true);
   d->m_day = new KDateWidgetSpinBox(1, 1, this);
   d->m_month = new TQComboBox(false, this);
   for (int i = 1; ; ++i)
@@ -97,8 +97,8 @@ void KDateWidget::init(const TQDate& date)
 {
   d = new KDateWidgetPrivate;
   KLocale *locale = KGlobal::locale();
-  TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
-  tqlayout->setAutoAdd(true);
+  TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
+  layout->setAutoAdd(true);
   d->m_day = new KDateWidgetSpinBox(1, 1, this);
   d->m_month = new TQComboBox(false, this);
   for (int i = 1; ; ++i)
diff --git a/kdeui/kdcopactionproxy.cpp b/kdeui/kdcopactionproxy.cpp
index 2b20e8bd3..15e431da3 100644
--- a/kdeui/kdcopactionproxy.cpp
+++ b/kdeui/kdcopactionproxy.cpp
@@ -132,7 +132,7 @@ bool KDCOPActionProxy::processAction( const TQCString &, const TQCString &fun, c
   {
     replyType = "bool";
     TQDataStream reply( replyData, IO_WriteOnly );
-    reply << (TQ_INT8)action->isPlugged();
+    reply << (Q_INT8)action->isPlugged();
     return true;
   }
 
diff --git a/kdeui/kdepackages.h b/kdeui/kdepackages.h
index 327f64f18..f1d7ac284 100644
--- a/kdeui/kdepackages.h
+++ b/kdeui/kdepackages.h
@@ -259,7 +259,7 @@ const char * const packages[] = {
 "kamefu",
 "kanagram",
 "kandy",
-"kapptqfinder",
+"kappfinder",
 "kapptemplate",
 "karbon",
 "karbon/opendocument",
@@ -520,7 +520,7 @@ const char * const packages[] = {
 "kdevelop/php support",
 "kdevelop/problem reporter",
 "kdevelop/qeditor",
-"kdevelop/tqreplace part",
+"kdevelop/replace part",
 "kdevelop/scriptproject",
 "kdevelop/valgrind integration",
 "kdevplatform",
@@ -586,8 +586,8 @@ const char * const packages[] = {
 "kfile-plugins/wav",
 "kfile",
 "kfile/kfileplacesview",
-"kfiletqreplace",
-"ktqfind",
+"kfilereplace",
+"kfind",
 "kfinger",
 "kfloppy",
 "kformula",
@@ -703,7 +703,7 @@ const char * const packages[] = {
 "kipiplugins/batchprocessimages",
 "kipiplugins/calendar",
 "kipiplugins/cdarchiving",
-"kipiplugins/tqfindimages",
+"kipiplugins/findimages",
 "kipiplugins/flickrexport",
 "kipiplugins/galleryexport",
 "kipiplugins/imageviewer",
@@ -921,12 +921,12 @@ const char * const packages[] = {
 "kopete/Alias Plugin",
 "kopete/Audio/Video Plugin",
 "kopete/Auto-Away Plugin",
-"kopete/Autotqreplace plugin",
+"kopete/Autoreplace plugin",
 "kopete/Bonjour Plugin",
 "kopete/Bookmarks plugin",
 "kopete/Chat Window",
 "kopete/Chatwindow Styles",
-"kopete/Connection tqStatus Plugin",
+"kopete/Connection Status Plugin",
 "kopete/Contact Notes Plugin",
 "kopete/Contact list",
 "kopete/Cryptography Plugin",
@@ -1276,7 +1276,7 @@ const char * const packages[] = {
 "systemsettings/kcmlaunch",
 "systemsettings/kdm",
 "systemsettings/keyboard",
-"systemsettings/keyboard_tqlayout",
+"systemsettings/keyboard_layout",
 "systemsettings/keys",
 "systemsettings/khotkeys",
 "systemsettings/ksplashthememgr",
diff --git a/kdeui/kdetrayproxy/kdetrayproxy.cpp b/kdeui/kdetrayproxy/kdetrayproxy.cpp
index bf2298fd3..e49f3a148 100644
--- a/kdeui/kdetrayproxy/kdetrayproxy.cpp
+++ b/kdeui/kdetrayproxy/kdetrayproxy.cpp
@@ -57,11 +57,11 @@ void KDETrayProxy::windowAdded( WId w )
     if ( !trayWinFor ) // not a KDE tray window
         return;
 //    kdDebug() << "New tray window:" << w << endl;
-    if( !tray_windows.tqcontains( w ))
+    if( !tray_windows.contains( w ))
         tray_windows.append( w );
     withdrawWindow( w );
     // window will be removed from pending_windows when after docked
-    if( !pending_windows.tqcontains( w ))
+    if( !pending_windows.contains( w ))
         pending_windows.append( w );
     docked_windows.remove( w );
     Window owner = selection.owner();
@@ -87,21 +87,21 @@ bool KDETrayProxy::x11Event( XEvent* e )
     {
     if( tray_windows.isEmpty())
         return false;
-    if( e->type == DestroyNotify && tray_windows.tqcontains( e->xdestroywindow.window ))
+    if( e->type == DestroyNotify && tray_windows.contains( e->xdestroywindow.window ))
         {
         tray_windows.remove( e->xdestroywindow.window );
         pending_windows.remove( e->xdestroywindow.window );
         docked_windows.remove( e->xdestroywindow.window );
         }
-    if( e->type == ReparentNotify && tray_windows.tqcontains( e->xreparent.window ))
+    if( e->type == ReparentNotify && tray_windows.contains( e->xreparent.window ))
         {
         if( e->xreparent.parent == qt_xrootwin())
             {
-            if( !docked_windows.tqcontains( e->xreparent.window ) || e->xreparent.serial >= docked_windows[ e->xreparent.window ] )
+            if( !docked_windows.contains( e->xreparent.window ) || e->xreparent.serial >= docked_windows[ e->xreparent.window ] )
                 {
 //                kdDebug() << "Window released:" << e->xreparent.window << endl;
                 docked_windows.remove( e->xreparent.window );
-                if( !pending_windows.tqcontains( e->xreparent.window ))
+                if( !pending_windows.contains( e->xreparent.window ))
                     pending_windows.append( e->xreparent.window );
                 }
             }
@@ -111,9 +111,9 @@ bool KDETrayProxy::x11Event( XEvent* e )
             pending_windows.remove( e->xreparent.window );
             }
         }
-    if( e->type == UnmapNotify && tray_windows.tqcontains( e->xunmap.window ))
+    if( e->type == UnmapNotify && tray_windows.contains( e->xunmap.window ))
         {
-        if( docked_windows.tqcontains( e->xunmap.window ) && e->xunmap.serial >= docked_windows[ e->xunmap.window ] )
+        if( docked_windows.contains( e->xunmap.window ) && e->xunmap.serial >= docked_windows[ e->xunmap.window ] )
             {
 //            kdDebug() << "Window unmapped:" << e->xunmap.window << endl;
             XReparentWindow( qt_xdisplay(), e->xunmap.window, qt_xrootwin(), 0, 0 );
diff --git a/kdeui/kdialog.cpp b/kdeui/kdialog.cpp
index 054144351..5963a415d 100644
--- a/kdeui/kdialog.cpp
+++ b/kdeui/kdialog.cpp
@@ -132,9 +132,9 @@ void KDialog::setPlainCaption( const TQString &caption )
 
 void KDialog::resizeLayout( TQWidget *w, int margin, int spacing )
 {
-  if( w->tqlayout() )
+  if( w->layout() )
   {
-    resizeLayout( w->tqlayout(), margin, spacing );
+    resizeLayout( w->layout(), margin, spacing );
   }
 
   if( w->children() )
@@ -162,10 +162,10 @@ void KDialog::resizeLayout( TQLayoutItem *lay, int margin, int spacing )
     resizeLayout( child, margin, spacing );
     ++it;
   }
-  if( lay->tqlayout() )
+  if( lay->layout() )
   {
-    lay->tqlayout()->setMargin( margin );
-    lay->tqlayout()->setSpacing( spacing );
+    lay->layout()->setMargin( margin );
+    lay->layout()->setSpacing( spacing );
   }
 }
 
@@ -188,7 +188,7 @@ static TQRect screenRect( TQWidget *w, int screen )
     }
     return desktop->availableGeometry(screen);
   } else {
-    return desktop->tqgeometry();
+    return desktop->geometry();
   }
 }
 
diff --git a/kdeui/kdialog.h b/kdeui/kdialog.h
index 17a1926b7..d74b232ce 100644
--- a/kdeui/kdialog.h
+++ b/kdeui/kdialog.h
@@ -37,7 +37,7 @@ class TQLayoutItem;
  * (@p escape = @p reject(), @p enter = @p accept(), etc.) are disabled.
  *
  * The marginHint() and spacingHint() sizes shall be used
- * whenever you tqlayout the interior of a dialog. One special note. If
+ * whenever you layout the interior of a dialog. One special note. If
  * you make your own action buttons (OK, Cancel etc), the space
  * beteween the buttons shall be spacingHint(), whereas the space
  * above, below, to the right and to the left shall be marginHint().
@@ -75,20 +75,20 @@ class KDEUI_EXPORT KDialog : public QDialog
     static int spacingHint();
 
     /**
-     * Resize every tqlayout manager used in @p widget and its nested children.
+     * Resize every layout manager used in @p widget and its nested children.
      *
      * @param widget The widget used.
-     * @param margin The new tqlayout margin.
-     * @param spacing The new tqlayout spacing.
+     * @param margin The new layout margin.
+     * @param spacing The new layout spacing.
      */
     static void resizeLayout( TQWidget *widget, int margin, int spacing );
 
     /**
-     * Resize every tqlayout associated with @p lay and its children.
+     * Resize every layout associated with @p lay and its children.
      *
-     * @param lay tqlayout to be resized
-     * @param margin The new tqlayout margin
-     * @param spacing The new tqlayout spacing
+     * @param lay layout to be resized
+     * @param margin The new layout margin
+     * @param spacing The new layout spacing
      */
     static void resizeLayout( TQLayoutItem *lay, int margin, int spacing );
 
@@ -97,7 +97,7 @@ class KDEUI_EXPORT KDialog : public QDialog
      * account. If @p screen is -1, @p widget will be centered on its
      * current screen (if it was shown already) or on the primary screen.
      * If @p screen is -3, @p widget will be centered on the screen that
-     * currently tqcontains the mouse pointer.
+     * currently contains the mouse pointer.
      * @p screen will be ignored if a merged display (like Xinerama) is not
      * in use, or merged display placement is not enabled in kdeglobals.
      * @since 3.1
@@ -106,7 +106,7 @@ class KDEUI_EXPORT KDialog : public QDialog
 
     /**
      * Places @p widget so that it doesn't cover a certain @p area of the screen.
-     * This is typically used by the "tqfind dialog" so that the match it tqfinds can
+     * This is typically used by the "find dialog" so that the match it finds can
      * be read.
      * For @p screen, see centerOnScreen
      * @return true on success (widget doesn't cover area anymore, or never did),
@@ -155,7 +155,7 @@ class KDEUI_EXPORT KDialog : public QDialog
      * Use marginHint() and spacingHint() in your slot
      * to get the new values.
      */
-    void tqlayoutHintChanged();
+    void layoutHintChanged();
 
   private:
     static const int mMarginSize;
@@ -185,7 +185,7 @@ class KDEUI_EXPORT KDialog : public QDialog
   * @author Waldo Bastian <bastian@kde.org>
   */
 class KDialogQueuePrivate;
-class KDEUI_EXPORT KDialogQueue : public TQObject
+class KDEUI_EXPORT KDialogQueue : public QObject
 {
       Q_OBJECT
 
diff --git a/kdeui/kdialogbase.cpp b/kdeui/kdialogbase.cpp
index 884e6a84d..202de5f9b 100644
--- a/kdeui/kdialogbase.cpp
+++ b/kdeui/kdialogbase.cpp
@@ -65,7 +65,7 @@ struct SButton : public Qt
   SButton()
   {
     box = 0;
-    tqmask = 0;
+    mask = 0;
     style = 0;
   }
 
@@ -76,7 +76,7 @@ struct SButton : public Qt
   KPushButton *button( int key );
 
   TQWidget *box;
-  int tqmask;
+  int mask;
   int style;
   TQPtrList<KDialogBaseButton> list;
 };
@@ -109,7 +109,7 @@ KDialogBase::KDialogBase( TQWidget *parent, const char *name, bool modal,
   setCaption( caption );
 
   makeRelay();
-  connect( this, TQT_SIGNAL(tqlayoutHintChanged()), TQT_SLOT(updateGeometry()) );
+  connect( this, TQT_SIGNAL(layoutHintChanged()), TQT_SLOT(updateGeometry()) );
 
   enableButtonSeparator( separator );
   makeButtonBox( buttonMask, defaultButton, user1, user2, user3 );
@@ -131,7 +131,7 @@ KDialogBase::KDialogBase( int dialogFace, const TQString &caption,
   setCaption( caption );
 
   makeRelay();
-  connect( this, TQT_SIGNAL(tqlayoutHintChanged()), TQT_SLOT(updateGeometry()) );
+  connect( this, TQT_SIGNAL(layoutHintChanged()), TQT_SLOT(updateGeometry()) );
 
   mJanus = new KJanusWidget( this, "janus", dialogFace );
   connect(mJanus, TQT_SIGNAL(aboutToShowPage(TQWidget *)),
@@ -160,7 +160,7 @@ KDialogBase::KDialogBase(  KDialogBase::DialogType dialogFace, WFlags f, TQWidge
   setCaption( caption );
 
   makeRelay();
-  connect( this, TQT_SIGNAL(tqlayoutHintChanged()), TQT_SLOT(updateGeometry()) );
+  connect( this, TQT_SIGNAL(layoutHintChanged()), TQT_SLOT(updateGeometry()) );
 
   mJanus = new KJanusWidget( this, "janus", dialogFace );
   connect(mJanus, TQT_SIGNAL(aboutToShowPage(TQWidget *)),
@@ -189,7 +189,7 @@ KDialogBase::KDialogBase( const TQString &caption, int buttonMask,
   setCaption( caption );
 
   makeRelay();
-  connect( this, TQT_SIGNAL(tqlayoutHintChanged()), TQT_SLOT(updateGeometry()) );
+  connect( this, TQT_SIGNAL(layoutHintChanged()), TQT_SLOT(updateGeometry()) );
 
   enableButtonSeparator( separator );
 
@@ -230,7 +230,7 @@ void SButton::resize( bool sameWidth, int margin,
 
   for( p = list.first(); p; p =  list.next() )
   {
-    const TQSize s( p->tqsizeHint() );
+    const TQSize s( p->sizeHint() );
     if( s.height() > h ) { h = s.height(); }
     if( s.width() > w ) { w = s.width(); }
   }
@@ -239,7 +239,7 @@ void SButton::resize( bool sameWidth, int margin,
   {
     for( p = list.first(); p; p =  list.next() )
     {
-      TQSize s( p->tqsizeHint() );
+      TQSize s( p->sizeHint() );
       if( sameWidth ) { s.setWidth( w ); }
       p->setFixedWidth( s.width() );
       t += s.width() + spacing;
@@ -253,7 +253,7 @@ void SButton::resize( bool sameWidth, int margin,
     // sameWidth has no effect here
     for( p = list.first(); p; p =  list.next() )
     {
-      TQSize s( p->tqsizeHint() );
+      TQSize s( p->sizeHint() );
       s.setWidth( w );
       p->setFixedSize( s );
       t += s.height() + spacing;
@@ -381,7 +381,7 @@ void KDialogBase::makeRelay()
   if( mTile )
   {
     connect( mTile, TQT_SIGNAL(pixmapChanged()), TQT_SLOT(updateBackground()) );
-    connect( tqApp, TQT_SIGNAL(aboutToQuit()), mTile, TQT_SLOT(cleanup()) );
+    connect( qApp, TQT_SIGNAL(aboutToQuit()), mTile, TQT_SLOT(cleanup()) );
   }
 }
 
@@ -426,20 +426,20 @@ TQFrame *KDialogBase::plainPage()
 
 void KDialogBase::adjustSize()
 {
-//  if (tqlayout())
-//     tqlayout()->activate();
+//  if (layout())
+//     layout()->activate();
   if( d->bFixed )
-    setFixedSize( tqsizeHint() );
+    setFixedSize( sizeHint() );
   else
-    resize( tqsizeHint() );
+    resize( sizeHint() );
 }
 
-TQSize KDialogBase::tqsizeHint() const
+TQSize KDialogBase::sizeHint() const
 {
-   return d->minSize.expandedTo( tqminimumSizeHint() ) + d->incSize;
+   return d->minSize.expandedTo( minimumSizeHint() ) + d->incSize;
 }
 
-TQSize KDialogBase::tqminimumSizeHint() const
+TQSize KDialogBase::minimumSizeHint() const
 {
   const int m = marginHint();
   const int s = spacingHint();
@@ -454,7 +454,7 @@ TQSize KDialogBase::tqminimumSizeHint() const
   //
   if( mUrlHelp )
   {
-    s2 = mUrlHelp->tqminimumSize() + zeroByS;
+    s2 = mUrlHelp->minimumSize() + zeroByS;
   }
   s1.rwidth()   = QMAX( s1.rwidth(), s2.rwidth() );
   s1.rheight() += s2.rheight();
@@ -464,13 +464,13 @@ TQSize KDialogBase::tqminimumSizeHint() const
   //
   if( mJanus )
   {
-    s2 = mJanus->tqminimumSizeHint() + zeroByS;
+    s2 = mJanus->minimumSizeHint() + zeroByS;
   }
   else if( mMainWidget )
   {
-    s2 = mMainWidget->tqsizeHint() + zeroByS;
-    s2 = s2.expandedTo( mMainWidget->tqminimumSize() );
-    s2 = s2.expandedTo( mMainWidget->tqminimumSizeHint() );
+    s2 = mMainWidget->sizeHint() + zeroByS;
+    s2 = s2.expandedTo( mMainWidget->minimumSize() );
+    s2 = s2.expandedTo( mMainWidget->minimumSizeHint() );
     if( s2.isEmpty() )
     {
       s2 = TQSize( 100, 100+s );
@@ -485,9 +485,9 @@ TQSize KDialogBase::tqminimumSizeHint() const
 
   if (d->detailsWidget && d->bDetails)
   {
-    s2 = d->detailsWidget->tqsizeHint() + zeroByS;
-    s2 = s2.expandedTo( d->detailsWidget->tqminimumSize() );
-    s2 = s2.expandedTo( d->detailsWidget->tqminimumSizeHint() );
+    s2 = d->detailsWidget->sizeHint() + zeroByS;
+    s2 = s2.expandedTo( d->detailsWidget->minimumSize() );
+    s2 = s2.expandedTo( d->detailsWidget->minimumSizeHint() );
     s1.rwidth()  = QMAX( s1.rwidth(), s2.rwidth() );
     s1.rheight() += s2.rheight();
   }
@@ -497,7 +497,7 @@ TQSize KDialogBase::tqminimumSizeHint() const
   //
   if( mActionSep )
   {
-    s1.rheight() += mActionSep->tqminimumSize().height() + s;
+    s1.rheight() += mActionSep->minimumSize().height() + s;
   }
 
   //
@@ -505,7 +505,7 @@ TQSize KDialogBase::tqminimumSizeHint() const
   //
   if( d->mButton.box )
   {
-    s2 = d->mButton.box->tqminimumSize();
+    s2 = d->mButton.box->minimumSize();
     if( mButtonOrientation == Horizontal )
     {
       s1.rwidth()   = QMAX( s1.rwidth(), s2.rwidth() );
@@ -530,7 +530,7 @@ TQSize KDialogBase::tqminimumSizeHint() const
 
 void KDialogBase::disableResize()
 {
-  setFixedSize( tqsizeHint() );
+  setFixedSize( sizeHint() );
 }
 
 
@@ -571,31 +571,31 @@ void KDialogBase::makeButtonBox( int buttonMask, ButtonCode defaultButton,
 
   d->mButton.box = new TQWidget( this );
 
-  d->mButton.tqmask = buttonMask;
-  if( d->mButton.tqmask & Help )
+  d->mButton.mask = buttonMask;
+  if( d->mButton.mask & Help )
   {
     KPushButton *pb = d->mButton.append( Help, KStdGuiItem::help() );
 
     connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotHelp()) );
   }
-  if( d->mButton.tqmask & Default )
+  if( d->mButton.mask & Default )
   {
     KPushButton *pb = d->mButton.append( Default, KStdGuiItem::defaults() );
 
     connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotDefault()) );
   }
-  if( d->mButton.tqmask & Details )
+  if( d->mButton.mask & Details )
   {
     KPushButton *pb = d->mButton.append( Details, TQString::null );
     connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotDetails()) );
     setDetails(false);
   }
-  if( d->mButton.tqmask & User3 )
+  if( d->mButton.mask & User3 )
   {
     KPushButton *pb = d->mButton.append( User3, user3 );
     connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotUser3()) );
   }
-  if( d->mButton.tqmask & User2 )
+  if( d->mButton.mask & User2 )
   {
     KPushButton *pb = d->mButton.append( User2, user2 );
     if( mMessageBoxMode )
@@ -607,7 +607,7 @@ void KDialogBase::makeButtonBox( int buttonMask, ButtonCode defaultButton,
       connect( pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUser2()) );
     }
   }
-  if( d->mButton.tqmask & User1 )
+  if( d->mButton.mask & User1 )
   {
     KPushButton *pb = d->mButton.append( User1, user1 );
     if( mMessageBoxMode )
@@ -619,29 +619,29 @@ void KDialogBase::makeButtonBox( int buttonMask, ButtonCode defaultButton,
       connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotUser1()) );
     }
   }
-  if( d->mButton.tqmask & Ok )
+  if( d->mButton.mask & Ok )
   {
     KPushButton *pb = d->mButton.append( Ok, KStdGuiItem::ok() );
     connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotOk()) );
   }
-  if( d->mButton.tqmask & Apply )
+  if( d->mButton.mask & Apply )
   {
     KPushButton *pb = d->mButton.append( Apply, KStdGuiItem::apply() );
     connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotApply()) );
     connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(applyPressed()) );
   }
-  if( d->mButton.tqmask & Try )
+  if( d->mButton.mask & Try )
   {
     KPushButton *pb = d->mButton.append( Try,
                            i18n( "&Try" ) );
     connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotTry()) );
   }
-  if( d->mButton.tqmask & Cancel )
+  if( d->mButton.mask & Cancel )
   {
     KPushButton *pb = d->mButton.append( Cancel, KStdGuiItem::cancel() );
     connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotCancel()) );
   }
-  if( d->mButton.tqmask & Close )
+  if( d->mButton.mask & Close )
   {
     KPushButton *pb = d->mButton.append( Close, KStdGuiItem::close() );
     connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotClose()) );
@@ -671,11 +671,11 @@ void KDialogBase::setButtonStyle( int style )
   if( style < 0 || style >= ActionStyleMAX ) { style = ActionStyle0; }
   d->mButton.style = style;
 
-  const int *tqlayout;
-  int tqlayoutMax = 0;
+  const int *layout;
+  int layoutMax = 0;
   if (mMessageBoxMode)
   {
-    static const int tqlayoutRule[5][6] =
+    static const int layoutRule[5][6] =
     {
       {Details,Stretch,User2|Stretch,User1|Stretch,Cancel|Stretch, Details|Filler},
       {Details,Stretch,User2|Stretch,User1|Stretch,Cancel|Stretch, Details|Filler},
@@ -683,12 +683,12 @@ void KDialogBase::setButtonStyle( int style )
       {Details|Filler,Stretch,Cancel|Stretch,User2|Stretch,User1|Stretch,Details},
       {Details|Filler,Stretch,Cancel|Stretch,User2|Stretch,User1|Stretch,Details}
     };
-    tqlayoutMax = 6;
-    tqlayout = tqlayoutRule[ d->mButton.style ];
+    layoutMax = 6;
+    layout = layoutRule[ d->mButton.style ];
   }
   else if (mButtonOrientation == Horizontal)
   {
-    static const int tqlayoutRule[5][10] =
+    static const int layoutRule[5][10] =
     {
       {Details,Help,Default,Stretch,User3,User2,User1,Ok,Apply|Try,Cancel|Close},
       {Details,Help,Default,Stretch,User3,User2,User1,Cancel|Close,Apply|Try,Ok},
@@ -696,12 +696,12 @@ void KDialogBase::setButtonStyle( int style )
       {Ok,Apply|Try,Cancel|Close,User3,User2,User1,Stretch,Default,Help,Details},
       {Ok,Cancel|Close,Apply|Try,User3,User2,User1,Stretch,Default,Help,Details}
     };
-    tqlayoutMax = 10;
-    tqlayout = tqlayoutRule[ d->mButton.style ];
+    layoutMax = 10;
+    layout = layoutRule[ d->mButton.style ];
   }
   else
   {
-    static const int tqlayoutRule[5][10] =
+    static const int layoutRule[5][10] =
     {
       {Ok,Apply|Try,User1,User2,User3,Stretch,Default,Cancel|Close,Help, Details},
       //{Ok,Apply|Try,Cancel|Close,User1,User2,User3,Stretch, Default,Help, Details},
@@ -710,13 +710,13 @@ void KDialogBase::setButtonStyle( int style )
       {Ok,Apply|Try,Cancel|Close,User3,User2,User1,Stretch,Default,Help,Details},
       {Ok,Cancel|Close,Apply|Try,User3,User2,User1,Stretch,Default,Help,Details}
     };
-    tqlayoutMax = 10;
-    tqlayout = tqlayoutRule[ d->mButton.style ];
+    layoutMax = 10;
+    layout = layoutRule[ d->mButton.style ];
   }
 
-  if( d->mButton.box->tqlayout() )
+  if( d->mButton.box->layout() )
   {
-    delete d->mButton.box->tqlayout();
+    delete d->mButton.box->layout();
   }
 
   TQBoxLayout *lay;
@@ -735,74 +735,74 @@ void KDialogBase::setButtonStyle( int style )
   TQPushButton *prevButton = 0;
   TQPushButton *newButton;
 
-  for( int i=0; i<tqlayoutMax; ++i )
+  for( int i=0; i<layoutMax; ++i )
   {
-    if(((ButtonCode) tqlayout[i]) == Stretch) // Unconditional Stretch
+    if(((ButtonCode) layout[i]) == Stretch) // Unconditional Stretch
     {
       lay->addStretch(1);
       continue;
     }
-    else if (tqlayout[i] & Filler) // Conditional space
+    else if (layout[i] & Filler) // Conditional space
     {
-      if (d->mButton.tqmask & tqlayout[i])
+      if (d->mButton.mask & layout[i])
       {
-        newButton = actionButton( (ButtonCode) (tqlayout[i] & ~(Stretch | Filler)));
+        newButton = actionButton( (ButtonCode) (layout[i] & ~(Stretch | Filler)));
         if (newButton)
-           lay->addSpacing(newButton->tqsizeHint().width());
+           lay->addSpacing(newButton->sizeHint().width());
       }
       continue;
     }
-    else if( d->mButton.tqmask & Help & tqlayout[i] )
+    else if( d->mButton.mask & Help & layout[i] )
     {
       newButton = actionButton( Help );
       lay->addWidget( newButton ); ++numButton;
     }
-    else if( d->mButton.tqmask & Default & tqlayout[i] )
+    else if( d->mButton.mask & Default & layout[i] )
     {
       newButton = actionButton( Default );
       lay->addWidget( newButton ); ++numButton;
     }
-    else if( d->mButton.tqmask & User3 & tqlayout[i] )
+    else if( d->mButton.mask & User3 & layout[i] )
     {
       newButton = actionButton( User3 );
       lay->addWidget( newButton ); ++numButton;
     }
-    else if( d->mButton.tqmask & User2 & tqlayout[i] )
+    else if( d->mButton.mask & User2 & layout[i] )
     {
       newButton = actionButton( User2 );
       lay->addWidget( newButton ); ++numButton;
     }
-    else if( d->mButton.tqmask & User1 & tqlayout[i] )
+    else if( d->mButton.mask & User1 & layout[i] )
     {
       newButton = actionButton( User1 );
       lay->addWidget( newButton ); ++numButton;
     }
-    else if( d->mButton.tqmask & Ok & tqlayout[i] )
+    else if( d->mButton.mask & Ok & layout[i] )
     {
       newButton = actionButton( Ok );
       lay->addWidget( newButton ); ++numButton;
     }
-    else if( d->mButton.tqmask & Apply & tqlayout[i] )
+    else if( d->mButton.mask & Apply & layout[i] )
     {
       newButton = actionButton( Apply );
       lay->addWidget( newButton ); ++numButton;
     }
-    else if( d->mButton.tqmask & Try & tqlayout[i] )
+    else if( d->mButton.mask & Try & layout[i] )
     {
       newButton = actionButton( Try );
       lay->addWidget( newButton ); ++numButton;
     }
-    else if( d->mButton.tqmask & Cancel & tqlayout[i] )
+    else if( d->mButton.mask & Cancel & layout[i] )
     {
       newButton = actionButton( Cancel );
       lay->addWidget( newButton ); ++numButton;
     }
-    else if( d->mButton.tqmask & Close & tqlayout[i] )
+    else if( d->mButton.mask & Close & layout[i] )
     {
       newButton = actionButton( Close );
       lay->addWidget( newButton ); ++numButton;
     }
-    else if( d->mButton.tqmask & Details & tqlayout[i] )
+    else if( d->mButton.mask & Details & layout[i] )
     {
       newButton = actionButton( Details );
       lay->addWidget( newButton ); ++numButton;
@@ -813,7 +813,7 @@ void KDialogBase::setButtonStyle( int style )
     }
 
     // Add conditional stretch (Only added if a button was added)
-    if(tqlayout[i] & Stretch)
+    if(layout[i] & Stretch)
     {
       lay->addStretch(1);
     }
@@ -1113,7 +1113,7 @@ void KDialogBase::setDetailsWidget(TQWidget *detailsWidget)
 {
   delete d->detailsWidget;
   d->detailsWidget = detailsWidget;
-  if (d->detailsWidget->tqparentWidget() != this)
+  if (d->detailsWidget->parentWidget() != this)
      d->detailsWidget->reparent(this, TQPoint(0,0));
   d->detailsWidget->hide();
   if( mIsActivated )
@@ -1136,14 +1136,14 @@ void KDialogBase::setDetails(bool showDetails)
      setButtonText(Details, d->detailsButton+ " <<");
      if (d->detailsWidget)
      {
-        if (tqlayout())
-           tqlayout()->setEnabled(false);
+        if (layout())
+           layout()->setEnabled(false);
         adjustSize();
         d->detailsWidget->show();
-        if (tqlayout())
+        if (layout())
         {
-           tqlayout()->activate();
-           tqlayout()->setEnabled(true);
+           layout()->activate();
+           layout()->setEnabled(true);
         }
      }
   }
@@ -1154,8 +1154,8 @@ void KDialogBase::setDetails(bool showDetails)
      {
         d->detailsWidget->hide();
      }
-     if (tqlayout())
-        tqlayout()->activate();
+     if (layout())
+        layout()->activate();
      adjustSize();
   }
   d->bSettingDetails = false;
@@ -1492,10 +1492,10 @@ TQRect KDialogBase::getContentsRect() const
   r.setLeft( marginHint() );
   r.setTop( marginHint() + (mUrlHelp ? mUrlHelp->height() : 0) );
   r.setRight( width() - marginHint() );
-  int h = (!mActionSep ? 0 : mActionSep->tqminimumSize().height()+marginHint());
+  int h = (!mActionSep ? 0 : mActionSep->minimumSize().height()+marginHint());
   if( d->mButton.box )
   {
-    r.setBottom( height() - d->mButton.box->tqminimumSize().height() - h );
+    r.setBottom( height() - d->mButton.box->minimumSize().height() - h );
   }
   else
   {
@@ -1513,14 +1513,14 @@ void KDialogBase::getBorderWidths(int& ulx, int& uly, int& lrx, int& lry) const
   uly = marginHint();
   if( mUrlHelp  )
   {
-    uly += mUrlHelp->tqminimumSize().height();
+    uly += mUrlHelp->minimumSize().height();
   }
 
   lrx = marginHint();
-  lry = d->mButton.box ? d->mButton.box->tqminimumSize().height() : 0;
+  lry = d->mButton.box ? d->mButton.box->minimumSize().height() : 0;
   if( mActionSep )
   {
-    lry += mActionSep->tqminimumSize().height() + marginHint();
+    lry += mActionSep->minimumSize().height() + marginHint();
   }
 }
 
@@ -1748,15 +1748,15 @@ TQSize KDialogBase::configDialogSize( KConfig& config,
 				      const TQString& groupName ) const
 {
    int w, h;
-   int scnum = TQApplication::desktop()->screenNumber(tqparentWidget());
+   int scnum = TQApplication::desktop()->screenNumber(parentWidget());
    TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
 
-   w = tqsizeHint().width();
-   h = tqsizeHint().height();
+   w = sizeHint().width();
+   h = sizeHint().height();
 
    KConfigGroupSaver cs(&config, groupName);
-   w = config.readNumEntry( TQString::tqfromLatin1("Width %1").arg( desk.width()), w );
-   h = config.readNumEntry( TQString::tqfromLatin1("Height %1").arg( desk.height()), h );
+   w = config.readNumEntry( TQString::fromLatin1("Width %1").arg( desk.width()), w );
+   h = config.readNumEntry( TQString::fromLatin1("Height %1").arg( desk.height()), h );
 
    return TQSize( w, h );
 }
@@ -1771,15 +1771,15 @@ void KDialogBase::saveDialogSize( const TQString& groupName, bool global )
 void KDialogBase::saveDialogSize( KConfig& config, const TQString& groupName,
 				      bool global ) const
 {
-   int scnum = TQApplication::desktop()->screenNumber(tqparentWidget());
+   int scnum = TQApplication::desktop()->screenNumber(parentWidget());
    TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
 
    KConfigGroupSaver cs(&config, groupName);
    TQSize sizeToSave = size();
 
-   config.writeEntry( TQString::tqfromLatin1("Width %1").arg( desk.width()),
+   config.writeEntry( TQString::fromLatin1("Width %1").arg( desk.width()),
 		      TQString::number( sizeToSave.width()), true, global);
-   config.writeEntry( TQString::tqfromLatin1("Height %1").arg( desk.height()),
+   config.writeEntry( TQString::fromLatin1("Height %1").arg( desk.height()),
 		      TQString::number( sizeToSave.height()), true, global);
 }
 
diff --git a/kdeui/kdialogbase.h b/kdeui/kdialogbase.h
index 5a914b791..ea4b21955 100644
--- a/kdeui/kdialogbase.h
+++ b/kdeui/kdialogbase.h
@@ -48,18 +48,18 @@ class KDialogBaseButton;
 class KDialogBaseTile;
 
 /**
- * @short A dialog base class with standard buttons and predefined tqlayouts.
+ * @short A dialog base class with standard buttons and predefined layouts.
  *
  * Provides basic functionality needed by nearly all dialogs.
  *
- * It offers the standard action buttons you'd expect to tqfind in a
+ * It offers the standard action buttons you'd expect to find in a
  * dialog as well as the capability to define at most three configurable
- * buttons. You can define a main widget that tqcontains your specific
- * dialog tqlayout or you can use a predefined tqlayout. Currently, @p
+ * buttons. You can define a main widget that contains your specific
+ * dialog layout or you can use a predefined layout. Currently, @p
  * TreeList/Paged, @p Tabbed, @p Plain, @p Swallow and @p IconList
- * mode tqlayouts (faces) are available.
+ * mode layouts (faces) are available.
  *
- * The class takes care of the tqgeometry management. You only need to define
+ * The class takes care of the geometry management. You only need to define
  * a minimum size for the widget you want to use as the main widget.
  *
  * You can set a background tile (pixmap) for parts of the dialog. The
@@ -67,7 +67,7 @@ class KDialogBaseTile;
  * application so that they all get the same look and feel.
  *
  * There is a tutorial available on http://developer.kde.org/ (NOT YET)
- * that tqcontains
+ * that contains
  * copy/paste examples as well a screenshots on how to use this class.
  *
  * <b>Standard buttons (action buttons):</b>\n
@@ -100,7 +100,7 @@ class KDialogBaseTile;
  * signals that are related to the standard action buttons will be used
  * when you don't use these buttons.
  *
- * <b>Dialog tqshapes:</b>\n
+ * <b>Dialog shapes:</b>\n
  *
  * You can either use one of the prebuilt, easy to use, faces or
  * define your own main widget. The dialog provides ready to use
@@ -138,7 +138,7 @@ class KDialogBaseTile;
  * equal to KDialog::marginHint(). You should not add a margin yourself,
  * since one will be added automatically.
  * The example below (from kedit) shows how you use the top level widget
- * and its tqlayout. The second argument (the border) to QVBoxLayout
+ * and its layout. The second argument (the border) to QVBoxLayout
  * is 0. This situation is valid for addPage , addVBoxPage ,
  * addHBoxPage , addGridPage , makeMainWidget ,
  * makeVBoxMainWidget , makeHBoxMainWidget and
@@ -279,8 +279,8 @@ class KDEUI_EXPORT KDialogBase : public KDialog
      * In KDE4 a WFlag paramater should be added after modal and next
      * function can be removed.
      *
-     * Constructor for the predefined tqlayout mode where you specify the
-     * kind of tqlayout (face).
+     * Constructor for the predefined layout mode where you specify the
+     * kind of layout (face).
      *
      * @param dialogFace You can use TreeList, Tabbed, Plain, Swallow or
      *        IconList.
@@ -312,8 +312,8 @@ class KDEUI_EXPORT KDialogBase : public KDialog
 
 
     /**
-     * Constructor for the predefined tqlayout mode where you specify the
-     * kind of tqlayout (face).
+     * Constructor for the predefined layout mode where you specify the
+     * kind of layout (face).
      *
      * @param dialogFace You can use TreeList, Tabbed, Plain, Swallow or
      *        IconList.
@@ -426,18 +426,18 @@ class KDEUI_EXPORT KDialogBase : public KDialog
      * resized before showing it.
      **/
     virtual void adjustSize();
-    virtual TQSize tqsizeHint() const;
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize sizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
     /**
-     * Retrieve the empty page when the predefined tqlayout is used in @p Plain
+     * Retrieve the empty page when the predefined layout is used in @p Plain
      * mode.
      *
      * This widget must be used as the toplevel widget of your dialog
      * code.
      *
-     * @return The widget or 0 if the predefined tqlayout mode is not @p Plain
-     *         or if you don't use any predefined tqlayout.
+     * @return The widget or 0 if the predefined layout mode is not @p Plain
+     *         or if you don't use any predefined layout.
      */
     TQFrame *plainPage();
 
@@ -448,8 +448,8 @@ class KDEUI_EXPORT KDialogBase : public KDialog
      * The returned widget must be used as the
      * toplevel widget for this particular page.
      * Note: The returned frame widget has no
-     * tqlayout manager associated with it. In order to use it you must
-     * create a tqlayout yourself as the example below illustrates:
+     * layout manager associated with it. In order to use it you must
+     * create a layout yourself as the example below illustrates:
      *
      * \code
      * TQFrame *page = addPage( i18n("Layout") );
@@ -492,8 +492,8 @@ class KDEUI_EXPORT KDialogBase : public KDialog
      * @p IconList or @p Tabbed mode.
      *
      * The returned widget must be used as the toplevel widget for
-     * this particular page. The widget tqcontains a QVBoxLayout
-     * tqlayout so the widget children are lined up vertically.  You can
+     * this particular page. The widget contains a QVBoxLayout
+     * layout so the widget children are lined up vertically.  You can
      * use it as follows:
      *
      * \code
@@ -535,8 +535,8 @@ class KDEUI_EXPORT KDialogBase : public KDialog
      * @p IconList or @p Tabbed mode.
      *
      * The returned widget must be used as the
-     * toplevel widget for this particular page. The widget tqcontains a
-     * TQHBoxLayout tqlayout so the widget children are lined up horizontally.
+     * toplevel widget for this particular page. The widget contains a
+     * TQHBoxLayout layout so the widget children are lined up horizontally.
      * You can use it as follows:
      *
      * @param itemName String used in the list or as tab item name.
@@ -572,8 +572,8 @@ class KDEUI_EXPORT KDialogBase : public KDialog
      * @p IconList or @p Tabbed mode.
      *
      * The returned widget must be used as the
-     * toplevel widget for this particular page. The widget tqcontains a
-     * TQGridLayout tqlayout so the widget children are  positioned in a grid.
+     * toplevel widget for this particular page. The widget contains a
+     * TQGridLayout layout so the widget children are  positioned in a grid.
      *
      * @param n Specifies the number of columns if @p dir is Qt::Horizontal
      *          or the number of rows if @p dir is Qt::Vertical.
@@ -733,7 +733,7 @@ class KDEUI_EXPORT KDialogBase : public KDialog
      * Sets the page with @p index to be displayed.
      *
      * This method will only
-     * work when the dialog is using the predefined tqshape of TreeList,
+     * work when the dialog is using the predefined shape of TreeList,
      * IconList or Tabbed.
      *
      * @param index Index of the page to be shown.
@@ -745,7 +745,7 @@ class KDEUI_EXPORT KDialogBase : public KDialog
      * Returns the index of the active page.
      *
      * This method will only work when the dialog is using the
-     * predefined tqshape of Tabbed, TreeList or IconList.
+     * predefined shape of Tabbed, TreeList or IconList.
      *
      * @return The page index or -1 if there is no active page.
      */
@@ -828,7 +828,7 @@ class KDEUI_EXPORT KDialogBase : public KDialog
 
    /**
     * read the dialogs size from the configuration according to the screen size.
-    * If no size is saved for one dimension of the screen, tqsizeHint() is returned.
+    * If no size is saved for one dimension of the screen, sizeHint() is returned.
     *
     * @param groupName Name of the group to read from. The old group
     *                  of KGlobal::config is preserved.
@@ -837,7 +837,7 @@ class KDEUI_EXPORT KDialogBase : public KDialog
 
    /**
     * read the dialogs size from the configuration according to the screen size.
-    * If no size is saved for one dimension of the screen, tqsizeHint() is returned.
+    * If no size is saved for one dimension of the screen, sizeHint() is returned.
     *
     * @param config The KConfig object to read from
     * @param groupName Name of the group to read from. The old group
@@ -888,7 +888,7 @@ class KDEUI_EXPORT KDialogBase : public KDialog
      *
      * If the default parameters are used
      * (that is, if no parameters are given) the standard texts are set:
-     * The button shows "OK", the tooltip tqcontains "Accept settings."
+     * The button shows "OK", the tooltip contains "Accept settings."
      * (internationalized) and the quickhelp text explains the standard
      * behavior of the OK button in settings dialogs.
      *
@@ -918,7 +918,7 @@ class KDEUI_EXPORT KDialogBase : public KDialog
      *
      * If the default parameters are
      * used (that is, if no parameters are given) the standard texts are set:
-     * The button shows "Apply", the tooltip tqcontains "Apply settings."
+     * The button shows "Apply", the tooltip contains "Apply settings."
      * (internationalized) and the quickhelp text explains the standard
      * behavior of the apply button in settings dialogs.
      *
@@ -1150,7 +1150,7 @@ class KDEUI_EXPORT KDialogBase : public KDialog
      *
      * This method returns the contents rectangle of the work area. Place
      * your widgets inside this rectangle, and use it to set up
-     * their tqgeometry. Be careful: The rectangle is only valid after
+     * their geometry. Be careful: The rectangle is only valid after
      * resizing the dialog, as it is a result of the resizing process.
      * If you need the "overhead" the dialog needs for its elements,
      * use getBorderWidths().
@@ -1167,7 +1167,7 @@ class KDEUI_EXPORT KDialogBase : public KDialog
      * set it as a minimum size for the resulting dialog.
      *
      * You should not need to use this method and never if you use one of
-     * the predefined tqshapes.
+     * the predefined shapes.
      *
      * @param w The width of you special widget.
      * @param h The height of you special widget.
@@ -1311,74 +1311,74 @@ class KDEUI_EXPORT KDialogBase : public KDialog
   signals:
     /**
      * The Help button was pressed. This signal is only emitted if
-     * slotHelp() is not tqreplaced.
+     * slotHelp() is not replaced.
      */
     void helpClicked();
 
     /**
      * The Default button was pressed. This signal is only emitted if
-     * slotDefault() is not tqreplaced.
+     * slotDefault() is not replaced.
      */
     void defaultClicked();
 
 
     /**
      * The User3 button was pressed. This signal is only emitted if
-     * slotUser3() is not tqreplaced.
+     * slotUser3() is not replaced.
      */
     void user3Clicked();
 
     /**
      * The User2 button was pressed. This signal is only emitted if
-     * slotUser2() is not tqreplaced.
+     * slotUser2() is not replaced.
      */
     void user2Clicked();
 
     /**
      * The User1 button was pressed. This signal is only emitted if
-     * slotUser1() is not tqreplaced.
+     * slotUser1() is not replaced.
      */
     void user1Clicked();
 
     /**
      * The Apply button was pressed. This signal is only emitted if
-     * slotApply() is not tqreplaced.
+     * slotApply() is not replaced.
      */
     void applyClicked();
 
     /**
      * The Try button was pressed. This signal is only emitted if
-     * slotTry() is not tqreplaced.
+     * slotTry() is not replaced.
      */
     void tryClicked();
 
     /**
      * The OK button was pressed. This signal is only emitted if
-     * slotOk() is not tqreplaced.
+     * slotOk() is not replaced.
      */
     void okClicked();
 
     /**
      * The Yes button was pressed. This signal is only emitted if
-     * slotYes() is not tqreplaced.
+     * slotYes() is not replaced.
      */
     void yesClicked();
 
     /**
      * The No button was pressed. This signal is only emitted if
-     * slotNo() is not tqreplaced.
+     * slotNo() is not replaced.
      */
     void noClicked();
 
     /**
      * The Cancel button was pressed. This signal is only emitted if
-     * slotCancel() is not tqreplaced.
+     * slotCancel() is not replaced.
      */
     void cancelClicked();
 
     /**
      * The Close button was pressed. This signal is only emitted if
-     * slotClose() is not tqreplaced.
+     * slotClose() is not replaced.
      */
     void closeClicked();
 
@@ -1549,7 +1549,7 @@ class KDEUI_EXPORT KDialogBase : public KDialog
 
   private:
     /**
-     * Prepares the tqlayout that manages the widgets of the dialog
+     * Prepares the layout that manages the widgets of the dialog
      */
     void setupLayout();
 
@@ -1572,7 +1572,7 @@ class KDEUI_EXPORT KDialogBase : public KDialog
      * @param user2 User button2 item.
      * @param user2 User button3 item.
      */
-    void makeButtonBox( int tqmask, ButtonCode defaultButton,
+    void makeButtonBox( int mask, ButtonCode defaultButton,
 			const KGuiItem &user1 = KGuiItem(),
 			const KGuiItem &user2 = KGuiItem(),
 			const KGuiItem &user3 = KGuiItem() );
diff --git a/kdeui/kdialogbase_priv.h b/kdeui/kdialogbase_priv.h
index d38ef884a..a5bbf31be 100644
--- a/kdeui/kdialogbase_priv.h
+++ b/kdeui/kdialogbase_priv.h
@@ -45,7 +45,7 @@ class KDEUI_EXPORT KDialogBaseButton : public KPushButton
  * Used internally by KDialogBase.
  * @internal
  */
-class KDEUI_EXPORT KDialogBaseTile : public TQObject
+class KDEUI_EXPORT KDialogBaseTile : public QObject
 {
   Q_OBJECT
 
diff --git a/kdeui/kdockwidget.cpp b/kdeui/kdockwidget.cpp
index b7d124f43..dc5213c3c 100644
--- a/kdeui/kdockwidget.cpp
+++ b/kdeui/kdockwidget.cpp
@@ -151,7 +151,7 @@ void KDockMainWindow::makeDockInvisible( KDockWidget* dock )
 
 void KDockMainWindow::makeWidgetDockVisible( TQWidget* widget )
 {
-  makeDockVisible( dockManager->tqfindWidgetParentDock(widget) );
+  makeDockVisible( dockManager->findWidgetParentDock(widget) );
 }
 
 void KDockMainWindow::writeDockConfig(TQDomElement &base)
@@ -203,7 +203,7 @@ void KDockWidgetHeaderDrag::paintEvent( TQPaintEvent* )
 
   paint.begin( this );
 
-  style().drawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), tqcolorGroup());
+  style().drawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup());
 
   paint.end();
 }
@@ -221,8 +221,8 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name )
 #endif
   d = new KDockWidgetHeaderPrivate( this );
 
-  tqlayout = new TQHBoxLayout( this );
-  tqlayout->setResizeMode( TQLayout::Minimum );
+  layout = new TQHBoxLayout( this );
+  layout->setResizeMode( TQLayout::Minimum );
 
   drag = new KDockWidgetHeaderDrag( this, parent );
 
@@ -234,7 +234,7 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name )
   connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(undock()));
 
   stayButton = new KDockButton_Private( this, "DockStayButton" );
-  TQToolTip::add( stayButton, i18n("Freeze the window tqgeometry", "Freeze") );
+  TQToolTip::add( stayButton, i18n("Freeze the window geometry", "Freeze") );
   stayButton->setToggleButton( true );
   stayButton->setPixmap( const_cast< const char** >(not_close_xpm) );
   stayButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height());
@@ -258,15 +258,15 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name )
   d->dummy->setFixedSize( 1,closeButton->pixmap()->height() );
 
 
-  tqlayout->addWidget( drag );
-  tqlayout->addWidget( dockbackButton );
-  tqlayout->addWidget( d->toDesktopButton );
-  tqlayout->addWidget( d->dummy);
-  tqlayout->addWidget( stayButton );
-  tqlayout->addWidget( closeButton );
-  tqlayout->activate();
+  layout->addWidget( drag );
+  layout->addWidget( dockbackButton );
+  layout->addWidget( d->toDesktopButton );
+  layout->addWidget( d->dummy);
+  layout->addWidget( stayButton );
+  layout->addWidget( closeButton );
+  layout->activate();
   d->dummy->hide();
-  drag->setFixedHeight( tqlayout->tqminimumSize().height() );
+  drag->setFixedHeight( layout->minimumSize().height() );
 }
 
 void KDockWidgetHeader::setTopLevel( bool isTopLevel )
@@ -290,7 +290,7 @@ void KDockWidgetHeader::setTopLevel( bool isTopLevel )
     if( d->showToDesktopButton )
       d->toDesktopButton->show();
   }
-  tqlayout->activate();
+  layout->activate();
 
    bool dontShowDummy=drag->isVisibleTo(this) || dockbackButton->isVisibleTo(this) ||
         d->toDesktopButton->isVisibleTo(this) || stayButton->isVisibleTo(this) ||
@@ -317,73 +317,73 @@ void KDockWidgetHeader::setDragPanel( KDockWidgetHeaderDrag* nd )
 {
   if ( !nd ) return;
 
-  delete tqlayout;
-  tqlayout = new TQHBoxLayout( this );
-  tqlayout->setResizeMode( TQLayout::Minimum );
+  delete layout;
+  layout = new TQHBoxLayout( this );
+  layout->setResizeMode( TQLayout::Minimum );
 
   delete drag;
   drag = nd;
-  if (drag->tqparentWidget()!=this) {
+  if (drag->parentWidget()!=this) {
 	drag->reparent(this,TQPoint(0,0));
   }
 
 
-  tqlayout->addWidget( drag );
-  tqlayout->addWidget( dockbackButton );
-  tqlayout->addWidget( d->dummy );
-  tqlayout->addWidget( d->toDesktopButton );
-  tqlayout->addWidget( stayButton );
+  layout->addWidget( drag );
+  layout->addWidget( dockbackButton );
+  layout->addWidget( d->dummy );
+  layout->addWidget( d->toDesktopButton );
+  layout->addWidget( stayButton );
   bool dontShowDummy=drag->isVisibleTo(this) || dockbackButton->isVisibleTo(this) ||
 	d->toDesktopButton->isVisibleTo(this) || stayButton->isVisibleTo(this) ||
 	closeButton->isVisibleTo(this);
   for (TQPtrListIterator<KDockButton_Private> it( d->btns );it.current();++it) {
-      tqlayout->addWidget(it.current());
+      layout->addWidget(it.current());
 	dontShowDummy=dontShowDummy || (it.current()->isVisibleTo(this));
   }
   if (dontShowDummy) d->dummy->hide(); else d->dummy->show();
-  tqlayout->addWidget( closeButton );
-  tqlayout->activate();
-  kdDebug(282)<<"KdockWidgetHeader::setDragPanel:minimum height="<<tqlayout->tqminimumSize().height()<<endl;
+  layout->addWidget( closeButton );
+  layout->activate();
+  kdDebug(282)<<"KdockWidgetHeader::setDragPanel:minimum height="<<layout->minimumSize().height()<<endl;
   //FIXME somebody left this here, but we don't know what the hell it's for.
-  drag->setFixedHeight( closeButton->height()); // /*tqlayout->minimumS*/tqsizeHint().height() );
+  drag->setFixedHeight( closeButton->height()); // /*layout->minimumS*/sizeHint().height() );
 }
 
 void KDockWidgetHeader::addButton(KDockButton_Private* btn) {
 	if (!btn) return;
 
-	if (btn->tqparentWidget()!=this) {
+	if (btn->parentWidget()!=this) {
 		btn->reparent(this,TQPoint(0,0));
 	}
 	btn->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height());
-	if (!d->btns.tqcontainsRef(btn)) d->btns.append(btn);
+	if (!d->btns.containsRef(btn)) d->btns.append(btn);
 
 	btn->show();
 
-	delete tqlayout;
-	tqlayout = new TQHBoxLayout( this );
-	tqlayout->setResizeMode( TQLayout::Minimum );
+	delete layout;
+	layout = new TQHBoxLayout( this );
+	layout->setResizeMode( TQLayout::Minimum );
 
-	tqlayout->addWidget( drag );
- 	tqlayout->addWidget( dockbackButton );
-	tqlayout->addWidget( d->toDesktopButton );
-	tqlayout->addWidget( d->dummy);
-	tqlayout->addWidget( stayButton );
+	layout->addWidget( drag );
+ 	layout->addWidget( dockbackButton );
+	layout->addWidget( d->toDesktopButton );
+	layout->addWidget( d->dummy);
+	layout->addWidget( stayButton );
 	 bool dontShowDummy=drag->isVisibleTo(this) || dockbackButton->isVisibleTo(this) ||
 	        d->toDesktopButton->isVisibleTo(this) || stayButton->isVisibleTo(this) ||
         	closeButton->isVisibleTo(this);
 	 for (TQPtrListIterator<KDockButton_Private> it( d->btns );it.current();++it) {
-	        tqlayout->addWidget(it.current());
+	        layout->addWidget(it.current());
 		dontShowDummy=dontShowDummy || (it.current()->isVisibleTo(this));
    	}
   	if (dontShowDummy) d->dummy->hide(); else d->dummy->show();
-	tqlayout->addWidget( closeButton );
-	tqlayout->activate();
-	drag->setFixedHeight( tqlayout->tqminimumSize().height() );
+	layout->addWidget( closeButton );
+	layout->activate();
+	drag->setFixedHeight( layout->minimumSize().height() );
 }
 
 void KDockWidgetHeader::removeButton(KDockButton_Private* btn) {
-	if (btn->tqparentWidget()==this) {
-		if (d->btns.tqcontainsRef(btn)) d->btns.removeRef(btn);
+	if (btn->parentWidget()==this) {
+		if (d->btns.containsRef(btn)) d->btns.removeRef(btn);
 		delete btn;
 	}
 }
@@ -494,8 +494,8 @@ KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQP
 
   d->_parent = parent;
 
-  tqlayout = new TQVBoxLayout( this );
-  tqlayout->setResizeMode( TQLayout::Minimum );
+  layout = new TQVBoxLayout( this );
+  layout->setResizeMode( TQLayout::Minimum );
 
   manager = dockManager;
   manager->childDock->append( this );
@@ -574,7 +574,7 @@ void KDockWidget::paintEvent(TQPaintEvent* pe)
 	TQWidget::paintEvent(pe);
         TQPainter paint;
         paint.begin( this );
-        style().drawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), tqcolorGroup());
+        style().drawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), colorGroup());
         paint.end();
 }
 
@@ -601,7 +601,7 @@ void KDockWidget::mousePressEvent(TQMouseEvent* mme)
 		int styleheight;
 		TQPoint mp;
 		mp=mme->pos();
-      		styleheight=2*style().tqpixelMetric(TQStyle::PM_DefaultFrameWidth,this);
+      		styleheight=2*style().pixelMetric(TQStyle::PM_DefaultFrameWidth,this);
 		bbottom=mp.y()>=height()-styleheight;
 		btop=mp.y()<=styleheight;
 		bleft=mp.x()<=styleheight;
@@ -689,7 +689,7 @@ void  KDockWidget::mouseMoveEvent(TQMouseEvent* mme)
 	int styleheight;
 	TQPoint mp;
 	mp=mme->pos();
-      	styleheight=2*style().tqpixelMetric(TQStyle::PM_DefaultFrameWidth,this);
+      	styleheight=2*style().pixelMetric(TQStyle::PM_DefaultFrameWidth,this);
 	bbottom=mp.y()>=height()-styleheight;
 	btop=mp.y()<=styleheight;
 	bleft=mp.x()<=styleheight;
@@ -745,15 +745,15 @@ void KDockWidget::setHeader( KDockWidgetAbstractHeader* h )
 
   if ( header ){
     delete header;
-    delete tqlayout;
+    delete layout;
     header = h;
-    tqlayout = new TQVBoxLayout( this );
-    tqlayout->setResizeMode( TQLayout::Minimum );
-    tqlayout->addWidget( header );
+    layout = new TQVBoxLayout( this );
+    layout->setResizeMode( TQLayout::Minimum );
+    layout->addWidget( header );
      setWidget( widget );
   } else {
     header = h;
-    tqlayout->addWidget( header );
+    layout->addWidget( header );
   }
   kdDebug(282)<<caption()<<": KDockWidget::setHeader"<<endl;
   setEnableDocking(eDocking);
@@ -773,7 +773,7 @@ void KDockWidget::updateHeader()
 {
   if ( parent() ){
 #ifdef BORDERLESS_WINDOWS
-      tqlayout->setMargin(0);
+      layout->setMargin(0);
       setMouseTracking(false);
       setCursor(TQCursor(ArrowCursor));
 #endif
@@ -791,7 +791,7 @@ void KDockWidget::updateHeader()
     header->setTopLevel( true );
     header->show();
 #ifdef BORDERLESS_WINDOWS
-      tqlayout->setMargin(2*style().tqpixelMetric(TQStyle::PM_DefaultFrameWidth,this));
+      layout->setMargin(2*style().pixelMetric(TQStyle::PM_DefaultFrameWidth,this));
       setMouseTracking(true);
 #endif
   }
@@ -810,7 +810,7 @@ void KDockWidget::applyToWidget( TQWidget* s, const TQPoint& p )
   }
 
   if ( manager && s == manager->main ){
-      setGeometry( TQRect(TQPoint(0,0), manager->main->tqgeometry().size()) );
+      setGeometry( TQRect(TQPoint(0,0), manager->main->geometry().size()) );
   }
 
   if ( !s )
@@ -858,7 +858,7 @@ void KDockWidget::show()
 void KDockWidget::setDockWindowType (NET::WindowType windowType)
 {
   d->windowType = windowType;
-  applyToWidget( tqparentWidget(), TQPoint(0,0) );
+  applyToWidget( parentWidget(), TQPoint(0,0) );
 }
 
 #endif
@@ -867,7 +867,7 @@ void KDockWidget::setDockWindowTransient (TQWidget *parent, bool transientEnable
 {
   d->_parent = parent;
   d->transient = transientEnabled;
-  applyToWidget( tqparentWidget(), TQPoint(0,0) );
+  applyToWidget( parentWidget(), TQPoint(0,0) );
 }
 
 TQWidget *KDockWidget::transientTo() {
@@ -898,7 +898,7 @@ bool KDockWidget::event( TQEvent *event )
       emit manager->change();
       break;
     case TQEvent::CaptionChange:
-      if ( tqparentWidget() ){
+      if ( parentWidget() ){
         if ( parent()->inherits("KDockSplitter") ){
           ((KDockSplitter*)(parent()))->updateName();
         }
@@ -917,7 +917,7 @@ bool KDockWidget::event( TQEvent *event )
   return TQWidget::event( event );
 }
 
-KDockWidget *KDockWidget::tqfindNearestDockWidget(DockPosition pos)
+KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos)
 {
 	if (!parent()) return 0;
 	if (!parent()->inherits("KDockSplitter")) return 0;
@@ -930,7 +930,7 @@ KDockWidget *KDockWidget::tqfindNearestDockWidget(DockPosition pos)
 				static_cast<KDockWidget*>(((KDockSplitter*)(parent()))->getLast());
 
 			if (neighbor==this)
-			return (static_cast<KDockWidget*>(parent()->parent())->tqfindNearestDockWidget(pos));
+			return (static_cast<KDockWidget*>(parent()->parent())->findNearestDockWidget(pos));
 			else
 			if (neighbor->getWidget() && (neighbor->getWidget()->qt_cast("KDockTabGroup")))
 				return (KDockWidget*)(((KDockTabGroup*)neighbor->getWidget())->page(0));
@@ -938,7 +938,7 @@ KDockWidget *KDockWidget::tqfindNearestDockWidget(DockPosition pos)
 			return neighbor;
 		}
 		else
-		return (static_cast<KDockWidget*>(parent()->parent())->tqfindNearestDockWidget(pos));
+		return (static_cast<KDockWidget*>(parent()->parent())->findNearestDockWidget(pos));
 
 	return 0;
 }
@@ -1091,7 +1091,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
   }
 
   // create a new dockwidget that will contain the target and this
-  TQWidget* parentDock = target->tqparentWidget();
+  TQWidget* parentDock = target->parentWidget();
   KDockWidget* newDock = new KDockWidget( manager, "tempName", TQPixmap(""), parentDock );
   newDock->currentDockPos = target->currentDockPos;
 
@@ -1107,7 +1107,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
   if ( !parentDock ){
     // dock to a toplevel dockwidget means newDock is toplevel now
     newDock->move( target->frameGeometry().topLeft() );
-    newDock->resize( target->tqgeometry().size() );
+    newDock->resize( target->geometry().size() );
     if ( target->isVisibleToTLW() ) newDock->show();
   }
 
@@ -1142,7 +1142,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
     tab->insertTab( this, icon() ? *icon() : TQPixmap(),
                     tabPageLabel(), tabIndex );
 
-    TQRect geom=newDock->tqgeometry();
+    TQRect geom=newDock->geometry();
     TQWidget *wantTransient=tab->transientTo();
     newDock->setDockWindowTransient(wantTransient,wantTransient);
     newDock->setGeometry(geom);
@@ -1209,7 +1209,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
 
   newDock->show();
   emit target->docking( this, dockPos );
-  emit manager->tqreplaceDock( target, newDock );
+  emit manager->replaceDock( target, newDock );
   emit manager->change();
 
   return newDock;
@@ -1218,7 +1218,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
 KDockTabGroup* KDockWidget::parentDockTabGroup() const
 {
   if ( !parent() ) return 0L;
-  TQWidget* candidate = tqparentWidget()->tqparentWidget();
+  TQWidget* candidate = parentWidget()->parentWidget();
   if ( candidate && candidate->inherits("KDockTabGroup") ) return (KDockTabGroup*)candidate;
   return 0L;
 }
@@ -1226,7 +1226,7 @@ KDockTabGroup* KDockWidget::parentDockTabGroup() const
 TQWidget *KDockWidget::parentDockContainer() const
 {
   if (!parent()) return 0L;
-  TQWidget* candidate = tqparentWidget()->tqparentWidget();
+  TQWidget* candidate = parentWidget()->parentWidget();
   if (candidate && dynamic_cast<KDockContainer*>(candidate)) return candidate;
   return 0L;
 }
@@ -1295,7 +1295,7 @@ void KDockWidget::undock()
   manager->d->dragRect = TQRect ();
   manager->drawDragRectangle ();
 
-  TQWidget* parentW = tqparentWidget();
+  TQWidget* parentW = parentWidget();
   if ( !parentW ){
     hide();
     if (!d->blockHasUndockedSignal)
@@ -1337,7 +1337,7 @@ void KDockWidget::undock()
       KDockWidget* parentOfTab = (KDockWidget*)parentTab->parent();
       delete parentTab; // KDockTabGroup
 
-      TQWidget* parentOfDockWidget = parentOfTab->tqparentWidget();
+      TQWidget* parentOfDockWidget = parentOfTab->parentWidget();
       if ( !parentOfDockWidget ){
           if ( isV ) lastTab->show();
       } else {
@@ -1365,7 +1365,7 @@ void KDockWidget::undock()
         lastTab->show();
       }
       manager->blockSignals(false);
-      emit manager->tqreplaceDock( parentOfTab, lastTab );
+      emit manager->replaceDock( parentOfTab, lastTab );
       lastTab->currentDockPos = parentOfTab->currentDockPos;
       emit parentOfTab->iMBeingClosed();
       manager->blockSignals(true);
@@ -1396,16 +1396,16 @@ void KDockWidget::undock()
       d->splitPosInPercent = parentSplitterOfDockWidget->separatorPosInPercent();
 
       KDockWidget* secondWidget = (KDockWidget*)parentSplitterOfDockWidget->getAnother( this );
-      KDockWidget* group        = (KDockWidget*)parentSplitterOfDockWidget->tqparentWidget();
+      KDockWidget* group        = (KDockWidget*)parentSplitterOfDockWidget->parentWidget();
       setFormerBrotherDockWidget(secondWidget);
       applyToWidget( 0L );
       group->hide();
 
-      if ( !group->tqparentWidget() ){
+      if ( !group->parentWidget() ){
         secondWidget->applyToWidget( 0L, group->frameGeometry().topLeft() );
         secondWidget->resize( group->width(), group->height() );
       } else {
-        TQWidget* obj = group->tqparentWidget();
+        TQWidget* obj = group->parentWidget();
         secondWidget->applyToWidget( obj );
         if ( obj->inherits("KDockSplitter") ){
           KDockSplitter* parentOfGroup = (KDockSplitter*)obj;
@@ -1421,7 +1421,7 @@ void KDockWidget::undock()
       secondWidget->formerDockPos  = group->formerDockPos;
       delete parentSplitterOfDockWidget;
       manager->blockSignals(false);
-      emit manager->tqreplaceDock( group, secondWidget );
+      emit manager->replaceDock( group, secondWidget );
       emit group->iMBeingClosed();
       manager->blockSignals(true);
       delete group;
@@ -1457,10 +1457,10 @@ void KDockWidget::setWidget( TQWidget* mw )
   if (!mw->ownCursor()) mw->setCursor(TQCursor(ArrowCursor));
 #endif
   widget = mw;
-  delete tqlayout;
+  delete layout;
 
-  tqlayout = new TQVBoxLayout( this );
-  tqlayout->setResizeMode( TQLayout::Minimum );
+  layout = new TQVBoxLayout( this );
+  layout->setResizeMode( TQLayout::Minimum );
 
   KDockContainer* dc = dynamic_cast<KDockContainer*>(widget);
   if (dc)
@@ -1475,8 +1475,8 @@ void KDockWidget::setWidget( TQWidget* mw )
 
   {
      header->show();
-     tqlayout->addWidget( header );
-     tqlayout->addWidget( widget,1 );
+     layout->addWidget( header );
+     layout->addWidget( widget,1 );
   }
   updateHeader();
   emit widgetSet(mw);
@@ -1494,13 +1494,13 @@ void KDockWidget::setDockTabName( KDockTabGroup* tab )
   listOfCaption.remove( listOfCaption.length()-1, 1 );
   listOfName.remove( listOfName.length()-1, 1 );
 
-  tab->tqparentWidget()->setName( listOfName.utf8() );
-  tab->tqparentWidget()->setCaption( listOfCaption );
+  tab->parentWidget()->setName( listOfName.utf8() );
+  tab->parentWidget()->setCaption( listOfCaption );
 
-  tab->tqparentWidget()->tqrepaint( false ); // KDockWidget->tqrepaint
-  if ( tab->tqparentWidget()->parent() )
-    if ( tab->tqparentWidget()->parent()->inherits("KDockSplitter") )
-      ((KDockSplitter*)(tab->tqparentWidget()->parent()))->updateName();
+  tab->parentWidget()->repaint( false ); // KDockWidget->repaint
+  if ( tab->parentWidget()->parent() )
+    if ( tab->parentWidget()->parent()->inherits("KDockSplitter") )
+      ((KDockSplitter*)(tab->parentWidget()->parent()))->updateName();
 }
 
 bool KDockWidget::mayBeHide() const
@@ -1545,11 +1545,11 @@ void KDockWidget::makeDockVisible()
   }
   if ( isVisible() ) return;
 
-  TQWidget* p = tqparentWidget();
+  TQWidget* p = parentWidget();
   while ( p ){
     if ( !p->isVisible() )
       p->show();
-    p = p->tqparentWidget();
+    p = p->parentWidget();
   }
   if( !parent() ) // is undocked
     dockBack();
@@ -1570,7 +1570,7 @@ void KDockWidget::loseFormerBrotherDockWidget()
     TQObject::disconnect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()),
                          this, TQT_SLOT(loseFormerBrotherDockWidget()) );
   formerBrotherDockWidget = 0L;
-  tqrepaint();
+  repaint();
 }
 
 void KDockWidget::dockBack()
@@ -1723,16 +1723,16 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event )
           if ( curdw->eDocking != (int)KDockWidget::DockNone ){
             dropCancel = true;
             curdw->setFocus();
-            tqApp->processOneEvent();
+            qApp->processOneEvent();
 
             currentDragWidget = curdw;
             currentMoveWidget = 0L;
             childDockWidgetList = new TQWidgetList();
             childDockWidgetList->append( curdw );
-            tqfindChildDockWidget( curdw, childDockWidgetList );
+            findChildDockWidget( curdw, childDockWidgetList );
 
             //d->oldDragRect = TQRect(); should fix rectangle not erased problem
-            d->dragRect = TQRect(curdw->tqgeometry());
+            d->dragRect = TQRect(curdw->geometry());
             TQPoint p = curdw->mapToGlobal(TQPoint(0,0));
             d->dragRect.moveTopLeft(p);
             drawDragRectangle();
@@ -1754,7 +1754,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event )
           if (d->readyToDrag) {
               d->readyToDrag = false;
               //d->oldDragRect = TQRect(); should fix rectangle not erased problem
-              d->dragRect = TQRect(curdw->tqgeometry());
+              d->dragRect = TQRect(curdw->geometry());
               TQPoint p = curdw->mapToGlobal(TQPoint(0,0));
               d->dragRect.moveTopLeft(p);
               drawDragRectangle();
@@ -1775,17 +1775,17 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event )
 	  if (!curdw->parent())
 	  {
 	  	curdw->move(TQCursor::pos()-d->dragOffset);
-   	        pDockWdgAtCursor = tqfindDockWidgetAt( TQCursor::pos()-TQPoint(0,d->dragOffset.y()+3) );
+   	        pDockWdgAtCursor = findDockWidgetAt( TQCursor::pos()-TQPoint(0,d->dragOffset.y()+3) );
                 oldMoveWidget = currentMoveWidget;
 	  }
 	  else
 	  {
-	        pDockWdgAtCursor = tqfindDockWidgetAt( TQCursor::pos() );
+	        pDockWdgAtCursor = findDockWidgetAt( TQCursor::pos() );
                 oldMoveWidget = currentMoveWidget;
 	  }
 //END TEST
 #else
-	  pDockWdgAtCursor = tqfindDockWidgetAt( TQCursor::pos() );
+	  pDockWdgAtCursor = findDockWidgetAt( TQCursor::pos() );
           KDockWidget* oldMoveWidget = currentMoveWidget;
 #endif
 
@@ -1794,7 +1794,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event )
             break;
           } else {
             if (dropCancel && curdw) {
-              d->dragRect = TQRect(curdw->tqgeometry());
+              d->dragRect = TQRect(curdw->geometry());
               TQPoint p = curdw->mapToGlobal(TQPoint(0,0));
               d->dragRect.moveTopLeft(p);
             }else
@@ -1835,7 +1835,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event )
   return TQObject::eventFilter( obj, event );
 }
 
-KDockWidget* KDockManager::tqfindDockWidgetAt( const TQPoint& pos )
+KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos )
 {
   dropCancel = true;
 
@@ -1850,10 +1850,10 @@ KDockWidget* KDockManager::tqfindDockWidgetAt( const TQPoint& pos )
     return 0L;
   }
 #if defined(_OS_WIN32_) || defined(Q_OS_WIN32)
-  p = p->tqtopLevelWidget();
+  p = p->topLevelWidget();
 #endif
   TQWidget* w = 0L;
-  tqfindChildDockWidget( w, p, p->mapFromGlobal(pos) );
+  findChildDockWidget( w, p, p->mapFromGlobal(pos) );
   if ( !w ){
     if ( !p->inherits("KDockWidget") ) {
       return 0L;
@@ -1865,7 +1865,7 @@ KDockWidget* KDockManager::tqfindDockWidgetAt( const TQPoint& pos )
   if (dynamic_cast<KDockContainer*>(w)) return 0L;
 
   if (!childDockWidgetList) return 0L;
-  if ( childDockWidgetList->tqfind(w) != -1 ) return 0L;
+  if ( childDockWidgetList->find(w) != -1 ) return 0L;
   if ( currentDragWidget->isGroup && ((KDockWidget*)w)->parentDockTabGroup() ) return 0L;
 
   KDockWidget* www = (KDockWidget*)w;
@@ -1901,7 +1901,7 @@ KDockWidget* KDockManager::tqfindDockWidgetAt( const TQPoint& pos )
   return www;
 }
 
-void KDockManager::tqfindChildDockWidget( TQWidget*& ww, const TQWidget* p, const TQPoint& pos )
+void KDockManager::findChildDockWidget( TQWidget*& ww, const TQWidget* p, const TQPoint& pos )
 {
   if ( p->children() ) {
     TQWidget *w;
@@ -1910,9 +1910,9 @@ void KDockManager::tqfindChildDockWidget( TQWidget*& ww, const TQWidget* p, cons
     while ( it.current() ) {
       if ( it.current()->isWidgetType() ) {
         w = (TQWidget*)it.current();
-        if ( w->isVisible() && w->tqgeometry().tqcontains(pos) ) {
+        if ( w->isVisible() && w->geometry().contains(pos) ) {
           if ( w->inherits("KDockWidget") ) ww = w;
-          tqfindChildDockWidget( ww, w, w->mapFromParent(pos) );
+          findChildDockWidget( ww, w, w->mapFromParent(pos) );
           return;
         }
       }
@@ -1922,7 +1922,7 @@ void KDockManager::tqfindChildDockWidget( TQWidget*& ww, const TQWidget* p, cons
   return;
 }
 
-void KDockManager::tqfindChildDockWidget( const TQWidget* p, TQWidgetList*& list )
+void KDockManager::findChildDockWidget( const TQWidget* p, TQWidgetList*& list )
 {
   if ( p->children() ) {
     TQWidget *w;
@@ -1933,7 +1933,7 @@ void KDockManager::tqfindChildDockWidget( const TQWidget* p, TQWidgetList*& list
         w = (TQWidget*)it.current();
         if ( w->isVisible() ) {
           if ( w->inherits("KDockWidget") ) list->append( w );
-          tqfindChildDockWidget( w, list );
+          findChildDockWidget( w, list );
         }
       }
       --it;
@@ -1948,8 +1948,8 @@ void KDockManager::startDrag( KDockWidget* w )
    || ( w->currentDockPos == KDockWidget::DockTop) || ( w->currentDockPos == KDockWidget::DockBottom)) {
     w->prevSideDockPosBeforeDrag = w->currentDockPos;
 
-    if ( w->tqparentWidget()->inherits("KDockSplitter") ){
-      KDockSplitter* parentSplitterOfDockWidget = (KDockSplitter*)(w->tqparentWidget());
+    if ( w->parentWidget()->inherits("KDockSplitter") ){
+      KDockSplitter* parentSplitterOfDockWidget = (KDockSplitter*)(w->parentWidget());
       w->d->splitPosInPercent = parentSplitterOfDockWidget->separatorPosInPercent();
     }
   }
@@ -2105,7 +2105,7 @@ static TQDomElement createStringEntry(TQDomDocument &doc, const TQString &tagNam
 
 static TQDomElement createBoolEntry(TQDomDocument &doc, const TQString &tagName, bool b)
 {
-    return createStringEntry(doc, tagName, TQString::tqfromLatin1(b? "true" : "false"));
+    return createStringEntry(doc, tagName, TQString::fromLatin1(b? "true" : "false"));
 }
 
 
@@ -2144,7 +2144,7 @@ static TQDomElement createListEntry(TQDomDocument &doc, const TQString &tagName,
     TQStrListIterator it(list);
     for (; it.current(); ++it) {
         TQDomElement subel = doc.createElement(subTagName);
-        subel.appendChild(doc.createTextNode(TQString::tqfromLatin1(it.current())));
+        subel.appendChild(doc.createTextNode(TQString::fromLatin1(it.current())));
         el.appendChild(subel);
     }
 
@@ -2214,7 +2214,7 @@ void KDockManager::writeConfig(TQDomElement &base)
     KDockWidget *obj1;
     while ( (obj1=(KDockWidget*)it.current()) ) {
         if ( obj1->parent() == main )
-            mainWidgetStr = TQString::tqfromLatin1(obj1->name());
+            mainWidgetStr = TQString::fromLatin1(obj1->name());
         nList.append(obj1->name());
         ++it;
     }
@@ -2230,8 +2230,8 @@ void KDockManager::writeConfig(TQDomElement &base)
     TQStringList::Iterator nListIt=nList.begin();
     while ( nListIt!=nList.end() ) {
         KDockWidget *obj = getDockWidgetFromName( *nListIt);
-        if ((obj->isGroup && (!obj->d->isContainer)) && (nameList.tqfind( obj->firstName.latin1() ) == -1
-                             || nameList.tqfind(obj->lastName.latin1()) == -1)) {
+        if ((obj->isGroup && (!obj->d->isContainer)) && (nameList.find( obj->firstName.latin1() ) == -1
+                             || nameList.find(obj->lastName.latin1()) == -1)) {
             // Skip until children are saved (why?)
             ++nListIt;
 //            nList.next();
@@ -2279,10 +2279,10 @@ void KDockManager::writeConfig(TQDomElement &base)
             }
         }
 
-        groupEl.appendChild(createStringEntry(doc, "name", TQString::tqfromLatin1(obj->name())));
+        groupEl.appendChild(createStringEntry(doc, "name", TQString::fromLatin1(obj->name())));
         groupEl.appendChild(createBoolEntry(doc, "hasParent", obj->parent()));
         if ( !obj->parent() ) {
-            groupEl.appendChild(createRectEntry(doc, "tqgeometry", TQRect(main->frameGeometry().topLeft(), main->size())));
+            groupEl.appendChild(createRectEntry(doc, "geometry", TQRect(main->frameGeometry().topLeft(), main->size())));
             groupEl.appendChild(createBoolEntry(doc, "visible", obj->isVisible()));
         }
         if (obj->header && obj->header->inherits("KDockWidgetHeader")) {
@@ -2306,7 +2306,7 @@ void KDockManager::writeConfig(TQDomElement &base)
         base.appendChild(createStringEntry(doc, "mainWidget", mainWidgetStr));
     }
 
-    base.appendChild(createRectEntry(doc, "tqgeometry", TQRect(main->frameGeometry().topLeft(), main->size())));
+    base.appendChild(createRectEntry(doc, "geometry", TQRect(main->frameGeometry().topLeft(), main->size())));
 }
 
 
@@ -2350,7 +2350,7 @@ void KDockManager::readConfig(TQDomElement &base)
         obj->setToolTipString(stringEntry(childEl, "tabToolTip"));
 
         if (!boolEntry(childEl, "hasParent")) {
-            TQRect r = rectEntry(childEl, "tqgeometry");
+            TQRect r = rectEntry(childEl, "geometry");
             obj = getDockWidgetFromName(stringEntry(childEl, "name"));
             obj->applyToWidget(0);
             obj->setGeometry(r);
@@ -2434,7 +2434,7 @@ void KDockManager::readConfig(TQDomElement &base)
         }
 
         if (!boolEntry(childEl, "hasParent")) {
-            TQRect r = rectEntry(childEl, "tqgeometry");
+            TQRect r = rectEntry(childEl, "geometry");
             obj = getDockWidgetFromName(stringEntry(childEl, "name"));
             obj->applyToWidget(0);
             obj->setGeometry(r);
@@ -2495,7 +2495,7 @@ void KDockManager::readConfig(TQDomElement &base)
         }
 
         // only resize + move non-mainwindows
-        TQRect mr = rectEntry(base, "tqgeometry");
+        TQRect mr = rectEntry(base, "geometry");
         main->move(mr.topLeft());
         main->resize(mr.size());
     }
@@ -2538,7 +2538,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group )
   c->writeEntry( "Version", DOCK_CONFIG_VERSION );
 
   TQStringList nameList;
-  TQStringList tqfindList;
+  TQStringList findList;
   TQObjectListIt it( *childDock );
   KDockWidget * obj;
 
@@ -2578,12 +2578,12 @@ void KDockManager::writeConfig( KConfig* c, TQString group )
     }
 /*************************************************************************************************/
     if ( obj->isGroup ){
-      if ( (tqfindList.tqfind( obj->firstName ) != tqfindList.end()) && (tqfindList.tqfind( obj->lastName ) != tqfindList.end() )){
+      if ( (findList.find( obj->firstName ) != findList.end()) && (findList.find( obj->lastName ) != findList.end() )){
 
         c->writeEntry( cname+":type", "GROUP");
         if ( !obj->parent() ){
           c->writeEntry( cname+":parent", "___null___");
-          c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
+          c->writeEntry( cname+":geometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
           c->writeEntry( cname+":visible", obj->isVisible());
         } else {
           c->writeEntry( cname+":parent", "yes");
@@ -2594,16 +2594,16 @@ void KDockManager::writeConfig( KConfig* c, TQString group )
         c->writeEntry( cname+":sepPos", ((KDockSplitter*)obj->widget)->separatorPosInPercent() );
 
         nameList.append( obj->name() );
-        tqfindList.append( obj->name() );
+        findList.append( obj->name() );
         //debug("  Save %s", nList.current());
         nList.remove(nListIt);
         nListIt=nList.begin(); //nList.first();
       } else {
 /*************************************************************************************************/
         //debug("  Skip %s", nList.current());
-        //if ( tqfindList.tqfind( obj->firstName ) == -1 )
+        //if ( findList.find( obj->firstName ) == -1 )
         //  debug("  ? Not found %s", obj->firstName);
-        //if ( tqfindList.tqfind( obj->lastName ) == -1 )
+        //if ( findList.find( obj->lastName ) == -1 )
         //  debug("  ? Not found %s", obj->lastName);
         ++nListIt;
         // if ( !nList.current() ) nList.first();
@@ -2615,7 +2615,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group )
         c->writeEntry( cname+":type", "TAB_GROUP");
         if ( !obj->parent() ){
           c->writeEntry( cname+":parent", "___null___");
-          c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
+          c->writeEntry( cname+":geometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
           c->writeEntry( cname+":visible", obj->isVisible());
           c->writeEntry( cname+":dockBackTo", obj->formerBrotherDockWidget ? obj->formerBrotherDockWidget->name() : "");
           c->writeEntry( cname+":dockBackToPos", obj->formerDockPos);
@@ -2629,7 +2629,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group )
         c->writeEntry( cname+":curTab", ((KDockTabGroup*)obj->widget)->currentPageIndex() );
 
         nameList.append( obj->name() );
-        tqfindList.append( obj->name() ); // not really need !!!
+        findList.append( obj->name() ); // not really need !!!
         //debug("  Save %s", nList.current());
         nList.remove(nListIt);
         nListIt=nList.begin();
@@ -2639,7 +2639,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group )
         c->writeEntry( cname+":tabToolTip", obj->toolTipString());
         if ( !obj->parent() ){
           c->writeEntry( cname+":type", "NULL_DOCK");
-          c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
+          c->writeEntry( cname+":geometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
           c->writeEntry( cname+":visible", obj->isVisible());
           c->writeEntry( cname+":dockBackTo", obj->formerBrotherDockWidget ? obj->formerBrotherDockWidget->name() : "");
           c->writeEntry( cname+":dockBackToPos", obj->formerDockPos);
@@ -2648,7 +2648,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group )
         }
         nameList.append( cname.latin1() );
         //debug("  Save %s", nList.current());
-        tqfindList.append( obj->name() );
+        findList.append( obj->name() );
         nList.remove(nListIt);
         nListIt=nList.begin();
       }
@@ -2714,7 +2714,7 @@ void KDockManager::readConfig( KConfig* c, TQString group )
     obj = 0L;
 
     if ( type == "NULL_DOCK" || c->readEntry( oname + ":parent") == "___null___" ){
-      TQRect r = c->readRectEntry( oname + ":tqgeometry" );
+      TQRect r = c->readRectEntry( oname + ":geometry" );
       obj = getDockWidgetFromName( oname );
       obj->applyToWidget( 0L );
       obj->setGeometry(r);
@@ -2954,7 +2954,7 @@ void KDockManager::slotMenuActivated( int id )
   data->dock->changeHideShowState();
 }
 
-KDockWidget* KDockManager::tqfindWidgetParentDock( TQWidget* w ) const
+KDockWidget* KDockManager::findWidgetParentDock( TQWidget* w ) const
 {
   TQObjectListIt it( *childDock );
   KDockWidget * dock;
@@ -2994,14 +2994,14 @@ void KDockManager::drawDragRectangle()
     KDockMainWindow* pMain = 0L;
     KDockWidget* pTLDockWdg = 0L;
     TQWidget* topWdg;
-    if (pDockWdgAtRect->tqtopLevelWidget() == main) {
+    if (pDockWdgAtRect->topLevelWidget() == main) {
       isOverMainWdg = true;
       topWdg = pMain = (KDockMainWindow*) main;
       unclipped = pMain->testWFlags( WPaintUnclipped );
       pMain->setWFlags( WPaintUnclipped );
     }
     else {
-      topWdg = pTLDockWdg = (KDockWidget*) pDockWdgAtRect->tqtopLevelWidget();
+      topWdg = pTLDockWdg = (KDockWidget*) pDockWdgAtRect->topLevelWidget();
       unclipped = pTLDockWdg->testWFlags( WPaintUnclipped );
       pTLDockWdg->setWFlags( WPaintUnclipped );
     }
@@ -3077,7 +3077,7 @@ void KDockArea::makeDockInvisible( KDockWidget* dock )
 
 void KDockArea::makeWidgetDockVisible( TQWidget* widget )
 {
-  makeDockVisible( dockManager->tqfindWidgetParentDock(widget) );
+  makeDockVisible( dockManager->findWidgetParentDock(widget) );
 }
 
 void KDockArea::writeDockConfig(TQDomElement &base)
@@ -3326,6 +3326,6 @@ void KDockArea::virtual_hook( int, void* )
 { /*KMainWindow::virtual_hook( id, data );*/ }
 
 
-#ifndef NO_INCLUDE_TQMOCFILES // for Qt-only projects, because tmake doesn't take this name
+#ifndef NO_INCLUDE_MOCFILES // for Qt-only projects, because tmake doesn't take this name
 #include "kdockwidget.moc"
 #endif
diff --git a/kdeui/kdockwidget.h b/kdeui/kdockwidget.h
index 35d05542c..4f1605c8c 100644
--- a/kdeui/kdockwidget.h
+++ b/kdeui/kdockwidget.h
@@ -322,9 +322,9 @@ protected slots:
 protected:
 
   /**
-   * A tqlayout manager for placing the embedded buttons (close and stay)
+   * A layout manager for placing the embedded buttons (close and stay)
    */
-  TQHBoxLayout* tqlayout;
+  TQHBoxLayout* layout;
 
   /**
    * a little button for closing (undocking and hiding) the dockwidget
@@ -446,7 +446,7 @@ public:
    */
   KDockWidget( KDockManager* dockManager, const char* name,
                const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = TQString::null,
-               const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ), WFlags f = 0);
+               const TQString& strTabPageLabel = TQString::fromLatin1( " " ), WFlags f = 0);
 
   /**
    * Destructs a dockwidget.
@@ -479,8 +479,8 @@ public:
    *
    * If the target is null, it will become a toplevel dockwidget at position pos;
    * Note: Docking to another dockwidget means exactly:
-   * A new parent dockwidget will be created, that tqreplaces the target dockwidget and tqcontains another single helper widget (tab widget or panner)
-   * which tqcontains both dockwidgets, this and the target dockwidget. So consider parent<->child relationships change completely during such actions.
+   * A new parent dockwidget will be created, that replaces the target dockwidget and contains another single helper widget (tab widget or panner)
+   * which contains both dockwidgets, this and the target dockwidget. So consider parent<->child relationships change completely during such actions.
    *
    * @param  target The dockwidget to dock to
    * @param  dockPos One of the DockPositions this is going to dock to
@@ -488,7 +488,7 @@ public:
    * @param  pos The dock position, mainly of interest for docking to the desktop (as toplevel dockwidget)
    * @param  check Only for internal use;
    * @param  tabIndex The position index of the tab widget (when in tab page mode), -1 (default) means append
-   * @return result The group dockwidget that tqreplaces the target dockwidget and will be grandparent of target and @p this.
+   * @return result The group dockwidget that replaces the target dockwidget and will be grandparent of target and @p this.
    *
    * @note Since KDE 3.5 the splitter position @p spliPos is always a value between [0..100]. If
    *       the value is > 100, it will be treated like the old code and normalized to a value between
@@ -541,7 +541,7 @@ public:
    * Sets the header of this dockwidget.
    *
    * A TQLayout takes care about proper resizing, automatically.
-   * The header tqcontains the drag panel, the close button and the stay button.
+   * The header contains the drag panel, the close button and the stay button.
    *
    * @param ah A base class pointer to the dockwidget header
    */
@@ -659,7 +659,7 @@ public:
    * @param pos is the position the wanted widget is docked to this one
    * @since 3.1
    */
-  KDockWidget *tqfindNearestDockWidget(DockPosition pos);
+  KDockWidget *findNearestDockWidget(DockPosition pos);
 
   /**
    * Allows changing the pixmap which is used for the caption or dock tabs
@@ -853,9 +853,9 @@ private:
   TQWidget* widget;
 
   /**
-   * the tqlayout manager that takes care about proper resizing and moving the embedded widget and the header
+   * the layout manager that takes care about proper resizing and moving the embedded widget and the header
    */
-  TQVBoxLayout* tqlayout;
+  TQVBoxLayout* layout;
 
   /**
    * the responsible dockmanager
@@ -906,7 +906,7 @@ private:
  *
  * @author Max Judin (documentation: Falk Brettschneider).
  */
-class KDEUI_EXPORT KDockManager: public TQObject
+class KDEUI_EXPORT KDockManager: public QObject
 {
   Q_OBJECT
 friend class KDockWidget;
@@ -942,7 +942,7 @@ public:
 #ifndef NO_KDE2
   /**
    * Saves the current state of the dockmanager and of all controlled widgets.
-   * State means here to save the tqgeometry, visibility, parents, internal object names, orientation,
+   * State means here to save the geometry, visibility, parents, internal object names, orientation,
    * separator positions, dockwidget-group information, tab widget states (if it is a tab group) and
    * last but not least some necessary things for recovering the dockmainwindow state.
    *
@@ -957,9 +957,9 @@ public:
    * In order to restore a window configuration
    * from a config file, it looks up widgets by name
    * (TQObject::name) in the childDock variable of
-   * KDockManager. This list in turn tqcontains all
+   * KDockManager. This list in turn contains all
    * KDockWidgets (according to the KDockWidget constructor).
-   * So in principle, in order to restore a window tqlayout,
+   * So in principle, in order to restore a window layout,
    * one must first construct all widgets, put each of them in a
    * KDockWidget and then call readConfig(). And for all that
    * to work, each widget must have a unique name.
@@ -974,11 +974,11 @@ public:
   void setMainDockWidget2(KDockWidget *);
 
   /**
-   * Saves the current dock window tqlayout into a DOM tree below the given element.
+   * Saves the current dock window layout into a DOM tree below the given element.
    */
   void writeConfig(TQDomElement &base);
   /**
-   * Reads the current dock window tqlayout from a DOM tree below the given element.
+   * Reads the current dock window layout from a DOM tree below the given element.
    */
   void readConfig(TQDomElement &base);
 
@@ -999,20 +999,20 @@ public:
   virtual bool eventFilter( TQObject * object, TQEvent * event );
 
   /**
-   * This method tqfinds out what a widgets' dockwidget is. That means the dockmanager has a look at all
+   * This method finds out what a widgets' dockwidget is. That means the dockmanager has a look at all
    * dockwidgets it knows and tells you when one of those dockwidgets covers the given widget.
    *
    * @param w any widget that is supposed to be encapsulated by one of the controlled dockwidgets
    * @return the dockwidget that encapsulates that widget, otherwise 0
    */
-  KDockWidget* tqfindWidgetParentDock( TQWidget* w) const;
+  KDockWidget* findWidgetParentDock( TQWidget* w) const;
 
   /**
    * Works like makeDockVisible() but can be called for widgets that covered by a dockwidget.
    *
    * @param w the widget that is encapsulated by a dockwidget that turns to visible.
    */
-  void makeWidgetDockVisible( TQWidget* w ){ tqfindWidgetParentDock(w)->makeDockVisible(); }
+  void makeWidgetDockVisible( TQWidget* w ){ findWidgetParentDock(w)->makeDockVisible(); }
 
   /**
    * @return the popupmenu for showing/hiding dockwidgets
@@ -1083,9 +1083,9 @@ signals:
   void change();
 
   /**
-   * Signals a dockwidget is tqreplaced with another one.
+   * Signals a dockwidget is replaced with another one.
    */
-  void tqreplaceDock( KDockWidget* oldDock, KDockWidget* newDock );
+  void replaceDock( KDockWidget* oldDock, KDockWidget* newDock );
 
   /**
    * Signals a dockwidget without parent (toplevel) is shown.
@@ -1136,7 +1136,7 @@ private:
    * @param pos global (desktop) position of the wanted dockwidget
    * @return the dockwidget at that position
    */
-  KDockWidget* tqfindDockWidgetAt( const TQPoint& pos );
+  KDockWidget* findDockWidgetAt( const TQPoint& pos );
 
   /**
    * Finds the TQWidget recursively at the position given as parameter
@@ -1145,15 +1145,15 @@ private:
    * @param p the parent widget where the recursive search should start from
    * @param pos global (desktop) position of the wanted dockwidget
    */
-  void tqfindChildDockWidget( TQWidget*& w, const TQWidget* p, const TQPoint& pos );
+  void findChildDockWidget( TQWidget*& w, const TQWidget* p, const TQPoint& pos );
 
   /**
    * Finds all dockwidgets which are child, grandchild and so on of p.
    *
    * @param p the parent widget where the recursive search starts from
-   * @param l the widget list that tqcontains the search result after the return of this method
+   * @param l the widget list that contains the search result after the return of this method
    */
-  void tqfindChildDockWidget( const TQWidget* p, TQWidgetList*& l);
+  void findChildDockWidget( const TQWidget* p, TQWidgetList*& l);
 
   /**
    * Sets a dockwidget in drag mode.
@@ -1197,7 +1197,7 @@ private:
   KDockWidget* currentMoveWidget; // widget where mouse moving
 
   /**
-   * It is of interest during the dock process. Then it tqcontains all child dockwidgets.
+   * It is of interest during the dock process. Then it contains all child dockwidgets.
    */
   TQWidgetList* childDockWidgetList;
 
@@ -1244,7 +1244,7 @@ private:
   bool dropCancel;
 
   /**
-   * A popup menu that tqcontains one menuitem for each dockwidget that shows the current visibility state and
+   * A popup menu that contains one menuitem for each dockwidget that shows the current visibility state and
    * to show or hide the appropriate dockwidget.
    */
   TQPopupMenu* menu;
@@ -1365,14 +1365,14 @@ public:
    * @return    a pointer to the new created dockwidget
    */
   KDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L,
-    const TQString& strCaption = TQString::null, const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ) );
+    const TQString& strCaption = TQString::null, const TQString& strTabPageLabel = TQString::fromLatin1( " " ) );
 
   /**
-   * Saves the current dock window tqlayout into a DOM tree below the given element.
+   * Saves the current dock window layout into a DOM tree below the given element.
    */
   void writeDockConfig(TQDomElement &base);
   /**
-   * Reads the current dock window tqlayout from a DOM tree below the given element.
+   * Reads the current dock window layout from a DOM tree below the given element.
    */
   void readDockConfig(TQDomElement &base);
 
@@ -1402,7 +1402,7 @@ public:
   void activateDock(){ dockManager->activate(); }
 
   /**
-   * Returns a popup menu that tqcontains entries for all controlled dockwidgets making hiding and showing
+   * Returns a popup menu that contains entries for all controlled dockwidgets making hiding and showing
    * them possible.
    *
    * @return the wanted popup menu
@@ -1490,7 +1490,7 @@ public:
   KDockWidget* getMainDockWidget(){ return mainDockWidget; }
 
   KDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L,
-    const TQString& strCaption = TQString::null, const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ) );
+    const TQString& strCaption = TQString::null, const TQString& strTabPageLabel = TQString::fromLatin1( " " ) );
 
   void writeDockConfig(TQDomElement &base);
   void readDockConfig(TQDomElement &base);
diff --git a/kdeui/kdockwidget_private.cpp b/kdeui/kdockwidget_private.cpp
index 12c1b32f0..9c98ae69a 100644
--- a/kdeui/kdockwidget_private.cpp
+++ b/kdeui/kdockwidget_private.cpp
@@ -281,7 +281,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
               // xpos should not change, the docking is on the top
               // checkValue is *fuzzy* here, it leads to ugly rounding bugs
               // In truth, it is not needed, because it is called when calculating the "position".
-              xpos = tqRound(((double)xpos) * ev->oldSize().height() / height());
+              xpos = qRound(((double)xpos) * ev->oldSize().height() / height());
             }
           }
         } else {
@@ -291,7 +291,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
             } else {
               // xpos should not change
               // checkValue is *fuzzy* here, it leads to ugly rounding bugs
-              xpos = tqRound(((double)xpos) * ev->oldSize().width() / width());
+              xpos = qRound(((double)xpos) * ev->oldSize().width() / width());
             }
           }
         }
@@ -513,7 +513,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)
           if (tmp_xpos != xpos) {
             xpos = tmp_xpos;
             resizeEvent(0);
-            divider->tqrepaint(true);
+            divider->repaint(true);
           }
         }
       } else {
@@ -529,7 +529,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)
           if (tmp_xpos != xpos) {
             xpos = tmp_xpos;
             resizeEvent(0);
-            divider->tqrepaint(true);
+            divider->repaint(true);
           }
         }
       }
@@ -546,7 +546,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)
         }
         xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).y() ) / height();
         resizeEvent(0);
-        divider->tqrepaint(true);
+        divider->repaint(true);
       } else {
         if ((fixedWidth0!=-1) || (fixedWidth1!=-1))
         {
@@ -554,7 +554,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)
         }
         xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).x() ) / width();
         resizeEvent(0);
-        divider->tqrepaint(true);
+        divider->repaint(true);
       }
       handled= true;
       break;
@@ -585,15 +585,15 @@ void KDockSplitter::updateName()
   if ( !initialised ) return;
 
   TQString new_name = TQString( child0->name() ) + "," + child1->name();
-  tqparentWidget()->setName( new_name.latin1() );
-  tqparentWidget()->setCaption( child0->caption() + "," + child1->caption() );
-  tqparentWidget()->tqrepaint( false );
+  parentWidget()->setName( new_name.latin1() );
+  parentWidget()->setCaption( child0->caption() + "," + child1->caption() );
+  parentWidget()->repaint( false );
 
-  ((KDockWidget*)tqparentWidget())->firstName = child0->name();
-  ((KDockWidget*)tqparentWidget())->lastName = child1->name();
-  ((KDockWidget*)tqparentWidget())->splitterOrientation = m_orientation;
+  ((KDockWidget*)parentWidget())->firstName = child0->name();
+  ((KDockWidget*)parentWidget())->lastName = child1->name();
+  ((KDockWidget*)parentWidget())->splitterOrientation = m_orientation;
 
-  TQWidget* p = tqparentWidget()->tqparentWidget();
+  TQWidget* p = parentWidget()->parentWidget();
   if ( p && p->inherits("KDockSplitter" ) )
     ((KDockSplitter*)p)->updateName();
 }
@@ -634,7 +634,7 @@ KDockButton_Private::~KDockButton_Private()
 
 void KDockButton_Private::drawButton( TQPainter* p )
 {
-  p->fillRect( 0,0, width(), height(), TQBrush(tqcolorGroup().brush(TQColorGroup::Background)) );
+  p->fillRect( 0,0, width(), height(), TQBrush(colorGroup().brush(TQColorGroup::Background)) );
   p->drawPixmap( (width() - pixmap()->width()) / 2, (height() - pixmap()->height()) / 2, *pixmap() );
   if ( moveMouse && !isDown() ){
     p->setPen( white );
@@ -642,12 +642,12 @@ void KDockButton_Private::drawButton( TQPainter* p )
     p->lineTo( 0, 0 );
     p->lineTo( width() - 1, 0 );
 
-    p->setPen( tqcolorGroup().dark() );
+    p->setPen( colorGroup().dark() );
     p->lineTo( width() - 1, height() - 1 );
     p->lineTo( 0, height() - 1 );
   }
   if ( isOn() || isDown() ){
-    p->setPen( tqcolorGroup().dark() );
+    p->setPen( colorGroup().dark() );
     p->moveTo( 0, height() - 1 );
     p->lineTo( 0, 0 );
     p->lineTo( width() - 1, 0 );
@@ -661,13 +661,13 @@ void KDockButton_Private::drawButton( TQPainter* p )
 void KDockButton_Private::enterEvent( TQEvent * )
 {
   moveMouse = true;
-  tqrepaint();
+  repaint();
 }
 
 void KDockButton_Private::leaveEvent( TQEvent * )
 {
   moveMouse = false;
-  tqrepaint();
+  repaint();
 }
 
 /*************************************************************************/
@@ -707,6 +707,6 @@ void KDockWidgetPrivate::slotFocusEmbeddedWidget(TQWidget* w)
    }
 }
 
-#ifndef NO_INCLUDE_TQMOCFILES // for Qt-only projects, because tmake doesn't take this name
+#ifndef NO_INCLUDE_MOCFILES // for Qt-only projects, because tmake doesn't take this name
 #include "kdockwidget_private.moc"
 #endif
diff --git a/kdeui/kdockwidget_private.h b/kdeui/kdockwidget_private.h
index ccc38ffd0..c017f1d14 100644
--- a/kdeui/kdockwidget_private.h
+++ b/kdeui/kdockwidget_private.h
@@ -61,7 +61,7 @@ public:
 
   /**
    * Initialize the splitter. If @p c0 or @p c1 is 0L the child will not
-   * be tqreplaced. So if you want to change @p c1 and not change c0, you'd
+   * be replaced. So if you want to change @p c1 and not change c0, you'd
    * call @p activate(0L,new_widget);
    *
    * @param c0 the widget on top/left
@@ -270,7 +270,7 @@ private:
 /**
  * additional KDockWidget stuff (private)
 */
-class KDockWidgetPrivate : public TQObject
+class KDockWidgetPrivate : public QObject
 {
   Q_OBJECT
 public:
@@ -311,7 +311,7 @@ public:
 };
 
 class KDockWidgetHeaderPrivate
-   : public TQObject
+   : public QObject
 {
 public:
   KDockWidgetHeaderPrivate( TQObject* parent )
diff --git a/kdeui/kdualcolorbutton.cpp b/kdeui/kdualcolorbutton.cpp
index 2ecbce5fd..2b4c2ecfd 100644
--- a/kdeui/kdualcolorbutton.cpp
+++ b/kdeui/kdualcolorbutton.cpp
@@ -51,8 +51,8 @@ KDualColorButton::KDualColorButton(TQWidget *parent, const char *name, TQWidget*
     curColor = Foreground;
     dragFlag = false;
     miniCtlFlag = false;
-    if(tqsizeHint().isValid())
-        setMinimumSize(tqsizeHint());
+    if(sizeHint().isValid())
+        setMinimumSize(sizeHint());
     setAcceptDrops(true);
 }
 
@@ -72,8 +72,8 @@ KDualColorButton::KDualColorButton(const TQColor &fgColor, const TQColor &bgColo
     curColor = Foreground;
     dragFlag = false;
     miniCtlFlag = false;
-    if(tqsizeHint().isValid())
-        setMinimumSize(tqsizeHint());
+    if(sizeHint().isValid())
+        setMinimumSize(sizeHint());
     setAcceptDrops(true);
 }
 
@@ -104,7 +104,7 @@ TQColor KDualColorButton::currentColor() const
     return (curColor == Background ? bg.color() : fg.color());
 }
 
-TQSize KDualColorButton::tqsizeHint() const
+TQSize KDualColorButton::sizeHint() const
 {
     return TQSize(34, 34);
 }
@@ -112,7 +112,7 @@ TQSize KDualColorButton::tqsizeHint() const
 void KDualColorButton::setForeground(const TQColor &c)
 {
     fg = TQBrush(c, SolidPattern);
-    tqrepaint(false);
+    repaint(false);
 
     emit fgChanged(fg.color());
 }
@@ -120,7 +120,7 @@ void KDualColorButton::setForeground(const TQColor &c)
 void KDualColorButton::setBackground(const TQColor &c)
 {
     bg = TQBrush(c, SolidPattern);
-    tqrepaint(false);
+    repaint(false);
 
     emit bgChanged(bg.color());
 }
@@ -131,13 +131,13 @@ void KDualColorButton::setCurrentColor(const TQColor &c)
         bg = TQBrush(c, SolidPattern);
     else
         fg = TQBrush(c, SolidPattern);
-    tqrepaint(false);
+    repaint(false);
 }
 
 void KDualColorButton::setCurrent(DualColor s)
 {
     curColor = s;
-    tqrepaint(false);
+    repaint(false);
 }
 
 void KDualColorButton::metrics(TQRect &fgRect, TQRect &bgRect)
@@ -152,13 +152,13 @@ void KDualColorButton::paintEvent(TQPaintEvent *)
     TQPainter p(this);
 
     metrics(fgRect, bgRect);
-    TQBrush defBrush = tqcolorGroup().brush(TQColorGroup::Button);
+    TQBrush defBrush = colorGroup().brush(TQColorGroup::Button);
 
-    qDrawShadeRect(&p, bgRect, tqcolorGroup(), curColor == Background, 2, 0,
+    qDrawShadeRect(&p, bgRect, colorGroup(), curColor == Background, 2, 0,
                    isEnabled() ? &bg : &defBrush);
-    qDrawShadeRect(&p, fgRect, tqcolorGroup(), curColor == Foreground, 2, 0,
+    qDrawShadeRect(&p, fgRect, colorGroup(), curColor == Foreground, 2, 0,
                    isEnabled() ? &fg : &defBrush);
-    p.setPen(tqcolorGroup().shadow());
+    p.setPen(colorGroup().shadow());
     p.drawPixmap(fgRect.right()+2, 0, *arrowBitmap);
     p.drawPixmap(0, fgRect.bottom()+2, *resetPixmap);
 
@@ -181,7 +181,7 @@ void KDualColorButton::dropEvent(TQDropEvent *ev)
             bg.setColor(c);
             emit(bgChanged(c));
         }
-        tqrepaint(false);
+        repaint(false);
     }
 }
 
@@ -192,11 +192,11 @@ void KDualColorButton::mousePressEvent(TQMouseEvent *ev)
     mPos = ev->pos();
     tmpColor = curColor;
     dragFlag = false;
-    if(fgRect.tqcontains(mPos)){
+    if(fgRect.contains(mPos)){
         curColor = Foreground;
         miniCtlFlag = false;
     }
-    else if(bgRect.tqcontains(mPos)){
+    else if(bgRect.contains(mPos)){
         curColor = Background;
         miniCtlFlag = false;
    }
@@ -217,7 +217,7 @@ void KDualColorButton::mousePressEvent(TQMouseEvent *ev)
         emit bgChanged(bg.color());
         miniCtlFlag = true;
     }
-    tqrepaint(false);
+    repaint(false);
 }
 
 
@@ -244,7 +244,7 @@ void KDualColorButton::mouseReleaseEvent(TQMouseEvent *ev)
         metrics(fgRect, bgRect);
         if(dragFlag)
             curColor = tmpColor;
-        else if(fgRect.tqcontains(ev->pos()) && curColor == Foreground){
+        else if(fgRect.contains(ev->pos()) && curColor == Foreground){
             if(tmpColor == Background){
                 curColor = Foreground;
                 emit currentChanged(Foreground);
@@ -257,7 +257,7 @@ void KDualColorButton::mouseReleaseEvent(TQMouseEvent *ev)
                 }
             }
         }
-        else if(bgRect.tqcontains(ev->pos()) && curColor == Background){
+        else if(bgRect.contains(ev->pos()) && curColor == Background){
             if(tmpColor == Foreground){
                 curColor = Background;
                 emit currentChanged(Background);
@@ -270,7 +270,7 @@ void KDualColorButton::mouseReleaseEvent(TQMouseEvent *ev)
                 }
             }
         }
-        tqrepaint(false);
+        repaint(false);
         dragFlag = false;
     }
     else
diff --git a/kdeui/kdualcolorbutton.h b/kdeui/kdualcolorbutton.h
index d246e68bf..7b08ec0e3 100644
--- a/kdeui/kdualcolorbutton.h
+++ b/kdeui/kdualcolorbutton.h
@@ -94,7 +94,7 @@ public:
      * Returns the minimum size needed to display the widget and all its
      * controls.
      */
-    virtual TQSize tqsizeHint() const;
+    virtual TQSize sizeHint() const;
 public slots:
     /**
      * Sets the foreground color.
@@ -128,7 +128,7 @@ signals:
 protected:
     /**
      * Sets the supplied rectangles to the proper size and position for the
-     * current widget size. You can reimplement this to change the tqlayout
+     * current widget size. You can reimplement this to change the layout
      * of the widget. Restrictions are that the swap control will always
      * be at the top right, the reset control will always be at the bottom
      * left, and you must leave at least a 14x14 space in those corners.
diff --git a/kdeui/keditcl.h b/kdeui/keditcl.h
index c3f58b9c4..19f828c2b 100644
--- a/kdeui/keditcl.h
+++ b/kdeui/keditcl.h
@@ -126,10 +126,10 @@ public:
     KHistoryCombo *searchCombo() const;
 
     /**
-     * @returns the combobox containing the history of tqreplaces. Can be used
+     * @returns the combobox containing the history of replaces. Can be used
      * to save and restore the history.
      */
-    KHistoryCombo *tqreplaceCombo() const;
+    KHistoryCombo *replaceCombo() const;
 
     bool 	case_sensitive();
     bool 	get_direction();
@@ -149,9 +149,9 @@ private:
 	virtual void done(int i ) { KDialogBase::done(i); }
 
 signals:
-    void tqreplace();
-    void tqfind();
-    void tqreplaceAll();
+    void replace();
+    void find();
+    void replaceAll();
     void done();
 protected:
   virtual void virtual_hook( int id, void* data );
@@ -194,7 +194,7 @@ public:
 
     /**
      * Save text from the edit widget to a text stream.
-     * If @p softWrap is false soft line wrappings are tqreplaced with line-feeds
+     * If @p softWrap is false soft line wrappings are replaced with line-feeds
      * If @p softWrap is true soft line wrappings are ignored.
      * @since 3.1
      **/
@@ -225,7 +225,7 @@ public:
     /**
      * Present a Search and Replace Dialog to the user.
      **/
-    void 	tqreplace();
+    void 	replace();
 
     /**
      * Present a "Goto Line" dialog to the user.
@@ -340,22 +340,22 @@ private slots:
       /**
        * @internal
        **/
-    void tqreplace_slot();
+    void replace_slot();
 
       /**
        * @internal
        **/
-    void tqreplace_all_slot();
+    void replace_all_slot();
 
       /**
        * @internal
        **/
-    void tqreplace_search_slot();
+    void replace_search_slot();
 
       /**
        * @internal
        **/
-    void tqreplacedone_slot();
+    void replacedone_slot();
 
       /**
        * Cursor moved...
@@ -368,7 +368,7 @@ protected:
 			 bool regex, bool forward,int line, int col);
 
     int 	doReplace(TQString s_pattern, bool case_sensitive,
-			  bool regex, bool forward,int line, int col,bool tqreplace);
+			  bool regex, bool forward,int line, int col,bool replace);
 
       /**
        * Sets line and col to the position pos, considering word wrap.
@@ -401,25 +401,25 @@ protected:
     void        contentsDropEvent(TQDropEvent* e);
 
 private:
-    TQTimer* tqrepaintTimer;
+    TQTimer* repaintTimer;
 
     QString	killbufferstring;
     TQWidget     *parent;
     KEdFind 	*srchdialog;
-    KEdReplace 	*tqreplace_dialog;
+    KEdReplace 	*replace_dialog;
     KEdGotoLine *gotodialog;
 
     TQString     pattern;
 
-    bool 	can_tqreplace;
+    bool 	can_replace;
     bool	killing;
     bool 	killtrue;
     bool 	lastwasanewline;
     bool        saved_readonlystate;
     int 	last_search;
-    int 	last_tqreplace;
-    int 	tqreplace_all_line;
-    int 	tqreplace_all_col;
+    int 	last_replace;
+    int 	replace_all_line;
+    int 	replace_all_col;
 
     int 	line_pos, col_pos;
     bool        fill_column_is_set;
diff --git a/kdeui/keditcl1.cpp b/kdeui/keditcl1.cpp
index 0b8ebea12..a77e1c523 100644
--- a/kdeui/keditcl1.cpp
+++ b/kdeui/keditcl1.cpp
@@ -61,7 +61,7 @@ KEdit::KEdit(TQWidget *_parent, const char *name)
     line_pos = col_pos = 0;
 
     srchdialog = NULL;
-    tqreplace_dialog= NULL;
+    replace_dialog= NULL;
     gotodialog = NULL;
 
     setAcceptDrops(true);
@@ -128,7 +128,7 @@ KEdit::insertText(TQTextStream *stream)
    setCursorPosition(saveline, savecol);
 //   setAutoUpdate(true);
 
-//   tqrepaint();
+//   repaint();
 
    setModified(true);
    setFocus();
@@ -140,7 +140,7 @@ KEdit::insertText(TQTextStream *stream)
 
    //   TQString str = text();
    //   for (int i = 0; i < (int) str.length(); i++)
-   //     printf("KEdit: U+%04X\n", str[i].tqunicode());
+   //     printf("KEdit: U+%04X\n", str[i].unicode());
 
 }
 
@@ -164,7 +164,7 @@ KEdit::cleanWhiteSpace()
       if (line.isEmpty())
       {
          if (addSpace)
-            newText += TQString::tqfromLatin1("\n\n");
+            newText += TQString::fromLatin1("\n\n");
          if (firstLine)
          {
             if (firstChar.isSpace())
@@ -200,7 +200,7 @@ KEdit::cleanWhiteSpace()
    {
       deselect();
       d->autoUpdate = true;
-      tqrepaint();
+      repaint();
       return;
    }
    if (wordWrap() == NoWrap)
@@ -225,7 +225,7 @@ KEdit::cleanWhiteSpace()
 
    insert(newText);
    d->autoUpdate = true;
-   tqrepaint();
+   repaint();
 
    setModified(true);
    setFocus();
@@ -350,7 +350,7 @@ void KEdit::computePosition()
 
   int coltemp = col-start_of_line;
   int pos  = 	0;
-  int tqfind = 	0;
+  int find = 	0;
   int mem  = 	0;
   bool found_one = false;
 
@@ -358,14 +358,14 @@ void KEdit::computePosition()
   // kedit+ sources -- if not, go away ;-)
 
 
-  while(tqfind >=0 && tqfind <= coltemp- 1 ){
-    tqfind = linetext.tqfind('\t', tqfind+start_of_line, true )-start_of_line;
-    if( tqfind >=0 && tqfind <= coltemp - 1 ){
+  while(find >=0 && find <= coltemp- 1 ){
+    find = linetext.find('\t', find+start_of_line, true )-start_of_line;
+    if( find >=0 && find <= coltemp - 1 ){
       found_one = true;
-      pos = pos + tqfind - mem;
+      pos = pos + find - mem;
       pos = pos + 8  - pos % 8;
-      mem = tqfind;
-      tqfind ++;
+      mem = find;
+      find ++;
     }
   }
 
@@ -466,48 +466,48 @@ void KEdit::keyPressEvent ( TQKeyEvent *e)
 
   killing = false;
 
-  if ( KStdAccel::copy().tqcontains( key ) )
+  if ( KStdAccel::copy().contains( key ) )
     copy();
   else if ( isReadOnly() )
     TQMultiLineEdit::keyPressEvent( e );
   // If this is an unmodified printable key, send it directly to TQMultiLineEdit.
-  else if ( !(key.keyCodeQt() & (CTRL | ALT)) && !e->text().isEmpty() && e->text().tqunicode()->isPrint() )
+  else if ( !(key.keyCodeQt() & (CTRL | ALT)) && !e->text().isEmpty() && e->text().unicode()->isPrint() )
     TQMultiLineEdit::keyPressEvent( e );
-  else if ( KStdAccel::paste().tqcontains( key ) ) {
+  else if ( KStdAccel::paste().contains( key ) ) {
     paste();
     setModified(true);
     slotCursorPositionChanged();
   }
-  else if ( KStdAccel::cut().tqcontains( key ) ) {
+  else if ( KStdAccel::cut().contains( key ) ) {
     cut();
     setModified(true);
     slotCursorPositionChanged();
   }
-  else if ( KStdAccel::undo().tqcontains( key ) ) {
+  else if ( KStdAccel::undo().contains( key ) ) {
     undo();
     setModified(true);
     slotCursorPositionChanged();
   }
-  else if ( KStdAccel::redo().tqcontains( key ) ) {
+  else if ( KStdAccel::redo().contains( key ) ) {
     redo();
     setModified(true);
     slotCursorPositionChanged();
   }
-  else if ( KStdAccel::deleteWordBack().tqcontains( key ) ) {
+  else if ( KStdAccel::deleteWordBack().contains( key ) ) {
     moveCursor(MoveWordBackward, true);
     if (hasSelectedText())
       del();
     setModified(true);
     slotCursorPositionChanged();
   }
-  else if ( KStdAccel::deleteWordForward().tqcontains( key ) ) {
+  else if ( KStdAccel::deleteWordForward().contains( key ) ) {
     moveCursor(MoveWordForward, true);
     if (hasSelectedText())
       del();
     setModified(true);
     slotCursorPositionChanged();
   }
-  else if ( KStdAccel::backwardWord().tqcontains( key ) ) {
+  else if ( KStdAccel::backwardWord().contains( key ) ) {
     CursorAction action = MoveWordBackward;
     int para, index;
     getCursorPosition( &para, & index );
@@ -516,7 +516,7 @@ void KEdit::keyPressEvent ( TQKeyEvent *e)
     moveCursor(action, false );
     slotCursorPositionChanged();
   }
-  else if ( KStdAccel::forwardWord().tqcontains( key ) ) {
+  else if ( KStdAccel::forwardWord().contains( key ) ) {
     CursorAction action = MoveWordForward;
     int para, index;
     getCursorPosition( &para, & index );
@@ -525,27 +525,27 @@ void KEdit::keyPressEvent ( TQKeyEvent *e)
     moveCursor( action, false );
     slotCursorPositionChanged();
   }
-  else if ( KStdAccel::next().tqcontains( key ) ) {
+  else if ( KStdAccel::next().contains( key ) ) {
     moveCursor( MovePgDown, false );
     slotCursorPositionChanged();
   }
-  else if ( KStdAccel::prior().tqcontains( key ) ) {
+  else if ( KStdAccel::prior().contains( key ) ) {
     moveCursor( MovePgUp, false );
     slotCursorPositionChanged();
   }
-  else if ( KStdAccel::home().tqcontains( key ) ) {
+  else if ( KStdAccel::home().contains( key ) ) {
     moveCursor( MoveHome, false );
     slotCursorPositionChanged();
   }
-  else if ( KStdAccel::end().tqcontains( key ) ) {
+  else if ( KStdAccel::end().contains( key ) ) {
     moveCursor( MoveEnd, false );
     slotCursorPositionChanged();
   }
-  else if ( KStdAccel::beginningOfLine().tqcontains( key ) ) {
+  else if ( KStdAccel::beginningOfLine().contains( key ) ) {
     moveCursor( MoveLineStart, false);
     slotCursorPositionChanged();
   }
-  else if ( KStdAccel::endOfLine().tqcontains( key ) ) {
+  else if ( KStdAccel::endOfLine().contains( key ) ) {
     moveCursor( MoveLineEnd, false);
     slotCursorPositionChanged();
   }
diff --git a/kdeui/keditcl2.cpp b/kdeui/keditcl2.cpp
index f3f8c0bbb..36d1b8f3b 100644
--- a/kdeui/keditcl2.cpp
+++ b/kdeui/keditcl2.cpp
@@ -50,9 +50,9 @@
 
 void KEdit::search(){
 
-  if( tqreplace_dialog && tqreplace_dialog->isVisible() )
+  if( replace_dialog && replace_dialog->isVisible() )
   {
-    tqreplace_dialog->hide();
+    replace_dialog->hide();
   }
 
   if( !srchdialog )
@@ -62,8 +62,8 @@ void KEdit::search(){
     connect(srchdialog,TQT_SIGNAL(done()),this,TQT_SLOT(searchdone_slot()));
   }
 
-  // If we already searched / tqreplaced something before make sure it shows
-  // up in the tqfind dialog line-edit.
+  // If we already searched / replaced something before make sure it shows
+  // up in the find dialog line-edit.
 
   TQString string;
   string = srchdialog->getText();
@@ -162,7 +162,7 @@ int KEdit::doSearch(TQString s_pattern, bool case_sensitive,
 
       string = textLine(i);
 
-      pos = string.tqfind(s_pattern, i == line ? col : 0, case_sensitive);
+      pos = string.find(s_pattern, i == line ? col : 0, case_sensitive);
 
       if( pos != -1){
 
@@ -191,7 +191,7 @@ int KEdit::doSearch(TQString s_pattern, bool case_sensitive,
       string = textLine(i);
       int line_length = string.length();
 
-      pos = string.tqfindRev(s_pattern, line == i ? col : line_length , case_sensitive);
+      pos = string.findRev(s_pattern, line == i ? col : line_length , case_sensitive);
 
       if (pos != -1){
 
@@ -244,47 +244,47 @@ bool KEdit::repeatSearch() {
 //
 
 
-void KEdit::tqreplace()
+void KEdit::replace()
 {
   if( srchdialog && srchdialog->isVisible() )
   {
     srchdialog->hide();
   }
 
-  if( !tqreplace_dialog )
+  if( !replace_dialog )
   {
-    tqreplace_dialog = new KEdReplace( this, "tqreplace_dialog", false );
-    connect(tqreplace_dialog,TQT_SIGNAL(tqfind()),this,TQT_SLOT(tqreplace_search_slot()));
-    connect(tqreplace_dialog,TQT_SIGNAL(tqreplace()),this,TQT_SLOT(tqreplace_slot()));
-    connect(tqreplace_dialog,TQT_SIGNAL(tqreplaceAll()),this,TQT_SLOT(tqreplace_all_slot()));
-    connect(tqreplace_dialog,TQT_SIGNAL(done()),this,TQT_SLOT(tqreplacedone_slot()));
+    replace_dialog = new KEdReplace( this, "replace_dialog", false );
+    connect(replace_dialog,TQT_SIGNAL(find()),this,TQT_SLOT(replace_search_slot()));
+    connect(replace_dialog,TQT_SIGNAL(replace()),this,TQT_SLOT(replace_slot()));
+    connect(replace_dialog,TQT_SIGNAL(replaceAll()),this,TQT_SLOT(replace_all_slot()));
+    connect(replace_dialog,TQT_SIGNAL(done()),this,TQT_SLOT(replacedone_slot()));
   }
 
-  TQString string = tqreplace_dialog->getText();
-  tqreplace_dialog->setText(string.isEmpty() ? pattern : string);
+  TQString string = replace_dialog->getText();
+  replace_dialog->setText(string.isEmpty() ? pattern : string);
 
 
   deselect();
-  last_tqreplace = NONE;
+  last_replace = NONE;
 
-  tqreplace_dialog->show();
-  tqreplace_dialog->result();
+  replace_dialog->show();
+  replace_dialog->result();
 }
 
 
-void KEdit::tqreplace_slot(){
+void KEdit::replace_slot(){
 
-  if (!tqreplace_dialog)
+  if (!replace_dialog)
     return;
 
-  if(!can_tqreplace){
+  if(!can_replace){
     KNotifyClient::beep();
     return;
   }
 
   int line,col, length;
 
-  TQString string = tqreplace_dialog->getReplaceText();
+  TQString string = replace_dialog->getReplaceText();
   length = string.length();
 
   this->cut();
@@ -293,9 +293,9 @@ void KEdit::tqreplace_slot(){
 
   insertAt(string,line,col);
   setModified(true);
-  can_tqreplace = false;
+  can_replace = false;
 
-  if (tqreplace_dialog->get_direction())
+  if (replace_dialog->get_direction())
   {
     // Backward
     setCursorPosition(line,col+length);
@@ -313,40 +313,40 @@ void KEdit::tqreplace_slot(){
   }
 }
 
-void KEdit::tqreplace_all_slot(){
+void KEdit::replace_all_slot(){
 
-  if (!tqreplace_dialog)
+  if (!replace_dialog)
     return;
 
-  TQString to_find_string = tqreplace_dialog->getText();
+  TQString to_find_string = replace_dialog->getText();
 
   int lineFrom, lineTo, colFrom, colTo;
   getSelection(&lineFrom, &colFrom, &lineTo, &colTo);
 
-  // tqreplace_dialog->get_direction() is true if searching backward
-  if (tqreplace_dialog->get_direction())
+  // replace_dialog->get_direction() is true if searching backward
+  if (replace_dialog->get_direction())
   {
     if (colTo != -1)
     {
-      tqreplace_all_col = colTo - to_find_string.length();
-      tqreplace_all_line = lineTo;
+      replace_all_col = colTo - to_find_string.length();
+      replace_all_line = lineTo;
     }
     else
     {
-      getCursorPosition(&tqreplace_all_line,&tqreplace_all_col);
-      tqreplace_all_col--;
+      getCursorPosition(&replace_all_line,&replace_all_col);
+      replace_all_col--;
     }
   }
   else
   {
     if (colFrom != -1)
     {
-      tqreplace_all_col = colFrom;
-      tqreplace_all_line = lineFrom;
+      replace_all_col = colFrom;
+      replace_all_line = lineFrom;
     }
     else
     {
-      getCursorPosition(&tqreplace_all_line,&tqreplace_all_col);
+      getCursorPosition(&replace_all_line,&replace_all_col);
     }
   }
 
@@ -359,16 +359,16 @@ again:
 
   while(result){
 
-    result = doReplace(to_find_string, tqreplace_dialog->case_sensitive(),
-		       false, (!tqreplace_dialog->get_direction()),
-		       tqreplace_all_line,tqreplace_all_col,true);
+    result = doReplace(to_find_string, replace_dialog->case_sensitive(),
+		       false, (!replace_dialog->get_direction()),
+		       replace_all_line,replace_all_col,true);
 
   }
 
   setAutoUpdate(true);
   update();
 
-  if(!tqreplace_dialog->get_direction()){ // forward search
+  if(!replace_dialog->get_direction()){ // forward search
 
     int query = KMessageBox::questionYesNo(
 			srchdialog,
@@ -376,8 +376,8 @@ again:
                              "Continue from the beginning?"),
                         i18n("Find"),KStdGuiItem::cont(),i18n("Stop"));
     if (query == KMessageBox::Yes){
-      tqreplace_all_line = 0;
-      tqreplace_all_col = 0;
+      replace_all_line = 0;
+      replace_all_col = 0;
       goto again;
     }
   }
@@ -390,9 +390,9 @@ again:
                         i18n("Find"),KStdGuiItem::cont(),i18n("Stop"));
     if (query == KMessageBox::Yes){
       TQString string = textLine( numLines() - 1 );
-      tqreplace_all_line = numLines() - 1;
-      tqreplace_all_col  = string.length();
-      last_tqreplace = BACKWARD;
+      replace_all_line = numLines() - 1;
+      replace_all_col  = string.length();
+      last_replace = BACKWARD;
       goto again;
     }
   }
@@ -402,20 +402,20 @@ again:
 }
 
 
-void KEdit::tqreplace_search_slot(){
+void KEdit::replace_search_slot(){
 
   int line, col;
 
-  if (!tqreplace_dialog)
+  if (!replace_dialog)
     return;
 
-  TQString to_find_string = tqreplace_dialog->getText();
+  TQString to_find_string = replace_dialog->getText();
 
   int lineFrom, lineTo, colFrom, colTo;
   getSelection(&lineFrom, &colFrom, &lineTo, &colTo);
 
-  // tqreplace_dialog->get_direction() is true if searching backward
-  if (tqreplace_dialog->get_direction())
+  // replace_dialog->get_direction() is true if searching backward
+  if (replace_dialog->get_direction())
   {
     if (colFrom != -1)
     {
@@ -443,14 +443,14 @@ void KEdit::tqreplace_search_slot(){
 
 again:
 
-  int  result = doReplace(to_find_string, tqreplace_dialog->case_sensitive(),
-			 false, (!tqreplace_dialog->get_direction()), line, col, false );
+  int  result = doReplace(to_find_string, replace_dialog->case_sensitive(),
+			 false, (!replace_dialog->get_direction()), line, col, false );
 
   if(!result){
-    if(!tqreplace_dialog->get_direction()){ // forward search
+    if(!replace_dialog->get_direction()){ // forward search
 
      int query = KMessageBox::questionYesNo(
-			tqreplace_dialog,
+			replace_dialog,
                         i18n("End of document reached.\n"\
                              "Continue from the beginning?"),
                         i18n("Replace"),KStdGuiItem::cont(),i18n("Stop"));
@@ -463,7 +463,7 @@ again:
     else{ //backward search
 
      int query = KMessageBox::questionYesNo(
-			tqreplace_dialog,
+			replace_dialog,
                         i18n("Beginning of document reached.\n"\
                              "Continue from the end?"),
                         i18n("Replace"),KStdGuiItem::cont(),i18n("Stop"));
@@ -471,7 +471,7 @@ again:
 	TQString string = textLine( numLines() - 1 );
 	line = numLines() - 1;
 	col  = string.length();
-	last_tqreplace = BACKWARD;
+	last_replace = BACKWARD;
 	goto again;
       }
     }
@@ -484,18 +484,18 @@ again:
 
 
 
-void KEdit::tqreplacedone_slot(){
+void KEdit::replacedone_slot(){
 
-  if (!tqreplace_dialog)
+  if (!replace_dialog)
     return;
 
-  tqreplace_dialog->hide();
-  //  tqreplace_dialog->clearFocus();
+  replace_dialog->hide();
+  //  replace_dialog->clearFocus();
 
   setFocus();
 
-  last_tqreplace = NONE;
-  can_tqreplace  = false;
+  last_replace = NONE;
+  can_replace  = false;
 
 }
 
@@ -503,7 +503,7 @@ void KEdit::tqreplacedone_slot(){
 
 /* antlarr: KDE 4: make it const TQString & */
 int KEdit::doReplace(TQString s_pattern, bool case_sensitive,
-	   bool wildcard, bool forward, int line, int col, bool tqreplace_all){
+	   bool wildcard, bool forward, int line, int col, bool replace_all){
 
 
   (void) wildcard; // reserved for possible extension to regex
@@ -513,11 +513,11 @@ int KEdit::doReplace(TQString s_pattern, bool case_sensitive,
 
   TQString string;
   TQString stringnew;
-  TQString tqreplacement;
+  TQString replacement;
 
-  tqreplacement = tqreplace_dialog->getReplaceText();
+  replacement = replace_dialog->getReplaceText();
   line_counter = line;
-  tqreplace_all_col = col;
+  replace_all_col = col;
 
   if(forward){
 
@@ -527,34 +527,34 @@ int KEdit::doReplace(TQString s_pattern, bool case_sensitive,
 
       string = textLine(line_counter);
 
-      if (tqreplace_all){
-	pos = string.tqfind(s_pattern, tqreplace_all_col, case_sensitive);
+      if (replace_all){
+	pos = string.find(s_pattern, replace_all_col, case_sensitive);
       }
       else{
-	pos = string.tqfind(s_pattern, line_counter == line ? col : 0, case_sensitive);
+	pos = string.find(s_pattern, line_counter == line ? col : 0, case_sensitive);
       }
 
       if (pos == -1 ){
 	line_counter++;
-	tqreplace_all_col = 0;
-	tqreplace_all_line = line_counter;
+	replace_all_col = 0;
+	replace_all_line = line_counter;
       }
 
       if( pos != -1){
 
 	length = s_pattern.length();
 
-	if(tqreplace_all){ // automatic
+	if(replace_all){ // automatic
 
           stringnew = string.copy();
           do 
           {  
-	    stringnew.tqreplace(pos,length,tqreplacement);
+	    stringnew.replace(pos,length,replacement);
 
-	    tqreplace_all_col = pos + tqreplacement.length();
-	    tqreplace_all_line = line_counter;
+	    replace_all_col = pos + replacement.length();
+	    replace_all_line = line_counter;
 
-            pos = stringnew.tqfind(s_pattern, tqreplace_all_col, case_sensitive);
+            pos = stringnew.find(s_pattern, replace_all_col, case_sensitive);
           }
           while( pos != -1); 
 
@@ -573,8 +573,8 @@ int KEdit::doReplace(TQString s_pattern, bool case_sensitive,
 
 	  setCursorPosition( line_counter , pos + length, true );
 	  pattern = s_pattern;
-	  last_tqreplace = FORWARD;
-	  can_tqreplace = true;
+	  last_replace = FORWARD;
+	  can_replace = true;
 
 	  return 1;
 
@@ -591,55 +591,55 @@ int KEdit::doReplace(TQString s_pattern, bool case_sensitive,
 
       int line_length = string.length();
 
-      if( tqreplace_all ){
-        if (tqreplace_all_col < 0)
+      if( replace_all ){
+        if (replace_all_col < 0)
           pos = -1;
         else
-          pos = string.tqfindRev(s_pattern, tqreplace_all_col , case_sensitive);
+          pos = string.findRev(s_pattern, replace_all_col , case_sensitive);
       }
       else{
         if ((line == line_counter) && (col < 0))
           pos = -1;
         else
-          pos = string.tqfindRev(s_pattern,
+          pos = string.findRev(s_pattern,
 			   line == line_counter ? col : line_length , case_sensitive);
       }
 
       if (pos == -1 ){
 	line_counter--;
 
-        tqreplace_all_col = 0;
+        replace_all_col = 0;
 	if(line_counter >= 0){
 	  string = textLine(line_counter);
-	  tqreplace_all_col = string.length();
+	  replace_all_col = string.length();
 
 	}
-	tqreplace_all_line = line_counter;
+	replace_all_line = line_counter;
       }
 
 
       if (pos != -1){
 	length = s_pattern.length();
 
-	if(tqreplace_all){ // automatic
+	if(replace_all){ // automatic
 
 	  stringnew = string.copy();
-	  stringnew.tqreplace(pos,length,tqreplacement);
+	  stringnew.replace(pos,length,replacement);
 
 	  removeLine(line_counter);
 	  insertLine(stringnew,line_counter);
 
-	  tqreplace_all_col = pos-length;
-	  tqreplace_all_line = line_counter;
-	  if (tqreplace_all_col < 0)
+	  replace_all_col = pos-length;
+	  replace_all_line = line_counter;
+	  if (replace_all_col < 0)
 	  {
              line_counter--;
 
              if(line_counter >= 0){
                 string = textLine(line_counter);
-                tqreplace_all_col = string.length();
+                replace_all_col = string.length();
              }
-             tqreplace_all_line = line_counter;
+             replace_all_line = line_counter;
 	  }
 
 	  setModified(true);
@@ -658,8 +658,8 @@ int KEdit::doReplace(TQString s_pattern, bool case_sensitive,
 	    setCursorPosition(line_counter, pos ,true );
 	    pattern = s_pattern;
 
-	    last_tqreplace = BACKWARD;
-	    can_tqreplace = true;
+	    last_replace = BACKWARD;
+	    can_replace = true;
 
 	    return 1;
 	  }
@@ -698,7 +698,7 @@ public:
 
 KEdFind::KEdFind( TQWidget *parent, const char *name, bool modal )
   :KDialogBase( parent, name, modal, i18n("Find"),
-		modal ? User1|Cancel : User1|Close, User1, false, KGuiItem( i18n("&Find"), "tqfind") )
+		modal ? User1|Cancel : User1|Close, User1, false, KGuiItem( i18n("&Find"), "find") )
 {
   setWFlags( WType_TopLevel );
 
@@ -709,7 +709,7 @@ KEdFind::KEdFind( TQWidget *parent, const char *name, bool modal )
   d = new KEdFindPrivate( page );
 
   TQString text = i18n("Find:");
-  TQLabel *label = new TQLabel( text, page , "tqfind" );
+  TQLabel *label = new TQLabel( text, page , "find" );
   topLayout->addWidget( label );
 
   d->combo->setMinimumWidth(fontMetrics().maxWidth()*20);
@@ -813,24 +813,24 @@ class KEdReplace::KEdReplacePrivate
 public:
     KEdReplacePrivate( TQWidget *parent ) {
 	searchCombo = new KHistoryCombo( parent, "value" );
-	tqreplaceCombo = new KHistoryCombo( parent, "tqreplace_value" );
+	replaceCombo = new KHistoryCombo( parent, "replace_value" );
 
 	searchCombo->setMaxCount( 20 ); // just some defaults
-	tqreplaceCombo->setMaxCount( 20 );
+	replaceCombo->setMaxCount( 20 );
     }
     ~KEdReplacePrivate() {
 	delete searchCombo;
-	delete tqreplaceCombo;
+	delete replaceCombo;
     }
 
-    KHistoryCombo *searchCombo, *tqreplaceCombo;
+    KHistoryCombo *searchCombo, *replaceCombo;
 };
 
 KEdReplace::KEdReplace( TQWidget *parent, const char *name, bool modal )
   :KDialogBase( parent, name, modal, i18n("Replace"),
 		modal ? User3|User2|User1|Cancel : User3|User2|User1|Close,
                 User3, false,
-		i18n("Replace &All"), i18n("&Replace"), KGuiItem( i18n("&Find"), "tqfind") )
+		i18n("Replace &All"), i18n("&Replace"), KGuiItem( i18n("&Find"), "find") )
 {
   setWFlags( WType_TopLevel );
 
@@ -842,7 +842,7 @@ KEdReplace::KEdReplace( TQWidget *parent, const char *name, bool modal )
   d = new KEdReplacePrivate( page );
 
   TQString text = i18n("Find:");
-  TQLabel *label = new TQLabel( text, page, "tqfind" );
+  TQLabel *label = new TQLabel( text, page, "find" );
   topLayout->addWidget( label );
 
   d->searchCombo->setMinimumWidth(fontMetrics().maxWidth()*20);
@@ -850,11 +850,11 @@ KEdReplace::KEdReplace( TQWidget *parent, const char *name, bool modal )
   topLayout->addWidget(d->searchCombo);
 
   text = i18n("Replace with:");
-  label = new TQLabel( text, page, "tqreplace" );
+  label = new TQLabel( text, page, "replace" );
   topLayout->addWidget( label );
 
-  d->tqreplaceCombo->setMinimumWidth(fontMetrics().maxWidth()*20);
-  topLayout->addWidget(d->tqreplaceCombo);
+  d->replaceCombo->setMinimumWidth(fontMetrics().maxWidth()*20);
+  topLayout->addWidget(d->replaceCombo);
 
   connect(d->searchCombo, TQT_SIGNAL(textChanged ( const TQString & )),
           this,TQT_SLOT(textSearchChanged ( const TQString & )));
@@ -892,7 +892,7 @@ void KEdReplace::slotCancel( void )
 {
   emit done();
   d->searchCombo->clearEdit();
-  d->tqreplaceCombo->clearEdit();
+  d->replaceCombo->clearEdit();
   KDialogBase::slotCancel();
 }
 
@@ -905,8 +905,8 @@ void KEdReplace::slotUser1( void )
 {
     if( !d->searchCombo->currentText().isEmpty() )
     {
-        d->tqreplaceCombo->addToHistory( d->tqreplaceCombo->currentText() );
-        emit tqreplaceAll();
+        d->replaceCombo->addToHistory( d->replaceCombo->currentText() );
+        emit replaceAll();
     }
 }
 
@@ -915,8 +915,8 @@ void KEdReplace::slotUser2( void )
 {
     if( !d->searchCombo->currentText().isEmpty() )
     {
-        d->tqreplaceCombo->addToHistory( d->tqreplaceCombo->currentText() );
-        emit tqreplace();
+        d->replaceCombo->addToHistory( d->replaceCombo->currentText() );
+        emit replace();
     }
 }
 
@@ -925,7 +925,7 @@ void KEdReplace::slotUser3( void )
   if( !d->searchCombo->currentText().isEmpty() )
   {
     d->searchCombo->addToHistory( d->searchCombo->currentText() );
-    emit tqfind();
+    emit find();
   }
 }
 
@@ -938,7 +938,7 @@ TQString KEdReplace::getText()
 
 TQString KEdReplace::getReplaceText()
 {
-    return d->tqreplaceCombo->currentText();
+    return d->replaceCombo->currentText();
 }
 
 
@@ -966,9 +966,9 @@ KHistoryCombo * KEdReplace::searchCombo() const
     return d->searchCombo;
 }
 
-KHistoryCombo * KEdReplace::tqreplaceCombo() const
+KHistoryCombo * KEdReplace::replaceCombo() const
 {
-    return d->tqreplaceCombo;
+    return d->replaceCombo;
 }
 
 
@@ -1034,7 +1034,7 @@ void KEdit::misspelling (const TQString &word, const TQStringList &, unsigned in
 void KEdit::corrected (const TQString &originalword, const TQString &newword, unsigned int pos)
 {
   //we'll reselect the original word in case the user has played with
-  //the selection in eframe or the word was auto-tqreplaced
+  //the selection in eframe or the word was auto-replaced
 
   unsigned int l = 0;
   unsigned int cnt = 0;
diff --git a/kdeui/keditlistbox.cpp b/kdeui/keditlistbox.cpp
index b28b1ab00..b58244e93 100644
--- a/kdeui/keditlistbox.cpp
+++ b/kdeui/keditlistbox.cpp
@@ -79,7 +79,7 @@ void KEditListBox::init( bool checkAtEntering, int buttons,
     d->m_checkAtEntering = checkAtEntering;
 
     servNewButton = servRemoveButton = servUpButton = servDownButton = 0L;
-    tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding,
+    setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding,
                               TQSizePolicy::MinimumExpanding));
 
     TQGridLayout * grid = new TQGridLayout(this, 7, 2,
@@ -119,7 +119,7 @@ void KEditListBox::setButtons( uint buttons )
     if ( d->buttons == buttons )
         return;
 
-    TQGridLayout* grid = static_cast<TQGridLayout *>( tqlayout() );
+    TQGridLayout* grid = static_cast<TQGridLayout *>( layout() );
     if ( ( buttons & Add ) && !servNewButton ) {
         servNewButton = new TQPushButton(i18n("&Add"), this);
         servNewButton->setEnabled(false);
@@ -195,7 +195,7 @@ void KEditListBox::typedSomething(const TQString& text)
         else
         {
             StringComparisonMode mode = (StringComparisonMode) (ExactMatch | CaseSensitive );
-            bool enable = (!m_listBox->tqfindItem( text, mode ));
+            bool enable = (!m_listBox->findItem( text, mode ));
             servNewButton->setEnabled( enable );
         }
     }
@@ -266,7 +266,7 @@ void KEditListBox::addItem()
         else
         {
             StringComparisonMode mode = (StringComparisonMode) (ExactMatch | CaseSensitive );
-            alreadyInList =(m_listBox->tqfindItem(currentTextLE, mode) );
+            alreadyInList =(m_listBox->findItem(currentTextLE, mode) );
         }
     }
 
diff --git a/kdeui/kedittoolbar.cpp b/kdeui/kedittoolbar.cpp
index be33ac923..2d01dc469 100644
--- a/kdeui/kedittoolbar.cpp
+++ b/kdeui/kedittoolbar.cpp
@@ -155,7 +155,7 @@ public:
     if (!e)
       return false;
 
-    TQByteArray data = e->tqencodedData(TOOLBARITEMMIMETYPE);
+    TQByteArray data = e->encodedData(TOOLBARITEMMIMETYPE);
     if ( data.isEmpty() )
       return false;
 
@@ -252,7 +252,7 @@ public:
   /**
    * Return a list of toolbar elements given a toplevel element
    */
-  ToolbarList tqfindToolbars(TQDomNode n)
+  ToolbarList findToolbars(TQDomNode n)
   {
     static const TQString &tagToolbar = KGlobal::staticQString( "ToolBar" );
     static const TQString &attrNoEdit = KGlobal::staticQString( "noEdit" );
@@ -267,7 +267,7 @@ public:
       if (elem.tagName() == tagToolbar && elem.attribute( attrNoEdit ) != "true" )
         list.append(elem);
 
-      list += tqfindToolbars(elem.firstChild());
+      list += findToolbars(elem.firstChild());
     }
 
     return list;
@@ -304,7 +304,7 @@ public:
   /**
    * Look for a given item in the current toolbar
    */
-  TQDomElement tqfindElementForToolbarItem( const ToolbarItem* item ) const
+  TQDomElement findElementForToolbarItem( const ToolbarItem* item ) const
   {
     static const TQString &attrName    = KGlobal::staticQString( "name" );
     for(TQDomNode n = m_currentToolbarElem.firstChild(); !n.isNull(); n = n.nextSibling())
@@ -378,7 +378,7 @@ const char *KEditToolbar::s_defaultToolbar = 0L;
 KEditToolbar::KEditToolbar(KActionCollection *collection, const TQString& file,
                            bool global, TQWidget* parent, const char* name)
   : KDialogBase(Swallow, i18n("Configure Toolbars"), Default|Ok|Apply|Cancel, Ok, parent, name),
-    m_widget(new KEditToolbarWidget(TQString::tqfromLatin1(s_defaultToolbar), collection, file, global, this))
+    m_widget(new KEditToolbarWidget(TQString::fromLatin1(s_defaultToolbar), collection, file, global, this))
 {
     init();
     d->m_global = global;
@@ -400,7 +400,7 @@ KEditToolbar::KEditToolbar(const TQString& defaultToolbar, KActionCollection *co
 
 KEditToolbar::KEditToolbar(KXMLGUIFactory* factory, TQWidget* parent, const char* name)
     : KDialogBase(Swallow, i18n("Configure Toolbars"), Default|Ok|Apply|Cancel, Ok, parent, name),
-      m_widget(new KEditToolbarWidget(TQString::tqfromLatin1(s_defaultToolbar), factory, this))
+      m_widget(new KEditToolbarWidget(TQString::fromLatin1(s_defaultToolbar), factory, this))
 {
     init();
     d->m_factory = factory;
@@ -427,7 +427,7 @@ void KEditToolbar::init()
     connect(m_widget, TQT_SIGNAL(enableOk(bool)), TQT_SLOT(enableButtonApply(bool)));
     enableButtonApply(false);
 
-    setMinimumSize(tqsizeHint());
+    setMinimumSize(sizeHint());
     s_defaultToolbar = 0L;
 }
 
@@ -467,7 +467,7 @@ void KEditToolbar::slotDefault()
             if (TQDir::isRelativePath(file))
             {
                 const KInstance *instance = client->instance() ? client->instance() : KGlobal::instance();
-                file = locateLocal("data", TQString::tqfromLatin1( instance->instanceName() + '/' ) + file);
+                file = locateLocal("data", TQString::fromLatin1( instance->instanceName() + '/' ) + file);
             }
             else
             {
@@ -485,10 +485,10 @@ void KEditToolbar::slotDefault()
     }
     else
     {
-        int slash = d->m_file.tqfindRev('/')+1;
+        int slash = d->m_file.findRev('/')+1;
         if (slash)
             d->m_file = d->m_file.mid(slash);
-        TQString xml_file = locateLocal("data", TQString::tqfromLatin1( KGlobal::instance()->instanceName() + '/' ) + d->m_file);
+        TQString xml_file = locateLocal("data", TQString::fromLatin1( KGlobal::instance()->instanceName() + '/' ) + d->m_file);
 
         if ( TQFile::exists( xml_file ) )
             if ( !TQFile::remove( xml_file ) )
@@ -547,7 +547,7 @@ KEditToolbarWidget::KEditToolbarWidget(KActionCollection *collection,
   // now load in our toolbar combo box
   loadToolbarCombo();
   adjustSize();
-  setMinimumSize(tqsizeHint());
+  setMinimumSize(sizeHint());
 }
 
 KEditToolbarWidget::KEditToolbarWidget(const TQString& defaultToolbar,
@@ -561,7 +561,7 @@ KEditToolbarWidget::KEditToolbarWidget(const TQString& defaultToolbar,
   // now load in our toolbar combo box
   loadToolbarCombo(defaultToolbar);
   adjustSize();
-  setMinimumSize(tqsizeHint());
+  setMinimumSize(sizeHint());
 }
 
 KEditToolbarWidget::KEditToolbarWidget( KXMLGUIFactory* factory,
@@ -573,7 +573,7 @@ KEditToolbarWidget::KEditToolbarWidget( KXMLGUIFactory* factory,
   // now load in our toolbar combo box
   loadToolbarCombo();
   adjustSize();
-  setMinimumSize(tqsizeHint());
+  setMinimumSize(sizeHint());
 }
 
 KEditToolbarWidget::KEditToolbarWidget( const TQString& defaultToolbar,
@@ -586,7 +586,7 @@ KEditToolbarWidget::KEditToolbarWidget( const TQString& defaultToolbar,
   // now load in our toolbar combo box
   loadToolbarCombo(defaultToolbar);
   adjustSize();
-  setMinimumSize(tqsizeHint());
+  setMinimumSize(sizeHint());
 }
 
 KEditToolbarWidget::~KEditToolbarWidget()
@@ -614,7 +614,7 @@ void KEditToolbarWidget::initNonKPart(KActionCollection *collection,
   local.m_type    = XmlData::Local;
   local.m_document.setContent(localXML);
   elem = local.m_document.documentElement().toElement();
-  local.m_barList = d->tqfindToolbars(elem);
+  local.m_barList = d->findToolbars(elem);
   local.m_actionCollection = collection;
   d->m_xmlFiles.append(local);
 
@@ -624,7 +624,7 @@ void KEditToolbarWidget::initNonKPart(KActionCollection *collection,
   merge.m_type     = XmlData::Merged;
   merge.m_document = domDocument();
   elem = merge.m_document.documentElement().toElement();
-  merge.m_barList  = d->tqfindToolbars(elem);
+  merge.m_barList  = d->findToolbars(elem);
   merge.m_actionCollection = collection;
   d->m_xmlFiles.append(merge);
 
@@ -662,7 +662,7 @@ void KEditToolbarWidget::initKPart(KXMLGUIFactory* factory)
       data.m_type = XmlData::Part;
     data.m_document.setContent( KXMLGUIFactory::readConfigFile( client->xmlFile(), client->instance() ) );
     elem = data.m_document.documentElement().toElement();
-    data.m_barList = d->tqfindToolbars(elem);
+    data.m_barList = d->findToolbars(elem);
     data.m_actionCollection = client->actionCollection();
     d->m_xmlFiles.append(data);
 
@@ -816,7 +816,7 @@ void KEditToolbarWidget::setupLayout()
 
   // "change icon" button
   d->m_changeIcon = new KPushButton( i18n( "Change &Icon..." ), this );
-  TQString kdialogExe = KStandardDirs::findExe(TQString::tqfromLatin1("kdialog"));
+  TQString kdialogExe = KStandardDirs::findExe(TQString::fromLatin1("kdialog"));
   d->m_hasKDialog = !kdialogExe.isEmpty();
   d->m_changeIcon->setEnabled( d->m_hasKDialog );
 
@@ -853,52 +853,52 @@ void KEditToolbarWidget::setupLayout()
   connect(m_downAction, TQT_SIGNAL(clicked()), TQT_SLOT(slotDownButton()));
 
   d->m_helpArea = new TQLabel(this);
-  d->m_helpArea->tqsetAlignment( Qt::WordBreak );
+  d->m_helpArea->setAlignment( Qt::WordBreak );
 
-  // now start with our tqlayouts
-  TQVBoxLayout *top_tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+  // now start with our layouts
+  TQVBoxLayout *top_layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 
-  TQVBoxLayout *name_tqlayout = new TQVBoxLayout(KDialog::spacingHint());
-  TQHBoxLayout *list_tqlayout = new TQHBoxLayout(KDialog::spacingHint());
+  TQVBoxLayout *name_layout = new TQVBoxLayout(KDialog::spacingHint());
+  TQHBoxLayout *list_layout = new TQHBoxLayout(KDialog::spacingHint());
 
-  TQVBoxLayout *inactive_tqlayout = new TQVBoxLayout(KDialog::spacingHint());
-  TQVBoxLayout *active_tqlayout = new TQVBoxLayout(KDialog::spacingHint());
-  TQHBoxLayout *changeIcon_tqlayout = new TQHBoxLayout(KDialog::spacingHint());
+  TQVBoxLayout *inactive_layout = new TQVBoxLayout(KDialog::spacingHint());
+  TQVBoxLayout *active_layout = new TQVBoxLayout(KDialog::spacingHint());
+  TQHBoxLayout *changeIcon_layout = new TQHBoxLayout(KDialog::spacingHint());
 
-  TQGridLayout *button_tqlayout = new TQGridLayout(5, 3, 0);
+  TQGridLayout *button_layout = new TQGridLayout(5, 3, 0);
 
-  name_tqlayout->addWidget(d->m_comboLabel);
-  name_tqlayout->addWidget(m_toolbarCombo);
-//  name_tqlayout->addWidget(new_toolbar);
-//  name_tqlayout->addWidget(del_toolbar);
+  name_layout->addWidget(d->m_comboLabel);
+  name_layout->addWidget(m_toolbarCombo);
+//  name_layout->addWidget(new_toolbar);
+//  name_layout->addWidget(del_toolbar);
 
-  button_tqlayout->setRowStretch( 0, 10 );
-  button_tqlayout->addWidget(m_upAction, 1, 1);
-  button_tqlayout->addWidget(m_removeAction, 2, 0);
-  button_tqlayout->addWidget(m_insertAction, 2, 2);
-  button_tqlayout->addWidget(m_downAction, 3, 1);
-  button_tqlayout->setRowStretch( 4, 10 );
+  button_layout->setRowStretch( 0, 10 );
+  button_layout->addWidget(m_upAction, 1, 1);
+  button_layout->addWidget(m_removeAction, 2, 0);
+  button_layout->addWidget(m_insertAction, 2, 2);
+  button_layout->addWidget(m_downAction, 3, 1);
+  button_layout->setRowStretch( 4, 10 );
 
-  inactive_tqlayout->addWidget(inactive_label);
-  inactive_tqlayout->addWidget(m_inactiveList, 1);
+  inactive_layout->addWidget(inactive_label);
+  inactive_layout->addWidget(m_inactiveList, 1);
 
-  active_tqlayout->addWidget(active_label);
-  active_tqlayout->addWidget(m_activeList, 1);
-  active_tqlayout->addLayout(changeIcon_tqlayout);
+  active_layout->addWidget(active_label);
+  active_layout->addWidget(m_activeList, 1);
+  active_layout->addLayout(changeIcon_layout);
 
-  changeIcon_tqlayout->addStretch( 1 );
-  changeIcon_tqlayout->addWidget( d->m_changeIcon );
-  changeIcon_tqlayout->addStretch( 1 );
+  changeIcon_layout->addStretch( 1 );
+  changeIcon_layout->addWidget( d->m_changeIcon );
+  changeIcon_layout->addStretch( 1 );
 
-  list_tqlayout->addLayout(inactive_tqlayout);
-  list_tqlayout->addLayout(button_tqlayout);
-  list_tqlayout->addLayout(active_tqlayout);
+  list_layout->addLayout(inactive_layout);
+  list_layout->addLayout(button_layout);
+  list_layout->addLayout(active_layout);
 
-  top_tqlayout->addLayout(name_tqlayout);
-  top_tqlayout->addWidget(d->m_comboSeparator);
-  top_tqlayout->addLayout(list_tqlayout,10);
-  top_tqlayout->addWidget(d->m_helpArea);
-  top_tqlayout->addWidget(new KSeparator(this));
+  top_layout->addLayout(name_layout);
+  top_layout->addWidget(d->m_comboSeparator);
+  top_layout->addLayout(list_layout,10);
+  top_layout->addWidget(d->m_helpArea);
+  top_layout->addWidget(new KSeparator(this));
 }
 
 void KEditToolbarWidget::loadToolbarCombo(const TQString& defaultToolbar)
@@ -975,7 +975,7 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem)
     if (it.tagName() == tagSeparator)
     {
       ToolbarItem *act = new ToolbarItem(m_activeList, tagSeparator, sep_name.arg(sep_num++), TQString::null);
-      bool isLineSep = ( it.attribute(attrLineSeparator, "true").lower() == TQString::tqfromLatin1("true") );
+      bool isLineSep = ( it.attribute(attrLineSeparator, "true").lower() == TQString::fromLatin1("true") );
       if(isLineSep)
         act->setText(1, LINESEPARATORSTRING);
       else
@@ -988,7 +988,7 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem)
     {
       // Merge can be named or not - use the name if there is one
       TQString name = it.attribute( attrName );
-      ToolbarItem *act = new ToolbarItem(m_activeList, tagMerge, name, i18n("This element will be tqreplaced with all the elements of an embedded component."));
+      ToolbarItem *act = new ToolbarItem(m_activeList, tagMerge, name, i18n("This element will be replaced with all the elements of an embedded component."));
       if ( name.isEmpty() )
           act->setText(1, i18n("<Merge>"));
       else
@@ -1034,7 +1034,7 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem)
     KAction *action = actionCollection->action( i );
 
     // skip our active ones
-    if (active_list.tqcontains(action->name()))
+    if (active_list.contains(action->name()))
       continue;
 
     ToolbarItem *act = new ToolbarItem(m_inactiveList, tagActionList, action->name(), action->toolTip());
@@ -1213,7 +1213,7 @@ void KEditToolbarWidget::insertActive(ToolbarItem *item, TQListViewItem *before,
     // we have the item in the active list which is before the new
     // item.. so let's try our best to add our new item right after it
     ToolbarItem *act_item = (ToolbarItem*)before;
-    TQDomElement elem = d->tqfindElementForToolbarItem( act_item );
+    TQDomElement elem = d->findElementForToolbarItem( act_item );
     Q_ASSERT( !elem.isNull() );
     d->m_currentToolbarElem.insertAfter(new_item, elem);
   }
@@ -1243,8 +1243,8 @@ void KEditToolbarWidget::removeActive(ToolbarItem *item)
   // we're modified, so let this change
   emit enableOk(true);
 
-  // now iterate through to tqfind the child to nuke
-  TQDomElement elem = d->tqfindElementForToolbarItem( item );
+  // now iterate through to find the child to nuke
+  TQDomElement elem = d->findElementForToolbarItem( item );
   if ( !elem.isNull() )
   {
     // nuke myself!
@@ -1275,7 +1275,7 @@ void KEditToolbarWidget::slotUpButton()
 
 void KEditToolbarWidget::moveActive( ToolbarItem* item, TQListViewItem* before )
 {
-  TQDomElement e = d->tqfindElementForToolbarItem( item );
+  TQDomElement e = d->findElementForToolbarItem( item );
 
   if ( e.isNull() )
     return;
@@ -1303,7 +1303,7 @@ void KEditToolbarWidget::moveActive( ToolbarItem* item, TQListViewItem* before )
   if ( !before )
     d->m_currentToolbarElem.insertBefore(e, d->m_currentToolbarElem.firstChild() );
   else
-    d->m_currentToolbarElem.insertAfter(e, d->tqfindElementForToolbarItem( (ToolbarItem*)before ));
+    d->m_currentToolbarElem.insertAfter(e, d->findElementForToolbarItem( (ToolbarItem*)before ));
 
   // and set this container as a noMerge
   static const TQString &attrNoMerge = KGlobal::staticQString( "noMerge" );
@@ -1361,7 +1361,7 @@ void KEditToolbarWidget::updateLocal(TQDomElement& elem)
         continue;
 
       TQDomElement toolbar = (*xit).m_document.documentElement().toElement();
-      toolbar.tqreplaceChild(elem, (*it));
+      toolbar.replaceChild(elem, (*it));
       return;
     }
 
@@ -1382,10 +1382,10 @@ void KEditToolbarWidget::slotChangeIcon()
         return;
   
   d->m_kdialogProcess = new KProcIO;
-  TQString kdialogExe = KStandardDirs::findExe(TQString::tqfromLatin1("kdialog"));
+  TQString kdialogExe = KStandardDirs::findExe(TQString::fromLatin1("kdialog"));
   (*d->m_kdialogProcess) << kdialogExe;
   (*d->m_kdialogProcess) << "--embed";
-  (*d->m_kdialogProcess) << TQString::number( (ulong)tqtopLevelWidget()->winId() );
+  (*d->m_kdialogProcess) << TQString::number( (ulong)topLevelWidget()->winId() );
   (*d->m_kdialogProcess) << "--geticon";
   (*d->m_kdialogProcess) << "Toolbar";
   (*d->m_kdialogProcess) << "Actions";
@@ -1434,7 +1434,7 @@ void KEditToolbarWidget::slotProcessExited( KProcess* )
     // Get hold of ActionProperties tag
     TQDomElement elem = KXMLGUIFactory::actionPropertiesElement( d->m_currentXmlData->m_document );
     // Find or create an element for this action
-    TQDomElement act_elem = KXMLGUIFactory::tqfindActionByName( elem, item->internalName(), true /*create*/ );
+    TQDomElement act_elem = KXMLGUIFactory::findActionByName( elem, item->internalName(), true /*create*/ );
     Q_ASSERT( !act_elem.isNull() );
     act_elem.setAttribute( "icon", icon );
 
diff --git a/kdeui/kedittoolbar.h b/kdeui/kedittoolbar.h
index 4bc6c26b4..9033ff17f 100644
--- a/kdeui/kedittoolbar.h
+++ b/kdeui/kedittoolbar.h
@@ -43,7 +43,7 @@ namespace
  *
  * This dialog only works if your application uses the XML UI
  * framework for creating menus and toolbars.  It depends on the XML
- * files to describe the toolbar tqlayouts and it requires the actions
+ * files to describe the toolbar layouts and it requires the actions
  * to determine which buttons are active.
  *
  * Typically, you would include the KStdAction::configureToolbars()
@@ -83,7 +83,7 @@ namespace
  * Note that the procedure is a bit different for KParts applications.
  * In this case, you need only pass along a pointer to your
  * application's KXMLGUIFactory object.  The editor will take care of
- * tqfinding all of the action collections and XML files.  The editor
+ * finding all of the action collections and XML files.  The editor
  * aims to be semi-intelligent about where it assigns any
  * modifications.  In other words, it will not write out part specific
  * changes to your shell's XML file.
@@ -164,7 +164,7 @@ public:
    * Constructor for KParts based apps.
    *
    * The main parameter, factory(), is a pointer to the
-   * XML GUI factory object for your application.  It tqcontains a list
+   * XML GUI factory object for your application.  It contains a list
    * of all of the GUI clients (along with the action collections and
    * xml files) and the toolbar editor uses that.
    *
@@ -261,7 +261,7 @@ private:
  *
  * This widget only works if your application uses the XML UI
  * framework for creating menus and toolbars.  It depends on the XML
- * files to describe the toolbar tqlayouts and it requires the actions
+ * files to describe the toolbar layouts and it requires the actions
  * to determine which buttons are active.
  *
  * @author Kurt Granroth <granroth@kde.org>
@@ -325,7 +325,7 @@ public:
    * Constructor for KParts based apps.
    *
    * The first parameter, factory, is a pointer to the XML GUI
-   * factory object for your application.  It tqcontains a list of all
+   * factory object for your application.  It contains a list of all
    * of the GUI clients (along with the action collections and xml
    * files) and the toolbar editor uses that.
    *
diff --git a/kdeui/kfontcombo.cpp b/kdeui/kfontcombo.cpp
index cd4c92b43..c664d226e 100644
--- a/kdeui/kfontcombo.cpp
+++ b/kdeui/kfontcombo.cpp
@@ -132,7 +132,7 @@ void KFontListItem::paint(TQPainter *p)
             if (m_canPaintName)
                 p->setFont(*m_font);
             else
-                t = TQString::tqfromLatin1("(%1)").arg(m_fontName);
+                t = TQString::fromLatin1("(%1)").arg(m_fontName);
         }
         TQFontMetrics fm(p->fontMetrics());
         p->drawText(3, (m_combo->d->lineSpacing + fm.ascent() + fm.leading() / 2) / 2, t);
@@ -212,7 +212,7 @@ void KFontCombo::setCurrentFont(const TQString &family)
           return;
        }
     }
-    int x = lowerName.tqfind(" [");
+    int x = lowerName.find(" [");
     if (x>-1)
     {
        lowerName = lowerName.left(x);
@@ -251,7 +251,7 @@ void KFontCombo::setCurrentFont(const TQString &family)
     FcConfigSubstitute (config, pattern, FcMatchPattern);
     pattern = FcFontMatch(NULL, pattern, NULL);
     realFamily = (char*)FcNameUnparse(pattern);
-    realFamily.remove(realFamily.tqfind(regExp), realFamily.length());
+    realFamily.remove(realFamily.find(regExp), realFamily.length());
 
     if ( !realFamily.isEmpty() && realFamily != family )
        setCurrentFont( realFamily );
diff --git a/kdeui/kfontdialog.cpp b/kdeui/kfontdialog.cpp
index 0b0193981..4044c7b68 100644
--- a/kdeui/kfontdialog.cpp
+++ b/kdeui/kfontdialog.cpp
@@ -66,7 +66,7 @@ static int minimumListWidth( const TQListBox *list )
   }
   if( w == 0 ) { w = 40; }
   w += list->frameWidth() * 2;
-  w += list->verticalScrollBar()->tqsizeHint().width();
+  w += list->verticalScrollBar()->sizeHint().width();
   return w;
 }
 
@@ -284,7 +284,7 @@ KFontChooser::KFontChooser(TQWidget *parent, const char *name,
 
   connect( sizeListBox, TQT_SIGNAL(highlighted(const TQString&)),
 	   TQT_SLOT(size_chosen_slot(const TQString&)) );
-  sizeListBox->setSelected(sizeListBox->tqfindItem(TQString::number(10)), true); // default to 10pt.
+  sizeListBox->setSelected(sizeListBox->findItem(TQString::number(10)), true); // default to 10pt.
 
   row ++;
 
@@ -292,10 +292,10 @@ KFontChooser::KFontChooser(TQWidget *parent, const char *name,
   sampleEdit = new TQLineEdit( page, "sampleEdit");
   TQFont tmpFont( KGlobalSettings::generalFont().family(), 64, TQFont::Black );
   sampleEdit->setFont(tmpFont);
-  //i18n: This is a classical test phrase. (It tqcontains all letters from A to Z.)
+  //i18n: This is a classical test phrase. (It contains all letters from A to Z.)
   sampleEdit->setText(i18n("The Quick Brown Fox Jumps Over The Lazy Dog"));
   sampleEdit->setMinimumHeight( sampleEdit->fontMetrics().lineSpacing() );
-  sampleEdit->tqsetAlignment(Qt::AlignCenter);
+  sampleEdit->setAlignment(Qt::AlignCenter);
   gridLayout->addMultiCellWidget(sampleEdit, 4, 4, 0, 2);
   TQString sampleEditWhatsThisText =
     i18n("This sample text illustrates the current settings. "
@@ -331,8 +331,8 @@ KFontChooser::KFontChooser(TQWidget *parent, const char *name,
     setSizeIsRelative( *sizeIsRelativeState );
 
   KConfig *config = KGlobal::config();
-  KConfigGroupSaver saver(config, TQString::tqfromLatin1("General"));
-  showXLFDArea(config->readBoolEntry(TQString::tqfromLatin1("fontSelectorShowXLFD"), false));
+  KConfigGroupSaver saver(config, TQString::fromLatin1("General"));
+  showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false));
 }
 
 KFontChooser::~KFontChooser()
@@ -403,9 +403,9 @@ TQButton::ToggleState KFontChooser::sizeIsRelative() const
        : TQButton::NoChange;
 }
 
-TQSize KFontChooser::tqsizeHint( void ) const
+TQSize KFontChooser::sizeHint( void ) const
 {
-  return tqminimumSizeHint();
+  return minimumSizeHint();
 }
 
 
@@ -469,13 +469,13 @@ void KFontChooser::family_chosen_slot(const TQString& family)
     currentStyles.clear();
     for ( TQStringList::Iterator it = styles.begin(); it != styles.end(); ++it ) {
         TQString style = *it;
-        int pos = style.tqfind("Plain");
-        if(pos >=0) style = style.tqreplace(pos,5,i18n("Regular"));
-        pos = style.tqfind("Normal");
-        if(pos >=0) style = style.tqreplace(pos,6,i18n("Regular"));
-        pos = style.tqfind("Oblique");
-        if(pos >=0) style = style.tqreplace(pos,7,i18n("Italic"));
-        if(!styleListBox->tqfindItem(style)) {
+        int pos = style.find("Plain");
+        if(pos >=0) style = style.replace(pos,5,i18n("Regular"));
+        pos = style.find("Normal");
+        if(pos >=0) style = style.replace(pos,6,i18n("Regular"));
+        pos = style.find("Oblique");
+        if(pos >=0) style = style.replace(pos,7,i18n("Italic"));
+        if(!styleListBox->findItem(style)) {
             styleListBox->insertItem(i18n(style.utf8()));
             currentStyles.insert(i18n(style.utf8()), *it);
         }
@@ -486,9 +486,9 @@ void KFontChooser::family_chosen_slot(const TQString& family)
     }
 
     styleListBox->blockSignals(true);
-    TQListBoxItem *item = styleListBox->tqfindItem(selectedStyle);
+    TQListBoxItem *item = styleListBox->findItem(selectedStyle);
     if (item)
-       styleListBox->setSelected(styleListBox->tqfindItem(selectedStyle), true);
+       styleListBox->setSelected(styleListBox->findItem(selectedStyle), true);
     else
        styleListBox->setSelected(0, true);
     styleListBox->blockSignals(false);
@@ -538,7 +538,7 @@ void KFontChooser::style_chosen_slot(const TQString& style)
             fillSizeList();
     }
     sizeListBox->blockSignals(true);
-    sizeListBox->setSelected(sizeListBox->tqfindItem(TQString::number(selectedSize)), true);
+    sizeListBox->setSelected(sizeListBox->findItem(TQString::number(selectedSize)), true);
     sizeListBox->blockSignals(false);
     sizeListBox->ensureCurrentVisible();
 
@@ -585,9 +585,9 @@ void KFontChooser::setupDisplay()
   // 1st Fallback
   if ( (i == numEntries) )
   {
-    if (family.tqcontains('['))
+    if (family.contains('['))
     {
-      family = family.left(family.tqfind('[')).stripWhiteSpace();
+      family = family.left(family.find('[')).stripWhiteSpace();
       for (i = 0; i < numEntries; i++) {
         if (family == familyListBox->text(i).lower()) {
           familyListBox->setCurrentItem(i);
@@ -681,13 +681,13 @@ void KFontChooser::addFont( TQStringList &list, const char *xfont )
   if ( !ptr )
     return;
 
-  TQString font = TQString::tqfromLatin1(ptr + 1);
+  TQString font = TQString::fromLatin1(ptr + 1);
 
   int pos;
-  if ( ( pos = font.tqfind( '-' ) ) > 0 ) {
+  if ( ( pos = font.find( '-' ) ) > 0 ) {
     font.truncate( pos );
 
-    if ( font.tqfind( TQString::tqfromLatin1("open look"), 0, false ) >= 0 )
+    if ( font.find( TQString::fromLatin1("open look"), 0, false ) >= 0 )
       return;
 
     TQStringList::Iterator it = list.begin();
@@ -711,11 +711,11 @@ void KFontChooser::showXLFDArea(bool show)
 {
   if( show )
   {
-    xlfdEdit->tqparentWidget()->show();
+    xlfdEdit->parentWidget()->show();
   }
   else
   {
-    xlfdEdit->tqparentWidget()->hide();
+    xlfdEdit->parentWidget()->hide();
   }
 }
 
diff --git a/kdeui/kfontdialog.h b/kdeui/kfontdialog.h
index 7eea713b7..266090c37 100644
--- a/kdeui/kfontdialog.h
+++ b/kdeui/kfontdialog.h
@@ -139,7 +139,7 @@ public:
   void setFont( const TQFont &font, bool onlyFixed = false );
 
   /**
-   * @return The bittqmask corresponding to the attributes the user
+   * @return The bitmask corresponding to the attributes the user
    *         wishes to change.
    */
   int fontDiffFlags();
@@ -252,7 +252,7 @@ public:
   /**
    * Reimplemented for internal reasons.
    */
-  virtual TQSize tqsizeHint( void ) const;
+  virtual TQSize sizeHint( void ) const;
 
 signals:
   /**
@@ -431,8 +431,8 @@ public:
    * @param theFont a reference to the font to write the chosen font
    *        into.
    * @param diffFlags a reference to the int into which the chosen
-   *        difference selection bittqmask should be written.
-   *        Check the returned bittqmask like:
+   *        difference selection bitmask should be written.
+   *        Check the returned bitmask like:
    *        \code
    *        if ( diffFlags & KFontChooser::FontDiffFamily )
    *            [...]
diff --git a/kdeui/kfontrequester.cpp b/kdeui/kfontrequester.cpp
index 13b3ffbcf..293f9d546 100644
--- a/kdeui/kfontrequester.cpp
+++ b/kdeui/kfontrequester.cpp
@@ -32,7 +32,7 @@ KFontRequester::KFontRequester( TQWidget *parent, const char *name,
     bool onlyFixed ) : TQWidget( parent, name ),
     m_onlyFixed( onlyFixed )
 {
-  TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 0, KDialog::spacingHint() );
+  TQHBoxLayout *layout = new TQHBoxLayout( this, 0, KDialog::spacingHint() );
 
   m_sampleLabel = new TQLabel( this, "m_sampleLabel" );
   m_button = new TQPushButton( i18n( "Choose..." ), this, "m_button" );
@@ -40,8 +40,8 @@ KFontRequester::KFontRequester( TQWidget *parent, const char *name,
   m_sampleLabel->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
   setFocusProxy( m_button );
 
-  tqlayout->addWidget( m_sampleLabel, 1 );
-  tqlayout->addWidget( m_button );
+  layout->addWidget( m_sampleLabel, 1 );
+  layout->addWidget( m_button );
 
   connect( m_button, TQT_SIGNAL( clicked() ), TQT_SLOT( buttonClicked() ) );
 
@@ -72,7 +72,7 @@ void KFontRequester::setTitle( const TQString &title )
 
 void KFontRequester::buttonClicked()
 {
-  int result = KFontDialog::getFont( m_selFont, m_onlyFixed, tqparentWidget() );
+  int result = KFontDialog::getFont( m_selFont, m_onlyFixed, parentWidget() );
 
   if ( result == KDialog::Accepted )
   {
diff --git a/kdeui/kguiitem.cpp b/kdeui/kguiitem.cpp
index abcc3868a..7b73c7401 100644
--- a/kdeui/kguiitem.cpp
+++ b/kdeui/kguiitem.cpp
@@ -135,7 +135,7 @@ TQString KGuiItem::plainText() const
     int resultLength = 0;
     stripped.setLength(len);
 
-    const TQChar* data    = d->m_text.tqunicode();
+    const TQChar* data    = d->m_text.unicode();
     for ( int pos = 0; pos < len; ++pos )
     {
         if ( data[ pos ] != '&' )
diff --git a/kdeui/khelpmenu.cpp b/kdeui/khelpmenu.cpp
index 20be799b6..c6557f044 100644
--- a/kdeui/khelpmenu.cpp
+++ b/kdeui/khelpmenu.cpp
@@ -118,7 +118,7 @@ KPopupMenu* KHelpMenu::menu()
     // compatible.
     //
     const KAboutData *aboutData = d->mAboutData ? d->mAboutData : KGlobal::instance()->aboutData();
-    TQString appName = (aboutData)? aboutData->programName() : TQString::tqfromLatin1(tqApp->name());
+    TQString appName = (aboutData)? aboutData->programName() : TQString::fromLatin1(qApp->name());
 
     mMenu = new KPopupMenu();
     connect( mMenu, TQT_SIGNAL(destroyed()), this, TQT_SLOT(menuDestroyed()));
@@ -306,7 +306,7 @@ void KHelpMenu::contextHelpActivated()
   TQWhatsThis::enterWhatsThisMode();
   TQWidget* w = TQApplication::widgetAt( TQCursor::pos(), true );
   while ( w && !w->isTopLevel() && !w->inherits("QXEmbed")  )
-      w = w->tqparentWidget();
+      w = w->parentWidget();
 #ifdef Q_WS_X11
    if ( w && w->inherits("QXEmbed") )
 	  (( QXEmbed*) w )->enterWhatsThisMode();
diff --git a/kdeui/khelpmenu.h b/kdeui/khelpmenu.h
index 331ef0875..fdece6510 100644
--- a/kdeui/khelpmenu.h
+++ b/kdeui/khelpmenu.h
@@ -128,7 +128,7 @@ class KHelpMenuPrivate;
  * @author Espen Sand (espen@kde.org)
  */
 
-class KDEUI_EXPORT KHelpMenu : public TQObject
+class KDEUI_EXPORT KHelpMenu : public QObject
 {
   Q_OBJECT
 
diff --git a/kdeui/kiconview.cpp b/kdeui/kiconview.cpp
index 102fb3cc4..13b6183ad 100644
--- a/kdeui/kiconview.cpp
+++ b/kdeui/kiconview.cpp
@@ -49,7 +49,7 @@ public:
     KIconView::Mode mode;
     bool doAutoSelect;
     TQFontMetrics *fm;
-    TQPixmapCache tqmaskCache;
+    TQPixmapCache maskCache;
     int textHeight;
     TQIconViewItem *dragHoldItem;
     TQTimer dragHoldTimer;
@@ -186,7 +186,7 @@ void KIconView::slotAutoSelect()
       bool update = viewport()->isUpdatesEnabled();
       viewport()->setUpdatesEnabled( false );
 
-      //Calculate the smallest rectangle that tqcontains the current Item
+      //Calculate the smallest rectangle that contains the current Item
       //and the one that got the autoselect event
       TQRect r;
       TQRect redraw;
@@ -217,7 +217,7 @@ void KIconView::slotAutoSelect()
 
       blockSignals( block );
       viewport()->setUpdatesEnabled( update );
-      tqrepaintContents( redraw, false );
+      repaintContents( redraw, false );
 
       emit selectionChanged();
 
@@ -258,7 +258,7 @@ void KIconView::emitExecute( TQIconViewItem *item, const TQPoint &pos )
 
 void KIconView::updateDragHoldItem( TQDropEvent *e )
 {
-  TQIconViewItem *item = tqfindItem( e->pos() );
+  TQIconViewItem *item = findItem( e->pos() );
 
   if ( d->dragHoldItem != item)
   {
@@ -307,7 +307,7 @@ void KIconView::contentsMouseDoubleClickEvent ( TQMouseEvent * e )
 {
   TQIconView::contentsMouseDoubleClickEvent( e );
 
-  TQIconViewItem* item = tqfindItem( e->pos() );
+  TQIconViewItem* item = findItem( e->pos() );
 
   if( item ) {
     if( (e->button() == LeftButton) && !m_bUseSingle )
@@ -417,10 +417,10 @@ TQFontMetrics *KIconView::itemFontMetrics() const
 TQPixmap KIconView::selectedIconPixmap( TQPixmap *pix, const TQColor &col ) const
 {
     TQPixmap m;
-    if ( d->tqmaskCache.tqfind( TQString::number( pix->serialNumber() ), m ) )
+    if ( d->maskCache.find( TQString::number( pix->serialNumber() ), m ) )
 	return m;
     m = KPixmapEffect::selectedPixmap( KPixmap(*pix), col );
-    d->tqmaskCache.insert( TQString::number( pix->serialNumber() ), m );
+    d->maskCache.insert( TQString::number( pix->serialNumber() ), m );
     return m;
 }
 
@@ -485,7 +485,7 @@ void KIconViewItem::calcRect( const TQString& text_ )
     KIconView *view = static_cast<KIconView *>(iconView());
     TQRect itemIconRect = pixmapRect();
     TQRect itemTextRect = textRect();
-    TQRect tqitemRect = rect();
+    TQRect itemRect = rect();
 
     int pw = 0;
     int ph = 0;
@@ -507,9 +507,9 @@ void KIconViewItem::calcRect( const TQString& text_ )
     itemIconRect.setWidth( pw );
 #if 1 // FIXME 
     // There is a bug in Qt which prevents the item from being placed
-    // properly when the pixmapRect is not at the top of the tqitemRect, so we
+    // properly when the pixmapRect is not at the top of the itemRect, so we
     // have to increase the height of the pixmapRect and leave it at the top
-    // of the tqitemRect...
+    // of the itemRect...
     if ( d && !d->m_pixmapSize.isNull() )
         itemIconRect.setHeight( d->m_pixmapSize.height() + 2 );
     else
@@ -574,8 +574,8 @@ void KIconViewItem::calcRect( const TQString& text_ )
             h = itemTextRect.height() + itemIconRect.height() + 1;
         }
 
-        tqitemRect.setWidth( w );
-        tqitemRect.setHeight( h );
+        itemRect.setWidth( w );
+        itemRect.setHeight( h );
         int width = QMAX( w, TQApplication::globalStrut().width() ); // see TQIconViewItem::width()
         int height = QMAX( h, TQApplication::globalStrut().height() ); // see TQIconViewItem::height()
         itemTextRect = TQRect( ( width - itemTextRect.width() ) / 2, height - itemTextRect.height(),
@@ -597,8 +597,8 @@ void KIconViewItem::calcRect( const TQString& text_ )
             h = QMAX( itemTextRect.height(), itemIconRect.height() );
         w = itemTextRect.width() + itemIconRect.width() + 1;
 
-        tqitemRect.setWidth( w );
-        tqitemRect.setHeight( h );
+        itemRect.setWidth( w );
+        itemRect.setHeight( h );
         int width = QMAX( w, TQApplication::globalStrut().width() ); // see TQIconViewItem::width()
         int height = QMAX( h, TQApplication::globalStrut().height() ); // see TQIconViewItem::height()
 
@@ -621,8 +621,8 @@ void KIconViewItem::calcRect( const TQString& text_ )
         setPixmapRect( itemIconRect );
     if ( itemTextRect != textRect() )
         setTextRect( itemTextRect );
-    if ( tqitemRect != rect() )
-        setItemRect( tqitemRect );
+    if ( itemRect != rect() )
+        setItemRect( itemRect );
 
     // Done by setPixmapRect, setTextRect and setItemRect !  [and useless if no rect changed]
     //view->updateItemContainer( this );
@@ -680,7 +680,7 @@ void KIconViewItem::paintPixmap( TQPainter *p, const TQColorGroup &cg )
 
 #if 1 // FIXME 
         // Move the pixmap manually because the pixmapRect is at the
-        // top of the tqitemRect
+        // top of the itemRect
         // (won't be needed anymore in future versions of qt)
         if ( d && !d->m_pixmapSize.isNull() )
         {
diff --git a/kdeui/kiconview.h b/kdeui/kiconview.h
index 0f6096ac9..0b0c49515 100644
--- a/kdeui/kiconview.h
+++ b/kdeui/kiconview.h
@@ -247,10 +247,10 @@ public:
 
    /**
     * Using this function, you can specify a custom size for the pixmap. The
-    * tqgeometry of the item will be calculated to let a pixmap of the given size
+    * geometry of the item will be calculated to let a pixmap of the given size
     * fit in the iconView without needing an update.
     * This may be useful if you want to change the pixmap later without breaking
-    * the tqlayout. A possible use of this function is to tqreplace a fileItem icon
+    * the layout. A possible use of this function is to replace a fileItem icon
     * by a larger pixmap (preview).
     * @since 3.3
     *
diff --git a/kdeui/kiconviewsearchline.cpp b/kdeui/kiconviewsearchline.cpp
index 1ee76c9df..701e15428 100644
--- a/kdeui/kiconviewsearchline.cpp
+++ b/kdeui/kiconviewsearchline.cpp
@@ -224,7 +224,7 @@ bool KIconViewSearchLine::itemMatches( const TQIconViewItem *item,
     return false;
 
   TQString itemtext = item->text();
-  return ( itemtext.tqfind( s, 0, caseSensitive() ) >= 0 );
+  return ( itemtext.find( s, 0, caseSensitive() ) >= 0 );
 }
 
 void KIconViewSearchLine::init( TQIconView *iconView )
diff --git a/kdeui/kinputdialog.cpp b/kdeui/kinputdialog.cpp
index af88b922e..37f94e89e 100644
--- a/kdeui/kinputdialog.cpp
+++ b/kdeui/kinputdialog.cpp
@@ -52,30 +52,30 @@ KInputDialogPrivate::KInputDialogPrivate()
 
 KInputDialog::KInputDialog( const TQString &caption, const TQString &label,
     const TQString &value, TQWidget *parent, const char *name,
-    TQValidator *validator, const TQString &tqmask )
+    TQValidator *validator, const TQString &mask )
     : KDialogBase( parent, name, true, caption, Ok|Cancel|User1, Ok, true,
     KStdGuiItem::clear() ),
     d( new KInputDialogPrivate() )
 {
   TQFrame *frame = makeMainWidget();
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( frame, 0, spacingHint() );
+  TQVBoxLayout *layout = new TQVBoxLayout( frame, 0, spacingHint() );
 
   d->m_label = new TQLabel( label, frame );
-  tqlayout->addWidget( d->m_label );
+  layout->addWidget( d->m_label );
 
   d->m_lineEdit = new KLineEdit( value, frame );
-  tqlayout->addWidget( d->m_lineEdit );
+  layout->addWidget( d->m_lineEdit );
 
   d->m_lineEdit->setFocus();
   d->m_label->setBuddy( d->m_lineEdit );
 
-  tqlayout->addStretch();
+  layout->addStretch();
 
   if ( validator )
     d->m_lineEdit->setValidator( validator );
 
-  if ( !tqmask.isEmpty() )
-    d->m_lineEdit->setInputMask( tqmask );
+  if ( !mask.isEmpty() )
+    d->m_lineEdit->setInputMask( mask );
 
   connect( d->m_lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
       TQT_SLOT( slotEditTextChanged( const TQString & ) ) );
@@ -92,15 +92,15 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label,
     d( new KInputDialogPrivate() )
 {
   TQFrame *frame = makeMainWidget();
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( frame, 0, spacingHint() );
+  TQVBoxLayout *layout = new TQVBoxLayout( frame, 0, spacingHint() );
 
   d->m_label = new TQLabel( label, frame );
-  tqlayout->addWidget( d->m_label );
+  layout->addWidget( d->m_label );
 
   d->m_textEdit = new KTextEdit( frame );
   d->m_textEdit->setTextFormat( PlainText );
   d->m_textEdit->setText( value );
-  tqlayout->addWidget( d->m_textEdit, 10 );
+  layout->addWidget( d->m_textEdit, 10 );
 
   d->m_textEdit->setFocus();
   d->m_label->setBuddy( d->m_textEdit );
@@ -117,16 +117,16 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label,
     d( new KInputDialogPrivate() )
 {
   TQFrame *frame = makeMainWidget();
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( frame, 0, spacingHint() );
+  TQVBoxLayout *layout = new TQVBoxLayout( frame, 0, spacingHint() );
 
   d->m_label = new TQLabel( label, frame );
-  tqlayout->addWidget( d->m_label );
+  layout->addWidget( d->m_label );
 
   d->m_intSpinBox = new KIntSpinBox( minValue, maxValue, step, value,
       base, frame );
-  tqlayout->addWidget( d->m_intSpinBox );
+  layout->addWidget( d->m_intSpinBox );
 
-  tqlayout->addStretch();
+  layout->addStretch();
 
   d->m_intSpinBox->setFocus();
   setMinimumWidth( 300 );
@@ -139,16 +139,16 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label,
     d( new KInputDialogPrivate() )
 {
   TQFrame *frame = makeMainWidget();
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( frame, 0, spacingHint() );
+  TQVBoxLayout *layout = new TQVBoxLayout( frame, 0, spacingHint() );
 
   d->m_label = new TQLabel( label, frame );
-  tqlayout->addWidget( d->m_label );
+  layout->addWidget( d->m_label );
 
   d->m_doubleSpinBox = new KDoubleSpinBox( minValue, maxValue, step, value,
       decimals, frame );
-  tqlayout->addWidget( d->m_doubleSpinBox );
+  layout->addWidget( d->m_doubleSpinBox );
 
-  tqlayout->addStretch();
+  layout->addStretch();
 
   d->m_doubleSpinBox->setFocus();
   setMinimumWidth( 300 );
@@ -164,17 +164,17 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label,
   showButton( User1, editable );
 
   TQFrame *frame = makeMainWidget();
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( frame, 0, spacingHint() );
+  TQVBoxLayout *layout = new TQVBoxLayout( frame, 0, spacingHint() );
 
   d->m_label = new TQLabel( label, frame );
-  tqlayout->addWidget( d->m_label );
+  layout->addWidget( d->m_label );
 
   if ( editable )
   {
     d->m_comboBox = new KComboBox( editable, frame );
     d->m_comboBox->insertStringList( list );
     d->m_comboBox->setCurrentItem( current );
-    tqlayout->addWidget( d->m_comboBox );
+    layout->addWidget( d->m_comboBox );
 
     connect( d->m_comboBox, TQT_SIGNAL( textChanged( const TQString & ) ),
       TQT_SLOT( slotUpdateButtons( const TQString & ) ) );
@@ -187,7 +187,7 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label,
     d->m_listBox->insertStringList( list );
     d->m_listBox->setSelected( current, true );
     d->m_listBox->ensureCurrentVisible();
-    tqlayout->addWidget( d->m_listBox, 10 );
+    layout->addWidget( d->m_listBox, 10 );
     connect( d->m_listBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ),
       TQT_SLOT( slotOk() ) );
     connect( d->m_listBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ),
@@ -196,7 +196,7 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label,
     d->m_listBox->setFocus();
   }
 
-  tqlayout->addStretch();
+  layout->addStretch();
 
   setMinimumWidth( 320 );
 }
@@ -208,14 +208,14 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label,
     d( new KInputDialogPrivate() )
 {
   TQFrame *frame = makeMainWidget();
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( frame, 0, spacingHint() );
+  TQVBoxLayout *layout = new TQVBoxLayout( frame, 0, spacingHint() );
 
   d->m_label = new TQLabel( label, frame );
-  tqlayout->addWidget( d->m_label );
+  layout->addWidget( d->m_label );
 
   d->m_listBox = new KListBox( frame );
   d->m_listBox->insertStringList( list );
-  tqlayout->addWidget( d->m_listBox );
+  layout->addWidget( d->m_listBox );
 
   TQListBoxItem *item;
 
@@ -225,7 +225,7 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label,
 
     for ( TQStringList::ConstIterator it=select.begin(); it!=select.end(); ++it )
     {
-      item = d->m_listBox->tqfindItem( *it, CaseSensitive|ExactMatch );
+      item = d->m_listBox->findItem( *it, CaseSensitive|ExactMatch );
       if ( item )
         d->m_listBox->setSelected( item, true );
     }
@@ -238,7 +238,7 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label,
       TQT_SLOT( slotOk() ) );
 
     TQString text = select.first();
-    item = d->m_listBox->tqfindItem( text, CaseSensitive|ExactMatch );
+    item = d->m_listBox->findItem( text, CaseSensitive|ExactMatch );
     if ( item )
       d->m_listBox->setSelected( item, true );
   }
@@ -246,7 +246,7 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label,
   d->m_listBox->ensureCurrentVisible();
   d->m_listBox->setFocus();
 
-  tqlayout->addStretch();
+  layout->addStretch();
 
   setMinimumWidth( 320 );
 }
@@ -258,18 +258,18 @@ KInputDialog::~KInputDialog()
 
 TQString KInputDialog::getText( const TQString &caption, const TQString &label,
     const TQString &value, bool *ok, TQWidget *parent, const char *name,
-    TQValidator *validator, const TQString &tqmask )
+    TQValidator *validator, const TQString &mask )
 {
-  return text( caption, label, value, ok, parent, name, validator, tqmask,
+  return text( caption, label, value, ok, parent, name, validator, mask,
                TQString::null );
 }
 
 TQString KInputDialog::text( const TQString &caption,
     const TQString &label, const TQString &value, bool *ok, TQWidget *parent,
-    const char *name, TQValidator *validator, const TQString &tqmask,
+    const char *name, TQValidator *validator, const TQString &mask,
     const TQString &whatsThis )
 {
-  KInputDialog dlg( caption, label, value, parent, name, validator, tqmask );
+  KInputDialog dlg( caption, label, value, parent, name, validator, mask );
 
   if( !whatsThis.isEmpty() )
     TQWhatsThis::add( dlg.lineEdit(), whatsThis );
diff --git a/kdeui/kinputdialog.h b/kdeui/kinputdialog.h
index 3228545a0..c675a280c 100644
--- a/kdeui/kinputdialog.h
+++ b/kdeui/kinputdialog.h
@@ -57,7 +57,7 @@ class KDEUI_EXPORT KInputDialog : public KDialogBase
      */
     KInputDialog( const TQString &caption, const TQString &label,
       const TQString &value, TQWidget *parent, const char *name,
-      TQValidator *validator, const TQString &tqmask );
+      TQValidator *validator, const TQString &mask );
     KInputDialog( const TQString &caption, const TQString &label,
       const TQString &value, TQWidget *parent, const char *name );
     KInputDialog( const TQString &caption, const TQString &label, int value,
@@ -111,15 +111,15 @@ class KDEUI_EXPORT KInputDialog : public KDialogBase
      * @param parent    Parent of the dialog widget
      * @param name      Name of the dialog widget
      * @param validator A @ref TQValidator to be associated with the line edit
-     * @param tqmask      Mask associated with the line edit. See the
-     *                  documentation for @ref TQLineEdit about tqmasks.
+     * @param mask      Mask associated with the line edit. See the
+     *                  documentation for @ref TQLineEdit about masks.
      *
      * @return String user entered if Ok was pressed, else a null string
      */
     static TQString getText( const TQString &caption, const TQString &label,
         const TQString &value=TQString::null, bool *ok=0, TQWidget *parent=0,
         const char *name=0, TQValidator *validator=0,
-        const TQString &tqmask=TQString::null );
+        const TQString &mask=TQString::null );
 
     /** 
      * Same as @ref getText except it provides an extra parameter to specify 
@@ -132,7 +132,7 @@ class KDEUI_EXPORT KInputDialog : public KDialogBase
     static TQString text( const TQString &caption, const TQString &label, 
         const TQString &value=TQString::null, bool *ok=0, TQWidget *parent=0, 
         const char *name=0, TQValidator *validator=0,
-        const TQString &tqmask=TQString::null,
+        const TQString &mask=TQString::null,
         const TQString& whatsThis=TQString::null );
 
     /**
diff --git a/kdeui/kjanuswidget.cpp b/kdeui/kjanuswidget.cpp
index 865aea170..4fb398395 100644
--- a/kdeui/kjanuswidget.cpp
+++ b/kdeui/kjanuswidget.cpp
@@ -373,7 +373,7 @@ void KJanusWidget::InsertTreeListItem(const TQStringList &items, const TQPixmap
     }
 
     // Now search for a child with the current Name, and if it we doesn't
-    // tqfind it, then remember the location of the last child.
+    // find it, then remember the location of the last child.
     for (last = 0; child && child->text(0) != name ; last = child, child = child->nextSibling());
 
     if (!last && !child) {
@@ -397,7 +397,7 @@ void KJanusWidget::InsertTreeListItem(const TQStringList &items, const TQPixmap
       }
     }
     else {
-      // the node had some children, but we didn't tqfind the given name
+      // the node had some children, but we didn't find the given name
       if (isTop)
         newChild = new TQListViewItem(mTreeList, last, name);
       else
@@ -413,7 +413,7 @@ void KJanusWidget::InsertTreeListItem(const TQStringList &items, const TQPixmap
       curPath << name;
 
       TQString key = curPath.join("_/_");
-      if (mFolderIconMap.tqcontains(key)) {
+      if (mFolderIconMap.contains(key)) {
         TQPixmap p = mFolderIconMap[key];
         newChild->setPixmap(0,p);
       }
@@ -459,8 +459,8 @@ void KJanusWidget::addPageWidget( TQFrame *page, const TQStringList &items,
       TQString itemName = items.last();
       IconListItem *item = new IconListItem( mIconList, pixmap, itemName );
       mIconListToPageStack.insert(item, page);
-      mIconList->tqinvalidateHeight();
-      mIconList->tqinvalidateWidth();
+      mIconList->invalidateHeight();
+      mIconList->invalidateWidth();
 
       if (mIconList->isVisible())
         mIconList->updateWidth();
@@ -506,9 +506,9 @@ bool KJanusWidget::setSwallowedWidget( TQWidget *widget )
   }
 
   //
-  // Remove current tqlayout and make a new.
+  // Remove current layout and make a new.
   //
-  delete mSwallowPage->tqlayout();
+  delete mSwallowPage->layout();
 
   TQGridLayout *gbox = new TQGridLayout( mSwallowPage, 1, 1, 0 );
 
@@ -542,7 +542,7 @@ bool KJanusWidget::setSwallowedWidget( TQWidget *widget )
     }
     gbox->addWidget(widget, 0, 0 );
     gbox->activate();
-    mSwallowPage->setMinimumSize( widget->tqminimumSize() );
+    mSwallowPage->setMinimumSize( widget->minimumSize() );
   }
 
   return true;
@@ -686,7 +686,7 @@ int KJanusWidget::pageIndex( TQWidget *widget ) const
     //
     if( widget->isA("TQFrame") )
     {
-      return d->mPageToInt[widget->tqparentWidget()];
+      return d->mPageToInt[widget->parentWidget()];
     }
     else
     {
@@ -714,8 +714,8 @@ void KJanusWidget::slotFontChanged()
     TQFont listFont( mIconList->font() );
     listFont.setBold( true );
     mIconList->setFont( listFont );
-    mIconList->tqinvalidateHeight();
-    mIconList->tqinvalidateWidth();
+    mIconList->invalidateHeight();
+    mIconList->invalidateWidth();
   }
 }
 
@@ -758,31 +758,31 @@ void KJanusWidget::setFocus()
 }
 
 
-TQSize KJanusWidget::tqminimumSizeHint() const
+TQSize KJanusWidget::minimumSizeHint() const
 {
   if( mFace == TreeList || mFace == IconList )
   {
     TQSize s1( KDialog::spacingHint(), KDialog::spacingHint()*2 );
     TQSize s2(0,0);
     TQSize s3(0,0);
-    TQSize s4( mPageStack->tqsizeHint() );
+    TQSize s4( mPageStack->sizeHint() );
 
     if( mFace == TreeList )
     {
-      s1.rwidth() += style().tqpixelMetric( TQStyle::PM_SplitterWidth );
-      s2 = mTreeList->tqminimumSize();
+      s1.rwidth() += style().pixelMetric( TQStyle::PM_SplitterWidth );
+      s2 = mTreeList->minimumSize();
     }
     else
     {
       mIconList->updateMinimumHeight();
       mIconList->updateWidth();
-      s2 = mIconList->tqminimumSize();
+      s2 = mIconList->minimumSize();
     }
 
     if( mTitleLabel->isVisible() )
     {
-      s3 += mTitleLabel->tqsizeHint();
-      s3.rheight() += mTitleSep->tqminimumSize().height();
+      s3 += mTitleLabel->sizeHint();
+      s3.rheight() += mTitleSep->minimumSize().height();
     }
 
     //
@@ -795,15 +795,15 @@ TQSize KJanusWidget::tqminimumSizeHint() const
   }
   else if( mFace == Tabbed )
   {
-    return mTabControl->tqsizeHint();
+    return mTabControl->sizeHint();
   }
   else if( mFace == Swallow )
   {
-    return mSwallowPage->tqminimumSize();
+    return mSwallowPage->minimumSize();
   }
   else if( mFace == Plain )
   {
-    return mPlainPage->tqsizeHint();
+    return mPlainPage->sizeHint();
   }
   else
   {
@@ -813,9 +813,9 @@ TQSize KJanusWidget::tqminimumSizeHint() const
 }
 
 
-TQSize KJanusWidget::tqsizeHint() const
+TQSize KJanusWidget::sizeHint() const
 {
-  return tqminimumSizeHint();
+  return minimumSizeHint();
 }
 
 
@@ -914,7 +914,7 @@ bool KJanusWidget::eventFilter( TQObject *o, TQEvent *e )
     if( item )
     {
       int lw = item->width( mIconList );
-      int sw = mIconList->verticalScrollBar()->tqsizeHint().width();
+      int sw = mIconList->verticalScrollBar()->sizeHint().width();
       mIconList->setFixedWidth( lw+sw+mIconList->frameWidth()*2 );
     }
   }
@@ -978,7 +978,7 @@ void KJanusWidget::IconListBox::updateWidth()
 
     if( verticalScrollBar()->isVisible() )
     {
-      maxWidth += verticalScrollBar()->tqsizeHint().width();
+      maxWidth += verticalScrollBar()->sizeHint().width();
     }
 
     setFixedWidth( maxWidth + frameWidth()*2 );
@@ -987,13 +987,13 @@ void KJanusWidget::IconListBox::updateWidth()
 }
 
 
-void KJanusWidget::IconListBox::tqinvalidateHeight()
+void KJanusWidget::IconListBox::invalidateHeight()
 {
   mHeightValid = false;
 }
 
 
-void KJanusWidget::IconListBox::tqinvalidateWidth()
+void KJanusWidget::IconListBox::invalidateWidth()
 {
   mWidthValid = false;
 }
@@ -1074,13 +1074,13 @@ void KJanusWidget::IconListItem::highlight( bool erase )
    // For now, always disable highlighting
    erase = true;
 
-   TQRect r = listBox()->tqitemRect( this );
+   TQRect r = listBox()->itemRect( this );
    r.addCoords( 1, 1, -1, -1 );
 
    TQPainter p( listBox()->viewport() );
    p.setClipRegion( r );
 
-   const TQColorGroup &cg = listBox()->tqcolorGroup();
+   const TQColorGroup &cg = listBox()->colorGroup();
    if ( erase )
    {
       p.setPen( cg.base() );
@@ -1114,14 +1114,14 @@ const TQPixmap &KJanusWidget::IconListItem::defaultPixmap()
     p.drawRect ( 0, 0, pix->width(), pix->height() );
     p.end();
 
-    TQBitmap tqmask( pix->width(), pix->height(), true );
-    tqmask.fill( Qt::black );
-    p.begin( &tqmask );
+    TQBitmap mask( pix->width(), pix->height(), true );
+    mask.fill( Qt::black );
+    p.begin( &mask );
     p.setPen( Qt::white );
     p.drawRect ( 0, 0, pix->width(), pix->height() );
     p.end();
 
-    pix->setMask( tqmask );
+    pix->setMask( mask );
   }
   return *pix;
 }
@@ -1129,7 +1129,7 @@ const TQPixmap &KJanusWidget::IconListItem::defaultPixmap()
 
 void KJanusWidget::IconListItem::paint( TQPainter *painter )
 {
-  TQRect itemPaintRegion( listBox()->tqitemRect( this ) );
+  TQRect itemPaintRegion( listBox()->itemRect( this ) );
   TQRect r( 1, 1, itemPaintRegion.width() - 2, itemPaintRegion.height() - 2);
 
   if ( isSelected() )
@@ -1137,7 +1137,7 @@ void KJanusWidget::IconListItem::paint( TQPainter *painter )
     painter->eraseRect( r );
 
     painter->save();
-    painter->setPen( listBox()->tqcolorGroup().highlight().dark( 160 ) );
+    painter->setPen( listBox()->colorGroup().highlight().dark( 160 ) );
     painter->drawRect( r );
     painter->restore();
   }
@@ -1191,7 +1191,7 @@ void KJanusWidget::virtual_hook( int, void* )
 // delete the node.
 void KJanusWidget::removePage( TQWidget *page )
 {
-  if (!d || !d->mPageToInt.tqcontains(page))
+  if (!d || !d->mPageToInt.contains(page))
     return;
 
   int index = d->mPageToInt[page];
@@ -1237,7 +1237,7 @@ void KJanusWidget::removePage( TQWidget *page )
 
 TQString KJanusWidget::pageTitle(int index) const
 {
-  if (!d || !d->mIntToTitle.tqcontains(index))
+  if (!d || !d->mIntToTitle.contains(index))
     return TQString::null;
   else
     return d->mIntToTitle[index];
@@ -1246,7 +1246,7 @@ TQString KJanusWidget::pageTitle(int index) const
 
 TQWidget *KJanusWidget::pageWidget(int index) const
 {
-  if (!d || !d->mIntToPage.tqcontains(index))
+  if (!d || !d->mIntToPage.contains(index))
     return 0;
   else
     return d->mIntToPage[index];
diff --git a/kdeui/kjanuswidget.h b/kdeui/kjanuswidget.h
index 94c50e5c6..cc22dc334 100644
--- a/kdeui/kjanuswidget.h
+++ b/kdeui/kjanuswidget.h
@@ -41,21 +41,21 @@ class TQListViewItem;
 class KGuiItem;
 
 /**
- * @short Easy to use widget with many tqlayouts
+ * @short Easy to use widget with many layouts
  *
- * Provides a number of ready to use tqlayouts (faces). It is used
+ * Provides a number of ready to use layouts (faces). It is used
  * as an internal widget in KDialogBase, but can also used as a
  * widget of its own.
  *
  * This class provides KJanusWidget::TreeList, KJanusWidget::IconList,
- * KJanusWidget::Tabbed, KJanusWidget::Plain and KJanusWidget::Swallow tqlayouts.
+ * KJanusWidget::Tabbed, KJanusWidget::Plain and KJanusWidget::Swallow layouts.
  *
- * For all modes it is important that you specify the TQWidget::tqminimumSize()
+ * For all modes it is important that you specify the TQWidget::minimumSize()
  * on the page, plain widget or the swallowed widget. If you use a QLayout
  * on the page, plain widget or the swallowed widget this will be taken care
  * of automatically. The size is used when the KJanusWidget determines its
  * own minimum size. You get the minimum size by using the
- * tqminimumSizeHint() or tqsizeHint() methods.
+ * minimumSizeHint() or sizeHint() methods.
  *
  * Pages that have been added in TreeList, IconList or Tabbed mode can be
  * removed by simply deleting the page. However, it would be preferable to use
@@ -77,8 +77,8 @@ class KDEUI_EXPORT KJanusWidget : public QWidget
         IconListBox( TQWidget *parent=0, const char *name=0, WFlags f=0 );
 	void updateMinimumHeight();
 	void updateWidth();
-	void tqinvalidateHeight();
-	void tqinvalidateWidth();
+	void invalidateHeight();
+	void invalidateWidth();
 	void setShowAll( bool showAll );
 
       protected:
@@ -98,7 +98,7 @@ class KDEUI_EXPORT KJanusWidget : public QWidget
       /**
        * The TreeList face provides a list in the left area and pages in the
        * right. The area are separated by a movable splitter. The style is somewhat
-       * similar to the tqlayout in the Control Center. A page is raised by
+       * similar to the layout in the Control Center. A page is raised by
        * selecting the corresponding tree list item.
        */
       TreeList = 0,
@@ -106,7 +106,7 @@ class KDEUI_EXPORT KJanusWidget : public QWidget
        * page is similar for creating a TreeList. This has the advantage that if
        * your widget contain too many pages it is trivial to convert it into a
        * TreeList. Just change the face in the KJanusWidget constructor to
-       * KJanusWidget::TreeList and you have a tree list tqlayout instead.
+       * KJanusWidget::TreeList and you have a tree list layout instead.
        */
       Tabbed,
       /**
@@ -126,7 +126,7 @@ class KDEUI_EXPORT KJanusWidget : public QWidget
       /**
        * The IconList face provides an icon list in the left area and pages in the
        * right. For each entry the Icon is on top with the text below. The style
-       * is somewhat similar to the tqlayout of the Eudora configuation dialog box.
+       * is somewhat similar to the layout of the Eudora configuation dialog box.
        * A page is raised by selecting the corresponding icon list item. The
        * preferred icon size is 32x32 pixels.
        */
@@ -186,7 +186,7 @@ class KDEUI_EXPORT KJanusWidget : public QWidget
      *
      * @return The minimum size.
      */
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
     /**
      * Returns the recommended size for the widget in order to be displayed
@@ -194,7 +194,7 @@ class KDEUI_EXPORT KJanusWidget : public QWidget
      *
      * @return The recommended size.
      */
-    virtual TQSize tqsizeHint() const;
+    virtual TQSize sizeHint() const;
 
     /**
      * Returns the empty widget that is available in Plain mode.
@@ -206,7 +206,7 @@ class KDEUI_EXPORT KJanusWidget : public QWidget
     /**
      * Add a new page when the class is used in TreeList, IconList or Tabbed
      * mode. The returned widget is empty and you must add your widgets
-     * as children to this widget. In most cases you must create a tqlayout
+     * as children to this widget. In most cases you must create a layout
      * manager and associate it with this widget as well.
 	 *
 	 * Deleting the returned frame will cause the listitem or tab to be
@@ -246,7 +246,7 @@ class KDEUI_EXPORT KJanusWidget : public QWidget
      * Add a new page when the class is used in TreeList, IconList or Tabbed
      * mode. The returned widget is empty and you must add your widgets
      * as children to this widget. The returned widget is a QVBox
-     * so it tqcontains a TQVBoxLayout tqlayout that lines up the child widgets
+     * so it contains a TQVBoxLayout layout that lines up the child widgets
      * are vertically.
      *
 	 * Deleting the returned frame will cause the listitem or tab to be
@@ -285,7 +285,7 @@ class KDEUI_EXPORT KJanusWidget : public QWidget
      * Add a new page when the class is used in TreeList, IconList or Tabbed
      * mode. The returned widget is empty and you must add your widgets
      * as children to this widget. The returned widget is a QHBox
-     * so it tqcontains a TQHBoxLayout tqlayout that lines up the child widgets
+     * so it contains a TQHBoxLayout layout that lines up the child widgets
      * are horizontally.
      *
      * Deleting the returned frame will cause the listitem or tab to be
@@ -325,7 +325,7 @@ class KDEUI_EXPORT KJanusWidget : public QWidget
      * Add a new page when the class is used in either TreeList or Tabbed
      * mode. The returned widget is empty and you must add your widgets
      * as children to this widget. The returned widget is a QGrid
-     * so it tqcontains a TQGridLayout tqlayout that places up the child widgets
+     * so it contains a TQGridLayout layout that places up the child widgets
      * in a grid.
      *
      * Deleting the returned frame will cause the listitem or tab to be
diff --git a/kdeui/kkeybutton.cpp b/kdeui/kkeybutton.cpp
index 5ac9dd360..581d7bf40 100644
--- a/kdeui/kkeybutton.cpp
+++ b/kdeui/kkeybutton.cpp
@@ -85,7 +85,7 @@ void KKeyButton::setShortcut( const KShortcut& cut, bool bQtShortcut )
 	d->bQtShortcut = bQtShortcut;
 	m_cut = cut;
 	TQString keyStr = m_cut.toString();
-	keyStr.tqreplace('&', TQString::tqfromLatin1("&&"));
+	keyStr.replace('&', TQString::fromLatin1("&&"));
 	setText( keyStr.isEmpty() ? i18n("None") : keyStr );
 }
 
@@ -98,7 +98,7 @@ void KKeyButton::setShortcut( const KShortcut& cut )
 void KKeyButton::setText( const TQString& text )
 {
 	TQPushButton::setText( text );
-	setFixedSize( tqsizeHint().width()+12, tqsizeHint().height()+8 );
+	setFixedSize( sizeHint().width()+12, sizeHint().height()+8 );
 }
 
 void KKeyButton::captureShortcut()
@@ -106,7 +106,7 @@ void KKeyButton::captureShortcut()
 	KShortcut cut;
 
 	m_bEditing = true;
-	tqrepaint();
+	repaint();
 
         {
 	KShortcutDialog dlg( m_cut, d->bQtShortcut, this );
@@ -117,7 +117,7 @@ void KKeyButton::captureShortcut()
 	    emit capturedShortcut( cut );
 
 	m_bEditing = false;
-	tqrepaint();
+	repaint();
 }
 
 void KKeyButton::drawButton( TQPainter *painter )
@@ -146,11 +146,11 @@ void KKeyButton::drawButton( TQPainter *painter )
   painter->setClipping( false );
   if( width() > 12 && height() > 8 )
     qDrawShadePanel( painter, 6, 4, width() - 12, height() - 8,
-                     tqcolorGroup(), true, 1, 0L );
+                     colorGroup(), true, 1, 0L );
   if ( m_bEditing )
   {
-    painter->setPen( tqcolorGroup().base() );
-    painter->setBrush( tqcolorGroup().base() );
+    painter->setPen( colorGroup().base() );
+    painter->setBrush( colorGroup().base() );
   }
   else
   {
@@ -162,7 +162,7 @@ void KKeyButton::drawButton( TQPainter *painter )
 
   drawButtonLabel( painter );
 
-  painter->setPen( tqcolorGroup().text() );
+  painter->setPen( colorGroup().text() );
   painter->setBrush( NoBrush );
   if( hasFocus() || m_bEditing )
   {
diff --git a/kdeui/kkeydialog.cpp b/kdeui/kkeydialog.cpp
index bb228895e..13835b650 100644
--- a/kdeui/kkeydialog.cpp
+++ b/kdeui/kkeydialog.cpp
@@ -301,7 +301,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts )
   //
   // TOP LAYOUT MANAGER
   //
-  // The following tqlayout is used for the dialog
+  // The following layout is used for the dialog
   //            LIST LABELS LAYOUT
   //            SPLIT LIST BOX WIDGET
   //            CHOOSE KEY GROUP BOX WIDGET
@@ -423,7 +423,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts )
   d->pbtnShortcut = new KKeyButton(d->fCArea, "key");
   d->pbtnShortcut->setEnabled( false );
   connect( d->pbtnShortcut, TQT_SIGNAL(capturedShortcut(const KShortcut&)), TQT_SLOT(capturedShortcut(const KShortcut&)) );
-  grid->addRowSpacing( 1, d->pbtnShortcut->tqsizeHint().height() + 5 );
+  grid->addRowSpacing( 1, d->pbtnShortcut->sizeHint().height() + 5 );
 
   wtstr = i18n("Use this button to choose a new shortcut key. Once you click it, "
   		"you can press the key-combination which you would like to be assigned "
@@ -431,7 +431,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts )
   TQWhatsThis::add( d->pbtnShortcut, wtstr );
 
   //
-  // Add widgets to the tqgeometry manager
+  // Add widgets to the geometry manager
   //
   pushLayout->addSpacing( KDialog::spacingHint()*2 );
   pushLayout->addWidget( d->pbtnShortcut );
@@ -439,7 +439,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts )
 
   d->lInfo = new TQLabel(d->fCArea);
   //resize(0,0);
-  //d->lInfo->tqsetAlignment( AlignCenter );
+  //d->lInfo->setAlignment( AlignCenter );
   //d->lInfo->setEnabled( false );
   //d->lInfo->hide();
   grid->addMultiCellWidget( d->lInfo, 2, 2, 0, 3 );
@@ -532,7 +532,7 @@ void KKeyChooser::updateButtons()
 
 		d->pbtnShortcut->setShortcut( pItem->shortcut(), bQtShortcut );
 		//item->setText( 1, keyStrCfg );
-		pItem->tqrepaint();
+		pItem->repaint();
 		d->lInfo->setText( i18n("Default key:") + TQString(" %1").arg(keyStrDef.isEmpty() ? i18n("None") : keyStrDef) );
 
 		// Select the appropriate radio button.
@@ -601,7 +601,7 @@ void KKeyChooser::slotSettingsChanged( int category )
 
 void KKeyChooser::fontChange( const TQFont & )
 {
-        d->fCArea->setMinimumHeight( 4*d->pbtnShortcut->tqsizeHint().height() );
+        d->fCArea->setMinimumHeight( 4*d->pbtnShortcut->sizeHint().height() );
 
         int widget_width = 0;
 
@@ -610,7 +610,7 @@ void KKeyChooser::fontChange( const TQFont & )
 
 // KDE4 IMHO this shouldn't be here at all - it cannot check whether the default
 // shortcut don't conflict with some already changed ones (e.g. global shortcuts).
-// Also, I personally tqfind reseting all shortcuts to default (i.e. hardcoded in the app)
+// Also, I personally find reseting all shortcuts to default (i.e. hardcoded in the app)
 // ones after pressing the 'Default' button rather a misfeature.
 void KKeyChooser::allDefault()
 {
@@ -1010,7 +1010,7 @@ void KKeyChooserItem::setShortcut( const KShortcut& cut )
 {
 	m_cut = cut;
 	m_bModified = (m_cut != m_pList->shortcut(m_iAction));
-	listView()->tqrepaintItem( this );
+	listView()->repaintItem( this );
 }
 
 void KKeyChooserItem::commitChanges()
diff --git a/kdeui/klanguagebutton.cpp b/kdeui/klanguagebutton.cpp
index 5e8f7e330..abbc4f5d3 100644
--- a/kdeui/klanguagebutton.cpp
+++ b/kdeui/klanguagebutton.cpp
@@ -60,12 +60,12 @@ static void checkInsertPos( TQPopupMenu *popup, const TQString & str,
 static TQPopupMenu * checkInsertIndex( TQPopupMenu *popup,
                                       const TQStringList *tags, const TQString &submenu )
 {
-  int pos = tags->tqfindIndex( submenu );
+  int pos = tags->findIndex( submenu );
 
   TQPopupMenu *pi = 0;
   if ( pos != -1 )
   {
-    TQMenuItem *p = popup->tqfindItem( pos );
+    TQMenuItem *p = popup->findItem( pos );
     pi = p ? p->popup() : 0;
   }
   if ( !pi )
@@ -112,8 +112,8 @@ void KLanguageButton::init(const char * name)
 
   d->staticText = false;
 
-  TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 0, 0);
-  tqlayout->setAutoAdd(true);
+  TQHBoxLayout *layout = new TQHBoxLayout(this, 0, 0);
+  layout->setAutoAdd(true);
   d->button = new TQPushButton( this, name ); // HPB don't touch this!!
 
   clear();
@@ -131,12 +131,12 @@ KLanguageButton::~KLanguageButton()
 void KLanguageButton::insertLanguage( const TQString& path, const TQString& name,
                         const TQString&, const TQString &submenu, int index )
 {
-  TQString output = name + TQString::tqfromLatin1( " (" ) + path +
-                   TQString::tqfromLatin1( ")" );
+  TQString output = name + TQString::fromLatin1( " (" ) + path +
+                   TQString::fromLatin1( ")" );
 #if 0
   // Nooooo ! Country != language
   TQPixmap flag( locate( "locale", sub + path +
-                TQString::tqfromLatin1( "/flag.png" ) ) );
+                TQString::fromLatin1( "/flag.png" ) ) );
 #endif
   insertItem( output, path, submenu, index );
 }
@@ -230,9 +230,9 @@ void KLanguageButton::clear()
   }
 }
 
-bool KLanguageButton::tqcontains( const TQString & id ) const
+bool KLanguageButton::contains( const TQString & id ) const
 {
-  return m_ids->tqcontains( id ) > 0;
+  return m_ids->contains( id ) > 0;
 }
 
 TQString KLanguageButton::current() const
@@ -276,7 +276,7 @@ void KLanguageButton::setCurrentItem( int i )
 
 void KLanguageButton::setCurrentItem( const TQString & id )
 {
-  int i = m_ids->tqfindIndex( id );
+  int i = m_ids->findIndex( id );
   if ( id.isNull() )
     i = 0;
   if ( i != -1 )
diff --git a/kdeui/klanguagebutton.h b/kdeui/klanguagebutton.h
index 0736b50c7..c167930db 100644
--- a/kdeui/klanguagebutton.h
+++ b/kdeui/klanguagebutton.h
@@ -144,9 +144,9 @@ public:
    */
   TQString current() const;
   /**
-   * Returns TRUE if the combobox tqcontains id.
+   * Returns TRUE if the combobox contains id.
    */
-  bool tqcontains( const TQString & id ) const;
+  bool contains( const TQString & id ) const;
   /**
    * Sets id as current item.
    */
diff --git a/kdeui/kled.cpp b/kdeui/kled.cpp
index 605ff5345..b7980203b 100644
--- a/kdeui/kled.cpp
+++ b/kdeui/kled.cpp
@@ -51,7 +51,7 @@ KLed::KLed(TQWidget *parent, const char *name)
   : TQWidget( parent, name),
     led_state(On),
     led_look(Raised),
-    led_tqshape(Circular)
+    led_shape(Circular)
 {
   TQColor col(green);
   d = new KLed::KLedPrivate;
@@ -68,7 +68,7 @@ KLed::KLed(const TQColor& col, TQWidget *parent, const char *name)
   : TQWidget( parent, name),
     led_state(On),
     led_look(Raised),
-    led_tqshape(Circular)
+    led_shape(Circular)
 {
   d = new KLed::KLedPrivate;
   d->dark_factor = 300;
@@ -81,11 +81,11 @@ KLed::KLed(const TQColor& col, TQWidget *parent, const char *name)
 }
 
 KLed::KLed(const TQColor& col, KLed::State state,
-	   KLed::Look look, KLed::Shape tqshape, TQWidget *parent, const char *name )
+	   KLed::Look look, KLed::Shape shape, TQWidget *parent, const char *name )
   : TQWidget(parent, name),
     led_state(state),
     led_look(look),
-    led_tqshape(tqshape)
+    led_shape(shape)
 {
   d = new KLed::KLedPrivate;
   d->dark_factor = 300;
@@ -93,7 +93,7 @@ KLed::KLed(const TQColor& col, KLed::State state,
   d->off_map = 0;
   d->on_map = 0;
 
-  //setShape(tqshape);
+  //setShape(shape);
   setColor(col);
 }
 
@@ -114,7 +114,7 @@ KLed::paintEvent(TQPaintEvent *)
   t.start();
   for (int i=0; i<rounds; i++) {
 #endif
-  switch(led_tqshape)
+  switch(led_shape)
     {
     case Rectangular:
       switch (led_look)
@@ -129,7 +129,7 @@ KLed::paintEvent(TQPaintEvent *)
 	  paintRect();
 	  break;
 	default  :
-	  qWarning("%s: in class KLed: no KLed::Look set",tqApp->argv()[0]);
+	  qWarning("%s: in class KLed: no KLed::Look set",qApp->argv()[0]);
 	}
       break;
     case Circular:
@@ -145,11 +145,11 @@ KLed::paintEvent(TQPaintEvent *)
 	  paintSunken();
 	  break;
 	default:
-	  qWarning("%s: in class KLed: no KLed::Look set",tqApp->argv()[0]);
+	  qWarning("%s: in class KLed: no KLed::Look set",qApp->argv()[0]);
 	}
       break;
     default:
-      qWarning("%s: in class KLed: no KLed::Shape set",tqApp->argv()[0]);
+      qWarning("%s: in class KLed: no KLed::Shape set",qApp->argv()[0]);
       break;
     }
 #ifdef PAINT_BENCH
@@ -229,7 +229,7 @@ KLed::paintFlat() // paint a ROUND FLAT led lamp
     brush.setColor( color );
 
     pen.setWidth( scale );
-    color = tqcolorGroup().dark();
+    color = colorGroup().dark();
     pen.setColor( color );			// Set the pen accordingly
 
     paint.setPen( pen );			// Select pen for drawing
@@ -325,7 +325,7 @@ KLed::paintRound() // paint a ROUND RAISED led lamp
     // avoid that the border can be erased by the bright spot of the LED
 
     pen.setWidth( 2 * scale + 1 );
-    color = tqcolorGroup().dark();
+    color = colorGroup().dark();
     pen.setColor( color );			// Set the pen accordingly
     paint.setPen( pen );			// Select pen for drawing
     brush.setStyle( TQBrush::NoBrush );		// Switch off the brush
@@ -424,11 +424,11 @@ KLed::paintSunken() // paint a ROUND SUNKEN led lamp
     brush.setStyle( TQBrush::NoBrush );              // Switch off the brush
     paint.setBrush( brush );                        // This avoids filling of the ellipse
 
-    // Set the initial color value to tqcolorGroup().light() (bright) and start
+    // Set the initial color value to colorGroup().light() (bright) and start
     // drawing the shadow border at 45° (45*16 = 720).
 
     int angle = -720;
-    color = tqcolorGroup().light();
+    color = colorGroup().light();
 
     for ( int arc = 120; arc < 2880; arc += 240 ) {
       pen.setColor( color );
@@ -525,9 +525,9 @@ KLed::state() const
 }
 
 KLed::Shape
-KLed::tqshape() const
+KLed::shape() const
 {
-  return led_tqshape;
+  return led_shape;
 }
 
 QColor
@@ -561,9 +561,9 @@ KLed::toggleState()
 void
 KLed::setShape(KLed::Shape s)
 {
-  if(led_tqshape!=s)
+  if(led_shape!=s)
     {
-      led_tqshape = s;
+      led_shape = s;
       update();
     }
 }
@@ -627,13 +627,13 @@ KLed::off()
 }
 
 QSize
-KLed::tqsizeHint() const
+KLed::sizeHint() const
 {
   return TQSize(16, 16);
 }
 
 QSize
-KLed::tqminimumSizeHint() const
+KLed::minimumSizeHint() const
 {
   return TQSize(16, 16 );
 }
diff --git a/kdeui/kled.h b/kdeui/kled.h
index 2cffe0d84..580f01ab4 100644
--- a/kdeui/kled.h
+++ b/kdeui/kled.h
@@ -47,7 +47,7 @@ class KDEUI_EXPORT KLed : public QWidget
     Q_OBJECT
     Q_ENUMS( State Shape Look )
     Q_PROPERTY( State state READ state WRITE setState )
-    Q_PROPERTY( Shape tqshape READ tqshape WRITE setShape )
+    Q_PROPERTY( Shape shape READ shape WRITE setShape )
     Q_PROPERTY( Look look READ look WRITE setLook )
     Q_PROPERTY( TQColor color READ color WRITE setColor )
     Q_PROPERTY( int darkFactor READ darkFactor WRITE setDarkFactor )
@@ -55,14 +55,14 @@ class KDEUI_EXPORT KLed : public QWidget
 public:
 
   /**
-   * tqStatus of the light is on/off.
+   * Status of the light is on/off.
    * @short LED on/off.
    */
   enum State { Off, On };
 
   /**
    * Shades of the lamp.
-   * @short LED tqshape
+   * @short LED shape
    */
   enum Shape { Rectangular, Circular };
 
@@ -114,12 +114,12 @@ public:
    * @param col Initial color of the LED.
    * @param state    Sets the State.
    * @param look     Sets the Look.
-   * @param tqshape    Sets the Shape (rectangular or circular)
+   * @param shape    Sets the Shape (rectangular or circular)
    * @param parent   Will be handed over to TQWidget.
    * @param name     Will be handed over to TQWidget.
    * @short Constructor
    */
-  KLed(const TQColor& col, KLed::State state, KLed::Look look, KLed::Shape tqshape,
+  KLed(const TQColor& col, KLed::State state, KLed::Look look, KLed::Shape shape,
        TQWidget *parent=0, const char *name=0);
 
 
@@ -137,7 +137,7 @@ public:
    */
   State state() const;
 
-  Shape tqshape() const;
+  Shape shape() const;
 
   /**
    * Returns the color of the widget
@@ -175,13 +175,13 @@ public:
   void setState( State state );
 
   /**
-   * Set the tqshape of the LED to @p s.
+   * Set the shape of the LED to @p s.
    */
   void setShape(Shape s);
   /**
    * Toggle the state of the LED from Off to On and vice versa.
    *
-   * The widget will be tqrepainted when returning to the main
+   * The widget will be repainted when returning to the main
    * event loop.
    * @short Toggles LED on->off / off->on.
    * @deprecated, use #toggle() instead.
@@ -249,15 +249,15 @@ public:
    */
   void setLook( Look look );
 
-  virtual TQSize tqsizeHint() const;
-  virtual TQSize tqminimumSizeHint() const;
+  virtual TQSize sizeHint() const;
+  virtual TQSize minimumSizeHint() const;
 
 public slots:
 
   /**
    * Toggles the state of the led from Off to On or vice versa.
    *
-   * The widget tqrepaints itself immediately.
+   * The widget repaints itself immediately.
    */
   void toggle();
 
@@ -317,7 +317,7 @@ private:
   State led_state;
   TQColor led_color;
   Look  led_look;
-  Shape led_tqshape;
+  Shape led_shape;
 
 protected:
   virtual void virtual_hook( int id, void* data );
diff --git a/kdeui/klineedit.cpp b/kdeui/klineedit.cpp
index 01b50d7c9..f89f4cf25 100644
--- a/kdeui/klineedit.cpp
+++ b/kdeui/klineedit.cpp
@@ -441,17 +441,17 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
 {
     KKey key( e );
 
-    if ( KStdAccel::copy().tqcontains( key ) )
+    if ( KStdAccel::copy().contains( key ) )
     {
         copy();
         return;
     }
-    else if ( KStdAccel::paste().tqcontains( key ) )
+    else if ( KStdAccel::paste().contains( key ) )
     {
         paste();
         return;
     }
-    else if ( KStdAccel::pasteSelection().tqcontains( key ) )
+    else if ( KStdAccel::pasteSelection().contains( key ) )
     {
         TQString text = TQApplication::clipboard()->text( QClipboard::Selection);
         insert( text );
@@ -459,22 +459,22 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
         return;
     }
 
-    else if ( KStdAccel::cut().tqcontains( key ) )
+    else if ( KStdAccel::cut().contains( key ) )
     {
         cut();
         return;
     }
-    else if ( KStdAccel::undo().tqcontains( key ) )
+    else if ( KStdAccel::undo().contains( key ) )
     {
         undo();
         return;
     }
-    else if ( KStdAccel::redo().tqcontains( key ) )
+    else if ( KStdAccel::redo().contains( key ) )
     {
         redo();
         return;
     }
-    else if ( KStdAccel::deleteWordBack().tqcontains( key ) )
+    else if ( KStdAccel::deleteWordBack().contains( key ) )
     {
         cursorWordBackward(true);
         if ( hasSelectedText() )
@@ -483,7 +483,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
         e->accept();
         return;
     }
-    else if ( KStdAccel::deleteWordForward().tqcontains( key ) )
+    else if ( KStdAccel::deleteWordForward().contains( key ) )
     {
         // Workaround for QT bug where
         cursorWordForward(true);
@@ -493,25 +493,25 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
         e->accept();
         return;
     }
-    else if ( KStdAccel::backwardWord().tqcontains( key ) )
+    else if ( KStdAccel::backwardWord().contains( key ) )
     {
       cursorWordBackward(false);
       e->accept();
       return;
     }
-    else if ( KStdAccel::forwardWord().tqcontains( key ) )
+    else if ( KStdAccel::forwardWord().contains( key ) )
     {
       cursorWordForward(false);
       e->accept();
       return;
     }
-    else if ( KStdAccel::beginningOfLine().tqcontains( key ) )
+    else if ( KStdAccel::beginningOfLine().contains( key ) )
     {
       home(false);
       e->accept();
       return;
     }
-    else if ( KStdAccel::endOfLine().tqcontains( key ) )
+    else if ( KStdAccel::endOfLine().contains( key ) )
     {
       end(false);
       e->accept();
@@ -575,7 +575,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
               mode == KGlobalSettings::CompletionMan) && noModifier )
         {
             TQString keycode = e->text();
-            if ( !keycode.isEmpty() && (keycode.tqunicode()->isPrint() ||
+            if ( !keycode.isEmpty() && (keycode.unicode()->isPrint() ||
                 e->key() == Key_Backspace || e->key() == Key_Delete ) )
             {
                 bool hasUserSelection=d->userSelection;
@@ -658,7 +658,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
             // as if there was no selection. After processing the key event, we
             // can set the new autocompletion again.
             if (hadSelection && !hasUserSelection && start>cPos &&
-               ( (!keycode.isEmpty() && keycode.tqunicode()->isPrint()) ||
+               ( (!keycode.isEmpty() && keycode.unicode()->isPrint()) ||
                  e->key() == Key_Backspace || e->key() == Key_Delete ) )
             {
                 del();
@@ -679,7 +679,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
             int len = txt.length();
 
             if ( txt != old_txt && len/* && ( cursorPosition() == len || force )*/ &&
-                 ( (!keycode.isEmpty() && keycode.tqunicode()->isPrint()) ||
+                 ( (!keycode.isEmpty() && keycode.unicode()->isPrint()) ||
                    e->key() == Key_Backspace || e->key() == Key_Delete) )
             {
                 if ( e->key() == Key_Backspace )
@@ -729,7 +729,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
             else
                 cut = keys[TextCompletion];
 
-            if ( cut.tqcontains( key ) )
+            if ( cut.contains( key ) )
             {
                 // Emit completion if the completion mode is CompletionShell
                 // and the cursor is at the end of the string.
@@ -758,7 +758,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
             else
                 cut = keys[PrevCompletionMatch];
 
-            if ( cut.tqcontains( key ) )
+            if ( cut.contains( key ) )
             {
                 if ( emitSignals() )
                     emit textRotation( KCompletionBase::PrevCompletionMatch );
@@ -773,7 +773,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
             else
                 cut = keys[NextCompletionMatch];
 
-            if ( cut.tqcontains( key ) )
+            if ( cut.contains( key ) )
             {
                 if ( emitSignals() )
                     emit textRotation( KCompletionBase::NextCompletionMatch );
@@ -792,7 +792,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
             else
                 cut = keys[SubstringCompletion];
 
-            if ( cut.tqcontains( key ) )
+            if ( cut.contains( key ) )
             {
                 if ( emitSignals() )
                     emit substringCompletion( text() );
@@ -1134,7 +1134,7 @@ bool KLineEdit::overrideAccel (const TQKeyEvent* e)
     else
         scKey = keys[TextCompletion];
 
-    if (scKey.tqcontains( key ))
+    if (scKey.contains( key ))
         return true;
 
     if (keys[NextCompletionMatch].isNull())
@@ -1142,7 +1142,7 @@ bool KLineEdit::overrideAccel (const TQKeyEvent* e)
     else
         scKey = keys[NextCompletionMatch];
 
-    if (scKey.tqcontains( key ))
+    if (scKey.contains( key ))
         return true;
 
     if (keys[PrevCompletionMatch].isNull())
@@ -1150,31 +1150,31 @@ bool KLineEdit::overrideAccel (const TQKeyEvent* e)
     else
         scKey = keys[PrevCompletionMatch];
 
-    if (scKey.tqcontains( key ))
+    if (scKey.contains( key ))
         return true;
 
     // Override all the text manupilation accelerators...
-    if ( KStdAccel::copy().tqcontains( key ) )
+    if ( KStdAccel::copy().contains( key ) )
         return true;
-    else if ( KStdAccel::paste().tqcontains( key ) )
+    else if ( KStdAccel::paste().contains( key ) )
         return true;
-    else if ( KStdAccel::cut().tqcontains( key ) )
+    else if ( KStdAccel::cut().contains( key ) )
         return true;
-    else if ( KStdAccel::undo().tqcontains( key ) )
+    else if ( KStdAccel::undo().contains( key ) )
         return true;
-    else if ( KStdAccel::redo().tqcontains( key ) )
+    else if ( KStdAccel::redo().contains( key ) )
         return true;
-    else if (KStdAccel::deleteWordBack().tqcontains( key ))
+    else if (KStdAccel::deleteWordBack().contains( key ))
         return true;
-    else if (KStdAccel::deleteWordForward().tqcontains( key ))
+    else if (KStdAccel::deleteWordForward().contains( key ))
         return true;
-    else if (KStdAccel::forwardWord().tqcontains( key ))
+    else if (KStdAccel::forwardWord().contains( key ))
         return true;
-    else if (KStdAccel::backwardWord().tqcontains( key ))
+    else if (KStdAccel::backwardWord().contains( key ))
         return true;
-    else if (KStdAccel::beginningOfLine().tqcontains( key ))
+    else if (KStdAccel::beginningOfLine().contains( key ))
         return true;
-    else if (KStdAccel::endOfLine().tqcontains( key ))
+    else if (KStdAccel::endOfLine().contains( key ))
         return true;
 
     if (d->completionBox && d->completionBox->isVisible ())
@@ -1219,7 +1219,7 @@ void KLineEdit::setCompletedItems( const TQStringList& items, bool autoSuggest )
             bool wasSelected = d->completionBox->isSelected( d->completionBox->currentItem() );
             const TQString currentSelection = d->completionBox->currentText();
             d->completionBox->setItems( items );
-            TQListBoxItem* item = d->completionBox->tqfindItem( currentSelection, Qt::ExactMatch );
+            TQListBoxItem* item = d->completionBox->findItem( currentSelection, Qt::ExactMatch );
             // If no item is selected, that means the listbox hasn't been manipulated by the user yet,
             // because it's not possible otherwise to have no selected item. In such case make
             // always the first item current and unselected, so that the current item doesn't jump.
@@ -1246,7 +1246,7 @@ void KLineEdit::setCompletedItems( const TQStringList& items, bool autoSuggest )
 
         if ( d->autoSuggest && autoSuggest )
         {
-            int index = items.first().tqfind( txt );
+            int index = items.first().find( txt );
             TQString newText = items.first().mid( index );
             setUserSelection(false);
             setCompletedText(newText,true);
diff --git a/kdeui/klineeditdlg.cpp b/kdeui/klineeditdlg.cpp
index c92f0a8bd..9551fc1f6 100644
--- a/kdeui/klineeditdlg.cpp
+++ b/kdeui/klineeditdlg.cpp
@@ -44,7 +44,7 @@ KLineEditDlg::KLineEditDlg( const TQString&_text, const TQString& _value,
   topLayout->addWidget( label, 1 );
 
   edit = new KLineEdit( plainPage(), 0L );
-  edit->setMinimumWidth(edit->tqsizeHint().width() * 3);
+  edit->setMinimumWidth(edit->sizeHint().width() * 3);
   label->setBuddy(edit);  // please "scheck" style
   //  connect( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(accept()) );
   connect( edit, TQT_SIGNAL(textChanged(const TQString&)),
@@ -69,13 +69,13 @@ KLineEditDlg::KLineEditDlg( const TQString&_text, const TQString& _value,
 			    TQWidget *parent, bool _file_mode )
     : TQDialog( parent, 0L, true )
 {
-  TQGridLayout *tqlayout = new TQGridLayout(this, 4, 3, 10);
+  TQGridLayout *layout = new TQGridLayout(this, 4, 3, 10);
 
   TQLabel *label = new TQLabel(_text, this);
-  tqlayout->addWidget(label, 0, 0, AlignLeft);
+  layout->addWidget(label, 0, 0, AlignLeft);
 
   edit = new KLineEdit( this, 0L );
-  edit->setMinimumWidth(edit->tqsizeHint().width() * 3);
+  edit->setMinimumWidth(edit->sizeHint().width() * 3);
   connect( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(accept()) );
 
   if ( _file_mode ) {
@@ -85,22 +85,22 @@ KLineEditDlg::KLineEditDlg( const TQString&_text, const TQString& _value,
   } else
     completion = 0L;
 
-  tqlayout->addMultiCellWidget(edit, 1, 1, 0, _file_mode ? 1 : 2);
-  tqlayout->setColStretch(1, 1);
+  layout->addMultiCellWidget(edit, 1, 1, 0, _file_mode ? 1 : 2);
+  layout->setColStretch(1, 1);
 
   if (_file_mode) {
     TQPushButton *browse = new TQPushButton(i18n("&Browse..."), this);
-    tqlayout->addWidget(browse, 1, 2, AlignCenter);
+    layout->addWidget(browse, 1, 2, AlignCenter);
     connect(browse, TQT_SIGNAL(clicked()),
 	    TQT_SLOT(slotBrowse()));
   }
 
   TQFrame *hLine = new TQFrame(this);
   hLine->setFrameStyle(TQFrame::Sunken|TQFrame::HLine);
-  tqlayout->addMultiCellWidget(hLine, 2, 2, 0, 2);
+  layout->addMultiCellWidget(hLine, 2, 2, 0, 2);
 
   KButtonBox *bBox = new KButtonBox(this);
-  tqlayout->addMultiCellWidget(bBox, 3, 3, 0, 2);
+  layout->addMultiCellWidget(bBox, 3, 3, 0, 2);
 
   TQPushButton *ok = bBox->addButton(KStdGuiItem::ok());
   ok->setDefault(true);
@@ -116,9 +116,9 @@ KLineEditDlg::KLineEditDlg( const TQString&_text, const TQString& _value,
   TQPushButton *cancel = bBox->addButton(KStdGuiItem::cancel());
   connect( cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
 
-  bBox->tqlayout();
+  bBox->layout();
 
-  tqlayout->activate();
+  layout->activate();
 
   edit->setText( _value );
   edit->setSelection(0, edit->text().length());
diff --git a/kdeui/klineeditdlg.h b/kdeui/klineeditdlg.h
index a46019abe..6e6fc2d89 100644
--- a/kdeui/klineeditdlg.h
+++ b/kdeui/klineeditdlg.h
@@ -34,7 +34,7 @@ class TQValidator;
  * Dialog for user to enter a single line of text.
  *
  * @version $Id$
- * @author David Faure <faure@kde.org>, tqlayout management by Preston Brown <pbrown@kde.org>
+ * @author David Faure <faure@kde.org>, layout management by Preston Brown <pbrown@kde.org>
  */
 
 class KDEUI_EXPORT_DEPRECATED KLineEditDlg : public KDialogBase
diff --git a/kdeui/klistview.cpp b/kdeui/klistview.cpp
index 657aa2870..332bc4e8c 100644
--- a/kdeui/klistview.cpp
+++ b/kdeui/klistview.cpp
@@ -197,7 +197,7 @@ void KListViewLineEdit::load(TQListViewItem *i, int c)
         item=i;
         col=c;
 
-        TQRect rect(p->tqitemRect(i));
+        TQRect rect(p->itemRect(i));
         setText(item->text(c));
         home( true );
 
@@ -263,7 +263,7 @@ static TQListViewItem *lastQChild (TQListViewItem *pi)
 	if (pi)
 	{
 		/*	Since there's no TQListViewItem::lastChild().
-		 *	This tqfinds the last sibling for the given
+		 *	This finds the last sibling for the given
 		 *	item.
 		 */
 		for (TQListViewItem *pt = pi->nextSibling(); pt; pt = pt->nextSibling())
@@ -716,7 +716,7 @@ void KListView::focusInEvent( TQFocusEvent *fe )
       && (currentItem()))
   {
       currentItem()->setSelected(true);
-      currentItem()->tqrepaint();
+      currentItem()->repaint();
       emit selectionChanged();
   };
 }
@@ -736,7 +736,7 @@ void KListView::focusOutEvent( TQFocusEvent *fe )
       && (!d->editor->isVisible()))
   {
       currentItem()->setSelected(false);
-      currentItem()->tqrepaint();
+      currentItem()->repaint();
       emit selectionChanged();
   };
 
@@ -776,7 +776,7 @@ void KListView::contentsMousePressEvent( TQMouseEvent *e )
      if (currentItem())
      {
         currentItem()->setSelected(false);
-        currentItem()->tqrepaint();
+        currentItem()->repaint();
 //        emit selectionChanged();
      }
   }
@@ -865,7 +865,7 @@ void KListView::contentsMouseReleaseEvent( TQMouseEvent *e )
         if (!rootDecoClicked)
         {
           int col = header()->mapToLogical( header()->cellAt( p.x() ) );
-          if ( d->renameable.tqcontains(col) )
+          if ( d->renameable.contains(col) )
             rename(at, col);
         }
       }
@@ -1008,7 +1008,7 @@ void KListView::contentsDragMoveEvent(TQDragMoveEvent *event)
       {
         cleanDropVisualizer();
         d->mOldDropVisualizer=tmpRect;
-        viewport()->tqrepaint(tmpRect);
+        viewport()->repaint(tmpRect);
       }
     }
     if (dropHighlighter())
@@ -1018,7 +1018,7 @@ void KListView::contentsDragMoveEvent(TQDragMoveEvent *event)
       {
         cleanItemHighlighter();
         d->mOldDropHighlighter=tmpRect;
-        viewport()->tqrepaint(tmpRect);
+        viewport()->repaint(tmpRect);
       }
     }
   }
@@ -1045,7 +1045,7 @@ void KListView::cleanDropVisualizer()
   {
     TQRect rect=d->mOldDropVisualizer;
     d->mOldDropVisualizer = TQRect();
-    viewport()->tqrepaint(rect, true);
+    viewport()->repaint(rect, true);
   }
 }
 
@@ -1067,7 +1067,7 @@ void KListView::findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListView
 	else
 	{
 		// Get the closest item before us ('atpos' or the one above, if any)
-		if (p.y() - tqitemRect(atpos).topLeft().y() < (atpos->height()/2))
+		if (p.y() - itemRect(atpos).topLeft().y() < (atpos->height()/2))
 			above = atpos->itemAbove();
 		else
 			above = atpos;
@@ -1327,12 +1327,12 @@ TQRect KListView::drawDropVisualizer(TQPainter *p, TQListViewItem *parent,
                             it = it->firstChild();
             }
 
-            insertmarker = tqitemRect (it ? it : after);
+            insertmarker = itemRect (it ? it : after);
             level = after->depth();
         }
         else if (parent)
         {
-            insertmarker = tqitemRect (parent);
+            insertmarker = itemRect (parent);
             level = parent->depth() + 1;
         }
         insertmarker.setLeft( treeStepSize() * ( level + (rootIsDecorated() ? 1 : 0) ) + itemMargin() );
@@ -1355,11 +1355,11 @@ TQRect KListView::drawItemHighlighter(TQPainter *painter, TQListViewItem *item)
 
   if (item)
   {
-    r = tqitemRect(item);
+    r = itemRect(item);
     r.setLeft(r.left()+(item->depth()+(rootIsDecorated() ? 1 : 0))*treeStepSize());
     if (painter)
-      style().drawPrimitive(TQStyle::PE_FocusRect, painter, r, tqcolorGroup(),
-                            TQStyle::Style_FocusAtBorder, tqcolorGroup().highlight());
+      style().drawPrimitive(TQStyle::PE_FocusRect, painter, r, colorGroup(),
+                            TQStyle::Style_FocusAtBorder, colorGroup().highlight());
   }
 
   return r;
@@ -1371,13 +1371,13 @@ void KListView::cleanItemHighlighter ()
   {
     TQRect rect=d->mOldDropHighlighter;
     d->mOldDropHighlighter = TQRect();
-    viewport()->tqrepaint(rect, true);
+    viewport()->repaint(rect, true);
   }
 }
 
 void KListView::rename(TQListViewItem *item, int c)
 {
-  if (d->renameable.tqcontains(c))
+  if (d->renameable.contains(c))
   {
     ensureItemVisible(item);
     d->editor->load(item,c);
@@ -1386,7 +1386,7 @@ void KListView::rename(TQListViewItem *item, int c)
 
 bool KListView::isRenameable (int col) const
 {
-  return d->renameable.tqcontains(col);
+  return d->renameable.contains(col);
 }
 
 void KListView::setRenameable (int col, bool renameable)
@@ -1482,7 +1482,7 @@ void KListView::activateAutomaticSelection()
    if (currentItem())
    {
       currentItem()->setSelected(true);
-      currentItem()->tqrepaint();
+      currentItem()->repaint();
       emit selectionChanged();
    };
 }
@@ -1519,8 +1519,8 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e)
     TQListViewItem* item = currentItem();
     if (!item) return;
 
-    TQListViewItem* tqrepaintItem1 = item;
-    TQListViewItem* tqrepaintItem2 = 0L;
+    TQListViewItem* repaintItem1 = item;
+    TQListViewItem* repaintItem2 = 0L;
     TQListViewItem* visItem = 0L;
 
     TQListViewItem* nextItem = 0L;
@@ -1579,7 +1579,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e)
 
        if (nextItem)
        {
-          tqrepaintItem2=nextItem;
+          repaintItem2=nextItem;
           visItem=nextItem;
           setCurrentItem(nextItem);
        };
@@ -1614,7 +1614,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e)
        {
           if (d->selectedBySimpleMove)
              nextItem->setSelected(true);
-          tqrepaintItem2=nextItem;
+          repaintItem2=nextItem;
           visItem=nextItem;
           setCurrentItem(nextItem);
        };
@@ -1649,7 +1649,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e)
        {
           if (d->selectedBySimpleMove)
              nextItem->setSelected(true);
-          tqrepaintItem2=nextItem;
+          repaintItem2=nextItem;
           visItem=nextItem;
           setCurrentItem(nextItem);
        };
@@ -1671,7 +1671,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e)
           {
              if (d->selectedBySimpleMove)
                 nextItem->setSelected(true);
-             tqrepaintItem2=nextItem;
+             repaintItem2=nextItem;
              visItem=nextItem;
              setCurrentItem(nextItem);
           }
@@ -1684,7 +1684,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e)
        // move to the first item and toggle selection of all items inbetween
        nextItem = firstChild();
        visItem = nextItem;
-       tqrepaintItem2 = visItem;
+       repaintItem2 = visItem;
        if (d->selectedBySimpleMove)
           item->setSelected(false);
        if (shiftOrCtrl)
@@ -1797,7 +1797,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e)
           currentItem()->setSelected(true);
           emitSelectionChanged=true;
        }
-       tqrepaintItem2=currentItem();
+       repaintItem2=currentItem();
        if (realKey)
           visItem=currentItem();
        break;
@@ -1807,21 +1807,21 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e)
        ensureItemVisible(visItem);
 
     TQRect ir;
-    if (tqrepaintItem1)
-       ir = ir.unite( tqitemRect(tqrepaintItem1) );
-    if (tqrepaintItem2)
-       ir = ir.unite( tqitemRect(tqrepaintItem2) );
+    if (repaintItem1)
+       ir = ir.unite( itemRect(repaintItem1) );
+    if (repaintItem2)
+       ir = ir.unite( itemRect(repaintItem2) );
 
     if ( !ir.isEmpty() )
-    {                 // rectangle to be tqrepainted
+    {                 // rectangle to be repainted
        if ( ir.x() < 0 )
           ir.moveBy( -ir.x(), 0 );
-       viewport()->tqrepaint( ir, false );
+       viewport()->repaint( ir, false );
     }
-    /*if (tqrepaintItem1)
-       tqrepaintItem1->tqrepaint();
-    if (tqrepaintItem2)
-       tqrepaintItem2->tqrepaint();*/
+    /*if (repaintItem1)
+       repaintItem1->repaint();
+    if (repaintItem2)
+       repaintItem2->repaint();*/
     update();
     if (emitSelectionChanged)
        emit selectionChanged();
@@ -1895,7 +1895,7 @@ void KListView::emitContextMenu (KListView*, TQListViewItem* i)
   TQPoint p;
 
   if (i)
-        p = viewport()->mapToGlobal(tqitemRect(i).center());
+        p = viewport()->mapToGlobal(itemRect(i).center());
   else
         p = mapToGlobal(rect().center());
 
@@ -1940,7 +1940,7 @@ void KListView::viewportPaintEvent(TQPaintEvent *e)
       TQPainter painter(viewport());
 
       // This is where we actually draw the drop-highlighter
-      style().drawPrimitive(TQStyle::PE_FocusRect, &painter, d->mOldDropHighlighter, tqcolorGroup(),
+      style().drawPrimitive(TQStyle::PE_FocusRect, &painter, d->mOldDropHighlighter, colorGroup(),
                             TQStyle::Style_FocusAtBorder);
     }
   d->painting = false;
@@ -2001,13 +2001,13 @@ const TQColor &KListView::alternateBackground() const
 void KListView::setAlternateBackground(const TQColor &c)
 {
   d->alternateBackground = c;
-  tqrepaint();
+  repaint();
 }
 
 void KListView::setShadeSortColumn(bool shadeSortColumn)
 {
   d->shadeSortColumn = shadeSortColumn;
-  tqrepaint();
+  repaint();
 }
 
 bool KListView::shadeSortColumn() const
@@ -2231,7 +2231,7 @@ const TQColor &KListViewItem::backgroundColor()
 {
   if (isAlternate())
     return static_cast< KListView* >(listView())->alternateBackground();
-  return listView()->viewport()->tqcolorGroup().base();
+  return listView()->viewport()->colorGroup().base();
 }
 
 TQColor KListViewItem::backgroundColor(int column)
@@ -2239,7 +2239,7 @@ TQColor KListViewItem::backgroundColor(int column)
   KListView* view = static_cast< KListView* >(listView());
   TQColor color = isAlternate() ?
                  view->alternateBackground() :
-                 view->viewport()->tqcolorGroup().base();
+                 view->viewport()->colorGroup().base();
 
   // calculate a different color if the current column is sorted (only if more than 1 column)
   if ( (view->columns() > 1) && view->shadeSortColumn() && (column == view->columnSorted()) )
@@ -2335,7 +2335,7 @@ bool KListViewItem::isAlternate()
   return false;
 }
 
-void KListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
+void KListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
 {
   TQColorGroup _cg = cg;
   TQListView* lv = listView();
@@ -2353,7 +2353,7 @@ void KListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column,
                  TQColorGroup::Background : TQColorGroup::Base,
                  backgroundColor(column));
   }
-  TQListViewItem::paintCell(p, _cg, column, width, tqalignment);
+  TQListViewItem::paintCell(p, _cg, column, width, alignment);
 }
 
 void KListView::virtual_hook( int, void* )
diff --git a/kdeui/klistview.h b/kdeui/klistview.h
index 3f7df3f6c..d78ec2724 100644
--- a/kdeui/klistview.h
+++ b/kdeui/klistview.h
@@ -348,7 +348,7 @@ public:
   const TQColor &alternateBackground() const;
 
   /**
-   * Saves the list view's tqlayout (column widtsh, column order, sort column)
+   * Saves the list view's layout (column widtsh, column order, sort column)
    * to a KConfig group
    *
    * @param config the KConfig object to write to
@@ -356,7 +356,7 @@ public:
    */
   void saveLayout(KConfig *config, const TQString &group) const;
   /**
-   * Reads the list view's tqlayout from a KConfig group as stored with
+   * Reads the list view's layout from a KConfig group as stored with
    * saveLayout
    *
    * @param config the KConfig object to read from
@@ -684,7 +684,7 @@ protected:
    */
   inline bool below (TQListViewItem* i, const TQPoint& p)
   {
-	return below (tqitemRect(i), contentsToViewport(p));
+	return below (itemRect(i), contentsToViewport(p));
   }
 
   /**
@@ -1002,7 +1002,7 @@ private:
 
 /**
  * A listview item with support for alternate background colors. It is
- * a drop-in tqreplacement for QListViewItem
+ * a drop-in replacement for QListViewItem
  *
  * @short listview item with alternate background color support
  */
@@ -1069,7 +1069,7 @@ public:
   TQColor backgroundColor(int column);
 
   virtual void paintCell(TQPainter *p, const TQColorGroup &cg,
-    int column, int width, int tqalignment);
+    int column, int width, int alignment);
 
 private:
   void init();
diff --git a/kdeui/klistviewsearchline.cpp b/kdeui/klistviewsearchline.cpp
index 6dc214d29..7bd26afc1 100644
--- a/kdeui/klistviewsearchline.cpp
+++ b/kdeui/klistviewsearchline.cpp
@@ -145,7 +145,7 @@ void KListViewSearchLine::updateSearch(const TQString &s)
             it.current() && !currentItem;
             ++it)
         {
-            if(d->listView->tqitemRect(it.current()).isValid())
+            if(d->listView->itemRect(it.current()).isValid())
                 currentItem = it.current();
         }
     }
@@ -214,14 +214,14 @@ bool KListViewSearchLine::itemMatches(const TQListViewItem *item, const TQString
         TQValueList<int>::ConstIterator it = d->searchColumns.begin();
         for(; it != d->searchColumns.end(); ++it) {
             if(*it < item->listView()->columns() &&
-               item->text(*it).tqfind(s, 0, d->caseSensitive) >= 0)
+               item->text(*it).find(s, 0, d->caseSensitive) >= 0)
                 return true;
         }
     }
     else {
         for(int i = 0; i < item->listView()->columns(); i++) {
             if(item->listView()->columnWidth(i) > 0 &&
-               item->text(i).tqfind(s, 0, d->caseSensitive) >= 0)
+               item->text(i).find(s, 0, d->caseSensitive) >= 0)
             {
                 return true;
             }
@@ -260,7 +260,7 @@ TQPopupMenu *KListViewSearchLine::createPopupMenu()
 		    columnText = i18n("Column number %1","Column No. %1").arg(visiblePosition);
 	        }
                 subMenu->insertItem(columnText, visibleColumns);
-	        if(d->searchColumns.isEmpty() || d->searchColumns.tqfind(i) != d->searchColumns.end())
+	        if(d->searchColumns.isEmpty() || d->searchColumns.find(i) != d->searchColumns.end())
 		    subMenu->setItemChecked(visibleColumns, true);
                 else
                     allColumnsAreSearchColumns = false;
@@ -320,7 +320,7 @@ void KListViewSearchLine::searchColumnsMenuActivated(int id)
             d->searchColumns.clear();
     }
     else {
-        if(d->searchColumns.tqfind(id) != d->searchColumns.end())
+        if(d->searchColumns.find(id) != d->searchColumns.end())
             d->searchColumns.remove(id);
         else {
             if(d->searchColumns.isEmpty()) {
@@ -475,7 +475,7 @@ void KListViewSearchLineWidget::positionInToolBar()
     if(toolBar) {
 
         // Here we have The Big Ugly.  Figure out how many widgets are in the
-        // and do a hack-ish iteration over them to tqfind this widget so that we
+        // and do a hack-ish iteration over them to find this widget so that we
         // can insert the clear button before it.
 
         int widgetCount = toolBar->count();
diff --git a/kdeui/kmainwindow.cpp b/kdeui/kmainwindow.cpp
index 31eecbebb..94baa34e7 100644
--- a/kdeui/kmainwindow.cpp
+++ b/kdeui/kmainwindow.cpp
@@ -64,7 +64,7 @@ public:
     bool autoSaveSettings:1;
     bool settingsDirty:1;
     bool autoSaveWindowSize:1;
-    bool care_about_tqgeometry:1;
+    bool care_about_geometry:1;
     bool shuttingDown:1;
     TQString autoSaveGroup;
     KAccel * kaccel;
@@ -105,8 +105,8 @@ public:
             n++;
             it.current()->savePropertiesInternal(config, n);
         }
-        config->setGroup(TQString::tqfromLatin1("Number"));
-        config->writeEntry(TQString::tqfromLatin1("NumberOfWindows"), n );
+        config->setGroup(TQString::fromLatin1("Number"));
+        config->writeEntry(TQString::fromLatin1("NumberOfWindows"), n );
         return true;
     }
 
@@ -212,7 +212,7 @@ void KMainWindow::initKMainWindow(const char *name, int cflags)
         unusedNumber = 0; // add numbers only when needed
         }
     for(;;) {
-        TQWidgetList* list = kapp->tqtopLevelWidgets();
+        TQWidgetList* list = kapp->topLevelWidgets();
         TQWidgetListIt it( *list );
         bool found = false;
         for( TQWidget* w = it.current();
@@ -243,10 +243,10 @@ void KMainWindow::initKMainWindow(const char *name, int cflags)
     d->settingsTimer = 0;
     d->showStatusBarAction = NULL;
     d->shuttingDown = false;
-    if ((d->care_about_tqgeometry = being_first)) {
+    if ((d->care_about_geometry = being_first)) {
         being_first = false;
-        if ( kapp->geometryArgument().isNull() ) // if there is no tqgeometry, it doesn't mater
-            d->care_about_tqgeometry = false;
+        if ( kapp->geometryArgument().isNull() ) // if there is no geometry, it doesn't mater
+            d->care_about_geometry = false;
         else
             parseGeometry(false);
     }
@@ -279,15 +279,15 @@ void KMainWindow::setupToolbarMenuActions()
 void KMainWindow::parseGeometry(bool parsewidth)
 {
     assert ( !kapp->geometryArgument().isNull() );
-    assert ( d->care_about_tqgeometry );
+    assert ( d->care_about_geometry );
 
 #if defined Q_WS_X11
     int x, y;
     int w, h;
     int m = XParseGeometry( kapp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h);
     if (parsewidth) {
-        TQSize minSize = tqminimumSize();
-        TQSize maxSize = tqmaximumSize();
+        TQSize minSize = minimumSize();
+        TQSize maxSize = maximumSize();
         if ( !(m & WidthValue) )
             w = width();
         if ( !(m & HeightValue) )
@@ -299,9 +299,9 @@ void KMainWindow::parseGeometry(bool parsewidth)
          resize(w, h);
     } else {
         if ( parsewidth && !(m & XValue) )
-            x = tqgeometry().x();
+            x = geometry().x();
         if ( parsewidth && !(m & YValue) )
-            y = tqgeometry().y();
+            y = geometry().y();
         if ( (m & XNegative) )
             x = KApplication::desktop()->width()  + x - w;
         if ( (m & YNegative) )
@@ -356,8 +356,8 @@ bool KMainWindow::canBeRestored( int number )
     KConfig *config = kapp->sessionConfig();
     if ( !config )
         return false;
-    config->setGroup( TQString::tqfromLatin1("Number") );
-    int n = config->readNumEntry( TQString::tqfromLatin1("NumberOfWindows") , 1 );
+    config->setGroup( TQString::fromLatin1("Number") );
+    int n = config->readNumEntry( TQString::fromLatin1("NumberOfWindows") , 1 );
     return number >= 1 && number <= n;
 }
 
@@ -370,12 +370,12 @@ const TQString KMainWindow::classNameOfToplevel( int number )
         return TQString::null;
     TQString s;
     s.setNum( number );
-    s.prepend( TQString::tqfromLatin1("WindowProperties") );
+    s.prepend( TQString::fromLatin1("WindowProperties") );
     config->setGroup( s );
-    if ( !config->hasKey( TQString::tqfromLatin1("ClassName") ) )
+    if ( !config->hasKey( TQString::fromLatin1("ClassName") ) )
         return TQString::null;
     else
-        return config->readEntry( TQString::tqfromLatin1("ClassName") );
+        return config->readEntry( TQString::fromLatin1("ClassName") );
 }
 
 void KMainWindow::show()
@@ -545,7 +545,7 @@ void KMainWindow::createGUI( const TQString &xmlfile, bool _conserveMemory )
       // In addition we have to take care of not removing containers
       // like popupmenus, defined in the XML document.
       // this code should probably go into a separate method in KMainWindow.
-      // there's just one problem: I'm bad in tqfinding names ;-) , so
+      // there's just one problem: I'm bad in finding names ;-) , so
       // I skipped this ;-)
 
       TQDomDocument doc = domDocument();
@@ -696,13 +696,13 @@ void KMainWindow::savePropertiesInternal( KConfig *config, int number )
 
     TQString s;
     s.setNum(number);
-    s.prepend(TQString::tqfromLatin1("WindowProperties"));
+    s.prepend(TQString::fromLatin1("WindowProperties"));
     config->setGroup(s);
 
     // store objectName, className, Width and Height  for later restoring
     // (Only useful for session management)
-    config->writeEntry(TQString::tqfromLatin1("ObjectName"), name());
-    config->writeEntry(TQString::tqfromLatin1("ClassName"), className());
+    config->writeEntry(TQString::fromLatin1("ObjectName"), name());
+    config->writeEntry(TQString::fromLatin1("ClassName"), className());
 
     saveMainWindowSettings(config); // Menubar, statusbar and Toolbar settings.
 
@@ -738,7 +738,7 @@ void KMainWindow::saveMainWindowSettings(KConfig *config, const TQString &config
 
     TQMenuBar* mb = internalMenuBar();
     if (mb) {
-       TQString MenuBar = TQString::tqfromLatin1("MenuBar");
+       TQString MenuBar = TQString::fromLatin1("MenuBar");
        if(!config->hasDefault("MenuBar") && !mb->isHidden() )
            config->revertToDefault("MenuBar");
        else
@@ -795,7 +795,7 @@ bool KMainWindow::isStandardToolBarMenuEnabled() const
 
 void KMainWindow::createStandardStatusBarAction(){
   if(!d->showStatusBarAction){
-    d->showStatusBarAction = KStdAction::showtqStatusbar(this, TQT_SLOT(setSettingsDirty()), actionCollection());
+    d->showStatusBarAction = KStdAction::showStatusbar(this, TQT_SLOT(setSettingsDirty()), actionCollection());
     KStatusBar *sb = statusBar(); // Creates statusbar if it doesn't exist already.
     connect(d->showStatusBarAction, TQT_SIGNAL(toggled(bool)), sb, TQT_SLOT(setShown(bool)));
     d->showStatusBarAction->setChecked(sb->isHidden());
@@ -810,13 +810,13 @@ bool KMainWindow::readPropertiesInternal( KConfig *config, int number )
     // in order they are in toolbar list
     TQString s;
     s.setNum(number);
-    s.prepend(TQString::tqfromLatin1("WindowProperties"));
+    s.prepend(TQString::fromLatin1("WindowProperties"));
 
     config->setGroup(s);
 
     // restore the object name (window role)
-    if ( config->hasKey(TQString::tqfromLatin1("ObjectName" )) )
-        setName( config->readEntry(TQString::tqfromLatin1("ObjectName")).latin1()); // latin1 is right here
+    if ( config->hasKey(TQString::fromLatin1("ObjectName" )) )
+        setName( config->readEntry(TQString::fromLatin1("ObjectName")).latin1()); // latin1 is right here
 
     applyMainWindowSettings(config); // Menubar, statusbar and toolbar settings.
 
@@ -901,7 +901,7 @@ void KMainWindow::finalizeGUI( bool force )
 
 void KMainWindow::saveWindowSize( KConfig * config ) const
 {
-  int scnum = TQApplication::desktop()->screenNumber(tqparentWidget());
+  int scnum = TQApplication::desktop()->screenNumber(parentWidget());
   TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
   int w, h;
 #if defined Q_WS_X11
@@ -918,8 +918,8 @@ void KMainWindow::saveWindowSize( KConfig * config ) const
 #endif
   TQRect size( desk.width(), w, desk.height(), h );
   bool defaultSize = (size == d->defaultWindowSize);
-  TQString widthString = TQString::tqfromLatin1("Width %1").arg(desk.width());
-  TQString heightString = TQString::tqfromLatin1("Height %1").arg(desk.height());
+  TQString widthString = TQString::fromLatin1("Width %1").arg(desk.width());
+  TQString heightString = TQString::fromLatin1("Height %1").arg(desk.height());
   if (!config->hasDefault(widthString) && defaultSize)
      config->revertToDefault(widthString);
   else
@@ -933,24 +933,24 @@ void KMainWindow::saveWindowSize( KConfig * config ) const
 
 void KMainWindow::restoreWindowSize( KConfig * config )
 {
-    if (d->care_about_tqgeometry) {
+    if (d->care_about_geometry) {
         parseGeometry(true);
     } else {
         // restore the size
-        int scnum = TQApplication::desktop()->screenNumber(tqparentWidget());
+        int scnum = TQApplication::desktop()->screenNumber(parentWidget());
         TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
         if ( d->defaultWindowSize.isNull() ) // only once
           d->defaultWindowSize = TQRect(desk.width(), width(), desk.height(), height()); // store default values
-        TQSize size( config->readNumEntry( TQString::tqfromLatin1("Width %1").arg(desk.width()), 0 ),
-                    config->readNumEntry( TQString::tqfromLatin1("Height %1").arg(desk.height()), 0 ) );
+        TQSize size( config->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 0 ),
+                    config->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 0 ) );
         if (size.isEmpty()) {
             // try the KDE 2.0 way
-            size = TQSize( config->readNumEntry( TQString::tqfromLatin1("Width"), 0 ),
-                          config->readNumEntry( TQString::tqfromLatin1("Height"), 0 ) );
+            size = TQSize( config->readNumEntry( TQString::fromLatin1("Width"), 0 ),
+                          config->readNumEntry( TQString::fromLatin1("Height"), 0 ) );
             if (!size.isEmpty()) {
                 // make sure the other resolutions don't get old settings
-                config->writeEntry( TQString::tqfromLatin1("Width"), 0 );
-                config->writeEntry( TQString::tqfromLatin1("Height"), 0 );
+                config->writeEntry( TQString::fromLatin1("Width"), 0 );
+                config->writeEntry( TQString::fromLatin1("Height"), 0 );
             }
         }
         if ( !size.isEmpty() ) {
@@ -979,12 +979,12 @@ void KMainWindow::restoreWindowSize( KConfig * config )
 
 bool KMainWindow::initialGeometrySet() const
 {
-    return d->care_about_tqgeometry;
+    return d->care_about_geometry;
 }
 
 void KMainWindow::ignoreInitialGeometry()
 {
-    d->care_about_tqgeometry = false;
+    d->care_about_geometry = false;
 }
 
 void KMainWindow::setSettingsDirty()
@@ -1073,7 +1073,7 @@ KMenuBar *KMainWindow::menuBar()
     KMenuBar * mb = internalMenuBar();
     if ( !mb ) {
         mb = new KMenuBar( this );
-        // trigger a re-tqlayout and trigger a call to the private
+        // trigger a re-layout and trigger a call to the private
         // setMenuBar method.
         TQMainWindow::menuBar();
     }
@@ -1085,7 +1085,7 @@ KStatusBar *KMainWindow::statusBar()
     KStatusBar * sb = internalStatusBar();
     if ( !sb ) {
         sb = new KStatusBar( this );
-        // trigger a re-tqlayout and trigger a call to the private
+        // trigger a re-layout and trigger a call to the private
         // setStatusBar method.
         TQMainWindow::statusBar();
     }
@@ -1188,16 +1188,16 @@ TQSize KMainWindow::sizeForCentralWidgetSize(TQSize size)
         {
           case KToolBar::Top:
           case KToolBar::Bottom:
-            size += TQSize(0, tb->tqsizeHint().height());
+            size += TQSize(0, tb->sizeHint().height());
             break;
 
           case KToolBar::Left:
           case KToolBar::Right:
-            size += TQSize(toolBar()->tqsizeHint().width(), 0);
+            size += TQSize(toolBar()->sizeHint().width(), 0);
             break;
 
           case KToolBar::Flat:
-            size += TQSize(0, 3+kapp->style().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent ));
+            size += TQSize(0, 3+kapp->style().pixelMetric( TQStyle::PM_DockWindowHandleExtent ));
             break;
 
           default:
@@ -1207,12 +1207,12 @@ TQSize KMainWindow::sizeForCentralWidgetSize(TQSize size)
     KMenuBar *mb = internalMenuBar();
     if (mb && !mb->isHidden()) {
         size += TQSize(0,mb->heightForWidth(size.width()));
-        if (style().tqstyleHint(TQStyle::SH_MainWindow_SpaceBelowMenuBar, this))
+        if (style().styleHint(TQStyle::SH_MainWindow_SpaceBelowMenuBar, this))
            size += TQSize( 0, dockWindowsMovable() ? 1 : 2);
     }
     TQStatusBar *sb = internalStatusBar();
     if( sb && !sb->isHidden() )
-       size += TQSize(0, sb->tqsizeHint().height());
+       size += TQSize(0, sb->sizeHint().height());
 
     return size;
 }
diff --git a/kdeui/kmainwindow.h b/kdeui/kmainwindow.h
index b5536f51a..fbadc0471 100644
--- a/kdeui/kmainwindow.h
+++ b/kdeui/kmainwindow.h
@@ -50,7 +50,7 @@ class DCOPObject;
  * Top level widget that provides toolbars, a status line and a frame.
  *
  * It should be used as a top level (parent-less) widget.
- * It manages the tqgeometry for all its children, including your
+ * It manages the geometry for all its children, including your
  * main widget.
  *
  * Normally, you will inherit from KMainWindow,
@@ -74,7 +74,7 @@ class DCOPObject;
 *
  * KMainWindow will set icon, mini icon and caption, which it gets
  * from KApplication. It provides full session management, and
- * will save its position, tqgeometry and positions of toolbars and
+ * will save its position, geometry and positions of toolbars and
  * menubar on logout. If you want to save additional data, reimplement
  * saveProperties() and (to read them again on next login)
  * readProperties(). To save special data about your data, reimplement
@@ -168,7 +168,7 @@ public:
     /**
      * Retrieve the standard help menu.
      *
-     * It tqcontains entires for the
+     * It contains entires for the
      * help system (activated by F1), an optional "What's This?" entry
      * (activated by Shift F1), an application specific dialog box,
      * and an "About KDE" dialog box.
@@ -195,7 +195,7 @@ public:
     /**
      * Returns the help menu. Creates a standard help menu if none exists yet.
      *
-     * It tqcontains entries for the
+     * It contains entries for the
      * help system (activated by F1), an optional "What's This?" entry
      * (activated by Shift F1), an application specific dialog box,
      * and an "About KDE" dialog box. You must create the application
@@ -325,7 +325,7 @@ public:
      * then it will try to construct a local XML filename like
      * appnameui.rc where 'appname' is your app's name.  If that file
      * does not exist, then the XML UI code will only use the global
-     * (standard) XML file for the tqlayout purposes.
+     * (standard) XML file for the layout purposes.
      *
      * Note that when passing true for the conserveMemory argument subsequent
      * calls to guiFactory()->addClient/removeClient may not work as expected.
@@ -384,7 +384,7 @@ public:
      */
     static TQPtrList<KMainWindow>* memberList;
 
-    //KDE4: tqreplace with memberList() and make memberList member private
+    //KDE4: replace with memberList() and make memberList member private
     /**
      * List of members of KMainWindow class.
      * @since 3.4
@@ -444,10 +444,10 @@ public:
      *   have been created and placed inside the main window (i.e. for 99% of
      *   apps setCentralWidget())
      * - Widgets that inherit from TQWidget (like game boards) should overload
-     *   "virtual TQSize tqsizeHint() const;" to specify a default size rather
+     *   "virtual TQSize sizeHint() const;" to specify a default size rather
      *   than letting TQWidget::adjust use the default size of 0x0.
      */
-    void setAutoSaveSettings( const TQString & groupName = TQString::tqfromLatin1("MainWindow"),
+    void setAutoSaveSettings( const TQString & groupName = TQString::fromLatin1("MainWindow"),
                               bool saveWindowSize = true );
 
     /**
@@ -576,7 +576,7 @@ public:
         Save = 8,
 
         /**
-         * calls createGUI() once ToolBar, Keys and tqStatusbar have been
+         * calls createGUI() once ToolBar, Keys and Statusbar have been
          * taken care of.  See createGUI
          */
         Create = 16
@@ -587,7 +587,7 @@ public:
      * fashion.  The options are all enabled by default but can be turned
      * off if desired through the params or if the prereqs don't exists.
      *
-     * Typically this function tqreplaces createGUI().
+     * Typically this function replaces createGUI().
      *
      * @see StandardWindowOptions
      *
@@ -602,7 +602,7 @@ public:
      *
      * @p defaultSize The default size of the window
      *
-     * Typically this function tqreplaces createGUI().
+     * Typically this function replaces createGUI().
      *
      * @see StandardWindowOptions
      *
@@ -632,7 +632,7 @@ public:
     void finalizeGUI( bool force );
 
     /**
-     * @return true if a -tqgeometry argument was given on the command line,
+     * @return true if a -geometry argument was given on the command line,
      * and this is the first window created (the one on which this option applies)
      */
     bool initialGeometrySet() const;
@@ -649,11 +649,11 @@ public:
      *
      * @deprecated You normally don't need this, the recommended way to achieve a
      *   certain central widget size is as follows:
-     *     @li Override tqsizeHint() in the central widget so that it
+     *     @li Override sizeHint() in the central widget so that it
      *      returns the desired size.
      *     @li Call updateGeometry() in the central widget whenever the
-     *      desired size changes. This ensures that the new tqsizeHint() is properly
-     *      propagated to any parent tqlayout.
+     *      desired size changes. This ensures that the new sizeHint() is properly
+     *      propagated to any parent layout.
      *     @li Now call adjustSize() in the mainwindow to resize the
      *      mainwindow such that the central widget will become the desired size.
      *
@@ -923,16 +923,16 @@ protected:
     /**
      * For inherited classes
      * Note that the group must be set before calling, and that
-     * a -tqgeometry on the command line has priority.
+     * a -geometry on the command line has priority.
      */
     void restoreWindowSize( KConfig * config );
 
-    /// parse the tqgeometry from the tqgeometry command line argument
+    /// parse the geometry from the geometry command line argument
     void parseGeometry(bool parsewidth);
 
 protected slots:
    /**
-    * Rebuilds the GUI after KEditToolbar changed the toolbar tqlayout.
+    * Rebuilds the GUI after KEditToolbar changed the toolbar layout.
     * @see configureToolbars()
     */
    void saveNewToolbarConfig(); // TODO KDE4: make virtual and reimplement in KParts::MainWindow
@@ -1016,7 +1016,7 @@ private:
 
 /**
  *  These global convenience functions (that come with a varying
- *  number of template arguments) are a tqreplacement for the RESTORE
+ *  number of template arguments) are a replacement for the RESTORE
  *  macro provided in earlier versions of KDE. The old RESTORE macro
  *  is still provided for backwards compatibility. See
  *  KMainWindow documentation for more.
@@ -1028,7 +1028,7 @@ template <typename T>
 inline void kRestoreMainWindows() {
   for ( int n = 1 ; KMainWindow::canBeRestored( n ) ; ++n ) {
     const TQString className = KMainWindow::classNameOfToplevel( n );
-    if ( className == TQString::tqfromLatin1( T::staticMetaObject()->className() ) )
+    if ( className == TQString::fromLatin1( T::staticMetaObject()->className() ) )
       (new T)->restore( n );
   }
 }
@@ -1040,9 +1040,9 @@ inline void kRestoreMainWindows() {
   classNames[1] = T1::staticMetaObject()->className();
   for ( int n = 1 ; KMainWindow::canBeRestored( n ) ; ++n ) {
     const TQString className = KMainWindow::classNameOfToplevel( n );
-    if ( className == TQString::tqfromLatin1( classNames[0] ) )
+    if ( className == TQString::fromLatin1( classNames[0] ) )
       (new T0)->restore( n );
-    else if ( className == TQString::tqfromLatin1( classNames[1] ) )
+    else if ( className == TQString::fromLatin1( classNames[1] ) )
       (new T1)->restore( n );
   }
 }
@@ -1055,11 +1055,11 @@ inline void kRestoreMainWindows() {
   classNames[2] = T2::staticMetaObject()->className();
   for ( int n = 1 ; KMainWindow::canBeRestored( n ) ; ++n ) {
     const TQString className = KMainWindow::classNameOfToplevel( n );
-    if ( className == TQString::tqfromLatin1( classNames[0] ) )
+    if ( className == TQString::fromLatin1( classNames[0] ) )
       (new T0)->restore( n );
-    else if ( className == TQString::tqfromLatin1( classNames[1] ) )
+    else if ( className == TQString::fromLatin1( classNames[1] ) )
       (new T1)->restore( n );
-    else if ( className == TQString::tqfromLatin1( classNames[2] ) )
+    else if ( className == TQString::fromLatin1( classNames[2] ) )
       (new T2)->restore( n );
   }
 }
diff --git a/kdeui/kmenubar.cpp b/kdeui/kmenubar.cpp
index 5660b4cad..d2accb61d 100644
--- a/kdeui/kmenubar.cpp
+++ b/kdeui/kmenubar.cpp
@@ -136,7 +136,7 @@ KMenuBar::KMenuBar(TQWidget *parent, const char *name)
     connect( &d->selection_timer, TQT_SIGNAL( timeout()),
         this, TQT_SLOT( selectionTimeout()));
 
-    connect( tqApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( updateFallbackSize()));
+    connect( qApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( updateFallbackSize()));
 
     if ( kapp )
         // toolbarAppearanceChanged(int) is sent when changing macstyle
@@ -163,8 +163,8 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level)
     top_level = true;
 
   d->wasTopLevel = top_level;
-  if( tqparentWidget()
-      && tqparentWidget()->tqtopLevelWidget()->isFullScreen())
+  if( parentWidget()
+      && parentWidget()->topLevelWidget()->isFullScreen())
     top_level = false;
 
   if ( isTopLevelMenu() == top_level )
@@ -185,19 +185,19 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level)
       d->margin = margin();
       d->fallback_mode = false;
       bool wasShown = !isHidden();
-      reparent( tqparentWidget(), WType_TopLevel | WStyle_Tool | WStyle_Customize | WStyle_NoBorder, TQPoint(0,0), false );
+      reparent( parentWidget(), WType_TopLevel | WStyle_Tool | WStyle_Customize | WStyle_NoBorder, TQPoint(0,0), false );
 #ifdef Q_WS_X11
       KWin::setType( winId(), NET::TopMenu );
-      if( tqparentWidget())
-          XSetTransientForHint( qt_xdisplay(), winId(), tqparentWidget()->tqtopLevelWidget()->winId());
+      if( parentWidget())
+          XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId());
 #endif
       TQMenuBar::setFrameStyle( NoFrame );
       TQMenuBar::setLineWidth( 0 );
       TQMenuBar::setMargin( 0 );
       updateFallbackSize();
       d->min_size = TQSize( 0, 0 );
-      if( tqparentWidget() && !tqparentWidget()->isTopLevel())
-          setShown( tqparentWidget()->isVisible());
+      if( parentWidget() && !parentWidget()->isTopLevel())
+          setShown( parentWidget()->isVisible());
       else if ( wasShown )
           show();
   } else
@@ -213,8 +213,8 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level)
       setMinimumSize( 0, 0 );
       setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX );
       updateMenuBarSize();
-      if ( tqparentWidget() )
-          reparent( tqparentWidget(), TQPoint(0,0), !isHidden());
+      if ( parentWidget() )
+          reparent( parentWidget(), TQPoint(0,0), !isHidden());
   }
 }
 
@@ -240,34 +240,34 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev)
 {
     if ( d->topLevel )
     {
-	if ( tqparentWidget() && obj == tqparentWidget()->tqtopLevelWidget()  )
+	if ( parentWidget() && obj == parentWidget()->topLevelWidget()  )
         {
 	    if( ev->type() == TQEvent::Resize )
 		return false; // ignore resizing of parent, TQMenuBar would try to adjust size
 	    if ( ev->type() == TQEvent::Accel || ev->type() == TQEvent::AccelAvailable )
             {
-		if ( TQApplication::sendEvent( tqtopLevelWidget(), ev ) )
+		if ( TQApplication::sendEvent( topLevelWidget(), ev ) )
 		    return true;
 	    }
             if(ev->type() == TQEvent::ShowFullScreen )
                 // will update the state properly
                 setTopLevelMenuInternal( d->topLevel );
         }
-        if( tqparentWidget() && obj == tqparentWidget() && ev->type() == TQEvent::Reparent )
+        if( parentWidget() && obj == parentWidget() && ev->type() == TQEvent::Reparent )
             {
 #ifdef Q_WS_X11
-            XSetTransientForHint( qt_xdisplay(), winId(), tqparentWidget()->tqtopLevelWidget()->winId());
+            XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId());
 #else
             //TODO: WIN32?
 #endif
-            setShown( tqparentWidget()->isTopLevel() || tqparentWidget()->isVisible());
+            setShown( parentWidget()->isTopLevel() || parentWidget()->isVisible());
             }
-        if( tqparentWidget() && !tqparentWidget()->isTopLevel() && obj == tqparentWidget())
+        if( parentWidget() && !parentWidget()->isTopLevel() && obj == parentWidget())
         { // if the parent is not toplevel, KMenuBar needs to match its visibility status
             if( ev->type() == TQEvent::Show )
                 {
 #ifdef Q_WS_X11
-                XSetTransientForHint( qt_xdisplay(), winId(), tqparentWidget()->tqtopLevelWidget()->winId());
+                XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId());
 #else
                 //TODO: WIN32?
 #endif
@@ -279,10 +279,10 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev)
     }
     else
     {
-        if( tqparentWidget() && obj == tqparentWidget()->tqtopLevelWidget())
+        if( parentWidget() && obj == parentWidget()->topLevelWidget())
         {
             if( ev->type() == TQEvent::WindowStateChange
-                && !tqparentWidget()->tqtopLevelWidget()->isFullScreen() )
+                && !parentWidget()->topLevelWidget()->isFullScreen() )
                 setTopLevelMenuInternal( d->wasTopLevel );
         }
     }
@@ -330,7 +330,7 @@ void KMenuBar::selectionTimeout()
             TQApplication::desktop()->screenNumber(TQPoint(0,0)) );
         TQRect area;
         if (kapp->desktop()->numScreens() < 2)
-            area = kapp->desktop()->tqgeometry();
+            area = kapp->desktop()->geometry();
         else
             area = kapp->desktop()->screenGeometry(screen);
         int margin = 0;
@@ -372,7 +372,7 @@ void KMenuBar::setGeometry( int x, int y, int w, int h )
 	return;
     }
     checkSize( w, h );
-    if( tqgeometry() != TQRect( x, y, w, h ))
+    if( geometry() != TQRect( x, y, w, h ))
         TQMenuBar::setGeometry( x, y, w, h );
 }
 
@@ -390,7 +390,7 @@ void KMenuBar::checkSize( int& w, int& h )
 {
     if( !d->topLevel || d->fallback_mode )
 	return;
-    TQSize s = tqsizeHint();
+    TQSize s = sizeHint();
     w = s.width();
     h = s.height();
     // This is not done as setMinimumSize(), because that would set the minimum
@@ -400,17 +400,17 @@ void KMenuBar::checkSize( int& w, int& h )
     h = KMAX( h, d->min_size.height());
 }
 
-// QMenuBar's tqsizeHint() gives wrong size (insufficient width), which causes wrapping in the kicker applet
-TQSize KMenuBar::tqsizeHint() const
+// QMenuBar's sizeHint() gives wrong size (insufficient width), which causes wrapping in the kicker applet
+TQSize KMenuBar::sizeHint() const
 {
     if( !d->topLevel || block_resize > 0 )
-        return TQMenuBar::tqsizeHint();
-    // Since TQMenuBar::tqsizeHint() may indirectly call resize(),
+        return TQMenuBar::sizeHint();
+    // Since TQMenuBar::sizeHint() may indirectly call resize(),
     // avoid infinite recursion.
     ++block_resize;
-    // tqfind the minimum useful height, and enlarge the width until the menu fits in that height (one row)
+    // find the minimum useful height, and enlarge the width until the menu fits in that height (one row)
     int h = heightForWidth( 1000000 );
-    int w = TQMenuBar::tqsizeHint().width();
+    int w = TQMenuBar::sizeHint().width();
     // optimization - don't call heightForWidth() too many times
     while( heightForWidth( w + 12 ) > h )
         w += 12;
@@ -444,7 +444,7 @@ bool KMenuBar::x11Event( XEvent* ev )
 void KMenuBar::updateMenuBarSize()
     {
     menuContentsChanged(); // trigger invalidating calculated size
-    resize( tqsizeHint());   // and resize to preferred size
+    resize( sizeHint());   // and resize to preferred size
     }
 
 void KMenuBar::setFrameStyle( int style )
@@ -509,16 +509,16 @@ void KMenuBar::drawContents( TQPainter* p )
 	p->eraseRect( rect() );
 	erase();
         
-        TQColorGroup g = tqcolorGroup();
+        TQColorGroup g = colorGroup();
         bool e;
 
         for ( int i=0; i<(int)count(); i++ )
         {
-            TQMenuItem *mi = tqfindItem( idAt( i ) );
+            TQMenuItem *mi = findItem( idAt( i ) );
 
             if ( !mi->text().isNull() || mi->pixmap() )
             {
-                TQRect r = tqitemRect(i);
+                TQRect r = itemRect(i);
                 if(r.isEmpty() || !mi->isVisible())
                     continue;
 
@@ -544,7 +544,7 @@ void KMenuBar::drawContents( TQPainter* p )
                         flags |= TQStyle::Style_Down;
                     flags |= TQStyle::Style_HasFocus;
 
-                    style().tqdrawControl(TQStyle::CE_MenuBarItem, p, this,
+                    style().drawControl(TQStyle::CE_MenuBarItem, p, this,
                                         r, g, flags, TQStyleOption(mi));
                 }
                 else
diff --git a/kdeui/kmenubar.h b/kdeui/kmenubar.h
index e0e19007c..548a0c12f 100644
--- a/kdeui/kmenubar.h
+++ b/kdeui/kmenubar.h
@@ -84,7 +84,7 @@ public:
     virtual void setFrameStyle( int );
     virtual void setLineWidth( int );
     virtual void setMargin( int );
-    virtual TQSize tqsizeHint() const;
+    virtual TQSize sizeHint() const;
 protected slots:
     void slotReadConfig();
 protected:
diff --git a/kdeui/kmessagebox.cpp b/kdeui/kmessagebox.cpp
index dcfe0a83f..8e9256677 100644
--- a/kdeui/kmessagebox.cpp
+++ b/kdeui/kmessagebox.cpp
@@ -219,7 +219,7 @@ int KMessageBox::createKMessageBox(KDialogBase *dialog, TQPixmap icon,
     }
 
     // We add 10 pixels extra to compensate for some KActiveLabel margins.
-    // TODO: tqfind out why this is 10.
+    // TODO: find out why this is 10.
     label2->setFixedSize(TQSize(pref_width+10, pref_height));
     lay->addWidget( label2 );
     lay->addStretch();
@@ -247,7 +247,7 @@ int KMessageBox::createKMessageBox(KDialogBase *dialog, TQPixmap icon,
        if ( details.length() < 512 ) {
          KActiveLabel *label3 = new KActiveLabel(qrichtextify(details),
                                                  detailsGroup);
-         label3->setMinimumSize(label3->tqsizeHint());
+         label3->setMinimumSize(label3->sizeHint());
          if (!(options & KMessageBox::AllowLink))
          {
            TQObject::disconnect(label3, TQT_SIGNAL(linkClicked(const TQString &)),
@@ -288,7 +288,7 @@ int KMessageBox::createKMessageBox(KDialogBase *dialog, TQPixmap icon,
 		btn->setFocus();
 
     if ( (options & KMessageBox::Notify) )
-        sendNotification( text, strlist, notifyType, dialog->tqtopLevelWidget()->winId());
+        sendNotification( text, strlist, notifyType, dialog->topLevelWidget()->winId());
 
     if (KMessageBox_queue)
     {
@@ -342,7 +342,7 @@ KMessageBox::shouldBeShownYesNo(const TQString &dontShowAgainName,
                                 ButtonCode &result)
 {
     if ( dontShowAgainName.isEmpty() ) return true;
-    TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages");
+    TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
     KConfig *config = againConfig ? againConfig : KGlobal::config();
     KConfigGroupSaver saver( config, grpNotifMsgs );
     TQString dontAsk = config->readEntry(dontShowAgainName).lower();
@@ -361,7 +361,7 @@ bool
 KMessageBox::shouldBeShownContinue(const TQString &dontShowAgainName)
 {
     if ( dontShowAgainName.isEmpty() ) return true;
-    TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages");
+    TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
     KConfig *config = againConfig ? againConfig : KGlobal::config();
     KConfigGroupSaver saver( config, grpNotifMsgs );
     return config->readBoolEntry(dontShowAgainName,  true);
@@ -372,7 +372,7 @@ KMessageBox::saveDontShowAgainYesNo(const TQString &dontShowAgainName,
                                     ButtonCode result)
 {
     if ( dontShowAgainName.isEmpty() ) return;
-    TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages");
+    TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
     KConfig *config = againConfig ? againConfig : KGlobal::config();
     KConfigGroupSaver saver( config, grpNotifMsgs );
     config->writeEntry( dontShowAgainName, result==Yes ? "yes" : "no", true, (dontShowAgainName[0] == ':'));
@@ -383,7 +383,7 @@ void
 KMessageBox::saveDontShowAgainContinue(const TQString &dontShowAgainName)
 {
     if ( dontShowAgainName.isEmpty() ) return;
-    TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages");
+    TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
     KConfig *config = againConfig ? againConfig : KGlobal::config();
     KConfigGroupSaver saver( config, grpNotifMsgs );
     config->writeEntry( dontShowAgainName, false, true, (dontShowAgainName[0] == ':'));
@@ -423,7 +423,7 @@ KMessageBox::questionYesNoListWId(WId parent_id, const TQString &text,
     if ( !shouldBeShownYesNo(dontAskAgainName, res) )
         return res;
 
-    TQWidget* parent = TQWidget::tqfind( parent_id );
+    TQWidget* parent = TQWidget::find( parent_id );
     KDialogBase *dialog= new KDialogBase(
                        caption.isEmpty() ? i18n("Question") : caption,
                        KDialogBase::Yes | KDialogBase::No,
@@ -474,7 +474,7 @@ KMessageBox::questionYesNoCancelWId(WId parent_id,
     if ( !shouldBeShownYesNo(dontAskAgainName, res) )
         return res;
 
-    TQWidget* parent = TQWidget::tqfind( parent_id );
+    TQWidget* parent = TQWidget::find( parent_id );
     KDialogBase *dialog= new KDialogBase(
                        caption.isEmpty() ? i18n("Question") : caption,
                        KDialogBase::Yes | KDialogBase::No | KDialogBase::Cancel,
@@ -556,7 +556,7 @@ KMessageBox::warningYesNoListWId(WId parent_id, const TQString &text,
     if ( !shouldBeShownYesNo(dontAskAgainName, res) )
         return res;
 
-    TQWidget* parent = TQWidget::tqfind( parent_id );
+    TQWidget* parent = TQWidget::find( parent_id );
     KDialogBase *dialog= new KDialogBase(
                        caption.isEmpty() ? i18n("Warning") : caption,
                        KDialogBase::Yes | KDialogBase::No,
@@ -628,7 +628,7 @@ KMessageBox::warningContinueCancelListWId(WId parent_id, const TQString &text,
     if ( !shouldBeShownContinue(dontAskAgainName) )
         return Continue;
 
-    TQWidget* parent = TQWidget::tqfind( parent_id );
+    TQWidget* parent = TQWidget::find( parent_id );
     KDialogBase *dialog= new KDialogBase(
                        caption.isEmpty() ? i18n("Warning") : caption,
                        KDialogBase::Yes | KDialogBase::No,
@@ -704,7 +704,7 @@ KMessageBox::warningYesNoCancelListWId(WId parent_id, const TQString &text,
     if ( !shouldBeShownYesNo(dontAskAgainName, res) )
         return res;
 
-    TQWidget* parent = TQWidget::tqfind( parent_id );
+    TQWidget* parent = TQWidget::find( parent_id );
     KDialogBase *dialog= new KDialogBase(
                        caption.isEmpty() ? i18n("Warning") : caption,
                        KDialogBase::Yes | KDialogBase::No | KDialogBase::Cancel,
@@ -755,7 +755,7 @@ void
 KMessageBox::errorListWId(WId parent_id,  const TQString &text, const TQStringList &strlist,
                    const TQString &caption, int options)
 {
-    TQWidget* parent = TQWidget::tqfind( parent_id );
+    TQWidget* parent = TQWidget::find( parent_id );
     KDialogBase *dialog= new KDialogBase(
                        caption.isEmpty() ? i18n("Error") : caption,
                        KDialogBase::Yes,
@@ -785,7 +785,7 @@ KMessageBox::detailedErrorWId(WId parent_id,  const TQString &text,
                    const TQString &details,
                    const TQString &caption, int options)
 {
-    TQWidget* parent = TQWidget::tqfind( parent_id );
+    TQWidget* parent = TQWidget::find( parent_id );
     KDialogBase *dialog= new KDialogBase(
                        caption.isEmpty() ? i18n("Error") : caption,
                        KDialogBase::Yes | KDialogBase::Details,
@@ -832,7 +832,7 @@ void
 KMessageBox::sorryWId(WId parent_id, const TQString &text,
                    const TQString &caption, int options)
 {
-    TQWidget* parent = TQWidget::tqfind( parent_id );
+    TQWidget* parent = TQWidget::find( parent_id );
     KDialogBase *dialog= new KDialogBase(
                        caption.isEmpty() ? i18n("Sorry") : caption,
                        KDialogBase::Yes,
@@ -862,7 +862,7 @@ KMessageBox::detailedSorryWId(WId parent_id, const TQString &text,
                    const TQString &details,
                    const TQString &caption, int options)
 {
-    TQWidget* parent = TQWidget::tqfind( parent_id );
+    TQWidget* parent = TQWidget::find( parent_id );
     KDialogBase *dialog= new KDialogBase(
                        caption.isEmpty() ? i18n("Sorry") : caption,
                        KDialogBase::Yes | KDialogBase::Details,
@@ -908,7 +908,7 @@ KMessageBox::informationListWId(WId parent_id,const TQString &text, const TQStri
     if ( !shouldBeShownContinue(dontShowAgainName) )
         return;
 
-    TQWidget* parent = TQWidget::tqfind( parent_id );
+    TQWidget* parent = TQWidget::find( parent_id );
     KDialogBase *dialog= new KDialogBase(
                        caption.isEmpty() ? i18n("Information") : caption,
                        KDialogBase::Yes,
@@ -936,7 +936,7 @@ void
 KMessageBox::enableAllMessages()
 {
    KConfig *config = againConfig ? againConfig : KGlobal::config();
-   TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages");
+   TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
    if (!config->hasGroup(grpNotifMsgs))
       return;
 
@@ -956,7 +956,7 @@ void
 KMessageBox::enableMessage(const TQString &dontShowAgainName)
 {
    KConfig *config = againConfig ? againConfig : KGlobal::config();
-   TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages");
+   TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
    if (!config->hasGroup(grpNotifMsgs))
       return;
 
diff --git a/kdeui/kmessagebox.h b/kdeui/kmessagebox.h
index 96f907879..a543e106f 100644
--- a/kdeui/kmessagebox.h
+++ b/kdeui/kmessagebox.h
@@ -740,7 +740,7 @@ public:
   * or your user did something stupid.
   *
   * To be used for small problems like
-  * "Sorry, I can't tqfind the file you specified."
+  * "Sorry, I can't find the file you specified."
   *
   * The default button is "&OK". Pressing "Esc" selects the OK-button.
   *
@@ -778,7 +778,7 @@ public:
   * or your user did something stupid.
   *
   * To be used for small problems like
-  * "Sorry, I can't tqfind the file you specified."
+  * "Sorry, I can't find the file you specified."
   *
   * And then @p details can contain something like
   * "foobar.txt was not found in any of
@@ -1100,7 +1100,7 @@ public:
     static void setDontShowAskAgainConfig(KConfig* cfg);
 
     /**
-     * Create content and tqlayout of a standard dialog
+     * Create content and layout of a standard dialog
      *
      * @param dialog  The parent dialog base
      * @param icon    Which predefined icon the message box shall show.
@@ -1114,7 +1114,7 @@ public:
      * @param details Detailed message string.
      * @since 3.3
      * @return A KDialogBase button code, not a KMessageBox button code,
-     *         based on the buttontqmask given to the constructor of the
+     *         based on the buttonmask given to the constructor of the
      *         @p dialog (ie. will return KDialogBase::Yes [256] instead of 
      *         KMessageBox::Yes [3]). Will return KMessageBox::Cancel
      *         if the message box is queued for display instead of 
@@ -1128,7 +1128,7 @@ public:
                              int options, const TQString &details=TQString::null);
 
     /**
-     * Create content and tqlayout of a standard dialog
+     * Create content and layout of a standard dialog
      *
      * @param dialog  The parent dialog base
      * @param icon    A TQPixmap containing the icon to be displayed in the
@@ -1145,7 +1145,7 @@ public:
      *                is presentend.
      * @since 3.3
      * @return A KDialogBase button code, not a KMessageBox button code,
-     *         based on the buttontqmask given to the constructor of the
+     *         based on the buttonmask given to the constructor of the
      *         @p dialog (ie. will return KDialogBase::Yes [256] instead of 
      *         KMessageBox::Yes [3]). Will return KMessageBox::Cancel
      *         if the message box is queued for display instead of 
diff --git a/kdeui/knuminput.cpp b/kdeui/knuminput.cpp
index 8e9c00d4f..4d3075bb2 100644
--- a/kdeui/knuminput.cpp
+++ b/kdeui/knuminput.cpp
@@ -86,7 +86,7 @@ void KNumInput::init()
 
     m_label = 0;
     m_slider = 0;
-    m_tqalignment = 0;
+    m_alignment = 0;
 }
 
 KNumInput::~KNumInput()
@@ -103,20 +103,20 @@ void KNumInput::setLabel(const TQString & label, int a)
     if(label.isEmpty()) {
         delete m_label;
         m_label = 0;
-        m_tqalignment = 0;
+        m_alignment = 0;
     }
     else {
         if (m_label) m_label->setText(label);
         else m_label = new TQLabel(label, this, "KNumInput::TQLabel");
-        m_label->tqsetAlignment((a & (~(AlignTop|AlignBottom|AlignVCenter)))
+        m_label->setAlignment((a & (~(AlignTop|AlignBottom|AlignVCenter)))
                               | AlignVCenter);
-        // if no vertical tqalignment set, use Top tqalignment
+        // if no vertical alignment set, use Top alignment
         if(!(a & (AlignTop|AlignBottom|AlignVCenter)))
            a |= AlignTop;
-        m_tqalignment = a;
+        m_alignment = a;
     }
 
-    tqlayout(true);
+    layout(true);
 }
 
 TQString KNumInput::label() const
@@ -125,21 +125,21 @@ TQString KNumInput::label() const
     return TQString::null;
 }
 
-void KNumInput::tqlayout(bool deep)
+void KNumInput::layout(bool deep)
 {
     int w1 = m_colw1;
     int w2 = m_colw2;
 
-    // label tqsizeHint
-    m_sizeLabel = (m_label ? m_label->tqsizeHint() : TQSize(0,0));
+    // label sizeHint
+    m_sizeLabel = (m_label ? m_label->sizeHint() : TQSize(0,0));
 
-    if(m_label && (m_tqalignment & AlignVCenter))
+    if(m_label && (m_alignment & AlignVCenter))
         m_colw1 = m_sizeLabel.width() + 4;
     else
         m_colw1 = 0;
 
-    // slider tqsizeHint
-    m_sizeSlider = (m_slider ? m_slider->tqsizeHint() : TQSize(0, 0));
+    // slider sizeHint
+    m_sizeSlider = (m_slider ? m_slider->sizeHint() : TQSize(0, 0));
 
     doLayout();
 
@@ -187,9 +187,9 @@ TQSizePolicy KNumInput::sizePolicy() const
     return TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed );
 }
 
-TQSize KNumInput::tqsizeHint() const
+TQSize KNumInput::sizeHint() const
 {
-    return tqminimumSizeHint();
+    return minimumSizeHint();
 }
 
 void KNumInput::setSteps(int minor, int major)
@@ -204,7 +204,7 @@ void KNumInput::setSteps(int minor, int major)
 KIntSpinBox::KIntSpinBox(TQWidget *parent, const char *name)
     : TQSpinBox(0, 99, 1, parent, name)
 {
-    editor()->tqsetAlignment(AlignRight);
+    editor()->setAlignment(AlignRight);
     val_base = 10;
     setValue(0);
 }
@@ -217,7 +217,7 @@ KIntSpinBox::KIntSpinBox(int lower, int upper, int step, int value, int base,
                          TQWidget* parent, const char* name)
     : TQSpinBox(lower, upper, step, parent, name)
 {
-    editor()->tqsetAlignment(AlignRight);
+    editor()->setAlignment(AlignRight);
     val_base = base;
     setValue(value);
 }
@@ -298,7 +298,7 @@ void KIntNumInput::init(int val, int _base)
 	    TQT_SLOT(slotEmitRelativeValueChanged(int)));
 
     setFocusProxy(m_spin);
-    tqlayout(true);
+    layout(true);
 }
 
 void KIntNumInput::setReferencePoint( int ref ) {
@@ -360,7 +360,7 @@ void KIntNumInput::setRange(int lower, int upper, int step, bool slider)
     // check that reference point is still inside valid range:
     setReferencePoint( referencePoint() );
 
-    tqlayout(true);
+    layout(true);
 }
 
 void KIntNumInput::setMinValue(int min)
@@ -387,7 +387,7 @@ void KIntNumInput::setSuffix(const TQString &suffix)
 {
     m_spin->setSuffix(suffix);
 
-    tqlayout(true);
+    layout(true);
 }
 
 TQString KIntNumInput::suffix() const
@@ -399,7 +399,7 @@ void KIntNumInput::setPrefix(const TQString &prefix)
 {
     m_spin->setPrefix(prefix);
 
-    tqlayout(true);
+    layout(true);
 }
 
 TQString KIntNumInput::prefix() const
@@ -412,7 +412,7 @@ void KIntNumInput::setEditFocus(bool mark)
     m_spin->setEditFocus(mark);
 }
 
-TQSize KIntNumInput::tqminimumSizeHint() const
+TQSize KIntNumInput::minimumSizeHint() const
 {
     constPolish();
 
@@ -422,16 +422,16 @@ TQSize KIntNumInput::tqminimumSizeHint() const
     h = 2 + QMAX(m_sizeSpin.height(), m_sizeSlider.height());
 
     // if in extra row, then count it here
-    if(m_label && (m_tqalignment & (AlignBottom|AlignTop)))
+    if(m_label && (m_alignment & (AlignBottom|AlignTop)))
         h += 4 + m_sizeLabel.height();
     else
         // label is in the same row as the other widgets
         h = QMAX(h, m_sizeLabel.height() + 2);
 
-    w = m_slider ? m_slider->tqsizeHint().width() + 8 : 0;
+    w = m_slider ? m_slider->sizeHint().width() + 8 : 0;
     w += m_colw1 + m_colw2;
 
-    if(m_tqalignment & (AlignTop|AlignBottom))
+    if(m_alignment & (AlignTop|AlignBottom))
         w = QMAX(w, m_sizeLabel.width() + 4);
 
     return TQSize(w, h);
@@ -439,7 +439,7 @@ TQSize KIntNumInput::tqminimumSizeHint() const
 
 void KIntNumInput::doLayout()
 {
-    m_sizeSpin = m_spin->tqsizeHint();
+    m_sizeSpin = m_spin->sizeHint();
     m_colw2 = m_sizeSpin.width();
 
     if (m_label)
@@ -451,15 +451,15 @@ void KIntNumInput::resizeEvent(TQResizeEvent* e)
     int w = m_colw1;
     int h = 0;
 
-    if(m_label && (m_tqalignment & AlignTop)) {
+    if(m_label && (m_alignment & AlignTop)) {
         m_label->setGeometry(0, 0, e->size().width(), m_sizeLabel.height());
         h += m_sizeLabel.height() + KDialog::spacingHint();
     }
 
-    if(m_label && (m_tqalignment & AlignVCenter))
+    if(m_label && (m_alignment & AlignVCenter))
         m_label->setGeometry(0, 0, w, m_sizeSpin.height());
 
-    if (tqApp->reverseLayout())
+    if (qApp->reverseLayout())
     {
         m_spin->setGeometry(w, h, m_slider ? m_colw2 : QMAX(m_colw2, e->size().width() - w), m_sizeSpin.height());
         w += m_colw2 + 8;
@@ -477,7 +477,7 @@ void KIntNumInput::resizeEvent(TQResizeEvent* e)
 
     h += m_sizeSpin.height() + 2;
 
-    if(m_label && (m_tqalignment & AlignBottom))
+    if(m_label && (m_alignment & AlignBottom))
         m_label->setGeometry(0, h, m_sizeLabel.width(), m_sizeLabel.height());
 }
 
@@ -512,7 +512,7 @@ int  KIntNumInput::value() const
 void KIntNumInput::setSpecialValueText(const TQString& text)
 {
     m_spin->setSpecialValueText(text);
-    tqlayout(true);
+    layout(true);
 }
 
 TQString KIntNumInput::specialValueText() const
@@ -618,7 +618,7 @@ void KDoubleNumInput::init(double value, double lower, double upper,
 
     updateLegacyMembers();
 
-    tqlayout(true);
+    layout(true);
 }
 
 void KDoubleNumInput::updateLegacyMembers() {
@@ -653,7 +653,7 @@ void KDoubleNumInput::slotEmitRelativeValueChanged( double value )
     emit relativeValueChanged( value / d->referencePoint );
 }
 
-TQSize KDoubleNumInput::tqminimumSizeHint() const
+TQSize KDoubleNumInput::minimumSizeHint() const
 {
     constPolish();
 
@@ -663,16 +663,16 @@ TQSize KDoubleNumInput::tqminimumSizeHint() const
     h = 2 + QMAX(m_sizeEdit.height(), m_sizeSlider.height());
 
     // if in extra row, then count it here
-    if(m_label && (m_tqalignment & (AlignBottom|AlignTop)))
+    if(m_label && (m_alignment & (AlignBottom|AlignTop)))
         h += 4 + m_sizeLabel.height();
     else
         // label is in the same row as the other widgets
 	h = QMAX(h, m_sizeLabel.height() + 2);
 
-    w = m_slider ? m_slider->tqsizeHint().width() + 8 : 0;
+    w = m_slider ? m_slider->sizeHint().width() + 8 : 0;
     w += m_colw1 + m_colw2;
 
-    if(m_tqalignment & (AlignTop|AlignBottom))
+    if(m_alignment & (AlignTop|AlignBottom))
         w = QMAX(w, m_sizeLabel.width() + 4);
 
     return TQSize(w, h);
@@ -683,15 +683,15 @@ void KDoubleNumInput::resizeEvent(TQResizeEvent* e)
     int w = m_colw1;
     int h = 0;
 
-    if(m_label && (m_tqalignment & AlignTop)) {
+    if(m_label && (m_alignment & AlignTop)) {
         m_label->setGeometry(0, 0, e->size().width(), m_sizeLabel.height());
         h += m_sizeLabel.height() + 4;
     }
 
-    if(m_label && (m_tqalignment & AlignVCenter))
+    if(m_label && (m_alignment & AlignVCenter))
         m_label->setGeometry(0, 0, w, m_sizeEdit.height());
 
-    if (tqApp->reverseLayout())
+    if (qApp->reverseLayout())
     {
         d->spin->setGeometry(w, h, m_slider ? m_colw2
                                             : e->size().width() - w, m_sizeEdit.height());
@@ -713,13 +713,13 @@ void KDoubleNumInput::resizeEvent(TQResizeEvent* e)
 
     h += m_sizeEdit.height() + 2;
 
-    if(m_label && (m_tqalignment & AlignBottom))
+    if(m_label && (m_alignment & AlignBottom))
         m_label->setGeometry(0, h, m_sizeLabel.width(), m_sizeLabel.height());
 }
 
 void KDoubleNumInput::doLayout()
 {
-    m_sizeEdit = d->spin->tqsizeHint();
+    m_sizeEdit = d->spin->sizeHint();
     m_colw2 = m_sizeEdit.width();
 }
 
@@ -786,7 +786,7 @@ void KDoubleNumInput::setRange(double lower, double upper, double step,
 
     setReferencePoint( referencePoint() );
 
-    tqlayout(true);
+    layout(true);
     updateLegacyMembers();
 }
 
@@ -840,21 +840,21 @@ void KDoubleNumInput::setSuffix(const TQString &suffix)
 {
     d->spin->setSuffix( suffix );
 
-    tqlayout(true);
+    layout(true);
 }
 
 void KDoubleNumInput::setPrefix(const TQString &prefix)
 {
     d->spin->setPrefix( prefix );
 
-    tqlayout(true);
+    layout(true);
 }
 
 void KDoubleNumInput::setPrecision(int precision)
 {
     d->spin->setPrecision( precision );
 
-    tqlayout(true);
+    layout(true);
 }
 
 int KDoubleNumInput::precision() const
@@ -866,7 +866,7 @@ void KDoubleNumInput::setSpecialValueText(const TQString& text)
 {
     d->spin->setSpecialValueText( text );
 
-    tqlayout(true);
+    layout(true);
     updateLegacyMembers();
 }
 
@@ -915,7 +915,7 @@ TQValidator::State KDoubleSpinBoxValidator::validate( TQString& str, int& pos )
             int corePos = pos - pref.length();
             state = KDoubleValidator::validate( core, corePos );
             pos = corePos + pref.length();
-            str.tqreplace( pref.length(), str.length() - overhead, core );
+            str.replace( pref.length(), str.length() - overhead, core );
         } else {
             state = KDoubleValidator::validate( str, pos );
             if ( state == Invalid ) {
@@ -996,7 +996,7 @@ public:
 KDoubleSpinBox::KDoubleSpinBox( TQWidget * parent, const char * name )
   : TQSpinBox( parent, name )
 {
-  editor()->tqsetAlignment( Qt::AlignRight );
+  editor()->setAlignment( Qt::AlignRight );
   d = new Private();
   updateValidator();
   connect( this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)) );
@@ -1007,7 +1007,7 @@ KDoubleSpinBox::KDoubleSpinBox( double lower, double upper, double step,
 				TQWidget * parent, const char * name )
   : TQSpinBox( parent, name )
 {
-  editor()->tqsetAlignment( Qt::AlignRight );
+  editor()->setAlignment( Qt::AlignRight );
   d = new Private();
   setRange( lower, upper, step, precision );
   setValue( value );
diff --git a/kdeui/knuminput.h b/kdeui/knuminput.h
index 882e9d3ec..4c4c90732 100644
--- a/kdeui/knuminput.h
+++ b/kdeui/knuminput.h
@@ -67,7 +67,7 @@ public:
     ~KNumInput();
 
     /**
-     * Sets the text and tqalignment of the main description label.
+     * Sets the text and alignment of the main description label.
      *
      * @param label The text of the label.
      *              Use TQString::null to remove an existing one.
@@ -76,7 +76,7 @@ public:
      *          @p AlignTop, @p AlignVCenter, @p AlignBottom.
      *          default is @p AlignLeft | @p AlignTop.
      *
-     * The vertical tqalignment flags have special meaning with this
+     * The vertical alignment flags have special meaning with this
      * widget:
      *
      *     @li @p AlignTop     The label is placed above the edit/slider
@@ -116,18 +116,18 @@ public:
      *
      * @return the preferred size necessary to show the control
      */
-    virtual TQSize tqsizeHint() const;
+    virtual TQSize sizeHint() const;
 
 protected:
     /**
-     * Call this function whenever you change something in the tqgeometry
+     * Call this function whenever you change something in the geometry
      * of your KNumInput child.
      *
      */
-    void tqlayout(bool deep);
+    void layout(bool deep);
 
     /**
-     * You need to overwrite this method and implement your tqlayout
+     * You need to overwrite this method and implement your layout
      * calculations there.
      *
      * See KIntNumInput::doLayout and KDoubleNumInput::doLayout implementation
@@ -143,7 +143,7 @@ protected:
     TQSlider* m_slider;
     TQSize    m_sizeSlider, m_sizeLabel;
 
-    int      m_tqalignment;
+    int      m_alignment;
 
 private:
     void init();
@@ -222,9 +222,9 @@ public:
      * the difference to the one above is the "below" parameter. It tells
      * this instance that it is visually put below some other KNumInput widget.
      * Note that these two KNumInput's need not to have the same parent widget
-     * or be in the same tqlayout group.
-     * The effect is that it'll adjust it's tqlayout in correspondence
-     * with the tqlayout of the other KNumInput's (you can build an arbitrary long
+     * or be in the same layout group.
+     * The effect is that it'll adjust it's layout in correspondence
+     * with the layout of the other KNumInput's (you can build an arbitrary long
      * chain).
      *
      * @param below  append KIntNumInput to the KNumInput chain
@@ -312,11 +312,11 @@ public:
     /**
      * This method returns the minimum size necessary to display the
      * control. The minimum size is enough to show all the labels
-     * in the current font (font change may tqinvalidate the return value).
+     * in the current font (font change may invalidate the return value).
      *
      * @return the minimum size necessary to show the control
      */
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
 public slots:
     /**
@@ -498,9 +498,9 @@ public:
      * the difference here is the "below" parameter. It tells this
      * instance that it is visually put below some other KNumInput
      * widget.  Note that these two KNumInput's need not to have the
-     * same parent widget or be in the same tqlayout group.  The effect
-     * is that it'll adjust it's tqlayout in correspondence with the
-     * tqlayout of the other KNumInput's (you can build an arbitrary long
+     * same parent widget or be in the same layout group.  The effect
+     * is that it'll adjust it's layout in correspondence with the
+     * layout of the other KNumInput's (you can build an arbitrary long
      * chain).
      *
      * @param below  append KDoubleNumInput to the KDoubleNumInput chain
@@ -596,7 +596,7 @@ public:
     void setSpecialValueText(const TQString& text);
 
     virtual void setLabel(const TQString & label, int a = AlignLeft | AlignTop);
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize minimumSizeHint() const;
     virtual bool eventFilter(TQObject*, TQEvent*);
 
 public slots:
@@ -807,7 +807,7 @@ private:
    \endcode
 
    Since the value, bounds and lineStep are rounded to the current
-   precision, you may tqfind that the order of setting these
+   precision, you may find that the order of setting these
    parameters matters. As an example, the following are @em not equivalent (try
    it!):
 
@@ -871,7 +871,7 @@ public:
   int precision() const;
 
   /** Equivalent to setPrecision( @p precision, @p false ); Needed
-      since Qt's tqmoc doesn't ignore trailing parameters with default
+      since Qt's moc doesn't ignore trailing parameters with default
       args when searching for a property setter method. */
   void setPrecision( int precision );
 
diff --git a/kdeui/knumvalidator.cpp b/kdeui/knumvalidator.cpp
index e60730eed..436f95431 100644
--- a/kdeui/knumvalidator.cpp
+++ b/kdeui/knumvalidator.cpp
@@ -67,7 +67,7 @@ TQValidator::State KIntValidator::validate ( TQString &str, int & ) const
   if (_base > 10)
     newStr = newStr.upper();
 
-  if (newStr == TQString::tqfromLatin1("-")) // a special case
+  if (newStr == TQString::fromLatin1("-")) // a special case
     if ((_min || _max) && _min >= 0)
       ok = false;
     else
@@ -209,12 +209,12 @@ TQValidator::State KFloatValidator::validate ( TQString &str, int & ) const
   TQString newStr;
   newStr = str.stripWhiteSpace();
 
-  if (newStr == TQString::tqfromLatin1("-")) // a special case
+  if (newStr == TQString::fromLatin1("-")) // a special case
     if ((_min || _max) && _min >= 0)
       ok = false;
     else
       return TQValidator::Acceptable;
-  else if (newStr == TQString::tqfromLatin1(".") || (d->acceptLocalizedNumbers && newStr==KGlobal::locale()->decimalSymbol())) // another special case
+  else if (newStr == TQString::fromLatin1(".") || (d->acceptLocalizedNumbers && newStr==KGlobal::locale()->decimalSymbol())) // another special case
     return TQValidator::Acceptable;
   else if (newStr.length())
   {
@@ -339,30 +339,30 @@ TQValidator::State KDoubleValidator::validate( TQString & input, int & p ) const
             t = l->thousandsSeparator();
     // first, delete p's and t's:
     if ( !p.isEmpty() )
-      for ( int idx = s.tqfind( p ) ; idx >= 0 ; idx = s.tqfind( p, idx ) )
+      for ( int idx = s.find( p ) ; idx >= 0 ; idx = s.find( p, idx ) )
 	s.remove( idx, p.length() );
 
 
     if ( !t.isEmpty() )
-      for ( int idx = s.tqfind( t ) ; idx >= 0 ; idx = s.tqfind( t, idx ) )
+      for ( int idx = s.find( t ) ; idx >= 0 ; idx = s.find( t, idx ) )
 	s.remove( idx, t.length() );
 
-    // then, tqreplace the d's and n's
-    if ( ( !n.isEmpty() && n.tqfind('.') != -1 ) ||
-	 ( !d.isEmpty() && d.tqfind('-') != -1 ) ) {
-      // make sure we don't tqreplace something twice:
-      kdWarning() << "KDoubleValidator: decimal symbol tqcontains '-' or "
-		     "negative sign tqcontains '.' -> improve algorithm" << endl;
+    // then, replace the d's and n's
+    if ( ( !n.isEmpty() && n.find('.') != -1 ) ||
+	 ( !d.isEmpty() && d.find('-') != -1 ) ) {
+      // make sure we don't replace something twice:
+      kdWarning() << "KDoubleValidator: decimal symbol contains '-' or "
+		     "negative sign contains '.' -> improve algorithm" << endl;
       return Invalid;
     }
 
     if ( !d.isEmpty() && d != "." )
-      for ( int idx = s.tqfind( d ) ; idx >= 0 ; idx = s.tqfind( d, idx + 1 ) )
-	s.tqreplace( idx, d.length(), '.');
+      for ( int idx = s.find( d ) ; idx >= 0 ; idx = s.find( d, idx + 1 ) )
+	s.replace( idx, d.length(), '.');
 
     if ( !n.isEmpty() && n != "-" )
-      for ( int idx = s.tqfind( n ) ; idx >= 0 ; idx = s.tqfind( n, idx + 1 ) )
-	s.tqreplace( idx, n.length(), '-' );
+      for ( int idx = s.find( n ) ; idx >= 0 ; idx = s.find( n, idx + 1 ) )
+	s.replace( idx, n.length(), '-' );
   }
 
   return base::validate( s, p );
diff --git a/kdeui/kpanelapplet.cpp b/kdeui/kpanelapplet.cpp
index f89305f1f..817d9de60 100644
--- a/kdeui/kpanelapplet.cpp
+++ b/kdeui/kpanelapplet.cpp
@@ -47,7 +47,7 @@ KPanelApplet::KPanelApplet(const TQString& configFile, Type type,
   : TQFrame(parent, name, f)
   , _type(type)
   , _position( pBottom )
-  , _tqalignment( LeftTop )
+  , _alignment( LeftTop )
   , _config(0)
   , _actions(actions)
   , d(new KPanelApplet::KPanelAppletPrivate())
@@ -78,11 +78,11 @@ void KPanelApplet::setPosition( Position p )
   positionChange( p );
 }
 
-void KPanelApplet::tqsetAlignment( Alignment a )
+void KPanelApplet::setAlignment( Alignment a )
 {
-  if( _tqalignment == a ) return;
-  _tqalignment = a;
-  tqalignmentChange( a );
+  if( _alignment == a ) return;
+  _alignment = a;
+  alignmentChange( a );
 }
 
 // FIXME: Remove implementation for KDE 4
@@ -146,13 +146,13 @@ void KPanelApplet::watchForFocus(TQWidget* widget, bool watch)
 
     if (watch)
     {
-        if (d->watchedForFocus.tqfind(widget) == -1)
+        if (d->watchedForFocus.find(widget) == -1)
         {
             d->watchedForFocus.append(widget);
             widget->installEventFilter(this);
         }
     }
-    else if (d->watchedForFocus.tqfind(widget) != -1)
+    else if (d->watchedForFocus.find(widget) != -1)
     {
         d->watchedForFocus.remove(widget);
         widget->removeEventFilter(this);
@@ -172,7 +172,7 @@ void KPanelApplet::needsFocus(bool focus)
 
 bool KPanelApplet::eventFilter(TQObject *o, TQEvent * e)
 {
-    if (d->watchedForFocus.tqfind(o) != -1)
+    if (d->watchedForFocus.find(o) != -1)
     {
         if (e->type() == TQEvent::MouseButtonRelease ||
             e->type() == TQEvent::FocusIn)
diff --git a/kdeui/kpanelapplet.h b/kdeui/kpanelapplet.h
index 859906adb..7719c7b68 100644
--- a/kdeui/kpanelapplet.h
+++ b/kdeui/kpanelapplet.h
@@ -106,7 +106,7 @@ public:
     enum Type { Normal = 0, Stretch };
     /**
      * This enum holds flags which can be ORed together to describe
-     * which items the context menu over the applet handle tqcontains.
+     * which items the context menu over the applet handle contains.
      */
     // KDE4: Merge these with KPanelExtension's enums
     enum Action { About = 1, Help = 2, Preferences = 4, ReportBug = 8 };
@@ -224,22 +224,22 @@ public:
     /**
      * @internal
      **/
-    void tqsetAlignment( Alignment a );
+    void setAlignment( Alignment a );
 
 signals:
     /**
-     * Emit this signal to make the panel retqlayout all applets, when
+     * Emit this signal to make the panel relayout all applets, when
      * you want to change your width (horizontal panel) or
      * height (vertical panel).
      *
-     * The panel is going to retqlayout all applets based on their
+     * The panel is going to relayout all applets based on their
      * widthForHeight(int height) (horizontal panel) or
      * heightForWidth(int width) (vertical panel).
      *
      * Please note that the panel may change the applet's location
      * if the new widthForHeight(int height) (horizontal panel) or
      * heightForWidth(int width) (vertical panel) does not fit into the
-     * current panel tqlayout.
+     * current panel layout.
      **/
     void updateLayout();
 
@@ -308,9 +308,9 @@ protected:
      **/
     Position position() const { return _position; }
     /**
-     * @return the applet's tqalignment. (top/left, center, or bottom/right)
+     * @return the applet's alignment. (top/left, center, or bottom/right)
      **/
-    Alignment tqalignment() const { return _tqalignment; }
+    Alignment alignment() const { return _alignment; }
 
     /**
      * The panel on which this applet resides has changed its position.
@@ -320,11 +320,11 @@ protected:
     virtual void positionChange( Position p );
 
     /**
-     * The panel on which this applet resides has changed its tqalignment.
+     * The panel on which this applet resides has changed its alignment.
      * Reimplement this change handler in order to adjust the look of your
      * applet.
      **/
-    virtual void tqalignmentChange( Alignment /*a*/ ) {}
+    virtual void alignmentChange( Alignment /*a*/ ) {}
 
     /**
      * Use this method to set the custom menu for this applet so that it can be shown
@@ -383,7 +383,7 @@ protected:
 private:
     Type         _type;
     Position     _position;
-    Alignment    _tqalignment;
+    Alignment    _alignment;
     KConfig*     _config;
     int          _actions;
 protected:
diff --git a/kdeui/kpanelextension.cpp b/kdeui/kpanelextension.cpp
index 57db25c66..538756758 100644
--- a/kdeui/kpanelextension.cpp
+++ b/kdeui/kpanelextension.cpp
@@ -49,7 +49,7 @@ KPanelExtension::KPanelExtension(const TQString& configFile, Type type,
   : TQFrame(parent, name)
   , _type(type)
   , _position( Top )
-  , _tqalignment( LeftTop )
+  , _alignment( LeftTop )
   , _config(0)
   , _actions(actions)
 {
@@ -71,11 +71,11 @@ void KPanelExtension::setPosition( Position p )
   positionChange( p );
 }
 
-void KPanelExtension::tqsetAlignment( Alignment a )
+void KPanelExtension::setAlignment( Alignment a )
 {
-  if( _tqalignment == a ) return;
-  _tqalignment = a;
-  tqalignmentChange( a );
+  if( _alignment == a ) return;
+  _alignment = a;
+  alignmentChange( a );
 }
 
 void KPanelExtension::setSize( Size size, int customSize )
diff --git a/kdeui/kpanelextension.h b/kdeui/kpanelextension.h
index 7e223f8ac..8fe97956d 100644
--- a/kdeui/kpanelextension.h
+++ b/kdeui/kpanelextension.h
@@ -136,7 +136,7 @@ public:
      * location in the Window Manager Dock. Please note that the size can not be larger than the
      * maxsize given by the handler.
      **/
-    virtual TQSize tqsizeHint(Position /*p*/, TQSize maxsize) const { return maxsize; }
+    virtual TQSize sizeHint(Position /*p*/, TQSize maxsize) const { return maxsize; }
 
     /**
      * Always use this KConfig object to save/load your extensions configuration.
@@ -189,7 +189,7 @@ public:
     /**
      * @internal
      **/
-    void tqsetAlignment( Alignment a );
+    void setAlignment( Alignment a );
     /**
      * @internal
      * @since 3.1
@@ -216,7 +216,7 @@ public:
     TQPopupMenu* customMenu() const;
 
     /**
-     * @return whether or not to set a desktop tqgeometry claiming strut for this panel
+     * @return whether or not to set a desktop geometry claiming strut for this panel
      * defaults to true
      * @see setReservetrut(bool)
      * @since 3.4
@@ -225,9 +225,9 @@ public:
 
 signals:
     /**
-     * Emit this signal to make the panel retqlayout all extensions in the dock, when you want
+     * Emit this signal to make the panel relayout all extensions in the dock, when you want
      * to change the extensions size.
-     * The panel is going to retqlayout all extensions based on their preferred size.
+     * The panel is going to relayout all extensions based on their preferred size.
      **/
     void updateLayout();
 
@@ -282,9 +282,9 @@ protected:
     Position position() const { return _position; }
 
     /**
-     * @return the extension's tqalignment. (left/top, center, or right/bottom)
+     * @return the extension's alignment. (left/top, center, or right/bottom)
      **/
-    Alignment tqalignment() const { return _tqalignment; }
+    Alignment alignment() const { return _alignment; }
 
     /**
      * @return the extensions orientation. (horizontal or vertical)
@@ -305,11 +305,11 @@ protected:
     virtual void positionChange( Position ) {}
 
     /**
-     * This extension has changed its tqalignment.
+     * This extension has changed its alignment.
      * Reimplement this change handler in order to adjust the look of your
      * applet.
      **/
-    virtual void tqalignmentChange( Alignment ) {}
+    virtual void alignmentChange( Alignment ) {}
 
     /**
      * Use this method to set the custom menu for this extensions so that it can be shown
@@ -333,7 +333,7 @@ protected:
 private:
     Type         		_type;
     Position     		_position;
-    Alignment    		_tqalignment;
+    Alignment    		_alignment;
     KConfig*     		_config;
     int          		_actions;
 protected:
diff --git a/kdeui/kpanelmenu.h b/kdeui/kpanelmenu.h
index afa0fdc9e..de0b065eb 100644
--- a/kdeui/kpanelmenu.h
+++ b/kdeui/kpanelmenu.h
@@ -44,7 +44,7 @@ class KPanelMenuPrivate;
  * the menu object.
  *
  * Finally, you also have to provide a desktop file describing your dynamic menu. The
- * relevant entries are: Name, Comment, Icon and X-KDE-Library (which tqcontains the
+ * relevant entries are: Name, Comment, Icon and X-KDE-Library (which contains the
  * library name without any extension). This desktop file has to be installed in
  * $KDEDIR/share/apps/kicker/menuext/.
  *
@@ -87,7 +87,7 @@ public:
      */
     void setPath(const TQString &p);
     /**
-     * Tell if the menu has been initialized, that is it already tqcontains items.
+     * Tell if the menu has been initialized, that is it already contains items.
      * This is useful when you need to know if you have to clear the menu, or to
      * fill it.
      * @return the initial state
diff --git a/kdeui/kpartgui.dtd b/kdeui/kpartgui.dtd
index 36cbe2a4d..a3cbb8121 100644
--- a/kdeui/kpartgui.dtd
+++ b/kdeui/kpartgui.dtd
@@ -12,7 +12,7 @@
 -->
 
 <!--The root element that must enclose all other tags in the document. This element
-  tqreplaces the kpartgui element used previously.
+  replaces the kpartgui element used previously.
   
   NOTE: do not forget to increase the version attribute for each change in
   your file or the changes will not be taken!!
diff --git a/kdeui/kpassdlg.cpp b/kdeui/kpassdlg.cpp
index 567c1bab2..11db31eb5 100644
--- a/kdeui/kpassdlg.cpp
+++ b/kdeui/kpassdlg.cpp
@@ -69,10 +69,10 @@ static int * ourMaxLength( const KPasswordEdit* const e ) {
 		d_ptr->setAutoDelete(true);
 		qAddPostRoutine( cleanup_d_ptr );
 	}
-	int* ret = d_ptr->tqfind( (void*) e );
+	int* ret = d_ptr->find( (void*) e );
 	if ( ! ret ) {
 		ret = new int;
-		d_ptr->tqreplace( (void*) e, ret );
+		d_ptr->replace( (void*) e, ret );
 	}
 	return ret;
 }
@@ -339,7 +339,7 @@ void KPasswordDialog::init()
 
     KConfig* const cfg = KGlobal::config();
     const KConfigGroupSaver saver(cfg, "Passwords");
-    bool def = ( qstrcmp( tqAppName(), "kdesu" ) == 0 ? defKeep : false );
+    bool def = ( qstrcmp( qAppName(), "kdesu" ) == 0 ? defKeep : false );
     if (m_Keep && cfg->readBoolEntry("Keep", def))
 	++m_Keep;
 
@@ -354,13 +354,13 @@ void KPasswordDialog::init()
     if (!pix.isNull()) {
 	lbl = new TQLabel(m_pMain);
 	lbl->setPixmap(pix);
-	lbl->tqsetAlignment(AlignHCenter|AlignVCenter);
-	lbl->setFixedSize(lbl->tqsizeHint());
+	lbl->setAlignment(AlignHCenter|AlignVCenter);
+	lbl->setFixedSize(lbl->sizeHint());
 	m_pGrid->addWidget(lbl, 0, 0, AlignCenter);
     }
 
     m_pHelpLbl = new TQLabel(m_pMain);
-    m_pHelpLbl->tqsetAlignment(AlignLeft|AlignVCenter|WordBreak);
+    m_pHelpLbl->setAlignment(AlignLeft|AlignVCenter|WordBreak);
     m_pGrid->addWidget(m_pHelpLbl, 0, 2, AlignLeft);
     m_pGrid->addRowSpacing(1, 10);
     m_pGrid->setRowStretch(1, 12);
@@ -371,9 +371,9 @@ void KPasswordDialog::init()
 
     // Row 3: Password editor #1
     lbl = new TQLabel(m_pMain);
-    lbl->tqsetAlignment(AlignLeft|AlignVCenter);
+    lbl->setAlignment(AlignLeft|AlignVCenter);
     lbl->setText(i18n("&Password:"));
-    lbl->setFixedSize(lbl->tqsizeHint());
+    lbl->setFixedSize(lbl->sizeHint());
     m_pGrid->addWidget(lbl, 7, 0, AlignLeft);
 
     TQHBoxLayout *h_lay = new TQHBoxLayout();
@@ -381,7 +381,7 @@ void KPasswordDialog::init()
     m_pEdit = new KPasswordEdit(m_pMain);
     m_pEdit2 = 0;
     lbl->setBuddy(m_pEdit);
-    TQSize size = m_pEdit->tqsizeHint();
+    TQSize size = m_pEdit->sizeHint();
     m_pEdit->setFixedHeight(size.height());
     m_pEdit->setMinimumWidth(size.width());
     h_lay->addWidget(m_pEdit);
@@ -392,7 +392,7 @@ void KPasswordDialog::init()
 	m_pGrid->addRowSpacing(8, 10);
 	m_pGrid->setRowStretch(8, 12);
 	TQCheckBox* const cb = new TQCheckBox(i18n("&Keep password"), m_pMain);
-	cb->setFixedSize(cb->tqsizeHint());
+	cb->setFixedSize(cb->sizeHint());
 	if (m_Keep > 1)
 	    cb->setChecked(true);
 	else
@@ -402,16 +402,16 @@ void KPasswordDialog::init()
     } else if (m_Type == NewPassword) {
 	m_pGrid->addRowSpacing(8, 10);
 	lbl = new TQLabel(m_pMain);
-	lbl->tqsetAlignment(AlignLeft|AlignVCenter);
+	lbl->setAlignment(AlignLeft|AlignVCenter);
 	lbl->setText(i18n("&Verify:"));
-	lbl->setFixedSize(lbl->tqsizeHint());
+	lbl->setFixedSize(lbl->sizeHint());
 	m_pGrid->addWidget(lbl, 9, 0, AlignLeft);
 
 	h_lay = new TQHBoxLayout();
 	m_pGrid->addLayout(h_lay, 9, 2);
 	m_pEdit2 = new KPasswordEdit(m_pMain);
 	lbl->setBuddy(m_pEdit2);
-	size = m_pEdit2->tqsizeHint();
+	size = m_pEdit2->sizeHint();
 	m_pEdit2->setFixedHeight(size.height());
 	m_pEdit2->setMinimumWidth(size.width());
 	h_lay->addWidget(m_pEdit2);
@@ -424,7 +424,7 @@ void KPasswordDialog::init()
         strengthBox->setSpacing(10);
         m_pGrid->addMultiCellWidget(strengthBox, 11, 11, 0, 2);
         TQLabel* const passStrengthLabel = new TQLabel(strengthBox);
-        passStrengthLabel->tqsetAlignment(AlignLeft|AlignVCenter);
+        passStrengthLabel->setAlignment(AlignLeft|AlignVCenter);
         passStrengthLabel->setText(i18n("Password strength meter:"));
         d->m_strengthBar = new KProgress(100, strengthBox, "PasswordStrengthMeter");
         d->m_strengthBar->setPercentageVisible(false);
@@ -443,7 +443,7 @@ void KPasswordDialog::init()
         m_pGrid->setRowStretch(12, 12);
 
         d->m_MatchLabel = new TQLabel(m_pMain);
-        d->m_MatchLabel->tqsetAlignment(AlignLeft|AlignVCenter|WordBreak);
+        d->m_MatchLabel->setAlignment(AlignLeft|AlignVCenter|WordBreak);
         m_pGrid->addMultiCellWidget(d->m_MatchLabel, 13, 13, 0, 2);
         d->m_MatchLabel->setText(i18n("Passwords do not match"));
 
@@ -490,12 +490,12 @@ void KPasswordDialog::addLine(TQString key, TQString value)
 	return;
 
     TQLabel *lbl = new TQLabel(key, m_pMain);
-    lbl->tqsetAlignment(AlignLeft|AlignTop);
-    lbl->setFixedSize(lbl->tqsizeHint());
+    lbl->setAlignment(AlignLeft|AlignTop);
+    lbl->setFixedSize(lbl->sizeHint());
     m_pGrid->addWidget(lbl, m_Row+2, 0, AlignLeft);
 
     lbl = new TQLabel(value, m_pMain);
-    lbl->tqsetAlignment(AlignTop|WordBreak);
+    lbl->setAlignment(AlignTop|WordBreak);
     lbl->setFixedSize(275, lbl->heightForWidth(275));
     m_pGrid->addWidget(lbl, m_Row+2, 2, AlignLeft);
     ++m_Row;
@@ -634,15 +634,15 @@ void KPasswordDialog::enableOkBtn()
       if (pwlength > 5) pwlength = 5;
 
       const TQRegExp numRxp("[0-9]", true, false);
-      int numeric = (int) (pass.tqcontains(numRxp) / lengthFactor);
+      int numeric = (int) (pass.contains(numRxp) / lengthFactor);
       if (numeric > 3) numeric = 3;
 
       const TQRegExp symbRxp("\\W", false, false);
-      int numsymbols = (int) (pass.tqcontains(symbRxp) / lengthFactor);
+      int numsymbols = (int) (pass.contains(symbRxp) / lengthFactor);
       if (numsymbols > 3) numsymbols = 3;
 
       const TQRegExp upperRxp("[A-Z]", true, false);
-      int upper = (int) (pass.tqcontains(upperRxp) / lengthFactor);
+      int upper = (int) (pass.contains(upperRxp) / lengthFactor);
       if (upper > 3) upper = 3;
 
       int pwstrength=((pwlength*10)-20) + (numeric*10) + (numsymbols*15) + (upper*10);
diff --git a/kdeui/kpassdlg.h b/kdeui/kpassdlg.h
index 58c356474..ab6156979 100644
--- a/kdeui/kpassdlg.h
+++ b/kdeui/kpassdlg.h
@@ -189,7 +189,7 @@ public:
     /**
      * Constructs a password dialog.
      *
-     * @param type: if NewPassword is given here, the dialog tqcontains two
+     * @param type: if NewPassword is given here, the dialog contains two
      *        input fields, so that the user must confirm his password
      *        and possible typos are detected immediately.
      * @param enableKeep: if true, a check box is shown in the dialog
@@ -215,7 +215,7 @@ public:
     /**
      * Construct a password dialog. Essentially the same as above but allows the
      * icon in the password dialog to be set via @p iconName.
-     * @param type if NewPassword is given here, the dialog tqcontains two
+     * @param type if NewPassword is given here, the dialog contains two
      * input fields, so that the user must confirm his password
      * and possible typos are detected immediately
      * @param enableKeep: if true, a check box is shown in the dialog
diff --git a/kdeui/kpassivepopup.cpp b/kdeui/kpassivepopup.cpp
index 69f2bd1aa..4b870c794 100644
--- a/kdeui/kpassivepopup.cpp
+++ b/kdeui/kpassivepopup.cpp
@@ -138,7 +138,7 @@ TQVBox * KPassivePopup::standardView( const TQString& caption,
 	hb->setSpacing( KDialog::spacingHint() );
 	ttlIcon = new TQLabel( hb, "title_icon" );
 	ttlIcon->setPixmap( icon );
-        ttlIcon->tqsetAlignment( AlignLeft );
+        ttlIcon->setAlignment( AlignLeft );
     }
 
     if ( !caption.isEmpty() ) {
@@ -146,14 +146,14 @@ TQVBox * KPassivePopup::standardView( const TQString& caption,
 	TQFont fnt = ttl->font();
 	fnt.setBold( true );
 	ttl->setFont( fnt );
-	ttl->tqsetAlignment( Qt::AlignHCenter );
+	ttl->setAlignment( Qt::AlignHCenter );
         if ( hb )
             hb->setStretchFactor( ttl, 10 ); // enforce centering
     }
 
     if ( !text.isEmpty() ) {
         msg = new TQLabel( text, vb, "msg_label" );
-        msg->tqsetAlignment( AlignLeft );
+        msg->setAlignment( AlignLeft );
     }
 
     return vb;
@@ -194,8 +194,8 @@ void KPassivePopup::mouseReleaseEvent( TQMouseEvent *e )
 
 void KPassivePopup::show()
 {
-    if ( size() != tqsizeHint() )
-	resize( tqsizeHint() );
+    if ( size() != sizeHint() )
+	resize( sizeHint() );
 
     if ( d->fixedPosition.isNull() )
 	positionSelf();
@@ -303,7 +303,7 @@ void KPassivePopup::moveNear( TQRect target )
 
     if( d->popupStyle == Balloon )
     {
-        // tqfind a point to anchor to
+        // find a point to anchor to
         if( x + w > r.width() ){
             x = x + target.width();
         }
@@ -356,8 +356,8 @@ void KPassivePopup::paintEvent( TQPaintEvent* pe )
 
 void KPassivePopup::updateMask()
 {
-    // get screen-tqgeometry for screen our anchor is on
-    // (tqgeometry can differ from screen to screen!
+    // get screen-geometry for screen our anchor is on
+    // (geometry can differ from screen to screen!
     TQRect deskRect = KGlobalSettings::desktopGeometry(d->anchor);
 
     int xh = 70, xl = 40;
@@ -376,8 +376,8 @@ void KPassivePopup::updateMask()
         TQPoint( width() - 50, height() - 50 )
     };
 
-    TQBitmap tqmask( width(), height(), true );
-    TQPainter p( &tqmask );
+    TQBitmap mask( width(), height(), true );
+    TQPainter p( &mask );
     TQBrush brush( Qt::white, Qt::SolidPattern );
     p.setBrush( brush );
 
@@ -421,7 +421,7 @@ void KPassivePopup::updateMask()
     d->surround.resize( z + 1 );
     d->surround.setPoint( z, d->surround[0] );
     p.drawPolygon( d->surround );
-    setMask(tqmask);
+    setMask(mask);
 
     move( right ? d->anchor.x() - width() + 20 : ( d->anchor.x() < 11 ? 11 : d->anchor.x() - 20 ),
           bottom ? d->anchor.y() - height() : ( d->anchor.y() < 11 ? 11 : d->anchor.y() ) );
diff --git a/kdeui/kpassivepopup.h b/kdeui/kpassivepopup.h
index 8a1bb85d4..326c995cb 100644
--- a/kdeui/kpassivepopup.h
+++ b/kdeui/kpassivepopup.h
@@ -324,7 +324,7 @@ protected:
     TQRect defaultArea() const;
 
     /**
-     * Updates the transparency tqmask. Unused if PopupStyle == Boxed
+     * Updates the transparency mask. Unused if PopupStyle == Boxed
      * @since 3.5
      */
     void updateMask();
diff --git a/kdeui/kpixmapio.cpp b/kdeui/kpixmapio.cpp
index 3946c58ad..74c68b82e 100644
--- a/kdeui/kpixmapio.cpp
+++ b/kdeui/kpixmapio.cpp
@@ -468,7 +468,7 @@ TQImage KPixmapIO::convertFromXImage()
 		cmap, ncells);
 	image.setNumColors(ncells);
 	for (i=0; i<ncells; i++)
-	    image.setColor(i, tqRgb(cmap[i].red, cmap[i].green, cmap[i].blue >> 8));
+	    image.setColor(i, qRgb(cmap[i].red, cmap[i].green, cmap[i].blue >> 8));
     } else
 	image.create(width, height, 32);
 
@@ -485,11 +485,11 @@ TQImage KPixmapIO::convertFromXImage()
     case bo16_RGB_565:
     case bo16_BGR_565:
     {
-	TQ_INT32 pixel, *src;
+	Q_INT32 pixel, *src;
 	QRgb *dst, val;
 	for (y=0; y<height; y++)
 	{
-	    src = (TQ_INT32 *) (data + y*bpl);
+	    src = (Q_INT32 *) (data + y*bpl);
 	    dst = (QRgb *) image.scanLine(y);
 	    for (x=0; x<width/2; x++)
 	    {
@@ -516,11 +516,11 @@ TQImage KPixmapIO::convertFromXImage()
     case bo16_RGB_555:
     case bo16_BGR_555:
     {
-	TQ_INT32 pixel, *src;
+	Q_INT32 pixel, *src;
 	QRgb *dst, val;
 	for (y=0; y<height; y++)
 	{
-	    src = (TQ_INT32 *) (data + y*bpl);
+	    src = (Q_INT32 *) (data + y*bpl);
 	    dst = (QRgb *) image.scanLine(y);
 	    for (x=0; x<width/2; x++)
 	    {
@@ -549,16 +549,16 @@ TQImage KPixmapIO::convertFromXImage()
 	char *src;
 	QRgb *dst;
 	int w1 = width/4;
-	TQ_INT32 d1, d2, d3;
+	Q_INT32 d1, d2, d3;
 	for (y=0; y<height; y++)
 	{
 	    src = data + y*bpl;
 	    dst = (QRgb *) image.scanLine(y);
 	    for (x=0; x<w1; x++)
 	    {
-		d1 = *((TQ_INT32 *)src);
-		d2 = *((TQ_INT32 *)src + 1);
-		d3 = *((TQ_INT32 *)src + 2);
+		d1 = *((Q_INT32 *)src);
+		d2 = *((Q_INT32 *)src + 1);
+		d3 = *((Q_INT32 *)src + 2);
 		src += 12;
 		*dst++ = d1;
 		*dst++ = (d1 >> 24) | (d2 << 8);
@@ -581,16 +581,16 @@ TQImage KPixmapIO::convertFromXImage()
 	char *src;
 	QRgb *dst;
 	int w1 = width/4;
-	TQ_INT32 d1, d2, d3;
+	Q_INT32 d1, d2, d3;
 	for (y=0; y<height; y++)
 	{
 	    src = data + y*bpl;
 	    dst = (QRgb *) image.scanLine(y);
 	    for (x=0; x<w1; x++)
 	    {
-		d1 = *((TQ_INT32 *)src);
-		d2 = *((TQ_INT32 *)src + 1);
-		d3 = *((TQ_INT32 *)src + 2);
+		d1 = *((Q_INT32 *)src);
+		d2 = *((Q_INT32 *)src + 1);
+		d3 = *((Q_INT32 *)src + 2);
 		src += 12;
 		*dst++ = d1;
 		*dst++ = (d1 >> 24) | (d2 << 8);
@@ -638,11 +638,11 @@ void KPixmapIO::convertToXImage(const TQImage &img)
 	if (img.depth() == 32)
 	{
 	    QRgb *src, pixel;
-	    TQ_INT32 *dst, val;
+	    Q_INT32 *dst, val;
 	    for (y=0; y<height; y++)
 	    {
 		src = (QRgb *) img.scanLine(y);
-		dst = (TQ_INT32 *) (data + y*bpl);
+		dst = (Q_INT32 *) (data + y*bpl);
 		for (x=0; x<width/2; x++)
 		{
 		    pixel = *src++;
@@ -656,19 +656,19 @@ void KPixmapIO::convertToXImage(const TQImage &img)
 		if (width%2)
 		{
 		    pixel = *src++;
-		    *((TQ_INT16 *)dst) = ((pixel & 0xf80000) >> 9) |
+		    *((Q_INT16 *)dst) = ((pixel & 0xf80000) >> 9) |
 			    ((pixel & 0xf800) >> 6) | ((pixel & 0xff) >> 3);
 		}
 	    }
 	} else
 	{
 	    uchar *src;
-	    TQ_INT32 val, *dst;
+	    Q_INT32 val, *dst;
 	    QRgb pixel, *clut = img.colorTable();
 	    for (y=0; y<height; y++)
 	    {
 		src = img.scanLine(y);
-		dst = (TQ_INT32 *) (data + y*bpl);
+		dst = (Q_INT32 *) (data + y*bpl);
 		for (x=0; x<width/2; x++)
 		{
 		    pixel = clut[*src++];
@@ -682,7 +682,7 @@ void KPixmapIO::convertToXImage(const TQImage &img)
 		if (width%2)
 		{
 		    pixel = clut[*src++];
-		    *((TQ_INT16 *)dst) = ((pixel & 0xf80000) >> 9) |
+		    *((Q_INT16 *)dst) = ((pixel & 0xf80000) >> 9) |
 			    ((pixel & 0xf800) >> 6) | ((pixel & 0xff) >> 3);
 		}
 	    }
@@ -695,11 +695,11 @@ void KPixmapIO::convertToXImage(const TQImage &img)
 	if (img.depth() == 32)
 	{
 	    QRgb *src, pixel;
-	    TQ_INT32 *dst, val;
+	    Q_INT32 *dst, val;
 	    for (y=0; y<height; y++)
 	    {
 		src = (QRgb *) img.scanLine(y);
-		dst = (TQ_INT32 *) (data + y*bpl);
+		dst = (Q_INT32 *) (data + y*bpl);
 		for (x=0; x<width/2; x++)
 		{
 		    pixel = *src++;
@@ -713,19 +713,19 @@ void KPixmapIO::convertToXImage(const TQImage &img)
 		if (width%2)
 		{
 		    pixel = *src++;
-		    *((TQ_INT16 *)dst) = ((pixel & 0xf80000) >> 8) |
+		    *((Q_INT16 *)dst) = ((pixel & 0xf80000) >> 8) |
 			    ((pixel & 0xfc00) >> 5) | ((pixel & 0xff) >> 3);
 		}
 	    }
 	} else
 	{
 	    uchar *src;
-	    TQ_INT32 val, *dst;
+	    Q_INT32 val, *dst;
 	    QRgb pixel, *clut = img.colorTable();
 	    for (y=0; y<height; y++)
 	    {
 		src = img.scanLine(y);
-		dst = (TQ_INT32 *) (data + y*bpl);
+		dst = (Q_INT32 *) (data + y*bpl);
 		for (x=0; x<width/2; x++)
 		{
 		    pixel = clut[*src++];
@@ -739,7 +739,7 @@ void KPixmapIO::convertToXImage(const TQImage &img)
 		if (width%2)
 		{
 		    pixel = clut[*src++];
-		    *((TQ_INT16 *)dst) = ((pixel & 0xf80000) >> 8) |
+		    *((Q_INT16 *)dst) = ((pixel & 0xf80000) >> 8) |
 			    ((pixel & 0xfc00) >> 5) | ((pixel & 0xff) >> 3);
 		}
 	    }
@@ -763,17 +763,17 @@ void KPixmapIO::convertToXImage(const TQImage &img)
 		    d2 = (*src++ & 0xffffff);
 		    d3 = (*src++ & 0xffffff);
 		    d4 = (*src++ & 0xffffff);
-		    *((TQ_INT32 *)dst) = d1 | (d2 << 24);
-		    *((TQ_INT32 *)dst+1) = (d2 >> 8) | (d3 << 16);
-		    *((TQ_INT32 *)dst+2) = (d4 << 8) | (d3 >> 16);
+		    *((Q_INT32 *)dst) = d1 | (d2 << 24);
+		    *((Q_INT32 *)dst+1) = (d2 >> 8) | (d3 << 16);
+		    *((Q_INT32 *)dst+2) = (d4 << 8) | (d3 >> 16);
 		    dst += 12;
 		}
 		for (x=w1*4; x<width; x++)
 		{
 		    d1 = *src++;
-		    *dst++ = tqRed(d1);
-		    *dst++ = tqGreen(d1);
-		    *dst++ = tqBlue(d1);
+		    *dst++ = qRed(d1);
+		    *dst++ = qGreen(d1);
+		    *dst++ = qBlue(d1);
 		}
 	    }
 	} else
@@ -791,17 +791,17 @@ void KPixmapIO::convertToXImage(const TQImage &img)
 		    d2 = (clut[*src++] & 0xffffff);
 		    d3 = (clut[*src++] & 0xffffff);
 		    d4 = (clut[*src++] & 0xffffff);
-		    *((TQ_INT32 *)dst) = d1 | (d2 << 24);
-		    *((TQ_INT32 *)dst+1) = (d2 >> 8) | (d3 << 16);
-		    *((TQ_INT32 *)dst+2) = (d4 << 8) | (d3 >> 16);
+		    *((Q_INT32 *)dst) = d1 | (d2 << 24);
+		    *((Q_INT32 *)dst+1) = (d2 >> 8) | (d3 << 16);
+		    *((Q_INT32 *)dst+2) = (d4 << 8) | (d3 >> 16);
 		    dst += 12;
 		}
 		for (x=w1*4; x<width; x++)
 		{
 		    d1 = clut[*src++];
-		    *dst++ = tqRed(d1);
-		    *dst++ = tqGreen(d1);
-		    *dst++ = tqBlue(d1);
+		    *dst++ = qRed(d1);
+		    *dst++ = qGreen(d1);
+		    *dst++ = qBlue(d1);
 		}
 	    }
 	}
@@ -824,17 +824,17 @@ void KPixmapIO::convertToXImage(const TQImage &img)
 		    d2 = (*src++ & 0xffffff);
 		    d3 = (*src++ & 0xffffff);
 		    d4 = (*src++ & 0xffffff);
-		    *((TQ_INT32 *)dst) = d1 | (d2 << 24);
-		    *((TQ_INT32 *)dst+1) = (d2 >> 8) | (d3 << 16);
-		    *((TQ_INT32 *)dst+2) = (d4 << 8) | (d3 >> 16);
+		    *((Q_INT32 *)dst) = d1 | (d2 << 24);
+		    *((Q_INT32 *)dst+1) = (d2 >> 8) | (d3 << 16);
+		    *((Q_INT32 *)dst+2) = (d4 << 8) | (d3 >> 16);
 		    dst += 12;
 		}
 		for (x=w1*4; x<width; x++)
 		{
 		    d1 = *src++;
-		    *dst++ = tqBlue(d1);
-		    *dst++ = tqGreen(d1);
-		    *dst++ = tqRed(d1);
+		    *dst++ = qBlue(d1);
+		    *dst++ = qGreen(d1);
+		    *dst++ = qRed(d1);
 		}
 	    }
 	} else
@@ -852,17 +852,17 @@ void KPixmapIO::convertToXImage(const TQImage &img)
 		    d2 = (clut[*src++] & 0xffffff);
 		    d3 = (clut[*src++] & 0xffffff);
 		    d4 = (clut[*src++] & 0xffffff);
-		    *((TQ_INT32 *)dst) = d1 | (d2 << 24);
-		    *((TQ_INT32 *)dst+1) = (d2 >> 8) | (d3 << 16);
-		    *((TQ_INT32 *)dst+2) = (d4 << 8) | (d3 >> 16);
+		    *((Q_INT32 *)dst) = d1 | (d2 << 24);
+		    *((Q_INT32 *)dst+1) = (d2 >> 8) | (d3 << 16);
+		    *((Q_INT32 *)dst+2) = (d4 << 8) | (d3 >> 16);
 		    dst += 12;
 		}
 		for (x=w1*4; x<width; x++)
 		{
 		    d1 = clut[*src++];
-		    *dst++ = tqBlue(d1);
-		    *dst++ = tqGreen(d1);
-		    *dst++ = tqRed(d1);
+		    *dst++ = qBlue(d1);
+		    *dst++ = qGreen(d1);
+		    *dst++ = qRed(d1);
 		}
 	    }
 	}
diff --git a/kdeui/kpixmapregionselectorwidget.cpp b/kdeui/kpixmapregionselectorwidget.cpp
index 19dcd8292..ada867bba 100644
--- a/kdeui/kpixmapregionselectorwidget.cpp
+++ b/kdeui/kpixmapregionselectorwidget.cpp
@@ -223,7 +223,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev)
 
       TQCursor cursor;
 
-      if ( m_selectedRegion.tqcontains( mev->pos() ) 
+      if ( m_selectedRegion.contains( mev->pos() ) 
           && m_selectedRegion!=m_originalPixmap.rect() )
       {
          m_state=Moving;
diff --git a/kdeui/kpopupmenu.cpp b/kdeui/kpopupmenu.cpp
index 468703ed3..6765216b4 100644
--- a/kdeui/kpopupmenu.cpp
+++ b/kdeui/kpopupmenu.cpp
@@ -110,9 +110,9 @@ void KPopupTitle::paintEvent(TQPaintEvent *)
     }
 }
 
-TQSize KPopupTitle::tqsizeHint() const
+TQSize KPopupTitle::sizeHint() const
 {
-    return tqminimumSize();
+    return minimumSize();
 }
 
 class KPopupMenu::KPopupMenuPrivate
@@ -198,7 +198,7 @@ int KPopupMenu::insertTitle(const TQPixmap &icon, const TQString &text, int id,
 
 void KPopupMenu::changeTitle(int id, const TQString &text)
 {
-    TQMenuItem *item = tqfindItem(id);
+    TQMenuItem *item = findItem(id);
     if(item){
         if(item->widget())
             ((KPopupTitle *)item->widget())->setTitle(text);
@@ -215,7 +215,7 @@ void KPopupMenu::changeTitle(int id, const TQString &text)
 
 void KPopupMenu::changeTitle(int id, const TQPixmap &icon, const TQString &text)
 {
-    TQMenuItem *item = tqfindItem(id);
+    TQMenuItem *item = findItem(id);
     if(item){
         if(item->widget())
             ((KPopupTitle *)item->widget())->setTitle(text, &icon);
@@ -234,7 +234,7 @@ TQString KPopupMenu::title(int id) const
 {
     if(id == -1) // obsolete
         return d->m_lastTitle;
-    TQMenuItem *item = tqfindItem(id);
+    TQMenuItem *item = findItem(id);
     if(item){
         if(item->widget())
             return ((KPopupTitle *)item->widget())->title();
@@ -248,7 +248,7 @@ TQString KPopupMenu::title(int id) const
 
 TQPixmap KPopupMenu::titlePixmap(int id) const
 {
-    TQMenuItem *item = tqfindItem(id);
+    TQMenuItem *item = findItem(id);
     if(item){
         if(item->widget())
             return ((KPopupTitle *)item->widget())->icon();
@@ -377,13 +377,13 @@ void KPopupMenu::keyPressEvent(TQKeyEvent* e)
 
         // if there is an accelerator present, remove it
         if ((int)accel(j) != 0)
-            thisText = thisText.tqreplace("&", TQString::null);
+            thisText = thisText.replace("&", TQString::null);
 
         // chop text to the search length
         thisText = thisText.left(seqLen);
 
         // do the search
-        if (!thisText.tqfind(d->keySeq, 0, false)) {
+        if (!thisText.find(d->keySeq, 0, false)) {
 
             if (firstpass) {
                 // match
@@ -424,8 +424,8 @@ void KPopupMenu::keyPressEvent(TQKeyEvent* e)
             activateItemAt(d->lastHitIndex);
             resetKeyboardVars();
 
-        } else if (tqfindItem(idAt(d->lastHitIndex)) &&
-                 tqfindItem(idAt(d->lastHitIndex))->popup()) {
+        } else if (findItem(idAt(d->lastHitIndex)) &&
+                 findItem(idAt(d->lastHitIndex))->popup()) {
             // only activate sub-menus
             activateItemAt(d->lastHitIndex);
             resetKeyboardVars();
@@ -552,7 +552,7 @@ void KPopupMenu::itemHighlighted(int /* whichItem */)
 
 void KPopupMenu::showCtxMenu(TQPoint pos)
 {
-    TQMenuItem* item = tqfindItem(KPopupMenuPrivate::s_highlightedItem);
+    TQMenuItem* item = findItem(KPopupMenuPrivate::s_highlightedItem);
     if (item)
     {
         TQPopupMenu* subMenu = item->popup();
@@ -572,7 +572,7 @@ void KPopupMenu::showCtxMenu(TQPoint pos)
 
     emit aboutToShowContextMenu(this, KPopupMenuPrivate::s_highlightedItem, d->m_ctxMenu);
 
-    TQPopupMenu* subMenu = tqfindItem(KPopupMenuPrivate::s_highlightedItem)->popup();
+    TQPopupMenu* subMenu = findItem(KPopupMenuPrivate::s_highlightedItem)->popup();
     if (subMenu)
     {
         connect(subMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(ctxMenuHideShowingMenu()));
@@ -596,7 +596,7 @@ void KPopupMenu::showCtxMenu(TQPoint pos)
  */
 void KPopupMenu::ctxMenuHideShowingMenu()
 {
-    TQMenuItem* item = tqfindItem(KPopupMenuPrivate::s_highlightedItem);
+    TQMenuItem* item = findItem(KPopupMenuPrivate::s_highlightedItem);
     if (item)
     {
         TQPopupMenu* subMenu = item->popup();
@@ -611,7 +611,7 @@ void KPopupMenu::ctxMenuHiding()
 {
     if (KPopupMenuPrivate::s_highlightedItem)
     {
-        TQPopupMenu* subMenu = tqfindItem(KPopupMenuPrivate::s_highlightedItem)->popup();
+        TQPopupMenu* subMenu = findItem(KPopupMenuPrivate::s_highlightedItem)->popup();
         if (subMenu)
         {
             disconnect(subMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(ctxMenuHideShowingMenu()));
diff --git a/kdeui/kpopupmenu.h b/kdeui/kpopupmenu.h
index b94aa06a5..55ebbad8d 100644
--- a/kdeui/kpopupmenu.h
+++ b/kdeui/kpopupmenu.h
@@ -74,7 +74,7 @@ public:
      */
     TQPixmap icon() const { return miniicon; }
 
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
 
 public slots:
     /// @since 3.1
diff --git a/kdeui/kprogress.cpp b/kdeui/kprogress.cpp
index 23a3b06ab..17994eb88 100644
--- a/kdeui/kprogress.cpp
+++ b/kdeui/kprogress.cpp
@@ -132,9 +132,9 @@ bool KProgress::setIndicator(TQString &indicator, int progress, int totalSteps)
     if (!totalSteps)
         return false;
     TQString newString(mFormat);
-    newString.tqreplace(TQString::tqfromLatin1("%v"),
+    newString.replace(TQString::fromLatin1("%v"),
                       TQString::number(progress));
-    newString.tqreplace(TQString::tqfromLatin1("%m"),
+    newString.replace(TQString::fromLatin1("%m"),
                       TQString::number(totalSteps));
 
     if (totalSteps > INT_MAX / 1000) {
@@ -142,7 +142,7 @@ bool KProgress::setIndicator(TQString &indicator, int progress, int totalSteps)
         totalSteps /= 1000;
     }
 
-    newString.tqreplace(TQString::tqfromLatin1("%p"),
+    newString.replace(TQString::fromLatin1("%p"),
                       TQString::number((progress * 100) / totalSteps)); 
 
     if (newString != indicator)
@@ -188,13 +188,13 @@ KProgressDialog::KProgressDialog(TQWidget* parent, const char* name,
     mCancelText = actionButton(KDialogBase::Cancel)->text();
 
     TQFrame* mainWidget = plainPage();
-    TQVBoxLayout* tqlayout = new TQVBoxLayout(mainWidget, 10);
+    TQVBoxLayout* layout = new TQVBoxLayout(mainWidget, 10);
 
     mLabel = new TQLabel(text, mainWidget);
-    tqlayout->addWidget(mLabel);
+    layout->addWidget(mLabel);
 
     mProgressBar = new KProgress(mainWidget);
-    tqlayout->addWidget(mProgressBar);
+    layout->addWidget(mProgressBar);
 
     connect(mProgressBar, TQT_SIGNAL(percentageChanged(int)),
             this, TQT_SLOT(slotAutoActions(int)));
diff --git a/kdeui/kprogress.h b/kdeui/kprogress.h
index c0f865c5d..b86e28598 100644
--- a/kdeui/kprogress.h
+++ b/kdeui/kprogress.h
@@ -115,11 +115,11 @@ public slots:
    * The default format is "%p%" (which looks like "42%".)
    *
    * Note: Setting the format to anything other then "%p%" will force centerIndicator to true,
-   * since it's often impossible to tqlayout a progressbar with a more general format with the
+   * since it's often impossible to layout a progressbar with a more general format with the
    * indicator string anywhere else.
    *
-   * @param format "%p" is tqreplaced by percentage done, "%v" is tqreplaced by actual
-   * value, "%m" is tqreplaced by the maximum value.
+   * @param format "%p" is replaced by percentage done, "%v" is replaced by actual
+   * value, "%m" is replaced by the maximum value.
    */
   void setFormat(const TQString & format);
 
diff --git a/kdeui/kprogressbox.cpp b/kdeui/kprogressbox.cpp
index 2b15b878d..472d36fba 100644
--- a/kdeui/kprogressbox.cpp
+++ b/kdeui/kprogressbox.cpp
@@ -76,15 +76,15 @@ KProgressBoxDialog::KProgressBoxDialog(TQWidget* parent, const char* name,
     mCancelText = actionButton(KDialogBase::Cancel)->text();
 
     TQFrame* mainWidget = plainPage();
-    TQVBoxLayout* tqlayout = new TQVBoxLayout(mainWidget, 10);
+    TQVBoxLayout* layout = new TQVBoxLayout(mainWidget, 10);
 
     mLabel = new TQLabel(text, mainWidget);
-    tqlayout->addWidget(mLabel);
+    layout->addWidget(mLabel);
 
     mProgressBar = new KProgress(mainWidget);
-    tqlayout->addWidget(mProgressBar);
+    layout->addWidget(mProgressBar);
     mTextBox = new KTextEdit(mainWidget);
-    tqlayout->addWidget(mTextBox);
+    layout->addWidget(mTextBox);
 
     connect(mProgressBar, TQT_SIGNAL(percentageChanged(int)),
             this, TQT_SLOT(slotAutoActions(int)));
diff --git a/kdeui/kpushbutton.cpp b/kdeui/kpushbutton.cpp
index 12df91fd3..52679c0e5 100644
--- a/kdeui/kpushbutton.cpp
+++ b/kdeui/kpushbutton.cpp
@@ -98,7 +98,7 @@ void KPushButton::init( const KGuiItem &item )
 
     setIconSet( d->item.iconSet() );
 
-    tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
+    setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
 
     TQToolTip::add( this, item.toolTip() );
 
diff --git a/kdeui/krestrictedline.cpp b/kdeui/krestrictedline.cpp
index 1904eb0c8..85c52d54c 100644
--- a/kdeui/krestrictedline.cpp
+++ b/kdeui/krestrictedline.cpp
@@ -51,7 +51,7 @@ void KRestrictedLine::keyPressEvent( TQKeyEvent *e )
 
   // do we have a list of valid chars &&
   // is the pressed key in the list of valid chars?
-  if (!qsValidChars.isEmpty() && !qsValidChars.tqcontains(e->ascii()))
+  if (!qsValidChars.isEmpty() && !qsValidChars.contains(e->ascii()))
     {
       // invalid char, emit signal and return
       emit (invalidChar(e->key()));
diff --git a/kdeui/krootpixmap.cpp b/kdeui/krootpixmap.cpp
index d583a243d..cf6af3fdf 100644
--- a/kdeui/krootpixmap.cpp
+++ b/kdeui/krootpixmap.cpp
@@ -66,7 +66,7 @@ void KRootPixmap::init()
     m_bCustomPaint = false;
 
     connect(kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int)));
-    connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(tqrepaint()));
+    connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(repaint()));
 #ifdef Q_WS_X11
     connect(m_pPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(slotDone(bool)));
 
@@ -75,7 +75,7 @@ void KRootPixmap::init()
     connect(d->kwin, TQT_SIGNAL(currentDesktopChanged(int)), TQT_SLOT(desktopChanged(int)));
 #endif
 
-    d->toplevel = m_pWidget->tqtopLevelWidget();
+    d->toplevel = m_pWidget->topLevelWidget();
     d->toplevel->installEventFilter(this);
     m_pWidget->installEventFilter(this);
 }
@@ -113,7 +113,7 @@ void KRootPixmap::start()
 	return;
     }
     if (m_bInit)
-	tqrepaint(true);
+	repaint(true);
 }
 
 
@@ -134,7 +134,7 @@ void KRootPixmap::setFadeEffect(double fade, const TQColor &color)
 	m_Fade = fade;
     m_FadeColor = color;
 
-    if ( m_bActive && m_bInit ) tqrepaint(true);
+    if ( m_bActive && m_bInit ) repaint(true);
 }
 
 
@@ -163,7 +163,7 @@ bool KRootPixmap::eventFilter(TQObject *, TQEvent *event)
 
     case TQEvent::Reparent:
         d->toplevel->removeEventFilter(this);
-        d->toplevel = m_pWidget->tqtopLevelWidget();
+        d->toplevel = m_pWidget->topLevelWidget();
         d->toplevel->installEventFilter(this);
         break;
 
@@ -181,31 +181,31 @@ void KRootPixmap::desktopChanged(int desktop)
 	return;
 
 #ifdef Q_WS_X11
-    if (KWin::windowInfo(m_pWidget->tqtopLevelWidget()->winId()).desktop() == NET::OnAllDesktops &&
+    if (KWin::windowInfo(m_pWidget->topLevelWidget()->winId()).desktop() == NET::OnAllDesktops &&
 	pixmapName(m_Desk) != pixmapName(desktop))
 #endif
-	tqrepaint(true);
+	repaint(true);
 }
 
 void KRootPixmap::desktopChanged( WId window, unsigned int properties )
 {
 #ifdef Q_WS_X11
     if( !(properties & NET::WMDesktop) ||
-	(window != m_pWidget->tqtopLevelWidget()->winId()))
+	(window != m_pWidget->topLevelWidget()->winId()))
 	return;
 #endif
 
     kdDebug() << k_funcinfo << endl;
-    tqrepaint(true);
+    repaint(true);
 }
 
-void KRootPixmap::tqrepaint()
+void KRootPixmap::repaint()
 {
-    tqrepaint(false);
+    repaint(false);
 }
 
 
-void KRootPixmap::tqrepaint(bool force)
+void KRootPixmap::repaint(bool force)
 {
     TQPoint p1 = m_pWidget->mapToGlobal(m_pWidget->rect().topLeft());
     TQPoint p2 = m_pWidget->mapToGlobal(m_pWidget->rect().bottomRight());
@@ -226,7 +226,7 @@ void KRootPixmap::tqrepaint(bool force)
     }
     m_Rect = TQRect(p1, p2);
 #ifdef Q_WS_X11
-    m_Desk = KWin::windowInfo(m_pWidget->tqtopLevelWidget()->winId()).desktop();
+    m_Desk = KWin::windowInfo(m_pWidget->topLevelWidget()->winId()).desktop();
     if (m_Desk == NET::OnAllDesktops)
 	m_Desk = currentDesktop();
 
@@ -326,7 +326,7 @@ void KRootPixmap::slotBackgroundChanged(int desk)
 	return;
 
     if (desk == m_Desk)
-	tqrepaint(true);
+	repaint(true);
 }
 
 #include "krootpixmap.moc"
diff --git a/kdeui/krootpixmap.h b/kdeui/krootpixmap.h
index 60f9ac549..d714c93ef 100644
--- a/kdeui/krootpixmap.h
+++ b/kdeui/krootpixmap.h
@@ -43,7 +43,7 @@ class KRootPixmapData;
  * @author Geert Jansen <jansen@kde.org>
  * @version $Id$
  */
-class KDEUI_EXPORT KRootPixmap: public TQObject
+class KDEUI_EXPORT KRootPixmap: public QObject
 {
     Q_OBJECT
 
@@ -137,16 +137,16 @@ public slots:
      * Repaints the widget background. Normally, you shouldn't need this
      * as it is handled automatically.
      *
-     * @param force Force a tqrepaint, even if the contents did not change.
+     * @param force Force a repaint, even if the contents did not change.
      */
-    void tqrepaint( bool force );
+    void repaint( bool force );
 
     /**
      * Repaints the widget background. Normally, you shouldn't need this
      * as it is handled automatically. This is equivalent to calling
-     * tqrepaint( false ).
+     * repaint( false ).
      */
-    void tqrepaint();
+    void repaint();
 
     /**
      * Enables custom handling of the background painting. If custom
diff --git a/kdeui/kruler.cpp b/kdeui/kruler.cpp
index 2e48c9cc5..c50cf9620 100644
--- a/kdeui/kruler.cpp
+++ b/kdeui/kruler.cpp
@@ -432,19 +432,19 @@ KRuler::setRulerMetricStyle(KRuler::MetricStyle style)
   }
   switch (style) {
   case Pixel:
-    setEndLabel(TQString::tqfromLatin1("pixel"));
+    setEndLabel(TQString::fromLatin1("pixel"));
     break;
   case Inch:
-    setEndLabel(TQString::tqfromLatin1("inch"));
+    setEndLabel(TQString::fromLatin1("inch"));
     break;
   case Millimetres:
-    setEndLabel(TQString::tqfromLatin1("mm"));
+    setEndLabel(TQString::fromLatin1("mm"));
     break;
   case Centimetres:
-    setEndLabel(TQString::tqfromLatin1("cm"));
+    setEndLabel(TQString::fromLatin1("cm"));
     break;
   case Metres:
-    setEndLabel(TQString::tqfromLatin1("m"));
+    setEndLabel(TQString::fromLatin1("m"));
   default: /* never reached, see above switch */
     /* empty command */;
   }
@@ -550,16 +550,16 @@ KRuler::slotNewValue(int _value)
     return;
   }
   // get the rectangular of the old and the new ruler pointer
-  // and tqrepaint only him
+  // and repaint only him
   if (dir == Horizontal) {
     TQRect oldrec(-5+oldvalue,10, 11,6);
     TQRect newrec(-5+_value,10, 11,6);
-    tqrepaint( oldrec.unite(newrec) );
+    repaint( oldrec.unite(newrec) );
   }
   else {
     TQRect oldrec(10,-5+oldvalue, 6,11);
     TQRect newrec(10,-5+_value, 6,11);
-    tqrepaint( oldrec.unite(newrec) );
+    repaint( oldrec.unite(newrec) );
   }
 }
 
@@ -569,7 +569,7 @@ KRuler::slotNewOffset(int _offset)
   if (offset_ != _offset) {
     //setOffset(_offset);
     offset_ = _offset;
-    tqrepaint(contentsRect());
+    repaint(contentsRect());
   }
 }
 
@@ -586,7 +586,7 @@ KRuler::slotEndOffset(int offset)
   }
   if (d->endOffset_length != tmp) {
     d->endOffset_length = tmp;
-    tqrepaint(contentsRect());
+    repaint(contentsRect());
   }
 }
 
diff --git a/kdeui/kruler.h b/kdeui/kruler.h
index fbf39a279..997eb5c36 100644
--- a/kdeui/kruler.h
+++ b/kdeui/kruler.h
@@ -55,12 +55,12 @@
  * To receive mouse clicks or mouse moves,
  * the class has to be overloaded.
  *
- * For performance reasons, the public methods don't call TQWidget::tqrepaint().
+ * For performance reasons, the public methods don't call TQWidget::repaint().
  * (Slots do, see documentation below.)
  * All the changed settings will be painted once after leaving
  * to the main event loop.
  * For performance painting the slot methods should be used,
- * they do a fast TQWidget::tqrepaint() call after changing the values.
+ * they do a fast TQWidget::repaint() call after changing the values.
  * For setting multiple values like minValue(), maxValue(), offset() etc.
  * using the public methods is recommended
  * so the widget will be painted only once when entering the main event loop.
@@ -428,7 +428,7 @@ public slots:
    * Sets the pointer to a new position.
    *
    * The offset is NOT updated.
-   * TQWidget::tqrepaint() is called afterwards.
+   * TQWidget::repaint() is called afterwards.
    **/
   void slotNewValue(int);
 
@@ -436,7 +436,7 @@ public slots:
    * Sets the ruler marks to a new position.
    *
    * The pointer is NOT updated.
-   * TQWidget::tqrepaint() is called afterwards.
+   * TQWidget::repaint() is called afterwards.
    **/
   void slotNewOffset(int);
 
diff --git a/kdeui/ksconfig.cpp b/kdeui/ksconfig.cpp
index b859b7ba9..a8849e8fe 100644
--- a/kdeui/ksconfig.cpp
+++ b/kdeui/ksconfig.cpp
@@ -41,7 +41,7 @@
 class KSpellConfigPrivate
 {
 public:
-    TQStringList tqreplacelist;
+    TQStringList replacelist;
 };
 
 
@@ -56,7 +56,7 @@ KSpellConfig::KSpellConfig (const KSpellConfig &_ksc)
   , clientcombo(0)
 {
   d = new KSpellConfigPrivate;
-  setReplaceAllList( _ksc.tqreplaceAllList() );
+  setReplaceAllList( _ksc.replaceAllList() );
   setNoRootAffix( _ksc.noRootAffix() );
   setRunTogether( _ksc.runTogether() );
   setDictionary( _ksc.dictionary() );
@@ -266,7 +266,7 @@ KSpellConfig::interpret( TQString &fname, TQString &lname,
 
   TQString extension;
 
-  int i = dname.tqfind('-');
+  int i = dname.find('-');
   if ( i != -1 )
   {
     extension = dname.mid(i+1);
@@ -363,8 +363,8 @@ KSpellConfig::interpret( TQString &fname, TQString &lname,
   }
 
   //We have explicitly chosen English as the default here.
-  if ( ( KGlobal::locale()->language() == TQString::tqfromLatin1("C") &&
-         lname==TQString::tqfromLatin1("en") ) ||
+  if ( ( KGlobal::locale()->language() == TQString::fromLatin1("C") &&
+         lname==TQString::fromLatin1("en") ) ||
        KGlobal::locale()->language() == lname )
     return true;
 
@@ -406,9 +406,9 @@ KSpellConfig::fillInDialog ()
   int whichelement=-1;
 
   if ( dictFromList() )
-    whichelement = langfnames.tqfindIndex(dictionary());
+    whichelement = langfnames.findIndex(dictionary());
 
-  dictcombo->setMinimumWidth (dictcombo->tqsizeHint().width());
+  dictcombo->setMinimumWidth (dictcombo->sizeHint().width());
 
   if (dictionary().isEmpty() ||  whichelement!=-1)
   {
@@ -668,7 +668,7 @@ KSpellConfig::fillDicts( TQComboBox* box, TQStringList* dictionaries )
       box->insertItem (i18n("ASpell Default"));
 
       // dictionary path
-      // FIXME: use "aspell dump config" to tqfind out the dict-dir
+      // FIXME: use "aspell dump config" to find out the dict-dir
       TQFileInfo dir ("/usr/lib" KDELIBSUFF "/aspell");
       if (!dir.exists() || !dir.isDir())
         dir.setFile ("/usr/lib" KDELIBSUFF "/aspell-0.60");
@@ -742,7 +742,7 @@ KSpellConfig::fillDicts( TQComboBox* box, TQStringList* dictionaries )
         }
       }
     }
-    int whichelement = langfnames.tqfindIndex(qsdict);
+    int whichelement = langfnames.findIndex(qsdict);
     if ( whichelement >= 0 ) {
       box->setCurrentItem( whichelement );
     }
@@ -788,7 +788,7 @@ KSpellConfig::setDictionary (const TQString s)
   qsdict=s; //.copy();
 
   if (qsdict.length()>5)
-    if ((signed)qsdict.tqfind(".hash")==(signed)qsdict.length()-5)
+    if ((signed)qsdict.find(".hash")==(signed)qsdict.length()-5)
       qsdict.remove (qsdict.length()-5,5);
 
 
@@ -797,7 +797,7 @@ KSpellConfig::setDictionary (const TQString s)
     int whichelement=-1;
     if (dictFromList())
     {
-      whichelement = langfnames.tqfindIndex(s);
+      whichelement = langfnames.findIndex(s);
 
       if(whichelement >= 0)
       {
@@ -903,7 +903,7 @@ KSpellConfig::sBrowseDict()
 /*
 void KSpellConfig::sBrowsePDict()
 {
-  //how do I tqfind home directory path??
+  //how do I find home directory path??
   TQString qs( KFileDialog::getOpenFileName ("",".ispell_*") );
   if ( !qs.isNull() )
       kle2->setText (qs);
@@ -1011,15 +1011,15 @@ KSpellConfig::ignoreList () const
 
 // KDE 4: Make it const TQStringList &
 void
-KSpellConfig::setReplaceAllList (TQStringList _tqreplacelist)
+KSpellConfig::setReplaceAllList (TQStringList _replacelist)
 {
-  d->tqreplacelist=_tqreplacelist;
+  d->replacelist=_replacelist;
 }
 
 QStringList
-KSpellConfig::tqreplaceAllList() const
+KSpellConfig::replaceAllList() const
 {
-  return d->tqreplacelist;
+  return d->replacelist;
 }
 
 #include "ksconfig.moc"
diff --git a/kdeui/ksconfig.h b/kdeui/ksconfig.h
index cf3583e94..0c688d459 100644
--- a/kdeui/ksconfig.h
+++ b/kdeui/ksconfig.h
@@ -34,7 +34,7 @@ class KSpellConfigPrivate;
 /**
  * @brief Encoding for the spell checker
  * @note In the identifier names LATIN means ISO-8859, not ECMA Latin
- * @todo Should be tqreplaced by the charset strings
+ * @todo Should be replaced by the charset strings
  * because the config file would be more stable 
  * when inserting entries in the list
  */
@@ -67,7 +67,7 @@ enum KSpellClients {
 /**
  * A configuration class/dialog for KSpell.
  *
- * It tqcontains all of the options settings.The options are set to default
+ * It contains all of the options settings.The options are set to default
  * values by the constructor and can be reset either by using the
  * public interface or by using KSpellConfig as a widget in a dialog
  * (or, preferably a tabbed dialog using KDialogBase) and letting
@@ -139,10 +139,10 @@ class KDEUI_EXPORT KSpellConfig : public QWidget
 
     /**
      *
-     * The @p _ignorelist tqcontains words you'd like KSpell
+     * The @p _ignorelist contains words you'd like KSpell
      * to ignore when it is spellchecking.  When you get a KSpellConfig
      * object back from KSpell (using KSpell::kcConfig()),
-     * the @p _ignorelist tqcontains whatever was put in by you plus
+     * the @p _ignorelist contains whatever was put in by you plus
      * any words the user has chosen to ignore via the dialog box.
      * It may be useful to save this list with the document being
      * edited to facilitate quicker future spellchecking.
@@ -150,11 +150,11 @@ class KDEUI_EXPORT KSpellConfig : public QWidget
     void setIgnoreList( TQStringList _ignorelist );
 
     /**
-     * The @p _tqreplaceAllList tqcontains word you like that tqreplace
-     * word. Be careful that this list tqcontains word which is tqreplaced
+     * The @p _replaceAllList contains word you like that replace
+     * word. Be careful that this list contains word which is replaced
      * and new word.
      */
-    void setReplaceAllList( TQStringList _tqreplaceAllList );
+    void setReplaceAllList( TQStringList _replaceAllList );
 
     /**
      * Set an ISpell option.
@@ -193,7 +193,7 @@ class KDEUI_EXPORT KSpellConfig : public QWidget
     //TQString personalDict () const;
     int encoding() const;
     TQStringList ignoreList() const;
-    TQStringList tqreplaceAllList() const;
+    TQStringList replaceAllList() const;
 
     int client() const; ///< Spell checker client, see KSpellClients
 
diff --git a/kdeui/kselect.cpp b/kdeui/kselect.cpp
index 9349be2b1..a5fd0f613 100644
--- a/kdeui/kselect.cpp
+++ b/kdeui/kselect.cpp
@@ -53,7 +53,7 @@ KXYSelector::~KXYSelector()
 
 void KXYSelector::setRange( int _minX, int _minY, int _maxX, int _maxY )
 {
-	int w = style().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+	int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
 	px = w;
 	py = w;
 	minX = _minX;
@@ -74,7 +74,7 @@ void KXYSelector::setYValue( int _yPos )
 
 void KXYSelector::setValues( int _xPos, int _yPos )
 {
-	int w = style().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+	int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
 	if (w < 5) w = 5;
 
 	xPos = _xPos;
@@ -98,7 +98,7 @@ void KXYSelector::setValues( int _xPos, int _yPos )
 
 TQRect KXYSelector::contentsRect() const
 {
-	int w = style().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+	int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
 	if (w < 5) {
 		w = 5;
 	}
@@ -113,7 +113,7 @@ void KXYSelector::paintEvent( TQPaintEvent *ev )
 	TQRect paintRect = ev->rect();
 	TQRect borderRect = rect();
 
-	int w = style().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+	int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
 	if (w < 5) {
 		w = 5 - w;
 	}
@@ -123,11 +123,11 @@ void KXYSelector::paintEvent( TQPaintEvent *ev )
 	painter.begin( this );
 
 	style().drawPrimitive(TQStyle::PE_Panel, &painter, 
-			      borderRect, tqcolorGroup(), 
+			      borderRect, colorGroup(), 
 			      TQStyle::Style_Sunken);
 
 	drawContents( &painter );
-	if (paintRect.tqcontains(cursorRect))
+	if (paintRect.contains(cursorRect))
 	{
 	   bitBlt( &store, 0, 0, this, px - STORE_W, py - STORE_W,
 		STORE_W2, STORE_W2, CopyROP );
@@ -135,7 +135,7 @@ void KXYSelector::paintEvent( TQPaintEvent *ev )
         }
         else if (paintRect.intersects(cursorRect))
         {
-           tqrepaint( cursorRect, false);
+           repaint( cursorRect, false);
         }
 
 	painter.end();
@@ -150,7 +150,7 @@ void KXYSelector::mouseMoveEvent( TQMouseEvent *e )
 {
 	int xVal, yVal;
 
-	int w = style().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+	int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
 	valuesFromPosition( e->pos().x() - w, e->pos().y() - w, xVal, yVal );
 	
 	setValues( xVal, yVal );
@@ -170,7 +170,7 @@ void KXYSelector::wheelEvent( TQWheelEvent *e )
 
 void KXYSelector::valuesFromPosition( int x, int y, int &xVal, int &yVal ) const
 {
-	int w = style().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+	int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
 	if (w < 5) w = 5;
 	xVal = ( (maxX-minX) * (x-w) ) / ( width()-2*w );
 	yVal = maxY - ( ( (maxY-minY) * (y-w) ) / ( height()-2*w ) );
@@ -188,7 +188,7 @@ void KXYSelector::valuesFromPosition( int x, int y, int &xVal, int &yVal ) const
 
 void KXYSelector::setPosition( int xp, int yp )
 {
-	int w = style().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+	int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
 	if (w < 5) w = 5;
 	if ( xp < w )
 		xp = w;
@@ -256,7 +256,7 @@ KSelector::~KSelector()
 
 TQRect KSelector::contentsRect() const
 {
-	int w = style().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+	int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
 	int iw = (w < 5) ? 5 : w;
 	if ( orientation() == Vertical )
 		return TQRect( w, iw, width() - w * 2 - 5, height() - 2 * iw );
@@ -267,7 +267,7 @@ TQRect KSelector::contentsRect() const
 void KSelector::paintEvent( TQPaintEvent * )
 {
 	TQPainter painter;
-	int w = style().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+	int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
 	int iw = (w < 5) ? 5 : w;
 
 	painter.begin( this );
@@ -282,7 +282,7 @@ void KSelector::paintEvent( TQPaintEvent * )
 		else
 			r.addCoords(iw - w, 0, w - iw, -iw);
 		style().drawPrimitive(TQStyle::PE_Panel, &painter, 
-			r, tqcolorGroup(), 
+			r, colorGroup(), 
 			TQStyle::Style_Sunken);
 	}
 
@@ -329,7 +329,7 @@ void KSelector::valueChange()
 void KSelector::moveArrow( const TQPoint &pos )
 {
 	int val;
-	int w = style().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+	int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
 	int iw = (w < 5) ? 5 : w;
 
 	if ( orientation() == Vertical )
@@ -346,7 +346,7 @@ TQPoint KSelector::calcArrowPos( int val )
 {
 	TQPoint p;
 
-	int w = style().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+	int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
 	int iw = (w < 5) ? 5 : w;
 	if ( orientation() == Vertical )
 	{
@@ -374,7 +374,7 @@ void KSelector::drawArrow( TQPainter *painter, bool show, const TQPoint &pos )
     TQPointArray array(3);
 
     painter->setPen( TQPen() );
-    painter->setBrush( TQBrush( tqcolorGroup().buttonText() ) );
+    painter->setBrush( TQBrush( colorGroup().buttonText() ) );
     array.setPoint( 0, pos.x()+0, pos.y()+0 );
     array.setPoint( 1, pos.x()+5, pos.y()+5 );
     if ( orientation() == Vertical )
@@ -392,11 +392,11 @@ void KSelector::drawArrow( TQPainter *painter, bool show, const TQPoint &pos )
   {
     if ( orientation() == Vertical )
     {
-       tqrepaint(pos.x(), pos.y()-5, 6, 11, true);
+       repaint(pos.x(), pos.y()-5, 6, 11, true);
     }
     else
     {
-       tqrepaint(pos.x()-5, pos.y(), 11, 6, true);
+       repaint(pos.x()-5, pos.y(), 11, 6, true);
     }
   }
 }
diff --git a/kdeui/kselect.h b/kdeui/kselect.h
index e0e9522b4..cc9d57d48 100644
--- a/kdeui/kselect.h
+++ b/kdeui/kselect.h
@@ -302,12 +302,12 @@ class KDEUI_EXPORT KGradientSelector : public KSelector
 public:
   /**
    * Constructs a horizontal color selector which
-   * tqcontains a gradient between white and black.
+   * contains a gradient between white and black.
    */
   KGradientSelector( TQWidget *parent=0, const char *name=0 );
   /**
    * Constructs a colors selector with orientation o which
-   * tqcontains a gradient between white and black.
+   * contains a gradient between white and black.
    */
   KGradientSelector( Orientation o, TQWidget *parent=0, const char *name=0 );
   /**
@@ -351,8 +351,8 @@ public:
 protected:
 
   virtual void drawContents( TQPainter * );
-  virtual TQSize tqminimumSize() const
-  { return tqsizeHint(); }
+  virtual TQSize minimumSize() const
+  { return sizeHint(); }
 
 private:
   void init();
diff --git a/kdeui/kseparator.cpp b/kdeui/kseparator.cpp
index 699f2e9c2..3b6523917 100644
--- a/kdeui/kseparator.cpp
+++ b/kdeui/kseparator.cpp
@@ -83,7 +83,7 @@ void KSeparator::drawFrame(TQPainter *p)
 {
    QPoint	p1, p2;
    QRect	r     = frameRect();
-   const TQColorGroup & g = tqcolorGroup();
+   const TQColorGroup & g = colorGroup();
 
    if ( frameStyle() & HLine ) {
       p1 = TQPoint( r.x(), r.height()/2 );
@@ -100,7 +100,7 @@ void KSeparator::drawFrame(TQPainter *p)
 }
 
 
-TQSize KSeparator::tqsizeHint() const
+TQSize KSeparator::sizeHint() const
 {
    if ( frameStyle() & VLine )
       return TQSize(2, 0);
diff --git a/kdeui/kseparator.h b/kdeui/kseparator.h
index 987beb4d0..008403a15 100644
--- a/kdeui/kseparator.h
+++ b/kdeui/kseparator.h
@@ -70,7 +70,7 @@ class KDEUI_EXPORT KSeparator : public QFrame
   /**
    * The recommended height (width) for a horizontal (vertical) separator.
    **/
-  virtual TQSize tqsizeHint() const;
+  virtual TQSize sizeHint() const;
 
 protected:
   /**
diff --git a/kdeui/ksharedpixmap.cpp b/kdeui/ksharedpixmap.cpp
index 4e5ac9e47..002b4290f 100644
--- a/kdeui/ksharedpixmap.cpp
+++ b/kdeui/ksharedpixmap.cpp
@@ -102,7 +102,7 @@ bool KSharedPixmap::loadFromShared(const TQString & name, const TQRect & rect)
 	// already active
 	return false;
 
-    TQPixmap::resize(0, 0); // tqinvalidate
+    TQPixmap::resize(0, 0); // invalidate
 
     TQString str = TQString("KDESHPIXMAP:%1").arg(name);
     d->selection = XInternAtom(qt_xdisplay(), str.latin1(), true);
@@ -160,7 +160,7 @@ bool KSharedPixmap::x11Event(XEvent *event)
     void *drawable_id = (void *) pixmap_id;
     Drawable pixmap = *(Drawable*) drawable_id;
 
-    tqStatus status = XGetGeometry(qt_xdisplay(), pixmap, &root, &dummy, &dummy, &width, &height, &udummy, &udummy);
+    Status status = XGetGeometry(qt_xdisplay(), pixmap, &root, &dummy, &dummy, &width, &height, &udummy, &udummy);
 
     if (status == BadDrawable)
         return false;
diff --git a/kdeui/kshortcutdialog.cpp b/kdeui/kshortcutdialog.cpp
index 26c7beeda..27d721626 100644
--- a/kdeui/kshortcutdialog.cpp
+++ b/kdeui/kshortcutdialog.cpp
@@ -169,8 +169,8 @@ void KShortcutDialog::updateShortcutDisplay()
 		this->setFocus();
 	}
 	
-	s[0].tqreplace('&', TQString::tqfromLatin1("&&"));
-	s[1].tqreplace('&', TQString::tqfromLatin1("&&"));
+	s[0].replace('&', TQString::fromLatin1("&&"));
+	s[1].replace('&', TQString::fromLatin1("&&"));
 
 	m_simple->m_txtShortcut->setText( s[0] );
 	m_adv->m_txtPrimary->setText( s[0] );
diff --git a/kdeui/kshortcutdialog_advanced.ui b/kdeui/kshortcutdialog_advanced.ui
index bcd5cba0c..9c371523f 100644
--- a/kdeui/kshortcutdialog_advanced.ui
+++ b/kdeui/kshortcutdialog_advanced.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>KShortcutDialogAdvanced</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -71,7 +71,7 @@
                 </widget>
                 <widget class="QLayoutWidget" row="1" column="2">
                     <property name="name">
-                        <cstring>tqlayout6</cstring>
+                        <cstring>layout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -111,7 +111,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>21</width>
                                     <height>20</height>
@@ -122,7 +122,7 @@
                 </widget>
                 <widget class="QLayoutWidget" row="0" column="2">
                     <property name="name">
-                        <cstring>tqlayout7</cstring>
+                        <cstring>layout7</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -165,7 +165,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>21</width>
                                     <height>20</height>
@@ -245,8 +245,8 @@
 <forwards>
     <forward>class KShortcut</forward>
 </forwards>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kdeui/kshortcutdialog_simple.ui b/kdeui/kshortcutdialog_simple.ui
index fb979f507..a7fb651ff 100644
--- a/kdeui/kshortcutdialog_simple.ui
+++ b/kdeui/kshortcutdialog_simple.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>KShortcutDialogSimple</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -37,7 +37,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>0</height>
@@ -95,7 +95,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>40</width>
                     <height>20</height>
@@ -112,8 +112,8 @@
 <forwards>
     <forward>class KShortcut</forward>
 </forwards>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
 </includehints>
diff --git a/kdeui/kspell.cpp b/kdeui/kspell.cpp
index 20b89f41f..c4ea85ec6 100644
--- a/kdeui/kspell.cpp
+++ b/kdeui/kspell.cpp
@@ -393,7 +393,7 @@ bool KSpell::addPersonal( const TQString & word )
   TQString qs = word.simplifyWhiteSpace();
 
   //we'll let ispell do the work here b/c we can
-  if ( qs.tqfind(' ') != -1 || qs.isEmpty() )    // make sure it's a _word_
+  if ( qs.find(' ') != -1 || qs.isEmpty() )    // make sure it's a _word_
     return false;
 
   qs.prepend( "*" );
@@ -412,7 +412,7 @@ bool KSpell::ignore( const TQString & word )
   TQString qs = word.simplifyWhiteSpace();
 
   //we'll let ispell do the work here b/c we can
-  if ( qs.tqfind (' ') != -1 || qs.isEmpty() )    // make sure it's a _word_
+  if ( qs.find (' ') != -1 || qs.isEmpty() )    // make sure it's a _word_
     return false;
 
   qs.prepend( "@" );
@@ -483,7 +483,7 @@ bool KSpell::checkWord( const TQString & buffer, bool _usedialog )
   d->checking = true;
   TQString qs = buffer.simplifyWhiteSpace();
 
-  if ( qs.tqfind (' ') != -1 || qs.isEmpty() ) {   // make sure it's a _word_
+  if ( qs.find (' ') != -1 || qs.isEmpty() ) {   // make sure it's a _word_
     d->checkNextTimer->start( 0, true );
     return false;
   }
@@ -525,7 +525,7 @@ bool KSpell::checkWord( const TQString & buffer, bool _usedialog, bool suggest )
   d->checking = true;
   TQString qs = buffer.simplifyWhiteSpace();
 
-  if ( qs.tqfind (' ') != -1 || qs.isEmpty() ) {   // make sure it's a _word_
+  if ( qs.find (' ') != -1 || qs.isEmpty() ) {   // make sure it's a _word_
     d->checkNextTimer->start( 0, true );
     return false;
   }
@@ -635,7 +635,7 @@ void KSpell::checkWord3()
 {
   disconnect( this, TQT_SIGNAL(dialog3()), this, TQT_SLOT(checkWord3()) );
 
-  emit corrected( cwword, tqreplacement(), 0L );
+  emit corrected( cwword, replacement(), 0L );
 }
 
 TQString KSpell::funnyWord( const TQString & word )
@@ -660,7 +660,7 @@ TQString KSpell::funnyWord( const TQString & word )
 
       i = j-1;
 
-      if ( !( k = qs.tqfindRev(shorty) ) || k != -1 )
+      if ( !( k = qs.findRev(shorty) ) || k != -1 )
         qs.remove( k, shorty.length() );
       else
       {
@@ -681,7 +681,7 @@ int KSpell::parseOneResponse( const TQString &buffer, TQString &word, TQStringLi
   // returns
   //   GOOD    if word is fine
   //   IGNORE  if word is in ignorelist
-  //   REPLACE if word is in tqreplacelist
+  //   REPLACE if word is in replacelist
   //   MISTAKE if word is misspelled
 {
   word = "";
@@ -699,7 +699,7 @@ int KSpell::parseOneResponse( const TQString &buffer, TQString &word, TQStringLi
     int i,j;
 
 
-    word = buffer.mid( 2, buffer.tqfind( ' ', 3 ) -2 );
+    word = buffer.mid( 2, buffer.find( ' ', 3 ) -2 );
     //check() needs this
     orig=word;
 
@@ -717,22 +717,22 @@ int KSpell::parseOneResponse( const TQString &buffer, TQString &word, TQStringLi
     //We don't take advantage of ispell's ignore function because
     //we can't interrupt ispell's output (when checking a large
     //buffer) to add a word to _it's_ ignore-list.
-    if ( ignorelist.tqfindIndex( word.lower() ) != -1 )
+    if ( ignorelist.findIndex( word.lower() ) != -1 )
       return IGNORE;
 
     //// Position in line ///
     TQString qs2;
 
-    if ( buffer.tqfind( ':' ) != -1 )
-      qs2 = buffer.left( buffer.tqfind(':') );
+    if ( buffer.find( ':' ) != -1 )
+      qs2 = buffer.left( buffer.find(':') );
     else
       qs2 = buffer;
 
-    posinline = qs2.right( qs2.length()-qs2.tqfindRev(' ') ).toInt()-1;
+    posinline = qs2.right( qs2.length()-qs2.findRev(' ') ).toInt()-1;
 
     ///// Replace-list stuff ////
-    TQStringList::Iterator it = tqreplacelist.begin();
-    for( ;it != tqreplacelist.end(); ++it, ++it ) // Skip two entries at a time.
+    TQStringList::Iterator it = replacelist.begin();
+    for( ;it != replacelist.end(); ++it, ++it ) // Skip two entries at a time.
     {
       if ( word == *it ) // Word matches
       {
@@ -745,14 +745,14 @@ int KSpell::parseOneResponse( const TQString &buffer, TQString &word, TQStringLi
     /////// Suggestions //////
     if ( buffer[0] != '#' )
     {
-      TQString qs = buffer.mid( buffer.tqfind(':')+2, buffer.length() );
+      TQString qs = buffer.mid( buffer.find(':')+2, buffer.length() );
       qs += ',';
       sugg.clear();
       i = j = 0;
 
       while( (unsigned int)i < qs.length() )
       {
-        TQString temp = qs.mid( i, (j=qs.tqfind (',',i)) - i );
+        TQString temp = qs.mid( i, (j=qs.find (',',i)) - i );
         sugg.append( funnyWord(temp) );
 
         i=j+2;
@@ -873,7 +873,7 @@ void KSpell::checkList3a (KProcIO *)
         if ( e == REPLACE )
         {
           TQString old = *(--wlIt); ++wlIt;
-          dlgtqreplacement = word;
+          dlgreplacement = word;
           checkListReplaceCurrent();
           // inform application
           emit corrected( old, *(--wlIt), lastpos ); ++wlIt;
@@ -916,8 +916,8 @@ void KSpell::checkListReplaceCurrent()
   wlIt--;
 
   TQString s = *wlIt;
-  s.tqreplace(posinline+offset,orig.length(),tqreplacement());
-  offset += tqreplacement().length()-orig.length();
+  s.replace(posinline+offset,orig.length(),replacement());
+  offset += replacement().length()-orig.length();
   wordlist->insert (wlIt, s);
   wlIt = wordlist->remove (wlIt);
   // wlIt now points to the word after the repalced one
@@ -940,7 +940,7 @@ void KSpell::checkList4 ()
     kdDebug(750) << "KS: cklist4: lastpos: " << lastpos << endl;
     old = *(--wlIt);
     ++wlIt;
-    // tqreplace word
+    // replace word
     checkListReplaceCurrent();
     emit corrected( old, *(--wlIt), lastpos );
     ++wlIt;
@@ -1016,7 +1016,7 @@ bool KSpell::check( const TQString &_buffer, bool _usedialog )
   emitProgress();
 
   // send first buffer line
-  int i = origbuffer.tqfind( '\n', 0 ) + 1;
+  int i = origbuffer.find( '\n', 0 ) + 1;
   qs = origbuffer.mid( 0, i );
   cleanFputs( qs, false );
 
@@ -1079,10 +1079,10 @@ void KSpell::check2( KProcIO * )
 
         if (e==REPLACE)
         {
-          dlgtqreplacement=word;
-          emit corrected( orig, tqreplacement(), lastpos );
-          offset += tqreplacement().length()-orig.length();
-          newbuffer.tqreplace( lastpos, orig.length(), word );
+          dlgreplacement=word;
+          emit corrected( orig, replacement(), lastpos );
+          offset += replacement().length()-orig.length();
+          newbuffer.replace( lastpos, orig.length(), word );
         }
         else  //MISTAKE
         {
@@ -1130,7 +1130,7 @@ void KSpell::check2( KProcIO * )
     //kdDebug(750) << "[EOL](" << tempe << ")[" << temp << "]" << endl;
 
     lastpos = (lastlastline=lastline) + offset; //do we really want this?
-    i = origbuffer.tqfind('\n', lastline) + 1;
+    i = origbuffer.find('\n', lastline) + 1;
     qs = origbuffer.mid( lastline, i-lastline );
     cleanFputs( qs, false );
     lastline = i;
@@ -1153,17 +1153,17 @@ void KSpell::check3 ()
   // evaluates the return value of the dialog
 {
   disconnect (this, TQT_SIGNAL (dialog3()), this, TQT_SLOT (check3()));
-  kdDebug(750) << "check3 [" << cwword << "] [" << tqreplacement() << "] " << dlgresult << endl;
+  kdDebug(750) << "check3 [" << cwword << "] [" << replacement() << "] " << dlgresult << endl;
 
   //others should have been processed by dialog() already
   switch (dlgresult)
   {
   case KS_REPLACE:
   case KS_REPLACEALL:
-    offset+=tqreplacement().length()-cwword.length();
-    newbuffer.tqreplace (lastpos, cwword.length(),
-                       tqreplacement());
-    emit corrected (dlgorigword, tqreplacement(), lastpos);
+    offset+=replacement().length()-cwword.length();
+    newbuffer.replace (lastpos, cwword.length(),
+                       replacement());
+    emit corrected (dlgorigword, replacement(), lastpos);
     break;
   case KS_CANCEL:
     //      kdDebug(750) << "canceled\n" << endl;
@@ -1215,15 +1215,15 @@ void KSpell::dialog( const TQString & word, TQStringList & sugg, const char *_sl
   TQString tmpBuf = newbuffer;
   kdDebug(750)<<" position = "<<lastpos<<endl;
 
-  // extract a context string, tqreplace all characters which might confuse
+  // extract a context string, replace all characters which might confuse
   // the RichText display and highlight the possibly wrong word
   TQString marker( "_MARKER_" );
-  tmpBuf.tqreplace( lastpos, word.length(), marker );
+  tmpBuf.replace( lastpos, word.length(), marker );
   TQString context = tmpBuf.mid(QMAX(lastpos-18,0), 2*18+marker.length());
-  context.tqreplace( '\n',TQString::tqfromLatin1(" "));
-  context.tqreplace( '<', TQString::tqfromLatin1("&lt;") );
-  context.tqreplace( '>', TQString::tqfromLatin1("&gt;") );
-  context.tqreplace( marker, TQString::tqfromLatin1("<b>%1</b>").arg( word ) );
+  context.replace( '\n',TQString::fromLatin1(" "));
+  context.replace( '<', TQString::fromLatin1("&lt;") );
+  context.replace( '>', TQString::fromLatin1("&gt;") );
+  context.replace( marker, TQString::fromLatin1("<b>%1</b>").arg( word ) );
   context = "<qt>" + context + "</qt>";
 
   ksdlg->init( word, &sugg, context );
@@ -1243,7 +1243,7 @@ void KSpell::dialog2( int result )
   dlgresult = result;
   ksdlg->standby();
 
-  dlgtqreplacement = ksdlg->tqreplacement();
+  dlgreplacement = ksdlg->replacement();
 
   //process result here
   switch ( dlgresult )
@@ -1265,14 +1265,14 @@ void KSpell::dialog2( int result )
     break;
   case KS_REPLACEALL:
   {
-    tqreplacelist.append( dlgorigword );
-    TQString _tqreplacement = tqreplacement();
-    tqreplacelist.append( _tqreplacement );
-    emit tqreplaceall( dlgorigword ,  _tqreplacement );
+    replacelist.append( dlgorigword );
+    TQString _replacement = replacement();
+    replacelist.append( _replacement );
+    emit replaceall( dlgorigword ,  _replacement );
   }
     break;
   case KS_SUGGEST:
-    checkWord( ksdlg->tqreplacement(), false, true );
+    checkWord( ksdlg->replacement(), false, true );
     return;
     break;
   }
@@ -1295,7 +1295,7 @@ KSpell::~KSpell()
 KSpellConfig KSpell::ksConfig() const
 {
   ksconfig->setIgnoreList(ignorelist);
-  ksconfig->setReplaceAllList(tqreplacelist);
+  ksconfig->setReplaceAllList(replacelist);
   return *ksconfig;
 }
 
@@ -1413,13 +1413,13 @@ KSpell::modalCheck( TQString& text, KSpellConfig* _kcs )
 
 void KSpell::slotSpellCheckerCorrected( const TQString & oldText, const TQString & newText, unsigned int pos )
 {
-  modaltext=modaltext.tqreplace(pos,oldText.length(),newText);
+  modaltext=modaltext.replace(pos,oldText.length(),newText);
 }
 
 
 void KSpell::slotModalReady()
 {
-  //kdDebug() << tqApp->loopLevel() << endl;
+  //kdDebug() << qApp->loopLevel() << endl;
   //kdDebug(750) << "MODAL READY------------------" << endl;
 
   Q_ASSERT( m_status == Running );
@@ -1439,7 +1439,7 @@ void KSpell::slotModalDone( const TQString &/*_buffer*/ )
   cleanUp();
 
   //kdDebug() << "ABOUT TO EXIT LOOP" << endl;
-  //tqApp->exit_loop();
+  //qApp->exit_loop();
 
   //modalWidgetHack->close(true);
   slotModalSpellCheckerFinished();
@@ -1537,7 +1537,7 @@ void KSpell::initialize( TQWidget *_parent, const TQString &_caption,
   // copy ignore list from ksconfig
   ignorelist += ksconfig->ignoreList();
 
-  tqreplacelist += ksconfig->tqreplaceAllList();
+  replacelist += ksconfig->replaceAllList();
   texmode=dlgon=false;
   m_status = Starting;
   dialogsetup = false;
diff --git a/kdeui/kspell.h b/kdeui/kspell.h
index 4160bbdeb..29ff7faf7 100644
--- a/kdeui/kspell.h
+++ b/kdeui/kspell.h
@@ -43,7 +43,7 @@ class KSpellDlg;
  * @see KSpellConfig, KSyntaxHighlighter
  */
 
-class KDEUI_EXPORT KSpell : public TQObject
+class KDEUI_EXPORT KSpell : public QObject
 {
   Q_OBJECT
 
@@ -62,7 +62,7 @@ public:
    * @li @p Error -  An error occurred in the @p Starting state.
    * @li @p Crashed - An error occurred in the @p Running state.
    **/
-  enum spelltqStatus { Starting = 0, Running, Cleaning, Finished, Error, Crashed, FinishedNoMisspellingsEncountered };
+  enum spellStatus { Starting = 0, Running, Cleaning, Finished, Error, Crashed, FinishedNoMisspellingsEncountered };
 
   /**
    * These are possible types of documents which the spell checker can check.
@@ -125,9 +125,9 @@ public:
   /**
    * Returns the status of KSpell.
    *
-   * @see spelltqStatus()
+   * @see spellStatus()
    */
-  spelltqStatus status() const { return m_status; }
+  spellStatus status() const { return m_status; }
 
   /**
    * Cleans up ISpell.
@@ -191,15 +191,15 @@ public:
    *  spellcheck as-you-type).
    *
    * checkWord() returns @p false if @p buffer is not a single word (e.g.
-   *  if it tqcontains white space), otherwise it returns @p true;
+   *  if it contains white space), otherwise it returns @p true;
    *
    * If @p usedialog is set to @p true, KSpell will open the standard
    *  dialog if the word is not found.  The dialog results can be queried
-   *  by using dlgResult() and tqreplacement().
+   *  by using dlgResult() and replacement().
    *
    *  The signal corrected() is emitted when the check is
    *  complete.  You can look at suggestions() to see what the
-   *  suggested tqreplacements were.
+   *  suggested replacements were.
    */
   virtual bool checkWord (const TQString &_buffer, bool usedialog = false);
   bool checkWord( const TQString & buffer, bool _usedialog, bool suggest );
@@ -212,7 +212,7 @@ public:
   void hide ();
 
   /**
-   * Returns list of suggested word tqreplacements.
+   * Returns list of suggested word replacements.
    *
    * After calling checkWord() (an in response to
    *  a misspelled() signal you can
@@ -364,11 +364,11 @@ signals:
    * "Replace All" for this word).
    *
    * Results from the dialog may be checked with dlgResult()
-   *  and tqreplacement().
+   *  and replacement().
    *
    * Note, that when using checkList() this signal can occur
    * more then once with same list position, when checking a word with
-   * hyphens. In this case @p originalword is the last tqreplacement.
+   * hyphens. In this case @p originalword is the last replacement.
    *
    * @see check()
    */
@@ -400,7 +400,7 @@ signals:
   /**
    * Emitted when the user pressed "ReplaceAll" in the dialog.
    */
-  void tqreplaceall( const TQString & origword ,  const TQString &tqreplacement );
+  void replaceall( const TQString & origword ,  const TQString &replacement );
 
   /**
    * Emitted after KSpell has verified that ISpell/ASpell is running
@@ -499,11 +499,11 @@ protected:
   TQStringList *wordlist;
   TQStringList::Iterator wlIt;
   TQStringList ignorelist;
-  TQStringList tqreplacelist;
+  TQStringList replacelist;
   TQStringList sugg;
   TQTextCodec* codec;
 
-  spelltqStatus m_status;
+  spellStatus m_status;
 
   bool usedialog;
   bool texmode;
@@ -520,7 +520,7 @@ protected:
   TQString newbuffer;
   TQString cwword;
   TQString dlgorigword;
-  TQString dlgtqreplacement;
+  TQString dlgreplacement;
   TQString dialog3slot;
 
   int dlgresult;
@@ -546,8 +546,8 @@ protected:
   int parseOneResponse (const TQString &_buffer, TQString &word, TQStringList &sugg);
   TQString funnyWord (const TQString & word);
   void dialog (const TQString & word, TQStringList & sugg, const char* _slot);
-  TQString tqreplacement () const
-    { return dlgtqreplacement; }
+  TQString replacement () const
+    { return dlgreplacement; }
 
   void setUpDialog ( bool reallyusedialogbox = true);
 
diff --git a/kdeui/kspelldlg.cpp b/kdeui/kspelldlg.cpp
index d714ee710..d21b6975e 100644
--- a/kdeui/kspelldlg.cpp
+++ b/kdeui/kspelldlg.cpp
@@ -60,13 +60,13 @@ KSpellDlg::KSpellDlg( TQWidget * parent, const char * name, bool _progressbar, b
   d->ui = new KSpellUI( this );
   setMainWidget( d->ui );
 
-  connect( d->ui->m_tqreplaceBtn, TQT_SIGNAL(clicked()),
-           this, TQT_SLOT(tqreplace()));
+  connect( d->ui->m_replaceBtn, TQT_SIGNAL(clicked()),
+           this, TQT_SLOT(replace()));
   connect( this, TQT_SIGNAL(ready(bool)),
-           d->ui->m_tqreplaceBtn, TQT_SLOT(setEnabled(bool)) );
+           d->ui->m_replaceBtn, TQT_SLOT(setEnabled(bool)) );
 
-  connect( d->ui->m_tqreplaceAllBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(tqreplaceAll()));
-  connect(this, TQT_SIGNAL(ready(bool)), d->ui->m_tqreplaceAllBtn, TQT_SLOT(setEnabled(bool)));
+  connect( d->ui->m_replaceAllBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(replaceAll()));
+  connect(this, TQT_SIGNAL(ready(bool)), d->ui->m_replaceAllBtn, TQT_SLOT(setEnabled(bool)));
 
   connect( d->ui->m_skipBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(ignore()));
   connect( this, TQT_SIGNAL(ready(bool)), d->ui->m_skipBtn, TQT_SLOT(setEnabled(bool)));
@@ -83,15 +83,15 @@ KSpellDlg::KSpellDlg( TQWidget * parent, const char * name, bool _progressbar, b
 
   connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(stop()));
 
-  connect( d->ui->m_tqreplacement, TQT_SIGNAL(textChanged(const TQString &)),
+  connect( d->ui->m_replacement, TQT_SIGNAL(textChanged(const TQString &)),
            TQT_SLOT(textChanged(const TQString &)) );
 
-  connect( d->ui->m_tqreplacement, TQT_SIGNAL(returnPressed()),   TQT_SLOT(tqreplace()) );
+  connect( d->ui->m_replacement, TQT_SIGNAL(returnPressed()),   TQT_SLOT(replace()) );
   connect( d->ui->m_suggestions, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
            TQT_SLOT(slotSelectionChanged(TQListViewItem*)) );
 
   connect( d->ui->m_suggestions, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
-           TQT_SLOT( tqreplace() ) );
+           TQT_SLOT( replace() ) );
   d->spellConfig = new KSpellConfig( 0, 0 ,0, false );
   d->spellConfig->fillDicts( d->ui->m_language );
   connect( d->ui->m_language, TQT_SIGNAL(activated(int)),
@@ -100,7 +100,7 @@ KSpellDlg::KSpellDlg( TQWidget * parent, const char * name, bool _progressbar, b
            TQT_SLOT(slotConfigChanged()) );
 
   setHelp( "spelldlg", "kspell" );
-  setMinimumSize( tqsizeHint() );
+  setMinimumSize( sizeHint() );
   emit ready( false );
 }
 
@@ -130,14 +130,14 @@ KSpellDlg::init( const TQString & _word, TQStringList * _sugg )
   d->ui->m_unknownWord->setText( _word );
 
   if ( sugg->count() == 0 ) {
-    d->ui->m_tqreplacement->setText( _word );
-    d->ui->m_tqreplaceBtn->setEnabled( false );
-    d->ui->m_tqreplaceAllBtn->setEnabled( false );
+    d->ui->m_replacement->setText( _word );
+    d->ui->m_replaceBtn->setEnabled( false );
+    d->ui->m_replaceAllBtn->setEnabled( false );
     d->ui->m_suggestBtn->setEnabled( false );
   } else {
-    d->ui->m_tqreplacement->setText( (*sugg)[0] );
-    d->ui->m_tqreplaceBtn->setEnabled( true );
-    d->ui->m_tqreplaceAllBtn->setEnabled( true );
+    d->ui->m_replacement->setText( (*sugg)[0] );
+    d->ui->m_replaceBtn->setEnabled( true );
+    d->ui->m_replaceAllBtn->setEnabled( true );
     d->ui->m_suggestBtn->setEnabled( false );
     d->ui->m_suggestions->setSelected( d->ui->m_suggestions->firstChild(), true );
   }
@@ -166,14 +166,14 @@ KSpellDlg::init( const TQString& _word, TQStringList* _sugg,
   d->ui->m_contextLabel->setText( context );
 
   if ( sugg->count() == 0 ) {
-    d->ui->m_tqreplacement->setText( _word );
-    d->ui->m_tqreplaceBtn->setEnabled( false );
-    d->ui->m_tqreplaceAllBtn->setEnabled( false );
+    d->ui->m_replacement->setText( _word );
+    d->ui->m_replaceBtn->setEnabled( false );
+    d->ui->m_replaceAllBtn->setEnabled( false );
     d->ui->m_suggestBtn->setEnabled( false );
   } else {
-    d->ui->m_tqreplacement->setText( (*sugg)[0] );
-    d->ui->m_tqreplaceBtn->setEnabled( true );
-    d->ui->m_tqreplaceAllBtn->setEnabled( true );
+    d->ui->m_replacement->setText( (*sugg)[0] );
+    d->ui->m_replaceBtn->setEnabled( true );
+    d->ui->m_replaceAllBtn->setEnabled( true );
     d->ui->m_suggestBtn->setEnabled( false );
     d->ui->m_suggestions->setSelected( d->ui->m_suggestions->firstChild(), true );
   }
@@ -191,8 +191,8 @@ KSpellDlg::slotProgress( unsigned int p )
 void
 KSpellDlg::textChanged( const TQString & )
 {
-  d->ui->m_tqreplaceBtn->setEnabled( true );
-  d->ui->m_tqreplaceAllBtn->setEnabled( true );
+  d->ui->m_replaceBtn->setEnabled( true );
+  d->ui->m_replaceAllBtn->setEnabled( true );
   d->ui->m_suggestBtn->setEnabled( true );
 }
 
@@ -200,7 +200,7 @@ void
 KSpellDlg::slotSelectionChanged( TQListViewItem* item )
 {
   if ( item )
-    d->ui->m_tqreplacement->setText( item->text( 0 ) );
+    d->ui->m_replacement->setText( item->text( 0 ) );
 }
 
 /*
@@ -248,9 +248,9 @@ KSpellDlg::cancel()
 }
 
 void
-KSpellDlg::tqreplace()
+KSpellDlg::replace()
 {
-  newword = d->ui->m_tqreplacement->text();
+  newword = d->ui->m_replacement->text();
   done( KS_REPLACE );
 }
 
@@ -262,16 +262,16 @@ KSpellDlg::stop()
 }
 
 void
-KSpellDlg::tqreplaceAll()
+KSpellDlg::replaceAll()
 {
-  newword = d->ui->m_tqreplacement->text();
+  newword = d->ui->m_replacement->text();
   done( KS_REPLACEALL );
 }
 
 void
 KSpellDlg::suggest()
 {
-  newword = d->ui->m_tqreplacement->text();
+  newword = d->ui->m_replacement->text();
   done( KS_SUGGEST );
 }
 
diff --git a/kdeui/kspelldlg.h b/kdeui/kspelldlg.h
index b2a191de4..42960862e 100644
--- a/kdeui/kspelldlg.h
+++ b/kdeui/kspelldlg.h
@@ -63,11 +63,11 @@ public:
 	     bool _progressbar = false, bool _modal = false );
   ~KSpellDlg();
 
-  TQString tqreplacement() const
+  TQString replacement() const
     { return newword; }
 
   /**
-   * Change the misspelled word and suggested tqreplacements
+   * Change the misspelled word and suggested replacements
    *  and enable the disabled buttons on the dialog box.
    * (Buttons are disabled by standby().)
    **/
@@ -100,8 +100,8 @@ protected slots:
   void add();
   void ignoreAll();
   void cancel();
-  void tqreplace();
-  void tqreplaceAll();
+  void replace();
+  void replaceAll();
   void suggest();
   void stop();
   void slotConfigChanged();
diff --git a/kdeui/kspellui.ui b/kdeui/kspellui.ui
index 0b74e9c87..496662797 100644
--- a/kdeui/kspellui.ui
+++ b/kdeui/kspellui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>KSpellUI</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -40,7 +40,7 @@
             <property name="whatsThis" stdset="0">
                 <string>&lt;qt&gt;&lt;p&gt;This word was considered to be an "unknown word" because it does not match any entry in the dictionary currently in use. It may also be a word in a foreign language.&lt;/p&gt;
 &lt;p&gt;If the word is not misspelled, you may add it to the dictionary by clicking &lt;b&gt;Add to Dictionary&lt;/b&gt;. If you don't want to add the unknown word to the dictionary, but you want to leave it unchanged, click &lt;b&gt;Ignore&lt;/b&gt; or &lt;b&gt;Ignore All&lt;/b&gt;.&lt;/p&gt;
-&lt;p&gt;However, if the word is misspelled, you can try to tqfind the correct tqreplacement in the list below. If you cannot tqfind a tqreplacement there, you may type it in the text box below, and click &lt;b&gt;Replace&lt;/b&gt; or &lt;b&gt;Replace All&lt;/b&gt;.&lt;/p&gt;
+&lt;p&gt;However, if the word is misspelled, you can try to find the correct replacement in the list below. If you cannot find a replacement there, you may type it in the text box below, and click &lt;b&gt;Replace&lt;/b&gt; or &lt;b&gt;Replace All&lt;/b&gt;.&lt;/p&gt;
 &lt;/qt&gt;</string>
             </property>
         </widget>
@@ -57,7 +57,7 @@
             <property name="whatsThis" stdset="0">
                 <string>&lt;qt&gt;&lt;p&gt;This word was considered to be an "unknown word" because it does not match any entry in the dictionary currently in use. It may also be a word in a foreign language.&lt;/p&gt;
 &lt;p&gt;If the word is not misspelled, you may add it to the dictionary by clicking &lt;b&gt;Add to Dictionary&lt;/b&gt;. If you don't want to add the unknown word to the dictionary, but you want to leave it unchanged, click &lt;b&gt;Ignore&lt;/b&gt; or &lt;b&gt;Ignore All&lt;/b&gt;.&lt;/p&gt;
-&lt;p&gt;However, if the word is misspelled, you can try to tqfind the correct tqreplacement in the list below. If you cannot tqfind a tqreplacement there, you may type it in the text box below, and click &lt;b&gt;Replace&lt;/b&gt; or &lt;b&gt;Replace All&lt;/b&gt;.&lt;/p&gt;
+&lt;p&gt;However, if the word is misspelled, you can try to find the correct replacement in the list below. If you cannot find a replacement there, you may type it in the text box below, and click &lt;b&gt;Replace&lt;/b&gt; or &lt;b&gt;Replace All&lt;/b&gt;.&lt;/p&gt;
 &lt;/qt&gt;</string>
             </property>
         </widget>
@@ -87,7 +87,7 @@
             <property name="text">
                 <string>... the &lt;b&gt;misspelled&lt;/b&gt; word shown in context ...</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignCenter</set>
             </property>
             <property name="toolTip" stdset="0">
@@ -95,7 +95,7 @@
             </property>
             <property name="whatsThis" stdset="0">
                 <string>&lt;qt&gt;
-&lt;p&gt;Here you can see a text excerpt showing the unknown word in its context. If this information is not sufficient to choose the best tqreplacement for the unknown word, you can click on the document you are proofing, read a larger part of the text and then return here to continue proofing.&lt;/p&gt;
+&lt;p&gt;Here you can see a text excerpt showing the unknown word in its context. If this information is not sufficient to choose the best replacement for the unknown word, you can click on the document you are proofing, read a larger part of the text and then return here to continue proofing.&lt;/p&gt;
 &lt;/qt&gt;</string>
             </property>
         </widget>
@@ -123,7 +123,7 @@ Click here if you consider that the unknown word is not misspelled and you want
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>20</height>
@@ -132,14 +132,14 @@ Click here if you consider that the unknown word is not misspelled and you want
         </spacer>
         <widget class="QPushButton" row="4" column="5">
             <property name="name">
-                <cstring>m_tqreplaceAllBtn</cstring>
+                <cstring>m_replaceAllBtn</cstring>
             </property>
             <property name="text">
                 <string>R&amp;eplace All</string>
             </property>
             <property name="whatsThis" stdset="0">
                 <string>&lt;qt&gt;
-&lt;p&gt;Click here to tqreplace all occurrences of the unknown text with the text in the edit box above (to the left).&lt;/p&gt;
+&lt;p&gt;Click here to replace all occurrences of the unknown text with the text in the edit box above (to the left).&lt;/p&gt;
 &lt;/qt&gt;</string>
             </property>
         </widget>
@@ -166,21 +166,21 @@ Click here if you consider that the unknown word is not misspelled and you want
             </property>
             <property name="whatsThis" stdset="0">
                 <string>&lt;qt&gt;
-&lt;p&gt;If the unknown word is misspelled, you should check if the correction for it is available and if it is, click on it. If none of the words in this list is a good tqreplacement you may type the correct word in the edit box above.&lt;/p&gt;
+&lt;p&gt;If the unknown word is misspelled, you should check if the correction for it is available and if it is, click on it. If none of the words in this list is a good replacement you may type the correct word in the edit box above.&lt;/p&gt;
 &lt;p&gt;To correct this word click &lt;b&gt;Replace&lt;/b&gt; if you want to correct only this occurrence or &lt;b&gt;Replace All&lt;/b&gt; if you want to correct all occurrences.&lt;/p&gt;
 &lt;/qt&gt;</string>
             </property>
         </widget>
         <widget class="QPushButton" row="3" column="5">
             <property name="name">
-                <cstring>m_tqreplaceBtn</cstring>
+                <cstring>m_replaceBtn</cstring>
             </property>
             <property name="text">
                 <string>&amp;Replace</string>
             </property>
             <property name="whatsThis" stdset="0">
                 <string>&lt;qt&gt;
-&lt;p&gt;Click here to tqreplace this occurrence of the unknown text with the text in the edit box above (to the left).&lt;/p&gt;
+&lt;p&gt;Click here to replace this occurrence of the unknown text with the text in the edit box above (to the left).&lt;/p&gt;
 &lt;/qt&gt;</string>
             </property>
         </widget>
@@ -192,7 +192,7 @@ Click here if you consider that the unknown word is not misspelled and you want
                 <string>Replace &amp;with:</string>
             </property>
             <property name="buddy" stdset="0">
-                <cstring>m_tqreplacement</cstring>
+                <cstring>m_replacement</cstring>
             </property>
             <property name="whatsThis" stdset="0">
                 <string>&lt;qt&gt;
@@ -231,7 +231,7 @@ Click here if you consider that the unknown word is not misspelled and you want
         </widget>
         <widget class="QLineEdit" row="2" column="2" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>m_tqreplacement</cstring>
+                <cstring>m_replacement</cstring>
             </property>
             <property name="whatsThis" stdset="0">
                 <string>&lt;qt&gt;
@@ -276,7 +276,7 @@ Click here if you consider that the unknown word is not misspelled and you want
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
@@ -287,14 +287,14 @@ Click here if you consider that the unknown word is not misspelled and you want
 </widget>
 <tabstops>
     <tabstop>m_addBtn</tabstop>
-    <tabstop>m_tqreplacement</tabstop>
+    <tabstop>m_replacement</tabstop>
     <tabstop>m_suggestBtn</tabstop>
-    <tabstop>m_tqreplaceBtn</tabstop>
-    <tabstop>m_tqreplaceAllBtn</tabstop>
+    <tabstop>m_replaceBtn</tabstop>
+    <tabstop>m_replaceAllBtn</tabstop>
     <tabstop>m_skipBtn</tabstop>
     <tabstop>m_skipAllBtn</tabstop>
     <tabstop>m_suggestions</tabstop>
     <tabstop>m_language</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdeui/ksqueezedtextlabel.cpp b/kdeui/ksqueezedtextlabel.cpp
index 42d6776b9..f44b38916 100644
--- a/kdeui/ksqueezedtextlabel.cpp
+++ b/kdeui/ksqueezedtextlabel.cpp
@@ -22,30 +22,30 @@
 
 KSqueezedTextLabel::KSqueezedTextLabel( const TQString &text , TQWidget *parent, const char *name )
  : TQLabel ( parent, name ) {
-  tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+  setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
   fullText = text;
   squeezeTextToLabel();
 }
 
 KSqueezedTextLabel::KSqueezedTextLabel( TQWidget *parent, const char *name )
  : TQLabel ( parent, name ) {
-  tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+  setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
 }
 
 void KSqueezedTextLabel::resizeEvent( TQResizeEvent * ) {
   squeezeTextToLabel();
 }
 
-TQSize KSqueezedTextLabel::tqminimumSizeHint() const
+TQSize KSqueezedTextLabel::minimumSizeHint() const
 {
-  TQSize sh = TQLabel::tqminimumSizeHint();
+  TQSize sh = TQLabel::minimumSizeHint();
   sh.setWidth(-1);
   return sh;
 }
 
-TQSize KSqueezedTextLabel::tqsizeHint() const
+TQSize KSqueezedTextLabel::sizeHint() const
 {
-  return TQSize(contentsRect().width(), TQLabel::tqsizeHint().height());
+  return TQSize(contentsRect().width(), TQLabel::sizeHint().height());
 }
 
 void KSqueezedTextLabel::setText( const TQString &text ) {
@@ -73,11 +73,11 @@ void KSqueezedTextLabel::squeezeTextToLabel() {
   }
 }
 
-void KSqueezedTextLabel::tqsetAlignment( int tqalignment )
+void KSqueezedTextLabel::setAlignment( int alignment )
 {
   // save fullText and restore it
   TQString tmpFull(fullText);
-  TQLabel::tqsetAlignment(tqalignment);
+  TQLabel::setAlignment(alignment);
   fullText = tmpFull;
 }
 
diff --git a/kdeui/ksqueezedtextlabel.h b/kdeui/ksqueezedtextlabel.h
index 88f657153..9ad81d9dd 100644
--- a/kdeui/ksqueezedtextlabel.h
+++ b/kdeui/ksqueezedtextlabel.h
@@ -24,7 +24,7 @@
 #include <kdelibs_export.h>
 
 /**
- * @short A tqreplacement for TQLabel that squeezes its text
+ * @short A replacement for TQLabel that squeezes its text
  *
  * A label class that squeezes its text into the label
  *
@@ -53,12 +53,12 @@ public:
   KSqueezedTextLabel( TQWidget *parent, const char *name = 0 );
   KSqueezedTextLabel( const TQString &text, TQWidget *parent, const char *name = 0 );
 
-  virtual TQSize tqminimumSizeHint() const;
-  virtual TQSize tqsizeHint() const;
+  virtual TQSize minimumSizeHint() const;
+  virtual TQSize sizeHint() const;
   /**
    * Overridden for internal reasons; the API remains unaffected.
    */
-  virtual void tqsetAlignment( int );
+  virtual void setAlignment( int );
 
 public slots:
   void setText( const TQString & );
diff --git a/kdeui/kstatusbar.cpp b/kdeui/kstatusbar.cpp
index a04cbf875..b70c8ae9c 100644
--- a/kdeui/kstatusbar.cpp
+++ b/kdeui/kstatusbar.cpp
@@ -42,7 +42,7 @@ KStatusBarLabel::KStatusBarLabel( const TQString& text, int _id,
   setLineWidth  (0);
   setFrameStyle (TQFrame::NoFrame);
 
-  tqsetAlignment( AlignHCenter | AlignVCenter | SingleLine );
+  setAlignment( AlignHCenter | AlignVCenter | SingleLine );
 
   connect (this, TQT_SIGNAL(itemPressed(int)), parent, TQT_SIGNAL(pressed(int)));
   connect (this, TQT_SIGNAL(itemReleased(int)), parent, TQT_SIGNAL(released(int)));
@@ -65,8 +65,8 @@ KStatusBar::KStatusBar( TQWidget *parent, const char *name )
   // ...but off by default (sven)
   KConfig *config = KGlobal::config();
   TQString group(config->group());
-  config->setGroup(TQString::tqfromLatin1("StatusBar style"));
-  bool grip_enabled = config->readBoolEntry(TQString::tqfromLatin1("SizeGripEnabled"), false);
+  config->setGroup(TQString::fromLatin1("StatusBar style"));
+  bool grip_enabled = config->readBoolEntry(TQString::fromLatin1("SizeGripEnabled"), false);
   setSizeGripEnabled(grip_enabled);
   config->setGroup(group);
 }
@@ -129,7 +129,7 @@ void KStatusBar::setItemAlignment (int id, int align)
   KStatusBarLabel *l = items[id];
   if (l)
   {
-    l->tqsetAlignment(align);
+    l->setAlignment(align);
   }
   else
     kdDebug() << "KStatusBar::setItemAlignment: bad item id: " << id << endl;
diff --git a/kdeui/kstatusbar.h b/kdeui/kstatusbar.h
index 200c23d23..97ec7881d 100644
--- a/kdeui/kstatusbar.h
+++ b/kdeui/kstatusbar.h
@@ -62,7 +62,7 @@ signals:
  *
  *  Display status messages.
  *
- *  You can insert text labels or custom widgets. Their tqgeometry is managed
+ *  You can insert text labels or custom widgets. Their geometry is managed
  *  internally. KStatusBar resizes itself, but positioning is left to
  *  KMainWindow (or to you, if you don't use KMainWindow ).
  *
@@ -94,7 +94,7 @@ public:
    * WARNING: This enum is only for backward compatibility and it may be removed.
    * No method here uses it.
    */
-  enum BartqStatus{ Toggle, Show, Hide };
+  enum BarStatus{ Toggle, Show, Hide };
 
   /**
    *  Constructs a status bar. @p parent is usually KMainWindow.
@@ -121,7 +121,7 @@ public:
    *  @param stretch stretch passed to TQStatusBar::addWidget
    *  @param permanent is item permanent or not (passed to TQStatusBar::addWidget )
    *
-   *  @see QtqStatusbar::addWidget
+   *  @see QStatusbar::addWidget
    *
    */
   void insertItem(const TQString& text, int id, int stretch=0, bool permanent=false );
@@ -167,8 +167,8 @@ public:
   void changeItem( const TQString& text, int id );
 
   /**
-   * Sets the tqalignment of item @p id. By default all fields are aligned
-   * @p AlignHCenter | @p AlignVCenter. See TQLabel::tqsetAlignment for details.
+   * Sets the alignment of item @p id. By default all fields are aligned
+   * @p AlignHCenter | @p AlignVCenter. See TQLabel::setAlignment for details.
    *
   */
   void setItemAlignment(int id, int align);
diff --git a/kdeui/kstdaction.cpp b/kdeui/kstdaction.cpp
index ed27f0f4b..3dae8f281 100644
--- a/kdeui/kstdaction.cpp
+++ b/kdeui/kstdaction.cpp
@@ -72,7 +72,7 @@ KAction* create( StdAction id, const char *name, const TQObject *recvr, const ch
 			else
 			    aboutData = KGlobal::instance()->aboutData();
 			*/
-			TQString appName = (aboutData) ? aboutData->programName() : TQString::tqfromLatin1(tqApp->name());
+			TQString appName = (aboutData) ? aboutData->programName() : TQString::fromLatin1(qApp->name());
 			sLabel = i18n(pInfo->psLabel).arg(appName);
 			}
 			break;
@@ -95,7 +95,7 @@ KAction* create( StdAction id, const char *name, const TQObject *recvr, const ch
 			break;
 		 case ShowMenubar:
 		 case ShowToolbar:
-		 case ShowtqStatusbar:
+		 case ShowStatusbar:
 		 {
 			KToggleAction *ret;
 			ret = new KToggleAction( sLabel, pInfo->psIconName, cut,
@@ -179,13 +179,13 @@ KAction *selectAll( const TQObject *recvr, const char *slot, KActionCollection*
 	{ return KStdAction::create( SelectAll, name, recvr, slot, parent ); }
 KAction *deselect( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
 	{ return KStdAction::create( Deselect, name, recvr, slot, parent ); }
-KAction *tqfind( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+KAction *find( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
 	{ return KStdAction::create( Find, name, recvr, slot, parent ); }
-KAction *tqfindNext( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+KAction *findNext( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
 	{ return KStdAction::create( FindNext, name, recvr, slot, parent ); }
-KAction *tqfindPrev( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+KAction *findPrev( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
 	{ return KStdAction::create( FindPrev, name, recvr, slot, parent ); }
-KAction *tqreplace( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+KAction *replace( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
 	{ return KStdAction::create( Replace, name, recvr, slot, parent ); }
 KAction *actualSize( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
 	{ return KStdAction::create( ActualSize, name, recvr, slot, parent ); }
@@ -267,16 +267,16 @@ KToggleToolBarAction *showToolbar( const char* toolBarName, KActionCollection* p
     return ret;
 }
 
-KToggleAction *showtqStatusbar( const TQObject *recvr, const char *slot,
+KToggleAction *showStatusbar( const TQObject *recvr, const char *slot,
                                          KActionCollection* parent, const char *_name )
 {
     KToggleAction *ret;
     ret = new KToggleAction(i18n("Show St&atusbar"), 0, recvr, slot, parent,
-                            _name ? _name : name(ShowtqStatusbar));
-    ret->setWhatsThis( i18n( "Show tqStatusbar<p>"
+                            _name ? _name : name(ShowStatusbar));
+    ret->setWhatsThis( i18n( "Show Statusbar<p>"
                              "Shows the statusbar, which is the bar at the bottom of the window used for status information." ) );
     KGuiItem guiItem( i18n("Hide St&atusbar"), TQString::null, TQString::null,
-                      i18n( "Hide tqStatusbar<p>"
+                      i18n( "Hide Statusbar<p>"
                             "Hides the statusbar, which is the bar at the bottom of the window used for status information." ) );
     ret->setCheckedState( guiItem );
 
diff --git a/kdeui/kstdaction.h b/kdeui/kstdaction.h
index e5152798e..ba0845caf 100644
--- a/kdeui/kstdaction.h
+++ b/kdeui/kstdaction.h
@@ -46,7 +46,7 @@ class KToggleFullScreenAction;
  *
  * <b>Simple Example:</b>\n
  *
- * In general, using standard actions should be a drop in tqreplacement
+ * In general, using standard actions should be a drop in replacement
  * for regular actions.  For example, if you previously had:
  *
  * \code
@@ -55,7 +55,7 @@ class KToggleFullScreenAction;
  *                               TQT_SLOT(fileNew()), actionCollection());
  * \endcode
  *
- * You could drop that and tqreplace it with:
+ * You could drop that and replace it with:
  *
  * \code
  * KAction *newAct = KStdAction::openNew(this, TQT_SLOT(fileNew()),
@@ -74,7 +74,7 @@ class KToggleFullScreenAction;
  * it is still possible.
  *
  * Basically, the XML building code matches names in the XML code with
- * the internal names of the actions.  You can tqfind out the internal
+ * the internal names of the actions.  You can find out the internal
  * names of each of the standard actions by using the stdName
  * action like so: KStdAction::stdName(KStdAction::Cut) would return
  * 'edit_cut'.  The XML building code will match 'edit_cut' to the
@@ -145,7 +145,7 @@ namespace KStdAction
 		Spelling,
 
 		// Settings Menu
-		ShowMenubar, ShowToolbar, ShowtqStatusbar,
+		ShowMenubar, ShowToolbar, ShowStatusbar,
 		SaveOptions, KeyBindings,
 		Preferences, ConfigureToolbars,
 
@@ -328,27 +328,27 @@ namespace KStdAction
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
-	* Initiate a 'tqfind' request in the current document.
+	* Initiate a 'find' request in the current document.
 	*/
-	KDEUI_EXPORT KAction *tqfind(const TQObject *recvr, const char *slot,
+	KDEUI_EXPORT KAction *find(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
-	* Find the next instance of a stored 'tqfind'.
+	* Find the next instance of a stored 'find'.
 	*/
-	KDEUI_EXPORT KAction *tqfindNext(const TQObject *recvr, const char *slot,
+	KDEUI_EXPORT KAction *findNext(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
-	* Find a previous instance of a stored 'tqfind'.
+	* Find a previous instance of a stored 'find'.
 	*/
-	KDEUI_EXPORT KAction *tqfindPrev(const TQObject *recvr, const char *slot,
+	KDEUI_EXPORT KAction *findPrev(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
-	* Find and tqreplace matches.
+	* Find and replace matches.
 	*/
-	KDEUI_EXPORT KAction *tqreplace(const TQObject *recvr, const char *slot,
+	KDEUI_EXPORT KAction *replace(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
@@ -512,7 +512,7 @@ namespace KStdAction
 	/**
 	* Show/Hide the statusbar.
 	*/
-	KDEUI_EXPORT KToggleAction *showtqStatusbar(const TQObject *recvr, const char *slot,
+	KDEUI_EXPORT KToggleAction *showStatusbar(const TQObject *recvr, const char *slot,
 					KActionCollection* parent, const char *name = 0 );
 
 	/**
diff --git a/kdeui/kstdaction_p.h b/kdeui/kstdaction_p.h
index 37ecb0c10..bc60115b1 100644
--- a/kdeui/kstdaction_p.h
+++ b/kdeui/kstdaction_p.h
@@ -58,11 +58,11 @@ static const KStdActionInfo g_rgActionInfo[] =
 	{ Clear,         KStdAccel::AccelNone, "edit_clear", I18N_NOOP("C&lear"), 0, "editclear" },
 	{ SelectAll,     KStdAccel::SelectAll, "edit_select_all", I18N_NOOP("Select &All"), 0, 0 },
 	{ Deselect,      KStdAccel::Deselect, "edit_deselect", I18N_NOOP("Dese&lect"), 0, 0 },
-	{ Find,          KStdAccel::Find, "edit_tqfind", I18N_NOOP("&Find..."), 0, "tqfind" },
-	{ FindNext,      KStdAccel::FindNext, "edit_tqfind_next", I18N_NOOP("Find &Next"), 0, "next" },
-	// FIXME: rename edit_tqfind_last to edit_tqfind_prev for KDE 4
-	{ FindPrev,      KStdAccel::FindPrev, "edit_tqfind_last", I18N_NOOP("Find Pre&vious"), 0, "previous" },
-	{ Replace,       KStdAccel::Replace, "edit_tqreplace", I18N_NOOP("&Replace..."), 0, 0 },
+	{ Find,          KStdAccel::Find, "edit_find", I18N_NOOP("&Find..."), 0, "find" },
+	{ FindNext,      KStdAccel::FindNext, "edit_find_next", I18N_NOOP("Find &Next"), 0, "next" },
+	// FIXME: rename edit_find_last to edit_find_prev for KDE 4
+	{ FindPrev,      KStdAccel::FindPrev, "edit_find_last", I18N_NOOP("Find Pre&vious"), 0, "previous" },
+	{ Replace,       KStdAccel::Replace, "edit_replace", I18N_NOOP("&Replace..."), 0, 0 },
 
 	{ ActualSize,    KStdAccel::AccelNone, "view_actual_size", I18N_NOOP("&Actual Size"), 0, "viewmag1" },
 	{ FitToPage,     KStdAccel::AccelNone, "view_fit_to_page", I18N_NOOP("&Fit to Page"), 0, "view_fit_window" },
@@ -94,7 +94,7 @@ static const KStdActionInfo g_rgActionInfo[] =
 
 	{ ShowMenubar,   KStdAccel::ShowMenubar, "options_show_menubar", I18N_NOOP("Show &Menubar"), 0, "showmenu" },
 	{ ShowToolbar,   KStdAccel::AccelNone, "options_show_toolbar", I18N_NOOP("Show &Toolbar"), 0, 0 },
-	{ ShowtqStatusbar, KStdAccel::AccelNone, "options_show_statusbar", I18N_NOOP("Show St&atusbar"), 0, 0 },
+	{ ShowStatusbar, KStdAccel::AccelNone, "options_show_statusbar", I18N_NOOP("Show St&atusbar"), 0, 0 },
 	{ FullScreen,    KStdAccel::FullScreen, "fullscreen", I18N_NOOP("F&ull Screen Mode"), 0, "window_fullscreen" },
 	{ SaveOptions,   KStdAccel::AccelNone, "options_save_options", I18N_NOOP("&Save Settings"), 0, 0 },
 	{ KeyBindings,   KStdAccel::AccelNone, "options_configure_keybinding", I18N_NOOP("Configure S&hortcuts..."), 0,"configure_shortcuts" },
diff --git a/kdeui/kstdguiitem.cpp b/kdeui/kstdguiitem.cpp
index 4b3591789..8391819ed 100644
--- a/kdeui/kstdguiitem.cpp
+++ b/kdeui/kstdguiitem.cpp
@@ -48,7 +48,7 @@ KGuiItem KStdGuiItem::guiItem ( StdItem ui_enum )
   case Reset    : return reset();
   case Delete   : return del();
   case Insert   : return insert();
-  case Find     : return tqfind();
+  case Find     : return find();
   case Stop     : return stop();
   case Add      : return add();
   case Remove   : return remove();
@@ -62,34 +62,34 @@ KGuiItem KStdGuiItem::guiItem ( StdItem ui_enum )
 TQString KStdGuiItem::stdItem( StdItem ui_enum )
 {
   switch (ui_enum ) {
-  case Ok       : return TQString::tqfromLatin1("ok");
-  case Cancel   : return TQString::tqfromLatin1("cancel");
-  case Yes      : return TQString::tqfromLatin1("yes");
-  case No       : return TQString::tqfromLatin1("no");
-  case Discard  : return TQString::tqfromLatin1("discard");
-  case Save     : return TQString::tqfromLatin1("save");
-  case DontSave : return TQString::tqfromLatin1("dontSave");
-  case SaveAs   : return TQString::tqfromLatin1("saveAs");
-  case Apply    : return TQString::tqfromLatin1("apply");
-  case Help     : return TQString::tqfromLatin1("help");
-  case Close    : return TQString::tqfromLatin1("close");
-  case Defaults : return TQString::tqfromLatin1("defaults");
-  case Back     : return TQString::tqfromLatin1("back");
-  case Forward  : return TQString::tqfromLatin1("forward");
-  case Print    : return TQString::tqfromLatin1("print");
-  case Continue : return TQString::tqfromLatin1("continue");
-  case Open     : return TQString::tqfromLatin1("open");
-  case Quit     : return TQString::tqfromLatin1("quit");
-  case AdminMode: return TQString::tqfromLatin1("adminMode");
-  case Delete   : return TQString::tqfromLatin1("delete");
-  case Insert   : return TQString::tqfromLatin1("insert");
-  case Find     : return TQString::tqfromLatin1("tqfind");
-  case Stop     : return TQString::tqfromLatin1("stop");
-  case Add      : return TQString::tqfromLatin1("add");
-  case Remove   : return TQString::tqfromLatin1("remove");
-  case Test     : return TQString::tqfromLatin1("test");
-  case Properties : return TQString::tqfromLatin1("properties");
-  case Overwrite : return TQString::tqfromLatin1("overwrite");
+  case Ok       : return TQString::fromLatin1("ok");
+  case Cancel   : return TQString::fromLatin1("cancel");
+  case Yes      : return TQString::fromLatin1("yes");
+  case No       : return TQString::fromLatin1("no");
+  case Discard  : return TQString::fromLatin1("discard");
+  case Save     : return TQString::fromLatin1("save");
+  case DontSave : return TQString::fromLatin1("dontSave");
+  case SaveAs   : return TQString::fromLatin1("saveAs");
+  case Apply    : return TQString::fromLatin1("apply");
+  case Help     : return TQString::fromLatin1("help");
+  case Close    : return TQString::fromLatin1("close");
+  case Defaults : return TQString::fromLatin1("defaults");
+  case Back     : return TQString::fromLatin1("back");
+  case Forward  : return TQString::fromLatin1("forward");
+  case Print    : return TQString::fromLatin1("print");
+  case Continue : return TQString::fromLatin1("continue");
+  case Open     : return TQString::fromLatin1("open");
+  case Quit     : return TQString::fromLatin1("quit");
+  case AdminMode: return TQString::fromLatin1("adminMode");
+  case Delete   : return TQString::fromLatin1("delete");
+  case Insert   : return TQString::fromLatin1("insert");
+  case Find     : return TQString::fromLatin1("find");
+  case Stop     : return TQString::fromLatin1("stop");
+  case Add      : return TQString::fromLatin1("add");
+  case Remove   : return TQString::fromLatin1("remove");
+  case Test     : return TQString::fromLatin1("test");
+  case Properties : return TQString::fromLatin1("properties");
+  case Overwrite : return TQString::fromLatin1("overwrite");
   default       : return TQString::null;
   };
 }
@@ -249,9 +249,9 @@ KGuiItem KStdGuiItem::configure()
   return KGuiItem( i18n( "Confi&gure..." ), "configure" );
 }
 
-KGuiItem KStdGuiItem::tqfind()
+KGuiItem KStdGuiItem::find()
 {
-  return KGuiItem(i18n("&Find"), "tqfind");
+  return KGuiItem(i18n("&Find"), "find");
 }
 
 KGuiItem KStdGuiItem::stop()
diff --git a/kdeui/kstdguiitem.h b/kdeui/kstdguiitem.h
index a423fb15e..bf2182191 100644
--- a/kdeui/kstdguiitem.h
+++ b/kdeui/kstdguiitem.h
@@ -146,10 +146,10 @@ public:
     static KGuiItem quit();
 
     /**
-    * Returns a "tqfind" item.
+    * Returns a "find" item.
     * @since 3.4
     */
-    static KGuiItem tqfind();
+    static KGuiItem find();
 
     /**
     * Returns a "stop" item.
diff --git a/kdeui/kstringvalidator.cpp b/kdeui/kstringvalidator.cpp
index 96e086346..f783a4b9f 100644
--- a/kdeui/kstringvalidator.cpp
+++ b/kdeui/kstringvalidator.cpp
@@ -30,12 +30,12 @@ TQValidator::State KStringListValidator::validate( TQString & input, int& ) cons
   if ( input.isEmpty() ) return Intermediate;
 
   if ( isRejecting() ) // anything not in mStringList is acceptable:
-    if ( mStringList.tqfind( input ) == mStringList.end() )
+    if ( mStringList.find( input ) == mStringList.end() )
       return Acceptable;
     else
       return Intermediate;
   else // only what is in mStringList is acceptable:
-    if ( mStringList.tqfind( input ) != mStringList.end() )
+    if ( mStringList.find( input ) != mStringList.end() )
       return Acceptable;
     else
       for ( TQStringList::ConstIterator it = mStringList.begin() ;
@@ -84,7 +84,7 @@ TQValidator::State KMimeTypeValidator::validate( TQString & input, int& ) const
 void KMimeTypeValidator::fixup( TQString & input ) const
 {
   TQRegExp invalidChars("[^/" ALLOWED_CHARS "]+");
-  input.tqreplace( invalidChars, TQString::null);
+  input.replace( invalidChars, TQString::null);
 }
 
 #include "kstringvalidator.moc"
diff --git a/kdeui/kswitchlanguagedialog.cpp b/kdeui/kswitchlanguagedialog.cpp
index f309f4878..3cfcc011b 100644
--- a/kdeui/kswitchlanguagedialog.cpp
+++ b/kdeui/kswitchlanguagedialog.cpp
@@ -158,7 +158,7 @@ void KSwitchLanguageDialog::removeButtonClicked()
         return;
     }
     
-    TQMap<KPushButton *, LanguageRowData>::iterator it = d->languageRows.tqfind(removeButton);
+    TQMap<KPushButton *, LanguageRowData>::iterator it = d->languageRows.find(removeButton);
     
     if (it == d->languageRows.end())
     {
diff --git a/kdeui/ksyntaxhighlighter.cpp b/kdeui/ksyntaxhighlighter.cpp
index 5bc2c0ba0..a5485841f 100644
--- a/kdeui/ksyntaxhighlighter.cpp
+++ b/kdeui/ksyntaxhighlighter.cpp
@@ -148,14 +148,14 @@ int KSyntaxHighlighter::highlightParagraph( const TQString &text, int )
     }
 
     TQString simplified = text;
-    simplified = simplified.tqreplace( TQRegExp( "\\s" ), TQString::null ).tqreplace( '|', TQString::tqfromLatin1(">") );
-    while ( simplified.startsWith( TQString::tqfromLatin1(">>>>") ) )
+    simplified = simplified.replace( TQRegExp( "\\s" ), TQString::null ).replace( '|', TQString::fromLatin1(">") );
+    while ( simplified.startsWith( TQString::fromLatin1(">>>>") ) )
 	simplified = simplified.mid(3);
-    if	( simplified.startsWith( TQString::tqfromLatin1(">>>") ) || simplified.startsWith( TQString::tqfromLatin1("> >	>") ) )
+    if	( simplified.startsWith( TQString::fromLatin1(">>>") ) || simplified.startsWith( TQString::fromLatin1("> >	>") ) )
 	setFormat( 0, text.length(), d->col2 );
-    else if	( simplified.startsWith( TQString::tqfromLatin1(">>") ) || simplified.startsWith( TQString::tqfromLatin1("> >") ) )
+    else if	( simplified.startsWith( TQString::fromLatin1(">>") ) || simplified.startsWith( TQString::fromLatin1("> >") ) )
 	setFormat( 0, text.length(), d->col3 );
-    else if	( simplified.startsWith( TQString::tqfromLatin1(">") ) )
+    else if	( simplified.startsWith( TQString::fromLatin1(">") ) )
 	setFormat( 0, text.length(), d->col4 );
     else
 	setFormat( 0, text.length(), d->col5 );
@@ -189,7 +189,7 @@ int KSpellingHighlighter::highlightParagraph( const TQString &text,
     // leave #includes, diffs, and quoted replies alone
     TQString diffAndCo( ">|" );
 
-    bool isCode = diffAndCo.tqfind(text[0]) != -1;
+    bool isCode = diffAndCo.find(text[0]) != -1;
 
     if ( !text.endsWith(" ") )
 	d->alwaysEndsWithSpace = false;
@@ -375,7 +375,7 @@ bool KDictSpellingHighlighter::isMisspelled( const TQString &word )
     // get tricky...
     // For auto detection ignore signature and reply prefix
     if ( !d->autoReady )
-	d->autoIgnoreDict.tqreplace( word, Ignore );
+	d->autoIgnoreDict.replace( word, Ignore );
 
     // "dict" is used as a cache to store the results of KSpell
     TQDict<int>* dict = ( d->globalConfig ? d->sDict() : d->mDict );
@@ -383,14 +383,14 @@ bool KDictSpellingHighlighter::isMisspelled( const TQString &word )
 	if ( d->autoReady && ( d->autoDict[word] != NotOkay )) {
 	    if ( !d->autoIgnoreDict[word] )
 		++d->errorCount;
-	    d->autoDict.tqreplace( word, NotOkay );
+	    d->autoDict.replace( word, NotOkay );
 	}
 
 	return d->active;
     }
     if ( !dict->isEmpty() && (*dict)[word] == Okay ) {
 	if ( d->autoReady && !d->autoDict[word] ) {
-	    d->autoDict.tqreplace( word, Okay );
+	    d->autoDict.replace( word, Okay );
 	}
 	return false;
     }
@@ -399,7 +399,7 @@ bool KDictSpellingHighlighter::isMisspelled( const TQString &word )
 	int para, index;
 	textEdit()->getCursorPosition( &para, &index );
 	++d->wordCount;
-	dict->tqreplace( word, Unknown );
+	dict->replace( word, Unknown );
 	++d->checksRequested;
 	if (currentParagraph() != para)
 	    d->completeRehighlightRequired = true;
@@ -425,9 +425,9 @@ void KDictSpellingHighlighter::slotMisspelling (const TQString &originalWord, co
     Q_UNUSED( suggestions );
     // kdDebug() << suggestions.join( " " ).latin1() << endl;
     if ( d->globalConfig )
-        d->sDict()->tqreplace( originalWord, NotOkay );
+        d->sDict()->replace( originalWord, NotOkay );
     else
-        d->mDict->tqreplace( originalWord, NotOkay );
+        d->mDict->replace( originalWord, NotOkay );
 
     //Emit this baby so that apps that want to have suggestions in a popup over
     //the misspelled word can catch them.
@@ -441,7 +441,7 @@ void KDictSpellingHighlighter::slotCorrected(const TQString &word,
 {
     TQDict<int>* dict = ( d->globalConfig ? d->sDict() : d->mDict );
     if ( !dict->isEmpty() && (*dict)[word] == Unknown ) {
-        dict->tqreplace( word, Okay );
+        dict->replace( word, Okay );
     }
     ++d->checksDone;
     if (d->checksDone == d->checksRequested) {
diff --git a/kdeui/ksystemtray.cpp b/kdeui/ksystemtray.cpp
index de06be65b..5742eb174 100644
--- a/kdeui/ksystemtray.cpp
+++ b/kdeui/ksystemtray.cpp
@@ -67,7 +67,7 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name )
     d->actionCollection = new KActionCollection(this);
 
 #ifdef Q_WS_X11
-    KWin::setSystemTrayWindowFor( winId(), parent?parent->tqtopLevelWidget()->winId(): qt_xrootwin() );
+    KWin::setSystemTrayWindowFor( winId(), parent?parent->topLevelWidget()->winId(): qt_xrootwin() );
 #endif
     setBackgroundMode(X11ParentRelative);
     setBackgroundOrigin(WindowOrigin);
@@ -77,13 +77,13 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name )
     move( -1000, -1000 );
     KStdAction::quit(this, TQT_SLOT(maybeQuit()), d->actionCollection);
 
-    if (tqparentWidget())
+    if (parentWidget())
     {
         new KAction(i18n("Minimize"), KShortcut(),
                     this, TQT_SLOT( minimizeRestoreAction() ),
                     d->actionCollection, "minimizeRestore");
 #ifdef Q_WS_X11
-	KWin::WindowInfo info = KWin::windowInfo( tqparentWidget()->winId());
+	KWin::WindowInfo info = KWin::windowInfo( parentWidget()->winId());
 	d->on_all_desktops = info.onAllDesktops();
 #else
 	d->on_all_desktops = false;
@@ -94,7 +94,7 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name )
         d->on_all_desktops = false;
     }
     setCaption( KGlobal::instance()->aboutData()->programName());
-    tqsetAlignment( tqalignment() | Qt::AlignVCenter | Qt::AlignHCenter );
+    setAlignment( alignment() | Qt::AlignVCenter | Qt::AlignHCenter );
 
     // Handle the possibility that the requested system tray size is something other than 22x22 pixels, per the Free Desktop specifications
     setScaledContents(true);
@@ -142,7 +142,7 @@ KPopupMenu* KSystemTray::contextMenu() const
 
 void KSystemTray::mousePressEvent( TQMouseEvent *e )
 {
-    if ( !rect().tqcontains( e->pos() ) )
+    if ( !rect().contains( e->pos() ) )
 	return;
 
     switch ( e->button() ) {
@@ -152,9 +152,9 @@ void KSystemTray::mousePressEvent( TQMouseEvent *e )
     case MidButton:
 	// fall through
     case RightButton:
-	if ( tqparentWidget() ) {
+	if ( parentWidget() ) {
             KAction* action = d->actionCollection->action("minimizeRestore");
-	    if ( tqparentWidget()->isVisible() )
+	    if ( parentWidget()->isVisible() )
 		action->setText( i18n("&Minimize") );
 	    else
 		action->setText( i18n("&Restore") );
@@ -182,8 +182,8 @@ void KSystemTray::contextMenuAboutToShow( KPopupMenu* )
 // entry is "minimize", otherwise it's "restore"
 void KSystemTray::minimizeRestoreAction()
 {
-    if ( tqparentWidget() ) {
-        bool restore = !( tqparentWidget()->isVisible() );
+    if ( parentWidget() ) {
+        bool restore = !( parentWidget()->isVisible() );
 	minimizeRestore( restore );
     }
 }
@@ -207,13 +207,13 @@ void KSystemTray::maybeQuit()
     // KDE4: stop closing the parent widget? it results in complex application code
     //       instead make applications connect to the quitSelected() signal
 
-    if (tqparentWidget())
+    if (parentWidget())
     {
-        tqparentWidget()->close();
+        parentWidget()->close();
     }
     else
     {
-        tqApp->closeAllWindows();
+        qApp->closeAllWindows();
     }
 }
 
@@ -237,7 +237,7 @@ void KSystemTray::setInactive()
 // (just like taskbar); otherwise hide it
 void KSystemTray::activateOrHide()
 {
-    TQWidget *pw = tqparentWidget();
+    TQWidget *pw = parentWidget();
 
     if ( !pw )
 	return;
@@ -263,7 +263,7 @@ void KSystemTray::activateOrHide()
                 NET::WMGeometry | NET::XAWMState | NET::WMState | NET::WMWindowType );
             if( info2.mappingState() != NET::Visible )
                 continue; // not visible on current desktop -> ignore
-            if( !info2.tqgeometry().intersects( pw->tqgeometry()))
+            if( !info2.geometry().intersects( pw->geometry()))
                 continue; // not obscuring the window -> ignore
             if( !info1.hasState( NET::KeepAbove ) && info2.hasState( NET::KeepAbove ))
                 continue; // obscured by window kept above -> ignore
@@ -283,7 +283,7 @@ void KSystemTray::activateOrHide()
 
 void KSystemTray::minimizeRestore( bool restore )
 {
-    TQWidget* pw = tqparentWidget();
+    TQWidget* pw = parentWidget();
     if( !pw )
 	return;
 #ifdef Q_WS_X11
@@ -294,7 +294,7 @@ void KSystemTray::minimizeRestore( bool restore )
 	    KWin::setOnAllDesktops( pw->winId(), true );
 	else
 	    KWin::setCurrentDesktop( info.desktop() );
-        pw->move( info.tqgeometry().topLeft() ); // avoid placement policies
+        pw->move( info.geometry().topLeft() ); // avoid placement policies
         pw->show();
         pw->raise();
 	KWin::activateWindow( pw->winId() );
diff --git a/kdeui/ksystemtray.h b/kdeui/ksystemtray.h
index 6794bda19..861de3f3b 100644
--- a/kdeui/ksystemtray.h
+++ b/kdeui/ksystemtray.h
@@ -163,7 +163,7 @@ protected:
 
     /**
        Reimplemented to provide the standard show/raise behavior
-       for the tqparentWidget() and the context menu.
+       for the parentWidget() and the context menu.
 
        Feel free to reimplement this if you need something special.
      */
@@ -171,7 +171,7 @@ protected:
 
     /**
        Reimplemented to provide the standard show/raise behavior
-       for the tqparentWidget() and the context menu.
+       for the parentWidget() and the context menu.
 
        Feel free to reimplement this if you need something special.
      */
diff --git a/kdeui/ktabbar.cpp b/kdeui/ktabbar.cpp
index 615fa3795..e95eb54ca 100644
--- a/kdeui/ktabbar.cpp
+++ b/kdeui/ktabbar.cpp
@@ -48,7 +48,7 @@ KTabBar::KTabBar( TQWidget *parent, const char *name )
     mActivateDragSwitchTabTimer = new TQTimer( this );
     connect( mActivateDragSwitchTabTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( activateDragSwitchTab() ) );
 
-    connect(this, TQT_SIGNAL(tqlayoutChanged()), TQT_SLOT(onLayoutChange()));
+    connect(this, TQT_SIGNAL(layoutChanged()), TQT_SLOT(onLayoutChange()));
 }
 
 KTabBar::~KTabBar()
@@ -76,11 +76,11 @@ void KTabBar::setTabEnabled( int id, bool enabled )
 
                 if ( t->isEnabled() ) {
                     r = r.unite( t->rect() );
-                    tablist->append( tablist->take( tablist->tqfindRef( t ) ) );
+                    tablist->append( tablist->take( tablist->findRef( t ) ) );
                     emit selected( t->identifier() );
                 }
             }
-            tqrepaint( r );
+            repaint( r );
         }
     }
 }
@@ -170,10 +170,10 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e )
             TQRect rect( 0, 0, pixmap.width() + 4, pixmap.height() +4);
 
             int xoff = 0, yoff = 0;
-            // The additional offsets were found by try and error, TODO: tqfind the rational behind them
+            // The additional offsets were found by try and error, TODO: find the rational behind them
             if ( t == tab( currentTab() ) ) {
-                xoff = style().tqpixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this ) + 3;
-                yoff = style().tqpixelMetric( TQStyle::PM_TabBarTabShiftVertical, this ) - 4;
+                xoff = style().pixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this ) + 3;
+                yoff = style().pixelMetric( TQStyle::PM_TabBarTabShiftVertical, this ) - 4;
             }
             else {
                 xoff = 7;
@@ -181,7 +181,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e )
             }
             rect.moveLeft( t->rect().left() + 2 + xoff );
             rect.moveTop( t->rect().center().y()-pixmap.height()/2 + yoff );
-            if ( rect.tqcontains( e->pos() ) ) {
+            if ( rect.contains( e->pos() ) ) {
                 if ( mHoverCloseButton ) {
                     if ( mHoverCloseButtonTab == t )
                         return;
@@ -253,7 +253,7 @@ void KTabBar::dragMoveEvent( TQDragMoveEvent *e )
     TQTab *tab = selectTab( e->pos() );
     if( tab ) {
         bool accept = false;
-        // The tqreceivers of the testCanDecode() signal has to adjust
+        // The receivers of the testCanDecode() signal has to adjust
         // 'accept' accordingly.
         emit testCanDecode( e, accept);
         if ( accept && tab != TQTabBar::tab( currentTab() ) ) {
@@ -294,16 +294,16 @@ void KTabBar::setTabColor( int id, const TQColor& color )
     TQTab *t = tab( id );
     if ( t ) {
         mTabColors.insert( id, color );
-        tqrepaint( t->rect(), false );
+        repaint( t->rect(), false );
     }
 }
 
 const TQColor &KTabBar::tabColor( int id  ) const
 {
-    if ( mTabColors.tqcontains( id ) )
+    if ( mTabColors.contains( id ) )
         return mTabColors[id];
 
-    return tqcolorGroup().foreground();
+    return colorGroup().foreground();
 }
 
 int KTabBar::insertTab( TQTab *t, int index )
@@ -312,7 +312,7 @@ int KTabBar::insertTab( TQTab *t, int index )
 
     if ( mTabCloseActivatePrevious && count() > 2 ) {
         TQPtrList<TQTab> *tablist = tabList();
-        tablist->insert( count()-2, tablist->take( tablist->tqfindRef( t ) ) );
+        tablist->insert( count()-2, tablist->take( tablist->findRef( t ) ) );
     }
 
     return res;
@@ -341,8 +341,8 @@ void KTabBar::paintLabel( TQPainter *p, const TQRect& br,
         r.setLeft( r.left() + pixw + 4 );
         r.setRight( r.right() + 2 );
 
-        int inactiveXShift = style().tqpixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this );
-        int inactiveYShift = style().tqpixelMetric( TQStyle::PM_TabBarTabShiftVertical, this );
+        int inactiveXShift = style().pixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this );
+        int inactiveYShift = style().pixelMetric( TQStyle::PM_TabBarTabShiftVertical, this );
 
         int right = t->text().isEmpty() ? br.right() - pixw : br.left() + 2;
 
@@ -358,11 +358,11 @@ void KTabBar::paintLabel( TQPainter *p, const TQRect& br,
     if ( has_focus )
         flags |= TQStyle::Style_HasFocus;
 
-    TQColorGroup cg( tqcolorGroup() );
-    if ( mTabColors.tqcontains( t->identifier() ) )
+    TQColorGroup cg( colorGroup() );
+    if ( mTabColors.contains( t->identifier() ) )
         cg.setColor( TQColorGroup::Foreground, mTabColors[t->identifier()] );
 
-    style().tqdrawControl( TQStyle::CE_TabBarLabel, p, this, r,
+    style().drawControl( TQStyle::CE_TabBarLabel, p, this, r,
                              t->isEnabled() ? cg : palette().disabled(),
                              flags, TQStyleOption(t) );
 }
diff --git a/kdeui/ktabctl.cpp b/kdeui/ktabctl.cpp
index 03546ace9..a4b3c8ac8 100644
--- a/kdeui/ktabctl.cpp
+++ b/kdeui/ktabctl.cpp
@@ -56,8 +56,8 @@ void KTabCtl::resizeEvent(TQResizeEvent *)
         for (i=0; i<(int)pages.size(); i++) {
             pages[i]->setGeometry(r);
         }
-        if( ( tabs->tqshape() == TQTabBar::RoundedBelow ) ||
-            ( tabs->tqshape() == TQTabBar::TriangularBelow ) ) {
+        if( ( tabs->shape() == TQTabBar::RoundedBelow ) ||
+            ( tabs->shape() == TQTabBar::TriangularBelow ) ) {
             tabs->move( 0, height()-tabs->height()-4 );
         }
     }
@@ -104,7 +104,7 @@ bool KTabCtl::isTabEnabled(const TQString& name)
     unsigned int i;
 
     for(i = 0; i < pages.size(); i++)
-	if (TQString::tqfromLatin1(pages[i]->name()) == name)
+	if (TQString::fromLatin1(pages[i]->name()) == name)
 	    return tabs->isTabEnabled(i);   /* return the enabled status */
     return false;     /* tab does not exist */
 }
@@ -117,7 +117,7 @@ void KTabCtl::setTabEnabled(const TQString& name, bool state)
         return;
 
     for (i = 0; i < pages.size(); i++)
-	if (TQString::tqfromLatin1(pages[i]->name()) == name)
+	if (TQString::fromLatin1(pages[i]->name()) == name)
 	    tabs->setTabEnabled(i, state);
 }
 
@@ -125,7 +125,7 @@ void KTabCtl::setSizes()
 {
     unsigned i;
 
-    TQSize min(tabs->tqsizeHint());    /* the minimum required size for the tabbar */
+    TQSize min(tabs->sizeHint());    /* the minimum required size for the tabbar */
     tabs->resize(min);         /* make sure that the tabbar does not require more space than actually needed. */
 
 
@@ -138,14 +138,14 @@ void KTabCtl::setSizes()
          * check the actual minimum and maximum sizes
          */
 
-	if (pages[i]->tqmaximumSize().height() < max.height())
-	    max.setHeight(pages[i]->tqmaximumSize().height());
-	if (pages[i]->tqmaximumSize().width() < max.width())
-	    max.setWidth( pages[i]->tqmaximumSize().width());
-	if ( pages[i]->tqminimumSize().height() > min.height())
-	    min.setHeight( pages[i]->tqminimumSize().height());
-	if ( pages[i]->tqminimumSize().width() > min.width())
-	    min.setWidth( pages[i]->tqminimumSize().width());
+	if (pages[i]->maximumSize().height() < max.height())
+	    max.setHeight(pages[i]->maximumSize().height());
+	if (pages[i]->maximumSize().width() < max.width())
+	    max.setWidth( pages[i]->maximumSize().width());
+	if ( pages[i]->minimumSize().height() > min.height())
+	    min.setHeight( pages[i]->minimumSize().height());
+	if ( pages[i]->minimumSize().width() > min.width())
+	    min.setWidth( pages[i]->minimumSize().width());
     }
 
     // BL: min and max are sizes of children, not tabcontrol
@@ -184,22 +184,22 @@ void KTabCtl::setBorder( bool state )
     blBorder = state;
 }
 
-void KTabCtl::setShape( TQTabBar::Shape tqshape )
+void KTabCtl::setShape( TQTabBar::Shape shape )
 {
-    tabs->setShape( tqshape );
+    tabs->setShape( shape );
 }
 
 QSize
-KTabCtl::tqsizeHint() const
+KTabCtl::sizeHint() const
 {
 	/* desired size of the tabbar */
-	TQSize hint(tabs->tqsizeHint());
+	TQSize hint(tabs->sizeHint());
 
 	/* overall desired size of all pages */
 	TQSize pageHint;
 	for (unsigned int i = 0; i < pages.size(); i++)
 	{
-		TQSize sizeI(pages[i]->tqsizeHint());
+		TQSize sizeI(pages[i]->sizeHint());
 
 		if (sizeI.isValid())
 		{
@@ -229,7 +229,7 @@ KTabCtl::tqsizeHint() const
 	}
 
 	/*
-	 * If not at least a one page has a valid tqsizeHint we have to return
+	 * If not at least a one page has a valid sizeHint we have to return
 	 * an invalid size as well.
 	 */
 	return (pageHint);
@@ -251,16 +251,16 @@ void KTabCtl::paintEvent(TQPaintEvent *)
     int x1 = getChildRect().right() + 2;
     int x0 = getChildRect().left() - 1;
 
-    p.setPen(tqcolorGroup().light());
+    p.setPen(colorGroup().light());
     p.drawLine(x0, y0 - 1, x1 - 1, y0 - 1);      /* 1st top line */
-    p.setPen(tqcolorGroup().midlight());
+    p.setPen(colorGroup().midlight());
     p.drawLine(x0, y0, x1 - 1, y0);      /* 2nd top line */
-    p.setPen(tqcolorGroup().light());
+    p.setPen(colorGroup().light());
     p.drawLine(x0, y0 + 1, x0, y1);      /* left line */
     p.setPen(black);
     p.drawLine(x1, y1, x0, y1);          /* bottom line */
     p.drawLine(x1, y1 - 1, x1, y0);
-    p.setPen(tqcolorGroup().dark());
+    p.setPen(colorGroup().dark());
     p.drawLine(x0 + 1, y1 - 1, x1 - 1, y1 - 1);  /* bottom */
     p.drawLine(x1 - 1, y1 - 2, x1 - 1, y0 + 1);
     p.end();
@@ -273,8 +273,8 @@ void KTabCtl::paintEvent(TQPaintEvent *)
 
 TQRect KTabCtl::getChildRect() const
 {
-    if( ( tabs->tqshape() == TQTabBar::RoundedBelow ) ||
-        ( tabs->tqshape() == TQTabBar::TriangularBelow ) ) {
+    if( ( tabs->shape() == TQTabBar::RoundedBelow ) ||
+        ( tabs->shape() == TQTabBar::TriangularBelow ) ) {
     	return TQRect(2, 1, width() - 4,
 		     height() - tabs->height() - 4);
     } else {
diff --git a/kdeui/ktabctl.h b/kdeui/ktabctl.h
index a57d529c7..9c390351f 100644
--- a/kdeui/ktabctl.h
+++ b/kdeui/ktabctl.h
@@ -61,8 +61,8 @@ public:
     bool isTabEnabled(const TQString& );
     void setTabEnabled(const TQString&, bool);
     void setBorder(bool);
-    void setShape( TQTabBar::Shape tqshape );
-    virtual TQSize tqsizeHint() const;
+    void setShape( TQTabBar::Shape shape );
+    virtual TQSize sizeHint() const;
 
 protected:
     void paintEvent(TQPaintEvent *);
diff --git a/kdeui/ktabwidget.cpp b/kdeui/ktabwidget.cpp
index 463c8a940..5a431ecd2 100644
--- a/kdeui/ktabwidget.cpp
+++ b/kdeui/ktabwidget.cpp
@@ -163,8 +163,8 @@ bool KTabWidget::tabCloseActivatePrevious() const
 unsigned int KTabWidget::tabBarWidthForMaxChars( uint maxLength )
 {
     int hframe, overlap;
-    hframe  = tabBar()->style().tqpixelMetric( TQStyle::PM_TabBarTabHSpace, tabBar() );
-    overlap = tabBar()->style().tqpixelMetric( TQStyle::PM_TabBarTabOverlap, tabBar() );
+    hframe  = tabBar()->style().pixelMetric( TQStyle::PM_TabBarTabHSpace, tabBar() );
+    overlap = tabBar()->style().pixelMetric( TQStyle::PM_TabBarTabOverlap, tabBar() );
 
     TQFontMetrics fm = tabBar()->fontMetrics();
     int x = 0;
@@ -253,7 +253,7 @@ void KTabWidget::resizeTabs( int changeTabIndex )
         newMaxLength=d->m_maxLength;
         uint lcw=0, rcw=0;
 
-        int tabBarHeight = tabBar()->tqsizeHint().height();
+        int tabBarHeight = tabBar()->sizeHint().height();
         if ( cornerWidget( TopLeft ) && cornerWidget( TopLeft )->isVisible() )
             lcw = QMAX( cornerWidget( TopLeft )->width(), tabBarHeight );
         if ( cornerWidget( TopRight ) && cornerWidget( TopRight )->isVisible() )
@@ -291,7 +291,7 @@ void KTabWidget::updateTab( int index )
     }
 
     title = KStringHandler::rsqueeze( title, d->m_CurrentMaxLength ).leftJustify( d->m_minLength, ' ' );
-    title.tqreplace( '&', "&&" );
+    title.replace( '&', "&&" );
 
     if ( TQTabWidget::label( index ) != title )
         TQTabWidget::setTabLabel( page( index ), title );
@@ -301,7 +301,7 @@ void KTabWidget::dragMoveEvent( TQDragMoveEvent *e )
 {
     if ( isEmptyTabbarSpace( e->pos() ) ) {
         bool accept = false;
-        // The tqreceivers of the testCanDecode() signal has to adjust
+        // The receivers of the testCanDecode() signal has to adjust
         // 'accept' accordingly.
         emit testCanDecode( e, accept);
         e->accept( accept );
@@ -451,7 +451,7 @@ void KTabWidget::removePage( TQWidget * w ) {
 
 bool KTabWidget::isEmptyTabbarSpace( const TQPoint &point ) const
 {
-    TQSize size( tabBar()->tqsizeHint() );
+    TQSize size( tabBar()->sizeHint() );
     if ( ( tabPosition()==Top && point.y()< size.height() ) || ( tabPosition()==Bottom && point.y()>(height()-size.height() ) ) ) {
         TQWidget *rightcorner = cornerWidget( TopRight );
         if ( rightcorner ) {
diff --git a/kdeui/ktextbrowser.cpp b/kdeui/ktextbrowser.cpp
index e18076590..6b3685a81 100644
--- a/kdeui/ktextbrowser.cpp
+++ b/kdeui/ktextbrowser.cpp
@@ -60,7 +60,7 @@ void KTextBrowser::setSource( const TQString& name )
     return;
   }
 
-  if( name.tqfind('@') > -1 )
+  if( name.find('@') > -1 )
   {
     if( !mNotifyClick )
     {
@@ -106,7 +106,7 @@ void KTextBrowser::viewportMouseMoveEvent( TQMouseEvent* e)
   // do this first so we get the right type of cursor
   TQTextBrowser::viewportMouseMoveEvent(e);
 
-  if ( viewport()->cursor().tqshape() == PointingHandCursor )
+  if ( viewport()->cursor().shape() == PointingHandCursor )
     viewport()->setCursor( KCursor::handCursor() );
 }
 
diff --git a/kdeui/ktextedit.cpp b/kdeui/ktextedit.cpp
index 7aa654532..0951fe066 100644
--- a/kdeui/ktextedit.cpp
+++ b/kdeui/ktextedit.cpp
@@ -75,44 +75,44 @@ void KTextEdit::keyPressEvent( TQKeyEvent *e )
 {
     KKey key( e );
 
-    if ( KStdAccel::copy().tqcontains( key ) ) {
+    if ( KStdAccel::copy().contains( key ) ) {
         copy();
         e->accept();
         return;
     }
-    else if ( KStdAccel::paste().tqcontains( key ) ) {
+    else if ( KStdAccel::paste().contains( key ) ) {
         paste();
         e->accept();
         return;
     }
-    else if ( KStdAccel::cut().tqcontains( key ) ) {
+    else if ( KStdAccel::cut().contains( key ) ) {
         cut();
         e->accept();
         return;
     }
-    else if ( KStdAccel::undo().tqcontains( key ) ) {
+    else if ( KStdAccel::undo().contains( key ) ) {
         undo();
         e->accept();
         return;
     }
-    else if ( KStdAccel::redo().tqcontains( key ) ) {
+    else if ( KStdAccel::redo().contains( key ) ) {
         redo();
         e->accept();
         return;
     }
-    else if ( KStdAccel::deleteWordBack().tqcontains( key ) )
+    else if ( KStdAccel::deleteWordBack().contains( key ) )
     {
         deleteWordBack();
         e->accept();
         return;
     }
-    else if ( KStdAccel::deleteWordForward().tqcontains( key ) )
+    else if ( KStdAccel::deleteWordForward().contains( key ) )
     {
         deleteWordForward();
         e->accept();
         return;
     }
-    else if ( KStdAccel::backwardWord().tqcontains( key ) )
+    else if ( KStdAccel::backwardWord().contains( key ) )
     {
       CursorAction action = MoveWordBackward;
       int para, index;
@@ -123,7 +123,7 @@ void KTextEdit::keyPressEvent( TQKeyEvent *e )
       e->accept();
       return;
     }
-    else if ( KStdAccel::forwardWord().tqcontains( key ) )
+    else if ( KStdAccel::forwardWord().contains( key ) )
     {
       CursorAction action = MoveWordForward;
       int para, index;
@@ -134,43 +134,43 @@ void KTextEdit::keyPressEvent( TQKeyEvent *e )
       e->accept();
       return;
     }
-    else if ( KStdAccel::next().tqcontains( key ) )
+    else if ( KStdAccel::next().contains( key ) )
     {
       moveCursor( MovePgDown, false );
       e->accept();
       return;
     }
-    else if ( KStdAccel::prior().tqcontains( key ) )
+    else if ( KStdAccel::prior().contains( key ) )
     {
       moveCursor( MovePgUp, false );
       e->accept();
       return;
     }
-    else if ( KStdAccel::home().tqcontains( key ) )
+    else if ( KStdAccel::home().contains( key ) )
     {
       moveCursor( MoveHome, false );
       e->accept();
       return;
     }
-    else if ( KStdAccel::end().tqcontains( key ) )
+    else if ( KStdAccel::end().contains( key ) )
     {
       moveCursor( MoveEnd, false );
       e->accept();
       return;
     }
-    else if ( KStdAccel::beginningOfLine().tqcontains( key ) )
+    else if ( KStdAccel::beginningOfLine().contains( key ) )
     {
       moveCursor( MoveLineStart, false );
       e->accept();
       return;
     }
-    else if ( KStdAccel::endOfLine().tqcontains( key ) )
+    else if ( KStdAccel::endOfLine().contains( key ) )
     {
       moveCursor(MoveLineEnd, false);
       e->accept();
       return;
     }
-    else if ( KStdAccel::pasteSelection().tqcontains( key ) )
+    else if ( KStdAccel::pasteSelection().contains( key ) )
     {
         TQString text = TQApplication::clipboard()->text( QClipboard::Selection);
         if ( !text.isEmpty() )
@@ -182,7 +182,7 @@ void KTextEdit::keyPressEvent( TQKeyEvent *e )
     // ignore Ctrl-Return so that KDialogs can close the dialog
     else if ( e->state() == ControlButton &&
               (e->key() == Key_Return || e->key() == Key_Enter) &&
-              tqtopLevelWidget()->inherits( "KDialog" ) )
+              topLevelWidget()->inherits( "KDialog" ) )
     {
         e->ignore();
         return;
@@ -262,7 +262,7 @@ void KTextEdit::setPalette( const TQPalette& palette )
 {
     TQTextEdit::setPalette( palette );
     // unsetPalette() is not virtual and calls setPalette() as well
-    // so we can use ownPalette() to tqfind out about unsetting
+    // so we can use ownPalette() to find out about unsetting
     d->customPalette = ownPalette();
 }
 
diff --git a/kdeui/ktimewidget.cpp b/kdeui/ktimewidget.cpp
index 09ae40060..3a5ec3936 100644
--- a/kdeui/ktimewidget.cpp
+++ b/kdeui/ktimewidget.cpp
@@ -36,8 +36,8 @@ void KTimeWidget::init()
 {
   d = new KTimeWidgetPrivate;
 
-  TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
-  tqlayout->setAutoAdd(true);
+  TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
+  layout->setAutoAdd(true);
 
   d->timeWidget = new QTimeEdit(this);
 
diff --git a/kdeui/ktimezonewidget.cpp b/kdeui/ktimezonewidget.cpp
index fb514c5d5..a9a73a4f5 100644
--- a/kdeui/ktimezonewidget.cpp
+++ b/kdeui/ktimezonewidget.cpp
@@ -85,7 +85,7 @@ KTimezoneWidget::~KTimezoneWidget()
 
 TQString KTimezoneWidget::displayName(const KTimezone *zone)
 {
-    return i18n(zone->name().utf8()).tqreplace("_", " ");
+    return i18n(zone->name().utf8()).replace("_", " ");
 }
 
 TQStringList KTimezoneWidget::selection() const
diff --git a/kdeui/ktip.cpp b/kdeui/ktip.cpp
index cc8740caa..ae619a173 100644
--- a/kdeui/ktip.cpp
+++ b/kdeui/ktip.cpp
@@ -59,7 +59,7 @@ KTipDatabase::KTipDatabase(const TQString &_tipFile)
 {
     TQString tipFile = _tipFile;
     if (tipFile.isEmpty())
-	tipFile = TQString::tqfromLatin1(KGlobal::instance()->aboutData()->appName()) + "/tips";
+	tipFile = TQString::fromLatin1(KGlobal::instance()->aboutData()->appName()) + "/tips";
 
     loadTips(tipFile);
 
@@ -72,7 +72,7 @@ KTipDatabase::KTipDatabase( const TQStringList& tipsFiles )
 {
    if ( tipsFiles.isEmpty() || ( ( tipsFiles.count() == 1 ) && tipsFiles.first().isEmpty() ) )
    {
-       addTips(TQString::tqfromLatin1(KGlobal::instance()->aboutData()->appName()) + "/tips");
+       addTips(TQString::fromLatin1(KGlobal::instance()->aboutData()->appName()) + "/tips");
    }
    else
    {
@@ -99,7 +99,7 @@ void KTipDatabase::addTips(const TQString& tipFile )
 
     if (fileName.isEmpty())
     {
-	kdDebug() << "KTipDatabase::addTips: can't tqfind '" << tipFile << "' in standard dirs" << endl;
+	kdDebug() << "KTipDatabase::addTips: can't find '" << tipFile << "' in standard dirs" << endl;
         return;
     }
 
@@ -115,13 +115,13 @@ void KTipDatabase::addTips(const TQString& tipFile )
     const TQRegExp rx("\\n+");
 
     int pos = -1;
-    while ((pos = content.tqfind("<html>", pos + 1, false)) != -1)
+    while ((pos = content.find("<html>", pos + 1, false)) != -1)
     {
        // to make translations work, tip extraction here must exactly 
        // match what is done by the preparetips script 
        TQString tip = content 
-           .mid(pos + 6, content.tqfind("</html>", pos, false) - pos - 6)
-           .tqreplace(rx, "\n");
+           .mid(pos + 6, content.find("</html>", pos, false) - pos - 6)
+           .replace(rx, "\n");
        if (!tip.endsWith("\n"))
            tip += "\n";
        if (tip.startsWith("\n")) 
@@ -173,7 +173,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name)
 {
     /**
      * Parent is 0L when TipDialog is used as a mainWidget. This should
-     * be the case only in ktip, so let's use the ktip tqlayout.
+     * be the case only in ktip, so let's use the ktip layout.
      */
     bool isTipDialog = (parent);
 
@@ -191,7 +191,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name)
 	KIconEffect::colorize(img, mBlendedColor, 1.0);
 	QRgb colPixel( img.pixel(0,0) );
 
-	mBlendedColor = TQColor(tqRed(colPixel),tqGreen(colPixel),tqBlue(colPixel));
+	mBlendedColor = TQColor(qRed(colPixel),qGreen(colPixel),qBlue(colPixel));
     }
 
     mBaseColor = KGlobalSettings::alternateBackgroundColor();
@@ -223,7 +223,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name)
 	titlePane->setBackgroundPixmap(locate("data", "kdeui/pics/ktip-background.png"));
 	titlePane->setText(i18n("Did you know...?\n"));
 	titlePane->setFont(TQFont(KGlobalSettings::generalFont().family(), 20, TQFont::Bold));
-	titlePane->tqsetAlignment(TQLabel::AlignCenter);
+	titlePane->setAlignment(TQLabel::AlignCenter);
 	pl->addWidget(titlePane, 100);
     }
 
@@ -268,7 +268,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name)
 	TQLabel *l = new TQLabel(hbox);
 	l->setPixmap(img);
 	l->setBackgroundColor(mBlendedColor);
-	l->tqsetAlignment(Qt::AlignRight | Qt::AlignBottom);
+	l->setAlignment(Qt::AlignRight | Qt::AlignBottom);
 
 	resize(550, 230);
         TQSize sh = size();
@@ -347,10 +347,10 @@ void KTipDialog::showMultiTip(TQWidget *parent, const TQStringList &tipFiles, bo
            const int oneDay = 24*60*60;
            TQDateTime lastShown = configGroup.readDateTimeEntry("TipLastShown");
            // Show tip roughly once a week
-           if (lastShown.secsTo(TQDateTime::tqcurrentDateTime()) < (oneDay + (kapp->random() % (10*oneDay))))
+           if (lastShown.secsTo(TQDateTime::currentDateTime()) < (oneDay + (kapp->random() % (10*oneDay))))
                return;
         }
-        configGroup.writeEntry("TipLastShown", TQDateTime::tqcurrentDateTime());
+        configGroup.writeEntry("TipLastShown", TQDateTime::currentDateTime());
         kapp->config()->sync();
         if (!hasLastShown)
            return; // Don't show tip on first start
@@ -375,7 +375,7 @@ static TQString fixTip(TQString tip)
       TQString iconName = iconRegExp.cap(1);
       if (!iconName.isEmpty())
          if (KGlobal::dirs()->findResource("icon", iconName).isEmpty())
-           tip.tqreplace("crystalsvg","hicolor");
+           tip.replace("crystalsvg","hicolor");
     }
 
     return tip;
@@ -384,7 +384,7 @@ static TQString fixTip(TQString tip)
   void KTipDialog::prevTip()
   {
       mDatabase->prevTip();
-      TQString currentTip = TQString::tqfromLatin1(
+      TQString currentTip = TQString::fromLatin1(
      "<qt text=\"%1\" bgcolor=\"%2\">%3</qt>")
      .arg(mTextColor.name())
      .arg(mBaseColor.name())
@@ -399,7 +399,7 @@ static TQString fixTip(TQString tip)
   void KTipDialog::nextTip()
   {
       mDatabase->nextTip();
-      TQString currentTip = TQString::tqfromLatin1(
+      TQString currentTip = TQString::fromLatin1(
         "<qt text=\"%1\" bgcolor=\"%2\">%3</qt>")
         .arg(mTextColor.name())
         .arg(mBaseColor.name())
diff --git a/kdeui/ktoolbar.cpp b/kdeui/ktoolbar.cpp
index e885667a8..79607099a 100644
--- a/kdeui/ktoolbar.cpp
+++ b/kdeui/ktoolbar.cpp
@@ -131,7 +131,7 @@ public:
 
     ToolBarInfo toolBarInfo;
     TQValueList<int> iconSizes;
-    TQTimer tqrepaintTimer;
+    TQTimer repaintTimer;
 
   // Default Values.
   bool HiddenDefault;
@@ -170,7 +170,7 @@ void KToolBarSeparator::drawContents( TQPainter* p )
             flags = flags | TQStyle::Style_Horizontal;
 
         style().drawPrimitive(TQStyle::PE_DockWindowSeparator, p,
-                              contentsRect(), tqcolorGroup(), flags);
+                              contentsRect(), colorGroup(), flags);
     } else {
         TQFrame::drawContents(p);
     }
@@ -181,9 +181,9 @@ void KToolBarSeparator::styleChange( TQStyle& )
     setOrientation( orient );
 }
 
-TQSize KToolBarSeparator::tqsizeHint() const
+TQSize KToolBarSeparator::sizeHint() const
 {
-    int dim = style().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this );
+    int dim = style().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this );
     return orientation() == Vertical ? TQSize( 0, dim ) : TQSize( dim, 0 );
 }
 
@@ -193,7 +193,7 @@ TQSizePolicy KToolBarSeparator::sizePolicy() const
 }
 
 KToolBar::KToolBar( TQWidget *parent, const char *name, bool honorStyle, bool readConfig )
-    : TQToolBar( TQString::tqfromLatin1( name ),
+    : TQToolBar( TQString::fromLatin1( name ),
       dynamic_cast<TQMainWindow*>(parent),
       parent, false,
       name ? name : "mainToolBar")
@@ -202,7 +202,7 @@ KToolBar::KToolBar( TQWidget *parent, const char *name, bool honorStyle, bool re
 }
 
 KToolBar::KToolBar( TQMainWindow *parentWindow, TQMainWindow::ToolBarDock dock, bool newLine, const char *name, bool honorStyle, bool readConfig )
-    : TQToolBar( TQString::tqfromLatin1( name ),
+    : TQToolBar( TQString::fromLatin1( name ),
       parentWindow, dock, newLine,
       name ? name : "mainToolBar")
 {
@@ -210,7 +210,7 @@ KToolBar::KToolBar( TQMainWindow *parentWindow, TQMainWindow::ToolBarDock dock,
 }
 
 KToolBar::KToolBar( TQMainWindow *parentWindow, TQWidget *dock, bool newLine, const char *name, bool honorStyle, bool readConfig )
-    : TQToolBar( TQString::tqfromLatin1( name ),
+    : TQToolBar( TQString::fromLatin1( name ),
       parentWindow, dock, newLine,
       name ? name : "mainToolBar")
 {
@@ -229,10 +229,10 @@ void KToolBar::init( bool readConfig, bool honorStyle )
     setFullSize( true );
     d->m_honorStyle = honorStyle;
     context = 0;
-    tqlayoutTimer = new TQTimer( this );
-    connect( tqlayoutTimer, TQT_SIGNAL( timeout() ),
+    layoutTimer = new TQTimer( this );
+    connect( layoutTimer, TQT_SIGNAL( timeout() ),
              this, TQT_SLOT( rebuildLayout() ) );
-    connect( &(d->tqrepaintTimer), TQT_SIGNAL( timeout() ),
+    connect( &(d->repaintTimer), TQT_SIGNAL( timeout() ),
              this, TQT_SLOT( slotRepaint() ) );
 
     if ( kapp ) { // may be null when started inside designer
@@ -427,7 +427,7 @@ int KToolBar::insertAnimatedWidget(int id, TQObject *receiver, const char *slot,
 
 KAnimWidget *KToolBar::animatedWidget( int id )
 {
-    Id2WidgetMap::Iterator it = id2widget.tqfind( id );
+    Id2WidgetMap::Iterator it = id2widget.find( id );
     if ( it == id2widget.end() )
         return 0;
     KAnimWidget *aw = dynamic_cast<KAnimWidget *>(*it);
@@ -610,7 +610,7 @@ TQString KToolBar::getComboItem (int id, int index) const
 
 KComboBox * KToolBar::getCombo(int id)
 {
-    Id2WidgetMap::Iterator it = id2widget.tqfind( id );
+    Id2WidgetMap::Iterator it = id2widget.find( id );
     if ( it == id2widget.end() )
         return 0;
     return dynamic_cast<KComboBox *>( *it );
@@ -619,7 +619,7 @@ KComboBox * KToolBar::getCombo(int id)
 
 KLineEdit * KToolBar::getLined (int id)
 {
-    Id2WidgetMap::Iterator it = id2widget.tqfind( id );
+    Id2WidgetMap::Iterator it = id2widget.find( id );
     if ( it == id2widget.end() )
         return 0;
     return dynamic_cast<KLineEdit *>( *it );
@@ -628,7 +628,7 @@ KLineEdit * KToolBar::getLined (int id)
 
 KToolBarButton * KToolBar::getButton (int id)
 {
-    Id2WidgetMap::Iterator it = id2widget.tqfind( id );
+    Id2WidgetMap::Iterator it = id2widget.find( id );
     if ( it == id2widget.end() )
         return 0;
     return dynamic_cast<KToolBarButton *>( *it );
@@ -637,7 +637,7 @@ KToolBarButton * KToolBar::getButton (int id)
 
 void KToolBar::alignItemRight (int id, bool right )
 {
-    Id2WidgetMap::Iterator it = id2widget.tqfind( id );
+    Id2WidgetMap::Iterator it = id2widget.find( id );
     if ( it == id2widget.end() )
         return;
     if ( rightAligned && !right && (*it) == rightAligned )
@@ -649,7 +649,7 @@ void KToolBar::alignItemRight (int id, bool right )
 
 TQWidget *KToolBar::getWidget (int id)
 {
-    Id2WidgetMap::Iterator it = id2widget.tqfind( id );
+    Id2WidgetMap::Iterator it = id2widget.find( id );
     return ( it == id2widget.end() ) ? 0 : (*it);
 }
 
@@ -677,7 +677,7 @@ void KToolBar::clear ()
 
 void KToolBar::removeItem(int id)
 {
-    Id2WidgetMap::Iterator it = id2widget.tqfind( id );
+    Id2WidgetMap::Iterator it = id2widget.find( id );
     if ( it == id2widget.end() )
     {
         kdDebug(220) << name() << " KToolBar::removeItem item " << id << " not found" << endl;
@@ -693,7 +693,7 @@ void KToolBar::removeItem(int id)
 
 void KToolBar::removeItemDelayed(int id)
 {
-    Id2WidgetMap::Iterator it = id2widget.tqfind( id );
+    Id2WidgetMap::Iterator it = id2widget.find( id );
     if ( it == id2widget.end() )
     {
         kdDebug(220) << name() << " KToolBar::removeItem item " << id << " not found" << endl;
@@ -706,7 +706,7 @@ void KToolBar::removeItemDelayed(int id)
 
     w->blockSignals(true);
     d->idleButtons.append(w);
-    tqlayoutTimer->start( 50, true );
+    layoutTimer->start( 50, true );
 }
 
 
@@ -729,7 +729,7 @@ void KToolBar::showItem (int id)
 int KToolBar::itemIndex (int id)
 {
     TQWidget *w = getWidget(id);
-    return w ? widgets.tqfindRef(w) : -1;
+    return w ? widgets.findRef(w) : -1;
 }
 
 int KToolBar::idAt (int index)
@@ -781,7 +781,7 @@ KToolBar::BarPosition KToolBar::barPos() const
 }
 
 
-bool KToolBar::enable(BartqStatus stat)
+bool KToolBar::enable(BarStatus stat)
 {
     bool mystat = isVisible();
 
@@ -964,7 +964,7 @@ void KToolBar::saveState()
     if ( d->m_xmlguiClient && !d->m_xmlguiClient->xmlFile().isEmpty() ) {
         //kdDebug(220) << name() << " saveState: saving to " << d->m_xmlguiClient->xmlFile() << endl;
         TQString barname(!::qstrcmp(name(), "unnamed") ? "mainToolBar" : name());
-        // try to tqfind our toolbar
+        // try to find our toolbar
         d->modified = false;
         // go down one level to get to the right tags
         TQDomElement current;
@@ -1005,7 +1005,7 @@ void KToolBar::saveState()
 
             if ( curname == barname ) {
                 just_append = false;
-                local.documentElement().tqreplaceChild( current, elem );
+                local.documentElement().replaceChild( current, elem );
                 break;
             }
         }
@@ -1225,11 +1225,11 @@ void KToolBar::rebuildLayout()
        w->blockSignals(false);
     d->idleButtons.clear();
 
-    tqlayoutTimer->stop();
+    layoutTimer->stop();
     TQApplication::sendPostedEvents( this, TQEvent::ChildInserted );
     TQBoxLayout *l = boxLayout();
 
-    // clear the old tqlayout
+    // clear the old layout
     TQLayoutIterator it = l->iterator();
     while ( it.current() )
         it.deleteCurrent();
@@ -1239,7 +1239,7 @@ void KToolBar::rebuildLayout()
             continue;
         KToolBarSeparator *ktbs = dynamic_cast<KToolBarSeparator *>(w);
         if ( ktbs && !ktbs->showLine() ) {
-            l->addSpacing( orientation() == Vertical ? w->tqsizeHint().height() : w->tqsizeHint().width() );
+            l->addSpacing( orientation() == Vertical ? w->sizeHint().height() : w->sizeHint().width() );
             w->hide();
             continue;
         }
@@ -1262,7 +1262,7 @@ void KToolBar::rebuildLayout()
         if ( stretchableWidget )
             l->setStretchFactor( stretchableWidget, 10 );
     }
-    l->tqinvalidate();
+    l->invalidate();
     TQApplication::postEvent( this, new TQEvent( TQEvent::LayoutHint ) );
 }
 
@@ -1279,7 +1279,7 @@ void KToolBar::childEvent( TQChildEvent *e )
             if ( !dynamic_cast<TQPopupMenu *>(w)) { // e->child() is not a QPopupMenu
                 // prevent items that have been explicitly inserted by insert*() from
                 // being inserted again
-                if ( !widget2id.tqcontains( w ) )
+                if ( !widget2id.contains( w ) )
                 {
                     int dummy = -1;
                     insertWidgetInternal( w, dummy, -1 );
@@ -1290,10 +1290,10 @@ void KToolBar::childEvent( TQChildEvent *e )
         }
         if ( isVisibleTo( 0 ) )
         {
-            tqlayoutTimer->start( 50, true );
+            layoutTimer->start( 50, true );
             TQBoxLayout *l = boxLayout();
 
-            // clear the old tqlayout so that we don't get unnecassery tqlayout
+            // clear the old layout so that we don't get unnecassery layout
             // changes till we have rebuild the thing
             TQLayoutIterator it = l->iterator();
             while ( it.current() )
@@ -1342,27 +1342,27 @@ TQSizePolicy KToolBar::sizePolicy() const
         return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding );
 }
 
-TQSize KToolBar::tqsizeHint() const
+TQSize KToolBar::sizeHint() const
 {
     TQSize minSize(0,0);
     KToolBar *ncThis = const_cast<KToolBar *>(this);
 
     ncThis->polish();
 
-    int margin = static_cast<TQWidget*>(ncThis)->tqlayout()->margin() + frameWidth();
+    int margin = static_cast<TQWidget*>(ncThis)->layout()->margin() + frameWidth();
     switch( barPos() )
     {
      case KToolBar::Top:
      case KToolBar::Bottom:
        for ( TQWidget *w = ncThis->widgets.first(); w; w = ncThis->widgets.next() )
        {
-          TQSize sh = w->tqsizeHint();
+          TQSize sh = w->sizeHint();
           if ( w->sizePolicy().horData() == TQSizePolicy::Ignored )
              sh.setWidth( 1 );
           if ( w->sizePolicy().verData() == TQSizePolicy::Ignored )
              sh.setHeight( 1 );
-          sh = sh.boundedTo( w->tqmaximumSize() )
-                 .expandedTo( w->tqminimumSize() ).expandedTo( TQSize(1, 1) );
+          sh = sh.boundedTo( w->maximumSize() )
+                 .expandedTo( w->minimumSize() ).expandedTo( TQSize(1, 1) );
 
           minSize = minSize.expandedTo(TQSize(0, sh.height()));
           minSize += TQSize(sh.width()+1, 0);
@@ -1370,7 +1370,7 @@ TQSize KToolBar::tqsizeHint() const
              minSize += TQSize(2, 0); // A little bit extra spacing behind it.
        }
 
-       minSize += TQSize(TQApplication::style().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent ), 0);
+       minSize += TQSize(TQApplication::style().pixelMetric( TQStyle::PM_DockWindowHandleExtent ), 0);
        minSize += TQSize(margin*2, margin*2);
        break;
 
@@ -1378,36 +1378,36 @@ TQSize KToolBar::tqsizeHint() const
      case KToolBar::Right:
        for ( TQWidget *w = ncThis->widgets.first(); w; w = ncThis->widgets.next() )
        {
-          TQSize sh = w->tqsizeHint();
+          TQSize sh = w->sizeHint();
           if ( w->sizePolicy().horData() == TQSizePolicy::Ignored )
              sh.setWidth( 1 );
           if ( w->sizePolicy().verData() == TQSizePolicy::Ignored )
              sh.setHeight( 1 );
-          sh = sh.boundedTo( w->tqmaximumSize() )
-                 .expandedTo( w->tqminimumSize() ).expandedTo( TQSize(1, 1) );
+          sh = sh.boundedTo( w->maximumSize() )
+                 .expandedTo( w->minimumSize() ).expandedTo( TQSize(1, 1) );
 
           minSize = minSize.expandedTo(TQSize(sh.width(), 0));
           minSize += TQSize(0, sh.height()+1);
        }
-       minSize += TQSize(0, TQApplication::style().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent ));
+       minSize += TQSize(0, TQApplication::style().pixelMetric( TQStyle::PM_DockWindowHandleExtent ));
        minSize += TQSize(margin*2, margin*2);
        break;
 
      default:
-       minSize = TQToolBar::tqsizeHint();
+       minSize = TQToolBar::sizeHint();
        break;
     }
     return minSize;
 }
 
-TQSize KToolBar::tqminimumSize() const
+TQSize KToolBar::minimumSize() const
 {
-    return tqminimumSizeHint();
+    return minimumSizeHint();
 }
 
-TQSize KToolBar::tqminimumSizeHint() const
+TQSize KToolBar::minimumSizeHint() const
 {
-    return tqsizeHint();
+    return sizeHint();
 }
 
 bool KToolBar::highlight() const
@@ -1432,10 +1432,10 @@ void KToolBar::resizeEvent( TQResizeEvent *e )
     TQToolBar::resizeEvent( e );
     if (b)
     {
-      if (tqlayoutTimer->isActive())
+      if (layoutTimer->isActive())
       {
-         // Wait with tqrepainting till tqlayout is complete.
-         d->tqrepaintTimer.start( 100, true );
+         // Wait with repainting till layout is complete.
+         d->repaintTimer.start( 100, true );
       }
       else
       {
@@ -1481,25 +1481,25 @@ void KToolBar::slotAppearanceChanged()
 //static
 bool KToolBar::highlightSetting()
 {
-    TQString grpToolbar(TQString::tqfromLatin1("Toolbar style"));
+    TQString grpToolbar(TQString::fromLatin1("Toolbar style"));
     KConfigGroupSaver saver(KGlobal::config(), grpToolbar);
-    return KGlobal::config()->readBoolEntry(TQString::tqfromLatin1("Highlighting"),true);
+    return KGlobal::config()->readBoolEntry(TQString::fromLatin1("Highlighting"),true);
 }
 
 //static
 bool KToolBar::transparentSetting()
 {
-    TQString grpToolbar(TQString::tqfromLatin1("Toolbar style"));
+    TQString grpToolbar(TQString::fromLatin1("Toolbar style"));
     KConfigGroupSaver saver(KGlobal::config(), grpToolbar);
-    return KGlobal::config()->readBoolEntry(TQString::tqfromLatin1("TransparentMoving"),true);
+    return KGlobal::config()->readBoolEntry(TQString::fromLatin1("TransparentMoving"),true);
 }
 
 //static
 KToolBar::IconText KToolBar::iconTextSetting()
 {
-    TQString grpToolbar(TQString::tqfromLatin1("Toolbar style"));
+    TQString grpToolbar(TQString::fromLatin1("Toolbar style"));
     KConfigGroupSaver saver(KGlobal::config(), grpToolbar);
-    TQString icontext = KGlobal::config()->readEntry(TQString::tqfromLatin1("IconText"),TQString::tqfromLatin1("IconOnly"));
+    TQString icontext = KGlobal::config()->readEntry(TQString::fromLatin1("IconText"),TQString::fromLatin1("IconOnly"));
     if ( icontext == "IconTextRight" )
         return IconTextRight;
     else if ( icontext == "IconTextBottom" )
@@ -1541,7 +1541,7 @@ void KToolBar::applyAppearanceSettings(KConfig *config, const TQString &_configG
     TQString iconText = d->IconTextDefault;
 
     // this is the first iteration
-    TQString grpToolbar(TQString::tqfromLatin1("Toolbar style"));
+    TQString grpToolbar(TQString::fromLatin1("Toolbar style"));
     { // start block for KConfigGroupSaver
         KConfigGroupSaver saver(gconfig, grpToolbar);
 
@@ -1711,13 +1711,13 @@ void KToolBar::applySettings(KConfig *config, const TQString &_configGroup, bool
 bool KToolBar::event( TQEvent *e )
 {
     if ( (e->type() == TQEvent::LayoutHint) && isUpdatesEnabled() )
-       d->tqrepaintTimer.start( 100, true );
+       d->repaintTimer.start( 100, true );
 
     if (e->type() == TQEvent::ChildInserted )
     {
        // Bypass TQToolBar::event,
        // it will show() the inserted child and we don't want to
-       // do that until we have rebuilt the tqlayout.
+       // do that until we have rebuilt the layout.
        childEvent((TQChildEvent *)e);
        return true;
     }
@@ -1735,7 +1735,7 @@ void KToolBar::slotRepaint()
     resizeEvent(&ev);
     TQApplication::sendPostedEvents( this, TQEvent::LayoutHint );
     setUpdatesEnabled( true );
-    tqrepaint( true );
+    repaint( true );
 }
 
 void KToolBar::toolBarPosChanged( TQToolBar *tb )
@@ -1803,7 +1803,7 @@ void KToolBar::loadState( const TQDomElement &element )
         like we do for shortcuts)
 
       - for later re-loading when switching between parts in KXMLGUIFactory.
-        In that case the XML tqcontains the final settings, not the defaults.
+        In that case the XML contains the final settings, not the defaults.
         We do need the defaults, and the toolbar might have been completely
         deleted and recreated meanwhile. So we store the app-default settings
         into the XML.
@@ -2142,7 +2142,7 @@ void KToolBar::slotContextAboutToShow()
           tbAction->plug(context);
   }
 
-  // try to tqfind "configure toolbars" action
+  // try to find "configure toolbars" action
   KAction *configureAction = 0;
   const char* actionName = KStdAction::name(KStdAction::ConfigureToolbars);
   if ( d->m_xmlguiClient )
@@ -2245,7 +2245,7 @@ void KToolBar::widgetDestroyed()
 void KToolBar::removeWidgetInternal( TQWidget * w )
 {
     widgets.removeRef( w );
-    TQMap< TQWidget*, int >::Iterator it = widget2id.tqfind( w );
+    TQMap< TQWidget*, int >::Iterator it = widget2id.find( w );
     if ( it == widget2id.end() )
         return;
     id2widget.remove( *it );
diff --git a/kdeui/ktoolbar.h b/kdeui/ktoolbar.h
index bb1a9bed2..9c85e5fc2 100644
--- a/kdeui/ktoolbar.h
+++ b/kdeui/ktoolbar.h
@@ -61,7 +61,7 @@ class KDEUI_EXPORT KToolBarSeparator : public QFrame
 public:
     KToolBarSeparator( Orientation, bool l, TQToolBar *parent, const char* name=0 );
 
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
     Orientation orientation() const { return orient; }
     TQSizePolicy sizePolicy() const;
     bool showLine() const { return line; }
@@ -90,7 +90,7 @@ private:
   * Once you have a KToolBar object, you can insert items into it with the
   * insert... methods, or remove them with the removeItem() method. This
   * can be done at any time; the toolbar will be automatically updated.
-  * There are also many methods to set per-child properties like tqalignment
+  * There are also many methods to set per-child properties like alignment
   * and toggle behavior.
   *
   * KToolBar uses a global config group to load toolbar settings on
@@ -116,7 +116,7 @@ public:
      * The state of the status bar.
      * @deprecated
      */
-    enum BartqStatus{Toggle, Show, Hide};
+    enum BarStatus{Toggle, Show, Hide};
     /**
    * Possible bar positions.
    */
@@ -655,7 +655,7 @@ public:
    * Only @p one item can be autosized, and it has to be
    * the last left-aligned item. Items that come after this must be right
    * aligned. Items that can be right aligned are Lineds, Frames, Widgets and
-   * Combos. An autosized item will resize itself whenever the toolbar tqgeometry
+   * Combos. An autosized item will resize itself whenever the toolbar geometry
    * changes to the last right-aligned item (or to end of toolbar if there
    * are no right-aligned items.)
    * @see setFullWidth()
@@ -750,10 +750,10 @@ public:
    *
    * This method is provided for compatibility only,
    * please use show() and/or hide() instead.
-   * @see BartqStatus
+   * @see BarStatus
    * @deprecated
    */
-    bool enable(BartqStatus stat) KDE_DEPRECATED;
+    bool enable(BarStatus stat) KDE_DEPRECATED;
 
   /**
    * Use setMaximumHeight() instead.
@@ -943,9 +943,9 @@ public:
     void setStretchableWidget( TQWidget *w );
     TQSizePolicy sizePolicy() const;
     bool highlight() const;
-    TQSize tqsizeHint() const;
-    TQSize tqminimumSizeHint() const;
-    TQSize tqminimumSize() const;
+    TQSize sizeHint() const;
+    TQSize minimumSizeHint() const;
+    TQSize minimumSize() const;
 
     void hide();
     void show();
@@ -1117,7 +1117,7 @@ private:
     Id2WidgetMap id2widget;
     KPopupMenu *context;
     TQPtrList<TQWidget> widgets;
-    TQTimer *tqlayoutTimer;
+    TQTimer *layoutTimer;
     TQGuardedPtr<TQWidget> stretchableWidget, rightAligned;
 protected:
     virtual void virtual_hook( int id, void* data );
diff --git a/kdeui/ktoolbarbutton.cpp b/kdeui/ktoolbarbutton.cpp
index b6488dab9..765b2e433 100644
--- a/kdeui/ktoolbarbutton.cpp
+++ b/kdeui/ktoolbarbutton.cpp
@@ -263,7 +263,7 @@ void KToolBarButton::setTextLabel( const TQString& text, bool tipToo)
     return;
 
   TQString txt(text);
-  if (txt.endsWith(TQString::tqfromLatin1("...")))
+  if (txt.endsWith(TQString::fromLatin1("...")))
     txt.truncate(txt.length() - 3);
 
   TQToolButton::setTextLabel(txt, tipToo);
@@ -376,7 +376,7 @@ void KToolBarButton::leaveEvent(TQEvent *)
   {
     d->m_isRaised = false;
     d->m_isActive = false;
-    tqrepaint(false);
+    repaint(false);
   }
 
   emit highlighted(d->m_id, false);
@@ -398,7 +398,7 @@ void KToolBarButton::enterEvent(TQEvent *)
       d->m_isActive = false;
     }
 
-    tqrepaint(false);
+    repaint(false);
   }
   emit highlighted(d->m_id, true);
 }
@@ -494,8 +494,8 @@ void KToolBarButton::drawButton( TQPainter *_painter )
   if (hasFocus())	flags |= TQStyle::Style_HasFocus;
 
   // Draw a styled toolbutton
-  style().tqdrawComplexControl(TQStyle::CC_ToolButton, _painter, this, rect(),
-	tqcolorGroup(), flags, TQStyle::SC_ToolButton, active, TQStyleOption());
+  style().drawComplexControl(TQStyle::CC_ToolButton, _painter, this, rect(),
+	colorGroup(), flags, TQStyle::SC_ToolButton, active, TQStyleOption());
 
   int dx, dy;
   TQFont tmp_font(KGlobalSettings::toolBarFont());
@@ -513,7 +513,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
     {
       dx = ( width() - pixmap.width() ) / 2;
       dy = ( height() - pixmap.height() ) / 2;
-      if ( isDown() && style().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+      if ( isDown() && style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
       {
         ++dx;
         ++dy;
@@ -531,7 +531,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
     {
       dx = 4;
       dy = ( height() - pixmap.height() ) / 2;
-      if ( isDown() && style().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+      if ( isDown() && style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
       {
         ++dx;
         ++dy;
@@ -547,7 +547,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
       else
         dx = 4;
       dy = 0;
-      if ( isDown() && style().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+      if ( isDown() && style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
       {
         ++dx;
         ++dy;
@@ -562,7 +562,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
       textFlags = AlignVCenter|AlignLeft;
       dx = (width() - fm.width(textLabel())) / 2;
       dy = (height() - fm.lineSpacing()) / 2;
-      if ( isDown() && style().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+      if ( isDown() && style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
       {
         ++dx;
         ++dy;
@@ -580,7 +580,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
     {
       dx = (width() - pixmap.width()) / 2;
       dy = (height() - fm.lineSpacing() - pixmap.height()) / 2;
-      if ( isDown() && style().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+      if ( isDown() && style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
       {
         ++dx;
         ++dy;
@@ -594,7 +594,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
       dx = (width() - fm.width(textLabel())) / 2;
       dy = height() - fm.lineSpacing() - 4;
 
-      if ( isDown() && style().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+      if ( isDown() && style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
       {
         ++dx;
         ++dy;
@@ -612,7 +612,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
       else if(d->m_isRaised)
         _painter->setPen(KGlobalSettings::toolBarHighlightColor());
       else
-	_painter->setPen( tqcolorGroup().buttonText() );
+	_painter->setPen( colorGroup().buttonText() );
       _painter->drawText(textRect, textFlags, textLabel());
   }
 
@@ -624,7 +624,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
     if (isEnabled()) 	arrowFlags |= TQStyle::Style_Enabled;
 
       style().drawPrimitive(TQStyle::PE_ArrowDown, _painter,
-          TQRect(width()-7, height()-7, 7, 7), tqcolorGroup(),
+          TQRect(width()-7, height()-7, 7, 7), colorGroup(),
 	  arrowFlags, TQStyleOption() );
   }
 }
@@ -634,7 +634,7 @@ void KToolBarButton::paletteChange(const TQPalette &)
   if(!d->m_isSeparator)
   {
     modeChange();
-    tqrepaint(false); // no need to delete it first therefore only false
+    repaint(false); // no need to delete it first therefore only false
   }
 }
 
@@ -642,7 +642,7 @@ bool KToolBarButton::event(TQEvent *e)
 {
   if (e->type() == TQEvent::ParentFontChange || e->type() == TQEvent::ApplicationFontChange)
   {
-     //If we use toolbar text, apply the settings again, to retqlayout...
+     //If we use toolbar text, apply the settings again, to relayout...
      if (d->m_iconText != KToolBar::IconOnly)
        modeChange();
      return true;
@@ -669,7 +669,7 @@ void KToolBarButton::slotClicked()
   emit clicked( d->m_id );
 
   // emit buttonClicked when the button was clicked while being in an extension popupmenu
-  if ( d->m_parent && !d->m_parent->rect().tqcontains( tqgeometry().center() ) ) {
+  if ( d->m_parent && !d->m_parent->rect().contains( geometry().center() ) ) {
     ButtonState state = KApplication::keyboardMouseState();
     if ( ( state & MouseButtonMask ) == NoButton )
       state = ButtonState( LeftButton | state );
@@ -698,7 +698,7 @@ void KToolBarButton::setNoStyle(bool no_style)
 
     modeChange();
     d->m_iconText = KToolBar::IconTextRight;
-    tqrepaint(false);
+    repaint(false);
 }
 
 void KToolBarButton::setRadio (bool f)
@@ -716,13 +716,13 @@ void KToolBarButton::on(bool flag)
     setDown(flag);
     leaveEvent((TQEvent *) 0);
   }
-  tqrepaint();
+  repaint();
 }
 
 void KToolBarButton::toggle()
 {
   setOn(!isOn());
-  tqrepaint();
+  repaint();
 }
 
 void KToolBarButton::setToggle(bool flag)
@@ -734,17 +734,17 @@ void KToolBarButton::setToggle(bool flag)
     disconnect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled()));
 }
 
-TQSize KToolBarButton::tqsizeHint() const
+TQSize KToolBarButton::sizeHint() const
 {
    return d->size;
 }
 
-TQSize KToolBarButton::tqminimumSizeHint() const
+TQSize KToolBarButton::minimumSizeHint() const
 {
    return d->size;
 }
 
-TQSize KToolBarButton::tqminimumSize() const
+TQSize KToolBarButton::minimumSize() const
 {
    return d->size;
 }
diff --git a/kdeui/ktoolbarbutton.h b/kdeui/ktoolbarbutton.h
index 4fdc71bed..2cb05d9ac 100644
--- a/kdeui/ktoolbarbutton.h
+++ b/kdeui/ktoolbarbutton.h
@@ -259,7 +259,7 @@ signals:
   void clicked(int);
   /**
    * Emitted when the toolbar button is clicked (with any mouse button)
-   * @param state makes it possible to tqfind out which button was pressed,
+   * @param state makes it possible to find out which button was pressed,
    * and whether any keyboard modifiers were held.
    * @since 3.4
    */
@@ -291,9 +291,9 @@ protected:
   /// @since 3.4
   void mouseReleaseEvent( TQMouseEvent * );
   void showMenu();
-  TQSize tqsizeHint() const;
-  TQSize tqminimumSizeHint() const;
-  TQSize tqminimumSize() const;
+  TQSize sizeHint() const;
+  TQSize minimumSizeHint() const;
+  TQSize minimumSize() const;
 
   /// @since 3.1
   bool isRaised() const;
diff --git a/kdeui/ktoolbarhandler.cpp b/kdeui/ktoolbarhandler.cpp
index f1bce69c6..5d8a49d8f 100644
--- a/kdeui/ktoolbarhandler.cpp
+++ b/kdeui/ktoolbarhandler.cpp
@@ -55,7 +55,7 @@ namespace
                 if ( !toolBar )
                     continue;
 
-                if ( oldToolBarList.tqfindRef( toolBar ) == -1 )
+                if ( oldToolBarList.findRef( toolBar ) == -1 )
                     m_needsRebuild = true;
 
                 m_toolBars.append( toolBar );
@@ -209,7 +209,7 @@ void ToolBarHandler::init( KMainWindow *mainWindow )
 
     if ( domDocument().documentElement().isNull() ) {
 
-        TQString completeDescription = TQString::tqfromLatin1( guiDescription )
+        TQString completeDescription = TQString::fromLatin1( guiDescription )
             .arg( actionListName );
 
         setXML( completeDescription, false /*merge*/ );
diff --git a/kdeui/ktoolbarlabelaction.cpp b/kdeui/ktoolbarlabelaction.cpp
index e17837d5d..aab7717b8 100644
--- a/kdeui/ktoolbarlabelaction.cpp
+++ b/kdeui/ktoolbarlabelaction.cpp
@@ -68,7 +68,7 @@ KToolBarLabelAction::KToolBarLabelAction(TQLabel* label,
   : KWidgetAction(label, label->text(), cut, receiver, slot, parent, name),
     d(new KToolBarLabelActionPrivate)
 {
-  Q_ASSERT(TQString::tqfromLatin1("kde toolbar widget") == label->name());
+  Q_ASSERT(TQString::fromLatin1("kde toolbar widget") == label->name());
   init();
 }
 
@@ -84,7 +84,7 @@ void KToolBarLabelAction::init()
   /* these lines were copied from Konqueror's KonqDraggableLabel class in
      konq_misc.cc */
   d->m_label->setBackgroundMode(Qt::PaletteButton);
-  d->m_label->tqsetAlignment((TQApplication::reverseLayout()
+  d->m_label->setAlignment((TQApplication::reverseLayout()
 			 ? Qt::AlignRight : Qt::AlignLeft) |
  			Qt::AlignVCenter | Qt::ShowPrefix );
   d->m_label->adjustSize();
diff --git a/kdeui/ktoolbarlabelaction.h b/kdeui/ktoolbarlabelaction.h
index 592d648fe..2cbc27875 100644
--- a/kdeui/ktoolbarlabelaction.h
+++ b/kdeui/ktoolbarlabelaction.h
@@ -33,14 +33,14 @@ class TQLabel;
  *
  * \code
  *
- * KHistoryCombo* tqfindCombo = new KHistoryCombo(true, this);
+ * KHistoryCombo* findCombo = new KHistoryCombo(true, this);
  * KWidgetAction* action
- *   = new KWidgetAction(tqfindCombo, i18n("F&ind Combo"), Qt::Key_F6, this,
- *                       TQT_SLOT(slotFocus()), actionCollection(), "tqfind_combo");
+ *   = new KWidgetAction(findCombo, i18n("F&ind Combo"), Qt::Key_F6, this,
+ *                       TQT_SLOT(slotFocus()), actionCollection(), "find_combo");
  *
- * new KToolBarLabelAction(tqfindCombo, i18n("F&ind "), 0, this,
+ * new KToolBarLabelAction(findCombo, i18n("F&ind "), 0, this,
  *                         TQT_SLOT(slotFocus()), actionCollection(),
- *             "tqfind_label");
+ *             "find_label");
  *
  * \endcode
  *
diff --git a/kdeui/ktoolbarradiogroup.cpp b/kdeui/ktoolbarradiogroup.cpp
index 190b1e395..ab8e50e08 100644
--- a/kdeui/ktoolbarradiogroup.cpp
+++ b/kdeui/ktoolbarradiogroup.cpp
@@ -53,15 +53,15 @@ void KToolBarRadioGroup::addButton (int id)
 
 void KToolBarRadioGroup::removeButton (int id)
 {
-  if (!buttons->tqfind(id))
+  if (!buttons->find(id))
      return;
-  buttons->tqfind(id)->setRadio(false);
+  buttons->find(id)->setRadio(false);
   buttons->remove(id);
 }
 
 void KToolBarRadioGroup::slotToggled(int id)
 {
-  if (buttons->tqfind(id) && buttons->tqfind(id)->isOn())
+  if (buttons->find(id) && buttons->find(id)->isOn())
   {
     TQIntDictIterator<KToolBarButton> it(*buttons);
     while (it.current())
diff --git a/kdeui/ktoolbarradiogroup.h b/kdeui/ktoolbarradiogroup.h
index f0e793bf2..2fbf08174 100644
--- a/kdeui/ktoolbarradiogroup.h
+++ b/kdeui/ktoolbarradiogroup.h
@@ -46,7 +46,7 @@ class KToolBarRadioGroupPrivate;
   *
   * @author Sven Radej <radej@kde.org>
   */
-class KDEUI_EXPORT KToolBarRadioGroup : public TQObject
+class KDEUI_EXPORT KToolBarRadioGroup : public QObject
 {
   Q_OBJECT
 
diff --git a/kdeui/kurllabel.cpp b/kdeui/kurllabel.cpp
index 0457fcef0..d4d4ff7c0 100644
--- a/kdeui/kurllabel.cpp
+++ b/kdeui/kurllabel.cpp
@@ -114,7 +114,7 @@ void KURLLabel::mouseReleaseEvent (TQMouseEvent* e)
     return;
   d->MousePressed = false;
   TQRect r( activeRect() );
-  if (!r.tqcontains(e->pos()))
+  if (!r.contains(e->pos()))
     return;
 
   setLinkColor (d->HighlightedLinkColor);
@@ -162,7 +162,7 @@ void KURLLabel::updateColor ()
   d->Timer->stop();
 
   TQRect r( activeRect() );
-  if (!(d->Glow || d->Float) || !r.tqcontains (mapFromGlobal(TQCursor::pos())))
+  if (!(d->Glow || d->Float) || !r.contains (mapFromGlobal(TQCursor::pos())))
     setLinkColor (d->LinkColor);
 }
 
@@ -308,7 +308,7 @@ void KURLLabel::enterEvent (TQEvent* e)
   TQLabel::enterEvent (e);
 
   TQRect r( activeRect() );
-  if (!r.tqcontains( static_cast<TQMouseEvent*>(e)->pos() ))
+  if (!r.contains( static_cast<TQMouseEvent*>(e)->pos() ))
     return;
 
   if (!d->AltPixmap.isNull() && pixmap())
@@ -353,8 +353,8 @@ bool KURLLabel::event (TQEvent *e)
 {
   if (e && e->type() == TQEvent::ParentPaletteChange)
   {
-    // use tqparentWidget() unless you are a toplevel widget, then try qAapp
-    TQPalette p = tqparentWidget() ? tqparentWidget()->palette() : tqApp->palette();
+    // use parentWidget() unless you are a toplevel widget, then try qAapp
+    TQPalette p = parentWidget() ? parentWidget()->palette() : qApp->palette();
     p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Normal, TQColorGroup::Background));
     p.setColor(TQColorGroup::Foreground, palette().active().foreground());
     setPalette(p);
@@ -367,7 +367,7 @@ bool KURLLabel::event (TQEvent *e)
     if (result && hasFocus()) {
         TQPainter p(this);
         TQRect r( activeRect() );
-        style().drawPrimitive( TQStyle::PE_FocusRect, &p, r, tqcolorGroup() );
+        style().drawPrimitive( TQStyle::PE_FocusRect, &p, r, colorGroup() );
     }
     return result;
   }
@@ -384,12 +384,12 @@ bool KURLLabel::event (TQEvent *e)
   }
   else if (e->type() == TQEvent::MouseButtonPress) {
     TQRect r( activeRect() );
-    d->MousePressed = r.tqcontains(static_cast<TQMouseEvent*>(e)->pos());
+    d->MousePressed = r.contains(static_cast<TQMouseEvent*>(e)->pos());
   }
   else if (e->type() == TQEvent::MouseMove) {
     if (d->Cursor) {
       TQRect r( activeRect() );
-      bool inside = r.tqcontains(static_cast<TQMouseEvent*>(e)->pos());
+      bool inside = r.contains(static_cast<TQMouseEvent*>(e)->pos());
       if (d->WasInsideRect != inside) {
         if (inside)
           TQLabel::setCursor(*d->Cursor);
@@ -407,7 +407,7 @@ TQRect KURLLabel::activeRect() const
   TQRect r( contentsRect() );
   if (text().isEmpty() || (!d->MarginAltered && sizePolicy() == TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)))
       return r; //fixed size is sometimes used with pixmap
-  int hAlign = TQApplication::horizontalAlignment( tqalignment() );
+  int hAlign = TQApplication::horizontalAlignment( alignment() );
   int indentX = (hAlign && indent()>0) ? indent() : 0;
   TQFontMetrics fm(font());
   r.setWidth( QMIN(fm.width(text()), r.width()));
@@ -436,9 +436,9 @@ void KURLLabel::setFocusPolicy( FocusPolicy policy )
   }
 }
 
-void KURLLabel::tqsetSizePolicy ( TQSizePolicy policy )
+void KURLLabel::setSizePolicy ( TQSizePolicy policy )
 {
-  TQLabel::tqsetSizePolicy(policy);
+  TQLabel::setSizePolicy(policy);
   if (!d->MarginAltered && policy.horData()==TQSizePolicy::Fixed && policy.verData()==TQSizePolicy::Fixed) {
       TQLabel::setMargin(0); //better default : better look when fixed size
   }
diff --git a/kdeui/kurllabel.h b/kdeui/kurllabel.h
index 93f6138a5..b39d65d92 100644
--- a/kdeui/kurllabel.h
+++ b/kdeui/kurllabel.h
@@ -30,9 +30,9 @@ class TQCursor;
 class TQPixmap;
 
 /**
- * @short A drop-in tqreplacement for TQLabel that displays hyperlinks.
+ * @short A drop-in replacement for TQLabel that displays hyperlinks.
  *
- * KURLLabel is a drop-in tqreplacement for TQLabel that handles text
+ * KURLLabel is a drop-in replacement for TQLabel that handles text
  * in a fashion similar to how an HTML widget handles hyperlinks.  The
  * text can be underlined (or not) and set to different colors.  It
  * can also "glow" (cycle colors) when the mouse passes over it.
@@ -166,7 +166,7 @@ public:
   /**
    * Reimplemented for internal reasons, the API is not affected.
    */
-  virtual void tqsetSizePolicy ( TQSizePolicy );
+  virtual void setSizePolicy ( TQSizePolicy );
 
 public slots:
   /**
diff --git a/kdeui/kwhatsthismanager.cpp b/kdeui/kwhatsthismanager.cpp
index 675746bf1..a2f3cf0f6 100644
--- a/kdeui/kwhatsthismanager.cpp
+++ b/kdeui/kwhatsthismanager.cpp
@@ -52,8 +52,8 @@ TQString KWhatsThisUndefined::text (const TQPoint &)
             " describe the widget, you are welcome to <a href=\"submit"
             "-whatsthis\">send us your own \"What's This?\" help</a> for it.");
     TQString parent;
-    if (m_widget -> tqparentWidget ())
-        parent = TQWhatsThis::textFor (m_widget -> tqparentWidget ());
+    if (m_widget -> parentWidget ())
+        parent = TQWhatsThis::textFor (m_widget -> parentWidget ());
         if (parent != txt)
             if (! parent . isEmpty ())
                 return parent;
@@ -68,11 +68,11 @@ bool KWhatsThisUndefined::clicked (const TQString& href)
         body . append ("Widget text: '" + (m_widget -> property ("text") . toString ()) + "'\n");
         TQString dsc = TQString ("current --> ") + m_widget -> name ();
         dsc . append (TQString (" (") + m_widget -> className () + ")\n");
-        for (w = m_widget; w && w != m_widget -> tqtopLevelWidget (); w = w -> tqparentWidget ()) {
+        for (w = m_widget; w && w != m_widget -> topLevelWidget (); w = w -> parentWidget ()) {
             dsc . append (w -> name ());
             dsc . append (TQString (" (") + w -> className () + ")\n");
         }
-        w = m_widget -> tqtopLevelWidget ();
+        w = m_widget -> topLevelWidget ();
         if (w) {
             dsc . append ("toplevel --> ");
             dsc . append (w -> name ());
@@ -80,7 +80,7 @@ bool KWhatsThisUndefined::clicked (const TQString& href)
         }
         body . append (dsc);
         TQString subj ("What's This submission: ");
-        subj . append (tqApp -> argv () [0]);
+        subj . append (qApp -> argv () [0]);
         body . append ("\nPlease type in your what's this help between these lines: "
                 "\n--%-----------------------------------------------------------------------\n"
                 "\n--%-----------------------------------------------------------------------");
@@ -99,7 +99,7 @@ void KWhatsThisManager::init ()
 KWhatsThisManager::KWhatsThisManager ()
 {
     // go away...
-    // tqApp -> installEventFilter (this);
+    // qApp -> installEventFilter (this);
 }
 
 bool KWhatsThisManager::eventFilter (TQObject * /*o*/, TQEvent *e)
diff --git a/kdeui/kwhatsthismanager_p.h b/kdeui/kwhatsthismanager_p.h
index 919ffd197..f797dc4d3 100644
--- a/kdeui/kwhatsthismanager_p.h
+++ b/kdeui/kwhatsthismanager_p.h
@@ -43,7 +43,7 @@ class TQTextEdit;
  * @see QWhatsThis
  * @author Peter Rockai (mornfall) <mornfall@danill.sk>
  **/
-class KDEUI_EXPORT KWhatsThisManager : public TQObject
+class KDEUI_EXPORT KWhatsThisManager : public QObject
 {
     Q_OBJECT
     public:
diff --git a/kdeui/kwindowinfo.h b/kdeui/kwindowinfo.h
index 167d3e0a9..efd797c91 100644
--- a/kdeui/kwindowinfo.h
+++ b/kdeui/kwindowinfo.h
@@ -38,7 +38,7 @@
  * @author Richard Moore, rich@kde.org
  * @since 3.1
 */
-class KDEUI_EXPORT KWindowInfo : public TQObject
+class KDEUI_EXPORT KWindowInfo : public QObject
 {
     Q_OBJECT
 
diff --git a/kdeui/kwindowlistmenu.cpp b/kdeui/kwindowlistmenu.cpp
index 0be4c2f4e..de9cd0c08 100644
--- a/kdeui/kwindowlistmenu.cpp
+++ b/kdeui/kwindowlistmenu.cpp
@@ -186,7 +186,7 @@ void KWindowListMenu::init()
                 }
 
                 // Avoid creating unwanted accelerators.
-                itemText.tqreplace('&', TQString::tqfromLatin1("&&"));
+                itemText.replace('&', TQString::fromLatin1("&&"));
                 insertItem( pm, itemText, i);
                 map.insert(i, info->win());
                 if (info->win() == active_window)
diff --git a/kdeui/kwordwrap.cpp b/kdeui/kwordwrap.cpp
index 26f5211fd..9c6427eb5 100644
--- a/kdeui/kwordwrap.cpp
+++ b/kdeui/kwordwrap.cpp
@@ -35,7 +35,7 @@ KWordWrap* KWordWrap::formatText( TQFontMetrics &fm, const TQRect & r, int /*fla
 {
     KWordWrap* kw = new KWordWrap( r );
     // The wordwrap algorithm
-    // The variable names and the global tqshape of the algorithm are inspired
+    // The variable names and the global shape of the algorithm are inspired
     // from QTextFormatterBreakWords::format().
     //kdDebug() << "KWordWrap::formatText " << str << " r=" << r.x() << "," << r.y() << " " << r.width() << "x" << r.height() << endl;
     int height = fm.height();
diff --git a/kdeui/kwordwrap.h b/kdeui/kwordwrap.h
index 232cb826c..22fcf940a 100644
--- a/kdeui/kwordwrap.h
+++ b/kdeui/kwordwrap.h
@@ -91,12 +91,12 @@ public:
 
     /**
      * Draw the text that has been previously wrapped, at position x,y.
-     * Flags are for tqalignment, e.g. Qt::AlignHCenter. Default is
+     * Flags are for alignment, e.g. Qt::AlignHCenter. Default is
      * Qt::AlignAuto.
      * @param painter the TQPainter to use.
      * @param x the horizontal position of the text
      * @param y the vertical position of the text
-     * @param flags the ORed text tqalignment flags from the Qt namespace,
+     * @param flags the ORed text alignment flags from the Qt namespace,
      *              ORed with FadeOut if you want the text to fade out if it
      *              does not fit (the @p painter's background must be set
      *              accordingly)
diff --git a/kdeui/kxmlgui.xsd b/kdeui/kxmlgui.xsd
index f3fab6291..c0979cb72 100644
--- a/kdeui/kxmlgui.xsd
+++ b/kdeui/kxmlgui.xsd
@@ -56,7 +56,7 @@
         <xsd:annotation>
             <xsd:documentation>
                 
-                The name used for every name and group attribute. Maps to TQObject::name() in most cases. 
+                The name used for every name and group attribute. Maps to QObject::name() in most cases. 
             </xsd:documentation>
         </xsd:annotation>
         <xsd:restriction base="xsd:Name">
@@ -252,7 +252,7 @@
             <xsd:documentation>
                 
                 The root element that must enclose all other tags in the document. This
-                element tqreplaces the kpartgui element used previously.  
+                element replaces the kpartgui element used previously.  
                 Note: do not forget to increase the version attribute for each change in
                 your file, otherwise the changes will not be taken into account.
                 
diff --git a/kdeui/kxmlguibuilder.cpp b/kdeui/kxmlguibuilder.cpp
index f61aaaf2b..305ce135c 100644
--- a/kdeui/kxmlguibuilder.cpp
+++ b/kdeui/kxmlguibuilder.cpp
@@ -70,24 +70,24 @@ KXMLGUIBuilder::KXMLGUIBuilder( TQWidget *widget )
   d = new KXMLGUIBuilderPrivate;
   d->m_widget = widget;
 
-  d->tagMainWindow = TQString::tqfromLatin1( "mainwindow" );
-  d->tagMenuBar = TQString::tqfromLatin1( "menubar" );
-  d->tagMenu = TQString::tqfromLatin1( "menu" );
-  d->tagToolBar = TQString::tqfromLatin1( "toolbar" );
-  d->tagStatusBar = TQString::tqfromLatin1( "statusbar" );
+  d->tagMainWindow = TQString::fromLatin1( "mainwindow" );
+  d->tagMenuBar = TQString::fromLatin1( "menubar" );
+  d->tagMenu = TQString::fromLatin1( "menu" );
+  d->tagToolBar = TQString::fromLatin1( "toolbar" );
+  d->tagStatusBar = TQString::fromLatin1( "statusbar" );
 
-  d->tagSeparator = TQString::tqfromLatin1( "separator" );
-  d->tagTearOffHandle = TQString::tqfromLatin1( "tearoffhandle" );
-  d->tagMenuTitle = TQString::tqfromLatin1( "title" );
+  d->tagSeparator = TQString::fromLatin1( "separator" );
+  d->tagTearOffHandle = TQString::fromLatin1( "tearoffhandle" );
+  d->tagMenuTitle = TQString::fromLatin1( "title" );
 
-  d->attrName = TQString::tqfromLatin1( "name" );
-  d->attrLineSeparator = TQString::tqfromLatin1( "lineseparator" );
+  d->attrName = TQString::fromLatin1( "name" );
+  d->attrLineSeparator = TQString::fromLatin1( "lineseparator" );
 
-  d->attrText1 = TQString::tqfromLatin1( "text" );
-  d->attrText2 = TQString::tqfromLatin1( "Text" );
-  d->attrContext = TQString::tqfromLatin1( "context" );
+  d->attrText1 = TQString::fromLatin1( "text" );
+  d->attrText2 = TQString::fromLatin1( "Text" );
+  d->attrContext = TQString::fromLatin1( "context" );
 
-  d->attrIcon = TQString::tqfromLatin1( "icon" );
+  d->attrIcon = TQString::fromLatin1( "icon" );
 
   d->m_instance = 0;
   d->m_client = 0;
@@ -146,7 +146,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ
     // otherwise its shortcuts appear.
     TQWidget* p = parent;
     while ( p && !::qt_cast<KMainWindow *>( p ) )
-        p = p->tqparentWidget();
+        p = p->parentWidget();
 
     TQCString name = element.attribute( d->attrName ).utf8();
 
@@ -332,7 +332,7 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo
         TQDomAttr attr = attributes.item( i ).toAttr();
 
         if ( attr.name().lower() == d->attrLineSeparator &&
-             attr.value().lower() == TQString::tqfromLatin1("false") )
+             attr.value().lower() == TQString::fromLatin1("false") )
         {
           isLineSep = false;
           break;
diff --git a/kdeui/kxmlguiclient.cpp b/kdeui/kxmlguiclient.cpp
index e18b6ca8e..f857f3109 100644
--- a/kdeui/kxmlguiclient.cpp
+++ b/kdeui/kxmlguiclient.cpp
@@ -143,7 +143,7 @@ TQString KXMLGUIClient::localXMLFile() const
   if ( !TQDir::isRelativePath(d->m_xmlFile) )
       return TQString::null; // can't save anything here
 
-  return locateLocal( "data", TQString::tqfromLatin1( instance()->instanceName() + '/' ) + d->m_xmlFile );
+  return locateLocal( "data", TQString::fromLatin1( instance()->instanceName() + '/' ) + d->m_xmlFile );
 }
 
 
@@ -178,7 +178,7 @@ void KXMLGUIClient::setXMLFile( const TQString& _file, bool merge, bool setXMLDo
   {
     TQString doc;
 
-    TQString filter = TQString::tqfromLatin1( instance()->instanceName() + '/' ) + _file;
+    TQString filter = TQString::fromLatin1( instance()->instanceName() + '/' ) + _file;
 
     TQStringList allFiles = instance()->dirs()->findAllResources( "data", filter ) + instance()->dirs()->findAllResources( "data", _file );
 
@@ -190,10 +190,10 @@ void KXMLGUIClient::setXMLFile( const TQString& _file, bool merge, bool setXMLDo
       // let's treat this as if it isn't a problem and the user just
       // wants the global standards file
 
-      // however if a non-empty file gets passed and we can't tqfind it we might
+      // however if a non-empty file gets passed and we can't find it we might
       // inform the developer using some debug output
       if ( !_file.isEmpty() )
-          kdWarning() << "KXMLGUIClient::setXMLFile: cannot tqfind .rc file " << _file << endl;
+          kdWarning() << "KXMLGUIClient::setXMLFile: cannot find .rc file " << _file << endl;
 
       setXML( TQString::null, true );
       return;
@@ -263,13 +263,13 @@ bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive,
   static const TQString &attrOne = KGlobal::staticQString( "1" );
 
   // there is a possibility that we don't want to merge in the
-  // additive.. rather, we might want to *tqreplace* the base with the
+  // additive.. rather, we might want to *replace* the base with the
   // additive.  this can be for any container.. either at a file wide
   // level or a simple container level.  we look for the 'noMerge'
-  // tag, in any event and just tqreplace the old with the new
+  // tag, in any event and just replace the old with the new
   if ( additive.attribute(attrNoMerge) == attrOne ) // ### use toInt() instead? (Simon)
   {
-    base.parentNode().tqreplaceChild(additive, base);
+    base.parentNode().replaceChild(additive, base);
     return true;
   }
 
@@ -348,7 +348,7 @@ bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive,
           // first, see if this new element matches a standard one in
           // the global file.  if it does, then we skip it as it will
           // be merged in, later
-          TQDomElement matchingElement = tqfindMatchingElement( newChild, base );
+          TQDomElement matchingElement = findMatchingElement( newChild, base );
           if ( matchingElement.isNull() || newChild.tagName() == tagSeparator )
             base.insertBefore( newChild, e );
         }
@@ -368,7 +368,7 @@ bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive,
       if ( tag == tagText )
         continue;
 
-      TQDomElement matchingElement = tqfindMatchingElement( e, additive );
+      TQDomElement matchingElement = findMatchingElement( e, additive );
 
       if ( !matchingElement.isNull() )
       {
@@ -416,7 +416,7 @@ bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive,
     if (e.isNull())
        continue;
 
-    TQDomElement matchingElement = tqfindMatchingElement( e, base );
+    TQDomElement matchingElement = findMatchingElement( e, base );
 
     if ( matchingElement.isNull() )
     {
@@ -449,8 +449,8 @@ bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive,
 
     if ( tag == tagAction )
     {
-      // if base tqcontains an implemented action, then we must not get
-      // deleted (note that the actionCollection tqcontains both,
+      // if base contains an implemented action, then we must not get
+      // deleted (note that the actionCollection contains both,
       // "global" and "local" actions
       if ( actionCollection->action( e.attribute( attrName ).utf8() ) )
       {
@@ -499,7 +499,7 @@ bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive,
   return deleteMe;
 }
 
-TQDomElement KXMLGUIClient::tqfindMatchingElement( const TQDomElement &base, const TQDomElement &additive )
+TQDomElement KXMLGUIClient::findMatchingElement( const TQDomElement &base, const TQDomElement &additive )
 {
   static const TQString &tagAction = KGlobal::staticQString( "Action" );
   static const TQString &tagMergeLocal = KGlobal::staticQString( "MergeLocal" );
@@ -572,14 +572,14 @@ void KXMLGUIClient::insertChildClient( KXMLGUIClient *child )
 
 void KXMLGUIClient::removeChildClient( KXMLGUIClient *child )
 {
-  assert( d->m_children.tqcontainsRef( child ) );
+  assert( d->m_children.containsRef( child ) );
   d->m_children.removeRef( child );
   child->d->m_parent = 0;
 }
 
 /*bool KXMLGUIClient::addSuperClient( KXMLGUIClient *super )
 {
-  if ( d->m_supers.tqcontains( super ) )
+  if ( d->m_supers.contains( super ) )
     return false;
   d->m_supers.append( super );
   return true;
@@ -642,7 +642,7 @@ TQString KXMLGUIClient::findMostRecentXMLFile( const TQStringList &files, TQStri
   TQValueList<DocStruct>::Iterator docEnd = allDocuments.end();
   for (; docIt != docEnd; ++docIt )
   {
-    TQString versionStr = tqfindVersionNumber( (*docIt).data );
+    TQString versionStr = findVersionNumber( (*docIt).data );
     if ( versionStr.isEmpty() )
       continue;
 
@@ -699,7 +699,7 @@ TQString KXMLGUIClient::findMostRecentXMLFile( const TQStringList &files, TQStri
       else
       {
         TQString f = (*local).file;
-        TQString backup = f + TQString::tqfromLatin1( ".backup" );
+        TQString backup = f + TQString::fromLatin1( ".backup" );
         TQDir dir;
         dir.rename( f, backup );
       }
@@ -719,7 +719,7 @@ TQString KXMLGUIClient::findMostRecentXMLFile( const TQStringList &files, TQStri
 
 
 
-TQString KXMLGUIClient::tqfindVersionNumber( const TQString &xml )
+TQString KXMLGUIClient::findVersionNumber( const TQString &xml )
 {
   enum { ST_START, ST_AFTER_OPEN, ST_AFTER_GUI,
                ST_EXPECT_VERSION, ST_VERSION_NUM} state = ST_START;
@@ -734,7 +734,7 @@ TQString KXMLGUIClient::tqfindVersionNumber( const TQString &xml )
       case ST_AFTER_OPEN:
       {
         //Jump to gui..
-        int guipos = xml.tqfind("gui", pos, false /*case-insensitive*/);
+        int guipos = xml.find("gui", pos, false /*case-insensitive*/);
         if (guipos == -1)
           return TQString::null; //Reject
 
@@ -747,7 +747,7 @@ TQString KXMLGUIClient::tqfindVersionNumber( const TQString &xml )
         break;
       case ST_EXPECT_VERSION:
       {
-        int verpos =  xml.tqfind("version=\"", pos, false /*case-insensitive*/);
+        int verpos =  xml.find("version=\"", pos, false /*case-insensitive*/);
         if (verpos == -1)
           return TQString::null; //Reject
 
@@ -760,9 +760,9 @@ TQString KXMLGUIClient::tqfindVersionNumber( const TQString &xml )
         unsigned int endpos;
         for (endpos = pos; endpos <  xml.length(); endpos++)
         {
-          if (xml[endpos].tqunicode() >= '0' && xml[endpos].tqunicode() <= '9')
+          if (xml[endpos].unicode() >= '0' && xml[endpos].unicode() <= '9')
             continue; //Number..
-          if (xml[endpos].tqunicode() == '"') //End of parameter
+          if (xml[endpos].unicode() == '"') //End of parameter
             break;
           else //This shouldn't be here..
           {
@@ -810,7 +810,7 @@ KXMLGUIClient::ActionPropertiesMap KXMLGUIClient::extractActionProperties( const
     if ( actionName.isEmpty() )
       continue;
 
-    TQMap<TQString, TQMap<TQString, TQString> >::Iterator propIt = properties.tqfind( actionName );
+    TQMap<TQString, TQMap<TQString, TQString> >::Iterator propIt = properties.find( actionName );
     if ( propIt == properties.end() )
       propIt = properties.insert( actionName, TQMap<TQString, TQString>() );
 
@@ -874,7 +874,7 @@ void KXMLGUIClient::addStateActionEnabled(const TQString& state,
   stateChange.actionsToEnable.append( action );
   //kdDebug() << "KXMLGUIClient::addStateActionEnabled( " << state << ", " << action << ")" << endl;
 
-  m_actionsStateMap.tqreplace( state, stateChange );
+  m_actionsStateMap.replace( state, stateChange );
 }
 
 
@@ -886,7 +886,7 @@ void KXMLGUIClient::addStateActionDisabled(const TQString& state,
   stateChange.actionsToDisable.append( action );
   //kdDebug() << "KXMLGUIClient::addStateActionDisabled( " << state << ", " << action << ")" << endl;
 
-  m_actionsStateMap.tqreplace( state, stateChange );
+  m_actionsStateMap.replace( state, stateChange );
 }
 
 
diff --git a/kdeui/kxmlguiclient.h b/kdeui/kxmlguiclient.h
index a4b903028..f3f7393f4 100644
--- a/kdeui/kxmlguiclient.h
+++ b/kdeui/kxmlguiclient.h
@@ -102,7 +102,7 @@ public:
   /**
    * @return The parsed XML in a TQDomDocument, set by
    * setXMLFile() or setXML().
-   * This document describes the tqlayout of the GUI.
+   * This document describes the layout of the GUI.
    */
   virtual TQDomDocument domDocument() const;
 
@@ -304,7 +304,7 @@ protected:
   virtual void setXML( const TQString &document, bool merge = false );
 
   /**
-   * Sets the Document for the part, describing the tqlayout of the GUI.
+   * Sets the Document for the part, describing the layout of the GUI.
    *
    * Call this in the Part-inherited class constructor if you don't call
    * setXMLFile or setXML .
@@ -344,7 +344,7 @@ private:
   bool mergeXML( TQDomElement &base, const TQDomElement &additive,
                  KActionCollection *actionCollection );
 
-  TQDomElement tqfindMatchingElement( const TQDomElement &base,
+  TQDomElement findMatchingElement( const TQDomElement &base,
                                    const TQDomElement &additive );
 
   typedef TQMap<TQString, TQMap<TQString, TQString> > ActionPropertiesMap;
@@ -353,7 +353,7 @@ private:
 
   static void storeActionProperties( TQDomDocument &doc, const ActionPropertiesMap &properties );
 
-  static TQString tqfindVersionNumber( const TQString &_xml );
+  static TQString findVersionNumber( const TQString &_xml );
 
   // Actions to enable/disable on a state change
   TQMap<TQString,StateChange> m_actionsStateMap;
diff --git a/kdeui/kxmlguifactory.cpp b/kdeui/kxmlguifactory.cpp
index 59f7202d6..c166df861 100644
--- a/kdeui/kxmlguifactory.cpp
+++ b/kdeui/kxmlguifactory.cpp
@@ -110,7 +110,7 @@ TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_nu
         xml_file = filename;
     else
     {
-        xml_file = locate("data", TQString::tqfromLatin1(instance->instanceName() + '/' ) + filename);
+        xml_file = locate("data", TQString::fromLatin1(instance->instanceName() + '/' ) + filename);
         if ( !TQFile::exists( xml_file ) )
           xml_file = locate( "data", filename );
     }
@@ -120,7 +120,7 @@ TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_nu
     {
         kdError(240) << "No such XML file " << filename << endl;
         if ( never_null )
-            return TQString::tqfromLatin1( "<!DOCTYPE kpartgui>\n<kpartgui name=\"empty\">\n</kpartgui>" );
+            return TQString::fromLatin1( "<!DOCTYPE kpartgui>\n<kpartgui name=\"empty\">\n</kpartgui>" );
         else
             return TQString::null;
     }
@@ -146,7 +146,7 @@ bool KXMLGUIFactory::saveConfigFile( const TQDomDocument& doc,
     TQString xml_file(filename);
 
     if (TQDir::isRelativePath(xml_file))
-        xml_file = locateLocal("data", TQString::tqfromLatin1( instance->instanceName() + '/' )
+        xml_file = locateLocal("data", TQString::fromLatin1( instance->instanceName() + '/' )
                                + filename);
 
     TQFile file( xml_file );
@@ -240,7 +240,7 @@ void KXMLGUIFactory::addClient( KXMLGUIClient *client )
     d->guiClient = client;
 
     // add this client to our client list
-    if ( !d->m_clients.tqcontainsRef( client ) )
+    if ( !d->m_clients.containsRef( client ) )
         d->m_clients.append( client );
     else
         kdDebug(1002) << "XMLGUI client already added " << client << endl;
@@ -251,7 +251,7 @@ void KXMLGUIFactory::addClient( KXMLGUIClient *client )
     client->beginXMLPlug( d->builder->widget() );
 
     // try to use the build document for building the client's GUI, as the build document
-    // tqcontains the correct container state information (like toolbar positions, sizes, etc.) .
+    // contains the correct container state information (like toolbar positions, sizes, etc.) .
     // if there is non available, then use the "real" document.
     TQDomDocument doc = client->xmlguiBuildDocument();
     if ( doc.documentElement().isNull() )
@@ -388,7 +388,7 @@ TQWidget *KXMLGUIFactory::container( const TQString &containerName, KXMLGUIClien
     d->m_containerName = containerName;
     d->guiClient = client;
 
-    TQWidget *result = tqfindRecursive( d->m_rootNode, useTagName );
+    TQWidget *result = findRecursive( d->m_rootNode, useTagName );
 
     d->guiClient = 0L;
     d->m_containerName = TQString::null;
@@ -400,7 +400,7 @@ TQWidget *KXMLGUIFactory::container( const TQString &containerName, KXMLGUIClien
 
 TQPtrList<TQWidget> KXMLGUIFactory::containers( const TQString &tagName )
 {
-    return tqfindRecursive( d->m_rootNode, tagName );
+    return findRecursive( d->m_rootNode, tagName );
 }
 
 void KXMLGUIFactory::reset()
@@ -415,7 +415,7 @@ void KXMLGUIFactory::resetContainer( const TQString &containerName, bool useTagN
     if ( containerName.isEmpty() )
         return;
 
-    ContainerNode *container = d->m_rootNode->tqfindContainer( containerName, useTagName );
+    ContainerNode *container = d->m_rootNode->findContainer( containerName, useTagName );
 
     if ( !container )
         return;
@@ -429,7 +429,7 @@ void KXMLGUIFactory::resetContainer( const TQString &containerName, bool useTagN
     parent->removeChild( container );
 }
 
-TQWidget *KXMLGUIFactory::tqfindRecursive( KXMLGUI::ContainerNode *node, bool tag )
+TQWidget *KXMLGUIFactory::findRecursive( KXMLGUI::ContainerNode *node, bool tag )
 {
     if ( ( ( !tag && node->name == d->m_containerName ) ||
            ( tag && node->tagName == d->m_containerName ) ) &&
@@ -439,7 +439,7 @@ TQWidget *KXMLGUIFactory::tqfindRecursive( KXMLGUI::ContainerNode *node, bool ta
     TQPtrListIterator<ContainerNode> it( node->children );
     for (; it.current(); ++it )
     {
-        TQWidget *cont = tqfindRecursive( it.current(), tag );
+        TQWidget *cont = findRecursive( it.current(), tag );
         if ( cont )
             return cont;
     }
@@ -447,7 +447,7 @@ TQWidget *KXMLGUIFactory::tqfindRecursive( KXMLGUI::ContainerNode *node, bool ta
     return 0L;
 }
 
-TQPtrList<TQWidget> KXMLGUIFactory::tqfindRecursive( KXMLGUI::ContainerNode *node,
+TQPtrList<TQWidget> KXMLGUIFactory::findRecursive( KXMLGUI::ContainerNode *node,
                                                  const TQString &tagName )
 {
     TQPtrList<TQWidget> res;
@@ -458,7 +458,7 @@ TQPtrList<TQWidget> KXMLGUIFactory::tqfindRecursive( KXMLGUI::ContainerNode *nod
     TQPtrListIterator<KXMLGUI::ContainerNode> it( node->children );
     for (; it.current(); ++it )
     {
-        TQPtrList<TQWidget> lst = tqfindRecursive( it.current(), tagName );
+        TQPtrList<TQWidget> lst = findRecursive( it.current(), tagName );
         TQPtrListIterator<TQWidget> wit( lst );
         for (; wit.current(); ++wit )
             res.append( wit.current() );
@@ -566,7 +566,7 @@ int KXMLGUIFactory::configureShortcuts(bool bAllowLetterShortcuts , bool bSaveSe
 
 TQDomElement KXMLGUIFactory::actionPropertiesElement( TQDomDocument& doc )
 {
-	const TQString tagActionProp = TQString::tqfromLatin1("ActionProperties");
+	const TQString tagActionProp = TQString::fromLatin1("ActionProperties");
 	// first, lets see if we have existing properties
 	TQDomElement elem;
 	TQDomNode it = doc.documentElement().firstChild();
@@ -586,7 +586,7 @@ TQDomElement KXMLGUIFactory::actionPropertiesElement( TQDomDocument& doc )
 	return elem;
 }
 
-TQDomElement KXMLGUIFactory::tqfindActionByName( TQDomElement& elem, const TQString& sName, bool create )
+TQDomElement KXMLGUIFactory::findActionByName( TQDomElement& elem, const TQString& sName, bool create )
 {
         static const TQString& attrName = KGlobal::staticQString( "name" );
 	static const TQString& tagAction = KGlobal::staticQString( "Action" );
diff --git a/kdeui/kxmlguifactory.h b/kdeui/kxmlguifactory.h
index 0a1b30deb..fa534e093 100644
--- a/kdeui/kxmlguifactory.h
+++ b/kdeui/kxmlguifactory.h
@@ -52,14 +52,14 @@ class BuildHelper;
  * and merging the GUI from an unlimited number of clients.
  *
  * Each client provides XML through a TQDomDocument and actions through a
- * KActionCollection . The XML document tqcontains the rules for how to merge the
+ * KActionCollection . The XML document contains the rules for how to merge the
  * GUI.
  *
  * KXMLGUIFactory processes the DOM tree provided by a client and plugs in the client's actions,
  * according to the XML and the merging rules of previously inserted clients. Container widgets
  * are built via a KXMLGUIBuilder , which has to be provided with the KXMLGUIFactory constructor.
  */
-class KDEUI_EXPORT KXMLGUIFactory : public TQObject
+class KDEUI_EXPORT KXMLGUIFactory : public QObject
 {
   friend class KXMLGUI::BuildHelper;
   Q_OBJECT
@@ -103,7 +103,7 @@ class KDEUI_EXPORT KXMLGUIFactory : public TQObject
    * Find or create the element for a given action, by name.
    * Used when saving custom action properties
    */
-  static TQDomElement tqfindActionByName( TQDomElement& elem, const TQString& sName, bool create );
+  static TQDomElement findActionByName( TQDomElement& elem, const TQString& sName, bool create );
 
   /**
    * Creates the GUI described by the TQDomDocument of the client,
@@ -201,9 +201,9 @@ class KDEUI_EXPORT KXMLGUIFactory : public TQObject
 
  private:
 
-  TQWidget *tqfindRecursive( KXMLGUI::ContainerNode *node, bool tag );
+  TQWidget *findRecursive( KXMLGUI::ContainerNode *node, bool tag );
 
-  TQPtrList<TQWidget> tqfindRecursive( KXMLGUI::ContainerNode *node, const TQString &tagName );
+  TQPtrList<TQWidget> findRecursive( KXMLGUI::ContainerNode *node, const TQString &tagName );
 
   void applyActionProperties( const TQDomElement &element );
   void configureAction( KAction *action, const TQDomNamedNodeMap &attributes );
diff --git a/kdeui/kxmlguifactory_p.cpp b/kdeui/kxmlguifactory_p.cpp
index f4e7459b7..4bd5ad68e 100644
--- a/kdeui/kxmlguifactory_p.cpp
+++ b/kdeui/kxmlguifactory_p.cpp
@@ -64,16 +64,16 @@ ContainerNode::ContainerNode( TQWidget *_container, const TQString &_tagName,
 
 void ContainerNode::removeChild( ContainerNode *child )
 {
-    MergingIndexList::Iterator mergingIt = tqfindIndex( child->mergingName );
+    MergingIndexList::Iterator mergingIt = findIndex( child->mergingName );
     adjustMergingIndices( -1, mergingIt );
     children.removeRef( child );
 }
 
 /*
- * Find a merging index with the given name. Used to tqfind an index defined by <Merge name="blah"/>
+ * Find a merging index with the given name. Used to find an index defined by <Merge name="blah"/>
  * or by a <DefineGroup name="foo" /> tag.
  */
-MergingIndexList::Iterator ContainerNode::tqfindIndex( const TQString &name )
+MergingIndexList::Iterator ContainerNode::findIndex( const TQString &name )
 {
     MergingIndexList::Iterator it( mergingIndices.begin() );
     MergingIndexList::Iterator end( mergingIndices.end() );
@@ -87,7 +87,7 @@ MergingIndexList::Iterator ContainerNode::tqfindIndex( const TQString &name )
  * Check if the given container widget is a child of this node and return the node structure
  * if fonud.
  */
-ContainerNode *ContainerNode::tqfindContainerNode( TQWidget *container )
+ContainerNode *ContainerNode::findContainerNode( TQWidget *container )
 {
     ContainerNodeListIt it( children );
 
@@ -103,7 +103,7 @@ ContainerNode *ContainerNode::tqfindContainerNode( TQWidget *container )
  * container's tag name or the value of the container's name attribute. Specified by
  * the tag bool .
  */
-ContainerNode *ContainerNode::tqfindContainer( const TQString &_name, bool tag )
+ContainerNode *ContainerNode::findContainer( const TQString &_name, bool tag )
 {
     if ( ( tag && tagName == _name ) ||
          ( !tag && name == _name ) )
@@ -112,7 +112,7 @@ ContainerNode *ContainerNode::tqfindContainer( const TQString &_name, bool tag )
     ContainerNodeListIt it( children );
     for (; it.current(); ++it )
     {
-        ContainerNode *res = it.current()->tqfindContainer( _name, tag );
+        ContainerNode *res = it.current()->findContainer( _name, tag );
         if ( res )
             return res;
     }
@@ -125,7 +125,7 @@ ContainerNode *ContainerNode::tqfindContainer( const TQString &_name, bool tag )
  * leaves out container widgets specified in the exludeList . Also ensures that the containers
  * belongs to currClient.
  */
-ContainerNode *ContainerNode::tqfindContainer( const TQString &name, const TQString &tagName,
+ContainerNode *ContainerNode::findContainer( const TQString &name, const TQString &tagName,
                                              const TQPtrList<TQWidget> *excludeList,
                                              KXMLGUIClient * /*currClient*/ )
 {
@@ -136,7 +136,7 @@ ContainerNode *ContainerNode::tqfindContainer( const TQString &name, const TQStr
     {
         for (; nIt.current(); ++nIt )
             if ( nIt.current()->name == name &&
-                 !excludeList->tqcontainsRef( nIt.current()->container ) )
+                 !excludeList->containsRef( nIt.current()->container ) )
             {
                 res = nIt.current();
                 break;
@@ -149,7 +149,7 @@ ContainerNode *ContainerNode::tqfindContainer( const TQString &name, const TQStr
         for (; nIt.current(); ++nIt )
         {
             if ( nIt.current()->tagName == tagName &&
-                 !excludeList->tqcontainsRef( nIt.current()->container )
+                 !excludeList->containsRef( nIt.current()->container )
                  /*
                   * It is a bad idea to also compare the client, because
                   * we don't want to do so in situations like these:
@@ -175,7 +175,7 @@ ContainerNode *ContainerNode::tqfindContainer( const TQString &name, const TQStr
     return res;
 }
 
-ContainerClient *ContainerNode::tqfindChildContainerClient( KXMLGUIClient *currentGUIClient,
+ContainerClient *ContainerNode::findChildContainerClient( KXMLGUIClient *currentGUIClient,
                                                           const TQString &groupName,
                                                           const MergingIndexList::Iterator &mergingIdx )
 {
@@ -226,7 +226,7 @@ void ContainerNode::plugActionList( BuildState &state, const MergingIndexList::I
 
     TQString k( mergingIdx.mergingName );
 
-    if ( k.tqfind( tagActionList ) == -1 )
+    if ( k.find( tagActionList ) == -1 )
         return;
 
     k = k.mid( tagActionList.length() );
@@ -237,7 +237,7 @@ void ContainerNode::plugActionList( BuildState &state, const MergingIndexList::I
     if ( k != state.actionListName )
         return;
 
-    ContainerClient *client = tqfindChildContainerClient( state.guiClient,
+    ContainerClient *client = findChildContainerClient( state.guiClient,
                                                         TQString::null,
                                                         mergingIndices.end() );
 
@@ -268,7 +268,7 @@ void ContainerNode::unplugActionList( BuildState &state, const MergingIndexList:
 
     TQString k = mergingIdx.mergingName;
 
-    if ( k.tqfind( tagActionList ) == -1 )
+    if ( k.find( tagActionList ) == -1 )
         return;
 
     k = k.mid( tagActionList.length() );
@@ -279,11 +279,11 @@ void ContainerNode::unplugActionList( BuildState &state, const MergingIndexList:
     if ( k != state.actionListName )
         return;
 
-    ContainerClient *client = tqfindChildContainerClient( state.guiClient,
+    ContainerClient *client = findChildContainerClient( state.guiClient,
                                                         TQString::null,
                                                         mergingIndices.end() );
 
-    ActionListMap::Iterator lIt( client->actionLists.tqfind( k ) );
+    ActionListMap::Iterator lIt( client->actionLists.find( k ) );
     if ( lIt == client->actionLists.end() )
         return;
 
@@ -352,7 +352,7 @@ void ContainerNode::destructChildren( const TQDomElement &element, BuildState &s
     {
         ContainerNode *childNode = childIt.current();
 
-        TQDomElement childElement = tqfindElementForChild( element, childNode );
+        TQDomElement childElement = findElementForChild( element, childNode );
 
         // destruct returns true in case the container really got deleted
         if ( childNode->destruct( childElement, state ) )
@@ -362,7 +362,7 @@ void ContainerNode::destructChildren( const TQDomElement &element, BuildState &s
     }
 }
 
-TQDomElement ContainerNode::tqfindElementForChild( const TQDomElement &baseElement,
+TQDomElement ContainerNode::findElementForChild( const TQDomElement &baseElement,
                                                 ContainerNode *childNode )
 {
     static const TQString &attrName = KGlobal::staticQString( "name" );
@@ -427,7 +427,7 @@ void ContainerNode::unplugClient( ContainerClient *client )
 
     // now adjust all merging indices
 
-    MergingIndexList::Iterator mergingIt = tqfindIndex( client->mergingName );
+    MergingIndexList::Iterator mergingIt = findIndex( client->mergingName );
 
     adjustMergingIndices( - int( client->actions.count()
                           + client->customElements.count() ),
@@ -441,12 +441,12 @@ void ContainerNode::unplugClient( ContainerClient *client )
     {
         alIt.data().unplug( container );
 
-        // construct the merging index key (i.e. like named merging) , tqfind the
+        // construct the merging index key (i.e. like named merging) , find the
         // corresponding merging index and adjust all indices
         TQString mergingKey = alIt.key();
         mergingKey.prepend( tagActionList );
 
-        MergingIndexList::Iterator mIt = tqfindIndex( mergingKey );
+        MergingIndexList::Iterator mIt = findIndex( mergingKey );
         if ( mIt == mergingIndices.end() )
             continue;
 
@@ -476,9 +476,9 @@ int ContainerNode::calcMergingIndex( const TQString &mergingName,
     MergingIndexList::Iterator mergingIt;
 
     if ( mergingName.isEmpty() )
-        mergingIt = tqfindIndex( state.clientName );
+        mergingIt = findIndex( state.clientName );
     else
-        mergingIt = tqfindIndex( mergingName );
+        mergingIt = findIndex( mergingName );
 
     MergingIndexList::Iterator mergingEnd = mergingIndices.end();
     it = mergingEnd;
@@ -538,7 +538,7 @@ BuildHelper::BuildHelper( BuildState &state, ContainerNode *node )
         containerTags = m_state.clientBuilderContainerTags + containerTags;
     }
 
-    m_state.currentDefaultMergingIt = parentNode->tqfindIndex( defaultMergingName );
+    m_state.currentDefaultMergingIt = parentNode->findIndex( defaultMergingName );
     parentNode->calcMergingIndex( TQString::null, m_state.currentClientMergingIt,
                                   m_state, /*ignoreDefaultMergingIndex*/ false );
 }
@@ -568,9 +568,9 @@ void BuildHelper::processElement( const TQDomElement &e )
 
     bool isActionTag = ( tag == tagAction );
 
-    if ( isActionTag || customTags.tqfindIndex( tag ) != -1 )
+    if ( isActionTag || customTags.findIndex( tag ) != -1 )
         processActionOrCustomElement( e, isActionTag );
-    else if ( containerTags.tqfindIndex( tag ) != -1 )
+    else if ( containerTags.findIndex( tag ) != -1 )
         processContainerElement( e, tag, currName );
     else if ( tag == tagMerge || tag == tagDefineGroup || tag == tagActionList )
         processMergeElement( tag, currName, e );
@@ -588,7 +588,7 @@ void BuildHelper::processActionOrCustomElement( const TQDomElement &e, bool isAc
     TQString group;
     int idx = calcMergingIndex( e, it, group );
 
-    containerClient = parentNode->tqfindChildContainerClient( m_state.guiClient, group, it );
+    containerClient = parentNode->findChildContainerClient( m_state.guiClient, group, it );
 
     bool guiElementCreated = false;
     if ( isActionTag )
@@ -697,7 +697,7 @@ void BuildHelper::processMergeElement( const TQString &tag, const TQString &name
     else if ( tag == tagActionList )
         mergingName.prepend( tagActionList );
 
-    if ( parentNode->tqfindIndex( mergingName ) != parentNode->mergingIndices.end() )
+    if ( parentNode->findIndex( mergingName ) != parentNode->mergingIndices.end() )
         return; //do not allow the redefinition of merging indices!
 
     MergingIndexList::Iterator mIt( parentNode->mergingIndices.end() );
@@ -726,7 +726,7 @@ void BuildHelper::processMergeElement( const TQString &tag, const TQString &name
         ignoreDefaultMergingIndex = true;
 
     // re-calculate the running default and client merging indices.
-    m_state.currentDefaultMergingIt = parentNode->tqfindIndex( defaultMergingName );
+    m_state.currentDefaultMergingIt = parentNode->findIndex( defaultMergingName );
     parentNode->calcMergingIndex( TQString::null, m_state.currentClientMergingIt,
                                   m_state, ignoreDefaultMergingIndex );
 }
@@ -736,7 +736,7 @@ void BuildHelper::processContainerElement( const TQDomElement &e, const TQString
 {
     static const TQString &defaultMergingName = KGlobal::staticQString( "<default>" );
 
-    ContainerNode *containerNode = parentNode->tqfindContainer( name, tag,
+    ContainerNode *containerNode = parentNode->findContainer( name, tag,
                                                               &containerList,
                                                               m_state.guiClient );
 
@@ -759,7 +759,7 @@ void BuildHelper::processContainerElement( const TQDomElement &e, const TQString
 
         parentNode->adjustMergingIndices( 1, it );
 
-        assert( !parentNode->tqfindContainerNode( container ) );
+        assert( !parentNode->findContainerNode( container ) );
 
         containerList.append( container );
 
@@ -783,7 +783,7 @@ void BuildHelper::processContainerElement( const TQDomElement &e, const TQString
     BuildHelper( m_state, containerNode ).build( e );
 
     // and re-calculate running values, for better performance
-    m_state.currentDefaultMergingIt = parentNode->tqfindIndex( defaultMergingName );
+    m_state.currentDefaultMergingIt = parentNode->findIndex( defaultMergingName );
     parentNode->calcMergingIndex( TQString::null, m_state.currentClientMergingIt,
                                   m_state, ignoreDefaultMergingIndex );
 }
diff --git a/kdeui/kxmlguifactory_p.h b/kdeui/kxmlguifactory_p.h
index 440353ea1..1877a295f 100644
--- a/kdeui/kxmlguifactory_p.h
+++ b/kdeui/kxmlguifactory_p.h
@@ -99,7 +99,7 @@ typedef TQValueList<MergingIndex> MergingIndexList;
  * is shared all over the place, so there's no need to worry about memory consumption for these
  * variables :-)
  *
- * The mergingIndices list tqcontains the merging indices ;-) , as defined by <Merge>, <DefineGroup>
+ * The mergingIndices list contains the merging indices ;-) , as defined by <Merge>, <DefineGroup>
  * or by <ActionList> tags. The order of these index structures within the mergingIndices list
  * is (and has to be) identical with the order in the DOM tree.
  *
@@ -141,14 +141,14 @@ struct KDEUI_EXPORT ContainerNode
     void clearChildren() { children.clear(); }
     void removeChild( ContainerNode *child );
 
-    MergingIndexList::Iterator tqfindIndex( const TQString &name );
-    ContainerNode *tqfindContainerNode( TQWidget *container );
-    ContainerNode *tqfindContainer( const TQString &_name, bool tag );
-    ContainerNode *tqfindContainer( const TQString &name, const TQString &tagName,
+    MergingIndexList::Iterator findIndex( const TQString &name );
+    ContainerNode *findContainerNode( TQWidget *container );
+    ContainerNode *findContainer( const TQString &_name, bool tag );
+    ContainerNode *findContainer( const TQString &name, const TQString &tagName,
                                   const TQPtrList<TQWidget> *excludeList,
                                   KXMLGUIClient *currClient );
 
-    ContainerClient *tqfindChildContainerClient( KXMLGUIClient *currentGUIClient, 
+    ContainerClient *findChildContainerClient( KXMLGUIClient *currentGUIClient, 
                                                const TQString &groupName, 
                                                const MergingIndexList::Iterator &mergingIdx );
 
@@ -162,7 +162,7 @@ struct KDEUI_EXPORT ContainerNode
 
     bool destruct( TQDomElement element, BuildState &state );
     void destructChildren( const TQDomElement &element, BuildState &state );
-    static TQDomElement tqfindElementForChild( const TQDomElement &baseElement, 
+    static TQDomElement findElementForChild( const TQDomElement &baseElement, 
                                             ContainerNode *childNode );
     void unplugActions( BuildState &state );
     void unplugClient( ContainerClient *client );
diff --git a/kdeui/preparetips b/kdeui/preparetips
index e69e11255..baeaaf3b4 100755
--- a/kdeui/preparetips
+++ b/kdeui/preparetips
@@ -14,10 +14,10 @@ sub printText
 	if ( $text cmp "" )
 	{
 
-	# tqreplace \ with \\
+	# replace \ with \\
 	$text =~ s/\\/\\\\/g;
 
-	# tqreplace " with \"
+	# replace " with \"
 	$text =~ s/"/\\"/g;
 			
 	print "\"$text\\n\"\n";
diff --git a/kdeui/qxembed.cpp b/kdeui/qxembed.cpp
index 422a424ff..7ec1db3a2 100644
--- a/kdeui/qxembed.cpp
+++ b/kdeui/qxembed.cpp
@@ -150,10 +150,10 @@ namespace
 {
     // L0200: This application wide event filter handles focus
     //        issues in the embedded client.
-    class QXEmbedAppFilter : public TQObject
+    class QXEmbedAppFilter : public QObject
     {
     public:
-        QXEmbedAppFilter()  { tqApp->installEventFilter( this ); } 
+        QXEmbedAppFilter()  { qApp->installEventFilter( this ); } 
         ~QXEmbedAppFilter() { }
         bool eventFilter( TQObject *, TQEvent * );
     };
@@ -169,7 +169,7 @@ static XKeyEvent last_key_event;
 // L0300: This class gives access protected members of class TQWidget.
 //        Function focusData() is useful to reimplement tab focus management
 //        (L0620) Function topData() returns a structure QTLWExtra containing
-//        information unique to toplevel windows.  This structure tqcontains two
+//        information unique to toplevel windows.  This structure contains two
 //        members for the sole use of QXEmbed. Flag `embedded' indicates whether
 //        the toplevel window is embedded using the XEMBED protocol (L0680). 
 //        Handle `parentWinId' then records the id of the embedding window.
@@ -311,8 +311,8 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e)
         //        active and has just been given the Qt focus (L0614) or
         //        because the widget already had the Qt focus and just became
         //        active (L0615).
-        if ( tqApp->tqfocusWidget() == o &&
-             ((QPublicWidget*)tqApp->tqfocusWidget()->tqtopLevelWidget())->topData()->embedded ) {
+        if ( qApp->focusWidget() == o &&
+             ((QPublicWidget*)qApp->focusWidget()->topLevelWidget())->topData()->embedded ) {
             TQFocusEvent* fe = (TQFocusEvent*) e;
             if ( obeyFocus || fe->reason() != TQFocusEvent::ActiveWindow /*|| fe->reason() == TQFocusEvent::Mouse ||
                  fe->reason() == TQFocusEvent::Shortcut*/ ) {
@@ -320,8 +320,8 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e)
                 //        Variable `obeyFocus' suggests that this is the result of mouse
                 //        activity in the client.  The XEMBED_REQUEST_FOCUS message causes
                 //        the embedding widget to take the Qt focus (L2085).
-                WId window = ((QPublicWidget*)tqApp->tqfocusWidget()->tqtopLevelWidget())->topData()->parentWinId;
-                focusMap->remove( tqApp->tqfocusWidget()->tqtopLevelWidget() );
+                WId window = ((QPublicWidget*)qApp->focusWidget()->topLevelWidget())->topData()->parentWinId;
+                focusMap->remove( qApp->focusWidget()->topLevelWidget() );
                 sendXEmbedMessage( window, XEMBED_REQUEST_FOCUS );
             } else if ( fe->reason() == TQFocusEvent::ActiveWindow ) {
                 // L0615: Both the embedder and the embedded client became active.
@@ -329,21 +329,21 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e)
                 //        So we clear the Qt focus for now.  If indeed the QXEmbed widget
                 //        has the focus, it will receive a FocusIn message (L1530) and
                 //        tell us to restore the focus (L0680, L0683).
-                focusMap->remove( tqApp->tqfocusWidget()->tqtopLevelWidget() );
-                focusMap->insert( tqApp->tqfocusWidget()->tqtopLevelWidget(),
-                                  new TQGuardedPtr<TQWidget>(tqApp->tqfocusWidget()->tqtopLevelWidget()->tqfocusWidget() ) );
-                // L0616: tqApp->tqfocusWidget() might belong to a modal dialog and not be 
-                //        equal to tqApp->tqfocusWidget()->tqtopLevelWidget()->tqfocusWidget() !
-                tqApp->tqfocusWidget()->clearFocus();
+                focusMap->remove( qApp->focusWidget()->topLevelWidget() );
+                focusMap->insert( qApp->focusWidget()->topLevelWidget(),
+                                  new TQGuardedPtr<TQWidget>(qApp->focusWidget()->topLevelWidget()->focusWidget() ) );
+                // L0616: qApp->focusWidget() might belong to a modal dialog and not be 
+                //        equal to qApp->focusWidget()->topLevelWidget()->focusWidget() !
+                qApp->focusWidget()->clearFocus();
                 // L0617: ??? [why not {obeyFocus=false; return true;} here?]
             }
             obeyFocus = false;
         }
         break;
     case TQEvent::KeyPress: 
-        if (tqApp->tqfocusWidget() == o &&
-            ((QPublicWidget*)tqApp->tqfocusWidget()->tqtopLevelWidget())->topData()->embedded ) {
-            // L0620: The following code tqreplaces the Qt code that 
+        if (qApp->focusWidget() == o &&
+            ((QPublicWidget*)qApp->focusWidget()->topLevelWidget())->topData()->embedded ) {
+            // L0620: The following code replaces the Qt code that 
             //        handles focus focus changes with the tab key. See the
             //        XEMBED specification for details.  The keypress event
             //        arrives here after an interesting itinerary. It is first
@@ -356,7 +356,7 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e)
             //        (L0653, L0654) which then performs tab navigation
             //        (L2081).
             TQKeyEvent *k = (TQKeyEvent *)e;
-            TQWidget *w = tqApp->tqfocusWidget();
+            TQWidget *w = qApp->focusWidget();
             // L0621: The following tests are copied from TQWidget::event().
             bool res = false;
             bool tabForward = true;
@@ -375,16 +375,16 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e)
                 // L0625: We changed the focus because of tab/backtab key
                 //        Now check whether we have been looping around.
                 TQFocusData *fd = ((QPublicWidget*)w)->focusData();
-                WId window = ((QPublicWidget*)w->tqtopLevelWidget())->topData()->parentWinId;
+                WId window = ((QPublicWidget*)w->topLevelWidget())->topData()->parentWinId;
                 TQWidget *cw = 0;
                 TQWidget *fw = fd->home();
                 if (tabForward && window) {
-                    while (cw != w && cw != fw && cw != w->tqtopLevelWidget()) 
+                    while (cw != w && cw != fw && cw != w->topLevelWidget()) 
                         cw = fd->prev();
                     if (cw != w)
                         sendXEmbedMessage( window, XEMBED_FOCUS_NEXT );
                 } else if (window) {
-                    while (cw != w && cw != fw && cw != w->tqtopLevelWidget()) 
+                    while (cw != w && cw != fw && cw != w->topLevelWidget()) 
                         cw = fd->next();
                     if (cw != w)
                         sendXEmbedMessage( window, XEMBED_FOCUS_PREV );
@@ -422,16 +422,16 @@ static int qxembed_x11_event_filter( XEvent* e)
             // L0671: Keep Qt message time up to date
             if ( msgtime > qt_x_time )
                 qt_x_time = msgtime;
-            TQWidget* w = TQWidget::tqfind( e->xclient.window );
+            TQWidget* w = TQWidget::find( e->xclient.window );
             if ( !w )
                 break;
             switch ( message) {
             case XEMBED_EMBEDDED_NOTIFY: {
                 // L0675: We just have been embedded into a XEMBED aware widget.
-                QTLWExtra *extra = ((QPublicWidget*)w->tqtopLevelWidget())->topData();
+                QTLWExtra *extra = ((QPublicWidget*)w->topLevelWidget())->topData();
                 extra->embedded = 1;
                 extra->parentWinId = e->xclient.data.l[3];
-                w->tqtopLevelWidget()->show();
+                w->topLevelWidget()->show();
                 break;
             }
             case XEMBED_WINDOW_ACTIVATE: {
@@ -444,10 +444,10 @@ static int qxembed_x11_event_filter( XEvent* e)
                 memset(&ev, 0, sizeof(ev));
                 ev.xfocus.display = qt_xdisplay();
                 ev.xfocus.type = XFocusIn;
-                ev.xfocus.window = w->tqtopLevelWidget()->winId();
+                ev.xfocus.window = w->topLevelWidget()->winId();
                 ev.xfocus.mode = NotifyNormal;
                 ev.xfocus.detail = NotifyAncestor;
-                tqApp->x11ProcessEvent( &ev );
+                qApp->x11ProcessEvent( &ev );
             }
             break;
             case XEMBED_WINDOW_DEACTIVATE: {
@@ -458,10 +458,10 @@ static int qxembed_x11_event_filter( XEvent* e)
                 memset(&ev, 0, sizeof(ev));
                 ev.xfocus.display = qt_xdisplay();
                 ev.xfocus.type = XFocusOut;
-                ev.xfocus.window = w->tqtopLevelWidget()->winId();
+                ev.xfocus.window = w->topLevelWidget()->winId();
                 ev.xfocus.mode = NotifyNormal;
                 ev.xfocus.detail = NotifyAncestor;
-                tqApp->x11ProcessEvent( &ev );
+                qApp->x11ProcessEvent( &ev );
             }
             break;
             case XEMBED_FOCUS_IN:
@@ -469,11 +469,11 @@ static int qxembed_x11_event_filter( XEvent* e)
                 {
                     // L0681: Search saved focus widget.
                     TQWidget* focusCurrent = 0;
-                    TQGuardedPtr<TQWidget>* fw = focusMap->tqfind( w->tqtopLevelWidget() );
+                    TQGuardedPtr<TQWidget>* fw = focusMap->find( w->topLevelWidget() );
                     if ( fw ) {
                         focusCurrent = *fw;
                         // L0682: Remove it from the map
-                        focusMap->remove( w->tqtopLevelWidget() );
+                        focusMap->remove( w->topLevelWidget() );
                     }
                     switch ( detail ) {
                     case XEMBED_FOCUS_CURRENT:
@@ -483,15 +483,15 @@ static int qxembed_x11_event_filter( XEvent* e)
                             if( QXEmbed* emb = dynamic_cast< QXEmbed* >( focusCurrent ))
                                 emb->updateEmbeddedFocus( true );
                         }
-                        else if ( !w->tqtopLevelWidget()->tqfocusWidget() )
-                            w->tqtopLevelWidget()->setFocus();
+                        else if ( !w->topLevelWidget()->focusWidget() )
+                            w->topLevelWidget()->setFocus();
                         break;
                     case XEMBED_FOCUS_FIRST:
                         {
                             // L0684: Search first widget in tab chain
                             TQFocusEvent::setReason( TQFocusEvent::Tab );
-                            w->tqtopLevelWidget()->setFocus();
-                            ((QPublicWidget*)w->tqtopLevelWidget())->focusNextPrev(true);
+                            w->topLevelWidget()->setFocus();
+                            ((QPublicWidget*)w->topLevelWidget())->focusNextPrev(true);
                             TQFocusEvent::resetReason();
                         }
                         break;
@@ -499,8 +499,8 @@ static int qxembed_x11_event_filter( XEvent* e)
                         {
                             // L0686: Search last widget in tab chain
                             TQFocusEvent::setReason( TQFocusEvent::Backtab );
-                            w->tqtopLevelWidget()->setFocus();
-                            ((QPublicWidget*)w->tqtopLevelWidget())->focusNextPrev(false);
+                            w->topLevelWidget()->setFocus();
+                            ((QPublicWidget*)w->topLevelWidget())->focusNextPrev(false);
                             TQFocusEvent::resetReason();
                         }
                         break;
@@ -513,12 +513,12 @@ static int qxembed_x11_event_filter( XEvent* e)
                 // L0688: Embedding application takes the focus away
                 //        We first record what the focus widget was
                 //        and clear the Qt focus.
-                if ( w->tqtopLevelWidget()->tqfocusWidget() ) {
-                    if( QXEmbed* emb = dynamic_cast< QXEmbed* >( w->tqtopLevelWidget()->tqfocusWidget()))
+                if ( w->topLevelWidget()->focusWidget() ) {
+                    if( QXEmbed* emb = dynamic_cast< QXEmbed* >( w->topLevelWidget()->focusWidget()))
                         emb->updateEmbeddedFocus( false );
-                    focusMap->insert( w->tqtopLevelWidget(),
-                        new TQGuardedPtr<TQWidget>(w->tqtopLevelWidget()->tqfocusWidget() ) );
-                    w->tqtopLevelWidget()->tqfocusWidget()->clearFocus();
+                    focusMap->insert( w->topLevelWidget(),
+                        new TQGuardedPtr<TQWidget>(w->topLevelWidget()->focusWidget() ) );
+                    w->topLevelWidget()->focusWidget()->clearFocus();
                 }
             break;
             default:
@@ -526,7 +526,7 @@ static int qxembed_x11_event_filter( XEvent* e)
             }
         } else if ( e->xclient.format == 32 && e->xclient.message_type ) {
             if ( e->xclient.message_type == qt_wm_protocols ) {
-                TQWidget* w = TQWidget::tqfind( e->xclient.window );
+                TQWidget* w = TQWidget::find( e->xclient.window );
                 if ( !w )
                     break;
                 // L0690: This is for the embedding side!
@@ -621,7 +621,7 @@ QXEmbed::QXEmbed(TQWidget *parent, const char *name, WFlags f)
     //        whole embedding application. They compete between themselves and
     //        against Qt (L0690, L0914, L1040, L1310, L1510, L1580). 
     //        This would be much simpler if implemented within Qt.
-    d->focusProxy = new TQWidget( tqtopLevelWidget(), "xembed_focus" );
+    d->focusProxy = new TQWidget( topLevelWidget(), "xembed_focus" );
     d->focusProxy->setGeometry( -1, -1, 1, 1 );
     d->focusProxy->show();
     // make sure it's shown - for XSetInputFocus
@@ -656,13 +656,13 @@ QXEmbed::QXEmbed(TQWidget *parent, const char *name, WFlags f)
     // L0913: all application events pass through eventFilter().
     //        This is mostly used to force the X11 focus on the 
     //        proxy focus window. See L1300.
-    tqtopLevelWidget()->installEventFilter( this );
-    tqApp->installEventFilter( this );
+    topLevelWidget()->installEventFilter( this );
+    qApp->installEventFilter( this );
 
     // L0914: Start moving the X11 focus on the focus proxy window.
     //        See L1581 to know why we do not use isActiveWindow().
-    if ( tqApp->activeWindow() == tqtopLevelWidget() )
-        if ( !((QPublicWidget*) tqtopLevelWidget())->topData()->embedded )
+    if ( qApp->activeWindow() == topLevelWidget() )
+        if ( !((QPublicWidget*) topLevelWidget())->topData()->embedded )
             XSetInputFocus( qt_xdisplay(), d->focusProxy->winId(), 
                             RevertToParent, qt_x_time );
     // L0915: ??? [drag&drop?]
@@ -682,7 +682,7 @@ QXEmbed::~QXEmbed()
             //        with this QXEmbed's window.
 #if 0
 // TODO: The proper XEmbed way would be to unmap the window, and the embedded
-// app would detect the embedding has ended, and do whatever it tqfinds appropriate.
+// app would detect the embedding has ended, and do whatever it finds appropriate.
 // However, QXEmbed currently doesn't provide support for this detection,
 // so for the time being, it's better to leave the window mapped as toplevel window.
 // This will be ever more complicated with the systray windows, as the simple API
@@ -716,7 +716,7 @@ QXEmbed::~QXEmbed()
     int revert;
     XGetInputFocus( qt_xdisplay(), &focus, &revert );
     if( focus == d->focusProxy->winId())
-        XSetInputFocus( qt_xdisplay(), tqtopLevelWidget()->winId(), RevertToParent, qt_x_time );
+        XSetInputFocus( qt_xdisplay(), topLevelWidget()->winId(), RevertToParent, qt_x_time );
     // L01045: Delete our private data.
     delete d;
 }
@@ -780,10 +780,10 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e)
 
     switch ( e->type() ) {
     case TQEvent::WindowActivate:
-        if ( o == tqtopLevelWidget() ) {
+        if ( o == topLevelWidget() ) {
             // L1310: Qt thinks the application window has just been activated.
             //        Make sure the X11 focus is on the focus proxy window. See L0686.
-            if ( !((QPublicWidget*) tqtopLevelWidget())->topData()->embedded )
+            if ( !((QPublicWidget*) topLevelWidget())->topData()->embedded )
                 if (! hasFocus() )
                     XSetInputFocus( qt_xdisplay(), d->focusProxy->winId(), 
                                     RevertToParent, qt_x_time );
@@ -796,7 +796,7 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e)
         }
         break;
     case TQEvent::WindowDeactivate:
-        if ( o == tqtopLevelWidget() ) {
+        if ( o == topLevelWidget() ) {
             if (d->xplain)
                 // L1321: Activation has changed. Grab state might change. See L2800.
                 checkGrab();
@@ -808,8 +808,8 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e)
     case TQEvent::Move:
         {
             TQWidget* pos = this;
-            while( pos != o && pos != tqtopLevelWidget())
-                pos = pos->tqparentWidget();
+            while( pos != o && pos != topLevelWidget())
+                pos = pos->parentWidget();
             if( pos == o ) {
                 // L1390: Send fake configure notify events whenever the
                 //        global position of the client changes. See L2900.
@@ -864,8 +864,8 @@ void QXEmbed::focusInEvent( TQFocusEvent * e ){
         return;
     // L1510: This is a good time to set the X11 focus on the focus proxy window.
     //        Except if the the embedding application itself is embedded into another.
-    if ( !((QPublicWidget*) tqtopLevelWidget())->topData()->embedded )
-      if ( tqApp->activeWindow() == tqtopLevelWidget() )
+    if ( !((QPublicWidget*) topLevelWidget())->topData()->embedded )
+      if ( qApp->activeWindow() == topLevelWidget() )
           // L1511: Alter X focus only when window is active. 
           //        This is dual safety here because FocusIn implies this.
           //        But see L1581 for an example where this really matters.
@@ -913,8 +913,8 @@ void QXEmbed::focusOutEvent( TQFocusEvent * ){
     //        is properly set to the X11 focus widget.  We do this because
     //        the client application might have moved the X11 focus after
     //        receiving the fake focus messages.
-    if ( !((QPublicWidget*) tqtopLevelWidget())->topData()->embedded )
-        if ( tqApp->activeWindow() == tqtopLevelWidget() )
+    if ( !((QPublicWidget*) topLevelWidget())->topData()->embedded )
+        if ( qApp->activeWindow() == topLevelWidget() )
             // L1581: Alter X focus only when window is active.
             //        The test above is not the same as isActiveWindow().
             //        Function isActiveWindow() also returns true when a modal
@@ -950,7 +950,7 @@ static bool wstate_withdrawn( WId winid )
     // L1610: Non managed windows have no WM_STATE property.
     //        Returning true ensures that the loop L1711 stops.
     if ( r == Success && data && format == 32 ) {
-        TQ_UINT32 *wstate = (TQ_UINT32*)data;
+        Q_UINT32 *wstate = (Q_UINT32*)data;
         withdrawn  = (*wstate == WithdrawnState );
         XFree( (char *)data );
     }
@@ -1046,8 +1046,8 @@ void QXEmbed::handleEmbed()
     if ( parent() ) {
         // L2030: embedded window might have new size requirements.
         //        see L2500, L2520, L2550.
-        TQEvent * tqlayoutHint = new TQEvent( TQEvent::LayoutHint );
-        TQApplication::postEvent( parent(), tqlayoutHint );
+        TQEvent * layoutHint = new TQEvent( TQEvent::LayoutHint );
+        TQApplication::postEvent( parent(), layoutHint );
     }
     windowChanged( window );
     if (d->xplain) {
@@ -1176,10 +1176,10 @@ bool QXEmbed::x11Event( XEvent* e)
                 break;
                 // L2085: The client asks for the focus.
             case XEMBED_REQUEST_FOCUS:
-                if( ((QPublicWidget*)tqtopLevelWidget())->topData()->embedded ) {
-                    focusMap->remove( tqtopLevelWidget() );
-                    focusMap->insert( tqtopLevelWidget(), new TQGuardedPtr<TQWidget>( this ));
-                    WId window = ((QPublicWidget*)tqtopLevelWidget())->topData()->parentWinId;
+                if( ((QPublicWidget*)topLevelWidget())->topData()->embedded ) {
+                    focusMap->remove( topLevelWidget() );
+                    focusMap->insert( topLevelWidget(), new TQGuardedPtr<TQWidget>( this ));
+                    WId window = ((QPublicWidget*)topLevelWidget())->topData()->parentWinId;
                     sendXEmbedMessage( window, XEMBED_REQUEST_FOCUS );
                 } else {
                     TQFocusEvent::setReason( TQFocusEvent::Mouse );
@@ -1194,7 +1194,7 @@ bool QXEmbed::x11Event( XEvent* e)
 	break;
 
     case ConfigureRequest:
-        // L2090: Client wants to change its tqgeometry. 
+        // L2090: Client wants to change its geometry. 
         //        Just inform it that nothing has changed.
         if (e->xconfigurerequest.window == window) 
         {
@@ -1285,7 +1285,7 @@ void QXEmbed::embedClientIntoWindow(TQWidget* client, WId window)
 
 
 // L2500: Specifies that this widget can use additional space,
-//        and that it can survive on less than tqsizeHint().
+//        and that it can survive on less than sizeHint().
 TQSizePolicy QXEmbed::sizePolicy() const
 {
     return TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
@@ -1293,13 +1293,13 @@ TQSizePolicy QXEmbed::sizePolicy() const
 
 
 // L2520: Returns a size sufficient for the embedded window
-TQSize QXEmbed::tqsizeHint() const
+TQSize QXEmbed::sizeHint() const
 {
-    return tqminimumSizeHint();
+    return minimumSizeHint();
 }
 
 // L2550: Returns the minimum size specified by the embedded window.
-TQSize QXEmbed::tqminimumSizeHint() const
+TQSize QXEmbed::minimumSizeHint() const
 {
     int minw = 0;
     int minh = 0;
@@ -1356,7 +1356,7 @@ void QXEmbed::checkGrab()
 }
 
 // L2900: This sends fake configure notify events to inform
-//        the client about its window tqgeometry. See L1390, L2024 and L2090.
+//        the client about its window geometry. See L1390, L2024 and L2090.
 void QXEmbed::sendSyntheticConfigureNotifyEvent() 
 {
     // L2910: It seems that the x and y coordinates are global.
diff --git a/kdeui/qxembed.h b/kdeui/qxembed.h
index 2d1d92baa..3b345554f 100644
--- a/kdeui/qxembed.h
+++ b/kdeui/qxembed.h
@@ -183,8 +183,8 @@ public:
     bool autoDelete() const;
 
     /* Reimp */
-    TQSize tqsizeHint() const;
-    TQSize tqminimumSizeHint() const;
+    TQSize sizeHint() const;
+    TQSize minimumSizeHint() const;
     TQSizePolicy sizePolicy() const;
     bool eventFilter( TQObject *, TQEvent * );
     bool customWhatsThis() const;
diff --git a/kdeui/tests/kblendtest.cpp b/kdeui/tests/kblendtest.cpp
index 59a57dc6a..e2d36a575 100644
--- a/kdeui/tests/kblendtest.cpp
+++ b/kdeui/tests/kblendtest.cpp
@@ -11,7 +11,7 @@ KBlendWidget::KBlendWidget(TQWidget *parent, const char *name)
   :TQWidget(parent, name)
 {
 
-    bgnd = tqRgb(255, 255, 255);
+    bgnd = qRgb(255, 255, 255);
 
     image = TQImage("testimage.png");
 
diff --git a/kdeui/tests/kbuttonboxtest.cpp b/kdeui/tests/kbuttonboxtest.cpp
index 80b4661cc..1773c47f9 100644
--- a/kdeui/tests/kbuttonboxtest.cpp
+++ b/kdeui/tests/kbuttonboxtest.cpp
@@ -37,8 +37,8 @@ int main(int argc, char **argv) {
 			   "the window!\n"
 			   "Press OK or Cancel when done"
 			   , w);
-    l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
-    l->setMinimumSize(l->tqsizeHint());
+    l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
+    l->setMinimumSize(l->sizeHint());
     tl->addWidget(l,1);
     KButtonBox *bbox = new KButtonBox(w);
     TQPushButton *b = bbox->addButton("OK");
@@ -50,7 +50,7 @@ int main(int argc, char **argv) {
     
     bbox->addStretch(1);
     bbox->addButton("Help");
-    bbox->tqlayout();
+    bbox->layout();
     tl->addWidget(bbox,0);
     tl->activate();
     w->exec();
@@ -65,8 +65,8 @@ int main(int argc, char **argv) {
     TQLabel *l = new TQLabel("Another common dialog\n\n"\
 			   "OK and Cancel are right aligned\n"\
 			   "Try resizing the window!", w);
-    l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
-    l->setMinimumSize(l->tqsizeHint());
+    l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
+    l->setMinimumSize(l->sizeHint());
     tl->addWidget(l,1);
     KButtonBox *bbox = new KButtonBox(w);
     bbox->addStretch(1);
@@ -76,7 +76,7 @@ int main(int argc, char **argv) {
 	       w, TQT_SLOT(accept()));
     w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()),
 	       w, TQT_SLOT(accept()));
-    bbox->tqlayout();
+    bbox->layout();
     tl->addWidget(bbox,0);
     tl->activate();  
     w->exec();
@@ -91,8 +91,8 @@ int main(int argc, char **argv) {
     TQLabel *l = new TQLabel("Another common dialog\n\n"\
 			   "OK and Cancel are middle aligned\n"\
 			   "Try resizing the window!", w);
-    l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
-    l->setMinimumSize(l->tqsizeHint());
+    l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
+    l->setMinimumSize(l->sizeHint());
     tl->addWidget(l,1);
     KButtonBox *bbox = new KButtonBox(w);
     bbox->addStretch(1);
@@ -103,7 +103,7 @@ int main(int argc, char **argv) {
     w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()),
 	       w, TQT_SLOT(accept()));
     bbox->addStretch(1);
-    bbox->tqlayout();
+    bbox->layout();
     tl->addWidget(bbox,0);
     tl->activate();  
     w->exec();
@@ -120,8 +120,8 @@ int main(int argc, char **argv) {
 			   "the maximum width for all buttons\n"
 			   "since it will look ugly -- "
 			   "anyway, it works", w);
-    l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
-    l->setMinimumSize(l->tqsizeHint());
+    l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
+    l->setMinimumSize(l->sizeHint());
     tl->addWidget(l,1);
     KButtonBox *bbox = new KButtonBox(w);
     bbox->addStretch(1);
@@ -134,7 +134,7 @@ int main(int argc, char **argv) {
 
     bbox->addButton("Push me and I give you a banana");
     bbox->addStretch(1);
-    bbox->tqlayout();
+    bbox->layout();
     tl->addWidget(bbox,0);
     tl->activate();  
     w->exec();
@@ -152,8 +152,8 @@ int main(int argc, char **argv) {
 			   "prevent this strange effect as seen\n"
 			   "the former example!"
 			   ,w);
-    l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
-    l->setMinimumSize(l->tqsizeHint());
+    l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
+    l->setMinimumSize(l->sizeHint());
     tl->addWidget(l,1);
     KButtonBox *bbox = new KButtonBox(w);
     bbox->addStretch(1);
@@ -166,7 +166,7 @@ int main(int argc, char **argv) {
 
     bbox->addButton("Push me and I give you a banana", true);
     bbox->addStretch(1);
-    bbox->tqlayout();
+    bbox->layout();
     tl->addWidget(bbox,0);
     tl->activate();  
     w->exec();
@@ -182,8 +182,8 @@ int main(int argc, char **argv) {
 			   "to make vertically aligned buttons\n"
 			   "too?"
 			   ,w);
-    l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
-    l->setMinimumSize(l->tqsizeHint());
+    l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
+    l->setMinimumSize(l->sizeHint());
     tl->addWidget(l,1);
     KButtonBox *bbox = new KButtonBox(w, KButtonBox::Vertical);
     TQPushButton *b = bbox->addButton("OK");
@@ -194,7 +194,7 @@ int main(int argc, char **argv) {
 	       w, TQT_SLOT(accept()));
 
     bbox->addStretch(1);
-    bbox->tqlayout();
+    bbox->layout();
     tl->addWidget(bbox,0);
     tl->activate();  
     w->exec();
diff --git a/kdeui/tests/kcharselecttest.cpp b/kdeui/tests/kcharselecttest.cpp
index 5880c436a..facd17bca 100644
--- a/kdeui/tests/kcharselecttest.cpp
+++ b/kdeui/tests/kcharselecttest.cpp
@@ -7,7 +7,7 @@ int main (int argc,char **argv)
     KApplication app( argc, argv, "kcharselecttest" );
 
     KCharSelect selector( 0, "char selector" );
-    selector.resize( selector.tqsizeHint() );
+    selector.resize( selector.sizeHint() );
     selector.show();
     selector.setCaption( "KCharSelect Test" );
 
diff --git a/kdeui/tests/kcolortest.cpp b/kdeui/tests/kcolortest.cpp
index 46f5b42bc..d4a5c2625 100644
--- a/kdeui/tests/kcolortest.cpp
+++ b/kdeui/tests/kcolortest.cpp
@@ -51,9 +51,9 @@ void KColorWidget::doIntensityLoop()
 	  for (int i=0;i<size; i++, qptr++)
 	    {
 	      qrgb=*(QRgb *)qptr;
-	      *qptr=tqRgb((int)(tqRed(qrgb)*1./max),
-			 (int)(tqGreen(qrgb)*1./max),
-			 (int)(tqBlue(qrgb)*1./max));
+	      *qptr=qRgb((int)(qRed(qrgb)*1./max),
+			 (int)(qGreen(qrgb)*1./max),
+			 (int)(qBlue(qrgb)*1./max));
 	    }
 	}
 	pixmap.convertFromImage(image);
diff --git a/kdeui/tests/kcomboboxtest.cpp b/kdeui/tests/kcomboboxtest.cpp
index e8fd35f7e..44b849b44 100644
--- a/kdeui/tests/kcomboboxtest.cpp
+++ b/kdeui/tests/kcomboboxtest.cpp
@@ -36,7 +36,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
   TQHBox* hbox = new TQHBox(this);
   hbox->setSpacing (KDialog::spacingHint());
   TQLabel* lbl = new TQLabel("&QCombobox:", hbox);
-  lbl->tqsetSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred);
+  lbl->setSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred);
   
   m_qc = new TQComboBox(hbox, "QtReadOnlyCombo" );
   lbl->setBuddy (m_qc);  
@@ -48,7 +48,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
   hbox = new TQHBox(this);
   hbox->setSpacing (KDialog::spacingHint());
   lbl = new TQLabel("&Read-Only Combo:", hbox);
-  lbl->tqsetSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred);
+  lbl->setSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred);
 
   m_ro = new KComboBox(hbox, "ReadOnlyCombo" );
   lbl->setBuddy (m_ro);
@@ -61,7 +61,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
   hbox = new TQHBox(this);
   hbox->setSpacing (KDialog::spacingHint());
   lbl = new TQLabel("&Editable Combo:", hbox);
-  lbl->tqsetSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred);
+  lbl->setSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred);
 
   m_rw = new KComboBox( true, hbox, "ReadWriteCombo" );
   lbl->setBuddy (m_rw);
@@ -78,7 +78,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
   hbox = new TQHBox(this);
   hbox->setSpacing (KDialog::spacingHint());
   lbl = new TQLabel("&History Combo:", hbox);
-  lbl->tqsetSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred);
+  lbl->setSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred);
 
   m_hc = new KHistoryCombo( true, hbox, "HistoryCombo" );
   lbl->setBuddy (m_hc);
@@ -94,7 +94,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
   hbox = new TQHBox(this);
   hbox->setSpacing (KDialog::spacingHint());
   lbl = new TQLabel( "&Konq's Combo:", hbox);
-  lbl->tqsetSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred);
+  lbl->setSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred);
 
   m_konqc = new KComboBox( true, hbox, "KonqyCombo" );
   lbl->setBuddy (m_konqc);
diff --git a/kdeui/tests/kcompletiontest.cpp b/kdeui/tests/kcompletiontest.cpp
index b38ec8095..bdd47ab48 100644
--- a/kdeui/tests/kcompletiontest.cpp
+++ b/kdeui/tests/kcompletiontest.cpp
@@ -39,10 +39,10 @@ Form1::Form1( TQWidget* parent,  const char* name )
     GroupBox1 = new TQGroupBox( this, "GroupBox1" );
     GroupBox1->setTitle( "Completion Test" );
     GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->tqlayout()->setSpacing( 0 );
-    GroupBox1->tqlayout()->setMargin( 0 );
-    GroupBox1Layout = new TQVBoxLayout( GroupBox1->tqlayout() );
-    GroupBox1Layout->tqsetAlignment( Qt::AlignTop );
+    GroupBox1->layout()->setSpacing( 0 );
+    GroupBox1->layout()->setMargin( 0 );
+    GroupBox1Layout = new TQVBoxLayout( GroupBox1->layout() );
+    GroupBox1Layout->setAlignment( Qt::AlignTop );
     GroupBox1Layout->setSpacing( 6 );
     GroupBox1Layout->setMargin( 11 );
 
@@ -166,7 +166,7 @@ void Form1::slotList()
 void Form1::slotHighlighted( const TQString& text )
 {
     // remove any "weighting"
-    int index = text.tqfindRev( ':' );
+    int index = text.findRev( ':' );
     if ( index > 0 )
 	LineEdit1->setText( text.left( index ) );
     else
diff --git a/kdeui/tests/kdesattest.cpp b/kdeui/tests/kdesattest.cpp
index e75b320a7..28f7d4cf2 100644
--- a/kdeui/tests/kdesattest.cpp
+++ b/kdeui/tests/kdesattest.cpp
@@ -23,7 +23,7 @@ KDesatWidget::KDesatWidget(TQWidget *parent, const char *name)
 
 void KDesatWidget::change(double) {
     desat_value = slide->value();
-    tqrepaint(false);
+    repaint(false);
 }
 
 void KDesatWidget::paintEvent(TQPaintEvent */*ev*/)
diff --git a/kdeui/tests/kdialogbasetest.cpp b/kdeui/tests/kdialogbasetest.cpp
index 8092f27ef..5e62115fa 100644
--- a/kdeui/tests/kdialogbasetest.cpp
+++ b/kdeui/tests/kdialogbasetest.cpp
@@ -12,12 +12,12 @@ int main(int argc, char** argv)
     "<center><h1>DialogBase Example</h1></center><hr><br>"
     "This example shows the usage of the <i>DialogBase</i>  class. "
     "<i>DialogBase</i> is the KDE user interface class used to create "
-    "dialogs with unique tqlayout without having to define an own dialog "
+    "dialogs with unique layout without having to define an own dialog "
     "style for your application. <br>"
     "It provides three standard buttons (<b>OK</b>, <b>Apply</b>, and "
     "<b>Cancel</b>) that are needed in most dialogs. Each one may be "
     "hidden, enabled or disabled, and tooltips and quickhelp texts might be"
-    " added. And you do not need to bother about tqgeometry management, this "
+    " added. And you do not need to bother about geometry management, this "
     "is all done automatically.<br>"
     "To polish your user interface even further, you might want to add "
     "textures to the inner and the outer frame of the dialog (the frame is "
@@ -60,11 +60,11 @@ int main(int argc, char** argv)
   view.setMinimumSize( 250, 300 );
   dialog.setMainWidget(&view);
   /* After finishing the setup of your main widget, the dialog needs to be
-     adjusted. It is not done automatically, since the tqlayout of the main
+     adjusted. It is not done automatically, since the layout of the main
      widget may change before the dialog is shown. Additionally, setting a
      help chapter may cause a need for adjustment since it modifies the height
      of the upper frame. */
-  dialog.resize(dialog.tqminimumSize());
+  dialog.resize(dialog.minimumSize());
   /* The dialog object is used just as any other TQDialog: */
   if(dialog.exec())
     {
diff --git a/kdeui/tests/kdockwidgetdemo.cpp b/kdeui/tests/kdockwidgetdemo.cpp
index 8cec435c3..15b83d14e 100644
--- a/kdeui/tests/kdockwidgetdemo.cpp
+++ b/kdeui/tests/kdockwidgetdemo.cpp
@@ -82,7 +82,7 @@ SFileDialog::SFileDialog( TQString initially, const TQStringList& filter, const
 :TQDialog(0L,name,true)
 {
   KConfig* config = kapp->config();
-  config->setGroup( TQString::tqfromLatin1("SFileDialogData:") + name );
+  config->setGroup( TQString::fromLatin1("SFileDialogData:") + name );
   if ( initially.isNull() ){
     initially = config->readPathEntry( "InitiallyDir", TQDir::currentDirPath() );
   }
@@ -242,7 +242,7 @@ void PixmapView::setPixmap( const TQPixmap &pix )
 {
     pixmap = pix;
     resizeContents( pixmap.size().width(), pixmap.size().height() );
-    viewport()->tqrepaint( true );
+    viewport()->repaint( true );
 }
 
 void PixmapView::drawContents( TQPainter *p, int, int, int, int )
@@ -280,7 +280,7 @@ void Preview::showPreview( const TQString &str )
 		    TQTextStream ts( &f );
 		    TQString text = ts.read();
 		    f.close();
-		    if ( fi.extension().lower().tqcontains( "htm" ) ) {
+		    if ( fi.extension().lower().contains( "htm" ) ) {
 			TQString url = html->mimeSourceFactory()->makeAbsolute( path, html->context() );
 			html->setText( text, url ); 	
 			raiseWidget( html );
@@ -777,13 +777,13 @@ int main(int argc, char* argv[]) {
 #endif
 
 #if 0
-  qDebug ( SFileDialog::getOpenFileName( TQString::null, TQString::tqfromLatin1("All (*)"),
-                                         TQString::tqfromLatin1("DockWidget Demo"), "dialog1" ) );
+  qDebug ( SFileDialog::getOpenFileName( TQString::null, TQString::fromLatin1("All (*)"),
+                                         TQString::fromLatin1("DockWidget Demo"), "dialog1" ) );
 #endif
 
 #if 1
-  TQStringList s = SFileDialog::getOpenFileNames( TQString::null, TQString::tqfromLatin1("All (*)"),
-                                                TQString::tqfromLatin1("DockWidget Demo"), "dialog1" );
+  TQStringList s = SFileDialog::getOpenFileNames( TQString::null, TQString::fromLatin1("All (*)"),
+                                                TQString::fromLatin1("DockWidget Demo"), "dialog1" );
   TQStringList::Iterator it = s.begin();
   for ( ; it != s.end(); ++it ){
     qDebug( "%s", (*it).local8Bit().data() );
diff --git a/kdeui/tests/kdualcolortest.cpp b/kdeui/tests/kdualcolortest.cpp
index 031a54c80..2060a9842 100644
--- a/kdeui/tests/kdualcolortest.cpp
+++ b/kdeui/tests/kdualcolortest.cpp
@@ -10,8 +10,8 @@ KDualColorWidget::KDualColorWidget(TQWidget *parent, const char *name)
 {
     lbl = new TQLabel("Testing, testing, 1, 2, 3...", this);
     KDualColorButton *colorBtn =
-        new KDualColorButton(lbl->tqcolorGroup().text(),
-                             lbl->tqcolorGroup().background(), this);
+        new KDualColorButton(lbl->colorGroup().text(),
+                             lbl->colorGroup().background(), this);
     connect(colorBtn, TQT_SIGNAL(fgChanged(const TQColor &)),
             TQT_SLOT(slotFgChanged(const TQColor &)));
     connect(colorBtn, TQT_SIGNAL(bgChanged(const TQColor &)),
@@ -19,11 +19,11 @@ KDualColorWidget::KDualColorWidget(TQWidget *parent, const char *name)
     connect(colorBtn, TQT_SIGNAL(currentChanged(KDualColorButton::DualColor)),
             TQT_SLOT(slotCurrentChanged(KDualColorButton::DualColor)));
     
-    TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 5);
-    tqlayout->addWidget(colorBtn, 0);
-    tqlayout->addWidget(lbl, 1);
-    tqlayout->activate();
-    resize(tqsizeHint());
+    TQHBoxLayout *layout = new TQHBoxLayout(this, 5);
+    layout->addWidget(colorBtn, 0);
+    layout->addWidget(lbl, 1);
+    layout->activate();
+    resize(sizeHint());
 }
 
 void KDualColorWidget::slotFgChanged(const TQColor &c)
diff --git a/kdeui/tests/keditlistboxtest.cpp b/kdeui/tests/keditlistboxtest.cpp
index fdc90a742..90dbb74d0 100644
--- a/kdeui/tests/keditlistboxtest.cpp
+++ b/kdeui/tests/keditlistboxtest.cpp
@@ -7,14 +7,14 @@ int main( int argc, char **argv )
     KApplication app( argc, argv, "keditlistboxtest" );
 
     KEditListBox::CustomEditor editor( new KComboBox( true, 0L, "test" ) );
-    KEditListBox *box = new KEditListBox( TQString::tqfromLatin1("KEditListBox"),
+    KEditListBox *box = new KEditListBox( TQString::fromLatin1("KEditListBox"),
                                           editor );
     
-    box->insertItem( TQString::tqfromLatin1("Test") );
-    box->insertItem( TQString::tqfromLatin1("for") );
-    box->insertItem( TQString::tqfromLatin1("this") );
-    box->insertItem( TQString::tqfromLatin1("KEditListBox") );
-    box->insertItem( TQString::tqfromLatin1("Widget") );
+    box->insertItem( TQString::fromLatin1("Test") );
+    box->insertItem( TQString::fromLatin1("for") );
+    box->insertItem( TQString::fromLatin1("this") );
+    box->insertItem( TQString::fromLatin1("KEditListBox") );
+    box->insertItem( TQString::fromLatin1("Widget") );
     box->show();
 
     return app.exec();
diff --git a/kdeui/tests/kledtest.cpp b/kdeui/tests/kledtest.cpp
index f8d031530..d68f1e366 100644
--- a/kdeui/tests/kledtest.cpp
+++ b/kdeui/tests/kledtest.cpp
@@ -50,14 +50,14 @@ KLedTest::KLedTest(TQWidget* parent)
   }
   else {
     y=Grid; index=0;
-    for( int tqshape=0; (int)tqshape<2; tqshape=(KLed::Shape)(tqshape+1)) {
+    for( int shape=0; (int)shape<2; shape=(KLed::Shape)(shape+1)) {
       x=Grid;
       for( int look=0; (int)look<3; look=(KLed::Look)(look+1)) {
 	for(state=KLed::Off; (int)state<2; state=(KLed::State)(state+1))
 	    {
 	      leds[index]=new KLed(Qt::yellow, state,
 				   (KLed::Look)(look+1),
-				   (KLed::Shape)(tqshape+1), this);
+				   (KLed::Shape)(shape+1), this);
 	      leds[index]->setGeometry(x, y, LedWidth, LedHeight);
 	      ++index;
 	      x+=Grid+LedWidth;
@@ -108,7 +108,7 @@ KLedTest::nextLook() {
   ledlook = static_cast<KLed::Look>(tmp);
   l->setLook(ledlook);
   //qDebug("painting look %i", ledlook);
-  //l->tqrepaint(); 
+  //l->repaint(); 
 }
 
 
diff --git a/kdeui/tests/kledtest.h b/kdeui/tests/kledtest.h
index 7a1416090..33c70fe83 100644
--- a/kdeui/tests/kledtest.h
+++ b/kdeui/tests/kledtest.h
@@ -15,7 +15,7 @@ protected:
   const int LedWidth;
   const int LedHeight;
   const int Grid;
-  KLed::Shape tqshape;
+  KLed::Shape shape;
   KLed::Look look;
   KLed::State state;
   int x, y, index;
diff --git a/kdeui/tests/klineedittest.cpp b/kdeui/tests/klineedittest.cpp
index 7b9049c06..3508982fa 100644
--- a/kdeui/tests/klineedittest.cpp
+++ b/kdeui/tests/klineedittest.cpp
@@ -19,7 +19,7 @@
 KLineEditTest::KLineEditTest (TQWidget* widget, const char* name )
               :TQWidget( widget, name )
 {
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
+    TQVBoxLayout* layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
 
     TQStringList list;
     list << "Tree" << "Suuupa" << "Stroustrup" << "Stone" << "Slick"
@@ -54,8 +54,8 @@ KLineEditTest::KLineEditTest (TQWidget* widget, const char* name )
      m_btnHide->setFixedSize(100,30);
     connect( m_btnHide, TQT_SIGNAL( clicked() ), TQT_SLOT( slotHide() ) );
 
-    tqlayout->addWidget( m_lineedit );
-    tqlayout->addWidget( hbox );
+    layout->addWidget( m_lineedit );
+    layout->addWidget( hbox );
     setCaption( "KLineEdit Unit Test" );
 }
 
diff --git a/kdeui/tests/kmessageboxtest.cpp b/kdeui/tests/kmessageboxtest.cpp
index 44630c178..1b926739f 100644
--- a/kdeui/tests/kmessageboxtest.cpp
+++ b/kdeui/tests/kmessageboxtest.cpp
@@ -21,22 +21,22 @@ public:
 ExampleWidget::ExampleWidget( TQWidget *parent, const char *name )
     : TQLabel(parent, name )
 {
-    // Make the top-level tqlayout; a vertical box to contain all widgets
-    // and sub-tqlayouts.
+    // Make the top-level layout; a vertical box to contain all widgets
+    // and sub-layouts.
     TQSize sh;
     setText("<p>Hello.</p>");
-    sh = tqsizeHint();
+    sh = sizeHint();
     qWarning("SizeHint = %d x %d", sh.width(), sh.height());
     setText("Hello.");
-    sh = tqsizeHint();
+    sh = sizeHint();
     qWarning("SizeHint = %d x %d", sh.width(), sh.height());
     setText("<p>Hello<br>World</p>");
-    sh = tqsizeHint();
+    sh = sizeHint();
     qWarning("SizeHint = %d x %d", sh.width(), sh.height());
 //    setText("Hello\nWorld");
-    sh = tqsizeHint();
+    sh = sizeHint();
     qWarning("SizeHint = %d x %d", sh.width(), sh.height());
-    setMinimumSize(tqsizeHint());
+    setMinimumSize(sizeHint());
 }
 
 
@@ -79,11 +79,11 @@ case 1:
   i = KMessageBox::warningContinueCancel(w, 
                 "You are about to <Print>.\n"
 		"Are you sure?",
-                "Print", TQString::tqfromLatin1("&Print"), "dontask", false);
+                "Print", TQString::fromLatin1("&Print"), "dontask", false);
   i = KMessageBox::warningContinueCancel(0, 
                 "You are about to <Print>.\n"
 		"Are you sure?",
-                "Print", TQString::tqfromLatin1("&Print"), "dontask", KMessageBox::AllowLink);
+                "Print", TQString::fromLatin1("&Print"), "dontask", KMessageBox::AllowLink);
   i = KMessageBox::questionYesNo(0, "<p>Do you have a printer? thisisaverylongdkldhklghklghklashgkllasghkdlsghkldfghklsabla bla bbla bla. It also has <a href=http://www.kde.org>this URL</a>.</p>",
   	TQString("Bla"), TQString("Yes"), TQString("No"), "bla", KMessageBox::AllowLink);
   break;
@@ -96,7 +96,7 @@ case 2:
 case 3:
   i = KMessageBox::questionYesNo(0,
                 "Does your printer support color or only black and white?",
-                "Printer setup", TQString::tqfromLatin1("&Color"), TQString::tqfromLatin1("&Black & White"));
+                "Printer setup", TQString::fromLatin1("&Color"), TQString::fromLatin1("&Black & White"));
   break;
 
 case 4:
@@ -123,33 +123,33 @@ case 6:
   i = KMessageBox::warningContinueCancel(0, 
                 "You are about to print.\n"
 		"Are you sure?",
-                "Print", TQString::tqfromLatin1("&Print"));
+                "Print", TQString::fromLatin1("&Print"));
   break;
 case 7:
   i = KMessageBox::warningContinueCancel(0, 
                 "You are about to <Print>.\n"
 		"Are you sure?",
-                "Print", TQString::tqfromLatin1("&Print"), "dontask", false);
+                "Print", TQString::fromLatin1("&Print"), "dontask", false);
   break;
 
 case 8:
   i = KMessageBox::warningYesNoCancel(0,
-                "Your document tqcontains unsaved changes.\n"
+                "Your document contains unsaved changes.\n"
                 "Do you want to save your changes?\n");
   break;
 
 case 9:
   i = KMessageBox::warningYesNoCancel(0,
-                "Your document tqcontains unsaved changes.\n"
+                "Your document contains unsaved changes.\n"
                 "Do you want to save your changes?\n",
-                TQString::tqfromLatin1("Close"));
+                TQString::fromLatin1("Close"));
   break;
 
 case 10:
   i = KMessageBox::warningYesNoCancel(0,
-                "Your document tqcontains unsaved changes.\n"
+                "Your document contains unsaved changes.\n"
                 "Do you want to save or discard your changes?\n",
-                "Close", TQString::tqfromLatin1("&Save"), TQString::tqfromLatin1("&Discard") );
+                "Close", TQString::fromLatin1("&Save"), TQString::fromLatin1("&Discard") );
   break;
 
 case 11:
diff --git a/kdeui/tests/kpanelmenutest.cpp b/kdeui/tests/kpanelmenutest.cpp
index e081e467f..6f2d8f2be 100644
--- a/kdeui/tests/kpanelmenutest.cpp
+++ b/kdeui/tests/kpanelmenutest.cpp
@@ -20,7 +20,7 @@ TestWidget::TestWidget(TQWidget *parent, const char *name)
     init();
     
     setText("We added \"Client Test\" to kicker. Click the K Menu to check.");
-    resize(tqsizeHint());
+    resize(sizeHint());
 }
 
 void TestWidget::init()
diff --git a/kdeui/tests/kpopuptest.cpp b/kdeui/tests/kpopuptest.cpp
index 3db71106b..96f4b3d32 100644
--- a/kdeui/tests/kpopuptest.cpp
+++ b/kdeui/tests/kpopuptest.cpp
@@ -24,7 +24,7 @@ public:
         menu->insertItem("Item1");
         menu->insertItem("Item2");
         menu->insertSeparator();
-        menu->insertItem("Quit", tqApp, TQT_SLOT(quit()));
+        menu->insertItem("Quit", qApp, TQT_SLOT(quit()));
     }       
 };
 
diff --git a/kdeui/tests/krulertest.cpp b/kdeui/tests/krulertest.cpp
index b221ef397..ad2f5630a 100644
--- a/kdeui/tests/krulertest.cpp
+++ b/kdeui/tests/krulertest.cpp
@@ -55,7 +55,7 @@ KRulerTest::KRulerTest( const char *name )
 {
   mainframe = new TQFrame(this);
 
-  tqlayout = new TQGridLayout(mainframe, 2, 2);
+  layout = new TQGridLayout(mainframe, 2, 2);
 
   miniwidget = new TQFrame(mainframe);
   miniwidget->setFrameStyle(TQFrame::WinPanel | TQFrame::Raised);
@@ -85,10 +85,10 @@ KRulerTest::KRulerTest( const char *name )
   connect( bigwidget, TQT_SIGNAL(newHeight(int)),
 	   TQT_SLOT(slotNewHeight(int)) );
 
-  tqlayout->addWidget(miniwidget, 0, 0);
-  tqlayout->addWidget(hruler, 0, 1);
-  tqlayout->addWidget(vruler, 1, 0);
-  tqlayout->addWidget(bigwidget, 1, 1);
+  layout->addWidget(miniwidget, 0, 0);
+  layout->addWidget(hruler, 0, 1);
+  layout->addWidget(vruler, 1, 0);
+  layout->addWidget(bigwidget, 1, 1);
 
   mouse_message = new TQLabel("Press and hold mouse button\nfor pointer movement", bigwidget);
   mouse_message->adjustSize();
@@ -140,7 +140,7 @@ KRulerTest::KRulerTest( const char *name )
   beginMark = new KIntNumInput(0, lineEdit);
   beginMark->setRange(-1000, 1000, 1, false);
   beginMark->move(5, 15);
-  beginMark->setFixedSize(beginMark->tqsizeHint());
+  beginMark->setFixedSize(beginMark->sizeHint());
   connect(beginMark, TQT_SIGNAL(valueChanged(int)), 
 	  hruler, TQT_SLOT(slotNewOffset(int)) );
   connect(beginMark, TQT_SIGNAL(valueChanged(int)), 
@@ -148,7 +148,7 @@ KRulerTest::KRulerTest( const char *name )
   endMark = new KIntNumInput(0, lineEdit);
   endMark->setRange(-1000, 1000, 1, false);
   endMark->move(5, 35);
-  endMark->setFixedSize(endMark->tqsizeHint());
+  endMark->setFixedSize(endMark->sizeHint());
   connect(endMark, TQT_SIGNAL(valueChanged(int)), 
 	  hruler, TQT_SLOT(slotEndOffset(int)) );
   connect(endMark, TQT_SIGNAL(valueChanged(int)), 
@@ -156,7 +156,7 @@ KRulerTest::KRulerTest( const char *name )
   lengthInput = new KIntNumInput(0, lineEdit);
   lengthInput->setRange(-1000, 1000, 1, false);
   lengthInput->move(5, 55);
-  lengthInput->setFixedSize(lengthInput->tqsizeHint());
+  lengthInput->setFixedSize(lengthInput->sizeHint());
   connect(lengthInput, TQT_SIGNAL(valueChanged(int)), 
 	  hruler, TQT_SLOT(slotEndOffset(int)) );
   connect(lengthInput, TQT_SIGNAL(valueChanged(int)), 
@@ -169,21 +169,21 @@ KRulerTest::KRulerTest( const char *name )
   transX = new KDoubleNumInput(0.0, vertrot);
   transX->setRange(-1000, 1000, 1, false);
   transX->move(5, 15);
-  transX->setFixedSize(transX->tqsizeHint());
+  transX->setFixedSize(transX->sizeHint());
   //transX->setLabel("transx", AlignLeft);
   connect(transX, TQT_SIGNAL(valueChanged(double)), 
 	  TQT_SLOT(slotSetXTrans(double)) );
   transY = new KDoubleNumInput(-12.0, vertrot);
   transY->setRange(-1000, 1000, 1, false);
   transY->move(5, 35);
-  transY->setFixedSize(transY->tqsizeHint());
+  transY->setFixedSize(transY->sizeHint());
   //transY->setLabel("transy", AlignLeft);
   connect(transY, TQT_SIGNAL(valueChanged(double)), 
 	  TQT_SLOT(slotSetYTrans(double)) );
   rotV = new KDoubleNumInput(90.0, vertrot);
   rotV->setRange(-1000, 1000, 1, false);
   rotV->move(5, 55);
-  rotV->setFixedSize(rotV->tqsizeHint());
+  rotV->setFixedSize(rotV->sizeHint());
   //rotV->setLabel("rot", AlignLeft);
   connect(rotV, TQT_SIGNAL(valueChanged(double)), 
 	  TQT_SLOT(slotSetRotate(double)) );
@@ -221,7 +221,7 @@ KRulerTest::KRulerTest( const char *name )
 
 KRulerTest::~KRulerTest()
 {
-  delete tqlayout;
+  delete layout;
   delete hruler;
   delete vruler;
   delete miniwidget;
diff --git a/kdeui/tests/krulertest.h b/kdeui/tests/krulertest.h
index b21c5375f..fe552467c 100644
--- a/kdeui/tests/krulertest.h
+++ b/kdeui/tests/krulertest.h
@@ -74,7 +74,7 @@ private slots:
 private:
 
   KRuler *hruler, *vruler;
-  TQGridLayout *tqlayout;
+  TQGridLayout *layout;
   TQFrame *miniwidget, *bigwidget;
   TQFrame *mainframe;
 
diff --git a/kdeui/tests/ktabwidgettest.cpp b/kdeui/tests/ktabwidgettest.cpp
index f67dd17a9..32ed5c89f 100644
--- a/kdeui/tests/ktabwidgettest.cpp
+++ b/kdeui/tests/ktabwidgettest.cpp
@@ -39,51 +39,51 @@ Test::Test( TQWidget* parent, const char *name )
   mWidget->setTabReorderingEnabled( true );
 
   TQWidget * grid = new TQWidget(this);
-  TQGridLayout * gridtqlayout = new TQGridLayout( grid, 5, 2 );
+  TQGridLayout * gridlayout = new TQGridLayout( grid, 5, 2 );
 
   TQPushButton * addTab = new TQPushButton( "Add Tab", grid );
-  gridtqlayout->addWidget( addTab, 0, 0 );
+  gridlayout->addWidget( addTab, 0, 0 );
   connect( addTab, TQT_SIGNAL( clicked() ), TQT_SLOT( addTab() ) );
 
   TQPushButton * removeTab = new TQPushButton( "Remove Current Tab", grid );
-  gridtqlayout->addWidget( removeTab, 0, 1 );
+  gridlayout->addWidget( removeTab, 0, 1 );
   connect( removeTab, TQT_SIGNAL( clicked() ), TQT_SLOT( removeCurrentTab() ) );
 
   mLeftButton = new TQCheckBox( "Show left button", grid );
-  gridtqlayout->addWidget( mLeftButton, 1, 0 );
+  gridlayout->addWidget( mLeftButton, 1, 0 );
   connect( mLeftButton, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleLeftButton(bool) ) );
   mLeftButton->setChecked(true);
 
   TQCheckBox * leftPopup = new TQCheckBox( "Enable left popup", grid );
-  gridtqlayout->addWidget( leftPopup, 2, 0 );
+  gridlayout->addWidget( leftPopup, 2, 0 );
   connect( leftPopup, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleLeftPopup(bool) ) );
   leftPopup->setChecked(true);
 
   mRightButton = new TQCheckBox( "Show right button", grid );
-  gridtqlayout->addWidget( mRightButton, 1, 1 );
+  gridlayout->addWidget( mRightButton, 1, 1 );
   connect( mRightButton, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleRightButton(bool) ) );
   mRightButton->setChecked(true);
 
   TQCheckBox * rightPopup = new TQCheckBox( "Enable right popup", grid );
-  gridtqlayout->addWidget( rightPopup, 2, 1 );
+  gridlayout->addWidget( rightPopup, 2, 1 );
   connect( rightPopup, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleRightPopup(bool) ) );
   rightPopup->setChecked(true);
 
   mTabsBottom = new TQCheckBox( "Show tabs at bottom", grid );
-  gridtqlayout->addWidget( mTabsBottom, 3, 0 );
+  gridlayout->addWidget( mTabsBottom, 3, 0 );
   connect( mTabsBottom, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabPosition(bool) ) );
 
-  TQCheckBox * tabtqshape = new TQCheckBox( "Triangular tab tqshape", grid );
-  gridtqlayout->addWidget( tabtqshape, 3, 1 );
-  connect( tabtqshape, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabShape(bool) ) );
+  TQCheckBox * tabshape = new TQCheckBox( "Triangular tab shape", grid );
+  gridlayout->addWidget( tabshape, 3, 1 );
+  connect( tabshape, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabShape(bool) ) );
 
   TQCheckBox *tabClose = new TQCheckBox( "Close button on icon hover", grid );
-  gridtqlayout->addWidget( tabClose, 4, 0 );
+  gridlayout->addWidget( tabClose, 4, 0 );
   connect( tabClose, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleCloseButtons(bool) ) );
   tabClose->setChecked(true);
 
   TQCheckBox * showlabels = new TQCheckBox( "Show labels", grid );
-  gridtqlayout->addWidget( showlabels, 4, 1 );
+  gridlayout->addWidget( showlabels, 4, 1 );
   connect( showlabels, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( toggleLabels(bool) ) );
 }
 
diff --git a/kdeui/tests/kunbalancedgrdtest.cpp b/kdeui/tests/kunbalancedgrdtest.cpp
index 9f616496d..7f5b2cc78 100644
--- a/kdeui/tests/kunbalancedgrdtest.cpp
+++ b/kdeui/tests/kunbalancedgrdtest.cpp
@@ -159,7 +159,7 @@ void myTopWidget::rebalance()
 
   if ((otime - itime )> 500)
     {
-      grds->tqrepaint(false);
+      grds->repaint(false);
       itime = time.elapsed();
     }
 }
diff --git a/kdeui/tests/kwizardtest.cpp b/kdeui/tests/kwizardtest.cpp
index a96c9892a..91974263e 100644
--- a/kdeui/tests/kwizardtest.cpp
+++ b/kdeui/tests/kwizardtest.cpp
@@ -36,10 +36,10 @@ int main(int argc, char **argv)
     TQWidget *p = new TQWidget;
     TQString msg = TQString("This is page %1 out of 10").arg(i);
     TQLabel *label = new TQLabel(msg, p);
-    TQHBoxLayout *tqlayout = new TQHBoxLayout(p, 5);
-    label->tqsetAlignment(Qt::AlignCenter);
+    TQHBoxLayout *layout = new TQHBoxLayout(p, 5);
+    label->setAlignment(Qt::AlignCenter);
     label->setFixedSize(300, 200);
-    tqlayout->addWidget(label);
+    layout->addWidget(label);
     TQString title = TQString("%1. page").arg(i);
     wiz->addPage(p, title);
     wiz->setFinishEnabled(p, (i==10));
diff --git a/kdeui/ui_standards.rc b/kdeui/ui_standards.rc
index 6af8eedb1..8c4f1fe2c 100644
--- a/kdeui/ui_standards.rc
+++ b/kdeui/ui_standards.rc
@@ -69,11 +69,11 @@
     <Action name="edit_deselect"/>
     <MergeLocal name="edit_select_merge"/>
     <Separator/>
-    <Action name="edit_tqfind"/>
-    <Action name="edit_tqfind_next"/>
-    <Action name="edit_tqfind_last"/>
-    <Action name="edit_tqreplace"/>
-    <MergeLocal name="edit_tqfind_merge"/>
+    <Action name="edit_find"/>
+    <Action name="edit_find_next"/>
+    <Action name="edit_find_last"/>
+    <Action name="edit_replace"/>
+    <MergeLocal name="edit_find_merge"/>
     <Separator/>
     <MergeLocal/>
   </Menu>
@@ -197,7 +197,7 @@
   <Action name="edit_copy"/>
   <Action name="edit_paste"/>
   <Separator/>
-  <Action name="edit_tqfind"/>
+  <Action name="edit_find"/>
   <Action name="view_zoom"/>
   <Separator/>
   <Action name="go_previous"/>
diff --git a/kdewidgets/README b/kdewidgets/README
index 7b5dcfa4a..eaa3de347 100644
--- a/kdewidgets/README
+++ b/kdewidgets/README
@@ -5,7 +5,7 @@ KDE Custom Widgets for Qt Designer 2
 Summary:
 ========
 
-This directory tqcontains KDE custom widgets for designer 2 which comes with
+This directory contains KDE custom widgets for designer 2 which comes with
 Qt 3. Just make sure your plugin path in qtconfig includes
 $KDEDIR/lib/kde3/plugins . With the KDE build system nothing special 
 (i.e. editing the plugin path) is needed, as uic will automatically be
diff --git a/kdewidgets/kde.widgets b/kdewidgets/kde.widgets
index 1416b3f11..0503bac48 100644
--- a/kdewidgets/kde.widgets
+++ b/kdewidgets/kde.widgets
@@ -38,7 +38,7 @@ Group=Input (KDE)
 [KDatePicker]
 ToolTip=A date selection widget (KDE)
 WhatsThis=Provides a widget for calendar date input
-ConstructorArgs=(parent, QDate::tqcurrentDate(), name)
+ConstructorArgs=(parent, QDate::currentDate(), name)
 Group=Input (KDE)
 
 [KDialog]
@@ -229,7 +229,7 @@ Group=Input (KDE)
 [KDateTable]
 IncludeFile=kdatetbl.h
 Group=Input (KDE)
-ConstructorArgs=(parent, QDate::tqcurrentDate(), name)
+ConstructorArgs=(parent, QDate::currentDate(), name)
 
 [KLanguageButton]
 IncludeFile=klanguagebutton.h
diff --git a/kdewidgets/makekdewidgets.cpp b/kdewidgets/makekdewidgets.cpp
index fb005e1e7..c2339e5a1 100644
--- a/kdewidgets/makekdewidgets.cpp
+++ b/kdewidgets/makekdewidgets.cpp
@@ -47,7 +47,7 @@ static const char classDef[] = "#ifndef EMBED_IMAGES\n"
                                 "		TQPixmap pix(m_widgets[key].iconSet);\n"
                                 "#else\n"
                                 "		TQPixmap pix(locate( \"data\", \n"
-				"			TQString::tqfromLatin1(\"%PluginNameLower/pics/\") + m_widgets[key].iconSet));\n"
+				"			TQString::fromLatin1(\"%PluginNameLower/pics/\") + m_widgets[key].iconSet));\n"
                                 "#endif\n"
                                 "		return TQIconSet(pix);\n"
                                 "	}\n"
@@ -81,17 +81,17 @@ static const char classDef[] = "#ifndef EMBED_IMAGES\n"
                                 "%PluginName::%PluginName()\n"
                                 "{\n"
                                 "        WidgetInfo widget;\n";
-static const char widgetDef[] = "	widget.group = TQString::tqfromLatin1(\"%Group\");\n"
+static const char widgetDef[] = "	widget.group = TQString::fromLatin1(\"%Group\");\n"
                                  "#ifdef EMBED_IMAGES\n"
                                  "	widget.iconSet = TQPixmap(%Pixmap);\n"
                                  "#else\n"
-                                 "	widget.iconSet = TQString::tqfromLatin1(\"%IconSet\");\n"
+                                 "	widget.iconSet = TQString::fromLatin1(\"%IconSet\");\n"
                                  "#endif\n"
-                                 "	widget.includeFile = TQString::tqfromLatin1(\"%IncludeFile\");\n"
-                                 "	widget.toolTip = TQString::tqfromLatin1(\"%ToolTip\");\n"
-                                 "	widget.whatsThis = TQString::tqfromLatin1(\"%WhatsThis\");\n"
+                                 "	widget.includeFile = TQString::fromLatin1(\"%IncludeFile\");\n"
+                                 "	widget.toolTip = TQString::fromLatin1(\"%ToolTip\");\n"
+                                 "	widget.whatsThis = TQString::fromLatin1(\"%WhatsThis\");\n"
                                  "	widget.isContainer = %IsContainer;\n"
-                                 "	m_widgets.insert(TQString::tqfromLatin1(\"%Class\"), widget);\n";
+                                 "	m_widgets.insert(TQString::fromLatin1(\"%Class\"), widget);\n";
 static const char endCtor[] = "	%Init\n"
                                "}\n"
                                "%PluginName::~%PluginName()\n"
@@ -100,7 +100,7 @@ static const char endCtor[] = "	%Init\n"
                                "}\n"
                                "TQWidget *%PluginName::create(const TQString &key, TQWidget *parent, const char *name)\n"
                                "{\n";
-static const char widgetCreate[] = "         if (key == TQString::tqfromLatin1(\"%Class\"))\n"
+static const char widgetCreate[] = "         if (key == TQString::fromLatin1(\"%Class\"))\n"
                                     "                return new %ImplClass%ConstructorArgs;\n";
 static const char endCreate[] = "	return 0;\n"
                                  "}\n"
@@ -172,7 +172,7 @@ void buildFile( TQTextStream &ts, const TQString& group, const TQString& fileNam
     for ( uint idx = 0; idx < includes.count(); ++idx )
         ts << "#include <" << includes[ idx ] << ">" << endl;
     TQStringList classes = input.groupList();
-    classes.remove( classes.tqfind( "Global" ) );
+    classes.remove( classes.find( "Global" ) );
     // Autogenerate widget includes here
     for ( uint idx = 0; idx < classes.count(); ++idx )
         ts << buildWidgetInclude( classes[ idx ], input ) << endl;
@@ -198,12 +198,12 @@ void buildFile( TQTextStream &ts, const TQString& group, const TQString& fileNam
 TQString buildWidgetDef( const TQString &name, KConfig &input, const TQString &group ) {
     input.setGroup( name );
     TQMap<TQString, TQString> defMap;
-    defMap.insert( "Group", input.readEntry( "Group", group ).tqreplace( "\"", "\\\"" ) );
-    defMap.insert( "IconSet", input.readEntry( "IconSet", name.lower() + ".png" ).tqreplace( ":", "_" ) );
-    defMap.insert( "Pixmap", name.lower().tqreplace( ":", "_" ) + "_xpm" );
+    defMap.insert( "Group", input.readEntry( "Group", group ).replace( "\"", "\\\"" ) );
+    defMap.insert( "IconSet", input.readEntry( "IconSet", name.lower() + ".png" ).replace( ":", "_" ) );
+    defMap.insert( "Pixmap", name.lower().replace( ":", "_" ) + "_xpm" );
     defMap.insert( "IncludeFile", input.readEntry( "IncludeFile", name.lower() + ".h" ).remove( ":" ) );
-    defMap.insert( "ToolTip", input.readEntry( "ToolTip", name + " Widget" ).tqreplace( "\"", "\\\"" ) );
-    defMap.insert( "WhatsThis", input.readEntry( "WhatsThis", name + " Widget" ).tqreplace( "\"", "\\\"" ) );
+    defMap.insert( "ToolTip", input.readEntry( "ToolTip", name + " Widget" ).replace( "\"", "\\\"" ) );
+    defMap.insert( "WhatsThis", input.readEntry( "WhatsThis", name + " Widget" ).replace( "\"", "\\\"" ) );
     defMap.insert( "IsContainer", input.readEntry( "IsContainer", "false" ) );
     defMap.insert( "Class", name );
     return KMacroExpander::expandMacros( widgetDef, defMap );
@@ -225,7 +225,7 @@ TQString buildWidgetInclude( const TQString &name, KConfig &input ) {
 
 TQString buildPixmap( const TQString &name, KConfig &input, const TQString &iconPath ) {
     input.setGroup( name );
-    TQString cleanName = name.lower().tqreplace( ":", "_" );
+    TQString cleanName = name.lower().replace( ":", "_" );
     TQString iconName = input.readEntry( "IconSet", cleanName + ".png" );
 
     TQFileInfo fi( iconPath + "/" + iconName );
diff --git a/kdewidgets/tests/test.widgets b/kdewidgets/tests/test.widgets
index f198bb137..b67abedee 100644
--- a/kdewidgets/tests/test.widgets
+++ b/kdewidgets/tests/test.widgets
@@ -38,7 +38,7 @@ Group=Input (KDE)
 [KDatePicker]
 ToolTip=A date selection widget (KDE)
 WhatsThis=Provides a widget for calendar date input
-ConstructorArgs=(parent, QDate::tqcurrentDate(), name)
+ConstructorArgs=(parent, QDate::currentDate(), name)
 Group=Input (KDE)
 
 [KDialog]
@@ -218,7 +218,7 @@ Group=Input (KDE)
 [KDateTable]
 IncludeFile=kdatetbl.h
 Group=Input (KDE)
-ConstructorArgs=(parent, QDate::tqcurrentDate(), name)
+ConstructorArgs=(parent, QDate::currentDate(), name)
 
 [KLanguageButton]
 IncludeFile=klanguagebutton.h
diff --git a/kdoctools/configure.in.in b/kdoctools/configure.in.in
index 6794a635a..2fcb7b75a 100644
--- a/kdoctools/configure.in.in
+++ b/kdoctools/configure.in.in
@@ -3,7 +3,7 @@
 HELP_SUBDIR=kdoctools
 
 KDE_FIND_PATH(xml2-config, XML_CONFIG, [${prefix}/bin ${exec_prefix}/bin], [
-  AC_MSG_WARN([Could not tqfind libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)])
+  AC_MSG_WARN([Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)])
   HELP_SUBDIR=
 ])
 
@@ -35,7 +35,7 @@ fi
 if test -n "$HELP_SUBDIR"; then
 
   KDE_FIND_PATH(xslt-config, XSLT_CONFIG, [${prefix}/bin ${exec_prefix}/bin], [
-    AC_MSG_WARN([Could not tqfind libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in kdesupport for CVS users' convience)])
+    AC_MSG_WARN([Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in kdesupport for CVS users' convience)])
     HELP_SUBDIR=
   ])
 
diff --git a/kdoctools/kio_help.cpp b/kdoctools/kio_help.cpp
index 7af5919ff..292c4de13 100644
--- a/kdoctools/kio_help.cpp
+++ b/kdoctools/kio_help.cpp
@@ -75,7 +75,7 @@ TQString HelpProtocol::langLookup(const TQString& fname)
 
         if ( ( *it ).right( 5 ) == ".html" )
         {
-            TQString file = (*it).left((*it).tqfindRev('/')) + "/index.docbook";
+            TQString file = (*it).left((*it).findRev('/')) + "/index.docbook";
             kdDebug( 7119 ) << "Looking for help in: " << file << endl;
             info.setFile(file);
             if (info.exists() && info.isFile() && info.isReadable())
@@ -112,7 +112,7 @@ TQString HelpProtocol::lookupFile(const TQString &fname,
 	}
         else
 	{
-	    tqunicodeError( i18n("There is no documentation available for %1." ).arg(path) );
+	    unicodeError( i18n("There is no documentation available for %1." ).arg(path) );
 	    finished();
             return TQString::null;
 	}
@@ -123,7 +123,7 @@ TQString HelpProtocol::lookupFile(const TQString &fname,
 }
 
 
-void HelpProtocol::tqunicodeError( const TQString &t )
+void HelpProtocol::unicodeError( const TQString &t )
 {
    data(fromUnicode( TQString(
         "<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=%1\"></head>\n"
@@ -189,7 +189,7 @@ void HelpProtocol::get( const KURL& url )
          return;
       }
     } else {
-        TQString docbook_file = file.left(file.tqfindRev('/')) + "/index.docbook";
+        TQString docbook_file = file.left(file.findRev('/')) + "/index.docbook";
         if (!KStandardDirs::exists(file)) {
             file = docbook_file;
         } else {
@@ -215,13 +215,13 @@ void HelpProtocol::get( const KURL& url )
         kdDebug( 7119 ) << "parsed " << mParsed.length() << endl;
 
         if (mParsed.isEmpty()) {
-            tqunicodeError( i18n( "The requested help file could not be parsed:<br>%1" ).arg( file ) );
+            unicodeError( i18n( "The requested help file could not be parsed:<br>%1" ).arg( file ) );
         } else {
-            int pos1 = mParsed.tqfind( "charset=" );
+            int pos1 = mParsed.find( "charset=" );
             if ( pos1 > 0 ) {
-              int pos2 = mParsed.tqfind( '"', pos1 );
+              int pos2 = mParsed.find( '"', pos1 );
               if ( pos2 > 0 ) {
-                mParsed.tqreplace( pos1, pos2 - pos1, "charset=UTF-8" );
+                mParsed.replace( pos1, pos2 - pos1, "charset=UTF-8" );
               }
             }
             data( mParsed.utf8() );
@@ -248,11 +248,11 @@ void HelpProtocol::get( const KURL& url )
         kdDebug( 7119 ) << "parsed " << mParsed.length() << endl;
 
         if (mParsed.isEmpty()) {
-            tqunicodeError( i18n( "The requested help file could not be parsed:<br>%1" ).arg( file ) );
+            unicodeError( i18n( "The requested help file could not be parsed:<br>%1" ).arg( file ) );
         } else {
             TQString query = url.query(), anchor;
 
-            // if we have a query, look if it tqcontains an anchor
+            // if we have a query, look if it contains an anchor
             if (!query.isEmpty())
                 if (query.left(8) == "?anchor=") {
                     anchor = query.mid(8).lower();
@@ -274,7 +274,7 @@ void HelpProtocol::get( const KURL& url )
             {
                 int index = 0;
                 while ( true ) {
-                    index = mParsed.tqfind( TQRegExp( "<a name=" ), index);
+                    index = mParsed.find( TQRegExp( "<a name=" ), index);
                     if ( index == -1 ) {
                         kdDebug( 7119 ) << "no anchor\n";
                         break; // use whatever is the target, most likely index.html
@@ -283,12 +283,12 @@ void HelpProtocol::get( const KURL& url )
                     if ( mParsed.mid( index, 11 + anchor.length() ).lower() ==
                          TQString( "<a name=\"%1\">" ).arg( anchor ) )
                     {
-                        index = mParsed.tqfindRev( "<FILENAME filename=", index ) +
+                        index = mParsed.findRev( "<FILENAME filename=", index ) +
                                  strlen( "<FILENAME filename=\"" );
                         TQString filename=mParsed.mid( index, 2000 );
-                        filename = filename.left( filename.tqfind( '\"' ) );
+                        filename = filename.left( filename.find( '\"' ) );
                         TQString path = target.path();
-                        path = path.left( path.tqfindRev( '/' ) + 1) + filename;
+                        path = path.left( path.findRev( '/' ) + 1) + filename;
                         kdDebug( 7119 ) << "anchor found in " << path <<endl;
                         target.setPath( path );
                         break;
@@ -307,21 +307,21 @@ void HelpProtocol::emitFile( const KURL& url )
 {
     infoMessage(i18n("Looking up section"));
 
-    TQString filename = url.path().mid(url.path().tqfindRev('/') + 1);
+    TQString filename = url.path().mid(url.path().findRev('/') + 1);
 
-    int index = mParsed.tqfind(TQString("<FILENAME filename=\"%1\"").arg(filename));
+    int index = mParsed.find(TQString("<FILENAME filename=\"%1\"").arg(filename));
     if (index == -1) {
         if ( filename == "index.html" ) {
             data( fromUnicode( mParsed ) );
             return;
         }
 
-        tqunicodeError( i18n("Could not tqfind filename %1 in %2.").arg(filename).arg( url.url() ) );
+        unicodeError( i18n("Could not find filename %1 in %2.").arg(filename).arg( url.url() ) );
         return;
     }
 
     TQString filedata = splitOut(mParsed, index);
-    tqreplaceCharsetHeader( filedata );
+    replaceCharsetHeader( filedata );
 
     data( fromUnicode( filedata ) );
     data( TQByteArray() );
diff --git a/kdoctools/kio_help.h b/kdoctools/kio_help.h
index c442e7c61..13c198af1 100644
--- a/kdoctools/kio_help.h
+++ b/kdoctools/kio_help.h
@@ -37,7 +37,7 @@ private:
     TQString lookupFile(const TQString &fname, const TQString &query,
                        bool &redirect);
 
-    void tqunicodeError( const TQString &t );
+    void unicodeError( const TQString &t );
 
     TQString mParsed;
     bool mGhelp;
diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp
index 73db67ea5..dd2e194e6 100644
--- a/kdoctools/meinproc.cpp
+++ b/kdoctools/meinproc.cpp
@@ -212,7 +212,7 @@ int main(int argc, char **argv) {
         QCStringList::ConstIterator end = paramList.end();
         for ( ; it != end; ++it ) {
             const TQCString tuple = *it;
-            const int ch = tuple.tqfind( '=' );
+            const int ch = tuple.find( '=' );
             if ( ch == -1 ) {
                 kdError() << "Key-Value tuple '" << tuple << "' lacks a '='!" << endl;
                 return( 2 );
@@ -282,7 +282,7 @@ int main(int argc, char **argv) {
             goto end;
         }
 
-        if (output.tqfind( "<FILENAME " ) == -1 || args->isSet( "stdout" ) || args->isSet("output") )
+        if (output.find( "<FILENAME " ) == -1 || args->isSet( "stdout" ) || args->isSet("output") )
         {
             TQFile file;
             if (args->isSet( "stdout" ) ) {
@@ -294,7 +294,7 @@ int main(int argc, char **argv) {
                    file.setName( "index.html" );
                 file.open(IO_WriteOnly);
             }
-            tqreplaceCharsetHeader( output );
+            replaceCharsetHeader( output );
 
             TQCString data = output.local8Bit();
             file.writeBlock(data.data(), data.length());
@@ -302,19 +302,19 @@ int main(int argc, char **argv) {
         } else {
             int index = 0;
             while (true) {
-                index = output.tqfind("<FILENAME ", index);
+                index = output.find("<FILENAME ", index);
                 if (index == -1)
                     break;
                 int filename_index = index + strlen("<FILENAME filename=\"");
 
                 TQString filename = output.mid(filename_index,
-                                              output.tqfind("\"", filename_index) -
+                                              output.find("\"", filename_index) -
                                               filename_index);
 
                 TQString filedata = splitOut(output, index);
                 TQFile file(filename);
                 file.open(IO_WriteOnly);
-                tqreplaceCharsetHeader( filedata );
+                replaceCharsetHeader( filedata );
                 TQCString data = fromUnicode( filedata );
                 file.writeBlock(data.data(), data.length());
                 file.close();
diff --git a/kdoctools/template.docbook b/kdoctools/template.docbook
index bda3c8e97..719379c1f 100644
--- a/kdoctools/template.docbook
+++ b/kdoctools/template.docbook
@@ -1,121 +1,569 @@
 <?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-<!ENTITY % English "INCLUDE">
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!-- Define an entity for your application if it is not part of KDE
+       CVS -->
+  <!ENTITY kmyapplication "<application>KMyApp</application>">
+  <!ENTITY kappname "&kmyapplication;"><!-- replace kmyapplication here
+                                            do *not* replace kappname-->
+  <!ENTITY package "kde-module"><!-- kdebase, kdeadmin, etc.  Leave
+                                     this unchanged if your
+                                     application is not maintained in KDE CVS -->
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE"> <!-- ONLY If you are writing non-English
+                                     original documentation, change
+                                     the language here -->
+
+  <!-- Do not define any other entities; instead, use the entities
+       from entities/general.entities and $LANG/user.entities. -->
 ]>
+<!-- kdoctemplate v0.9 January 10 2003
+     Changes to comments to clarify entity usage January 10 2003
+     Minor update to "Credits and Licenses" section on August 24, 2000
+     Removed "Revision history" section on 22 January 2001
+     Changed to Installation/Help menu entities 18 October 2001
+     Other minor cleanup and changes 18 October 2001
+     FPI change and minor changes November 2002 -->
+
+<!--
+This template was designed by: David Rugge davidrugge@mindspring.com
+with lots of help from: Eric Bischoff ebisch@cybercable.tm.fr
+and Frederik Fouvry fouvry@sfs.nphil.uni-tuebingen.de
+of the KDE DocBook team.
+
+You may freely use this template for writing any sort of KDE documentation.
+If you have any changes or improvements, please let us know.
+
+Remember:
+- in XML, the case of the <tags> and attributes is relevant ;
+- also, quote all attributes.
+
+Please don't forget to remove all these comments in your final documentation,
+thanks ;-).
+-->
+
+<!-- ................................................................ -->
+
+<!-- The language must NOT be changed here. -->
+<!-- If you are writing original documentation in a language other -->
+<!-- than English, change the language above ONLY, not here -->
+<book lang="&language;">
 
-<refentry lang="&language;">
-<refentryinfo>
-<title>KDE User's Manual</title>
-<author><personname>
-<firstname><!-- --Your first name-- --></firstname>
-<surname><!-- --Your last name-- --></surname>
+<!-- This header contains all of the meta-information for the document such
+as Authors, publish date, the abstract, and Keywords -->
+
+<bookinfo>
+<title>The &kmyapplication; Handbook</title>
+
+<authorgroup>
+<author>
+<!-- This is just put in as an example.  For real documentation, please
+     define a general entity in entities/contributor.entities, e.g.
+<!ENTITY George.N.Ugnacious "<personname><firstname>George</firstname><othername>N.</othername><surname>Ugnacious</surname></personname>">
+<!ENTITY George.N.Ugnacious.mail "<email>gnu@kde.org</email>">
+and use `&George.N.Ugnacious; &George.N.Ugnacious.mail;' in the author element.
+ -->
+<personname>
+<firstname>George</firstname>
+<othername>N.</othername>
+<surname>Ugnacious</surname>
 </personname>
-<affiliation><address><email><!-- --Your email address-- --></email></address></affiliation></author>
-<date><!-- --Date when this manpage was written, in the ISO 8601 format
-'yyyy-mm-dd'-- --></date>
-<productname>K Desktop Environment</productname>
-</refentryinfo>
+<email>gnu@kde.org</email>
+</author>
+</authorgroup>
+
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+
+<copyright>
+<year>2002</year>
+<holder>George N. Ugnacious</holder>
+</copyright>
+<!-- Translators: put here the copyright notice of the translation -->
+<!-- Put here the FDL notice.  Read the explanation in fdl-notice.docbook
+     and in the FDL itself on how to use it. -->
+<legalnotice>&FDLNotice;</legalnotice>
+
+<!-- Date and version information of the documentation
+Don't forget to include this last date and this last revision number, we
+need them for translation coordination !
+Please respect the format of the date (YYYY-MM-DD) and of the version
+(V.MM.LL), it could be used by automation scripts.
+Do NOT change these in the translation. -->
+
+<date>2003-01-10</date>
+<releaseinfo>1.01.00</releaseinfo>
+
+<!-- Abstract about this handbook -->
+
+<abstract>
+<para>
+&kmyapplication; is an application specially designed to do nothing you would
+ever want.
+</para>
+</abstract>
+
+<!-- This is a set of Keywords for indexing by search engines.
+Please at least include KDE, the KDE package it is in, the name
+ of your application, and a few relevant keywords. -->
+
+<keywordset>
+<keyword>KDE</keyword>
+<keyword>kdeutils</keyword>
+<keyword>Kapp</keyword>
+<keyword>nothing</keyword>
+<keyword>nothing else</keyword>
+</keywordset>
+
+</bookinfo>
+
+<!-- The contents of the documentation begin here.  Label
+each chapter so with the id attribute. This is necessary for two reasons: it
+allows you to easily reference the chapter from other chapters of your
+document, and if there is no ID, the name of the generated HTML files will vary
+from time to time making it hard to manage for maintainers and for the CVS
+system. Any chapter labelled (OPTIONAL) may be left out at the author's
+discretion. Other chapters should not be left out in order to maintain a
+consistent documentation style across all KDE apps. -->
+
+<chapter id="introduction">
+<title>Introduction</title>
+
+<!-- The introduction chapter contains a brief introduction for the
+application that explains what it does and where to report
+problems. Basically a long version of the abstract.  Don't include a
+revision history. (see installation appendix comment) -->
+
+<para>
+&kmyapplication; is a program that lets you do absolutely nothing. Please report
+any problems or feature requests to the &kde; mailing lists.
+</para>
+</chapter>
+
+<chapter id="using-kapp">
+<title>Using &kmyapplication;</title>
+
+<!-- This chapter should tell the user how to use your app. You should use as
+many sections (Chapter, Sect1, Sect3, etc...) as is necessary to fully document
+your application. -->
+
+<para>
+
+<!-- Note that all graphics should be in .png format. Use no gifs because of
+patent issues. -->
 
+<screenshot>
+<screeninfo>Here's a screenshot of &kmyapplication;</screeninfo>
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="screenshot.png" format="PNG"/>
+	  </imageobject>
+	  <imageobject>
+	    <imagedata fileref="screenshot.eps" format="EPS"/>
+	  </imageobject>
+	  <textobject>
+	    <phrase>Screenshot</phrase>
+	  </textobject>
+	</mediaobject>
+</screenshot>
+</para>
+
+
+<sect1 id="kapp-features">
+<title>More &kmyapplication; features</title>
+
+<para>It slices! It dices! and it comes with a free toaster!</para>
+<para>
+The Squiggle Tool <guiicon><inlinemediaobject>
+	  <imageobject>
+	    <imagedata fileref="squiggle.png" format="PNG"/>
+	  </imageobject>
+	  <imageobject>
+	    <imagedata fileref="squiggle.eps" format="EPS"/>
+	  </imageobject>
+	  <textobject>
+	    <phrase>Squiggle</phrase>
+	  </textobject>
+</inlinemediaobject></guiicon> is used to draw squiggly lines all over
+the &kmyapplication; main window. It's not a bug, it's a feature!
+</para>
+
+</sect1>
+</chapter>
+
+<chapter id="commands">
+<title>Command Reference</title>
+
+<!-- (OPTIONAL, BUT RECOMMENDED) This chapter should list all of the
+application windows and their menubar and toolbar commands for easy reference.
+Also include any keys that have a special function but have no equivalent in the
+menus or toolbars. This may not be necessary for small apps or apps with no tool
+or menu bars. -->
+
+<sect1 id="kapp-mainwindow">
+<title>The main &kmyapplication; window</title>
+
+<sect2>
+<title>The File Menu</title>
+<para>
+<variablelist>
+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo>
+</shortcut>
+<guimenu>File</guimenu>
+<guimenuitem>New</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Creates a new document</action></para></listitem>
+</varlistentry>
+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo>
+</shortcut>
+<guimenu>File</guimenu>
+<guimenuitem>Save</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Saves the document</action></para></listitem>
+</varlistentry>
+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo>
+</shortcut>
+<guimenu>File</guimenu>
+<guimenuitem>Quit</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Quits</action> &kmyapplication;</para></listitem>
+</varlistentry>
+</variablelist>
+</para>
+
+</sect2>
+
+<sect2>
+<title>The <guimenu>Help</guimenu> Menu</title>
+
+<!-- Assuming you have a standard help menu (help, what's this, about -->
+<!-- &kmyapplication;, about KDE) then the documentation is already written. -->
+<!-- The following entity is valid anywhere that a variablelist is -->
+<!-- valid.  -->
+
+&help.menu.documentation;
+
+</sect2>
+
+</sect1>
+</chapter>
+
+<chapter id="developers">
+<title>Developer's Guide to &kmyapplication;</title>
+
+<!-- (OPTIONAL) A Programming/Scripting reference chapter should be
+used for apps that use plugins or that provide their own scripting hooks
+and/or development libraries. -->
+
+<para>
+Programming &kmyapplication; plugins is a joy to behold. Just read through the next
+66 pages of API's to learn how!
+</para>
+
+<!-- Use refentries to describe APIs.  Refentries are fairly complicated and you
+should consult the docbook reference for further details. The example below was
+taken from that reference and shortened a bit for readability. -->
+
+<refentry id="re-1007-unmanagechildren-1">
 <refmeta>
-<refentrytitle><command><!-- --The command this page is about-- --></command></refentrytitle>
-<manvolnum><!-- --The section this page should be in-- --></manvolnum>
+<refentrytitle>XtUnmanageChildren</refentrytitle>
+<refmiscinfo>Xt - Geometry Management</refmiscinfo>
 </refmeta>
-
 <refnamediv>
-<refname><command><!-- --The command this page is about-- --></command></refname>
-<refpurpose><!-- --Very brief description, suitable for 'whatis'-- --></refpurpose>
-</refnamediv>
+<refname>XtUnmanageChildren
+</refname>
+<refpurpose>remove a list of children from a parent widget's managed
+list.
+<indexterm id="ix-1007-unmanagechildren-1"><primary>widgets</primary><secondary>removing</secondary></indexterm>
+<indexterm id="ix-1007-unmanagechildren-2"><primary>XtUnmanageChildren</primary></indexterm>
+</refpurpose>
 
+</refnamediv>
 <refsynopsisdiv>
-<cmdsynopsis>
-<command><!-- --The command this page is about-- --></command>
-<arg choice="req"><!-- --Required command specific options-- --></arg>
-<arg choice="opt"><!-- --Optional command specific options-- --></arg>
-<arg choice="opt">KDE Generic Options</arg>
-<arg choice="opt">Qt Generic Options</arg>
-</cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1>
-<title>Description</title>
-<para><!-- --Description of the app, what it's for, what it does and doesn't
-do.-- --> </para> 
-
-</refsect1>
+<refsynopsisdivinfo>
+<date>4 March 1996</date>
+</refsynopsisdivinfo>
+<synopsis>
+void XtUnmanageChildren(<replaceable class="parameter">children</replaceable>, <replaceable class="parameter">num_children</replaceable>)
+    WidgetList <replaceable class="parameter">children</replaceable>;
+    Cardinal <replaceable class="parameter">num_children</replaceable>;
+</synopsis>
 
-<refsect1>
-<title>Options</title>
-<para>App options, in a variablelist</para>
+<refsect2 id="r2-1007-unmanagechildren-1">
+<title>Inputs</title>
+<variablelist>
+<varlistentry>
+<term><replaceable class="parameter">children</replaceable>
+</term>
+<listitem>
+<para>Specifies an array of child widgets. Each child must be of
+class RectObj or any subclass thereof.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term><replaceable class="parameter">num_children</replaceable>
+</term>
+<listitem>
+<para>Specifies the number of elements in <replaceable class="parameter">children</replaceable>.
+</para>
+</listitem>
+</varlistentry>
+</variablelist>
+</refsect2></refsynopsisdiv>
 
+<refsect1 id="r1-1007-unmanagechildren-1">
+<title>Description
+</title>
+<para><function>XtUnmanageChildren()</function> unmaps the specified widgets
+and removes them from their parent's geometry management.
+The widgets will disappear from the screen, and (depending
+on its parent) may no longer have screen space allocated for
+them.
+</para>
+<para>Each of the widgets in the <replaceable class="parameter">children</replaceable> array must have
+the same parent.
+</para>
+<para>See the &ldquo;Algorithm&rdquo; section below for full details of the
+widget unmanagement procedure.
+</para>
 </refsect1>
 
-<!-- --The Following sections are optional, but recommended if they are
-applicable.-- -->
+<refsect1 id="r1-1007-unmanagechildren-2">
+<title>Usage</title>
+<para>Unmanaging widgets is the usual method for temporarily
+making them invisible.  They can be re-managed with
+<function>XtManageChildren()</function>.
+</para>
+<para>You can unmap a widget, but leave it under geometry
+management by calling <function>XtUnmapWidget()</function>.  You can
+destroy a widget's window without destroying the widget by
+calling <function>XtUnrealizeWidget()</function>.  You can destroy a
+widget completely with <function>XtDestroyWidget()</function>.
+</para>
+<para>If you are only going to unmanage a single widget, it is
+more convenient to call <function>XtUnmanageChild()</function>.  It is
+often more convenient to call <function>XtUnmanageChild()</function>
+several times than it is to declare and initialize an array
+of widgets to pass to <function>XtUnmanageChildren()</function>.  Calling
+<function>XtUnmanageChildren()</function> is more efficient, however,
+because it only calls the parent's <function>change_managed()</function>
+method once.
+</para>
+</refsect1>
 
-<refsect1>
-<title>Environment</title>
-<para><!-- --Environment variablesars that affect this command, how to set
-them, who sets them, how they affect it, probably in a variablelist.  Only for
-man sections 1, 6, 7 and 8-- --></para>
+<refsect1 id="r1-1007-unmanagechildren-3">
+<title>Algorithm
+</title>
+<para><function>XtUnmanageChildren()</function> performs the following:
+</para>
+<variablelist>
+<varlistentry>
+<term>-
+</term>
+<listitem>
+<para>Ignores the child if it already is unmanaged or is being
+destroyed.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>-
+</term>
+<listitem>
+<para>Otherwise, if the child is realized, it makes it nonvisible
+by unmapping it.
+</para>
+</listitem>
+</varlistentry>
+</variablelist>
+<para>
+</para>
 </refsect1>
 
-<refsect1>
-<title>Files</title>
-<para><!-- --Files used by this command (eg, rc files, locations of caches
-etc.)  who puts them there, how they are configured, and if it's safe
-to remove them, probably in a variablelist.-- --></para>
+<refsect1 id="r1-1007-unmanagechildren-4">
+<title>Structures</title>
+<para>The <type>WidgetList</type> type is simply an array of widgets:
+</para>
+<screen id="sc-1007-unmanagechildren-1">typedef Widget *WidgetList;
+</screen>
 </refsect1>
+</refentry>
 
-<refsect1>
-<title>See Also</title>
-<para><!-- --foo(1)-style references, use a simplelist for these-- --></para>
+</chapter>
 
-<para>More detailed user documentation is available from <ulink
-url="help:/<!-- --commandname-- -->">help:/<!-- --command-- --></ulink>
-(either enter this <acronym>URL</acronym> into &konqueror;, or run
-<userinput><command>khelpcenter</command>
-<parameter>help:/<!-- --command-- --></parameter></userinput>).</para>
+<chapter id="faq">
+<title>Questions and Answers</title>
 
-<para>There is also further information available at <!-- --link to
-website if applicable-- --></para>
-</refsect1>
+<!-- (OPTIONAL but recommended) This chapter should include all of the silly
+(and not-so-silly) newbie questions that fill up your mailbox. This chapter
+should be reserved for BRIEF questions and answers! If one question uses more
+than a page or so then it should probably be part of the
+"Using this Application" chapter instead. You should use links to
+cross-reference questions to the parts of your documentation that answer them.
+This is also a great place to provide pointers to other FAQ's if your users
+must do some complicated configuration on other programs in order for your
+application work. -->
 
-<refsect1>
-<title>Examples</title>
-<para><!-- -- Give examples on how to use the program with different parameters
-here, don't forget to explain what each invocation does exactly. Be verbose,
-many users find this the most useful part of the documentation! -- --></para>
-</refsect1>
+&reporting.bugs;
+&updating.documentation;
 
-<refsect1>
-<title>Standards</title>
+<qandaset id="faqlist">
+<qandaentry>
+<question>
+<para>My Mouse doesn't work. How do I quit &kmyapplication;?</para>
+</question>
+<answer>
+<para>You silly goose! Check out the <link linkend="commands">Commands
+Section</link> for the answer.</para>
+</answer>
+</qandaentry>
+<qandaentry>
+<question>
+<para>Why can't I twiddle my documents?</para>
+</question>
+<answer>
+<para>You can only twiddle your documents if you have the foobar.lib
+installed.</para>
+</answer>
+</qandaentry>
+</qandaset>
+</chapter>
 
-<para><!-- --If the app adheres to any particular standards or RFC's, note
-them here.-- --> </para>
-</refsect1>
+<chapter id="credits">
 
-<refsect1>
-<title>History</title>
-<para><!-- --Programs derived from other sources sometimes have this, or you
-might keep a modification log here.  If the log gets overly long or detailed,
-consider maintaining it in a separate file, though.-- -->
-</refsect1>
+<!-- Include credits for the programmers, documentation writers, and
+contributors here. The license for your software should then be included below
+the credits with a reference to the appropriate license file included in the KDE
+distribution. -->
+
+<title>Credits and License</title>
 
-<refsect1>
-<title>Bugs</title>
-<para><!-- --Things that cause specific errors, so that people may avoid it,
-or at least will be prepared for it.-- -->
+<para>
+&kmyapplication;
+</para>
+<para>
+Program copyright 1997 John Q. Hacker <email>jqh@kde.org</email>
+</para>
+<para>
+Contributors:
+<itemizedlist>
+<listitem><para>Konqui the KDE Dragon <email>konqui@kde.org</email></para>
+</listitem>
+<listitem><para>Tux the Linux Penguin <email>tux@linux.org</email></para>
+</listitem>
+</itemizedlist>
 </para>
-</refsect1>
 
-<refsect1>
-<title>Restrictions</title>
-<para><!-- --Bugs you don't plan to fix. :-)-- --></para>
-</refsect1>
+<para>
+Documentation Copyright &copy; 1999 George N. Ugnacious <email>gnu@kde.org</email>
+</para>
 
-<refsect1>
-<title>Authors</title>
-<para><!-- --Author information of the developer and man page writer.-- --></para>
-</refsect1>
+<!-- TRANS:CREDIT_FOR_TRANSLATORS -->
 
-</refentry>
+&underFDL;               <!-- FDL: do not remove -->
+
+<!-- Determine which license your application is licensed under,
+     and delete all the remaining licenses below:
+
+     (NOTE:  All documentation are licensed under the FDL,
+     regardless of what license the application uses) -->
+
+&underGPL;        	 <!-- GPL License -->
+&underBSDLicense;        <!-- BSD License -->
+&underArtisticLicense;   <!-- BSD Artistic License -->
+&underX11License;        <!-- X11 License  -->
+
+</chapter>
+
+<appendix id="installation">
+<title>Installation</title>
+
+<sect1 id="getting-kapp">
+<title>How to obtain &kmyapplication;</title>
+
+<!-- This first entity contains boiler plate for applications that are
+part of KDE CVS.  You should remove it if you are releasing your
+application -->
+
+&install.intro.documentation;
+
+</sect1>
+
+<sect1 id="requirements">
+<title>Requirements</title>
+
+<!--
+List any special requirements for your application here. This should include:
+.Libraries or other software that is not included in kdesupport,
+kdelibs, or kdebase.
+.Hardware requirements like amount of RAM, disk space, graphics card
+capabilities, screen resolution, special expansion cards, etc.
+.Operating systems the app will run on. If your app is designed only for a
+specific OS, (you wrote a graphical LILO configurator for example) put this
+information here.
+-->
+
+<para>
+In order to successfully use &kmyapplication;, you need &kde; 1.1. Foobar.lib is
+required in order to support the advanced &kmyapplication; features. &kmyapplication; uses
+about 5 megs of memory to run, but this may vary depending on your
+platform and configuration.
+</para>
+
+<para>
+All required libraries as well as &kmyapplication; itself can be found
+on <ulink url="ftp://ftp.kapp.org">The &kmyapplication; home page</ulink>.
+</para>
+
+<!-- For a list of updates, you may refer to the application web site
+or the ChangeLog file, or ... -->
+<para>
+You can find a list of changes at <ulink
+url="http://apps.kde.org/kapp">http://apps.kde.org/kapp</ulink>.
+</para>
+</sect1>
+
+<sect1 id="compilation">
+<title>Compilation and Installation</title>
+
+<!-- This entity contains the boilerplate text for standard -->
+<!-- compilation instructions.  If your application requires any -->
+<!-- special handling, remove it, and replace with your own text. -->
+
+&install.compile.documentation;
+
+</sect1>
+
+<sect1 id="configuration">
+<title>Configuration</title>
+
+<para>Don't forget to tell your system to start the <filename>dtd</filename>
+dicer-toaster daemon first, or &kmyapplication; won't work !</para>
+
+</sect1>
+
+</appendix>
+
+&documentation.index;
+</book>
+
+<!--
+Local Variables:
+mode: xml
+sgml-minimize-attributes:nil
+sgml-general-insert-case:lower
+sgml-indent-step:0
+sgml-indent-data:nil
+End:
+
+vim:tabstop=2:shiftwidth=2:expandtab
+kate: space-indent on; indent-width 2; tab-width 2; indent-mode none;
+-->
diff --git a/kdoctools/xslt.cpp b/kdoctools/xslt.cpp
index 13a2ac9ac..216773e7d 100644
--- a/kdoctools/xslt.cpp
+++ b/kdoctools/xslt.cpp
@@ -140,14 +140,14 @@ TQString splitOut(const TQString &parsed, int index)
     TQString filedata;
 
     while (true) {
-        int endindex = parsed.tqfind("</FILENAME>", index);
-        int startindex = parsed.tqfind("<FILENAME ", index) + 1;
+        int endindex = parsed.find("</FILENAME>", index);
+        int startindex = parsed.find("<FILENAME ", index) + 1;
 
 //        kdDebug() << "FILENAME " << startindex << " " << endindex << " " << inside << " " << parsed.mid(startindex + 18, 15)<< " " << parsed.length() << endl;
 
         if (startindex > 0) {
             if (startindex < endindex) {
-                //              kdDebug() << "tqfinding another" << endl;
+                //              kdDebug() << "finding another" << endl;
                 index = startindex + 8;
                 inside++;
             } else {
@@ -166,16 +166,16 @@ TQString splitOut(const TQString &parsed, int index)
 
     }
 
-    index = filedata.tqfind("<FILENAME ");
+    index = filedata.find("<FILENAME ");
 
     if (index > 0) {
-        int endindex = filedata.tqfindRev("</FILENAME>");
+        int endindex = filedata.findRev("</FILENAME>");
         while (filedata.at(endindex) != '>') endindex++;
         endindex++;
         filedata = filedata.left(index) + filedata.mid(endindex);
     }
 
-    // filedata.tqreplace(TQRegExp(">"), "\n>");
+    // filedata.replace(TQRegExp(">"), "\n>");
     return filedata;
 }
 
@@ -336,7 +336,7 @@ TQCString fromUnicode( const TQString &data )
                 buffer_len += test.length();
             } else {
                 TQString res;
-                res.sprintf( "&#%d;", part.at( i ).tqunicode() );
+                res.sprintf( "&#%d;", part.at( i ).unicode() );
                 test = locale->fromUnicode( res );
                 if (buffer_len + test.length() + 1 > sizeof(buffer))
                    break;
@@ -350,10 +350,10 @@ TQCString fromUnicode( const TQString &data )
     return result;
 }
 
-void tqreplaceCharsetHeader( TQString &output )
+void replaceCharsetHeader( TQString &output )
 {
     TQString name = TQTextCodec::codecForLocale()->name();
-    name.tqreplace( TQString( "ISO " ), "iso-" );
-    output.tqreplace( TQString( "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">" ),
+    name.replace( TQString( "ISO " ), "iso-" );
+    output.replace( TQString( "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">" ),
                     TQString( "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%1\">" ).arg( name ) );
 }
diff --git a/kdoctools/xslt.h b/kdoctools/xslt.h
index 9db0a00f6..975bd3c88 100644
--- a/kdoctools/xslt.h
+++ b/kdoctools/xslt.h
@@ -11,7 +11,7 @@ void fillInstance(KInstance &ins, const TQString &srcdir = TQString::null );
 bool saveToCache( const TQString &contents, const TQString &filename );
 TQString lookForCache( const TQString &filename );
 TQCString fromUnicode( const TQString &data );
-void tqreplaceCharsetHeader( TQString &output );
+void replaceCharsetHeader( TQString &output );
 
 extern bool warnings_exist;
 extern TQString *SRCDIR;
diff --git a/khtml/ChangeLog b/khtml/ChangeLog
index 31037ed20..8c7c88bb9 100644
--- a/khtml/ChangeLog
+++ b/khtml/ChangeLog
@@ -33,7 +33,7 @@
 	* ecma/kjs_window.cpp (executeOpenWindow): fixed location href
 	and pathname for about:blank windows
 
-	* khtml_part.cpp (tqfindFrameParent): made frame name lookup locale
+	* khtml_part.cpp (findFrameParent): made frame name lookup locale
 	independant. Was mostly problematic with non-ascii names.
 
 	* html/html_formimpl.cpp (gatherWalletData): prevent crash occuring
@@ -79,16 +79,16 @@
 
         . Correct drawing of borders on iframes and objects (#118277/#56109)
         . Frameborder attribute for iframes (http://www.w3.org/TR/html401/present/frames.html#adef-frameborder)
-        . Fix widget counter-tqmask not being updated in time, thus sometimes missing a tqrepaint (e.g: http://lequipe.fr)
+        . Fix widget counter-mask not being updated in time, thus sometimes missing a repaint (e.g: http://lequipe.fr)
 
         * html/html_baseimpl.{h,cpp} (HTMLIFrameElementImpl::parseAttribute): parse frameborder attribute. Defaults to true as per specification.
         (HTMLIFrameElementImpl::updateFrame/attach): apply/remove frameborder style at attachment time.
-        * khtmlview.cpp (drawContents): fix counter-tqmask problem. Widget tqgeometry is not accurate before painting, so we must
+        * khtmlview.cpp (drawContents): fix counter-mask problem. Widget geometry is not accurate before painting, so we must
         use the RenderObject's.
         * rendering/render_frames.h (paddingTop/paddingBottom/paddingLeft/paddingRight): reimplement. Frames have no padding.
         (RenderPartObject::canHaveBorder): reimplement. True.
-        * rendering/render_object.cpp (RenderObject::updateWidgetMasks): clip tqmask to correct width/height, though it doesn't matter much on X11.
-        * rendering/render_tqreplaced.h (RenderWidget::borderTop/borderBottom/borderLeft/borderRight): percolated down from RenderForm.
+        * rendering/render_object.cpp (RenderObject::updateWidgetMasks): clip mask to correct width/height, though it doesn't matter much on X11.
+        * rendering/render_replaced.h (RenderWidget::borderTop/borderBottom/borderLeft/borderRight): percolated down from RenderForm.
         Frames/Iframes also need that reimplementation.
 
 2006-06-22  Germain Garand  <germain@ebooksfrance.org>
@@ -96,7 +96,7 @@
         Implement floating auto-width table quirk
 
         * rendering/render_block.cpp (positionNewFloats): in quirkmode, floated auto-width
-        tables try to fit within remaining linewidth, so look for minWidth, and retqlayout if
+        tables try to fit within remaining linewidth, so look for minWidth, and relayout if
         position found ends up being narrower than current table width.
 
 2006-06-20  Germain Garand  <germain@ebooksfrance.org>
@@ -106,7 +106,7 @@
         * rendering/render_block.cpp (calcInlineMinMaxWidth/calcBlockMinMaxWidth): lazzily check available width
         so floats don't overflow it if they can break line.
         * rendering/render_box.{h,cpp} (availableWidth{,Using}): new. Like availableHeight{,Using}
-        * rendering/render_canvas.cpp (RenderCanvas::tqlayout): set m_viewportWidth before recalculating minmax, as
+        * rendering/render_canvas.cpp (RenderCanvas::layout): set m_viewportWidth before recalculating minmax, as
         availableWidth needs it.
 
 2006-06-15  Allan Sandfeld Jensen <kde@carewolf.com>
@@ -124,7 +124,7 @@
 
 2006-06-14  Allan Sandfeld Jensen <kde@carewolf.com>
 
-        Implement tqreplaced CSS(3) content, and fix various details in generated pseudo elements for CSS 2.1
+        Implement replaced CSS(3) content, and fix various details in generated pseudo elements for CSS 2.1
 
         * rendering/render_style.{h,cpp}: Add REPLACED and MARKER pseudo styles
         * rendering/render_container.{h,cpp}:
@@ -138,7 +138,7 @@
         * rendering/render_generated.{h,cpp}: Add new class RenderGlyph to render list-style glyphs (square, disc, etc.)
         * xml/dom_nodeimpl.cpp:
             (NodeImpl::diff) detect changes in content and return Detach
-        * css/css_base.{h,cpp}: Add marker and tqreplaced pseudo-styles
+        * css/css_base.{h,cpp}: Add marker and replaced pseudo-styles
         * css/cssstyleselector.cpp:
             (checkOneSelector) Allow content on more elements
             (precomputeAttributeDependencies) Track attributes inside :not elements as well
@@ -158,7 +158,7 @@
             (RenderBox::calcAbsoluteHorizontalValues):
             (RenderBox::calcAbsoluteVertical):
             (RenderBox::calcAbsoluteVerticalValues):
-            (RenderBox::calcAbsoluteHorizontalReplaced): Handle tqreplaced case separately.
+            (RenderBox::calcAbsoluteHorizontalReplaced): Handle replaced case separately.
             (RenderBox::calcAbsoluteVerticalReplaced): ditto.
 
 2006-04-20  Allan Sandfeld Jensen <kde@carewolf.com>
@@ -209,7 +209,7 @@
         * misc/stringit.h (TokenizerQueue): a LIFO stack of TokenizerStrings
         * html/htmltokenizer.{h,cpp} (scriptHandler/write/notifyFinished): use a TokenizerQueue to store
         postponed fragments while executing/loading scripts.
-        (fixUpChar): unrelated - fill in missing tqunicode tqreplacements.
+        (fixUpChar): unrelated - fill in missing unicode replacements.
 
 2006-03-20  Dirk Mueller <mueller@kde.org>
 
@@ -225,27 +225,27 @@
 
 2006-03-07  Germain Garand  <germain@ebooksfrance.org>
 
-        Scope: retqlayout/tqrepaint/widget tqmasks fixes. Refine stacking context exploration. Optimise.
+        Scope: relayout/repaint/widget masks fixes. Refine stacking context exploration. Optimise.
 
-        * khtmlview.cpp (drawContents): use widget tqgeometry rather than the RenderWidget's rect (fixes widget borders not being updated)
+        * khtmlview.cpp (drawContents): use widget geometry rather than the RenderWidget's rect (fixes widget borders not being updated)
         Check if widget is in the dirty rect before doing any work.
 
-        * rendering/render_block.cpp (tqlayoutBlockChildren): I meant !child->isPositioned() here, not isPositioned(). No need to
-        dirty positioned children as this is handled by the containing block chain through tqlayoutPositionedObjects
-        (tqlayoutPositionedObjects): always retqlayout fixed objects.
+        * rendering/render_block.cpp (layoutBlockChildren): I meant !child->isPositioned() here, not isPositioned(). No need to
+        dirty positioned children as this is handled by the containing block chain through layoutPositionedObjects
+        (layoutPositionedObjects): always relayout fixed objects.
 
-        * rendering/render_canvas.cpp (tqlayout): check canvas dimensions and call tqlayoutBlock directly with retqlayoutChildren boolean.
+        * rendering/render_canvas.cpp (layout): check canvas dimensions and call layoutBlock directly with relayoutChildren boolean.
 
-        * rendering/render_layer.{h,cpp} (paintedRegion): constrain our tqshape to the visibleRect. Use convertToLayerCoords to get a correct
-        visibleFlowRegion (updateWidgetMasks): don't forget to update the tqmask if it reverts to none at all.
+        * rendering/render_layer.{h,cpp} (paintedRegion): constrain our shape to the visibleRect. Use convertToLayerCoords to get a correct
+        visibleFlowRegion (updateWidgetMasks): don't forget to update the mask if it reverts to none at all.
 
         * rendering/render_object.{h,cpp} (containingBlock): for relpos inlines, return the nearest block (skipping to next containingBlock gives
-        stalled tqlayout flags problems - #121653). (updateWidgetMasks): tqmask the content box, not the border box.
+        stalled layout flags problems - #121653). (updateWidgetMasks): mask the content box, not the border box.
         (enclosingStackingContext) new. Returns the layer defining current stacking context.
 
-        * rendering/render_tqreplaced.{h,cpp} (isKHTMLWidget): new flag for KHTML-proxied widgets.
-        (detach/resizeWidget/setQWidget/tqlayout/updateFromElement/slotWidgetDestructed/setStyle/paint): use the flag insead of strcmp's
-        Only allow !khtml widgets to register in the view (only those need tqmasking).
+        * rendering/render_replaced.{h,cpp} (isKHTMLWidget): new flag for KHTML-proxied widgets.
+        (detach/resizeWidget/setQWidget/layout/updateFromElement/slotWidgetDestructed/setStyle/paint): use the flag insead of strcmp's
+        Only allow !khtml widgets to register in the view (only those need masking).
 
 2006-03-05  Charles Samuels  <charles@kde.org>
 	* link not accessable with negative text-indent (#96275)
@@ -259,20 +259,20 @@
 
         get iframes, objects and some other overlaid widgets to obey their stacking context (#31121)
 
-        * khtmlview.cpp: tqmask widgets more precisely (i.e. allow layers to paint over overlaid widgets,
+        * khtmlview.cpp: mask widgets more precisely (i.e. allow layers to paint over overlaid widgets,
         when they ought to).
 
-        * rendering/render_canvas.{cpp,h}: update widget tqmasks after pos child tqlayout/positioning;
+        * rendering/render_canvas.{cpp,h}: update widget masks after pos child layout/positioning;
         set a boolean m_needsWidgetMasks to optimise for common case (where we have no such widgets).
 
-        * rendering/render_layer.{cpp,h} (updateWidgetMasks/paintedRegion):  build a rough tqmask for the positive Z order
-        childs. We'll apply that tqmask later to widgets that are under our aegis.
+        * rendering/render_layer.{cpp,h} (updateWidgetMasks/paintedRegion):  build a rough mask for the positive Z order
+        childs. We'll apply that mask later to widgets that are under our aegis.
 
-        * rendering/render_object.{cpp,h} (visibleFlowRegion): helper for calculation of broad region we want to tqmask in flows.
-        (updateWidgetMasks): walk our children looking for widgets suitable to tqmasking. Apply our enclosingLayer's tqmask,
+        * rendering/render_object.{cpp,h} (visibleFlowRegion): helper for calculation of broad region we want to mask in flows.
+        (updateWidgetMasks): walk our children looking for widgets suitable to masking. Apply our enclosingLayer's mask,
         transformis transformandi.
 
-        * rendering/render_tqreplaced.cpp: overlaid widgets must advertise their existence to the enclosing layer.
+        * rendering/render_replaced.cpp: overlaid widgets must advertise their existence to the enclosing layer.
 
 2006-03-01  Germain Garand  <germain@ebooksfrance.org>
 
@@ -295,11 +295,11 @@
 
 2006-02-28  Germain Garand  <germain@ebooksfrance.org>
 
-        * rendering/render_block.cpp (tqlayoutBlockChildren): be more efficient with regard to positioned objects retqlayout.
+        * rendering/render_block.cpp (layoutBlockChildren): be more efficient with regard to positioned objects relayout.
         Merge WC margin-collapse regression fix (WC/#3508).
-        (tqlayoutPositionedObjects) Objects with staticX() need a retqlayout too.
-        * rendering/render_canvas.cpp (tqlayout): no need to retqlayout positioned objects here. This would mark entire branches of the tree
-        as needing a tqlayout, thus stalling update requests in those branches (#116626)
+        (layoutPositionedObjects) Objects with staticX() need a relayout too.
+        * rendering/render_canvas.cpp (layout): no need to relayout positioned objects here. This would mark entire branches of the tree
+        as needing a layout, thus stalling update requests in those branches (#116626)
 
 2006-01-14  Allan Sandfeld Jensen <kde@carewolf.com>
 
@@ -313,14 +313,14 @@
 
 2005-12-09  Germain Garand  <germain@ebooksfrance.org>
 
-        implement quirky HTML tqalignment ; introduce special float values
+        implement quirky HTML alignment ; introduce special float values
         -khtml-left/-khtml-right to this effect.
 
         * css/cssparser.cpp: ditto. Fix memory leak from Function struct deletion also.
         * css/cssstyleselector.cpp: ditto.
         * css/html4.css: set as default style for table[align="left/right"]
         * html/html_tableimpl.cpp (parseAttribute): remove setting of float property
-        * rendering/render_block{h,cpp}: quirky HTML tqalignment never clears, and never cause fafs to clear.
+        * rendering/render_block{h,cpp}: quirky HTML alignment never clears, and never cause fafs to clear.
           Only examine the last floating object on line, so as to match MSIE behaviour.
         * rendering/render_style.h: extra float enumeration values
         * css/css_renderstyledeclarationimpl.cpp (getPropertyCSSValue): adjust
@@ -345,19 +345,19 @@
 
         * rendering/render_table.{cpp,h}:
         had member booleans to hold whether flexing of cells in a row is
-        needed, and in the affirmative, whether we need to mark our anonymous childs for retqlayout (hence go one level deeper).
+        needed, and in the affirmative, whether we need to mark our anonymous childs for relayout (hence go one level deeper).
         Part of line 1394 comes from WebCore.
-        Also: don't allow negative offset in vertical tqalignment when content overflows ; matches MSIE better.
+        Also: don't allow negative offset in vertical alignment when content overflows ; matches MSIE better.
 
 2005-10-28  Germain Garand  <germain@ebooksfrance.org>
 
-        * rendering/table_tqlayout.cpp (calcEffectiveWidth): do proportional distribution of overflowing minwidth
+        * rendering/table_layout.cpp (calcEffectiveWidth): do proportional distribution of overflowing minwidth
         when all cols are percent (#104156)
 
 2005-10-21  Germain Garand  <germain@ebooksfrance.org>
 
-        * rendering/bidi.cpp (tqfindNextLineBreak): implement needed quirk for line breaking of
-        tqreplaced elements within table cells.
+        * rendering/bidi.cpp (findNextLineBreak): implement needed quirk for line breaking of
+        replaced elements within table cells.
         * rendering/render_block.cpp (calcInlineMinMaxWidth): ditto.
         Bugs #93745, #72457
 
@@ -397,7 +397,7 @@
 
         Port soft-hyphen support from WebCore
 
-        * rendering/bidi.cpp (tqfindNextLineBreak): main skipping/breaking logic
+        * rendering/bidi.cpp (findNextLineBreak): main skipping/breaking logic
 
         * rendering/render_text.{cpp,h} (calcMinMaxWidth): account for soft hyphen
 
@@ -416,7 +416,7 @@
 
 2005-10-07  Germain Garand  <germain@ebooksfrance.org>
 
-        * rendering/bidi.cpp (tqfindNextLineBreak): integrate all positioned inlines in the lineboxes to get a correct static position
+        * rendering/bidi.cpp (findNextLineBreak): integrate all positioned inlines in the lineboxes to get a correct static position
         in initial whitespace. Use some midpoints voodoo to take care of whitespace.
 
         cf. unsorted/113527.html
@@ -442,7 +442,7 @@
         Implementation of real page-breaking algorithm respecting the CSS 2.1 specification.
 
         * khtmlview.cpp:
-        Do tqlayout for page-breaks before printing.
+        Do layout for page-breaks before printing.
         Use screen resolution as default instead of 72DPI.
         * css/html4.css: Add the print media default styles
         * rendering/render_style.*: Add RenderPageStyle as the style for the page-context. Not yet used.
@@ -454,12 +454,12 @@
         (deleteLastLineBox) new function to remove the last line (in order to redo it).
         * rendering/render_line.*:
         (removeFromLine) ditto
-        * rendering/bidi.cpp: New algorithm in tqlayoutInlineChildren for doing page-breaks at tqlayout-time,
+        * rendering/bidi.cpp: New algorithm in layoutInlineChildren for doing page-breaks at layout-time,
         and respecting orphans/widows CSS settings.
         * rendering/render_block.cpp:
         (makePageBreakAvoidBlocks) Function for collecting runs of page-break-after/before: avoid blocks, so
         they can be moved across page-breaks collectively.
-        (tqlayoutBlockChildren) New algorithm for doing page-breaks at tqlayout time,
+        (layoutBlockChildren) New algorithm for doing page-breaks at layout time,
         and respecting page-break-after/before/inside
         * rendering/render_table.cpp: Force page-breaks to happen inside cells and not between rows.
         (RenderTableSection::addSpaceAt) moves later table-rows down when one cell expands to handle a
@@ -494,7 +494,7 @@
 
 2005-08-02  Allan Sandfeld Jensen <kde@carewolf.com>
 
-        * rendering/render_block.{h,cpp}: Split tqlayoutBlockChildren into several auxilary functions.
+        * rendering/render_block.{h,cpp}: Split layoutBlockChildren into several auxilary functions.
 
 2005-07-26  Andreas Kling <kling@impul.se>
 
@@ -507,7 +507,7 @@
 2005-07-25  Andreas Kling <kling@impul.se>
 
         Make new ad filters have instant effect (either hide affected elements
-        tqreplace them with the "blocked" pixmap.)
+        replace them with the "blocked" pixmap.)
 
         * khtml_part.{cpp,h}: Added runAdFilters() function which is called from reparseConfiguration()
         * khtml_ext.cpp: Call KHTMLPart::reparseConfiguration() after adding new filters.
@@ -535,7 +535,7 @@
         vertical-align fixes
 
         * rendering/render_object.cpp (getVerticalPosition): block level
-        elements must ignore vertical tqalignment (#92118). For Length values, check the parent
+        elements must ignore vertical alignment (#92118). For Length values, check the parent
         too. Don't use the parent's position if it's top/bottom - it's waiting for
         our subtree's to complete! (cf. css/vertical-align.html)
 
@@ -721,7 +721,7 @@
         * khtmlview.cpp (dispatchKeyEvent): Don't send DOM keypress if
         the DOM keydown that precedes it was blocked by javascript, as in IE.
 
-        * rendering/render_tqreplaced.cpp (handleEvent): send Qt::KeyPress to the
+        * rendering/render_replaced.cpp (handleEvent): send Qt::KeyPress to the
         widget for DOM keypress and not DOM keydown to allow sites to block a key
         with onkeypress, #99749.
 
@@ -753,7 +753,7 @@
         * khtml_popupmenu.rc: ditto
         * khtml_settings.{cc,h}: Add adFilter settings and helper functions
         * html/htmlparser.cpp: Strip blocked IMG tags
-        * misc/loader.{cpp,h}: Return tqreplacement blocked images and refuse to load blocked scripts.
+        * misc/loader.{cpp,h}: Return replacement blocked images and refuse to load blocked scripts.
         * misc/blocked_icon.{cpp,png}: Image for above
         * xml/dom_docimpl.cpp: isURLAllowed returns false for blocked URL's
 
@@ -780,7 +780,7 @@
             - Make sure percentage min-height goes to 0 and not auto when the percentage does not apply.
         * renderer/render_table.cpp:
             - Make sure empty tables honor CSS-specified height in strict mode.
-            - Fix baseline tqalignment within table cells to use the bottom of empty blocks.
+            - Fix baseline alignment within table cells to use the bottom of empty blocks.
 
 2005-04-30  Harri Porten  <porten@kde.org>
 
@@ -810,10 +810,10 @@
 
 2005-04-06  Lubos Lunak <l.lunak@kde.org>
 
-        * khtmlview.{h,cpp}: Use KActions for type ahead tqfind.
+        * khtmlview.{h,cpp}: Use KActions for type ahead find.
         * khtml_part.{h,cpp}: ditto.
         * khtml_part.{h,cpp}: Add Find Previous action.
-        * khtml_part.cpp (tqfindTextNext): Fix changing direction while searching text.
+        * khtml_part.cpp (findTextNext): Fix changing direction while searching text.
 
 2005-04-05  Lubos Lunak <l.lunak@kde.org>
 
@@ -821,7 +821,7 @@
 
 2005-04-04  Lubos Lunak <l.lunak@kde.org>
 
-        * khtmlview.cpp: Don't use keyboard grab for type-ahead tqfind.
+        * khtmlview.cpp: Don't use keyboard grab for type-ahead find.
 
 2005-04-03  Allan Sandfeld Jensen <kde@carewolf.com>
 
@@ -839,15 +839,15 @@
         * ecma/kjs_dom.cpp (putValueProperty): scrollLeft/scrollTop need an
         up-to-date rendering.
 
-        * rendering/render_box.cpp (tqrepaintRectangle): apply scroll offset
-        to the tqrepaint rectangle (overflow != visible objects).
+        * rendering/render_box.cpp (repaintRectangle): apply scroll offset
+        to the repaint rectangle (overflow != visible objects).
 
-        * rendering/render_layer.{h,cpp} (tqrepaint): rename markForRepaint to
-        less equivocal tqrepaint.
+        * rendering/render_layer.{h,cpp} (repaint): rename markForRepaint to
+        less equivocal repaint.
         (updateLayerPositions): small fixes.
         (scrollToOffset): update our child layers (#102235)
 
-        * rendering/render_object.cpp (setStyle/tqrepaintDuringLayout): rename ditto.
+        * rendering/render_object.cpp (setStyle/repaintDuringLayout): rename ditto.
 
 2005-03-29  Germain Garand  <germain@ebooksfrance.org>
 
@@ -906,7 +906,7 @@
 
 2005-03-17  Leo Savernik  <l.savernik@aon.at>
 
-	* rendering/render_flow.cpp (tqrepaint): Calculate height, do not simply
+	* rendering/render_flow.cpp (repaint): Calculate height, do not simply
 	use the bottom overflow of the root line box.
 
 2005-03-16  George Staikos  <staikos@kde.org>
@@ -941,7 +941,7 @@
 
 2005-03-04  Germain Garand  <germain@ebooksfrance.org>
 
-        * rendering/render_block.cpp (tqlayoutBlockChildren): percent width
+        * rendering/render_block.cpp (layoutBlockChildren): percent width
         children behaves like fixed width children with regard to float
         clearing. In both cases we need to check if current line as enough width to
         hold the (flowing-around-float) child. If not, we need to clear.
@@ -980,7 +980,7 @@
 2005-02-28  David Faure  <faure@kde.org>
 
         * html/html_formimpl.cpp (setName): Also set ATTR_NAME so that
-        form.foo tqfinds the input element. Testcase forms/input_setName.html.
+        form.foo finds the input element. Testcase forms/input_setName.html.
 
 2005-02-27  Leo Savernik  <l.savernik@aon.at>
 
@@ -1002,14 +1002,14 @@
         needs to use QWidget::focusNextPrevChild.
         (defaultEventHandler): only handle key tab if it wasn't accepted by the widget (#58247)
 
-        * rendering/render_tqreplaced.cpp (RenderWidget::handleEvent): return
+        * rendering/render_replaced.cpp (RenderWidget::handleEvent): return
         something meaningful.
 
 2005-02-18  Germain Garand  <germain@ebooksfrance.org>
 
-        scope: table percentage height, tqreplaced element height calculation.
+        scope: table percentage height, replaced element height calculation.
 
-        * rendering/render_body.cpp (tqlayout): pre-calculate our margins in
+        * rendering/render_body.cpp (layout): pre-calculate our margins in
         quirk mode, to be able to compute calcPercentageHeight in a const way.
 
         * rendering/render_box.{h,cpp}
@@ -1020,7 +1020,7 @@
         Looking for available height is an IE quirk and is thusly only done in quirk mode now.
         When it is not computable, it behaves like 'auto', so use the intrinsicHeight (cf.10.6.2).
 
-        * rendering/render_table.cpp (tqlayoutRows): fix vertical tqalignment within
+        * rendering/render_table.cpp (layoutRows): fix vertical alignment within
         percentage driven cells. Subtract the cell's PB from cellPercentageHeight.
 
 2005-02-18  Leo Savernik  <l.savernik@aon.at>
@@ -1066,14 +1066,14 @@
         * rendering/counter_tree.{h,cpp}: Adds a dynamic counter-tree to keep counter values up-to-date
         * rendering/render_generated.{h,cpp}: New renderCounter class to renders counters as text
         * rendering/render_container.cpp: Content now only inherits style from the pseudo-container rather than use an exact duplicate.
-        * rendering/render_object.cpp: Add new functions to tqfind and attach counter-tree nodes.
+        * rendering/render_object.cpp: Add new functions to find and attach counter-tree nodes.
         * rendering/render_style.cpp: New counter content and counter acts
         * rendering/render_list.cpp: Use the new counters to count lists
 
 2005-02-14  Leo Savernik  <l.savernik@aon.at>
 
-	* rendering/render_flow.cpp (tqrepaint): Only include top and bottom
-	overflow while not retqlayouting, otherwise root inline box may not be
+	* rendering/render_flow.cpp (repaint): Only include top and bottom
+	overflow while not relayouting, otherwise root inline box may not be
 	available yet.
 
 2005-02-14  David Faure  <faure@kde.org>
@@ -1087,15 +1087,15 @@
 	* rendering/render_block.{cpp,h} (paintObject): Added parameter to only
 	paint the block's outline on demand.
 
-	* rendering/render_flow.cpp (tqrepaint): Fix tqrepaint rectangle to also
+	* rendering/render_flow.cpp (repaint): Fix repaint rectangle to also
 	encompass the top and bottom overflow of the root inline box.
 
 	* rendering/render_line.{cpp,h} (InlineBox::root): Ported over from
 	WebCore. Returns the root inline box of this box.
 
-	* rendering/render_table.{cpp,h} (RenderTableCell::tqrepaintRectangle):
+	* rendering/render_table.{cpp,h} (RenderTableCell::repaintRectangle):
 	Use full height of table cell, otherwise outline won't be fully
-	tqrepainted.
+	repainted.
 	(RenderTableCell::paint): Paint outline of table cells explicitly,
 	and keep the underlying render block from painting it itself.
 	(RenderTableCell::paintObject): Removed. Nowhere used anymore.
@@ -1144,7 +1144,7 @@
 	the according RenderTableRows, and call their paintRow routine.
 	Fixed overflow size of damage rectangle.
 	(RenderTableRow::paintRow): Added. Can't use paint() because
-	RenderTableRow is not a RenderBox, and hence doesn't store tqlayout
+	RenderTableRow is not a RenderBox, and hence doesn't store layout
 	information.
 	(RenderTableCell::paint): Added painting of the table cell's outline
 	herein instead in RenderBlock to encompass the extra table cell top
@@ -1157,7 +1157,7 @@
         Blockquote and DL don't by any stretch of the mind, so clear this property for those.
         Also, don't center fieldset.
 
-        * rendering/render_block.cpp (tqlayoutBlock): make flowAroundFloats encompass their own floats
+        * rendering/render_block.cpp (layoutBlock): make flowAroundFloats encompass their own floats
         (#85984).
 
 2005-02-02  Leo Savernik  <l.savernik@aon.at>
@@ -1200,7 +1200,7 @@
 
 2005-01-25  Germain Garand  <germain@ebooksfrance.org>
 
-        * khtmlview.cpp (viewportWheelEvent): discard wheel events occuring before the first retqlayout (avoids blanking the view).
+        * khtmlview.cpp (viewportWheelEvent): discard wheel events occuring before the first relayout (avoids blanking the view).
          Also support Horizontal wheel events (needs qt-copy/patch #61).
 
 2005-01-25  Germain Garand  <germain@ebooksfrance.org>
@@ -1219,7 +1219,7 @@
 
 2005-01-12  Allan Sandfeld Jensen <kde@carewolf.com>
 
-        * css/cssstyleselector.cpp: Match :tqcontains() against innerText on HTMLElements
+        * css/cssstyleselector.cpp: Match :contains() against innerText on HTMLElements
 
 2005-01-11  Leo Savernik  <l.savernik@aon.at>
 
@@ -1304,39 +1304,39 @@
 
 2004-12-12  Germain Garand  <germain@ebooksfrance.org>
 
-        Pragmatic incremental tqrepaints: be accurate on layered objects, conservative on
-        objects in normal flow. Fix performance issues on repeated retqlayouts (#53114)
+        Pragmatic incremental repaints: be accurate on layered objects, conservative on
+        objects in normal flow. Fix performance issues on repeated relayouts (#53114)
 
         * khtmlview.{cpp,h}: add needsFullRepaint flag, mostly similar to WebCore's.
-        (tqlayout): don't tqrepaint the canvas systematically anymore.
+        (layout): don't repaint the canvas systematically anymore.
 
-        * rendering/bidi.cpp (tqlayoutInlineChildren): schedule a tqrepaint on
+        * rendering/bidi.cpp (layoutInlineChildren): schedule a repaint on
         old rectangle and future rectangle, if marked dirty.
 
-        * rendering/render_block.cpp (tqlayoutBlock/tqlayoutBlockChildren/tqlayoutPositionedObjects): ditto.
+        * rendering/render_block.cpp (layoutBlock/layoutBlockChildren/layoutPositionedObjects): ditto.
 
-        * rendering/render_table.cpp (tqlayout): ditto.
+        * rendering/render_table.cpp (layout): ditto.
 
         * rendering/render_box.cpp (calcAbsoluteHorizontal): no more updateLayerPosition() here.
         Layers positioning now happen in a separate pass.
 
         * rendering/render_canvas.{cpp,h}
-        (needsFullRepaint): new - used to determine if we need to do incremental tqrepaint at all. Don't waste time if the whole canvas is dirty.
-        (tqrepaintViewRectangle): new - schedule a tqrepaint in absolute coordinates.
-        (deferredRepaint): new - append argument to a list of objects needing a post-tqlayout tqrepaint.
-        (scheduleDeferredRepaints): new - tqrepaint all objects in list described above, at the end of tqlayout.
+        (needsFullRepaint): new - used to determine if we need to do incremental repaint at all. Don't waste time if the whole canvas is dirty.
+        (repaintViewRectangle): new - schedule a repaint in absolute coordinates.
+        (deferredRepaint): new - append argument to a list of objects needing a post-layout repaint.
+        (scheduleDeferredRepaints): new - repaint all objects in list described above, at the end of layout.
 
-        * rendering/render_layer.{cpp,h} (markForRepaint): new - schedule a tqrepaint of a layer, calculating its visible rectangle,
-        and optionnally marking it as needing a post-tqlayout tqrepaint.
+        * rendering/render_layer.{cpp,h} (markForRepaint): new - schedule a repaint of a layer, calculating its visible rectangle,
+        and optionnally marking it as needing a post-layout repaint.
         (updateLayerPositions): merged++ from WebCore. Position layers. Repaint layers marked by the above.
         (calculateClipRects/calculateRects): no more updateLayerPosition call there.
 
         * rendering/render_object.cpp
-        (setNeedsLayout): when marking for tqlayout, also mark the formatting context for tqrepaint (m_markedForRepaint boolean)
+        (setNeedsLayout): when marking for layout, also mark the formatting context for repaint (m_markedForRepaint boolean)
         (setChildNeedsLayout): merge WebCore guard against multiple dirtying.
         (setStyle): based on the Style diff, decide whether to dirty only the current formatting context, or also the parent's.
         (dirtyFormattingContext): new.
-        (tqrepaintDuringLayout): new - schedule a pre/post-tqlayout tqrepaint on the object, if it makes sense.
+        (repaintDuringLayout): new - schedule a pre/post-layout repaint on the object, if it makes sense.
 
 2004-12-12  Germain Garand  <germain@ebooksfrance.org>
 
@@ -1411,9 +1411,9 @@
 
 2004-11-27  Germain Garand  <germain@ebooksfrance.org>
 
-        merge WebCore differences in logic for Auto table tqlayout
+        merge WebCore differences in logic for Auto table layout
 
-        * rendering/table_tqlayout.cpp (calcEffectiveWidth/tqlayout):
+        * rendering/table_layout.cpp (calcEffectiveWidth/layout):
         distribute remaining width starting with fixed rather than percent (#88104).
 
 2004-11-26  Germain Garand  <germain@ebooksfrance.org>
@@ -1432,17 +1432,17 @@
         The later because the not-function is unique in its parsing.
         * css/tokenizer.cpp: Manually merge output from flex :(
         * css/parser.y: Update parsing of pseudo-functions.
-        Also enables correct parsing of :lang and :tqcontains.
+        Also enables correct parsing of :lang and :contains.
         * css/css_base.{h,cpp}: Add new pseudoselectors
         * css/cssstyleselector.cpp: Implement new selectors
 
 2004-11-22  Germain Garand  <germain@ebooksfrance.org>
 
-        * rendering/bidi.cpp (tqlayoutInlineChildren): for elements with some kind of
+        * rendering/bidi.cpp (layoutInlineChildren): for elements with some kind of
         scrolling overflow and a variable height, include the scrollbar height in
-        calculations to avoid tqmasking content (#89136).
+        calculations to avoid masking content (#89136).
 
-        * rendering/render_block.cpp (tqlayoutBlock/tqlayoutBlockChildren): ditto.
+        * rendering/render_block.cpp (layoutBlock/layoutBlockChildren): ditto.
 
         * rendering/render_box.cpp (contentWidth/contentHeight): subtract scrollbars
         height/width when applicable.
@@ -1457,7 +1457,7 @@
         * css/html4.css: Make -khtml-native default border-style for form-widgets
         * render/render_style.h: Add BNATIVE
         * render/render_object.cpp: Treat BNATIVE like BNONE
-        * render/render_tqreplaced.cpp: Remove native, and paint CSS border when allowed
+        * render/render_replaced.cpp: Remove native, and paint CSS border when allowed
 
 2004-11-21  Germain Garand  <germain@ebooksfrance.org>
 
@@ -1465,8 +1465,8 @@
 
         * css/html4.css: make fieldset -khtml-around-floats (#92979)
 
-        * rendering/render_block.cpp (tqlayoutBlockChildren): cleanup float/flowAroundFloats
-        logic. Merges: add better RTL tqlayouting of fAFs.
+        * rendering/render_block.cpp (layoutBlockChildren): cleanup float/flowAroundFloats
+        logic. Merges: add better RTL layouting of fAFs.
         (lineWidth): guard against negative values
         (clearFloats): don't copy floats if element defines a new block
         formatting context (#93511)
@@ -1480,7 +1480,7 @@
         * rendering/render_box.cpp (calcWidth): use containingBlockWidth
 
         * rendering/render_object.cpp (isHR): new. Evil but useful for quirkmode (cf. usesLineWidth).
-        (flowAroundFloats): add tqreplaced and overflowClip elements
+        (flowAroundFloats): add replaced and overflowClip elements
         (usesLineWidth): adapt to above.
 
         * rendering/render_table.cpp (calcWidth): style()->flowAroundFloats => flowAroundFloats()
@@ -1500,15 +1500,15 @@
 
 2004-11-16  Germain Garand  <germain@ebooksfrance.org>
 
-        * rendering/render_tqreplaced.{cpp,h} (cancelPendingResize): allow
+        * rendering/render_replaced.{cpp,h} (cancelPendingResize): allow
         canceling of scheduled widget resizes, to avoid flicker when we
-        had to perform temporary tqlayouts.
+        had to perform temporary layouts.
 
-        * rendering/render_table.cpp (calcRowHeight): displace resetting tqlayout of cells with
+        * rendering/render_table.cpp (calcRowHeight): displace resetting layout of cells with
         percent children here and mark those dirty, or we might get zero-height widgets on resize
         (cf. map24.com)
-        (tqlayout): ditto.
-        (tqlayoutRows): cancel widget resizes from temporary tqlayouts.
+        (layout): ditto.
+        (layoutRows): cancel widget resizes from temporary layouts.
 
 2004-11-16  Stephan Kulow  <coolo@kde.org>
 
@@ -1556,7 +1556,7 @@
 2004-11-05  Germain Garand  <germain@ebooksfrance.org>
 
         * khtml_part.cpp (closeURL/slotData/restoreState): avoid triggering
-        full tqrepaints of the view before the first tqlayout is done.
+        full repaints of the view before the first layout is done.
 
 2004-11-05  Germain Garand  <germain@ebooksfrance.com>
 
@@ -1571,12 +1571,12 @@
 
 2004-11-03  Germain Garand  <germain@ebooksfrance.com>
 
-        * khtmlview.cpp (slotScrollBarMoved): make sure we are tqlayouted before
+        * khtmlview.cpp (slotScrollBarMoved): make sure we are layouted before
         scrolling if we are still loading (#51473)
 
 2004-11-02  Stephan Kulow  <coolo@kde.org>
 
-        * rendering/render_tqreplaced.cpp (setStyle): set hidden widgets to invisible
+        * rendering/render_replaced.cpp (setStyle): set hidden widgets to invisible
 
         * xml/dom_docimpl.cpp (recalcStyleSelector): avoid invalid casts on XML documents
 
@@ -1588,7 +1588,7 @@
 
 2004-11-01  Sandro Giessl <sandro@giessl.com>
 
-        * rendering/render_tqreplaced.cpp (copyWidget): don't fill the
+        * rendering/render_replaced.cpp (copyWidget): don't fill the
 	background of QFrames. they paint their own background now
 
 2004-10-30  Stephan Kulow  <coolo@kde.org>
@@ -1684,13 +1684,13 @@
         * css/cssstyleselector.cpp (adjustRenderStyle): remember our original display
         * rendering/bidi.cpp (appendRun): include positioned objects with static X/Y,
         now that we use those.
-        (tqfindNextLineBreak): adjust static position
+        (findNextLineBreak): adjust static position
 
-        * rendering/render_block.cpp (tqlayoutBlockChildren): ditto.
+        * rendering/render_block.cpp (layoutBlockChildren): ditto.
 
         * rendering/render_box.cpp (containingBlockWidth): use usesLineWidth
         (position): activate static position logic
-        (calcAbsoluteHorizontal): tqreplace static position calculation
+        (calcAbsoluteHorizontal): replace static position calculation
         (calcAbsoluteVertical): ditto.
 
         * rendering/render_object.cpp (removeChild): fix typo
@@ -1704,7 +1704,7 @@
 
 2004-10-18  Allan Sandfeld Jensen <kde@carewolf.com>
 
-        * rendering/render_table.cpp: Merge tqlayout fixes from Webcore
+        * rendering/render_table.cpp: Merge layout fixes from Webcore
 
 2004-10-17  Stephan Kulow  <coolo@kde.org>
 
@@ -1731,14 +1731,14 @@
         * html/html_formimpl.cpp (defaultEventHandler): propagate events to
         QScrollView
 
-        * khtmlview.{cpp,h}: QScrollview needs fast tqrepaints. Fix
+        * khtmlview.{cpp,h}: QScrollview needs fast repaints. Fix
         background color of QFrames.
 
         * rendering/render_form.cpp (createListBox/TextAreaWidget):
         make those widgets z-ordered as well.
 
-        * rendering/render_tqreplaced.cpp (paintWidget): optimize painting by
-        avoiding unnecessary background tqrepaints and by using a shared
+        * rendering/render_replaced.cpp (paintWidget): optimize painting by
+        avoiding unnecessary background repaints and by using a shared
         paint buffer.
 
 2004-10-15  Germain Garand  <germain@ebooksfrance.org>
@@ -1748,7 +1748,7 @@
         * rendering/bidi.cpp: remove checks for display: compact,
         not needed anymore.
 
-        * rendering/render_block.cpp (tqlayoutBlockChildren):
+        * rendering/render_block.cpp (layoutBlockChildren):
         simpler implementation for compact display: do not insert the
         compact child within the next block anymore.
         Solves lot of problems with host blocks having non-inline children.
@@ -1767,7 +1767,7 @@
         ("htmlCompat") lookup of tags and attributes (but not in CSS parser). (#86446)
 
 2004-10-14  Allan Sandfeld Jensen <kde@carewolf.com>
-        * rendering/*.*: WebCore merge/port of tqlayouted->needsLayout
+        * rendering/*.*: WebCore merge/port of layouted->needsLayout
 
 2004-10-11  David Faure  <faure@kde.org>
 
@@ -1793,7 +1793,7 @@
         setStyle/close. Better drilling logic. Use RenderTextFragment to
         correctly handle text-transform on first-letter(#76078).
         (addChildToFlow): ditto. fix display: block on pseudo-elements (#90917)
-        (tqlayoutBlockChildren): only clear if floats actually changed our
+        (layoutBlockChildren): only clear if floats actually changed our
         height.
         * rendering/render_object.h (node): accessor to m_node
         * rendering/render_text.{cpp,h}: merge RenderTextFragment class
@@ -1867,7 +1867,7 @@
         (HTMLTextAreaElementImpl::setValue): Mark element as initialized after
         setting.
         * render_form.cpp (RenderTextArea::setStyle):
-        Block signals on call to QTextEdit::tqsetAlignment. Otherwise, a bogus
+        Block signals on call to QTextEdit::setAlignment. Otherwise, a bogus
         textChanged signal is emitted.
 
 2004-08-27  Germain Garand  <germain@ebooksfrance.org>
@@ -1881,7 +1881,7 @@
         (gotoAnchor): "top" and "" anchors mean top of document.
 
         (checkCompleted): entrust the view to emit completed on our behalf
-        after any pending tqlayout/tqrepaint is done.
+        after any pending layout/repaint is done.
 
         * khtmlview.{cpp,h}: ditto
 
@@ -1915,19 +1915,19 @@
 
 2004-08-18  Leo Savernik  <l.savernik@aon.at>
 
-	* rendering/render_block.cpp (tqlayoutBlock, tqlayoutBlockChildren,
-	tqlayoutPositionedObject): Ensure that m_overflowWidth/m_overflowHeight
+	* rendering/render_block.cpp (layoutBlock, layoutBlockChildren,
+	layoutPositionedObject): Ensure that m_overflowWidth/m_overflowHeight
 	get updated properly to include relatively positioned
 	elements, but to exclude the overflow-area of clipped children.
 
-	* rendering/render_box.cpp (tqrepaint): Removed superfluous null ptr check.
+	* rendering/render_box.cpp (repaint): Removed superfluous null ptr check.
 	Use effectiveWidth/Height instead of overflowWidth/Height.
 
 	* rendering/render_canvas.cpp (docHeight): Fixed superfluous vertical
 	scrollbars on clipped children.
 	(docWidth): Fixed superfluous horizontal scrollbars on clipped children.
 
-	* rendering/render_flow.cpp (tqrepaint):
+	* rendering/render_flow.cpp (repaint):
 	Use effectiveWidth/Height instead of overflowWidth/Height.
 
 	* rendering/render_object.h: Added effectiveWidth/Height.
@@ -1935,7 +1935,7 @@
 
 2004-08-05  Germain Garand  <germain@ebooksfrance.org>
 
-        * rendering/render_block.cpp (tqlayoutBlockChildren): when positionning floats,
+        * rendering/render_block.cpp (layoutBlockChildren): when positionning floats,
         use the margin tracking variables, and not the prevFlow -there might be
         self-collapsing blocks in between (#85150).
         (calcMinMaxWidth): better calculation merged from WebCore.  Fixes a few testcases.
@@ -1944,7 +1944,7 @@
         they are virtuals reimplemented for RenderBlock.
 
         * rendering/render_object.cpp (createObject): do not set the style before
-        the renderer is assigned to a node. Fixes Marquee initial tqlayout
+        the renderer is assigned to a node. Fixes Marquee initial layout
         (unsorted/RESOLVED-57087-1342.html) failing because of 'element()->renderer() == this' checks.
 
         * xml/dom_elementimpl.cpp (attach): ditto
@@ -1952,10 +1952,10 @@
 2004-08-04  Germain Garand <germain@ebooksfrance.org>
 
 	* khtmlview.cpp (resizeEvent): take care, in case we are shrinking,
-        not to pass past the content limits yet. Next tqlayout will calculate
+        not to pass past the content limits yet. Next layout will calculate
         if we positively need scrollbars or not (#84798).
 
-        * rendering/render_canvas.cpp (tqlayout): remove scrollbar flickering turnarounds.
+        * rendering/render_canvas.cpp (layout): remove scrollbar flickering turnarounds.
         instead, account for a scrollbar hysteresis level when sizing the content (#61730).
 
 2004-07-30  Jean-Baptiste Mardelle <bj@altern.org>
@@ -2025,8 +2025,8 @@
 
         * rendering/render_object.cpp:
         (getVerticalPosition): fix inverted logic. cf.unsorted/74399.html
-        (lineHeight/baselinePosition): inline-blocks behaves like tqreplaced elements
-        only after they are tqlayouted.
+        (lineHeight/baselinePosition): inline-blocks behaves like replaced elements
+        only after they are layouted.
 
         * rendering/render_table.h (position): remove empty reimplementation:
         inline-tables need positioning. cf.webcore/fast/inline-block/001.html
@@ -2053,8 +2053,8 @@
         * rendering/render_block.cpp:
         (setStyle): do not overwrite inline status
         (makeChildrenNonInline): change assert
-        (tqlayoutBlock): account for inline-blocks
-        (tqlayoutBlockChildren): ditto
+        (layoutBlock): account for inline-blocks
+        (layoutBlockChildren): ditto
         (clearFloats): ditto. bail out.
 
         * rendering/render_box.cpp:
@@ -2062,8 +2062,8 @@
         (calcHeight): fix logic
 
         * rendering/render_form.cpp:
-        (tqlayoutLegend): merges from WebCore-125
-        (tqfindLegend): ditto
+        (layoutLegend): merges from WebCore-125
+        (findLegend): ditto
         (paintBoxDecorations): ditto
         (setStyle): cf.webcore/fast/forms/007.html
 
@@ -2073,7 +2073,7 @@
 
         * rendering/bidi.cpp (Bidinext): simplified logic. Do not return each
         InlineFlow twice.
-        (tqlayoutInlineChildren): clear InlineBoxes on retqlayout.
+        (layoutInlineChildren): clear InlineBoxes on relayout.
 
         * rendering/render_object.{cpp,h}:
         (deleteInlineBoxes): new virtual method.
@@ -2084,7 +2084,7 @@
         * rendering/render_flow.{cpp,h}:
         (createInlineBox/deleteInlineBoxes): ditto.
 
-        * rendering/render_tqreplaced.cpp (detach): call deleteLineBoxes
+        * rendering/render_replaced.cpp (detach): call deleteLineBoxes
 
         * rendering/render_text.{cpp,h} (deleteInlineBoxes): reimplemented, replacing
         deleteTextBoxes
@@ -2116,7 +2116,7 @@
 	* htmlattrs.{c,h}: Regenerated.
 	* htmlattrs.in: Added behavior, direction, loop, scrollamount, scrolldelay,
 	truespeed attribute keywords.
-	* rendering/bidi.cpp: (RenderBlock::tqfindNextLineBreak): marquee-related extensions.
+	* rendering/bidi.cpp: (RenderBlock::findNextLineBreak): marquee-related extensions.
 	* rendering/render_block.{cpp,h}: Updated lowestPosition, rightmostPosition, added
 	leftmostPosition.
 	* rendering/render_box.{cpp,h}: Updated lowestPosition, rightmostPosition, added
@@ -2198,7 +2198,7 @@
 
         * html/htmltokenizer.cpp (parseEntity): Fix to make 8-character
         hexadecimal entities work in khtml from Darin Adler. Testcase at
-        http://www.alanwood.net/tqunicode/deseret.html
+        http://www.alanwood.net/unicode/deseret.html
 
 2004-06-06  Zack Rusin  <zack@kde.org>
 
@@ -2362,7 +2362,7 @@
 
 	* rendering/render_text.h: Merged inlineTextBoxes function, needed by
 	firstRunAt, lastRunAt.
-	(tqfindInlineTextBox): Make it public.
+	(findInlineTextBox): Make it public.
 
 2004-04-15  Leo Savernik  <l.savernik@aon.at>
 
@@ -2385,7 +2385,7 @@
 	flags to denote outside positions.
 	Add RenderObject::isRenderReplaced.
 
-	* rendering/render_tqreplaced.h: Add RenderReplaced::isRenderReplaced
+	* rendering/render_replaced.h: Add RenderReplaced::isRenderReplaced
 	returning true.
 
 	* rendering/render_text.{cpp,h}: (RenderText::caretPos) Handle flags.
@@ -2416,14 +2416,14 @@
 	* khtml_part.cpp/.h: if text in a link is highlighted, the link now receives
 	focus.
 
-	* khtmlview.cpp: made type-ahead tqfind more aggressive by grabbing the keyboard
+	* khtmlview.cpp: made type-ahead find more aggressive by grabbing the keyboard
 	when active, this way it temporarily overrules single-letter shortcuts as seen
 	in KMail. Note it immediately releases the keyboard when it looses focus.
 
 2004-03-20  Arend van Beelen jr. <arend@auton.nl>
 	* khtml_part.cpp/.h: finished new searching API.
 
-	* khtmlview.cpp/.h: implemented type-ahead tqfind (#51259).
+	* khtmlview.cpp/.h: implemented type-ahead find (#51259).
 
 2004-03-21  Dirk Mueller  <mueller@kde.org>
 
@@ -2459,10 +2459,10 @@
 	* html/html_documentimpl.cpp (determineParseMode): treat xhtml transitional
 	that way (#76449).
 
-	* rendering/bidi.cpp (tqfindNextLineBreak): make sure we move
-	tqreplaced elements, that don't fit on a line below the floats (#74609).
+	* rendering/bidi.cpp (findNextLineBreak): make sure we move
+	replaced elements, that don't fit on a line below the floats (#74609).
 
-	* rendering/render_tqreplaced.cpp (calcMinMaxWidth): respect
+	* rendering/render_replaced.cpp (calcMinMaxWidth): respect
 	padding and borders (#65788).
 
 	* rendering/render_form.h (RenderFormElement): make sure we never
@@ -2477,8 +2477,8 @@
 
 2004-02-28  Germain Garand  <germain@ebooksfrance.org>
 
-        * rendering/render_block.cpp (tqlayoutBlockChildren):
-        - displace the check for if we need to retqlayout our childs
+        * rendering/render_block.cpp (layoutBlockChildren):
+        - displace the check for if we need to relayout our childs
         because of a float. It was outside of loop (#71445)
         - remove check for floatBottom() > m_y has it seems outdated.
 
@@ -2497,7 +2497,7 @@
 	* misc/htmlattrs.h: don't export getAttrName symbol.
 
 	* rendering/render_object.h (class RenderObject): move background
-	tqrepaint handling over here, since TableSections don't inherit RenderBox,
+	repaint handling over here, since TableSections don't inherit RenderBox,
 	but still have a background.
 
 	* khtml_settings.cc (init)/html4.css: MediumFontSize up to 12. Form elements
@@ -2512,7 +2512,7 @@
 	to KEYUP/DOWN_EVENT. Add events needed for XMLHttpRequest.
 
 	* rendering/render_object.h (class RenderObject): introduce a PaintInfo
-	struct that tqcontains the information necessary for all those paint..() methods.
+	struct that contains the information necessary for all those paint..() methods.
 	Requires much less parameters to pass and is therefore faster. While being
 	at it, eliminate the unnecessary virtual method paintObject.
 
@@ -2620,7 +2620,7 @@
         (Bidinext): merge skipInline bool to avoid leak.
         (RenderBlock::bidiReorderLine): handle whitespace count through
         category separator_Space
-        (RenderBlock::tqfindNextLineBreak): account for empty InlineFlow
+        (RenderBlock::findNextLineBreak): account for empty InlineFlow
 
         * rendering/font.cpp (drawText, width): whitespace handling
 
@@ -2635,7 +2635,7 @@
         * rendering/render_object.cpp (offsetLeft/offsetTop): adjust
         (hasStaticX/hasStaticY): merged non-virtual methods
 
-        * rendering/render_tqreplaced.cpp (position): do not add margin anymore
+        * rendering/render_replaced.cpp (position): do not add margin anymore
 
         * rendering/render_text.cpp: whitespace handling. No more p/b/m.
 
@@ -2718,11 +2718,11 @@
 	state machine goes out of sync.
 
 	* rendering/render_image.cpp: avoid shoot-out effect when neither oimage nor
-	image are fully loaded. do a tqrepaint when the new image finished loading, so
+	image are fully loaded. do a repaint when the new image finished loading, so
 	that it actually updates. avoid reloading images on news.google.com on hover.
 
-	* khtmlview.cpp (scheduleRepaint): make scheduling not starvating tqrepaints.
-	Fix tqrepainting logic to optimize for reduced X server load and minimum CPU
+	* khtmlview.cpp (scheduleRepaint): make scheduling not starvating repaints.
+	Fix repainting logic to optimize for reduced X server load and minimum CPU
 	usage in traversing the render tree (#72575).
 
 2004-01-25  Dirk Mueller  <mueller@kde.org>
@@ -2738,7 +2738,7 @@
 	* html/html_objectimpl.cpp (renderAlternative): give the alternative rendering
 	some time to avoid ugly deletion races.
 
-	* rendering/render_canvas.cpp (tqlayout): don't recurse when printing (#72775).
+	* rendering/render_canvas.cpp (layout): don't recurse when printing (#72775).
 
 	* rendering/render_image.cpp (setPixmap): handle cases when
 	we're not inserted in the tree yet, but the image is already loaded
@@ -2783,7 +2783,7 @@
 	done by setNamedItem
 
 	* xml/dom_elementimpl.cpp (setNamedItem): if attribute exists already,
-	return it, to fix DOMTS-Core-level1 test hc_elementtqreplaceattributewithself
+	return it, to fix DOMTS-Core-level1 test hc_elementreplaceattributewithself
 
 2004-01-21  Leo Savernik <l.savernik@aon.at>
 
@@ -2797,7 +2797,7 @@
 
 2004-01-21  Germain Garand  <germain@ebooksfrance.org>
 
-        * rendering/render_block.cpp (tqlayoutBlockChildren): use maxTopMargin
+        * rendering/render_block.cpp (layoutBlockChildren): use maxTopMargin
         again, for correct margin-top determination (#67527)
 
 2004-01-20  Dirk Mueller  <mueller@kde.org>
@@ -2855,7 +2855,7 @@
 2004-01-15  Lars Knoll <knoll@kde.org>
 
 	* rendering/render_table.cpp: set overflowWidth to width
-	when tqlayouting (#72420)
+	when layouting (#72420)
 	* xml/dom2_eventsimpl.cpp rendering/render_block.cpp
 	nodeAtPoint() should always use contents coordinates.
 
@@ -2870,8 +2870,8 @@
 
 2004-01-13  Germain Garand  <germain@ebooksfrance.org>
 
-        * rendering/render_canvas.cpp (tqlayout):
-        force scrollbar visibility status while tqlayouting
+        * rendering/render_canvas.cpp (layout):
+        force scrollbar visibility status while layouting
         to avoid endless cycles (#69613)
 
 2004-01-13  Dirk Mueller  <mueller@kde.org>
@@ -2931,7 +2931,7 @@
 	down the machine with large images
 	(try http://www.parisc-linux.org/~willy/kde/graph.jpg)
 
-	* rendering/render_image.cpp (tqlayout): ugh, major stupidity. don't rescale large
+	* rendering/render_image.cpp (layout): ugh, major stupidity. don't rescale large
 	images if nobody explicitely asked for it. makes loading of very large images
 	quite a bit faster.
 
@@ -2943,7 +2943,7 @@
 
 2004-01-09  Dirk Mueller  <mueller@kde.org>
 
-	* rendering/render_tqreplaced.cpp (eventFilter): readd the wheel event handling
+	* rendering/render_replaced.cpp (eventFilter): readd the wheel event handling
 	which allows scrolling of the page again. Thanks a lot for just removing it. (#45180)
 
 
@@ -2979,7 +2979,7 @@
 
 2003-12-10  Germain Garand  <germain@ebooksfrance.org>
 
-        * rendering/render_tqreplaced.cpp (updateFromElement): don't use setEraseColor for __khtml
+        * rendering/render_replaced.cpp (updateFromElement): don't use setEraseColor for __khtml
         widgets as it changes the background mode and induces flicker (#69130)
         (copyWidget): retrieve background color from the widget's palette.
 
@@ -3005,7 +3005,7 @@
 	that dispatchKeyEvent returns defaultHandled || defaultPrevented.
 	* dom/dom_node.cpp (dispatchEvent): Return !defaultPrevented as mandated by
 	the DOM, now that NodeImpl doesn't do it anymore.
-	* rendering/render_tqreplaced.cpp (eventFilter): Adapted to new logic
+	* rendering/render_replaced.cpp (eventFilter): Adapted to new logic
 	* khtmlview.cpp (dispatchKeyEventHelper): Adapted to new logic
 
 2003-12-05  Stephan Kulow  <coolo@kde.org>
@@ -3014,7 +3014,7 @@
 
 2003-12-05  Lubos Lunak  <l.lunak@kde.org>
 
-	* khtmlview.cpp, xml/dom2_eventsimpl.*, xml/dom_nodeimpl.*, rendering/render_tqreplaced.cpp :
+	* khtmlview.cpp, xml/dom2_eventsimpl.*, xml/dom_nodeimpl.*, rendering/render_replaced.cpp :
             fix mapping between Qt and DOM key events
 
 2003-12-05  Germain Garand  <germain@ebooksfrance.org>
@@ -3032,7 +3032,7 @@
 
 2003-12-03  Stephan Kulow  <coolo@kde.org>
 
-	* css/html4.css: define default text-tqalignments for input fields to avoid
+	* css/html4.css: define default text-alignments for input fields to avoid
 	problems with inherited attributes
 
 2003-12-02  Stephan Kulow  <coolo@kde.org>
@@ -3055,7 +3055,7 @@
 	(#65610)
 
 	* html/html_formimpl.cpp (HTMLInputElementImpl): don't make input elements
-	floating, but only care for the text tqalignment
+	floating, but only care for the text alignment
 
 2003-11-28  Harri Porten  <porten@kde.org>
 
@@ -3127,7 +3127,7 @@
 	* html/htmlparser.cpp (popInlineBlocks): Fixed infinite loop due to
 	popOneBlock returning immediately if blockStack==0. #68034.
 
-	* rendering/bidi.cpp: Fixed infinite loop with <nobr> due to tqfindNextLineBreak
+	* rendering/bidi.cpp: Fixed infinite loop with <nobr> due to findNextLineBreak
 	going back (wrong variable used). #66867, #68598, #59230 and their duplicates.
 
 2003-11-24  Stephan Kulow  <coolo@kde.org>
@@ -3210,7 +3210,7 @@
 	* rendering/render_*.cpp: changing the output of dump to
 	get a more comprehensive renderer tree output - as inspired
 	by Safari's kwqDebugTree. This allows for a change in
-	test_regression to check tqlayouts
+	test_regression to check layouts
 
 2003-11-15  Zack Rusin  <zack@kde.org>
 
@@ -3220,13 +3220,13 @@
 
 2003-11-14  Germain Garand  <germain@ebooksfrance.org>
 
-        fix "overflow: scroll" tqlayout/painting issues
+        fix "overflow: scroll" layout/painting issues
 
         * rendering/render_box.cpp (getOverflowClipRect): substract
         scrollbars width/height if any. Merged from WebCore.
 
         * rendering/render_layer.cpp (horizontalScrollbarHeight,
-        verticalScrollbarWidth): use tqpixelMetric instead of width()/height().
+        verticalScrollbarWidth): use pixelMetric instead of width()/height().
 
 2003-11-13  Zack Rusin  <zack@kde.org>
 
@@ -3339,11 +3339,11 @@
 
 	* rendering/render_object.cpp (nodeAtPoint): merge from Safari. Still
 	does not work, but at least its the same now.
-	(lineHeight): handle tqreplaced elements here. They don't necessarily
+	(lineHeight): handle replaced elements here. They don't necessarily
 	inherit RenderReplaced anymore.
-	(baselinePosition): handle tqreplaced elements.
+	(baselinePosition): handle replaced elements.
 
-	* rendering/render_tqreplaced.cpp: remove baselinePosition/lineHeight. its in
+	* rendering/render_replaced.cpp: remove baselinePosition/lineHeight. its in
 	RenderObject now.
 
 	* rendering/render_block.cpp (isSelfCollapsingBlock): collapse away trailing whitespace
@@ -3354,7 +3354,7 @@
 
 2003-11-02  Stephan Kulow  <coolo@kde.org>
 
-	* rendering/render_form.cpp (updateFromElement): tqinvalidate the size hint
+	* rendering/render_form.cpp (updateFromElement): invalidate the size hint
 	of comboboxes as they are cached in QComboBox (#64229)
 
 2003-11-01  Dirk Mueller  <mueller@kde.org>
@@ -3410,7 +3410,7 @@
 
 2003-10-28  Leo Savernik  <l.savernik@aon.at>
 
-	* rendering/render_tqreplaced.cpp (checkSelectionPoint):
+	* rendering/render_replaced.cpp (checkSelectionPoint):
 	Readded RenderReplaced::checkSelectionPoint to fix disrupted selection
 	of sole inline images within block elements (<p><img ...></p>).
 	Also fixes caret placement issues.
@@ -3591,7 +3591,7 @@
 	either modality or QScrollView (but doesn't work in 3.1.x neither).
 
 2003-10-24  Lars Knoll <knoll@kde.org>
-	* Hopefully fixed most tqrepainting problems.
+	* Hopefully fixed most repainting problems.
 
 2003-10-24  Lars Knoll <knoll@kde.org>
 	* Fix most of the form related regressions introduced by my
@@ -3638,18 +3638,18 @@
 
 	* rendering/render_list.cpp (calcListValue): handle <ul><p><li> again.
 
-	* rendering/render_box.cpp (tqrepaint): revert commit which introduced another
+	* rendering/render_box.cpp (repaint): revert commit which introduced another
 	4 bytes overhead. No need to waste memory here.
 
-	* rendering/render_object.cpp (setStyle): schedule tqrepaint on old object
+	* rendering/render_object.cpp (setStyle): schedule repaint on old object
 	when the new outline is going to be thinner.
 
 	* rendering/render_form.cpp (RenderCustomButton): Remove.
 
-	* rendering/render_tqreplaced.cpp (RenderReplaced::checkSelectionPoint): Remove.
+	* rendering/render_replaced.cpp (RenderReplaced::checkSelectionPoint): Remove.
 	RenderObject/RenderBox'es implementation *must* work. No need to add useless code.
 
-	* rendering/render_tqreplaced.cpp (RenderReplacedBlock): Remove.
+	* rendering/render_replaced.cpp (RenderReplacedBlock): Remove.
 
 	* html/html_formimpl.cpp (HTMLButtonElement::attach): Remove.
 
@@ -3671,15 +3671,15 @@
 
 	* css/makeprop: don't export getPropertyName. declare it.
 
-	* xml/dom_nodeimpl.cpp (tqreplaceChild/appendChild/removeChild):
-	Reverting patch which tqinvalidated tqlayout on child when it was attached.
+	* xml/dom_nodeimpl.cpp (replaceChild/appendChild/removeChild):
+	Reverting patch which invalidated layout on child when it was attached.
 
 2003-10-20  Lars Knoll <knoll@kde.org>
 
 	* fix most issues with the layering code by
 	merging and adapting safaris implementation
 	* fix a bug in RenderBox::calcAbsoluteVertical(), that probably
-	has destroyed a lot of tqlayouts.
+	has destroyed a lot of layouts.
 	* don't add the scroll offset in RenderBox::paintBoxDecorations()
 
 2003-10-20  Dirk Mueller  <mueller@kde.org>
@@ -3694,7 +3694,7 @@
 
 2003-10-20  Dirk Mueller  <mueller@kde.org>
 
-	* rendering/render_form.cpp (tqlayout): set IE-CSS-extension style palette
+	* rendering/render_form.cpp (layout): set IE-CSS-extension style palette
 	on <textarea> scrollbars (#56532).
 
 	* rendering/render_layer.cpp (showScrollbar): set IE-CSS-extension styled
@@ -3808,7 +3808,7 @@
 	meaningful peripheral mouse events to focused widget to restore correct
 	mouse handling in proxied widgets. #65216 (selection part)
 
-	* rendering/render_tqreplaced.cpp (handleEvent):
+	* rendering/render_replaced.cpp (handleEvent):
 	map MOUSEOUT/MOUSEOVER DOM events to Enter/Leave events. Honours stacking
 	while mouse buttons are pressed.
 
@@ -3817,7 +3817,7 @@
 
 2003-10-06  Daniel Molkentin  <molkentin@kde.org>
 
-	* ecma/kjs_window.cpp: added window.open targets _self and tqreplace
+	* ecma/kjs_window.cpp: added window.open targets _self and replace
 
 2003-10-06  David Faure  <faure@kde.org>
 
@@ -3835,7 +3835,7 @@
 	to make the one call entering a local event loop the last, so that we can
 	cleanly exit when it the view is already deleted.
 
-	* khtml_ext.cpp (KHTMLPopupGUIClient): pass TQObject parent
+	* khtml_ext.cpp (KHTMLPopupGUIClient): pass QObject parent
 
 2003-10-05  Dirk Mueller  <mueller@kde.org>
 
@@ -3847,7 +3847,7 @@
 
 2003-10-04 Germain Garand <germain@ebooksfrance.org>
 
-	* rendering/render_tqreplaced.cpp (baselinePosition): use setPos to adjust
+	* rendering/render_replaced.cpp (baselinePosition): use setPos to adjust
 	layer position if needed. Fix relatively positioned widgets not being painted.
 
 2003-10-04  Dirk Mueller  <mueller@kde.org>
diff --git a/khtml/DESIGN.html b/khtml/DESIGN.html
index c14170ec4..00af13045 100644
--- a/khtml/DESIGN.html
+++ b/khtml/DESIGN.html
@@ -9,7 +9,7 @@ dt { font-weight: bold; }
 
 <p>
 This document tries to give a short overview about the internal design of the khtml
-library. I've written this, because the lib has gotten quite big, and it is hard at first to tqfind your
+library. I've written this, because the lib has gotten quite big, and it is hard at first to find your
 way in the source code. This doesn't mean that you'll understand khtml after reading this
 document, but it'll hopefully make it easier for you to read the source code.
 </p>
@@ -84,7 +84,7 @@ in a tree like structure. Imagine some html like
 In the following I'll show how this input will be processed step by step to generate the visible output
 you will finally see on your screen. I'm describing the things as if they happen one after the other,
 to make the principle more clear. In reality, to get visible output on the screen as soon as possible,
-all these things (from tokenization to the build up and tqlayouting of the rendering tree) happen
+all these things (from tokenization to the build up and layouting of the rendering tree) happen
 more or less in parallel.
 
 <h2>Tokenizer and parser</h2>
@@ -168,7 +168,7 @@ explicit sharing of the DOM specs.
 Another advantage is, that (as the implementation classes are not exported) it gives us a lot
 more freedom to make changes in the implementation without breaking binary compatibility.
 <p>
-You will tqfind almost a one to one correspondence between the interface classes and the implementation
+You will find almost a one to one correspondence between the interface classes and the implementation
 classes. In the implementation classes we have added a few more intermediate classes, that can
 not be seen from the outside for various reasons (make implementation of shared features easier
 or to reduce memory consumption).
@@ -258,9 +258,9 @@ RenderRoot*
 </pre>
 
 <p>
-A call to of <a href="rendering/render_root.cpp">tqlayout()</a> on the
+A call to of <a href="rendering/render_root.cpp">layout()</a> on the
 <a href="rendering/render_root.h">RenderRoot </a> (the root of the rendering tree)
-object causes the rendering tree to tqlayout itself into the available space
+object causes the rendering tree to layout itself into the available space
 (width) given by the the KHTMLView. After that, the drawContents() method of
 KHTMLView can call RenderRoot->print() with appropriate parameters to actually
 paint the document. This is not 100% correct, when parsing incrementally, but
@@ -291,10 +291,10 @@ that defines the DTD to use for HTML (used mainly in the parser).
 <dd>Java related stuff.
 <dt><a href="misc/">misc:</a>
 <dd>Some misc stuff needed in khtml. Contains the image loader, some misc definitions and the
-decoder class that converts the incoming stream to tqunicode.
+decoder class that converts the incoming stream to unicode.
 <dt><a href="rendering">rendering:</a>
 <dd>Everything thats related to bringing a DOM tree with CSS declarations to the screen. Contains
-the definition of the objects used in the rendering tree, the tqlayouting code, and the RenderStyle objects.
+the definition of the objects used in the rendering tree, the layouting code, and the RenderStyle objects.
 <dt><a href="xml/">xml:</a>
 <dd>The XML part of the DOM implementation, the xml tokenizer.
 </dl>
@@ -309,7 +309,7 @@ is part of dom/* checks for this flag and throws the exception.
 <p>
 All the above is to give you a quick introduction into the way khtml brings an HTML/XML file to the screen.
 It is by no way complete or even 100% correct. I left out many problems, I will perhaps add either on request
-or when I tqfind some time to do so. Let me name some of the missing things:
+or when I find some time to do so. Let me name some of the missing things:
 <ul>
 <li>The decoder to convert the incoming stream to Unicode
 <li>interaction with konqueror/applications
@@ -329,7 +329,7 @@ if you don't immediately understand how it works. On the other hand, it is by no
 get used a lot, that probably has the biggest number of remaining bugs (even though it's sometimes hard to
 know if some behavior is really a bug).
 <blockquote>
-Some parts of it's code are however <b>extremely touchy</b> (especially the tqlayouting algorithms), 
+Some parts of it's code are however <b>extremely touchy</b> (especially the layouting algorithms), 
 and making changes there (that might fix a bug on one web page) might introduce severe bugs.
 All the people developing khtml have already spend huge amounts of time searching for such bugs,
 that only showed up on some web pages, and thus were found only a week after the change that
diff --git a/khtml/SAFARI_MERGE b/khtml/SAFARI_MERGE
index 4c48e6b34..7ef67e134 100644
--- a/khtml/SAFARI_MERGE
+++ b/khtml/SAFARI_MERGE
@@ -82,7 +82,7 @@ Needs other stuff before it can be applied:
 ===========================================================================
 
 - decoder.cpp/.h: changes in APPLE_CHANGES #ifdef that make decoder
-  being a null wrapper just using tqunicode directly instead of working
+  being a null wrapper just using unicode directly instead of working
   on charset specific 8bit data. 
 
 - htmltags.in: removal of <-konqblock>, not sure if that should ever
@@ -112,7 +112,7 @@ changes that need to be merged:
   IMO to speed up style stuff. Should IMO be separated out into a font_mac.cpp
   and font_x11.cpp
 
-- tqrepaint has gotten a bool immediate
+- repaint has gotten a bool immediate
 
 - render_applet.cpp: small #ifdef APPLE changes
 
diff --git a/khtml/configure.in.in b/khtml/configure.in.in
index c58788de2..b85dd8474 100644
--- a/khtml/configure.in.in
+++ b/khtml/configure.in.in
@@ -41,7 +41,7 @@ if test "$ac_libthai" != "no"; then
 
   LIBTHAI=""
   if test "$kde_link_libthai" = "no"; then
-     AC_MSG_ERROR([Can't tqfind libthai.])
+     AC_MSG_ERROR([Can't find libthai.])
   else
      AC_DEFINE(HAVE_LIBTHAI, 1,
      [Defined if you have libthai and want to have it compiled in])
diff --git a/khtml/css/css_base.cpp b/khtml/css/css_base.cpp
index 2ffbbb0a4..5af37b9b9 100644
--- a/khtml/css/css_base.cpp
+++ b/khtml/css/css_base.cpp
@@ -56,9 +56,9 @@ StyleSheetImpl* StyleBaseImpl::stylesheet()
 
 KURL StyleBaseImpl::baseURL()
 {
-    // try to tqfind the style sheet. If found look for its url.
+    // try to find the style sheet. If found look for its url.
     // If it has none, look for the parentsheet, or the parentNode and
-    // try to tqfind out about their url
+    // try to find out about their url
 
     StyleSheetImpl *sheet = stylesheet();
 
@@ -67,7 +67,7 @@ KURL StyleBaseImpl::baseURL()
     if(!sheet->href().isNull())
         return KURL( sheet->href().string() );
 
-    // tqfind parent
+    // find parent
     if(sheet->parent()) return sheet->parent()->baseURL();
 
     if(!sheet->ownerNode()) return KURL();
@@ -172,7 +172,7 @@ void CSSSelector::extractPseudoType() const
         value = value.lower();
         switch (value[0]) {
             case '-':
-                if (value == "-khtml-tqreplaced")
+                if (value == "-khtml-replaced")
                     _pseudoType = PseudoReplaced;
                 else
                 if (value == "-khtml-marker")
@@ -196,7 +196,7 @@ void CSSSelector::extractPseudoType() const
             case 'c':
                 if (value == "checked")
                     _pseudoType = PseudoChecked;
-                else if (value == "tqcontains(")
+                else if (value == "contains(")
                     _pseudoType = PseudoContains;
                 break;
             case 'd':
@@ -319,7 +319,7 @@ DOMString CSSSelector::selectorText() const
     // the original namespace prefix used. Ugh. -dwh
     DOMString str;
     const CSSSelector* cs = this;
-    TQ_UINT16 tag = localNamePart(cs->tag);
+    Q_UINT16 tag = localNamePart(cs->tag);
     if (tag == anyLocalName && cs->match == CSSSelector::None)
         str = "*";
     else if (tag != anyLocalName)
diff --git a/khtml/css/css_base.h b/khtml/css/css_base.h
index 75611f054..9a8774107 100644
--- a/khtml/css/css_base.h
+++ b/khtml/css/css_base.h
@@ -176,7 +176,7 @@ namespace DOM {
         mutable DOM::DOMString value;
 	CSSSelector *tagHistory;
         CSSSelector* simpleSelector; // Used by :not
-        DOM::DOMString string_arg; // Used by :tqcontains, :lang and :nth-*
+        DOM::DOMString string_arg; // Used by :contains, :lang and :nth-*
         DOM::NodeImpl::Id attr;
         DOM::NodeImpl::Id tag;
 
diff --git a/khtml/css/css_renderstyledeclarationimpl.cpp b/khtml/css/css_renderstyledeclarationimpl.cpp
index ef60d5262..daf607a9e 100644
--- a/khtml/css/css_renderstyledeclarationimpl.cpp
+++ b/khtml/css/css_renderstyledeclarationimpl.cpp
@@ -367,7 +367,7 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
     if (!node)
         return 0;
 
-    // Make sure our tqlayout is up to date before we allow a query on these attributes.
+    // Make sure our layout is up to date before we allow a query on these attributes.
     DocumentImpl* docimpl = node->getDocument();
     if (docimpl) {
         docimpl->updateLayout();
@@ -930,7 +930,7 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
     case CSS_PROP_TOP:
         return getPositionOffsetValue(renderer, CSS_PROP_TOP);
     case CSS_PROP_UNICODE_BIDI:
-        switch (style->tqunicodeBidi()) {
+        switch (style->unicodeBidi()) {
         case UBNormal:
             return new CSSPrimitiveValueImpl(CSS_VAL_NORMAL);
         case Embed:
diff --git a/khtml/css/css_stylesheetimpl.cpp b/khtml/css/css_stylesheetimpl.cpp
index 855b1a6e8..bf85c0d59 100644
--- a/khtml/css/css_stylesheetimpl.cpp
+++ b/khtml/css/css_stylesheetimpl.cpp
@@ -235,7 +235,7 @@ void CSSStyleSheetImpl::addNamespace(CSSParser* p, const DOM::DOMString& prefix,
     }
 }
 
-void CSSStyleSheetImpl::determineNamespace(TQ_UINT32& id, const DOM::DOMString& prefix)
+void CSSStyleSheetImpl::determineNamespace(Q_UINT32& id, const DOM::DOMString& prefix)
 {
     // If the stylesheet has no namespaces we can just return.  There won't be any need to ever check
     // namespace values in selectors.
@@ -253,7 +253,7 @@ void CSSStyleSheetImpl::determineNamespace(TQ_UINT32& id, const DOM::DOMString&
             Q_ASSERT(m_doc != 0);
 
             // Look up the id for this namespace URI.
-            TQ_UINT16 nsid = m_doc->getId(NodeImpl::NamespaceId, 0, 0, ns->uri().implementation(), false, false, &exceptioncode);
+            Q_UINT16 nsid = m_doc->getId(NodeImpl::NamespaceId, 0, 0, ns->uri().implementation(), false, false, &exceptioncode);
             id = makeId(nsid, localNamePart(id));
         }
     }
@@ -324,7 +324,7 @@ StyleSheetListImpl::~StyleSheetListImpl()
 
 void StyleSheetListImpl::add( StyleSheetImpl* s )
 {
-    if ( !styleSheets.tqcontainsRef( s ) ) {
+    if ( !styleSheets.containsRef( s ) ) {
         s->ref();
         styleSheets.append( s );
     }
@@ -377,10 +377,10 @@ MediaListImpl::MediaListImpl( CSSRuleImpl *parentRule, const DOMString &media )
     setMediaText( media );
 }
 
-bool MediaListImpl::tqcontains( const DOMString &medium ) const
+bool MediaListImpl::contains( const DOMString &medium ) const
 {
-    return m_lstMedia.empty() || m_lstMedia.tqcontains( medium ) ||
-            m_lstMedia.tqcontains( "all" );
+    return m_lstMedia.empty() || m_lstMedia.contains( medium ) ||
+            m_lstMedia.contains( "all" );
 }
 
 CSSStyleSheetImpl *MediaListImpl::parentStyleSheet() const
diff --git a/khtml/css/css_stylesheetimpl.h b/khtml/css/css_stylesheetimpl.h
index 80f2b4ed8..e7a551947 100644
--- a/khtml/css/css_stylesheetimpl.h
+++ b/khtml/css/css_stylesheetimpl.h
@@ -101,8 +101,8 @@ public:
     void deleteRule ( unsigned long index, int &exceptioncode );
 
     void addNamespace(CSSParser* p, const DOM::DOMString& prefix, const DOM::DOMString& uri);
-    void determineNamespace(TQ_UINT32& id, const DOM::DOMString& prefix);
-    TQ_UINT32 defaultNamespace() { return m_defaultNamespace; };
+    void determineNamespace(Q_UINT32& id, const DOM::DOMString& prefix);
+    Q_UINT32 defaultNamespace() { return m_defaultNamespace; };
 
     void setCharset(const DOMString &charset) { m_charset = charset; }
     const DOMString& charset() const { return m_charset; }
@@ -123,7 +123,7 @@ public:
 protected:
     DocumentImpl *m_doc;
     bool m_implicit;
-    TQ_UINT32 m_defaultNamespace;
+    Q_UINT32 m_defaultNamespace;
     CSSNamespace* m_namespaces;
     DOMString m_charset;
 };
@@ -172,14 +172,14 @@ public:
     void setMediaText(const DOM::DOMString &value);
 
     /**
-     * Check if the list tqcontains either the requested medium, or the
+     * Check if the list contains either the requested medium, or the
      * catch-all "all" media type. Returns true when found, false otherwise.
      * Since not specifying media types should be treated as "all" according
      * to DOM specs, an empty list always returns true.
      *
      * _NOT_ part of the DOM!
      */
-    bool tqcontains( const DOM::DOMString &medium ) const;
+    bool contains( const DOM::DOMString &medium ) const;
 
 protected:
     TQValueList<DOM::DOMString> m_lstMedia;
diff --git a/khtml/css/css_valueimpl.cpp b/khtml/css/css_valueimpl.cpp
index c5ab10a08..52e962725 100644
--- a/khtml/css/css_valueimpl.cpp
+++ b/khtml/css/css_valueimpl.cpp
@@ -57,8 +57,8 @@ static DOMString quoteStringIfNeeded(const DOMString &string)
 {
     // FIXME: Also need to transform control characters into \ sequences.
     TQString s = string.string();
-    s.tqreplace('\\', "\\\\");
-    s.tqreplace('\'', "\\'");
+    s.replace('\\', "\\\\");
+    s.replace('\'', "\\'");
     return '\'' + s + '\'';
 }
 
@@ -757,14 +757,14 @@ DOM::DOMString CSSPrimitiveValueImpl::cssText() const
             break;
         }
 	case CSSPrimitiveValue::CSS_RGBCOLOR:
-	    if (tqAlpha(m_value.rgbcolor) != 0xFF) {
+	    if (qAlpha(m_value.rgbcolor) != 0xFF) {
 		if (m_value.rgbcolor == khtml::transparentColor)
 		    text = "transparent";
 		else
-		    text = "rgba(" + TQString::number(tqRed  (m_value.rgbcolor)) + "," 
-				   + TQString::number(tqBlue (m_value.rgbcolor)) + "," 
-				   + TQString::number(tqGreen(m_value.rgbcolor)) + "," 
-				   + TQString::number(tqAlpha(m_value.rgbcolor)/255.0) + ")";
+		    text = "rgba(" + TQString::number(qRed  (m_value.rgbcolor)) + "," 
+				   + TQString::number(qBlue (m_value.rgbcolor)) + "," 
+				   + TQString::number(qGreen(m_value.rgbcolor)) + "," 
+				   + TQString::number(qAlpha(m_value.rgbcolor)/255.0) + ")";
 	    } else {
 		text = TQColor(m_value.rgbcolor).name();
 	    }
@@ -886,9 +886,9 @@ FontFamilyValueImpl::FontFamilyValueImpl( const TQString &string)
 
     parsedFontName = string;
     // a language tag is often added in braces at the end. Remove it.
-    parsedFontName.tqreplace(parenReg, TQString::null);
+    parsedFontName.replace(parenReg, TQString::null);
     // remove [Xft] qualifiers
-    parsedFontName.tqreplace(braceReg, TQString::null);
+    parsedFontName.replace(braceReg, TQString::null);
 
 #ifndef APPLE_CHANGES
     const TQString &available = KHTMLSettings::availableFamilies();
@@ -896,21 +896,21 @@ FontFamilyValueImpl::FontFamilyValueImpl( const TQString &string)
     parsedFontName = parsedFontName.lower();
     // kdDebug(0) << "searching for face '" << parsedFontName << "'" << endl;
 
-    int pos = available.tqfind( ',' + parsedFontName + ',', 0, false );
+    int pos = available.find( ',' + parsedFontName + ',', 0, false );
     if ( pos == -1 ) {
         // many pages add extra MSs to make sure it's windows only ;(
         if ( parsedFontName.startsWith( "ms " ) )
             parsedFontName = parsedFontName.mid( 3 );
         if ( parsedFontName.endsWith( " ms" ) )
             parsedFontName.truncate( parsedFontName.length() - 3 );
-        pos = available.tqfind( ",ms " + parsedFontName + ',', 0, false );
+        pos = available.find( ",ms " + parsedFontName + ',', 0, false );
         if ( pos == -1 )
-            pos = available.tqfind( ',' + parsedFontName + " ms,", 0, false );
+            pos = available.find( ',' + parsedFontName + " ms,", 0, false );
     }
 
     if ( pos != -1 ) {
        ++pos;
-       int p = available.tqfind(',', pos);
+       int p = available.find(',', pos);
        assert( p != -1 ); // available is supposed to start and end with ,
        parsedFontName = available.mid( pos, p - pos);
        // kdDebug(0) << "going for '" << parsedFontName << "'" << endl;
diff --git a/khtml/css/csshelper.cpp b/khtml/css/csshelper.cpp
index f1d681bd6..73eff588c 100644
--- a/khtml/css/csshelper.cpp
+++ b/khtml/css/csshelper.cpp
@@ -78,7 +78,7 @@ DOMString khtml::parseURL(const DOMString &url)
 
     int nl = 0;
     for(int k = o; k < o+l; k++)
-        if(i->s[k].tqunicode() > '\r')
+        if(i->s[k].unicode() > '\r')
             j->s[nl++] = i->s[k];
 
     j->l = nl;
diff --git a/khtml/css/cssparser.cpp b/khtml/css/cssparser.cpp
index 4dff70ba9..d167af025 100644
--- a/khtml/css/cssparser.cpp
+++ b/khtml/css/cssparser.cpp
@@ -166,7 +166,7 @@ void CSSParser::parseSheet( CSSStyleSheetImpl *sheet, const DOMString &string )
 
     int length = string.length() + 3;
     data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
-    memcpy( data, string.tqunicode(), string.length()*sizeof( unsigned short) );
+    memcpy( data, string.unicode(), string.length()*sizeof( unsigned short) );
 
 #ifdef CSS_DEBUG
     kdDebug( 6080 ) << ">>>>>>> start parsing style sheet" << endl;
@@ -190,7 +190,7 @@ CSSRuleImpl *CSSParser::parseRule( DOM::CSSStyleSheetImpl *sheet, const DOM::DOM
     data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
     for ( unsigned int i = 0; i < strlen(khtml_rule); i++ )
         data[i] = khtml_rule[i];
-    memcpy( data + strlen( khtml_rule ), string.tqunicode(), string.length()*sizeof( unsigned short) );
+    memcpy( data + strlen( khtml_rule ), string.unicode(), string.length()*sizeof( unsigned short) );
     // qDebug("parse string = '%s'", TQConstString( (const TQChar *)data, length ).string().latin1() );
     data[length-4] = '}';
 
@@ -218,7 +218,7 @@ bool CSSParser::parseValue( DOM::CSSStyleDeclarationImpl *declaration, int _id,
     data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
     for ( unsigned int i = 0; i < strlen(khtml_value); i++ )
         data[i] = khtml_value[i];
-    memcpy( data + strlen( khtml_value ), string.tqunicode(), string.length()*sizeof( unsigned short) );
+    memcpy( data + strlen( khtml_value ), string.unicode(), string.length()*sizeof( unsigned short) );
     data[length-4] = '}';
     // qDebug("parse string = '%s'", TQConstString( (const TQChar *)data, length ).string().latin1() );
 
@@ -260,7 +260,7 @@ bool CSSParser::parseDeclaration( DOM::CSSStyleDeclarationImpl *declaration, con
     data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
     for ( unsigned int i = 0; i < strlen(khtml_decls); i++ )
         data[i] = khtml_decls[i];
-    memcpy( data + strlen( khtml_decls ), string.tqunicode(), string.length()*sizeof( unsigned short) );
+    memcpy( data + strlen( khtml_decls ), string.unicode(), string.length()*sizeof( unsigned short) );
     data[length-4] = '}';
 
     nonCSSHint = _nonCSSHint;
@@ -522,7 +522,7 @@ bool CSSParser::parseValue( int propId, bool important )
             valid_primitive = true;
         break;
 
-    case CSS_PROP_CLIP:                 // <tqshape> | auto | inherit
+    case CSS_PROP_CLIP:                 // <shape> | auto | inherit
         if ( id == CSS_VAL_AUTO )
             valid_primitive = true;
         else if ( value->unit == Value::Function )
@@ -1186,7 +1186,7 @@ bool CSSParser::parseBackgroundShorthand(bool important)
 	    }
 	}
 
-        // if we didn't tqfind at least one match, this is an
+        // if we didn't find at least one match, this is an
         // invalid shorthand and we have to ignore it
         if (!found)
             goto fail;
@@ -1243,7 +1243,7 @@ bool CSSParser::parseShortHand(int propId, const int *properties, int numPropert
             }
         }
 
-        // if we didn't tqfind at least one match, this is an
+        // if we didn't find at least one match, this is an
         // invalid shorthand and we have to ignore it
         if (!found)
             return false;
@@ -2125,7 +2125,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value)
         colorValues[0] = kMax( 0, kMin( 255, colorValues[0] ) );
         colorValues[1] = kMax( 0, kMin( 255, colorValues[1] ) );
         colorValues[2] = kMax( 0, kMin( 255, colorValues[2] ) );
-        c = tqRgb(colorValues[0], colorValues[1], colorValues[2]);
+        c = qRgb(colorValues[0], colorValues[1], colorValues[2]);
     } else if (value->unit == Value::Function &&
                 value->function->args != 0 &&
                 value->function->args->size() == 7 /* rgba + three commas */ &&
@@ -2136,7 +2136,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value)
         colorValues[0] = kMax( 0, kMin( 255, colorValues[0] ) );
         colorValues[1] = kMax( 0, kMin( 255, colorValues[1] ) );
         colorValues[2] = kMax( 0, kMin( 255, colorValues[2] ) );
-        c = tqRgba(colorValues[0], colorValues[1], colorValues[2], colorValues[3]);
+        c = qRgba(colorValues[0], colorValues[1], colorValues[2], colorValues[3]);
     } else if (value->unit == Value::Function &&
                 value->function->args != 0 &&
                 value->function->args->size() == 5 /* hsl + two commas */ &&
@@ -2144,7 +2144,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value)
         double colorValues[3];
         if (!parseHSLParameters(value, colorValues, false))
             return 0;
-        c = khtml::tqRgbaFromHsla(colorValues[0], colorValues[1], colorValues[2], 1.0);
+        c = khtml::qRgbaFromHsla(colorValues[0], colorValues[1], colorValues[2], 1.0);
     } else if (value->unit == Value::Function &&
                 value->function->args != 0 &&
                 value->function->args->size() == 7 /* hsla + three commas */ &&
@@ -2152,7 +2152,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value)
         double colorValues[4];
         if (!parseHSLParameters(value, colorValues, true))
             return 0;
-        c = khtml::tqRgbaFromHsla(colorValues[0], colorValues[1], colorValues[2], colorValues[3]);
+        c = khtml::qRgbaFromHsla(colorValues[0], colorValues[1], colorValues[2], colorValues[3]);
     }
     else
         return 0;
diff --git a/khtml/css/cssproperties.c b/khtml/css/cssproperties.c
index f8205a5b9..c86f2d326 100644
--- a/khtml/css/cssproperties.c
+++ b/khtml/css/cssproperties.c
@@ -1,5 +1,5 @@
 /* ANSI-C code produced by gperf version 3.0.2 */
-/* Command-line: gperf -a -L ANSI-C -E -C -c -o -t -k '*' -NtqfindProp -Hhash_prop -Wwordlist_prop -D -s 2 cssproperties.gperf  */
+/* Command-line: gperf -a -L ANSI-C -E -C -c -o -t -k '*' -NfindProp -Hhash_prop -Wwordlist_prop -D -s 2 cssproperties.gperf  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
       && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
@@ -39,7 +39,7 @@ struct props {
     int id;
 };
 
-static const struct props * tqfindProp (register const char *str, register unsigned int len);
+static const struct props * findProp (register const char *str, register unsigned int len);
 /* maximum key range = 469, duplicates = 0 */
 
 #ifdef __GNUC__
@@ -189,7 +189,7 @@ hash_prop (register const char *str, register unsigned int len)
 __inline
 #endif
 const struct props *
-tqfindProp (register const char *str, register unsigned int len)
+findProp (register const char *str, register unsigned int len)
 {
   enum
     {
@@ -281,7 +281,7 @@ tqfindProp (register const char *str, register unsigned int len)
 #line 102 "cssproperties.gperf"
       {"text-align", CSS_PROP_TEXT_ALIGN},
 #line 109 "cssproperties.gperf"
-      {"tqunicode-bidi", CSS_PROP_UNICODE_BIDI},
+      {"unicode-bidi", CSS_PROP_UNICODE_BIDI},
 #line 82 "cssproperties.gperf"
       {"outline-color", CSS_PROP_OUTLINE_COLOR},
 #line 60 "cssproperties.gperf"
@@ -417,7 +417,7 @@ tqfindProp (register const char *str, register unsigned int len)
 #line 129 "cssproperties.gperf"
       {"list-style", CSS_PROP_LIST_STYLE},
 #line 101 "cssproperties.gperf"
-      {"table-tqlayout", CSS_PROP_TABLE_LAYOUT},
+      {"table-layout", CSS_PROP_TABLE_LAYOUT},
 #line 54 "cssproperties.gperf"
       {"font-size", CSS_PROP_FONT_SIZE},
 #line 86 "cssproperties.gperf"
@@ -624,7 +624,7 @@ static const char * const propertyList[] = {
 "quotes", 
 "right", 
 "size", 
-"table-tqlayout", 
+"table-layout", 
 "text-align", 
 "text-decoration", 
 "text-indent", 
@@ -632,7 +632,7 @@ static const char * const propertyList[] = {
 "text-shadow", 
 "text-transform", 
 "top", 
-"tqunicode-bidi", 
+"unicode-bidi", 
 "vertical-align", 
 "visibility", 
 "white-space", 
diff --git a/khtml/css/cssproperties.in b/khtml/css/cssproperties.in
index 6c2a8b254..251eb5e3d 100644
--- a/khtml/css/cssproperties.in
+++ b/khtml/css/cssproperties.in
@@ -102,7 +102,7 @@ position
 quotes
 right
 size
-table-tqlayout
+table-layout
 text-align
 text-decoration
 text-indent
@@ -110,7 +110,7 @@ text-overflow
 text-shadow
 text-transform
 top
-tqunicode-bidi
+unicode-bidi
 vertical-align
 visibility
 white-space
diff --git a/khtml/css/cssstyleselector.cpp b/khtml/css/cssstyleselector.cpp
index db978d5b9..15432dcd6 100644
--- a/khtml/css/cssstyleselector.cpp
+++ b/khtml/css/cssstyleselector.cpp
@@ -257,7 +257,7 @@ CSSStyleSelector::CSSStyleSelector( DocumentImpl* doc, TQString userStyleSheet,
     u.setQuery( TQString::null );
     u.setRef( TQString::null );
     encodedurl.file = u.url();
-    int pos = encodedurl.file.tqfindRev('/');
+    int pos = encodedurl.file.findRev('/');
     encodedurl.path = encodedurl.file;
     if ( pos > 0 ) {
 	encodedurl.path.truncate( pos );
@@ -327,7 +327,7 @@ void CSSStyleSelector::loadDefaultStyle(const KHTMLSettings *s, DocumentImpl *do
 	if ( readbytes >= 0 )
 	    file[readbytes] = '\0';
 
-	TQString style = TQString::tqfromLatin1( file.data() );
+	TQString style = TQString::fromLatin1( file.data() );
 	if(s)
 	    style += s->settingsToCSS();
 	DOMString str(style);
@@ -352,7 +352,7 @@ void CSSStyleSelector::loadDefaultStyle(const KHTMLSettings *s, DocumentImpl *do
 	if ( readbytes >= 0 )
 	    file[readbytes] = '\0';
 
-	TQString style = TQString::tqfromLatin1( file.data() );
+	TQString style = TQString::fromLatin1( file.data() );
 	DOMString str(style);
 
 	s_quirksSheet = new DOM::CSSStyleSheetImpl(doc);
@@ -496,12 +496,12 @@ RenderStyle *CSSStyleSelector::styleForElement(ElementImpl *e)
     unsigned int numPseudoProps = 0;
 
     // try to sort out most style rules as early as possible.
-    TQ_UINT16 cssTagId = localNamePart(element->id());
+    Q_UINT16 cssTagId = localNamePart(element->id());
     int smatch = 0;
     int schecked = 0;
 
     for ( unsigned int i = 0; i < selectors_size; i++ ) {
-	TQ_UINT16 tag = localNamePart(selectors[i]->tag);
+	Q_UINT16 tag = localNamePart(selectors[i]->tag);
 	if ( cssTagId == tag || tag == anyLocalName ) {
 	    ++schecked;
 
@@ -741,8 +741,8 @@ void CSSStyleSelector::adjustRenderStyle(RenderStyle* style, DOM::ElementImpl *e
     // Cull out any useless layers and also repeat patterns into additional layers.
     style->adjustBackgroundLayers();
 
-    // Only use slow tqrepaints if we actually have a background image.
-    // FIXME: We only need to tqinvalidate the fixed regions when scrolling.  It's total overkill to
+    // Only use slow repaints if we actually have a background image.
+    // FIXME: We only need to invalidate the fixed regions when scrolling.  It's total overkill to
     // prevent the entire view from blitting on a scroll.
     if (style->hasFixedBackgroundImage() && view)
         view->useSlowRepaints();
@@ -828,12 +828,12 @@ unsigned int CSSStyleSelector::addInlineDeclarations(DOM::ElementImpl* e,
 static void cleanpath(TQString &path)
 {
     int pos;
-    while ( (pos = path.tqfind( "/../" )) != -1 ) {
+    while ( (pos = path.find( "/../" )) != -1 ) {
         int prev = 0;
         if ( pos > 0 )
-            prev = path.tqfindRev( "/", pos -1 );
+            prev = path.findRev( "/", pos -1 );
         // don't remove the host, i.e. http://foo.org/../foo.html
-        if (prev < 0 || (prev > 3 && path.tqfindRev("://", prev-1) == prev-2))
+        if (prev < 0 || (prev > 3 && path.findRev("://", prev-1) == prev-2))
             path.remove( pos, 3);
         else
             // matching directory found ?
@@ -846,9 +846,9 @@ static void cleanpath(TQString &path)
     // We don't want to waste a function call on the search for the anchor
     // in the vast majority of cases where there is no "//" in the path.
     int refPos = -2;
-    while ( (pos = path.tqfind( "//", pos )) != -1) {
+    while ( (pos = path.find( "//", pos )) != -1) {
         if (refPos == -2)
-            refPos = path.tqfind("#", 0);
+            refPos = path.find("#", 0);
         if (refPos > 0 && pos >= refPos)
             break;
 
@@ -857,7 +857,7 @@ static void cleanpath(TQString &path)
         else
             pos += 2;
     }
-    while ( (pos = path.tqfind( "/./" )) != -1)
+    while ( (pos = path.find( "/./" )) != -1)
         path.remove( pos, 2 );
     //kdDebug() << "checkPseudoState " << path << endl;
 }
@@ -871,9 +871,9 @@ static PseudoState checkPseudoState( const CSSStyleSelector::Encodedurl& encoded
     if( attr.isNull() ) {
         return PseudoNone;
     }
-    TQConstString cu(attr.tqunicode(), attr.length());
+    TQConstString cu(attr.unicode(), attr.length());
     TQString u = cu.string();
-    if ( !u.tqcontains("://") ) {
+    if ( !u.contains("://") ) {
         if ( u[0] == '/' )
             u = encodedurl.host + u;
         else if ( u[0] == '#' )
@@ -883,10 +883,10 @@ static PseudoState checkPseudoState( const CSSStyleSelector::Encodedurl& encoded
         cleanpath( u );
     }
     //completeURL( attr.string() );
-    bool tqcontains = KHTMLFactory::vLinks()->tqcontains( u );
-    if ( !tqcontains && u.tqcontains('/')==2 )
-      tqcontains = KHTMLFactory::vLinks()->tqcontains( u+'/' );
-    return tqcontains ? PseudoVisited : PseudoLink;
+    bool contains = KHTMLFactory::vLinks()->contains( u );
+    if ( !contains && u.contains('/')==2 )
+      contains = KHTMLFactory::vLinks()->contains( u+'/' );
+    return contains ? PseudoVisited : PseudoLink;
 }
 
 // a helper function for parsing nth-arguments
@@ -904,7 +904,7 @@ static bool matchNth(int count, const TQString& nth)
         b = 0;
     }
     else {
-        int n = nth.tqfind('n');
+        int n = nth.find('n');
         if (n != -1) {
             if (nth[0] == '-')
                 if (n==1)
@@ -917,11 +917,11 @@ static bool matchNth(int count, const TQString& nth)
                 else
                     a = nth.left(n).toInt();
 
-            int p = nth.tqfind('+');
+            int p = nth.find('+');
             if (p != -1)
                 b = nth.mid(p+1).toInt();
             else {
-                p = nth.tqfind('-');
+                p = nth.find('-');
                 b = -nth.mid(p+1).toInt();
             }
         }
@@ -1107,10 +1107,10 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm
 
     if (sel->tag != anyQName) {
         int eltID = e->id();
-        TQ_UINT16 localName = localNamePart(eltID);
-        TQ_UINT16 ns = namespacePart(eltID);
-        TQ_UINT16 selLocalName = localNamePart(sel->tag);
-        TQ_UINT16 selNS = namespacePart(sel->tag);
+        Q_UINT16 localName = localNamePart(eltID);
+        Q_UINT16 ns = namespacePart(eltID);
+        Q_UINT16 selLocalName = localNamePart(sel->tag);
+        Q_UINT16 selNS = namespacePart(sel->tag);
 
         if (localName <= ID_LAST_TAG && ns == defaultNamespace) {
             assert(e->isHTMLElement());
@@ -1158,22 +1158,22 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm
             // Be smart compare on length first
             if (sel_len > val_len) return false;
             // Selector string may not contain spaces
-            if ((sel->attr != ATTR_CLASS || e->hasClassList()) && sel->value.tqfind(' ') != -1) return false;
+            if ((sel->attr != ATTR_CLASS || e->hasClassList()) && sel->value.find(' ') != -1) return false;
             if (sel_len == val_len)
                 return (caseSensitive && !strcmp(sel->value, value)) ||
 		       (!caseSensitive && !strcasecmp(sel->value, value));
             // else the value is longer and can be a list
             if ( sel->match == CSSSelector::Class && !e->hasClassList() ) return false;
 
-            TQChar* sel_uc = sel->value.tqunicode();
-            TQChar* val_uc = value->tqunicode();
+            TQChar* sel_uc = sel->value.unicode();
+            TQChar* val_uc = value->unicode();
 
             TQConstString sel_str(sel_uc, sel_len);
             TQConstString val_str(val_uc, val_len);
 
             int pos = 0;
             for ( ;; ) {
-                pos = val_str.string().tqfind(sel_str.string(), pos, caseSensitive);
+                pos = val_str.string().find(sel_str.string(), pos, caseSensitive);
                 if ( pos == -1 ) return false;
                 if ( pos == 0 || val_uc[pos-1].isSpace() ) {
                     int endpos = pos + sel_len;
@@ -1186,35 +1186,35 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm
         }
         case CSSSelector::Contain:
         {
-            //kdDebug( 6080 ) << "checking for tqcontains match" << endl;
-            TQConstString val_str(value->tqunicode(), value->length());
-            TQConstString sel_str(sel->value.tqunicode(), sel->value.length());
-            return val_str.string().tqcontains(sel_str.string(), caseSensitive);
+            //kdDebug( 6080 ) << "checking for contains match" << endl;
+            TQConstString val_str(value->unicode(), value->length());
+            TQConstString sel_str(sel->value.unicode(), sel->value.length());
+            return val_str.string().contains(sel_str.string(), caseSensitive);
         }
         case CSSSelector::Begin:
         {
             //kdDebug( 6080 ) << "checking for beginswith match" << endl;
-            TQConstString val_str(value->tqunicode(), value->length());
-            TQConstString sel_str(sel->value.tqunicode(), sel->value.length());
+            TQConstString val_str(value->unicode(), value->length());
+            TQConstString sel_str(sel->value.unicode(), sel->value.length());
             return val_str.string().startsWith(sel_str.string(), caseSensitive);
         }
         case CSSSelector::End:
         {
             //kdDebug( 6080 ) << "checking for endswith match" << endl;
-            TQConstString val_str(value->tqunicode(), value->length());
-            TQConstString sel_str(sel->value.tqunicode(), sel->value.length());
+            TQConstString val_str(value->unicode(), value->length());
+            TQConstString sel_str(sel->value.unicode(), sel->value.length());
             return val_str.string().endsWith(sel_str.string(), caseSensitive);
         }
         case CSSSelector::Hyphen:
         {
             //kdDebug( 6080 ) << "checking for hyphen match" << endl;
-            TQConstString val_str(value->tqunicode(), value->length());
-            TQConstString sel_str(sel->value.tqunicode(), sel->value.length());
+            TQConstString val_str(value->unicode(), value->length());
+            TQConstString sel_str(sel->value.unicode(), sel->value.length());
             const TQString& str = val_str.string();
             const TQString& selStr = sel_str.string();
             if(str.length() < selStr.length()) return false;
             // Check if str begins with selStr:
-            if(str.tqfind(selStr, 0, caseSensitive) != 0) return false;
+            if(str.find(selStr, 0, caseSensitive) != 0) return false;
             // It does. Check for exact match or following '-':
             if(str.length() != selStr.length()
                 && str[selStr.length()] != '-') return false;
@@ -1557,8 +1557,8 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm
                 elem = static_cast<HTMLElementImpl*>(e);
                 DOMString s = elem->innerText();
                 TQString selStr = sel->string_arg.string();
-//                kdDebug(6080) << ":tqcontains(\"" << selStr << "\")" << " on \"" << s << "\"" << endl;
-                return s.string().tqcontains(selStr);
+//                kdDebug(6080) << ":contains(\"" << selStr << "\")" << " on \"" << s << "\"" << endl;
+                return s.string().contains(selStr);
             }
             break;
         }
@@ -1768,7 +1768,7 @@ void CSSStyleSelectorList::append( CSSStyleSheetImpl *sheet,
 
     // No media implies "all", but if a medialist exists it must
     // contain our current medium
-    if( sheet->media() && !sheet->media()->tqcontains( medium ) )
+    if( sheet->media() && !sheet->media()->contains( medium ) )
         return; // style sheet not applicable for this medium
 
     int len = sheet->length();
@@ -1794,7 +1794,7 @@ void CSSStyleSelectorList::append( CSSStyleSheetImpl *sheet,
             //kdDebug( 6080 ) << "@import: Media: "
             //                << import->media()->mediaText().string() << endl;
 
-            if( !import->media() || import->media()->tqcontains( medium ) )
+            if( !import->media() || import->media()->contains( medium ) )
             {
                 CSSStyleSheetImpl *importedSheet = import->styleSheet();
                 append( importedSheet, medium );
@@ -1809,7 +1809,7 @@ void CSSStyleSelectorList::append( CSSStyleSheetImpl *sheet,
             //kdDebug( 6080 ) << "@media: Media: "
             //                << r->media()->mediaText().string() << endl;
 
-            if( ( !r->media() || r->media()->tqcontains( medium ) ) && rules)
+            if( ( !r->media() || r->media()->contains( medium ) ) && rules)
             {
                 // Traverse child elements of the @import rule. Since
                 // many elements are not allowed as child we do not use
@@ -2079,13 +2079,13 @@ static TQColor colorForCSSValue( int css_value )
 	    KConfig bckgrConfig("kdesktoprc", true, false); // No multi-screen support
 	    bckgrConfig.setGroup("Desktop0");
 	    // Desktop background.
-	    return bckgrConfig.readColorEntry("Color1", &tqApp->palette().disabled().background());
+	    return bckgrConfig.readColorEntry("Color1", &qApp->palette().disabled().background());
 	}
 	return TQColor();
     }
 #endif
 
-    const TQPalette &pal = tqApp->palette();
+    const TQPalette &pal = qApp->palette();
     TQColor c = pal.color( uicol->group, uicol->role );
 #ifndef APPLE_CHANGES
     if ( uicol->configEntry ) {
@@ -2597,7 +2597,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
     }
 
     case CSS_PROP_UNICODE_BIDI: {
-        HANDLE_INHERIT_AND_INITIAL(tqunicodeBidi, UnicodeBidi)
+        HANDLE_INHERIT_AND_INITIAL(unicodeBidi, UnicodeBidi)
         if(!primitiveValue) break;
         switch (primitiveValue->getIdent()) {
             case CSS_VAL_NORMAL:
@@ -2772,7 +2772,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
 		    col = colorForCSSValue( ident );
 	    } else if ( primitiveValue->primitiveType() == CSSPrimitiveValue::CSS_RGBCOLOR ) {
 #ifndef APPLE_CHANGES
-		if(tqAlpha(primitiveValue->getRGBColorValue()))
+		if(qAlpha(primitiveValue->getRGBColorValue()))
 #endif
 		    col.setRgb(primitiveValue->getRGBColorValue());
 	    } else {
@@ -3241,7 +3241,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
         if (size < 0) return;
 
         // we never want to get smaller than the minimum font size to keep fonts readable
-        // do not however maximize zero as that is commonly used for fancy tqlayouting purposes
+        // do not however maximize zero as that is commonly used for fancy layouting purposes
         if (size && size < minFontSize) size = minFontSize;
 
         //kdDebug( 6080 ) << "computed raw font size: " << size << endl;
diff --git a/khtml/css/cssstyleselector.h b/khtml/css/cssstyleselector.h
index 5b9946342..23d854bc0 100644
--- a/khtml/css/cssstyleselector.h
+++ b/khtml/css/cssstyleselector.h
@@ -76,7 +76,7 @@ namespace khtml
 
     /**
      * this class selects a RenderStyle for a given Element based on the
-     * collection of stylesheets it tqcontains. This is just a virtual base class
+     * collection of stylesheets it contains. This is just a virtual base class
      * for specific implementations of the Selector. At the moment only CSSStyleSelector
      * exists, but someone may wish to implement XSL...
      */
@@ -136,7 +136,7 @@ namespace khtml
 
 	bool strictParsing;
 	struct Encodedurl {
-	    TQString host; //also tqcontains protocol
+	    TQString host; //also contains protocol
 	    TQString path;
 	    TQString file;
 	} encodedurl;
@@ -290,7 +290,7 @@ public:
 	unsigned int selector;
 	unsigned int position;
 
-	TQ_UINT32 priority;
+	Q_UINT32 priority;
     };
 
     /*
diff --git a/khtml/css/cssvalues.c b/khtml/css/cssvalues.c
index f841c05b0..7368d1869 100644
--- a/khtml/css/cssvalues.c
+++ b/khtml/css/cssvalues.c
@@ -1,5 +1,5 @@
 /* ANSI-C code produced by gperf version 3.0.2 */
-/* Command-line: gperf -L ANSI-C -E -c -C -n -o -t -k '*' -NtqfindValue -Hhash_val -Wwordlist_value -D cssvalues.gperf  */
+/* Command-line: gperf -L ANSI-C -E -c -C -n -o -t -k '*' -NfindValue -Hhash_val -Wwordlist_value -D cssvalues.gperf  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
       && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
@@ -39,7 +39,7 @@ struct css_value {
     int id;
 };
 
-static const css_value* tqfindValue (register const char *str, register unsigned int len);
+static const css_value* findValue (register const char *str, register unsigned int len);
 /* maximum key range = 2876, duplicates = 0 */
 
 #ifdef __GNUC__
@@ -177,7 +177,7 @@ hash_val (register const char *str, register unsigned int len)
 __inline
 #endif
 const struct css_value *
-tqfindValue (register const char *str, register unsigned int len)
+findValue (register const char *str, register unsigned int len)
 {
   enum
     {
diff --git a/khtml/css/cssvalues.in b/khtml/css/cssvalues.in
index ac5f4f276..1ad99c38d 100644
--- a/khtml/css/cssvalues.in
+++ b/khtml/css/cssvalues.in
@@ -175,7 +175,7 @@ text-top
 text-bottom
 top
 bottom
-# HTML tqalignment MIDDLE has no corresponding CSS tqalignment
+# HTML alignment MIDDLE has no corresponding CSS alignment
 -khtml-baseline-middle
 #
 # CSS_PROP_TEXT_ALIGN:
diff --git a/khtml/css/html4.css b/khtml/css/html4.css
index 0829ccab4..c3fd1a347 100644
--- a/khtml/css/html4.css
+++ b/khtml/css/html4.css
@@ -477,7 +477,7 @@ a:visited:active          { color: red; outline: 1px dotted invert; }
 :before,:after  { white-space: pre-line }
 */
 
-/* ### use this to tqreplace renderbr
+/* ### use this to replace renderbr
       br:before       { content: "\n" }
 */
 
@@ -486,27 +486,27 @@ a:visited:active          { color: red; outline: 1px dotted invert; }
 
 bdo[dir="ltr"]  {
 	direction: ltr;
-	tqunicode-bidi: bidi-override;
+	unicode-bidi: bidi-override;
 }
 
 bdo[dir="rtl"]  {
 	direction: rtl;
-	tqunicode-bidi: bidi-override;
+	unicode-bidi: bidi-override;
 }
 
 /* ### this selector seems to be still broken ...
-      *[dir="ltr"]    { direction: ltr; tqunicode-bidi: embed }
-      *[dir="rtl"]    { direction: rtl; tqunicode-bidi: embed }
+      *[dir="ltr"]    { direction: ltr; unicode-bidi: embed }
+      *[dir="rtl"]    { direction: rtl; unicode-bidi: embed }
 */
 
 /* elements that are block-level in html4 */
-/* ### don't support tqunicode-bidi at the moment
+/* ### don't support unicode-bidi at the moment
       address, blockquote, body, dd, div, dl, dt, fieldset,
       form, frame, frameset, h1, h2, h3, h4, h5, h6, iframe,
       noscript, noframes, object, ol, p, ul, applet, center,
       dir, hr, menu, pre, li, table, tr, thead, tbody, tfoot,
       col, colgroup, td, th, caption
-                      { tqunicode-bidi: embed }
+                      { unicode-bidi: embed }
 */
 
 /* end bidi settings */
diff --git a/khtml/css/makeprop b/khtml/css/makeprop
index df0f42764..a1a30ac97 100644
--- a/khtml/css/makeprop
+++ b/khtml/css/makeprop
@@ -23,7 +23,7 @@
 #
 grep "^[^\#]" cssproperties.in > cssproperties.strip
 
-echo -e '%{\n/* This file is automatically generated from cssproperties.in by makeprop, do not edit */\n/* Copyright 1999 W. Bastian */\n#include "cssproperties.h"\n%}\nstruct props {\n    const char *name;\n    int id;\n};\n\nstatic const struct props * tqfindProp (register const char *str, register unsigned int len);\n\n%%' > cssproperties.gperf
+echo -e '%{\n/* This file is automatically generated from cssproperties.in by makeprop, do not edit */\n/* Copyright 1999 W. Bastian */\n#include "cssproperties.h"\n%}\nstruct props {\n    const char *name;\n    int id;\n};\n\nstatic const struct props * findProp (register const char *str, register unsigned int len);\n\n%%' > cssproperties.gperf
 cat cssproperties.strip | awk '{ do { prop = $0; gsub("-", "_"); print prop ", CSS_PROP_" toupper($0) } while (getline) }' >> cssproperties.gperf
 echo '%%' >> cssproperties.gperf
 echo -e '/* This file is automatically generated from cssproperties.in by makeprop, do not edit */\n/* Copyright 1998 W. Bastian */\n\n#ifndef CSSPROPERTIES_H\n#define CSSPROPERTIES_H\n\nDOM::DOMString getPropertyName(unsigned short id) KDE_NO_EXPORT;\n' > cssproperties.h
@@ -36,7 +36,7 @@ print ""; \
 print "#define CSS_PROP_MAX CSS_PROP_Z_INDEX"; \
 print "#define CSS_PROP_TOTAL " i \
 }' >> cssproperties.h
-gperf -a -L 'ANSI-C' -E -C -c -o -t -k '*' -NtqfindProp -Hhash_prop -Wwordlist_prop -D -s 2 cssproperties.gperf > cssproperties.c || exit 1
+gperf -a -L 'ANSI-C' -E -C -c -o -t -k '*' -NfindProp -Hhash_prop -Wwordlist_prop -D -s 2 cssproperties.gperf > cssproperties.c || exit 1
 echo -e '#endif\n' >> cssproperties.h
 
 cat cssproperties.strip | awk '{ \
diff --git a/khtml/css/makevalues b/khtml/css/makevalues
index 2feedf15c..0f81f1612 100755
--- a/khtml/css/makevalues
+++ b/khtml/css/makevalues
@@ -24,7 +24,7 @@
 #
 grep "^[^\#]" cssvalues.in > cssvalues.strip
 
-echo -e '%{\n/* This file is automatically generated from cssvalues.in by makevalues, do not edit */\n/* Copyright 1999 W. Bastian */\n#include "cssvalues.h"\n%}\nstruct css_value {\n    const char *name;\n    int id;\n};\n\nstatic const css_value* tqfindValue (register const char *str, register unsigned int len);\n\n%%' > cssvalues.gperf
+echo -e '%{\n/* This file is automatically generated from cssvalues.in by makevalues, do not edit */\n/* Copyright 1999 W. Bastian */\n#include "cssvalues.h"\n%}\nstruct css_value {\n    const char *name;\n    int id;\n};\n\nstatic const css_value* findValue (register const char *str, register unsigned int len);\n\n%%' > cssvalues.gperf
 cat cssvalues.strip | awk '{ do { prop = $0; gsub("-", "_"); print prop ", CSS_VAL_" toupper($0) } while (getline) }' >> cssvalues.gperf
 echo '%%' >> cssvalues.gperf
 echo -e '/* This file is automatically generated from cssvalues.in by
@@ -37,7 +37,7 @@ do { gsub("-", "_"); print "#define CSS_VAL_" toupper($0) " " i; i = i + 1 } whi
 print ""; \
 print "#define CSS_VAL_TOTAL " i \
 }' >> cssvalues.h
-gperf -L 'ANSI-C' -E -c -C -n -o -t -k '*' -NtqfindValue -Hhash_val -Wwordlist_value -D cssvalues.gperf > cssvalues.c || exit 1
+gperf -L 'ANSI-C' -E -c -C -n -o -t -k '*' -NfindValue -Hhash_val -Wwordlist_value -D cssvalues.gperf > cssvalues.c || exit 1
 echo -e '#endif\n' >> cssvalues.h
 
 cat cssvalues.strip | awk '{ \
diff --git a/khtml/css/parser.cpp b/khtml/css/parser.cpp
index 6cda882ea..c0e6f5869 100644
--- a/khtml/css/parser.cpp
+++ b/khtml/css/parser.cpp
@@ -210,7 +210,7 @@ using namespace DOM;
 
 //
 // The following file defines the function
-//     const struct props *tqfindProp(const char *word, int len)
+//     const struct props *findProp(const char *word, int len)
 //
 // with 'props->id' a CSS property in the range from CSS_PROP_MIN to
 // (and including) CSS_PROP_TOTAL-1
@@ -224,7 +224,7 @@ using namespace DOM;
 
 int DOM::getPropertyID(const char *tagStr, int len)
 {
-    const struct props *propsPtr = tqfindProp(tagStr, len);
+    const struct props *propsPtr = findProp(tagStr, len);
     if (!propsPtr)
         return 0;
 
@@ -233,7 +233,7 @@ int DOM::getPropertyID(const char *tagStr, int len)
 
 static inline int getValueID(const char *tagStr, int len)
 {
-    const struct css_value *val = tqfindValue(tagStr, len);
+    const struct css_value *val = findValue(tagStr, len);
     if (!val)
         return 0;
 
diff --git a/khtml/css/parser.y b/khtml/css/parser.y
index 88df3cceb..50e558db9 100644
--- a/khtml/css/parser.y
+++ b/khtml/css/parser.y
@@ -45,7 +45,7 @@ using namespace DOM;
 
 //
 // The following file defines the function
-//     const struct props *tqfindProp(const char *word, int len)
+//     const struct props *findProp(const char *word, int len)
 //
 // with 'props->id' a CSS property in the range from CSS_PROP_MIN to
 // (and including) CSS_PROP_TOTAL-1
@@ -59,7 +59,7 @@ using namespace DOM;
 
 int DOM::getPropertyID(const char *tagStr, int len)
 {
-    const struct props *propsPtr = tqfindProp(tagStr, len);
+    const struct props *propsPtr = findProp(tagStr, len);
     if (!propsPtr)
         return 0;
 
@@ -68,7 +68,7 @@ int DOM::getPropertyID(const char *tagStr, int len)
 
 static inline int getValueID(const char *tagStr, int len)
 {
-    const struct css_value *val = tqfindValue(tagStr, len);
+    const struct css_value *val = findValue(tagStr, len);
     if (!val)
         return 0;
 
@@ -808,7 +808,7 @@ pseudo:
         $$->string_arg = domString($3);
         $$->value = domString($2);
     }
-    // used by :tqcontains
+    // used by :contains
     | ':' FUNCTION STRING ')' {
         $$ = new CSSSelector();
         $$->match = CSSSelector::PseudoClass;
diff --git a/khtml/css/tokenizer.cpp b/khtml/css/tokenizer.cpp
index 34a586d49..493a98032 100644
--- a/khtml/css/tokenizer.cpp
+++ b/khtml/css/tokenizer.cpp
@@ -634,7 +634,7 @@ yy_match:
 			}
 		while ( yy_base[yy_current_state] != 1638 );
 
-yy_tqfind_action:
+yy_find_action:
 		yy_act = yy_accept[yy_current_state];
 		if ( yy_act == 0 )
 			{ /* have to back up */
@@ -656,7 +656,7 @@ do_action:	/* This label is used only to access EOF actions. */
 			*yy_cp = yy_hold_char;
 			yy_cp = yy_last_accepting_cpos;
 			yy_current_state = yy_last_accepting_state;
-			goto yy_tqfind_action;
+			goto yy_find_action;
 
 case 1:
 YY_RULE_SETUP
diff --git a/khtml/css/tokenizer.flex b/khtml/css/tokenizer.flex
index 074862a23..3c24d8e07 100644
--- a/khtml/css/tokenizer.flex
+++ b/khtml/css/tokenizer.flex
@@ -4,8 +4,8 @@
 
 h               [0-9a-fA-F]
 nonascii        [\200-\377]
-tqunicode         \\{h}{1,6}[ \t\r\n\f]?
-escape          {tqunicode}|\\[ -~\200-\377]
+unicode         \\{h}{1,6}[ \t\r\n\f]?
+escape          {unicode}|\\[ -~\200-\377]
 nmstart         [_a-zA-Z]|{nonascii}|{escape}
 nmchar          [_a-zA-Z0-9-]|{nonascii}|{escape}
 string1         \"([\t !#$%&(-~]|\\{nl}|\'|{nonascii}|{escape})*\"
diff --git a/khtml/dom/css_extensions.cpp b/khtml/dom/css_extensions.cpp
index 01a47d5f1..23f7739dc 100644
--- a/khtml/dom/css_extensions.cpp
+++ b/khtml/dom/css_extensions.cpp
@@ -1881,15 +1881,15 @@ void CSS2Properties::setTop( const DOMString &value )
     if(impl) ((ElementImpl *)impl)->setAttribute("top", value);
 }
 
-DOMString CSS2Properties::tqunicodeBidi() const
+DOMString CSS2Properties::unicodeBidi() const
 {
     if(!impl) return 0;
-    return ((ElementImpl *)impl)->getAttribute("tqunicodeBidi");
+    return ((ElementImpl *)impl)->getAttribute("unicodeBidi");
 }
 
 void CSS2Properties::setUnicodeBidi( const DOMString &value )
 {
-    if(impl) ((ElementImpl *)impl)->setAttribute("tqunicodeBidi", value);
+    if(impl) ((ElementImpl *)impl)->setAttribute("unicodeBidi", value);
 }
 
 DOMString CSS2Properties::verticalAlign() const
diff --git a/khtml/dom/css_extensions.h b/khtml/dom/css_extensions.h
index c236c6a14..a6cdb2149 100644
--- a/khtml/dom/css_extensions.h
+++ b/khtml/dom/css_extensions.h
@@ -61,7 +61,7 @@ public:
 
     /**
      * If \c azimuthType is \c CSS_IDENT ,
-     * \c identifier tqcontains one of left-side, far-left,
+     * \c identifier contains one of left-side, far-left,
      * left, center-left, center, center-right, right, far-right,
      * right-side, leftwards, rightwards. The empty string if none is
      * set.
@@ -184,8 +184,8 @@ public:
 
     /**
      * If \c horizontalType is \c CSS_IDENT or
-     * \c CSS_INHERIT , this attribute tqcontains the string
-     * representation of the ident, otherwise it tqcontains an empty
+     * \c CSS_INHERIT , this attribute contains the string
+     * representation of the ident, otherwise it contains an empty
      * string.
      *
      */
@@ -193,8 +193,8 @@ public:
 
     /**
      * If \c verticalType is \c CSS_IDENT or
-     * \c CSS_INHERIT , this attribute tqcontains the string
-     * representation of the ident, otherwise it tqcontains an empty
+     * \c CSS_INHERIT , this attribute contains the string
+     * representation of the ident, otherwise it contains an empty
      * string. The value is \c "center" if only the
      * horizontalIdentifier has been set. The value is
      * \c "inherit" if the horizontalIdentifier is
@@ -572,8 +572,8 @@ public:
      * A code defining the type of the property. It would one of
      * \c CSS_UNKNOWN or \c CSS_INHERIT . If
      * the type is \c CSS_UNKNOWN , then \c uris
-     * tqcontains a list of URIs and \c predefinedCursor
-     * tqcontains an ident. Setting this attribute from
+     * contains a list of URIs and \c predefinedCursor
+     * contains an ident. Setting this attribute from
      * \c CSS_INHERIT to \c CSS_UNKNOWN will set the
      * \c predefinedCursor to \c "auto" .
      *
@@ -654,7 +654,7 @@ public:
     void setUri( const DOM::DOMString & );
 
     /**
-     * This attribute tqcontains a list of strings for the format CSS
+     * This attribute contains a list of strings for the format CSS
      * function.
      *
      */
@@ -776,8 +776,8 @@ public:
 
     /**
      * If \c width is \c CSS_IDENT or
-     * \c CSS_INHERIT , this attribute tqcontains the string
-     * representation of the ident, otherwise it tqcontains an empty
+     * \c CSS_INHERIT , this attribute contains the string
+     * representation of the ident, otherwise it contains an empty
      * string.
      *
      */
@@ -2424,8 +2424,8 @@ public:
 
     /**
      * See the <a
-     * href="http://www.w3.org/TR/REC-CSS2/tables.html#propdef-table-tqlayout">
-     * table-tqlayout property definition </a> in CSS2.
+     * href="http://www.w3.org/TR/REC-CSS2/tables.html#propdef-table-layout">
+     * table-layout property definition </a> in CSS2.
      *
      */
     DOM::DOMString tableLayout() const;
@@ -2515,14 +2515,14 @@ public:
 
     /**
      * See the <a
-     * href="http://www.w3.org/TR/REC-CSS2/visuren.html#propdef-tqunicode-bidi">
-     * tqunicode-bidi property definition </a> in CSS2.
+     * href="http://www.w3.org/TR/REC-CSS2/visuren.html#propdef-unicode-bidi">
+     * unicode-bidi property definition </a> in CSS2.
      *
      */
-    DOM::DOMString tqunicodeBidi() const;
+    DOM::DOMString unicodeBidi() const;
 
     /**
-     * see tqunicodeBidi
+     * see unicodeBidi
      */
     void setUnicodeBidi( const DOM::DOMString & );
 
diff --git a/khtml/dom/css_rule.h b/khtml/dom/css_rule.h
index 1a737933d..5f27e8f8a 100644
--- a/khtml/dom/css_rule.h
+++ b/khtml/dom/css_rule.h
@@ -111,7 +111,7 @@ public:
     void setCssText( const DOM::DOMString & );
 
     /**
-     * The style sheet that tqcontains this rule.
+     * The style sheet that contains this rule.
      *
      */
     CSSStyleSheet parentStyleSheet() const;
@@ -299,7 +299,7 @@ public:
      * Used to insert a new rule into the media block.
      *
      * @param rule The parsable text representing the rule. For rule
-     * sets this tqcontains both the selector and the style declaration.
+     * sets this contains both the selector and the style declaration.
      * For at-rules, this specifies both the at-identifier and the
      * rule content.
      *
diff --git a/khtml/dom/css_stylesheet.h b/khtml/dom/css_stylesheet.h
index d18ad6ec7..33b380ef9 100644
--- a/khtml/dom/css_stylesheet.h
+++ b/khtml/dom/css_stylesheet.h
@@ -247,7 +247,7 @@ public:
      * now becomes part of the cascade.
      *
      * @param rule The parsable text representing the rule. For rule
-     * sets this tqcontains both the selector and the style declaration.
+     * sets this contains both the selector and the style declaration.
      * For at-rules, this specifies both the at-identifier and the
      * rule content.
      *
@@ -425,7 +425,7 @@ public:
      * @param newMedium The new medium to add.
      *
      * @exception DOMException
-     * INVALID_CHARACTER_ERR: If the medium tqcontains characters that are
+     * INVALID_CHARACTER_ERR: If the medium contains characters that are
      * invalid in the underlying style language.
      *
      * NO_MODIFICATION_ALLOWED_ERR: Raised if this list is readonly.
diff --git a/khtml/dom/css_value.cpp b/khtml/dom/css_value.cpp
index 20faff88a..de450e861 100644
--- a/khtml/dom/css_value.cpp
+++ b/khtml/dom/css_value.cpp
@@ -126,7 +126,7 @@ void CSSStyleDeclaration::setProperty( const DOMString &propName, const DOMStrin
     if (!id) return;
     bool important = false;
     TQString str = priority.string();
-    if (str.tqfind("important", 0, false) != -1)
+    if (str.find("important", 0, false) != -1)
         important = true;
 
     static_cast<CSSStyleDeclarationImpl *>(impl)->setProperty( id, value, important );
@@ -500,17 +500,17 @@ RGBColor::~RGBColor()
 
 CSSPrimitiveValue RGBColor::red() const
 {
-    return new CSSPrimitiveValueImpl(float(tqAlpha(m_color) ? tqRed(m_color) : 0), CSSPrimitiveValue::CSS_DIMENSION);
+    return new CSSPrimitiveValueImpl(float(qAlpha(m_color) ? qRed(m_color) : 0), CSSPrimitiveValue::CSS_DIMENSION);
 }
 
 CSSPrimitiveValue RGBColor::green() const
 {
-    return new CSSPrimitiveValueImpl(float(tqAlpha(m_color) ? tqGreen(m_color) : 0), CSSPrimitiveValue::CSS_DIMENSION);
+    return new CSSPrimitiveValueImpl(float(qAlpha(m_color) ? qGreen(m_color) : 0), CSSPrimitiveValue::CSS_DIMENSION);
 }
 
 CSSPrimitiveValue RGBColor::blue() const
 {
-    return new CSSPrimitiveValueImpl(float(tqAlpha(m_color) ? tqBlue(m_color) : 0), CSSPrimitiveValue::CSS_DIMENSION);
+    return new CSSPrimitiveValueImpl(float(qAlpha(m_color) ? qBlue(m_color) : 0), CSSPrimitiveValue::CSS_DIMENSION);
 }
 
 
diff --git a/khtml/dom/css_value.h b/khtml/dom/css_value.h
index d31155f95..5d4a043c7 100644
--- a/khtml/dom/css_value.h
+++ b/khtml/dom/css_value.h
@@ -99,7 +99,7 @@ public:
     unsigned long length() const;
 
     /**
-     * The CSS rule that tqcontains this declaration block.
+     * The CSS rule that contains this declaration block.
      *
      */
     CSSRule parentRule() const;
@@ -633,7 +633,7 @@ class RectImpl;
 
 /**
  * The \c Rect interface is used to represent any <a
- * href="http://www.w3.org/TR/REC-CSS2/visufx.html#value-def-tqshape">
+ * href="http://www.w3.org/TR/REC-CSS2/visufx.html#value-def-shape">
  * rect </a> value. This interface reflects the values in the
  * underlying style property. Hence, modifications made through this
  * interface modify the style property.
diff --git a/khtml/dom/dom2_events.h b/khtml/dom/dom2_events.h
index 06c008818..285a0c10e 100644
--- a/khtml/dom/dom2_events.h
+++ b/khtml/dom/dom2_events.h
@@ -70,8 +70,8 @@ public:
      * This method is called whenever an event occurs of the type for which the
      * EventListener interface was registered. Parameters
      *
-     * @param evt The Event tqcontains contextual information about the event. It
-     * also tqcontains the stopPropagation and preventDefault methods which are
+     * @param evt The Event contains contextual information about the event. It
+     * also contains the stopPropagation and preventDefault methods which are
      * used in determining the event's flow and default action.
      *
      */
diff --git a/khtml/dom/dom2_traversal.h b/khtml/dom/dom2_traversal.h
index 59cec9016..d2d3abf48 100644
--- a/khtml/dom/dom2_traversal.h
+++ b/khtml/dom/dom2_traversal.h
@@ -533,7 +533,7 @@ protected:
 // Document
 
 /**
- * \c DocumentTraversal tqcontains methods that creates
+ * \c DocumentTraversal contains methods that creates
  * Iterators to traverse a node and its children in document order
  * (depth first, pre-order traversal, which is equivalent to the order
  * in which the start tags occur in the text representation of the
diff --git a/khtml/dom/dom2_views.h b/khtml/dom/dom2_views.h
index 3af4b0ad0..862cb9ef2 100644
--- a/khtml/dom/dom2_views.h
+++ b/khtml/dom/dom2_views.h
@@ -69,7 +69,7 @@ public:
      * @param pseudoElt The pseudo-element or null if none.
      *
      * @return The computed style. The CSSStyleDeclaration is read-only and
-     * tqcontains only absolute values.
+     * contains only absolute values.
      */
     CSSStyleDeclaration getComputedStyle(const Element &elt, const DOMString &pseudoElt);
 
diff --git a/khtml/dom/dom_doc.cpp b/khtml/dom/dom_doc.cpp
index 088a7a94a..0ff123444 100644
--- a/khtml/dom/dom_doc.cpp
+++ b/khtml/dom/dom_doc.cpp
@@ -112,8 +112,8 @@ HTMLDocument DOMImplementation::createHTMLDocument( const DOMString& title )
 
     r->open();
 
-    r->write(TQString::tqfromLatin1("<HTML><HEAD><TITLE>") + title.string() +
-             TQString::tqfromLatin1("</TITLE></HEAD>"));
+    r->write(TQString::fromLatin1("<HTML><HEAD><TITLE>") + title.string() +
+             TQString::fromLatin1("</TITLE></HEAD>"));
 
     return r;
 }
diff --git a/khtml/dom/dom_doc.h b/khtml/dom/dom_doc.h
index fd64253f5..9a5331295 100644
--- a/khtml/dom/dom_doc.h
+++ b/khtml/dom/dom_doc.h
@@ -122,7 +122,7 @@ public:
      * @return A new DocumentType node with Node.ownerDocument set to null.
      *
      * @exception DOMException
-     * INVALID_CHARACTER_ERR: Raised if the specified qualified name tqcontains
+     * INVALID_CHARACTER_ERR: Raised if the specified qualified name contains
      * an illegal character.
      *
      * NAMESPACE_ERR: Raised if the qualifiedName is malformed.
@@ -150,7 +150,7 @@ public:
      * @return A new Document object.
      *
      * @exception DOMException
-     * INVALID_CHARACTER_ERR: Raised if the specified qualified name tqcontains
+     * INVALID_CHARACTER_ERR: Raised if the specified qualified name contains
      * an illegal character.
      *
      * NAMESPACE_ERR: Raised if the qualifiedName is malformed, if the
@@ -235,7 +235,7 @@ protected:
  *
  *  Since elements, text nodes, comments, processing instructions,
  * etc. cannot exist outside the context of a \c Document
- * , the \c Document interface also tqcontains the factory
+ * , the \c Document interface also contains the factory
  * methods needed to create these objects. The \c Node
  * objects created have a \c ownerDocument attribute which
  * associates them with the \c Document within whose
@@ -309,7 +309,7 @@ public:
      * @return A new \c Element object.
      *
      * @exception DOMException
-     * INVALID_CHARACTER_ERR: Raised if the specified name tqcontains an
+     * INVALID_CHARACTER_ERR: Raised if the specified name contains an
      * invalid character.
      *
      */
@@ -326,7 +326,7 @@ public:
      * @return A new Element object with the following attributes:
      *
      * @exception INVALID_CHARACTER_ERR Raised if the specified qualified name
-     * tqcontains an illegal character.
+     * contains an illegal character.
      *
      * @exception NAMESPACE_ERR Raised if the qualifiedName is malformed, if
      * the qualifiedName has a prefix and the namespaceURI is null, or if the
@@ -411,7 +411,7 @@ public:
      * @return A new \c Attr object.
      *
      * @exception DOMException
-     * INVALID_CHARACTER_ERR: Raised if the specified name tqcontains an
+     * INVALID_CHARACTER_ERR: Raised if the specified name contains an
      * invalid character.
      *
      */
@@ -436,7 +436,7 @@ public:
      * Node.nodeValue - the empty string
      *
      * @exception INVALID_CHARACTER_ERR Raised if the specified qualified name
-     * tqcontains an illegal character.
+     * contains an illegal character.
      *
      * @exception NAMESPACE_ERR Raised if the qualifiedName is malformed, if
      * the qualifiedName has a prefix and the namespaceURI is null, if the
@@ -456,7 +456,7 @@ public:
      * @return The new \c EntityReference object.
      *
      * @exception DOMException
-     * INVALID_CHARACTER_ERR: Raised if the specified name tqcontains an
+     * INVALID_CHARACTER_ERR: Raised if the specified name contains an
      * invalid character.
      *
      *  NOT_SUPPORTED_ERR: Raised if this document is an HTML
diff --git a/khtml/dom/dom_element.h b/khtml/dom/dom_element.h
index a9f2f69a8..e6cc11877 100644
--- a/khtml/dom/dom_element.h
+++ b/khtml/dom/dom_element.h
@@ -148,7 +148,7 @@ public:
 
     /**
      * On retrieval, the value of the attribute is returned as a
-     * string. Character and general entity references are tqreplaced
+     * string. Character and general entity references are replaced
      * with their values.
      *
      *  On setting, this creates a \c Text node with the
@@ -188,10 +188,10 @@ class DOMString;
  * &lt;/elementExample&gt;
  *
  *  When represented using DOM, the top node is an \c Element
- * node for &quot;elementExample&quot;, which tqcontains two
+ * node for &quot;elementExample&quot;, which contains two
  * child \c Element nodes, one for &quot;subelement1&quot;
  * and one for &quot;subelement2&quot;. &quot;subelement1&quot;
- * tqcontains no child nodes.
+ * contains no child nodes.
  *
  *  Elements may have attributes associated with them; since the
  * \c Element interface inherits from \c Node
@@ -257,7 +257,7 @@ public:
      * recognized as an entity reference) is treated as literal text,
      * and needs to be appropriately escaped by the implementation
      * when it is written out. In order to assign an attribute value
-     * that tqcontains entity references, the user must create an
+     * that contains entity references, the user must create an
      * \c Attr node plus any \c Text and
      * \c EntityReference nodes, build the appropriate subtree,
      * and use \c setAttributeNode to assign it as the
@@ -270,7 +270,7 @@ public:
      * @return
      *
      * @exception DOMException
-     * INVALID_CHARACTER_ERR: Raised if the specified name tqcontains an
+     * INVALID_CHARACTER_ERR: Raised if the specified name contains an
      * invalid character.
      *
      *  NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
@@ -280,7 +280,7 @@ public:
 
     /**
      * Removes an attribute by name. If the removed attribute has a
-     * default value it is immediately tqreplaced.
+     * default value it is immediately replaced.
      *
      * @param name The name of the attribute to remove.
      *
@@ -306,12 +306,12 @@ public:
 
     /**
      * Adds a new attribute. If an attribute with that name is already
-     * present in the element, it is tqreplaced by the new one.
+     * present in the element, it is replaced by the new one.
      *
      * @param newAttr The \c Attr node to add to the
      * attribute list.
      *
-     * @return If the \c newAttr attribute tqreplaces an
+     * @return If the \c newAttr attribute replaces an
      * existing attribute with the same name, the previously existing
      * \c Attr node is returned, otherwise \c null
      * is returned.
@@ -336,7 +336,7 @@ public:
      *
      * @param oldAttr The \c Attr node to remove from the
      * attribute list. If the removed \c Attr has a
-     * default value it is immediately tqreplaced.
+     * default value it is immediately replaced.
      *
      * @return The \c Attr node that was removed.
      *
@@ -408,7 +408,7 @@ public:
      * as it is being set. So any markup (such as syntax to be recognized as an
      * entity reference) is treated as literal text, and needs to be
      * appropriately escaped by the implementation when it is written out. In
-     * order to assign an attribute value that tqcontains entity references, the
+     * order to assign an attribute value that contains entity references, the
      * user must create an Attr node plus any Text and EntityReference nodes,
      * build the appropriate subtree, and use setAttributeNodeNS or
      * setAttributeNode to assign it as the value of an attribute.
@@ -424,7 +424,7 @@ public:
      * @param value The value to set in string form.
      *
      * @exception DOMException
-     * INVALID_CHARACTER_ERR: Raised if the specified qualified name tqcontains
+     * INVALID_CHARACTER_ERR: Raised if the specified qualified name contains
      * an illegal character.
      *
      * NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
@@ -444,7 +444,7 @@ public:
      * Introduced in DOM Level 2
      *
      * Removes an attribute by local name and namespace URI. If the removed
-     * attribute has a default value it is immediately tqreplaced. The replacing
+     * attribute has a default value it is immediately replaced. The replacing
      * attribute has the same namespace URI and local name, as well as the
      * original prefix.
      *
@@ -480,15 +480,15 @@ public:
      * Introduced in DOM Level 2
      *
      * Adds a new attribute. If an attribute with that local name and that
-     * namespace URI is already present in the element, it is tqreplaced by the
+     * namespace URI is already present in the element, it is replaced by the
      * new one.
      *
      * HTML-only DOM implementations do not need to implement this method.
      *
      * @param newAttr The Attr node to add to the attribute list.
      *
-     * @return If the newAttr attribute tqreplaces an existing attribute with the
-     * same local name and namespace URI, the tqreplaced Attr node is returned,
+     * @return If the newAttr attribute replaces an existing attribute with the
+     * same local name and namespace URI, the replaced Attr node is returned,
      * otherwise null is returned.
      *
      * @exception DOMException
diff --git a/khtml/dom/dom_node.cpp b/khtml/dom/dom_node.cpp
index 90e6fa032..9971bdb00 100644
--- a/khtml/dom/dom_node.cpp
+++ b/khtml/dom/dom_node.cpp
@@ -266,11 +266,11 @@ Node Node::insertBefore( const Node &newChild, const Node &refChild )
     return r;
 }
 
-Node Node::tqreplaceChild( const Node &newChild, const Node &oldChild )
+Node Node::replaceChild( const Node &newChild, const Node &oldChild )
 {
     if (!impl) throw DOMException(DOMException::NOT_FOUND_ERR);
     int exceptioncode = 0;
-    impl->tqreplaceChild( newChild.impl, oldChild.impl, exceptioncode );
+    impl->replaceChild( newChild.impl, oldChild.impl, exceptioncode );
     if (exceptioncode)
 	throw DOMException(exceptioncode);
     if (newChild.impl && !newChild.impl->closed()) newChild.impl->close();
diff --git a/khtml/dom/dom_node.h b/khtml/dom/dom_node.h
index 4f8b23e0c..37889eec2 100644
--- a/khtml/dom/dom_node.h
+++ b/khtml/dom/dom_node.h
@@ -104,9 +104,9 @@ public:
      * @param arg A node to store in a named node map. The node will
      * later be accessible using the value of the \c nodeName
      * attribute of the node. If a node with that name is
-     * already present in the map, it is tqreplaced by the new one.
+     * already present in the map, it is replaced by the new one.
      *
-     * @return If the new \c Node tqreplaces an existing
+     * @return If the new \c Node replaces an existing
      * node with the same name the previously existing \c Node
      * is returned, otherwise \c null is returned.
      *
@@ -129,7 +129,7 @@ public:
     /**
      * Removes a node specified by name. If the removed node is an
      * \c Attr with a default value it is immediately
-     * tqreplaced.
+     * replaced.
      *
      * @param name The name of a node to remove.
      *
@@ -178,13 +178,13 @@ public:
      *
      * Adds a node using its namespaceURI and localName. If a node with that
      * namespace URI and that local name is already present in this map, it is
-     * tqreplaced by the new one.
+     * replaced by the new one.
      * HTML-only DOM implementations do not need to implement this method.
      *
      * @param arg A node to store in this map. The node will later be
      * accessible using the value of its namespaceURI and localName attributes.
      *
-     * @return If the new Node tqreplaces an existing node the tqreplaced Node is
+     * @return If the new Node replaces an existing node the replaced Node is
      * returned, otherwise null is returned.
      *
      * @exception DOMException
@@ -203,7 +203,7 @@ public:
      * Introduced in DOM Level 2
      *
      * Removes a node specified by local name and namespace URI. A removed
-     * attribute may be known to have a default value when this map tqcontains
+     * attribute may be known to have a default value when this map contains
      * the attributes attached to an element, as returned by the attributes
      * attribute of the Node interface. If so, an attribute immediately appears
      * containing the default value as well as the corresponding namespace URI,
@@ -442,7 +442,7 @@ public:
     Node parentNode() const;
 
     /**
-     * A \c NodeList that tqcontains all children of this
+     * A \c NodeList that contains all children of this
      * node. If there are no children, this is a \c NodeList
      * containing no nodes. The content of the returned
      * \c NodeList is &quot;live&quot; in the sense that, for
@@ -545,9 +545,9 @@ public:
      *
      * @param newChild The new node to put in the child list.
      *
-     * @param oldChild The node being tqreplaced in the list.
+     * @param oldChild The node being replaced in the list.
      *
-     * @return The node tqreplaced.
+     * @return The node replaced.
      *
      * @exception DOMException
      * HIERARCHY_REQUEST_ERR: Raised if this node is of a type that
@@ -565,7 +565,7 @@ public:
      * child of this node.
      *
      */
-    Node tqreplaceChild ( const Node &newChild, const Node &oldChild );
+    Node replaceChild ( const Node &newChild, const Node &oldChild );
 
     /**
      * Removes the child node indicated by \c oldChild
@@ -630,7 +630,7 @@ public:
      *  Cloning an \c Element copies all attributes and
      * their values, including those generated by the XML processor to
      * represent defaulted attributes, but this method does not copy
-     * any text it tqcontains unless it is a deep clone, since the text
+     * any text it contains unless it is a deep clone, since the text
      * is contained in a child \c Text node. Cloning any
      * other type of node simply returns a copy of this node.
      *
@@ -657,7 +657,7 @@ public:
      * [XPointer] lookups) that depend on a particular document tree structure
      * are to be used.
      *
-     * Note: In cases where the document tqcontains CDATASections, the normalize
+     * Note: In cases where the document contains CDATASections, the normalize
      * operation alone may not be sufficient, since XPointers do not
      * differentiate between Text nodes and CDATASection nodes.
      */
@@ -722,7 +722,7 @@ public:
      * see prefix
      *
      * @exception DOMException
-     * INVALID_CHARACTER_ERR: Raised if the specified prefix tqcontains an
+     * INVALID_CHARACTER_ERR: Raised if the specified prefix contains an
      * illegal character.
      *
      * NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
@@ -770,7 +770,7 @@ public:
      * @see textContent
      *
      * On setting, any possible children this node may have are removed and, if the new 
-     * string is not empty or null, tqreplaced by a single Text node containing the string this attribute is set to. 
+     * string is not empty or null, replaced by a single Text node containing the string this attribute is set to. 
      * No parsing is performed, the input string is taken as pure textual content.
      *
      * @exception DOMException
@@ -801,7 +801,7 @@ public:
      * @param type The event type for which the user is registering
      *
      * @param listener The listener parameter takes an interface implemented by
-     * the user which tqcontains the methods to be called when the event occurs.
+     * the user which contains the methods to be called when the event occurs.
      *
      * @param useCapture If true, useCapture indicates that the user wishes to
      * initiate capture. After initiating capture, all events of the specified
@@ -875,7 +875,7 @@ public:
      * not part of the DOM.
      * @returns the element id, in case this is an element, 0 otherwise
      */
-    TQ_UINT32 elementId() const;
+    Q_UINT32 elementId() const;
 
     /**
      * tests if this Node is 0. Useful especially, if casting to a derived
diff --git a/khtml/dom/dom_string.cpp b/khtml/dom/dom_string.cpp
index 2108d872f..14bdc2613 100644
--- a/khtml/dom/dom_string.cpp
+++ b/khtml/dom/dom_string.cpp
@@ -39,7 +39,7 @@ DOMString::DOMString(const TQString &str)
 	return;
     }
 
-    impl = new DOMStringImpl( str.tqunicode(), str.length() );
+    impl = new DOMStringImpl( str.unicode(), str.length() );
     impl->ref();
 }
 
@@ -136,7 +136,7 @@ const TQChar &DOMString::operator [](unsigned int i) const
     return *(impl->s+i);
 }
 
-int DOMString::tqfind(const TQChar c, int start) const
+int DOMString::find(const TQChar c, int start) const
 {
     unsigned int l = start;
     if(!impl || l >= impl->l ) return -1;
@@ -193,10 +193,10 @@ bool DOMString::percentage(int &_percentage) const
     return true;
 }
 
-TQChar *DOMString::tqunicode() const
+TQChar *DOMString::unicode() const
 {
     if(!impl) return 0;
-    return impl->tqunicode();
+    return impl->unicode();
 }
 
 TQString DOMString::string() const
@@ -225,8 +225,8 @@ bool DOM::strcasecmp( const DOMString &as, const DOMString &bs )
 {
     if ( as.length() != bs.length() ) return true;
 
-    const TQChar *a = as.tqunicode();
-    const TQChar *b = bs.tqunicode();
+    const TQChar *a = as.unicode();
+    const TQChar *b = bs.unicode();
     if ( a == b )  return false;
     if ( !( a && b ) )  return true;
     int l = as.length();
@@ -239,7 +239,7 @@ bool DOM::strcasecmp( const DOMString &as, const DOMString &bs )
 
 bool DOM::strcasecmp( const DOMString &as, const char* bs )
 {
-    const TQChar *a = as.tqunicode();
+    const TQChar *a = as.unicode();
     int l = as.length();
     if ( !bs ) return ( l != 0 );
     while ( l-- ) {
@@ -265,7 +265,7 @@ bool DOM::operator==( const DOMString &a, const DOMString &b )
 
     if( l != b.length() ) return false;
 
-    if(!memcmp(a.tqunicode(), b.tqunicode(), l*sizeof(TQChar)))
+    if(!memcmp(a.unicode(), b.unicode(), l*sizeof(TQChar)))
 	return true;
     return false;
 }
@@ -276,7 +276,7 @@ bool DOM::operator==( const DOMString &a, const TQString &b )
 
     if( l != b.length() ) return false;
 
-    if(!memcmp(a.tqunicode(), b.tqunicode(), l*sizeof(TQChar)))
+    if(!memcmp(a.unicode(), b.unicode(), l*sizeof(TQChar)))
 	return true;
     return false;
 }
@@ -291,7 +291,7 @@ bool DOM::operator==( const DOMString &a, const char *b )
         const TQChar *aptr = aimpl->s;
         while ( alen-- ) {
             unsigned char c = *b++;
-            if ( !c || ( *aptr++ ).tqunicode() != c )
+            if ( !c || ( *aptr++ ).unicode() != c )
                 return false;
         }
     }
diff --git a/khtml/dom/dom_string.h b/khtml/dom/dom_string.h
index 137830b1a..3fe725f68 100644
--- a/khtml/dom/dom_string.h
+++ b/khtml/dom/dom_string.h
@@ -78,7 +78,7 @@ public:
      */
     const TQChar &operator [](unsigned int i) const;
 
-    int tqfind(const TQChar c, int start = 0) const;
+    int find(const TQChar c, int start = 0) const;
 
     uint length() const;
     void truncate( unsigned int len );
@@ -97,7 +97,7 @@ public:
      */
     DOMString upper() const;
 
-    TQChar *tqunicode() const;
+    TQChar *unicode() const;
     TQString string() const;
 
     int toInt() const;
diff --git a/khtml/dom/dom_text.cpp b/khtml/dom/dom_text.cpp
index 146791d7f..af4584410 100644
--- a/khtml/dom/dom_text.cpp
+++ b/khtml/dom/dom_text.cpp
@@ -131,13 +131,13 @@ void CharacterData::deleteData( const unsigned long offset, const unsigned long
 	throw DOMException( exceptioncode );
 }
 
-void CharacterData::tqreplaceData( const unsigned long offset, const unsigned long count, const DOMString &arg )
+void CharacterData::replaceData( const unsigned long offset, const unsigned long count, const DOMString &arg )
 {
     if (!impl)
 	return; // ### enable throw DOMException(DOMException::NOT_FOUND_ERR);
 
     int exceptioncode = 0;
-    ((CharacterDataImpl *)impl)->tqreplaceData(offset, count, arg, exceptioncode);
+    ((CharacterDataImpl *)impl)->replaceData(offset, count, arg, exceptioncode);
     if ( exceptioncode )
 	throw DOMException( exceptioncode );
 }
diff --git a/khtml/dom/dom_text.h b/khtml/dom/dom_text.h
index c5db2ed4c..c6f92fb1d 100644
--- a/khtml/dom/dom_text.h
+++ b/khtml/dom/dom_text.h
@@ -183,15 +183,15 @@ public:
      *
      * @param offset The offset from which to start replacing.
      *
-     * @param count The number of characters to tqreplace. If the sum of
+     * @param count The number of characters to replace. If the sum of
      * \c offset and \c count exceeds
      * \c length , then all characters to the end of the data are
-     * tqreplaced (i.e., the effect is the same as a \c remove
+     * replaced (i.e., the effect is the same as a \c remove
      * method call with the same range, followed by an
      * \c append method invocation).
      *
      * @param arg The \c DOMString with which the range
-     * must be tqreplaced.
+     * must be replaced.
      *
      * @return
      *
@@ -203,7 +203,7 @@ public:
      *  NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
      *
      */
-    void tqreplaceData ( const unsigned long offset, const unsigned long count, const DOMString &arg );
+    void replaceData ( const unsigned long offset, const unsigned long count, const DOMString &arg );
 
 protected:
     CharacterData(CharacterDataImpl *i);
@@ -285,9 +285,9 @@ public:
     /**
      * Breaks this \c Text node into two Text nodes at the
      * specified offset, keeping both in the tree as siblings. This
-     * node then only tqcontains all the content up to the \c offset
+     * node then only contains all the content up to the \c offset
      * point. And a new \c Text node, which is
-     * inserted as the next sibling of this node, tqcontains all the
+     * inserted as the next sibling of this node, contains all the
      * content at and after the \c offset point.
      *
      * @param offset The offset at which to split, starting from 0.
diff --git a/khtml/dom/dom_xml.h b/khtml/dom/dom_xml.h
index 747262cb8..12e70d9e5 100644
--- a/khtml/dom/dom_xml.h
+++ b/khtml/dom/dom_xml.h
@@ -89,7 +89,7 @@ class DOMString;
  * been left for a later Level of the DOM specification.
  *
  *  The \c nodeName attribute that is inherited from
- * \c Node tqcontains the name of the entity.
+ * \c Node contains the name of the entity.
  *
  *  An XML processor may choose to completely expand entities before
  * the structure model is passed to the DOM; in this case there will
@@ -99,21 +99,21 @@ class DOMString;
  * process entity declarations made in the external subset or declared
  * in external parameter entities. This means that parsed entities
  * declared in the external subset need not be expanded by some
- * classes of applications, and that the tqreplacement value of the
- * entity may not be available. When the tqreplacement value is
+ * classes of applications, and that the replacement value of the
+ * entity may not be available. When the replacement value is
  * available, the corresponding \c Entity node's child
- * list represents the structure of that tqreplacement text. Otherwise,
+ * list represents the structure of that replacement text. Otherwise,
  * the child list is empty.
  *
  *  The resolution of the children of the \c Entity (the
- * tqreplacement value) may be lazily evaluated; actions by the user
+ * replacement value) may be lazily evaluated; actions by the user
  * (such as calling the \c childNodes method on the
  * \c Entity Node) are assumed to trigger the evaluation.
  *
  *  The DOM Level 1 does not support editing \c Entity
  * nodes; if a user wants to make changes to the contents of an
  * \c Entity , every related \c EntityReference node
- * has to be tqreplaced in the structure model by a clone of the
+ * has to be replaced in the structure model by a clone of the
  * \c Entity 's contents, and then the desired changes must be
  * made to each of those clones instead. All the descendants of an
  * \c Entity node are readonly.
@@ -178,7 +178,7 @@ protected:
  * \c EntityReference are readonly.
  *
  *  The resolution of the children of the \c EntityReference
- * (the tqreplacement value of the referenced \c Entity
+ * (the replacement value of the referenced \c Entity
  * ) may be lazily evaluated; actions by the user (such as
  * calling the \c childNodes method on the
  * \c EntityReference node) are assumed to trigger the
diff --git a/khtml/dom/html_base.h b/khtml/dom/html_base.h
index 9811b1ea4..8a1a2510c 100644
--- a/khtml/dom/html_base.h
+++ b/khtml/dom/html_base.h
@@ -286,7 +286,7 @@ public:
     /**
      * Introduced in DOM Level 2
      *
-     * Returns the document this frame tqcontains, if there is any and
+     * Returns the document this frame contains, if there is any and
      * it is available, a Null document otherwise. The attribute is
      * read-only.
      *
@@ -513,7 +513,7 @@ public:
     /**
      * Introduced in DOM Level 2
      *
-     * Returns the document this iframe tqcontains, if there is any and
+     * Returns the document this iframe contains, if there is any and
      * it is available, a Null document otherwise. The attribute is
      * read-only.
      *
diff --git a/khtml/dom/html_block.h b/khtml/dom/html_block.h
index e57c311cd..43be3660d 100644
--- a/khtml/dom/html_block.h
+++ b/khtml/dom/html_block.h
@@ -105,7 +105,7 @@ public:
     ~HTMLDivElement();
 
     /**
-     * Horizontal text tqalignment. See the <a
+     * Horizontal text alignment. See the <a
      * href="http://www.w3.org/TR/REC-html40/present/graphics.html#adef-align">
      * align attribute definition </a> in HTML 4.0. This attribute is
      * deprecated in HTML 4.0.
@@ -231,7 +231,7 @@ public:
     ~HTMLHeadingElement();
 
     /**
-     * Horizontal text tqalignment. See the <a
+     * Horizontal text alignment. See the <a
      * href="http://www.w3.org/TR/REC-html40/present/graphics.html#adef-align">
      * align attribute definition </a> in HTML 4.0. This attribute is
      * deprecated in HTML 4.0.
@@ -272,7 +272,7 @@ public:
     ~HTMLParagraphElement();
 
     /**
-     * Horizontal text tqalignment. See the <a
+     * Horizontal text alignment. See the <a
      * href="http://www.w3.org/TR/REC-html40/present/graphics.html#adef-align">
      * align attribute definition </a> in HTML 4.0. This attribute is
      * deprecated in HTML 4.0.
diff --git a/khtml/dom/html_document.h b/khtml/dom/html_document.h
index 8b7211cf9..677251e78 100644
--- a/khtml/dom/html_document.h
+++ b/khtml/dom/html_document.h
@@ -128,7 +128,7 @@ public:
     DOMString URL() const;
 
     /**
-     * The element that tqcontains the content for the document. In
+     * The element that contains the content for the document. In
      * documents with \c BODY contents, returns the
      * \c BODY element, and in frameset documents, this returns
      * the outermost \c FRAMESET element.
@@ -187,7 +187,7 @@ public:
      * A collection of all the anchor ( \c A ) elements in
      * a document with a value for the \c name attribute.
      * Note. For reasons of backwards compatibility, the returned set
-     * of anchors only tqcontains those anchors created with the
+     * of anchors only contains those anchors created with the
      * \c name attribute, not those created with the \c id
      * attribute.
      *
@@ -211,7 +211,7 @@ public:
 
     /**
      * Note. This method and the ones following allow a user to add to
-     * or tqreplace the structure model of a document using strings of
+     * or replace the structure model of a document using strings of
      * unparsed HTML. At the time of writing alternate methods for
      * providing similar functionality for both HTML and XML documents
      * were being considered. The following methods may be deprecated
diff --git a/khtml/dom/html_element.cpp b/khtml/dom/html_element.cpp
index 0063985ea..0a2c15e53 100644
--- a/khtml/dom/html_element.cpp
+++ b/khtml/dom/html_element.cpp
@@ -177,7 +177,7 @@ HTMLCollection HTMLElement::all() const
 
 void HTMLElement::assignOther( const Node &other, int elementId )
 {
-    if (other.elementId() != static_cast<TQ_UINT32>(elementId)) {
+    if (other.elementId() != static_cast<Q_UINT32>(elementId)) {
 	if ( impl ) impl->deref();
 	impl = 0;
     } else {
diff --git a/khtml/dom/html_form.h b/khtml/dom/html_form.h
index e7ca21fdd..0623e421b 100644
--- a/khtml/dom/html_form.h
+++ b/khtml/dom/html_form.h
@@ -341,7 +341,7 @@ class HTMLInputElementImpl;
  * Form control. Note. Depending upon the environment the page is
  * being viewed, the value property may be read-only for the file
  * upload input type. For the "password" input type, the actual value
- * returned may be tqmasked to prevent unauthorized use. See the <a
+ * returned may be masked to prevent unauthorized use. See the <a
  * href="http://www.w3.org/TR/REC-html40/interact/forms.html#edef-INPUT">
  * INPUT element definition </a> in HTML 4.0.
  *
@@ -798,7 +798,7 @@ public:
     void setAccessKey( const DOMString & );
 
     /**
-     * Text tqalignment relative to \c FIELDSET . See the <a
+     * Text alignment relative to \c FIELDSET . See the <a
      * href="http://www.w3.org/TR/REC-html40/interact/forms.html#adef-align-LEGEND">
      * align attribute definition </a> in HTML 4.0. This attribute is
      * deprecated in HTML 4.0.
diff --git a/khtml/dom/html_head.h b/khtml/dom/html_head.h
index b1b871f0b..e8dc52d21 100644
--- a/khtml/dom/html_head.h
+++ b/khtml/dom/html_head.h
@@ -247,7 +247,7 @@ public:
 class HTMLMetaElementImpl;
 
 /**
- * This tqcontains generic meta-information about the document. See the
+ * This contains generic meta-information about the document. See the
  * <a
  * href="http://www.w3.org/TR/REC-html40/struct/global.html#edef-META">
  * META element definition </a> in HTML 4.0.
diff --git a/khtml/dom/html_image.cpp b/khtml/dom/html_image.cpp
index a5cdb3b71..f7c9dac26 100644
--- a/khtml/dom/html_image.cpp
+++ b/khtml/dom/html_image.cpp
@@ -122,7 +122,7 @@ void HTMLAreaElement::setNoHref( bool _noHref )
     }
 }
 
-DOMString HTMLAreaElement::tqshape() const
+DOMString HTMLAreaElement::shape() const
 {
     if(!impl) return DOMString();
     return ((ElementImpl *)impl)->getAttribute(ATTR_SHAPE);
diff --git a/khtml/dom/html_image.h b/khtml/dom/html_image.h
index bfd854b69..9f30aaa14 100644
--- a/khtml/dom/html_image.h
+++ b/khtml/dom/html_image.h
@@ -90,7 +90,7 @@ public:
 
     /**
      * Comma-separated list of lengths, defining an active region
-     * tqgeometry. See also \c tqshape for the tqshape of the
+     * geometry. See also \c shape for the shape of the
      * region. See the <a
      * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-coords">
      * coords attribute definition </a> in HTML 4.0.
@@ -131,16 +131,16 @@ public:
     void setNoHref( bool );
 
     /**
-     * The tqshape of the active area. The coordinates are given by
+     * The shape of the active area. The coordinates are given by
      * \c coords . See the <a
-     * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-tqshape">
-     * tqshape attribute definition </a> in HTML 4.0.
+     * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-shape">
+     * shape attribute definition </a> in HTML 4.0.
      *
      */
-    DOMString tqshape() const;
+    DOMString shape() const;
 
     /**
-     * see tqshape
+     * see shape
      */
     void setShape( const DOMString & );
 
diff --git a/khtml/dom/html_inline.cpp b/khtml/dom/html_inline.cpp
index 9f40da2fb..568761685 100644
--- a/khtml/dom/html_inline.cpp
+++ b/khtml/dom/html_inline.cpp
@@ -148,7 +148,7 @@ void HTMLAnchorElement::setRev( const DOMString &value )
     if(impl) ((ElementImpl *)impl)->setAttribute(ATTR_REV, value);
 }
 
-DOMString HTMLAnchorElement::tqshape() const
+DOMString HTMLAnchorElement::shape() const
 {
     if(!impl) return DOMString();
     return ((ElementImpl *)impl)->getAttribute(ATTR_SHAPE);
diff --git a/khtml/dom/html_inline.h b/khtml/dom/html_inline.h
index 9db17efb4..6c1b2d2a2 100644
--- a/khtml/dom/html_inline.h
+++ b/khtml/dom/html_inline.h
@@ -89,7 +89,7 @@ public:
 
     /**
      * Comma-separated list of lengths, defining an active region
-     * tqgeometry. See also \c tqshape for the tqshape of the
+     * geometry. See also \c shape for the shape of the
      * region. See the <a
      * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-coords">
      * coords attribute definition </a> in HTML 4.0.
@@ -168,16 +168,16 @@ public:
     void setRev( const DOMString & );
 
     /**
-     * The tqshape of the active area. The coordinates are given by
+     * The shape of the active area. The coordinates are given by
      * \c coords . See the <a
-     * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-tqshape">
-     * tqshape attribute definition </a> in HTML 4.0.
+     * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-shape">
+     * shape attribute definition </a> in HTML 4.0.
      *
      */
-    DOMString tqshape() const;
+    DOMString shape() const;
 
     /**
-     * see tqshape
+     * see shape
      */
     void setShape( const DOMString & );
 
diff --git a/khtml/dom/html_misc.h b/khtml/dom/html_misc.h
index 0dd9a9815..bcfa09495 100644
--- a/khtml/dom/html_misc.h
+++ b/khtml/dom/html_misc.h
@@ -169,7 +169,7 @@ public:
     /**
      * This method retrieves a \c Node using a name. It
      * first searches for a \c Node with a matching
-     * \c id attribute. If it doesn't tqfind one, it then searches
+     * \c id attribute. If it doesn't find one, it then searches
      * for a \c Node with a matching \c name
      * attribute, but only on those elements that are allowed a name
      * attribute.
diff --git a/khtml/dom/html_object.h b/khtml/dom/html_object.h
index 5c9b4ad29..9195a40f7 100644
--- a/khtml/dom/html_object.h
+++ b/khtml/dom/html_object.h
@@ -535,7 +535,7 @@ public:
     /**
      * Introduced in DOM Level 2
      *
-     * Returns the document this iframe tqcontains, if there is any and
+     * Returns the document this iframe contains, if there is any and
      * it is available, a Null document otherwise. The attribute is
      * read-only.
      *
diff --git a/khtml/dom/html_table.h b/khtml/dom/html_table.h
index 69d163723..c3a364d47 100644
--- a/khtml/dom/html_table.h
+++ b/khtml/dom/html_table.h
@@ -63,7 +63,7 @@ public:
     ~HTMLTableCaptionElement();
 
     /**
-     * Caption tqalignment with respect to the table. See the <a
+     * Caption alignment with respect to the table. See the <a
      * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-align-CAPTION">
      * align attribute definition </a> in HTML 4.0. This attribute is
      * deprecated in HTML 4.0.
@@ -134,7 +134,7 @@ public:
     void setAbbr( const DOMString & );
 
     /**
-     * Horizontal tqalignment of data in cell. See the <a
+     * Horizontal alignment of data in cell. See the <a
      * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-align-TD">
      * align attribute definition </a> in HTML 4.0.
      *
@@ -187,7 +187,7 @@ public:
     void setCh( const DOMString & );
 
     /**
-     * Offset of tqalignment character. See the <a
+     * Offset of alignment character. See the <a
      * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-charoff">
      * charoff attribute definition </a> in HTML 4.0.
      *
@@ -281,7 +281,7 @@ public:
     void setScope( const DOMString & );
 
     /**
-     * Vertical tqalignment of data in cell. See the <a
+     * Vertical alignment of data in cell. See the <a
      * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-valign">
      * valign attribute definition </a> in HTML 4.0.
      *
@@ -338,7 +338,7 @@ public:
     ~HTMLTableColElement();
 
     /**
-     * Horizontal tqalignment of cell data in column. See the <a
+     * Horizontal alignment of cell data in column. See the <a
      * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-align-TD">
      * align attribute definition </a> in HTML 4.0.
      *
@@ -364,7 +364,7 @@ public:
     void setCh( const DOMString & );
 
     /**
-     * Offset of tqalignment character. See the <a
+     * Offset of alignment character. See the <a
      * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-charoff">
      * charoff attribute definition </a> in HTML 4.0.
      *
@@ -391,7 +391,7 @@ public:
     void setSpan( long  );
 
     /**
-     * Vertical tqalignment of cell data in column. See the <a
+     * Vertical alignment of cell data in column. See the <a
      * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-valign">
      * valign attribute definition </a> in HTML 4.0.
      *
@@ -790,7 +790,7 @@ public:
     void setCells( const HTMLCollection & );
 
     /**
-     * Horizontal tqalignment of data within cells of this row. See the
+     * Horizontal alignment of data within cells of this row. See the
      * <a
      * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-align-TD">
      * align attribute definition </a> in HTML 4.0.
@@ -831,7 +831,7 @@ public:
     void setCh( const DOMString & );
 
     /**
-     * Offset of tqalignment character. See the <a
+     * Offset of alignment character. See the <a
      * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-charoff">
      * charoff attribute definition </a> in HTML 4.0.
      *
@@ -844,7 +844,7 @@ public:
     void setChOff( const DOMString & );
 
     /**
-     * Vertical tqalignment of data within cells of this row. See the <a
+     * Vertical alignment of data within cells of this row. See the <a
      * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-valign">
      * valign attribute definition </a> in HTML 4.0.
      *
@@ -913,7 +913,7 @@ public:
     ~HTMLTableSectionElement();
 
     /**
-     * Horizontal tqalignment of data in cells. See the \c align
+     * Horizontal alignment of data in cells. See the \c align
      * attribute for HTMLTheadElement for details.
      *
      */
@@ -938,7 +938,7 @@ public:
     void setCh( const DOMString & );
 
     /**
-     * Offset of tqalignment character. See the <a
+     * Offset of alignment character. See the <a
      * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-charoff">
      * charoff attribute definition </a> in HTML 4.0.
      *
@@ -951,7 +951,7 @@ public:
     void setChOff( const DOMString & );
 
     /**
-     * Vertical tqalignment of data in cells. See the \c valign
+     * Vertical alignment of data in cells. See the \c valign
      * attribute for HTMLTheadElement for details.
      *
      */
diff --git a/khtml/ecma/README b/khtml/ecma/README
index 1efc877d8..4c341699a 100644
--- a/khtml/ecma/README
+++ b/khtml/ecma/README
@@ -1,4 +1,4 @@
-This module tqcontains the ECMAScript a.k.a. JavaScript language bindings for
+This module contains the ECMAScript a.k.a. JavaScript language bindings for
 the KHTML Part.
 
 The module is loaded into KHTML's address space on demand.
diff --git a/khtml/ecma/kjs_binding.cpp b/khtml/ecma/kjs_binding.cpp
index b2ad17725..f9dd291d7 100644
--- a/khtml/ecma/kjs_binding.cpp
+++ b/khtml/ecma/kjs_binding.cpp
@@ -190,7 +190,7 @@ ScriptInterpreter::~ScriptInterpreter()
 #ifdef KJS_VERBOSE
   kdDebug(6070) << "ScriptInterpreter::~ScriptInterpreter " << this << " for part=" << m_frame << endl;
 #endif
-  assert( interpreterList && interpreterList->tqcontains( this ) );
+  assert( interpreterList && interpreterList->contains( this ) );
   interpreterList->remove( this );
   if ( interpreterList->isEmpty() ) {
     delete interpreterList;
@@ -261,7 +261,7 @@ UString::UString(const TQString &d)
 {
   unsigned int len = d.length();
   UChar *dat = new UChar[len];
-  memcpy(dat, d.tqunicode(), len * sizeof(UChar));
+  memcpy(dat, d.unicode(), len * sizeof(UChar));
   rep = UString::Rep::create(dat, len);
 }
 
@@ -277,7 +277,7 @@ UString::UString(const DOM::DOMString &d)
 
   unsigned int len = d.length();
   UChar *dat = new UChar[len];
-  memcpy(dat, d.tqunicode(), len * sizeof(UChar));
+  memcpy(dat, d.unicode(), len * sizeof(UChar));
   rep = UString::Rep::create(dat, len);
 }
 
diff --git a/khtml/ecma/kjs_binding.h b/khtml/ecma/kjs_binding.h
index 0672cd8eb..c55da21ce 100644
--- a/khtml/ecma/kjs_binding.h
+++ b/khtml/ecma/kjs_binding.h
@@ -103,7 +103,7 @@ namespace KJS {
       m_domObjects.insert( objectHandle, obj );
     }
     void customizedDOMObject( DOMObject* obj ) {
-      m_customizedDomObjects.tqreplace( obj, this );
+      m_customizedDomObjects.replace( obj, this );
     }
     bool deleteDOMObject( void* objectHandle ) {
       DOMObject* obj = m_domObjects.take( objectHandle );
diff --git a/khtml/ecma/kjs_css.cpp b/khtml/ecma/kjs_css.cpp
index ea651336e..b42f9dd02 100644
--- a/khtml/ecma/kjs_css.cpp
+++ b/khtml/ecma/kjs_css.cpp
@@ -185,7 +185,7 @@ void DOMCSSStyleDeclaration::tryPut(ExecState *exec, const Identifier &propertyN
       if (propvalue.isEmpty())
         styleDecl.removeProperty(prop);
       else {
-        int important = propvalue.tqfind("!important", 0, false);
+        int important = propvalue.find("!important", 0, false);
         if (important == -1)
             styleDecl.setProperty(prop, DOM::DOMString(propvalue), "");
         else
diff --git a/khtml/ecma/kjs_debugwin.cpp b/khtml/ecma/kjs_debugwin.cpp
index d7f1c66e2..eeb126ebb 100644
--- a/khtml/ecma/kjs_debugwin.cpp
+++ b/khtml/ecma/kjs_debugwin.cpp
@@ -107,7 +107,7 @@ void SourceDisplay::setSource(SourceFile *sourceFile)
   }
 
   TQString code = sourceFile->getCode();
-  const TQChar *chars = code.tqunicode();
+  const TQChar *chars = code.unicode();
   uint len = code.length();
   TQChar newLine('\n');
   TQChar cr('\r');
@@ -861,7 +861,7 @@ bool KJSDebugWin::exception(ExecState *exec, const Value &value, bool inTryCatch
 
   if (dontShowAgain) {
     KConfig *config = kapp->config();
-    KConfigGroupSaver saver(config,TQString::tqfromLatin1("Java/JavaScript Settings"));
+    KConfigGroupSaver saver(config,TQString::fromLatin1("Java/JavaScript Settings"));
     config->writeEntry("ReportJavaScriptErrors",TQVariant(false,0));
     config->sync();
     TQByteArray data;
@@ -1020,7 +1020,7 @@ void KJSDebugWin::enterSession(ExecState *exec)
 
   updateContextList();
 
-  tqApp->enter_loop(); // won't return until leaveSession() is called
+  qApp->enter_loop(); // won't return until leaveSession() is called
 }
 
 void KJSDebugWin::leaveSession()
@@ -1043,7 +1043,7 @@ void KJSDebugWin::leaveSession()
     enableOtherWindows();
   }
 
-  tqApp->exit_loop();
+  qApp->exit_loop();
 }
 
 void KJSDebugWin::updateContextList()
@@ -1123,7 +1123,7 @@ bool KJSDebugWin::haveBreakpoint(SourceFile *sourceFile, int line0, int line1)
   for (int i = 0; i < m_breakpointCount; i++) {
     int sourceId = m_breakpoints[i].sourceId;
     int lineno = m_breakpoints[i].lineno;
-    if (m_sourceFragments.tqcontains(sourceId) &&
+    if (m_sourceFragments.contains(sourceId) &&
         m_sourceFragments[sourceId]->sourceFile == sourceFile) {
       int absLineno = m_sourceFragments[sourceId]->baseLine+lineno-1;
       if (absLineno >= line0 && absLineno <= line1)
diff --git a/khtml/ecma/kjs_debugwin.h b/khtml/ecma/kjs_debugwin.h
index e925965eb..8faf71d52 100644
--- a/khtml/ecma/kjs_debugwin.h
+++ b/khtml/ecma/kjs_debugwin.h
@@ -151,7 +151,7 @@ namespace KJS {
   /**
    * @internal
    *
-   * KJSDebugWin represents the debugger window that is visible to the user. It tqcontains
+   * KJSDebugWin represents the debugger window that is visible to the user. It contains
    * a stack frame list, a code viewer and a source fragment selector, plus buttons
    * to control execution including next, step and continue.
    *
diff --git a/khtml/ecma/kjs_dom.cpp b/khtml/ecma/kjs_dom.cpp
index b69976e0d..08afc6aab 100644
--- a/khtml/ecma/kjs_dom.cpp
+++ b/khtml/ecma/kjs_dom.cpp
@@ -67,7 +67,7 @@ IMPLEMENT_CONSTANT_TABLE(DOMNodeConstants,"DOMNodeConstants")
 /* Source for DOMNodeProtoTable.
 @begin DOMNodeProtoTable 13
   insertBefore	DOMNode::InsertBefore	DontDelete|Function 2
-  tqreplaceChild	DOMNode::ReplaceChild	DontDelete|Function 2
+  replaceChild	DOMNode::ReplaceChild	DontDelete|Function 2
   removeChild	DOMNode::RemoveChild	DontDelete|Function 1
   appendChild	DOMNode::AppendChild	DontDelete|Function 1
   hasAttributes	DOMNode::HasAttributes	DontDelete|Function 0
@@ -81,7 +81,7 @@ IMPLEMENT_CONSTANT_TABLE(DOMNodeConstants,"DOMNodeConstants")
   removeEventListener	DOMNode::RemoveEventListener	DontDelete|Function 3
   dispatchEvent		DOMNode::DispatchEvent	DontDelete|Function 1
 # IE extensions
-  tqcontains	DOMNode::Contains		DontDelete|Function 1
+  contains	DOMNode::Contains		DontDelete|Function 1
   insertAdjacentHTML	DOMNode::InsertAdjacentHTML	DontDelete|Function 2
 # "DOM level 0" (from Gecko DOM reference; also in WinIE)
   item          DOMNode::Item           DontDelete|Function 1
@@ -216,7 +216,7 @@ static khtml::RenderObject* handleBodyRootQuirk(const DOM::Node& node, khtml::Re
   }
   
   if (needViewport) {
-    //Scan up to tqfind the new target
+    //Scan up to find the new target
     while (rend->parent())
       rend = rend->parent();
   }
@@ -322,7 +322,7 @@ Value DOMNode::getValueProperty(ExecState *exec, int token) const
   default:
     // no DOM standard, found in IE only
 
-    // Make sure our tqlayout is up to date before we allow a query on these attributes.
+    // Make sure our layout is up to date before we allow a query on these attributes.
     DOM::DocumentImpl* docimpl = node.handle()->getDocument();
     if (docimpl) {
       docimpl->updateLayout();
@@ -469,7 +469,7 @@ void DOMNode::putValueProperty(ExecState *exec, int token, const Value& value, i
     setListener(exec,DOM::EventImpl::UNLOAD_EVENT,value);
     break;
   default:
-    // Make sure our tqlayout is up to date 
+    // Make sure our layout is up to date 
     DOM::DocumentImpl* docimpl = node.handle()->getDocument();
     if (docimpl)
       docimpl->updateLayout();
@@ -585,7 +585,7 @@ Value DOMNodeProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List &ar
     case DOMNode::InsertBefore:
       return getDOMNode(exec,node.insertBefore(toNode(args[0]), toNode(args[1])));
     case DOMNode::ReplaceChild:
-      return getDOMNode(exec,node.tqreplaceChild(toNode(args[0]), toNode(args[1])));
+      return getDOMNode(exec,node.replaceChild(toNode(args[0]), toNode(args[1])));
     case DOMNode::Contains:
     {
 	DOM::Node other = toNode(args[0]);
@@ -1738,7 +1738,7 @@ const ClassInfo DOMCharacterData::info = { "CharacterImp",
   appendData	DOMCharacterData::AppendData	DontDelete|Function 1
   insertData	DOMCharacterData::InsertData	DontDelete|Function 2
   deleteData	DOMCharacterData::DeleteData	DontDelete|Function 2
-  tqreplaceData	DOMCharacterData::ReplaceData	DontDelete|Function 2
+  replaceData	DOMCharacterData::ReplaceData	DontDelete|Function 2
 @end
 */
 KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE(DOMCharacterDataProto, DOMNodeProto)
@@ -1801,7 +1801,7 @@ Value DOMCharacterDataProtoFunc::tryCall(ExecState *exec, Object &thisObj, const
       return  Undefined();
       break;
     case DOMCharacterData::ReplaceData:
-      data.tqreplaceData(args[0].toInteger(exec),args[1].toInteger(exec),args[2].toString(exec).string());
+      data.replaceData(args[0].toInteger(exec),args[1].toInteger(exec),args[2].toString(exec).string());
       return Undefined();
     default:
       break;
diff --git a/khtml/ecma/kjs_html.cpp b/khtml/ecma/kjs_html.cpp
index 321746f20..57762ffd3 100644
--- a/khtml/ecma/kjs_html.cpp
+++ b/khtml/ecma/kjs_html.cpp
@@ -205,12 +205,12 @@ bool KJS::HTMLDocument::hasProperty(ExecState *exec, const Identifier &p) const
     return false;
 
 
-  if ( docImpl->underDocNamedCache().tqcontains( p.qstring() ) )
+  if ( docImpl->underDocNamedCache().contains( p.qstring() ) )
     return true;
 
   if ( view && view->part() )
   {
-    KHTMLPart *kp = view->part()->tqfindFrame( p.qstring() );
+    KHTMLPart *kp = view->part()->findFrame( p.qstring() );
     if (kp)
       return true;
   }
@@ -260,8 +260,8 @@ Value KJS::HTMLDocument::tryGet(ExecState *exec, const Identifier &propertyName)
   if ( view && view->part() )
   {
     // ###### TODO return a collection in case several frames have the same name
-    // (IE does that). Hard to do with tqfindFrame :}
-    KHTMLPart *kp = view->part()->tqfindFrame( propertyName.qstring() );
+    // (IE does that). Hard to do with findFrame :}
+    KHTMLPart *kp = view->part()->findFrame( propertyName.qstring() );
     if (kp)
       return Window::retrieve(kp);
   }
@@ -896,7 +896,7 @@ const ClassInfo* KJS::HTMLElement::classInfo() const
   rel		KJS::HTMLElement::AnchorRel		DontDelete
   rev		KJS::HTMLElement::AnchorRev		DontDelete
   search	KJS::HTMLElement::AnchorSearch		DontDelete
-  tqshape		KJS::HTMLElement::AnchorShape		DontDelete
+  shape		KJS::HTMLElement::AnchorShape		DontDelete
   tabIndex	KJS::HTMLElement::AnchorTabIndex	DontDelete
   target	KJS::HTMLElement::AnchorTarget		DontDelete
   text		KJS::HTMLElement::AnchorText		DontDelete|ReadOnly
@@ -981,7 +981,7 @@ const ClassInfo* KJS::HTMLElement::classInfo() const
   protocol	KJS::HTMLElement::AreaProtocol		DontDelete|ReadOnly
   search	KJS::HTMLElement::AreaSearch		DontDelete|ReadOnly
   noHref	KJS::HTMLElement::AreaNoHref		DontDelete
-  tqshape		KJS::HTMLElement::AreaShape		DontDelete
+  shape		KJS::HTMLElement::AreaShape		DontDelete
   tabIndex	KJS::HTMLElement::AreaTabIndex		DontDelete
   target	KJS::HTMLElement::AreaTarget		DontDelete
 @end
@@ -1599,7 +1599,7 @@ Value KJS::HTMLElement::getValueProperty(ExecState *exec, int token) const
     case AnchorName:            return String(anchor.name());
     case AnchorRel:             return String(anchor.rel());
     case AnchorRev:             return String(anchor.rev());
-    case AnchorShape:           return String(anchor.tqshape());
+    case AnchorShape:           return String(anchor.shape());
     case AnchorTabIndex:        return Number(anchor.tabIndex());
     case AnchorTarget:          return String(anchor.target());
     // Not specified in http://msdn.microsoft.com/workshop/author/dhtml/reference/objects/a.asp
@@ -1735,7 +1735,7 @@ Value KJS::HTMLElement::getValueProperty(ExecState *exec, int token) const
       }
     }
     case AreaNoHref:          return Boolean(area.noHref());
-    case AreaShape:           return String(area.tqshape());
+    case AreaShape:           return String(area.shape());
     case AreaTabIndex:        return Number(area.tabIndex());
     case AreaTarget:          return String(area.target());
     }
@@ -3773,7 +3773,7 @@ void KJS::HTMLSelectCollection::tryPut(ExecState *exec, const Identifier &proper
     while (diff--) {
       element.add(element.ownerDocument().createElement("OPTION"), before);
     }
-    // tqreplace an existing entry ?
+    // replace an existing entry ?
   } else if (diff < 0) {
     before = element.options().item(u+1);
     element.remove(u);
diff --git a/khtml/ecma/kjs_navigator.cpp b/khtml/ecma/kjs_navigator.cpp
index 4c51561e4..a5c793357 100644
--- a/khtml/ecma/kjs_navigator.cpp
+++ b/khtml/ecma/kjs_navigator.cpp
@@ -187,15 +187,15 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const
   case AppCodeName:
     return String("Mozilla");
   case AppName:
-    // If we tqfind "Mozilla" but not "(compatible, ...)" we are a real Netscape
-    if (userAgent.tqfind(TQString::tqfromLatin1("Mozilla")) >= 0 &&
-        userAgent.tqfind(TQString::tqfromLatin1("compatible")) == -1)
+    // If we find "Mozilla" but not "(compatible, ...)" we are a real Netscape
+    if (userAgent.find(TQString::fromLatin1("Mozilla")) >= 0 &&
+        userAgent.find(TQString::fromLatin1("compatible")) == -1)
     {
       //kdDebug() << "appName -> Mozilla" << endl;
       return String("Netscape");
     }
-    if (userAgent.tqfind(TQString::tqfromLatin1("Microsoft")) >= 0 ||
-        userAgent.tqfind(TQString::tqfromLatin1("MSIE")) >= 0)
+    if (userAgent.find(TQString::fromLatin1("Microsoft")) >= 0 ||
+        userAgent.find(TQString::fromLatin1("MSIE")) >= 0)
     {
       //kdDebug() << "appName -> IE" << endl;
       return String("Microsoft Internet Explorer");
@@ -204,17 +204,17 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const
     return String("Konqueror");
   case AppVersion:
     // We assume the string is something like Mozilla/version (properties)
-    return String(userAgent.mid(userAgent.tqfind('/') + 1));
+    return String(userAgent.mid(userAgent.find('/') + 1));
   case Product:
     // We are pretending to be Mozilla or Safari
-    if (userAgent.tqfind(TQString::tqfromLatin1("Mozilla")) >= 0 &&
-        userAgent.tqfind(TQString::tqfromLatin1("compatible")) == -1)
+    if (userAgent.find(TQString::fromLatin1("Mozilla")) >= 0 &&
+        userAgent.find(TQString::fromLatin1("compatible")) == -1)
     {
         return String("Gecko");
     }
     // When spoofing as IE, we use Undefined().
-    if (userAgent.tqfind(TQString::tqfromLatin1("Microsoft")) >= 0 ||
-        userAgent.tqfind(TQString::tqfromLatin1("MSIE")) >= 0)
+    if (userAgent.find(TQString::fromLatin1("Microsoft")) >= 0 ||
+        userAgent.find(TQString::fromLatin1("MSIE")) >= 0)
     {
         return Undefined();
     }
@@ -222,9 +222,9 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const
     return String("Konqueror/khtml");
   case ProductSub:
     {
-      int ix = userAgent.tqfind("Gecko");
-      if (ix >= 0 && userAgent.length() >= (uint)ix+14 && userAgent.tqunicode()[ix+5] == TQChar('/') &&
-          userAgent.tqfind(TQRegExp("\\d{8}"), ix+6) == ix+6)
+      int ix = userAgent.find("Gecko");
+      if (ix >= 0 && userAgent.length() >= (uint)ix+14 && userAgent.unicode()[ix+5] == TQChar('/') &&
+          userAgent.find(TQRegExp("\\d{8}"), ix+6) == ix+6)
       {
           // We have Gecko/<productSub> in the UA string
           return String(userAgent.mid(ix+6, 8));
@@ -245,19 +245,19 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const
     return String(userAgent);
   case Platform:
     // yet another evil hack, but necessary to spoof some sites...
-    if ( (userAgent.tqfind(TQString::tqfromLatin1("Win"),0,false)>=0) )
-      return String(TQString::tqfromLatin1("Win32"));
-    else if ( (userAgent.tqfind(TQString::tqfromLatin1("Macintosh"),0,false)>=0) ||
-              (userAgent.tqfind(TQString::tqfromLatin1("Mac_PowerPC"),0,false)>=0) )
-      return String(TQString::tqfromLatin1("MacPPC"));
+    if ( (userAgent.find(TQString::fromLatin1("Win"),0,false)>=0) )
+      return String(TQString::fromLatin1("Win32"));
+    else if ( (userAgent.find(TQString::fromLatin1("Macintosh"),0,false)>=0) ||
+              (userAgent.find(TQString::fromLatin1("Mac_PowerPC"),0,false)>=0) )
+      return String(TQString::fromLatin1("MacPPC"));
     else
     {
         struct utsname name;
         int ret = uname(&name);
         if ( ret >= 0 )
-            return String(TQString::tqfromLatin1("%1 %1 X11").arg(name.sysname).arg(name.machine));
+            return String(TQString::fromLatin1("%1 %1 X11").arg(name.sysname).arg(name.machine));
         else // can't happen
-            return String(TQString::tqfromLatin1("Unix X11"));
+            return String(TQString::fromLatin1("Unix X11"));
     }
   case CpuClass:
   {
diff --git a/khtml/ecma/kjs_proxy.cpp b/khtml/ecma/kjs_proxy.cpp
index 0301ef141..ca26c5a0b 100644
--- a/khtml/ecma/kjs_proxy.cpp
+++ b/khtml/ecma/kjs_proxy.cpp
@@ -343,8 +343,8 @@ void KJSProxyImpl::applyUserAgent()
   assert( m_script );
   TQString host = m_frame->m_part->url().isLocalFile() ? "localhost" : m_frame->m_part->url().host();
   TQString userAgent = KProtocolManager::userAgentForHost(host);
-  if (userAgent.tqfind(TQString::tqfromLatin1("Microsoft")) >= 0 ||
-      userAgent.tqfind(TQString::tqfromLatin1("MSIE")) >= 0)
+  if (userAgent.find(TQString::fromLatin1("Microsoft")) >= 0 ||
+      userAgent.find(TQString::fromLatin1("MSIE")) >= 0)
   {
     m_script->setCompatMode(Interpreter::IECompat);
 #ifdef KJS_VERBOSE
@@ -352,10 +352,10 @@ void KJSProxyImpl::applyUserAgent()
 #endif
   }
   else
-    // If we tqfind "Mozilla" but not "(compatible, ...)" we are a real Netscape
-    if (userAgent.tqfind(TQString::tqfromLatin1("Mozilla")) >= 0 &&
-        userAgent.tqfind(TQString::tqfromLatin1("compatible")) == -1 &&
-        userAgent.tqfind(TQString::tqfromLatin1("KHTML")) == -1)
+    // If we find "Mozilla" but not "(compatible, ...)" we are a real Netscape
+    if (userAgent.find(TQString::fromLatin1("Mozilla")) >= 0 &&
+        userAgent.find(TQString::fromLatin1("compatible")) == -1 &&
+        userAgent.find(TQString::fromLatin1("KHTML")) == -1)
     {
       m_script->setCompatMode(Interpreter::NetscapeCompat);
 #ifdef KJS_VERBOSE
diff --git a/khtml/ecma/kjs_window.cpp b/khtml/ecma/kjs_window.cpp
index 827756ac4..90123aec6 100644
--- a/khtml/ecma/kjs_window.cpp
+++ b/khtml/ecma/kjs_window.cpp
@@ -225,9 +225,9 @@ const ClassInfo Window::info = { "Window", &DOMAbstractView::info, &WindowTable,
   btoa		Window::BToA		DontDelete|Function 1
   closed	Window::Closed		DontDelete|ReadOnly
   crypto	Window::Crypto		DontDelete|ReadOnly
-  defaulttqStatus	Window::DefaulttqStatus	DontDelete
-  defaultstatus	Window::DefaulttqStatus	DontDelete
-  status	Window::tqStatus		DontDelete
+  defaultStatus	Window::DefaultStatus	DontDelete
+  defaultstatus	Window::DefaultStatus	DontDelete
+  status	Window::Status		DontDelete
   document	Window::Document	DontDelete|ReadOnly
   frameElement		Window::FrameElement		DontDelete|ReadOnly
   frames	Window::Frames		DontDelete|ReadOnly
@@ -521,7 +521,7 @@ bool Window::hasProperty(ExecState *exec, const Identifier &p) const
       return false;
 
   TQString q = p.qstring();
-  if (part->tqfindFramePart(p.qstring()))
+  if (part->findFramePart(p.qstring()))
     return true;
   // allow window[1] or parent[1] etc. (#56983)
   bool ok;
@@ -655,9 +655,9 @@ Value Window::get(ExecState *exec, const Identifier &p) const
     switch( entry->value ) {
     case Crypto:
       return Undefined(); // ###
-    case DefaulttqStatus:
+    case DefaultStatus:
       return String(UString(part->jsDefaultStatusBarText()));
-    case tqStatus:
+    case Status:
       return String(UString(part->jsStatusBarText()));
     case Document:
       if (part->document().isNull()) {
@@ -864,9 +864,9 @@ Value Window::get(ExecState *exec, const Identifier &p) const
 #if defined Q_WS_X11 && ! defined K_WS_QTONLY
       if (!part->widget())
         return Number(0);
-      KWin::WindowInfo inf = KWin::windowInfo(part->widget()->tqtopLevelWidget()->winId());
+      KWin::WindowInfo inf = KWin::windowInfo(part->widget()->topLevelWidget()->winId());
       return Number(entry->value == OuterHeight ?
-                    inf.tqgeometry().height() : inf.tqgeometry().width());
+                    inf.geometry().height() : inf.geometry().width());
 #else
       return Number(entry->value == OuterHeight ?  
 		    part->view()->height() : part->view()->width());
@@ -1002,7 +1002,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const
     return isSafeScript(exec) ? val2 : Undefined();
   }
 
-  KParts::ReadOnlyPart *rop = part->tqfindFramePart( p.qstring() );
+  KParts::ReadOnlyPart *rop = part->findFramePart( p.qstring() );
   if (rop)
     return retrieve(rop);
 
@@ -1088,17 +1088,17 @@ void Window::put(ExecState* exec, const Identifier &propertyName, const Value &v
     KHTMLPart *part = ::qt_cast<KHTMLPart *>(m_frame->m_part);
     if (part) {
     switch( entry->value ) {
-    case tqStatus: {
-      if  (isSafeScript(exec) && part->settings()->windowtqStatusPolicy(part->url().host())
-		== KHTMLSettings::KJSWindowtqStatusAllow) {
+    case Status: {
+      if  (isSafeScript(exec) && part->settings()->windowStatusPolicy(part->url().host())
+		== KHTMLSettings::KJSWindowStatusAllow) {
       String s = value.toString(exec);
       part->setJSStatusBarText(s.value().qstring());
       }
       return;
     }
-    case DefaulttqStatus: {
-      if (isSafeScript(exec) && part->settings()->windowtqStatusPolicy(part->url().host())
-		== KHTMLSettings::KJSWindowtqStatusAllow) {
+    case DefaultStatus: {
+      if (isSafeScript(exec) && part->settings()->windowStatusPolicy(part->url().host())
+		== KHTMLSettings::KJSWindowStatusAllow) {
       String s = value.toString(exec);
       part->setJSDefaultStatusBarText(s.value().qstring());
       }
@@ -1245,7 +1245,7 @@ void Window::closeNow()
       kdDebug(6070) << "closeNow on non KHTML part" << endl;
     } else {
       //kdDebug(6070) << k_funcinfo << " -> closing window" << endl;
-      // We want to make sure that window.open won't tqfind this part by name.
+      // We want to make sure that window.open won't find this part by name.
       part->setName( 0 );
       part->deleteLater();
       part = 0;
@@ -1446,7 +1446,7 @@ void Window::goURL(ExecState* exec, const TQString& url, bool lockHistory)
       // check if we're allowed to inject javascript
       // SYNC check with khtml_part.cpp::slotRedirect!
       if ( isSafeScript(exec) ||
-            dstUrl.tqfind(TQString::tqfromLatin1("javascript:"), 0, false) != 0 )
+            dstUrl.find(TQString::fromLatin1("javascript:"), 0, false) != 0 )
         part->scheduleRedirection(-1,
                                   dstUrl,
                                   lockHistory);
@@ -1618,11 +1618,11 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString
       while (it != flist.end()) {
         TQString s = *it++;
         TQString key, val;
-        int pos = s.tqfind('=');
+        int pos = s.find('=');
         if (pos >= 0) {
           key = s.left(pos).stripWhiteSpace().lower();
           val = s.mid(pos + 1).stripWhiteSpace().lower();
-          TQRect screen = KGlobalSettings::desktopGeometry(widget->tqtopLevelWidget());
+          TQRect screen = KGlobalSettings::desktopGeometry(widget->topLevelWidget());
 
           if (key == "left" || key == "screenx") {
             winargs.x = (int)val.toFloat() + screen.x();
@@ -1633,13 +1633,13 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString
             if (winargs.y < screen.y() || winargs.y > screen.bottom())
               winargs.y = screen.y(); // only safe choice until size is determined
           } else if (key == "height") {
-            winargs.height = (int)val.toFloat() + 2*tqApp->style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2;
+            winargs.height = (int)val.toFloat() + 2*qApp->style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2;
             if (winargs.height > screen.height())  // should actually check workspace
               winargs.height = screen.height();
             if (winargs.height < 100)
               winargs.height = 100;
           } else if (key == "width") {
-            winargs.width = (int)val.toFloat() + 2*tqApp->style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2;
+            winargs.width = (int)val.toFloat() + 2*qApp->style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2;
             if (winargs.width > screen.width())    // should actually check workspace
               winargs.width = screen.width();
             if (winargs.width < 100)
@@ -1693,7 +1693,7 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString
       Window::retrieveWindow(p)->goURL(exec, url.url(), false /*don't lock history*/);
       return Window::retrieve(p);
     }
-    if ( uargs.frameName.lower() == "tqreplace" )
+    if ( uargs.frameName.lower() == "replace" )
     {
       Window::retrieveWindow(p)->goURL(exec, url.url(), true /*lock history*/);
       return Window::retrieve(p);
@@ -1897,8 +1897,8 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
     KHTMLSettings::KJSWindowFocusPolicy policy =
 		part->settings()->windowFocusPolicy(part->url().host());
     if(policy == KHTMLSettings::KJSWindowFocusAllow && widget) {
-      widget->tqtopLevelWidget()->raise();
-      KWin::deIconifyWindow( widget->tqtopLevelWidget()->winId() );
+      widget->topLevelWidget()->raise();
+      KWin::deIconifyWindow( widget->topLevelWidget()->winId() );
       widget->setActiveWindow();
       emit part->browserExtension()->requestFocus(part);
     }
@@ -1950,7 +1950,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
     {
       KParts::BrowserExtension *ext = part->browserExtension();
       if (ext) {
-        TQWidget * tl = widget->tqtopLevelWidget();
+        TQWidget * tl = widget->topLevelWidget();
         TQRect sg = KGlobalSettings::desktopGeometry(tl);
 
         TQPoint dest = tl->pos() + TQPoint( args[0].toInt32(exec), args[1].toInt32(exec) );
@@ -1970,7 +1970,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
     {
       KParts::BrowserExtension *ext = part->browserExtension();
       if (ext) {
-        TQWidget * tl = widget->tqtopLevelWidget();
+        TQWidget * tl = widget->topLevelWidget();
         TQRect sg = KGlobalSettings::desktopGeometry(tl);
 
         TQPoint dest( args[0].toInt32(exec)+sg.x(), args[1].toInt32(exec)+sg.y() );
@@ -1989,7 +1989,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
     if(policy == KHTMLSettings::KJSWindowResizeAllow
     		&& args.size() == 2 && widget)
     {
-      TQWidget * tl = widget->tqtopLevelWidget();
+      TQWidget * tl = widget->topLevelWidget();
       TQRect geom = tl->frameGeometry();
       window->resizeTo( tl,
                         geom.width() + args[0].toInt32(exec),
@@ -2003,7 +2003,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
     if(policy == KHTMLSettings::KJSWindowResizeAllow
                && args.size() == 2 && widget)
     {
-      TQWidget * tl = widget->tqtopLevelWidget();
+      TQWidget * tl = widget->topLevelWidget();
       window->resizeTo( tl, args[0].toInt32(exec), args[1].toInt32(exec) );
     }
     return Undefined();
@@ -2271,7 +2271,7 @@ void WindowQObject::timerEvent(TQTimerEvent *)
   it = TQPtrListIterator<ScheduledAction>(toExecute);
   for (; it.current(); ++it) {
     ScheduledAction *action = it.current();
-    if (!scheduledActions.tqcontainsRef(action)) // removed by clearTimeout()
+    if (!scheduledActions.containsRef(action)) // removed by clearTimeout()
       continue;
 
     action->executing = true; // prevent deletion in clearTimeout()
@@ -2288,7 +2288,7 @@ void WindowQObject::timerEvent(TQTimerEvent *)
 
     action->executing = false;
 
-    if (!scheduledActions.tqcontainsRef(action))
+    if (!scheduledActions.containsRef(action))
       delete action;
     else
       action->nextTime = action->nextTime.addMSecs(action->interval);
@@ -2353,10 +2353,10 @@ DateTimeMS DateTimeMS::now()
 {
   DateTimeMS t;
   TQTime before = TQTime::currentTime();
-  t.mDate = TQDate::tqcurrentDate();
+  t.mDate = TQDate::currentDate();
   t.mTime = TQTime::currentTime();
   if (t.mTime < before)
-    t.mDate = TQDate::tqcurrentDate(); // prevent race condition in hacky way :)
+    t.mDate = TQDate::currentDate(); // prevent race condition in hacky way :)
   return t;
 }
 
@@ -2407,7 +2407,7 @@ Value FrameArray::get(ExecState *exec, const Identifier &p) const
   }
 
   // check for the name or number
-  KParts::ReadOnlyPart *frame = part->tqfindFramePart(p.qstring());
+  KParts::ReadOnlyPart *frame = part->findFramePart(p.qstring());
   if (!frame) {
     bool ok;
     unsigned int i = p.toArrayIndex(&ok);
@@ -2423,7 +2423,7 @@ Value FrameArray::get(ExecState *exec, const Identifier &p) const
   }
 
   // Fun IE quirk: name lookup in there is actually done by document.all 
-  // hence, it can tqfind non-frame things (and even let them hide frame ones!)
+  // hence, it can find non-frame things (and even let them hide frame ones!)
   // We don't quite do that, but do this as a fallback.
   DOM::DocumentImpl* doc  = static_cast<DOM::DocumentImpl*>(part->document().handle());
   if (doc) {
@@ -2478,7 +2478,7 @@ const ClassInfo Location::info = { "Location", 0, &LocationTable, 0 };
   [[==]]	Location::EqualEqual	DontDelete|ReadOnly
   assign	Location::Assign	DontDelete|Function 1
   toString	Location::ToString	DontDelete|Function 0
-  tqreplace	Location::Replace	DontDelete|Function 1
+  replace	Location::Replace	DontDelete|Function 1
   reload	Location::Reload	DontDelete|Function 0
 @end
 */
@@ -2545,7 +2545,7 @@ Value Location::get(ExecState *exec, const Identifier &p) const
 	return String("");
       return String( url.path().isEmpty() ? TQString("/") : url.path() );
     case Port:
-      return String( url.port() ? TQString::number((int)url.port()) : TQString::tqfromLatin1("") );
+      return String( url.port() ? TQString::number((int)url.port()) : TQString::fromLatin1("") );
     case Protocol:
       return String( url.protocol()+":" );
     case Search:
@@ -2603,8 +2603,8 @@ void Location::put(ExecState *exec, const Identifier &p, const Value &v, int att
       url.setRef(str);
       break;
     case Host: {
-      TQString host = str.left(str.tqfind(":"));
-      TQString port = str.mid(str.tqfind(":")+1);
+      TQString host = str.left(str.find(":"));
+      TQString port = str.mid(str.find(":")+1);
       url.setHost(host);
       url.setPort(port.toUInt());
       break;
diff --git a/khtml/ecma/kjs_window.h b/khtml/ecma/kjs_window.h
index 0078615cd..2f5eb45f5 100644
--- a/khtml/ecma/kjs_window.h
+++ b/khtml/ecma/kjs_window.h
@@ -128,7 +128,7 @@ namespace KJS {
     TQPtrDict<JSEventListener> jsEventListeners;
     virtual const ClassInfo* classInfo() const { return &info; }
     static const ClassInfo info;
-    enum { Closed, Crypto, DefaulttqStatus, tqStatus, Document, Node, EventCtor, Range,
+    enum { Closed, Crypto, DefaultStatus, Status, Document, Node, EventCtor, Range,
            NodeFilter, DOMException, CSSRule, Frames, _History, _External, Event, InnerHeight,
            InnerWidth, Length, _Location, Navigate, Name, _Navigator, _Konqueror, ClientInformation,
            OffscreenBuffering, Opener, OuterHeight, OuterWidth, PageXOffset, PageYOffset,
diff --git a/khtml/ecma/xmlhttprequest.cpp b/khtml/ecma/xmlhttprequest.cpp
index fe232457f..b20515de7 100644
--- a/khtml/ecma/xmlhttprequest.cpp
+++ b/khtml/ecma/xmlhttprequest.cpp
@@ -47,7 +47,7 @@ using KIO::NetAccess;
 
 #define BANNED_HTTP_HEADERS "authorization,proxy-authorization,"\
                             "content-length,host,connect,copy,move,"\
-                            "delete,head,trace,put,proptqfind,proppatch,"\
+                            "delete,head,trace,put,propfind,proppatch,"\
                             "mkcol,lock,unlock,options,via,"\
                             "accept-charset,accept-encoding,expect,date,"\
                             "keep-alive,te,trailer,"\
@@ -125,8 +125,8 @@ const ClassInfo XMLHttpRequest::info = { "XMLHttpRequest", 0, &XMLHttpRequestTab
   readyState		XMLHttpRequest::ReadyState		DontDelete|ReadOnly
   responseText		XMLHttpRequest::ResponseText		DontDelete|ReadOnly
   responseXML		XMLHttpRequest::ResponseXML		DontDelete|ReadOnly
-  status		XMLHttpRequest::tqStatus			DontDelete|ReadOnly
-  statusText		XMLHttpRequest::tqStatusText		DontDelete|ReadOnly
+  status		XMLHttpRequest::Status			DontDelete|ReadOnly
+  statusText		XMLHttpRequest::StatusText		DontDelete|ReadOnly
   onreadystatechange	XMLHttpRequest::Onreadystatechange	DontDelete
   onload		XMLHttpRequest::Onload			DontDelete
 @end
@@ -182,10 +182,10 @@ Value XMLHttpRequest::getValueProperty(ExecState *exec, int token) const
     }
 
     return getDOMNode(exec,responseXML);
-  case tqStatus:
-    return gettqStatus();
-  case tqStatusText:
-    return gettqStatusText();
+  case Status:
+    return getStatus();
+  case StatusText:
+    return getStatusText();
   case Onreadystatechange:
    if (onReadyStateChangeListener && onReadyStateChangeListener->listenerObjImp()) {
      return onReadyStateChangeListener->listenerObj();
@@ -394,8 +394,8 @@ void XMLHttpRequest::send(const TQString& _body)
   // Set the default referrer if one is not already supplied
   // through setRequestHeader. NOTE: the user can still disable
   // this feature at the protocol level (kio_http).
-  // ### does tqfind() ever succeed? the headers are stored in lower case!
-  if (requestHeaders.tqfind("Referer") == requestHeaders.end()) {
+  // ### does find() ever succeed? the headers are stored in lower case!
+  if (requestHeaders.find("Referer") == requestHeaders.end()) {
     KURL documentURL(doc->URL());
     documentURL.setPass(TQString::null);
     documentURL.setUser(TQString::null);
@@ -487,9 +487,9 @@ void XMLHttpRequest::setRequestHeader(const TQString& _name, const TQString &val
   // Reject all banned headers. See BANNED_HTTP_HEADERS above.
   // kdDebug() << "Banned HTTP Headers: " << BANNED_HTTP_HEADERS << endl;
   TQStringList bannedHeaders = TQStringList::split(',',
-                                  TQString::tqfromLatin1(BANNED_HTTP_HEADERS));
+                                  TQString::fromLatin1(BANNED_HTTP_HEADERS));
 
-  if (bannedHeaders.tqcontains(name))
+  if (bannedHeaders.contains(name))
     return;   // Denied
 
   requestHeaders[name] = value.stripWhiteSpace();
@@ -501,7 +501,7 @@ Value XMLHttpRequest::getAllResponseHeaders() const
     return Undefined();
   }
 
-  int endOfLine = responseHeaders.tqfind("\n");
+  int endOfLine = responseHeaders.find("\n");
 
   if (endOfLine == -1) {
     return Undefined();
@@ -535,27 +535,27 @@ Value XMLHttpRequest::getResponseHeader(const TQString& name) const
     return Undefined();
   }
 
-  int endOfLine = responseHeaders.tqfind("\n", headerLinePos + matchLength);
+  int endOfLine = responseHeaders.find("\n", headerLinePos + matchLength);
 
   return String(responseHeaders.mid(headerLinePos + matchLength, endOfLine - (headerLinePos + matchLength)).stripWhiteSpace());
 }
 
-static Value httptqStatus(const TQString& response, bool texttqStatus = false)
+static Value httpStatus(const TQString& response, bool textStatus = false)
 {
   if (response.isEmpty()) {
     return Undefined();
   }
 
-  int endOfLine = response.tqfind("\n");
+  int endOfLine = response.find("\n");
   TQString firstLine = (endOfLine == -1) ? response : response.left(endOfLine);
-  int codeStart = firstLine.tqfind(" ");
-  int codeEnd = firstLine.tqfind(" ", codeStart + 1);
+  int codeStart = firstLine.find(" ");
+  int codeEnd = firstLine.find(" ", codeStart + 1);
 
   if (codeStart == -1 || codeEnd == -1) {
     return Undefined();
   }
 
-  if (texttqStatus) {
+  if (textStatus) {
     TQString statusText = firstLine.mid(codeEnd + 1, endOfLine - (codeEnd + 1)).stripWhiteSpace();
     return String(statusText);
   }
@@ -571,14 +571,14 @@ static Value httptqStatus(const TQString& response, bool texttqStatus = false)
   return Number(code);
 }
 
-Value XMLHttpRequest::gettqStatus() const
+Value XMLHttpRequest::getStatus() const
 {
-  return httptqStatus(responseHeaders);
+  return httpStatus(responseHeaders);
 }
 
-Value XMLHttpRequest::gettqStatusText() const
+Value XMLHttpRequest::getStatusText() const
 {
-  return httptqStatus(responseHeaders, true);
+  return httpStatus(responseHeaders, true);
 }
 
 void XMLHttpRequest::processSyncLoadResults(const TQByteArray &data, const KURL &finalURL, const TQString &headers)
@@ -643,11 +643,11 @@ void XMLHttpRequest::slotData(KIO::Job*, const TQByteArray &_data)
 
     // NOTE: Replace a 304 response with a 200! Both IE and Mozilla do this.
     // Problem first reported through bug# 110272.
-    int codeStart = responseHeaders.tqfind("304");
+    int codeStart = responseHeaders.find("304");
     if ( codeStart != -1) {
-      int codeEnd = responseHeaders.tqfind("\n", codeStart+3);
+      int codeEnd = responseHeaders.find("\n", codeStart+3);
       if (codeEnd != -1)
-        responseHeaders.tqreplace(codeStart, (codeEnd-codeStart), "200 OK");
+        responseHeaders.replace(codeStart, (codeEnd-codeStart), "200 OK");
     }
 
     changeState(Loaded);
@@ -659,13 +659,13 @@ void XMLHttpRequest::slotData(KIO::Job*, const TQByteArray &_data)
 #endif
 
   if ( decoder == NULL ) {
-    int pos = responseHeaders.tqfind("content-type:", 0, false);
+    int pos = responseHeaders.find("content-type:", 0, false);
 
     if ( pos > -1 ) {
       pos += 13;
-      int index = responseHeaders.tqfind('\n', pos);
+      int index = responseHeaders.find('\n', pos);
       TQString type = responseHeaders.mid(pos, (index-pos));
-      index = type.tqfind (';');
+      index = type.find (';');
       if (index > -1)
         encoding = type.mid( index+1 ).remove(TQRegExp("charset[ ]*=[ ]*", false)).stripWhiteSpace();
     }
diff --git a/khtml/ecma/xmlhttprequest.h b/khtml/ecma/xmlhttprequest.h
index d69f976c3..2c646708e 100644
--- a/khtml/ecma/xmlhttprequest.h
+++ b/khtml/ecma/xmlhttprequest.h
@@ -60,7 +60,7 @@ namespace KJS {
     virtual bool toBoolean(ExecState *) const { return true; }
     virtual const ClassInfo* classInfo() const { return &info; }
     static const ClassInfo info;
-    enum { Onload, Onreadystatechange, ReadyState, ResponseText, ResponseXML, tqStatus, tqStatusText, Abort,
+    enum { Onload, Onreadystatechange, ReadyState, ResponseText, ResponseXML, Status, StatusText, Abort,
            GetAllResponseHeaders, GetResponseHeader, Open, Send, SetRequestHeader,
            OverrideMIMEType };
 
@@ -68,8 +68,8 @@ namespace KJS {
     friend class XMLHttpRequestProtoFunc;
     friend class XMLHttpRequestQObject;
 
-    Value gettqStatusText() const;
-    Value gettqStatus() const;
+    Value getStatusText() const;
+    Value getStatus() const;
     bool urlMatchesDocumentDomain(const KURL&) const;
 
     XMLHttpRequestQObject *qObject;
diff --git a/khtml/html/Makefile.am b/khtml/html/Makefile.am
index 343254bd5..ed7722517 100644
--- a/khtml/html/Makefile.am
+++ b/khtml/html/Makefile.am
@@ -47,7 +47,7 @@ INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/dcop \
 
 # Use "make doctypes" to regenerate doctypes.cpp from doctypes.gperf
 doctypes: $(srcdir)/doctypes.gperf $(srcdir)/Makefile.am
-	gperf -CEot -L "ANSI-C" -k "*" -N tqfindDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards $(srcdir)/doctypes.gperf > $(srcdir)/doctypes.cpp
+	gperf -CEot -L "ANSI-C" -k "*" -N findDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards $(srcdir)/doctypes.gperf > $(srcdir)/doctypes.cpp
 
 #html_documentimpl.lo: doctypes.cpp
 .PHONY: doctypes
diff --git a/khtml/html/doctypes.cpp b/khtml/html/doctypes.cpp
index 68bfe4207..e79a56f34 100644
--- a/khtml/html/doctypes.cpp
+++ b/khtml/html/doctypes.cpp
@@ -1,5 +1,5 @@
 /* ANSI-C code produced by gperf version 3.0.1 */
-/* Command-line: gperf -CEot -L ANSI-C -k '*' -N tqfindDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards /opt/src/kde/kdelibs/khtml/html/doctypes.gperf  */
+/* Command-line: gperf -CEot -L ANSI-C -k '*' -N findDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards /opt/src/kde/kdelibs/khtml/html/doctypes.gperf  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
       && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
@@ -334,7 +334,7 @@ hash (register const char *str, register unsigned int len)
 __inline
 #endif
 const struct PubIDInfo *
-tqfindDoctypeEntry (register const char *str, register unsigned int len)
+findDoctypeEntry (register const char *str, register unsigned int len)
 {
   enum
     {
diff --git a/khtml/html/dtd.cpp b/khtml/html/dtd.cpp
index 02cf81482..accc8b855 100644
--- a/khtml/html/dtd.cpp
+++ b/khtml/html/dtd.cpp
@@ -152,7 +152,7 @@ const unsigned short KDE_NO_EXPORT DOM::tagPriority[] = {
     0, // ID_TEXT
 };
 
-const tagtqStatus DOM::endTag[] = {
+const tagStatus DOM::endTag[] = {
     REQUIRED,  // 0
     REQUIRED,  // ID_A == 1
     REQUIRED,  // ID_ABBR
diff --git a/khtml/html/dtd.dtd b/khtml/html/dtd.dtd
index f451f3c0f..d6a5ac8f0 100644
--- a/khtml/html/dtd.dtd
+++ b/khtml/html/dtd.dtd
@@ -310,7 +310,7 @@
 <!ELEMENT DIV - - (%flow;)*            -- generic language/style container -->
 <!ATTLIST DIV
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %align;                              -- align, text tqalignment --
+  %align;                              -- align, text alignment --
   %reserved;                           -- reserved for possible future use --
   >
 
@@ -336,7 +336,7 @@
   rel         %LinkTypes;    #IMPLIED  -- forward link types --
   rev         %LinkTypes;    #IMPLIED  -- reverse link types --
   accesskey   %Character;    #IMPLIED  -- accessibility key character --
-  tqshape       %Shape;        rect      -- for use with client-side image maps --
+  shape       %Shape;        rect      -- for use with client-side image maps --
   coords      %Coords;       #IMPLIED  -- for use with client-side image maps --
   tabindex    NUMBER         #IMPLIED  -- position in tabbing order --
   onfocus     %Script;       #IMPLIED  -- the element got the focus --
@@ -357,7 +357,7 @@
 <!ELEMENT AREA - O EMPTY               -- client-side image map area -->
 <!ATTLIST AREA
   %attrs;                              -- %coreattrs, %i18n, %events --
-  tqshape       %Shape;        rect      -- controls interpretation of coords --
+  shape       %Shape;        rect      -- controls interpretation of coords --
   coords      %Coords;       #IMPLIED  -- comma separated list of lengths --
   href        %URI;          #IMPLIED  -- URI for linked resource --
   target      %FrameTarget;  #IMPLIED  -- render in this frame --
@@ -425,7 +425,7 @@
   width       %Length;       #IMPLIED  -- override width --
   usemap      %URI;          #IMPLIED  -- use client-side image map --
   ismap       (ismap)        #IMPLIED  -- use server-side image map --
-  align       %IAlign;       #IMPLIED  -- vertical or horizontal tqalignment --
+  align       %IAlign;       #IMPLIED  -- vertical or horizontal alignment --
   border      %Length;       #IMPLIED  -- link border width --
   hspace      %Pixels;       #IMPLIED  -- horizontal gutter --
   vspace      %Pixels;       #IMPLIED  -- vertical gutter --
@@ -458,7 +458,7 @@
   usemap      %URI;          #IMPLIED  -- use client-side image map --
   name        CDATA          #IMPLIED  -- submit as part of form --
   tabindex    NUMBER         #IMPLIED  -- position in tabbing order --
-  align       %IAlign;       #IMPLIED  -- vertical or horizontal tqalignment --
+  align       %IAlign;       #IMPLIED  -- vertical or horizontal alignment --
   border      %Length;       #IMPLIED  -- link border width --
   hspace      %Pixels;       #IMPLIED  -- horizontal gutter --
   vspace      %Pixels;       #IMPLIED  -- vertical gutter --
@@ -488,10 +488,10 @@
   code        CDATA          #IMPLIED  -- applet class file --
   object      CDATA          #IMPLIED  -- serialized applet file --
   alt         %Text;         #IMPLIED  -- short description --
-  name        CDATA          #IMPLIED  -- allows applets to tqfind each other --
+  name        CDATA          #IMPLIED  -- allows applets to find each other --
   width       %Length;       #REQUIRED -- initial width --
   height      %Length;       #REQUIRED -- initial height --
-  align       %IAlign;       #IMPLIED  -- vertical or horizontal tqalignment --
+  align       %IAlign;       #IMPLIED  -- vertical or horizontal alignment --
   hspace      %Pixels;       #IMPLIED  -- horizontal gutter --
   vspace      %Pixels;       #IMPLIED  -- vertical gutter --
   >
@@ -513,7 +513,7 @@
 <!ELEMENT P - O (%inline;)*            -- paragraph -->
 <!ATTLIST P
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %align;                              -- align, text tqalignment --
+  %align;                              -- align, text alignment --
   >
 
 <!--=================== Headings =========================================-->
@@ -526,7 +526,7 @@
 <!ELEMENT (%heading;)  - - (%inline;)* -- heading -->
 <!ATTLIST (%heading;)
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %align;                              -- align, text tqalignment --
+  %align;                              -- align, text alignment --
   >
 
 <!--=================== Preformatted Text ================================-->
@@ -687,7 +687,7 @@
   onselect    %Script;       #IMPLIED  -- some text was selected --
   onchange    %Script;       #IMPLIED  -- the element value was changed --
   accept      %ContentTypes; #IMPLIED  -- list of MIME types for file upload --
-  align       %IAlign;       #IMPLIED  -- vertical or horizontal tqalignment --
+  align       %IAlign;       #IMPLIED  -- vertical or horizontal alignment --
   %reserved;                           -- reserved for possible future use --
   >
 
@@ -804,14 +804,14 @@
 <!-- horizontal placement of table relative to document -->
 <!ENTITY % TAlign "(left|center|right)">
 
-<!-- horizontal tqalignment attributes for cell contents -->
+<!-- horizontal alignment attributes for cell contents -->
 <!ENTITY % cellhalign
   "align      (left|center|right|justify|char) #IMPLIED
-   char       %Character;    #IMPLIED  -- tqalignment char, e.g. char=':' --
-   charoff    %Length;       #IMPLIED  -- offset for tqalignment char --"
+   char       %Character;    #IMPLIED  -- alignment char, e.g. char=':' --
+   charoff    %Length;       #IMPLIED  -- offset for alignment char --"
   >
 
-<!-- vertical tqalignment attributes for cell contents -->
+<!-- vertical alignment attributes for cell contents -->
 <!ENTITY % cellvalign
   "valign     (top|middle|bottom|baseline) #IMPLIED"
   >
@@ -857,12 +857,12 @@ several semantically related columns together.
   %attrs;                              -- %coreattrs, %i18n, %events --
   span        NUMBER         1         -- default number of columns in group --
   width       %MultiLength;  #IMPLIED  -- default width for enclosed COLs --
-  %cellhalign;                         -- horizontal tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment in cells --
   >
 
 <!--
- COL elements define the tqalignment properties for cells in
+ COL elements define the alignment properties for cells in
  one or more columns.
 
  The WIDTH attribute specifies the width of the columns, e.g.
@@ -877,8 +877,8 @@ several semantically related columns together.
   %attrs;                              -- %coreattrs, %i18n, %events --
   span        NUMBER         1         -- COL attributes affect N columns --
   width       %MultiLength;  #IMPLIED  -- column width specification --
-  %cellhalign;                         -- horizontal tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment in cells --
   >
 
 <!--
@@ -895,14 +895,14 @@ several semantically related columns together.
 -->
 <!ATTLIST (THEAD|TBODY|TFOOT)          -- table section --
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %cellhalign;                         -- horizontal tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment in cells --
   >
 
 <!ATTLIST TR                           -- table row --
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %cellhalign;                         -- horizontal tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment in cells --
   bgcolor     %Color;        #IMPLIED  -- background color for row --
   >
 
@@ -919,8 +919,8 @@ several semantically related columns together.
   scope       %Scope;        #IMPLIED  -- scope covered by header cells --
   rowspan     NUMBER         1         -- number of rows spanned by cell --
   colspan     NUMBER         1         -- number of cols spanned by cell --
-  %cellhalign;                         -- horizontal tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment in cells --
   nowrap      (nowrap)       #IMPLIED  -- suppress word wrap --
   bgcolor     %Color;        #IMPLIED  -- cell background color --
   width       %Pixels;       #IMPLIED  -- width for cell --
@@ -973,7 +973,7 @@ several semantically related columns together.
   marginwidth %Pixels;       #IMPLIED  -- margin widths in pixels --
   marginheight %Pixels;      #IMPLIED  -- margin height in pixels --
   scrolling   (yes|no|auto)  auto      -- scrollbar or none --
-  align       %IAlign;       #IMPLIED  -- vertical or horizontal tqalignment --
+  align       %IAlign;       #IMPLIED  -- vertical or horizontal alignment --
   height      %Length;       #IMPLIED  -- frame height --
   width       %Length;       #IMPLIED  -- frame width --
   >
diff --git a/khtml/html/dtd.h b/khtml/html/dtd.h
index 30d97a280..4192ce51c 100644
--- a/khtml/html/dtd.h
+++ b/khtml/html/dtd.h
@@ -30,12 +30,12 @@ namespace DOM
 void addForbidden(int tagId, ushort *forbiddenTags);
 void removeForbidden(int tagId, ushort *forbiddenTags);
 
-enum tagtqStatus { OPTIONAL, REQUIRED, FORBIDDEN };
+enum tagStatus { OPTIONAL, REQUIRED, FORBIDDEN };
 
 bool checkChild(ushort tagID, ushort childID, bool strict = false);
 
 extern const unsigned short tagPriority[];
-extern const tagtqStatus endTag[];
+extern const tagStatus endTag[];
 
 } //namespace DOM
 #endif
diff --git a/khtml/html/html_baseimpl.cpp b/khtml/html/html_baseimpl.cpp
index b73d68257..9ebe26242 100644
--- a/khtml/html/html_baseimpl.cpp
+++ b/khtml/html/html_baseimpl.cpp
@@ -382,7 +382,7 @@ void HTMLFrameElementImpl::setLocation( const DOMString& str )
     // load the frame contents
     KHTMLView *w = getDocument()->view();
     if (w) {
-	KHTMLPart *part = w->part()->tqfindFrame(  name.string() );
+	KHTMLPart *part = w->part()->findFrame(  name.string() );
 	if ( part ) {
 	    part->openURL( KURL( getDocument()->completeURL( url.string() ) ) );
 	} else {
@@ -570,7 +570,7 @@ void HTMLFrameSetElementImpl::recalcStyle( StyleChange ch )
 {
     if (changed() && m_render) {
         m_render->setNeedsLayout(true);
-//         m_render->tqlayout();
+//         m_render->layout();
         setChanged(false);
     }
     HTMLElementImpl::recalcStyle( ch );
diff --git a/khtml/html/html_documentimpl.cpp b/khtml/html/html_documentimpl.cpp
index 413079483..e2ee3ba57 100644
--- a/khtml/html/html_documentimpl.cpp
+++ b/khtml/html/html_documentimpl.cpp
@@ -110,15 +110,15 @@ DOMString HTMLDocumentImpl::cookie() const
     long windowId = 0;
     KHTMLView *v = view ();
 
-    if ( v && v->tqtopLevelWidget() )
-      windowId = v->tqtopLevelWidget()->winId();
+    if ( v && v->topLevelWidget() )
+      windowId = v->topLevelWidget()->winId();
 
     TQCString replyType;
     TQByteArray params, reply;
     TQDataStream stream(params, IO_WriteOnly);
     stream << URL().url() << windowId;
     if (!kapp->dcopClient()->call("kcookiejar", "kcookiejar",
-                                  "tqfindDOMCookies(TQString,long int)", params,
+                                  "findDOMCookies(TQString,long int)", params,
                                   replyType, reply))
     {
        kdWarning(6010) << "Can't communicate with cookiejar!" << endl;
@@ -127,7 +127,7 @@ DOMString HTMLDocumentImpl::cookie() const
 
     TQDataStream stream2(reply, IO_ReadOnly);
     if(replyType != "TQString") {
-         kdError(6010) << "DCOP function tqfindDOMCookies(...) returns "
+         kdError(6010) << "DCOP function findDOMCookies(...) returns "
                        << replyType << ", expected TQString" << endl;
          return DOMString();
     }
@@ -142,8 +142,8 @@ void HTMLDocumentImpl::setCookie( const DOMString & value )
     long windowId = 0;
     KHTMLView *v = view ();
 
-    if ( v && v->tqtopLevelWidget() )
-      windowId = v->tqtopLevelWidget()->winId();
+    if ( v && v->topLevelWidget() )
+      windowId = v->topLevelWidget()->winId();
 
     TQByteArray params;
     TQDataStream stream(params, IO_WriteOnly);
@@ -192,7 +192,7 @@ void HTMLDocumentImpl::setBody(HTMLElementImpl *_body, int& exceptioncode)
     if ( !b )
         documentElement()->appendChild( _body, exceptioncode );
     else
-        documentElement()->tqreplaceChild( _body, b, exceptioncode );
+        documentElement()->replaceChild( _body, b, exceptioncode );
 }
 
 Tokenizer *HTMLDocumentImpl::createTokenizer()
@@ -226,18 +226,18 @@ void HTMLDocumentImpl::slotHistoryChanged()
         return;
 
     recalcStyle( Force );
-    m_render->tqrepaint();
+    m_render->repaint();
 }
 
 HTMLMapElementImpl* HTMLDocumentImpl::getMap(const DOMString& _url)
 {
     TQString url = _url.string();
     TQString s;
-    int pos = url.tqfind('#');
+    int pos = url.find('#');
     //kdDebug(0) << "map pos of #:" << pos << endl;
-    s = TQString(_url.tqunicode() + pos + 1, _url.length() - pos - 1);
+    s = TQString(_url.unicode() + pos + 1, _url.length() - pos - 1);
 
-    TQMapConstIterator<TQString,HTMLMapElementImpl*> it = mapMap.tqfind(s);
+    TQMapConstIterator<TQString,HTMLMapElementImpl*> it = mapMap.find(s);
 
     if (it != mapMap.end())
         return *it;
@@ -297,7 +297,7 @@ static int parseDocTypePart(const TQString& buffer, int index)
         else if (ch == '-') {
             int tmpIndex=index;
             if (buffer[index+1] == '-' &&
-                ((tmpIndex=buffer.tqfind("--", index+2)) != -1))
+                ((tmpIndex=buffer.find("--", index+2)) != -1))
                 index = tmpIndex+2;
             else
                 return index;
@@ -307,7 +307,7 @@ static int parseDocTypePart(const TQString& buffer, int index)
     }
 }
 
-static bool tqcontainsString(const char* str, const TQString& buffer, int offset)
+static bool containsString(const char* str, const TQString& buffer, int offset)
 {
     TQString startString(str);
     if (offset + startString.length() > buffer.length())
@@ -330,20 +330,20 @@ static bool parseDocTypeDeclaration(const TQString& buffer,
     // Skip through any comments and processing instructions.
     int index = 0;
     do {
-        index = buffer.tqfind('<', index);
+        index = buffer.find('<', index);
         if (index == -1) break;
         TQChar nextChar = buffer[index+1];
         if (nextChar == '!') {
-            if (tqcontainsString("doctype", buffer, index+2)) {
+            if (containsString("doctype", buffer, index+2)) {
                 haveDocType = true;
                 index += 9; // Skip "<!DOCTYPE"
                 break;
             }
             index = parseDocTypePart(buffer,index);
-            index = buffer.tqfind('>', index);
+            index = buffer.find('>', index);
         }
         else if (nextChar == '?')
-            index = buffer.tqfind('>', index);
+            index = buffer.find('>', index);
         else
             break;
     } while (index != -1);
@@ -353,16 +353,16 @@ static bool parseDocTypeDeclaration(const TQString& buffer,
     *resultFlags |= PARSEMODE_HAVE_DOCTYPE;
 
     index = parseDocTypePart(buffer, index);
-    if (!tqcontainsString("html", buffer, index))
+    if (!containsString("html", buffer, index))
         return false;
 
     index = parseDocTypePart(buffer, index+4);
-    bool hasPublic = tqcontainsString("public", buffer, index);
+    bool hasPublic = containsString("public", buffer, index);
     if (hasPublic) {
         index = parseDocTypePart(buffer, index+6);
 
         // We've read <!DOCTYPE HTML PUBLIC (not case sensitive).
-        // Now we tqfind the beginning and end of the public identifers
+        // Now we find the beginning and end of the public identifers
         // and system identifiers (assuming they're even present).
         TQChar theChar = buffer[index];
         if (theChar != '\"' && theChar != '\'')
@@ -371,7 +371,7 @@ static bool parseDocTypeDeclaration(const TQString& buffer,
         // |start| is the first character (after the quote) and |end|
         // is the final quote, so there are |end|-|start| characters.
         int publicIDStart = index+1;
-        int publicIDEnd = buffer.tqfind(theChar, publicIDStart);
+        int publicIDEnd = buffer.find(theChar, publicIDStart);
         if (publicIDEnd == -1)
             return false;
         index = parseDocTypePart(buffer, publicIDEnd+1);
@@ -385,7 +385,7 @@ static bool parseDocTypeDeclaration(const TQString& buffer,
             // We have a system identifier.
             *resultFlags |= PARSEMODE_HAVE_SYSTEM_ID;
             int systemIDStart = index+1;
-            int systemIDEnd = buffer.tqfind(next, systemIDStart);
+            int systemIDEnd = buffer.find(next, systemIDStart);
             if (systemIDEnd == -1)
                 return false;
             systemID = buffer.mid(systemIDStart, systemIDEnd - systemIDStart);
@@ -402,7 +402,7 @@ static bool parseDocTypeDeclaration(const TQString& buffer,
         publicID = publicID.simplifyWhiteSpace();
         *resultFlags |= PARSEMODE_HAVE_PUBLIC_ID;
     } else {
-        if (tqcontainsString("system", buffer, index)) {
+        if (containsString("system", buffer, index)) {
             // Doctype has a system ID but no public ID
             *resultFlags |= PARSEMODE_HAVE_SYSTEM_ID;
             index = parseDocTypePart(buffer, index+6);
@@ -410,7 +410,7 @@ static bool parseDocTypeDeclaration(const TQString& buffer,
             if (next != '\"' && next != '\'')
                 return false;
             int systemIDStart = index+1;
-            int systemIDEnd = buffer.tqfind(next, systemIDStart);
+            int systemIDEnd = buffer.find(next, systemIDStart);
             if (systemIDEnd == -1)
                 return false;
             systemID = buffer.mid(systemIDStart, systemIDEnd - systemIDStart);
@@ -473,7 +473,7 @@ void HTMLDocumentImpl::determineParseMode( const TQString &str )
             const char* pubIDStr = lowerPubID.latin1();
 
             // Look up the entry in our gperf-generated table.
-            const PubIDInfo* doctypeEntry = tqfindDoctypeEntry(pubIDStr, publicID.length());
+            const PubIDInfo* doctypeEntry = findDoctypeEntry(pubIDStr, publicID.length());
             if (!doctypeEntry) {
                 // The DOCTYPE is not in the list.  Assume strict mode.
                 // ### Doesn't make any sense, but it's what Mozilla does.
diff --git a/khtml/html/html_elementimpl.cpp b/khtml/html/html_elementimpl.cpp
index f7a082f77..e6269d8b5 100644
--- a/khtml/html/html_elementimpl.cpp
+++ b/khtml/html/html_elementimpl.cpp
@@ -176,7 +176,7 @@ void HTMLElementImpl::parseAttribute(AttributeImpl *attr)
     case ATTR_CLASS:
         if (attr->val()) {
           DOMString v = attr->value();
-          const TQChar* s = v.tqunicode();
+          const TQChar* s = v.unicode();
           int l = v.length();
           while( l && !s->isSpace() )
             l--,s++;
@@ -321,7 +321,7 @@ void HTMLElementImpl::addCSSLength(int id, const DOMString &value, bool numOnly,
         int v = kClamp( TQConstString(s, i).string().toInt(), -8192, 8191 ) ;
         const char* suffix = "px";
         if (!numOnly || multiLength) {
-            // look if we tqfind a % or *
+            // look if we find a % or *
             while (i < l) {
                 if (multiLength && s[i] == '*') {
                     suffix = "";
@@ -354,11 +354,11 @@ static inline bool isHexDigit( const TQChar &c ) {
 
 static inline int toHex( const TQChar &c ) {
     return ( (c >= '0' && c <= '9')
-	     ? (c.tqunicode() - '0')
+	     ? (c.unicode() - '0')
 	     : ( ( c >= 'a' && c <= 'f' )
-		 ? (c.tqunicode() - 'a' + 10)
+		 ? (c.unicode() - 'a' + 10)
 		 : ( ( c >= 'A' && c <= 'F' )
-		     ? (c.tqunicode() - 'A' + 10)
+		     ? (c.unicode() - 'A' + 10)
 		     : -1 ) ) );
 }
 
@@ -457,7 +457,7 @@ DOMString HTMLElementImpl::innerHTML() const
     TQString result; //Use TQString to accumulate since DOMString is poor for appends
     for (NodeImpl *child = firstChild(); child != NULL; child = child->nextSibling()) {
         DOMString kid = child->toString();
-        result += TQConstString(kid.tqunicode(), kid.length()).string();
+        result += TQConstString(kid.unicode(), kid.length()).string();
     }
     return result;
 }
@@ -469,7 +469,7 @@ DOMString HTMLElementImpl::innerText() const
         return text;
 
     const NodeImpl *n = this;
-    // tqfind the next text/image after the anchor, to get a position
+    // find the next text/image after the anchor, to get a position
     while(n) {
         if(n->firstChild())
             n = n->firstChild();
@@ -620,32 +620,32 @@ void HTMLElementImpl::setInnerText( const DOMString &text, int& exceptioncode )
     appendChild( t, exceptioncode );
 }
 
-void HTMLElementImpl::addHTMLAlignment( DOMString tqalignment )
+void HTMLElementImpl::addHTMLAlignment( DOMString alignment )
 {
-    //qDebug("tqalignment is %s", tqalignment.string().latin1() );
-    // vertical tqalignment with respect to the current baseline of the text
+    //qDebug("alignment is %s", alignment.string().latin1() );
+    // vertical alignment with respect to the current baseline of the text
     // right or left means floating images
     int propfloat = -1;
     int propvalign = -1;
-    if ( strcasecmp( tqalignment, "absmiddle" ) == 0 ) {
+    if ( strcasecmp( alignment, "absmiddle" ) == 0 ) {
         propvalign = CSS_VAL_MIDDLE;
-    } else if ( strcasecmp( tqalignment, "absbottom" ) == 0 ) {
+    } else if ( strcasecmp( alignment, "absbottom" ) == 0 ) {
         propvalign = CSS_VAL_BOTTOM;
-    } else if ( strcasecmp( tqalignment, "left" ) == 0 ) {
+    } else if ( strcasecmp( alignment, "left" ) == 0 ) {
 	propfloat = CSS_VAL_LEFT;
 	propvalign = CSS_VAL_TOP;
-    } else if ( strcasecmp( tqalignment, "right" ) == 0 ) {
+    } else if ( strcasecmp( alignment, "right" ) == 0 ) {
 	propfloat = CSS_VAL_RIGHT;
 	propvalign = CSS_VAL_TOP;
-    } else if ( strcasecmp( tqalignment, "top" ) == 0 ) {
+    } else if ( strcasecmp( alignment, "top" ) == 0 ) {
 	propvalign = CSS_VAL_TOP;
-    } else if ( strcasecmp( tqalignment, "middle" ) == 0 ) {
+    } else if ( strcasecmp( alignment, "middle" ) == 0 ) {
 	propvalign = CSS_VAL__KHTML_BASELINE_MIDDLE;
-    } else if ( strcasecmp( tqalignment, "center" ) == 0 ) {
+    } else if ( strcasecmp( alignment, "center" ) == 0 ) {
 	propvalign = CSS_VAL_MIDDLE;
-    } else if ( strcasecmp( tqalignment, "bottom" ) == 0 ) {
+    } else if ( strcasecmp( alignment, "bottom" ) == 0 ) {
 	propvalign = CSS_VAL_BASELINE;
-    } else if ( strcasecmp ( tqalignment, "texttop") == 0 ) {
+    } else if ( strcasecmp ( alignment, "texttop") == 0 ) {
 	propvalign = CSS_VAL_TEXT_TOP;
     }
 
diff --git a/khtml/html/html_elementimpl.h b/khtml/html/html_elementimpl.h
index 83836f15d..f71ae9b23 100644
--- a/khtml/html/html_elementimpl.h
+++ b/khtml/html/html_elementimpl.h
@@ -68,7 +68,7 @@ public:
 
 protected:
     // for IMG, OBJECT and APPLET
-    void addHTMLAlignment( DOMString tqalignment );
+    void addHTMLAlignment( DOMString alignment );
 };
 
 class HTMLGenericElementImpl : public HTMLElementImpl
diff --git a/khtml/html/html_formimpl.cpp b/khtml/html/html_formimpl.cpp
index 6ace551ff..a72df3743 100644
--- a/khtml/html/html_formimpl.cpp
+++ b/khtml/html/html_formimpl.cpp
@@ -122,8 +122,8 @@ static TQCString encodeCString(const TQCString& e)
     // http://www.w3.org/TR/html4/interact/forms.html#h-17.13.4.1
     // safe characters like NS handles them for compatibility
     static const char *safe = "-._*";
-    TQCString encoded(( e.length()+e.tqcontains( '\n' ) )*3
-                     +e.tqcontains('\r') * 3 + 1);
+    TQCString encoded(( e.length()+e.contains( '\n' ) )*3
+                     +e.contains('\r') * 3 + 1);
     int enclen = 0;
     bool crmissing = false;
     unsigned char oldc;
@@ -193,7 +193,7 @@ inline static TQString escapeUnencodeable(const TQTextCodec* codec, const TQStri
             enc_string.append(c);
         else {
             TQString ampersandEscape;
-            ampersandEscape.sprintf("&#%u;", c.tqunicode());
+            ampersandEscape.sprintf("&#%u;", c.unicode());
             enc_string.append(ampersandEscape);
         }
     }
@@ -216,7 +216,7 @@ TQByteArray HTMLFormElementImpl::formData(bool& ok)
     TQByteArray form_data(0);
     TQCString enc_string = ""; // used for non-multipart data
 
-    // tqfind out the QTextcodec to use
+    // find out the QTextcodec to use
     const TQString str = m_acceptcharset.string();
     const TQChar space(' ');
     const unsigned int strLength = str.length();
@@ -231,7 +231,7 @@ TQByteArray HTMLFormElementImpl::formData(bool& ok)
         for ( ; it != itEnd; ++it )
         {
             TQString enc = (*it);
-            if(enc.tqcontains("UNKNOWN"))
+            if(enc.contains("UNKNOWN"))
             {
                 // use standard document encoding
                 enc = "ISO 8859-1";
@@ -391,12 +391,12 @@ TQByteArray HTMLFormElementImpl::formData(bool& ok)
 
 void HTMLFormElementImpl::setEnctype( const DOMString& type )
 {
-    if(type.string().tqfind("multipart", 0, false) != -1 || type.string().tqfind("form-data", 0, false) != -1)
+    if(type.string().find("multipart", 0, false) != -1 || type.string().find("form-data", 0, false) != -1)
     {
         m_enctype = "multipart/form-data";
         m_multipart = true;
         m_post = true;
-    } else if (type.string().tqfind("text", 0, false) != -1 || type.string().tqfind("plain", 0, false) != -1)
+    } else if (type.string().find("text", 0, false) != -1 || type.string().find("plain", 0, false) != -1)
     {
         m_enctype = "text/plain";
         m_multipart = false;
@@ -457,7 +457,7 @@ void HTMLFormElementImpl::walletOpened(KWallet::Wallet *w) {
             if ((current->inputType() == HTMLInputElementImpl::PASSWORD ||
                     current->inputType() == HTMLInputElementImpl::TEXT) &&
                     !current->readOnly() &&
-                    map.tqcontains(current->name().string())) {
+                    map.contains(current->name().string())) {
                 getDocument()->setFocusNode(current);
                 current->setValue(map[current->name().string()]);
             }
@@ -888,7 +888,7 @@ HTMLFormElementImpl *HTMLGenericFormElementImpl::getForm() const
         p = p->parentNode();
     }
 #ifdef FORMS_DEBUG
-    kdDebug( 6030 ) << "couldn't tqfind form!" << endl;
+    kdDebug( 6030 ) << "couldn't find form!" << endl;
     kdDebug( 6030 ) << kdBacktrace() << endl;
 #endif
     return 0;
@@ -1316,10 +1316,10 @@ TQString HTMLInputElementImpl::state( )
 {
     switch (m_type) {
     case PASSWORD:
-        return TQString::tqfromLatin1("."); // empty string, avoid restoring
+        return TQString::fromLatin1("."); // empty string, avoid restoring
     case CHECKBOX:
     case RADIO:
-        return TQString::tqfromLatin1(checked() ? "on" : "off");
+        return TQString::fromLatin1(checked() ? "on" : "off");
     case TEXT:
         if (autoComplete() && value() != getAttribute(ATTR_VALUE) && getDocument()->view())
             getDocument()->view()->addFormCompletionItem(name().string(), value().string());
@@ -1334,7 +1334,7 @@ void HTMLInputElementImpl::restoreState(const TQString &state)
     switch (m_type) {
     case CHECKBOX:
     case RADIO:
-        setChecked((state == TQString::tqfromLatin1("on")));
+        setChecked((state == TQString::fromLatin1("on")));
         break;
     case FILE:
         m_value = DOMString(state.left(state.length()-1));
@@ -1560,12 +1560,12 @@ bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, khtml::encodingLis
             if(m_clicked)
             {
                 m_clicked = false;
-                TQString astr(nme.isEmpty() ? TQString::tqfromLatin1("x") : nme + ".x");
+                TQString astr(nme.isEmpty() ? TQString::fromLatin1("x") : nme + ".x");
 
                 encoding += fixUpfromUnicode(codec, astr);
                 astr.setNum(KMAX( clickX(), 0 ));
                 encoding += fixUpfromUnicode(codec, astr);
-                astr = nme.isEmpty() ? TQString::tqfromLatin1("y") : nme + ".y";
+                astr = nme.isEmpty() ? TQString::fromLatin1("y") : nme + ".y";
                 encoding += fixUpfromUnicode(codec, astr);
                 astr.setNum(KMAX( clickY(), 0 ) );
                 encoding += fixUpfromUnicode(codec, astr);
@@ -1612,7 +1612,7 @@ bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, khtml::encodingLis
             KIO::UDSEntry filestat;
 
             // can't submit file in www-url-form encoded
-            TQWidget* const toplevel = static_cast<RenderSubmitButton*>(m_render)->widget()->tqtopLevelWidget();
+            TQWidget* const toplevel = static_cast<RenderSubmitButton*>(m_render)->widget()->topLevelWidget();
             if (multipart) {
                 TQCString filearray( "" );
                 if ( KIO::NetAccess::stat(fileurl, filestat, toplevel)) {
@@ -2162,7 +2162,7 @@ DOMString HTMLSelectElementImpl::value( ) const
 
 void HTMLSelectElementImpl::setValue(DOMStringImpl* value)
 {
-    // tqfind the option with value() matching the given parameter
+    // find the option with value() matching the given parameter
     // and make it the current selection.
     TQMemArray<HTMLGenericFormElementImpl*> items = listItems();
     for (unsigned i = 0; i < items.size(); i++)
@@ -2192,7 +2192,7 @@ void HTMLSelectElementImpl::restoreState(const TQString &_state)
     recalcListItems();
 
     TQString state = _state;
-    if(!state.isEmpty() && !state.tqcontains('X') && !m_multiple && m_size <= 1) {
+    if(!state.isEmpty() && !state.contains('X') && !m_multiple && m_size <= 1) {
         qWarning("should not happen in restoreState!");
         state[0] = 'X';
     }
@@ -2217,9 +2217,9 @@ NodeImpl *HTMLSelectElementImpl::insertBefore ( NodeImpl *newChild, NodeImpl *re
     return result;
 }
 
-void HTMLSelectElementImpl::tqreplaceChild ( NodeImpl *newChild, NodeImpl *oldChild, int &exceptioncode )
+void HTMLSelectElementImpl::replaceChild ( NodeImpl *newChild, NodeImpl *oldChild, int &exceptioncode )
 {
-    HTMLGenericFormElementImpl::tqreplaceChild(newChild,oldChild, exceptioncode);
+    HTMLGenericFormElementImpl::replaceChild(newChild,oldChild, exceptioncode);
     if( !exceptioncode )
         setRecalcListItems();
 }
@@ -2374,7 +2374,7 @@ void HTMLSelectElementImpl::recalcListItems() const
     m_length = 0;
     while(current) {
         if (current->id() == ID_OPTGROUP && current->firstChild()) {
-            // ### what if optgroup tqcontains just comments? don't want one of no options in it...
+            // ### what if optgroup contains just comments? don't want one of no options in it...
             m_listItems.resize(m_listItems.size()+1);
             m_listItems[m_listItems.size()-1] = static_cast<HTMLGenericFormElementImpl*>(current);
             current = current->firstChild();
@@ -2745,7 +2745,7 @@ void HTMLTextAreaElementImpl::attach()
 static TQString expandLF(const TQString& s)
 {
     // LF -> CRLF
-    unsigned crs = s.tqcontains( '\n' );
+    unsigned crs = s.contains( '\n' );
     if (crs == 0)
 	return s;
     unsigned len = s.length();
@@ -2756,7 +2756,7 @@ static TQString expandLF(const TQString& s)
     for(unsigned pos = 0; pos < len; pos++)
     {
        TQChar c = s.at(pos);
-       switch(c.tqunicode())
+       switch(c.unicode())
        {
          case '\n':
            r[pos2++] = '\r';
@@ -2814,8 +2814,8 @@ DOMString HTMLTextAreaElementImpl::value()
 void HTMLTextAreaElementImpl::setValue(DOMString _value)
 {
     // \r\n -> \n, \r -> \n
-    TQString str = _value.string().tqreplace( "\r\n", "\n" );
-    m_value = str.tqreplace( '\r', '\n' );
+    TQString str = _value.string().replace( "\r\n", "\n" );
+    m_value = str.replace( '\r', '\n' );
     m_dirtyvalue = false;
     m_initialized = true;
     setChanged(true);
@@ -2844,7 +2844,7 @@ DOMString HTMLTextAreaElementImpl::defaultValue()
 
 void HTMLTextAreaElementImpl::setDefaultValue(DOMString _defaultValue)
 {
-    // there may be comments - remove all the text nodes and tqreplace them with one
+    // there may be comments - remove all the text nodes and replace them with one
     TQPtrList<NodeImpl> toRemove;
     NodeImpl *n;
     for (n = firstChild(); n; n = n->nextSibling())
@@ -2953,7 +2953,7 @@ void HTMLIsIndexElementImpl::parseAttribute(AttributeImpl* attr)
 DOMString HTMLIsIndexElementImpl::prompt() const
 {
     // When IsIndex is parsed, <HR/>Prompt: <ISINDEX/><HR/> is created.
-    // So we have to look at the previous sibling to tqfind the prompt text
+    // So we have to look at the previous sibling to find the prompt text
     DOM::NodeImpl* const prev = previousSibling();
     if ( prev && prev->nodeType() == DOM::Node::TEXT_NODE)
         return prev->nodeValue();
@@ -2963,7 +2963,7 @@ DOMString HTMLIsIndexElementImpl::prompt() const
 void HTMLIsIndexElementImpl::setPrompt(const DOMString& str)
 {
     // When IsIndex is parsed, <HR/>Prompt: <ISINDEX/><HR/> is created.
-    // So we have to look at the previous sibling to tqfind the prompt text
+    // So we have to look at the previous sibling to find the prompt text
     int exceptioncode = 0;
     DOM::NodeImpl* const prev = previousSibling();
     if ( prev && prev->nodeType() == DOM::Node::TEXT_NODE)
diff --git a/khtml/html/html_formimpl.h b/khtml/html/html_formimpl.h
index e4db1a931..40fefc9ee 100644
--- a/khtml/html/html_formimpl.h
+++ b/khtml/html/html_formimpl.h
@@ -415,7 +415,7 @@ public:
     virtual void restoreState(const TQString &state);
 
     virtual NodeImpl *insertBefore ( NodeImpl *newChild, NodeImpl *refChild, int &exceptioncode );
-    virtual void      tqreplaceChild ( NodeImpl *newChild, NodeImpl *oldChild, int &exceptioncode );
+    virtual void      replaceChild ( NodeImpl *newChild, NodeImpl *oldChild, int &exceptioncode );
     virtual void      removeChild ( NodeImpl *oldChild, int &exceptioncode );
     virtual NodeImpl *appendChild ( NodeImpl *newChild, int &exceptioncode );
     virtual NodeImpl *addChild( NodeImpl* newChild );
diff --git a/khtml/html/html_headimpl.cpp b/khtml/html/html_headimpl.cpp
index 0f85206b9..d7154e936 100644
--- a/khtml/html/html_headimpl.cpp
+++ b/khtml/html/html_headimpl.cpp
@@ -148,7 +148,7 @@ void HTMLLinkElementImpl::parseAttribute(AttributeImpl *attr)
                 // disabling: recheck alternate status
                 TQString rel =  getAttribute(ATTR_REL).string().lower();
                 TQString type = getAttribute(ATTR_TYPE).string().lower();
-                m_alternate = (type.tqcontains("text/css") || rel.tqcontains("stylesheet")) && rel.tqcontains("alternate");
+                m_alternate = (type.contains("text/css") || rel.contains("stylesheet")) && rel.contains("alternate");
             }
             if (isLoading())
                 break;
@@ -179,19 +179,19 @@ void HTMLLinkElementImpl::process()
 
     // IE extension: location of small icon for locationbar / bookmarks
     // Uses both "shortcut icon" and "icon"
-    if ( part && rel.tqcontains("icon") && !m_url.isEmpty() && !part->parentPart())
+    if ( part && rel.contains("icon") && !m_url.isEmpty() && !part->parentPart())
         part->browserExtension()->setIconURL( KURL(m_url.string()) );
 
     // Stylesheet
     else if (!m_isDisabled &&
-        (type.tqcontains("text/css") || rel.tqcontains("stylesheet"))) {
+        (type.contains("text/css") || rel.contains("stylesheet"))) {
         // no need to load style sheets which aren't for the screen output
         // ### there may be in some situations e.g. for an editor or script to manipulate
-        if( m_media.isNull() || m_media.tqcontains("screen") || m_media.tqcontains("all") || m_media.tqcontains("print") ) {
+        if( m_media.isNull() || m_media.contains("screen") || m_media.contains("all") || m_media.contains("print") ) {
             m_loading = true;
             // Add ourselves as a pending sheet, but only if we aren't an alternate
             // stylesheet.  Alternate stylesheets don't hold up render tree construction.
-            m_alternate = rel.tqcontains("alternate");
+            m_alternate = rel.contains("alternate");
             if (!isAlternate())
                 getDocument()->addPendingSheet();
 
@@ -572,7 +572,7 @@ void HTMLStyleElementImpl::childrenChanged()
 
     m_loading = false;
     if ((m_type.isEmpty() || m_type == "text/css") // Type must be empty or CSS
-         && (m_media.isNull() || m_media.tqcontains("screen") || m_media.tqcontains("all") || m_media.tqcontains("print"))) {
+         && (m_media.isNull() || m_media.contains("screen") || m_media.contains("all") || m_media.contains("print"))) {
         getDocument()->addPendingSheet();
         m_loading = true;
         m_sheet = new CSSStyleSheetImpl(this);
diff --git a/khtml/html/html_imageimpl.cpp b/khtml/html/html_imageimpl.cpp
index 3ba2c2da0..be13e93c2 100644
--- a/khtml/html/html_imageimpl.cpp
+++ b/khtml/html/html_imageimpl.cpp
@@ -214,7 +214,7 @@ DOMString HTMLImageElementImpl::altText() const
     if ( alt.isNull() ) {
         TQString p = KURL( getDocument()->completeURL( getAttribute(ATTR_SRC).string() ) ).prettyURL();
         int pos;
-        if ( ( pos = p.tqfindRev( '.' ) ) > 0 )
+        if ( ( pos = p.findRev( '.' ) ) > 0 )
             p.truncate( pos );
         alt = DOMString( KStringHandler::csqueeze( p ) );
     }
@@ -286,7 +286,7 @@ long HTMLImageElementImpl::width() const
     if (changed()) {
         getDocument()->updateRendering();
         if (getDocument()->view())
-            getDocument()->view()->tqlayout();
+            getDocument()->view()->layout();
     }
 
     return m_render ? m_render->contentWidth() :
@@ -309,7 +309,7 @@ long HTMLImageElementImpl::height() const
     if (changed()) {
         getDocument()->updateRendering();
         if (getDocument()->view())
-            getDocument()->view()->tqlayout();
+            getDocument()->view()->layout();
     }
 
     return m_render ? m_render->contentHeight() :
@@ -418,8 +418,8 @@ void HTMLMapElementImpl::parseAttribute(AttributeImpl *attr)
     case ATTR_NAME:
     {
         DOMString s = attr->value();
-        if(*s.tqunicode() == '#')
-            name = TQString(s.tqunicode()+1, s.length()-1).lower();
+        if(*s.unicode() == '#')
+            name = TQString(s.unicode()+1, s.length()-1).lower();
         else
             name = s.string().lower();
 	// ### make this work for XML documents, e.g. in case of <html:map...>
@@ -441,7 +441,7 @@ HTMLAreaElementImpl::HTMLAreaElementImpl(DocumentImpl *doc)
     m_coords=0;
     m_coordsLen = 0;
     nohref = false;
-    tqshape = Unknown;
+    shape = Unknown;
     lasth = lastw = -1;
 }
 
@@ -461,13 +461,13 @@ void HTMLAreaElementImpl::parseAttribute(AttributeImpl *attr)
     {
     case ATTR_SHAPE:
         if ( strcasecmp( attr->value(), "default" ) == 0 )
-            tqshape = Default;
+            shape = Default;
         else if ( strcasecmp( attr->value(), "circle" ) == 0 )
-            tqshape = Circle;
+            shape = Circle;
         else if ( strcasecmp( attr->value(), "poly" ) == 0 || strcasecmp( attr->value(),  "polygon" ) == 0 )
-            tqshape = Poly;
+            shape = Poly;
         else if ( strcasecmp( attr->value(), "rect" ) == 0 )
-            tqshape = Rect;
+            shape = Rect;
         break;
     case ATTR_COORDS:
         delete [] m_coords;
@@ -497,7 +497,7 @@ bool HTMLAreaElementImpl::mapMouseEvent(int x_, int y_, int width_, int height_,
         region=getRegion(width_, height_);
         lastw=width_; lasth=height_;
     }
-    if (region.tqcontains(TQPoint(x_,y_)))
+    if (region.contains(TQPoint(x_,y_)))
     {
         inside = true;
         info.setInnerNode(this);
@@ -530,7 +530,7 @@ TQRegion HTMLAreaElementImpl::getRegion(int width_, int height_) const
     // what the HTML author tried to tell us.
 
     // a Poly needs at least 3 points (6 coords), so this is correct
-    if ((tqshape==Poly || tqshape==Unknown) && m_coordsLen > 5) {
+    if ((shape==Poly || shape==Unknown) && m_coordsLen > 5) {
         // make sure its even
         int len = m_coordsLen >> 1;
         TQPointArray points(len);
@@ -539,19 +539,19 @@ TQRegion HTMLAreaElementImpl::getRegion(int width_, int height_) const
                             m_coords[(i<<1)+1].minWidth(height_));
         region = TQRegion(points);
     }
-    else if (tqshape==Circle && m_coordsLen>=3 || tqshape==Unknown && m_coordsLen == 3) {
+    else if (shape==Circle && m_coordsLen>=3 || shape==Unknown && m_coordsLen == 3) {
         int r = kMin(m_coords[2].minWidth(width_), m_coords[2].minWidth(height_));
         region = TQRegion(m_coords[0].minWidth(width_)-r,
                          m_coords[1].minWidth(height_)-r, 2*r, 2*r,TQRegion::Ellipse);
     }
-    else if (tqshape==Rect && m_coordsLen>=4 || tqshape==Unknown && m_coordsLen == 4) {
+    else if (shape==Rect && m_coordsLen>=4 || shape==Unknown && m_coordsLen == 4) {
         int x0 = m_coords[0].minWidth(width_);
         int y0 = m_coords[1].minWidth(height_);
         int x1 = m_coords[2].minWidth(width_);
         int y1 = m_coords[3].minWidth(height_);
         region = TQRegion(x0,y0,x1-x0,y1-y0);
     }
-    else if (tqshape==Default)
+    else if (shape==Default)
         region = TQRegion(0,0,width_,height_);
     // else
        // return null region
diff --git a/khtml/html/html_imageimpl.h b/khtml/html/html_imageimpl.h
index 1a389e895..6f26cd2df 100644
--- a/khtml/html/html_imageimpl.h
+++ b/khtml/html/html_imageimpl.h
@@ -102,7 +102,7 @@ public:
 
     virtual void parseAttribute(AttributeImpl *attr);
 
-    bool isDefault() const { return tqshape==Default; }
+    bool isDefault() const { return shape==Default; }
 
     bool mapMouseEvent(int x_, int y_, int width_, int height_,
                        khtml::RenderObject::NodeInfo& info);
@@ -117,7 +117,7 @@ protected:
     khtml::Length* m_coords;
     int m_coordsLen;
     int lastw, lasth;
-    Shape tqshape  : 3;
+    Shape shape  : 3;
     bool nohref  : 1;
 };
 
diff --git a/khtml/html/html_miscimpl.cpp b/khtml/html/html_miscimpl.cpp
index 84460195c..58804bff5 100644
--- a/khtml/html/html_miscimpl.cpp
+++ b/khtml/html/html_miscimpl.cpp
@@ -225,7 +225,7 @@ NodeImpl *HTMLCollectionImpl::item ( unsigned long index ) const
     HTMLTableSectionElementImpl*  section;
 
     NodeImpl* found = 0;
-    if (table->tqfindRowSection(index, section, sectionIndex)) {
+    if (table->findRowSection(index, section, sectionIndex)) {
         HTMLCollectionImpl rows(section, TSECTION_ROWS);
         found = rows.item(sectionIndex);
     }
@@ -290,7 +290,7 @@ TQValueList<NodeImpl*> HTMLCollectionImpl::namedItems( const DOMString &name ) c
     //remember stuff about elements we were asked for.
     m_cache->updateNodeListInfo(m_refNode->getDocument());
     CollectionCache* cache = static_cast<CollectionCache*>(m_cache);
-    if (TQValueList<NodeImpl*>* info = cache->nameCache.tqfind(key)) {
+    if (TQValueList<NodeImpl*>* info = cache->nameCache.find(key)) {
         return *info;
     }
     else {
@@ -366,7 +366,7 @@ NodeImpl *HTMLFormCollectionImpl::nextNamedItem( const DOMString &name ) const
 {
     TQPtrList<HTMLGenericFormElementImpl>& l = static_cast<HTMLFormElementImpl*>( m_refNode )->formElements;
 
-    //Go through the list, trying to tqfind the appropriate named form element.
+    //Go through the list, trying to find the appropriate named form element.
     for ( ; currentNamePos < l.count(); ++currentNamePos )
     {
         HTMLGenericFormElementImpl* el = l.at(currentNamePos);
diff --git a/khtml/html/html_miscimpl.h b/khtml/html/html_miscimpl.h
index f66274d4a..b28fef82a 100644
--- a/khtml/html/html_miscimpl.h
+++ b/khtml/html/html_miscimpl.h
@@ -106,7 +106,7 @@ protected:
     bool checkForNameMatch(NodeImpl *node, const DOMString &name) const;
 };
 
-// this whole class is just a big hack to tqfind form elements even in
+// this whole class is just a big hack to find form elements even in
 // malformed HTML elements
 // the famous <table><tr><form><td> problem
 class HTMLFormCollectionImpl : public HTMLCollectionImpl
diff --git a/khtml/html/html_objectimpl.cpp b/khtml/html/html_objectimpl.cpp
index a4c1920ac..106a862e9 100644
--- a/khtml/html/html_objectimpl.cpp
+++ b/khtml/html/html_objectimpl.cpp
@@ -57,7 +57,7 @@ HTMLObjectBaseElementImpl::HTMLObjectBaseElementImpl(DocumentImpl *doc)
 
 void HTMLObjectBaseElementImpl::setServiceType(const TQString & val) {
     serviceType = val.lower();
-    int pos = serviceType.tqfind( ";" );
+    int pos = serviceType.find( ";" );
     if ( pos!=-1 )
         serviceType.truncate( pos );
 }
@@ -160,9 +160,9 @@ void HTMLObjectBaseElementImpl::attach() {
 
     if (serviceType.isEmpty() && url.startsWith("data:")) {
         // Extract the MIME type from the data URL.
-        int index = url.tqfind(';');
+        int index = url.find(';');
         if (index == -1)
-            index = url.tqfind(',');
+            index = url.find(',');
         if (index != -1) {
             int len = index - 5;
             if (len > 0)
diff --git a/khtml/html/html_tableimpl.cpp b/khtml/html/html_tableimpl.cpp
index 1c982a624..2c2e6567d 100644
--- a/khtml/html/html_tableimpl.cpp
+++ b/khtml/html/html_tableimpl.cpp
@@ -81,7 +81,7 @@ NodeImpl* HTMLTableElementImpl::setCaption( HTMLTableCaptionElementImpl *c )
     int exceptioncode = 0;
     NodeImpl* r;
     if(ElementImpl* cap = caption()) {
-        tqreplaceChild ( c, cap, exceptioncode );
+        replaceChild ( c, cap, exceptioncode );
         r = c;
     }
     else
@@ -95,7 +95,7 @@ NodeImpl* HTMLTableElementImpl::setTHead( HTMLTableSectionElementImpl *s )
     int exceptioncode = 0;
     NodeImpl* r;
     if( ElementImpl* head = tHead() ) {
-        tqreplaceChild( s, head, exceptioncode );
+        replaceChild( s, head, exceptioncode );
         r = s;
     }
     else if(ElementImpl* foot = tFoot())
@@ -114,7 +114,7 @@ NodeImpl* HTMLTableElementImpl::setTFoot( HTMLTableSectionElementImpl *s )
     int exceptioncode = 0;
     NodeImpl* r;
     if(ElementImpl* foot = tFoot()) {
-        tqreplaceChild ( s, foot, exceptioncode );
+        replaceChild ( s, foot, exceptioncode );
         r = s;
     } else if(ElementImpl* firstBody = tFirstBody())
         r = insertBefore( s, firstBody, exceptioncode );
@@ -130,7 +130,7 @@ NodeImpl* HTMLTableElementImpl::setTBody( HTMLTableSectionElementImpl *s )
     NodeImpl* r;
 
     if(ElementImpl* firstBody = tFirstBody()) {
-        tqreplaceChild ( s, firstBody, exceptioncode );
+        replaceChild ( s, firstBody, exceptioncode );
         r = s;
     } else
         r = appendChild( s, exceptioncode );
@@ -205,7 +205,7 @@ void HTMLTableElementImpl::deleteCaption(  )
 }
 
 /**
- Helper. This checks whether the section tqcontains the desired index, and if so,
+ Helper. This checks whether the section contains the desired index, and if so,
  returns the section. Otherwise, it adjust the index, and returns 0.
  indeces < 0 are considered to be infinite.
 
@@ -227,7 +227,7 @@ static inline HTMLTableSectionElementImpl* processSection(HTMLTableSectionElemen
 }
 
 
-bool HTMLTableElementImpl::tqfindRowSection(long index,
+bool HTMLTableElementImpl::findRowSection(long index,
                         HTMLTableSectionElementImpl*& outSection,
                         long&                         outIndex) const
 {
@@ -280,7 +280,7 @@ HTMLElementImpl *HTMLTableElementImpl::insertRow( long index, int &exceptioncode
 
     long sectionIndex;
     HTMLTableSectionElementImpl* section;
-    if ( tqfindRowSection( index, section, sectionIndex ) )
+    if ( findRowSection( index, section, sectionIndex ) )
         return section->insertRow( sectionIndex, exceptioncode );
     else if ( index == -1 || sectionIndex == 0 )
         return section->insertRow( section->numRows(), exceptioncode );
@@ -294,7 +294,7 @@ void HTMLTableElementImpl::deleteRow( long index, int &exceptioncode )
 {
     long sectionIndex;
     HTMLTableSectionElementImpl* section;
-    if ( tqfindRowSection( index, section, sectionIndex ) )
+    if ( findRowSection( index, section, sectionIndex ) )
         section->deleteRow( sectionIndex, exceptioncode );
     else if ( section && index == -1 )
         section->deleteRow( -1, exceptioncode );
@@ -389,10 +389,10 @@ NodeImpl *HTMLTableElementImpl::insertBefore ( NodeImpl *newChild, NodeImpl *ref
     return retval;
 }
 
-void HTMLTableElementImpl::tqreplaceChild ( NodeImpl *newChild, NodeImpl *oldChild, int &exceptioncode )
+void HTMLTableElementImpl::replaceChild ( NodeImpl *newChild, NodeImpl *oldChild, int &exceptioncode )
 {
     handleChildRemove( oldChild ); //Always safe.
-    HTMLElementImpl::tqreplaceChild( newChild, oldChild, exceptioncode );
+    HTMLElementImpl::replaceChild( newChild, oldChild, exceptioncode );
     if ( !exceptioncode )
         handleChildAdd( newChild );
 }
diff --git a/khtml/html/html_tableimpl.h b/khtml/html/html_tableimpl.h
index 277d76d14..76d81ce50 100644
--- a/khtml/html/html_tableimpl.h
+++ b/khtml/html/html_tableimpl.h
@@ -277,7 +277,7 @@ public:
     // overrides
     virtual NodeImpl *addChild(NodeImpl *child);
     virtual NodeImpl *insertBefore ( NodeImpl *newChild, NodeImpl *refChild, int &exceptioncode );
-    virtual void      tqreplaceChild ( NodeImpl *newChild, NodeImpl *oldChild, int &exceptioncode );
+    virtual void      replaceChild ( NodeImpl *newChild, NodeImpl *oldChild, int &exceptioncode );
     virtual void      removeChild ( NodeImpl *oldChild, int &exceptioncode );
     virtual NodeImpl *appendChild ( NodeImpl *newChild, int &exceptioncode );
     
@@ -285,7 +285,7 @@ public:
     virtual void attach();
     virtual void close();
 
-    /* Tries to tqfind the section containing row number outIndex.
+    /* Tries to find the section containing row number outIndex.
        Returns whether it succeeded or not. negative outIndex values
        are interpreted as being infinite.
 
@@ -295,7 +295,7 @@ public:
        On failure, outSection points to the last section of the table, and
        index is the offset the row would have if there was an additional section.
     */
-    bool tqfindRowSection(long inIndex,
+    bool findRowSection(long inIndex,
                         HTMLTableSectionElementImpl*& outSection,
                         long&                         outIndex) const;
 protected:
diff --git a/khtml/html/htmlparser.cpp b/khtml/html/htmlparser.cpp
index dd4c4344e..9da99f4b3 100644
--- a/khtml/html/htmlparser.cpp
+++ b/khtml/html/htmlparser.cpp
@@ -239,7 +239,7 @@ void KHTMLParser::parseToken(Token *t)
         if(inBody && !skipMode() &&
            current->id() != ID_STYLE && current->id() != ID_TITLE &&
            current->id() != ID_SCRIPT &&
-           !t->text->tqcontainsOnlyWhitespace()) haveContent = true;
+           !t->text->containsOnlyWhitespace()) haveContent = true;
 #ifdef PARSER_DEBUG
         kdDebug(6035) << "length="<< t->text->l << " text='" << TQConstString(t->text->s, t->text->l).string() << "'" << endl;
 #endif
@@ -509,7 +509,7 @@ bool KHTMLParser::insertNode(NodeImpl *n, bool flat)
         {
             // Don't try to fit random white-space anywhere
             TextImpl *t = static_cast<TextImpl *>(n);
-            if (t->tqcontainsOnlyWhitespace())
+            if (t->containsOnlyWhitespace())
                 return false;
             // ignore text inside the following elements.
             switch(current->id())
@@ -617,7 +617,7 @@ bool KHTMLParser::insertNode(NodeImpl *n, bool flat)
                 break;
             case ID_TEXT: {
                 TextImpl *t = static_cast<TextImpl *>(n);
-                if (t->tqcontainsOnlyWhitespace())
+                if (t->containsOnlyWhitespace())
                     return false;
                 /* Fall through to default */
             }
@@ -1425,7 +1425,7 @@ void KHTMLParser::handleResidualStyleCloseTagAcrossBlocks(HTMLStackElem* elem)
         newNode->appendChild(currNode, exceptionCode);
         currNode = nextNode;
 
- // TODO - To be tqreplaced.
+ // TODO - To be replaced.
         // Re-register form elements with currently active form, step 1 will have removed them
         if (form && currNode && currNode->isGenericFormElement())
         {
diff --git a/khtml/html/htmlparser.h b/khtml/html/htmlparser.h
index a8329f0fc..d0ce549ef 100644
--- a/khtml/html/htmlparser.h
+++ b/khtml/html/htmlparser.h
@@ -30,7 +30,7 @@
 #define HTMLPARSER_H
 
 // 0 all
-// 1 domtree + rendertree + styleForElement, no tqlayouting
+// 1 domtree + rendertree + styleForElement, no layouting
 // 2 domtree only
 #define SPEED_DEBUG 0
 
diff --git a/khtml/html/htmltokenizer.cpp b/khtml/html/htmltokenizer.cpp
index ba8e99a50..5da6edd14 100644
--- a/khtml/html/htmltokenizer.cpp
+++ b/khtml/html/htmltokenizer.cpp
@@ -89,7 +89,7 @@ static const char titleEnd [] = "</title";
 #define fixUpChar(x)
 #else
 #define fixUpChar(x) \
-            switch ((x).tqunicode()) \
+            switch ((x).unicode()) \
             { \
             case 0x80: (x) = 0x20ac; break; \
             case 0x82: (x) = 0x201a;    break; \
@@ -347,7 +347,7 @@ void HTMLTokenizer::parseSpecial(TokenizerString &src)
         // possible end of tagname, lets check.
         if ( !scriptCodeResync && !escaped && !src.escaped() && ( ch == '>' || ch == '/' || ch <= ' ' ) && ch &&
              scriptCodeSize >= searchStopperLen &&
-             !TQConstString( scriptCode+scriptCodeSize-searchStopperLen, searchStopperLen ).string().tqfind( searchStopper, 0, false )) {
+             !TQConstString( scriptCode+scriptCodeSize-searchStopperLen, searchStopperLen ).string().find( searchStopper, 0, false )) {
             scriptCodeResync = scriptCodeSize-searchStopperLen+1;
             tquote = NoQuote;
             continue;
@@ -471,7 +471,7 @@ void HTMLTokenizer::parseComment(TokenizerString &src)
 
         if (strict)
         {
-            if (src->tqunicode() == '-') {
+            if (src->unicode() == '-') {
                 delimiterCount++;
                 if (delimiterCount == 2) {
                     delimiterCount = 0;
@@ -482,7 +482,7 @@ void HTMLTokenizer::parseComment(TokenizerString &src)
                 delimiterCount = 0;
         }
 
-        if ((!strict || canClose) && src->tqunicode() == '>')
+        if ((!strict || canClose) && src->unicode() == '>')
         {
             bool handleBrokenComments =  brokenComments && !( script || style );
             bool scriptEnd=false;
@@ -521,7 +521,7 @@ void HTMLTokenizer::parseServer(TokenizerString &src)
     checkScriptBuffer(src.length());
     while ( !src.isEmpty() ) {
         scriptCode[ scriptCodeSize++ ] = *src;
-        if (src->tqunicode() == '>' &&
+        if (src->unicode() == '>' &&
             scriptCodeSize > 1 && scriptCode[scriptCodeSize-2] == '%') {
             ++src;
             server = false;
@@ -607,7 +607,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start)
 
     while( !src.isEmpty() )
     {
-        ushort cc = src->tqunicode();
+        ushort cc = src->unicode();
         switch(Entity) {
         case NoEntity:
             return;
@@ -639,7 +639,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start)
 
         case Hexadecimal:
         {
-            int uc = EntityChar.tqunicode();
+            int uc = EntityChar.unicode();
             int ll = kMin<uint>(src.length(), 8);
             while(ll--) {
                 TQChar csrc(src->lower());
@@ -658,7 +658,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start)
         }
         case Decimal:
         {
-            int uc = EntityChar.tqunicode();
+            int uc = EntityChar.unicode();
             int ll = kMin(src.length(), 9-cBufferPos);
             while(ll--) {
                 cc = src->cell();
@@ -695,7 +695,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start)
                 // be IE compatible and interpret even unterminated entities
                 // outside tags. like "foo &nbspstuff bla".
                 if ( tag == NoTag ) {
-                    const entity* e = kde_tqfindEntity(cBuffer, cBufferPos);
+                    const entity* e = kde_findEntity(cBuffer, cBufferPos);
                     if ( e && e->code < 256 ) {
                         EntityChar = e->code;
                         entityLen = cBufferPos;
@@ -705,7 +705,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start)
             if(cBufferPos == 9) Entity = SearchSemicolon;
             if(Entity == SearchSemicolon) {
                 if(cBufferPos > 1) {
-                    const entity *e = kde_tqfindEntity(cBuffer, cBufferPos);
+                    const entity *e = kde_findEntity(cBuffer, cBufferPos);
                     // IE only accepts unterminated entities < 256,
                     // Gecko accepts them all, but only outside tags
                     if(e && ( tag == NoTag || e->code < 256 || *src == ';' )) {
@@ -718,7 +718,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start)
         }
         case SearchSemicolon:
 #ifdef TOKEN_DEBUG
-            kdDebug( 6036 ) << "ENTITY " << EntityChar.tqunicode() << endl;
+            kdDebug( 6036 ) << "ENTITY " << EntityChar.unicode() << endl;
 #endif
             fixUpChar(EntityChar);
 
@@ -813,7 +813,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
                     break;
                 }
                 // this is a nasty performance trick. will work for the A-Z
-                // characters, but not for others. if it tqcontains one,
+                // characters, but not for others. if it contains one,
                 // we fail anyway
                 char cc = curchar;
                 cBuffer[cBufferPos++] = cc | 0x20;
@@ -919,7 +919,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
                                     a = khtml::getAttrID(cBuffer, cBufferPos-1);
                             }
                             if (!a)
-                                attrName = TQString::tqfromLatin1(TQCString(cBuffer, cBufferPos+1).data());
+                                attrName = TQString::fromLatin1(TQCString(cBuffer, cBufferPos+1).data());
                         }
 
                         dest = buffer;
@@ -941,7 +941,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
             }
             if ( cBufferPos == CBUFLEN ) {
                 cBuffer[cBufferPos] = '\0';
-                attrName = TQString::tqfromLatin1(TQCString(cBuffer, cBufferPos+1).data());
+                attrName = TQString::fromLatin1(TQCString(cBuffer, cBufferPos+1).data());
                 dest = buffer;
                 *dest++ = 0;
                 tag = SearchEqual;
@@ -956,7 +956,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
             ushort curchar;
             bool atespace = false;
             while(!src.isEmpty()) {
-                curchar = src->tqunicode();
+                curchar = src->unicode();
                 if(curchar > ' ') {
                     if(curchar == '=') {
 #ifdef TOKEN_DEBUG
@@ -988,7 +988,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
         {
             ushort curchar;
             while(!src.isEmpty()) {
-                curchar = src->tqunicode();
+                curchar = src->unicode();
                 if(curchar > ' ') {
                     if(( curchar == '\'' || curchar == '\"' )) {
                         tquote = curchar == '\"' ? DoubleQuote : SingleQuote;
@@ -1012,7 +1012,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
             while(!src.isEmpty()) {
                 checkBuffer();
 
-                curchar = src->tqunicode();
+                curchar = src->unicode();
                 if(curchar <= '\'' && !src.escaped()) {
                     // ### attributes like '&{blaa....};' are supposed to be treated as jscript.
                     if ( curchar == '&' )
@@ -1050,7 +1050,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
             ushort curchar;
             while(!src.isEmpty()) {
                 checkBuffer();
-                curchar = src->tqunicode();
+                curchar = src->unicode();
                 if(curchar <= '>' && !src.escaped()) {
                     // parse Entities
                     if ( curchar == '&' )
@@ -1351,7 +1351,7 @@ void HTMLTokenizer::write( const TokenizerString &str, bool appendData )
         // do we need to enlarge the buffer?
         checkBuffer();
 
-        ushort cc = src->tqunicode();
+        ushort cc = src->unicode();
 
         if (skipLF && (cc != '\n'))
             skipLF = false;
@@ -1595,7 +1595,7 @@ void HTMLTokenizer::finish()
         killTimer( m_autoCloseTimer );
         m_autoCloseTimer = 0;
     }
-    // do this as long as we don't tqfind matching comment ends
+    // do this as long as we don't find matching comment ends
     while((title || script || comment || server) && scriptCode && scriptCodeSize)
     {
         // we've found an unmatched comment start
@@ -1618,7 +1618,7 @@ void HTMLTokenizer::finish()
             food += TQString(scriptCode, scriptCodeSize);
         }
         else {
-            pos = TQConstString(scriptCode, scriptCodeSize).string().tqfind('>');
+            pos = TQConstString(scriptCode, scriptCodeSize).string().find('>');
             food.setUnicode(scriptCode+pos+1, scriptCodeSize-pos-1); // deep copy
         }
         KHTML_DELETE_QCHAR_VEC(scriptCode);
diff --git a/khtml/html/htmltokenizer.h b/khtml/html/htmltokenizer.h
index 2f257b106..8e36353b0 100644
--- a/khtml/html/htmltokenizer.h
+++ b/khtml/html/htmltokenizer.h
@@ -56,7 +56,7 @@ namespace khtml {
      * @internal
      * represents one HTML tag. Consists of a numerical id, and the list
      * of attributes. Can also represent text. In this case the id = 0 and
-     * text tqcontains the text.
+     * text contains the text.
      */
     class Token
     {
@@ -76,8 +76,8 @@ namespace khtml {
         {
             DOMStringImpl *value = 0;
             NodeImpl::Id tid = 0;
-            if(buffer->tqunicode()) {
-		tid = buffer->tqunicode();
+            if(buffer->unicode()) {
+		tid = buffer->unicode();
 		value = v.implementation();
             }
             else if ( !attrName.isEmpty() && attrName != "/" ) {
diff --git a/khtml/htmlpageinfo.ui b/khtml/htmlpageinfo.ui
index f7a299eb4..37adef500 100644
--- a/khtml/htmlpageinfo.ui
+++ b/khtml/htmlpageinfo.ui
@@ -6,7 +6,7 @@
     <property name="name">
         <cstring>HTMLPageInfo</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -42,7 +42,7 @@
                 </property>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -263,7 +263,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -292,8 +292,8 @@
     <include location="global" impldecl="in declaration">qlistview.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kactivelabel.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/khtml/java/KJAS_GRAMMAR.txt b/khtml/java/KJAS_GRAMMAR.txt
index bd2359f8b..5632f8de8 100644
--- a/khtml/java/KJAS_GRAMMAR.txt
+++ b/khtml/java/KJAS_GRAMMAR.txt
@@ -15,7 +15,7 @@ KJAS Grammar
                     <initApplet>     |
                     <showURLInFrame> |
                     <showDocument>   |
-                    <showtqStatus>     |
+                    <showStatus>     |
                     <resizeApplet>   |
                     <getURLData>     |
                     <URLData>        |
@@ -43,7 +43,7 @@ KJAS Grammar
                     <SEP><URL><END>
 <showURLInFrame> -> <1 byte equal to 9 when cast as int><SEP><ContextID>
                     <SEP><URL><SEP><targetFrame><END>
-<showtqStatus>     -> <1 byte equal to 10 when cast as int><SEP><ContextID>
+<showStatus>     -> <1 byte equal to 10 when cast as int><SEP><ContextID>
                     <SEP><string><END>
 <resizeApplet>   -> <1 byte equal to 11 when cast as int><SEP><ContextID>
                     <SEP><AppletID><SEP><Width><SEP><Height><END>
diff --git a/khtml/java/README b/khtml/java/README
index 69538ed8b..5d64e742f 100644
--- a/khtml/java/README
+++ b/khtml/java/README
@@ -14,7 +14,7 @@ kjava-classes.zip	An *uncompressed* ZIP file containing the .class files
 			support some crappy JVMs.
 org/kde/kjas/server	Java sources for KJAS server process
 
-You can tqfind more information at http://developer.kde.org/language-bindings/java/
+You can find more information at http://developer.kde.org/language-bindings/java/
 
 Richard Moore.
 rich@kde.org
diff --git a/khtml/java/kjava.jar b/khtml/java/kjava.jar
index f2a92ac85..afab6884b 100644
--- a/khtml/java/kjava.jar
+++ b/khtml/java/kjava.jar
diff --git a/khtml/java/kjavaapplet.cpp b/khtml/java/kjavaapplet.cpp
index fad22f9eb..879c8624e 100644
--- a/khtml/java/kjavaapplet.cpp
+++ b/khtml/java/kjavaapplet.cpp
@@ -222,27 +222,27 @@ void KJavaApplet::stateChange( const int newStateInt ) {
             break;
         case INSTANCIATED:
             if (ok) {
-                showtqStatus(i18n("Initializing Applet \"%1\"...").arg(appletName()));
+                showStatus(i18n("Initializing Applet \"%1\"...").arg(appletName()));
             }
             ok = (d->state == CLASS_LOADED);
             break;
         case INITIALIZED:
             ok = (d->state == INSTANCIATED);
             if (ok) { 
-                showtqStatus(i18n("Starting Applet \"%1\"...").arg(appletName()));
+                showStatus(i18n("Starting Applet \"%1\"...").arg(appletName()));
                 start();
             }
             break;
         case STARTED:
             ok = (d->state == INITIALIZED || d->state == STOPPED);
             if (ok) {    
-                showtqStatus(i18n("Applet \"%1\" started").arg(appletName()));
+                showStatus(i18n("Applet \"%1\" started").arg(appletName()));
             }
             break;
         case STOPPED:
             ok = (d->state == INITIALIZED || d->state == STARTED);
             if (ok) {    
-                showtqStatus(i18n("Applet \"%1\" stopped").arg(appletName()));
+                showStatus(i18n("Applet \"%1\" stopped").arg(appletName()));
             }
             break;
         case DESTROYED:
@@ -259,7 +259,7 @@ void KJavaApplet::stateChange( const int newStateInt ) {
     } 
 }
 
-void KJavaApplet::showtqStatus(const TQString &msg) {
+void KJavaApplet::showStatus(const TQString &msg) {
     TQStringList args;
     args << msg;
     context->processCmd("showstatus", args); 
diff --git a/khtml/java/kjavaapplet.h b/khtml/java/kjavaapplet.h
index 15d89d4cd..6fe0f7709 100644
--- a/khtml/java/kjavaapplet.h
+++ b/khtml/java/kjavaapplet.h
@@ -47,7 +47,7 @@ class KJavaAppletContext;
 class KJavaAppletPrivate;
 
 
-class KJavaApplet : public TQObject
+class KJavaApplet : public QObject
 {
 Q_OBJECT
 
@@ -238,7 +238,7 @@ public:
 signals:
     void jsEvent (const TQStringList & args);
 private:
-    void showtqStatus( const TQString &msg);
+    void showStatus( const TQString &msg);
     KJavaAppletPrivate*    d;
     TQMap<TQString, TQString> params;
     KJavaAppletContext*    context;
diff --git a/khtml/java/kjavaappletcontext.cpp b/khtml/java/kjavaappletcontext.cpp
index 6875ddfe5..76914a5dc 100644
--- a/khtml/java/kjavaappletcontext.cpp
+++ b/khtml/java/kjavaappletcontext.cpp
@@ -138,27 +138,27 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg
     kdDebug(6100) << "KJavaAppletContext::received, cmd = >>" << cmd << "<<" << endl;
     kdDebug(6100) << "arg count = " << arg.count() << endl;
 
-    if ( cmd == TQString::tqfromLatin1("showstatus")
+    if ( cmd == TQString::fromLatin1("showstatus")
 	 && !arg.empty() )
     {
         TQString tmp = arg.first();
-        tmp.tqreplace(TQRegExp("[\n\r]"), "");
+        tmp.replace(TQRegExp("[\n\r]"), "");
         kdDebug(6100) << "status message = " << tmp << endl;
-        emit showtqStatus( tmp );
+        emit showStatus( tmp );
     }
-    else if ( cmd == TQString::tqfromLatin1( "showurlinframe" )
+    else if ( cmd == TQString::fromLatin1( "showurlinframe" )
               && arg.count() > 1 )
     {
         kdDebug(6100) << "url = " << arg[0] << ", frame = " << arg[1] << endl;
         emit showDocument( arg[0], arg[1] );
     }
-    else if ( cmd == TQString::tqfromLatin1( "showdocument" )
+    else if ( cmd == TQString::fromLatin1( "showdocument" )
               && !arg.empty() )
     {
         kdDebug(6100) << "url = " << arg.first() << endl;
         emit showDocument( arg.first(), "_top" );
     }
-    else if ( cmd == TQString::tqfromLatin1( "resizeapplet" )
+    else if ( cmd == TQString::fromLatin1( "resizeapplet" )
               && arg.count() > 2 )
     {
         //arg[1] should be appletID
@@ -180,10 +180,10 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg
                 tmp->resizeAppletWidget( width, height );
         }
     }
-    else if (cmd.startsWith(TQString::tqfromLatin1("audioclip_"))) {
+    else if (cmd.startsWith(TQString::fromLatin1("audioclip_"))) {
         kdDebug(DEBUGAREA) << "process Audio command (not yet implemented): " << cmd  << " " << arg[0] << endl;
     }
-    else if ( cmd == TQString::tqfromLatin1( "JS_Event" )
+    else if ( cmd == TQString::fromLatin1( "JS_Event" )
               && arg.count() > 2 )
     {
         bool ok;
@@ -198,7 +198,7 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg
         else
             kdError(DEBUGAREA) << "parse JS event " << arg[0] << " " << arg[1] << endl;
     }
-    else if ( cmd == TQString::tqfromLatin1( "AppletStateNotification" ) )
+    else if ( cmd == TQString::fromLatin1( "AppletStateNotification" ) )
     {
         bool ok;
         const int appletID = arg.first().toInt(&ok);
@@ -222,7 +222,7 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg
         } else
             kdError(DEBUGAREA) << "AppletStateNotification: Applet ID is not numerical" << endl;
     }
-    else if ( cmd == TQString::tqfromLatin1( "AppletFailed" ) ) {
+    else if ( cmd == TQString::fromLatin1( "AppletFailed" ) ) {
         bool ok;
         const int appletID = arg.first().toInt(&ok);
         if (ok)
@@ -230,7 +230,7 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg
             KJavaApplet* const applet = d->applets[appletID];
             /*
             TQString errorDetail(arg[1]);
-            errorDetail.tqreplace(TQRegExp(":\\s*"), ":\n");
+            errorDetail.replace(TQRegExp(":\\s*"), ":\n");
             KMessageBox::detailedError(0L, i18n("Java error while loading applet."), errorDetail);
             */
             if (applet)
diff --git a/khtml/java/kjavaappletcontext.h b/khtml/java/kjavaappletcontext.h
index d5d5faa22..ca851a42e 100644
--- a/khtml/java/kjavaappletcontext.h
+++ b/khtml/java/kjavaappletcontext.h
@@ -42,7 +42,7 @@ class KJavaAppletServer;
 class KJavaApplet;
 class KJavaAppletContextPrivate;
 
-class KJavaAppletContext : public TQObject
+class KJavaAppletContext : public QObject
 {
 Q_OBJECT
 
@@ -109,7 +109,7 @@ signals:
     /**
      * Signals the KHMTL Part to show this as the status message.
      */
-    void showtqStatus  ( const TQString& txt );
+    void showStatus  ( const TQString& txt );
 
     /**
      * Signals the KHTML Part to show a url in a given target
diff --git a/khtml/java/kjavaappletserver.cpp b/khtml/java/kjavaappletserver.cpp
index 64e2ea2ab..59d0517a2 100644
--- a/khtml/java/kjavaappletserver.cpp
+++ b/khtml/java/kjavaappletserver.cpp
@@ -448,7 +448,7 @@ void KJavaAppletServer::sendURLData( int loaderID, int code, const TQByteArray&
 
 void KJavaAppletServer::removeDataJob( int loaderID )
 {
-    const KIOJobMap::iterator it = d->kiojobs.tqfind( loaderID );
+    const KIOJobMap::iterator it = d->kiojobs.find( loaderID );
     if (it != d->kiojobs.end()) {
         it.data()->deleteLater();
         d->kiojobs.erase( it );
@@ -502,7 +502,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
     if (cmd_code == KJAS_PUT_DATA) {
         // rest of the data is for kio put
         if (ok) {
-            KIOJobMap::iterator it = d->kiojobs.tqfind( ID_num );
+            KIOJobMap::iterator it = d->kiojobs.find( ID_num );
             if (ok && it != d->kiojobs.end()) {
                 TQByteArray qba;
                 qba.setRawData(qb.data() + index, qb.size() - index - 1);
@@ -517,7 +517,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
     //now parse out the arguments
     while( index < qb_size )
     {
-        int sep_pos = qb.tqfind( 0, index );
+        int sep_pos = qb.find( 0, index );
         if (sep_pos < 0) {
             kdError(6100) << "Missing separation byte" << endl;
             sep_pos = qb_size;
@@ -526,24 +526,24 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
         args.append( TQString::fromLocal8Bit( qb.data() + index, sep_pos - index ) );
         index = sep_pos + 1; //skip the sep
     }
-    //here I should tqfind the context and call the method directly
+    //here I should find the context and call the method directly
     //instead of emitting signals
     switch( cmd_code )
     {
         case KJAS_SHOW_DOCUMENT:
-            cmd = TQString::tqfromLatin1( "showdocument" );
+            cmd = TQString::fromLatin1( "showdocument" );
             break;
 
         case KJAS_SHOW_URLINFRAME:
-            cmd = TQString::tqfromLatin1( "showurlinframe" );
+            cmd = TQString::fromLatin1( "showurlinframe" );
             break;
 
         case KJAS_SHOW_STATUS:
-            cmd = TQString::tqfromLatin1( "showstatus" );
+            cmd = TQString::fromLatin1( "showstatus" );
             break;
 
         case KJAS_RESIZE_APPLET:
-            cmd = TQString::tqfromLatin1( "resizeapplet" );
+            cmd = TQString::fromLatin1( "resizeapplet" );
             break;
 
         case KJAS_GET_URLDATA:
@@ -565,7 +565,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
         case KJAS_DATA_COMMAND:
             if (ok && !args.empty()) {
                 const int cmd = args.first().toInt( &ok );
-                KIOJobMap::iterator it = d->kiojobs.tqfind( ID_num );
+                KIOJobMap::iterator it = d->kiojobs.find( ID_num );
                 if (ok && it != d->kiojobs.end())
                     it.data()->jobCommand( cmd );
                 kdDebug(6100) << "KIO Data command: " << ID_num << " " << args.first() << endl;
@@ -573,7 +573,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
                 kdError(6100) << "KIO Data command error " << ok << " args:" << args.size() << endl;
             return;
         case KJAS_JAVASCRIPT_EVENT:
-            cmd = TQString::tqfromLatin1( "JS_Event" );
+            cmd = TQString::fromLatin1( "JS_Event" );
             kdDebug(6100) << "Javascript request: "<< contextID
                           << " code: " << args[0] << endl;
             break;
@@ -581,7 +581,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
         case KJAS_PUT_MEMBER:
         case KJAS_CALL_MEMBER: {
             const int ticket = args[0].toInt();
-            JSStack::iterator it = d->jsstack.tqfind(ticket);
+            JSStack::iterator it = d->jsstack.find(ticket);
             if (it != d->jsstack.end()) {
                 kdDebug(6100) << "slotJavaRequest: " << ticket << endl;
                 args.pop_front();
@@ -593,24 +593,24 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
             return;
         }
         case KJAS_AUDIOCLIP_PLAY:
-            cmd = TQString::tqfromLatin1( "audioclip_play" );
+            cmd = TQString::fromLatin1( "audioclip_play" );
             kdDebug(6100) << "Audio Play: url=" << args[0] << endl;
             break;
         case KJAS_AUDIOCLIP_LOOP:
-            cmd = TQString::tqfromLatin1( "audioclip_loop" );
+            cmd = TQString::fromLatin1( "audioclip_loop" );
             kdDebug(6100) << "Audio Loop: url=" << args[0] << endl;
             break;
         case KJAS_AUDIOCLIP_STOP:
-            cmd = TQString::tqfromLatin1( "audioclip_stop" );
+            cmd = TQString::fromLatin1( "audioclip_stop" );
             kdDebug(6100) << "Audio Stop: url=" << args[0] << endl;
             break;
         case KJAS_APPLET_STATE:
             kdDebug(6100) << "Applet State Notification for Applet " << args[0] << ". New state=" << args[1] << endl;
-            cmd = TQString::tqfromLatin1( "AppletStateNotification" );
+            cmd = TQString::fromLatin1( "AppletStateNotification" );
             break;
         case KJAS_APPLET_FAILED:
             kdDebug(6100) << "Applet " << args[0] << " Failed: " << args[1] << endl;
-            cmd = TQString::tqfromLatin1( "AppletFailed" );
+            cmd = TQString::fromLatin1( "AppletFailed" );
             break;
         case KJAS_SECURITY_CONFIRM: {
             if (KSSL::doesSSLWork() && !d->kssl)
@@ -670,8 +670,8 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
                         TQString subject = cert->getSubject() + TQChar('\n');
                         TQRegExp reg(TQString("/[A-Z]+="));
                         int pos = 0;
-                        while ((pos = subject.tqfind(reg, pos)) > -1)
-                            subject.tqreplace(pos, 1, TQString("\n    "));
+                        while ((pos = subject.find(reg, pos)) > -1)
+                            subject.replace(pos, 1, TQString("\n    "));
                         text += subject.mid(1);
                     }
                 }
@@ -680,7 +680,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
                     KSSLCertChain chain;
                     chain.setChain( certs );
                     if ( chain.isValid() )
-                        answer = PermissionDialog( tqApp->activeWindow() ).exec( text, args[0] );
+                        answer = PermissionDialog( qApp->activeWindow() ).exec( text, args[0] );
                 }
             }
             sl.push_front( TQString(answer) );
@@ -779,7 +779,7 @@ PermissionDialog::PermissionDialog( TQWidget* parent )
 TQCString PermissionDialog::exec( const TQString & cert, const TQString & perm ) {
     TQGuardedPtr<TQDialog> dialog = new TQDialog( static_cast<TQWidget*>(parent()), "PermissionDialog");
 
-    dialog->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, dialog->sizePolicy().hasHeightForWidth() ) );
+    dialog->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, dialog->sizePolicy().hasHeightForWidth() ) );
     dialog->setModal( true );
     dialog->setCaption( i18n("Security Alert") );
 
@@ -807,7 +807,7 @@ TQCString PermissionDialog::exec( const TQString & cert, const TQString & perm )
     TQPushButton* const grant = new TQPushButton( i18n("&Grant All"), dialog, "grant" );
     buttonLayout->addWidget( grant );
     dialogLayout->addLayout( buttonLayout );
-    dialog->resize( dialog->tqminimumSizeHint() );
+    dialog->resize( dialog->minimumSizeHint() );
     //clearWState( WState_Polished );
 
     connect( no, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) );
@@ -827,7 +827,7 @@ PermissionDialog::~PermissionDialog()
 void PermissionDialog::clicked()
 {
     m_button = sender()->name();
-    static_cast<const TQWidget*>(sender())->tqparentWidget()->close();
+    static_cast<const TQWidget*>(sender())->parentWidget()->close();
 }
 
 #include "kjavaappletserver.moc"
diff --git a/khtml/java/kjavaappletserver.h b/khtml/java/kjavaappletserver.h
index 63463b040..08d0f2983 100644
--- a/khtml/java/kjavaappletserver.h
+++ b/khtml/java/kjavaappletserver.h
@@ -39,7 +39,7 @@ class KJavaAppletContext;
 class KJavaAppletServerPrivate;
 class JSStackFrame;
 
-class KJavaAppletServer : public TQObject
+class KJavaAppletServer : public QObject
 {
 Q_OBJECT
 
@@ -161,7 +161,7 @@ private:
 };
 
 
-class PermissionDialog : public TQObject
+class PermissionDialog : public QObject
 {
     Q_OBJECT
 public:
diff --git a/khtml/java/kjavaappletviewer.cpp b/khtml/java/kjavaappletviewer.cpp
index 2000dd6fa..d4c8e266f 100644
--- a/khtml/java/kjavaappletviewer.cpp
+++ b/khtml/java/kjavaappletviewer.cpp
@@ -90,7 +90,7 @@ KJavaServerMaintainer::~KJavaServerMaintainer () {
 
 KJavaAppletContext * KJavaServerMaintainer::getContext (TQObject * w, const TQString & doc) {
     ContextMap::key_type key = qMakePair (w, doc);
-    ContextMap::iterator it = m_contextmap.tqfind (key);
+    ContextMap::iterator it = m_contextmap.find (key);
     if (it != m_contextmap.end ()) {
         ++((*it).second);
         return (*it).first;
@@ -101,7 +101,7 @@ KJavaAppletContext * KJavaServerMaintainer::getContext (TQObject * w, const TQSt
 }
 
 void KJavaServerMaintainer::releaseContext (TQObject * w, const TQString & doc) {
-    ContextMap::iterator it = m_contextmap.tqfind (qMakePair (w, doc));
+    ContextMap::iterator it = m_contextmap.find (qMakePair (w, doc));
     if (it != m_contextmap.end () && --(*it).second <= 0) {
         kdDebug(6100) << "KJavaServerMaintainer::releaseContext" << endl;
         (*it).first->deleteLater ();
@@ -230,7 +230,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
     TQStringList::const_iterator it = args.begin();
     const TQStringList::const_iterator itEnd = args.end();
     for ( ; it != itEnd; ++it) {
-        const int equalPos = (*it).tqfind("=");
+        const int equalPos = (*it).find("=");
         if (equalPos > 0) {
             const TQString name = (*it).left (equalPos).upper ();
             TQString value = (*it).right ((*it).length () - equalPos - 1);
@@ -245,27 +245,27 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
                     baseurl = KURL (KURL (value), TQString (".")).url ();
                 } else if (name == "__KHTML__CODEBASE")
                     khtml_codebase = value;
-                else if (name_lower == TQString::tqfromLatin1("codebase") ||
-                         name_lower == TQString::tqfromLatin1("java_codebase")) {
+                else if (name_lower == TQString::fromLatin1("codebase") ||
+                         name_lower == TQString::fromLatin1("java_codebase")) {
                     if (!value.isEmpty ())
                         codebase = value;
                 } else if (name == "__KHTML__CLASSID")
-                //else if (name.lower()==TQString::tqfromLatin1("classid"))
+                //else if (name.lower()==TQString::fromLatin1("classid"))
                     classid = value;
-                else if (name_lower == TQString::tqfromLatin1("code") ||
-                         name_lower == TQString::tqfromLatin1("java_code"))
+                else if (name_lower == TQString::fromLatin1("code") ||
+                         name_lower == TQString::fromLatin1("java_code"))
                     classname = value;
-                else if (name_lower == TQString::tqfromLatin1("src"))
+                else if (name_lower == TQString::fromLatin1("src"))
                     src_param = value;
-                else if (name_lower == TQString::tqfromLatin1("archive") ||
-                         name_lower == TQString::tqfromLatin1("java_archive") ||
+                else if (name_lower == TQString::fromLatin1("archive") ||
+                         name_lower == TQString::fromLatin1("java_archive") ||
                          name_lower.startsWith ("cache_archive"))
                     applet->setArchives (value);
-                else if (name_lower == TQString::tqfromLatin1("name"))
+                else if (name_lower == TQString::fromLatin1("name"))
                     applet->setAppletName (value);
-                else if (name_lower == TQString::tqfromLatin1("width"))
+                else if (name_lower == TQString::fromLatin1("width"))
                     width = value.toInt();
-                else if (name_lower == TQString::tqfromLatin1("height"))
+                else if (name_lower == TQString::fromLatin1("height"))
                     height = value.toInt();
                 if (!name.startsWith ("__KHTML__")) {
                     applet->setParameter (name, value);
@@ -277,7 +277,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
         applet->setParameter ("CLSID", classid);
         kdDebug(6100) << "classid=" << classid << classid.startsWith("clsid:")<< endl;
         if (classid.startsWith ("clsid:"))
-            // codeBase tqcontains the URL to the plugin page
+            // codeBase contains the URL to the plugin page
             khtml_codebase = baseurl;
         else if (classname.isEmpty () && classid.startsWith ("java:"))
             classname = classid.mid(5);
@@ -327,7 +327,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
         info.verifyPath = true;
 
         TQDataStream stream(params, IO_WriteOnly);
-        stream << info << m_view->tqtopLevelWidget()->winId();
+        stream << info << m_view->topLevelWidget()->winId();
 
         if (!kapp->dcopClient ()->call( "kded", "kpasswdserver", "checkAuthInfo(KIO::AuthInfo, long int)", params, replyType, reply ) ) {
             kdWarning() << "Can't communicate with kded_kpasswdserver!" << endl;
@@ -342,14 +342,14 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
 
     /* install event filter for close events */
     if (wparent)
-        wparent->tqtopLevelWidget ()->installEventFilter (this);
+        wparent->topLevelWidget ()->installEventFilter (this);
 
     setInstance (KJavaAppletViewerFactory::instance ());
     KParts::Part::setWidget (m_view);
 
     connect (applet->getContext(), TQT_SIGNAL(appletLoaded()), this, TQT_SLOT(appletLoaded()));
     connect (applet->getContext(), TQT_SIGNAL(showDocument(const TQString&, const TQString&)), m_browserextension, TQT_SLOT(showDocument(const TQString&, const TQString&)));
-    connect (applet->getContext(), TQT_SIGNAL(showtqStatus(const TQString &)), this, TQT_SLOT(infoMessage(const TQString &)));
+    connect (applet->getContext(), TQT_SIGNAL(showStatus(const TQString &)), this, TQT_SLOT(infoMessage(const TQString &)));
     connect (applet, TQT_SIGNAL(jsEvent (const TQStringList &)), m_liveconnect, TQT_SLOT(jsEvent (const TQStringList &)));
 }
 
@@ -391,7 +391,7 @@ bool KJavaAppletViewer::openURL (const KURL & url) {
         } else
             applet->setAppletClass (url.url ());
         AppletParameterDialog (w).exec ();
-        applet->setSize (w->tqsizeHint());
+        applet->setSize (w->sizeHint());
     }
     if (!m_statusbar_icon) {
         KStatusBar *sb = m_statusbar->statusBar();
@@ -500,7 +500,7 @@ void KJavaAppletViewerBrowserExtension::restoreState (TQDataStream & stream) {
         applet->setParameter (key, val);
         kdDebug(6100) << "restoreState key:" << key << " val:" << val << endl;
     }
-    applet->setSize (w->tqsizeHint ());
+    applet->setSize (w->sizeHint ());
     if (w->isVisible())
         w->showApplet ();
 }
diff --git a/khtml/java/kjavaappletwidget.cpp b/khtml/java/kjavaappletwidget.cpp
index 2e9597b2d..1299ce7e8 100644
--- a/khtml/java/kjavaappletwidget.cpp
+++ b/khtml/java/kjavaappletwidget.cpp
@@ -50,7 +50,7 @@ KJavaAppletWidget::KJavaAppletWidget( TQWidget* parent, const char* name )
 
     d->tmplabel = new TQLabel( this );
     d->tmplabel->setText( KJavaAppletServer::getAppletLabel() );
-    d->tmplabel->tqsetAlignment( Qt::AlignCenter | Qt::WordBreak );
+    d->tmplabel->setAlignment( Qt::AlignCenter | Qt::WordBreak );
     d->tmplabel->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
     d->tmplabel->show();
 
@@ -98,10 +98,10 @@ void KJavaAppletWidget::setWindow( WId w )
     }
 }
 
-TQSize KJavaAppletWidget::tqsizeHint() const
+TQSize KJavaAppletWidget::sizeHint() const
 {
-    kdDebug(6100) << "KJavaAppletWidget::tqsizeHint()" << endl;
-    TQSize rval = QXEmbed::tqsizeHint();
+    kdDebug(6100) << "KJavaAppletWidget::sizeHint()" << endl;
+    TQSize rval = QXEmbed::sizeHint();
 
     if( rval.width() == 0 || rval.height() == 0 )
     {
@@ -132,7 +132,7 @@ void KJavaAppletWidget::showEvent (TQShowEvent * e) {
     if (!applet()->isCreated() && !applet()->appletClass().isEmpty()) {
         // delayed showApplet
         if (applet()->size().width() <= 0)
-            applet()->setSize (tqsizeHint());
+            applet()->setSize (sizeHint());
         showApplet();
     }
 }
diff --git a/khtml/java/kjavaappletwidget.h b/khtml/java/kjavaappletwidget.h
index f69ee59aa..18f5be341 100644
--- a/khtml/java/kjavaappletwidget.h
+++ b/khtml/java/kjavaappletwidget.h
@@ -96,7 +96,7 @@ public:
      */
     void showApplet();
 
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
     void resize( int, int );
 
 protected slots:
diff --git a/khtml/java/kjavadownloader.h b/khtml/java/kjavadownloader.h
index f9514304c..d3cf0de41 100644
--- a/khtml/java/kjavadownloader.h
+++ b/khtml/java/kjavadownloader.h
@@ -40,7 +40,7 @@ namespace KIO {
 class KJavaDownloaderPrivate;
 class KJavaUploaderPrivate;
 
-class KJavaKIOJob : public TQObject
+class KJavaKIOJob : public QObject
 {
 Q_OBJECT
 public:
diff --git a/khtml/java/kjavaprocess.cpp b/khtml/java/kjavaprocess.cpp
index 1a04daa71..1c9f1b346 100644
--- a/khtml/java/kjavaprocess.cpp
+++ b/khtml/java/kjavaprocess.cpp
@@ -282,7 +282,7 @@ bool KJavaProcess::invokeJVM()
     //load the extra user-defined arguments
     if( !d->extraArgs.isEmpty() )
     {
-        // BUG HERE: if an argument tqcontains space (-Dname="My name")
+        // BUG HERE: if an argument contains space (-Dname="My name")
         // this parsing will fail. Need more sophisticated parsing -- use KShell?
         const TQStringList args = TQStringList::split( " ", d->extraArgs );
         TQStringList::ConstIterator it = args.begin();
@@ -300,7 +300,7 @@ bool KJavaProcess::invokeJVM()
     TQString argStr;
     TQTextOStream stream( &argStr );
     const TQValueList<TQCString> args = javaProcess->args();
-    tqCopy( args.begin(), args.end(), TQTextOStreamIterator<TQCString>( stream, " " ) );
+    qCopy( args.begin(), args.end(), TQTextOStreamIterator<TQCString>( stream, " " ) );
     kdDebug(6100) << argStr << endl;
 
     KProcess::Communication flags =  (KProcess::Communication)
diff --git a/khtml/java/kjavaprocess.h b/khtml/java/kjavaprocess.h
index 9d2f93424..3e877685a 100644
--- a/khtml/java/kjavaprocess.h
+++ b/khtml/java/kjavaprocess.h
@@ -39,7 +39,7 @@
  */
 
 class KJavaProcessPrivate;
-class KJavaProcess : public KProcess //TQObject
+class KJavaProcess : public KProcess //QObject
 {
 Q_OBJECT
 
@@ -125,7 +125,7 @@ public:
 protected slots:
     /**
      * This slot is called whenever something is written to stdin of the process.
-     * It's called again to make sure we keep emptying out the buffer that tqcontains
+     * It's called again to make sure we keep emptying out the buffer that contains
      * the messages we need send.
      */
     void slotWroteData();
diff --git a/khtml/java/kxeventutil.cpp b/khtml/java/kxeventutil.cpp
index 01c65e2c5..9afa5a5ac 100644
--- a/khtml/java/kxeventutil.cpp
+++ b/khtml/java/kxeventutil.cpp
@@ -248,7 +248,7 @@ TQString KXEventUtil::getXConfigureEventInfo(XEvent *xevent) {
 
 TQString KXEventUtil::getXConfigureRequestEventInfo(XEvent *xevent) {
     XConfigureRequestEvent *e = &xevent->xconfigurerequest;
-    unsigned vm = e->value_tqmask;
+    unsigned vm = e->value_mask;
     TQStringList vml;
     if (vm & CWX)           vml.append("CWX");
     if (vm & CWY)           vml.append("CWY");
@@ -258,7 +258,7 @@ TQString KXEventUtil::getXConfigureRequestEventInfo(XEvent *xevent) {
     if (vm & CWSibling)     vml.append("CWSibling");
     if (vm & CWStackMode)   vml.append("CWStackMode");
     TQString vms = vml.join("|");
-    TQString s("window=%1 x=%2 y=%2 width=%3 height=%4 border_width=%5 above=%6 detail=%7 value_tqmask=0x%8=%9");
+    TQString s("window=%1 x=%2 y=%2 width=%3 height=%4 border_width=%5 above=%6 detail=%7 value_mask=0x%8=%9");
     return 
         s.arg(e->window)
         .arg(e->x).arg(e->y)
@@ -266,7 +266,7 @@ TQString KXEventUtil::getXConfigureRequestEventInfo(XEvent *xevent) {
         .arg(e->border_width)
         .arg(e->above)
         .arg(e->detail)
-        .arg(e->value_tqmask, 0, 16)
+        .arg(e->value_mask, 0, 16)
         .arg(vms);
 }
 TQString KXEventUtil::getX11EventInfo( XEvent* e )
diff --git a/khtml/java/make-jar b/khtml/java/make-jar
index 2bfe62cbe..a817ec1f3 100755
--- a/khtml/java/make-jar
+++ b/khtml/java/make-jar
@@ -7,6 +7,6 @@ rm -rf java-build-dir/*
 mkdir -p java-build-dir/images
 cp images/*.gif images/*.png java-build-dir/images/
 pwd=`pwd`;
-javac -d java-build-dir -deprecation -target 1.2 `tqfind org/kde netscape -name '*.java'` \
- && cd java-build-dir && jar c0vf $pwd/kjava.jar images `tqfind org/kde netscape -name *.class`
+javac -d java-build-dir -deprecation -target 1.2 `find org/kde netscape -name '*.java'` \
+ && cd java-build-dir && jar c0vf $pwd/kjava.jar images `find org/kde netscape -name *.class`
 
diff --git a/khtml/java/org/kde/kjas/server/KJASAppletClassLoader.java b/khtml/java/org/kde/kjas/server/KJASAppletClassLoader.java
index 1c7beb833..c6defa848 100644
--- a/khtml/java/org/kde/kjas/server/KJASAppletClassLoader.java
+++ b/khtml/java/org/kde/kjas/server/KJASAppletClassLoader.java
@@ -109,7 +109,7 @@ public final class KJASAppletClassLoader
         if (security != null) {
             security.checkCreateClassLoader();
         }
-        if( loaders.tqcontainsKey( key ) )
+        if( loaders.containsKey( key ) )
             return (KJASAppletClassLoader) loaders.get( key );
         
         return null;
@@ -149,17 +149,17 @@ public final class KJASAppletClassLoader
         super.addURL(url);
     }
     
-    public void addtqStatusListener(tqStatusListener lsnr) {
+    public void addStatusListener(StatusListener lsnr) {
         statusListeners.add(lsnr);
     }
-    public void removetqStatusListener(tqStatusListener lsnr) {
+    public void removeStatusListener(StatusListener lsnr) {
         statusListeners.remove(lsnr);
     }
-    public void showtqStatus(String msg) {
+    public void showStatus(String msg) {
         Enumeration en = statusListeners.elements();
         while (en.hasMoreElements()) {
-            tqStatusListener lsnr = (tqStatusListener)en.nextElement();
-            lsnr.showtqStatus(msg);
+            StatusListener lsnr = (StatusListener)en.nextElement();
+            lsnr.showStatus(msg);
         }
     }
     
@@ -202,7 +202,7 @@ public final class KJASAppletClassLoader
 
     void addArchiveName( String jarname )
     {
-        if( !archives.tqcontains( jarname ) )
+        if( !archives.contains( jarname ) )
         {
             archives.add( jarname );
         }
@@ -225,19 +225,19 @@ public final class KJASAppletClassLoader
     /***************************************************************************
      **** Class Loading Methods
      **************************************************************************/
-    public synchronized Class tqfindClass( String name ) throws ClassNotFoundException
+    public synchronized Class findClass( String name ) throws ClassNotFoundException
     {
         Class rval = null;
         //check the loaded classes 
-        rval = tqfindLoadedClass( name );
+        rval = findLoadedClass( name );
         if( rval == null ) {
             try {
-                rval =  super.tqfindClass(name);
+                rval =  super.findClass(name);
             } catch (ClassFormatError cfe) {
                 Main.debug(name + ": Catched " + cfe + ". Trying to repair...");
                 rval = loadFixedClass( name );
             } catch (Exception ex) {
-                Main.debug("tqfindClass " + name + " " + ex.getMessage());
+                Main.debug("findClass " + name + " " + ex.getMessage());
             }
         }
         if (rval == null) {
@@ -256,7 +256,7 @@ public final class KJASAppletClassLoader
     private Hashtable loadedClasses = new Hashtable();
 
     private synchronized final Class loadFixedClass(String name) throws ClassNotFoundException {
-        final String fileName = name.tqreplace('.', '/') + ".class";
+        final String fileName = name.replace('.', '/') + ".class";
         try {
             // try to get the class as resource
             final URL u = getResource(fileName);
@@ -316,7 +316,7 @@ public final class KJASAppletClassLoader
             }
         } catch (Throwable e) {
         }
-        showtqStatus("Loading: " + displayName);
+        showStatus("Loading: " + displayName);
         URL url =  super.findResource( name );
         Main.debug("findResource for " + name + " returns " + url);
         return url;
diff --git a/khtml/java/org/kde/kjas/server/KJASAppletContext.java b/khtml/java/org/kde/kjas/server/KJASAppletContext.java
index bb8b0f156..f868b7b64 100644
--- a/khtml/java/org/kde/kjas/server/KJASAppletContext.java
+++ b/khtml/java/org/kde/kjas/server/KJASAppletContext.java
@@ -104,7 +104,7 @@ public class KJASAppletContext implements AppletContext
         //do kludges to support mess with parameter table and
         //the applet variables
         String key = new String( "ARCHIVE" );
-        if (params.tqcontainsKey(key)) {
+        if (params.containsKey(key)) {
             String param_archive = (String)params.get(key);
             if (archives == null) {
                 // There is no 'archive' attribute
@@ -128,7 +128,7 @@ public class KJASAppletContext implements AppletContext
         if( codeBase == null )
         {
             key = new String( "CODEBASE" );
-            if( params.tqcontainsKey( key ) )
+            if( params.containsKey( key ) )
                 codeBase = (String) params.get( key );
         }
 
@@ -325,26 +325,26 @@ public class KJASAppletContext implements AppletContext
             //check with the Web Server
             String str_url = url.toString();
             Main.debug( "getImage, url = " + str_url );
-            if (Main.cacheImages && images.tqcontainsKey(str_url)) {
+            if (Main.cacheImages && images.containsKey(str_url)) {
                 Main.debug("Cached: url=" + str_url);
             }
             else
             {
                 if (Main.cacheImages) {
-                    if (!pendingImages.tqcontains(str_url)) {
+                    if (!pendingImages.contains(str_url)) {
                         Main.protocol.sendGetURLDataCmd( myID, str_url );
                         pendingImages.add(str_url);
                     }
                 } else {
                     Main.protocol.sendGetURLDataCmd( myID, str_url );
                 }
-                while( !images.tqcontainsKey( str_url ) && active )
+                while( !images.containsKey( str_url ) && active )
                 {
                     try { Thread.sleep( 200 ); }
                     catch( InterruptedException e ){}
                 }
             }
-            if( images.tqcontainsKey( str_url ) )
+            if( images.containsKey( str_url ) )
             {
                 byte[] data = (byte[]) images.get( str_url );
                 if( data.length > 0 )
@@ -378,11 +378,11 @@ public class KJASAppletContext implements AppletContext
         }
     }
 
-    public void showtqStatus( String message )
+    public void showStatus( String message )
     {
         if( active && (message != null) )
         {
-            Main.protocol.sendShowtqStatusCmd( myID, message );
+            Main.protocol.sendShowStatusCmd( myID, message );
         }
     }
     public boolean evaluateJavaScript(String script, String appletID, JSObject jso) {
diff --git a/khtml/java/org/kde/kjas/server/KJASAppletPanel.java b/khtml/java/org/kde/kjas/server/KJASAppletPanel.java
index ba779d107..d7acbdaf9 100644
--- a/khtml/java/org/kde/kjas/server/KJASAppletPanel.java
+++ b/khtml/java/org/kde/kjas/server/KJASAppletPanel.java
@@ -17,7 +17,7 @@ import java.net.URL;
  * A panel which embeds the applet and shows some
  * information during class loading.
  */
-public class KJASAppletPanel extends javax.swing.JPanel implements tqStatusListener {
+public class KJASAppletPanel extends javax.swing.JPanel implements StatusListener {
     private final static int LOADING = 1;
     private final static int RUNNING = 2;
     private final static int FAILED = 3;
@@ -45,10 +45,10 @@ public class KJASAppletPanel extends javax.swing.JPanel implements tqStatusListe
 		validate();
 	}
 
-    public void showtqStatus(String msg) {
+    public void showStatus(String msg) {
         this.msg = msg;
         if (status != RUNNING)
-            tqrepaint();
+            repaint();
     }
 
 	public void paint(Graphics g) {
@@ -88,12 +88,12 @@ public class KJASAppletPanel extends javax.swing.JPanel implements tqStatusListe
 		fail_img = getToolkit().createImage(url);
         status = FAILED;
 		msg = "Applet Failed.";
-		tqrepaint();
+		repaint();
 	}
 
 	void showFailed(String message) {
 		showFailed();
-		showtqStatus(message);
+		showStatus(message);
 	}
 
 	public void stopAnimation() {
diff --git a/khtml/java/org/kde/kjas/server/KJASAppletStub.java b/khtml/java/org/kde/kjas/server/KJASAppletStub.java
index c84013e7c..e090183d7 100644
--- a/khtml/java/org/kde/kjas/server/KJASAppletStub.java
+++ b/khtml/java/org/kde/kjas/server/KJASAppletStub.java
@@ -194,7 +194,7 @@ public final class KJASAppletStub
                     else
                         app.setBounds( 0, 0, panel.getSize().width, panel.getSize().height );
                     app.init();
-                    loader.removetqStatusListener(panel);
+                    loader.removeStatusListener(panel);
                     // stop the loading... animation 
                     panel.stopAnimation();
                     app.setVisible(true);
@@ -203,7 +203,7 @@ public final class KJASAppletStub
                     active = true;
                     app.start();
                     frame.validate();
-                    app.tqrepaint();
+                    app.repaint();
                     break;
                 case STOPPED:
                     active = false;
@@ -290,7 +290,7 @@ public final class KJASAppletStub
         docBase    = _docBase;
         active     = false;
         appletName = _appletName;
-        className  = _className.tqreplace( '/', '.' );
+        className  = _className.replace( '/', '.' );
         appletSize = _appletSize;
         params     = _params;
         windowName = _windowName;
@@ -305,7 +305,7 @@ public final class KJASAppletStub
         {
             fixedClassName = _className.substring(0, _className.length()-5);   
         }
-        className = fixedClassName.tqreplace('/', '.');
+        className = fixedClassName.replace('/', '.');
             
         appletClass = null;
         me = this;
@@ -321,7 +321,7 @@ public final class KJASAppletStub
     }
     
     private void setFailed(String why) {
-        loader.removetqStatusListener(panel);
+        loader.removeStatusListener(panel);
         panel.stopAnimation();
         panel.showFailed();
         Main.protocol.sendAppletFailed(context.getID(), appletID, why); 
@@ -358,7 +358,7 @@ public final class KJASAppletStub
         else
             frame.setBounds( 0, 0, 50, 50 );
         frame.setVisible(true);
-        loader.addtqStatusListener(panel);
+        loader.addStatusListener(panel);
         runThread = new RunThread();
         runThread.start();
     }
@@ -520,7 +520,7 @@ public final class KJASAppletStub
         }
         return ret;
     }
-    private Method tqfindMethod(Class c, String name, Class [] argcls) {
+    private Method findMethod(Class c, String name, Class [] argcls) {
         try {
             Method[] methods = c.getMethods();
             for (int i = 0; i < methods.length; i++) {
@@ -719,8 +719,8 @@ public final class KJASAppletStub
                 String type;
                 Class [] argcls = new Class[args.size()];
                 for (int i = 0; i < args.size(); i++)
-                    argcls[i] = name.getClass(); // String for now, will be updated by tqfindMethod
-                Method m = tqfindMethod(c, (String) name, argcls);
+                    argcls[i] = name.getClass(); // String for now, will be updated by findMethod
+                Method m = findMethod(c, (String) name, argcls);
                 Main.debug("Found Method: " + m);
                 if (m != null) {
                     Object [] argobj = new Object[args.size()];
diff --git a/khtml/java/org/kde/kjas/server/KJASProtocolHandler.java b/khtml/java/org/kde/kjas/server/KJASProtocolHandler.java
index ac79770a0..f8b50a91d 100644
--- a/khtml/java/org/kde/kjas/server/KJASProtocolHandler.java
+++ b/khtml/java/org/kde/kjas/server/KJASProtocolHandler.java
@@ -22,7 +22,7 @@ public class KJASProtocolHandler
     private static final int InitAppletCode      = 7;
     private static final int ShowDocumentCode    = 8;
     private static final int ShowURLInFrameCode  = 9;
-    private static final int ShowtqStatusCode      = 10;
+    private static final int ShowStatusCode      = 10;
     private static final int ResizeAppletCode    = 11;
     private static final int GetURLDataCode      = 12;
     private static final int URLDataCode         = 13;
@@ -586,9 +586,9 @@ public class KJASProtocolHandler
         signals.write( bytes, 0, bytes.length );
     }
 
-    public void sendShowtqStatusCmd( String contextID, String msg )
+    public void sendShowStatusCmd( String contextID, String msg )
     {
-        Main.debug( "sendShowtqStatusCmd, contextID = " + contextID + " msg = " + msg );
+        Main.debug( "sendShowStatusCmd, contextID = " + contextID + " msg = " + msg );
 
         byte [] msg_bytes = msg.getBytes();
         int length = contextID.length() + msg_bytes.length + 4;
@@ -598,7 +598,7 @@ public class KJASProtocolHandler
         byte [] tmp_bytes = getPaddedLengthBytes( length );
         System.arraycopy( tmp_bytes, 0, bytes, index, tmp_bytes.length );
         index += tmp_bytes.length;
-        bytes[index++] = (byte) ShowtqStatusCode;
+        bytes[index++] = (byte) ShowStatusCode;
         bytes[index++] = sep;
 
         tmp_bytes = contextID.getBytes();
diff --git a/khtml/java/org/kde/kjas/server/KJASSecurityManager.java b/khtml/java/org/kde/kjas/server/KJASSecurityManager.java
index ec5d69710..0525bba0c 100644
--- a/khtml/java/org/kde/kjas/server/KJASSecurityManager.java
+++ b/khtml/java/org/kde/kjas/server/KJASSecurityManager.java
@@ -82,9 +82,9 @@ public class KJASSecurityManager extends SecurityManager
             Main.debug("Certificates " + signers.size() + " for " + perm);
 
             // Check granted/denied permission
-            if ( grantAllPermissions.tqcontains(signers) )
+            if ( grantAllPermissions.contains(signers) )
                 return;
-            if ( rejectAllPermissions.tqcontains(signers) )
+            if ( rejectAllPermissions.contains(signers) )
                 throw se;
             Permissions permissions = (Permissions) grantedPermissions.get(signers);
             if (permissions != null && permissions.implies(perm))
@@ -168,7 +168,7 @@ public class KJASSecurityManager extends SecurityManager
                 // try to cast ...
                 KJASAppletClassLoader loader = (KJASAppletClassLoader)contextClassLoader;
                 // ok. cast succeeded. Now get the codebase of the loader
-                // because it tqcontains the host name
+                // because it contains the host name
                 URL codebase = loader.getCodeBase();
                 URL docbase = loader.getDocBase();
                 Main.debug("*   Class Loader docbase=" + docbase + " codebase=" + codebase);
diff --git a/khtml/java/org/kde/kjas/server/StatusListener.java b/khtml/java/org/kde/kjas/server/StatusListener.java
index a4f133ab1..be17c2b29 100644
--- a/khtml/java/org/kde/kjas/server/StatusListener.java
+++ b/khtml/java/org/kde/kjas/server/StatusListener.java
@@ -1,5 +1,5 @@
 package org.kde.kjas.server;
 
-public interface tqStatusListener {
-    public void showtqStatus(String message);
+public interface StatusListener {
+    public void showStatus(String message);
 }
\ No newline at end of file
diff --git a/khtml/java/tests/badapplets/BadApplet.java b/khtml/java/tests/badapplets/BadApplet.java
index 7d3275325..c8217d256 100644
--- a/khtml/java/tests/badapplets/BadApplet.java
+++ b/khtml/java/tests/badapplets/BadApplet.java
@@ -67,7 +67,7 @@ public class BadApplet extends JApplet {
                 }
             });
 
-            //do tqlayout ***********************************************************
+            //do layout ***********************************************************
             getContentPane().setLayout( new BorderLayout() );
 
             FileSystemTests.setLayout( new FlowLayout( FlowLayout.LEFT ) );
diff --git a/khtml/khtml.rc b/khtml/khtml.rc
index 49e687e25..cea311444 100644
--- a/khtml/khtml.rc
+++ b/khtml/khtml.rc
@@ -4,11 +4,11 @@
  <Menu name="edit"><text>&amp;Edit</text>
   <Action name="selectAll" />
   <Separator />
-  <Action name="tqfind" />
-  <Action name="tqfindNext" />
-  <Action name="tqfindPrevious" />
-  <Action name="tqfindAheadText" />
-  <Action name="tqfindAheadLink" />
+  <Action name="find" />
+  <Action name="findNext" />
+  <Action name="findPrevious" />
+  <Action name="findAheadText" />
+  <Action name="findAheadLink" />
  </Menu>
 </MenuBar>
 <ActionProperties>
diff --git a/khtml/khtml_browser.rc b/khtml/khtml_browser.rc
index e351f664b..a1da305e7 100644
--- a/khtml/khtml_browser.rc
+++ b/khtml/khtml_browser.rc
@@ -11,11 +11,11 @@
  <Menu name="edit"><text>&amp;Edit</text>
   <Action name="selectAll" />
   <Separator />
-  <Action name="tqfind" />
-  <Action name="tqfindNext" />
-  <Action name="tqfindPrevious" />
-  <Action name="tqfindAheadText" />
-  <Action name="tqfindAheadLink" />
+  <Action name="find" />
+  <Action name="findNext" />
+  <Action name="findPrevious" />
+  <Action name="findAheadText" />
+  <Action name="findAheadLink" />
  </Menu>
  <Menu name="view"><text>&amp;View</text>
   <Action name="incFontSizes" />
@@ -35,7 +35,7 @@
  </Menu>
 </MenuBar>
 <ToolBar name="mainToolBar"><text>Main Toolbar</text>
- <Action name="tqfind" />
+ <Action name="find" />
  <Separator />
  <Action name="incFontSizes" />
  <Action name="decFontSizes" />
diff --git a/khtml/khtml_caret.cpp b/khtml/khtml_caret.cpp
index 1b83ca89b..9b819ee6c 100644
--- a/khtml/khtml_caret.cpp
+++ b/khtml/khtml_caret.cpp
@@ -150,7 +150,7 @@ static inline bool isIndicatedInlineBox(InlineBox *box)
   	|| s->borderTopWidth() || s->borderBottomWidth()
 	|| s->paddingLeft().value() || s->paddingRight().value()
 	|| s->paddingTop().value() || s->paddingBottom().value()
-	// ### Can inline elements have top/bottom margins? Couldn't tqfind
+	// ### Can inline elements have top/bottom margins? Couldn't find
 	// it in the CSS 2 spec, but Mozilla ignores them, so we do, too.
 	|| s->marginLeft().value() || s->marginRight().value();
 }
@@ -581,7 +581,7 @@ static inline void mapTraversalStateToRenderPos(ObjectTraversalState trav,
  * @param outsideEnd returns whether the end of the outside position is meant
  * @return renderer or 0 if no following node has a renderer.
  */
-static RenderObject* tqfindRenderer(NodeImpl *&node, long offset,
+static RenderObject* findRenderer(NodeImpl *&node, long offset,
 			RenderObject *base, long &r_ofs,
                         bool &outside, bool &outsideEnd)
 {
@@ -589,7 +589,7 @@ static RenderObject* tqfindRenderer(NodeImpl *&node, long offset,
   RenderObject *r;
   mapDOMPosToRenderPos(node, offset, r, r_ofs, outside, outsideEnd);
 #if DEBUG_CARETMODE > 2
-   kdDebug(6200) << "tqfindRenderer: node " << node << " " << (node ? node->nodeName().string() : TQString::null) << " offset " << offset << " r " << r << "[" << (r ? r->renderName() : TQString::null) << "] r_ofs " << r_ofs << " outside " << outside << " outsideEnd " << outsideEnd << endl;
+   kdDebug(6200) << "findRenderer: node " << node << " " << (node ? node->nodeName().string() : TQString::null) << " offset " << offset << " r " << r << "[" << (r ? r->renderName() : TQString::null) << "] r_ofs " << r_ofs << " outside " << outside << " outsideEnd " << outsideEnd << endl;
 #endif
   if (r) return r;
   NodeImpl *baseElem = base ? base->element() : 0;
@@ -730,7 +730,7 @@ kdDebug(6200) << "== recursive invocation end" << endl;
 
     } else if (box->isInlineTextBox()) {
 #if DEBUG_ACIB
-kdDebug(6200) << "isinlinetextbox " << box << (box->object() ? TQString(" tqcontains \"%1\"").arg(TQConstString(static_cast<RenderText *>(box->object())->str->s+box->minOffset(), kMin(box->maxOffset() - box->minOffset(), 15L)).string()) : TQString::null) << endl;
+kdDebug(6200) << "isinlinetextbox " << box << (box->object() ? TQString(" contains \"%1\"").arg(TQConstString(static_cast<RenderText *>(box->object())->str->s+box->minOffset(), kMin(box->maxOffset() - box->minOffset(), 15L)).string()) : TQString::null) << endl;
 #endif
       caret_boxes.append(new CaretBox(box, false, false));
       sbp.check(preEnd());
@@ -739,7 +739,7 @@ kdDebug(6200) << "isinlinetextbox " << box << (box->object() ? TQString(" tqcont
 
     } else {
 #if DEBUG_ACIB
-kdDebug(6200) << "some tqreplaced or what " << box << endl;
+kdDebug(6200) << "some replaced or what " << box << endl;
 #endif
       // must be an inline-block, inline-table, or any RenderReplaced
       bool rtl = ps->direction() == RTL;
@@ -775,7 +775,7 @@ void CaretBoxLine::addCreatedFlowBoxInside(InlineFlowBox *flowBox, const TQFontM
   caret_boxes.append(caretBox);
 
   // afaik an inner flow box can only have the width 0, therefore we don't
-  // have to care for rtl or tqalignment
+  // have to care for rtl or alignment
   // ### can empty inline elements have a width? css 2 spec isn't verbose about it
 
   caretBox->_y += flowBox->baseline() - fm.ascent();
@@ -818,10 +818,10 @@ CaretBoxLine *CaretBoxLine::constructCaretBoxLine(CaretBoxLineDeleter *deleter,
   // - outside begin of an inline flow box (except for the basic inline flow box)
   // - outside end of an inline flow box (except for the basic inline flow box)
   // - inside of an empty inline flow box
-  // - outside begin of an inline box resembling a tqreplaced element
-  // - outside end of an inline box resembling a tqreplaced element
+  // - outside begin of an inline box resembling a replaced element
+  // - outside end of an inline box resembling a replaced element
   // - inline text box
-  // - inline tqreplaced box
+  // - inline replaced box
 
   CaretBoxLine *result = new CaretBoxLine(basicFlowBox);
   deleter->append(result);
@@ -885,7 +885,7 @@ CaretBoxLine *CaretBoxLine::constructCaretBoxLine(CaretBoxLineDeleter *deleter,
     switch (s->textAlign()) {
       case LEFT:
       case KHTML_LEFT:
-      case TAAUTO:	// ### tqfind out what this does
+      case TAAUTO:	// ### find out what this does
       case JUSTIFY:
         break;
       case CENTER:
@@ -938,14 +938,14 @@ inline InlineFlowBox *seekBaseFlowBox(InlineBox *b, RenderObject *base = 0)
   return static_cast<InlineFlowBox *>(b);
 }
 
-/** determines whether the given element is a block level tqreplaced element.
+/** determines whether the given element is a block level replaced element.
  */
 inline bool isBlockRenderReplaced(RenderObject *r)
 {
   return r->isRenderReplaced() && r->style()->display() == BLOCK;
 }
 
-/** determines the caret line box that tqcontains the given position.
+/** determines the caret line box that contains the given position.
  *
  * If the node does not map to a render object, the function will snap to
  * the next suitable render object following it.
@@ -955,38 +955,38 @@ inline bool isBlockRenderReplaced(RenderObject *r)
  * @param cblDeleter deleter for caret box lines
  * @param base base render object which the caret must not be placed beyond.
  * @param r_ofs adjusted offset within render object
- * @param caretBoxIt returns an iterator to the caret box that tqcontains the
+ * @param caretBoxIt returns an iterator to the caret box that contains the
  *	given position.
  * @return the determined caret box lineor 0 if either the node is 0 or
  *	there is no inline flow box containing this node. The containing block
  *	will still be set. If it is 0 too, @p node was invalid.
  */
-static CaretBoxLine* tqfindCaretBoxLine(DOM::NodeImpl *node, long offset,
+static CaretBoxLine* findCaretBoxLine(DOM::NodeImpl *node, long offset,
 		CaretBoxLineDeleter *cblDeleter, RenderObject *base,
                 long &r_ofs, CaretBoxIterator &caretBoxIt)
 {
   bool outside, outsideEnd;
-  RenderObject *r = tqfindRenderer(node, offset, base, r_ofs, outside, outsideEnd);
+  RenderObject *r = findRenderer(node, offset, base, r_ofs, outside, outsideEnd);
   if (!r) { return 0; }
 #if DEBUG_CARETMODE > 0
-  kdDebug(6200) << "=================== tqfindCaretBoxLine" << endl;
+  kdDebug(6200) << "=================== findCaretBoxLine" << endl;
   kdDebug(6200) << "node " << node << " offset: " << offset << " r " << r->renderName() << "[" << r << "].node " << r->element()->nodeName().string() << "[" << r->element() << "]" << " r_ofs " << r_ofs << " outside " << outside << " outsideEnd " << outsideEnd << endl;
 #endif
 
-  // There are two strategies to tqfind the correct line box. (The third is failsafe)
+  // There are two strategies to find the correct line box. (The third is failsafe)
   // (A) First, if node's renderer is a RenderText, we only traverse its text
   // runs and return the root line box (saves much time for long blocks).
   // This should be the case 99% of the time.
   // (B) Second, we derive the inline flow box directly when the renderer is
   // a RenderBlock, RenderInline, or blocked RenderReplaced.
-  // (C) Otherwise, we iterate linearly through all line boxes in order to tqfind
+  // (C) Otherwise, we iterate linearly through all line boxes in order to find
   // the renderer.
 
   // (A)
   if (r->isText()) do {
     RenderText *t = static_cast<RenderText *>(r);
     int dummy;
-    InlineBox *b = t->tqfindInlineTextBox(offset, dummy, true);
+    InlineBox *b = t->findInlineTextBox(offset, dummy, true);
     // Actually b should never be 0, but some render texts don't have text
     // boxes, so we insert the last run as an error correction.
     // If there is no last run, we resort to (B)
@@ -1000,13 +1000,13 @@ static CaretBoxLine* tqfindCaretBoxLine(DOM::NodeImpl *node, long offset,
     outside = false;	// text boxes cannot have outside positions
     InlineFlowBox *baseFlowBox = seekBaseFlowBox(b, base);
 #if DEBUG_CARETMODE > 2
-  kdDebug(6200) << "text-box b: " << b << " baseFlowBox: " << baseFlowBox << (b && b->object() ? TQString(" tqcontains \"%1\"").arg(TQConstString(static_cast<RenderText *>(b->object())->str->s+b->minOffset(), kMin(b->maxOffset() - b->minOffset(), 15L)).string()) : TQString::null) << endl;
+  kdDebug(6200) << "text-box b: " << b << " baseFlowBox: " << baseFlowBox << (b && b->object() ? TQString(" contains \"%1\"").arg(TQConstString(static_cast<RenderText *>(b->object())->str->s+b->minOffset(), kMin(b->maxOffset() - b->minOffset(), 15L)).string()) : TQString::null) << endl;
 #endif
 #if 0
     if (t->containingBlock()->isListItem()) dumpLineBoxes(static_cast<RenderFlow *>(t->containingBlock()));
 #endif
 #if DEBUG_CARETMODE > 0
-  kdDebug(6200) << "=================== end tqfindCaretBoxLine (renderText)" << endl;
+  kdDebug(6200) << "=================== end findCaretBoxLine (renderText)" << endl;
 #endif
     return CaretBoxLine::constructCaretBoxLine(cblDeleter, baseFlowBox,
         b, outside, outsideEnd, caretBoxIt);
@@ -1024,7 +1024,7 @@ static CaretBoxLine* tqfindCaretBoxLine(DOM::NodeImpl *node, long offset,
     if (isrepl || r->isRenderBlock() && (outside || !firstLineBox)
     		|| r->isRenderInline() && !firstLineBox) {
   #if DEBUG_CARETMODE > 0
-    kdDebug(6200) << "=================== end tqfindCaretBoxLine (box " << (outside ? (outsideEnd ? "outside end" : "outside begin") : "inside") << ")" << endl;
+    kdDebug(6200) << "=================== end findCaretBoxLine (box " << (outside ? (outsideEnd ? "outside end" : "outside begin") : "inside") << ")" << endl;
   #endif
       Q_ASSERT(r->isBox());
       return CaretBoxLine::constructCaretBoxLine(cblDeleter,
@@ -1049,23 +1049,23 @@ static CaretBoxLine* tqfindCaretBoxLine(DOM::NodeImpl *node, long offset,
 
   InlineFlowBox *flowBox = cb->firstLineBox();
   // (C)
-  // This case strikes when the element is tqreplaced, but neither a
+  // This case strikes when the element is replaced, but neither a
   // RenderBlock nor a RenderInline
   if (!flowBox) {	// ### utter emergency (why is this possible at all?)
 //    flowBox = generateDummyFlowBox(arena, cb, r);
 //    if (ibox) *ibox = flowBox->firstChild();
 //    outside = outside_end = true;
 
-//    kdWarning() << "containing block tqcontains no inline flow boxes!!! crash imminent" << endl;
+//    kdWarning() << "containing block contains no inline flow boxes!!! crash imminent" << endl;
 #if DEBUG_CARETMODE > 0
-   kdDebug(6200) << "=================== end tqfindCaretBoxLine (2)" << endl;
+   kdDebug(6200) << "=================== end findCaretBoxLine (2)" << endl;
 #endif
     return CaretBoxLine::constructCaretBoxLine(cblDeleter, cb,
 			outside, outsideEnd, caretBoxIt);
   }/*end if*/
 
   // We iterate the inline flow boxes of the containing block until
-  // we tqfind the given node. This has one major flaw: it is linear, and therefore
+  // we find the given node. This has one major flaw: it is linear, and therefore
   // painfully slow for really large blocks.
   for (; flowBox; flowBox = static_cast<InlineFlowBox *>(flowBox->nextLineBox())) {
 #if DEBUG_CARETMODE > 0
@@ -1081,7 +1081,7 @@ static CaretBoxLine* tqfindCaretBoxLine(DOM::NodeImpl *node, long offset,
 #endif
     if (caretBoxIt != cbl->end()) {
 #if DEBUG_CARETMODE > 0
-   kdDebug(6200) << "=================== end tqfindCaretBoxLine (3)" << endl;
+   kdDebug(6200) << "=================== end findCaretBoxLine (3)" << endl;
 #endif
       return cbl;
     }
@@ -1091,20 +1091,20 @@ static CaretBoxLine* tqfindCaretBoxLine(DOM::NodeImpl *node, long offset,
   // Danger: this is O(n^2). It's only called to recover from
   // errors, that means, theoretically, never. (Practically, far too often :-( )
   Q_ASSERT(!flowBox);
-  CaretBoxLine *cbl = tqfindCaretBoxLine(nextLeafNode(node, base ? base->element() : 0), 0, cblDeleter, base, r_ofs, caretBoxIt);
+  CaretBoxLine *cbl = findCaretBoxLine(nextLeafNode(node, base ? base->element() : 0), 0, cblDeleter, base, r_ofs, caretBoxIt);
 #if DEBUG_CARETMODE > 0
-  kdDebug(6200) << "=================== end tqfindCaretBoxLine" << endl;
+  kdDebug(6200) << "=================== end findCaretBoxLine" << endl;
 #endif
   return cbl;
 }
 
-/** tqfinds the innermost table object @p r is contained within, but no
+/** finds the innermost table object @p r is contained within, but no
  * farther than @p cb.
  * @param r leaf element to begin with
  * @param cb bottom element where to stop search at least.
  * @return the table object or 0 if none found.
  */
-static inline RenderTable *tqfindTableUpTo(RenderObject *r, RenderFlow *cb)
+static inline RenderTable *findTableUpTo(RenderObject *r, RenderFlow *cb)
 {
   while (r && r != cb && !r->isTable()) r = r->parent();
   return r && r->isTable() ? static_cast<RenderTable *>(r) : 0;
@@ -1118,7 +1118,7 @@ static inline bool isDescendant(RenderObject *r, RenderObject *cb)
   return r;
 }
 
-/** checks whether the given block tqcontains at least one editable element.
+/** checks whether the given block contains at least one editable element.
  *
  * Warning: This function has linear complexity, and therefore is expensive.
  * Use it sparingly, and cache the result.
@@ -1128,7 +1128,7 @@ static inline bool isDescendant(RenderObject *r, RenderObject *cb)
  *	or at the end.
  * @param fromEnd begin search from end (default: begin from beginning)
  */
-static bool tqcontainsEditableElement(KHTMLPart *part, RenderBlock *cb,
+static bool containsEditableElement(KHTMLPart *part, RenderBlock *cb,
 	RenderTable *&table, bool fromEnd = false)
 {
   RenderObject *r = cb;
@@ -1150,7 +1150,7 @@ static bool tqcontainsEditableElement(KHTMLPart *part, RenderBlock *cb,
       modWithinCb = true;
       r = cb;
     } else
-      tempTable = tqfindTableUpTo(r, cb);
+      tempTable = findTableUpTo(r, cb);
 
 #if DEBUG_CARETMODE > 1
     kdDebug(6201) << "cee: r " << (r ? r->renderName() : TQString::null) << "@" << r << " cb " << cb << " withinCb " << withinCb << " modWithinCb " << modWithinCb << " tempTable " << tempTable << endl;
@@ -1173,7 +1173,7 @@ static bool tqcontainsEditableElement(KHTMLPart *part, RenderBlock *cb,
   return false;
 }
 
-/** checks whether the given block tqcontains at least one editable child
+/** checks whether the given block contains at least one editable child
  * element, beginning with but excluding @p start.
  *
  * Warning: This function has linear complexity, and therefore is expensive.
@@ -1185,7 +1185,7 @@ static bool tqcontainsEditableElement(KHTMLPart *part, RenderBlock *cb,
  * @param fromEnd begin search from end (default: begin from beginning)
  * @param start object after which to begin search.
  */
-static bool tqcontainsEditableChildElement(KHTMLPart *part, RenderBlock *cb,
+static bool containsEditableChildElement(KHTMLPart *part, RenderBlock *cb,
 	RenderTable *&table, bool fromEnd, RenderObject *start)
 {
   int state = 0;
@@ -1220,7 +1220,7 @@ static bool tqcontainsEditableChildElement(KHTMLPart *part, RenderBlock *cb,
       modWithinCb = true;
       r = cb;
     } else
-      tempTable = tqfindTableUpTo(r, cb);
+      tempTable = findTableUpTo(r, cb);
 
 #if DEBUG_CARETMODE > 1
     kdDebug(6201) << "cece: r " << (r ? r->renderName() : TQString::null) << "@" << r << " cb " << cb << " withinCb " << withinCb << " modWithinCb " << modWithinCb << " tempTable " << tempTable << endl;
@@ -1322,7 +1322,7 @@ LineIterator::LineIterator(LinearDocument *l, DOM::NodeImpl *node, long offset)
 {
 //  kdDebug(6200) << "LineIterator: node " << node << " offset " << offset << endl;
   if (!node) { cbl = 0; return; }
-  cbl = tqfindCaretBoxLine(node, offset, &lines->cblDeleter,
+  cbl = findCaretBoxLine(node, offset, &lines->cblDeleter,
   		l->baseObject(), currentOffset, currentBox);
   // can happen on partially loaded documents
 #if DEBUG_CARETMODE > 0
@@ -1337,7 +1337,7 @@ LineIterator::LineIterator(LinearDocument *l, DOM::NodeImpl *node, long offset)
 #endif
   if (currentBox == cbl->end()) {
 #if DEBUG_CARETMODE > 0
-    kdDebug(6200) << "LineIterator: tqfindCaretBoxLine failed" << endl;
+    kdDebug(6200) << "LineIterator: findCaretBoxLine failed" << endl;
 #endif
     cbl = 0;
   }/*end if*/
@@ -1357,7 +1357,7 @@ void LineIterator::nextBlock()
     int state;		// not used
     mapRenderPosToTraversalState(cb_outside, cb_outside_end, false, trav);
 #if DEBUG_CARETMODE > 1
-    kdDebug(6200) << "nextBlock: before adv r" << r << " " << (r ? r->renderName() : TQString::null) << (r && r->isText() ? " tqcontains \"" + TQString(((RenderText *)r)->str->s, QMIN(((RenderText *)r)->str->l,15)) + "\"" : TQString::null) << " trav " << trav << " cb_outside " << cb_outside << " cb_outside_end " << cb_outside_end << endl;
+    kdDebug(6200) << "nextBlock: before adv r" << r << " " << (r ? r->renderName() : TQString::null) << (r && r->isText() ? " contains \"" + TQString(((RenderText *)r)->str->s, QMIN(((RenderText *)r)->str->l,15)) + "\"" : TQString::null) << " trav " << trav << " cb_outside " << cb_outside << " cb_outside_end " << cb_outside_end << endl;
 #endif
     r = advanceSuitableObject(r, trav, false, base, state);
     if (!r) {
@@ -1375,7 +1375,7 @@ void LineIterator::nextBlock()
 
     RenderBlock *cb;
 
-    // If we hit a block or tqreplaced object, use this as its enclosing object
+    // If we hit a block or replaced object, use this as its enclosing object
     bool isrepl = isBlockRenderReplaced(r);
     if (r->isRenderBlock() || isrepl) {
       RenderBox *cb = static_cast<RenderBox *>(r);
@@ -1426,7 +1426,7 @@ void LineIterator::prevBlock()
     int state;		// not used
     mapRenderPosToTraversalState(cb_outside, cb_outside_end, true, trav);
 #if DEBUG_CARETMODE > 1
-    kdDebug(6200) << "prevBlock: before adv r" << r << " " << (r ? r->renderName() : TQString::null) << (r && r->isText() ? " tqcontains \"" + TQString(((RenderText *)r)->str->s, QMIN(((RenderText *)r)->str->l,15)) + "\"" : TQString::null) << " trav " << trav << " cb_outside " << cb_outside << " cb_outside_end " << cb_outside_end << endl;
+    kdDebug(6200) << "prevBlock: before adv r" << r << " " << (r ? r->renderName() : TQString::null) << (r && r->isText() ? " contains \"" + TQString(((RenderText *)r)->str->s, QMIN(((RenderText *)r)->str->l,15)) + "\"" : TQString::null) << " trav " << trav << " cb_outside " << cb_outside << " cb_outside_end " << cb_outside_end << endl;
 #endif
     r = advanceSuitableObject(r, trav, true, base, state);
     if (!r) {
@@ -1602,7 +1602,7 @@ if (box->isInline()) {
                 << " padr " << s->paddingRight().value()
       		<< " padt " << s->paddingTop().value()
                 << " padb " << s->paddingBottom().value()
-	// ### Can inline elements have top/bottom margins? Couldn't tqfind
+	// ### Can inline elements have top/bottom margins? Couldn't find
 	// it in the CSS 2 spec, but Mozilla ignores them, so we do, too.
 		<< " marl " << s->marginLeft().value()
                 << " marr " << s->marginRight().value()
@@ -1647,7 +1647,7 @@ bool EditableCaretBoxIterator::isEditable(const CaretBoxIterator &boxit, bool fr
   RenderObject *r = b->object();
 #if DEBUG_CARETMODE > 0
 //  if (b->isInlineFlowBox()) kdDebug(6200) << "b is inline flow box" << (outside ? " (outside)" : "") << endl;
-  kdDebug(6200) << "isEditable r" << r << ": " << (r ? r->renderName() : TQString::null) << (r && r->isText() ? " tqcontains \"" + TQString(((RenderText *)r)->str->s, QMIN(((RenderText *)r)->str->l,15)) + "\"" : TQString::null) << endl;
+  kdDebug(6200) << "isEditable r" << r << ": " << (r ? r->renderName() : TQString::null) << (r && r->isText() ? " contains \"" + TQString(((RenderText *)r)->str->s, QMIN(((RenderText *)r)->str->l,15)) + "\"" : TQString::null) << endl;
 #endif
   // Must check caret mode or design mode *after* r->element(), otherwise
   // lines without a backing DOM node get regarded, leading to a crash.
@@ -1659,7 +1659,7 @@ bool EditableCaretBoxIterator::isEditable(const CaretBoxIterator &boxit, bool fr
     return false;
   }
 
-  // generally exclude tqreplaced elements with no children from navigation
+  // generally exclude replaced elements with no children from navigation
   if (!b->isOutside() && r->isRenderReplaced() && !r->firstChild())
     return false;
 
@@ -1749,7 +1749,7 @@ void EditableCharacterIterator::initFirstChar()
   if (_offset == box->maxOffset())
     peekNext();
   else if (b && !box->isOutside() && b->isInlineTextBox())
-    _char = static_cast<RenderText *>(b->object())->str->s[_offset].tqunicode();
+    _char = static_cast<RenderText *>(b->object())->str->s[_offset].unicode();
   else
     _char = -1;
 }
@@ -1849,7 +1849,7 @@ kdDebug(6200) << "_offset " << _offset << endl;
 readchar:
     // get character
     if (b && !box->isOutside() && b->isInlineTextBox() && _offset < b->maxOffset())
-      _char = static_cast<RenderText *>(b->object())->str->s[_offset].tqunicode();
+      _char = static_cast<RenderText *>(b->object())->str->s[_offset].unicode();
     else
       _char = -1;
   }/*end if*/
@@ -1861,7 +1861,7 @@ kdDebug(6200) << "_offset: " << _offset /*<< " _peekNext: " << _peekNext*/ << "
   if (!_end && ebit != (*_it)->end()) {
     CaretBox *box = *ebit;
     RenderObject *_r = box->object();
-    kdDebug(6200) << "echit++(1): box " << box << (box && box->isInlineTextBox() ? TQString(" tqcontains \"%1\"").arg(TQConstString(static_cast<RenderText *>(box->object())->str->s+box->minOffset(), box->maxOffset() - box->minOffset()).string()) : TQString::null) << " _r " << (_r ? _r->element()->nodeName().string() : TQString("<nil>")) << endl;
+    kdDebug(6200) << "echit++(1): box " << box << (box && box->isInlineTextBox() ? TQString(" contains \"%1\"").arg(TQConstString(static_cast<RenderText *>(box->object())->str->s+box->minOffset(), box->maxOffset() - box->minOffset()).string()) : TQString::null) << " _r " << (_r ? _r->element()->nodeName().string() : TQString("<nil>")) << endl;
   }
 #endif
   return *this;
@@ -1887,7 +1887,7 @@ kdDebug(6200) << "_offset == minofs: " << _offset << " == " << minofs << endl;
 //     _peekNext = b;
     // get character
     if (b && !box->isOutside() && b->isInlineTextBox())
-      _char = static_cast<RenderText *>(b->object())->text()[_offset].tqunicode();
+      _char = static_cast<RenderText *>(b->object())->text()[_offset].unicode();
     else
       _char = -1;
 
@@ -1934,7 +1934,7 @@ kdDebug(6200) << "box " << box << " b " << box->inlineBox() << " isText " << box
 // 	  if (!_it.outside) _offset = r->isBR() ? (*ebit)->minOffset() : (*ebit)->maxOffset();
 	  _char = -1;
 #if DEBUG_CARETMODE > 0
-          kdDebug(6200) << "echit--(2): box " << box << " b " << box->inlineBox() << (box->isInlineTextBox() ? TQString(" tqcontains \"%1\"").arg(TQConstString(static_cast<RenderText *>(box->object())->str->s+box->minOffset(), box->maxOffset() - box->minOffset()).string()) : TQString::null) << endl;
+          kdDebug(6200) << "echit--(2): box " << box << " b " << box->inlineBox() << (box->isInlineTextBox() ? TQString(" contains \"%1\"").arg(TQConstString(static_cast<RenderText *>(box->object())->str->s+box->minOffset(), box->maxOffset() - box->minOffset()).string()) : TQString::null) << endl;
 #endif
 	} else
 	  _end = true;
@@ -1990,9 +1990,9 @@ kdDebug(6200) << "_offset: " << _offset << " _peekNext: " << _peekNext << endl;
 #endif
     // get character
     if (_peekNext && _offset >= box->maxOffset() && _peekNext->isInlineTextBox())
-      _char = static_cast<RenderText *>(_peekNext->object())->text()[_peekNext->minOffset()].tqunicode();
+      _char = static_cast<RenderText *>(_peekNext->object())->text()[_peekNext->minOffset()].unicode();
     else if (b && _offset < b->maxOffset() && b->isInlineTextBox())
-      _char = static_cast<RenderText *>(b->object())->text()[_offset].tqunicode();
+      _char = static_cast<RenderText *>(b->object())->text()[_offset].unicode();
     else
       _char = -1;
   }/*end if*/
@@ -2000,7 +2000,7 @@ kdDebug(6200) << "_offset: " << _offset << " _peekNext: " << _peekNext << endl;
 #if DEBUG_CARETMODE > 0
   if (!_end && ebit != (*_it)->preBegin()) {
     CaretBox *box = *ebit;
-    kdDebug(6200) << "echit--(1): box " << box << " b " << box->inlineBox() << (box->isInlineTextBox() ? TQString(" tqcontains \"%1\"").arg(TQConstString(static_cast<RenderText *>(box->object())->str->s+box->minOffset(), box->maxOffset() - box->minOffset()).string()) : TQString::null) << endl;
+    kdDebug(6200) << "echit--(1): box " << box << " b " << box->inlineBox() << (box->isInlineTextBox() ? TQString(" contains \"%1\"").arg(TQConstString(static_cast<RenderText *>(box->object())->str->s+box->minOffset(), box->maxOffset() - box->minOffset()).string()) : TQString::null) << endl;
   }
 #endif
   return *this;
@@ -2052,10 +2052,10 @@ TableRowIterator &TableRowIterator::operator --()
 // == class ErgonomicEditableLineIterator implementation
 
 // some decls
-static RenderTableCell *tqfindNearestTableCellInRow(KHTMLPart *part, int x,
+static RenderTableCell *findNearestTableCellInRow(KHTMLPart *part, int x,
 		RenderTableSection::RowStruct *row, bool fromEnd);
 
-/** tqfinds the cell corresponding to absolute x-coordinate @p x in the given
+/** finds the cell corresponding to absolute x-coordinate @p x in the given
  * table.
  *
  * If there is no direct cell, or the cell is not accessible, the function
@@ -2068,13 +2068,13 @@ static RenderTableCell *tqfindNearestTableCellInRow(KHTMLPart *part, int x,
  *	beginning
  * @return the cell, or 0 if no editable cell was found.
  */
-static inline RenderTableCell *tqfindNearestTableCell(KHTMLPart *part, int x,
+static inline RenderTableCell *findNearestTableCell(KHTMLPart *part, int x,
 		TableRowIterator &it, bool fromEnd)
 {
   RenderTableCell *result = 0;
 
   while (*it) {
-    result = tqfindNearestTableCellInRow(part, x, *it, fromEnd);
+    result = findNearestTableCellInRow(part, x, *it, fromEnd);
     if (result) break;
 
     if (fromEnd) --it; else ++it;
@@ -2083,7 +2083,7 @@ static inline RenderTableCell *tqfindNearestTableCell(KHTMLPart *part, int x,
   return result;
 }
 
-/** tqfinds the nearest editable cell around the given absolute x-coordinate
+/** finds the nearest editable cell around the given absolute x-coordinate
  *
  * It will dive into nested tables as necessary to provide seamless navigation.
  *
@@ -2096,7 +2096,7 @@ static inline RenderTableCell *tqfindNearestTableCell(KHTMLPart *part, int x,
  * @param fromEnd @p true, begin from end (applies only to nested tables)
  * @return the found cell or 0 if no editable cell was found
  */
-static RenderTableCell *tqfindNearestTableCellInRow(KHTMLPart *part, int x,
+static RenderTableCell *findNearestTableCellInRow(KHTMLPart *part, int x,
 		RenderTableSection::RowStruct *row, bool fromEnd)
 {
   // First pass. Find spatially nearest cell.
@@ -2134,13 +2134,13 @@ static RenderTableCell *tqfindNearestTableCellInRow(KHTMLPart *part, int x,
     kdDebug(6201) << "index " << index << " cell " << cell << endl;
 #endif
     RenderTable *nestedTable;
-    if (tqcontainsEditableElement(part, cell, nestedTable, fromEnd)) {
+    if (containsEditableElement(part, cell, nestedTable, fromEnd)) {
 
       if (nestedTable) {
         TableRowIterator it(nestedTable, fromEnd);
 	while (*it) {
 // kdDebug(6201) << "=== recursive invocation" << endl;
-          cell = tqfindNearestTableCell(part, x, it, fromEnd);
+          cell = findNearestTableCell(part, x, it, fromEnd);
 	  if (cell) break;
 	  if (fromEnd) --it; else ++it;
 	}/*wend*/
@@ -2164,7 +2164,7 @@ static RenderObject *commonAncestorTableSectionOrCell(RenderObject *r1,
   if (!r1 || !r2) return 0;
   RenderTableSection *sec = 0;
   int start_depth=0, end_depth=0;
-  // First we tqfind the depths of the two objects in the tree (start_depth, end_depth)
+  // First we find the depths of the two objects in the tree (start_depth, end_depth)
   RenderObject *n = r1;
   while (n->parent()) {
     n = n->parent();
@@ -2200,14 +2200,14 @@ static RenderObject *commonAncestorTableSectionOrCell(RenderObject *r1,
   return r1 && r1->isTable() ? sec : r1;
 }
 
-/** Finds the row that tqcontains the given cell, directly, or indirectly
+/** Finds the row that contains the given cell, directly, or indirectly
  * @param section section to be searched
  * @param cell table cell
  * @param row returns the row
- * @param directCell returns the direct cell that tqcontains @p cell
+ * @param directCell returns the direct cell that contains @p cell
  * @return the index of the row.
  */
-static int tqfindRowInSection(RenderTableSection *section, RenderTableCell *cell,
+static int findRowInSection(RenderTableSection *section, RenderTableCell *cell,
 		RenderTableSection::RowStruct *&row, RenderTableCell *&directCell)
 {
   // Seek direct cell
@@ -2236,12 +2236,12 @@ static int tqfindRowInSection(RenderTableSection *section, RenderTableCell *cell
   return -1;
 }
 
-/** tqfinds the table that is the first direct or indirect descendant of @p block.
+/** finds the table that is the first direct or indirect descendant of @p block.
  * @param leaf object to begin search from.
  * @param block object to search to, or 0 to search up to top.
  * @return the table or 0 if there were none.
  */
-static inline RenderTable *tqfindFirstDescendantTable(RenderObject *leaf, RenderBlock *block)
+static inline RenderTable *findFirstDescendantTable(RenderObject *leaf, RenderBlock *block)
 {
   RenderTable *result = 0;
   while (leaf && leaf != block) {
@@ -2299,7 +2299,7 @@ void ErgonomicEditableLineIterator::determineTopologicalElement(
   if (!commonAncestor || commonAncestor->isTableCell()) {	// (1)
 
     RenderTableCell *cell = static_cast<RenderTableCell *>(commonAncestor);
-    RenderTable *table = tqfindFirstDescendantTable(newObject, cell);
+    RenderTable *table = findFirstDescendantTable(newObject, cell);
 
 #if DEBUG_CARETMODE > 0
     kdDebug(6201) << "table cell: " << cell << endl;
@@ -2315,7 +2315,7 @@ void ErgonomicEditableLineIterator::determineTopologicalElement(
 
     RenderTableSection *section = static_cast<RenderTableSection *>(commonAncestor);
     RenderTableSection::RowStruct *row;
-    int idx = tqfindRowInSection(section, oldCell, row, oldCell);
+    int idx = findRowInSection(section, oldCell, row, oldCell);
 #if DEBUG_CARETMODE > 1
     kdDebug(6201) << "table section: row idx " << idx << endl;
 #endif
@@ -2333,9 +2333,9 @@ void ErgonomicEditableLineIterator::determineTopologicalElement(
     // will crash on uninitialized table row iterator
   }/*end if*/
 
-  RenderTableCell *cell = tqfindNearestTableCell(lines->m_part, xCoor, it, toBegin);
+  RenderTableCell *cell = findNearestTableCell(lines->m_part, xCoor, it, toBegin);
 #if DEBUG_CARETMODE > 1
-  kdDebug(6201) << "tqfindNearestTableCell result: " << cell << endl;
+  kdDebug(6201) << "findNearestTableCell result: " << cell << endl;
 #endif
 
   RenderBlock *newBlock = cell;
@@ -2348,7 +2348,7 @@ void ErgonomicEditableLineIterator::determineTopologicalElement(
 #endif
 
     RenderTable *nestedTable;
-    bool editableChild = cell && tqcontainsEditableChildElement(lines->m_part,
+    bool editableChild = cell && containsEditableChildElement(lines->m_part,
     		cell, nestedTable, toBegin, section->table());
 
     if (cell && !editableChild) {
@@ -2436,7 +2436,7 @@ ErgonomicEditableLineIterator &ErgonomicEditableLineIterator::operator --()
 
 // == Navigational helper functions ==
 
-/** seeks the caret box which tqcontains or is the nearest to @p x
+/** seeks the caret box which contains or is the nearest to @p x
  * @param it line iterator pointing to line to be searched
  * @param cv caret view context
  * @param x returns the cv->origX approximation, relatively positioned to the
@@ -2457,7 +2457,7 @@ static CaretBox *nearestCaretBox(LineIterator &it, CaretViewContext *cv,
   if (cb) cb->absolutePosition(absx, absy);
   else absx = absy = 0;
 
-  // Otherwise tqfind out in which inline box the caret is to be placed.
+  // Otherwise find out in which inline box the caret is to be placed.
 
   // this horizontal position is to be approximated
   x = cv->origX - absx;
@@ -2478,7 +2478,7 @@ static CaretBox *nearestCaretBox(LineIterator &it, CaretViewContext *cv,
 #if DEBUG_CARETMODE > 0
 //    RenderObject *r = b->object();
 //	if (b->isInlineFlowBox()) kdDebug(6200) << "b is inline flow box" << endl;
-//	kdDebug(6200) << "approximate r" << r << ": " << (r ? r->renderName() : TQString::null) << (r && r->isText() ? " tqcontains \"" + TQString(((RenderText *)r)->str->s, ((RenderText *)r)->str->l) + "\"" : TQString::null) << endl;
+//	kdDebug(6200) << "approximate r" << r << ": " << (r ? r->renderName() : TQString::null) << (r && r->isText() ? " contains \"" + TQString(((RenderText *)r)->str->s, ((RenderText *)r)->str->l) + "\"" : TQString::null) << endl;
 #endif
     xPos = b->xPos();
 
diff --git a/khtml/khtml_caret_p.h b/khtml/khtml_caret_p.h
index 479dd7d76..9524f2df7 100644
--- a/khtml/khtml_caret_p.h
+++ b/khtml/khtml_caret_p.h
@@ -130,7 +130,7 @@ class CaretBoxLine;
  *
  * The caret box serves as a wrapper for inline boxes of all kind. It either
  * wraps an InlineBox, InlineTextBox, or InlineFlowBox, or if no such boxes
- * exist for a certain context, it tqcontains the relevant information directly.
+ * exist for a certain context, it contains the relevant information directly.
  *
  * This class will be constructed whenever a caret position has to be described.
  * @since 3.3
@@ -178,7 +178,7 @@ public:
    */
   RenderBlock *containingBlock() const { return _box ? static_cast<RenderBlock *>(cb) : cb->containingBlock(); }
 
-  /** returns the tqreplaced render object if this caret box represents one,
+  /** returns the replaced render object if this caret box represents one,
    * 0 otherwise.
    */
 
@@ -388,7 +388,7 @@ public:
 
   /** constructs a new caret box line for the given render block.
    * @param deleter deleter which handles alloc+dealloc of the object
-   * @param cb render block or render tqreplaced
+   * @param cb render block or render replaced
    * @param outside true when line is to be constructed outside
    * @param outsideEnd true when the ending outside is meant
    * @param iter returns the iterator to the caret box representing the given
@@ -409,7 +409,7 @@ public:
 #endif
 
 protected:
-  /** tqcontains the seek parameters */
+  /** contains the seek parameters */
   struct SeekBoxParams {
     InlineBox *box;
     bool outside;
@@ -656,10 +656,10 @@ public:
   virtual ~LinearDocument();
 
   /**
-   * Tells whether this list tqcontains any lines.
+   * Tells whether this list contains any lines.
    *
-   * @returns @p true if this document tqcontains lines, @p false otherwise. Note
-   *	that an empty document tqcontains at least one line, so this method
+   * @returns @p true if this document contains lines, @p false otherwise. Note
+   *	that an empty document contains at least one line, so this method
    *	only returns @p false if the document could not be initialised for
    *	some reason.
    */
@@ -796,7 +796,7 @@ public:
   void advance(bool toBegin);
 
 protected:
-  /** tqfinds out if the given box is editable.
+  /** finds out if the given box is editable.
    * @param boxit iterator to given caret box
    * @param fromEnd true when advancing towards the beginning
    * @return @p true if box is editable
@@ -860,7 +860,7 @@ public:
   void advance(bool toBegin);
 
 protected:
-  /** tqfinds out if the current line is editable.
+  /** finds out if the current line is editable.
    *
    * @param it check caret box line iterator points to
    * @return @p true if line is editable
@@ -1034,7 +1034,7 @@ public:
    */
   int chr() const { return _char; }
 
-  /** returns the current character as a tqunicode symbol, substituting
+  /** returns the current character as a unicode symbol, substituting
    * a blank for a non-text node.
    */
   TQChar operator *() const { return TQChar(_char >= 0 ? _char : ' '); }
@@ -1089,7 +1089,7 @@ protected:
     CaretBox *box = *copy;
     InlineBox *b = box->inlineBox();
     if (b && !box->isOutside() && b->isInlineTextBox())
-      _char = static_cast<RenderText *>(b->object())->str->s[b->minOffset()].tqunicode();
+      _char = static_cast<RenderText *>(b->object())->str->s[b->minOffset()].unicode();
     else
       _char = -1;
   }
diff --git a/khtml/khtml_ext.cpp b/khtml/khtml_ext.cpp
index 064d7dc8c..7cadfb944 100644
--- a/khtml/khtml_ext.cpp
+++ b/khtml/khtml_ext.cpp
@@ -220,7 +220,7 @@ void KHTMLPartBrowserExtension::copy()
     {
         // get selected text and paste to the clipboard
         TQString text= m_part->selectedText();
-	text.tqreplace( TQChar( 0xa0 ), ' ' );
+	text.replace( TQChar( 0xa0 ), ' ' );
 
 
         QClipboard *cb = TQApplication::clipboard();
@@ -240,7 +240,7 @@ void KHTMLPartBrowserExtension::copy()
 	KMultipleDrag *drag = new KMultipleDrag( m_editableFormWidget );
 	drag->addDragObject( textdrag );
 	if(!htmltext.isEmpty()) {
-	    htmltext.tqreplace( TQChar( 0xa0 ), ' ' );
+	    htmltext.replace( TQChar( 0xa0 ), ' ' );
 	    TQTextDrag *htmltextdrag = new TQTextDrag(htmltext, 0L);
 	    htmltextdrag->setSubtype("html");
 	    drag->addDragObject( htmltextdrag );
@@ -276,7 +276,7 @@ void KHTMLPartBrowserExtension::searchProvider()
         KDesktopFile file("searchproviders/google.desktop", true, "services");
 	TQString encodedSearchTerm = m_part->selectedText();
 	TQUrl::encode(encodedSearchTerm);
-	data.setData(file.readEntry("Query").tqreplace("\\{@}", encodedSearchTerm));
+	data.setData(file.readEntry("Query").replace("\\{@}", encodedSearchTerm));
     }
 
     KParts::URLArgs args;
@@ -315,7 +315,7 @@ void KHTMLPartBrowserExtension::callExtensionProxyMethod( const char *method )
     if ( !m_extensionProxy )
         return;
 
-    int slot = m_extensionProxy->tqmetaObject()->tqfindSlot( method );
+    int slot = m_extensionProxy->metaObject()->findSlot( method );
     if ( slot == -1 )
         return;
 
@@ -339,7 +339,7 @@ void KHTMLPartBrowserExtension::updateEditActions()
     enableAction( "paste", data->provides( "text/plain" ) );
 #else
     TQString data=TQApplication::clipboard()->text();
-    enableAction( "paste", data.tqcontains("://"));
+    enableAction( "paste", data.contains("://"));
 #endif
     bool hasSelection = false;
 
@@ -444,7 +444,7 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc,
 
       // search text
       TQString selectedText = khtml->selectedText();
-      selectedText.tqreplace("&", "&&");
+      selectedText.replace("&", "&&");
       if ( selectedText.length()>18 ) {
         selectedText.truncate(15);
         selectedText+="...";
@@ -465,7 +465,7 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc,
       {
         TQString iconPath = locate("cache", KMimeType::favIconForURL(data.uri()) + ".png");
         if ( iconPath.isEmpty() )
-          icon = SmallIcon("tqfind");
+          icon = SmallIcon("find");
         else
           icon = TQPixmap( iconPath );
         name = service->name();
@@ -502,7 +502,7 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc,
           {
             TQString iconPath = locate("cache", KMimeType::favIconForURL(data.uri()) + ".png");
             if ( iconPath.isEmpty() )
-              icon = SmallIcon("tqfind");
+              icon = SmallIcon("find");
             else
               icon = TQPixmap( iconPath );
             name = service->name();
@@ -514,7 +514,7 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc,
       }
 
 
-      if ( selectedText.tqcontains("://") && KURL(selectedText).isValid() )
+      if ( selectedText.contains("://") && KURL(selectedText).isValid() )
          new KAction( i18n( "Open '%1'" ).arg( selectedText ), "window_new", 0,
          d->m_khtml->browserExtension(), TQT_SLOT( openSelection() ), actionCollection(), "openSelection" );
   }
@@ -615,7 +615,7 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc,
     }
 
     TQString name = KStringHandler::csqueeze(d->m_imageURL.fileName()+d->m_imageURL.query(), 25);
-    new KAction( i18n( "View Image (%1)" ).arg(d->m_suggestedFilename.isEmpty() ? name.tqreplace("&", "&&") : d->m_suggestedFilename.tqreplace("&", "&&")), 0, this, TQT_SLOT( slotViewImage() ),
+    new KAction( i18n( "View Image (%1)" ).arg(d->m_suggestedFilename.isEmpty() ? name.replace("&", "&&") : d->m_suggestedFilename.replace("&", "&&")), 0, this, TQT_SLOT( slotViewImage() ),
                  actionCollection(), "viewimage" );
 
     if (KHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled())
@@ -809,7 +809,7 @@ void KHTMLPopupGUIClient::saveURL( TQWidget *parent, const TQString &caption,
                                    const TQString &filter, long cacheId,
                                    const TQString & suggestedFilename )
 {
-  TQString name = TQString::tqfromLatin1( "index.html" );
+  TQString name = TQString::fromLatin1( "index.html" );
   if ( !suggestedFilename.isEmpty() )
     name = suggestedFilename;
   else if ( !url.fileName().isEmpty() )
@@ -870,7 +870,7 @@ void KHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL,
         if(!saved)
         {
           // DownloadManager <-> konqueror integration
-          // tqfind if the integration is enabled
+          // find if the integration is enabled
           // the empty key  means no integration
           // only use download manager for non-local urls!
           bool downloadViaKIO = true;
@@ -881,7 +881,7 @@ void KHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL,
             TQString downloadManger = cfg.readPathEntry("DownloadManager");
             if (!downloadManger.isEmpty())
             {
-                // then tqfind the download manager location
+                // then find the download manager location
                 kdDebug(1000) << "Using: "<<downloadManger <<" as Download Manager" <<endl;
                 TQString cmd = KStandardDirs::findExe(downloadManger);
                 if (cmd.isEmpty())
@@ -947,7 +947,7 @@ void KHTMLPartBrowserHostExtension::virtual_hook( int id, void *data )
   if (id == VIRTUAL_FIND_FRAME_PARENT)
   {
     FindFrameParentParams *param = static_cast<FindFrameParentParams*>(data);
-    KHTMLPart *parentPart = m_part->tqfindFrameParent(param->callingPart, param->frame);
+    KHTMLPart *parentPart = m_part->findFrameParent(param->callingPart, param->frame);
     if (parentPart)
        param->parent = parentPart->browserHostExtension();
     return;
diff --git a/khtml/khtml_factory.cpp b/khtml/khtml_factory.cpp
index 981f8e49e..7eedc6311 100644
--- a/khtml/khtml_factory.cpp
+++ b/khtml/khtml_factory.cpp
@@ -103,13 +103,13 @@ KHTMLFactory::~KHTMLFactory()
         deref();
 }
 
-KParts::Part *KHTMLFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList & )
+KParts::Part *KHTMLFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList & )
 {
   KHTMLPart::GUIProfile prof = KHTMLPart::DefaultGUI;
   if ( strcmp( className, "Browser/View" ) == 0 )
     prof = KHTMLPart::BrowserViewGUI;
 
-  return new KHTMLPart( tqparentWidget, widgetName, parent, name, prof );
+  return new KHTMLPart( parentWidget, widgetName, parent, name, prof );
 }
 
 void KHTMLFactory::ref()
@@ -146,7 +146,7 @@ void KHTMLFactory::registerPart( KHTMLPart *part )
     if ( !s_parts )
         s_parts = new TQPtrList<KHTMLPart>;
 
-    if ( !s_parts->tqcontainsRef( part ) )
+    if ( !s_parts->containsRef( part ) )
     {
         s_parts->append( part );
         ref();
diff --git a/khtml/khtml_factory.h b/khtml/khtml_factory.h
index e5319bf83..e9d5c62a8 100644
--- a/khtml/khtml_factory.h
+++ b/khtml/khtml_factory.h
@@ -45,7 +45,7 @@ public:
   KHTMLFactory( bool clone = false );
   virtual ~KHTMLFactory();
 
-  virtual KParts::Part *createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &args );
+  virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &args );
 
   static void registerPart( KHTMLPart *part );
   static void deregisterPart( KHTMLPart *part );
diff --git a/khtml/khtml_iface.h b/khtml/khtml_iface.h
index 8fd7ccc0a..8caade850 100644
--- a/khtml/khtml_iface.h
+++ b/khtml/khtml_iface.h
@@ -155,7 +155,7 @@ k_dcop:
      * default style sheet.
      *
      * This gives a wide range of possibilities to
-     * change the tqlayout of the page.
+     * change the layout of the page.
      */
     void setUserStyleSheet(const TQString &styleSheet);
 
diff --git a/khtml/khtml_pagecache.cpp b/khtml/khtml_pagecache.cpp
index 33462110a..935f31cc0 100644
--- a/khtml/khtml_pagecache.cpp
+++ b/khtml/khtml_pagecache.cpp
@@ -157,7 +157,7 @@ KHTMLPageCache::createCacheEntry()
 void
 KHTMLPageCache::addData(long id, const TQByteArray &data)
 {
-  KHTMLPageCacheEntry *entry = d->dict.tqfind(id);
+  KHTMLPageCacheEntry *entry = d->dict.find(id);
   if (entry)
      entry->addData(data);
 }
@@ -165,7 +165,7 @@ KHTMLPageCache::addData(long id, const TQByteArray &data)
 void
 KHTMLPageCache::endData(long id)
 {
-  KHTMLPageCacheEntry *entry = d->dict.tqfind(id);
+  KHTMLPageCacheEntry *entry = d->dict.find(id);
   if (entry)
      entry->endData();
 }
@@ -184,13 +184,13 @@ KHTMLPageCache::cancelEntry(long id)
 bool
 KHTMLPageCache::isValid(long id)
 {
-  return (d->dict.tqfind(id) != 0);
+  return (d->dict.find(id) != 0);
 }
 
 bool
 KHTMLPageCache::isComplete(long id)
 {
-  KHTMLPageCacheEntry *entry = d->dict.tqfind(id);
+  KHTMLPageCacheEntry *entry = d->dict.find(id);
   if (entry)
      return entry->isComplete();
   return false;
@@ -199,7 +199,7 @@ KHTMLPageCache::isComplete(long id)
 void
 KHTMLPageCache::fetchData(long id, TQObject *recvObj, const char *recvSlot)
 {
-  KHTMLPageCacheEntry *entry = d->dict.tqfind(id);
+  KHTMLPageCacheEntry *entry = d->dict.find(id);
   if (!entry || !entry->isComplete()) return;
 
   // Make this entry the most recent entry.
@@ -271,7 +271,7 @@ KHTMLPageCache::sendData()
 void
 KHTMLPageCache::saveData(long id, TQDataStream *str)
 {
-  KHTMLPageCacheEntry *entry = d->dict.tqfind(id);
+  KHTMLPageCacheEntry *entry = d->dict.find(id);
   assert(entry);
 
   int fd = entry->m_file->handle();
diff --git a/khtml/khtml_pagecache.h b/khtml/khtml_pagecache.h
index ac9ea5b4b..9b41950a7 100644
--- a/khtml/khtml_pagecache.h
+++ b/khtml/khtml_pagecache.h
@@ -38,7 +38,7 @@ class KHTMLPageCachePrivate;
  *
  * It operates completely independent from the kio_http cache.
  */
-class KHTMLPageCache : public TQObject
+class KHTMLPageCache : public QObject
 {
   Q_OBJECT
 public:
@@ -113,7 +113,7 @@ private:
   KHTMLPageCachePrivate *d;  
 };
 
-class KHTMLPageCacheDelivery : public TQObject
+class KHTMLPageCacheDelivery : public QObject
 {
    friend class KHTMLPageCache;
 Q_OBJECT
diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp
index 2783e080f..338b9605d 100644
--- a/khtml/khtml_part.cpp
+++ b/khtml/khtml_part.cpp
@@ -170,7 +170,7 @@ void khtml::ChildFrame::liveConnectEvent(const unsigned long, const TQString & e
             script += ",";
         if ((*i).first == KParts::LiveConnectExtension::TypeString) {
             script += "\"";
-            script += TQString((*i).second).tqreplace('\\', "\\\\").tqreplace('"', "\\\"");
+            script += TQString((*i).second).replace('\\', "\\\\").replace('"', "\\\"");
             script += "\"";
         } else
             script += (*i).second;
@@ -191,7 +191,7 @@ void khtml::ChildFrame::liveConnectEvent(const unsigned long, const TQString & e
         part->executeScript(m_frame->element(), script);
 }
 
-KHTMLFrameList::Iterator KHTMLFrameList::tqfind( const TQString &name )
+KHTMLFrameList::Iterator KHTMLFrameList::find( const TQString &name )
 {
     Iterator it = begin();
     const Iterator e = end();
@@ -203,7 +203,7 @@ KHTMLFrameList::Iterator KHTMLFrameList::tqfind( const TQString &name )
     return it;
 }
 
-KHTMLPart::KHTMLPart( TQWidget *tqparentWidget, const char *widgetname, TQObject *parent, const char *name, GUIProfile prof )
+KHTMLPart::KHTMLPart( TQWidget *parentWidget, const char *widgetname, TQObject *parent, const char *name, GUIProfile prof )
 : KParts::ReadOnlyPart( parent, name )
 {
     d = 0;
@@ -211,7 +211,7 @@ KHTMLPart::KHTMLPart( TQWidget *tqparentWidget, const char *widgetname, TQObject
     setInstance(  KHTMLFactory::instance(), prof == BrowserViewGUI && !parentPart() );
     // TODO KDE4 - don't load plugins yet
     //setInstance( KHTMLFactory::instance(), false );
-    init( new KHTMLView( this, tqparentWidget, widgetname ), prof );
+    init( new KHTMLView( this, parentWidget, widgetname ), prof );
 }
 
 KHTMLPart::KHTMLPart( KHTMLView *view, TQObject *parent, const char *name, GUIProfile prof )
@@ -371,24 +371,24 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
                             "Click and hold down the mouse button for a menu with all available font sizes." ) );
   }
 
-  d->m_paFind = KStdAction::tqfind( this, TQT_SLOT( slotFind() ), actionCollection(), "tqfind" );
+  d->m_paFind = KStdAction::find( this, TQT_SLOT( slotFind() ), actionCollection(), "find" );
   d->m_paFind->setWhatsThis( i18n( "Find text<p>"
-				   "Shows a dialog that allows you to tqfind text on the displayed page." ) );
+				   "Shows a dialog that allows you to find text on the displayed page." ) );
 
-  d->m_paFindNext = KStdAction::tqfindNext( this, TQT_SLOT( slotFindNext() ), actionCollection(), "tqfindNext" );
+  d->m_paFindNext = KStdAction::findNext( this, TQT_SLOT( slotFindNext() ), actionCollection(), "findNext" );
   d->m_paFindNext->setWhatsThis( i18n( "Find next<p>"
 				       "Find the next occurrence of the text that you "
 				       "have found using the <b>Find Text</b> function" ) );
 
-  d->m_paFindPrev = KStdAction::tqfindPrev( this, TQT_SLOT( slotFindPrev() ), actionCollection(), "tqfindPrevious" );
+  d->m_paFindPrev = KStdAction::findPrev( this, TQT_SLOT( slotFindPrev() ), actionCollection(), "findPrevious" );
   d->m_paFindPrev->setWhatsThis( i18n( "Find previous<p>"
 				       "Find the previous occurrence of the text that you "
 				       "have found using the <b>Find Text</b> function" ) );
 
   d->m_paFindAheadText = new KAction( i18n("Find Text as You Type"), KShortcut( '/' ), this, TQT_SLOT( slotFindAheadText()),
-      actionCollection(), "tqfindAheadText");
+      actionCollection(), "findAheadText");
   d->m_paFindAheadLinks = new KAction( i18n("Find Links as You Type"), KShortcut( '\'' ), this, TQT_SLOT( slotFindAheadLink()),
-      actionCollection(), "tqfindAheadLink");
+      actionCollection(), "findAheadLink");
   d->m_paFindAheadText->setEnabled( false );
   d->m_paFindAheadLinks->setEnabled( false );
 
@@ -448,7 +448,7 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
 
   connect ( &d->m_progressUpdateTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotProgressUpdate() ) );
 
-  tqfindTextBegin(); //reset tqfind variables
+  findTextBegin(); //reset find variables
 
   connect( &d->m_redirectionTimer, TQT_SIGNAL( timeout() ),
            this, TQT_SLOT( slotRedirect() ) );
@@ -482,7 +482,7 @@ KHTMLPart::~KHTMLPart()
     delete d->m_statusBarPopupLabel;
   }
 
-  d->m_tqfind = 0; // deleted by its parent, the view.
+  d->m_find = 0; // deleted by its parent, the view.
 
   if ( d->m_manager )
   {
@@ -608,7 +608,7 @@ bool KHTMLPart::openURL( const KURL &url )
       if (!d->m_statusBarUALabel) {
         d->m_statusBarUALabel = new KURLLabel(d->m_statusBarExtension->statusBar());
         d->m_statusBarUALabel->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small));
-        d->m_statusBarUALabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+        d->m_statusBarUALabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
         d->m_statusBarUALabel->setUseCursor(false);
         d->m_statusBarExtension->addStatusBarItem(d->m_statusBarUALabel, 0, false);
         d->m_statusBarUALabel->setPixmap(SmallIcon("agent", instance()));
@@ -717,7 +717,7 @@ bool KHTMLPart::openURL( const KURL &url )
   }
 
   if (widget())
-     d->m_job->setWindow(widget()->tqtopLevelWidget());
+     d->m_job->setWindow(widget()->topLevelWidget());
   d->m_job->addMetaData(args.metaData());
 
   connect( d->m_job, TQT_SIGNAL( result( KIO::Job* ) ),
@@ -959,7 +959,7 @@ bool KHTMLPart::metaRefreshEnabled() const
 // Define this to disable dlopening kjs_html, when directly linking to it.
 // You need to edit khtml/Makefile.am to add ./ecma/libkjs_html.la to LIBADD
 // and to edit khtml/ecma/Makefile.am to s/kjs_html/libkjs_html/, remove libkhtml from LIBADD,
-//        remove LDFLAGS line, and tqreplace kde_module with either lib (shared) or noinst (static)
+//        remove LDFLAGS line, and replace kde_module with either lib (shared) or noinst (static)
 //        Also, change the order of "ecma" and "." in khtml's SUBDIRS line.
 // OK - that's the default now, use the opposite of the above instructions to go back
 // to "dlopening it" - but it breaks exception catching in kjs_binding.cpp
@@ -1043,7 +1043,7 @@ TQVariant KHTMLPart::crossFrameExecuteScript(const TQString& target,  const TQSt
     // we always allow these
   }
   else {
-    destpart = tqfindFrame(target);
+    destpart = findFrame(target);
     if (!destpart)
        destpart = this;
   }
@@ -1075,10 +1075,10 @@ KJSErrorDlg *KHTMLPart::jsErrorExtension() {
   if (!d->m_statusBarJSErrorLabel) {
     d->m_statusBarJSErrorLabel = new KURLLabel(d->m_statusBarExtension->statusBar());
     d->m_statusBarJSErrorLabel->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small));
-    d->m_statusBarJSErrorLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+    d->m_statusBarJSErrorLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
     d->m_statusBarJSErrorLabel->setUseCursor(false);
     d->m_statusBarExtension->addStatusBarItem(d->m_statusBarJSErrorLabel, 0, false);
-    TQToolTip::add(d->m_statusBarJSErrorLabel, i18n("This web page tqcontains coding errors."));
+    TQToolTip::add(d->m_statusBarJSErrorLabel, i18n("This web page contains coding errors."));
     d->m_statusBarJSErrorLabel->setPixmap(SmallIcon("bug", instance()));
     connect(d->m_statusBarJSErrorLabel, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(launchJSErrorDialog()));
     connect(d->m_statusBarJSErrorLabel, TQT_SIGNAL(rightClickedURL()), TQT_SLOT(jsErrorDialogContextMenu()));
@@ -1397,7 +1397,7 @@ void KHTMLPart::clear()
   }
 
 
-  tqfindTextBegin(); // resets d->m_tqfindNode and d->m_tqfindPos
+  findTextBegin(); // resets d->m_findNode and d->m_findPos
   d->m_mousePressNode = DOM::Node();
 
 
@@ -1525,7 +1525,7 @@ void KHTMLPart::setPageSecurity( PageSecurity sec )
   if ( sec != NotCrypted && !d->m_statusBarIconLabel && !parentPart() ) {
     d->m_statusBarIconLabel = new KURLLabel( d->m_statusBarExtension->statusBar() );
     d->m_statusBarIconLabel->setFixedHeight( instance()->iconLoader()->currentSize(KIcon::Small) );
-    d->m_statusBarIconLabel->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ));
+    d->m_statusBarIconLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ));
     d->m_statusBarIconLabel->setUseCursor( false );
     d->m_statusBarExtension->addStatusBarItem( d->m_statusBarIconLabel, 0, false );
     connect( d->m_statusBarIconLabel, TQT_SIGNAL( leftClickedURL() ), TQT_SLOT( slotSecurity() ) );
@@ -1722,14 +1722,14 @@ void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqU
   d->m_bJScriptForce = false;
   d->m_bJScriptOverride = true;
   begin();
-  TQString errText = TQString::tqfromLatin1( "<HTML dir=%1><HEAD><TITLE>" )
+  TQString errText = TQString::fromLatin1( "<HTML dir=%1><HEAD><TITLE>" )
                            .arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
   errText += i18n( "Error while loading %1" ).arg( reqUrl.htmlURL() );
-  errText += TQString::tqfromLatin1( "</TITLE></HEAD><BODY><P>" );
+  errText += TQString::fromLatin1( "</TITLE></HEAD><BODY><P>" );
   errText += i18n( "An error occurred while loading <B>%1</B>:" ).arg( reqUrl.htmlURL() );
-  errText += TQString::tqfromLatin1( "</P>" );
+  errText += TQString::fromLatin1( "</P>" );
   errText += TQStyleSheet::convertFromPlainText( KIO::buildErrorString( errorCode, text ) );
-  errText += TQString::tqfromLatin1( "</BODY></HTML>" );
+  errText += TQString::fromLatin1( "</BODY></HTML>" );
   write(errText);
   end();
 
@@ -1757,56 +1757,56 @@ void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqU
   TQString url, protocol, datetime;
   url = reqUrl.prettyURL();
   protocol = reqUrl.protocol();
-  datetime = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(),
+  datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(),
                                                 false );
 
-  TQString doc = TQString::tqfromLatin1( "<html><head><title>" );
+  TQString doc = TQString::fromLatin1( "<html><head><title>" );
   doc += i18n( "Error: " );
   doc += errorName;
-  doc += TQString::tqfromLatin1( " - %1</title></head><body><h1>" ).arg( url );
+  doc += TQString::fromLatin1( " - %1</title></head><body><h1>" ).arg( url );
   doc += i18n( "The requested operation could not be completed" );
-  doc += TQString::tqfromLatin1( "</h1><h2>" );
+  doc += TQString::fromLatin1( "</h1><h2>" );
   doc += errorName;
-  doc += TQString::tqfromLatin1( "</h2>" );
+  doc += TQString::fromLatin1( "</h2>" );
   if ( !techName.isNull() ) {
-    doc += TQString::tqfromLatin1( "<h2>" );
+    doc += TQString::fromLatin1( "<h2>" );
     doc += i18n( "Technical Reason: " );
     doc += techName;
-    doc += TQString::tqfromLatin1( "</h2>" );
+    doc += TQString::fromLatin1( "</h2>" );
   }
-  doc += TQString::tqfromLatin1( "<h3>" );
+  doc += TQString::fromLatin1( "<h3>" );
   doc += i18n( "Details of the Request:" );
-  doc += TQString::tqfromLatin1( "</h3><ul><li>" );
+  doc += TQString::fromLatin1( "</h3><ul><li>" );
   doc += i18n( "URL: %1" ).arg( url );
-  doc += TQString::tqfromLatin1( "</li><li>" );
+  doc += TQString::fromLatin1( "</li><li>" );
   if ( !protocol.isNull() ) {
     // uncomment for 3.1... i18n change
     // doc += i18n( "Protocol: %1" ).arg( protocol ).arg( protocol );
-    doc += TQString::tqfromLatin1( "</li><li>" );
+    doc += TQString::fromLatin1( "</li><li>" );
   }
   doc += i18n( "Date and Time: %1" ).arg( datetime );
-  doc += TQString::tqfromLatin1( "</li><li>" );
+  doc += TQString::fromLatin1( "</li><li>" );
   doc += i18n( "Additional Information: %1" ).arg( text );
-  doc += TQString::tqfromLatin1( "</li></ul><h3>" );
+  doc += TQString::fromLatin1( "</li></ul><h3>" );
   doc += i18n( "Description:" );
-  doc += TQString::tqfromLatin1( "</h3><p>" );
+  doc += TQString::fromLatin1( "</h3><p>" );
   doc += description;
-  doc += TQString::tqfromLatin1( "</p>" );
+  doc += TQString::fromLatin1( "</p>" );
   if ( causes.count() ) {
-    doc += TQString::tqfromLatin1( "<h3>" );
+    doc += TQString::fromLatin1( "<h3>" );
     doc += i18n( "Possible Causes:" );
-    doc += TQString::tqfromLatin1( "</h3><ul><li>" );
+    doc += TQString::fromLatin1( "</h3><ul><li>" );
     doc += causes.join( "</li><li>" );
-    doc += TQString::tqfromLatin1( "</li></ul>" );
+    doc += TQString::fromLatin1( "</li></ul>" );
   }
   if ( solutions.count() ) {
-    doc += TQString::tqfromLatin1( "<h3>" );
+    doc += TQString::fromLatin1( "<h3>" );
     doc += i18n( "Possible Solutions:" );
-    doc += TQString::tqfromLatin1( "</h3><ul><li>" );
+    doc += TQString::fromLatin1( "</h3><ul><li>" );
     doc += solutions.join( "</li><li>" );
-    doc += TQString::tqfromLatin1( "</li></ul>" );
+    doc += TQString::fromLatin1( "</li></ul>" );
   }
-  doc += TQString::tqfromLatin1( "</body></html>" );
+  doc += TQString::fromLatin1( "</body></html>" );
 
   write( doc );
   end();
@@ -2286,12 +2286,12 @@ void KHTMLPart::checkCompleted()
   }
 
   // the view will emit completed on our behalf,
-  // either now or at next tqrepaint if one is pending
+  // either now or at next repaint if one is pending
 
   //kdDebug(6050) << this << " asks the view to emit completed. pendingAction=" << pendingAction << endl;
   d->m_view->complete( pendingAction );
 
-  // tqfind the alternate stylesheets
+  // find the alternate stylesheets
   TQStringList sheets;
   if (d->m_doc)
      sheets = d->m_doc->availableStyleSheets();
@@ -2301,7 +2301,7 @@ void KHTMLPart::checkCompleted()
   d->m_paUseStylesheet->setEnabled( sheets.count() > 2);
   if (sheets.count() > 2)
   {
-    d->m_paUseStylesheet->setCurrentItem(kMax(sheets.tqfindIndex(d->m_sheetUsed), 0));
+    d->m_paUseStylesheet->setCurrentItem(kMax(sheets.findIndex(d->m_sheetUsed), 0));
     slotUseStylesheet();
   }
 
@@ -2402,7 +2402,7 @@ void KHTMLPart::slotRedirect()
   d->m_redirectURL = TQString::null;
 
   // SYNC check with ecma/kjs_window.cpp::goURL !
-  if ( u.tqfind( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 )
+  if ( u.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 )
   {
     TQString script = KURL::decode_string( u.right( u.length() - 11 ) );
     kdDebug( 6050 ) << "KHTMLPart::slotRedirect script=" << script << endl;
@@ -2731,17 +2731,17 @@ void KHTMLPart::setCaretVisible(bool show)
 #endif // KHTML_NO_CARET
 }
 
-void KHTMLPart::tqfindTextBegin()
+void KHTMLPart::findTextBegin()
 {
-  d->m_tqfindPos = -1;
-  d->m_tqfindNode = 0;
-  d->m_tqfindPosEnd = -1;
-  d->m_tqfindNodeEnd= 0;
-  d->m_tqfindPosStart = -1;
-  d->m_tqfindNodeStart = 0;
-  d->m_tqfindNodePrevious = 0;
-  delete d->m_tqfind;
-  d->m_tqfind = 0L;
+  d->m_findPos = -1;
+  d->m_findNode = 0;
+  d->m_findPosEnd = -1;
+  d->m_findNodeEnd= 0;
+  d->m_findPosStart = -1;
+  d->m_findNodeStart = 0;
+  d->m_findNodePrevious = 0;
+  delete d->m_find;
+  d->m_find = 0L;
 }
 
 bool KHTMLPart::initFindNode( bool selection, bool reverse, bool fromCursor )
@@ -2771,35 +2771,35 @@ bool KHTMLPart::initFindNode( bool selection, bool reverse, bool fromCursor )
       //kdDebug(6050) << k_funcinfo << "using selection" << endl;
       if ( !fromCursor )
       {
-        d->m_tqfindNode = reverse ? d->m_selectionEnd.handle() : d->m_selectionStart.handle();
-        d->m_tqfindPos = reverse ? d->m_endOffset : d->m_startOffset;
+        d->m_findNode = reverse ? d->m_selectionEnd.handle() : d->m_selectionStart.handle();
+        d->m_findPos = reverse ? d->m_endOffset : d->m_startOffset;
       }
-      d->m_tqfindNodeEnd = reverse ? d->m_selectionStart.handle() : d->m_selectionEnd.handle();
-      d->m_tqfindPosEnd = reverse ? d->m_startOffset : d->m_endOffset;
-      d->m_tqfindNodeStart = !reverse ? d->m_selectionStart.handle() : d->m_selectionEnd.handle();
-      d->m_tqfindPosStart = !reverse ? d->m_startOffset : d->m_endOffset;
-      d->m_tqfindNodePrevious = d->m_tqfindNodeStart;
+      d->m_findNodeEnd = reverse ? d->m_selectionStart.handle() : d->m_selectionEnd.handle();
+      d->m_findPosEnd = reverse ? d->m_startOffset : d->m_endOffset;
+      d->m_findNodeStart = !reverse ? d->m_selectionStart.handle() : d->m_selectionEnd.handle();
+      d->m_findPosStart = !reverse ? d->m_startOffset : d->m_endOffset;
+      d->m_findNodePrevious = d->m_findNodeStart;
     }
     else // whole document
     {
       //kdDebug(6050) << k_funcinfo << "whole doc" << endl;
       if ( !fromCursor )
       {
-        d->m_tqfindNode = firstNode;
-        d->m_tqfindPos = reverse ? -1 : 0;
+        d->m_findNode = firstNode;
+        d->m_findPos = reverse ? -1 : 0;
       }
-      d->m_tqfindNodeEnd = reverse ? firstNode : 0;
-      d->m_tqfindPosEnd = reverse ? 0 : -1;
-      d->m_tqfindNodeStart = !reverse ? firstNode : 0;
-      d->m_tqfindPosStart = !reverse ? 0 : -1;
-      d->m_tqfindNodePrevious = d->m_tqfindNodeStart;
+      d->m_findNodeEnd = reverse ? firstNode : 0;
+      d->m_findPosEnd = reverse ? 0 : -1;
+      d->m_findNodeStart = !reverse ? firstNode : 0;
+      d->m_findPosStart = !reverse ? 0 : -1;
+      d->m_findNodePrevious = d->m_findNodeStart;
       if ( reverse )
       {
-        // Need to tqfind out the really last object, to start from it
-        khtml::RenderObject* obj = d->m_tqfindNode ? d->m_tqfindNode->renderer() : 0;
+        // Need to find out the really last object, to start from it
+        khtml::RenderObject* obj = d->m_findNode ? d->m_findNode->renderer() : 0;
         if ( obj )
         {
-          // tqfind the last object in the render tree
+          // find the last object in the render tree
           while ( obj->lastChild() )
           {
               obj = obj->lastChild();
@@ -2809,7 +2809,7 @@ bool KHTMLPart::initFindNode( bool selection, bool reverse, bool fromCursor )
           {
              obj = obj->objectAbove();
           }
-          d->m_tqfindNode = obj->element();
+          d->m_findNode = obj->element();
         }
       }
     }
@@ -2817,15 +2817,15 @@ bool KHTMLPart::initFindNode( bool selection, bool reverse, bool fromCursor )
 }
 
 // Old method (its API limits the available features - remove in KDE-4)
-bool KHTMLPart::tqfindTextNext( const TQString &str, bool forward, bool caseSensitive, bool isRegExp )
+bool KHTMLPart::findTextNext( const TQString &str, bool forward, bool caseSensitive, bool isRegExp )
 {
-    if ( !initFindNode( false, !forward, d->m_tqfindNode ) )
+    if ( !initFindNode( false, !forward, d->m_findNode ) )
       return false;
     while(1)
     {
-        if( (d->m_tqfindNode->nodeType() == Node::TEXT_NODE || d->m_tqfindNode->nodeType() == Node::CDATA_SECTION_NODE) && d->m_tqfindNode->renderer() )
+        if( (d->m_findNode->nodeType() == Node::TEXT_NODE || d->m_findNode->nodeType() == Node::CDATA_SECTION_NODE) && d->m_findNode->renderer() )
         {
-            DOMString nodeText = d->m_tqfindNode->nodeValue();
+            DOMString nodeText = d->m_findNode->nodeValue();
             DOMStringImpl *t = nodeText.implementation();
             TQConstString s(t->s, t->l);
 
@@ -2833,26 +2833,26 @@ bool KHTMLPart::tqfindTextNext( const TQString &str, bool forward, bool caseSens
             if ( isRegExp ) {
               TQRegExp matcher( str );
               matcher.setCaseSensitive( caseSensitive );
-              d->m_tqfindPos = matcher.search(s.string(), d->m_tqfindPos+1);
-              if ( d->m_tqfindPos != -1 )
+              d->m_findPos = matcher.search(s.string(), d->m_findPos+1);
+              if ( d->m_findPos != -1 )
                 matchLen = matcher.matchedLength();
             }
             else {
-              d->m_tqfindPos = s.string().tqfind(str, d->m_tqfindPos+1, caseSensitive);
+              d->m_findPos = s.string().find(str, d->m_findPos+1, caseSensitive);
               matchLen = str.length();
             }
 
-            if(d->m_tqfindPos != -1)
+            if(d->m_findPos != -1)
             {
                 int x = 0, y = 0;
-                if(static_cast<khtml::RenderText *>(d->m_tqfindNode->renderer())
-                  ->posOfChar(d->m_tqfindPos, x, y))
+                if(static_cast<khtml::RenderText *>(d->m_findNode->renderer())
+                  ->posOfChar(d->m_findPos, x, y))
                     d->m_view->setContentsPos(x-50, y-50);
 
-                d->m_selectionStart = d->m_tqfindNode;
-                d->m_startOffset = d->m_tqfindPos;
-                d->m_selectionEnd = d->m_tqfindNode;
-                d->m_endOffset = d->m_tqfindPos + matchLen;
+                d->m_selectionStart = d->m_findNode;
+                d->m_startOffset = d->m_findPos;
+                d->m_selectionEnd = d->m_findNode;
+                d->m_endOffset = d->m_findPos + matchLen;
                 d->m_startBeforeEnd = true;
 
                 d->m_doc->setSelection( d->m_selectionStart.handle(), d->m_startOffset,
@@ -2861,39 +2861,39 @@ bool KHTMLPart::tqfindTextNext( const TQString &str, bool forward, bool caseSens
                 return true;
             }
         }
-        d->m_tqfindPos = -1;
+        d->m_findPos = -1;
 
         NodeImpl *next;
 
         if ( forward )
         {
-          next = d->m_tqfindNode->firstChild();
+          next = d->m_findNode->firstChild();
 
-          if(!next) next = d->m_tqfindNode->nextSibling();
-          while(d->m_tqfindNode && !next) {
-              d->m_tqfindNode = d->m_tqfindNode->parentNode();
-              if( d->m_tqfindNode ) {
-                  next = d->m_tqfindNode->nextSibling();
+          if(!next) next = d->m_findNode->nextSibling();
+          while(d->m_findNode && !next) {
+              d->m_findNode = d->m_findNode->parentNode();
+              if( d->m_findNode ) {
+                  next = d->m_findNode->nextSibling();
               }
           }
         }
         else
         {
-          next = d->m_tqfindNode->lastChild();
+          next = d->m_findNode->lastChild();
 
-          if (!next ) next = d->m_tqfindNode->previousSibling();
-          while ( d->m_tqfindNode && !next )
+          if (!next ) next = d->m_findNode->previousSibling();
+          while ( d->m_findNode && !next )
           {
-            d->m_tqfindNode = d->m_tqfindNode->parentNode();
-            if( d->m_tqfindNode )
+            d->m_findNode = d->m_findNode->parentNode();
+            if( d->m_findNode )
             {
-              next = d->m_tqfindNode->previousSibling();
+              next = d->m_findNode->previousSibling();
             }
           }
         }
 
-        d->m_tqfindNode = next;
-        if(!d->m_tqfindNode) return false;
+        d->m_findNode = next;
+        if(!d->m_findNode) return false;
     }
 }
 
@@ -2908,7 +2908,7 @@ void KHTMLPart::slotFind()
       kdError(6000) << "slotFind: part is a " << part->className() << ", can't do a search into it" << endl;
       return;
   }
-  static_cast<KHTMLPart *>( part )->tqfindText();
+  static_cast<KHTMLPart *>( part )->findText();
 }
 
 void KHTMLPart::slotFindNext()
@@ -2921,7 +2921,7 @@ void KHTMLPart::slotFindNext()
       kdError(6000) << "slotFindNext: part is a " << part->className() << ", can't do a search into it" << endl;
       return;
   }
-  static_cast<KHTMLPart *>( part )->tqfindTextNext();
+  static_cast<KHTMLPart *>( part )->findTextNext();
 }
 
 void KHTMLPart::slotFindPrev()
@@ -2934,7 +2934,7 @@ void KHTMLPart::slotFindPrev()
       kdError(6000) << "slotFindNext: part is a " << part->className() << ", can't do a search into it" << endl;
       return;
   }
-  static_cast<KHTMLPart *>( part )->tqfindTextNext( true ); // reverse
+  static_cast<KHTMLPart *>( part )->findTextNext( true ); // reverse
 }
 
 void KHTMLPart::slotFindDone()
@@ -2984,22 +2984,22 @@ void KHTMLPart::enableFindAheadActions( bool enable )
 
 void KHTMLPart::slotFindDialogDestroyed()
 {
-  d->m_lastFindState.options = d->m_tqfindDialog->options();
-  d->m_lastFindState.history = d->m_tqfindDialog->tqfindHistory();
-  d->m_tqfindDialog->deleteLater();
-  d->m_tqfindDialog = 0L;
+  d->m_lastFindState.options = d->m_findDialog->options();
+  d->m_lastFindState.history = d->m_findDialog->findHistory();
+  d->m_findDialog->deleteLater();
+  d->m_findDialog = 0L;
 }
 
-void KHTMLPart::tqfindText()
+void KHTMLPart::findText()
 {
   // First do some init to make sure we can search in this frame
   if ( !d->m_doc )
     return;
 
   // Raise if already opened
-  if ( d->m_tqfindDialog )
+  if ( d->m_findDialog )
   {
-    KWin::activateWindow( d->m_tqfindDialog->winId() );
+    KWin::activateWindow( d->m_findDialog->winId() );
     return;
   }
 
@@ -3009,27 +3009,27 @@ void KHTMLPart::tqfindText()
 #endif
 
   // Now show the dialog in which the user can choose options.
-  d->m_tqfindDialog = new KFindDialog( false /*non-modal*/, widget(), "khtmltqfind" );
-  d->m_tqfindDialog->setHasSelection( hasSelection() );
-  d->m_tqfindDialog->setHasCursor( d->m_tqfindNode != 0 );
-  if ( d->m_tqfindNode ) // has a cursor -> default to 'FromCursor'
+  d->m_findDialog = new KFindDialog( false /*non-modal*/, widget(), "khtmlfind" );
+  d->m_findDialog->setHasSelection( hasSelection() );
+  d->m_findDialog->setHasCursor( d->m_findNode != 0 );
+  if ( d->m_findNode ) // has a cursor -> default to 'FromCursor'
     d->m_lastFindState.options |= KFindDialog::FromCursor;
 
   // TODO? optionsDialog.setPattern( d->m_lastFindState.text );
-  d->m_tqfindDialog->setFindHistory( d->m_lastFindState.history );
-  d->m_tqfindDialog->setOptions( d->m_lastFindState.options );
+  d->m_findDialog->setFindHistory( d->m_lastFindState.history );
+  d->m_findDialog->setOptions( d->m_lastFindState.options );
 
-  d->m_lastFindState.options = -1; // force update in tqfindTextNext
+  d->m_lastFindState.options = -1; // force update in findTextNext
   d->m_lastFindState.last_dir = -1;
 
-  d->m_tqfindDialog->show();
-  connect( d->m_tqfindDialog, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotFindNext()) );
-  connect( d->m_tqfindDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(slotFindDialogDestroyed()) );
+  d->m_findDialog->show();
+  connect( d->m_findDialog, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotFindNext()) );
+  connect( d->m_findDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(slotFindDialogDestroyed()) );
 
-  tqfindText( d->m_tqfindDialog->pattern(), 0 /*options*/, widget(), d->m_tqfindDialog );
+  findText( d->m_findDialog->pattern(), 0 /*options*/, widget(), d->m_findDialog );
 }
 
-void KHTMLPart::tqfindText( const TQString &str, long options, TQWidget *parent, KFindDialog *tqfindDialog )
+void KHTMLPart::findText( const TQString &str, long options, TQWidget *parent, KFindDialog *findDialog )
 {
   // First do some init to make sure we can search in this frame
   if ( !d->m_doc )
@@ -3040,15 +3040,15 @@ void KHTMLPart::tqfindText( const TQString &str, long options, TQWidget *parent,
 #endif
 
   // Create the KFind object
-  delete d->m_tqfind;
-  d->m_tqfind = new KFind( str, options, parent, tqfindDialog );
-  d->m_tqfind->closeFindNextDialog(); // we use KFindDialog non-modal, so we don't want other dlg popping up
-  connect( d->m_tqfind, TQT_SIGNAL( highlight( const TQString &, int, int ) ),
+  delete d->m_find;
+  d->m_find = new KFind( str, options, parent, findDialog );
+  d->m_find->closeFindNextDialog(); // we use KFindDialog non-modal, so we don't want other dlg popping up
+  connect( d->m_find, TQT_SIGNAL( highlight( const TQString &, int, int ) ),
            this, TQT_SLOT( slotHighlight( const TQString &, int, int ) ) );
-  //connect(d->m_tqfind, TQT_SIGNAL( tqfindNext() ),
+  //connect(d->m_find, TQT_SIGNAL( findNext() ),
   //        this, TQT_SLOT( slotFindNext() ) );
 
-  if ( !tqfindDialog )
+  if ( !findDialog )
   {
     d->m_lastFindState.options = options;
     initFindNode( options & KFindDialog::SelectedText,
@@ -3057,33 +3057,33 @@ void KHTMLPart::tqfindText( const TQString &str, long options, TQWidget *parent,
   }
 }
 
-bool KHTMLPart::tqfindTextNext()
+bool KHTMLPart::findTextNext()
 {
-  return tqfindTextNext( false );
+  return findTextNext( false );
 }
 
 // New method
-bool KHTMLPart::tqfindTextNext( bool reverse )
+bool KHTMLPart::findTextNext( bool reverse )
 {
-  if (!d->m_tqfind)
+  if (!d->m_find)
   {
-    // We didn't show the tqfind dialog yet, let's do it then (#49442)
-    tqfindText();
+    // We didn't show the find dialog yet, let's do it then (#49442)
+    findText();
     return false;
   }
 
   view()->updateFindAheadTimeout();
   long options = 0;
-  if ( d->m_tqfindDialog ) // 0 when we close the dialog
+  if ( d->m_findDialog ) // 0 when we close the dialog
   {
-    if ( d->m_tqfind->pattern() != d->m_tqfindDialog->pattern() ) {
-      d->m_tqfind->setPattern( d->m_tqfindDialog->pattern() );
-      d->m_tqfind->resetCounts();
+    if ( d->m_find->pattern() != d->m_findDialog->pattern() ) {
+      d->m_find->setPattern( d->m_findDialog->pattern() );
+      d->m_find->resetCounts();
     }
-    options = d->m_tqfindDialog->options();
+    options = d->m_findDialog->options();
     if ( d->m_lastFindState.options != options )
     {
-      d->m_tqfind->setOptions( options );
+      d->m_find->setOptions( options );
 
       if ( options & KFindDialog::SelectedText )
         Q_ASSERT( hasSelection() );
@@ -3102,21 +3102,21 @@ bool KHTMLPart::tqfindTextNext( bool reverse )
     options = d->m_lastFindState.options;
   if( reverse )
     options = options ^ KFindDialog::FindBackwards;
-  if( d->m_tqfind->options() != options )
-    d->m_tqfind->setOptions( options );
+  if( d->m_find->options() != options )
+    d->m_find->setOptions( options );
 
-  // Changing tqfind direction. Start and end nodes must be switched.
-  // Additionally since d->m_tqfindNode points after the last node
+  // Changing find direction. Start and end nodes must be switched.
+  // Additionally since d->m_findNode points after the last node
   // that was searched, it needs to be "after" it in the opposite direction.
   if( d->m_lastFindState.last_dir != -1
       && bool( d->m_lastFindState.last_dir ) != bool( options & KFindDialog::FindBackwards ))
   {
-    tqSwap( d->m_tqfindNodeEnd, d->m_tqfindNodeStart );
-    tqSwap( d->m_tqfindPosEnd, d->m_tqfindPosStart );
-    tqSwap( d->m_tqfindNode, d->m_tqfindNodePrevious );
-    // d->m_tqfindNode now point at the end of the last searched line - advance one node
-    khtml::RenderObject* obj = d->m_tqfindNode ? d->m_tqfindNode->renderer() : 0;
-    khtml::RenderObject* end = d->m_tqfindNodeEnd ? d->m_tqfindNodeEnd->renderer() : 0;
+    qSwap( d->m_findNodeEnd, d->m_findNodeStart );
+    qSwap( d->m_findPosEnd, d->m_findPosStart );
+    qSwap( d->m_findNode, d->m_findNodePrevious );
+    // d->m_findNode now point at the end of the last searched line - advance one node
+    khtml::RenderObject* obj = d->m_findNode ? d->m_findNode->renderer() : 0;
+    khtml::RenderObject* end = d->m_findNodeEnd ? d->m_findNodeEnd->renderer() : 0;
     if ( obj == end )
       obj = 0L;
     else if ( obj )
@@ -3126,20 +3126,20 @@ bool KHTMLPart::tqfindTextNext( bool reverse )
       } while ( obj && ( !obj->element() || obj->isInlineContinuation() ) );
     }
     if ( obj )
-      d->m_tqfindNode = obj->element();
+      d->m_findNode = obj->element();
     else
-      d->m_tqfindNode = 0;
+      d->m_findNode = 0;
   }
   d->m_lastFindState.last_dir = ( options & KFindDialog::FindBackwards ) ? 1 : 0;
 
   KFind::Result res = KFind::NoMatch;
-  khtml::RenderObject* obj = d->m_tqfindNode ? d->m_tqfindNode->renderer() : 0;
-  khtml::RenderObject* end = d->m_tqfindNodeEnd ? d->m_tqfindNodeEnd->renderer() : 0;
+  khtml::RenderObject* obj = d->m_findNode ? d->m_findNode->renderer() : 0;
+  khtml::RenderObject* end = d->m_findNodeEnd ? d->m_findNodeEnd->renderer() : 0;
   khtml::RenderTextArea *tmpTextArea=0L;
   //kdDebug(6050) << k_funcinfo << "obj=" << obj << " end=" << end << endl;
   while( res == KFind::NoMatch )
   {
-    if ( d->m_tqfind->needData() )
+    if ( d->m_find->needData() )
     {
       if ( !obj ) {
         //kdDebug(6050) << k_funcinfo << "obj=0 -> done" << endl;
@@ -3153,7 +3153,7 @@ bool KHTMLPart::tqfindTextNext( bool reverse )
       d->m_stringPortions.clear();
       bool newLine = false;
       TQString str;
-      DOM::NodeImpl* lastNode = d->m_tqfindNode;
+      DOM::NodeImpl* lastNode = d->m_findNode;
       while ( obj && !newLine )
       {
         // Grab text from render object
@@ -3164,7 +3164,7 @@ bool KHTMLPart::tqfindTextNext( bool reverse )
         {
           khtml::RenderTextArea *parent= static_cast<khtml::RenderTextArea *>(obj->parent());
           s = parent->text();
-          s = s.tqreplace(0xa0, ' ');
+          s = s.replace(0xa0, ' ');
           tmpTextArea = parent;
         }
         else if ( renderLineText )
@@ -3172,7 +3172,7 @@ bool KHTMLPart::tqfindTextNext( bool reverse )
           khtml::RenderLineEdit *parentLine= static_cast<khtml::RenderLineEdit *>(obj);
           if (parentLine->widget()->echoMode() == TQLineEdit::Normal)
             s = parentLine->widget()->text();
-          s = s.tqreplace(0xa0, ' ');
+          s = s.replace(0xa0, ' ');
         }
         else if ( obj->isText() )
         {
@@ -3200,7 +3200,7 @@ bool KHTMLPart::tqfindTextNext( bool reverse )
           if ( isLink && obj->parent()!=tmpTextArea )
           {
             s = static_cast<khtml::RenderText *>(obj)->data().string();
-            s = s.tqreplace(0xa0, ' ');
+            s = s.replace(0xa0, ' ');
           }
         }
         else if ( obj->isBR() )
@@ -3208,11 +3208,11 @@ bool KHTMLPart::tqfindTextNext( bool reverse )
         else if ( !obj->isInline() && !str.isEmpty() )
           s = '\n';
 
-        if ( lastNode == d->m_tqfindNodeEnd )
-          s.truncate( d->m_tqfindPosEnd );
+        if ( lastNode == d->m_findNodeEnd )
+          s.truncate( d->m_findPosEnd );
         if ( !s.isEmpty() )
         {
-          newLine = s.tqfind( '\n' ) != -1; // did we just get a newline?
+          newLine = s.find( '\n' ) != -1; // did we just get a newline?
           if( !( options & KFindDialog::FindBackwards ))
           {
             //kdDebug(6050) << "StringPortion: " << index << "-" << index+s.length()-1 << " -> " << lastNode << endl;
@@ -3251,37 +3251,37 @@ bool KHTMLPart::tqfindTextNext( bool reverse )
       //kdDebug()<<" str : "<<str<<endl;
       if ( !str.isEmpty() )
       {
-        d->m_tqfind->setData( str, d->m_tqfindPos );
+        d->m_find->setData( str, d->m_findPos );
       }
 
-      d->m_tqfindPos = -1; // not used during the tqfindnext loops. Only during init.
-      d->m_tqfindNodePrevious = d->m_tqfindNode;
-      d->m_tqfindNode = lastNode;
+      d->m_findPos = -1; // not used during the findnext loops. Only during init.
+      d->m_findNodePrevious = d->m_findNode;
+      d->m_findNode = lastNode;
     }
-    if ( !d->m_tqfind->needData() ) // happens if str was empty
+    if ( !d->m_find->needData() ) // happens if str was empty
     {
       // Let KFind inspect the text fragment, and emit highlighted if a match is found
-      res = d->m_tqfind->tqfind();
+      res = d->m_find->find();
     }
   } // end while
 
   if ( res == KFind::NoMatch ) // i.e. we're done
   {
     kdDebug() << "No more matches." << endl;
-    if ( !(options & FindNoPopups) && d->m_tqfind->shouldRestart() )
+    if ( !(options & FindNoPopups) && d->m_find->shouldRestart() )
     {
       //kdDebug(6050) << "Restarting" << endl;
       initFindNode( false, options & KFindDialog::FindBackwards, false );
-      d->m_tqfind->resetCounts();
-      tqfindTextNext( reverse );
+      d->m_find->resetCounts();
+      findTextNext( reverse );
     }
     else // really done
     {
       //kdDebug(6050) << "Finishing" << endl;
-      //delete d->m_tqfind;
-      //d->m_tqfind = 0L;
+      //delete d->m_find;
+      //d->m_find = 0L;
       initFindNode( false, options & KFindDialog::FindBackwards, false );
-      d->m_tqfind->resetCounts();
+      d->m_find->resetCounts();
       slotClearSelection();
     }
     kdDebug() << "Dialog closed." << endl;
@@ -3422,12 +3422,12 @@ void KHTMLPart::slotHighlight( const TQString& /*text*/, int index, int length )
   }
   emitSelectionChanged();
 
-  // make the tqfinddialog move away from the selected area
-  if ( d->m_tqfindDialog && !highlightedRect.isNull() )
+  // make the finddialog move away from the selected area
+  if ( d->m_findDialog && !highlightedRect.isNull() )
   {
     highlightedRect.moveBy( -d->m_view->contentsX(), -d->m_view->contentsY() );
     //kdDebug(6050) << "avoiding " << highlightedRect << endl;
-    KDialog::avoidArea( d->m_tqfindDialog, highlightedRect );
+    KDialog::avoidArea( d->m_findDialog, highlightedRect );
   }
 }
 
@@ -3731,8 +3731,8 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi
     return;
   }
 
-  if (url.tqfind( TQString::tqfromLatin1( "javascript:" ),0, false ) == 0 ) {
-    TQString jscode = KURL::decode_string( url.mid( url.tqfind( "javascript:", 0, false ) ) );
+  if (url.find( TQString::fromLatin1( "javascript:" ),0, false ) == 0 ) {
+    TQString jscode = KURL::decode_string( url.mid( url.find( "javascript:", 0, false ) ) );
     jscode = KStringHandler::rsqueeze( jscode, 80 ); // truncate if too long
     if (url.startsWith("javascript:window.open"))
       jscode += i18n(" (In new window)");
@@ -3796,7 +3796,7 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi
     else if ( ok && S_ISREG( buff.st_mode ) )
     {
       if (buff.st_size < 1024)
-        text = i18n("%2 (%1 bytes)").arg((long) buff.st_size).arg(text2); // always put the URL last, in case it tqcontains '%'
+        text = i18n("%2 (%1 bytes)").arg((long) buff.st_size).arg(text2); // always put the URL last, in case it contains '%'
       else
       {
         float d = (float) buff.st_size/1024.0;
@@ -3838,29 +3838,29 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi
         extra = i18n(" (In other frame)");
     }
 
-    if (u.protocol() == TQString::tqfromLatin1("mailto")) {
-      TQString mailtoMsg /* = TQString::tqfromLatin1("<img src=%1>").arg(locate("icon", TQString::tqfromLatin1("locolor/16x16/actions/mail_send.png")))*/;
+    if (u.protocol() == TQString::fromLatin1("mailto")) {
+      TQString mailtoMsg /* = TQString::fromLatin1("<img src=%1>").arg(locate("icon", TQString::fromLatin1("locolor/16x16/actions/mail_send.png")))*/;
       mailtoMsg += i18n("Email to: ") + KURL::decode_string(u.path());
       TQStringList queries = TQStringList::split('&', u.query().mid(1));
       TQStringList::Iterator it = queries.begin();
       const TQStringList::Iterator itEnd = queries.end();
       for (; it != itEnd; ++it)
-        if ((*it).startsWith(TQString::tqfromLatin1("subject=")))
+        if ((*it).startsWith(TQString::fromLatin1("subject=")))
           mailtoMsg += i18n(" - Subject: ") + KURL::decode_string((*it).mid(8));
-        else if ((*it).startsWith(TQString::tqfromLatin1("cc=")))
+        else if ((*it).startsWith(TQString::fromLatin1("cc=")))
           mailtoMsg += i18n(" - CC: ") + KURL::decode_string((*it).mid(3));
-        else if ((*it).startsWith(TQString::tqfromLatin1("bcc=")))
+        else if ((*it).startsWith(TQString::fromLatin1("bcc=")))
           mailtoMsg += i18n(" - BCC: ") + KURL::decode_string((*it).mid(4));
       mailtoMsg = TQStyleSheet::escape(mailtoMsg);
-      mailtoMsg.tqreplace(TQRegExp("([\n\r\t]|[ ]{10})"), TQString::null);
+      mailtoMsg.replace(TQRegExp("([\n\r\t]|[ ]{10})"), TQString::null);
       setStatusBarText("<qt>"+mailtoMsg, BarHoverText);
       return;
     }
    // Is this check necessary at all? (Frerich)
 #if 0
-    else if (u.protocol() == TQString::tqfromLatin1("http")) {
+    else if (u.protocol() == TQString::fromLatin1("http")) {
         DOM::Node hrefNode = nodeUnderMouse().parentNode();
-        while (hrefNode.nodeName().string() != TQString::tqfromLatin1("A") && !hrefNode.isNull())
+        while (hrefNode.nodeName().string() != TQString::fromLatin1("A") && !hrefNode.isNull())
           hrefNode = hrefNode.parentNode();
 
         if (!hrefNode.isNull()) {
@@ -3868,12 +3868,12 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi
           if (!hreflangNode.isNull()) {
             TQString countryCode = hreflangNode.nodeValue().string().lower();
             // Map the language code to an appropriate country code.
-            if (countryCode == TQString::tqfromLatin1("en"))
-              countryCode = TQString::tqfromLatin1("gb");
-            TQString flagImg = TQString::tqfromLatin1("<img src=%1>").arg(
-                locate("locale", TQString::tqfromLatin1("l10n/")
+            if (countryCode == TQString::fromLatin1("en"))
+              countryCode = TQString::fromLatin1("gb");
+            TQString flagImg = TQString::fromLatin1("<img src=%1>").arg(
+                locate("locale", TQString::fromLatin1("l10n/")
                 + countryCode
-                + TQString::tqfromLatin1("/flag.png")));
+                + TQString::fromLatin1("/flag.png")));
             emit setStatusBarText(flagImg + u.prettyURL() + extra);
           }
         }
@@ -3906,7 +3906,7 @@ bool KHTMLPart::urlSelectedIntern( const TQString &url, int button, int state, c
   if ( !target.isEmpty() )
       hasTarget = true;
 
-  if ( url.tqfind( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 )
+  if ( url.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 )
   {
     crossFrameExecuteScript( target, KURL::decode_string( url.mid( 11 ) ) );
     return false;
@@ -3965,7 +3965,7 @@ bool KHTMLPart::urlSelectedIntern( const TQString &url, int button, int state, c
     }
   }
 
-  if (!d->m_referrer.isEmpty() && !args.metaData().tqcontains("referrer"))
+  if (!d->m_referrer.isEmpty() && !args.metaData().contains("referrer"))
     args.metaData()["referrer"] = d->m_referrer;
 
 
@@ -4027,7 +4027,7 @@ void KHTMLPart::slotViewDocumentSource()
      }
   }
 
-  (void) KRun::runURL( url, TQString::tqfromLatin1("text/plain"), isTempFile );
+  (void) KRun::runURL( url, TQString::fromLatin1("text/plain"), isTempFile );
 }
 
 void KHTMLPart::slotViewPageInfo()
@@ -4108,7 +4108,7 @@ void KHTMLPart::slotViewFrameSource()
      }
   }
 
-  (void) KRun::runURL( url, TQString::tqfromLatin1("text/plain"), isTempFile );
+  (void) KRun::runURL( url, TQString::fromLatin1("text/plain"), isTempFile );
 }
 
 KURL KHTMLPart::backgroundURL() const
@@ -4276,7 +4276,7 @@ void KHTMLPart::updateActions()
   {
     TQObject *ext = KParts::BrowserExtension::childObject( frame );
     if ( ext )
-      enablePrintFrame = ext->tqmetaObject()->slotNames().tqcontains( "print()" );
+      enablePrintFrame = ext->metaObject()->slotNames().contains( "print()" );
   }
 
   d->m_paPrintFrame->setEnabled( enablePrintFrame );
@@ -4305,7 +4305,7 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const TQString &url, con
                               const TQStringList &params, bool isIFrame )
 {
   //kdDebug( 6050 ) << this << " requestFrame( ..., " << url << ", " << frameName << " )" << endl;
-  FrameIt it = d->m_frames.tqfind( frameName );
+  FrameIt it = d->m_frames.find( frameName );
   if ( it == d->m_frames.end() )
   {
     khtml::ChildFrame * child = new khtml::ChildFrame;
@@ -4319,12 +4319,12 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const TQString &url, con
   (*it)->m_params = params;
 
   // Support for <frame src="javascript:string">
-  if ( url.tqfind( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 )
+  if ( url.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 )
   {
     if ( processObjectRequest(*it, KURL("about:blank"), TQString("text/html") ) ) {
       KHTMLPart* p = static_cast<KHTMLPart*>(static_cast<KParts::ReadOnlyPart *>((*it)->m_part));
 
-      // See if we want to tqreplace content with javascript: output..
+      // See if we want to replace content with javascript: output..
       TQVariant res = p->executeScript( DOM::Node(), KURL::decode_string( url.right( url.length() - 11) ) );
       if ( res.type() == TQVariant::String ) {
         p->begin();
@@ -4341,7 +4341,7 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const TQString &url, con
 
 TQString KHTMLPart::requestFrameName()
 {
-   return TQString::tqfromLatin1("<!--frame %1-->").arg(d->m_frameNameId++);
+   return TQString::fromLatin1("<!--frame %1-->").arg(d->m_frameNameId++);
 }
 
 bool KHTMLPart::requestObject( khtml::RenderPart *frame, const TQString &url, const TQString &serviceType,
@@ -4393,7 +4393,7 @@ bool KHTMLPart::requestObject( khtml::ChildFrame *child, const KURL &url, const
   child->m_args = args;
   child->m_args.reload = (d->m_cachePolicy == KIO::CC_Reload);
   child->m_serviceName = TQString::null;
-  if (!d->m_referrer.isEmpty() && !child->m_args.metaData().tqcontains( "referrer" ))
+  if (!d->m_referrer.isEmpty() && !child->m_args.metaData().contains( "referrer" ))
     child->m_args.metaData()["referrer"] = d->m_referrer;
 
   child->m_args.metaData().insert("PropagateHttpHeader", "true");
@@ -4408,7 +4408,7 @@ bool KHTMLPart::requestObject( khtml::ChildFrame *child, const KURL &url, const
 
   // We want a KHTMLPart if the HTML says <frame src=""> or <frame src="about:blank">
   if ((url.isEmpty() || url.url() == "about:blank") && args.serviceType.isEmpty())
-    args.serviceType = TQString::tqfromLatin1( "text/html" );
+    args.serviceType = TQString::fromLatin1( "text/html" );
 
   if ( args.serviceType.isEmpty() ) {
     kdDebug(6050) << "Running new KHTMLRun for " << this << " and child=" << child << endl;
@@ -4596,10 +4596,10 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
 
   child->m_args.reload = (d->m_cachePolicy == KIO::CC_Reload);
 
-  // make sure the part has a way to tqfind out about the mimetype.
+  // make sure the part has a way to find out about the mimetype.
   // we actually set it in child->m_args in requestObject already,
   // but it's useless if we had to use a KHTMLRun instance, as the
-  // point the run object is to tqfind out exactly the mimetype.
+  // point the run object is to find out exactly the mimetype.
   child->m_args.serviceType = mimetype;
 
   // if not a frame set child as completed
@@ -4643,19 +4643,19 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
   }
 }
 
-KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *tqparentWidget, const char *widgetName,
+KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *parentWidget, const char *widgetName,
                                              TQObject *parent, const char *name, const TQString &mimetype,
                                              TQString &serviceName, TQStringList &serviceTypes,
                                              const TQStringList &params )
 {
   TQString constr;
   if ( !serviceName.isEmpty() )
-    constr.append( TQString::tqfromLatin1( "Name == '%1'" ).arg( serviceName ) );
+    constr.append( TQString::fromLatin1( "Name == '%1'" ).arg( serviceName ) );
 
   KTrader::OfferList offers = KTrader::self()->query( mimetype, "KParts/ReadOnlyPart", constr, TQString::null );
 
   if ( offers.isEmpty() ) {
-    int pos = mimetype.tqfind( "-plugin" );
+    int pos = mimetype.find( "-plugin" );
     if (pos < 0)
         return 0L;
     TQString stripped_mime = mimetype.left( pos );
@@ -4675,13 +4675,13 @@ KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *tqparentWidget, const cha
       KParts::ReadOnlyPart *res = 0L;
 
       const char *className = "KParts::ReadOnlyPart";
-      if ( service->serviceTypes().tqcontains( "Browser/View" ) )
+      if ( service->serviceTypes().contains( "Browser/View" ) )
         className = "Browser/View";
 
       if ( factory->inherits( "KParts::Factory" ) )
-        res = static_cast<KParts::ReadOnlyPart *>(static_cast<KParts::Factory *>( factory )->createPart( tqparentWidget, widgetName, parent, name, className, params ));
+        res = static_cast<KParts::ReadOnlyPart *>(static_cast<KParts::Factory *>( factory )->createPart( parentWidget, widgetName, parent, name, className, params ));
       else
-        res = static_cast<KParts::ReadOnlyPart *>(factory->create( tqparentWidget, widgetName, className ));
+        res = static_cast<KParts::ReadOnlyPart *>(factory->create( parentWidget, widgetName, className ));
 
       if ( res ) {
         serviceTypes = service->serviceTypes();
@@ -4701,7 +4701,7 @@ KParts::PartManager *KHTMLPart::partManager()
 {
   if ( !d->m_manager && d->m_view )
   {
-    d->m_manager = new KParts::PartManager( d->m_view->tqtopLevelWidget(), this, "khtml part manager" );
+    d->m_manager = new KParts::PartManager( d->m_view->topLevelWidget(), this, "khtml part manager" );
     d->m_manager->setAllowNestedParts( true );
     connect( d->m_manager, TQT_SIGNAL( activePartChanged( KParts::Part * ) ),
              this, TQT_SLOT( slotActiveFrameChanged( KParts::Part * ) ) );
@@ -4777,7 +4777,7 @@ void KHTMLPart::submitForm( const char *action, const TQString &url, const TQByt
                                                       "WarnOnUnencryptedForm");
           // Move this setting into KSSL instead
           KConfig *config = kapp->config();
-          TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages");
+          TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
           KConfigGroupSaver saver( config, grpNotifMsgs );
 
           if (!config->readBoolEntry("WarnOnUnencryptedForm", true)) {
@@ -4811,7 +4811,7 @@ void KHTMLPart::submitForm( const char *action, const TQString &url, const TQByt
 
   TQString urlstring = u.url();
 
-  if ( urlstring.tqfind( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 ) {
+  if ( urlstring.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 ) {
     urlstring = KURL::decode_string(urlstring);
     crossFrameExecuteScript( _target, urlstring.right( urlstring.length() - 11) );
     return;
@@ -4873,18 +4873,18 @@ void KHTMLPart::submitForm( const char *action, const TQString &url, const TQByt
       TQString bodyEnc;
       if (contentType.lower() == "multipart/form-data") {
          // FIXME: is this correct?  I suspect not
-         bodyEnc = KURL::encode_string(TQString::tqfromLatin1(formData.data(),
+         bodyEnc = KURL::encode_string(TQString::fromLatin1(formData.data(),
                                                            formData.size()));
       } else if (contentType.lower() == "text/plain") {
          // Convention seems to be to decode, and s/&/\n/
-         TQString tmpbody = TQString::tqfromLatin1(formData.data(),
+         TQString tmpbody = TQString::fromLatin1(formData.data(),
                                                formData.size());
-         tmpbody.tqreplace(TQRegExp("[&]"), "\n");
-         tmpbody.tqreplace(TQRegExp("[+]"), " ");
+         tmpbody.replace(TQRegExp("[&]"), "\n");
+         tmpbody.replace(TQRegExp("[+]"), " ");
          tmpbody = KURL::decode_string(tmpbody);  // Decode the rest of it
          bodyEnc = KURL::encode_string(tmpbody);  // Recode for the URL
       } else {
-         bodyEnc = KURL::encode_string(TQString::tqfromLatin1(formData.data(),
+         bodyEnc = KURL::encode_string(TQString::fromLatin1(formData.data(),
                                                            formData.size()));
       }
 
@@ -4895,7 +4895,7 @@ void KHTMLPart::submitForm( const char *action, const TQString &url, const TQByt
 
   if ( strcmp( action, "get" ) == 0 ) {
     if (u.protocol() != "mailto")
-       u.setQuery( TQString::tqfromLatin1( formData.data(), formData.size() ) );
+       u.setQuery( TQString::fromLatin1( formData.data(), formData.size() ) );
     args.setDoPost( false );
   }
   else {
@@ -4975,7 +4975,7 @@ void KHTMLPart::popupMenu( const TQString &linkUrl )
   KHTMLPopupGUIClient* client = new KHTMLPopupGUIClient( this, d->m_popupMenuXML, linkKURL );
   TQGuardedPtr<TQObject> guard( client );
 
-  TQString mimetype = TQString::tqfromLatin1( "text/html" );
+  TQString mimetype = TQString::fromLatin1( "text/html" );
   args.metaData()["referrer"] = referrer;
 
   if (!linkUrl.isEmpty())				// over a link
@@ -4989,7 +4989,7 @@ void KHTMLPart::popupMenu( const TQString &linkUrl )
       const TQString fname(popupURL.fileName(false));
       if (!fname.isEmpty() && !popupURL.hasRef() && popupURL.query().isEmpty())
       {
-        KMimeType::Ptr pmt = KMimeType::tqfindByPath(fname,0,true);
+        KMimeType::Ptr pmt = KMimeType::findByPath(fname,0,true);
 
         // Further check for mime types guessed from the extension which,
         // on a web page, are more likely to be a script delivering content
@@ -5095,7 +5095,7 @@ void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &arg
 
   // TODO: handle child target correctly! currently the script are always executed fur the parent
   TQString urlStr = url.url();
-  if ( urlStr.tqfind( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 ) {
+  if ( urlStr.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 ) {
       TQString script = KURL::decode_string( urlStr.right( urlStr.length() - 11 ) );
       executeScript( DOM::Node(), script );
       return;
@@ -5103,17 +5103,17 @@ void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &arg
 
   TQString frameName = args.frameName.lower();
   if ( !frameName.isEmpty() ) {
-    if ( frameName == TQString::tqfromLatin1( "_top" ) )
+    if ( frameName == TQString::fromLatin1( "_top" ) )
     {
       emit d->m_extension->openURLRequest( url, args );
       return;
     }
-    else if ( frameName == TQString::tqfromLatin1( "_blank" ) )
+    else if ( frameName == TQString::fromLatin1( "_blank" ) )
     {
       emit d->m_extension->createNewWindow( url, args );
       return;
     }
-    else if ( frameName == TQString::tqfromLatin1( "_parent" ) )
+    else if ( frameName == TQString::fromLatin1( "_parent" ) )
     {
       KParts::URLArgs newArgs( args );
       newArgs.frameName = TQString::null;
@@ -5121,7 +5121,7 @@ void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &arg
       emit d->m_extension->openURLRequest( url, newArgs );
       return;
     }
-    else if ( frameName != TQString::tqfromLatin1( "_self" ) )
+    else if ( frameName != TQString::fromLatin1( "_self" ) )
     {
       khtml::ChildFrame *_frame = recursiveFrameRequest( callingHtmlPart, url, args );
 
@@ -5139,7 +5139,7 @@ void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &arg
       // Inform someone that we are about to show something else.
       child->m_bNotify = true;
       requestObject( child, url, args );
-  }  else if ( frameName== "_self" ) // this is for embedded objects (via <object>) which want to tqreplace the current document
+  }  else if ( frameName== "_self" ) // this is for embedded objects (via <object>) which want to replace the current document
   {
       KParts::URLArgs newArgs( args );
       newArgs.frameName = TQString::null;
@@ -5209,10 +5209,10 @@ bool KHTMLPart::checkFrameAccess(KHTMLPart *callingHtmlPart)
 }
 
 KHTMLPart *
-KHTMLPart::tqfindFrameParent( KParts::ReadOnlyPart *callingPart, const TQString &f, khtml::ChildFrame **childFrame )
+KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const TQString &f, khtml::ChildFrame **childFrame )
 {
 #ifdef DEBUG_FINDFRAME
-  kdDebug(6050) << "KHTMLPart::tqfindFrameParent: this = " << this << " URL = " << m_url << " name = " << name() << " tqfindFrameParent( " << f << " )" << endl;
+  kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " name = " << name() << " findFrameParent( " << f << " )" << endl;
 #endif
   // Check access
   KHTMLPart* const callingHtmlPart = dynamic_cast<KHTMLPart *>(callingPart);
@@ -5224,12 +5224,12 @@ KHTMLPart::tqfindFrameParent( KParts::ReadOnlyPart *callingPart, const TQString
   if (!childFrame && !parentPart() && (TQString::fromLocal8Bit(name()) == f))
      return this;
 
-  FrameIt it = d->m_frames.tqfind( f );
+  FrameIt it = d->m_frames.find( f );
   const FrameIt end = d->m_frames.end();
   if ( it != end )
   {
 #ifdef DEBUG_FINDFRAME
-     kdDebug(6050) << "KHTMLPart::tqfindFrameParent: FOUND!" << endl;
+     kdDebug(6050) << "KHTMLPart::findFrameParent: FOUND!" << endl;
 #endif
      if (childFrame)
         *childFrame = *it;
@@ -5242,7 +5242,7 @@ KHTMLPart::tqfindFrameParent( KParts::ReadOnlyPart *callingPart, const TQString
     KParts::ReadOnlyPart* const p = (*it)->m_part;
     if ( p && p->inherits( "KHTMLPart" ))
     {
-      KHTMLPart* const frameParent = static_cast<KHTMLPart*>(p)->tqfindFrameParent(callingPart, f, childFrame);
+      KHTMLPart* const frameParent = static_cast<KHTMLPart*>(p)->findFrameParent(callingPart, f, childFrame);
       if (frameParent)
          return frameParent;
     }
@@ -5251,10 +5251,10 @@ KHTMLPart::tqfindFrameParent( KParts::ReadOnlyPart *callingPart, const TQString
 }
 
 
-KHTMLPart *KHTMLPart::tqfindFrame( const TQString &f )
+KHTMLPart *KHTMLPart::findFrame( const TQString &f )
 {
   khtml::ChildFrame *childFrame;
-  KHTMLPart *parentFrame = tqfindFrameParent(this, f, &childFrame);
+  KHTMLPart *parentFrame = findFrameParent(this, f, &childFrame);
   if (parentFrame)
   {
      KParts::ReadOnlyPart *p = childFrame->m_part;
@@ -5264,10 +5264,10 @@ KHTMLPart *KHTMLPart::tqfindFrame( const TQString &f )
   return 0;
 }
 
-KParts::ReadOnlyPart *KHTMLPart::tqfindFramePart(const TQString &f)
+KParts::ReadOnlyPart *KHTMLPart::findFramePart(const TQString &f)
 {
   khtml::ChildFrame *childFrame;
-  return tqfindFrameParent(this, f, &childFrame) ? static_cast<KParts::ReadOnlyPart *>(childFrame->m_part) : 0L;
+  return findFrameParent(this, f, &childFrame) ? static_cast<KParts::ReadOnlyPart *>(childFrame->m_part) : 0L;
 }
 
 KParts::ReadOnlyPart *KHTMLPart::currentFrame() const
@@ -5287,12 +5287,12 @@ KParts::ReadOnlyPart *KHTMLPart::currentFrame() const
 
 bool KHTMLPart::frameExists( const TQString &frameName )
 {
-  ConstFrameIt it = d->m_frames.tqfind( frameName );
+  ConstFrameIt it = d->m_frames.find( frameName );
   if ( it == d->m_frames.end() )
     return false;
 
   // WABA: We only return true if the child actually has a frame
-  // set. Otherwise we might tqfind our preloaded-selve.
+  // set. Otherwise we might find our preloaded-selve.
   // This happens when we restore the frameset.
   return (!(*it)->m_frame.isNull());
 }
@@ -5327,7 +5327,7 @@ khtml::ChildFrame *KHTMLPart::recursiveFrameRequest( KHTMLPart *callingHtmlPart,
   kdDebug( 6050 ) << "KHTMLPart::recursiveFrameRequest this = " << this << ", frame = " << args.frameName << ", url = " << url << endl;
 #endif
   khtml::ChildFrame *childFrame;
-  KHTMLPart *childPart = tqfindFrameParent(callingHtmlPart, args.frameName, &childFrame);
+  KHTMLPart *childPart = findFrameParent(callingHtmlPart, args.frameName, &childFrame);
   if (childPart)
   {
      if (childPart == this)
@@ -5360,8 +5360,8 @@ void KHTMLPart::saveState( TQDataStream &stream )
   kdDebug( 6050 ) << indent << "saveState this=" << this << " '" << name() << "' saving URL " << m_url.url() << endl;
 #endif
 
-  stream << m_url << (TQ_INT32)d->m_view->contentsX() << (TQ_INT32)d->m_view->contentsY()
-         << (TQ_INT32) d->m_view->contentsWidth() << (TQ_INT32) d->m_view->contentsHeight() << (TQ_INT32) d->m_view->marginWidth() << (TQ_INT32) d->m_view->marginHeight();
+  stream << m_url << (Q_INT32)d->m_view->contentsX() << (Q_INT32)d->m_view->contentsY()
+         << (Q_INT32) d->m_view->contentsWidth() << (Q_INT32) d->m_view->contentsHeight() << (Q_INT32) d->m_view->marginWidth() << (Q_INT32) d->m_view->marginHeight();
 
   // save link cursor position
   int focusNodeNumber;
@@ -5431,7 +5431,7 @@ void KHTMLPart::saveState( TQDataStream &stream )
   }
 
   // Save frame data
-  stream << (TQ_UINT32) frameNameLst.count();
+  stream << (Q_UINT32) frameNameLst.count();
   stream << frameNameLst << frameServiceTypeLst << frameServiceNameLst << frameURLLst << frameStateBufferLst;
 #ifndef NDEBUG
   s_saveStateIndentLevel = indentLevel;
@@ -5441,8 +5441,8 @@ void KHTMLPart::saveState( TQDataStream &stream )
 void KHTMLPart::restoreState( TQDataStream &stream )
 {
   KURL u;
-  TQ_INT32 xOffset, yOffset, wContents, hContents, mWidth, mHeight;
-  TQ_UINT32 frameCount;
+  Q_INT32 xOffset, yOffset, wContents, hContents, mWidth, mHeight;
+  Q_UINT32 frameCount;
   TQStringList frameNames, frameServiceTypes, docState, frameServiceNames;
   KURL::List frameURLs;
   TQValueList<TQByteArray> frameStateBuffers;
@@ -5649,8 +5649,8 @@ DOM::Node KHTMLPart::nonSharedNodeUnderMouse() const
 void KHTMLPart::emitSelectionChanged()
 {
   emit d->m_extension->enableAction( "copy", hasSelection() );
-  if ( d->m_tqfindDialog )
-       d->m_tqfindDialog->setHasSelection( hasSelection() );
+  if ( d->m_findDialog )
+       d->m_findDialog->setHasSelection( hasSelection() );
 
   emit d->m_extension->selectionInfo( selectedText() );
   emit selectionChanged();
@@ -5696,7 +5696,7 @@ void KHTMLPart::zoomIn(const int stepping[], int count)
   int zoomFactor = d->m_zoomFactor;
 
   if (zoomFactor < maxZoom) {
-    // tqfind the entry nearest to the given zoomsizes
+    // find the entry nearest to the given zoomsizes
     for (int i = 0; i < count; ++i)
       if (stepping[i] > zoomFactor) {
         zoomFactor = stepping[i];
@@ -5710,7 +5710,7 @@ void KHTMLPart::zoomOut(const int stepping[], int count)
 {
     int zoomFactor = d->m_zoomFactor;
     if (zoomFactor > minZoom) {
-      // tqfind the entry nearest to the given zoomsizes
+      // find the entry nearest to the given zoomsizes
       for (int i = count-1; i >= 0; --i)
         if (stepping[i] < zoomFactor) {
           zoomFactor = stepping[i];
@@ -5912,7 +5912,7 @@ TQPtrList<KParts::ReadOnlyPart> KHTMLPart::frames() const
 bool KHTMLPart::openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs )
 {
     kdDebug( 6050 ) << this << "KHTMLPart::openURLInFrame " << url << endl;
-  FrameIt it = d->m_frames.tqfind( urlArgs.frameName );
+  FrameIt it = d->m_frames.find( urlArgs.frameName );
 
   if ( it == d->m_frames.end() )
     return false;
@@ -6192,7 +6192,7 @@ void KHTMLPart::extendSelection( DOM::NodeImpl* node, long offset, DOM::Node& se
   if (obj->isText() && selectLines) {
     int pos;
     khtml::RenderText *renderer = static_cast<khtml::RenderText *>(obj);
-    khtml::InlineTextBox *run = renderer->tqfindInlineTextBox( offset, pos );
+    khtml::InlineTextBox *run = renderer->findInlineTextBox( offset, pos );
     DOMString t = node->nodeValue();
     DOM::NodeImpl* selNode = 0;
     long selOfs = 0;
@@ -6609,7 +6609,7 @@ void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event )
     // get selected text and paste to the clipboard
 #ifndef QT_NO_CLIPBOARD
     TQString text = selectedText();
-    text.tqreplace(TQChar(0xa0), ' ');
+    text.replace(TQChar(0xa0), ' ');
     disconnect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), this, TQT_SLOT( slotClearSelection()));
     kapp->clipboard()->setText(text,QClipboard::Selection);
     connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection()));
@@ -6658,9 +6658,9 @@ void KHTMLPart::slotPrintFrame()
   if ( !ext )
     return;
 
-  TQMetaObject *mo = ext->tqmetaObject();
+  TQMetaObject *mo = ext->metaObject();
 
-  int idx = mo->tqfindSlot( "print()", true );
+  int idx = mo->findSlot( "print()", true );
   if ( idx >= 0 ) {
     QUObject o[ 1 ];
     ext->qt_invoke( idx, o );
@@ -6753,7 +6753,7 @@ void KHTMLPart::selectAll()
   NodeImpl *next;
 
   // Look for first text/cdata node that has a renderer,
-  // or first childless tqreplaced element
+  // or first childless replaced element
   while ( first && !(first->renderer()
   	&& ((first->nodeType() == Node::TEXT_NODE || first->nodeType() == Node::CDATA_SECTION_NODE)
 		|| (first->renderer()->isReplaced() && !first->renderer()->firstChild()))))
@@ -6775,8 +6775,8 @@ void KHTMLPart::selectAll()
   else
     last = d->m_doc;
   // Look for last text/cdata node that has a renderer,
-  // or last childless tqreplaced element
-  // ### Instead of changing this loop, use tqfindLastSelectableNode
+  // or last childless replaced element
+  // ### Instead of changing this loop, use findLastSelectableNode
   // in render_table.cpp (LS)
   while ( last && !(last->renderer()
   	&& ((last->nodeType() == Node::TEXT_NODE || last->nodeType() == Node::CDATA_SECTION_NODE)
@@ -6854,7 +6854,7 @@ void KHTMLPart::slotPartRemoved( KParts::Part *part )
             if (factory()) {
                 factory()->removeClient( part );
             }
-            if (childClients()->tqcontainsRef(part)) {
+            if (childClients()->containsRef(part)) {
                 removeChildClient( part );
             }
         }
@@ -6877,7 +6877,7 @@ void KHTMLPart::slotActiveFrameChanged( KParts::Part *part )
         if (frame->frameStyle() != TQFrame::NoFrame)
         {
            frame->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken);
-           frame->tqrepaint();
+           frame->repaint();
         }
     }
 
@@ -6905,7 +6905,7 @@ void KHTMLPart::slotActiveFrameChanged( KParts::Part *part )
         if (frame->frameStyle() != TQFrame::NoFrame)
         {
            frame->setFrameStyle( TQFrame::StyledPanel | TQFrame::Plain);
-           frame->tqrepaint();
+           frame->repaint();
         }
         kdDebug(6050) << "new active frame " << d->m_activeFrame << endl;
     }
@@ -6999,7 +6999,7 @@ bool KHTMLPart::pluginPageQuestionAsked(const TQString& mimetype) const
   if ( parent )
     return parent->pluginPageQuestionAsked(mimetype);
 
-  return d->m_pluginPageQuestionAsked.tqcontains(mimetype);
+  return d->m_pluginPageQuestionAsked.contains(mimetype);
 }
 
 void KHTMLPart::setPluginPageQuestionAsked(const TQString& mimetype)
@@ -7157,7 +7157,7 @@ void KHTMLPart::openWallet(DOM::HTMLFormElementImpl *form)
   }
 
   if (!d->m_wq) {
-    KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->tqtopLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous);
+    KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->topLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous);
     d->m_wq = new KHTMLWalletQueue(this);
     d->m_wq->wallet = wallet;
     connect(wallet, TQT_SIGNAL(walletOpened(bool)), d->m_wq, TQT_SLOT(walletOpened(bool)));
@@ -7199,7 +7199,7 @@ void KHTMLPart::saveToWallet(const TQString& key, const TQMap<TQString,TQString>
   }
 
   if (!d->m_wq) {
-    KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->tqtopLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous);
+    KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->topLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous);
     d->m_wq = new KHTMLWalletQueue(this);
     d->m_wq->wallet = wallet;
     connect(wallet, TQT_SIGNAL(walletOpened(bool)), d->m_wq, TQT_SLOT(walletOpened(bool)));
@@ -7249,7 +7249,7 @@ void KHTMLPart::walletOpened(KWallet::Wallet *wallet) {
   if (!d->m_statusBarWalletLabel) {
     d->m_statusBarWalletLabel = new KURLLabel(d->m_statusBarExtension->statusBar());
     d->m_statusBarWalletLabel->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small));
-    d->m_statusBarWalletLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+    d->m_statusBarWalletLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
     d->m_statusBarWalletLabel->setUseCursor(false);
     d->m_statusBarExtension->addStatusBarItem(d->m_statusBarWalletLabel, 0, false);
     d->m_statusBarWalletLabel->setPixmap(SmallIcon("wallet_open", instance()));
@@ -7379,14 +7379,14 @@ void KHTMLPart::setSuppressedPopupIndicator( bool enable, KHTMLPart *originPart
 
     if ( enable && originPart ) {
         d->m_openableSuppressedPopups++;
-        if ( d->m_suppressedPopupOriginParts.tqfindIndex( originPart ) == -1 )
+        if ( d->m_suppressedPopupOriginParts.findIndex( originPart ) == -1 )
             d->m_suppressedPopupOriginParts.append( originPart );
     }
 
     if ( enable && !d->m_statusBarPopupLabel ) {
         d->m_statusBarPopupLabel = new KURLLabel( d->m_statusBarExtension->statusBar() );
         d->m_statusBarPopupLabel->setFixedHeight( instance()->iconLoader()->currentSize( KIcon::Small) );
-        d->m_statusBarPopupLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ));
+        d->m_statusBarPopupLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ));
         d->m_statusBarPopupLabel->setUseCursor( false );
         d->m_statusBarExtension->addStatusBarItem( d->m_statusBarPopupLabel, 0, false );
         d->m_statusBarPopupLabel->setPixmap( SmallIcon( "window_suppressed", instance() ) );
diff --git a/khtml/khtml_part.h b/khtml/khtml_part.h
index e3c7b53f6..af8a1695d 100644
--- a/khtml/khtml_part.h
+++ b/khtml/khtml_part.h
@@ -243,10 +243,10 @@ public:
    * rendered in. You can specify two different parent objects for a
    * KHTMLPart, one parent for the KHTMLPart document and on parent
    * for the KHTMLView. If the second @p parent argument is 0L, then
-   * @p tqparentWidget is used as parent for both objects, the part and
+   * @p parentWidget is used as parent for both objects, the part and
    * the view.
    */
-  KHTMLPart( TQWidget *tqparentWidget = 0, const char *widgetname = 0,
+  KHTMLPart( TQWidget *parentWidget = 0, const char *widgetname = 0,
              TQObject *parent = 0, const char *name = 0, GUIProfile prof = DefaultGUI );
 
   KHTMLPart( KHTMLView *view, TQObject *parent = 0, const char *name = 0, GUIProfile prof = DefaultGUI );
@@ -629,7 +629,7 @@ public:
    * default style sheet.
    *
    * This gives a wide range of possibilities to
-   * change the tqlayout of the page.
+   * change the layout of the page.
    *
    * To have an effect this function has to be called after calling begin().
    */
@@ -640,7 +640,7 @@ public:
    * default style sheet.
    *
    * This gives a wide range of possibilities to
-   * change the tqlayout of the page.
+   * change the layout of the page.
    *
    * To have an effect this function has to be called after calling begin().
    */
@@ -697,7 +697,7 @@ public:
   TQCursor urlCursor() const;
 
   /**
-   * Extra Find options that can be used when calling the extended tqfindText().
+   * Extra Find options that can be used when calling the extended findText().
    * @since 3.3
    */
   enum FindOptions
@@ -712,46 +712,46 @@ public:
    * search for.
    * @since 3.3
    */
-  void tqfindText();
+  void findText();
 
   /**
    * Starts a new search, but bypasses the user dialog.
    * @param str The string to search for.
    * @param options Find options.
    * @param parent Parent used for centering popups like "string not found".
-   * @param tqfindDialog Optionally, you can supply your own dialog.
+   * @param findDialog Optionally, you can supply your own dialog.
    * @since 3.3
    */
-  void tqfindText( const TQString &str, long options, TQWidget *parent = 0,
-                 KFindDialog *tqfindDialog = 0 );
+  void findText( const TQString &str, long options, TQWidget *parent = 0,
+                 KFindDialog *findDialog = 0 );
 
   /**
    * Initiates a text search.
    */
-  void tqfindTextBegin();
+  void findTextBegin();
 
   /**
    * Finds the next occurrence of the string or expression.
    * If isRegExp is true then str is converted to a TQRegExp, and caseSensitive is ignored.
-   * @deprecated, use tqfindText( str, options, parent, tqfindDialog )
+   * @deprecated, use findText( str, options, parent, findDialog )
    */
-  bool tqfindTextNext( const TQString &str, bool forward, bool caseSensitive, bool isRegExp );
+  bool findTextNext( const TQString &str, bool forward, bool caseSensitive, bool isRegExp );
 
   /**
-   * Finds the next occurence of a string set by @ref tqfindText()
+   * Finds the next occurence of a string set by @ref findText()
    * @return true if a new match was found.
    * @since 3.3
    */
-  bool tqfindTextNext();
+  bool findTextNext();
 
   /**
-   * Finds the next occurence of a string set by @ref tqfindText()
-   * @param reverse if true, revert seach direction (only if no tqfind dialog is used)
+   * Finds the next occurence of a string set by @ref findText()
+   * @param reverse if true, revert seach direction (only if no find dialog is used)
    * @return true if a new match was found.
    * @since 3.5
    */
   // KDE4 merge with default = false
-  bool tqfindTextNext( bool reverse );
+  bool findTextNext( bool reverse );
 
   /**
    * Sets the Zoom factor. The value is given in percent, larger values mean a
@@ -906,17 +906,17 @@ public:
   /**
    * Finds a frame by name. Returns 0L if frame can't be found.
    */
-  KHTMLPart *tqfindFrame( const TQString &f );
+  KHTMLPart *findFrame( const TQString &f );
 
   /**
-   * Recursively tqfinds the part containing the frame with name @p f
+   * Recursively finds the part containing the frame with name @p f
    * and checks if it is accessible by @p callingPart
    * Returns 0L if no suitable frame can't be found.
    * Returns parent part if a suitable frame was found and
    * frame info in @p *childFrame
    * @since 3.3
    */
-  KHTMLPart *tqfindFrameParent( KParts::ReadOnlyPart *callingPart, const TQString &f, khtml::ChildFrame **childFrame=0 );
+  KHTMLPart *findFrameParent( KParts::ReadOnlyPart *callingPart, const TQString &f, khtml::ChildFrame **childFrame=0 );
 
   /**
    * Return the current frame (the one that has focus)
@@ -927,7 +927,7 @@ public:
 
   /**
    * Returns whether a frame with the specified name is exists or not.
-   * In contrary to the tqfindFrame method this one also returns true
+   * In contrary to the findFrame method this one also returns true
    * if the frame is defined but no displaying component has been
    * found/loaded, yet.
    */
@@ -941,7 +941,7 @@ public:
   /**
    * Finds a frame by name. Returns 0L if frame can't be found.
    */
-  KParts::ReadOnlyPart *tqfindFramePart( const TQString &f );
+  KParts::ReadOnlyPart *findFramePart( const TQString &f );
   /**
    * Called by KJS.
    * Sets the StatusBarText assigned
@@ -952,7 +952,7 @@ public:
   /**
    * Called by KJS.
    * Sets the DefaultStatusBarText assigned
-   * via window.defaulttqStatus
+   * via window.defaultStatus
    */
   void setJSDefaultStatusBarText( const TQString &text );
 
@@ -966,7 +966,7 @@ public:
   /**
    * Called by KJS.
    * Returns the DefaultStatusBarText assigned
-   * via window.defaulttqStatus
+   * via window.defaultStatus
    */
   TQString jsDefaultStatusBarText() const;
 
@@ -1028,7 +1028,7 @@ public:
   KURL toplevelURL();
 
   /**
-   * Checks whether the page tqcontains unsubmitted form changes.
+   * Checks whether the page contains unsubmitted form changes.
    *
    * @return true if form changes exist
    * @since 3.3
@@ -1168,7 +1168,7 @@ protected:
    * to be a object of your derived type, in which case you should return a new instance for
    * the mimetype 'text/html' .
    */
-  virtual KParts::ReadOnlyPart *createPart( TQWidget *tqparentWidget, const char *widgetName,
+  virtual KParts::ReadOnlyPart *createPart( TQWidget *parentWidget, const char *widgetName,
                                             TQObject *parent, const char *name,
                                             const TQString &mimetype, TQString &serviceName,
                                             TQStringList &serviceTypes, const TQStringList &params);
diff --git a/khtml/khtml_printsettings.cpp b/khtml/khtml_printsettings.cpp
index e41d6f2f8..1b3e9c245 100644
--- a/khtml/khtml_printsettings.cpp
+++ b/khtml/khtml_printsettings.cpp
@@ -44,7 +44,7 @@ KHTMLPrintSettings::KHTMLPrintSettings(TQWidget *parent, const char *name)
 		"<p><strong>'Print header'</strong></p>"
 		"<p>"
 		"If this checkbox is enabled, the printout of the HTML document will "
-		"contain a header line at the top of each page. This header tqcontains "
+		"contain a header line at the top of each page. This header contains "
 		"the current date, the location URL of the printed page and the page "
 		"number."
 		"</p>"
diff --git a/khtml/khtml_run.cpp b/khtml/khtml_run.cpp
index c07b44b79..90770d38f 100644
--- a/khtml/khtml_run.cpp
+++ b/khtml/khtml_run.cpp
@@ -30,7 +30,7 @@
 
 KHTMLRun::KHTMLRun( KHTMLPart *part, khtml::ChildFrame *child, const KURL &url,
                     const KParts::URLArgs &args, bool hideErrorDialog )
-    : KParts::BrowserRun( url, args, part, part->widget() ? part->widget()->tqtopLevelWidget() : 0,
+    : KParts::BrowserRun( url, args, part, part->widget() ? part->widget()->topLevelWidget() : 0,
                           false, false, hideErrorDialog ),
   m_child( child )
 {
diff --git a/khtml/khtml_settings.cc b/khtml/khtml_settings.cc
index 5401bc300..8e1c0f934 100644
--- a/khtml/khtml_settings.cc
+++ b/khtml/khtml_settings.cc
@@ -40,7 +40,7 @@ struct KPerDomainSettings {
     bool m_bEnablePlugins : 1;
     // don't forget to maintain the bitfields as the enums grow
     KHTMLSettings::KJSWindowOpenPolicy m_windowOpenPolicy : 2;
-    KHTMLSettings::KJSWindowtqStatusPolicy m_windowtqStatusPolicy : 1;
+    KHTMLSettings::KJSWindowStatusPolicy m_windowStatusPolicy : 1;
     KHTMLSettings::KJSWindowFocusPolicy m_windowFocusPolicy : 1;
     KHTMLSettings::KJSWindowMovePolicy m_windowMovePolicy : 1;
     KHTMLSettings::KJSWindowResizePolicy m_windowResizePolicy : 1;
@@ -52,7 +52,7 @@ struct KPerDomainSettings {
       kdDebug() << "  m_bEnableJavaScript: " << m_bEnableJavaScript << endl;
       kdDebug() << "  m_bEnablePlugins: " << m_bEnablePlugins << endl;
       kdDebug() << "  m_windowOpenPolicy: " << m_windowOpenPolicy << endl;
-      kdDebug() << "  m_windowtqStatusPolicy: " << m_windowtqStatusPolicy << endl;
+      kdDebug() << "  m_windowStatusPolicy: " << m_windowStatusPolicy << endl;
       kdDebug() << "  m_windowFocusPolicy: " << m_windowFocusPolicy << endl;
       kdDebug() << "  m_windowMovePolicy: " << m_windowMovePolicy << endl;
       kdDebug() << "  m_windowResizePolicy: " << m_windowResizePolicy << endl;
@@ -121,7 +121,7 @@ static KPerDomainSettings &setup_per_domain_policy(
     kdWarning() << "setup_per_domain_policy: domain is empty" << endl;
   }
   const TQString ldomain = domain.lower();
-  PolicyMap::iterator it = d->domainPolicy.tqfind(ldomain);
+  PolicyMap::iterator it = d->domainPolicy.find(ldomain);
   if (it == d->domainPolicy.end()) {
     // simply copy global domain settings (they should have been initialized
     // by this time)
@@ -138,9 +138,9 @@ KHTMLSettings::KJavaScriptAdvice KHTMLSettings::strToAdvice(const TQString& _str
   if (!_str)
         ret = KJavaScriptDunno;
 
-  if (_str.lower() == TQString::tqfromLatin1("accept"))
+  if (_str.lower() == TQString::fromLatin1("accept"))
         ret = KJavaScriptAccept;
-  else if (_str.lower() == TQString::tqfromLatin1("reject"))
+  else if (_str.lower() == TQString::fromLatin1("reject"))
         ret = KJavaScriptReject;
 
   return ret;
@@ -161,7 +161,7 @@ void KHTMLSettings::splitDomainAdvice(const TQString& configStr, TQString &domai
                                       KJavaScriptAdvice &javaAdvice, KJavaScriptAdvice& javaScriptAdvice)
 {
     TQString tmp(configStr);
-    int splitIndex = tmp.tqfind(':');
+    int splitIndex = tmp.find(':');
     if ( splitIndex == -1)
     {
         domain = configStr.lower();
@@ -172,7 +172,7 @@ void KHTMLSettings::splitDomainAdvice(const TQString& configStr, TQString &domai
     {
         domain = tmp.left(splitIndex).lower();
         TQString adviceString = tmp.mid( splitIndex+1, tmp.length() );
-        int splitIndex2 = adviceString.tqfind( ':' );
+        int splitIndex2 = adviceString.find( ':' );
         if( splitIndex2 == -1 ) {
             // Java advice only
             javaAdvice = strToAdvice( adviceString );
@@ -189,63 +189,63 @@ void KHTMLSettings::splitDomainAdvice(const TQString& configStr, TQString &domai
 void KHTMLSettings::readDomainSettings(KConfig *config, bool reset,
 	bool global, KPerDomainSettings &pd_settings) {
   TQString jsPrefix = global ? TQString::null
-  				: TQString::tqfromLatin1("javascript.");
+  				: TQString::fromLatin1("javascript.");
   TQString javaPrefix = global ? TQString::null
-  				: TQString::tqfromLatin1("java.");
+  				: TQString::fromLatin1("java.");
   TQString pluginsPrefix = global ? TQString::null
-  				: TQString::tqfromLatin1("plugins.");
+  				: TQString::fromLatin1("plugins.");
 
   // The setting for Java
-  TQString key = javaPrefix + TQString::tqfromLatin1("EnableJava");
+  TQString key = javaPrefix + TQString::fromLatin1("EnableJava");
   if ( (global && reset) || config->hasKey( key ) )
     pd_settings.m_bEnableJava = config->readBoolEntry( key, false );
   else if ( !global )
     pd_settings.m_bEnableJava = d->global.m_bEnableJava;
 
   // The setting for Plugins
-  key = pluginsPrefix + TQString::tqfromLatin1("EnablePlugins");
+  key = pluginsPrefix + TQString::fromLatin1("EnablePlugins");
   if ( (global && reset) || config->hasKey( key ) )
     pd_settings.m_bEnablePlugins = config->readBoolEntry( key, true );
   else if ( !global )
     pd_settings.m_bEnablePlugins = d->global.m_bEnablePlugins;
 
   // The setting for JavaScript
-  key = jsPrefix + TQString::tqfromLatin1("EnableJavaScript");
+  key = jsPrefix + TQString::fromLatin1("EnableJavaScript");
   if ( (global && reset) || config->hasKey( key ) )
     pd_settings.m_bEnableJavaScript = config->readBoolEntry( key, true );
   else if ( !global )
     pd_settings.m_bEnableJavaScript = d->global.m_bEnableJavaScript;
 
   // window property policies
-  key = jsPrefix + TQString::tqfromLatin1("WindowOpenPolicy");
+  key = jsPrefix + TQString::fromLatin1("WindowOpenPolicy");
   if ( (global && reset) || config->hasKey( key ) )
     pd_settings.m_windowOpenPolicy = (KJSWindowOpenPolicy)
     		config->readUnsignedNumEntry( key, KJSWindowOpenSmart );
   else if ( !global )
     pd_settings.m_windowOpenPolicy = d->global.m_windowOpenPolicy;
 
-  key = jsPrefix + TQString::tqfromLatin1("WindowMovePolicy");
+  key = jsPrefix + TQString::fromLatin1("WindowMovePolicy");
   if ( (global && reset) || config->hasKey( key ) )
     pd_settings.m_windowMovePolicy = (KJSWindowMovePolicy)
     		config->readUnsignedNumEntry( key, KJSWindowMoveAllow );
   else if ( !global )
     pd_settings.m_windowMovePolicy = d->global.m_windowMovePolicy;
 
-  key = jsPrefix + TQString::tqfromLatin1("WindowResizePolicy");
+  key = jsPrefix + TQString::fromLatin1("WindowResizePolicy");
   if ( (global && reset) || config->hasKey( key ) )
     pd_settings.m_windowResizePolicy = (KJSWindowResizePolicy)
     		config->readUnsignedNumEntry( key, KJSWindowResizeAllow );
   else if ( !global )
     pd_settings.m_windowResizePolicy = d->global.m_windowResizePolicy;
 
-  key = jsPrefix + TQString::tqfromLatin1("WindowtqStatusPolicy");
+  key = jsPrefix + TQString::fromLatin1("WindowStatusPolicy");
   if ( (global && reset) || config->hasKey( key ) )
-    pd_settings.m_windowtqStatusPolicy = (KJSWindowtqStatusPolicy)
-    		config->readUnsignedNumEntry( key, KJSWindowtqStatusAllow );
+    pd_settings.m_windowStatusPolicy = (KJSWindowStatusPolicy)
+    		config->readUnsignedNumEntry( key, KJSWindowStatusAllow );
   else if ( !global )
-    pd_settings.m_windowtqStatusPolicy = d->global.m_windowtqStatusPolicy;
+    pd_settings.m_windowStatusPolicy = d->global.m_windowStatusPolicy;
 
-  key = jsPrefix + TQString::tqfromLatin1("WindowFocusPolicy");
+  key = jsPrefix + TQString::fromLatin1("WindowFocusPolicy");
   if ( (global && reset) || config->hasKey( key ) )
     pd_settings.m_windowFocusPolicy = (KJSWindowFocusPolicy)
     		config->readUnsignedNumEntry( key, KJSWindowFocusAllow );
@@ -508,7 +508,7 @@ void KHTMLSettings::init( KConfig * config, bool reset )
 	const TQStringList::ConstIterator itEnd = dl.end();
 	for (; it != itEnd; ++it) {
 	  const TQString domain = (*it).lower();
-	  TQMap<TQString,int>::Iterator pos = domainList.tqfind(domain);
+	  TQMap<TQString,int>::Iterator pos = domainList.find(domain);
 	  if (pos == notfound) domainList.insert(domain,0);
 	}/*next it*/
       }
@@ -611,7 +611,7 @@ void KHTMLSettings::init( KConfig * config, bool reset )
         {
           TQCString javaPolicy = adviceToStr( it.data() );
           TQCString javaScriptPolicy = adviceToStr( KJavaScriptDunno );
-          domainConfig.append(TQString::tqfromLatin1("%1:%2:%3").arg(it.key()).arg(javaPolicy).arg(javaScriptPolicy));
+          domainConfig.append(TQString::fromLatin1("%1:%2:%3").arg(it.key()).arg(javaPolicy).arg(javaScriptPolicy));
         }
         config->writeEntry( "JavaDomainSettings", domainConfig );
       }
@@ -624,7 +624,7 @@ void KHTMLSettings::init( KConfig * config, bool reset )
         {
           TQCString javaPolicy = adviceToStr( KJavaScriptDunno );
           TQCString javaScriptPolicy = adviceToStr( it.data() );
-          domainConfig.append(TQString::tqfromLatin1("%1:%2:%3").arg(it.key()).arg(javaPolicy).arg(javaScriptPolicy));
+          domainConfig.append(TQString::fromLatin1("%1:%2:%3").arg(it.key()).arg(javaPolicy).arg(javaScriptPolicy));
         }
         config->writeEntry( "ECMADomainSettings", domainConfig );
       }
@@ -656,7 +656,7 @@ static const KPerDomainSettings &lookup_hostname_policy(
   const PolicyMap::const_iterator notfound = d->domainPolicy.end();
 
   // First check whether there is a perfect match.
-  PolicyMap::const_iterator it = d->domainPolicy.tqfind(hostname);
+  PolicyMap::const_iterator it = d->domainPolicy.find(hostname);
   if( it != notfound ) {
 #ifdef DEBUG_SETTINGS
     kdDebug() << "perfect match" << endl;
@@ -670,9 +670,9 @@ static const KPerDomainSettings &lookup_hostname_policy(
   // there's no dots left.
   TQString host_part = hostname;
   int dot_idx = -1;
-  while( (dot_idx = host_part.tqfind(TQChar('.'))) >= 0 ) {
+  while( (dot_idx = host_part.find(TQChar('.'))) >= 0 ) {
     host_part.remove(0,dot_idx);
-    it = d->domainPolicy.tqfind(host_part);
+    it = d->domainPolicy.find(host_part);
     Q_ASSERT(notfound == d->domainPolicy.end());
     if( it != notfound ) {
 #ifdef DEBUG_SETTINGS
@@ -822,9 +822,9 @@ KHTMLSettings::KJSWindowResizePolicy KHTMLSettings::windowResizePolicy(
   return lookup_hostname_policy(d,hostname.lower()).m_windowResizePolicy;
 }
 
-KHTMLSettings::KJSWindowtqStatusPolicy KHTMLSettings::windowtqStatusPolicy(
+KHTMLSettings::KJSWindowStatusPolicy KHTMLSettings::windowStatusPolicy(
 				const TQString& hostname) const {
-  return lookup_hostname_policy(d,hostname.lower()).m_windowtqStatusPolicy;
+  return lookup_hostname_policy(d,hostname.lower()).m_windowStatusPolicy;
 }
 
 KHTMLSettings::KJSWindowFocusPolicy KHTMLSettings::windowFocusPolicy(
@@ -887,8 +887,8 @@ const TQString &KHTMLSettings::availableFamilies()
         const TQStringList::Iterator fEnd = families.end();
 
         for ( ; f != fEnd; ++f ) {
-                (*f).tqreplace( foundryExp, "");
-                if (!s.tqcontains(*f))
+                (*f).replace( foundryExp, "");
+                if (!s.contains(*f))
                         s << *f;
         }
         s.sort();
diff --git a/khtml/khtml_settings.h b/khtml/khtml_settings.h
index b0e3fab1d..d7ef32eab 100644
--- a/khtml/khtml_settings.h
+++ b/khtml/khtml_settings.h
@@ -65,11 +65,11 @@ public:
     };
 
     /**
-     * This enum specifies the policy for window.status and .defaulttqStatus
+     * This enum specifies the policy for window.status and .defaultStatus
      */
-    enum KJSWindowtqStatusPolicy {
-    	KJSWindowtqStatusAllow=0,
-    	KJSWindowtqStatusIgnore
+    enum KJSWindowStatusPolicy {
+    	KJSWindowStatusAllow=0,
+    	KJSWindowStatusIgnore
     };
 
     /**
@@ -182,7 +182,7 @@ public:
     KJSWindowOpenPolicy windowOpenPolicy( const TQString& hostname = TQString::null ) const;
     KJSWindowMovePolicy windowMovePolicy( const TQString& hostname = TQString::null ) const;
     KJSWindowResizePolicy windowResizePolicy( const TQString& hostname = TQString::null ) const;
-    KJSWindowtqStatusPolicy windowtqStatusPolicy( const TQString& hostname = TQString::null ) const;
+    KJSWindowStatusPolicy windowStatusPolicy( const TQString& hostname = TQString::null ) const;
     KJSWindowFocusPolicy windowFocusPolicy( const TQString& hostname = TQString::null ) const;
 
     // helpers for parsing domain-specific configuration, used in KControl module as well
diff --git a/khtml/khtmlimage.cpp b/khtml/khtmlimage.cpp
index 46833c5f0..03279e968 100644
--- a/khtml/khtmlimage.cpp
+++ b/khtml/khtmlimage.cpp
@@ -48,24 +48,24 @@ KHTMLImageFactory::~KHTMLImageFactory()
     delete s_instance;
 }
 
-KParts::Part *KHTMLImageFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName,
+KParts::Part *KHTMLImageFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
                                                    TQObject *parent, const char *name,
                                                    const char *className, const TQStringList & )
 {
   KHTMLPart::GUIProfile prof = KHTMLPart::DefaultGUI;
   if ( strcmp( className, "Browser/View" ) == 0 )
     prof = KHTMLPart::BrowserViewGUI;
-  return new KHTMLImage( tqparentWidget, widgetName, parent, name, prof );
+  return new KHTMLImage( parentWidget, widgetName, parent, name, prof );
 }
 
-KHTMLImage::KHTMLImage( TQWidget *tqparentWidget, const char *widgetName,
+KHTMLImage::KHTMLImage( TQWidget *parentWidget, const char *widgetName,
                         TQObject *parent, const char *name, KHTMLPart::GUIProfile prof )
     : KParts::ReadOnlyPart( parent, name ), m_image( 0 )
 {
     KHTMLPart* parentPart = ::qt_cast<KHTMLPart *>( parent );
     setInstance( KHTMLImageFactory::instance(), prof == KHTMLPart::BrowserViewGUI && !parentPart );
 
-    TQVBox *box = new TQVBox( tqparentWidget, widgetName );
+    TQVBox *box = new TQVBox( parentWidget, widgetName );
 
     m_khtml = new KHTMLPart( box, widgetName, this, "htmlimagepart", prof );
     m_khtml->setAutoloadImages( true );
@@ -302,7 +302,7 @@ bool KHTMLImage::eventFilter(TQObject *, TQEvent *e) {
       case TQEvent::DragMove:
       case TQEvent::DragLeave:
       case TQEvent::Drop: {
-        // tqfind out if this part is embedded in a frame, and send the
+        // find out if this part is embedded in a frame, and send the
 	// event to its outside widget
 	KHTMLPart *p = ::qt_cast<KHTMLPart *>(parent());
 	if (p)
diff --git a/khtml/khtmlimage.h b/khtml/khtmlimage.h
index 735df4491..dda918177 100644
--- a/khtml/khtmlimage.h
+++ b/khtml/khtmlimage.h
@@ -44,7 +44,7 @@ public:
     KHTMLImageFactory();
     virtual ~KHTMLImageFactory();
 
-    virtual KParts::Part *createPartObject( TQWidget *tqparentWidget, const char *widgetName,
+    virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName,
                                             TQObject *parent, const char *name,
                                             const char *className, const TQStringList &args );
 
@@ -61,7 +61,7 @@ class KHTMLImage : public KParts::ReadOnlyPart, public khtml::CachedObjectClient
 {
     Q_OBJECT
 public:
-    KHTMLImage( TQWidget *tqparentWidget, const char *widgetName,
+    KHTMLImage( TQWidget *parentWidget, const char *widgetName,
                 TQObject *parent, const char *name, KHTMLPart::GUIProfile prof );
     virtual ~KHTMLImage();
 
diff --git a/khtml/khtmlpart_p.h b/khtml/khtmlpart_p.h
index 871ea62d7..0047dde54 100644
--- a/khtml/khtmlpart_p.h
+++ b/khtml/khtmlpart_p.h
@@ -72,7 +72,7 @@ namespace KParts
 
 namespace khtml
 {
-  class KDE_EXPORT ChildFrame : public TQObject
+  class KDE_EXPORT ChildFrame : public QObject
   {
       Q_OBJECT
   public:
@@ -118,7 +118,7 @@ namespace khtml
 
 struct KHTMLFrameList : public TQValueList<khtml::ChildFrame*>
 {
-    Iterator tqfind( const TQString &name ) KDE_NO_EXPORT;
+    Iterator find( const TQString &name ) KDE_NO_EXPORT;
 };
 
 typedef KHTMLFrameList::ConstIterator ConstFrameIt;
@@ -127,7 +127,7 @@ typedef KHTMLFrameList::Iterator FrameIt;
 static int khtml_part_dcop_counter = 0;
 
 
-class KHTMLWalletQueue : public TQObject
+class KHTMLWalletQueue : public QObject
 {
   Q_OBJECT
   public:
@@ -214,8 +214,8 @@ public:
     m_jobPercent = 0;
     m_haveEncoding = false;
     m_activeFrame = 0L;
-    m_tqfind = 0;
-    m_tqfindDialog = 0;
+    m_find = 0;
+    m_findDialog = 0;
     m_ssl_in_use = false;
     m_jsedlg = 0;
     m_formNotification = KHTMLPart::NoNotification;
@@ -516,29 +516,29 @@ public:
   };
   TQValueList<StringPortion> m_stringPortions;
 
-  KFind *m_tqfind;
-  KFindDialog *m_tqfindDialog;
+  KFind *m_find;
+  KFindDialog *m_findDialog;
 
-  struct tqfindState
+  struct findState
   {
-    tqfindState() : options( 0 ), last_dir( -1 ) {}
+    findState() : options( 0 ), last_dir( -1 ) {}
     TQStringList history;
     TQString text;
     int options;
     int last_dir; // -1=unknown,0=forward,1=backward
   };
 
-  tqfindState m_lastFindState;
+  findState m_lastFindState;
 
   KJSErrorDlg *m_jsedlg;
 
-  DOM::NodeImpl *m_tqfindNode; // current node
-  DOM::NodeImpl *m_tqfindNodeEnd; // end node
-  DOM::NodeImpl *m_tqfindNodeStart; // start node
-  DOM::NodeImpl *m_tqfindNodePrevious; // previous node used for tqfind
-  int m_tqfindPos; // current pos in current node
-  int m_tqfindPosEnd; // pos in end node
-  int m_tqfindPosStart; // pos in start node
+  DOM::NodeImpl *m_findNode; // current node
+  DOM::NodeImpl *m_findNodeEnd; // end node
+  DOM::NodeImpl *m_findNodeStart; // start node
+  DOM::NodeImpl *m_findNodePrevious; // previous node used for find
+  int m_findPos; // current pos in current node
+  int m_findPosEnd; // pos in end node
+  int m_findPosStart; // pos in start node
   /////////
 
   //TQGuardedPtr<KParts::Part> m_activeFrame;
diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp
index 90df688d6..850d8e9cd 100644
--- a/khtml/khtmlview.cpp
+++ b/khtml/khtmlview.cpp
@@ -220,7 +220,7 @@ public:
 #ifdef DEBUG_PIXEL
         timer.start();
         pixelbooth = 0;
-        tqrepaintbooth = 0;
+        repaintbooth = 0;
 #endif
         scrollBarMoved = false;
         contentsMoving = false;
@@ -237,16 +237,16 @@ public:
 	scrollingSelf = false;
         delete postponed_autorepeat;
         postponed_autorepeat = NULL;
-	tqlayoutTimerId = 0;
-        tqrepaintTimerId = 0;
+	layoutTimerId = 0;
+        repaintTimerId = 0;
         scrollTimerId = 0;
         scrollSuspended = false;
         scrollSuspendPreActivate = false;
         complete = false;
-        firstRetqlayout = true;
+        firstRelayout = true;
         needsFullRepaint = true;
         dirtyLayout = false;
-        tqlayoutSchedulingEnabled = true;
+        layoutSchedulingEnabled = true;
         painting = false;
         updateRegion = TQRegion();
         m_dialogsAllowed = true;
@@ -324,7 +324,7 @@ public:
 #ifdef DEBUG_PIXEL
     TQTime timer;
     unsigned int pixelbooth;
-    unsigned int tqrepaintbooth;
+    unsigned int repaintbooth;
 #endif
 
     TQPainter *tp;
@@ -356,10 +356,10 @@ public:
 
     int prevMouseX, prevMouseY;
     bool scrollingSelf;
-    int tqlayoutTimerId;
+    int layoutTimerId;
     TQKeyEvent* postponed_autorepeat;
 
-    int tqrepaintTimerId;
+    int repaintTimerId;
     int scrollTimerId;
     int scrollTiming;
     int scrollBy;
@@ -367,8 +367,8 @@ public:
     bool scrollSuspended			:1;
     bool scrollSuspendPreActivate		:1;
     bool complete				:1;
-    bool firstRetqlayout				:1;
-    bool tqlayoutSchedulingEnabled		:1;
+    bool firstRelayout				:1;
+    bool layoutSchedulingEnabled		:1;
     bool needsFullRepaint			:1;
     bool painting				:1;
     bool possibleTripleClick			:1;
@@ -382,9 +382,9 @@ public:
     EditorContext *m_editorContext;
 #endif // KHTML_NO_CARET
 #ifndef KHTML_NO_TYPE_AHEAD_FIND
-    TQString tqfindString;
+    TQString findString;
     TQTimer timer;
-    bool tqfindLinksOnly;
+    bool findLinksOnly;
     bool typeAheadActivated;
 #endif // KHTML_NO_TYPE_AHEAD_FIND
     bool accessKeysEnabled;
@@ -423,7 +423,7 @@ public:
  * @return true if an appropriate area was found -- only in this case r and
  *	s are valid, false otherwise
  */
-static bool tqfindImageMapRect(HTMLImageElementImpl *img, const TQPoint &scrollOfs,
+static bool findImageMapRect(HTMLImageElementImpl *img, const TQPoint &scrollOfs,
 			const TQPoint &p, TQRect &r, TQString &s)
 {
     HTMLMapElementImpl* map;
@@ -466,7 +466,7 @@ void KHTMLToolTip::maybeTip(const TQPoint& p)
             // for images, check if it is part of a client-side image map,
             // and query the <area>s' title attributes, too
             if (e->id() == ID_IMG && !e->getAttribute( ATTR_USEMAP ).isEmpty()) {
-                found = tqfindImageMapRect(static_cast<HTMLImageElementImpl *>(e),
+                found = findImageMapRect(static_cast<HTMLImageElementImpl *>(e),
                     		m_view->viewportToContents(TQPoint(0, 0)), p, r, s);
             }
             if (!found) {
@@ -512,7 +512,7 @@ KHTMLView::KHTMLView( KHTMLPart *part, TQWidget *parent, const char *name)
 #endif
 
 #ifndef KHTML_NO_TYPE_AHEAD_FIND
-    connect(&d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(tqfindTimeout()));
+    connect(&d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(findTimeout()));
 #endif // KHTML_NO_TYPE_AHEAD_FIND
 
     init();
@@ -571,7 +571,7 @@ void KHTMLView::clear()
 
 #ifndef KHTML_NO_TYPE_AHEAD_FIND
     if( d->typeAheadActivated )
-        tqfindTimeout();
+        findTimeout();
 #endif
     if (d->accessKeysEnabled && d->accessKeysActivated)
         accessKeysTimeout();
@@ -608,7 +608,7 @@ void KHTMLView::resizeEvent (TQResizeEvent* e)
     int dh = e->oldSize().height() - e->size().height();
 
     // if we are shrinking the view, don't allow the content to overflow
-    // before the tqlayout occurs - we don't know if we need scrollbars yet
+    // before the layout occurs - we don't know if we need scrollbars yet
     dw = dw>0 ? kMax(0, contentsWidth()-dw) : contentsWidth();
     dh = dh>0 ? kMax(0, contentsHeight()-dh) : contentsHeight();
 
@@ -627,8 +627,8 @@ void KHTMLView::viewportResizeEvent (TQResizeEvent* e)
     //int w = visibleWidth();
     //int h = visibleHeight();
 
-    if (d->tqlayoutSchedulingEnabled)
-        tqlayout();
+    if (d->layoutSchedulingEnabled)
+        layout();
 #ifndef KHTML_NO_CARET
     else {
         hideCaret();
@@ -650,14 +650,14 @@ void KHTMLView::drawContents( TQPainter *p, int ex, int ey, int ew, int eh )
 #ifdef DEBUG_PIXEL
 
     if ( d->timer.elapsed() > 5000 ) {
-        qDebug( "drawed %d pixels in %d tqrepaints the last %d milliseconds",
-                d->pixelbooth, d->tqrepaintbooth,  d->timer.elapsed() );
+        qDebug( "drawed %d pixels in %d repaints the last %d milliseconds",
+                d->pixelbooth, d->repaintbooth,  d->timer.elapsed() );
         d->timer.restart();
         d->pixelbooth = 0;
-        d->tqrepaintbooth = 0;
+        d->repaintbooth = 0;
     }
     d->pixelbooth += ew*eh;
-    d->tqrepaintbooth++;
+    d->repaintbooth++;
 #endif
 
     //kdDebug( 6000 ) << "drawContents this="<< this <<" x=" << ex << ",y=" << ey << ",w=" << ew << ",h=" << eh << endl;
@@ -665,9 +665,9 @@ void KHTMLView::drawContents( TQPainter *p, int ex, int ey, int ew, int eh )
         p->fillRect(ex, ey, ew, eh, palette().active().brush(TQColorGroup::Base));
         return;
     } else if ( d->complete && static_cast<RenderCanvas*>(m_part->xmlDocImpl()->renderer())->needsLayout() ) {
-        // an external update request happens while we have a tqlayout scheduled
-        unscheduleRetqlayout();
-        tqlayout();
+        // an external update request happens while we have a layout scheduled
+        unscheduleRelayout();
+        layout();
     }
 
     if (d->painting) {
@@ -696,13 +696,13 @@ void KHTMLView::drawContents( TQPainter *p, int ex, int ey, int ew, int eh )
                                     (g.right() <= pt.x()) || (g.left() > pt.x()+ew) ))
                 continue;
             RenderLayer* rl = rw->needsMask() ? rw->enclosingStackingContext() : 0;
-            TQRegion tqmask = rl ? rl->getMask() : TQRegion();
-            if (!tqmask.isNull()) {
+            TQRegion mask = rl ? rl->getMask() : TQRegion();
+            if (!mask.isNull()) {
                 TQPoint o(0,0);
                 o = contentsToViewport(o);
-                tqmask.translate(o.x(),o.y());
-                tqmask = tqmask.intersect( TQRect(g.x(),g.y(),g.width(),g.height()) );
-                cr -= tqmask;
+                mask.translate(o.x(),o.y());
+                mask = mask.intersect( TQRect(g.x(),g.y(),g.width(),g.height()) );
+                cr -= mask;
             } else {
                 cr -= g;
             }
@@ -797,7 +797,7 @@ void KHTMLView::setMarginHeight(int h)
     _marginHeight = h;
 }
 
-void KHTMLView::tqlayout()
+void KHTMLView::layout()
 {
     if( m_part && m_part->xmlDocImpl() ) {
         DOM::DocumentImpl *document = m_part->xmlDocImpl();
@@ -805,7 +805,7 @@ void KHTMLView::tqlayout()
         khtml::RenderCanvas* canvas = static_cast<khtml::RenderCanvas *>(document->renderer());
         if ( !canvas ) return;
 
-        d->tqlayoutSchedulingEnabled=false;
+        d->layoutSchedulingEnabled=false;
 
         // the reference object for the overflow property on canvas
         RenderObject * ref = 0;
@@ -847,7 +847,7 @@ void KHTMLView::tqlayout()
                 if (TQScrollView::vScrollBarMode() == AlwaysOff) TQScrollView::setVScrollBarMode(d->vmode);
             }
         }
-        d->needsFullRepaint = d->firstRetqlayout;
+        d->needsFullRepaint = d->firstRelayout;
         if (_height !=  visibleHeight() || _width != visibleWidth()) {;
             d->needsFullRepaint = true;
             _height = visibleHeight();
@@ -855,19 +855,19 @@ void KHTMLView::tqlayout()
         }
         //TQTime qt;
         //qt.start();
-        canvas->tqlayout();
+        canvas->layout();
 
         emit finishedLayout();
-        if (d->firstRetqlayout) {
-            // make sure firstRetqlayout is set to false now in case this tqlayout
+        if (d->firstRelayout) {
+            // make sure firstRelayout is set to false now in case this layout
             // wasn't scheduled
-            d->firstRetqlayout = false;
+            d->firstRelayout = false;
             verticalScrollBar()->setEnabled( true );
             horizontalScrollBar()->setEnabled( true );
         }
 #if 0
     ElementImpl *listitem = m_part->xmlDocImpl()->getElementById("__test_element__");
-    if (listitem) kdDebug(6000) << "after tqlayout, before tqrepaint" << endl;
+    if (listitem) kdDebug(6000) << "after layout, before repaint" << endl;
     if (listitem) dumpLineBoxes(static_cast<RenderFlow *>(listitem->renderer()));
 #endif
 #ifndef KHTML_NO_CARET
@@ -885,14 +885,14 @@ void KHTMLView::tqlayout()
             emit hideAccessKeys();
             displayAccessKeys();
         }
-        //kdDebug( 6000 ) << "TIME: tqlayout() dt=" << qt.elapsed() << endl;
+        //kdDebug( 6000 ) << "TIME: layout() dt=" << qt.elapsed() << endl;
     }
     else
        _width = visibleWidth();
 
-    killTimer(d->tqlayoutTimerId);
-    d->tqlayoutTimerId = 0;
-    d->tqlayoutSchedulingEnabled=true;
+    killTimer(d->layoutTimerId);
+    d->layoutTimerId = 0;
+    d->layoutSchedulingEnabled=true;
 }
 
 void KHTMLView::closeChildDialogs()
@@ -972,7 +972,7 @@ void KHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse )
         if ( !d->m_mouseScrollIndicator ) {
             TQPixmap pixmap, icon;
             pixmap.resize( 48, 48 );
-            pixmap.fill( TQColor( tqRgba( 127, 127, 127, 127 ) ) );
+            pixmap.fill( TQColor( qRgba( 127, 127, 127, 127 ) ) );
 
             TQPainter p( &pixmap );
             icon = KGlobal::iconLoader()->loadIcon( "1uparrow", KIcon::Small );
@@ -1000,24 +1000,24 @@ void KHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse )
             d->m_mouseScrollIndicator->show();
             d->m_mouseScrollIndicator->unsetCursor();
 
-            TQBitmap tqmask = d->m_mouseScrollIndicator->paletteBackgroundPixmap()->createHeuristicMask( true );
+            TQBitmap mask = d->m_mouseScrollIndicator->paletteBackgroundPixmap()->createHeuristicMask( true );
 
 	    if ( hasHorBar && !hasVerBar ) {
                 TQBitmap bm( 16, 16, true );
-                bitBlt( &tqmask, 16,  0, &bm, 0, 0, -1, -1 );
-                bitBlt( &tqmask, 16, 32, &bm, 0, 0, -1, -1 );
+                bitBlt( &mask, 16,  0, &bm, 0, 0, -1, -1 );
+                bitBlt( &mask, 16, 32, &bm, 0, 0, -1, -1 );
                 d->m_mouseScrollIndicator->setCursor( KCursor::SizeHorCursor );
             }
             else if ( !hasHorBar && hasVerBar ) {
                 TQBitmap bm( 16, 16, true );
-                bitBlt( &tqmask,  0, 16, &bm, 0, 0, -1, -1 );
-                bitBlt( &tqmask, 32, 16, &bm, 0, 0, -1, -1 );
+                bitBlt( &mask,  0, 16, &bm, 0, 0, -1, -1 );
+                bitBlt( &mask, 32, 16, &bm, 0, 0, -1, -1 );
                 d->m_mouseScrollIndicator->setCursor( KCursor::SizeVerCursor );
             }
             else
                 d->m_mouseScrollIndicator->setCursor( KCursor::SizeAllCursor );
 
-            d->m_mouseScrollIndicator->setMask( tqmask );
+            d->m_mouseScrollIndicator->setMask( mask );
         }
         else {
             if ( hasHorBar && !hasVerBar )
@@ -1179,7 +1179,7 @@ void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse )
 
     if (d->clickCount > 0 &&
         TQPoint(d->clickX-xm,d->clickY-ym).manhattanLength() > TQApplication::startDragDistance()) {
-	d->clickCount = 0;  // moving the mouse outside the threshold tqinvalidates the click
+	d->clickCount = 0;  // moving the mouse outside the threshold invalidates the click
     }
 
     // execute the scheduled script. This is to make sure the mouseover events come after the mouseout events
@@ -1202,7 +1202,7 @@ void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse )
             c = KCursor::ibeamCursor();
         if ( mev.url.length() && m_part->settings()->changeCursor() ) {
             c = m_part->urlCursor();
-	    if (mev.url.string().startsWith("mailto:") && mev.url.string().tqfind('@')>0)
+	    if (mev.url.string().startsWith("mailto:") && mev.url.string().find('@')>0)
                 mailtoCursor = true;
             else
                 newWindowCursor = targetOpensNewWindow( m_part, mev.target.string() );
@@ -1217,7 +1217,7 @@ void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse )
         break;
     case CURSOR_POINTER:
         c = m_part->urlCursor();
-	if (mev.url.string().startsWith("mailto:") && mev.url.string().tqfind('@')>0)
+	if (mev.url.string().startsWith("mailto:") && mev.url.string().find('@')>0)
             mailtoCursor = true;
         else
             newWindowCursor = targetOpensNewWindow( m_part, mev.target.string() );
@@ -1285,8 +1285,8 @@ void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse )
             attr.save_under = True;
             XChangeWindowAttributes( qt_xdisplay(), d->cursor_icon_widget->winId(), CWSaveUnder, &attr );
             d->cursor_icon_widget->resize( icon_pixmap.width(), icon_pixmap.height());
-            if( icon_pixmap.tqmask() )
-                d->cursor_icon_widget->setMask( *icon_pixmap.tqmask());
+            if( icon_pixmap.mask() )
+                d->cursor_icon_widget->setMask( *icon_pixmap.mask());
             else
                 d->cursor_icon_widget->clearMask();
             d->cursor_icon_widget->setBackgroundPixmap( icon_pixmap );
@@ -1447,18 +1447,18 @@ void KHTMLView::keyPressEvent( TQKeyEvent *_ke )
 #ifndef KHTML_NO_TYPE_AHEAD_FIND
 	if(d->typeAheadActivated)
 	{
-		// type-ahead tqfind aka tqfind-as-you-type
+		// type-ahead find aka find-as-you-type
 		if(_ke->key() == Key_BackSpace)
 		{
-			d->tqfindString = d->tqfindString.left(d->tqfindString.length() - 1);
+			d->findString = d->findString.left(d->findString.length() - 1);
 
-			if(!d->tqfindString.isEmpty())
+			if(!d->findString.isEmpty())
 			{
-				tqfindAhead(false);
+				findAhead(false);
 			}
 			else
 			{
-				tqfindTimeout();
+				findTimeout();
 			}
 
 			d->timer.start(3000, true);
@@ -1467,16 +1467,16 @@ void KHTMLView::keyPressEvent( TQKeyEvent *_ke )
 		}
 		else if(_ke->key() == Key_Escape)
 		{
-			tqfindTimeout();
+			findTimeout();
 
 			_ke->accept();
 			return;
 		}
 		else if(_ke->key() == Key_Space || !_ke->text().stripWhiteSpace().isEmpty())
 		{
-			d->tqfindString += _ke->text();
+			d->findString += _ke->text();
 
-			tqfindAhead(true);
+			findAhead(true);
 
 			d->timer.start(3000, true);
 			_ke->accept();
@@ -1636,11 +1636,11 @@ void KHTMLView::keyPressEvent( TQKeyEvent *_ke )
     _ke->accept();
 }
 
-void KHTMLView::tqfindTimeout()
+void KHTMLView::findTimeout()
 {
 #ifndef KHTML_NO_TYPE_AHEAD_FIND
 	d->typeAheadActivated = false;
-	d->tqfindString = "";
+	d->findString = "";
 	m_part->setStatusBarText(i18n("Find stopped."), KHTMLPart::BarDefaultText);
 	m_part->enableFindAheadActions( true );
 #endif // KHTML_NO_TYPE_AHEAD_FIND
@@ -1651,33 +1651,33 @@ void KHTMLView::startFindAhead( bool linksOnly )
 {
 	if( linksOnly )
 	{
-		d->tqfindLinksOnly = true;
-		m_part->setStatusBarText(i18n("Starting -- tqfind links as you type"),
+		d->findLinksOnly = true;
+		m_part->setStatusBarText(i18n("Starting -- find links as you type"),
 		                         KHTMLPart::BarDefaultText);
 	}
 	else
 	{
-		d->tqfindLinksOnly = false;
-		m_part->setStatusBarText(i18n("Starting -- tqfind text as you type"),
+		d->findLinksOnly = false;
+		m_part->setStatusBarText(i18n("Starting -- find text as you type"),
 		                         KHTMLPart::BarDefaultText);
 	}
 
-	m_part->tqfindTextBegin();
+	m_part->findTextBegin();
 	d->typeAheadActivated = true;
         // disable, so that the shortcut ( / or ' by default ) doesn't interfere
 	m_part->enableFindAheadActions( false );
 	d->timer.start(3000, true);
 }
 
-void KHTMLView::tqfindAhead(bool increase)
+void KHTMLView::findAhead(bool increase)
 {
 	TQString status;
 
-	if(d->tqfindLinksOnly)
+	if(d->findLinksOnly)
 	{
-		m_part->tqfindText(d->tqfindString, KHTMLPart::FindNoPopups |
+		m_part->findText(d->findString, KHTMLPart::FindNoPopups |
 		                 KHTMLPart::FindLinksOnly, this);
-		if(m_part->tqfindTextNext())
+		if(m_part->findTextNext())
 		{
 			status = i18n("Link found: \"%1\".");
 		}
@@ -1689,8 +1689,8 @@ void KHTMLView::tqfindAhead(bool increase)
 	}
 	else
 	{
-		m_part->tqfindText(d->tqfindString, KHTMLPart::FindNoPopups, this);
-		if(m_part->tqfindTextNext())
+		m_part->findText(d->findString, KHTMLPart::FindNoPopups, this);
+		if(m_part->findTextNext())
 		{
 			status = i18n("Text found: \"%1\".");
 		}
@@ -1701,7 +1701,7 @@ void KHTMLView::tqfindAhead(bool increase)
 		}
 	}
 
-	m_part->setStatusBarText(status.arg(d->tqfindString.lower()),
+	m_part->setStatusBarText(status.arg(d->findString.lower()),
 	                         KHTMLPart::BarDefaultText);
 }
 
@@ -1802,7 +1802,7 @@ void KHTMLView::contentsContextMenuEvent ( TQContextMenuEvent * /*ce*/ )
 
 bool KHTMLView::focusNextPrevChild( bool next )
 {
-    // Now try to tqfind the next child
+    // Now try to find the next child
     if (m_part->xmlDocImpl() && focusNextPrevNode(next))
     {
 	if (m_part->xmlDocImpl()->focusNode())
@@ -1903,7 +1903,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e)
 	    if (c->isWidgetType()) {
 		TQWidget *w = static_cast<TQWidget *>(c);
 		// don't install the event filter on toplevels
-		if (w->tqparentWidget(true) == view) {
+		if (w->parentWidget(true) == view) {
 		    if (!strcmp(w->name(), "__khtml")) {
 			w->installEventFilter(this);
 			w->unsetCursor();
@@ -1931,7 +1931,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e)
         TQWidget *c = v;
 	while (v && v != view) {
             c = v;
-	    v = v->tqparentWidget(true);
+	    v = v->parentWidget(true);
 	}
 
 	if (v && !strcmp(c->name(), "__khtml")) {
@@ -1941,23 +1941,23 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e)
 	    case TQEvent::Paint:
 		if (!allowWidgetPaintEvents) {
 		    // eat the event. Like this we can control exactly when the widget
-		    // get's tqrepainted.
+		    // get's repainted.
 		    block = true;
 		    int x = 0, y = 0;
 		    TQWidget *v = w;
 		    while (v && v != view) {
 			x += v->x();
 			y += v->y();
-			v = v->tqparentWidget();
+			v = v->parentWidget();
 		    }
 		    viewportToContents( x, y, x, y );
 		    TQPaintEvent *pe = static_cast<TQPaintEvent *>(e);
 		    bool asap = !d->contentsMoving && ::qt_cast<TQScrollView *>(c);
 
-		    // TQScrollView needs fast tqrepaints
+		    // TQScrollView needs fast repaints
 		    if ( asap && !d->painting && m_part->xmlDocImpl() && m_part->xmlDocImpl()->renderer() &&
 		         !static_cast<khtml::RenderCanvas *>(m_part->xmlDocImpl()->renderer())->needsLayout() ) {
-		        tqrepaintContents(x + pe->rect().x(), y + pe->rect().y(),
+		        repaintContents(x + pe->rect().x(), y + pe->rect().y(),
 	                                        pe->rect().width(), pe->rect().height(), true);
                     } else {
  		        scheduleRepaint(x + pe->rect().x(), y + pe->rect().y(),
@@ -1969,7 +1969,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e)
 	    case TQEvent::MouseButtonPress:
 	    case TQEvent::MouseButtonRelease:
 	    case TQEvent::MouseButtonDblClick: {
-		if ( (w->tqparentWidget() == view || ::qt_cast<TQScrollView*>(c)) && !::qt_cast<TQScrollBar *>(w)) {
+		if ( (w->parentWidget() == view || ::qt_cast<TQScrollView*>(c)) && !::qt_cast<TQScrollBar *>(w)) {
 		    TQMouseEvent *me = static_cast<TQMouseEvent *>(e);
 		    TQPoint pt = w->mapTo( view, me->pos());
 		    TQMouseEvent me2(me->type(), pt, me->button(), me->state());
@@ -1988,7 +1988,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e)
 	    }
 	    case TQEvent::KeyPress:
 	    case TQEvent::KeyRelease:
-		if (w->tqparentWidget() == view && !::qt_cast<TQScrollBar *>(w)) {
+		if (w->parentWidget() == view && !::qt_cast<TQScrollBar *>(w)) {
 		    TQKeyEvent *ke = static_cast<TQKeyEvent *>(e);
 		    if (e->type() == TQEvent::KeyPress)
 			keyPressEvent(ke);
@@ -2272,19 +2272,19 @@ void KHTMLView::displayAccessKeys( KHTMLView* caller, KHTMLView* origview, TQVal
             TQString accesskey;
             if( s.length() == 1 ) {
                 TQChar a = s.string()[ 0 ].upper();
-                if( tqFind( taken.begin(), taken.end(), a ) == taken.end()) // !tqcontains
+                if( qFind( taken.begin(), taken.end(), a ) == taken.end()) // !contains
                     accesskey = a;
             }
-            if( accesskey.isNull() && fallbacks.tqcontains( en )) {
+            if( accesskey.isNull() && fallbacks.contains( en )) {
                 TQChar a = fallbacks[ en ].upper();
-                if( tqFind( taken.begin(), taken.end(), a ) == taken.end()) // !tqcontains
+                if( qFind( taken.begin(), taken.end(), a ) == taken.end()) // !contains
                     accesskey = TQString( "<qt><i>" ) + a + "</i></qt>";
             }
             if( !accesskey.isNull()) {
 	        TQRect rec=en->getRect();
 	        TQLabel *lab=new TQLabel(accesskey,viewport(),0,Qt::WDestructiveClose);
 	        connect( origview, TQT_SIGNAL(hideAccessKeys()), lab, TQT_SLOT(close()) );
-	        connect( this, TQT_SIGNAL(tqrepaintAccessKeys()), lab, TQT_SLOT(tqrepaint()));
+	        connect( this, TQT_SIGNAL(repaintAccessKeys()), lab, TQT_SLOT(repaint()));
 	        lab->setPalette(TQToolTip::palette());
 	        lab->setLineWidth(2);
 	        lab->setFrameStyle(TQFrame::Box | TQFrame::Plain);
@@ -2352,7 +2352,7 @@ bool KHTMLView::focusNodeWithAccessKey( TQChar c, KHTMLView* caller )
     DocumentImpl *doc = m_part->xmlDocImpl();
     if( !doc )
         return false;
-    ElementImpl* node = doc->tqfindAccessKeyElement( c );
+    ElementImpl* node = doc->findAccessKeyElement( c );
     if( !node ) {
         TQPtrList<KParts::ReadOnlyPart> frames = m_part->frames();
         for( TQPtrListIterator<KParts::ReadOnlyPart> it( frames );
@@ -2621,7 +2621,7 @@ TQMap< ElementImpl*, TQChar > KHTMLView::buildFallbackAccessKeys() const
             }
             if( ignore )
                 continue;
-            if( text.isNull() && labels.tqcontains( element ))
+            if( text.isNull() && labels.contains( element ))
                 text = labels[ element ];
             if( text.isNull() && text_before )
                 text = getElementText( element, false );
@@ -2681,7 +2681,7 @@ TQMap< ElementImpl*, TQChar > KHTMLView::buildFallbackAccessKeys() const
                 for( TQValueList< QPair< TQString, TQChar > >::ConstIterator it = priorities.begin();
                      it != priorities.end();
                      ++it )
-                    if( text == (*it).first && keys.tqcontains( (*it).second )) {
+                    if( text == (*it).first && keys.contains( (*it).second )) {
                         key = (*it).second;
                         break;
                     }
@@ -2694,7 +2694,7 @@ TQMap< ElementImpl*, TQChar > KHTMLView::buildFallbackAccessKeys() const
                 for( TQStringList::ConstIterator it = words.begin();
                      it != words.end();
                      ++it ) {
-                    if( keys.tqcontains( (*it)[ 0 ].upper())) {
+                    if( keys.contains( (*it)[ 0 ].upper())) {
                         key = (*it)[ 0 ].upper();
                         break;
                     }
@@ -2704,7 +2704,7 @@ TQMap< ElementImpl*, TQChar > KHTMLView::buildFallbackAccessKeys() const
                 for( unsigned int i = 0;
                      i < text.length();
                      ++i ) {
-                    if( keys.tqcontains( text[ i ].upper())) {
+                    if( keys.contains( text[ i ].upper())) {
                         key = text[ i ].upper();
                         break;
                     }
@@ -2753,7 +2753,7 @@ bool KHTMLView::pagedMode() const
 void KHTMLView::setWidgetVisible(RenderWidget* w, bool vis)
 {
     if (vis) {
-        d->visibleWidgets.tqreplace(w, w->widget());
+        d->visibleWidgets.replace(w, w->widget());
     }
     else
         d->visibleWidgets.remove(w);
@@ -2825,7 +2825,7 @@ void KHTMLView::print(bool quick)
         root->makePageBreakAvoidBlocks();
 
         root->setNeedsLayoutAndMinMaxRecalc();
-        root->tqlayout();
+        root->layout();
         khtml::RenderWidget::flushWidgetResizes(); // make sure widgets have their final size
 
         // check sizes ask for action.. (scale or clip)
@@ -2835,7 +2835,7 @@ void KHTMLView::print(bool quick)
         int headerHeight = 0;
         TQFont headerFont("Sans Serif", 8);
 
-        TQString headerLeft = KGlobal::locale()->formatDate(TQDate::tqcurrentDate(),true);
+        TQString headerLeft = KGlobal::locale()->formatDate(TQDate::currentDate(),true);
         TQString headerMid = docname;
         TQString headerRight;
 
@@ -2877,7 +2877,7 @@ void KHTMLView::print(bool quick)
         root->setHeight(pageHeight);
         root->setPageBottom(pageHeight);
         root->setNeedsLayout(true);
-        root->tqlayoutIfNeeded();
+        root->layoutIfNeeded();
 //         m_part->slotDebugRenderTree();
 
         // Squeeze header to make it it on the page.
@@ -2933,7 +2933,7 @@ void KHTMLView::print(bool quick)
 
             root->layer()->paint(p, TQRect(0, top, pageWidth, pageHeight));
 //             m_part->xmlDocImpl()->renderer()->layer()->paint(p, TQRect(0, top, pageWidth, pageHeight));
-//             root->tqrepaint();
+//             root->repaint();
 //             p->flush();
             kdDebug(6000) << "printed: page " << page <<" bottom At = " << bottom << endl;
 
@@ -2945,7 +2945,7 @@ void KHTMLView::print(bool quick)
         p->end();
         delete p;
 
-        // and now reset the tqlayout to the usual one...
+        // and now reset the layout to the usual one...
         root->setPagedMode(false);
         root->setStaticMode(false);
         d->paged = false;
@@ -3038,7 +3038,7 @@ void KHTMLView::restoreScrollBar()
     int ow = visibleWidth();
     TQScrollView::setVScrollBarMode(d->vmode);
     if (visibleWidth() != ow)
-        tqlayout();
+        layout();
     d->prevScrollbarVisible = verticalScrollBar()->isVisible();
 }
 
@@ -3081,7 +3081,7 @@ void KHTMLView::addFormCompletionItem(const TQString &name, const TQString &valu
     if (cc_number)
       return;
     TQStringList items = formCompletionItems(name);
-    if (!items.tqcontains(value))
+    if (!items.contains(value))
         items.prepend(value);
     while ((int)items.count() > m_part->settings()->maxFormCompletionItems())
         items.remove(items.fromLast());
@@ -3121,7 +3121,7 @@ bool KHTMLView::nonPasswordStorableSite(const TQString& host) const
     TQStringList sites =  d->formCompletions->readListEntry("Sites");
     d->formCompletions->setGroup(TQString::null);//reset
 
-    return (sites.tqfind(host) != sites.end());
+    return (sites.find(host) != sites.end());
 }
 
 // returns true if event should be swallowed
@@ -3274,7 +3274,7 @@ void KHTMLView::viewportWheelEvent(TQWheelEvent* e)
         emit zoomView( - e->delta() );
         e->accept();
     }
-    else if (d->firstRetqlayout)
+    else if (d->firstRelayout)
     {
         e->accept();
     }
@@ -3373,7 +3373,7 @@ void KHTMLView::focusOutEvent( TQFocusEvent *e )
 #ifndef KHTML_NO_TYPE_AHEAD_FIND
     if(d->typeAheadActivated)
     {
-        tqfindTimeout();
+        findTimeout();
     }
     m_part->enableFindAheadActions( false );
 #endif // KHTML_NO_TYPE_AHEAD_FIND
@@ -3413,13 +3413,13 @@ void KHTMLView::focusOutEvent( TQFocusEvent *e )
 
 void KHTMLView::slotScrollBarMoved()
 {
-    if ( !d->firstRetqlayout && !d->complete && m_part->xmlDocImpl() &&
-          d->tqlayoutSchedulingEnabled) {
-        // contents scroll while we are not complete: we need to check our tqlayout *now*
+    if ( !d->firstRelayout && !d->complete && m_part->xmlDocImpl() &&
+          d->layoutSchedulingEnabled) {
+        // contents scroll while we are not complete: we need to check our layout *now*
         khtml::RenderCanvas* root = static_cast<khtml::RenderCanvas *>( m_part->xmlDocImpl()->renderer() );
         if (root && root->needsLayout()) {
-            unscheduleRetqlayout();
-            tqlayout();
+            unscheduleRelayout();
+            layout();
         }
     }
     if (!d->scrollingSelf) {
@@ -3467,11 +3467,11 @@ void KHTMLView::timerEvent ( TQTimerEvent *e )
         }
         return;
     }
-    else if ( e->timerId() == d->tqlayoutTimerId ) {
+    else if ( e->timerId() == d->layoutTimerId ) {
         d->dirtyLayout = true;
-        tqlayout();
-        if (d->firstRetqlayout) {
-            d->firstRetqlayout = false;
+        layout();
+        if (d->firstRelayout) {
+            d->firstRelayout = false;
             verticalScrollBar()->setEnabled( true );
             horizontalScrollBar()->setEnabled( true );
         }
@@ -3497,18 +3497,18 @@ void KHTMLView::timerEvent ( TQTimerEvent *e )
 	khtml::RenderCanvas* root = static_cast<khtml::RenderCanvas *>(document->renderer());
 
 	if ( root && root->needsLayout() ) {
-	    killTimer(d->tqrepaintTimerId);
-	    d->tqrepaintTimerId = 0;
-	    scheduleRetqlayout();
+	    killTimer(d->repaintTimerId);
+	    d->repaintTimerId = 0;
+	    scheduleRelayout();
 	    return;
 	}
     }
 
     setStaticBackground(d->useSlowRepaints);
 
-//        kdDebug() << "scheduled tqrepaint "<< d->tqrepaintTimerId  << endl;
-    killTimer(d->tqrepaintTimerId);
-    d->tqrepaintTimerId = 0;
+//        kdDebug() << "scheduled repaint "<< d->repaintTimerId  << endl;
+    killTimer(d->repaintTimerId);
+    d->repaintTimerId = 0;
 
     TQRect updateRegion;
     TQMemArray<TQRect> rects = d->updateRegion.rects();
@@ -3522,7 +3522,7 @@ void KHTMLView::timerEvent ( TQTimerEvent *e )
         TQRect newRegion = updateRegion.unite(rects[i]);
         if (2*newRegion.height() > 3*updateRegion.height() )
         {
-            tqrepaintContents( updateRegion );
+            repaintContents( updateRegion );
             updateRegion = rects[i];
         }
         else
@@ -3530,12 +3530,12 @@ void KHTMLView::timerEvent ( TQTimerEvent *e )
     }
 
     if ( !updateRegion.isNull() )
-        tqrepaintContents( updateRegion );
+        repaintContents( updateRegion );
 
-    // As widgets can only be accurately positioned during painting, every tqlayout might
-    // dissociate a widget from its RenderWidget. E.g: if a RenderWidget was visible before tqlayout, but the tqlayout
-    // pushed it out of the viewport, it will not be tqrepainted, and consequently it's assocoated widget won't be repositioned!
-    // Thus we need to check each supposedly 'visible' widget at the end of each tqlayout, and remove it in case it's no more in sight.
+    // As widgets can only be accurately positioned during painting, every layout might
+    // dissociate a widget from its RenderWidget. E.g: if a RenderWidget was visible before layout, but the layout
+    // pushed it out of the viewport, it will not be repainted, and consequently it's assocoated widget won't be repositioned!
+    // Thus we need to check each supposedly 'visible' widget at the end of each layout, and remove it in case it's no more in sight.
 
     if (d->dirtyLayout && !d->visibleWidgets.isEmpty()) {
         TQWidget* w;
@@ -3556,7 +3556,7 @@ void KHTMLView::timerEvent ( TQTimerEvent *e )
                 addChild(w, 0, -500000);
     }
 
-    emit tqrepaintAccessKeys();
+    emit repaintAccessKeys();
     if (d->emitCompletedAfterRepaint) {
         bool full = d->emitCompletedAfterRepaint == KHTMLViewPrivate::CSFull;
         d->emitCompletedAfterRepaint = KHTMLViewPrivate::CSNone;
@@ -3567,31 +3567,31 @@ void KHTMLView::timerEvent ( TQTimerEvent *e )
     }
 }
 
-void KHTMLView::scheduleRetqlayout(khtml::RenderObject * /*clippedObj*/)
+void KHTMLView::scheduleRelayout(khtml::RenderObject * /*clippedObj*/)
 {
-    if (!d->tqlayoutSchedulingEnabled || d->tqlayoutTimerId)
+    if (!d->layoutSchedulingEnabled || d->layoutTimerId)
         return;
 
-    d->tqlayoutTimerId = startTimer( m_part->xmlDocImpl() && m_part->xmlDocImpl()->parsing()
+    d->layoutTimerId = startTimer( m_part->xmlDocImpl() && m_part->xmlDocImpl()->parsing()
                              ? 1000 : 0 );
 }
 
-void KHTMLView::unscheduleRetqlayout()
+void KHTMLView::unscheduleRelayout()
 {
-    if (!d->tqlayoutTimerId)
+    if (!d->layoutTimerId)
         return;
 
-    killTimer(d->tqlayoutTimerId);
-    d->tqlayoutTimerId = 0;
+    killTimer(d->layoutTimerId);
+    d->layoutTimerId = 0;
 }
 
 void KHTMLView::unscheduleRepaint()
 {
-    if (!d->tqrepaintTimerId)
+    if (!d->repaintTimerId)
         return;
 
-    killTimer(d->tqrepaintTimerId);
-    d->tqrepaintTimerId = 0;
+    killTimer(d->repaintTimerId);
+    d->repaintTimerId = 0;
 }
 
 void KHTMLView::scheduleRepaint(int x, int y, int w, int h, bool asap)
@@ -3618,8 +3618,8 @@ void KHTMLView::scheduleRepaint(int x, int y, int w, int h, bool asap)
     if (asap && !parsing)
         unscheduleRepaint();
 
-    if ( !d->tqrepaintTimerId )
-        d->tqrepaintTimerId = startTimer( time );
+    if ( !d->repaintTimerId )
+        d->repaintTimerId = startTimer( time );
 
 //     kdDebug() << "starting timer " << time << endl;
 }
@@ -3630,24 +3630,24 @@ void KHTMLView::complete( bool pendingAction )
 
     d->complete = true;
 
-    // is there a retqlayout pending?
-    if (d->tqlayoutTimerId)
+    // is there a relayout pending?
+    if (d->layoutTimerId)
     {
-//         kdDebug() << "requesting retqlayout now" << endl;
+//         kdDebug() << "requesting relayout now" << endl;
         // do it now
-        killTimer(d->tqlayoutTimerId);
-        d->tqlayoutTimerId = startTimer( 0 );
+        killTimer(d->layoutTimerId);
+        d->layoutTimerId = startTimer( 0 );
         d->emitCompletedAfterRepaint = pendingAction ?
             KHTMLViewPrivate::CSActionPending : KHTMLViewPrivate::CSFull;
     }
 
-    // is there a tqrepaint pending?
-    if (d->tqrepaintTimerId)
+    // is there a repaint pending?
+    if (d->repaintTimerId)
     {
-//         kdDebug() << "requesting tqrepaint now" << endl;
+//         kdDebug() << "requesting repaint now" << endl;
         // do it now
-        killTimer(d->tqrepaintTimerId);
-        d->tqrepaintTimerId = startTimer( 20 );
+        killTimer(d->repaintTimerId);
+        d->repaintTimerId = startTimer( 20 );
         d->emitCompletedAfterRepaint = pendingAction ?
             KHTMLViewPrivate::CSActionPending : KHTMLViewPrivate::CSFull;
     }
@@ -3698,7 +3698,7 @@ void KHTMLView::initCaret(bool keepSelection)
     }/*end if*/
 //    kdDebug(6200) << "d->m_selectionStart " << m_part->d->m_selectionStart.handle()
 //    		<< " d->m_selectionEnd " << m_part->d->m_selectionEnd.handle() << endl;
-    // ### does not tqrepaint the selection on keepSelection!=false
+    // ### does not repaint the selection on keepSelection!=false
     moveCaretTo(m_part->d->caretNode().handle(), m_part->d->caretOffset(), !keepSelection);
 //    kdDebug(6200) << "d->m_selectionStart " << m_part->d->m_selectionStart.handle()
 //    		<< " d->m_selectionEnd " << m_part->d->m_selectionEnd.handle() << endl;
@@ -3841,7 +3841,7 @@ void KHTMLView::showCaret(bool forceRepaint)
 	    		d->m_caretViewContext->width,
 			d->m_caretViewContext->height);
             } else {
-	    	tqrepaintContents(d->m_caretViewContext->x, d->m_caretViewContext->y,
+	    	repaintContents(d->m_caretViewContext->x, d->m_caretViewContext->y,
 	    		d->m_caretViewContext->width,
 	    		d->m_caretViewContext->height);
 	    }/*end if*/
@@ -3873,9 +3873,9 @@ void KHTMLView::hideCaret()
         if (d->m_caretViewContext->visible) {
 //            kdDebug(6200) << "redraw caret hidden" << endl;
 	    d->m_caretViewContext->visible = false;
-	    // force tqrepaint, otherwise the event won't be handled
+	    // force repaint, otherwise the event won't be handled
 	    // before the focus leaves the window
-	    tqrepaintContents(d->m_caretViewContext->x, d->m_caretViewContext->y,
+	    repaintContents(d->m_caretViewContext->x, d->m_caretViewContext->y,
 	    		d->m_caretViewContext->width,
 	    		d->m_caretViewContext->height);
 	    d->m_caretViewContext->visible = true;
@@ -4115,16 +4115,16 @@ bool KHTMLView::moveCaretTo(NodeImpl *node, long offset, bool clearSel)
   RenderFlow *base = static_cast<RenderFlow *>(baseElem ? baseElem->renderer() : 0);
   if (!node) return false;
 
-  // need to tqfind out the node's inline box. If there is none, this function
+  // need to find out the node's inline box. If there is none, this function
   // will snap to the next node that has one. This is necessary to make the
   // caret visible in any case.
   CaretBoxLineDeleter cblDeleter;
 //   RenderBlock *cb;
   long r_ofs;
   CaretBoxIterator cbit;
-  CaretBoxLine *cbl = tqfindCaretBoxLine(node, offset, &cblDeleter, base, r_ofs, cbit);
+  CaretBoxLine *cbl = findCaretBoxLine(node, offset, &cblDeleter, base, r_ofs, cbit);
   if(!cbl) {
-      kdWarning() << "KHTMLView::moveCaretTo - tqfindCaretBoxLine() returns NULL" << endl;
+      kdWarning() << "KHTMLView::moveCaretTo - findCaretBoxLine() returns NULL" << endl;
       return false;
   }
 
@@ -4143,7 +4143,7 @@ bool KHTMLView::moveCaretTo(NodeImpl *node, long offset, bool clearSel)
     } else {	// box has no associated element -> do not use
       // this case should actually never happen.
       box = 0;
-      kdError(6200) << "Box tqcontains no node! Crash imminent" << endl;
+      kdError(6200) << "Box contains no node! Crash imminent" << endl;
     }/*end if*/
   }
 
@@ -4226,7 +4226,7 @@ void KHTMLView::placeCaretOnLine(CaretBox *caretBox, int x, int absx, int absy)
   kdDebug(6200) << "xPos: " << caretBox->xPos() << " yPos: " << caretBox->yPos()
   		<< " width: " << caretBox->width() << " height: " << caretBox->height() << endl;
   InlineTextBox *tb = static_cast<InlineTextBox *>(caretBox->inlineBox());
-  if (caretBox->isInlineTextBox()) { kdDebug(6200) << "tqcontains \"" << TQString(static_cast<RenderText *>(tb->object())->str->s + tb->m_start, tb->m_len) << "\"" << endl;}
+  if (caretBox->isInlineTextBox()) { kdDebug(6200) << "contains \"" << TQString(static_cast<RenderText *>(tb->object())->str->s + tb->m_start, tb->m_len) << "\"" << endl;}
 #endif
   // inquire height of caret
   int caretHeight = caretBox->height();
@@ -4264,7 +4264,7 @@ void KHTMLView::placeCaretOnLine(CaretBox *caretBox, int x, int absx, int absy)
       r_ofs = caretBox->minOffset();
   // somewhere within this block
     } else if (x > xPos && x <= xPos + caretBoxWidth) {
-      if (isText) { // tqfind out where exactly
+      if (isText) { // find out where exactly
         r_ofs = static_cast<InlineTextBox *>(caretBox->inlineBox())
       		->offsetForPoint(x, d->m_caretViewContext->x);
 #if DEBUG_CARETMODE > 2
@@ -4426,7 +4426,7 @@ void KHTMLView::placeCaretOnChar(CaretBox *hintBox)
   d->m_caretViewContext->origX = d->m_caretViewContext->x;
   d->scrollBarMoved = false;
 #if DEBUG_CARETMODE > 3
-  //if (caretNode->isTextNode())  kdDebug(6200) << "text[0] = " << (int)*((TextImpl *)caretNode)->data().tqunicode() << " text :\"" << ((TextImpl *)caretNode)->data().string() << "\"" << endl;
+  //if (caretNode->isTextNode())  kdDebug(6200) << "text[0] = " << (int)*((TextImpl *)caretNode)->data().unicode() << " text :\"" << ((TextImpl *)caretNode)->data().string() << "\"" << endl;
 #endif
   ensureNodeHasFocus(m_part->d->caretNode().handle());
   caretOn();
diff --git a/khtml/khtmlview.h b/khtml/khtmlview.h
index 46fe457ff..a79eff17f 100644
--- a/khtml/khtmlview.h
+++ b/khtml/khtmlview.h
@@ -162,7 +162,7 @@ public:
     /**
      * ensure the display is up to date
      */
-    void tqlayout(); // KDE 4.0: make private
+    void layout(); // KDE 4.0: make private
     /**
      * Display all accesskeys in small tooltips
      */
@@ -172,15 +172,15 @@ public:
 
 signals:
     /**
-     * This signal is used for internal tqlayouting. Don't use it to check if rendering finished.
+     * This signal is used for internal layouting. Don't use it to check if rendering finished.
      * Use @ref KHTMLPart completed() signal instead.
      */
     void finishedLayout();
     void cleared();
     void zoomView( int );
     void hideAccessKeys();
-    void tqrepaintAccessKeys();
-    void tqfindAheadActive( bool );
+    void repaintAccessKeys();
+    void findAheadActive( bool );
 //#define NO_SMOOTH_SCROLL_HACK
 #ifndef NO_SMOOTH_SCROLL_HACK
 public slots:
@@ -231,12 +231,12 @@ protected slots:
 #ifndef NO_SMOOTH_SCROLL_HACK
     void scrollTick();
 #else
-    void scrollTick() {}; // tqmoc cannot handle #if
+    void scrollTick() {}; // moc cannot handle #if
 #endif
 
 private slots:
     void tripleClickTimeout();
-    void tqfindTimeout();
+    void findTimeout();
     void accessKeysTimeout();
 
     /**
@@ -248,8 +248,8 @@ private slots:
 
 private:
 
-    void scheduleRetqlayout(khtml::RenderObject* clippedObj=0);
-    void unscheduleRetqlayout();
+    void scheduleRelayout(khtml::RenderObject* clippedObj=0);
+    void unscheduleRelayout();
 
     void scheduleRepaint(int x, int y, int w, int h, bool asap=false);
     void unscheduleRepaint();
@@ -329,7 +329,7 @@ private:
     void complete( bool pendingAction );
 
 #ifndef KHTML_NO_TYPE_AHEAD_FIND
-    void tqfindAhead(bool increase);
+    void findAhead(bool increase);
     void updateFindAheadTimeout();
     void startFindAhead( bool linksOnly );
 #endif // KHTML_NO_TYPE_AHEAD_FIND
@@ -384,8 +384,8 @@ private:
      *
      * These operations are executed unconditionally, regardless of the
      * focus, and the caret display policy.
-     * @param forceRepaint @p true to force an immediate tqrepaint, otherwise
-     *		do a scheduled tqrepaint
+     * @param forceRepaint @p true to force an immediate repaint, otherwise
+     *		do a scheduled repaint
      */
     void showCaret(bool forceRepaint = false);
     /** makes the caret invisible, but does not influence the frequency timer.
diff --git a/khtml/kjserrordlg.ui b/khtml/kjserrordlg.ui
index 1b7bf0c22..3e2eea389 100644
--- a/khtml/kjserrordlg.ui
+++ b/khtml/kjserrordlg.ui
@@ -5,7 +5,7 @@
     <property name="name">
         <cstring>KJSErrorDlg</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -63,7 +63,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>311</width>
                     <height>21</height>
@@ -125,8 +125,8 @@
     <slot>setURL( const QString &amp; url )</slot>
     <slot>clear()</slot>
 </slots>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kactivelabel.h</includehint>
 </includehints>
diff --git a/khtml/kmultipart/Makefile.am b/khtml/kmultipart/Makefile.am
index e16d7f683..b6d6af0df 100644
--- a/khtml/kmultipart/Makefile.am
+++ b/khtml/kmultipart/Makefile.am
@@ -9,7 +9,7 @@ libkmultipart_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/kio/httpfilter/libhttpfi
 libkmultipart_la_DEPENDENCIES = $(LIB_KPARTS)
 libkmultipart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 
-# Automatically generate tqmoc files
+# Automatically generate moc files
 METASOURCES = AUTO
 
 # Install the .desktop file into the kde_services directory
diff --git a/khtml/kmultipart/README b/khtml/kmultipart/README
index 14c871b7b..c8a342d68 100644
--- a/khtml/kmultipart/README
+++ b/khtml/kmultipart/README
@@ -1,5 +1,5 @@
 KMultiPart implements "server push" for KHTML/Konqueror:
-it handles the multipart/mixed and multipart/x-mixed-tqreplace
+it handles the multipart/mixed and multipart/x-mixed-replace
 mimetype, embedding the appropriate component (part).
 
 Documentation at http://www.netscape.com/assist/net_sites/pushpull.html
@@ -12,5 +12,5 @@ Testcases:
 TODO:
 * Use the new streaming API of KParts to pipe data into the part,
 the current code does that for KHTML only.
-* Change KHTML so that it embeds KMultiPart for images which send multipart/x-mixed-tqreplace
+* Change KHTML so that it embeds KMultiPart for images which send multipart/x-mixed-replace
 data.
diff --git a/khtml/kmultipart/kmultipart.cpp b/khtml/kmultipart/kmultipart.cpp
index a9fef06b5..17ea9d485 100644
--- a/khtml/kmultipart/kmultipart.cpp
+++ b/khtml/kmultipart/kmultipart.cpp
@@ -93,7 +93,7 @@ Data for the second and last object.
 */
 
 
-KMultiPart::KMultiPart( TQWidget *tqparentWidget, const char *widgetName,
+KMultiPart::KMultiPart( TQWidget *parentWidget, const char *widgetName,
                         TQObject *parent, const char *name, const TQStringList& )
     : KParts::ReadOnlyPart( parent, name )
 {
@@ -101,7 +101,7 @@ KMultiPart::KMultiPart( TQWidget *tqparentWidget, const char *widgetName,
 
     setInstance( KMultiPartFactory::instance() );
 
-    TQVBox *box = new TQVBox( tqparentWidget, widgetName );
+    TQVBox *box = new TQVBox( parentWidget, widgetName );
     setWidget( box );
 
     m_extension = new KParts::BrowserExtension( this );
@@ -234,7 +234,7 @@ void KMultiPart::slotData( KIO::Job *job, const TQByteArray &data )
                 }
                 else if ( !qstrnicmp( line.data(), "Content-Encoding:", 17 ) )
                 {
-                    TQString encoding = TQString::tqfromLatin1(line.data()+17).stripWhiteSpace().lower();
+                    TQString encoding = TQString::fromLatin1(line.data()+17).stripWhiteSpace().lower();
                     if (encoding == "gzip" || encoding == "x-gzip") {
                         m_gzip = true;
                     } else {
@@ -245,8 +245,8 @@ void KMultiPart::slotData( KIO::Job *job, const TQByteArray &data )
                 else if ( !qstrnicmp( line.data(), "Content-Type:", 13 ) )
                 {
                     Q_ASSERT( m_nextMimeType.isNull() );
-                    m_nextMimeType = TQString::tqfromLatin1( line.data() + 14 ).stripWhiteSpace();
-                    int semicolon = m_nextMimeType.tqfind( ';' );
+                    m_nextMimeType = TQString::fromLatin1( line.data() + 14 ).stripWhiteSpace();
+                    int semicolon = m_nextMimeType.find( ';' );
                     if ( semicolon != -1 )
                         m_nextMimeType = m_nextMimeType.left( semicolon );
                     kdDebug() << "m_nextMimeType=" << m_nextMimeType << endl;
@@ -266,14 +266,14 @@ void KMultiPart::slotData( KIO::Job *job, const TQByteArray &data )
                 else if ( !line.isEmpty() ) // this happens with e.g. Set-Cookie:
                     kdDebug() << "Ignoring header " << line << endl;
             } else {
-                if ( !tqstrncmp( line, m_boundary, m_boundaryLength ) )
+                if ( !qstrncmp( line, m_boundary, m_boundaryLength ) )
                 {
 #ifdef DEBUG_PARSING
                     kdDebug() << "boundary found!" << endl;
                     kdDebug() << "after it is " << line.data() + m_boundaryLength << endl;
 #endif
                     // Was it the very last boundary ?
-                    if ( !tqstrncmp( line.data() + m_boundaryLength, "--", 2 ) )
+                    if ( !qstrncmp( line.data() + m_boundaryLength, "--", 2 ) )
                     {
 #ifdef DEBUG_PARSING
                         kdDebug() << "Completed!" << endl;
@@ -312,7 +312,7 @@ void KMultiPart::setPart( const TQString& mimeType )
         guiFactory->removeClient( this );
     kdDebug() << "KMultiPart::setPart " << mimeType << endl;
     delete m_part;
-    // Try to tqfind an appropriate viewer component
+    // Try to find an appropriate viewer component
     m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>
              ( m_mimeType, TQString::null, widget(), 0L, this, 0L );
     if ( !m_part ) {
diff --git a/khtml/kmultipart/kmultipart.desktop b/khtml/kmultipart/kmultipart.desktop
index 3bec7ad0f..6419edac6 100644
--- a/khtml/kmultipart/kmultipart.desktop
+++ b/khtml/kmultipart/kmultipart.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-MimeType=multipart/mixed;multipart/x-mixed-tqreplace
+MimeType=multipart/mixed;multipart/x-mixed-replace
 Name=Embeddable Component for multipart/mixed
 Name[af]=Inlegbare Komponent vir multideel/gemeng
 Name[be]=Унутраны кампанент дл� multipart/mixed
diff --git a/khtml/kmultipart/kmultipart.h b/khtml/kmultipart/kmultipart.h
index a17269d74..f3bf95219 100644
--- a/khtml/kmultipart/kmultipart.h
+++ b/khtml/kmultipart/kmultipart.h
@@ -40,7 +40,7 @@ class KMultiPart : public KParts::ReadOnlyPart
 {
     Q_OBJECT
 public:
-    KMultiPart( TQWidget *tqparentWidget, const char *widgetName,
+    KMultiPart( TQWidget *parentWidget, const char *widgetName,
                 TQObject *parent, const char *name, const TQStringList& );
     virtual ~KMultiPart();
 
diff --git a/khtml/misc/arena.cpp b/khtml/misc/arena.cpp
index e259a27c9..5efcaf98d 100644
--- a/khtml/misc/arena.cpp
+++ b/khtml/misc/arena.cpp
@@ -30,7 +30,7 @@
  * version of this file only under the terms of one of those two
  * licenses (the MPL or the GPL) and not to allow others to use your
  * version of this file under the LGPL, indicate your decision by
- * deletingthe provisions above and tqreplace them with the notice and
+ * deletingthe provisions above and replace them with the notice and
  * other provisions required by the MPL or the GPL, as the case may be.
  * If you do not delete the provisions above, a recipient may use your
  * version of this file under any of the LGPL, the MPL or the GPL.
@@ -104,7 +104,7 @@ void InitArenaPool(ArenaPool *pool, const char* /*name*/,
      unsigned int size = POOL_SIZE;
      if (align == 0)
          align = ARENA_DEFAULT_ALIGN;
-     pool->tqmask = BITMASK(CeilingLog2(align));
+     pool->mask = BITMASK(CeilingLog2(align));
      pool->first.next = NULL;
      pool->first.base = pool->first.avail = pool->first.limit =
          (uword)ARENA_ALIGN(pool, &pool->first + 1);
@@ -140,10 +140,10 @@ void* ArenaAllocate(ArenaPool *pool, unsigned int nb)
     char *rp;     /* returned pointer */
 
 #ifdef DEBUG_ARENA_MALLOC
-    assert((nb & pool->tqmask) == 0);
+    assert((nb & pool->mask) == 0);
 #endif
 
-    nb = (uword)ARENA_ALIGN(pool, nb); /* force tqalignment */
+    nb = (uword)ARENA_ALIGN(pool, nb); /* force alignment */
 
     /* attempt to allocate from arenas at pool->current */
     {
@@ -197,7 +197,7 @@ void* ArenaAllocate(ArenaPool *pool, unsigned int nb)
         } else
 #endif
            sz = pool->arenasize > nb ? pool->arenasize : nb;
-        sz += sizeof *a + pool->tqmask;  /* header and tqalignment slop */
+        sz += sizeof *a + pool->mask;  /* header and alignment slop */
         pool->cumul += sz;
 #ifdef DEBUG_ARENA_MALLOC
         i++;
diff --git a/khtml/misc/arena.h b/khtml/misc/arena.h
index bbf8b9d42..6415b00bb 100644
--- a/khtml/misc/arena.h
+++ b/khtml/misc/arena.h
@@ -30,7 +30,7 @@
  * version of this file only under the terms of one of those two
  * licenses (the MPL or the GPL) and not to allow others to use your
  * version of this file under the LGPL, indicate your decision by
- * deletingthe provisions above and tqreplace them with the notice and
+ * deletingthe provisions above and replace them with the notice and
  * other provisions required by the MPL or the GPL, as the case may be.
  * If you do not delete the provisions above, a recipient may use your
  * version of this file under any of the LGPL, the MPL or the GPL.
@@ -74,7 +74,7 @@ struct ArenaPool {
     unsigned int arenasize;
     unsigned int largealloc; // threshold for fractional allocation strategy
     unsigned int cumul; // total bytes in pool.
-    uword tqmask; 	// Mask (power-of-2 - 1)
+    uword mask; 	// Mask (power-of-2 - 1)
 };
 
 void InitArenaPool(ArenaPool *pool, const char *name,
diff --git a/khtml/misc/decoder.cpp b/khtml/misc/decoder.cpp
index 9e5808d9e..f227f4014 100644
--- a/khtml/misc/decoder.cpp
+++ b/khtml/misc/decoder.cpp
@@ -166,11 +166,11 @@ static void skipComment(const char *&ptr, const char *pEnd)
 }
 
 // Returns the position of the encoding string.
-static int tqfindXMLEncoding(const TQCString &str, int &encodingLength)
+static int findXMLEncoding(const TQCString &str, int &encodingLength)
 {
     int len = str.length();
 
-    int pos = str.tqfind("encoding");
+    int pos = str.find("encoding");
     if (pos == -1)
         return -1;
     pos += 8;
@@ -287,7 +287,7 @@ TQString Decoder::decode(const char *data, int len)
             buffer.append(data, len);
 #else
             if(m_codec->mibEnum() != 1000) {  // utf16
-                // tqreplace '\0' by spaces, for buggy pages
+                // replace '\0' by spaces, for buggy pages
                 char *d = const_cast<char *>(data);
                 int i = len - 1;
                 while(i >= 0) {
@@ -329,7 +329,7 @@ TQString Decoder::decode(const char *data, int len)
                             break;
                         TQCString str(ptr, end - ptr + 1); //+1 as it must include the \0 terminator
                         int len;
-                        int pos = tqfindXMLEncoding(str, len);
+                        int pos = findXMLEncoding(str, len);
                         if (pos != -1) {
                             setEncoding(str.mid(pos, len), EncodingFromXMLHeader);
                             if (m_type == EncodingFromXMLHeader)
@@ -365,10 +365,10 @@ TQString Decoder::decode(const char *data, int len)
                         TQCString str( ptr, (end-ptr)+1);
                         str = str.lower();
                         int pos = 0;
-                        //if( (pos = str.tqfind("http-equiv", pos)) == -1) break;
-                        //if( (pos = str.tqfind("content-type", pos)) == -1) break;
+                        //if( (pos = str.find("http-equiv", pos)) == -1) break;
+                        //if( (pos = str.find("content-type", pos)) == -1) break;
 			while( pos < ( int ) str.length() ) {
-			    if( (pos = str.tqfind("charset", pos)) == -1) break;
+			    if( (pos = str.find("charset", pos)) == -1) break;
 			    pos += 7;
                             // skip whitespace..
 			    while(  pos < (int)str.length() && str[pos] <= ' ' ) pos++;
diff --git a/khtml/misc/helper.cpp b/khtml/misc/helper.cpp
index 9300acb1e..f56a4ba92 100644
--- a/khtml/misc/helper.cpp
+++ b/khtml/misc/helper.cpp
@@ -66,15 +66,15 @@ double calcHue(double temp1, double temp2, double hueVal)
 // explanation available at http://en.wikipedia.org/wiki/HSL_color_space
 
 // all values are in the range of 0 to 1.0
-QRgb khtml::tqRgbaFromHsla(double h, double s, double l, double a)
+QRgb khtml::qRgbaFromHsla(double h, double s, double l, double a)
 {
     double temp2 = l < 0.5 ? l * (1.0 + s) : l + s - l * s;
     double temp1 = 2.0 * l - temp2;
 
-    return tqRgba(calcHue(temp1, temp2, h + 1.0 / 3.0) * 255, calcHue(temp1, temp2, h) * 255, calcHue(temp1, temp2, h - 1.0 / 3.0) * 255, a * 255);
+    return qRgba(calcHue(temp1, temp2, h + 1.0 / 3.0) * 255, calcHue(temp1, temp2, h) * 255, calcHue(temp1, temp2, h - 1.0 / 3.0) * 255, a * 255);
 }
 
-/** tqfinds out the background color of an element
+/** finds out the background color of an element
  * @param obj render object
  * @return the background color. It is guaranteed that a valid color is returned.
  */
diff --git a/khtml/misc/helper.h b/khtml/misc/helper.h
index abfcf8c88..85442fae8 100644
--- a/khtml/misc/helper.h
+++ b/khtml/misc/helper.h
@@ -40,9 +40,9 @@ namespace khtml
     
     bool hasSufficientContrast(const TQColor &c1, const TQColor &c2);
     TQColor retrieveBackgroundColor(const RenderObject *obj);
-    QRgb tqRgbaFromHsla(double h, double s, double l, double a);
+    QRgb qRgbaFromHsla(double h, double s, double l, double a);
 
-    //enumerator for tqfindSelectionNode
+    //enumerator for findSelectionNode
     enum FindSelectionResult { SelectionPointBefore,
 			       SelectionPointAfter,
 			       SelectionPointInside,
diff --git a/khtml/misc/htmlattrs.c b/khtml/misc/htmlattrs.c
index 86b526e3d..779792e71 100644
--- a/khtml/misc/htmlattrs.c
+++ b/khtml/misc/htmlattrs.c
@@ -1,5 +1,5 @@
 /* ANSI-C code produced by gperf version 3.0.3 */
-/* Command-line: gperf -c -a -L ANSI-C -P -G -D -E -C -o -t -k '*' -NtqfindAttr -Hhash_attr -Wwordlist_attr -Qspool_attr -s 2 htmlattrs.gperf  */
+/* Command-line: gperf -c -a -L ANSI-C -P -G -D -E -C -o -t -k '*' -NfindAttr -Hhash_attr -Wwordlist_attr -Qspool_attr -s 2 htmlattrs.gperf  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
       && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
@@ -188,7 +188,7 @@ struct spool_attr_t
     char spool_attr_str42[sizeof("rules")];
     char spool_attr_str43[sizeof("compact")];
     char spool_attr_str44[sizeof("rev")];
-    char spool_attr_str45[sizeof("tqshape")];
+    char spool_attr_str45[sizeof("shape")];
     char spool_attr_str46[sizeof("charset")];
     char spool_attr_str47[sizeof("charoff")];
     char spool_attr_str48[sizeof("lang")];
@@ -343,7 +343,7 @@ static const struct spool_attr_t spool_attr_contents =
     "rules",
     "compact",
     "rev",
-    "tqshape",
+    "shape",
     "charset",
     "charoff",
     "lang",
@@ -830,7 +830,7 @@ __attribute__ ((__gnu_inline__))
 #endif
 #endif
 const struct attrs *
-tqfindAttr (register const char *str, register unsigned int len)
+findAttr (register const char *str, register unsigned int len)
 {
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
     {
diff --git a/khtml/misc/htmlattrs.in b/khtml/misc/htmlattrs.in
index 25bff2e50..263b2fd7b 100644
--- a/khtml/misc/htmlattrs.in
+++ b/khtml/misc/htmlattrs.in
@@ -80,7 +80,7 @@ scrollamount
 scrolldelay
 scrolling
 selected
-tqshape
+shape
 size
 span
 start
diff --git a/khtml/misc/htmlhashes.cpp b/khtml/misc/htmlhashes.cpp
index 98b126a00..593c1ce96 100644
--- a/khtml/misc/htmlhashes.cpp
+++ b/khtml/misc/htmlhashes.cpp
@@ -27,7 +27,7 @@
 
 int khtml::getTagID(const char *tagStr, int len)
 {
-    const struct tags *tagPtr = tqfindTag(tagStr, len);
+    const struct tags *tagPtr = findTag(tagStr, len);
     if (!tagPtr)
         return 0;
 
@@ -36,7 +36,7 @@ int khtml::getTagID(const char *tagStr, int len)
 
 int khtml::getAttrID(const char *tagStr, int len)
 {
-    const struct attrs *tagPtr = tqfindAttr(tagStr, len);
+    const struct attrs *tagPtr = findAttr(tagStr, len);
     if (!tagPtr)
         return 0;
 
diff --git a/khtml/misc/htmltags.c b/khtml/misc/htmltags.c
index 4ee80430f..1342e62bf 100644
--- a/khtml/misc/htmltags.c
+++ b/khtml/misc/htmltags.c
@@ -1,5 +1,5 @@
 /* ANSI-C code produced by gperf version 3.0.1 */
-/* Command-line: gperf -a -L ANSI-C -P -D -E -C -l -o -t -k '*' -NtqfindTag -Hhash_tag -Wwordlist_tag -Qspool_Tag htmltags.gperf  */
+/* Command-line: gperf -a -L ANSI-C -P -D -E -C -l -o -t -k '*' -NfindTag -Hhash_tag -Wwordlist_tag -Qspool_Tag htmltags.gperf  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
       && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
@@ -338,7 +338,7 @@ static const struct spool_Tag_t spool_Tag_contents =
 __inline
 #endif
 const struct tags *
-tqfindTag (register const char *str, register unsigned int len)
+findTag (register const char *str, register unsigned int len)
 {
   enum
     {
diff --git a/khtml/misc/khtmllayout.h b/khtml/misc/khtmllayout.h
index a67e7019e..e4fb531a1 100644
--- a/khtml/misc/khtmllayout.h
+++ b/khtml/misc/khtmllayout.h
@@ -18,22 +18,22 @@
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 
-    This widget holds some useful definitions needed for tqlayouting Elements
+    This widget holds some useful definitions needed for layouting Elements
 */
 #ifndef HTML_LAYOUT_H
 #define HTML_LAYOUT_H
 
 
 /*
- * this namespace tqcontains definitions for various types needed for
- * tqlayouting.
+ * this namespace contains definitions for various types needed for
+ * layouting.
  */
 namespace khtml
 {
 
     const int UNDEFINED = -1;
 
-    // tqalignment
+    // alignment
     enum VAlign { VNone=0, Bottom, VCenter, Top, Baseline };
     enum HAlign { HDefault, Left, HCenter, Right, HNone = 0 };
 
@@ -103,7 +103,7 @@ namespace khtml
                 unsigned type : 3;
                 bool quirk : 1;
             } l;
-            TQ_UINT32 _length;
+            Q_UINT32 _length;
         };
     };
 
diff --git a/khtml/misc/knsplugininstaller.cpp b/khtml/misc/knsplugininstaller.cpp
index 5cf5c7d01..1a9bf62bb 100644
--- a/khtml/misc/knsplugininstaller.cpp
+++ b/khtml/misc/knsplugininstaller.cpp
@@ -95,7 +95,7 @@ bool KNSPluginInstallEngine::pluginAvailable()
     if(!loadXmlConfig())
         return false;
     
-    return tqfindPlugin();
+    return findPlugin();
 }
 
 bool KNSPluginInstallEngine::isActive() 
@@ -152,7 +152,7 @@ bool KNSPluginInstallEngine::loadXmlConfig()
     return true;
 }
 
-bool KNSPluginInstallEngine::tqfindPlugin()
+bool KNSPluginInstallEngine::findPlugin()
 {
 
     // get system infos
@@ -428,12 +428,12 @@ void KNSPluginWizard::initLicencePage()
 void KNSPluginWizard::initInstallationProgressPage() {
 
     m_installationProgressWidget = new TQWidget(this);
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(m_installationProgressWidget);
-    tqlayout->addWidget(new TQLabel(i18n("Installation in progress."), m_installationProgressWidget));
-    tqlayout->addItem(new TQSpacerItem(40,20,TQSizePolicy::Expanding,TQSizePolicy::Expanding ));
+    TQVBoxLayout *layout = new TQVBoxLayout(m_installationProgressWidget);
+    layout->addWidget(new TQLabel(i18n("Installation in progress."), m_installationProgressWidget));
+    layout->addItem(new TQSpacerItem(40,20,TQSizePolicy::Expanding,TQSizePolicy::Expanding ));
     m_installationProgressBar = new KProgress(m_installationProgressWidget);
     m_installationProgressBar->setTotalSteps(100);
-    tqlayout->addWidget(m_installationProgressBar);
+    layout->addWidget(m_installationProgressBar);
     
     addPage( m_installationProgressWidget, i18n("Plugin installation"));
     
@@ -442,11 +442,11 @@ void KNSPluginWizard::initInstallationProgressPage() {
 void KNSPluginWizard::initFinishPage()
 {
     m_finishWidget = new TQWidget(this);
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(m_finishWidget);
-    tqlayout->addItem(new TQSpacerItem(40,20,TQSizePolicy::Expanding,TQSizePolicy::Expanding ));
+    TQVBoxLayout *layout = new TQVBoxLayout(m_finishWidget);
+    layout->addItem(new TQSpacerItem(40,20,TQSizePolicy::Expanding,TQSizePolicy::Expanding ));
     m_finishLabel = new TQLabel(m_finishWidget);
-    tqlayout->addWidget(m_finishLabel);
-    tqlayout->addItem(new TQSpacerItem(40,20,TQSizePolicy::Expanding,TQSizePolicy::Expanding ));
+    layout->addWidget(m_finishLabel);
+    layout->addItem(new TQSpacerItem(40,20,TQSizePolicy::Expanding,TQSizePolicy::Expanding ));
     
     addPage(m_finishWidget, i18n("Installation status"));
     
diff --git a/khtml/misc/knsplugininstaller.h b/khtml/misc/knsplugininstaller.h
index 92dad0207..0d9535ba9 100644
--- a/khtml/misc/knsplugininstaller.h
+++ b/khtml/misc/knsplugininstaller.h
@@ -43,7 +43,7 @@
 class TQStringList;
 
 /*
- * This class tqcontains all the infos needed to install a given plugin
+ * This class contains all the infos needed to install a given plugin
  * Takes and parse a TQDomNode in its constructor
  */
 class KNSPluginInfo 
@@ -87,7 +87,7 @@ private:
  * This class contain all the the methods used to perform a plugin installation
  *
  */
-class KNSPluginInstallEngine : public TQObject
+class KNSPluginInstallEngine : public QObject
 {
     Q_OBJECT
 public:
@@ -129,7 +129,7 @@ private:
     /*
      * parse the xml configuration file
      */
-    bool tqfindPlugin();
+    bool findPlugin();
     
 
     TQMap<TQString, TQString> m_archMap;
diff --git a/khtml/misc/loader.cpp b/khtml/misc/loader.cpp
index 3f8c7c29f..d6e463b02 100644
--- a/khtml/misc/loader.cpp
+++ b/khtml/misc/loader.cpp
@@ -144,7 +144,7 @@ void CachedObject::deref(CachedObjectClient *c)
     assert( c );
     assert( m_clients.count() );
     assert( !canDelete() );
-    assert( m_clients.tqfind( c ) );
+    assert( m_clients.find( c ) );
 
     Cache::flush();
 
@@ -213,7 +213,7 @@ CachedCSSStyleSheet::CachedCSSStyleSheet(DocLoader* dl, const DOMString &url, KI
     : CachedObject(url, CSSStyleSheet, _cachePolicy, 0)
 {
     // Set the type we want (probably css or xml)
-    TQString ah = TQString::tqfromLatin1( accept );
+    TQString ah = TQString::fromLatin1( accept );
     if ( !ah.isEmpty() )
         ah += ",";
     ah += "*/*;q=0.1";
@@ -327,7 +327,7 @@ CachedScript::CachedScript(DocLoader* dl, const DOMString &url, KIO::CacheContro
     // It's javascript we want.
     // But some websites think their scripts are <some wrong mimetype here>
     // and refuse to serve them if we only accept application/x-javascript.
-    setAccept( TQString::tqfromLatin1("*/*") );
+    setAccept( TQString::fromLatin1("*/*") );
     // load the file
     Cache::loader()->load(dl, this, false);
     m_loading = true;
@@ -476,7 +476,7 @@ CachedImage::CachedImage(DocLoader* dl, const DOMString &url, KIO::CacheControl
     pixPart = 0;
     bg = 0;
     scaled = 0;
-    bgColor = tqRgba( 0, 0, 0, 0xFF );
+    bgColor = qRgba( 0, 0, 0, 0xFF );
     typeChecked = false;
     isFullyTransparent = false;
     monochrome = false;
@@ -526,7 +526,7 @@ void CachedImage::deref( CachedObjectClient *c )
 
 const TQPixmap &CachedImage::tiled_pixmap(const TQColor& newc, int xWidth, int xHeight)
 {
-    static QRgb bgTransparent = tqRgba( 0, 0, 0, 0xFF );
+    static QRgb bgTransparent = qRgba( 0, 0, 0, 0xFF );
 
     TQSize s(pixmap_size());
     int w = xWidth;
@@ -564,7 +564,7 @@ const TQPixmap &CachedImage::tiled_pixmap(const TQColor& newc, int xWidth, int x
     bgSize = TQSize(xWidth, xHeight);
 
     //See whether we can - and should - pre-blend
-    if (isvalid && (r.hasAlphaChannel() || r.tqmask() )) {
+    if (isvalid && (r.hasAlphaChannel() || r.mask() )) {
         bg = new TQPixmap(xWidth, xHeight, r.depth());
         bg->fill(newc);
         bitBlt(bg, 0, 0, src);
@@ -692,10 +692,10 @@ void CachedImage::movieUpdated( const TQRect& r )
     do_notify(m->framePixmap(), r);
 }
 
-void CachedImage::movietqStatus(int status)
+void CachedImage::movieStatus(int status)
 {
 #ifdef LOADER_DEBUG
-    qDebug("movietqStatus(%d)", status);
+    qDebug("movieStatus(%d)", status);
 #endif
 
     // ### the html image objects are supposed to send the load event after every frame (according to
@@ -709,8 +709,8 @@ void CachedImage::movietqStatus(int status)
         const TQImage& im = m->frameImage();
         monochrome = ( ( im.depth() <= 8 ) && ( im.numColors() - int( im.hasAlphaBuffer() ) <= 2 ) );
         for (int i = 0; monochrome && i < im.numColors(); ++i)
-            if (im.colorTable()[i] != tqRgb(0xff, 0xff, 0xff) &&
-                im.colorTable()[i] != tqRgb(0x00, 0x00, 0x00))
+            if (im.colorTable()[i] != qRgb(0xff, 0xff, 0xff) &&
+                im.colorTable()[i] != qRgb(0x00, 0x00, 0x00))
                 monochrome = false;
         if( (im.width() < 5 || im.height() < 5) && im.hasAlphaBuffer()) // only evaluate for small images
         {
@@ -743,14 +743,14 @@ void CachedImage::movietqStatus(int status)
         {
             setShowAnimations( KHTMLSettings::KAnimationDisabled );
 
-            // monochrome alphatqmasked images are usually about 10000 times
+            // monochrome alphamasked images are usually about 10000 times
             // faster to draw, so this is worth the hack
             if (p && monochrome && p->depth() > 1)
             {
                 TQPixmap* pix = new TQPixmap;
                 pix->convertFromImage( p->convertToImage().convertDepth( 1 ), MonoOnly|AvoidDither );
-                if ( p->tqmask() )
-                    pix->setMask( *p->tqmask() );
+                if ( p->mask() )
+                    pix->setMask( *p->mask() );
                 delete p;
                 p = pix;
                 monochrome = false;
@@ -766,7 +766,7 @@ void CachedImage::movietqStatus(int status)
     {
 #ifdef LOADER_DEBUG
         TQRect r(valid_rect());
-        qDebug("movie tqStatus frame update %d/%d/%d/%d, pixmap size %d/%d", r.x(), r.y(), r.right(), r.bottom(),
+        qDebug("movie Status frame update %d/%d/%d/%d, pixmap size %d/%d", r.x(), r.y(), r.right(), r.bottom(),
                pixmap().size().width(), pixmap().size().height());
 #endif
         do_notify(pixmap(), valid_rect());
@@ -787,7 +787,7 @@ void CachedImage::setShowAnimations( KHTMLSettings::KAnimationAdvice showAnimati
         delete p;
         p = new TQPixmap(m->framePixmap());
         m->disconnectUpdate( this, TQT_SLOT( movieUpdated( const TQRect &) ));
-        m->disconnecttqStatus( this, TQT_SLOT( movietqStatus( int ) ));
+        m->disconnectStatus( this, TQT_SLOT( movieStatus( int ) ));
         m->disconnectResize( this, TQT_SLOT( movieResize( const TQSize& ) ) );
         TQTimer::singleShot(0, this, TQT_SLOT( deleteMovie()));
         imgSource = 0;
@@ -816,7 +816,7 @@ void CachedImage::clear()
     delete p;   p = 0;
     delete bg;  bg = 0;
     delete scaled;  scaled = 0;
-    bgColor = tqRgba( 0, 0, 0, 0xff );
+    bgColor = qRgba( 0, 0, 0, 0xff );
     bgSize = TQSize(-1,-1);
     delete pixPart; pixPart = 0;
 
@@ -850,7 +850,7 @@ void CachedImage::data ( TQBuffer &_buffer, bool eof )
             imgSource = new ImageSource( _buffer.buffer());
             m = new TQMovie( imgSource, 8192 );
             m->connectUpdate( this, TQT_SLOT( movieUpdated( const TQRect &) ));
-            m->connecttqStatus( this, TQT_SLOT( movietqStatus(int)));
+            m->connectStatus( this, TQT_SLOT( movieStatus(int)));
             m->connectResize( this, TQT_SLOT( movieResize( const TQSize& ) ) );
         }
     }
@@ -902,9 +902,9 @@ void CachedImage::data ( TQBuffer &_buffer, bool eof )
 
 void CachedImage::finish()
 {
-    tqStatus oldtqStatus = m_status;
+    Status oldStatus = m_status;
     CachedObject::finish();
-    if ( oldtqStatus != m_status ) {
+    if ( oldStatus != m_status ) {
 	const TQPixmap &pm = pixmap();
 	do_notify( pm, pm.rect() );
     }
@@ -981,7 +981,7 @@ void DocLoader::setExpireDate(time_t _expireDate, bool relative)
 
 void DocLoader::insertCachedObject( CachedObject* o ) const
 {
-    if ( m_docObjects.tqfind(o) )
+    if ( m_docObjects.find(o) )
         return;
     m_docObjects.insert( o, o );
     if ( m_docObjects.count() > 3 * m_docObjects.size() )
@@ -993,7 +993,7 @@ bool DocLoader::needReload(CachedObject *existing, const TQString& fullURL)
     bool reload = false;
     if (m_cachePolicy == KIO::CC_Verify)
     {
-       if (!m_reloadedURLs.tqcontains(fullURL))
+       if (!m_reloadedURLs.contains(fullURL))
        {
           if (existing && existing->isExpired())
           {
@@ -1005,7 +1005,7 @@ bool DocLoader::needReload(CachedObject *existing, const TQString& fullURL)
     }
     else if ((m_cachePolicy == KIO::CC_Reload) || (m_cachePolicy == KIO::CC_Refresh))
     {
-       if (!m_reloadedURLs.tqcontains(fullURL))
+       if (!m_reloadedURLs.contains(fullURL))
        {
           if (existing)
           {
@@ -1078,7 +1078,7 @@ void DocLoader::setAutoloadImages( bool enable )
         {
             CachedImage *img = const_cast<CachedImage*>( static_cast<const CachedImage *>( it.current()) );
 
-            CachedObject::tqStatus status = img->status();
+            CachedObject::Status status = img->status();
             if ( status != CachedObject::Unknown )
                 continue;
 
@@ -1167,7 +1167,7 @@ void Loader::servePendingRequests()
             {
                 job->addMetaData( "cross-domain", part->toplevelURL().url() );
                 if (part->widget())
-                    job->setWindow (part->widget()->tqtopLevelWidget());
+                    job->setWindow (part->widget()->topLevelWidget());
             }
         }
 
@@ -1427,7 +1427,7 @@ CachedObjectType* Cache::requestObject( DocLoader* dl, const KURL& kurl, const c
     KIO::CacheControl cachePolicy = dl ? dl->cachePolicy() : KIO::CC_Verify;
 
     TQString url = kurl.url();
-    CachedObject* o = cache->tqfind(url);
+    CachedObject* o = cache->find(url);
 
     if ( o && o->type() != CachedType ) {
         removeCacheEntry( o );
@@ -1436,7 +1436,7 @@ CachedObjectType* Cache::requestObject( DocLoader* dl, const KURL& kurl, const c
 
     if ( o && dl->needReload( o, url ) ) {
         o = 0;
-        assert( cache->tqfind( url ) == 0 );
+        assert( cache->find( url ) == 0 );
     }
 
     if(!o)
@@ -1464,7 +1464,7 @@ CachedObjectType* Cache::requestObject( DocLoader* dl, const KURL& kurl, const c
 
 void Cache::preloadStyleSheet( const TQString &url, const TQString &stylesheet_data)
 {
-    CachedObject *o = cache->tqfind(url);
+    CachedObject *o = cache->find(url);
     if(o)
         removeCacheEntry(o);
 
@@ -1474,7 +1474,7 @@ void Cache::preloadStyleSheet( const TQString &url, const TQString &stylesheet_d
 
 void Cache::preloadScript( const TQString &url, const TQString &script_data)
 {
-    CachedObject *o = cache->tqfind(url);
+    CachedObject *o = cache->find(url);
     if(o)
         removeCacheEntry(o);
 
diff --git a/khtml/misc/loader.h b/khtml/misc/loader.h
index 2e62e7f39..4314e950e 100644
--- a/khtml/misc/loader.h
+++ b/khtml/misc/loader.h
@@ -91,7 +91,7 @@ namespace khtml
 	    Script
 	};
 
-	enum tqStatus {
+	enum Status {
 	    Unknown,      // let imagecache decide what to do with it
 	    New,          // inserting new image
             Pending,      // only partially loaded
@@ -127,8 +127,8 @@ namespace khtml
 	int count() const { return m_clients.count(); }
         int accessCount() const { return m_accessCount; }
 
-	void setStatus(tqStatus s) { m_status = s; }
-	tqStatus status() const { return m_status; }
+	void setStatus(Status s) { m_status = s; }
+	Status status() const { return m_status; }
 
         virtual void setCharset( const TQString& /*charset*/ ) {}
 
@@ -167,7 +167,7 @@ namespace khtml
         TQString m_accept;
         Request *m_request;
 	Type m_type;
-	tqStatus m_status;
+	Status m_status;
         int m_accessCount;
 	KIO::CacheControl m_cachePolicy;
 	time_t m_expireDate;
@@ -302,7 +302,7 @@ namespace khtml
 	 * gets called, whenever a TQMovie changes frame
 	 */
 	void movieUpdated( const TQRect &rect );
-        void movietqStatus(int);
+        void movieStatus(int);
         void movieResize(const TQSize&);
         void deleteMovie();
 
@@ -405,7 +405,7 @@ namespace khtml
     /**
      * @internal
      */
-    class Loader : public TQObject
+    class Loader : public QObject
     {
 	Q_OBJECT
 
@@ -486,7 +486,7 @@ namespace khtml
 	/**
 	 * clears the cache
 	 * Warning: call this only at the end of your program, to clean
-	 * up memory (useful for tqfinding memory holes)
+	 * up memory (useful for finding memory holes)
 	 */
 	KDE_EXPORT static void clear();
 
diff --git a/khtml/misc/loader_jpeg.cpp b/khtml/misc/loader_jpeg.cpp
index fe9b8620f..57174fe1b 100644
--- a/khtml/misc/loader_jpeg.cpp
+++ b/khtml/misc/loader_jpeg.cpp
@@ -305,7 +305,7 @@ int KJPEGFormat::decode(TQImage& image, TQImageConsumer* consumer, const uchar*
     cinfo.src->bytes_in_buffer = (size_t) jsrc.valid_buffer_len;
 
 #ifdef BUFFER_DEBUG
-    qDebug("buffer tqcontains %d bytes", jsrc.valid_buffer_len);
+    qDebug("buffer contains %d bytes", jsrc.valid_buffer_len);
 #endif
 
     if(state == Init)
@@ -358,7 +358,7 @@ int KJPEGFormat::decode(TQImage& image, TQImageConsumer* consumer, const uchar*
             } else if ( cinfo.output_components == 1 ) {
                 image.create( cinfo.output_width, cinfo.output_height, 8, 256 );
                 for (int i=0; i<256; i++)
-                    image.setColor(i, tqRgb(i,i,i));
+                    image.setColor(i, qRgb(i,i,i));
             }
 
 #ifdef JPEG_DEBUG
@@ -431,7 +431,7 @@ again:
 
 		for (uint i=cinfo.output_width; i--; ) {
 		    in-=3;
-		    out[i] = tqRgb(in[0], in[1], in[2]);
+		    out[i] = qRgb(in[0], in[1], in[2]);
 		}
 	    }
 	}
diff --git a/khtml/misc/makeattrs b/khtml/misc/makeattrs
index 1cf3c4b79..48a02c045 100644
--- a/khtml/misc/makeattrs
+++ b/khtml/misc/makeattrs
@@ -72,7 +72,7 @@ print header "const char* getAttrName(unsigned short id) KDE_NO_EXPORT;\n";
 print header "\n#endif\n";
 close header;
 
-my $result = system("/bin/sh", "-c", "gperf -c -a -L 'ANSI-C' -P -G -D -E -C -o -t -k '*' -NtqfindAttr -Hhash_attr -Wwordlist_attr -Qspool_attr -s 2 htmlattrs.gperf > htmlattrs.c");
+my $result = system("/bin/sh", "-c", "gperf -c -a -L 'ANSI-C' -P -G -D -E -C -o -t -k '*' -NfindAttr -Hhash_attr -Wwordlist_attr -Qspool_attr -s 2 htmlattrs.gperf > htmlattrs.c");
 if ($result) {
   unlink "htmlattrs.c";
   exit $result;
diff --git a/khtml/misc/maketags b/khtml/misc/maketags
index e40c3e869..a460cf8e4 100644
--- a/khtml/misc/maketags
+++ b/khtml/misc/maketags
@@ -76,7 +76,7 @@ close out;
 print header "\n#endif\n";
 close header;
 
-my $result = system("/bin/sh", "-c", "gperf -a -L 'ANSI-C' -P -D -E -C -l -o -t -k '*' -NtqfindTag -Hhash_tag -Wwordlist_tag -Qspool_Tag htmltags.gperf > htmltags.c");
+my $result = system("/bin/sh", "-c", "gperf -a -L 'ANSI-C' -P -D -E -C -l -o -t -k '*' -NfindTag -Hhash_tag -Wwordlist_tag -Qspool_Tag htmltags.gperf > htmltags.c");
 if ($result) {
   unlink "htmltags.c";
   exit $result;
diff --git a/khtml/misc/multimap.h b/khtml/misc/multimap.h
index 52a9c5fdb..125e8e07d 100644
--- a/khtml/misc/multimap.h
+++ b/khtml/misc/multimap.h
@@ -32,7 +32,7 @@ template<class T> class MultiMapPtrList;
 
 // KMultiMap is an implementaition of a Map with multiple entries per key.
 // It is originally designed to work like a shell for TQPtrDict<TQPtrList>, but
-// TQPtrList have been tqreplaced with a much faster hash set.
+// TQPtrList have been replaced with a much faster hash set.
 template<class T>
 class KMultiMap {
 public:
@@ -42,7 +42,7 @@ public:
     typedef MultiMapPtrList<T> List;
 
     void append(void* key, T* element) {
-        List *list = dict.tqfind(key);
+        List *list = dict.find(key);
         if (!list){
              list = new List(8);
              dict.insert(key, list);
@@ -50,7 +50,7 @@ public:
         list->append(element);
     }
     void remove(void* key, T* element) {
-        List *list = dict.tqfind(key);
+        List *list = dict.find(key);
         if (list) {
             list->remove(element);
             if (list->isEmpty()) dict.remove(key);
@@ -59,8 +59,8 @@ public:
     void remove(void* key) {
         dict.remove(key);
     }
-    List* tqfind(void* key) {
-        return dict.tqfind(key);
+    List* find(void* key) {
+        return dict.find(key);
     }
 private:
     TQPtrDict<List> dict;
@@ -70,7 +70,7 @@ private:
 static inline unsigned int stupidHash(void* ptr)
 {
     unsigned long val = (unsigned long)ptr;
-    // remove tqalignment and multiply by a prime unlikely to be a factor of size
+    // remove alignment and multiply by a prime unlikely to be a factor of size
     val = (val >> 4) * 1237;
     return val;
 }
@@ -147,7 +147,7 @@ public:
         }
         return false;
     }
-    bool tqcontains(void* e) {
+    bool contains(void* e) {
         if (count == 0) return false;
         unsigned int t_size = size();
         unsigned int hash = stupidHash(e);
@@ -277,10 +277,10 @@ public:
             t_current = t_next;
         }
     }
-    bool tqcontains(T* e) {
+    bool contains(T* e) {
         PtrListEntry *t_current = m_first;
         while (t_current) {
-            if (t_current->tqcontains(e)) return true;
+            if (t_current->contains(e)) return true;
             t_current = t_current->next;
         }
         return false;
diff --git a/khtml/misc/stringit.h b/khtml/misc/stringit.h
index d56a78397..789f22af8 100644
--- a/khtml/misc/stringit.h
+++ b/khtml/misc/stringit.h
@@ -46,7 +46,7 @@ public:
     DOMStringIt(TQChar *str, uint len)
 	{ s = str, l = len; lines = 0; }
     DOMStringIt(const TQString &str)
-	{ s = str.tqunicode(); l = str.length(); lines = 0; }
+	{ s = str.unicode(); l = str.length(); lines = 0; }
 
     DOMStringIt *operator++()
     {
@@ -85,13 +85,13 @@ class TokenizerSubstring
     friend class TokenizerString;
 public:    
     TokenizerSubstring() : m_length(0), m_current(0) {}
-    TokenizerSubstring(const TQString &str) : m_string(str), m_length(str.length()), m_current(m_length == 0 ? 0 : str.tqunicode()) {}
+    TokenizerSubstring(const TQString &str) : m_string(str), m_length(str.length()), m_current(m_length == 0 ? 0 : str.unicode()) {}
     TokenizerSubstring(const TQChar *str, int length) : m_length(length), m_current(length == 0 ? 0 : str) {}
 
     void clear() { m_length = 0; m_current = 0; }
 
     void appendTo(TQString &str) const {
-        if (m_string.tqunicode() == m_current) {
+        if (m_string.unicode() == m_current) {
             if (str.isEmpty())
                 str = m_string;
             else
diff --git a/khtml/rendering/bidi.cpp b/khtml/rendering/bidi.cpp
index 515c9bfbb..bd010047a 100644
--- a/khtml/rendering/bidi.cpp
+++ b/khtml/rendering/bidi.cpp
@@ -61,8 +61,8 @@ struct BidiIterator
 };
 
 
-struct BiditqStatus {
-    BiditqStatus() : eor(TQChar::DirON), lastStrong(TQChar::DirON), last(TQChar::DirON) {}
+struct BidiStatus {
+    BidiStatus() : eor(TQChar::DirON), lastStrong(TQChar::DirON), last(TQChar::DirON) {}
 
     TQChar::Direction eor;
     TQChar::Direction lastStrong;
@@ -77,7 +77,7 @@ struct BidiState {
     BidiIterator last;
     BidiIterator current;
     BidiContext *context;
-    BiditqStatus status;
+    BidiStatus status;
 };
 
 // Used to track a list of chained bidi runs.
@@ -156,7 +156,7 @@ void BidiRun::operator delete(void* ptr, size_t sz)
 {
     assert(inBidiRunDetach);
 
-    // Stash size where detach can tqfind it.
+    // Stash size where detach can find it.
     *(size_t*)ptr = sz;
 }
 
@@ -181,7 +181,7 @@ static void deleteBidiRuns(RenderArena* arena)
 
 /* a small helper class used internally to resolve Bidi embedding levels.
    Each line of text caches the embedding level at the start of the line for faster
-   retqlayouting
+   relayouting
 */
 BidiContext::BidiContext(unsigned char l, TQChar::Direction e, BidiContext *p, bool o)
     : level(l) , override(o), dir(e)
@@ -242,7 +242,7 @@ static inline RenderObject *Bidinext(RenderObject *par, RenderObject *current, B
         if (!oldEndOfInline && !current->isFloating() && !current->isReplaced() && !current->isPositioned()) {
             next = current->firstChild();
             if ( next && adjustEmbedding ) {
-                EUnicodeBidi ub = next->style()->tqunicodeBidi();
+                EUnicodeBidi ub = next->style()->unicodeBidi();
                 if ( ub != UBNormal && !emptyRun ) {
                     EDirection dir = next->style()->direction();
                     TQChar::Direction d = ( ub == Embed ? ( dir == RTL ? TQChar::DirRLE : TQChar::DirLRE )
@@ -261,7 +261,7 @@ static inline RenderObject *Bidinext(RenderObject *par, RenderObject *current, B
             while (current && current != par) {
                 next = current->nextSibling();
                 if (next) break;
-                if ( adjustEmbedding && current->style()->tqunicodeBidi() != UBNormal && !emptyRun ) {
+                if ( adjustEmbedding && current->style()->unicodeBidi() != UBNormal && !emptyRun ) {
                     embed( TQChar::DirPDF, bidi );
                 }
                 current = current->parent();
@@ -454,7 +454,7 @@ static void checkMidpoints(BidiIterator& lBreak, BidiState &bidi)
                     // Don't shave a character off the endpoint if it was from a soft hyphen.
                     RenderText* textObj = static_cast<RenderText*>(endpoint.obj);
                     if (endpoint.pos+1 < textObj->length() &&
-                        textObj->text()[endpoint.pos+1].tqunicode() == SOFT_HYPHEN)
+                        textObj->text()[endpoint.pos+1].unicode() == SOFT_HYPHEN)
                         return;
                 }
                 endpoint.pos--;
@@ -795,7 +795,7 @@ void RenderBlock::computeVerticalPositionsForLine(InlineFlowBox* lineBox)
 
     bool beforeContent = true;
 
-    // Now make sure we place tqreplaced render objects correctly.
+    // Now make sure we place replaced render objects correctly.
     for (BidiRun* r = sFirstBidiRun; r; r = r->nextRun) {
 
         // For positioned placeholders, cache the static Y position an object with non-inline display would have.
@@ -806,7 +806,7 @@ void RenderBlock::computeVerticalPositionsForLine(InlineFlowBox* lineBox)
         else if (beforeContent)
            beforeContent = false;
 
-        // Position is used to properly position both tqreplaced elements and
+        // Position is used to properly position both replaced elements and
         // to update the static normal flow x/y of positioned elements.
         r->obj->position(r->box, r->start, r->stop - r->start, r->level%2);
     }
@@ -1241,7 +1241,7 @@ void RenderBlock::bidiReorderLine(const BidiIterator &start, const BidiIterator
 	}
 
 	// this causes the operator ++ to open and close embedding levels as needed
-	// for the CSS tqunicode-bidi property
+	// for the CSS unicode-bidi property
 	adjustEmbedding = true;
         bidi.current.increment( bidi );
 	adjustEmbedding = false;
@@ -1264,7 +1264,7 @@ void RenderBlock::bidiReorderLine(const BidiIterator &start, const BidiIterator
 
     // reorder line according to run structure...
 
-    // first tqfind highest and lowest levels
+    // first find highest and lowest levels
     uchar levelLow = 128;
     uchar levelHigh = 0;
     BidiRun *r = sFirstBidiRun;
@@ -1323,17 +1323,17 @@ void RenderBlock::bidiReorderLine(const BidiIterator &start, const BidiIterator
 #endif
 }
 
-void RenderBlock::tqlayoutInlineChildren(bool retqlayoutChildren, int breakBeforeLine)
+void RenderBlock::layoutInlineChildren(bool relayoutChildren, int breakBeforeLine)
 {
     BidiState bidi;
 
     m_overflowHeight = 0;
 
-    tqinvalidateVerticalPositions();
+    invalidateVerticalPositions();
 #ifdef DEBUG_LAYOUT
     TQTime qt;
     qt.start();
-    kdDebug( 6040 ) << renderName() << " tqlayoutInlineChildren( " << this <<" )" << endl;
+    kdDebug( 6040 ) << renderName() << " layoutInlineChildren( " << this <<" )" << endl;
 #endif
 #if BIDI_DEBUG > 1 || defined( DEBUG_LINEBREAKS )
     kdDebug(6041) << " ------- bidi start " << this << " -------" << endl;
@@ -1356,11 +1356,11 @@ void RenderBlock::tqlayoutInlineChildren(bool retqlayoutChildren, int breakBefor
          deleteEllipsisLineBoxes();
 
     if (firstChild()) {
-        // tqlayout tqreplaced elements
+        // layout replaced elements
         RenderObject *o = first( this, bidi, false );
         while ( o ) {
             if (o->markedForRepaint()) {
-                o->tqrepaintDuringLayout();
+                o->repaintDuringLayout();
                 o->setMarkedForRepaint(false);
              }
             if (o->isReplaced() || o->isFloating() || o->isPositioned()) {
@@ -1368,13 +1368,13 @@ void RenderBlock::tqlayoutInlineChildren(bool retqlayoutChildren, int breakBefor
                 if (o->isBox())
                     static_cast<RenderBox*>(o)->RenderBox::deleteInlineBoxes();
 
-                //kdDebug(6041) << "tqlayouting tqreplaced or floating child" << endl;
-                if (retqlayoutChildren || o->style()->width().isPercent() || o->style()->height().isPercent())
+                //kdDebug(6041) << "layouting replaced or floating child" << endl;
+                if (relayoutChildren || o->style()->width().isPercent() || o->style()->height().isPercent())
                     o->setChildNeedsLayout(true, false);
                 if (o->isPositioned())
                     o->containingBlock()->insertPositionedObject(o);
                 else
-                    o->tqlayoutIfNeeded();
+                    o->layoutIfNeeded();
             }
             else {
                 o->deleteInlineBoxes();
@@ -1437,7 +1437,7 @@ void RenderBlock::tqlayoutInlineChildren(bool retqlayoutChildren, int breakBefor
                 pagebreakHint = true;
             }
 redo_linebreak:
-            end = tqfindNextLineBreak(start, bidi);
+            end = findNextLineBreak(start, bidi);
             if( start.atEnd() ) break;
             if (!isLineEmpty) {
                 bidiReorderLine(start, end, bidi);
@@ -1496,13 +1496,13 @@ redo_linebreak:
     sNumMidpoints = 0;
     sCurrMidpoint = 0;
 
-    // If we violate widows page-breaking rules, we set a hint and retqlayout.
+    // If we violate widows page-breaking rules, we set a hint and relayout.
     // Note that the widows rule might still be violated afterwards if the lines have become wider
-    if (canvas()->pagedMode() && tqcontainsPageBreak() && breakBeforeLine == 0)
+    if (canvas()->pagedMode() && containsPageBreak() && breakBeforeLine == 0)
     {
         int orphans = 0;
         int widows = 0;
-        // tqfind breaking line
+        // find breaking line
         InlineRunBox* lineBox = firstLineBox();
         while (lineBox) {
             if (lineBox->isInlineFlowBox()) {
@@ -1527,15 +1527,15 @@ redo_linebreak:
             int newOrphans = orphans - (style()->widows() - widows);
             if (newOrphans < style()->orphans()) {
                 if (parent()->canClear(this,PageBreakHarder)) {
-                    // Retqlayout to remove incorrect page-break
+                    // Relayout to remove incorrect page-break
                     setNeedsPageClear(true);
                     setContainsPageBreak(false);
-                    tqlayoutInlineChildren(retqlayoutChildren, -1);
+                    layoutInlineChildren(relayoutChildren, -1);
                     return;
                 }
             } else {
                 // Set hint and try again
-                tqlayoutInlineChildren(retqlayoutChildren, newOrphans+1);
+                layoutInlineChildren(relayoutChildren, newOrphans+1);
                 return;
             }
         }
@@ -1564,7 +1564,7 @@ redo_linebreak:
 #if BIDI_DEBUG > 1
     kdDebug(6041) << " ------- bidi end " << this << " -------" << endl;
 #endif
-    //kdDebug() << "RenderBlock::tqlayoutInlineChildren time used " << qt.elapsed() << endl;
+    //kdDebug() << "RenderBlock::layoutInlineChildren time used " << qt.elapsed() << endl;
     //kdDebug(6040) << "height = " << m_height <<endl;
 }
 
@@ -1593,13 +1593,13 @@ static void setStaticPosition( RenderBlock* p, RenderObject *o, bool *needToSetS
       if (needToSetStaticY) *needToSetStaticY = nssy;
 }
 
-BidiIterator RenderBlock::tqfindNextLineBreak(BidiIterator &start, BidiState &bidi)
+BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, BidiState &bidi)
 {
     int width = lineWidth(m_height);
     int w = 0;
     int tmpW = 0;
 #ifdef DEBUG_LINEBREAKS
-    kdDebug(6041) << "tqfindNextLineBreak: line at " << m_height << " line width " << width << endl;
+    kdDebug(6041) << "findNextLineBreak: line at " << m_height << " line width " << width << endl;
     kdDebug(6041) << "sol: " << start.obj << " " << start.pos << endl;
 #endif
 
@@ -1611,11 +1611,11 @@ BidiIterator RenderBlock::tqfindNextLineBreak(BidiIterator &start, BidiState &bi
     // be skipped.
     while (!start.atEnd() && (start.obj->isInlineFlow() || (!start.obj->style()->preserveWS() && !start.obj->isBR() &&
 #ifndef QT_NO_UNICODETABLES
-        ( (start.current().tqunicode() == (ushort)0x0020) || // ASCII space
-          (start.current().tqunicode() == (ushort)0x0009) || // ASCII tab
-          (start.current().tqunicode() == (ushort)0x000A) || // ASCII line feed
-          (start.current().tqunicode() == (ushort)0x000C) || // ASCII form feed
-          (start.current().tqunicode() == (ushort)0x200B) || // Zero-width space
+        ( (start.current().unicode() == (ushort)0x0020) || // ASCII space
+          (start.current().unicode() == (ushort)0x0009) || // ASCII tab
+          (start.current().unicode() == (ushort)0x000A) || // ASCII line feed
+          (start.current().unicode() == (ushort)0x000C) || // ASCII form feed
+          (start.current().unicode() == (ushort)0x200B) || // Zero-width space
           start.obj->isFloatingOrPositioned() )
 #else
 	      ( start.current() == ' ' || start.current() == '\n' || start.obj->isFloatingOrPositioned() )
@@ -1710,7 +1710,7 @@ BidiIterator RenderBlock::tqfindNextLineBreak(BidiIterator &start, BidiState &bi
                     // only check the clear status for non-empty lines.
                     EClear clear = o->style()->clear();
                     if(clear != CNONE)
-                        m_cleartqStatus = (EClear) (m_cleartqStatus | clear);
+                        m_clearStatus = (EClear) (m_clearStatus | clear);
                 }
             }
             goto end;
@@ -1771,7 +1771,7 @@ BidiIterator RenderBlock::tqfindNextLineBreak(BidiIterator &start, BidiState &bi
             if (lastIt.current->isHTMLMarquee() && lastIt.current->layer() && lastIt.current->layer()->marquee())
                 lastWS = lastIt.current->layer()->marquee()->whiteSpace();
 
-            // Break on tqreplaced elements if either has normal white-space.
+            // Break on replaced elements if either has normal white-space.
             if (currWS == NORMAL || lastWS == NORMAL) {
                 w += tmpW;
                 tmpW = 0;
@@ -1824,7 +1824,7 @@ BidiIterator RenderBlock::tqfindNextLineBreak(BidiIterator &start, BidiState &bi
                     isLineEmpty = false;
 
                 // Check for soft hyphens.  Go ahead and ignore them.
-                if (c.tqunicode() == SOFT_HYPHEN && pos > 0) {
+                if (c.unicode() == SOFT_HYPHEN && pos > 0) {
                     nextIsSoftBreakable = true;
                     if (!ignoringSpaces) {
                         // Ignore soft hyphens
@@ -1877,7 +1877,7 @@ BidiIterator RenderBlock::tqfindNextLineBreak(BidiIterator &start, BidiState &bi
                     tmpW += t->width(lastSpace, pos - lastSpace, f);
 #ifdef APPLE_CHANGES
                     applyWordSpacing = (wordSpacing && currentCharacterIsSpace && !previousCharacterIsSpace &&
-                        !t->tqcontainsOnlyWhitespace(pos+1, strlen-(pos+1)));
+                        !t->containsOnlyWhitespace(pos+1, strlen-(pos+1)));
 #endif
 #ifdef DEBUG_LINEBREAKS
                     kdDebug(6041) << "found space at " << pos << " in string '" << TQString( str, strlen ).latin1() << "' adding " << tmpW << " new width = " << w << endl;
@@ -1886,7 +1886,7 @@ BidiIterator RenderBlock::tqfindNextLineBreak(BidiIterator &start, BidiState &bi
                         int fb = nearestFloatBottom(m_height);
                         int newLineWidth = lineWidth(fb);
                         // See if |tmpW| will fit on the new line.  As long as it does not,
-                        // keep adjusting our float bottom until we tqfind some room.
+                        // keep adjusting our float bottom until we find some room.
                         int lastFloatBottom = m_height;
                         while (lastFloatBottom < fb && tmpW > newLineWidth) {
                             lastFloatBottom = fb;
@@ -1898,7 +1898,7 @@ BidiIterator RenderBlock::tqfindNextLineBreak(BidiIterator &start, BidiState &bi
                             m_height = fb;
                             width = newLineWidth;
 #ifdef DEBUG_LINEBREAKS
-                            kdDebug() << "RenderBlock::tqfindNextLineBreak new position at " << m_height << " newWidth " << width << endl;
+                            kdDebug() << "RenderBlock::findNextLineBreak new position at " << m_height << " newWidth " << width << endl;
 #endif
                         }
                     }
@@ -1911,7 +1911,7 @@ BidiIterator RenderBlock::tqfindNextLineBreak(BidiIterator &start, BidiState &bi
                                 lBreak.endOfInline = false;
                             }
                             goto end;
-                        } else if ( (pos > 1 && str[pos-1].tqunicode() == SOFT_HYPHEN) )
+                        } else if ( (pos > 1 && str[pos-1].unicode() == SOFT_HYPHEN) )
                             // Subtract the width of the soft hyphen out since we fit on a line.
                             tmpW -= t->width(pos-1, 1, f);
                     }
@@ -1971,7 +1971,7 @@ BidiIterator RenderBlock::tqfindNextLineBreak(BidiIterator &start, BidiState &bi
             }
 
             if (!ignoringSpaces) {
-                // We didn't tqfind any space that would be beyond the line |width|.
+                // We didn't find any space that would be beyond the line |width|.
                 // Lets add to |tmpW| the remaining width since the last space we found.
                 // Before we test this new |tmpW| however, we will have to look ahead to check
                 // if the next object/position can serve as a line breaking opportunity.
@@ -2056,7 +2056,7 @@ BidiIterator RenderBlock::tqfindNextLineBreak(BidiIterator &start, BidiState &bi
             int fb = nearestFloatBottom(m_height);
             int newLineWidth = lineWidth(fb);
             // See if |tmpW| will fit on the new line.  As long as it does not,
-            // keep adjusting our float bottom until we tqfind some room.
+            // keep adjusting our float bottom until we find some room.
             int lastFloatBottom = m_height;
             while (lastFloatBottom < fb && tmpW > newLineWidth) {
                 lastFloatBottom = fb;
@@ -2067,7 +2067,7 @@ BidiIterator RenderBlock::tqfindNextLineBreak(BidiIterator &start, BidiState &bi
                 m_height = fb;
                 width = newLineWidth;
 #ifdef DEBUG_LINEBREAKS
-                kdDebug() << "RenderBlock::tqfindNextLineBreak new position at " << m_height << " newWidth " << width << endl;
+                kdDebug() << "RenderBlock::findNextLineBreak new position at " << m_height << " newWidth " << width << endl;
 #endif
             }
 
@@ -2189,7 +2189,7 @@ BidiIterator RenderBlock::tqfindNextLineBreak(BidiIterator &start, BidiState &bi
         // For soft hyphens on line breaks, we have to chop out the midpoints that made us
         // ignore the hyphen so that it will render at the end of the line.
         TQChar c = static_cast<RenderText*>(lBreak.obj)->text()[lBreak.pos-1];
-        if (c.tqunicode() == SOFT_HYPHEN)
+        if (c.unicode() == SOFT_HYPHEN)
             chopMidpointsAt(lBreak.obj, lBreak.pos-2);
     }
 
@@ -2233,7 +2233,7 @@ void RenderBlock::checkLinesForTextOverflow()
         if ((ltr && lineBoxEdge > blockEdge) || (!ltr && lineBoxEdge < blockEdge)) {
             // This line spills out of our box in the appropriate direction.  Now we need to see if the line
             // can be truncated.  In order for truncation to be possible, the line must have sufficient space to
-            // accommodate our truncation string, and no tqreplaced elements (images, tables) can overlap the ellipsis
+            // accommodate our truncation string, and no replaced elements (images, tables) can overlap the ellipsis
             // space.
             int width = curr == firstRootBox() ? firstLineEllipsisWidth : ellipsisWidth;
             if (curr->canAccommodateEllipsis(ltr, blockEdge, lineBoxEdge, width))
diff --git a/khtml/rendering/bidi.h b/khtml/rendering/bidi.h
index 2ae5599a1..c8776ce19 100644
--- a/khtml/rendering/bidi.h
+++ b/khtml/rendering/bidi.h
@@ -107,7 +107,7 @@ public:
     /* InlineMinMaxIterator is a class that will iterate over all render objects that contribute to
        inline min/max width calculations.  Note the following about the way it walks:
        (1) Positioned content is skipped (since it does not contribute to min/max width of a block)
-       (2) We do not drill into the children of floats or tqreplaced elements, since you can't break
+       (2) We do not drill into the children of floats or replaced elements, since you can't break
            in the middle of such an element.
        (3) Inline flows (e.g., <a>, <span>, <i>) are walked twice, since each side can have
            distinct borders/margin/padding that contribute to the min/max width.
diff --git a/khtml/rendering/break_lines.h b/khtml/rendering/break_lines.h
index 928b75e18..5176e5fb0 100644
--- a/khtml/rendering/break_lines.h
+++ b/khtml/rendering/break_lines.h
@@ -6,13 +6,13 @@
 namespace khtml {
 
     /*
-      array of tqunicode codes where breaking shouldn't occur.
+      array of unicode codes where breaking shouldn't occur.
       (in sorted order because of using with binary search)
       these are currently for Japanese, though simply adding
       Korean, Chinese ones should work as well
     */
     /*
-      dontbreakbefore[] tqcontains characters not covered by TQChar::Punctuation_Close that shouldn't be broken before.
+      dontbreakbefore[] contains characters not covered by TQChar::Punctuation_Close that shouldn't be broken before.
       chars included in TQChar::Punctuation_Close are listed below.(look at UAX #14)
          - 3001 ideographic comma
          - 3002 ideographic full stop
@@ -122,7 +122,7 @@ namespace khtml {
     inline bool isBreakable( const TQChar *str, const int pos, int len )
     {
 	const TQChar *c = str+pos;
-	unsigned short ch = c->tqunicode();
+	unsigned short ch = c->unicode();
 	if ( ch > 0xff ) {
 	    // not latin1, need to do more sophisticated checks for asian fonts
 	    unsigned char row = c->row();
@@ -147,8 +147,8 @@ namespace khtml {
                     return false;
 
                 // do binary search in dontbreak[]
-                return break_bsearch(dontbreakbefore, c->tqunicode()) &&
-                       break_bsearch(dontbreakafter, (str+(pos-1))->tqunicode());
+                return break_bsearch(dontbreakbefore, c->unicode()) &&
+                       break_bsearch(dontbreakafter, (str+(pos-1))->unicode());
             } else // no asian font
 		return c->isSpace();
 	} else {
diff --git a/khtml/rendering/counter_tree.h b/khtml/rendering/counter_tree.h
index ca630ea19..55b924b80 100644
--- a/khtml/rendering/counter_tree.h
+++ b/khtml/rendering/counter_tree.h
@@ -29,7 +29,7 @@ namespace khtml {
 
 class CounterReset;
 
-// This file implements a counter-tree that is used for tqfinding all parents in counters() lookup,
+// This file implements a counter-tree that is used for finding all parents in counters() lookup,
 // and for propagating count-changes when nodes are added or removed.
 // Please note that only counter-reset and root can be parents here, and that render-tree parents
 // are just counter-tree siblings
diff --git a/khtml/rendering/enumerate.cpp b/khtml/rendering/enumerate.cpp
index 57445c12b..9cfe149ad 100644
--- a/khtml/rendering/enumerate.cpp
+++ b/khtml/rendering/enumerate.cpp
@@ -138,7 +138,7 @@ TQString toHebrew( int number ) {
     TQString letter;
     if (number < 1) return TQString::number(number);
     if (number>999) {
-  	letter = toHebrew(number/1000) + TQString::tqfromLatin1("'");
+  	letter = toHebrew(number/1000) + TQString::fromLatin1("'");
    	number = number%1000;
     }
 
diff --git a/khtml/rendering/font.cpp b/khtml/rendering/font.cpp
index 18e0e57f0..a33f0e082 100644
--- a/khtml/rendering/font.cpp
+++ b/khtml/rendering/font.cpp
@@ -170,7 +170,7 @@ void Font::drawText( TQPainter *p, int x, int y, TQChar *str, int slen, int pos,
 	// and stored. In the second, the actual characters are drawn.
 
 	// For each letter in the text box, save the width of the character.
-	// When word-wise, only the first letter tqcontains the width, but of the
+	// When word-wise, only the first letter contains the width, but of the
 	// whole word.
         short* const widthList = (short *)alloca(to*sizeof(short));
 
@@ -293,7 +293,7 @@ int Font::width( TQChar *chs, int, int pos, int len, int start, int end, int toA
     const TQString qstr = cstr.string();
     if ( scFont ) {
 	const TQString upper = qstr.upper();
-	const TQChar *uc = qstr.tqunicode();
+	const TQChar *uc = qstr.unicode();
 	const TQFontMetrics sc_fm( *scFont );
 	for ( int i = 0; i < len; ++i ) {
 	    if ( (uc+i)->category() == TQChar::Letter_Lowercase )
@@ -431,7 +431,7 @@ void Font::update( TQPaintDeviceMetrics* devMetrics ) const
     if( !isFontScalable(db, f) )
     {
         const TQValueList<int>& pointSizes = (*scalSizesCache)[ScalKey(f)];
-        // lets see if we tqfind a nice looking font, which is not too far away
+        // lets see if we find a nice looking font, which is not too far away
         // from the requested one.
         // kdDebug(6080) << "khtml::setFontSize family = " << f.family() << " size requested=" << size << endl;
 
diff --git a/khtml/rendering/render_applet.cpp b/khtml/rendering/render_applet.cpp
index ad0d787df..fce22f7c8 100644
--- a/khtml/rendering/render_applet.cpp
+++ b/khtml/rendering/render_applet.cpp
@@ -70,7 +70,7 @@ short RenderApplet::intrinsicWidth() const
     int rval = 300;
 
     if( m_widget )
-        rval = ((KJavaAppletWidget*)(m_widget))->tqsizeHint().width();
+        rval = ((KJavaAppletWidget*)(m_widget))->sizeHint().width();
 
     return rval > 10 ? rval : 50;
 }
@@ -80,14 +80,14 @@ int RenderApplet::intrinsicHeight() const
     int rval = 150;
 
     if( m_widget )
-        rval = m_widget->tqsizeHint().height();
+        rval = m_widget->sizeHint().height();
 
     return rval > 10 ? rval : 50;
 }
 
-void RenderApplet::tqlayout()
+void RenderApplet::layout()
 {
-    //kdDebug(6100) << "RenderApplet::tqlayout" << endl;
+    //kdDebug(6100) << "RenderApplet::layout" << endl;
 
     KHTMLAssert( needsLayout() );
     KHTMLAssert( minMaxKnown() );
@@ -123,22 +123,22 @@ void RenderApplet::processArguments(const TQMap<TQString, TQString> &args)
     KJavaApplet* applet = w ? w->applet() : 0;
 
     if ( applet ) {
-        applet->setBaseURL( args[TQString::tqfromLatin1("baseURL") ] );
-        applet->setAppletClass( args[TQString::tqfromLatin1("code") ] );
+        applet->setBaseURL( args[TQString::fromLatin1("baseURL") ] );
+        applet->setAppletClass( args[TQString::fromLatin1("code") ] );
 
-	TQString str = args[TQString::tqfromLatin1("codeBase") ];
+	TQString str = args[TQString::fromLatin1("codeBase") ];
         if( !str.isEmpty() )
             applet->setCodeBase( str );
 
-	str = args[TQString::tqfromLatin1("name") ];
+	str = args[TQString::fromLatin1("name") ];
         if( !str.isNull() )
             applet->setAppletName( str );
         else
-            applet->setAppletName( args[TQString::tqfromLatin1("code") ] );
+            applet->setAppletName( args[TQString::fromLatin1("code") ] );
 
-	str = args[TQString::tqfromLatin1("archive") ];
+	str = args[TQString::fromLatin1("archive") ];
         if( !str.isEmpty() )
-            applet->setArchives( args[TQString::tqfromLatin1("archive") ] );
+            applet->setArchives( args[TQString::fromLatin1("archive") ] );
     }
 }
 
diff --git a/khtml/rendering/render_applet.h b/khtml/rendering/render_applet.h
index 1ec9c5b7e..184697a7c 100644
--- a/khtml/rendering/render_applet.h
+++ b/khtml/rendering/render_applet.h
@@ -44,7 +44,7 @@ public:
 
     virtual const char *renderName() const { return "RenderApplet"; }
 
-    virtual void tqlayout();
+    virtual void layout();
     virtual short intrinsicWidth() const;
     virtual int intrinsicHeight() const;
     virtual bool isApplet() const { return true; }
diff --git a/khtml/rendering/render_arena.cpp b/khtml/rendering/render_arena.cpp
index 448e9b7e9..99fbf4f4d 100644
--- a/khtml/rendering/render_arena.cpp
+++ b/khtml/rendering/render_arena.cpp
@@ -27,7 +27,7 @@
  * version of this file only under the terms of one of those two
  * licenses (the MPL or the GPL) and not to allow others to use your
  * version of this file under the LGPL, indicate your decision by
- * deletingthe provisions above and tqreplace them with the notice and
+ * deletingthe provisions above and replace them with the notice and
  * other provisions required by the MPL or the GPL, as the case may be.
  * If you do not delete the provisions above, a recipient may use your
  * version of this file under any of the LGPL, the MPL or the GPL.
@@ -52,7 +52,7 @@ typedef struct {
 } RenderArenaDebugHeader;
 
 #ifdef VALGRIND_SUPPORT
-Arena* tqfindContainingArena(ArenaPool* pool, void* ptr) {
+Arena* findContainingArena(ArenaPool* pool, void* ptr) {
     uword ptrBits = reinterpret_cast<uword>(ptr);
     for (Arena* a = &pool->first; a; a = a->next)
         if (ptrBits >= a->base && ptrBits < a->limit)
@@ -88,7 +88,7 @@ void* RenderArena::allocate(size_t size)
 #else
     void* result = 0;
 
-    // Ensure we have correct tqalignment for pointers.  Important for Tru64
+    // Ensure we have correct alignment for pointers.  Important for Tru64
     size = KHTML_ROUNDUP(size, sizeof(void*));
 
     // Check recyclers first
@@ -98,7 +98,7 @@ void* RenderArena::allocate(size_t size)
         result = m_recyclers[index];
         if (result) {
 #ifdef VALGRIND_SUPPORT
-            VALGRIND_MEMPOOL_ALLOC(tqfindContainingArena(&m_pool, result)->base, result, size);
+            VALGRIND_MEMPOOL_ALLOC(findContainingArena(&m_pool, result)->base, result, size);
 #endif
             // Need to move to the next object
             void* next = *((void**)result);
@@ -127,10 +127,10 @@ void RenderArena::free(size_t size, void* ptr)
 #else
 
 #ifdef VALGRIND_SUPPORT
-    VALGRIND_MEMPOOL_FREE(tqfindContainingArena(&m_pool, ptr)->base, ptr);
+    VALGRIND_MEMPOOL_FREE(findContainingArena(&m_pool, ptr)->base, ptr);
 #endif
 
-    // Ensure we have correct tqalignment for pointers.  Important for Tru64
+    // Ensure we have correct alignment for pointers.  Important for Tru64
     size = KHTML_ROUNDUP(size, sizeof(void*));
 
     // See if it's a size that we recycle
diff --git a/khtml/rendering/render_arena.h b/khtml/rendering/render_arena.h
index 1bb37c11d..786cd208a 100644
--- a/khtml/rendering/render_arena.h
+++ b/khtml/rendering/render_arena.h
@@ -27,7 +27,7 @@
  * version of this file only under the terms of one of those two
  * licenses (the MPL or the GPL) and not to allow others to use your
  * version of this file under the LGPL, indicate your decision by
- * deletingthe provisions above and tqreplace them with the notice and
+ * deletingthe provisions above and replace them with the notice and
  * other provisions required by the MPL or the GPL, as the case may be.
  * If you do not delete the provisions above, a recipient may use your
  * version of this file under any of the LGPL, the MPL or the GPL.
diff --git a/khtml/rendering/render_block.cpp b/khtml/rendering/render_block.cpp
index 0ea4144f1..ccbb6fad0 100644
--- a/khtml/rendering/render_block.cpp
+++ b/khtml/rendering/render_block.cpp
@@ -94,7 +94,7 @@ RenderBlock::RenderBlock(DOM::NodeImpl* node)
     m_positionedObjects = 0;
     m_firstLine = false;
     m_avoidPageBreak = false;
-    m_cleartqStatus = CNONE;
+    m_clearStatus = CNONE;
     m_maxTopPosMargin = m_maxTopNegMargin = m_maxBottomPosMargin = m_maxBottomNegMargin = 0;
     m_topMarginQuirk = m_bottomMarginQuirk = false;
     m_overflowHeight = m_overflowWidth = 0;
@@ -223,7 +223,7 @@ void RenderBlock::updateFirstLetter()
         // punctuation and white-space
         if(oldText->l >= 1) {
             oldText->ref();
-            // begin: we need skip leading whitespace so that RenderBlock::tqfindNextLineBreak
+            // begin: we need skip leading whitespace so that RenderBlock::findNextLineBreak
             // won't think we're continuing from a previous run
             unsigned int begin = 0; // the position that first-letter begins
             unsigned int length = 0; // the position that "the rest" begins
@@ -274,7 +274,7 @@ void RenderBlock::addChildToFlow(RenderObject* newChild, RenderObject* beforeChi
     bool madeBoxesNonInline = false;
 
     // If the requested beforeChild is not one of our children, then this is most likely because
-    // there is an anonymous block box within this object that tqcontains the beforeChild. So
+    // there is an anonymous block box within this object that contains the beforeChild. So
     // just insert the child into the anonymous block box instead of here. This may also be
     // needed in cases of things like anonymous tables.
     if (beforeChild && beforeChild->parent() != this) {
@@ -289,7 +289,7 @@ void RenderBlock::addChildToFlow(RenderObject* newChild, RenderObject* beforeChi
             beforeChild->parent()->firstChild() == beforeChild)
             return addChildToFlow(newChild, beforeChild->parent());
 
-        // Otherwise tqfind our kid inside which the beforeChild is, and delegate to it.
+        // Otherwise find our kid inside which the beforeChild is, and delegate to it.
         // This may be many levels deep due to anonymous tables, table sections, etc.
         RenderObject* responsible = beforeChild->parent();
         while (responsible->parent() != this)
@@ -298,7 +298,7 @@ void RenderBlock::addChildToFlow(RenderObject* newChild, RenderObject* beforeChi
         return responsible->addChild(newChild,beforeChild);
     }
 
-    // prevent elements that haven't received a tqlayout yet from getting painted by pushing
+    // prevent elements that haven't received a layout yet from getting painted by pushing
     // them far above the top of the page
     if (!newChild->isInline())
         newChild->setPos(newChild->xPos(), -500000);
@@ -376,7 +376,7 @@ static void getInlineRun(RenderObject* start, RenderObject* stop,
                          RenderObject*& inlineRunStart,
                          RenderObject*& inlineRunEnd)
 {
-    // Beginning at |start| we tqfind the largest contiguous run of inlines that
+    // Beginning at |start| we find the largest contiguous run of inlines that
     // we can.  We denote the run with start and end points, |inlineRunStart|
     // and |inlineRunEnd|.  Note that these two values may be the same if
     // we encounter only one inline.
@@ -565,7 +565,7 @@ void RenderBlock::removeChild(RenderObject *oldChild)
 bool RenderBlock::isSelfCollapsingBlock() const
 {
     // We are not self-collapsing if we
-    // (a) have a non-zero height according to tqlayout (an optimization to avoid wasting time)
+    // (a) have a non-zero height according to layout (an optimization to avoid wasting time)
     // (b) are a table,
     // (c) have border/padding,
     // (d) have a min-height
@@ -604,30 +604,30 @@ bool RenderBlock::isSelfCollapsingBlock() const
     return false;
 }
 
-void RenderBlock::tqlayout()
+void RenderBlock::layout()
 {
-    // Table cells call tqlayoutBlock directly, so don't add any logic here.  Put code into
-    // tqlayoutBlock().
-    tqlayoutBlock(false);
+    // Table cells call layoutBlock directly, so don't add any logic here.  Put code into
+    // layoutBlock().
+    layoutBlock(false);
 }
 
-void RenderBlock::tqlayoutBlock(bool retqlayoutChildren)
+void RenderBlock::layoutBlock(bool relayoutChildren)
 {
     if (isInline() && !isReplacedBlock()) {
         setNeedsLayout(false);
         return;
     }
-    //    kdDebug( 6040 ) << renderName() << " " << this << "::tqlayoutBlock() start" << endl;
+    //    kdDebug( 6040 ) << renderName() << " " << this << "::layoutBlock() start" << endl;
     //     TQTime t;
     //     t.start();
     KHTMLAssert( needsLayout() );
     KHTMLAssert( minMaxKnown() );
 
-    if (canvas()->pagedMode()) retqlayoutChildren = true;
+    if (canvas()->pagedMode()) relayoutChildren = true;
 
-    if (!retqlayoutChildren && posChildNeedsLayout() && !normalChildNeedsLayout() && !selfNeedsLayout()) {
+    if (!relayoutChildren && posChildNeedsLayout() && !normalChildNeedsLayout() && !selfNeedsLayout()) {
         // All we have to is lay out our positioned objects.
-        tqlayoutPositionedObjects(retqlayoutChildren);
+        layoutPositionedObjects(relayoutChildren);
         if (hasOverflowClip())
             m_layer->checkScrollbarsAfterLayout();
         setNeedsLayout(false);
@@ -635,7 +635,7 @@ void RenderBlock::tqlayoutBlock(bool retqlayoutChildren)
     }
 
     if (markedForRepaint()) {
-        tqrepaintDuringLayout();
+        repaintDuringLayout();
         setMarkedForRepaint(false);
     }
 
@@ -653,14 +653,14 @@ void RenderBlock::tqlayoutBlock(bool retqlayoutChildren)
     }
 
     if ( oldWidth != m_width )
-        retqlayoutChildren = true;
+        relayoutChildren = true;
 
     //     kdDebug( 6040 ) << floatingObjects << "," << oldWidth << ","
     //                     << m_width << ","<< needsLayout() << "," << isAnonymousBox() << ","
     //                     << overhangingContents() << "," << isPositioned() << endl;
 
 #ifdef DEBUG_LAYOUT
-    kdDebug( 6040 ) << renderName() << "(RenderBlock) " << this << " ::tqlayout() width=" << m_width << ", needsLayout=" << needsLayout() << endl;
+    kdDebug( 6040 ) << renderName() << "(RenderBlock) " << this << " ::layout() width=" << m_width << ", needsLayout=" << needsLayout() << endl;
     if(containingBlock() == static_cast<RenderObject *>(this))
         kdDebug( 6040 ) << renderName() << ": containingBlock == this" << endl;
 #endif
@@ -670,14 +670,14 @@ void RenderBlock::tqlayoutBlock(bool retqlayoutChildren)
     int previousHeight = m_height;
     m_height = 0;
     m_overflowHeight = 0;
-    m_cleartqStatus = CNONE;
+    m_clearStatus = CNONE;
 
     // We use four values, maxTopPos, maxPosNeg, maxBottomPos, and maxBottomNeg, to track
     // our current maximal positive and negative margins.  These values are used when we
     // are collapsed with adjacent blocks, so for example, if you have block A and B
     // collapsing together, then you'd take the maximal positive margin from both A and B
     // and subtract it from the maximal negative margin from both A and B to get the
-    // true collapsed margin.  This algorithm is recursive, so when we finish tqlayout()
+    // true collapsed margin.  This algorithm is recursive, so when we finish layout()
     // our block knows its current maximal positive/negative values.
     //
     // Start out by setting our margin values to our current margins.  Table cells have
@@ -705,9 +705,9 @@ void RenderBlock::tqlayoutBlock(bool retqlayoutChildren)
     setContainsPageBreak(false);
 
     if (childrenInline())
-        tqlayoutInlineChildren( retqlayoutChildren );
+        layoutInlineChildren( relayoutChildren );
     else
-        tqlayoutBlockChildren( retqlayoutChildren );
+        layoutBlockChildren( relayoutChildren );
 
     // Expand our intrinsic height to encompass floats.
     int toAdd = borderBottom() + paddingBottom();
@@ -729,7 +729,7 @@ void RenderBlock::tqlayoutBlock(bool retqlayoutChildren)
             m_overflowHeight = m_height;
     }
     if (previousHeight != m_height)
-        retqlayoutChildren = true;
+        relayoutChildren = true;
 
     if (isTableCell()) {
         // Table cells need to grow to accommodate both overhanging floats and
@@ -764,7 +764,7 @@ void RenderBlock::tqlayoutBlock(bool retqlayoutChildren)
             kdDebug( 6040 ) << renderName() << " crosses to page " << xpage << endl;
 #endif
         }
-        if (needsPageBreak && !tqcontainsPageBreak()) {
+        if (needsPageBreak && !containsPageBreak()) {
             setNeedsPageClear(true);
 #ifdef PAGE_DEBUG
             kdDebug( 6040 ) << renderName() << " marked for page-clear" << endl;
@@ -772,7 +772,7 @@ void RenderBlock::tqlayoutBlock(bool retqlayoutChildren)
         }
     }
 
-    tqlayoutPositionedObjects( retqlayoutChildren );
+    layoutPositionedObjects( relayoutChildren );
 
     // Always ensure our overflow width/height are at least as large as our width/height.
     m_overflowWidth = kMax(m_overflowWidth, (int)m_width);
@@ -881,7 +881,7 @@ static inline bool isAnonymousWhitespace( RenderObject* o ) {
         return false;
     RenderObject *fc = o->firstChild();
     return fc && fc == o->lastChild() && fc->isText() && static_cast<RenderText *>(fc)->stringLength() == 1 &&
-           static_cast<RenderText *>(fc)->text()[0].tqunicode() == ' ';
+           static_cast<RenderText *>(fc)->text()[0].unicode() == ' ';
 }
 
 RenderObject* RenderBlock::handleCompactChild(RenderObject* child, CompactInfo& compactInfo, const MarginInfo& marginInfo, bool& handled)
@@ -908,7 +908,7 @@ RenderObject* RenderBlock::handleCompactChild(RenderObject* child, CompactInfo&
                 // The compact will fit in the margin.
                 handled = true;
                 compactInfo.set(child, curr);
-                child->tqlayoutIfNeeded();
+                child->layoutIfNeeded();
                 int off = marginInfo.margin();
                 m_height += off + curr->marginTop() < child->marginTop() ?
                             child->marginTop() - curr->marginTop() -off: 0;
@@ -967,7 +967,7 @@ void RenderBlock::insertCompactIfNeeded(RenderObject* child, CompactInfo& compac
         Length newLineHeight( kMax(compactChild->lineHeight(true)+adj, (int)child->lineHeight(true)), khtml::Fixed);
         child->style()->setLineHeight( newLineHeight );
         child->setNeedsLayout( true, false );
-        child->tqlayout();
+        child->layout();
 
         compactChild->setPos(compactXPos, compactYPos); // Set the x position.
         compactInfo.clear();
@@ -1110,7 +1110,7 @@ void RenderBlock::collapseMargins(RenderObject* child, MarginInfo& marginInfo, i
             child->markAllDescendantsWithFloatsForLayout();
 
         // Our guess was wrong. Make the child lay itself out again.
-        child->tqlayoutIfNeeded();
+        child->layoutIfNeeded();
     }
 }
 
@@ -1146,7 +1146,7 @@ void RenderBlock::clearFloatsIfNeeded(RenderObject* child, MarginInfo& marginInf
         }
 
         // If our value of clear caused us to be repositioned vertically to be
-        // underneath a float, we might have to do another tqlayout to take into account
+        // underneath a float, we might have to do another layout to take into account
         // the extra space we now have available.
         if (!selfCollapsing && !child->style()->width().isFixed() && child->usesLineWidth())
             // The child's width is a percentage of the line width.
@@ -1156,7 +1156,7 @@ void RenderBlock::clearFloatsIfNeeded(RenderObject* child, MarginInfo& marginInf
             child->setChildNeedsLayout(true);
         if (!child->flowAroundFloats() && child->hasFloats())
             child->markAllDescendantsWithFloatsForLayout();
-        child->tqlayoutIfNeeded();
+        child->layoutIfNeeded();
     }
 }
 
@@ -1215,7 +1215,7 @@ void RenderBlock::clearPageBreak(RenderObject* child, int pageBottom)
     // Increase our height by the amount we had to clear.
     m_height += heightIncrease;
 
-    // We might have to do another tqlayout to take into account
+    // We might have to do another layout to take into account
     // the extra space we now have available.
     if (!child->style()->width().isFixed()  && child->usesLineWidth())
         // The child's width is a percentage of the line width.
@@ -1225,9 +1225,9 @@ void RenderBlock::clearPageBreak(RenderObject* child, int pageBottom)
         child->setChildNeedsLayout(true);
     if (!child->flowAroundFloats() && child->hasFloats())
         child->markAllDescendantsWithFloatsForLayout();
-    if (child->tqcontainsPageBreak())
+    if (child->containsPageBreak())
         child->setNeedsLayout(true);
-    child->tqlayoutIfNeeded();
+    child->layoutIfNeeded();
 
     child->setAfterPageBreak(true);
 }
@@ -1235,7 +1235,7 @@ void RenderBlock::clearPageBreak(RenderObject* child, int pageBottom)
 int RenderBlock::estimateVerticalPosition(RenderObject* child, const MarginInfo& marginInfo)
 {
     // FIXME: We need to eliminate the estimation of vertical position, because
-    // when it's wrong we sometimes trigger a pathological retqlayout if there are
+    // when it's wrong we sometimes trigger a pathological relayout if there are
     // intruding floats.
     int yPosEstimate = m_height;
     if (!marginInfo.canCollapseWithTop()) {
@@ -1344,10 +1344,10 @@ void RenderBlock::handleBottomOfBlock(int top, int bottom, MarginInfo& marginInf
     setCollapsedBottomMargin(marginInfo);
 }
 
-void RenderBlock::tqlayoutBlockChildren( bool retqlayoutChildren )
+void RenderBlock::layoutBlockChildren( bool relayoutChildren )
 {
 #ifdef DEBUG_LAYOUT
-    kdDebug( 6040 ) << renderName() << " tqlayoutBlockChildren( " << this <<" ), retqlayoutChildren="<< retqlayoutChildren << endl;
+    kdDebug( 6040 ) << renderName() << " layoutBlockChildren( " << this <<" ), relayoutChildren="<< relayoutChildren << endl;
 #endif
 
     int top = borderTop() + paddingTop();
@@ -1362,9 +1362,9 @@ void RenderBlock::tqlayoutBlockChildren( bool retqlayoutChildren )
     MarginInfo marginInfo(this, top, bottom);
     CompactInfo compactInfo;
 
-    // Fieldsets need to tqfind their legend and position it inside the border of the object.
-    // The legend then gets skipped during normal tqlayout.
-    RenderObject* legend = tqlayoutLegend(retqlayoutChildren);
+    // Fieldsets need to find their legend and position it inside the border of the object.
+    // The legend then gets skipped during normal layout.
+    RenderObject* legend = layoutLegend(relayoutChildren);
 
     PageBreakInfo pageBreakInfo(pageTopAfter(0));
 
@@ -1379,8 +1379,8 @@ void RenderBlock::tqlayoutBlockChildren( bool retqlayoutChildren )
         int oldTopPosMargin = m_maxTopPosMargin;
         int oldTopNegMargin = m_maxTopNegMargin;
 
-        // make sure we retqlayout children if we need it.
-        if (!child->isPositioned() && (retqlayoutChildren ||
+        // make sure we relayout children if we need it.
+        if (!child->isPositioned() && (relayoutChildren ||
              (child->isReplaced() && (child->style()->width().isPercent() || child->style()->height().isPercent())) ||
              (child->isRenderBlock() && child->style()->height().isPercent()) ||
              (child->isBody() && child->style()->htmlHacks())))
@@ -1407,11 +1407,11 @@ void RenderBlock::tqlayoutBlockChildren( bool retqlayoutChildren )
 
         // Try to guess our correct y position.  In most cases this guess will
         // be correct.  Only if we're wrong (when we compute the real y position)
-        // will we have to potentially retqlayout.
+        // will we have to potentially relayout.
         int yPosEstimate = estimateVerticalPosition(child, marginInfo);
 
         // If an element might be affected by the presence of floats, then always mark it for
-        // tqlayout.
+        // layout.
         if ( !child->flowAroundFloats() || child->usesLineWidth() ) {
             int fb = floatBottom();
             if (fb > m_height || fb > yPosEstimate)
@@ -1420,7 +1420,7 @@ void RenderBlock::tqlayoutBlockChildren( bool retqlayoutChildren )
 
         // Go ahead and position the child as though it didn't collapse with the top.
         child->setPos(child->xPos(), yPosEstimate);
-        child->tqlayoutIfNeeded();
+        child->layoutIfNeeded();
 
         // Now determine the correct ypos based on examination of collapsing margin
         // values.
@@ -1501,9 +1501,9 @@ void RenderBlock::clearChildOfPageBreaks(RenderObject *child, PageBreakInfo &pag
     int xpage = crossesPageBreak(childTop, childBottom);
     if (xpage || forcePageBreak)
     {
-        if (!forcePageBreak && child->tqcontainsPageBreak() && !child->needsPageClear()) {
+        if (!forcePageBreak && child->containsPageBreak() && !child->needsPageClear()) {
 #ifdef PAGE_DEBUG
-            kdDebug(6040) << renderName() << " Child tqcontains page-break to page " << xpage << endl;
+            kdDebug(6040) << renderName() << " Child contains page-break to page " << xpage << endl;
 #endif
             // ### Actually this assumes floating children are breaking/clearing
             // nicely as well.
@@ -1572,24 +1572,24 @@ void RenderBlock::clearChildOfPageBreaks(RenderObject *child, PageBreakInfo &pag
         pageBreakInfo.setForcePageBreak(true);
 }
 
-void RenderBlock::tqlayoutPositionedObjects(bool retqlayoutChildren)
+void RenderBlock::layoutPositionedObjects(bool relayoutChildren)
 {
     if (m_positionedObjects) {
-        //kdDebug( 6040 ) << renderName() << " " << this << "::tqlayoutPositionedObjects() start" << endl;
+        //kdDebug( 6040 ) << renderName() << " " << this << "::layoutPositionedObjects() start" << endl;
         RenderObject* r;
         TQPtrListIterator<RenderObject> it(*m_positionedObjects);
         for ( ; (r = it.current()); ++it ) {
             //kdDebug(6040) << "   have a positioned object" << endl;
             if (r->markedForRepaint()) {
-                r->tqrepaintDuringLayout();
+                r->repaintDuringLayout();
                 r->setMarkedForRepaint(false);
             }
-            if ( retqlayoutChildren || r->style()->position() == FIXED ||
+            if ( relayoutChildren || r->style()->position() == FIXED ||
                    ((r->hasStaticY()||r->hasStaticX()) && r->parent() != this && r->parent()->isBlockFlow()) ) {
                 r->setChildNeedsLayout(true);
                 r->dirtyFormattingContext(false);
             }
-            r->tqlayoutIfNeeded();
+            r->layoutIfNeeded();
         }
     }
 }
@@ -1775,7 +1775,7 @@ void RenderBlock::insertFloatingObject(RenderObject *o)
     FloatingObject *newObj;
     if (o->isFloating()) {
         // floating object
-        o->tqlayoutIfNeeded();
+        o->layoutIfNeeded();
 
         if(o->style()->floating() & FLEFT)
             newObj = new FloatingObject(FloatingObject::FloatLeft);
@@ -1894,7 +1894,7 @@ void RenderBlock::positionNewFloats()
             if (ftQuirk && (rightRelOffset(y,ro, false)-fx < f->width)) {
                 o->setPos( o->xPos(), y + o->marginTop() );
                 o->setChildNeedsLayout(true, false);
-                o->tqlayoutIfNeeded();
+                o->layoutIfNeeded();
                 _height = o->height() + o->marginTop() + o->marginBottom();
                 f->width = o->width() + o->marginLeft() + o->marginRight();
             }
@@ -1918,7 +1918,7 @@ void RenderBlock::positionNewFloats()
             if (ftQuirk && (fx - leftRelOffset(y,lo, false) < f->width)) {
                 o->setPos( o->xPos(), y + o->marginTop() );
                 o->setChildNeedsLayout(true, false);
-                o->tqlayoutIfNeeded();
+                o->layoutIfNeeded();
                 _height = o->height() + o->marginTop() + o->marginBottom();
                 f->width = o->width() + o->marginLeft() + o->marginRight();
             }
@@ -1950,7 +1950,7 @@ void RenderBlock::newLine()
     positionNewFloats();
     // set y position
     int newY = 0;
-    switch(m_cleartqStatus)
+    switch(m_clearStatus)
     {
         case CLEFT:
             newY = leftBottom();
@@ -1968,7 +1968,7 @@ void RenderBlock::newLine()
         //      kdDebug( 6040 ) << "adjusting y position" << endl;
         m_height = newY;
     }
-    m_cleartqStatus = CNONE;
+    m_clearStatus = CNONE;
 }
 
 int
@@ -2315,7 +2315,7 @@ RenderBlock::clearFloats()
 
     RenderObject *prev = previousSibling();
 
-    // tqfind the element to copy the floats from
+    // find the element to copy the floats from
     // pass non-flows
     // pass fAF's
     bool parentHasFloats = false;
@@ -2438,7 +2438,7 @@ void RenderBlock::addOverHangingFloats( RenderBlock *flow, int xoff, int offset,
     }
 }
 
-bool RenderBlock::tqcontainsFloat(RenderObject* o) const
+bool RenderBlock::containsFloat(RenderObject* o) const
 {
     if (m_floatingObjects) {
         TQPtrListIterator<FloatingObject> it(*m_floatingObjects);
@@ -2463,7 +2463,7 @@ void RenderBlock::markAllDescendantsWithFloatsForLayout(RenderObject* floatToRem
     if (!childrenInline()) {
         for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
             if (isBlockFlow() && !child->isFloatingOrPositioned() &&
-                ((floatToRemove ? child->tqcontainsFloat(floatToRemove) : child->hasFloats()) || child->usesLineWidth()))
+                ((floatToRemove ? child->containsFloat(floatToRemove) : child->hasFloats()) || child->usesLineWidth()))
                 child->markAllDescendantsWithFloatsForLayout(floatToRemove);
         }
     }
@@ -2518,7 +2518,7 @@ bool RenderBlock::isPointInScrollbar(int _x, int _y, int _tx, int _ty)
                        _ty + borderTop() - borderTopExtra(),
                        m_layer->verticalScrollbarWidth(),
                        height() + borderTopExtra() + borderBottomExtra()-borderTop()-borderBottom());
-        if (vertRect.tqcontains(_x, _y)) {
+        if (vertRect.contains(_x, _y)) {
 #ifdef APPLE_CHANGES
             RenderLayer::gScrollBar = m_layer->verticalScrollbar();
 #endif
@@ -2531,7 +2531,7 @@ bool RenderBlock::isPointInScrollbar(int _x, int _y, int _tx, int _ty)
                         _ty + height() + borderTop() + borderBottomExtra() - borderBottom() - m_layer->horizontalScrollbarHeight(),
                         width()-borderLeft()-borderRight(),
                         m_layer->horizontalScrollbarHeight());
-        if (horizRect.tqcontains(_x, _y)) {
+        if (horizRect.contains(_x, _y)) {
 #ifdef APPLE_CHANGES
             RenderLayer::gScrollBar = m_layer->horizontalScrollbar();
 #endif
@@ -2705,7 +2705,7 @@ void RenderBlock::calcInlineMinMaxWidth()
             // and are included in the iteration solely so that their margins can
             // be added in.
             //
-            // (2) An inline non-text non-flow object, e.g., an inline tqreplaced element.
+            // (2) An inline non-text non-flow object, e.g., an inline replaced element.
             // These objects can always be on a line by themselves, so in this situation
             // we need to go ahead and break the current line, and then add in our own
             // margins and min/max width on its own line, and then terminate the line.
@@ -2735,7 +2735,7 @@ void RenderBlock::calcInlineMinMaxWidth()
             short childMax = 0;
 
             if (!child->isText()) {
-                // Case (1) and (2).  Inline tqreplaced and inline flow elements.
+                // Case (1) and (2).  Inline replaced and inline flow elements.
                 if (child->isInlineFlow()) {
                     // Add in padding/border/margin from the appropriate side of
                     // the element.
@@ -2747,7 +2747,7 @@ void RenderBlock::calcInlineMinMaxWidth()
                     inlineMax += childMax;
                 }
                 else {
-                    // Inline tqreplaced elements add in their margins to their min/max values.
+                    // Inline replaced elements add in their margins to their min/max values.
                     int margins = 0;
                     LengthType type = cstyle->marginLeft().type();
                     if ( type != Variable )
@@ -2763,7 +2763,7 @@ void RenderBlock::calcInlineMinMaxWidth()
             if (!child->isRenderInline() && !child->isText()) {
 
                 bool qBreak = isTcQuirk && !child->isFloatingOrPositioned();
-                // Case (2). Inline tqreplaced elements and floats.
+                // Case (2). Inline replaced elements and floats.
                 // Go ahead and terminate the current line as far as
                 // minwidth is concerned.
                 childMin += child->minWidth();
@@ -3143,7 +3143,7 @@ void RenderBlock::dump(TQTextStream &stream, const TQString &ind) const
         stream << ")";
     }
 
-    // ### EClear m_cleartqStatus
+    // ### EClear m_clearStatus
 }
 #endif
 
diff --git a/khtml/rendering/render_block.h b/khtml/rendering/render_block.h
index df8d16fe0..2b0e49398 100644
--- a/khtml/rendering/render_block.h
+++ b/khtml/rendering/render_block.h
@@ -98,21 +98,21 @@ public:
     virtual void attach();
     void updateFirstLetter();
 
-    virtual void tqlayout();
-    void tqlayoutBlock( bool retqlayoutChildren );
-    void tqlayoutBlockChildren( bool retqlayoutChildren );
-    void tqlayoutInlineChildren( bool retqlayoutChildren, int breakBeforeLine = 0);
+    virtual void layout();
+    void layoutBlock( bool relayoutChildren );
+    void layoutBlockChildren( bool relayoutChildren );
+    void layoutInlineChildren( bool relayoutChildren, int breakBeforeLine = 0);
 
-    void tqlayoutPositionedObjects( bool retqlayoutChildren );
+    void layoutPositionedObjects( bool relayoutChildren );
     void insertPositionedObject(RenderObject *o);
     void removePositionedObject(RenderObject *o);
 
     // Called to lay out the legend for a fieldset.
-    virtual RenderObject* tqlayoutLegend(bool /*retqlayoutChildren*/) { return 0; };
+    virtual RenderObject* layoutLegend(bool /*relayoutChildren*/) { return 0; };
 
     // the implementation of the following functions is in bidi.cpp
     void bidiReorderLine(const BidiIterator &start, const BidiIterator &end, BidiState &bidi );
-    BidiIterator tqfindNextLineBreak(BidiIterator &start, BidiState &info );
+    BidiIterator findNextLineBreak(BidiIterator &start, BidiState &info );
     InlineFlowBox* constructLine(const BidiIterator& start, const BidiIterator& end);
     InlineFlowBox* createLineBoxes(RenderObject* obj);
     void computeHorizontalPositionsForLine(InlineFlowBox* lineBox, BidiState &bidi);
@@ -136,11 +136,11 @@ public:
     int getClearDelta(RenderObject *child);
     virtual void markAllDescendantsWithFloatsForLayout(RenderObject* floatToRemove = 0);
 
-    // FIXME: tqcontainsFloats() should not return true if the floating objects list
-    // is empty. However, tqlayoutInlineChildren() relies on the current behavior.
+    // FIXME: containsFloats() should not return true if the floating objects list
+    // is empty. However, layoutInlineChildren() relies on the current behavior.
     // http://bugzilla.opendarwin.org/show_bug.cgi?id=7395#c3
     virtual bool hasFloats() const { return m_floatingObjects!=0; }
-    virtual bool tqcontainsFloat(RenderObject* o) const;
+    virtual bool containsFloat(RenderObject* o) const;
 
     virtual bool hasOverhangingFloats() const { return floatBottom() > m_height; }
     void addOverHangingFloats( RenderBlock *block, int xoffset, int yoffset, bool child );
@@ -222,7 +222,7 @@ protected:
         bool crossedLayer : 1; // lock noPaint flag
     };
 
-    // The following helper functions and structs are used by tqlayoutBlockChildren.
+    // The following helper functions and structs are used by layoutBlockChildren.
     class CompactInfo {
         // A compact child that needs to be collapsed into the margin of the following block.
         RenderObject* m_compact;
@@ -342,7 +342,7 @@ protected:
     void handleBottomOfBlock(int top, int bottom, MarginInfo& marginInfo);
     void setCollapsedBottomMargin(const MarginInfo& marginInfo);
     void clearChildOfPageBreaks(RenderObject* child, PageBreakInfo &pageBreakInfo, MarginInfo &marginInfo);
-    // End helper functions and structs used by tqlayoutBlockChildren.
+    // End helper functions and structs used by layoutBlockChildren.
 
 protected:
     // How much content overflows out of our block vertically or horizontally (all we support
@@ -359,8 +359,8 @@ private:
     TQPtrList<RenderObject>* m_positionedObjects;
 
     bool m_childrenInline : 1;
-    bool m_firstLine      : 1; // used in inline tqlayouting
-    EClear m_cleartqStatus  : 2; // used during layuting of paragraphs
+    bool m_firstLine      : 1; // used in inline layouting
+    EClear m_clearStatus  : 2; // used during layuting of paragraphs
     bool m_avoidPageBreak : 1; // anonymous avoid page-break block
     bool m_topMarginQuirk : 1;
     bool m_bottomMarginQuirk : 1;
diff --git a/khtml/rendering/render_body.cpp b/khtml/rendering/render_body.cpp
index 14256d91b..930ec358c 100644
--- a/khtml/rendering/render_body.cpp
+++ b/khtml/rendering/render_body.cpp
@@ -81,20 +81,20 @@ void RenderBody::paintBoxDecorations(PaintInfo& paintInfo, int _tx, int _ty)
 
 }
 
-void RenderBody::tqrepaint(Priority p)
+void RenderBody::repaint(Priority p)
 {
     RenderObject *cb = containingBlock();
     if(cb)
-	cb->tqrepaint(p);
+	cb->repaint(p);
 }
 
-void RenderBody::tqlayout()
+void RenderBody::layout()
 {
     // in quirk mode, we'll need to have our margins determined
     // for percentage height calculations
     if (style()->htmlHacks())
         calcHeight();
-    RenderBlock::tqlayout();
+    RenderBlock::layout();
 
     if (!scrollbarsStyled)
     {
diff --git a/khtml/rendering/render_body.h b/khtml/rendering/render_body.h
index d508b8f5e..7951f73e1 100644
--- a/khtml/rendering/render_body.h
+++ b/khtml/rendering/render_body.h
@@ -40,9 +40,9 @@ public:
     virtual bool isBody() const { return true; }
 
     virtual const char *renderName() const { return "RenderBody"; }
-    virtual void tqrepaint(Priority p=NormalPriority);
+    virtual void repaint(Priority p=NormalPriority);
 
-    virtual void tqlayout();
+    virtual void layout();
     virtual void setStyle(RenderStyle* style);
 
     virtual int availableHeight() const;
diff --git a/khtml/rendering/render_box.cpp b/khtml/rendering/render_box.cpp
index 4ec95bf9c..e6742d54e 100644
--- a/khtml/rendering/render_box.cpp
+++ b/khtml/rendering/render_box.cpp
@@ -117,9 +117,9 @@ void RenderBox::restructureParentFlow() {
 static inline bool overflowAppliesTo(RenderObject* o) 
 {
      // css 2.1-11.1.1
-     // 1) overflow only applies to non-tqreplaced block-level elements, table cells, and inline-block elements
+     // 1) overflow only applies to non-replaced block-level elements, table cells, and inline-block elements
      if (o->isRenderBlock() || o->isTableRow() || o->isTableSection())
-         // 2) overflow on root applies to the viewport (cf. KHTMLView::tqlayout)
+         // 2) overflow on root applies to the viewport (cf. KHTMLView::layout)
          if (!o->isRoot())
              // 3) overflow on body may apply to the viewport...
              if (!o->isBody()
@@ -490,7 +490,7 @@ void RenderBox::paintBackgroundExtended(TQPainter *p, const TQColor &c, const Ba
     TQColor bgColor = c;
 
     // Paint the color first underneath all images.
-    if (!bgLayer->next() && bgColor.isValid() && tqAlpha(bgColor.rgb()) > 0)
+    if (!bgLayer->next() && bgColor.isValid() && qAlpha(bgColor.rgb()) > 0)
         p->fillRect(_tx, clipy, w, cliph, bgColor);
 
     // no progressive loading of the background image
@@ -622,7 +622,7 @@ void RenderBox::paintBackgroundExtended(TQPainter *p, const TQColor &c, const Ba
             sy+=b.y()-cy;
             cx=b.x();cy=b.y();cw=b.width();ch=b.height();
         }
-        // restrict painting to tqrepaint-clip
+        // restrict painting to repaint-clip
         if (cy < clipy) {
             ch -= (clipy - cy);
             sy += (clipy - cy);
@@ -795,7 +795,7 @@ void RenderBox::position(InlineBox* box, int /*from*/, int /*len*/, bool /*rever
         setPos( box->xPos(), box->yPos() );
 }
 
-void RenderBox::tqrepaint(Priority prior)
+void RenderBox::repaint(Priority prior)
 {
     int ow = style() ? style()->outlineSize() : 0;
     if( isInline() && !isReplaced() )
@@ -806,17 +806,17 @@ void RenderBox::tqrepaint(Priority prior)
             p = p->parent();
         int xoff = p->hasOverflowClip() ? 0 : p->overflowLeft();
         int yoff = p->hasOverflowClip() ? 0 : p->overflowTop();
-        p->tqrepaintRectangle( -ow + xoff, -ow + yoff, p->effectiveWidth()+ow*2, p->effectiveHeight()+ow*2, prior);
+        p->repaintRectangle( -ow + xoff, -ow + yoff, p->effectiveWidth()+ow*2, p->effectiveHeight()+ow*2, prior);
     }
     else
     {
         int xoff = hasOverflowClip() ? 0 : overflowLeft();
         int yoff = hasOverflowClip() ? 0 : overflowTop();
-        tqrepaintRectangle( -ow + xoff, -ow + yoff, effectiveWidth()+ow*2, effectiveHeight()+ow*2, prior);
+        repaintRectangle( -ow + xoff, -ow + yoff, effectiveWidth()+ow*2, effectiveHeight()+ow*2, prior);
     }
 }
 
-void RenderBox::tqrepaintRectangle(int x, int y, int w, int h, Priority p, bool f)
+void RenderBox::repaintRectangle(int x, int y, int w, int h, Priority p, bool f)
 {
     x += m_x;
     y += m_y;
@@ -830,7 +830,7 @@ void RenderBox::tqrepaintRectangle(int x, int y, int w, int h, Priority p, bool
 
     if (style()->position() == FIXED) f=true;
 
-    // kdDebug( 6040 ) << "RenderBox(" <<this << ", " << renderName() << ")::tqrepaintRectangle (" << x << "/" << y << ") (" << w << "/" << h << ")" << endl;
+    // kdDebug( 6040 ) << "RenderBox(" <<this << ", " << renderName() << ")::repaintRectangle (" << x << "/" << y << ") (" << w << "/" << h << ")" << endl;
     RenderObject *o = container();
     if( o ) {
          if (o->layer()) {
@@ -839,7 +839,7 @@ void RenderBox::tqrepaintRectangle(int x, int y, int w, int h, Priority p, bool
              if (style()->position() == ABSOLUTE)
                  o->layer()->checkInlineRelOffset(this,x,y);
         }
-        o->tqrepaintRectangle(x, y, w, h, p, f);
+        o->repaintRectangle(x, y, w, h, p, f);
     }
 }
 
@@ -1364,8 +1364,8 @@ void RenderBox::calcAbsoluteHorizontal()
     // percentage issues.
 
     // The following is based off of the W3C Working Draft from April 11, 2006 of
-    // CSS 2.1: Section 10.3.7 "Absolutely positioned, non-tqreplaced elements"
-    // <http://www.w3.org/TR/CSS21/visudet.html#abs-non-tqreplaced-width>
+    // CSS 2.1: Section 10.3.7 "Absolutely positioned, non-replaced elements"
+    // <http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width>
     // (block-style-comments in this function and in calcAbsoluteHorizontalValues()
     // correspond to text from the spec)
 
@@ -1415,14 +1415,14 @@ void RenderBox::calcAbsoluteHorizontal()
     // Calculate the static distance if needed.
     if (left.isVariable() && right.isVariable()) {
         if (containerDirection == LTR) {
-            // 'm_staticX' should already have been set through tqlayout of the parent.
+            // 'm_staticX' should already have been set through layout of the parent.
             int staticPosition = m_staticX - containerBlock->borderLeft();
             for (RenderObject* po = parent(); po && po != containerBlock; po = po->parent())
                 staticPosition += po->xPos();
             left = Length(staticPosition, Fixed);
         } else {
             RenderObject* po = parent();
-            // 'm_staticX' should already have been set through tqlayout of the parent.
+            // 'm_staticX' should already have been set through layout of the parent.
             int staticPosition = m_staticX + containerWidth + containerBlock->borderRight() - po->width();
             for (; po && po != containerBlock; po = po->parent())
                 staticPosition -= po->xPos();
@@ -1575,7 +1575,7 @@ void RenderBox::calcAbsoluteHorizontalValues(Length width, const RenderObject* c
          *    for 'right'
          *
          * Calculation of the shrink-to-fit width is similar to calculating the
-         * width of a table cell using the automatic table tqlayout algorithm.
+         * width of a table cell using the automatic table layout algorithm.
          * Roughly: calculate the preferred width by formatting the content
          * without breaking lines other than where explicit line breaks occur,
          * and also calculate the preferred minimum width, e.g., by trying all
@@ -1596,7 +1596,7 @@ void RenderBox::calcAbsoluteHorizontalValues(Length width, const RenderObject* c
 
         const int availableSpace = containerWidth - (marginLeftValue + marginRightValue + bordersPlusPadding);
 
-        // FIXME: Is there a faster way to tqfind the correct case?
+        // FIXME: Is there a faster way to find the correct case?
         // Use rule/case that applies.
         if (leftIsAuto && widthIsAuto && !rightIsAuto) {
             // RULE 1: (use shrink-to-fit for width, and solve of left)
@@ -1645,8 +1645,8 @@ void RenderBox::calcAbsoluteVertical()
     }
 
     // The following is based off of the W3C Working Draft from April 11, 2006 of
-    // CSS 2.1: Section 10.6.4 "Absolutely positioned, non-tqreplaced elements"
-    // <http://www.w3.org/TR/2005/WD-CSS21-20050613/visudet.html#abs-non-tqreplaced-height>
+    // CSS 2.1: Section 10.6.4 "Absolutely positioned, non-replaced elements"
+    // <http://www.w3.org/TR/2005/WD-CSS21-20050613/visudet.html#abs-non-replaced-height>
     // (block-style-comments in this function and in calcAbsoluteVerticalValues()
     // correspond to text from the spec)
 
@@ -1680,7 +1680,7 @@ void RenderBox::calcAbsoluteVertical()
 
     // Calculate the static distance if needed.
     if (top.isVariable() && bottom.isVariable()) {
-        // m_staticY should already have been set through tqlayout of the parent()
+        // m_staticY should already have been set through layout of the parent()
         int staticTop = m_staticY - containerBlock->borderTop();
         for (RenderObject* po = parent(); po && po != containerBlock; po = po->parent()) {
             staticTop += po->yPos();
@@ -1876,8 +1876,8 @@ void RenderBox::calcAbsoluteVerticalValues(Length height, const RenderObject* co
 void RenderBox::calcAbsoluteHorizontalReplaced()
 {
     // The following is based off of the W3C Working Draft from April 11, 2006 of
-    // CSS 2.1: Section 10.3.8 "Absolutly positioned, tqreplaced elements"
-    // <http://www.w3.org/TR/2005/WD-CSS21-20050613/visudet.html#abs-tqreplaced-width>
+    // CSS 2.1: Section 10.3.8 "Absolutly positioned, replaced elements"
+    // <http://www.w3.org/TR/2005/WD-CSS21-20050613/visudet.html#abs-replaced-width>
     // (block-style-comments in this function correspond to text from the spec and
     // the numbers correspond to numbers in spec)
 
@@ -1900,12 +1900,12 @@ void RenderBox::calcAbsoluteHorizontalReplaced()
 
 
     /*-----------------------------------------------------------------------*\
-     * 1. The used value of 'width' is determined as for inline tqreplaced
+     * 1. The used value of 'width' is determined as for inline replaced
      *    elements.
     \*-----------------------------------------------------------------------*/
     // NOTE: This value of width is FINAL in that the min/max width calculations
     // are dealt with in calcReplacedWidth().  This means that the steps to produce
-    // correct max/min in the non-tqreplaced version, are not necessary.
+    // correct max/min in the non-replaced version, are not necessary.
     m_width = calcReplacedWidth() + borderLeft() + borderRight() + paddingLeft() + paddingRight();
     const int availableSpace = containerWidth - m_width;
 
@@ -1917,14 +1917,14 @@ void RenderBox::calcAbsoluteHorizontalReplaced()
     if (left.isVariable() && right.isVariable()) {
         // see FIXME 1
         if (containerDirection == LTR) {
-            // 'm_staticX' should already have been set through tqlayout of the parent.
+            // 'm_staticX' should already have been set through layout of the parent.
             int staticPosition = m_staticX - containerBlock->borderLeft();
             for (RenderObject* po = parent(); po && po != containerBlock; po = po->parent())
                 staticPosition += po->xPos();
             left.setValue(Fixed, staticPosition);
         } else {
             RenderObject* po = parent();
-            // 'm_staticX' should already have been set through tqlayout of the parent.
+            // 'm_staticX' should already have been set through layout of the parent.
             int staticPosition = m_staticX + containerWidth + containerBlock->borderRight() - po->width();
             for (; po && po != containerBlock; po = po->parent())
                 staticPosition -= po->xPos();
@@ -1933,7 +1933,7 @@ void RenderBox::calcAbsoluteHorizontalReplaced()
     }
 
     /*-----------------------------------------------------------------------*\
-     * 3. If 'left' or 'right' are 'auto', tqreplace any 'auto' on 'margin-left'
+     * 3. If 'left' or 'right' are 'auto', replace any 'auto' on 'margin-left'
      *    or 'margin-right' with '0'.
     \*-----------------------------------------------------------------------*/
     if (left.isVariable() || right.isVariable()) {
@@ -2040,8 +2040,8 @@ void RenderBox::calcAbsoluteHorizontalReplaced()
 void RenderBox::calcAbsoluteVerticalReplaced()
 {
     // The following is based off of the W3C Working Draft from April 11, 2006 of
-    // CSS 2.1: Section 10.6.5 "Absolutly positioned, tqreplaced elements"
-    // <http://www.w3.org/TR/2005/WD-CSS21-20050613/visudet.html#abs-tqreplaced-height>
+    // CSS 2.1: Section 10.6.5 "Absolutly positioned, replaced elements"
+    // <http://www.w3.org/TR/2005/WD-CSS21-20050613/visudet.html#abs-replaced-height>
     // (block-style-comments in this function correspond to text from the spec and
     // the numbers correspond to numbers in spec)
 
@@ -2057,21 +2057,21 @@ void RenderBox::calcAbsoluteVerticalReplaced()
 
 
     /*-----------------------------------------------------------------------*\
-     * 1. The used value of 'height' is determined as for inline tqreplaced
+     * 1. The used value of 'height' is determined as for inline replaced
      *    elements.
     \*-----------------------------------------------------------------------*/
     // NOTE: This value of height is FINAL in that the min/max height calculations
     // are dealt with in calcReplacedHeight().  This means that the steps to produce
-    // correct max/min in the non-tqreplaced version, are not necessary.
+    // correct max/min in the non-replaced version, are not necessary.
     m_height = calcReplacedHeight() + borderTop() + borderBottom() + paddingTop() + paddingBottom();
     const int availableSpace = containerHeight - m_height;
 
     /*-----------------------------------------------------------------------*\
-     * 2. If both 'top' and 'bottom' have the value 'auto', tqreplace 'top'
+     * 2. If both 'top' and 'bottom' have the value 'auto', replace 'top'
      *    with the element's static position.
     \*-----------------------------------------------------------------------*/
     if (top.isVariable() && bottom.isVariable()) {
-        // m_staticY should already have been set through tqlayout of the parent().
+        // m_staticY should already have been set through layout of the parent().
         int staticTop = m_staticY - containerBlock->borderTop();
         for (RenderObject* po = parent(); po && po != containerBlock; po = po->parent()) {
             staticTop += po->yPos();
@@ -2080,7 +2080,7 @@ void RenderBox::calcAbsoluteVerticalReplaced()
     }
 
     /*-----------------------------------------------------------------------*\
-     * 3. If 'bottom' is 'auto', tqreplace any 'auto' on 'margin-top' or
+     * 3. If 'bottom' is 'auto', replace any 'auto' on 'margin-top' or
      *    'margin-bottom' with '0'.
     \*-----------------------------------------------------------------------*/
     // FIXME: The spec. says that this step should only be taken when bottom is
@@ -2296,7 +2296,7 @@ void RenderBox::caretPos(int /*offset*/, int flags, int &_x, int &_y, int &width
 	switch (s->textAlign()) {
 	case LEFT:
 	case KHTML_LEFT:
-	case TAAUTO:	// ### tqfind out what this does
+	case TAAUTO:	// ### find out what this does
 	case JUSTIFY:
 	    break;
 	case CENTER:
diff --git a/khtml/rendering/render_box.h b/khtml/rendering/render_box.h
index dcc38ba7d..c0c618d5c 100644
--- a/khtml/rendering/render_box.h
+++ b/khtml/rendering/render_box.h
@@ -87,9 +87,9 @@ public:
     virtual int rightmostPosition(bool includeOverflowInterior=true, bool includeSelf=true) const;
     virtual int leftmostPosition(bool includeOverflowInterior=true, bool includeSelf=true) const;
 
-    virtual void tqrepaint(Priority p=NormalPriority);
+    virtual void repaint(Priority p=NormalPriority);
 
-    virtual void tqrepaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false);
+    virtual void repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false);
 
     virtual short containingBlockWidth() const;
     void relativePositionOffset(int &tx, int &ty) const;
@@ -202,7 +202,7 @@ protected:
 
     /* A box used to represent this object on a line
      * when its inner content isn't contextually relevant
-     * (e.g tqreplaced or positioned elements)
+     * (e.g replaced or positioned elements)
      */
     InlineBox *m_placeHolderBox;
 };
diff --git a/khtml/rendering/render_canvas.cpp b/khtml/rendering/render_canvas.cpp
index 02eaa1599..e8540eba6 100644
--- a/khtml/rendering/render_canvas.cpp
+++ b/khtml/rendering/render_canvas.cpp
@@ -136,7 +136,7 @@ void RenderCanvas::calcMinMaxWidth()
 
 //#define SPEED_DEBUG
 
-void RenderCanvas::tqlayout()
+void RenderCanvas::layout()
 {
     if (m_pagedMode) {
        m_minWidth = m_width;
@@ -178,12 +178,12 @@ void RenderCanvas::tqlayout()
     qt.start();
 #endif
 
-    bool retqlayoutChildren = (oldWidth != m_width) || (oldHeight != m_height);
+    bool relayoutChildren = (oldWidth != m_width) || (oldHeight != m_height);
 
-    RenderBlock::tqlayoutBlock( retqlayoutChildren );
+    RenderBlock::layoutBlock( relayoutChildren );
 
 #ifdef SPEED_DEBUG
-    kdDebug() << "RenderCanvas::tqlayout time used=" << qt.elapsed() << endl;
+    kdDebug() << "RenderCanvas::layout time used=" << qt.elapsed() << endl;
     qt.start();
 #endif
 
@@ -217,11 +217,11 @@ void RenderCanvas::updateDocumentSize()
         // if we are about to show a scrollbar, and the document is sized to the viewport w or h,
         // then reserve the scrollbar space so that it doesn't trigger the _other_ scrollbar
 
-        if (!vss && m_width - m_view->verticalScrollBar()->tqsizeHint().width() == s.width() &&
+        if (!vss && m_width - m_view->verticalScrollBar()->sizeHint().width() == s.width() &&
             m_cachedDocWidth <= m_width)
             hDocW = kMin( m_cachedDocWidth, s.width() );
 
-        if (!hss && m_height - m_view->horizontalScrollBar()->tqsizeHint().height() == s.height() &&
+        if (!hss && m_height - m_view->horizontalScrollBar()->sizeHint().height() == s.height() &&
             m_cachedDocHeight <= m_height)
             hDocH = kMin( m_cachedDocHeight, s.height() );
 
@@ -269,7 +269,7 @@ bool RenderCanvas::needsFullRepaint() const
     return m_needsFullRepaint || m_pagedMode;
 }
 
-void RenderCanvas::tqrepaintViewRectangle(int x, int y, int w, int h, bool asap)
+void RenderCanvas::repaintViewRectangle(int x, int y, int w, int h, bool asap)
 {
   KHTMLAssert( view() );
   view()->scheduleRepaint( x, y, w, h, asap );
@@ -332,7 +332,7 @@ void RenderCanvas::paintBoxDecorations(PaintInfo& paintInfo, int /*_tx*/, int /*
     paintInfo.p->fillRect(paintInfo.r, view()->palette().active().color(TQColorGroup::Base));
 }
 
-void RenderCanvas::tqrepaintRectangle(int x, int y, int w, int h, Priority p, bool f)
+void RenderCanvas::repaintRectangle(int x, int y, int w, int h, Priority p, bool f)
 {
     if (m_staticMode) return;
 //    kdDebug( 6040 ) << "updating views contents (" << x << "/" << y << ") (" << w << "/" << h << ")" << endl;
@@ -353,7 +353,7 @@ void RenderCanvas::tqrepaintRectangle(int x, int y, int w, int h, Priority p, bo
         if (p == RealtimePriority)
 	// ### KWQ's updateContents has an additional parameter "now".
 	// It's not clear what the difference between updateContents(...,true)
-	// and tqrepaintContents(...) is. As Qt doesn't have this, I'm leaving it out. (LS)
+	// and repaintContents(...) is. As Qt doesn't have this, I'm leaving it out. (LS)
             m_view->updateContents(ur/*, true*/);
         else if (p == HighPriority)
             m_view->scheduleRepaint(x, y, w, h, true /*asap*/);
@@ -372,23 +372,23 @@ void RenderCanvas::scheduleDeferredRepaints()
     if (!needsFullRepaint()) {
         TQValueList<RenderObject*>::const_iterator it;
         for ( it = m_dirtyChildren.begin(); it != m_dirtyChildren.end(); ++it )
-            (*it)->tqrepaint();
+            (*it)->repaint();
     }
-    //kdDebug(6040) << "scheduled deferred tqrepaints: " << m_dirtyChildren.count() << " needed full tqrepaint: " << needsFullRepaint() << endl;
+    //kdDebug(6040) << "scheduled deferred repaints: " << m_dirtyChildren.count() << " needed full repaint: " << needsFullRepaint() << endl;
     m_dirtyChildren.clear();
 }
 
-void RenderCanvas::tqrepaint(Priority p)
+void RenderCanvas::repaint(Priority p)
 {
     if (m_view && !m_staticMode) {
         if (p == RealtimePriority) {
             //m_view->resizeContents(docWidth(), docHeight());
             m_view->unscheduleRepaint();
             if (needsLayout()) {
-                m_view->scheduleRetqlayout();
+                m_view->scheduleRelayout();
                 return;
             }
-	    // ### same as in tqrepaintRectangle
+	    // ### same as in repaintRectangle
             m_view->updateContents(m_view->contentsX(), m_view->contentsY(),
                                    m_view->visibleWidth(), m_view->visibleHeight()/*, true*/);
         }
@@ -454,7 +454,7 @@ TQRect RenderCanvas::selectionRect() const
 void RenderCanvas::setSelection(RenderObject *s, int sp, RenderObject *e, int ep)
 {
     // Check we got valid renderobjects. www.msnbc.com and clicking
-    // around, to tqfind the case where this happened.
+    // around, to find the case where this happened.
     if ( !s || !e )
     {
         kdWarning(6040) << "RenderCanvas::setSelection() called with start=" << s << " end=" << e << endl;
@@ -492,7 +492,7 @@ void RenderCanvas::setSelection(RenderObject *s, int sp, RenderObject *e, int ep
                     no = no->nextSibling();
             }
         }
-        if (os->selectionState() == SelectionInside && !oldSelectedInside.tqcontainsRef(os))
+        if (os->selectionState() == SelectionInside && !oldSelectedInside.containsRef(os))
             oldSelectedInside.append(os);
 
         os = no;
@@ -550,7 +550,7 @@ void RenderCanvas::setSelection(RenderObject *s, int sp, RenderObject *e, int ep
                 if (no)
                     no = no->nextSibling();
             }
-        if (o->selectionState() == SelectionInside && !newSelectedInside.tqcontainsRef(o))
+        if (o->selectionState() == SelectionInside && !newSelectedInside.containsRef(o))
             newSelectedInside.append(o);
 
         o=no;
@@ -567,7 +567,7 @@ void RenderCanvas::setSelection(RenderObject *s, int sp, RenderObject *e, int ep
 
     TQRect updateRect;
 
-    // Don't use tqrepaint() because it will cause all rects to
+    // Don't use repaint() because it will cause all rects to
     // be united (see khtmlview::scheduleRepaint()).  Instead
     // just draw damage rects for objects that have a change
     // in selection state.
@@ -581,7 +581,7 @@ void RenderCanvas::setSelection(RenderObject *s, int sp, RenderObject *e, int ep
     TQPtrListIterator<RenderObject> oldIterator(oldSelectedInside);
     bool firstRect = true;
     for (; oldIterator.current(); ++oldIterator){
-        if (!newSelectedInside.tqcontainsRef(oldIterator.current())){
+        if (!newSelectedInside.containsRef(oldIterator.current())){
             if (firstRect){
                 updateRect = enclosingPositionedRect(oldIterator.current());
                 firstRect = false;
@@ -601,7 +601,7 @@ void RenderCanvas::setSelection(RenderObject *s, int sp, RenderObject *e, int ep
     TQPtrListIterator<RenderObject> newIterator(newSelectedInside);
     firstRect = true;
     for (; newIterator.current(); ++newIterator){
-        if (!oldSelectedInside.tqcontainsRef(newIterator.current())){
+        if (!oldSelectedInside.containsRef(newIterator.current())){
             if (firstRect){
                 updateRect = enclosingPositionedRect(newIterator.current());
                 firstRect = false;
@@ -651,9 +651,9 @@ void RenderCanvas::clearSelection(bool doRepaint)
     {
         if (o->selectionState()!=SelectionNone)
             if (doRepaint)
-                o->tqrepaint();
+                o->repaint();
         o->setSelectionState(SelectionNone);
-        o->tqrepaint();
+        o->repaint();
         RenderObject* no;
         if ( !(no = o->firstChild()) )
             if ( !(no = o->nextSibling()) )
@@ -669,7 +669,7 @@ void RenderCanvas::clearSelection(bool doRepaint)
     if (m_selectionEnd) {
         m_selectionEnd->setSelectionState(SelectionNone);
         if (doRepaint)
-            m_selectionEnd->tqrepaint();
+            m_selectionEnd->repaint();
     }
 
     // set selection start & end to 0
diff --git a/khtml/rendering/render_canvas.h b/khtml/rendering/render_canvas.h
index 741e56f4e..17f279d7b 100644
--- a/khtml/rendering/render_canvas.h
+++ b/khtml/rendering/render_canvas.h
@@ -50,7 +50,7 @@ public:
     virtual bool isCanvas() const { return true; }
 
     virtual void setStyle(RenderStyle *style);
-    virtual void tqlayout();
+    virtual void layout();
     virtual void calcWidth();
     virtual void calcHeight();
     virtual void calcMinMaxWidth();
@@ -61,9 +61,9 @@ public:
 
     KHTMLView *view() const { return m_view; }
 
-    virtual void tqrepaint(Priority p=NormalPriority);
-    virtual void tqrepaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false);
-    void tqrepaintViewRectangle(int x, int y, int w, int h, bool asap=false);
+    virtual void repaint(Priority p=NormalPriority);
+    virtual void repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false);
+    void repaintViewRectangle(int x, int y, int w, int h, bool asap=false);
     bool needsFullRepaint() const;
     void deferredRepaint( RenderObject* o );
     void scheduleDeferredRepaints();
@@ -137,7 +137,7 @@ protected:
     void updateDocumentSize();
 
     // internal setters for cached values of document width/height
-    // Setting to -1/-1 tqinvalidates the cache.
+    // Setting to -1/-1 invalidates the cache.
     void setCachedDocWidth(int w ) { m_cachedDocWidth = w; }
     void setCachedDocHeight(int h) { m_cachedDocHeight = h; }
 
@@ -170,7 +170,7 @@ protected:
     bool m_staticMode;
     // Canvas is paged
     bool m_pagedMode;
-    // Canvas tqcontains overlaid widgets
+    // Canvas contains overlaid widgets
     bool m_needsWidgetMasks;
 
     short m_pageNr;
diff --git a/khtml/rendering/render_container.cpp b/khtml/rendering/render_container.cpp
index df7bfab79..69f987477 100644
--- a/khtml/rendering/render_container.cpp
+++ b/khtml/rendering/render_container.cpp
@@ -144,7 +144,7 @@ void RenderContainer::addChild(RenderObject *newChild, RenderObject *beforeChild
             newStyle->inheritFrom(style());
 	    newStyle->setDisplay( TABLE );
 	    newStyle->setFlowAroundFloats( true );
-	    table->setParent( this ); // so it tqfinds the arena
+	    table->setParent( this ); // so it finds the arena
             table->setStyle(newStyle);
 	    table->setParent( 0 );
             addChild(table, beforeChild);
@@ -170,15 +170,15 @@ RenderObject* RenderContainer::removeChildNode(RenderObject* oldChild)
     KHTMLAssert(oldChild->parent() == this);
 
     // So that we'll get the appropriate dirty bit set (either that a normal flow child got yanked or
-    // that a positioned child got yanked).  We also tqrepaint, so that the area exposed when the child
-    // disappears gets tqrepainted properly.
+    // that a positioned child got yanked).  We also repaint, so that the area exposed when the child
+    // disappears gets repainted properly.
     if ( document()->renderer() ) {
         oldChild->setNeedsLayoutAndMinMaxRecalc();
-        oldChild->tqrepaint();
+        oldChild->repaint();
 
         // Keep our layer hierarchy updated.
         oldChild->removeLayers(enclosingLayer());
-        // remove the child from any special tqlayout lists
+        // remove the child from any special layout lists
         oldChild->removeFromObjectLists();
 
         // if oldChild is the start or end of the selection, then clear
@@ -524,7 +524,7 @@ void RenderContainer::insertChildNode(RenderObject* child, RenderObject* beforeC
 }
 
 
-void RenderContainer::tqlayout()
+void RenderContainer::layout()
 {
     KHTMLAssert( needsLayout() );
     KHTMLAssert( minMaxKnown() );
@@ -532,8 +532,8 @@ void RenderContainer::tqlayout()
     RenderObject *child = firstChild();
     while( child ) {
         if (pagedMode) child->setNeedsLayout(true);
-        child->tqlayoutIfNeeded();
-        if (child->tqcontainsPageBreak()) setContainsPageBreak(true);
+        child->layoutIfNeeded();
+        if (child->containsPageBreak()) setContainsPageBreak(true);
         if (child->needsPageClear()) setNeedsPageClear(true);
         child = child->nextSibling();
     }
diff --git a/khtml/rendering/render_container.h b/khtml/rendering/render_container.h
index fb80bfc55..4cf386140 100644
--- a/khtml/rendering/render_container.h
+++ b/khtml/rendering/render_container.h
@@ -42,7 +42,7 @@ public:
     RenderObject *lastChild() const { return m_last; }
 
     virtual bool childAllowed() const {
-        // Prevent normal children when we are tqreplaced by generated content
+        // Prevent normal children when we are replaced by generated content
         if (style()) return style()->useNormalContent();
         return true;
     }
@@ -53,7 +53,7 @@ public:
     virtual void appendChildNode(RenderObject* child);
     virtual void insertChildNode(RenderObject* child, RenderObject* before);
 
-    virtual void tqlayout();
+    virtual void layout();
     virtual void calcMinMaxWidth() { setMinMaxKnown( true ); }
 
     virtual void removeLeftoverAnonymousBoxes();
diff --git a/khtml/rendering/render_flow.cpp b/khtml/rendering/render_flow.cpp
index 3bd21fe6f..ae579bd46 100644
--- a/khtml/rendering/render_flow.cpp
+++ b/khtml/rendering/render_flow.cpp
@@ -267,12 +267,12 @@ bool RenderFlow::hitTestLines(NodeInfo& i, int x, int y, int tx, int ty, HitTest
 }
 
 
-void RenderFlow::tqrepaint(Priority prior)
+void RenderFlow::repaint(Priority prior)
 {
     if (isInlineFlow()) {
         // Find our leftmost position.
         int left = 0;
-        // root inline box not reliably availabe during retqlayout
+        // root inline box not reliably availabe during relayout
         int top = firstLineBox() ? (
                 needsLayout() ? firstLineBox()->xPos() : firstLineBox()->root()->topOverflow()
             ) : 0;
@@ -280,7 +280,7 @@ void RenderFlow::tqrepaint(Priority prior)
             if (curr == firstLineBox() || curr->xPos() < left)
                 left = curr->xPos();
 
-        // Now tqinvalidate a rectangle.
+        // Now invalidate a rectangle.
         int ow = style() ? style()->outlineSize() : 0;
 
         // We need to add in the relative position offsets of any inlines (including us) up to our
@@ -295,18 +295,18 @@ void RenderFlow::tqrepaint(Priority prior)
         }
 
         RootInlineBox *lastRoot = lastLineBox() && !needsLayout() ? lastLineBox()->root() : 0;
-        containingBlock()->tqrepaintRectangle(-ow+left, -ow+top,
+        containingBlock()->repaintRectangle(-ow+left, -ow+top,
                                             width()+ow*2,
 					    (lastRoot ? lastRoot->bottomOverflow() - top : height())+ow*2, prior);
     }
     else {
         if (firstLineBox() && firstLineBox()->topOverflow() < 0) {
             int ow = style() ? style()->outlineSize() : 0;
-            tqrepaintRectangle(-ow, -ow+firstLineBox()->topOverflow(),
+            repaintRectangle(-ow, -ow+firstLineBox()->topOverflow(),
                              effectiveWidth()+ow*2, effectiveHeight()+ow*2, prior);
         }
         else
-            return RenderBox::tqrepaint(prior);
+            return RenderBox::repaint(prior);
     }
 }
 
diff --git a/khtml/rendering/render_flow.h b/khtml/rendering/render_flow.h
index 85321cd5d..1e23822bb 100644
--- a/khtml/rendering/render_flow.h
+++ b/khtml/rendering/render_flow.h
@@ -32,12 +32,12 @@
 namespace khtml {
 
 /**
- * all tqgeometry managing stuff is only in the block elements.
+ * all geometry managing stuff is only in the block elements.
  *
- * Inline elements don't tqlayout themselves, but the whole paragraph
+ * Inline elements don't layout themselves, but the whole paragraph
  * gets flowed by the surrounding block element. This is, because
  * one needs to know the whole paragraph to calculate bidirectional
- * behaviour of text, so putting the tqlayouting routines in the inline
+ * behaviour of text, so putting the layouting routines in the inline
  * elements is impossible.
  */
 class RenderFlow : public RenderBox
@@ -69,7 +69,7 @@ public:
     void paintLines(PaintInfo& i, int _tx, int _ty);
     bool hitTestLines(NodeInfo& i, int x, int y, int tx, int ty, HitTestAction hitTestAction);
 
-    virtual void tqrepaint(Priority p=NormalPriority);
+    virtual void repaint(Priority p=NormalPriority);
 
     virtual int highestPosition(bool includeOverflowInterior=true, bool includeSelf=true) const;
     virtual int lowestPosition(bool includeOverflowInterior=true, bool includeSelf=true) const;
diff --git a/khtml/rendering/render_form.cpp b/khtml/rendering/render_form.cpp
index ca556ecb5..58a9a8d33 100644
--- a/khtml/rendering/render_form.cpp
+++ b/khtml/rendering/render_form.cpp
@@ -81,7 +81,7 @@ void RenderFormElement::updateFromElement()
     RenderWidget::updateFromElement();
 }
 
-void RenderFormElement::tqlayout()
+void RenderFormElement::layout()
 {
     KHTMLAssert( needsLayout() );
     KHTMLAssert( minMaxKnown() );
@@ -155,8 +155,8 @@ void RenderCheckBox::calcMinMaxWidth()
     KHTMLAssert( !minMaxKnown() );
 
     TQCheckBox *cb = static_cast<TQCheckBox *>( m_widget );
-    TQSize s( cb->style().tqpixelMetric( TQStyle::PM_IndicatorWidth ),
-             cb->style().tqpixelMetric( TQStyle::PM_IndicatorHeight ) );
+    TQSize s( cb->style().pixelMetric( TQStyle::PM_IndicatorWidth ),
+             cb->style().pixelMetric( TQStyle::PM_IndicatorHeight ) );
     setIntrinsicWidth( s.width() );
     setIntrinsicHeight( s.height() );
 
@@ -207,8 +207,8 @@ void RenderRadioButton::calcMinMaxWidth()
     KHTMLAssert( !minMaxKnown() );
 
     TQRadioButton *rb = static_cast<TQRadioButton *>( m_widget );
-    TQSize s( rb->style().tqpixelMetric( TQStyle::PM_ExclusiveIndicatorWidth ),
-             rb->style().tqpixelMetric( TQStyle::PM_ExclusiveIndicatorHeight ) );
+    TQSize s( rb->style().pixelMetric( TQStyle::PM_ExclusiveIndicatorWidth ),
+             rb->style().pixelMetric( TQStyle::PM_ExclusiveIndicatorHeight ) );
     setIntrinsicWidth( s.width() );
     setIntrinsicHeight( s.height() );
 
@@ -260,17 +260,17 @@ void RenderSubmitButton::calcMinMaxWidth()
 
     bool empty = raw.isEmpty();
     if ( empty )
-        raw = TQString::tqfromLatin1("X");
+        raw = TQString::fromLatin1("X");
     TQFontMetrics fm = pb->fontMetrics();
     TQSize ts = fm.size( ShowPrefix, raw);
     TQSize s(pb->style().sizeFromContents( TQStyle::CT_PushButton, pb, ts )
             .expandedTo(TQApplication::globalStrut()));
-    int margin = pb->style().tqpixelMetric( TQStyle::PM_ButtonMargin, pb) +
-		 pb->style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, pb ) * 2;
+    int margin = pb->style().pixelMetric( TQStyle::PM_ButtonMargin, pb) +
+		 pb->style().pixelMetric( TQStyle::PM_DefaultFrameWidth, pb ) * 2;
     int w = ts.width() + margin;
     int h = s.height();
     if (pb->isDefault() || pb->autoDefault()) {
-	int dbw = pb->style().tqpixelMetric( TQStyle::PM_ButtonDefaultIndicator, pb ) * 2;
+	int dbw = pb->style().pixelMetric( TQStyle::PM_ButtonDefaultIndicator, pb ) * 2;
 	w += dbw;
     }
 
@@ -491,7 +491,7 @@ void RenderLineEdit::setStyle(RenderStyle* _style)
 {
     RenderFormElement::setStyle( _style );
 
-    widget()->tqsetAlignment(textAlignment());
+    widget()->setAlignment(textAlignment());
 }
 
 void RenderLineEdit::highLightWord( unsigned int length, unsigned int pos )
@@ -642,13 +642,13 @@ RenderFieldset::RenderFieldset(HTMLGenericFormElementImpl *element)
 {
 }
 
-RenderObject* RenderFieldset::tqlayoutLegend(bool retqlayoutChildren)
+RenderObject* RenderFieldset::layoutLegend(bool relayoutChildren)
 {
-    RenderObject* legend = tqfindLegend();
+    RenderObject* legend = findLegend();
     if (legend) {
-        if (retqlayoutChildren)
+        if (relayoutChildren)
             legend->setNeedsLayout(true);
-        legend->tqlayoutIfNeeded();
+        legend->layoutIfNeeded();
 
         int xPos = borderLeft() + paddingLeft() + legend->marginLeft();
         if (style()->direction() == RTL)
@@ -661,7 +661,7 @@ RenderObject* RenderFieldset::tqlayoutLegend(bool retqlayoutChildren)
     return legend;
 }
 
-RenderObject* RenderFieldset::tqfindLegend()
+RenderObject* RenderFieldset::findLegend()
 {
     for (RenderObject* legend = firstChild(); legend; legend = legend->nextSibling()) {
       if (!legend->isFloatingOrPositioned() && legend->element() &&
@@ -675,7 +675,7 @@ void RenderFieldset::paintBoxDecorations(PaintInfo& pI, int _tx, int _ty)
 {
     //kdDebug( 6040 ) << renderName() << "::paintDecorations()" << endl;
 
-    RenderObject* legend = tqfindLegend();
+    RenderObject* legend = findLegend();
     if (!legend)
         return RenderBlock::paintBoxDecorations(pI, _tx, _ty);
 
@@ -768,8 +768,8 @@ void RenderFieldset::setStyle(RenderStyle* _style)
     RenderBlock::setStyle(_style);
 
     // WinIE renders fieldsets with display:inline like they're inline-blocks.  For us,
-    // an inline-block is just a block element with tqreplaced set to true and inline set
-    // to true.  Ensure that if we ended up being inline that we set our tqreplaced flag
+    // an inline-block is just a block element with replaced set to true and inline set
+    // to true.  Ensure that if we ended up being inline that we set our replaced flag
     // so that we're treated like an inline-block.
     if (isInline())
         setReplaced(true);
@@ -809,7 +809,7 @@ void RenderFileButton::calcMinMaxWidth()
                                              edit,
           TQSize(w + 2 + 2*edit->frameWidth(), kMax(h, 14) + 2 + 2*edit->frameWidth()))
         .expandedTo(TQApplication::globalStrut());
-    TQSize bs = static_cast<KURLRequester*>( m_widget )->tqminimumSizeHint() - edit->tqminimumSizeHint();
+    TQSize bs = static_cast<KURLRequester*>( m_widget )->minimumSizeHint() - edit->minimumSizeHint();
 
     setIntrinsicWidth( s.width() + bs.width() );
     setIntrinsicHeight( kMax(s.height(), bs.height()) );
@@ -1018,7 +1018,7 @@ void RenderSelect::updateFromElement()
                     DOMString label = optElem->getAttribute(ATTR_LABEL);
                     if (!label.isEmpty())
                         text = label.string();
-                    text = TQString::tqfromLatin1("    ")+text;
+                    text = TQString::fromLatin1("    ")+text;
                 }
 
                 if(m_useListBox) {
@@ -1065,14 +1065,14 @@ void RenderSelect::calcMinMaxWidth()
 
     // ### ugly HACK FIXME!!!
     setMinMaxKnown();
-    tqlayoutIfNeeded();
+    layoutIfNeeded();
     setNeedsLayoutAndMinMaxRecalc();
     // ### end FIXME
 
     RenderFormElement::calcMinMaxWidth();
 }
 
-void RenderSelect::tqlayout( )
+void RenderSelect::layout( )
 {
     KHTMLAssert(needsLayout());
     KHTMLAssert(minMaxKnown());
@@ -1107,21 +1107,21 @@ void RenderSelect::tqlayout( )
         if(size < 1)
             size = kMin(static_cast<KListBox*>(m_widget)->count(), 10u);
 
-        width += 2*w->frameWidth() + w->verticalScrollBar()->tqsizeHint().width();
+        width += 2*w->frameWidth() + w->verticalScrollBar()->sizeHint().width();
         height = size*height + 2*w->frameWidth();
 
         setIntrinsicWidth( width );
         setIntrinsicHeight( height );
     }
     else {
-        TQSize s(m_widget->tqsizeHint());
+        TQSize s(m_widget->sizeHint());
         setIntrinsicWidth( s.width() );
         setIntrinsicHeight( s.height() );
     }
 
     /// uuh, ignore the following line..
     setNeedsLayout(true);
-    RenderFormElement::tqlayout();
+    RenderFormElement::layout();
 
     // and now disable the widget in case there is no <option> given
     TQMemArray<HTMLGenericFormElementImpl*> listItems = element()->listItems();
@@ -1145,7 +1145,7 @@ void RenderSelect::slotSelected(int index) // emitted by the combobox only
         bool found = ( listItems[index]->id() == ID_OPTION );
 
         if ( !found ) {
-            // this one is not selectable,  we need to tqfind an option element
+            // this one is not selectable,  we need to find an option element
             while ( ( unsigned ) index < listItems.size() ) {
                 if ( listItems[index]->id() == ID_OPTION ) {
                     found = true;
@@ -1277,7 +1277,7 @@ void RenderSelect::updateSelection()
 // -------------------------------------------------------------------------
 
 TextAreaWidget::TextAreaWidget(int wrap, TQWidget* parent)
-    : KTextEdit(parent, "__khtml"), m_tqfindDlg(0), m_tqfind(0), m_repDlg(0), m_tqreplace(0)
+    : KTextEdit(parent, "__khtml"), m_findDlg(0), m_find(0), m_repDlg(0), m_replace(0)
 {
     if(wrap != DOM::HTMLTextAreaElementImpl::ta_NoWrap) {
         setWordWrap(TQTextEdit::WidgetWidth);
@@ -1295,22 +1295,22 @@ TextAreaWidget::TextAreaWidget(int wrap, TQWidget* parent)
     setMouseTracking(true);
 
     KActionCollection *ac = new KActionCollection(this);
-    m_tqfindAction = KStdAction::tqfind( this, TQT_SLOT( slotFind() ), ac );
-    m_tqfindNextAction = KStdAction::tqfindNext( this, TQT_SLOT( slotFindNext() ), ac );
-    m_tqreplaceAction = KStdAction::tqreplace( this, TQT_SLOT( slotReplace() ), ac );
+    m_findAction = KStdAction::find( this, TQT_SLOT( slotFind() ), ac );
+    m_findNextAction = KStdAction::findNext( this, TQT_SLOT( slotFindNext() ), ac );
+    m_replaceAction = KStdAction::replace( this, TQT_SLOT( slotReplace() ), ac );
 }
 
 
 TextAreaWidget::~TextAreaWidget()
 {
-    delete m_tqreplace;
-    m_tqreplace = 0L;
-    delete m_tqfind;
-    m_tqfind = 0L;
+    delete m_replace;
+    m_replace = 0L;
+    delete m_find;
+    m_find = 0L;
     delete m_repDlg;
     m_repDlg = 0L;
-    delete m_tqfindDlg;
-    m_tqfindDlg = 0L;
+    delete m_findDlg;
+    m_findDlg = 0L;
 }
 
 
@@ -1325,14 +1325,14 @@ TQPopupMenu *TextAreaWidget::createPopupMenu(const TQPoint& pos)
     if (!isReadOnly()) {
         popup->insertSeparator();
 
-        m_tqfindAction->plug(popup);
-        m_tqfindAction->setEnabled( !text().isEmpty() );
+        m_findAction->plug(popup);
+        m_findAction->setEnabled( !text().isEmpty() );
 
-        m_tqfindNextAction->plug(popup);
-        m_tqfindNextAction->setEnabled( m_tqfind != 0 );
+        m_findNextAction->plug(popup);
+        m_findNextAction->setEnabled( m_find != 0 );
 
-        m_tqreplaceAction->plug(popup);
-        m_tqreplaceAction->setEnabled( !text().isEmpty() );
+        m_replaceAction->plug(popup);
+        m_replaceAction->setEnabled( !text().isEmpty() );
     }
 
     return popup;
@@ -1343,24 +1343,24 @@ void TextAreaWidget::slotFindHighlight(const TQString& text, int matchingIndex,
 {
     Q_UNUSED(text)
     //kdDebug() << "Highlight: [" << text << "] mi:" << matchingIndex << " ml:" << matchingLength << endl;
-    if (sender() == m_tqreplace) {
+    if (sender() == m_replace) {
         setSelection(m_repPara, matchingIndex, m_repPara, matchingIndex + matchingLength);
         setCursorPosition(m_repPara, matchingIndex);
     } else {
-        setSelection(m_tqfindPara, matchingIndex, m_tqfindPara, matchingIndex + matchingLength);
-        setCursorPosition(m_tqfindPara, matchingIndex);
+        setSelection(m_findPara, matchingIndex, m_findPara, matchingIndex + matchingLength);
+        setCursorPosition(m_findPara, matchingIndex);
     }
     ensureCursorVisible();
 }
 
 
-void TextAreaWidget::slotReplaceText(const TQString &text, int tqreplacementIndex, int /*tqreplacedLength*/, int matchedLength) {
+void TextAreaWidget::slotReplaceText(const TQString &text, int replacementIndex, int /*replacedLength*/, int matchedLength) {
     Q_UNUSED(text)
-    //kdDebug() << "Replace: [" << text << "] ri:" << tqreplacementIndex << " rl:" << tqreplacedLength << " ml:" << matchedLength << endl;
-    setSelection(m_repPara, tqreplacementIndex, m_repPara, tqreplacementIndex + matchedLength);
+    //kdDebug() << "Replace: [" << text << "] ri:" << replacementIndex << " rl:" << replacedLength << " ml:" << matchedLength << endl;
+    setSelection(m_repPara, replacementIndex, m_repPara, replacementIndex + matchedLength);
     removeSelectedText();
-    insertAt(m_repDlg->tqreplacement(), m_repPara, tqreplacementIndex);
-    if (m_tqreplace->options() & KReplaceDialog::PromptOnReplace) {
+    insertAt(m_repDlg->replacement(), m_repPara, replacementIndex);
+    if (m_replace->options() & KReplaceDialog::PromptOnReplace) {
         ensureCursorVisible();
     }
 }
@@ -1373,11 +1373,11 @@ void TextAreaWidget::slotDoReplace()
         return;
     }
 
-    delete m_tqreplace;
-    m_tqreplace = new KReplace(m_repDlg->pattern(), m_repDlg->tqreplacement(), m_repDlg->options(), this);
-    if (m_tqreplace->options() & KFindDialog::FromCursor) {
+    delete m_replace;
+    m_replace = new KReplace(m_repDlg->pattern(), m_repDlg->replacement(), m_repDlg->options(), this);
+    if (m_replace->options() & KFindDialog::FromCursor) {
         getCursorPosition(&m_repPara, &m_repIndex);
-    } else if (m_tqreplace->options() & KFindDialog::FindBackwards) {
+    } else if (m_replace->options() & KFindDialog::FindBackwards) {
         m_repPara = paragraphs() - 1;
         m_repIndex = paragraphLength(m_repPara) - 1;
     } else {
@@ -1387,10 +1387,10 @@ void TextAreaWidget::slotDoReplace()
 
     // Connect highlight signal to code which handles highlighting
     // of found text.
-    connect(m_tqreplace, TQT_SIGNAL(highlight(const TQString &, int, int)),
+    connect(m_replace, TQT_SIGNAL(highlight(const TQString &, int, int)),
             this, TQT_SLOT(slotFindHighlight(const TQString &, int, int)));
-    connect(m_tqreplace, TQT_SIGNAL(tqfindNext()), this, TQT_SLOT(slotReplaceNext()));
-    connect(m_tqreplace, TQT_SIGNAL(tqreplace(const TQString &, int, int, int)),
+    connect(m_replace, TQT_SIGNAL(findNext()), this, TQT_SLOT(slotReplaceNext()));
+    connect(m_replace, TQT_SIGNAL(replace(const TQString &, int, int, int)),
             this, TQT_SLOT(slotReplaceText(const TQString &, int, int, int)));
 
     m_repDlg->close();
@@ -1400,19 +1400,19 @@ void TextAreaWidget::slotDoReplace()
 
 void TextAreaWidget::slotReplaceNext()
 {
-    if (!m_tqreplace) {
+    if (!m_replace) {
         // assert?
         return;
     }
 
-    if (!(m_tqreplace->options() & KReplaceDialog::PromptOnReplace)) {
+    if (!(m_replace->options() & KReplaceDialog::PromptOnReplace)) {
         viewport()->setUpdatesEnabled(false);
     }
 
     KFind::Result res = KFind::NoMatch;
     while (res == KFind::NoMatch) {
         // If we're done.....
-        if (m_tqreplace->options() & KFindDialog::FindBackwards) {
+        if (m_replace->options() & KFindDialog::FindBackwards) {
             if (m_repIndex == 0 && m_repPara == 0) {
                 break;
             }
@@ -1423,14 +1423,14 @@ void TextAreaWidget::slotReplaceNext()
             }
         }
 
-        if (m_tqreplace->needData()) {
-            m_tqreplace->setData(text(m_repPara), m_repIndex);
+        if (m_replace->needData()) {
+            m_replace->setData(text(m_repPara), m_repIndex);
         }
 
-        res = m_tqreplace->tqreplace();
+        res = m_replace->replace();
 
         if (res == KFind::NoMatch) {
-            if (m_tqreplace->options() & KFindDialog::FindBackwards) {
+            if (m_replace->options() & KFindDialog::FindBackwards) {
                 if (m_repPara == 0) {
                     m_repIndex = 0;
                 } else {
@@ -1448,57 +1448,57 @@ void TextAreaWidget::slotReplaceNext()
         }
     }
 
-    if (!(m_tqreplace->options() & KReplaceDialog::PromptOnReplace)) {
+    if (!(m_replace->options() & KReplaceDialog::PromptOnReplace)) {
         viewport()->setUpdatesEnabled(true);
-        tqrepaintChanged();
+        repaintChanged();
     }
 
     if (res == KFind::NoMatch) { // at end
-        m_tqreplace->displayFinalDialog();
-        delete m_tqreplace;
-        m_tqreplace = 0;
+        m_replace->displayFinalDialog();
+        delete m_replace;
+        m_replace = 0;
         ensureCursorVisible();
-        //or           if ( m_tqreplace->shouldRestart() ) { reinit (w/o FromCursor) and call slotReplaceNext(); }
+        //or           if ( m_replace->shouldRestart() ) { reinit (w/o FromCursor) and call slotReplaceNext(); }
     } else {
-        //m_tqreplace->closeReplaceNextDialog();
+        //m_replace->closeReplaceNextDialog();
     }
 }
 
 
 void TextAreaWidget::slotDoFind()
 {
-    if (!m_tqfindDlg) {
+    if (!m_findDlg) {
         // Should really assert()
         return;
     }
 
-    delete m_tqfind;
-    m_tqfind = new KFind(m_tqfindDlg->pattern(), m_tqfindDlg->options(), this);
-    if (m_tqfind->options() & KFindDialog::FromCursor) {
-        getCursorPosition(&m_tqfindPara, &m_tqfindIndex);
-    } else if (m_tqfind->options() & KFindDialog::FindBackwards) {
-        m_tqfindPara = paragraphs() - 1;
-        m_tqfindIndex = paragraphLength(m_tqfindPara) - 1;
+    delete m_find;
+    m_find = new KFind(m_findDlg->pattern(), m_findDlg->options(), this);
+    if (m_find->options() & KFindDialog::FromCursor) {
+        getCursorPosition(&m_findPara, &m_findIndex);
+    } else if (m_find->options() & KFindDialog::FindBackwards) {
+        m_findPara = paragraphs() - 1;
+        m_findIndex = paragraphLength(m_findPara) - 1;
     } else {
-        m_tqfindPara = 0;
-        m_tqfindIndex = 0;
+        m_findPara = 0;
+        m_findIndex = 0;
     }
 
     // Connect highlight signal to code which handles highlighting
     // of found text.
-    connect(m_tqfind, TQT_SIGNAL(highlight(const TQString &, int, int)),
+    connect(m_find, TQT_SIGNAL(highlight(const TQString &, int, int)),
             this, TQT_SLOT(slotFindHighlight(const TQString &, int, int)));
-    connect(m_tqfind, TQT_SIGNAL(tqfindNext()), this, TQT_SLOT(slotFindNext()));
+    connect(m_find, TQT_SIGNAL(findNext()), this, TQT_SLOT(slotFindNext()));
 
-    m_tqfindDlg->close();
-    m_tqfind->closeFindNextDialog();
+    m_findDlg->close();
+    m_find->closeFindNextDialog();
     slotFindNext();
 }
 
 
 void TextAreaWidget::slotFindNext()
 {
-    if (!m_tqfind) {
+    if (!m_find) {
         // assert?
         return;
     }
@@ -1506,49 +1506,49 @@ void TextAreaWidget::slotFindNext()
     KFind::Result res = KFind::NoMatch;
     while (res == KFind::NoMatch) {
         // If we're done.....
-        if (m_tqfind->options() & KFindDialog::FindBackwards) {
-            if (m_tqfindIndex == 0 && m_tqfindPara == 0) {
+        if (m_find->options() & KFindDialog::FindBackwards) {
+            if (m_findIndex == 0 && m_findPara == 0) {
                 break;
             }
         } else {
-            if (m_tqfindPara == paragraphs() - 1 &&
-                m_tqfindIndex == paragraphLength(m_tqfindPara) - 1) {
+            if (m_findPara == paragraphs() - 1 &&
+                m_findIndex == paragraphLength(m_findPara) - 1) {
                 break;
             }
         }
 
-        if (m_tqfind->needData()) {
-            m_tqfind->setData(text(m_tqfindPara), m_tqfindIndex);
+        if (m_find->needData()) {
+            m_find->setData(text(m_findPara), m_findIndex);
         }
 
-        res = m_tqfind->tqfind();
+        res = m_find->find();
 
         if (res == KFind::NoMatch) {
-            if (m_tqfind->options() & KFindDialog::FindBackwards) {
-                if (m_tqfindPara == 0) {
-                    m_tqfindIndex = 0;
+            if (m_find->options() & KFindDialog::FindBackwards) {
+                if (m_findPara == 0) {
+                    m_findIndex = 0;
                 } else {
-                    m_tqfindPara--;
-                    m_tqfindIndex = paragraphLength(m_tqfindPara) - 1;
+                    m_findPara--;
+                    m_findIndex = paragraphLength(m_findPara) - 1;
                 }
             } else {
-                if (m_tqfindPara == paragraphs() - 1) {
-                    m_tqfindIndex = paragraphLength(m_tqfindPara) - 1;
+                if (m_findPara == paragraphs() - 1) {
+                    m_findIndex = paragraphLength(m_findPara) - 1;
                 } else {
-                    m_tqfindPara++;
-                    m_tqfindIndex = 0;
+                    m_findPara++;
+                    m_findIndex = 0;
                 }
             }
         }
     }
 
     if (res == KFind::NoMatch) { // at end
-        m_tqfind->displayFinalDialog();
-        delete m_tqfind;
-        m_tqfind = 0;
-        //or           if ( m_tqfind->shouldRestart() ) { reinit (w/o FromCursor) and call slotFindNext(); }
+        m_find->displayFinalDialog();
+        delete m_find;
+        m_find = 0;
+        //or           if ( m_find->shouldRestart() ) { reinit (w/o FromCursor) and call slotFindNext(); }
     } else {
-        //m_tqfind->closeFindNextDialog();
+        //m_find->closeFindNextDialog();
     }
 }
 
@@ -1558,13 +1558,13 @@ void TextAreaWidget::slotFind()
     if( text().isEmpty() )  // saves having to track the text changes
         return;
 
-    if ( m_tqfindDlg ) {
-      KWin::activateWindow( m_tqfindDlg->winId() );
+    if ( m_findDlg ) {
+      KWin::activateWindow( m_findDlg->winId() );
     } else {
-      m_tqfindDlg = new KFindDialog(false, this, "KHTML Text Area Find Dialog");
-      connect( m_tqfindDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotDoFind()) );
+      m_findDlg = new KFindDialog(false, this, "KHTML Text Area Find Dialog");
+      connect( m_findDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotDoFind()) );
     }
-    m_tqfindDlg->show();
+    m_findDlg->show();
 }
 
 
@@ -1651,10 +1651,10 @@ void RenderTextArea::calcMinMaxWidth()
     const TQFontMetrics &m = style()->fontMetrics();
     w->setTabStopWidth(8 * m.width(" "));
     TQSize size( kMax(element()->cols(), 1L)*m.width('x') + w->frameWidth() +
-                w->verticalScrollBar()->tqsizeHint().width(),
+                w->verticalScrollBar()->sizeHint().width(),
                 kMax(element()->rows(), 1L)*m.lineSpacing() + w->frameWidth()*4 +
                 (w->wordWrap() == TQTextEdit::NoWrap ?
-                 w->horizontalScrollBar()->tqsizeHint().height() : 0)
+                 w->horizontalScrollBar()->sizeHint().height() : 0)
         );
 
     setIntrinsicWidth( size.width() );
@@ -1670,7 +1670,7 @@ void RenderTextArea::setStyle(RenderStyle* _style)
     RenderFormElement::setStyle(_style);
 
     widget()->blockSignals(true);
-    widget()->tqsetAlignment(textAlignment());
+    widget()->setAlignment(textAlignment());
     widget()->blockSignals(false);
 
     scrollbarsStyled = false;
@@ -1678,11 +1678,11 @@ void RenderTextArea::setStyle(RenderStyle* _style)
     element()->m_unsubmittedFormChange = unsubmittedFormChange;
 }
 
-void RenderTextArea::tqlayout()
+void RenderTextArea::layout()
 {
     KHTMLAssert( needsLayout() );
 
-    RenderFormElement::tqlayout();
+    RenderFormElement::layout();
 
     TextAreaWidget* w = static_cast<TextAreaWidget*>(m_widget);
 
@@ -1738,13 +1738,13 @@ TQString RenderTextArea::text()
             paragraphText = paragraphText.left(pl); //Snip invented space.
             for (int l = 0; l < pl; ++l) {
                 if (lindex != w->lineOfChar(p, l)) {
-                    paragraphText.insert(l+ll++, TQString::tqfromLatin1("\n"));
+                    paragraphText.insert(l+ll++, TQString::fromLatin1("\n"));
                     lindex = w->lineOfChar(p, l);
                 }
             }
             txt += paragraphText;
             if (p < w->paragraphs() - 1)
-                txt += TQString::tqfromLatin1("\n");
+                txt += TQString::fromLatin1("\n");
         }
     }
     else
@@ -1817,7 +1817,7 @@ void RenderTextArea::computeParagraphAndIndex(long offset, int* para, int* index
         return;
     }
 
-    //Find the paragraph that tqcontains us..
+    //Find the paragraph that contains us..
     int containingPar = 0;
     long endPos       = 0;
     long startPos     = 0;
@@ -1833,7 +1833,7 @@ void RenderTextArea::computeParagraphAndIndex(long offset, int* para, int* index
 
     *para = containingPar;
 
-    //Now, scan within the paragraph to tqfind the position..
+    //Now, scan within the paragraph to find the position..
     long localOffset = offset - startPos;
 
     *index = queryParagraphInfo(containingPar, ParaPortionOffset, localOffset);
diff --git a/khtml/rendering/render_form.h b/khtml/rendering/render_form.h
index 52caee0ea..c414e079c 100644
--- a/khtml/rendering/render_form.h
+++ b/khtml/rendering/render_form.h
@@ -86,7 +86,7 @@ public:
 
     virtual void updateFromElement();
 
-    virtual void tqlayout();
+    virtual void layout();
     virtual short baselinePosition( bool ) const;
 
     DOM::HTMLGenericFormElementImpl *element() const
@@ -293,14 +293,14 @@ public:
     RenderFieldset(DOM::HTMLGenericFormElementImpl *element);
 
     virtual const char *renderName() const { return "RenderFieldSet"; }
-    virtual RenderObject* tqlayoutLegend(bool retqlayoutChildren);
+    virtual RenderObject* layoutLegend(bool relayoutChildren);
     virtual void setStyle(RenderStyle* _style);
 
 protected:
     virtual void paintBoxDecorations(PaintInfo& pI, int _tx, int _ty);
     void paintBorderMinusLegend(TQPainter *p, int _tx, int _ty, int w,
                                   int h, const RenderStyle *style, int lx, int lw);
-    RenderObject* tqfindLegend();
+    RenderObject* findLegend();
 };
 
 // -------------------------------------------------------------------------
@@ -385,7 +385,7 @@ public:
     virtual const char *renderName() const { return "RenderSelect"; }
 
     virtual void calcMinMaxWidth();
-    virtual void tqlayout();
+    virtual void layout();
 
     void setOptionsChanged(bool _optionsChanged);
 
@@ -436,14 +436,14 @@ private slots:
     void slotReplaceText(const TQString&, int, int, int);
     void slotFindHighlight(const TQString&, int, int);
 private:
-    KFindDialog *m_tqfindDlg;
-    KFind *m_tqfind;
+    KFindDialog *m_findDlg;
+    KFind *m_find;
     KReplaceDialog *m_repDlg;
-    KReplace *m_tqreplace;
-    KAction *m_tqfindAction;
-    KAction *m_tqfindNextAction;
-    KAction *m_tqreplaceAction;
-    int m_tqfindIndex, m_tqfindPara;
+    KReplace *m_replace;
+    KAction *m_findAction;
+    KAction *m_findNextAction;
+    KAction *m_replaceAction;
+    int m_findIndex, m_findPara;
     int m_repIndex, m_repPara;
 };
 
@@ -459,7 +459,7 @@ public:
 
     virtual const char *renderName() const { return "RenderTextArea"; }
     virtual void calcMinMaxWidth();
-    virtual void tqlayout();
+    virtual void layout();
     virtual void setStyle(RenderStyle *style);
 
     virtual void close ( );
diff --git a/khtml/rendering/render_frames.cpp b/khtml/rendering/render_frames.cpp
index cf94ffe15..3d06b7e6d 100644
--- a/khtml/rendering/render_frames.cpp
+++ b/khtml/rendering/render_frames.cpp
@@ -99,7 +99,7 @@ bool RenderFrameSet::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _t
     return inside || m_clientresizing;
 }
 
-void RenderFrameSet::tqlayout( )
+void RenderFrameSet::layout( )
 {
     KHTMLAssert( needsLayout() );
     KHTMLAssert( minMaxKnown() );
@@ -111,7 +111,7 @@ void RenderFrameSet::tqlayout( )
     }
 
 #ifdef DEBUG_LAYOUT
-    kdDebug( 6040 ) << renderName() << "(FrameSet)::tqlayout( ) width=" << width() << ", height=" << height() << endl;
+    kdDebug( 6040 ) << renderName() << "(FrameSet)::layout( ) width=" << width() << ", height=" << height() << endl;
 #endif
 
     int remainingLen[2];
@@ -308,7 +308,7 @@ void RenderFrameSet::tqlayout( )
                 gridLayout[gridLen - 1] += remainingLen[k];
             }
 
-            // now we have the final tqlayout, distribute the delta over it
+            // now we have the final layout, distribute the delta over it
             bool worked = true;
             for (int i = 0; i < gridLen; ++i) {
                 if (gridLayout[i] && gridLayout[i] + gridDelta[i] <= 0)
@@ -385,7 +385,7 @@ void RenderFrameSet::tqlayout( )
         }
 
     }
-    RenderContainer::tqlayout();
+    RenderContainer::layout();
  end2:
     setNeedsLayout(false);
 }
@@ -418,7 +418,7 @@ void RenderFrameSet::positionFrames()
           child->setWidth( m_gridLayout[1][c] );
           child->setHeight( m_gridLayout[0][r] );
           child->setNeedsLayout(true);
-          child->tqlayout();
+          child->layout();
       }
 
       xPos += m_gridLayout[1][c] + element()->border();
@@ -540,7 +540,7 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt )
       m_gridDelta[0][m_hSplit+1] += delta;
     }
 
-    // this just schedules the retqlayout
+    // this just schedules the relayout
     // important, otherwise the moving indicator is not correctly erased
     setNeedsLayout(true);
   }
@@ -583,7 +583,7 @@ void RenderFrameSet::setResizing(bool e)
 
 bool RenderFrameSet::canResize( int _x, int _y )
 {
-    // if we haven't received a tqlayout, then the gridLayout doesn't contain useful data yet
+    // if we haven't received a layout, then the gridLayout doesn't contain useful data yet
     if (needsLayout() || !m_gridLayout[0] || !m_gridLayout[1] ) return false;
 
     // check if we're over a horizontal or vertical boundary
@@ -641,7 +641,7 @@ void RenderPart::setWidget( TQWidget *widget )
     setNeedsLayoutAndMinMaxRecalc();
 
     // make sure the scrollbars are set correctly for restore
-    // ### tqfind better fix
+    // ### find better fix
     slotViewCleared();
 }
 
@@ -728,16 +728,16 @@ void RenderPartObject::updateWidget()
               HTMLParamElementImpl *p = static_cast<HTMLParamElementImpl *>( child );
 
               TQString aStr = p->name();
-              aStr += TQString::tqfromLatin1("=\"");
+              aStr += TQString::fromLatin1("=\"");
               aStr += p->value();
-              aStr += TQString::tqfromLatin1("\"");
+              aStr += TQString::fromLatin1("\"");
               TQString name_lower = p->name().lower();
-              if (name_lower == TQString::tqfromLatin1("type") && objbase->id() != ID_APPLET) {
+              if (name_lower == TQString::fromLatin1("type") && objbase->id() != ID_APPLET) {
                   objbase->setServiceType(p->value());
               } else if (url.isEmpty() &&
-                         (name_lower == TQString::tqfromLatin1("src") ||
-                          name_lower == TQString::tqfromLatin1("movie") ||
-                          name_lower == TQString::tqfromLatin1("code"))) {
+                         (name_lower == TQString::fromLatin1("src") ||
+                          name_lower == TQString::fromLatin1("movie") ||
+                          name_lower == TQString::fromLatin1("code"))) {
                   url = p->value();
               }
               params.append(aStr);
@@ -754,8 +754,8 @@ void RenderPartObject::updateWidget()
               }
           }
       }
-      params.append( TQString::tqfromLatin1("__KHTML__PLUGINEMBED=\"YES\"") );
-      params.append( TQString::tqfromLatin1("__KHTML__PLUGINBASEURL=\"%1\"").arg(element()->getDocument()->baseURL().url()));
+      params.append( TQString::fromLatin1("__KHTML__PLUGINEMBED=\"YES\"") );
+      params.append( TQString::fromLatin1("__KHTML__PLUGINBASEURL=\"%1\"").arg(element()->getDocument()->baseURL().url()));
 
       HTMLEmbedElementImpl *embed = 0;
       TQString classId;
@@ -775,18 +775,18 @@ void RenderPartObject::updateWidget()
               }
           classId = objbase->classId;
 
-          params.append( TQString::tqfromLatin1("__KHTML__CLASSID=\"%1\"").arg( classId ) );
-          params.append( TQString::tqfromLatin1("__KHTML__CODEBASE=\"%1\"").arg( objbase->getAttribute(ATTR_CODEBASE).string() ) );
+          params.append( TQString::fromLatin1("__KHTML__CLASSID=\"%1\"").arg( classId ) );
+          params.append( TQString::fromLatin1("__KHTML__CODEBASE=\"%1\"").arg( objbase->getAttribute(ATTR_CODEBASE).string() ) );
           if (!objbase->getAttribute(ATTR_WIDTH).isEmpty())
-              params.append( TQString::tqfromLatin1("WIDTH=\"%1\"").arg( objbase->getAttribute(ATTR_WIDTH).string() ) );
+              params.append( TQString::fromLatin1("WIDTH=\"%1\"").arg( objbase->getAttribute(ATTR_WIDTH).string() ) );
           else if (embed && !embed->getAttribute(ATTR_WIDTH).isEmpty()) {
-              params.append( TQString::tqfromLatin1("WIDTH=\"%1\"").arg( embed->getAttribute(ATTR_WIDTH).string() ) );
+              params.append( TQString::fromLatin1("WIDTH=\"%1\"").arg( embed->getAttribute(ATTR_WIDTH).string() ) );
               objbase->setAttribute(ATTR_WIDTH, embed->getAttribute(ATTR_WIDTH));
           }
           if (!objbase->getAttribute(ATTR_HEIGHT).isEmpty())
-              params.append( TQString::tqfromLatin1("HEIGHT=\"%1\"").arg( objbase->getAttribute(ATTR_HEIGHT).string() ) );
+              params.append( TQString::fromLatin1("HEIGHT=\"%1\"").arg( objbase->getAttribute(ATTR_HEIGHT).string() ) );
           else if (embed && !embed->getAttribute(ATTR_HEIGHT).isEmpty()) {
-              params.append( TQString::tqfromLatin1("HEIGHT=\"%1\"").arg( embed->getAttribute(ATTR_HEIGHT).string() ) );
+              params.append( TQString::fromLatin1("HEIGHT=\"%1\"").arg( embed->getAttribute(ATTR_HEIGHT).string() ) );
               objbase->setAttribute(ATTR_HEIGHT, embed->getAttribute(ATTR_HEIGHT));
           }
 
@@ -808,7 +808,7 @@ void RenderPartObject::updateWidget()
               serviceType = "application/x-activex-handler";
 #endif
 
-              if(classId.tqfind(TQString::tqfromLatin1("D27CDB6E-AE6D-11cf-96B8-444553540000")) >= 0) {
+              if(classId.find(TQString::fromLatin1("D27CDB6E-AE6D-11cf-96B8-444553540000")) >= 0) {
                   // It is ActiveX, but the nsplugin system handling
                   // should also work, that's why we don't override the
                   // serviceType with application/x-activex-handler
@@ -817,17 +817,17 @@ void RenderPartObject::updateWidget()
                   // with nspluginviewer (Niko)
                   serviceType = "application/x-shockwave-flash";
               }
-              else if(classId.tqfind(TQString::tqfromLatin1("CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA")) >= 0)
+              else if(classId.find(TQString::fromLatin1("CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA")) >= 0)
                   serviceType = "audio/x-pn-realaudio-plugin";
-              else if(classId.tqfind(TQString::tqfromLatin1("8AD9C840-044E-11D1-B3E9-00805F499D93")) >= 0 ||
-                      objbase->classId.tqfind(TQString::tqfromLatin1("CAFEEFAC-0014-0000-0000-ABCDEFFEDCBA")) >= 0)
+              else if(classId.find(TQString::fromLatin1("8AD9C840-044E-11D1-B3E9-00805F499D93")) >= 0 ||
+                      objbase->classId.find(TQString::fromLatin1("CAFEEFAC-0014-0000-0000-ABCDEFFEDCBA")) >= 0)
                   serviceType = "application/x-java-applet";
               // http://www.apple.com/quicktime/tools_tips/tutorials/activex.html
-              else if(classId.tqfind(TQString::tqfromLatin1("02BF25D5-8C17-4B23-BC80-D3488ABDDC6B")) >= 0)
+              else if(classId.find(TQString::fromLatin1("02BF25D5-8C17-4B23-BC80-D3488ABDDC6B")) >= 0)
                   serviceType = "video/quicktime";
               // http://msdn.microsoft.com/library/en-us/dnwmt/html/adding_windows_media_to_web_pages__etse.asp?frame=true
-              else if(objbase->classId.tqfind(TQString::tqfromLatin1("6BF52A52-394A-11d3-B153-00C04F79FAA6")) >= 0 ||
-                      classId.tqfind(TQString::tqfromLatin1("22D6f312-B0F6-11D0-94AB-0080C74C7E95")) >= 0)
+              else if(objbase->classId.find(TQString::fromLatin1("6BF52A52-394A-11d3-B153-00C04F79FAA6")) >= 0 ||
+                      classId.find(TQString::fromLatin1("22D6f312-B0F6-11D0-94AB-0080C74C7E95")) >= 0)
                   serviceType = "video/x-msvideo";
 
               else
@@ -900,7 +900,7 @@ bool RenderPartObject::partLoadingErrorNotify( khtml::ChildFrame *childFrame, co
 
 void RenderPartObject::slotPartLoadingErrorNotify()
 {
-    // First we need to tqfind out the servicetype - again - this code is too duplicated !
+    // First we need to find out the servicetype - again - this code is too duplicated !
     HTMLEmbedElementImpl *embed = 0;
     TQString serviceType;
     if( element()->id()==ID_OBJECT ) {
@@ -974,7 +974,7 @@ void RenderPartObject::slotPartLoadingErrorNotify()
     deref();
 }
 
-void RenderPartObject::tqlayout( )
+void RenderPartObject::layout( )
 {
     KHTMLAssert( needsLayout() );
     KHTMLAssert( minMaxKnown() );
@@ -982,7 +982,7 @@ void RenderPartObject::tqlayout( )
     calcWidth();
     calcHeight();
 
-    RenderPart::tqlayout();
+    RenderPart::layout();
 
     setNeedsLayout(false);
 }
diff --git a/khtml/rendering/render_frames.h b/khtml/rendering/render_frames.h
index d0867ba29..3dd7ed0d9 100644
--- a/khtml/rendering/render_frames.h
+++ b/khtml/rendering/render_frames.h
@@ -50,7 +50,7 @@ public:
     virtual const char *renderName() const { return "RenderFrameSet"; }
     virtual bool isFrameSet() const { return true; }
 
-    virtual void tqlayout();
+    virtual void layout();
 
     void positionFrames( );
 
@@ -61,7 +61,7 @@ public:
     bool canResize( int _x, int _y);
     void setResizing(bool e);
 
-    Qt::tqCursorShape cursorShape() const { return m_cursor; }
+    Qt::CursorShape cursorShape() const { return m_cursor; }
 
     bool nodeAtPoint(NodeInfo& info, int x, int y, int tx, int ty, HitTestAction hitTestAction, bool inside);
 
@@ -73,7 +73,7 @@ public:
 #endif
 
 private:
-    Qt::tqCursorShape m_cursor;
+    Qt::CursorShape m_cursor;
     int m_oldpos;
     int m_gridLen[2];
     int* m_gridDelta[2];
@@ -154,7 +154,7 @@ public:
 
     virtual void close();
 
-    virtual void tqlayout( );
+    virtual void layout( );
     virtual void updateWidget();
     
     virtual bool canHaveBorder() const { return true; }
diff --git a/khtml/rendering/render_generated.cpp b/khtml/rendering/render_generated.cpp
index b067d5b9d..17c65fc9c 100644
--- a/khtml/rendering/render_generated.cpp
+++ b/khtml/rendering/render_generated.cpp
@@ -36,14 +36,14 @@ RenderCounterBase::RenderCounterBase(DOM::NodeImpl* node)
 {
 }
 
-void RenderCounterBase::tqlayout()
+void RenderCounterBase::layout()
 {
     KHTMLAssert( needsLayout() );
 
     if ( !minMaxKnown() )
         calcMinMaxWidth();
 
-    RenderText::tqlayout();
+    RenderText::layout();
 }
 
 void RenderCounterBase::calcMinMaxWidth()
@@ -53,7 +53,7 @@ void RenderCounterBase::calcMinMaxWidth()
     generateContent();
 
     if (str) str->deref();
-    str = new DOM::DOMStringImpl(m_item.tqunicode(), m_item.length());
+    str = new DOM::DOMStringImpl(m_item.unicode(), m_item.length());
     str->ref();
 
     RenderText::calcMinMaxWidth();
diff --git a/khtml/rendering/render_generated.h b/khtml/rendering/render_generated.h
index 3b02bc338..6fa20e7cd 100644
--- a/khtml/rendering/render_generated.h
+++ b/khtml/rendering/render_generated.h
@@ -41,7 +41,7 @@ public:
 
     virtual const char *renderName() const { return "RenderCounterBase"; }
 
-    virtual void tqlayout( );
+    virtual void layout( );
     virtual void calcMinMaxWidth();
     virtual bool isCounter() const { return true; }
 
diff --git a/khtml/rendering/render_image.cpp b/khtml/rendering/render_image.cpp
index 5b438184c..120e75361 100644
--- a/khtml/rendering/render_image.cpp
+++ b/khtml/rendering/render_image.cpp
@@ -137,7 +137,7 @@ void RenderImage::setPixmap( const TQPixmap &p, const TQRect& r, CachedImage *o)
     }
     berrorPic = o->isErrorImage();
 
-    bool needtqlayout = false;
+    bool needlayout = false;
 
     // Image dimensions have been changed, see what needs to be done
     if( o->pixmap_size().width() != intrinsicWidth() ||
@@ -152,7 +152,7 @@ void RenderImage::setPixmap( const TQPixmap &p, const TQRect& r, CachedImage *o)
             setIntrinsicHeight( o->pixmap_size().height() );
         }
 
-         // lets see if we need to retqlayout at all..
+         // lets see if we need to relayout at all..
          int oldwidth = m_width;
          int oldheight = m_height;
          int oldminwidth = m_minWidth;
@@ -164,7 +164,7 @@ void RenderImage::setPixmap( const TQPixmap &p, const TQRect& r, CachedImage *o)
          }
 
          if(iwchanged || m_width != oldwidth || m_height != oldheight)
-             needtqlayout = true;
+             needlayout = true;
 
          m_minWidth = oldminwidth;
          m_width = oldwidth;
@@ -175,7 +175,7 @@ void RenderImage::setPixmap( const TQPixmap &p, const TQRect& r, CachedImage *o)
     if ( !parent() )
         return;
 
-    if(needtqlayout)
+    if(needlayout)
     {
         if (!selfNeedsLayout())
             setNeedsLayout(true);
@@ -196,10 +196,10 @@ void RenderImage::setPixmap( const TQPixmap &p, const TQRect& r, CachedImage *o)
         resizeCache = TQPixmap(); // for resized animations
 
         if(completeRepaint)
-            tqrepaintRectangle(borderLeft()+paddingLeft(), borderTop()+paddingTop(), contentWidth(), contentHeight());
+            repaintRectangle(borderLeft()+paddingLeft(), borderTop()+paddingTop(), contentWidth(), contentHeight());
         else
         {
-            tqrepaintRectangle(r.x() + borderLeft() + paddingLeft(), r.y() + borderTop() + paddingTop(),
+            repaintRectangle(r.x() + borderLeft() + paddingLeft(), r.y() + borderTop() + paddingTop(),
                              r.width(), r.height());
         }
     }
@@ -213,7 +213,7 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty)
     if (paintInfo.phase != PaintActionForeground && paintInfo.phase != PaintActionSelection)
         return;
 
-    // not visible or not even once tqlayouted?
+    // not visible or not even once layouted?
     if (style()->visibility() != VISIBLE || m_y <=  -500000)  return;
 
     _tx += m_x;
@@ -376,7 +376,7 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty)
     }
 }
 
-void RenderImage::tqlayout()
+void RenderImage::layout()
 {
     KHTMLAssert( needsLayout());
     KHTMLAssert( minMaxKnown() );
@@ -416,7 +416,7 @@ void RenderImage::notifyFinished(CachedObject *finishedObj)
     if ( ( m_cachedImage == finishedObj || m_oldImage == finishedObj ) && m_oldImage ) {
         m_oldImage->deref( this );
         m_oldImage = 0;
-        tqrepaint();
+        repaint();
     }
 
     RenderReplaced::notifyFinished(finishedObj);
diff --git a/khtml/rendering/render_image.h b/khtml/rendering/render_image.h
index 7fc7b4c4a..8c8bb9bef 100644
--- a/khtml/rendering/render_image.h
+++ b/khtml/rendering/render_image.h
@@ -45,7 +45,7 @@ public:
     virtual const char *renderName() const { return "RenderImage"; }
     virtual void paint( PaintInfo& i, int tx, int ty );
 
-    virtual void tqlayout();
+    virtual void layout();
 
     virtual void setPixmap( const TQPixmap &, const TQRect&, CachedImage *);
 
diff --git a/khtml/rendering/render_inline.cpp b/khtml/rendering/render_inline.cpp
index bc783d8ab..c3eb08d4b 100644
--- a/khtml/rendering/render_inline.cpp
+++ b/khtml/rendering/render_inline.cpp
@@ -57,7 +57,7 @@ void RenderInline::setStyle(RenderStyle* _style)
     }
 
     if (attached()) {
-        // Update tqreplaced content
+        // Update replaced content
         updateReplacedContent();
         // Update pseudos for ::before and ::after
         updatePseudoChildren();
@@ -864,7 +864,7 @@ void RenderInline::caretPos(int offset, int flags, int &_x, int &_y, int &width,
     RenderBlock *cb = containingBlock();
     bool rtl = cb->style()->direction() == RTL;
     bool outsideEnd = flags & CFOutsideEnd;
-    // I need to explain that: outsideEnd tqcontains a meaningful value if
+    // I need to explain that: outsideEnd contains a meaningful value if
     // and only if flags & CFOutside is set. If it is not, then randomly
     // either the first or the last line box is returned.
     // This doesn't matter because the only case this can happen is on an
diff --git a/khtml/rendering/render_inline.h b/khtml/rendering/render_inline.h
index 3bb290392..5f4bf7b29 100644
--- a/khtml/rendering/render_inline.h
+++ b/khtml/rendering/render_inline.h
@@ -54,7 +54,7 @@ public:
     virtual void setStyle(RenderStyle* _style);
     virtual void attach();
 
-    virtual void tqlayout() {} // Do nothing for tqlayout()
+    virtual void layout() {} // Do nothing for layout()
 
     virtual void paint(PaintInfo&, int tx, int ty);
 
diff --git a/khtml/rendering/render_layer.cpp b/khtml/rendering/render_layer.cpp
index 8fce128da..2b7e93f1f 100644
--- a/khtml/rendering/render_layer.cpp
+++ b/khtml/rendering/render_layer.cpp
@@ -37,7 +37,7 @@
  * version of this file only under the terms of one of those two
  * licenses (the MPL or the GPL) and not to allow others to use your
  * version of this file under the LGPL, indicate your decision by
- * deletingthe provisions above and tqreplace them with the notice and
+ * deletingthe provisions above and replace them with the notice and
  * other provisions required by the MPL or the GPL, as the case may be.
  * If you do not delete the provisions above, a recipient may use your
  * version of this file under any of the LGPL, the MPL or the GPL.
@@ -123,7 +123,7 @@ RenderLayer::~RenderLayer()
 void RenderLayer::updateLayerPosition()
 {
 
-    // The canvas is sized to the docWidth/Height over in RenderCanvas::tqlayout, so we
+    // The canvas is sized to the docWidth/Height over in RenderCanvas::layout, so we
     // don't need to ever update our layer position here.
     if (renderer()->isCanvas())
         return;
@@ -195,17 +195,17 @@ TQRegion RenderLayer::paintedRegion(RenderLayer* rootLayer)
     return r;
 }
 
-void RenderLayer::tqrepaint( Priority p, bool markForRepaint )
+void RenderLayer::repaint( Priority p, bool markForRepaint )
 {
     if (markForRepaint && m_markedForRepaint)
         return;
     for (RenderLayer* child = firstChild(); child; child = child->nextSibling())
-        child->tqrepaint( p, markForRepaint );
+        child->repaint( p, markForRepaint );
     TQRect layerBounds, damageRect, fgrect;
     calculateRects(renderer()->canvas()->layer(), renderer()->viewRect(), layerBounds, damageRect, fgrect);
     m_visibleRect = damageRect.intersect( layerBounds );
     if (m_visibleRect.isValid())
-        renderer()->canvas()->tqrepaintViewRectangle( m_visibleRect.x(), m_visibleRect.y(), m_visibleRect.width(), m_visibleRect.height(), (p > NormalPriority) );
+        renderer()->canvas()->repaintViewRectangle( m_visibleRect.x(), m_visibleRect.y(), m_visibleRect.width(), m_visibleRect.height(), (p > NormalPriority) );
     if (markForRepaint)
         m_markedForRepaint = true;
 }
@@ -213,7 +213,7 @@ void RenderLayer::tqrepaint( Priority p, bool markForRepaint )
 void RenderLayer::updateLayerPositions(RenderLayer* rootLayer, bool doFullRepaint, bool checkForRepaint)
 {
     if (doFullRepaint) {
-        m_object->tqrepaint();
+        m_object->repaint();
         checkForRepaint = doFullRepaint = false;
     }
 
@@ -233,14 +233,14 @@ void RenderLayer::updateLayerPositions(RenderLayer* rootLayer, bool doFullRepain
 #ifdef APPLE_CHANGES
     // FIXME: Child object could override visibility.
     if (checkForRepaint && (m_object->style()->visibility() == VISIBLE))
-        m_object->tqrepaintAfterLayoutIfNeeded(m_tqrepaintRect, m_fullRepaintRect);
+        m_object->repaintAfterLayoutIfNeeded(m_repaintRect, m_fullRepaintRect);
 #else
     if (checkForRepaint && m_markedForRepaint) {
         TQRect layerBounds, damageRect, fgrect;
         calculateRects(rootLayer, renderer()->viewRect(), layerBounds, damageRect, fgrect);
         TQRect vr = damageRect.intersect( layerBounds );
         if (vr != m_visibleRect && vr.isValid()) {
-            renderer()->canvas()->tqrepaintViewRectangle( vr.x(), vr.y(), vr.width(), vr.height() );
+            renderer()->canvas()->repaintViewRectangle( vr.x(), vr.y(), vr.width(), vr.height() );
             m_visibleRect = vr;
         }
     }
@@ -340,7 +340,7 @@ void RenderLayer::operator delete(void* ptr, size_t sz)
 {
     assert(inRenderLayerDetach);
 
-    // Stash size where detach can tqfind it.
+    // Stash size where detach can find it.
     *(size_t *)ptr = sz;
 }
 
@@ -450,7 +450,7 @@ void RenderLayer::insertOnlyThisLayer()
         RenderLayer* parentLayer = renderer()->parent()->enclosingLayer();
         if (parentLayer)
             parentLayer->addChild(this,
-                                  renderer()->parent()->tqfindNextLayer(parentLayer, renderer()));
+                                  renderer()->parent()->findNextLayer(parentLayer, renderer()));
     }
 
     // Remove all descendant layers from the hierarchy and add them to the new position.
@@ -528,7 +528,7 @@ void RenderLayer::checkInlineRelOffset(const RenderObject* o, int& x, int& y)
 
     // Despite the positioned child being a block display type inside an inline, we still keep
     // its x locked to our left.  Arguably the correct behavior would be to go flush left to
-    // the block that tqcontains us, but that isn't what other browsers do.
+    // the block that contains us, but that isn't what other browsers do.
     if (o->hasStaticX() && !isInlineType)
         // Avoid adding in the left border/padding of the containing block twice.  Subtract it out.
         x += sx - (o->containingBlock()->borderLeft() + o->containingBlock()->paddingLeft());
@@ -537,7 +537,7 @@ void RenderLayer::checkInlineRelOffset(const RenderObject* o, int& x, int& y)
         y += sy;
 }
 
-void RenderLayer::scrollToOffset(int x, int y, bool updateScrollbars, bool tqrepaint)
+void RenderLayer::scrollToOffset(int x, int y, bool updateScrollbars, bool repaint)
 {
     if (renderer()->style()->overflowX() != OMARQUEE || !renderer()->hasOverflowClip()) {
         if (x < 0) x = 0;
@@ -557,7 +557,7 @@ void RenderLayer::scrollToOffset(int x, int y, bool updateScrollbars, bool tqrep
     // blit, since the check for blitting is going to be very
     // complicated (since it will involve testing whether our layer
     // is either occluded by another layer or clipped by an enclosing
-    // layer or tqcontains fixed backgrounds, etc.).
+    // layer or contains fixed backgrounds, etc.).
     m_scrollX = x;
     m_scrollY = y;
 
@@ -569,9 +569,9 @@ void RenderLayer::scrollToOffset(int x, int y, bool updateScrollbars, bool tqrep
     // Fire the scroll DOM event.
     m_object->element()->dispatchHTMLEvent(EventImpl::SCROLL_EVENT, true, false);
 
-    // Just schedule a full tqrepaint of our object.
-    if (tqrepaint)
-        m_object->tqrepaint(RealtimePriority);
+    // Just schedule a full repaint of our object.
+    if (repaint)
+        m_object->repaint(RealtimePriority);
 
     if (updateScrollbars) {
         if (m_hBar)
@@ -637,7 +637,7 @@ int RenderLayer::verticalScrollbarWidth()
 #ifdef APPLE_CHANGES
     return m_vBar->width();
 #else
-    return m_vBar->style().tqpixelMetric(TQStyle::PM_ScrollBarExtent);
+    return m_vBar->style().pixelMetric(TQStyle::PM_ScrollBarExtent);
 #endif
 
 }
@@ -650,7 +650,7 @@ int RenderLayer::horizontalScrollbarHeight()
 #ifdef APPLE_CHANGES
     return m_hBar->height();
 #else
-    return m_hBar->style().tqpixelMetric(TQStyle::PM_ScrollBarExtent);
+    return m_hBar->style().pixelMetric(TQStyle::PM_ScrollBarExtent);
 #endif
 
 }
@@ -691,7 +691,7 @@ void RenderLayer::positionScrollbars(const TQRect& absBounds)
     TQScrollBar *b = m_hBar;
     if (!m_hBar)
 	b = m_vBar;
-    int sw = b->style().tqpixelMetric(TQStyle::PM_ScrollBarExtent);
+    int sw = b->style().pixelMetric(TQStyle::PM_ScrollBarExtent);
 
     if (m_vBar) {
 	TQRect vBarRect = TQRect(tx + w - sw + 1, ty, sw, h - (m_hBar ? sw : 0) + 1);
@@ -761,9 +761,9 @@ void RenderLayer::checkScrollbarsAfterLayout()
 
         m_object->setNeedsLayout(true);
 	if (m_object->isRenderBlock())
-            static_cast<RenderBlock*>(m_object)->tqlayoutBlock(true);
+            static_cast<RenderBlock*>(m_object)->layoutBlock(true);
         else
-            m_object->tqlayout();
+            m_object->layout();
 	return;
     }
 
@@ -1017,7 +1017,7 @@ RenderLayer* RenderLayer::nodeAtPointForLayer(RenderLayer* rootLayer, RenderObje
     updateZOrderLists();
     updateOverflowList();
 
-    // This variable tracks which layer the mouse ends up being inside.  The minute we tqfind an insideLayer,
+    // This variable tracks which layer the mouse ends up being inside.  The minute we find an insideLayer,
     // we are done and can return it.
     RenderLayer* insideLayer = 0;
 
@@ -1044,7 +1044,7 @@ RenderLayer* RenderLayer::nodeAtPointForLayer(RenderLayer* rootLayer, RenderObje
     }
 
     // Next we want to see if the mouse pos is inside the child RenderObjects of the layer.
-    if (tqcontainsPoint(xMousePos, yMousePos, fgRect) &&
+    if (containsPoint(xMousePos, yMousePos, fgRect) &&
         renderer()->nodeAtPoint(info, xMousePos, yMousePos,
                             layerBounds.x() - renderer()->xPos(),
                             layerBounds.y() - renderer()->yPos() + m_object->borderTopExtra(),
@@ -1065,7 +1065,7 @@ RenderLayer* RenderLayer::nodeAtPointForLayer(RenderLayer* rootLayer, RenderObje
     }
 
     // Next we want to see if the mouse pos is inside this layer but not any of its children.
-    if (tqcontainsPoint(xMousePos, yMousePos, bgRect) &&
+    if (containsPoint(xMousePos, yMousePos, bgRect) &&
         renderer()->nodeAtPoint(info, xMousePos, yMousePos,
                                 layerBounds.x() - renderer()->xPos(),
                                 layerBounds.y() - renderer()->yPos() + m_object->borderTopExtra(),
@@ -1166,12 +1166,12 @@ bool RenderLayer::intersectsDamageRect(const TQRect& layerBounds, const TQRect&
             layerBounds.intersects(damageRect));
 }
 
-bool RenderLayer::tqcontainsPoint(int x, int y, const TQRect& damageRect) const
+bool RenderLayer::containsPoint(int x, int y, const TQRect& damageRect) const
 {
     return (renderer()->isCanvas() || renderer()->isRoot() || renderer()->isBody() ||
             renderer()->hasOverhangingFloats() ||
             (renderer()->isInline() && !renderer()->isReplaced()) ||
-            damageRect.tqcontains(x, y));
+            damageRect.contains(x, y));
 }
 
 // This code has been written to anticipate the addition of CSS3-::outside and ::inside generated
diff --git a/khtml/rendering/render_layer.h b/khtml/rendering/render_layer.h
index 0e9e60bef..b65047391 100644
--- a/khtml/rendering/render_layer.h
+++ b/khtml/rendering/render_layer.h
@@ -35,7 +35,7 @@
  * version of this file only under the terms of one of those two
  * licenses (the MPL or the GPL) and not to allow others to use your
  * version of this file under the LGPL, indicate your decision by
- * deletingthe provisions above and tqreplace them with the notice and
+ * deletingthe provisions above and replace them with the notice and
  * other provisions required by the MPL or the GPL, as the case may be.
  * If you do not delete the provisions above, a recipient may use your
  * version of this file under any of the LGPL, the MPL or the GPL.
@@ -63,7 +63,7 @@ namespace khtml {
     class RenderObject;
     class RenderScrollMediator;
 
-class RenderScrollMediator: public TQObject
+class RenderScrollMediator: public QObject
 {
     Q_OBJECT
 public:
@@ -78,7 +78,7 @@ private:
 };
 
 // This class handles the auto-scrolling of layers with overflow: marquee.
-class Marquee: public TQObject
+class Marquee: public QObject
 {
     Q_OBJECT
 
@@ -190,7 +190,7 @@ public:
     void checkInlineRelOffset(const RenderObject* o, int& x, int& y);
     short scrollXOffset() { return m_scrollX; }
     int scrollYOffset() { return m_scrollY; }
-    void scrollToOffset(int x, int y, bool updateScrollbars = true, bool tqrepaint = true);
+    void scrollToOffset(int x, int y, bool updateScrollbars = true, bool repaint = true);
     void scrollToXOffset(int x) { scrollToOffset(x, m_scrollY); }
     void scrollToYOffset(int y) { scrollToOffset(m_scrollX, y); }
     void showScrollbar(Qt::Orientation, bool);
@@ -202,7 +202,7 @@ public:
     void paintScrollbars(RenderObject::PaintInfo& pI);
     void checkScrollbarsAfterLayout();
     void slotValueChanged(int);
-    void tqrepaint(Priority p=NormalPriority, bool markForRepaint = false);
+    void repaint(Priority p=NormalPriority, bool markForRepaint = false);
     void updateScrollPositionFromScrollbars();
 
     void updateLayerPosition();
@@ -253,7 +253,7 @@ public:
                             TQRect& posClipRect, TQRect& fixedClipRect);
 
     bool intersectsDamageRect(const TQRect& layerBounds, const TQRect& damageRect) const;
-    bool tqcontainsPoint(int x, int y, const TQRect& damageRect) const;
+    bool containsPoint(int x, int y, const TQRect& damageRect) const;
 
     void updateHoverActiveState(RenderObject::NodeInfo& info);
 
@@ -322,7 +322,7 @@ protected:
     TQPtrVector<RenderLayer>* m_posZOrderList;
     TQPtrVector<RenderLayer>* m_negZOrderList;
     
-    // This list tqcontains our overflow child layers.
+    // This list contains our overflow child layers.
     TQValueList<RenderLayer*>* m_overflowList;
    
     bool m_zOrderListsDirty: 1;
diff --git a/khtml/rendering/render_line.cpp b/khtml/rendering/render_line.cpp
index d90a65a32..2bcbe366e 100644
--- a/khtml/rendering/render_line.cpp
+++ b/khtml/rendering/render_line.cpp
@@ -95,7 +95,7 @@ void InlineBox::operator delete(void* ptr, size_t sz)
 {
     assert(inInlineBoxDetach);
 
-    // Stash size where detach can tqfind it.
+    // Stash size where detach can find it.
     *(size_t *)ptr = sz;
 }
 
@@ -119,7 +119,7 @@ void InlineBox::paint(RenderObject::PaintInfo& i, int tx, int ty)
     if ( i.phase == PaintActionOutline && !needsOutlinePhaseRepaint(object(), i, tx, ty) )
         return;
 
-    // Paint all phases of tqreplaced elements atomically, as though the tqreplaced element established its
+    // Paint all phases of replaced elements atomically, as though the replaced element established its
     // own stacking context.  (See Appendix E.2, section 6.4 on inline block/table elements in the CSS2.1
     // specification.)
     bool paintSelectionOnly = i.phase == PaintActionSelection;
@@ -139,7 +139,7 @@ void InlineBox::paint(RenderObject::PaintInfo& i, int tx, int ty)
 
 bool InlineBox::nodeAtPoint(RenderObject::NodeInfo& i, int x, int y, int tx, int ty)
 {
-    // Hit test all phases of tqreplaced elements atomically, as though the tqreplaced element established its
+    // Hit test all phases of replaced elements atomically, as though the replaced element established its
     // own stacking context.  (See Appendix E.2, section 6.4 on inline block/table elements in the CSS2.1
     // specification.)
     bool inside = false;
@@ -180,7 +180,7 @@ void InlineFlowBox::removeFromLine(InlineBox *child)
 
 bool InlineBox::canAccommodateEllipsisBox(bool ltr, int blockEdge, int ellipsisWidth)
 {
-    // Non-tqreplaced elements can always accommodate an ellipsis.
+    // Non-replaced elements can always accommodate an ellipsis.
     if (!m_object || !m_object->isReplaced())
         return true;
 
@@ -636,7 +636,7 @@ bool InlineFlowBox::nodeAtPoint(RenderObject::NodeInfo& i, int x, int y, int tx,
 
     // Now check ourselves.
     TQRect rect(tx + m_x, ty + m_y, m_width, m_height);
-    if (object()->style()->visibility() == VISIBLE && rect.tqcontains(x, y)) {
+    if (object()->style()->visibility() == VISIBLE && rect.contains(x, y)) {
         object()->setInnerNode(i);
         return true;
     }
@@ -770,7 +770,7 @@ static bool shouldDrawDecoration(RenderObject* obj)
             break;
         }
         else if (curr->isText() && !curr->isBR() && (curr->style()->preserveWS() ||
-                 !curr->element() || !curr->element()->tqcontainsOnlyWhitespace())) {
+                 !curr->element() || !curr->element()->containsOnlyWhitespace())) {
             shouldDraw = true;
             break;
         }
@@ -902,7 +902,7 @@ bool EllipsisBox::nodeAtPoint(RenderObject::NodeInfo& info, int _x, int _y, int
     }
 
     TQRect rect(_tx + m_x, _ty + m_y, m_width, m_height);
-    if (object()->style()->visibility() == VISIBLE && rect.tqcontains(_x, _y)) {
+    if (object()->style()->visibility() == VISIBLE && rect.contains(_x, _y)) {
         object()->setInnerNode(info);
         return true;
     }
@@ -938,7 +938,7 @@ bool RootInlineBox::canAccommodateEllipsis(bool ltr, int blockEdge, int lineBoxE
     if (width() - delta < ellipsisWidth)
         return false;
 
-    // Next iterate over all the line boxes on the line.  If we tqfind a tqreplaced element that intersects
+    // Next iterate over all the line boxes on the line.  If we find a replaced element that intersects
     // then we refuse to accommodate the ellipsis.  Otherwise we're ok.
     return InlineFlowBox::canAccommodateEllipsisBox(ltr, blockEdge, ellipsisWidth);
 }
@@ -956,7 +956,7 @@ void RootInlineBox::placeEllipsis(const DOMString& ellipsisStr,  bool ltr, int b
         return;
     }
 
-    // Now attempt to tqfind the nearest glyph horizontally and place just to the right (or left in RTL)
+    // Now attempt to find the nearest glyph horizontally and place just to the right (or left in RTL)
     // of that glyph.  Mark all of the objects that intersect the ellipsis box as not painting (as being
     // truncated).
     bool foundBox = false;
diff --git a/khtml/rendering/render_line.h b/khtml/rendering/render_line.h
index d00a060af..d42f2acb8 100644
--- a/khtml/rendering/render_line.h
+++ b/khtml/rendering/render_line.h
@@ -129,7 +129,7 @@ public: // FIXME: Would like to make this protected, but methods are accessing t
     InlineBox* m_next; // The next element on the same line as us.
     InlineBox* m_prev; // The previous element on the same line as us.
 
-    InlineFlowBox* m_parent; // The box that tqcontains us.
+    InlineFlowBox* m_parent; // The box that contains us.
 };
 
 class InlineRunBox : public InlineBox
diff --git a/khtml/rendering/render_list.cpp b/khtml/rendering/render_list.cpp
index e290b9c33..b08ec6eb9 100644
--- a/khtml/rendering/render_list.cpp
+++ b/khtml/rendering/render_list.cpp
@@ -178,13 +178,13 @@ short RenderListItem::marginRight() const
     return RenderBlock::marginRight();
 }*/
 
-void RenderListItem::tqlayout( )
+void RenderListItem::layout( )
 {
     KHTMLAssert( needsLayout() );
     KHTMLAssert( minMaxKnown() );
 
     updateMarkerLocation();
-    RenderBlock::tqlayout();
+    RenderBlock::layout();
 }
 
 // -----------------------------------------------------------
@@ -194,7 +194,7 @@ RenderListMarker::RenderListMarker(DOM::NodeImpl* node)
 {
     // init RenderObject attributes
     setInline(true);   // our object is Inline
-    setReplaced(true); // pretend to be tqreplaced
+    setReplaced(true); // pretend to be replaced
     // val = -1;
     // m_listImage = 0;
 }
@@ -344,21 +344,21 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty)
             	if( style()->direction() == LTR) {
                     p->drawText(_tx, _ty, 0, 0, Qt::AlignLeft|Qt::DontClip, m_item);
                     p->drawText(_tx + fm.width(m_item), _ty, 0, 0, Qt::AlignLeft|Qt::DontClip,
-                                TQString::tqfromLatin1(". "));
+                                TQString::fromLatin1(". "));
                 }
             	else {
-                    const TQString& punct(TQString::tqfromLatin1(" ."));
+                    const TQString& punct(TQString::fromLatin1(" ."));
                     p->drawText(_tx, _ty, 0, 0, Qt::AlignLeft|Qt::DontClip, punct);
             	    p->drawText(_tx + fm.width(punct), _ty, 0, 0, Qt::AlignLeft|Qt::DontClip, m_item);
                 }
             } else {
                 if (style()->direction() == LTR) {
-                    const TQString& punct(TQString::tqfromLatin1(". "));
+                    const TQString& punct(TQString::fromLatin1(". "));
                     p->drawText(_tx-offset/2, _ty, 0, 0, Qt::AlignRight|Qt::DontClip, punct);
                     p->drawText(_tx-offset/2-fm.width(punct), _ty, 0, 0, Qt::AlignRight|Qt::DontClip, m_item);
                 }
             	else {
-                    const TQString& punct(TQString::tqfromLatin1(" ."));
+                    const TQString& punct(TQString::fromLatin1(" ."));
             	    p->drawText(_tx+offset/2, _ty, 0, 0, Qt::AlignLeft|Qt::DontClip, punct);
                     p->drawText(_tx+offset/2+fm.width(punct), _ty, 0, 0, Qt::AlignLeft|Qt::DontClip, m_item);
                 }
@@ -367,7 +367,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty)
     }
 }
 
-void RenderListMarker::tqlayout()
+void RenderListMarker::layout()
 {
     KHTMLAssert( needsLayout() );
 
@@ -387,7 +387,7 @@ void RenderListMarker::setPixmap( const TQPixmap &p, const TQRect& r, CachedImag
     if(m_width != m_listImage->pixmap_size().width() || m_height != m_listImage->pixmap_size().height())
         setNeedsLayoutAndMinMaxRecalc();
     else
-        tqrepaintRectangle(0, 0, m_width, m_height);
+        repaintRectangle(0, 0, m_width, m_height);
 }
 
 void RenderListMarker::calcMinMaxWidth()
@@ -543,7 +543,7 @@ void RenderListMarker::calcMinMaxWidth()
     default:
         KHTMLAssert(false);
     }
-    m_markerWidth = fm.width(m_item) + fm.width(TQString::tqfromLatin1(". "));
+    m_markerWidth = fm.width(m_item) + fm.width(TQString::fromLatin1(". "));
     }
 
 end:
diff --git a/khtml/rendering/render_list.h b/khtml/rendering/render_list.h
index 84c7d0906..b70132671 100644
--- a/khtml/rendering/render_list.h
+++ b/khtml/rendering/render_list.h
@@ -58,7 +58,7 @@ public:
 
     void setValue( long v ) { predefVal = v; }
 
-    virtual void tqlayout( );
+    virtual void layout( );
     virtual void detach( );
     virtual void calcMinMaxWidth();
     //virtual short marginLeft() const;
@@ -89,11 +89,11 @@ public:
     virtual void setStyle(RenderStyle *style);
 
     virtual const char *renderName() const { return "RenderListMarker"; }
-    // so the marker gets to tqlayout itself. Only needed for
+    // so the marker gets to layout itself. Only needed for
     // list-style-position: inside
 
     virtual void paint(PaintInfo& i, int xoff, int yoff);
-    virtual void tqlayout( );
+    virtual void layout( );
     virtual void calcMinMaxWidth();
 
     virtual short lineHeight( bool firstLine ) const;
@@ -123,7 +123,7 @@ protected:
 };
 
 // Implementation of list-item counter
-// ### should tqreplace most list-item specific code in renderObject::getCounter
+// ### should replace most list-item specific code in renderObject::getCounter
 /*
 class CounterListItem : public CounterNode
 {
diff --git a/khtml/rendering/render_object.cpp b/khtml/rendering/render_object.cpp
index 309cd38a2..c5ee68720 100644
--- a/khtml/rendering/render_object.cpp
+++ b/khtml/rendering/render_object.cpp
@@ -71,8 +71,8 @@ using namespace khtml;
 #define COLOR_DARK_BS_FACTOR 30
 #define COLOR_DARK_TS_FACTOR 50
 
-#define LIGHT_GRAY tqRgb(192, 192, 192)
-#define DARK_GRAY  tqRgb(96, 96, 96)
+#define LIGHT_GRAY qRgb(192, 192, 192)
+#define DARK_GRAY  qRgb(96, 96, 96)
 
 #ifndef NDEBUG
 static void *baseOfRenderObjectBeingDeleted;
@@ -89,7 +89,7 @@ void RenderObject::operator delete(void* ptr, size_t sz)
 {
     assert(baseOfRenderObjectBeingDeleted == ptr);
 
-    // Stash size where detach can tqfind it.
+    // Stash size where detach can find it.
     *(size_t *)ptr = sz;
 }
 
@@ -171,14 +171,14 @@ RenderObject::RenderObject(DOM::NodeImpl* node)
       m_inline( true ),
       m_attached( false ),
 
-      m_tqreplaced( false ),
+      m_replaced( false ),
       m_mouseInside( false ),
       m_hasFirstLine( false ),
       m_isSelectionBorder( false ),
       m_isRoot( false ),
       m_afterPageBreak( false ),
       m_needsPageClear( false ),
-      m_tqcontainsPageBreak( false ),
+      m_containsPageBreak( false ),
       m_hasOverflowClip( false ),
       m_doNotDelete( false )
 {
@@ -319,9 +319,9 @@ static void addLayers(RenderObject* obj, RenderLayer* parentLayer, RenderObject*
     if (obj->layer()) {
         if (!beforeChild && newObject) {
             // We need to figure out the layer that follows newObject.  We only do
-            // this the first time we tqfind a child layer, and then we update the
+            // this the first time we find a child layer, and then we update the
             // pointer values for newObject and beforeChild used by everyone else.
-            beforeChild = newObject->parent()->tqfindNextLayer(parentLayer, newObject);
+            beforeChild = newObject->parent()->findNextLayer(parentLayer, newObject);
             newObject = 0;
         }
         parentLayer->addChild(obj->layer(), beforeChild);
@@ -372,10 +372,10 @@ void RenderObject::moveLayers(RenderLayer* oldParent, RenderLayer* newParent)
         curr->moveLayers(oldParent, newParent);
 }
 
-RenderLayer* RenderObject::tqfindNextLayer(RenderLayer* parentLayer, RenderObject* startPoint,
+RenderLayer* RenderObject::findNextLayer(RenderLayer* parentLayer, RenderObject* startPoint,
                                          bool checkParent)
 {
-    // Error check the parent layer passed in.  If it's null, we can't tqfind anything.
+    // Error check the parent layer passed in.  If it's null, we can't find anything.
     if (!parentLayer)
         return 0;
 
@@ -385,25 +385,25 @@ RenderLayer* RenderObject::tqfindNextLayer(RenderLayer* parentLayer, RenderObjec
         return ourLayer;
 
     // Step 2: If we don't have a layer, or our layer is the desired parent, then descend
-    // into our siblings trying to tqfind the next layer whose parent is the desired parent.
+    // into our siblings trying to find the next layer whose parent is the desired parent.
     if (!ourLayer || ourLayer == parentLayer) {
         for (RenderObject* curr = startPoint ? startPoint->nextSibling() : firstChild();
              curr; curr = curr->nextSibling()) {
-            RenderLayer* nextLayer = curr->tqfindNextLayer(parentLayer, 0, false);
+            RenderLayer* nextLayer = curr->findNextLayer(parentLayer, 0, false);
             if (nextLayer)
                 return nextLayer;
         }
     }
 
     // Step 3: If our layer is the desired parent layer, then we're finished.  We didn't
-    // tqfind anything.
+    // find anything.
     if (parentLayer == ourLayer)
         return 0;
 
     // Step 4: If |checkParent| is set, climb up to our parent and check its siblings that
     // follow us to see if we can locate a layer.
     if (checkParent && parent())
-        return parent()->tqfindNextLayer(parentLayer, this, true);
+        return parent()->findNextLayer(parentLayer, this, true);
 
     return 0;
 }
@@ -535,9 +535,9 @@ bool RenderObject::hasStaticY() const
 
 void RenderObject::setPixmap(const TQPixmap&, const TQRect& /*r*/, CachedImage* image)
 {
-    //tqrepaint bg when it finished loading
-    if(image && parent() && style() && style()->backgroundLayers()->tqcontainsImage(image)) {
-        isBody() ? canvas()->tqrepaint() : tqrepaint();
+    //repaint bg when it finished loading
+    if(image && parent() && style() && style()->backgroundLayers()->containsImage(image)) {
+        isBody() ? canvas()->repaint() : repaint();
     }
 }
 
@@ -592,7 +592,7 @@ void RenderObject::markContainingBlocksForLayout()
         o = o->container();
     }
 
-    last->scheduleRetqlayout();
+    last->scheduleRelayout();
 }
 
 RenderBlock *RenderObject::containingBlock() const
@@ -1103,9 +1103,9 @@ void RenderObject::paint( PaintInfo&, int /*tx*/, int /*ty*/)
 {
 }
 
-void RenderObject::tqrepaintRectangle(int x, int y, int w, int h, Priority p, bool f)
+void RenderObject::repaintRectangle(int x, int y, int w, int h, Priority p, bool f)
 {
-    if(parent()) parent()->tqrepaintRectangle(x, y, w, h, p, f);
+    if(parent()) parent()->repaintRectangle(x, y, w, h, p, f);
 }
 
 #ifdef ENABLE_DUMP
@@ -1164,15 +1164,15 @@ TQString RenderObject::information() const
        << " mB: " << marginBottom() << " qB: " << isBottomMarginQuirk()
        << "}"
         << (isTableCell() ?
-            ( TQString::tqfromLatin1(" [r=") +
+            ( TQString::fromLatin1(" [r=") +
               TQString::number( static_cast<const RenderTableCell *>(this)->row() ) +
-              TQString::tqfromLatin1(" c=") +
+              TQString::fromLatin1(" c=") +
               TQString::number( static_cast<const RenderTableCell *>(this)->col() ) +
-              TQString::tqfromLatin1(" rs=") +
+              TQString::fromLatin1(" rs=") +
               TQString::number( static_cast<const RenderTableCell *>(this)->rowSpan() ) +
-              TQString::tqfromLatin1(" cs=") +
+              TQString::fromLatin1(" cs=") +
               TQString::number( static_cast<const RenderTableCell *>(this)->colSpan() ) +
-              TQString::tqfromLatin1("]") ) : TQString::null );
+              TQString::fromLatin1("]") ) : TQString::null );
     if ( layer() )
         ts << " layer=" << layer();
     if ( continuation() )
@@ -1251,7 +1251,7 @@ void RenderObject::dump(TQTextStream &ts, const TQString &ind) const
     if (isRelPositioned()) { ts << " relPositioned"; }
     if (isText()) { ts << " text"; }
     if (isInline()) { ts << " inline"; }
-    if (isReplaced()) { ts << " tqreplaced"; }
+    if (isReplaced()) { ts << " replaced"; }
     if (shouldPaintBackgroundOrBorder()) { ts << " paintBackground"; }
     if (needsLayout()) { ts << " needsLayout"; }
     if (minMaxKnown()) { ts << " minMaxKnown"; }
@@ -1283,11 +1283,11 @@ void RenderObject::setStyle(RenderStyle *style)
                m_style->outlineWidth() > style->outlineWidth() ||
                (!m_style->hidesOverflow() && style->hidesOverflow()) ||
                ( m_style->hasClip() && !(m_style->clip() == style->clip()) ) ) ) {
-            // schedule a tqrepaint with the old style
+            // schedule a repaint with the old style
             if (layer() && !isInlineFlow())
-                layer()->tqrepaint(pri);
+                layer()->repaint(pri);
             else
-                tqrepaint(pri);
+                repaint(pri);
         }
 
         if ( ( isFloating() && m_style->floating() != style->floating() ) ||
@@ -1339,16 +1339,16 @@ void RenderObject::setStyle(RenderStyle *style)
             d = RenderStyle::Layout;
 
         if ( d > RenderStyle::Position) {
-            // we must perform a full tqlayout
+            // we must perform a full layout
             if (!isText() && d == RenderStyle::CbLayout) {
                 dirtyFormattingContext( true );
             }
             setNeedsLayoutAndMinMaxRecalc();
         } else if (!isText() && d >= RenderStyle::Visible) {
-            // a tqrepaint is enough
+            // a repaint is enough
             if (layer()) {
                 if (canvas() && canvas()->needsWidgetMasks()) {
-                    // update our widget tqmasks
+                    // update our widget masks
                     RenderLayer *p, *d = 0;
                     for (p=layer()->parent();p;p=p->parent())
                         if (p->hasOverlaidWidgets()) d=p;
@@ -1357,9 +1357,9 @@ void RenderObject::setStyle(RenderStyle *style)
                 }
             }
             if (layer() && !isInlineFlow())
-                layer()->tqrepaint(pri);
+                layer()->repaint(pri);
             else
-                tqrepaint(pri);
+                repaint(pri);
         }
     }
 }
@@ -1367,7 +1367,7 @@ void RenderObject::setStyle(RenderStyle *style)
 bool RenderObject::attemptDirectLayerTranslation()
 {
     // When the difference between two successive styles is only 'Position'
-    // we may attempt to save a tqlayout by directly updating the object position.
+    // we may attempt to save a layout by directly updating the object position.
 
     KHTMLAssert( m_style->position() != STATIC );
     if (!layer())
@@ -1383,7 +1383,7 @@ bool RenderObject::attemptDirectLayerTranslation()
     calcHeight();
     if (oldWidth != width() || oldHeight != height()) {
         // implicit size change or overconstrained dimensions:
-        // we'll need a tqlayout.
+        // we'll need a layout.
         setWidth(oldWidth);
         setHeight(oldHeight);
         // kdDebug() << "Layer translation failed for " << information() << endl;
@@ -1423,14 +1423,14 @@ void RenderObject::dirtyFormattingContext( bool checkContainer )
         m_parent->dirtyFormattingContext(false);
 }
 
-void RenderObject::tqrepaintDuringLayout()
+void RenderObject::repaintDuringLayout()
 {
     if (canvas()->needsFullRepaint() || isText())
         return;
     if (layer() && !isInlineFlow()) {
-        layer()->tqrepaint( NormalPriority, true );
+        layer()->repaint( NormalPriority, true );
     } else {
-       tqrepaint();
+       repaint();
        canvas()->deferredRepaint( this );
     }
 }
@@ -1477,11 +1477,11 @@ void RenderObject::updateBackgroundImages(RenderStyle* oldStyle)
     const BackgroundLayer* oldLayers = oldStyle ? oldStyle->backgroundLayers() : 0;
     const BackgroundLayer* newLayers = m_style ? m_style->backgroundLayers() : 0;
     for (const BackgroundLayer* currOld = oldLayers; currOld; currOld = currOld->next()) {
-        if (currOld->backgroundImage() && (!newLayers || !newLayers->tqcontainsImage(currOld->backgroundImage())))
+        if (currOld->backgroundImage() && (!newLayers || !newLayers->containsImage(currOld->backgroundImage())))
             currOld->backgroundImage()->deref(this);
     }
     for (const BackgroundLayer* currNew = newLayers; currNew; currNew = currNew->next()) {
-        if (currNew->backgroundImage() && (!oldLayers || !oldLayers->tqcontainsImage(currNew->backgroundImage())))
+        if (currNew->backgroundImage() && (!oldLayers || !oldLayers->containsImage(currNew->backgroundImage())))
             currNew->backgroundImage()->ref(this);
     }
 }
@@ -1571,7 +1571,7 @@ RenderObject *RenderObject::container() const
     // (2) For normal flow elements, it just returns the parent.
     // (3) For absolute positioned elements, it will return a relative positioned inline.
     // containingBlock() simply skips relpositioned inlines and lets an enclosing block handle
-    // the tqlayout of the positioned object.  This does mean that calcAbsoluteHorizontal and
+    // the layout of the positioned object.  This does mean that calcAbsoluteHorizontal and
     // calcAbsoluteVertical have to use container().
     EPosition pos = m_style->position();
     RenderObject *o = 0;
@@ -1617,7 +1617,7 @@ void RenderObject::removeFromObjectLists()
 
     if (isFloating()) {
         RenderBlock* outermostBlock = containingBlock();
-        for (RenderBlock* p = outermostBlock; p && !p->isCanvas() && p->tqcontainsFloat(this);) {
+        for (RenderBlock* p = outermostBlock; p && !p->isCanvas() && p->containsFloat(this);) {
             outermostBlock = p;
             if (p->isFloatingOrPositioned())
                 break;
@@ -1710,11 +1710,11 @@ FindSelectionResult RenderObject::checkSelectionPoint( int _x, int _y, int _tx,
         if (child->isText() && !static_cast<RenderText *>(child)->inlineTextBoxCount())
             continue;
 
-//        kdDebug(6040) << "iterating " << (child ? child->renderName() : "") << "@" << child << (child->isText() ? " tqcontains: \"" + TQConstString(static_cast<RenderText *>(child)->text(), kMin(static_cast<RenderText *>(child)->length(), 10u)).string() + "\"" : TQString::null) << endl;
+//        kdDebug(6040) << "iterating " << (child ? child->renderName() : "") << "@" << child << (child->isText() ? " contains: \"" + TQConstString(static_cast<RenderText *>(child)->text(), kMin(static_cast<RenderText *>(child)->length(), 10u)).string() + "\"" : TQString::null) << endl;
 //        kdDebug(6040) << "---------- checkSelectionPoint recursive -----------" << endl;
         khtml::FindSelectionResult pos = child->checkSelectionPoint(_x, _y, _tx+xPos(), _ty+yPos(), nod, off, state);
 //        kdDebug(6040) << "-------- end checkSelectionPoint recursive ---------" << endl;
-//        kdDebug(6030) << this << " child->tqfindSelectionNode returned result=" << pos << " nod=" << nod << " off=" << off << endl;
+//        kdDebug(6030) << this << " child->findSelectionNode returned result=" << pos << " nod=" << nod << " off=" << off << endl;
         switch(pos) {
         case SelectionPointBeforeInLine:
         case SelectionPointInside:
@@ -1779,7 +1779,7 @@ bool RenderObject::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _ty,
         int ol = overflowLeft();
         int ot = overflowTop();
         TQRect overflowRect( tx+ol, ty+ot, overflowWidth()-ol, overflowHeight()-ot );
-        inOverflowRect = overflowRect.tqcontains( _x, _y );
+        inOverflowRect = overflowRect.contains( _x, _y );
     }
 
     // ### table should have its own, more performant method
@@ -1850,7 +1850,7 @@ short RenderObject::getVerticalPosition( bool firstLine, RenderObject* ref ) con
             bool checkParent = ref->isInline() && !ref->isReplacedBlock() &&
                                !( ref->style()->verticalAlign() == TOP || ref->style()->verticalAlign() == BOTTOM );
             vpos = checkParent ? ref->verticalPositionHint( firstLine ) : 0;
-            // don't allow elements nested inside text-top to have a different vtqalignment.
+            // don't allow elements nested inside text-top to have a different valignment.
             if ( va == BASELINE )
                 return vpos;
             else if ( va == LENGTH )
@@ -1881,7 +1881,7 @@ short RenderObject::getVerticalPosition( bool firstLine, RenderObject* ref ) con
 
 short RenderObject::lineHeight( bool firstLine ) const
 {
-    // Inline blocks are tqreplaced elements. Otherwise, just pass off to
+    // Inline blocks are replaced elements. Otherwise, just pass off to
     // the base class.  If we're being queried as though we're the root line
     // box, then the fact that we're an inline-block is irrelevant, and we behave
     // just like a block.
@@ -1911,7 +1911,7 @@ short RenderObject::lineHeight( bool firstLine ) const
 
 short RenderObject::baselinePosition( bool firstLine ) const
 {
-    // Inline blocks are tqreplaced elements. Otherwise, just pass off to
+    // Inline blocks are replaced elements. Otherwise, just pass off to
     // the base class.  If we're being queried as though we're the root line
     // box, then the fact that we're an inline-block is irrelevant, and we behave
     // just like a block.
@@ -1923,12 +1923,12 @@ short RenderObject::baselinePosition( bool firstLine ) const
     return fm.ascent() + ( lineHeight( firstLine) - fm.height() ) / 2;
 }
 
-void RenderObject::tqinvalidateVerticalPositions()
+void RenderObject::invalidateVerticalPositions()
 {
     m_verticalPosition = PositionUndefined;
     RenderObject *child = firstChild();
     while( child ) {
-        child->tqinvalidateVerticalPositions();
+        child->invalidateVerticalPositions();
         child = child->nextSibling();
     }
 }
@@ -1961,7 +1961,7 @@ void RenderObject::recalcMinMaxWidths()
         child = child->nextSibling();
     }
 
-    // we need to recalculate, if the tqcontains inline children, as the change could have
+    // we need to recalculate, if the contains inline children, as the change could have
     // happened somewhere deep inside the child tree
     if ( ( !isInline() || isReplacedBlock() ) && childrenInline() )
         m_minMaxKnown = false;
@@ -1971,12 +1971,12 @@ void RenderObject::recalcMinMaxWidths()
     m_recalcMinMax = false;
 }
 
-void RenderObject::scheduleRetqlayout(RenderObject *clippedObj)
+void RenderObject::scheduleRelayout(RenderObject *clippedObj)
 {
     if (!isCanvas()) return;
     KHTMLView *view = static_cast<RenderCanvas *>(this)->view();
     if ( view )
-        view->scheduleRetqlayout(clippedObj);
+        view->scheduleRelayout(clippedObj);
 }
 
 
@@ -2223,7 +2223,7 @@ CounterNode* RenderObject::lookupCounter(const TQString& counter) const
 {
     TQDict<khtml::CounterNode>* counters = document()->counters(this);
     if (counters)
-        return counters->tqfind(counter);
+        return counters->find(counter);
     else
         return 0;
 }
@@ -2274,7 +2274,7 @@ void RenderObject::updateWidgetMasks() {
                                   curr->height()-pby-curr->borderBottom()-curr->paddingBottom()));
 #ifdef MASK_DEBUG
                 TQMemArray<TQRect> ar = r.rects();
-                kdDebug(6040) << "|| Setting widget tqmask for " << curr->information() << endl;
+                kdDebug(6040) << "|| Setting widget mask for " << curr->information() << endl;
                 for (int i = 0; i < ar.size() ; ++i) {
                     kdDebug(6040) << "		" <<  ar[i] << endl;
                 }
diff --git a/khtml/rendering/render_object.h b/khtml/rendering/render_object.h
index a80121820..f7f772387 100644
--- a/khtml/rendering/render_object.h
+++ b/khtml/rendering/render_object.h
@@ -61,7 +61,7 @@ class KHTMLView;
  *	a recursive descent into the layer's render objects. The first phase is the background phase.
  *	The backgrounds and borders of all blocks are painted.  Inlines are not painted at all.
  *	Floats must paint above block backgrounds but entirely below inline content that can overlap them.
- *	In the foreground phase, all inlines are fully painted.  Inline tqreplaced elements will get all
+ *	In the foreground phase, all inlines are fully painted.  Inline replaced elements will get all
  *	three phases invoked on them during this phase.
  */
 
@@ -161,7 +161,7 @@ public:
     void addLayers(RenderLayer* parentLayer, RenderObject* newObject);
     void removeLayers(RenderLayer* parentLayer);
     void moveLayers(RenderLayer* oldParent, RenderLayer* newParent);
-    RenderLayer* tqfindNextLayer(RenderLayer* parentLayer, RenderObject* startPoint,
+    RenderLayer* findNextLayer(RenderLayer* parentLayer, RenderObject* startPoint,
                                bool checkParent=true);
     virtual void positionChildLayers() { }
     virtual bool requiresLayer() const {
@@ -297,7 +297,7 @@ public:
     bool isCompact() const { return style()->display() == COMPACT; } // compact
     bool isRunIn() const { return style()->display() == RUN_IN; } // run-in object
     bool mouseInside() const;
-    bool isReplaced() const { return m_tqreplaced; }
+    bool isReplaced() const { return m_replaced; }
     bool isReplacedBlock() const { return isInline() && isReplaced() && isRenderBlock(); }
     bool shouldPaintBackgroundOrBorder() const { return m_paintBackground; }
     bool needsLayout() const   { return m_needsLayout || m_normalChildNeedsLayout || m_posChildNeedsLayout; }
@@ -327,7 +327,7 @@ public:
     void setOverhangingContents(bool p=true);
     void markContainingBlocksForLayout();
     void dirtyFormattingContext( bool checkContainer );
-    void tqrepaintDuringLayout();
+    void repaintDuringLayout();
     void setNeedsLayout(bool b, bool markParents = true);
     void setChildNeedsLayout(bool b, bool markParents = true);
     void setMinMaxKnown(bool b=true) {
@@ -353,11 +353,11 @@ public:
     void setMouseInside(bool b=true) { m_mouseInside = b; }
     void setShouldPaintBackgroundOrBorder(bool b=true) { m_paintBackground = b; }
     void setRenderText() { m_isText = true; }
-    void setReplaced(bool b=true) { m_tqreplaced = b; }
+    void setReplaced(bool b=true) { m_replaced = b; }
     void setHasOverflowClip(bool b = true) { m_hasOverflowClip = b; }
     void setIsSelectionBorder(bool b=true) { m_isSelectionBorder = b; }
 
-    void scheduleRetqlayout(RenderObject *clippedObj = 0);
+    void scheduleRelayout(RenderObject *clippedObj = 0);
 
     void updateBackgroundImages(RenderStyle* oldStyle);
 
@@ -402,7 +402,7 @@ public:
      *
      * when a element has a fixed size, m_minWidth and m_maxWidth should be
      * set to the same value. This has the special meaning that m_width,
-     * tqcontains the actual value.
+     * contains the actual value.
      *
      * assumes calcMinMaxWidth has already been called for all children.
      */
@@ -427,21 +427,21 @@ public:
 
     /*
      * This function should cause the Element to calculate its
-     * width and height and the tqlayout of its content
+     * width and height and the layout of its content
      *
-     * when the Element calls setNeedsLayout(false), tqlayout() is no
-     * longer called during retqlayouts, as long as there is no
+     * when the Element calls setNeedsLayout(false), layout() is no
+     * longer called during relayouts, as long as there is no
      * style sheet change. When that occurs, m_needsLayout will be
-     * set to true and the Element receives tqlayout() calls
+     * set to true and the Element receives layout() calls
      * again.
      */
-    virtual void tqlayout() = 0;
+    virtual void layout() = 0;
 
-    /* This function performs a tqlayout only if one is needed. */
-    void tqlayoutIfNeeded() { if (needsLayout()) tqlayout(); }
+    /* This function performs a layout only if one is needed. */
+    void layoutIfNeeded() { if (needsLayout()) layout(); }
 
     // used for element state updates that can not be fixed with a
-    // tqrepaint and do not need a retqlayout
+    // repaint and do not need a relayout
     virtual void updateFromElement() {}
 
     // Called immediately after render-object is inserted
@@ -464,11 +464,11 @@ public:
     virtual bool needsPageClear() const { return m_needsPageClear; }
 
     /*
-     * ContainsPageBreak indicates the object tqcontains a clean page-break.
-     * ### should be removed and tqreplaced with (crossesPageBreak && !needsPageClear)
+     * ContainsPageBreak indicates the object contains a clean page-break.
+     * ### should be removed and replaced with (crossesPageBreak && !needsPageClear)
      */
-    void setContainsPageBreak(bool b = true) { m_tqcontainsPageBreak = b; }
-    virtual bool tqcontainsPageBreak() const { return m_tqcontainsPageBreak; }
+    void setContainsPageBreak(bool b = true) { m_containsPageBreak = b; }
+    virtual bool containsPageBreak() const { return m_containsPageBreak; }
 
     virtual int pageTopAfter(int y) const { if (parent()) return parent()->pageTopAfter(y); else return 0; }
 
@@ -485,7 +485,7 @@ public:
     virtual bool afterPageBreak() const  { return m_afterPageBreak; }
     virtual bool beforePageBreak() const { return m_beforePageBreak; }
 
-    // does a query on the rendertree and tqfinds the innernode
+    // does a query on the rendertree and finds the innernode
     // and overURL for the given position
     // if readonly == false, it will recalc hover styles accordingly
    class NodeInfo
@@ -522,7 +522,7 @@ public:
         bool m_active;
     };
 
-    /** tqcontains stateful information for a checkSelectionPoint call
+    /** contains stateful information for a checkSelectionPoint call
      */
     struct SelPointState {
         /** last node that was before the current position */
@@ -557,7 +557,7 @@ public:
     virtual short contentWidth() const { return 0; }
     virtual int contentHeight() const { return 0; }
 
-    // intrinsic extend of tqreplaced elements. undefined otherwise
+    // intrinsic extend of replaced elements. undefined otherwise
     virtual short intrinsicWidth() const { return 0; }
     virtual int intrinsicHeight() const { return 0; }
 
@@ -681,9 +681,9 @@ public:
     // Used by collapsed border tables.
     virtual void collectBorders(TQValueList<CollapsedBorderValue>& borderStyles);
 
-    // force a complete tqrepaint
-    virtual void tqrepaint(Priority p = NormalPriority) { if(m_parent) m_parent->tqrepaint(p); }
-    virtual void tqrepaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false);
+    // force a complete repaint
+    virtual void repaint(Priority p = NormalPriority) { if(m_parent) m_parent->repaint(p); }
+    virtual void repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false);
 
     virtual unsigned int length() const { return 1; }
 
@@ -693,7 +693,7 @@ public:
     bool isFloatingOrPositioned() const { return (isFloating() || isPositioned()); };
     virtual bool hasOverhangingFloats() const { return false; }
     virtual bool hasFloats() const { return false; }
-    virtual bool tqcontainsFloat(RenderObject* /*o*/) const { return false; }
+    virtual bool containsFloat(RenderObject* /*o*/) const { return false; }
     virtual void markAllDescendantsWithFloatsForLayout(RenderObject* /*floatToRemove*/ = 0) {}
 
     bool flowAroundFloats() const;
@@ -747,8 +747,8 @@ public:
     virtual int leftmostPosition(bool /*includeOverflowInterior*/=true, bool /*includeSelf*/=true) const { return 0; }
     virtual int highestPosition(bool /*includeOverflowInterior*/=true, bool /*includeSelf*/=true) const { return 0; }
 
-    // recursively tqinvalidate current tqlayout
-    // unused: void tqinvalidateLayout();
+    // recursively invalidate current layout
+    // unused: void invalidateLayout();
 
     virtual void calcVerticalMargins() {}
     void removeFromObjectLists();
@@ -790,7 +790,7 @@ protected:
 
     virtual TQRect viewRect() const;
     void remove();
-    void tqinvalidateVerticalPositions();
+    void invalidateVerticalPositions();
     bool attemptDirectLayerTranslation();
     void updateWidgetMasks();
 
@@ -827,7 +827,7 @@ private:
     bool m_inline                    : 1;
     bool m_attached                  : 1;
 
-    bool m_tqreplaced                  : 1;
+    bool m_replaced                  : 1;
     bool m_mouseInside               : 1;
     bool m_hasFirstLine              : 1;
     bool m_isSelectionBorder         : 1;
@@ -838,7 +838,7 @@ private:
     bool m_afterPageBreak            : 1;
 
     bool m_needsPageClear            : 1;
-    bool m_tqcontainsPageBreak         : 1;
+    bool m_containsPageBreak         : 1;
     
     bool m_hasOverflowClip           : 1;
 
diff --git a/khtml/rendering/render_replaced.cpp b/khtml/rendering/render_replaced.cpp
index 60d91535d..157d1b76d 100644
--- a/khtml/rendering/render_replaced.cpp
+++ b/khtml/rendering/render_replaced.cpp
@@ -183,7 +183,7 @@ bool RenderWidget::event( TQEvent *e )
             return true;
         QWidgetResizeEvent *re = static_cast<QWidgetResizeEvent *>(e);
         m_widget->resize( re->w,  re->h );
-        tqrepaint();
+        repaint();
     }
     // eat all events - except if this is a frame (in which case KHTMLView handles it all)
     if ( ::qt_cast<KHTMLView *>( m_widget ) )
@@ -217,7 +217,7 @@ void RenderWidget::setQWidget(TQWidget *widget)
 
             if (m_widget->focusPolicy() > TQWidget::StrongFocus)
                 m_widget->setFocusPolicy(TQWidget::StrongFocus);
-            // if we've already received a tqlayout, apply the calculated space to the
+            // if we've already received a layout, apply the calculated space to the
             // widget immediately, but we have to have really been full constructed (with a non-null
             // style pointer).
             if (!needsLayout() && style()) {
@@ -234,7 +234,7 @@ void RenderWidget::setQWidget(TQWidget *widget)
     }
 }
 
-void RenderWidget::tqlayout( )
+void RenderWidget::layout( )
 {
     KHTMLAssert( needsLayout() );
     KHTMLAssert( minMaxKnown() );
@@ -387,7 +387,7 @@ void RenderWidget::paint(PaintInfo& paintInfo, int _tx, int _ty)
     if (!m_widget || !m_view || paintInfo.phase != PaintActionForeground)
         return;
 
-    // not visible or not even once tqlayouted
+    // not visible or not even once layouted
     if (style()->visibility() != VISIBLE || m_y <= -500000 || m_resizePending )
         return;
 
@@ -449,7 +449,7 @@ void RenderWidget::paint(PaintInfo& paintInfo, int _tx, int _ty)
 // is still needed.  If not, it shrinks down to the biggest size < maxPixelBuffering
 // that was requested during the overflow lapse.
 
-class PaintBuffer: public TQObject
+class PaintBuffer: public QObject
 {
 public:
     static const int maxPixelBuffering = 320*200;
@@ -533,7 +533,7 @@ static void copyWidget(const TQRect& r, TQPainter *p, TQWidget *widget, int tx,
         for (; it.current(); ++it) {
             TQWidget* const w = ::qt_cast<TQWidget *>(it.current());
 	    if ( w && !w->isTopLevel() && !w->isHidden()) {
-	        TQRect r2 = w->tqgeometry();
+	        TQRect r2 = w->geometry();
 	        blit -= r2;
 	        r2 = r2.intersect( r );
 	        r2.moveBy(-w->x(), -w->y());
@@ -557,7 +557,7 @@ static void copyWidget(const TQRect& r, TQPainter *p, TQWidget *widget, int tx,
     if ( external ) {
 	// even hackier!
         TQPainter pt( pm );
-        const TQColor c = widget->tqcolorGroup().base();
+        const TQColor c = widget->colorGroup().base();
         for (int i = 0; i < cnt; ++i)
             pt.fillRect( br[i], c );
     } else {
@@ -667,11 +667,11 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e)
         break;
 
     case TQEvent::Wheel:
-        if (widget()->tqparentWidget() == view()->viewport()) {
+        if (widget()->parentWidget() == view()->viewport()) {
             // don't allow the widget to react to wheel event unless its
             // currently focused. this avoids accidentally changing a select box
             // or something while wheeling a webpage.
-            if (tqApp->tqfocusWidget() != widget() &&
+            if (qApp->focusWidget() != widget() &&
                 widget()->focusPolicy() <= TQWidget::StrongFocus)  {
                 static_cast<TQWheelEvent*>(e)->ignore();
                 TQApplication::sendEvent(view(), e);
@@ -908,14 +908,14 @@ FindSelectionResult RenderReplaced::checkSelectionPoint(int _x, int _y, int _tx,
     }
     if ( _x > _tx + xPos() + width() ) {
         // to the right
-        // ### how to regard bidi in tqreplaced elements? (LS)
+        // ### how to regard bidi in replaced elements? (LS)
         offset = 1;
         return SelectionPointAfterInLine;
     }
 
     // The Y matches, check if we're on the left
     if ( _x < _tx + xPos() ) {
-        // ### how to regard bidi in tqreplaced elements? (LS)
+        // ### how to regard bidi in replaced elements? (LS)
         return SelectionPointBeforeInLine;
     }
 
diff --git a/khtml/rendering/render_replaced.h b/khtml/rendering/render_replaced.h
index b63d9879c..8432f170e 100644
--- a/khtml/rendering/render_replaced.h
+++ b/khtml/rendering/render_replaced.h
@@ -19,8 +19,8 @@
  * Boston, MA 02110-1301, USA.
  *
  */
-#ifndef render_tqreplaced_h
-#define render_tqreplaced_h
+#ifndef render_replaced_h
+#define render_replaced_h
 
 #include "rendering/render_block.h"
 #include <tqobject.h>
@@ -56,7 +56,7 @@ public:
 
     virtual void position(InlineBox*, int, int, bool);
 
-    // Return before, after (offset set to max), or inside the tqreplaced element,
+    // Return before, after (offset set to max), or inside the replaced element,
     // at @p offset
     virtual FindSelectionResult checkSelectionPoint( int _x, int _y, int _tx, int _ty,
                                                      DOM::NodeImpl*& node, int & offset,
@@ -95,7 +95,7 @@ public:
     virtual bool isFrame() const { return false; }
 
     virtual void detach( );
-    virtual void tqlayout( );
+    virtual void layout( );
 
     virtual void updateFromElement();
 
diff --git a/khtml/rendering/render_style.cpp b/khtml/rendering/render_style.cpp
index 22052b6be..a71dd4116 100644
--- a/khtml/rendering/render_style.cpp
+++ b/khtml/rendering/render_style.cpp
@@ -723,16 +723,16 @@ bool RenderStyle::inheritedNotEqual( RenderStyle *other ) const
   compares two styles. The result gives an idea of the action that
   needs to be taken when replacing the old style with a new one.
 
-  CbLayout: The containing block of the object needs a retqlayout.
-  Layout: the RenderObject needs a retqlayout after the style change
-  Visible: The change is visible, but no retqlayout is needed
-  NonVisible: The object does need neither tqrepaint nor retqlayout after
+  CbLayout: The containing block of the object needs a relayout.
+  Layout: the RenderObject needs a relayout after the style change
+  Visible: The change is visible, but no relayout is needed
+  NonVisible: The object does need neither repaint nor relayout after
        the change.
 
   ### TODO:
   A lot can be optimised here based on the display type, lots of
   optimisations are unimplemented, and currently result in the
-  worst case result causing a retqlayout of the containing block.
+  worst case result causing a relayout of the containing block.
 */
 RenderStyle::Diff RenderStyle::diff( const RenderStyle *other ) const
 {
@@ -743,8 +743,8 @@ RenderStyle::Diff RenderStyle::diff( const RenderStyle *other ) const
 // 	ECursor _cursor_style : 4;
 //	EUserInput _user_input : 2;	as long as :enabled is not impl'd
 
-// ### this needs work to know more exactly if we need a retqlayout
-//     or just a tqrepaint
+// ### this needs work to know more exactly if we need a relayout
+//     or just a repaint
 
 // non-inherited attributes
 //     DataRef<StyleBoxData> box;
@@ -775,18 +775,18 @@ RenderStyle::Diff RenderStyle::diff( const RenderStyle *other ) const
 // 	_border_collapse
 // 	EEmptyCell _empty_cells : 2 ;
 // 	ECaptionSide _caption_side : 2;
-//     ETableLayout _table_tqlayout : 1;
+//     ETableLayout _table_layout : 1;
 //     EPosition _position : 2;
 //     EFloat _floating : 2;
     if ( ((int)noninherited_flags.f._display) >= TABLE ) {
         if ( !(inherited_flags.f._empty_cells == other->inherited_flags.f._empty_cells) ||
              !(inherited_flags.f._caption_side == other->inherited_flags.f._caption_side) ||
              !(inherited_flags.f._border_collapse == other->inherited_flags.f._border_collapse) ||
-             !(noninherited_flags.f._table_tqlayout == other->noninherited_flags.f._table_tqlayout) ||
+             !(noninherited_flags.f._table_layout == other->noninherited_flags.f._table_layout) ||
              !(noninherited_flags.f._position == other->noninherited_flags.f._position) ||
              !(noninherited_flags.f._floating == other->noninherited_flags.f._floating) ||
              !(noninherited_flags.f._flowAroundFloats == other->noninherited_flags.f._flowAroundFloats) ||
-             !(noninherited_flags.f._tqunicodeBidi == other->noninherited_flags.f._tqunicodeBidi) )
+             !(noninherited_flags.f._unicodeBidi == other->noninherited_flags.f._unicodeBidi) )
             return CbLayout;
     }
 
@@ -813,7 +813,7 @@ RenderStyle::Diff RenderStyle::diff( const RenderStyle *other ) const
 	)
         return Layout;
 
-    // Overflow returns a tqlayout hint.
+    // Overflow returns a layout hint.
     if (noninherited_flags.f._overflowX != other->noninherited_flags.f._overflowX ||
         noninherited_flags.f._overflowY != other->noninherited_flags.f._overflowY)
         return Layout;
diff --git a/khtml/rendering/render_style.h b/khtml/rendering/render_style.h
index c54309b46..29b369ca1 100644
--- a/khtml/rendering/render_style.h
+++ b/khtml/rendering/render_style.h
@@ -220,7 +220,7 @@ public:
     }
 
     bool isTransparent() const {
-        return color.isValid() && tqAlpha(color.rgb()) == 0;
+        return color.isValid() && qAlpha(color.rgb()) == 0;
     }
 
     bool operator==(const BorderValue& o) const
@@ -503,7 +503,7 @@ public:
         return !(*this == o);
     }
 
-    bool tqcontainsImage(CachedImage* c) const { if (c == m_image) return true; if (m_next) return m_next->tqcontainsImage(c); return false; }
+    bool containsImage(CachedImage* c) const { if (c == m_image) return true; if (m_next) return m_next->containsImage(c); return false; }
 
     bool hasImage() const {
         if (m_image)
@@ -888,7 +888,7 @@ protected:
 
                 unsigned int unused : 27;
             } f;
-            TQ_UINT64 _iflags;
+            Q_UINT64 _iflags;
         };
     } inherited_flags;
 
@@ -910,7 +910,7 @@ protected:
                 EClear _clear : 2;
                 EPosition _position : 2;
                 EFloat _floating : 3;
-                ETableLayout _table_tqlayout : 1;
+                ETableLayout _table_layout : 1;
                 bool _flowAroundFloats :1;
 
                 EPageBreak _page_break_before : 3;
@@ -919,14 +919,14 @@ protected:
                 PseudoId _styleType : 4;
                 bool _hasClip : 1;
                 unsigned _pseudoBits : 8;
-                EUnicodeBidi _tqunicodeBidi : 2;
+                EUnicodeBidi _unicodeBidi : 2;
 
                 // non CSS2 non-inherited
                 bool _textOverflow : 1; // Whether or not lines that spill out should be truncated with "..."
 
                 unsigned int unused : 11;
             } f;
-            TQ_UINT64 _niflags;
+            Q_UINT64 _niflags;
         };
     } noninherited_flags;
 
@@ -984,14 +984,14 @@ protected:
 	noninherited_flags.f._clear = initialClear();
 	noninherited_flags.f._position = initialPosition();
 	noninherited_flags.f._floating = initialFloating();
-	noninherited_flags.f._table_tqlayout = initialTableLayout();
+	noninherited_flags.f._table_layout = initialTableLayout();
 	noninherited_flags.f._flowAroundFloats= initialFlowAroundFloats();
         noninherited_flags.f._page_break_before = initialPageBreak();
         noninherited_flags.f._page_break_after = initialPageBreak();
 	noninherited_flags.f._styleType = NOPSEUDO;
 	noninherited_flags.f._hasClip = false;
         noninherited_flags.f._pseudoBits = 0;
-	noninherited_flags.f._tqunicodeBidi = initialUnicodeBidi();
+	noninherited_flags.f._unicodeBidi = initialUnicodeBidi();
 	noninherited_flags.f._textOverflow = initialTextOverflow();
         noninherited_flags.f.unused = 0;
     }
@@ -1029,7 +1029,7 @@ public:
     bool        hasOffset() const { return surround->offset.nonZero(); }
 
     bool hasBackground() const {
-        if (backgroundColor().isValid() && tqAlpha(backgroundColor().rgb()) > 0)
+        if (backgroundColor().isValid() && qAlpha(backgroundColor().rgb()) > 0)
             return true;
         else
             return background->m_background.hasImage();
@@ -1108,10 +1108,10 @@ public:
     LengthBox clip() const { return visual->clip; }
     bool hasClip() const { return noninherited_flags.f._hasClip; }
 
-    EUnicodeBidi tqunicodeBidi() const { return noninherited_flags.f._tqunicodeBidi; }
+    EUnicodeBidi unicodeBidi() const { return noninherited_flags.f._unicodeBidi; }
 
     EClear clear() const { return  noninherited_flags.f._clear; }
-    ETableLayout tableLayout() const { return  noninherited_flags.f._table_tqlayout; }
+    ETableLayout tableLayout() const { return  noninherited_flags.f._table_layout; }
 
     const TQFont & font() const { return inherited->font.f; }
     // use with care. call font->update() after modifications
@@ -1272,10 +1272,10 @@ public:
     void setClip( Length top, Length right, Length bottom, Length left );
     void setHasClip( bool b ) { noninherited_flags.f._hasClip = b; }
 
-    void setUnicodeBidi( EUnicodeBidi b ) { noninherited_flags.f._tqunicodeBidi = b; }
+    void setUnicodeBidi( EUnicodeBidi b ) { noninherited_flags.f._unicodeBidi = b; }
 
     void setClear(EClear v) {  noninherited_flags.f._clear = v; }
-    void setTableLayout(ETableLayout v) {  noninherited_flags.f._table_tqlayout = v; }
+    void setTableLayout(ETableLayout v) {  noninherited_flags.f._table_layout = v; }
     bool setFontDef(const khtml::FontDef & v) {
         // bah, this doesn't compare pointers. broken! (Dirk)
         if (!(inherited->font.fontDef == v)) {
diff --git a/khtml/rendering/render_table.cpp b/khtml/rendering/render_table.cpp
index 8fc1d7246..2cf1bf1f9 100644
--- a/khtml/rendering/render_table.cpp
+++ b/khtml/rendering/render_table.cpp
@@ -99,12 +99,12 @@ void RenderTable::setStyle(RenderStyle *_style)
     if ( !tableLayout || style()->tableLayout() != oldTableLayout ) {
 	delete tableLayout;
 
-        // According to the CSS2 spec, you only use fixed table tqlayout if an
-        // explicit width is specified on the table.  Auto width implies auto table tqlayout.
+        // According to the CSS2 spec, you only use fixed table layout if an
+        // explicit width is specified on the table.  Auto width implies auto table layout.
 	if (style()->tableLayout() == TFIXED && !style()->width().isVariable()) {
 	    tableLayout = new FixedTableLayout(this);
 #ifdef DEBUG_LAYOUT
-	    kdDebug( 6040 ) << "using fixed table tqlayout" << endl;
+	    kdDebug( 6040 ) << "using fixed table layout" << endl;
 #endif
 	} else
 	    tableLayout = new AutoTableLayout(this);
@@ -113,7 +113,7 @@ void RenderTable::setStyle(RenderStyle *_style)
 
 short RenderTable::lineHeight(bool b) const
 {
-    // Inline tables are tqreplaced elements. Otherwise, just pass off to
+    // Inline tables are replaced elements. Otherwise, just pass off to
     // the base class.
     if (isReplaced())
         return height()+marginTop()+marginBottom();
@@ -122,7 +122,7 @@ short RenderTable::lineHeight(bool b) const
 
 short RenderTable::baselinePosition(bool b) const
 {
-    // Inline tables are tqreplaced elements. Otherwise, just pass off to
+    // Inline tables are replaced elements. Otherwise, just pass off to
     // the base class.
     if (isReplaced())
         return height()+marginTop()+marginBottom();
@@ -263,7 +263,7 @@ void RenderTable::calcWidth()
     calcHorizontalMargins(style()->marginLeft(),style()->marginRight(),availableWidth);
 }
 
-void RenderTable::tqlayout()
+void RenderTable::layout()
 {
     KHTMLAssert( needsLayout() );
     KHTMLAssert( minMaxKnown() );
@@ -271,13 +271,13 @@ void RenderTable::tqlayout()
 
     if (posChildNeedsLayout() && !normalChildNeedsLayout() && !selfNeedsLayout()) {
         // All we have to is lay out our positioned objects.
-        tqlayoutPositionedObjects(true);
+        layoutPositionedObjects(true);
         setNeedsLayout(false);
         return;
     }
 
     if (markedForRepaint()) {
-        tqrepaintDuringLayout();
+        repaintDuringLayout();
         setMarkedForRepaint(false);
     }
 
@@ -292,29 +292,29 @@ void RenderTable::tqlayout()
         tCaption->setChildNeedsLayout(true);
 
     // the optimization below doesn't work since the internal table
-    // tqlayout could have changed.  we need to add a flag to the table
-    // tqlayout that tells us if something has changed in the min max
+    // layout could have changed.  we need to add a flag to the table
+    // layout that tells us if something has changed in the min max
     // calculations to do it correctly.
 //     if ( oldWidth != m_width || columns.size() + 1 != columnPos.size() )
-    tableLayout->tqlayout();
+    tableLayout->layout();
 
 #ifdef DEBUG_LAYOUT
-    kdDebug( 6040 ) << renderName() << "(Table)::tqlayout1() width=" << width() << ", marginLeft=" << marginLeft() << " marginRight=" << marginRight() << endl;
+    kdDebug( 6040 ) << renderName() << "(Table)::layout1() width=" << width() << ", marginLeft=" << marginLeft() << " marginRight=" << marginRight() << endl;
 #endif
 
     setCellWidths();
 
-    // tqlayout child objects
+    // layout child objects
     int calculatedHeight = 0;
 
     RenderObject *child = firstChild();
     while( child ) {
         // FIXME: What about a form that has a display value that makes it a table section?
 	if ( child->needsLayout() && !(child->element() && child->element()->id() == ID_FORM) )
-	    child->tqlayout();
+	    child->layout();
 	if ( child->isTableSection() ) {
 	    static_cast<RenderTableSection *>(child)->calcRowHeight();
-	    calculatedHeight += static_cast<RenderTableSection *>(child)->tqlayoutRows( 0 );
+	    calculatedHeight += static_cast<RenderTableSection *>(child)->layoutRows( 0 );
 	}
 	child = child->nextSibling();
     }
@@ -346,7 +346,7 @@ void RenderTable::tqlayout()
     else if (h.isPercent())
         th += calcPercentageHeight(h);
 
-    // tqlayout rows
+    // layout rows
     if ( th > calculatedHeight ) {
 	// we have to redistribute that height to get the constraint correctly
 	// just force the first body to the height needed
@@ -354,7 +354,7 @@ void RenderTable::tqlayout()
 	// accordingly. For now this should be good enough
         if (firstBody) {
             firstBody->calcRowHeight();
-            firstBody->tqlayoutRows( th - calculatedHeight );
+            firstBody->layoutRows( th - calculatedHeight );
         }
         else if (!style()->htmlHacks()) {
             // Completely empty tables (with no sections or anything) should at least honor specified height
@@ -394,12 +394,12 @@ void RenderTable::tqlayout()
 
     if (canvas()->pagedMode()) {
         RenderObject *child = firstChild();
-        // retqlayout taking real position into account
+        // relayout taking real position into account
         while( child ) {
             if ( !(child->element() && child->element()->id() == ID_FORM) ) {
                 child->setNeedsLayout(true);
-                child->tqlayout();
-                if (child->tqcontainsPageBreak()) setContainsPageBreak(true);
+                child->layout();
+                if (child->containsPageBreak()) setContainsPageBreak(true);
                 if (child->needsPageClear()) setNeedsPageClear(true);
             }
             child = child->nextSibling();
@@ -410,7 +410,7 @@ void RenderTable::tqlayout()
 
     // table can be containing block of positioned elements.
     // ### only pass true if width or height changed.
-    tqlayoutPositionedObjects( true );
+    layoutPositionedObjects( true );
 
     m_overflowHeight = m_height;
 
@@ -1078,7 +1078,7 @@ void RenderTableSection::addCell( RenderTableCell *cell, RenderTableRow *row )
     int nCols = columns.size();
 
     // ### mozilla still seems to do the old HTML way, even for strict DTD
-    // (see the annotation on table cell tqlayouting in the CSS specs and the testcase below:
+    // (see the annotation on table cell layouting in the CSS specs and the testcase below:
     // <TABLE border>
     // <TR><TD>1 <TD rowspan="2">2 <TD>3 <TD>4
     // <TR><TD colspan="2">5
@@ -1246,7 +1246,7 @@ void RenderTableSection::calcRowHeight()
                             o->setChildNeedsLayout(true, false);
                 }
                 if (pagedMode) cell->setNeedsLayout(true);
-                cell->tqlayoutIfNeeded();
+                cell->layoutIfNeeded();
             }
 
             ch = cell->style()->height().width(0);
@@ -1261,7 +1261,7 @@ void RenderTableSection::calcRowHeight()
 	    if ( pos > rowPos[r+1] )
 		rowPos[r+1] = pos;
 
-	    // tqfind out the baseline
+	    // find out the baseline
 	    EVerticalAlign va = cell->style()->verticalAlign();
 	    if (va == BASELINE || va == TEXT_BOTTOM || va == TEXT_TOP
 		|| va == SUPER || va == SUB)
@@ -1294,7 +1294,7 @@ void RenderTableSection::calcRowHeight()
     }
 }
 
-int RenderTableSection::tqlayoutRows( int toAdd )
+int RenderTableSection::layoutRows( int toAdd )
 {
     int rHeight;
     int rindx;
@@ -1306,14 +1306,14 @@ int RenderTableSection::tqlayoutRows( int toAdd )
     m_width = table()->contentWidth();
 
     if (markedForRepaint()) {
-        tqrepaintDuringLayout();
+        repaintDuringLayout();
         setMarkedForRepaint(false);
     }
 
     if (toAdd && totalRows && (rowPos[totalRows] || !nextSibling())) {
 
 	int totalHeight = rowPos[totalRows] + toAdd;
-//	qDebug("tqlayoutRows: totalHeight = %d",  totalHeight );
+//	qDebug("layoutRows: totalHeight = %d",  totalHeight );
 
         int dh = toAdd;
 	int totalPercent = 0;
@@ -1443,7 +1443,7 @@ int RenderTableSection::tqlayoutRows( int toAdd )
                 cell->setCellPercentageHeight(kMax(0,
                                                    rHeight - cell->borderTop() - cell->paddingTop() -
                                                    cell->borderBottom() - cell->paddingBottom()));
-                cell->tqlayoutIfNeeded();
+                cell->layoutIfNeeded();
 
             }
             {
@@ -1507,7 +1507,7 @@ bool RenderTableSection::flexCellChildren(RenderObject* p) const
     while (o) {
         if (!o->isText() && o->style()->height().isPercent()) {
             if (o->isWidget()) {
-                // cancel resizes from transitory retqlayouts
+                // cancel resizes from transitory relayouts
                 static_cast<RenderWidget *>(o)->cancelPendingResize();
             }
             o->setNeedsLayout(true, false);
@@ -1608,7 +1608,7 @@ int RenderTableSection::highestPosition(bool includeOverflowInterior, bool inclu
 }
 
 // Search from first_row to last_row for the row containing y
-static unsigned int tqfindRow(unsigned int first_row, unsigned int last_row,
+static unsigned int findRow(unsigned int first_row, unsigned int last_row,
                             const TQMemArray<int> &rowPos, int y)
 {
     unsigned int under = first_row;
@@ -1628,7 +1628,7 @@ static unsigned int tqfindRow(unsigned int first_row, unsigned int last_row,
     return under;
 }
 
-static void tqfindRowCover(unsigned int &startrow, unsigned int &endrow,
+static void findRowCover(unsigned int &startrow, unsigned int &endrow,
                          const TQMemArray<int> &rowPos,
                          int min_y, int max_y)
 {
@@ -1656,9 +1656,9 @@ static void tqfindRowCover(unsigned int &startrow, unsigned int &endrow,
     }
 
     // Binary search for startrow
-    startrow = tqfindRow(startrow, endrow, rowPos, min_y);
+    startrow = findRow(startrow, endrow, rowPos, min_y);
     // Binary search for endrow
-    endrow = tqfindRow(startrow, endrow, rowPos, max_y) + 1;
+    endrow = findRow(startrow, endrow, rowPos, max_y) + 1;
     if (endrow > totalRows) endrow = totalRows;
 }
 
@@ -1682,7 +1682,7 @@ void RenderTableSection::paint( PaintInfo& pI, int tx, int ty )
     int os = 2*maximalOutlineSize(pI.phase);
     unsigned int startrow = 0;
     unsigned int endrow = totalRows;
-    tqfindRowCover(startrow, endrow, rowPos, y - os - ty - kMax(cbsw21, os), y + h + os - ty + kMax(cbsw2, os));
+    findRowCover(startrow, endrow, rowPos, y - os - ty - kMax(cbsw21, os), y + h + os - ty + kMax(cbsw2, os));
 
     // A binary search is probably not worthwhile for coloumns
     unsigned int startcol = 0;
@@ -1877,11 +1877,11 @@ static RenderTableCell *seekCell(RenderTableSection *section, int row, int col)
  *	a renderer.
  * @return the element or @p base if no suitable element found.
  */
-static NodeImpl *tqfindLastSelectableNode(NodeImpl *base)
+static NodeImpl *findLastSelectableNode(NodeImpl *base)
 {
   NodeImpl *last = base;
   // Look for last text/cdata node that has a renderer,
-  // or last childless tqreplaced element
+  // or last childless replaced element
   while ( last && !(last->renderer()
   	&& ((last->nodeType() == Node::TEXT_NODE || last->nodeType() == Node::CDATA_SECTION_NODE)
 		|| (last->renderer()->isReplaced() && !last->renderer()->lastChild()))))
@@ -1920,7 +1920,7 @@ FindSelectionResult RenderTableSection::checkSelectionPoint( int _x, int _y, int
 //    else if (_y >= _ty + height()) save_last = true;
 
     // Find the row containing the pointer
-    int row_idx = tqfindRow(0, totalRows, rowPos, _y - _ty);
+    int row_idx = findRow(0, totalRows, rowPos, _y - _ty);
 
     int col_idx;
     if ( style()->direction() == LTR ) {
@@ -1967,7 +1967,7 @@ FindSelectionResult RenderTableSection::checkSelectionPoint( int _x, int _y, int
     NodeImpl *element = cell->element();
     if (!element) return SelectionPointBefore;
 
-    element = tqfindLastSelectableNode(element);
+    element = findLastSelectableNode(element);
 
     state.m_lastNode = element;
     state.m_lastOffset = element->maxOffset();
@@ -2082,7 +2082,7 @@ void RenderTableRow::addChild(RenderObject *child, RenderObject *beforeChild)
         section()->setNeedCellRecalc();
 }
 
-void RenderTableRow::tqlayout()
+void RenderTableRow::layout()
 {
     KHTMLAssert( needsLayout() );
     KHTMLAssert( minMaxKnown() );
@@ -2095,18 +2095,18 @@ void RenderTableRow::tqlayout()
             if (pagedMode) {
                 cell->setNeedsLayout(true);
                 int oldHeight = child->height();
-                cell->tqlayout();
-                if (oldHeight > 0 && child->tqcontainsPageBreak() && child->height() != oldHeight)
+                cell->layout();
+                if (oldHeight > 0 && child->containsPageBreak() && child->height() != oldHeight)
                     section()->addSpaceAt(child->yPos()+1, child->height() - oldHeight);
             } else
             if ( child->needsLayout() ) {
                 if (markedForRepaint())
                     cell->setMarkedForRepaint( true );
                 cell->calcVerticalMargins();
-                cell->tqlayout();
+                cell->layout();
                 cell->setCellTopExtra(0);
                 cell->setCellBottomExtra(0);
-                if (child->tqcontainsPageBreak()) setContainsPageBreak(true);
+                if (child->containsPageBreak()) setContainsPageBreak(true);
             }
 	}
 	child = child->nextSibling();
@@ -2298,9 +2298,9 @@ void RenderTableCell::setWidth( int width )
     }
 }
 
-void RenderTableCell::tqlayout()
+void RenderTableCell::layout()
 {
-    tqlayoutBlock( m_widthChanged );
+    layoutBlock( m_widthChanged );
     m_widthChanged = false;
 }
 
@@ -2319,9 +2319,9 @@ bool RenderTableCell::requiresLayer() const {
     return /* style()->opacity() < 1.0f || */ hasOverflowClip() || isRelPositioned();
 }
 
-void RenderTableCell::tqrepaintRectangle(int x, int y, int w, int h, Priority p, bool f)
+void RenderTableCell::repaintRectangle(int x, int y, int w, int h, Priority p, bool f)
 {
-    RenderBlock::tqrepaintRectangle(x, y, w, h + _topExtra + _bottomExtra, p, f);
+    RenderBlock::repaintRectangle(x, y, w, h + _topExtra + _bottomExtra, p, f);
 }
 
 bool RenderTableCell::absolutePosition(int &xPos, int &yPos, bool f) const
@@ -2800,7 +2800,7 @@ public:
 
 static void addBorderStyle(TQValueList<CollapsedBorderValue>& borderStyles, CollapsedBorderValue borderValue)
 {
-    if (!borderValue.exists() || borderStyles.tqcontains(borderValue))
+    if (!borderValue.exists() || borderStyles.contains(borderValue))
         return;
 
     TQValueListIterator<CollapsedBorderValue> it = borderStyles.begin();
diff --git a/khtml/rendering/render_table.h b/khtml/rendering/render_table.h
index e6da166cb..a6de6cfaf 100644
--- a/khtml/rendering/render_table.h
+++ b/khtml/rendering/render_table.h
@@ -87,7 +87,7 @@ public:
     virtual void addChild(RenderObject *child, RenderObject *beforeChild = 0);
     virtual void paint( PaintInfo&, int tx, int ty);
     virtual void paintBoxDecorations(PaintInfo&, int _tx, int _ty);
-    virtual void tqlayout();
+    virtual void layout();
     virtual void calcMinMaxWidth();
     virtual void close();
 
@@ -224,7 +224,7 @@ public:
 
     void setCellWidths();
     void calcRowHeight();
-    int tqlayoutRows( int height );
+    int layoutRows( int height );
 
     RenderTable *table() const { return static_cast<RenderTable *>(parent()); }
 
@@ -315,7 +315,7 @@ public:
 
     virtual bool nodeAtPoint(NodeInfo& info, int x, int y, int tx, int ty, HitTestAction action, bool inside);
 
-    virtual void tqlayout();
+    virtual void layout();
 
     virtual RenderObject* removeChildNode(RenderObject* child);
 
@@ -336,7 +336,7 @@ class RenderTableCell : public RenderBlock
 public:
     RenderTableCell(DOM::NodeImpl* node);
 
-    virtual void tqlayout();
+    virtual void layout();
     virtual void detach();
 
     virtual const char *renderName() const { return "RenderTableCell"; }
@@ -396,7 +396,7 @@ public:
     // lie position to outside observers
     virtual int yPos() const { return m_y + _topExtra; }
 
-    virtual void tqrepaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false);
+    virtual void repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false);
     virtual bool absolutePosition(int &xPos, int &yPos, bool f = false) const;
 
     virtual short baselinePosition( bool = false ) const;
@@ -455,7 +455,7 @@ public:
 
     virtual short lineHeight( bool ) const { return 0; }
     virtual void position(InlineBox*, int, int, bool) {}
-    virtual void tqlayout() {}
+    virtual void layout() {}
     virtual bool requiresLayer() const { return false; }
 
     virtual void updateFromElement();
diff --git a/khtml/rendering/render_text.cpp b/khtml/rendering/render_text.cpp
index a45fc8583..0bded06fc 100644
--- a/khtml/rendering/render_text.cpp
+++ b/khtml/rendering/render_text.cpp
@@ -88,7 +88,7 @@ void InlineTextBox::operator delete(void* ptr, size_t sz)
 {
     assert(inInlineTextBoxDetach);
 
-    // Stash size where detach can tqfind it.
+    // Stash size where detach can find it.
     *(size_t *)ptr = sz;
 }
 
@@ -230,7 +230,7 @@ void InlineTextBox::paintSelection(const Font *f, RenderText *text, TQPainter *p
 	// In this case, simply swap the colors, thus in compliance with
 	// NN4 (win32 only), IE, and Mozilla.
 	if (!khtml::hasSufficientContrast(hbg, bg))
-	    tqSwap(hc, hbg);
+	    qSwap(hc, hbg);
     }
 
     p->setPen(hc);
@@ -319,9 +319,9 @@ void InlineTextBox::paintShadow(TQPainter *pt, const Font *f, int _tx, int _ty,
         const int w = m_width+2*thickness;
         const int h = m_height+2*thickness;
         const QRgb color = shadow->color.rgb();
-        const int gray = tqGray(color);
+        const int gray = qGray(color);
         const bool inverse = (gray < 100);
-        const QRgb bgColor = (inverse) ? tqRgb(255,255,255) : tqRgb(0,0,0);
+        const QRgb bgColor = (inverse) ? qRgb(255,255,255) : qRgb(0,0,0);
         TQPixmap pixmap(w, h);
         pixmap.fill(bgColor);
         TQPainter p;
@@ -365,7 +365,7 @@ void InlineTextBox::paintShadow(TQPainter *pt, const Font *f, int _tx, int _ty,
             for(int i=thickness; i<w-thickness; i++) {
                 QRgb col= img.pixel(i,j);
                 if (col == bgColor) continue;
-                float g = tqGray(col);
+                float g = qGray(col);
                 if (inverse)
                     g = (255-g)/(255-gray);
                 else
@@ -383,9 +383,9 @@ void InlineTextBox::paintShadow(TQPainter *pt, const Font *f, int _tx, int _ty,
 
         TQImage res(w,h,32);
         res.setAlphaBuffer(true);
-        int r = tqRed(color);
-        int g = tqGreen(color);
-        int b = tqBlue(color);
+        int r = qRed(color);
+        int g = qGreen(color);
+        int b = qBlue(color);
 
         // divide by factor
         factor = 1.0/factor;
@@ -394,7 +394,7 @@ void InlineTextBox::paintShadow(TQPainter *pt, const Font *f, int _tx, int _ty,
             for(int i=0; i<w; i++) {
                 int a = (int)(amap[i+j*w] * factor * 255.0);
                 if (a > 255) a = 255;
-                res.setPixel(i,j, tqRgba(r,g,b,a));
+                res.setPixel(i,j, qRgba(r,g,b,a));
             }
         }
 
@@ -494,7 +494,7 @@ FindSelectionResult InlineTextBox::checkSelectionPoint(int _x, int _y, int _tx,
 
 int InlineTextBox::offsetForPoint(int _x, int &ax) const
 {
-  // Do binary search for tqfinding out offset, saves some time for long
+  // Do binary search for finding out offset, saves some time for long
   // runs.
   int start = 0;
   int end = m_len;
@@ -643,7 +643,7 @@ int InlineTextBoxArray::compareItems( Item d1, Item d2 )
 }
 
 // remove this once QVector::bsearch is fixed
-int InlineTextBoxArray::tqfindFirstMatching(Item d) const
+int InlineTextBoxArray::findFirstMatching(Item d) const
 {
     int len = count();
 
@@ -758,7 +758,7 @@ DOM::DOMStringImpl* RenderText::originalString() const
     return element() ? element()->string() : 0;
 }
 
-InlineTextBox * RenderText::tqfindInlineTextBox( int offset, int &pos, bool checkFirstLetter )
+InlineTextBox * RenderText::findInlineTextBox( int offset, int &pos, bool checkFirstLetter )
 {
     // The text boxes point to parts of the rendertext's str string
     // (they don't include '\n')
@@ -775,7 +775,7 @@ InlineTextBox * RenderText::tqfindInlineTextBox( int offset, int &pos, bool chec
             RenderText *letterText = static_cast<RenderText *>(firstLetter->firstChild());
             //kdDebug(6040) << "lettertext: " << letterText << " minOfs: " << letterText->minOffset() << " maxOfs: " << letterText->maxOffset() << endl;
 	    if (offset >= letterText->minOffset() && offset <= letterText->maxOffset()) {
-	        InlineTextBox *result = letterText->tqfindInlineTextBox(offset, pos, false);
+	        InlineTextBox *result = letterText->findInlineTextBox(offset, pos, false);
             //kdDebug(6040) << "result: " << result << endl;
 		if (result) return result;
 	    }
@@ -927,7 +927,7 @@ void RenderText::caretPos(int offset, int flags, int &_x, int &_y, int &width, i
   }
 
   int pos;
-  InlineTextBox * s = tqfindInlineTextBox( offset, pos, true );
+  InlineTextBox * s = findInlineTextBox( offset, pos, true );
   RenderText *t = s->renderText();
 //  kdDebug(6040) << "offset="<<offset << " pos="<<pos << endl;
 
@@ -963,7 +963,7 @@ void RenderText::caretPos(int offset, int flags, int &_x, int &_y, int &width, i
 long RenderText::minOffset() const
 {
   if (!m_lines.count()) return 0;
-  // FIXME: it is *not* guaranteed that the first run tqcontains the lowest offset
+  // FIXME: it is *not* guaranteed that the first run contains the lowest offset
   // Either make this a linear search (slow),
   // or maintain an index (needs much mem),
   // or calculate and store it in bidi.cpp (needs calculation even if not needed)
@@ -975,7 +975,7 @@ long RenderText::maxOffset() const
 {
   int count = m_lines.count();
   if (!count) return str->l;
-  // FIXME: it is *not* guaranteed that the last run tqcontains the highest offset
+  // FIXME: it is *not* guaranteed that the last run contains the highest offset
   // Either make this a linear search (slow),
   // or maintain an index (needs much mem),
   // or calculate and store it in bidi.cpp (needs calculation even if not needed)
@@ -995,7 +995,7 @@ bool RenderText::posOfChar(int chr, int &x, int &y)
     parent()->absolutePosition( x, y, false );
 
     int pos;
-    InlineTextBox * s = tqfindInlineTextBox( chr, pos );
+    InlineTextBox * s = findInlineTextBox( chr, pos );
 
     if ( s ) {
         // s is the line containing the character
@@ -1036,7 +1036,7 @@ void RenderText::calcMinMaxWidth()
     bool firstLine = true;
     for(int i = 0; i < len; i++)
     {
-        unsigned short c = str->s[i].tqunicode();
+        unsigned short c = str->s[i].unicode();
         bool isNewline = false;
 
         // If line-breaks survive to here they are preserved
@@ -1056,7 +1056,7 @@ void RenderText::calcMinMaxWidth()
             continue;
 
         int wordlen = 0;
-        while( i+wordlen < len && (i+wordlen == 0 || str->s[i+wordlen].tqunicode() != SOFT_HYPHEN) &&
+        while( i+wordlen < len && (i+wordlen == 0 || str->s[i+wordlen].unicode() != SOFT_HYPHEN) &&
                !(isBreakable( str->s, i+wordlen, str->l )) )
             wordlen++;
 
@@ -1071,7 +1071,7 @@ void RenderText::calcMinMaxWidth()
             currMaxWidth += w;
 
             // Add in wordspacing to our maxwidth, but not if this is the last word.
-            if (wordSpacing && !tqcontainsOnlyWhitespace(i+wordlen, len-(i+wordlen)))
+            if (wordSpacing && !containsOnlyWhitespace(i+wordlen, len-(i+wordlen)))
                 currMaxWidth += wordSpacing;
 
             if (firstWord) {
@@ -1175,7 +1175,7 @@ void RenderText::setText(DOMStringImpl *text, bool force)
             RenderObject *o;
             bool runOnString = false;
 
-            // tqfind previous non-empty text renderer if one exists
+            // find previous non-empty text renderer if one exists
             for (o = previousRenderer(); o; o = o->previousRenderer()) {
                 if (!o->isInlineFlow()) {
                     if (!o->isText())
@@ -1259,7 +1259,7 @@ void RenderText::position(InlineBox* box, int from, int len, bool reverse)
 {
 //kdDebug(6040) << "position: from="<<from<<" len="<<len<<endl;
     // ### should not be needed!!!
-    // asserts sometimes with pre (that unibw-hamburg testcase). ### tqfind out why
+    // asserts sometimes with pre (that unibw-hamburg testcase). ### find out why
     //KHTMLAssert(!(len == 0 || (str->l && len == 1 && *(str->s+from) == '\n') ));
     // It is now needed. BRs need text boxes too otherwise caret navigation
     // gets stuck (LS)
@@ -1328,11 +1328,11 @@ short RenderText::width() const
     return w;
 }
 
-void RenderText::tqrepaint(Priority p)
+void RenderText::repaint(Priority p)
 {
     RenderObject *cb = containingBlock();
     if(cb)
-        cb->tqrepaint(p);
+        cb->repaint(p);
 }
 
 bool RenderText::isFixedWidthFont() const
@@ -1368,7 +1368,7 @@ const Font *RenderText::htmlFont(bool firstLine) const
     return f;
 }
 
-bool RenderText::tqcontainsOnlyWhitespace(unsigned int from, unsigned int len) const
+bool RenderText::containsOnlyWhitespace(unsigned int from, unsigned int len) const
 {
     unsigned int currPos;
     for (currPos = from;
@@ -1390,7 +1390,7 @@ void RenderText::trimmedMinMaxWidth(short& beginMinW, bool& beginWS,
         stripFrontSpaces = false;
 
     int len = str->l;
-    if (len == 0 || (stripFrontSpaces && str->tqcontainsOnlyWhitespace())) {
+    if (len == 0 || (stripFrontSpaces && str->containsOnlyWhitespace())) {
         maxW = 0;
         hasBreak = false;
         return;
@@ -1470,7 +1470,7 @@ static TQString quoteAndEscapeNonPrintables(const TQString &s)
         } else if (c == '"') {
             result += "\\\"";
         } else {
-            ushort u = c.tqunicode();
+            ushort u = c.unicode();
             if (u >= 0x20 && u < 0x7F) {
                 result += c;
             } else {
diff --git a/khtml/rendering/render_text.h b/khtml/rendering/render_text.h
index f5356b6c7..d91782b47 100644
--- a/khtml/rendering/render_text.h
+++ b/khtml/rendering/render_text.h
@@ -36,7 +36,7 @@
 class TQPainter;
 class TQFontMetrics;
 
-// Define a constant for soft hyphen's tqunicode value.
+// Define a constant for soft hyphen's unicode value.
 #define SOFT_HYPHEN 173
 
 const int cNoTruncation = -1;
@@ -154,7 +154,7 @@ public:
 
     InlineTextBox* first();
 
-    int	  tqfindFirstMatching( Item ) const;
+    int	  findFirstMatching( Item ) const;
     virtual int compareItems( Item, Item );
 };
 
@@ -183,7 +183,7 @@ public:
 
     virtual InlineBox* createInlineBox(bool, bool);
 
-    virtual void tqlayout() {assert(false);}
+    virtual void layout() {assert(false);}
 
     virtual bool nodeAtPoint(NodeInfo& info, int x, int y, int tx, int ty, HitTestAction hitTestAction, bool inBox);
 
@@ -217,7 +217,7 @@ public:
                             short& beginMaxW, short& endMaxW,
                             short& minW, short& maxW, bool& stripFrontSpaces);
 
-    bool tqcontainsOnlyWhitespace(unsigned int from, unsigned int len) const;
+    bool containsOnlyWhitespace(unsigned int from, unsigned int len) const;
 
     ushort startMin() const { return m_startMin; }
     ushort endMin() const { return m_endMin; }
@@ -247,7 +247,7 @@ public:
     virtual short marginLeft() const { return style()->marginLeft().minWidth(0); }
     virtual short marginRight() const { return style()->marginRight().minWidth(0); }
 
-    virtual void tqrepaint(Priority p=NormalPriority);
+    virtual void repaint(Priority p=NormalPriority);
 
     bool hasBreakableChar() const { return m_hasBreakableChar; }
     const TQFontMetrics &metrics(bool firstLine) const;
@@ -285,7 +285,7 @@ public:
      *		boxes, if available.
      * @return the text box, or 0 if no match has been found
      */
-    InlineTextBox * tqfindInlineTextBox( int offset, int &pos,
+    InlineTextBox * findInlineTextBox( int offset, int &pos,
     					bool checkFirstLetter = false );
 
 protected: // members
diff --git a/khtml/rendering/table_layout.cpp b/khtml/rendering/table_layout.cpp
index a9c40a272..7b5215d02 100644
--- a/khtml/rendering/table_layout.cpp
+++ b/khtml/rendering/table_layout.cpp
@@ -32,19 +32,19 @@ using namespace khtml;
 /*
   The text below is from the CSS 2.1 specs.
 
-  Fixed table tqlayout
+  Fixed table layout
   ------------------
 
-  With this (fast) algorithm, the horizontal tqlayout of the table does
+  With this (fast) algorithm, the horizontal layout of the table does
   not depend on the contents of the cells; it only depends on the
   table's width, the width of the columns, and borders or cell
   spacing.
 
   The table's width may be specified explicitly with the 'width'
   property. A value of 'auto' (for both 'display: table' and 'display:
-  inline-table') means use the automatic table tqlayout algorithm.
+  inline-table') means use the automatic table layout algorithm.
 
-  In the fixed table tqlayout algorithm, the width of each column is
+  In the fixed table layout algorithm, the width of each column is
   determined as follows:
 
     1. A column element with a value other than 'auto' for the 'width'
@@ -73,7 +73,7 @@ using namespace khtml;
 _____________________________________________________
 
   This is not quite true when comparing to IE. IE always honors
-  table-tqlayout:fixed and treats a variable table width as 100%. Makes
+  table-layout:fixed and treats a variable table width as 100%. Makes
   a lot of sense, and is implemented here the same way.
 
 */
@@ -223,7 +223,7 @@ int FixedTableLayout::calcWidthArray()
 void FixedTableLayout::calcMinMaxWidth()
 {
     // we might want to wait until we have all of the first row before
-    // tqlayouting for the first time.
+    // layouting for the first time.
 
     // only need to calculate the minimum width as the sum of the
     // cols/cells with a fixed width.
@@ -258,13 +258,13 @@ void FixedTableLayout::calcMinMaxWidth()
 #endif
 }
 
-void FixedTableLayout::tqlayout()
+void FixedTableLayout::layout()
 {
     int tableWidth = table->width() - table->bordersPaddingAndSpacing();
     int available = tableWidth;
     int nEffCols = table->numEffCols();
 #ifdef DEBUG_LAYOUT
-    qDebug("FixedTableLayout::tqlayout: tableWidth=%d, numEffCols=%d",  tableWidth, nEffCols);
+    qDebug("FixedTableLayout::layout: tableWidth=%d, numEffCols=%d",  tableWidth, nEffCols);
 #endif
 
 
@@ -293,7 +293,7 @@ void FixedTableLayout::tqlayout()
 	    base = available;
 
 #ifdef DEBUG_LAYOUT
-    qDebug("FixedTableLayout::tqlayout: assigning percent width, base=%d, totalPercent=%d", base, totalPercent);
+    qDebug("FixedTableLayout::layout: assigning percent width, base=%d, totalPercent=%d", base, totalPercent);
 #endif
         for ( int i = 0; available > 0 && i < nEffCols; i++ ) {
             if ( width[i].isPercent() ) {
@@ -369,13 +369,13 @@ AutoTableLayout::~AutoTableLayout()
 {
 }
 
-/* recalculates the full structure needed to do tqlayouting and minmax calculations.
+/* recalculates the full structure needed to do layouting and minmax calculations.
    This is usually calculated on the fly, but needs to be done fully when table cells change
    dynamically
 */
 void AutoTableLayout::recalcColumn( int effCol )
 {
-    Layout &l = tqlayoutStruct[effCol];
+    Layout &l = layoutStruct[effCol];
 
     RenderObject *child = table->firstChild();
     // first we iterate over all rows.
@@ -478,8 +478,8 @@ void AutoTableLayout::fullRecalc()
     effWidthDirty = true;
 
     int nEffCols = table->numEffCols();
-    tqlayoutStruct.resize( nEffCols );
-    tqlayoutStruct.fill( Layout() );
+    layoutStruct.resize( nEffCols );
+    layoutStruct.fill( Layout() );
     spanCells.fill( 0 );
 
     RenderObject *child = table->firstChild();
@@ -504,9 +504,9 @@ void AutoTableLayout::fullRecalc()
 #endif
 		if ( !w.isVariable() && span == 1 && cEffCol < nEffCols ) {
 		    if ( table->spanOfEffCol( cEffCol ) == 1 ) {
-			tqlayoutStruct[cEffCol].width = w;
-                        if (w.isFixed() && tqlayoutStruct[cEffCol].maxWidth < w.value())
-                            tqlayoutStruct[cEffCol].maxWidth = w.value();
+			layoutStruct[cEffCol].width = w;
+                        if (w.isFixed() && layoutStruct[cEffCol].maxWidth < w.value())
+                            layoutStruct[cEffCol].maxWidth = w.value();
                     }
 		}
 		cCol += span;
@@ -577,16 +577,16 @@ void AutoTableLayout::calcMinMaxWidth()
     int maxNonPercent = 0;
 
     int remainingPercent = 100;
-    for ( unsigned int i = 0; i < tqlayoutStruct.size(); i++ ) {
-	minWidth += tqlayoutStruct[i].effMinWidth;
-	maxWidth += tqlayoutStruct[i].effMaxWidth;
-	if ( tqlayoutStruct[i].effWidth.isPercent() ) {
-            int percent = kMin(tqlayoutStruct[i].effWidth.value(), remainingPercent);
-            int pw = ( tqlayoutStruct[i].effMaxWidth * 100) / kMax(percent, 1);
+    for ( unsigned int i = 0; i < layoutStruct.size(); i++ ) {
+	minWidth += layoutStruct[i].effMinWidth;
+	maxWidth += layoutStruct[i].effMaxWidth;
+	if ( layoutStruct[i].effWidth.isPercent() ) {
+            int percent = kMin(layoutStruct[i].effWidth.value(), remainingPercent);
+            int pw = ( layoutStruct[i].effMaxWidth * 100) / kMax(percent, 1);
             remainingPercent -= percent;
 	    maxPercent = kMax( pw,  maxPercent );
 	} else {
-	    maxNonPercent += tqlayoutStruct[i].effMaxWidth;
+	    maxNonPercent += layoutStruct[i].effMaxWidth;
 	}
     }
 
@@ -624,15 +624,15 @@ int AutoTableLayout::calcEffectiveWidth()
 {
     int tMaxWidth = 0;
 
-    unsigned int nEffCols = tqlayoutStruct.size();
+    unsigned int nEffCols = layoutStruct.size();
     int hspacing = table->borderHSpacing();
 #ifdef DEBUG_LAYOUT
     qDebug("AutoTableLayout::calcEffectiveWidth for %d cols", nEffCols );
 #endif
     for ( unsigned int i = 0; i < nEffCols; i++ ) {
-	tqlayoutStruct[i].effWidth = tqlayoutStruct[i].width;
-	tqlayoutStruct[i].effMinWidth = tqlayoutStruct[i].minWidth;
-	tqlayoutStruct[i].effMaxWidth = tqlayoutStruct[i].maxWidth;
+	layoutStruct[i].effWidth = layoutStruct[i].width;
+	layoutStruct[i].effMinWidth = layoutStruct[i].minWidth;
+	layoutStruct[i].effMaxWidth = layoutStruct[i].maxWidth;
     }
 
     for ( unsigned int i = 0; i < spanCells.size(); i++ ) {
@@ -660,14 +660,14 @@ int AutoTableLayout::calcEffectiveWidth()
 	int cSpan = span;
 #endif
 	while ( lastCol < nEffCols && span > 0 ) {
-	    switch( tqlayoutStruct[lastCol].width.type() ) {
+	    switch( layoutStruct[lastCol].width.type() ) {
 	    case Percent:
-		totalPercent += tqlayoutStruct[lastCol].width.value();
+		totalPercent += layoutStruct[lastCol].width.value();
 		allColsAreFixed = false;
 		break;
 	    case Fixed:
-                if (tqlayoutStruct[lastCol].width.value() > 0) {
-                    fixedWidth += tqlayoutStruct[lastCol].width.value();
+                if (layoutStruct[lastCol].width.value() > 0) {
+                    fixedWidth += layoutStruct[lastCol].width.value();
                     allColsArePercent = false;
                     // IE resets effWidth to Variable here, but this breaks the konqueror about page and seems to be some bad
                     // legacy behavior anyway. mozilla doesn't do this so I decided we don't either.
@@ -685,17 +685,17 @@ int AutoTableLayout::calcEffectiveWidth()
                 //   <tr><td>1</td><td colspan=2>2-3</tr>
                 //   <tr><td>1</td><td colspan=2 width=100%>2-3</td></tr>
                 // </table>
-                if (!tqlayoutStruct[lastCol].effWidth.isPercent()) {
-                    tqlayoutStruct[lastCol].effWidth = Length();
+                if (!layoutStruct[lastCol].effWidth.isPercent()) {
+                    layoutStruct[lastCol].effWidth = Length();
                     allColsArePercent = false;
                 }
                 else
-                    totalPercent += tqlayoutStruct[lastCol].effWidth.value();
+                    totalPercent += layoutStruct[lastCol].effWidth.value();
                 allColsAreFixed = false;
             }
             span -= table->spanOfEffCol( lastCol );
-	    minWidth += tqlayoutStruct[lastCol].effMinWidth;
-	    maxWidth += tqlayoutStruct[lastCol].effMaxWidth;
+	    minWidth += layoutStruct[lastCol].effMinWidth;
+	    maxWidth += layoutStruct[lastCol].effMaxWidth;
 	    lastCol++;
 	    cMinWidth -= hspacing;
 	    cMaxWidth -= hspacing;
@@ -720,22 +720,22 @@ int AutoTableLayout::calcEffectiveWidth()
 		int percentMissing = w.value() - totalPercent;
 		int totalWidth = 0;
 		for ( unsigned int pos = col; pos < lastCol; pos++ ) {
-		    if ( !(tqlayoutStruct[pos].width.isPercent() ) )
-			totalWidth += tqlayoutStruct[pos].effMaxWidth;
+		    if ( !(layoutStruct[pos].width.isPercent() ) )
+			totalWidth += layoutStruct[pos].effMaxWidth;
 		}
 
 		for ( unsigned int pos = col; pos < lastCol && totalWidth > 0; pos++ ) {
-		    if ( !(tqlayoutStruct[pos].width.isPercent() ) ) {
-			int percent = percentMissing * tqlayoutStruct[pos].effMaxWidth / totalWidth;
+		    if ( !(layoutStruct[pos].width.isPercent() ) ) {
+			int percent = percentMissing * layoutStruct[pos].effMaxWidth / totalWidth;
 #ifdef DEBUG_LAYOUT
-			qDebug("   col %d: setting percent value %d effMaxWidth=%d totalWidth=%d", pos, percent, tqlayoutStruct[pos].effMaxWidth, totalWidth );
+			qDebug("   col %d: setting percent value %d effMaxWidth=%d totalWidth=%d", pos, percent, layoutStruct[pos].effMaxWidth, totalWidth );
 #endif
-			totalWidth -= tqlayoutStruct[pos].effMaxWidth;
+			totalWidth -= layoutStruct[pos].effMaxWidth;
 			percentMissing -= percent;
 			if ( percent > 0 )
-			    tqlayoutStruct[pos].effWidth = Length( percent, Percent );
+			    layoutStruct[pos].effWidth = Length( percent, Percent );
 			else
-			    tqlayoutStruct[pos].effWidth = Length();
+			    layoutStruct[pos].effWidth = Length();
 		    }
 		}
 
@@ -749,13 +749,13 @@ int AutoTableLayout::calcEffectiveWidth()
 		qDebug("extending minWidth of cols %d-%d to %dpx currentMin=%d accroding to fixed sum %d", col, lastCol-1, cMinWidth, minWidth, fixedWidth );
 #endif
 		for ( unsigned int pos = col; fixedWidth > 0 && pos < lastCol; pos++ ) {
-		    int w = kMax( int( tqlayoutStruct[pos].effMinWidth ), cMinWidth * tqlayoutStruct[pos].width.value() / fixedWidth );
+		    int w = kMax( int( layoutStruct[pos].effMinWidth ), cMinWidth * layoutStruct[pos].width.value() / fixedWidth );
 #ifdef DEBUG_LAYOUT
-		    qDebug("   col %d: min=%d, effMin=%d, new=%d", pos, tqlayoutStruct[pos].effMinWidth, tqlayoutStruct[pos].effMinWidth, w );
+		    qDebug("   col %d: min=%d, effMin=%d, new=%d", pos, layoutStruct[pos].effMinWidth, layoutStruct[pos].effMinWidth, w );
 #endif
-		    fixedWidth -= tqlayoutStruct[pos].width.value();
+		    fixedWidth -= layoutStruct[pos].width.value();
 		    cMinWidth -= w;
-		    tqlayoutStruct[pos].effMinWidth = w;
+		    layoutStruct[pos].effMinWidth = w;
 		}
 
             } else if ( allColsArePercent ) {
@@ -764,17 +764,17 @@ int AutoTableLayout::calcEffectiveWidth()
                 int cminw = cMinWidth;
 
                 for ( unsigned int pos = col; maxw > 0 && pos < lastCol; pos++ ) {
-                    if ( tqlayoutStruct[pos].effWidth.isPercent() && tqlayoutStruct[pos].effWidth.value()>0 && fixedWidth <= cMinWidth) {
-                        int w = tqlayoutStruct[pos].effMinWidth;
-                        w = kMax( w, cminw*tqlayoutStruct[pos].effWidth.value()/totalPercent );
-                        w = kMin(tqlayoutStruct[pos].effMinWidth+(cMinWidth-minw), w);
+                    if ( layoutStruct[pos].effWidth.isPercent() && layoutStruct[pos].effWidth.value()>0 && fixedWidth <= cMinWidth) {
+                        int w = layoutStruct[pos].effMinWidth;
+                        w = kMax( w, cminw*layoutStruct[pos].effWidth.value()/totalPercent );
+                        w = kMin(layoutStruct[pos].effMinWidth+(cMinWidth-minw), w);
 #ifdef DEBUG_LAYOUT
-                        qDebug("   col %d: min=%d, effMin=%d, new=%d", pos, tqlayoutStruct[pos].effMinWidth, tqlayoutStruct[pos].effMinWidth, w );
+                        qDebug("   col %d: min=%d, effMin=%d, new=%d", pos, layoutStruct[pos].effMinWidth, layoutStruct[pos].effMinWidth, w );
 #endif
-                        maxw -= tqlayoutStruct[pos].effMaxWidth;
-                        minw -= tqlayoutStruct[pos].effMinWidth;
+                        maxw -= layoutStruct[pos].effMaxWidth;
+                        minw -= layoutStruct[pos].effMinWidth;
                         cMinWidth -= w;
-                        tqlayoutStruct[pos].effMinWidth = w;
+                        layoutStruct[pos].effMinWidth = w;
                     }
                 }
 	    } else {
@@ -786,31 +786,31 @@ int AutoTableLayout::calcEffectiveWidth()
 
                 // Give min to variable first, to fixed second, and to others third.
 		for ( unsigned int pos = col; maxw > 0 && pos < lastCol; pos++ ) {
-		    if ( tqlayoutStruct[pos].width.isFixed() && haveVariable && fixedWidth <= cMinWidth ) {
-			int w = kMax( int( tqlayoutStruct[pos].effMinWidth ), tqlayoutStruct[pos].width.value() );
-			fixedWidth -= tqlayoutStruct[pos].width.value();
-                        minw -= tqlayoutStruct[pos].effMinWidth;
+		    if ( layoutStruct[pos].width.isFixed() && haveVariable && fixedWidth <= cMinWidth ) {
+			int w = kMax( int( layoutStruct[pos].effMinWidth ), layoutStruct[pos].width.value() );
+			fixedWidth -= layoutStruct[pos].width.value();
+                        minw -= layoutStruct[pos].effMinWidth;
 #ifdef DEBUG_LAYOUT
-			qDebug("   col %d: min=%d, effMin=%d, new=%d", pos, tqlayoutStruct[pos].effMinWidth, tqlayoutStruct[pos].effMinWidth, w );
+			qDebug("   col %d: min=%d, effMin=%d, new=%d", pos, layoutStruct[pos].effMinWidth, layoutStruct[pos].effMinWidth, w );
 #endif
-			maxw -= tqlayoutStruct[pos].effMaxWidth;
+			maxw -= layoutStruct[pos].effMaxWidth;
 			cMinWidth -= w;
-			tqlayoutStruct[pos].effMinWidth = w;
+			layoutStruct[pos].effMinWidth = w;
 		    }
 		}
 
 		for ( unsigned int pos = col; maxw > 0 && pos < lastCol && minw < cMinWidth; pos++ ) {
-		    if ( !(tqlayoutStruct[pos].width.isFixed() && haveVariable && fixedWidth <= cMinWidth) ) {
-			int w = kMax( int( tqlayoutStruct[pos].effMinWidth ), cMinWidth * tqlayoutStruct[pos].effMaxWidth / maxw );
-                        w = kMin(tqlayoutStruct[pos].effMinWidth+(cMinWidth-minw), w);
+		    if ( !(layoutStruct[pos].width.isFixed() && haveVariable && fixedWidth <= cMinWidth) ) {
+			int w = kMax( int( layoutStruct[pos].effMinWidth ), cMinWidth * layoutStruct[pos].effMaxWidth / maxw );
+                        w = kMin(layoutStruct[pos].effMinWidth+(cMinWidth-minw), w);
 
 #ifdef DEBUG_LAYOUT
-			qDebug("   col %d: min=%d, effMin=%d, new=%d", pos, tqlayoutStruct[pos].effMinWidth, tqlayoutStruct[pos].effMinWidth, w );
+			qDebug("   col %d: min=%d, effMin=%d, new=%d", pos, layoutStruct[pos].effMinWidth, layoutStruct[pos].effMinWidth, w );
 #endif
-			maxw -= tqlayoutStruct[pos].effMaxWidth;
-                        minw -= tqlayoutStruct[pos].effMinWidth;
+			maxw -= layoutStruct[pos].effMaxWidth;
+                        minw -= layoutStruct[pos].effMinWidth;
 			cMinWidth -= w;
-			tqlayoutStruct[pos].effMinWidth = w;
+			layoutStruct[pos].effMinWidth = w;
 		    }
 		}
 	    }
@@ -821,18 +821,18 @@ int AutoTableLayout::calcEffectiveWidth()
 		qDebug("extending maxWidth of cols %d-%d to %dpx", col, lastCol-1, cMaxWidth );
 #endif
 		for ( unsigned int pos = col; maxWidth > 0 && pos < lastCol; pos++ ) {
-		    int w = kMax( int( tqlayoutStruct[pos].effMaxWidth ), cMaxWidth * tqlayoutStruct[pos].effMaxWidth / maxWidth );
+		    int w = kMax( int( layoutStruct[pos].effMaxWidth ), cMaxWidth * layoutStruct[pos].effMaxWidth / maxWidth );
 #ifdef DEBUG_LAYOUT
-		    qDebug("   col %d: max=%d, effMax=%d, new=%d", pos, tqlayoutStruct[pos].effMaxWidth, tqlayoutStruct[pos].effMaxWidth, w );
+		    qDebug("   col %d: max=%d, effMax=%d, new=%d", pos, layoutStruct[pos].effMaxWidth, layoutStruct[pos].effMaxWidth, w );
 #endif
-		    maxWidth -= tqlayoutStruct[pos].effMaxWidth;
+		    maxWidth -= layoutStruct[pos].effMaxWidth;
 		    cMaxWidth -= w;
-		    tqlayoutStruct[pos].effMaxWidth = w;
+		    layoutStruct[pos].effMaxWidth = w;
 		}
 	    }
 	} else {
 	    for ( unsigned int pos = col; pos < lastCol; pos++ )
-		tqlayoutStruct[pos].maxWidth = kMax(tqlayoutStruct[pos].maxWidth, int(tqlayoutStruct[pos].minWidth) );
+		layoutStruct[pos].maxWidth = kMax(layoutStruct[pos].maxWidth, int(layoutStruct[pos].minWidth) );
 	}
     }
     effWidthDirty = false;
@@ -868,20 +868,20 @@ void AutoTableLayout::insertSpanCell( RenderTableCell *cell )
 }
 
 
-void AutoTableLayout::tqlayout()
+void AutoTableLayout::layout()
 {
-    // table tqlayout based on the values collected in the tqlayout structure.
+    // table layout based on the values collected in the layout structure.
     int tableWidth = table->width() - table->bordersPaddingAndSpacing();
     int available = tableWidth;
     int nEffCols = table->numEffCols();
 
-    if ( nEffCols != (int)tqlayoutStruct.size() ) {
-	qWarning("WARNING: nEffCols is not equal to tqlayoutstruct!" );
+    if ( nEffCols != (int)layoutStruct.size() ) {
+	qWarning("WARNING: nEffCols is not equal to layoutstruct!" );
 	fullRecalc();
 	nEffCols = table->numEffCols();
     }
 #ifdef DEBUG_LAYOUT
-    qDebug("AutoTableLayout::tqlayout()");
+    qDebug("AutoTableLayout::layout()");
 #endif
 
     if ( effWidthDirty )
@@ -891,11 +891,11 @@ void AutoTableLayout::tqlayout()
     qDebug("    tableWidth=%d,  nEffCols=%d", tableWidth,  nEffCols );
     for ( int i = 0; i < nEffCols; i++ ) {
 	qDebug("    effcol %d is of type %d value %d, minWidth=%d, maxWidth=%d",
-               i, tqlayoutStruct[i].width.type(), tqlayoutStruct[i].width.value(),
-	       tqlayoutStruct[i].minWidth, tqlayoutStruct[i].maxWidth );
+               i, layoutStruct[i].width.type(), layoutStruct[i].width.value(),
+	       layoutStruct[i].minWidth, layoutStruct[i].maxWidth );
 	qDebug("        effective: type %d value %d, minWidth=%d, maxWidth=%d",
-               tqlayoutStruct[i].effWidth.type(), tqlayoutStruct[i].effWidth.value(),
-	       tqlayoutStruct[i].effMinWidth, tqlayoutStruct[i].effMaxWidth );
+               layoutStruct[i].effWidth.type(), layoutStruct[i].effWidth.value(),
+	       layoutStruct[i].effMinWidth, layoutStruct[i].effMaxWidth );
     }
 #endif
 
@@ -911,10 +911,10 @@ void AutoTableLayout::tqlayout()
 
     // fill up every cell with it's minWidth
     for ( int i = 0; i < nEffCols; i++ ) {
-	int w = tqlayoutStruct[i].effMinWidth;
-	tqlayoutStruct[i].calcWidth = w;
+	int w = layoutStruct[i].effMinWidth;
+	layoutStruct[i].calcWidth = w;
 	available -= w;
-	Length& width = tqlayoutStruct[i].effWidth;
+	Length& width = layoutStruct[i].effWidth;
         switch( width.type()) {
         case Percent:
 	    havePercent = true;
@@ -926,13 +926,13 @@ void AutoTableLayout::tqlayout()
             break;
         case Fixed:
             numFixed++;
-            totalFixed += tqlayoutStruct[i].effMaxWidth;
+            totalFixed += layoutStruct[i].effMaxWidth;
             // fall through
             break;
         case Variable:
         case Static:
             numVariable++;
-            totalVariable += tqlayoutStruct[i].effMaxWidth;
+            totalVariable += layoutStruct[i].effMaxWidth;
             allocVariable += w;
         }
     }
@@ -940,25 +940,25 @@ void AutoTableLayout::tqlayout()
     // allocate width to percent cols
     if ( available > 0 && havePercent ) {
 	for ( int i = 0; i < nEffCols; i++ ) {
-	    const Length &width = tqlayoutStruct[i].effWidth;
+	    const Length &width = layoutStruct[i].effWidth;
 	    if ( width.isPercent() ) {
-                int w = kMax ( int( tqlayoutStruct[i].effMinWidth ), width.minWidth( tableWidth ) );
-		available += tqlayoutStruct[i].calcWidth - w;
-		tqlayoutStruct[i].calcWidth = w;
+                int w = kMax ( int( layoutStruct[i].effMinWidth ), width.minWidth( tableWidth ) );
+		available += layoutStruct[i].calcWidth - w;
+		layoutStruct[i].calcWidth = w;
 	    }
 	}
 	if ( totalPercent > 100 ) {
 	    // remove overallocated space from the last columns
 	    int excess = tableWidth*(totalPercent-100)/100;
 	    for ( int i = nEffCols-1; i >= 0; i-- ) {
-		if ( tqlayoutStruct[i].effWidth.isPercent() ) {
-		    int w = tqlayoutStruct[i].calcWidth;
+		if ( layoutStruct[i].effWidth.isPercent() ) {
+		    int w = layoutStruct[i].calcWidth;
 		    int reduction = kMin( w,  excess );
 		    // the lines below might look inconsistent, but that's the way it's handled in mozilla
 		    excess -= reduction;
-		    int newWidth = kMax( int (tqlayoutStruct[i].effMinWidth), w - reduction );
+		    int newWidth = kMax( int (layoutStruct[i].effMinWidth), w - reduction );
 		    available += w - newWidth;
-		    tqlayoutStruct[i].calcWidth = newWidth;
+		    layoutStruct[i].calcWidth = newWidth;
 		    //qDebug("col %d: reducing to %d px (reduction=%d)", i, newWidth, reduction );
 		}
 	    }
@@ -971,10 +971,10 @@ void AutoTableLayout::tqlayout()
     // then allocate width to fixed cols
     if ( available > 0 ) {
 	for ( int i = 0; i < nEffCols; ++i ) {
-	    const Length &width = tqlayoutStruct[i].effWidth;
-	    if ( width.isFixed() && width.value() > tqlayoutStruct[i].calcWidth ) {
-		available += tqlayoutStruct[i].calcWidth - width.value();
-		tqlayoutStruct[i].calcWidth = width.value();
+	    const Length &width = layoutStruct[i].effWidth;
+	    if ( width.isFixed() && width.value() > layoutStruct[i].calcWidth ) {
+		available += layoutStruct[i].calcWidth - width.value();
+		layoutStruct[i].calcWidth = width.value();
             }
 	}
     }
@@ -985,12 +985,12 @@ void AutoTableLayout::tqlayout()
     // now satisfy relative
     if ( available > 0 ) {
 	for ( int i = 0; i < nEffCols; i++ ) {
-	    const Length &width = tqlayoutStruct[i].effWidth;
+	    const Length &width = layoutStruct[i].effWidth;
 	    if ( width.isRelative() && width.value() ) {
 		// width=0* gets effMinWidth.
 		int w = width.value()*tableWidth/totalRelative;
-		available += tqlayoutStruct[i].calcWidth - w;
-		tqlayoutStruct[i].calcWidth = w;
+		available += layoutStruct[i].calcWidth - w;
+		layoutStruct[i].calcWidth = w;
 	    }
 	}
     }
@@ -1000,13 +1000,13 @@ void AutoTableLayout::tqlayout()
 	available += allocVariable; // this gets redistributed
  	//qDebug("redistributing %dpx to %d variable columns. totalVariable=%d",  available,  numVariable,  totalVariable );
 	for ( int i = 0; i < nEffCols; i++ ) {
-	    const Length &width = tqlayoutStruct[i].effWidth;
+	    const Length &width = layoutStruct[i].effWidth;
 	    if ( width.isVariable() && totalVariable != 0 ) {
-		int w = kMax( int ( tqlayoutStruct[i].calcWidth ),
-                              available * tqlayoutStruct[i].effMaxWidth / totalVariable );
+		int w = kMax( int ( layoutStruct[i].calcWidth ),
+                              available * layoutStruct[i].effMaxWidth / totalVariable );
 		available -= w;
-		totalVariable -= tqlayoutStruct[i].effMaxWidth;
-		tqlayoutStruct[i].calcWidth = w;
+		totalVariable -= layoutStruct[i].effMaxWidth;
+		layoutStruct[i].calcWidth = w;
 	    }
 	}
     }
@@ -1018,12 +1018,12 @@ void AutoTableLayout::tqlayout()
     if ( available > 0 && numFixed) {
         // still have some width to spread, distribute to fixed columns
         for ( int i = 0; i < nEffCols; i++ ) {
-            const Length &width = tqlayoutStruct[i].effWidth;
+            const Length &width = layoutStruct[i].effWidth;
             if ( width.isFixed() ) {
-                int w = available * tqlayoutStruct[i].effMaxWidth / totalFixed;
+                int w = available * layoutStruct[i].effMaxWidth / totalFixed;
                 available -= w;
-                totalFixed -= tqlayoutStruct[i].effMaxWidth;
-                tqlayoutStruct[i].calcWidth += w;
+                totalFixed -= layoutStruct[i].effMaxWidth;
+                layoutStruct[i].calcWidth += w;
             }
         }
     }
@@ -1036,12 +1036,12 @@ void AutoTableLayout::tqlayout()
     if ( available > 0 && hasPercent && totalPercent < 100) {
         // still have some width to spread, distribute weighted to percent columns
         for ( int i = 0; i < nEffCols; i++ ) {
-            const Length &width = tqlayoutStruct[i].effWidth;
+            const Length &width = layoutStruct[i].effWidth;
             if ( width.isPercent() ) {
                 int w = available * width.value() / totalPercent;
                 available -= w;
                 totalPercent -= width.value();
-                tqlayoutStruct[i].calcWidth += w;
+                layoutStruct[i].calcWidth += w;
                 if (!available || !totalPercent) break;
             }
         }
@@ -1060,7 +1060,7 @@ void AutoTableLayout::tqlayout()
             int w = available / total;
             available -= w;
             total--;
-            tqlayoutStruct[i].calcWidth += w;
+            layoutStruct[i].calcWidth += w;
         }
     }
 
@@ -1079,17 +1079,17 @@ void AutoTableLayout::tqlayout()
         if (available < 0) {
             int mw = 0;
             for ( int i = nEffCols-1; i >= 0; i-- ) {
-                Length &width = tqlayoutStruct[i].effWidth;
+                Length &width = layoutStruct[i].effWidth;
                 if (width.isVariable())
-                    mw += tqlayoutStruct[i].calcWidth - tqlayoutStruct[i].effMinWidth;
+                    mw += layoutStruct[i].calcWidth - layoutStruct[i].effMinWidth;
             }
 
             for ( int i = nEffCols-1; i >= 0 && mw > 0; i-- ) {
-                Length &width = tqlayoutStruct[i].effWidth;
+                Length &width = layoutStruct[i].effWidth;
                 if (width.isVariable()) {
-                    int minMaxDiff = tqlayoutStruct[i].calcWidth-tqlayoutStruct[i].effMinWidth;
+                    int minMaxDiff = layoutStruct[i].calcWidth-layoutStruct[i].effMinWidth;
                     int reduce = available * minMaxDiff / mw;
-                    tqlayoutStruct[i].calcWidth += reduce;
+                    layoutStruct[i].calcWidth += reduce;
                     available -= reduce;
                     mw -= minMaxDiff;
                     if ( available >= 0 )
@@ -1101,17 +1101,17 @@ void AutoTableLayout::tqlayout()
         if (available < 0) {
             int mw = 0;
             for ( int i = nEffCols-1; i >= 0; i-- ) {
-                Length &width = tqlayoutStruct[i].effWidth;
+                Length &width = layoutStruct[i].effWidth;
                 if (width.isRelative())
-                    mw += tqlayoutStruct[i].calcWidth - tqlayoutStruct[i].effMinWidth;
+                    mw += layoutStruct[i].calcWidth - layoutStruct[i].effMinWidth;
             }
 
             for ( int i = nEffCols-1; i >= 0 && mw > 0; i-- ) {
-                Length &width = tqlayoutStruct[i].effWidth;
+                Length &width = layoutStruct[i].effWidth;
                 if (width.isRelative()) {
-                    int minMaxDiff = tqlayoutStruct[i].calcWidth-tqlayoutStruct[i].effMinWidth;
+                    int minMaxDiff = layoutStruct[i].calcWidth-layoutStruct[i].effMinWidth;
                     int reduce = available * minMaxDiff / mw;
-                    tqlayoutStruct[i].calcWidth += reduce;
+                    layoutStruct[i].calcWidth += reduce;
                     available -= reduce;
                     mw -= minMaxDiff;
                     if ( available >= 0 )
@@ -1123,17 +1123,17 @@ void AutoTableLayout::tqlayout()
         if (available < 0) {
             int mw = 0;
             for ( int i = nEffCols-1; i >= 0; i-- ) {
-                Length &width = tqlayoutStruct[i].effWidth;
+                Length &width = layoutStruct[i].effWidth;
                 if (width.isFixed())
-                    mw += tqlayoutStruct[i].calcWidth - tqlayoutStruct[i].effMinWidth;
+                    mw += layoutStruct[i].calcWidth - layoutStruct[i].effMinWidth;
             }
 
             for ( int i = nEffCols-1; i >= 0 && mw > 0; i-- ) {
-                Length &width = tqlayoutStruct[i].effWidth;
+                Length &width = layoutStruct[i].effWidth;
                 if (width.isFixed()) {
-                    int minMaxDiff = tqlayoutStruct[i].calcWidth-tqlayoutStruct[i].effMinWidth;
+                    int minMaxDiff = layoutStruct[i].calcWidth-layoutStruct[i].effMinWidth;
                     int reduce = available * minMaxDiff / mw;
-                    tqlayoutStruct[i].calcWidth += reduce;
+                    layoutStruct[i].calcWidth += reduce;
                     available -= reduce;
                     mw -= minMaxDiff;
                     if ( available >= 0 )
@@ -1145,17 +1145,17 @@ void AutoTableLayout::tqlayout()
         if (available < 0) {
             int mw = 0;
             for ( int i = nEffCols-1; i >= 0; i-- ) {
-                Length &width = tqlayoutStruct[i].effWidth;
+                Length &width = layoutStruct[i].effWidth;
                 if (width.isPercent())
-                    mw += tqlayoutStruct[i].calcWidth - tqlayoutStruct[i].effMinWidth;
+                    mw += layoutStruct[i].calcWidth - layoutStruct[i].effMinWidth;
             }
 
             for ( int i = nEffCols-1; i >= 0 && mw > 0; i-- ) {
-                Length &width = tqlayoutStruct[i].effWidth;
+                Length &width = layoutStruct[i].effWidth;
                 if (width.isPercent()) {
-                    int minMaxDiff = tqlayoutStruct[i].calcWidth-tqlayoutStruct[i].effMinWidth;
+                    int minMaxDiff = layoutStruct[i].calcWidth-layoutStruct[i].effMinWidth;
                     int reduce = available * minMaxDiff / mw;
-                    tqlayoutStruct[i].calcWidth += reduce;
+                    layoutStruct[i].calcWidth += reduce;
                     available -= reduce;
                     mw -= minMaxDiff;
                     if ( available >= 0 )
@@ -1170,10 +1170,10 @@ void AutoTableLayout::tqlayout()
     int pos = 0;
     for ( int i = 0; i < nEffCols; i++ ) {
 #ifdef DEBUG_LAYOUT
-	qDebug("col %d: %d (width %d)", i, pos, tqlayoutStruct[i].calcWidth );
+	qDebug("col %d: %d (width %d)", i, pos, layoutStruct[i].calcWidth );
 #endif
 	table->columnPos[i] = pos;
-	pos += tqlayoutStruct[i].calcWidth + table->borderHSpacing();
+	pos += layoutStruct[i].calcWidth + table->borderHSpacing();
     }
     table->columnPos[table->columnPos.size()-1] = pos;
 
@@ -1183,9 +1183,9 @@ void AutoTableLayout::tqlayout()
 void AutoTableLayout::calcPercentages() const
 {
     total_percent = 0;
-    for ( unsigned int i = 0; i < tqlayoutStruct.size(); i++ ) {
-	if ( tqlayoutStruct[i].width.isPercent() )
-	    total_percent += tqlayoutStruct[i].width.value();
+    for ( unsigned int i = 0; i < layoutStruct.size(); i++ ) {
+	if ( layoutStruct[i].width.isPercent() )
+	    total_percent += layoutStruct[i].width.value();
     }
     percentagesDirty = false;
 }
diff --git a/khtml/rendering/table_layout.h b/khtml/rendering/table_layout.h
index 1a8b2da53..cbaf6d3a7 100644
--- a/khtml/rendering/table_layout.h
+++ b/khtml/rendering/table_layout.h
@@ -40,7 +40,7 @@ public:
     virtual ~TableLayout() {}
 
     virtual void calcMinMaxWidth() = 0;
-    virtual void tqlayout() = 0;
+    virtual void layout() = 0;
 
 protected:
     RenderTable *table;
@@ -55,7 +55,7 @@ public:
     ~FixedTableLayout();
 
     void calcMinMaxWidth();
-    void tqlayout();
+    void layout();
 
 protected:
     int calcWidthArray();
@@ -72,7 +72,7 @@ public:
     ~AutoTableLayout();
 
     void calcMinMaxWidth();
-    void tqlayout();
+    void layout();
 
 
 protected:
@@ -100,7 +100,7 @@ protected:
 	short calcWidth;
     };
 
-    TQMemArray<Layout> tqlayoutStruct;
+    TQMemArray<Layout> layoutStruct;
     TQMemArray<RenderTableCell *>spanCells;
     bool hasPercent : 1;
     mutable bool percentagesDirty : 1;
diff --git a/khtml/rendering/table_layout.txt b/khtml/rendering/table_layout.txt
index 770dba06f..14a74bd1e 100644
--- a/khtml/rendering/table_layout.txt
+++ b/khtml/rendering/table_layout.txt
@@ -1,14 +1,14 @@
-CSS describes two ways of tqlayouting tables. Auto tqlayout (the NS4
-compliant HTML table tqlayout) and fixed tqlayout. The fixed tqlayout
+CSS describes two ways of layouting tables. Auto layout (the NS4
+compliant HTML table layout) and fixed layout. The fixed layout
 strategy is described in detail in the CSS specs and will not be
 repeated here.
 
-Due to the fact that two tqlayout strategies exist, it is rather natural
-to encapsulate the tqlayouting process in a TableLayout class. Two types
+Due to the fact that two layout strategies exist, it is rather natural
+to encapsulate the layouting process in a TableLayout class. Two types
 (FixedTableLayout and AutoTableLayout) exist. AutoTableLayout is the
 default and also need a quirks flags for NS compatibility
 mode. FixedTableLayout will be used if a style rule sets the
-table-tqlayout property to fixed.
+table-layout property to fixed.
 
 The grid of table cells is stored in each table section, as spans
 can't pass section borders. Changing the number of cols in the grid
@@ -25,10 +25,10 @@ structure.
 
 
 
-NS & Mozilla compliant table tqlayouting algorithm (AutoTableLayout)
+NS & Mozilla compliant table layouting algorithm (AutoTableLayout)
 ------------------------------------------------------------------
 
-The table tqlayout algorithm computes a set of tqlayout hints from the
+The table layout algorithm computes a set of layout hints from the
 informations in the table cells, <col> elements and style
 sheets. Hints from different sources are treated a bit differently in
 the collection stage.
@@ -37,17 +37,17 @@ In addition certain operations are only done in quirks (NS4 compat)
 mode.
 
 Resizing the table doesn't require you to build up this information
-again. All that is needed is a list of tqlayout hints for each column.
+again. All that is needed is a list of layout hints for each column.
 
 The algorithm below describes to the best of our knowledge the way
 table alyouting is handled in a NS compatible way.
 
 There are two stages, the collection stage (assocaited with
 calcMinMaxWidth() in khtml) and the stage assigning width to cells
-(associated with tqlayout()).
+(associated with layout()).
 
-A set of hinted widths are used to determine the final table tqlayout in
-the tqlayouting stage.
+A set of hinted widths are used to determine the final table layout in
+the layouting stage.
 
 enum hintType {
      MinWidth,
@@ -62,7 +62,7 @@ enum hintType {
 };
 
 One width (in pixels) for each hintType describes how the column
-wishes to be tqlayouted. The tqlayouting stage operates only on an array
+wishes to be layouted. The layouting stage operates only on an array
 of hints for each column.
 
 An additional totalCellSpacing variable is used to know about the
diff --git a/khtml/test/align2.html b/khtml/test/align2.html
index 18dbfc43e..56f3feb70 100644
--- a/khtml/test/align2.html
+++ b/khtml/test/align2.html
@@ -4,14 +4,14 @@
 </HEAD>
 <BODY>
 <H1>Align Test 2</H1>
-This page tqcontains regression tests for vertical tqalignment of images.
+This page contains regression tests for vertical alignment of images.
 Each test consist of a table with a colored background. 
 Within the table an empty image is shown with a border of 1 pixel around it. 
 <HR>
 <TABLE width = 100%>
 <tr><td bgcolor="0000ff">
 <IMG SRC="unknown.gif" height=10 width=50 border=1>
-<FONT size=7>This image has no tqalignment</FONT>
+<FONT size=7>This image has no alignment</FONT>
 </td></tr>
 </TABLE>
 <HR>
@@ -39,7 +39,7 @@ Within the table an empty image is shown with a border of 1 pixel around it.
 <TABLE width = 100%>
 <tr><td bgcolor="0000ff">
 <IMG SRC="unknown.gif" height=150 width=50 border=1>
-<FONT size=7>This image has no tqalignment</FONT>
+<FONT size=7>This image has no alignment</FONT>
 <IMG SRC="unknown.gif" height=50 width=50 border=1>
 </td></tr>
 </TABLE>
@@ -68,7 +68,7 @@ Within the table an empty image is shown with a border of 1 pixel around it.
 <TABLE width = 100%>
 <tr><td bgcolor="0000ff">
 <IMG SRC="unknown.gif" height=10 width=50 border=1>
-<FONT>This image has no tqalignment</FONT>
+<FONT>This image has no alignment</FONT>
 </td></tr>
 </TABLE>
 <HR>
@@ -96,7 +96,7 @@ Within the table an empty image is shown with a border of 1 pixel around it.
 <TABLE width = 100%>
 <tr><td bgcolor="0000ff">
 <IMG SRC="unknown.gif" height=150 width=50 border=1>
-<FONT>This image has no tqalignment</FONT>
+<FONT>This image has no alignment</FONT>
 <IMG SRC="unknown.gif" height=50 width=50 border=1>
 </td></tr>
 </TABLE>
diff --git a/khtml/test/button.html b/khtml/test/button.html
index 4ef6552f2..b9c3ae177 100644
--- a/khtml/test/button.html
+++ b/khtml/test/button.html
@@ -1,7 +1,7 @@
 <html>
 <body bgcolor=white>
 text before
-<button name=button type=submit value="this should get tqreplaced by the contents">
+<button name=button type=submit value="this should get replaced by the contents">
 some text
 <table width=200 border=1>
 <tr><td bgcolor=red>1<td bgcolor=blue>2</tr>
diff --git a/khtml/test/color.html b/khtml/test/color.html
index a53940d68..ff5617214 100644
--- a/khtml/test/color.html
+++ b/khtml/test/color.html
@@ -4,7 +4,7 @@
 </HEAD>
 <BODY>
 <H1>Color Test 1</H1>
-This page tqcontains regression tests for the parsing of colors.
+This page contains regression tests for the parsing of colors.
 Each test consist of a table with a colored background. 
 Within the table the name of the color is written in black text.
 <HR>
diff --git a/khtml/test/image_map.html b/khtml/test/image_map.html
index 35d170d2a..21e002382 100644
--- a/khtml/test/image_map.html
+++ b/khtml/test/image_map.html
@@ -13,11 +13,11 @@ Moving the mouse cursor over the image should show different destinations
 
 <!-- ===============  TOP IMAGE MAP =========== -->
 <MAP name="topbar">
-<AREA tqshape="rect" coords="90,0,120,18" href="http://www.kde.org/faq/kdefaq.html">
-<AREA tqshape="rect" coords="130,0,205,18" href="ftp://ftp.kde.org/pub/kde/">
-<AREA tqshape="rect" coords="215,0,295,18" href="http://www.kde.org/absolute_url.html">
-<AREA tqshape="rect" coords="305,0,355,18" href="relative_url_index.html">
-<AREA tqshape="default" nohref>
+<AREA shape="rect" coords="90,0,120,18" href="http://www.kde.org/faq/kdefaq.html">
+<AREA shape="rect" coords="130,0,205,18" href="ftp://ftp.kde.org/pub/kde/">
+<AREA shape="rect" coords="215,0,295,18" href="http://www.kde.org/absolute_url.html">
+<AREA shape="rect" coords="305,0,355,18" href="relative_url_index.html">
+<AREA shape="default" nohref>
 </MAP>
 
 </BODY>
diff --git a/khtml/test/lake.class b/khtml/test/lake.class
index dfd476292..3196702b1 100644
--- a/khtml/test/lake.class
+++ b/khtml/test/lake.class
diff --git a/khtml/test/nbsp.html b/khtml/test/nbsp.html
index e64c23c7f..7a8bde9de 100644
--- a/khtml/test/nbsp.html
+++ b/khtml/test/nbsp.html
@@ -4,7 +4,7 @@
 <body>
 <H1>NBSP Test</H1>
 This page is a regression test to test non-breaking spaces.<BR>
-The following text tqcontains normal and non-breaking spaces.<BR>
+The following text contains normal and non-breaking spaces.<BR>
 After each 'a' a non-breaking space occurs. After each 'b' a
 breaking space occurs:
 <HR>
diff --git a/khtml/test_regression.cpp b/khtml/test_regression.cpp
index 70a34b984..288f0df6b 100644
--- a/khtml/test_regression.cpp
+++ b/khtml/test_regression.cpp
@@ -92,7 +92,7 @@
 #include <kparts/browserextension.h>
 
 #include "khtmlview.h"
-#include "rendering/render_tqreplaced.h"
+#include "rendering/render_replaced.h"
 #include "xml/dom_docimpl.h"
 #include "html/html_baseimpl.h"
 #include "dom/dom_doc.h"
@@ -215,9 +215,9 @@ Value RegTestFunction::call(ExecState *exec, Object &/*thisObj*/, const List &ar
     switch (id) {
 	case Print: {
 	    UString str = args[0].toString(exec);
-            if ( str.qstring().lower().tqfind( "failed!" ) >= 0 )
+            if ( str.qstring().lower().find( "failed!" ) >= 0 )
                 m_regTest->saw_failure = true;
-            TQString res = str.qstring().tqreplace('\007', "");
+            TQString res = str.qstring().replace('\007', "");
             m_regTest->m_currentOutput += res + "\n";
 	    break;
 	}
@@ -236,7 +236,7 @@ Value RegTestFunction::call(ExecState *exec, Object &/*thisObj*/, const List &ar
             if ( docimpl && docimpl->view() && docimpl->renderer() )
             {
                 docimpl->updateRendering();
-                docimpl->view()->tqlayout();
+                docimpl->view()->layout();
             }
             TQString filename = args[0].toString(exec).qstring();
             filename = RegressionTest::curr->m_currentCategory+"/"+filename;
@@ -676,7 +676,7 @@ RegressionTest::RegressionTest(KHTMLPart *part, const TQString &baseDir, const T
 {
     m_part = part;
     m_baseDir = baseDir;
-    m_baseDir = m_baseDir.tqreplace( "//", "/" );
+    m_baseDir = m_baseDir.replace( "//", "/" );
     if ( m_baseDir.endsWith( "/" ) )
         m_baseDir = m_baseDir.left( m_baseDir.length() - 1 );
     if (outputDir.isEmpty())
@@ -770,16 +770,16 @@ bool RegressionTest::runTests(TQString relPath, bool mustExist, int known_failur
 	    TQString filename = sourceDir[fileno];
 	    TQString relFilename = relPath.isEmpty() ? filename : relPath+"/"+filename;
 
-	    if (filename == "." || filename == ".." ||  ignoreFiles.tqcontains(filename) )
+	    if (filename == "." || filename == ".." ||  ignoreFiles.contains(filename) )
                 continue;
             int failure_type = NoFailure;
-            if ( failureFiles.tqcontains( filename ) )
+            if ( failureFiles.contains( filename ) )
                 failure_type |= AllFailure;
-            if ( failureFiles.tqcontains ( filename + "-render" ) )
+            if ( failureFiles.contains ( filename + "-render" ) )
                 failure_type |= RenderFailure;
-            if ( failureFiles.tqcontains ( filename + "-dump.png" ) )
+            if ( failureFiles.contains ( filename + "-dump.png" ) )
                 failure_type |= PaintFailure;
-            if ( failureFiles.tqcontains ( filename + "-dom" ) )
+            if ( failureFiles.contains ( filename + "-dom" ) )
                 failure_type |= DomFailure;
             runTests(relFilename, false, failure_type );
 	}
@@ -849,7 +849,7 @@ void RegressionTest::getPartDOMOutput( TQTextStream &outputStream, KHTMLPart* pa
 		if ( node.handle()->id() == ID_FRAME ) {
 			outputStream << endl;
 			TQString frameName = static_cast<DOM::HTMLFrameElementImpl *>( node.handle() )->name.string();
-			KHTMLPart* frame = part->tqfindFrame( frameName );
+			KHTMLPart* frame = part->findFrame( frameName );
 			Q_ASSERT( frame );
 			if ( frame )
 			    getPartDOMOutput( outputStream, frame, indent );
@@ -923,7 +923,7 @@ void RegressionTest::dumpRenderTree( TQTextStream &outputStream, KHTMLPart* part
     names.sort();
     for ( TQStringList::iterator it = names.begin(); it != names.end(); ++it ) {
         outputStream << "FRAME: " << (*it) << "\n";
-	KHTMLPart* frame = part->tqfindFrame( (*it) );
+	KHTMLPart* frame = part->findFrame( (*it) );
 	Q_ASSERT( frame );
 	if ( frame )
             dumpRenderTree( outputStream, frame );
@@ -943,7 +943,7 @@ TQString RegressionTest::getPartOutput( OutputType type)
         getPartDOMOutput( outputStream, m_part, 0 );
     }
 
-    dump.tqreplace( m_baseDir + "/tests", TQString::tqfromLatin1( "REGRESSION_SRCDIR" ) );
+    dump.replace( m_baseDir + "/tests", TQString::fromLatin1( "REGRESSION_SRCDIR" ) );
     return dump;
 }
 
@@ -1000,9 +1000,9 @@ bool RegressionTest::imageEqual( const TQImage &lhsi, const TQImage &rhsi )
             for ( int x = 0; x < w; ++x ) {
                 QRgb l = ls[x];
                 QRgb r = rs[x];
-                if ( ( abs( tqRed( l ) - tqRed(r ) ) < 20 ) &&
-                     ( abs( tqGreen( l ) - tqGreen(r ) ) < 20 ) &&
-                     ( abs( tqBlue( l ) - tqBlue(r ) ) < 20 ) )
+                if ( ( abs( qRed( l ) - qRed(r ) ) < 20 ) &&
+                     ( abs( qGreen( l ) - qGreen(r ) ) < 20 ) &&
+                     ( abs( qBlue( l ) - qBlue(r ) ) < 20 ) )
                     continue;
                  kdDebug() << "pixel (" << x << ", " << y << ") is different " << TQColor(  lhsi.pixel (  x, y ) ) << " " << TQColor(  rhsi.pixel (  x, y ) ) << endl;
                 return false;
@@ -1045,15 +1045,15 @@ void RegressionTest::doJavascriptReport( const TQString &test )
     cl = TQString( "<html><head><title>%1</title>" ).arg( test );
     cl += "<body><tt>";
     TQString text = "\n" + m_currentOutput;
-    text.tqreplace( '<', "&lt;" );
-    text.tqreplace( '>', "&gt;" );
-    text.tqreplace( TQRegExp( "\nFAILED" ), "\n<span style='color: red'>FAILED</span>" );
-    text.tqreplace( TQRegExp( "\nFAIL" ), "\n<span style='color: red'>FAIL</span>" );
-    text.tqreplace( TQRegExp( "\nPASSED" ), "\n<span style='color: green'>PASSED</span>" );
-    text.tqreplace( TQRegExp( "\nPASS" ), "\n<span style='color: green'>PASS</span>" );
+    text.replace( '<', "&lt;" );
+    text.replace( '>', "&gt;" );
+    text.replace( TQRegExp( "\nFAILED" ), "\n<span style='color: red'>FAILED</span>" );
+    text.replace( TQRegExp( "\nFAIL" ), "\n<span style='color: red'>FAIL</span>" );
+    text.replace( TQRegExp( "\nPASSED" ), "\n<span style='color: green'>PASSED</span>" );
+    text.replace( TQRegExp( "\nPASS" ), "\n<span style='color: green'>PASS</span>" );
     if ( text.at( 0 ) == '\n' )
         text = text.mid( 1, text.length() );
-    text.tqreplace( '\n', "<br>\n" );
+    text.replace( '\n', "<br>\n" );
     cl += text;
     cl += "</tt></body></html>";
     compare.writeBlock( cl.latin1(), cl.length() );
@@ -1063,7 +1063,7 @@ void RegressionTest::doJavascriptReport( const TQString &test )
 /** returns the path in a way that is relatively reachable from base.
  * @param base base directory (must not include trailing slash)
  * @param path directory/file to be relatively reached by base
- * @return path with all elements tqreplaced by .. and concerning path elements
+ * @return path with all elements replaced by .. and concerning path elements
  *	to be relatively reachable from base.
  */
 static TQString makeRelativePath(const TQString &base, const TQString &path)
@@ -1077,10 +1077,10 @@ static TQString makeRelativePath(const TQString &base, const TQString &path)
     int pos = 0;
     do {
         pos++;
-        int newpos = absBase.tqfind('/', pos);
+        int newpos = absBase.find('/', pos);
         if (newpos == -1) newpos = absBase.length();
-        TQConstString cmpPathComp(absPath.tqunicode() + pos, newpos - pos);
-        TQConstString cmpBaseComp(absBase.tqunicode() + pos, newpos - pos);
+        TQConstString cmpPathComp(absPath.unicode() + pos, newpos - pos);
+        TQConstString cmpBaseComp(absBase.unicode() + pos, newpos - pos);
 //         kdDebug() << "cmpPathComp: \"" << cmpPathComp.string() << "\"" << endl;
 //         kdDebug() << "cmpBaseComp: \"" << cmpBaseComp.string() << "\"" << endl;
 //         kdDebug() << "pos: " << pos << " newpos: " << newpos << endl;
@@ -1094,11 +1094,11 @@ static TQString makeRelativePath(const TQString &base, const TQString &path)
 
     TQString rel;
     {
-        TQConstString relBase(absBase.tqunicode() + basepos, absBase.length() - basepos);
-        TQConstString relPath(absPath.tqunicode() + pathpos, absPath.length() - pathpos);
+        TQConstString relBase(absBase.unicode() + basepos, absBase.length() - basepos);
+        TQConstString relPath(absPath.unicode() + pathpos, absPath.length() - pathpos);
         // generate as many .. as there are path elements in relBase
         if (relBase.string().length() > 0) {
-            for (int i = relBase.string().tqcontains('/'); i > 0; --i)
+            for (int i = relBase.string().contains('/'); i > 0; --i)
                 rel += "../";
             rel += "..";
             if (relPath.string().length() > 0) rel += "/";
@@ -1138,13 +1138,13 @@ void RegressionTest::doFailureReport( const TQString& test, int failures )
 
     if ( failures & RenderFailure ) {
         renderDiff += "<pre>";
-        FILE *pipe = popen( TQString::tqfromLatin1( "diff -u baseline/%1-render %3/%2-render" )
+        FILE *pipe = popen( TQString::fromLatin1( "diff -u baseline/%1-render %3/%2-render" )
                             .arg ( test, test, relOutputDir ).latin1(), "r" );
         TQTextIStream *is = new TQTextIStream( pipe );
         for ( int line = 0; line < 100 && !is->eof(); ++line ) {
             TQString line = is->readLine();
-            line = line.tqreplace( '<', "&lt;" );
-            line = line.tqreplace( '>', "&gt;" );
+            line = line.replace( '<', "&lt;" );
+            line = line.replace( '>', "&gt;" );
             renderDiff += line + "\n";
         }
         delete is;
@@ -1154,13 +1154,13 @@ void RegressionTest::doFailureReport( const TQString& test, int failures )
 
     if ( failures & DomFailure ) {
         domDiff += "<pre>";
-        FILE *pipe = popen( TQString::tqfromLatin1( "diff -u baseline/%1-dom %3/%2-dom" )
+        FILE *pipe = popen( TQString::fromLatin1( "diff -u baseline/%1-dom %3/%2-dom" )
                             .arg ( test, test, relOutputDir ).latin1(), "r" );
         TQTextIStream *is = new TQTextIStream( pipe );
         for ( int line = 0; line < 100 && !is->eof(); ++line ) {
             TQString line = is->readLine();
-            line = line.tqreplace( '<', "&lt;" );
-            line = line.tqreplace( '>', "&gt;" );
+            line = line.replace( '<', "&lt;" );
+            line = line.replace( '>', "&gt;" );
             domDiff += line  + "\n";
         }
         delete is;
@@ -1254,7 +1254,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures )
 
 void RegressionTest::testStaticFile(const TQString & filename)
 {
-    tqApp->mainWidget()->resize( 800, 600); // restore size
+    qApp->mainWidget()->resize( 800, 600); // restore size
 
     // Set arguments
     KParts::URLArgs args;
@@ -1400,11 +1400,11 @@ public:
 
 void RegressionTest::testJSFile(const TQString & filename )
 {
-    tqApp->mainWidget()->resize( 800, 600); // restore size
+    qApp->mainWidget()->resize( 800, 600); // restore size
 
     // create interpreter
     // note: this is different from the interpreter used by the part,
-    // it tqcontains regression test-specific objects & functions
+    // it contains regression test-specific objects & functions
     Object global(new GlobalImp());
     khtml::ChildFrame frame;
     frame.m_part = m_part;
@@ -1571,7 +1571,7 @@ void RegressionTest::printDescription(const TQString& description)
 
     if (!description.isEmpty()) {
         TQString desc = description;
-        desc.tqreplace( '\n', ' ' );
+        desc.replace( '\n', ' ' );
 	printf(" [%s]", desc.latin1());
     }
 
@@ -1591,7 +1591,7 @@ void RegressionTest::createMissingDirs(const TQString & filename)
     pathComponents.prepend(parentDir.absFilePath());
     while (!parentDir.exists()) {
 	TQString parentPath = parentDir.absFilePath();
-	int slashPos = parentPath.tqfindRev('/');
+	int slashPos = parentPath.findRev('/');
 	if (slashPos < 0)
 	    break;
 	parentPath = parentPath.left(slashPos);
@@ -1636,7 +1636,7 @@ bool RegressionTest::svnIgnored( const TQString &filename )
 
 void RegressionTest::resizeTopLevelWidget( int w, int h )
 {
-    tqApp->mainWidget()->resize( w, h );
+    qApp->mainWidget()->resize( w, h );
     // Since we're not visible, this doesn't have an immediate effect, TQWidget posts the event
     TQApplication::sendPostedEvents( 0, TQEvent::Resize );
 }
diff --git a/khtml/test_regression.h b/khtml/test_regression.h
index df76f4439..1ec4e7d33 100644
--- a/khtml/test_regression.h
+++ b/khtml/test_regression.h
@@ -36,7 +36,7 @@ class TQTimer;
 /**
  * @internal
  */
-class PartMonitor : public TQObject
+class PartMonitor : public QObject
 {
   Q_OBJECT
 public:
@@ -122,7 +122,7 @@ class ScriptInterpreter;
 /**
  * @internal
  */
-class RegressionTest : public TQObject
+class RegressionTest : public QObject
 {
   Q_OBJECT
 public:
diff --git a/khtml/test_regression_fontoverload.cpp b/khtml/test_regression_fontoverload.cpp
index 5bbd05d31..a10146480 100644
--- a/khtml/test_regression_fontoverload.cpp
+++ b/khtml/test_regression_fontoverload.cpp
@@ -98,7 +98,7 @@ QFakeFontEngine::QFakeFontEngine( XFontStruct *fs, const char *name, int size )
     : QFontEngineXLFD( fs,  name,  0)
 {
     pixS = size;
-    ahem = TQString::tqfromLatin1(name).tqcontains("ahem");
+    ahem = TQString::fromLatin1(name).contains("ahem");
 }
 
 QFakeFontEngine::~QFakeFontEngine()
@@ -152,7 +152,7 @@ int QFakeFontEngine::leading() const
     // the original uses double and creates quite random results depending
     // on the compiler flags
     int l = ( _size * 15 + 50) / 100;
-    // only valid on i386 without -O2 assert(l == int(tqRound(_size * 0.15)));
+    // only valid on i386 without -O2 assert(l == int(qRound(_size * 0.15)));
     return (l > 0) ? l : 1;
 }
 
@@ -207,7 +207,7 @@ static TQString helv_pickxlfd( int pixelsize, bool italic, bool bold )
 }
 
 KDE_EXPORT QFontEngine *
-TQFontDatabase::tqfindFont( TQFont::Script script, const QFontPrivate *fp,
+TQFontDatabase::findFont( TQFont::Script script, const QFontPrivate *fp,
 			 const QFontDef &request, int )
 {
     TQString xlfd;
@@ -361,7 +361,7 @@ void KApplication::dcopFailure( const TQString & )
 
 #include <kparts/historyprovider.h>
 
-bool KParts::HistoryProvider::tqcontains( const TQString& t ) const
+bool KParts::HistoryProvider::contains( const TQString& t ) const
 {
     return ( t == "http://www.kde.org/" || t == "http://www.google.com/");
 }
diff --git a/khtml/testkhtml.cpp b/khtml/testkhtml.cpp
index d98d875b2..7765cee8a 100644
--- a/khtml/testkhtml.cpp
+++ b/khtml/testkhtml.cpp
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
 
     TQObject::connect( doc, TQT_SIGNAL(completed()), dummy, TQT_SLOT(handleDone()) );
 
-    if (args->url(0).url().right(4).tqfind(".xml", 0, false) == 0) {
+    if (args->url(0).url().right(4).find(".xml", 0, false) == 0) {
         KParts::URLArgs ags(doc->browserExtension()->urlArgs());
         ags.serviceType = "text/xml";
         doc->browserExtension()->setURLArgs(ags);
@@ -123,7 +123,7 @@ int main(int argc, char *argv[])
     doc->setURLCursor(TQCursor(Qt::PointingHandCursor));
     a.setTopWidget(doc->widget());
     TQWidget::connect(doc, TQT_SIGNAL(setWindowCaption(const TQString &)),
-		     doc->widget()->tqtopLevelWidget(), TQT_SLOT(setCaption(const TQString &)));
+		     doc->widget()->topLevelWidget(), TQT_SLOT(setCaption(const TQString &)));
     doc->widget()->show();
     toplevel->show();
     ((TQScrollView *)doc->widget())->viewport()->show();
@@ -142,7 +142,7 @@ void Dummy::doBenchmark()
     results.clear();
 
     TQString directory = KFileDialog::getExistingDirectory(settings.readPathEntry("path"), m_part->view(), 
-            TQString::tqfromLatin1("Please select directory with tests"));
+            TQString::fromLatin1("Please select directory with tests"));
 
     if (!directory.isEmpty()) {
         settings.writePathEntry("path", directory);
@@ -184,14 +184,14 @@ void Dummy::nextRun()
             for (int pos = 0; pos < timings.size(); ++pos) {
                 int t = timings[pos];
                 if (pos < COLD_RUNS)
-		    m_part->write(TQString::tqfromLatin1("<td>(Cold):") + TQString::number(t) + "</td>");
+		    m_part->write(TQString::fromLatin1("<td>(Cold):") + TQString::number(t) + "</td>");
                 else {
                     total += t;
-                    m_part->write(TQString::tqfromLatin1("<td><i>") + TQString::number(t) + "</i></td>");
+                    m_part->write(TQString::fromLatin1("<td><i>") + TQString::number(t) + "</i></td>");
                 }
             }
 
-            m_part->write(TQString::tqfromLatin1("<td>Average:<b>") + TQString::number(double(total) / HOT_RUNS) + "</b></td>");
+            m_part->write(TQString::fromLatin1("<td>Average:<b>") + TQString::number(double(total) / HOT_RUNS) + "</b></td>");
 
             m_part->write("</tr>");
         }
diff --git a/khtml/testkhtml.h b/khtml/testkhtml.h
index 4fd76d044..b945ec942 100644
--- a/khtml/testkhtml.h
+++ b/khtml/testkhtml.h
@@ -8,7 +8,7 @@
 /**
  * @internal
  */
-class Dummy : public TQObject
+class Dummy : public QObject
 {
   Q_OBJECT
 public:
diff --git a/khtml/xml/dom2_eventsimpl.cpp b/khtml/xml/dom2_eventsimpl.cpp
index 25e595baa..bcc2fca3a 100644
--- a/khtml/xml/dom2_eventsimpl.cpp
+++ b/khtml/xml/dom2_eventsimpl.cpp
@@ -48,7 +48,7 @@ EventImpl::EventImpl()
     m_currentTarget = 0;
     m_eventPhase = 0;
     m_target = 0;
-    m_createTime = TQDateTime::tqcurrentDateTime();
+    m_createTime = TQDateTime::currentDateTime();
     m_defaultHandled = false;
 }
 
@@ -67,7 +67,7 @@ EventImpl::EventImpl(EventId _id, bool canBubbleArg, bool cancelableArg)
     m_currentTarget = 0;
     m_eventPhase = 0;
     m_target = 0;
-    m_createTime = TQDateTime::tqcurrentDateTime();
+    m_createTime = TQDateTime::currentDateTime();
     m_defaultHandled = false;
 }
 
@@ -499,14 +499,14 @@ public:
     }
 
     L toLeft(R r) {
-        TQMapIterator<R,L> i( m_rToL.tqfind(r) );
+        TQMapIterator<R,L> i( m_rToL.find(r) );
         if (i != m_rToL.end())
             return *i;
         return L();
     }
 
     R toRight(L l) {
-        TQMapIterator<L,R> i = m_lToR.tqfind(l);
+        TQMapIterator<L,R> i = m_lToR.find(l);
         if (i != m_lToR.end())
             return *i;
         return R();
@@ -590,10 +590,10 @@ KeyEventBaseImpl::KeyEventBaseImpl(EventId id, bool canBubbleArg, bool cancelabl
     m_keyVal = key->ascii();
     m_virtKeyVal = virtKeyToQtKey()->toLeft(key->key());
 
-    // m_keyVal should contain the tqunicode value
+    // m_keyVal should contain the unicode value
     // of the pressed key if available.
     if (m_virtKeyVal == DOM_VK_UNDEFINED && !key->text().isEmpty())
-        m_keyVal = key->text().tqunicode()[0];
+        m_keyVal = key->text().unicode()[0];
 
     // key->state returns enum ButtonState, which is ShiftButton, ControlButton and AltButton or'ed together.
     m_modifier = key->state();
@@ -739,18 +739,18 @@ DOMString KeyboardEventImpl::keyIdentifier() const
 {
     if (unsigned special = virtKeyVal())
         if (const char* id = keyIdentifiersToVirtKeys()->toLeft(special))
-            return TQString::tqfromLatin1(id);
+            return TQString::fromLatin1(id);
 
-    if (unsigned tqunicode = keyVal())
-        return TQString(TQChar(tqunicode));
+    if (unsigned unicode = keyVal())
+        return TQString(TQChar(unicode));
 
     return "Unidentified";
 }
 
 bool KeyboardEventImpl::getModifierState (const DOMString& keyIdentifierArg) const
 {
-    unsigned tqmask = keyModifiersToCode()->toRight(keyIdentifierArg.string().latin1());
-    return m_modifier & tqmask;
+    unsigned mask = keyModifiersToCode()->toRight(keyIdentifierArg.string().latin1());
+    return m_modifier & mask;
 }
 
 bool KeyboardEventImpl::isKeyboardEvent() const
@@ -773,9 +773,9 @@ void KeyboardEventImpl::initKeyboardEvent(const DOMString &typeArg,
 
     //Figure out the code information from the key identifier.
     if (keyIdentifierArg.length() == 1) {
-        //Likely to be normal tqunicode id, unless it's one of the few
+        //Likely to be normal unicode id, unless it's one of the few
         //special values.
-        unsigned short code = keyIdentifierArg.tqunicode()[0];
+        unsigned short code = keyIdentifierArg.unicode()[0];
         if (code > 0x20 && code != 0x7F)
             keyVal = code;
     }
@@ -790,8 +790,8 @@ void KeyboardEventImpl::initKeyboardEvent(const DOMString &typeArg,
 
     unsigned modifiers = 0;
     for (TQStringList::Iterator i = mods.begin(); i != mods.end(); ++i)
-        if (unsigned tqmask = keyModifiersToCode()->toRight((*i).latin1()))
-            modifiers |= tqmask;
+        if (unsigned mask = keyModifiersToCode()->toRight((*i).latin1()))
+            modifiers |= mask;
 
     initKeyBaseEvent(typeArg, canBubbleArg, cancelableArg, viewArg,
             keyVal, virtKeyVal, modifiers);
@@ -819,7 +819,7 @@ int KeyboardEventImpl::keyCode() const
     if (m_virtKeyVal != DOM_VK_UNDEFINED)
         return m_virtKeyVal;
     else
-        return TQChar((unsigned short)m_keyVal).upper().tqunicode();
+        return TQChar((unsigned short)m_keyVal).upper().unicode();
 }
 
 int KeyboardEventImpl::charCode() const
@@ -856,14 +856,14 @@ void TextEventImpl::initTextEvent(const DOMString &typeArg,
     //See whether we can get a key out of this.
     unsigned keyCode = 0;
     if (text.length() == 1)
-        keyCode = text.tqunicode()[0].tqunicode();
+        keyCode = text.unicode()[0].unicode();
     initKeyBaseEvent(typeArg, canBubbleArg, cancelableArg, viewArg,
         keyCode, 0, 0);
 }
 
 int TextEventImpl::keyCode() const
 {
-    //Mozilla returns 0 here unless this is a non-tqunicode key.
+    //Mozilla returns 0 here unless this is a non-unicode key.
     //IE stuffs everything here, and so we try to match it..
     if (m_keyVal)
         return m_keyVal;
@@ -872,8 +872,8 @@ int TextEventImpl::keyCode() const
 
 int TextEventImpl::charCode() const
 {
-    //On text events, in Mozilla charCode is 0 for non-tqunicode keys,
-    //and the tqunicode key otherwise... IE doesn't support this.
+    //On text events, in Mozilla charCode is 0 for non-unicode keys,
+    //and the unicode key otherwise... IE doesn't support this.
     if (m_virtKeyVal)
         return 0;
     return m_keyVal;
diff --git a/khtml/xml/dom2_rangeimpl.cpp b/khtml/xml/dom2_rangeimpl.cpp
index 0670c10dd..b160ce23f 100644
--- a/khtml/xml/dom2_rangeimpl.cpp
+++ b/khtml/xml/dom2_rangeimpl.cpp
@@ -833,14 +833,14 @@ DOMString RangeImpl::toString( int &exceptioncode )
      * psuedo code:
      *
      * if start container is not text:
-     *     count through the children to tqfind where we start (m_startOffset children)
+     *     count through the children to find where we start (m_startOffset children)
      *
      * loop from the start position:
      *     if the current node is text, add the text to our variable 'text', truncating/removing if at the end/start.
      *     
      *     if the node has children, step to the first child.
      *     if the node has no children but does have siblings, step to the next sibling
-     *     until we tqfind a sibling, go to next the parent but:
+     *     until we find a sibling, go to next the parent but:
      *         make sure this sibling isn't past the end of where we are supposed to go. (position > endOffset and the parent is the endContainer)
      *         
      */
diff --git a/khtml/xml/dom_docimpl.cpp b/khtml/xml/dom_docimpl.cpp
index 6faeff108..36570d69a 100644
--- a/khtml/xml/dom_docimpl.cpp
+++ b/khtml/xml/dom_docimpl.cpp
@@ -128,7 +128,7 @@ DocumentTypeImpl *DOMImplementationImpl::createDocumentType( const DOMString &qu
         return 0;
     }
 
-    // INVALID_CHARACTER_ERR: Raised if the specified qualified name tqcontains an illegal character.
+    // INVALID_CHARACTER_ERR: Raised if the specified qualified name contains an illegal character.
     if (!Element::khtmlValidQualifiedName(qualifiedName)) {
         exceptioncode = DOMException::INVALID_CHARACTER_ERR;
         return 0;
@@ -232,7 +232,7 @@ void ElementMappingCache::add(const TQString& id, ElementImpl* nd)
 {
     if (id.isEmpty()) return;
 
-    ItemInfo* info = m_dict.tqfind(id);
+    ItemInfo* info = m_dict.find(id);
     if (info)
     {
         info->ref++;
@@ -251,7 +251,7 @@ void ElementMappingCache::set(const TQString& id, ElementImpl* nd)
 {
     if (id.isEmpty()) return;
 
-    ItemInfo* info = m_dict.tqfind(id);
+    ItemInfo* info = m_dict.find(id);
     info->nd = nd;
 }
 
@@ -259,7 +259,7 @@ void ElementMappingCache::remove(const TQString& id, ElementImpl* nd)
 {
     if (id.isEmpty()) return;
 
-    ItemInfo* info = m_dict.tqfind(id);
+    ItemInfo* info = m_dict.find(id);
     info->ref--;
     if (info->ref == 0)
     {
@@ -273,16 +273,16 @@ void ElementMappingCache::remove(const TQString& id, ElementImpl* nd)
     }
 }
 
-bool ElementMappingCache::tqcontains(const TQString& id)
+bool ElementMappingCache::contains(const TQString& id)
 {
     if (id.isEmpty()) return false;
-    return m_dict.tqfind(id);
+    return m_dict.find(id);
 }
 
 ElementMappingCache::ItemInfo* ElementMappingCache::get(const TQString& id)
 {
     if (id.isEmpty()) return 0;
-    return m_dict.tqfind(id);
+    return m_dict.find(id);
 }
 
 static KStaticDeleter< TQPtrList<DocumentImpl> > s_changedDocumentsDeleter;
@@ -337,7 +337,7 @@ DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v)
     m_namespaceMap = new IdNameMapping(1);
     TQString xhtml(XHTML_NAMESPACE);
     m_namespaceMap->names.insert(emptyNamespace, new DOMStringImpl(""));
-    m_namespaceMap->names.insert(xhtmlNamespace, new DOMStringImpl(xhtml.tqunicode(), xhtml.length()));
+    m_namespaceMap->names.insert(xhtmlNamespace, new DOMStringImpl(xhtml.unicode(), xhtml.length()));
     m_namespaceMap->names[emptyNamespace]->ref();
     m_namespaceMap->names[xhtmlNamespace]->ref();
     m_namespaceMap->count+=2;
@@ -1165,7 +1165,7 @@ void DocumentImpl::recalcStyle( StyleChange change )
     //kdDebug( 6020 ) << "TIME: recalcStyle() dt=" << qt.elapsed() << endl;
 
     if (changed() && m_view)
-	m_view->tqlayout();
+	m_view->layout();
 
 bail_out:
     setChanged( false );
@@ -1219,9 +1219,9 @@ void DocumentImpl::updateLayout()
 
     updateRendering();
 
-    // Only do a tqlayout if changes have occurred that make it necessary.
+    // Only do a layout if changes have occurred that make it necessary.
     if (m_view && renderer() && renderer()->needsLayout())
-	m_view->tqlayout();
+	m_view->layout();
 
     m_ignorePendingStylesheets = oldIgnore;
 }
@@ -1387,7 +1387,7 @@ void DocumentImpl::write( const TQString &text )
         if (m_view)
             m_view->part()->resetFromScript();
         m_tokenizer->setAutoClose();
-        write(TQString::tqfromLatin1("<html>"));
+        write(TQString::fromLatin1("<html>"));
     }
     m_tokenizer->write(text, false);
 }
@@ -1461,7 +1461,7 @@ NodeImpl *DocumentImpl::nextFocusNode(NodeImpl *fromNode)
     }
 
     if (fromTabIndex == 0) {
-	// Just need to tqfind the next selectable node after fromNode (in document order) that doesn't have a tab index
+	// Just need to find the next selectable node after fromNode (in document order) that doesn't have a tab index
 	NodeImpl *n = fromNode->traverseNextNode();
 	while (n && !(n->isTabFocusable() && n->tabIndex() == 0))
 	    n = n->traverseNextNode();
@@ -1471,7 +1471,7 @@ NodeImpl *DocumentImpl::nextFocusNode(NodeImpl *fromNode)
 	// Find the lowest tab index out of all the nodes except fromNode, that is greater than or equal to fromNode's
 	// tab index. For nodes with the same tab index as fromNode, we are only interested in those that come after
 	// fromNode in document order.
-	// If we don't tqfind a suitable tab index, the next focus node will be one with a tab index of 0.
+	// If we don't find a suitable tab index, the next focus node will be one with a tab index of 0.
 	unsigned short lowestSuitableTabIndex = 65535;
 	NodeImpl *n;
 
@@ -1578,7 +1578,7 @@ NodeImpl *DocumentImpl::previousFocusNode(NodeImpl *fromNode)
 	    // Find the lowest tab index out of all the nodes except fromNode, that is less than or equal to fromNode's
 	    // tab index. For nodes with the same tab index as fromNode, we are only interested in those before
 	    // fromNode.
-	    // If we don't tqfind a suitable tab index, then there will be no previous focus node.
+	    // If we don't find a suitable tab index, then there will be no previous focus node.
 	    unsigned short highestSuitableTabIndex = 0;
 	    NodeImpl *n;
 
@@ -1622,7 +1622,7 @@ NodeImpl *DocumentImpl::previousFocusNode(NodeImpl *fromNode)
     }
 }
 
-ElementImpl* DocumentImpl::tqfindAccessKeyElement(TQChar c)
+ElementImpl* DocumentImpl::findAccessKeyElement(TQChar c)
 {
     c = c.upper();
     for( NodeImpl* n = this;
@@ -1668,9 +1668,9 @@ void DocumentImpl::processHttpEquiv(const DOMString &equiv, const DOMString &con
     {
         // get delay and url
         TQString str = content.string().stripWhiteSpace();
-        int pos = str.tqfind(TQRegExp("[;,]"));
+        int pos = str.find(TQRegExp("[;,]"));
         if ( pos == -1 )
-            pos = str.tqfind(TQRegExp("[ \t]"));
+            pos = str.find(TQRegExp("[ \t]"));
 
         bool ok = false;
 	int delay = kMax( 0, content.implementation()->toInt(&ok) );
@@ -1685,7 +1685,7 @@ void DocumentImpl::processHttpEquiv(const DOMString &equiv, const DOMString &con
             pos++;
             while(pos < (int)str.length() && str[pos].isSpace()) pos++;
             str = str.mid(pos);
-            if(str.tqfind("url", 0,  false ) == 0)  str = str.mid(3);
+            if(str.find("url", 0,  false ) == 0)  str = str.mid(3);
             str = str.stripWhiteSpace();
             if ( str.length() && str[0] == '=' ) str = str.mid( 1 ).stripWhiteSpace();
             while(str.length() &&
@@ -1881,17 +1881,17 @@ NodeImpl::Id DocumentImpl::getId( NodeImpl::IdType _type, DOMStringImpl* _nsURI,
     TQString name = cs ? n.string() : n.string().upper();
 
     if (!_nsURI) {
-        id = (NodeImpl::Id)(long) map->ids.tqfind( name );
+        id = (NodeImpl::Id)(long) map->ids.find( name );
         if (!id && _type != NodeImpl::NamespaceId) {
-            id = (NodeImpl::Id)(long) map->ids.tqfind( "aliases: " + name );
+            id = (NodeImpl::Id)(long) map->ids.find( "aliases: " + name );
 	}
     } else {
-        id = (NodeImpl::Id)(long) map->ids.tqfind( name );
+        id = (NodeImpl::Id)(long) map->ids.find( name );
         if (!readonly && id && _prefix && _prefix->l) {
             // we were called in registration mode... check if the alias exists
             TQConstString px( _prefix->s, _prefix->l );
             TQString qn("aliases: " + (cs ? px.string() : px.string().upper()) + ":" + name);
-            if (!map->ids.tqfind( qn )) {
+            if (!map->ids.find( qn )) {
                 map->ids.insert( qn, (void*)id );
             }
         }
@@ -2067,7 +2067,7 @@ void DocumentImpl::recalcStyleSelector()
 
     TQPtrList<StyleSheetImpl> oldStyleSheets = m_styleSheets->styleSheets;
     m_styleSheets->styleSheets.clear();
-    TQString sheetUsed = view() ? view()->part()->d->m_sheetUsed.tqreplace("&&", "&") : TQString();
+    TQString sheetUsed = view() ? view()->part()->d->m_sheetUsed.replace("&&", "&") : TQString();
     bool autoselect = sheetUsed.isEmpty();
     if (autoselect && !m_preferredStylesheetSet.isEmpty())
         sheetUsed = m_preferredStylesheetSet.string();
@@ -2141,9 +2141,9 @@ void DocumentImpl::recalcStyleSelector()
                     if ( title != sheetUsed )
                         sheet = 0; // don't use it
 
-                    title = title.tqreplace('&',  "&&");
+                    title = title.replace('&',  "&&");
 
-                    if ( !m_availableSheets.tqcontains( title ) )
+                    if ( !m_availableSheets.contains( title ) )
                         m_availableSheets.append( title );
                 }
             }
@@ -2170,7 +2170,7 @@ void DocumentImpl::recalcStyleSelector()
         // or we found the sheet we selected
         if (sheetUsed.isEmpty() ||
             (!canResetSheet && tokenizer()) ||
-            m_availableSheets.tqcontains(sheetUsed)) {
+            m_availableSheets.contains(sheetUsed)) {
             break;
         }
 
@@ -2280,7 +2280,7 @@ void DocumentImpl::setFocusNode(NodeImpl *newFocusNode)
             if (m_focusNode != newFocusNode) return;
 
             // eww, I suck. set the qt focus correctly
-            // ### tqfind a better place in the code for this
+            // ### find a better place in the code for this
             if (view()) {
                 if (!m_focusNode->renderer() || !m_focusNode->renderer()->isWidget())
                     view()->setFocus();
@@ -2690,7 +2690,7 @@ NodeListImpl::Cache* DOM::DocumentImpl::acquireCachedNodeListInfo(
 
     //Check to see if we have this sort of item cached.
     NodeListImpl::Cache* cached =
-        (type == NodeListImpl::UNCACHEABLE) ? 0 : m_nodeListCache.tqfind(key.hash());
+        (type == NodeListImpl::UNCACHEABLE) ? 0 : m_nodeListCache.find(key.hash());
 
     if (cached) {
         if (cached->key == key) {
@@ -2710,7 +2710,7 @@ NodeListImpl::Cache* DOM::DocumentImpl::acquireCachedNodeListInfo(
 
     if (type != NodeListImpl::UNCACHEABLE) {
         newInfo->ref(); //Add the cache's reference
-        m_nodeListCache.tqreplace(key.hash(), newInfo);
+        m_nodeListCache.replace(key.hash(), newInfo);
     }
 
     return newInfo;
diff --git a/khtml/xml/dom_docimpl.h b/khtml/xml/dom_docimpl.h
index be26b0737..5e50c09a4 100644
--- a/khtml/xml/dom_docimpl.h
+++ b/khtml/xml/dom_docimpl.h
@@ -166,7 +166,7 @@ public:
     /**
      Returns true if the item exists
     */
-    bool tqcontains(const TQString& id);
+    bool contains(const TQString& id);
 
     /**
      Returns the information for the given ID
@@ -198,7 +198,7 @@ public:
     DocumentFragmentImpl *createDocumentFragment ();
     TextImpl *createTextNode ( DOMStringImpl* data ) { return new TextImpl( docPtr(), data); }
     TextImpl *createTextNode ( const TQString& data )
-        { return createTextNode(new DOMStringImpl(data.tqunicode(), data.length())); }
+        { return createTextNode(new DOMStringImpl(data.unicode(), data.length())); }
     CommentImpl *createComment ( DOMStringImpl* data );
     CDATASectionImpl *createCDATASection ( DOMStringImpl* data );
     ProcessingInstructionImpl *createProcessingInstruction ( const DOMString &target, DOMStringImpl* data );
@@ -485,7 +485,7 @@ public:
      */
     NodeImpl *previousFocusNode(NodeImpl *fromNode);
 
-    ElementImpl* tqfindAccessKeyElement(TQChar c);
+    ElementImpl* findAccessKeyElement(TQChar c);
 
     int nodeAbsIndex(NodeImpl *node);
     NodeImpl *nodeWithAbsIndex(int absIndex);
@@ -616,7 +616,7 @@ protected:
                 TQConstString px( _prefix->s, _prefix->l );
                 TQString name = cs ? n.string() : n.string().upper();
                 TQString qn("aliases: " + (cs ? px.string() : px.string().upper()) + ":" + name);
-                if (!ids.tqfind( qn )) {
+                if (!ids.find( qn )) {
                     ids.insert( qn, (void*)id );
                 }
             }
diff --git a/khtml/xml/dom_elementimpl.cpp b/khtml/xml/dom_elementimpl.cpp
index 21401e106..c41bef3dc 100644
--- a/khtml/xml/dom_elementimpl.cpp
+++ b/khtml/xml/dom_elementimpl.cpp
@@ -855,7 +855,7 @@ DOMString ElementImpl::toString() const
 
 	for (NodeImpl *child = firstChild(); child != NULL; child = child->nextSibling()) {
 	    DOMString kid = child->toString();
-	    result += TQConstString(kid.tqunicode(), kid.length()).string();
+	    result += TQConstString(kid.unicode(), kid.length()).string();
 	}
 
 	result += "</";
@@ -972,11 +972,11 @@ NodeImpl *NamedAttrMapImpl::getNamedItem ( NodeImpl::Id id, bool nsAware, DOMStr
 {
     if (!m_element)
 	return 0;
-    unsigned int tqmask = nsAware ? ~0L : NodeImpl_IdLocalMask;
-    id = (id & tqmask);
+    unsigned int mask = nsAware ? ~0L : NodeImpl_IdLocalMask;
+    id = (id & mask);
 
     for (unsigned long i = 0; i < m_attrCount; i++) {
-	if ((m_attrs[i].id() & tqmask) == id) {
+	if ((m_attrs[i].id() & mask) == id) {
             // if we are called with a qualified name, filter out NS-aware elements with non-matching name.
             if (qName && (namespacePart(m_attrs[i].id()) != defaultNamespace) &&
                 strcasecmp(m_attrs[i].name(), DOMString(qName)))
@@ -1000,11 +1000,11 @@ Node NamedAttrMapImpl::removeNamedItem ( NodeImpl::Id id, bool nsAware, DOMStrin
         exceptioncode = DOMException::NO_MODIFICATION_ALLOWED_ERR;
         return 0;
     }
-    unsigned int tqmask = nsAware ? ~0L : NodeImpl_IdLocalMask;
-    id = (id & tqmask);
+    unsigned int mask = nsAware ? ~0L : NodeImpl_IdLocalMask;
+    id = (id & mask);
 
     for (unsigned long i = 0; i < m_attrCount; i++) {
-	if ((m_attrs[i].id() & tqmask) == id) {
+	if ((m_attrs[i].id() & mask) == id) {
             // if we are called with a qualified name, filter out NS-aware elements with non-matching name.
             if (qName && (namespacePart(m_attrs[i].id()) != defaultNamespace) &&
                 strcasecmp(m_attrs[i].name(), DOMString(qName)))
@@ -1064,23 +1064,23 @@ Node NamedAttrMapImpl::setNamedItem ( NodeImpl* arg, bool nsAware, DOMStringImpl
 
     if (attr->ownerElement() == m_element) {
 	// Already have this attribute.
-	// DOMTS core-1 test "hc_elementtqreplaceattributewithself" says we should return it.
+	// DOMTS core-1 test "hc_elementreplaceattributewithself" says we should return it.
 	return attr;
     }
-    unsigned int tqmask = nsAware ? ~0L : NodeImpl_IdLocalMask;
-    NodeImpl::Id id = (attr->id() & tqmask);
+    unsigned int mask = nsAware ? ~0L : NodeImpl_IdLocalMask;
+    NodeImpl::Id id = (attr->id() & mask);
 
     for (unsigned long i = 0; i < m_attrCount; i++) {
-	if ((m_attrs[i].id() & tqmask) == id) {
+	if ((m_attrs[i].id() & mask) == id) {
             // if we are called with a qualified name, filter out NS-aware elements with non-matching name.
             if (qName && (namespacePart(m_attrs[i].id()) != defaultNamespace) &&
                 strcasecmp(m_attrs[i].name(), DOMString(qName)))
                 continue;
-	    // Attribute exists; tqreplace it
+	    // Attribute exists; replace it
 	    if (id == ATTR_ID)
 	       m_element->updateId(m_attrs[i].val(), attr->val());
 
-	    Node tqreplaced = m_attrs[i].createAttr(m_element,m_element->docPtr());
+	    Node replaced = m_attrs[i].createAttr(m_element,m_element->docPtr());
 	    m_attrs[i].free();
 	    m_attrs[i].m_attrId = 0; /* "has implementation" flag */
 	    m_attrs[i].m_data.attr = attr;
@@ -1089,7 +1089,7 @@ Node NamedAttrMapImpl::setNamedItem ( NodeImpl* arg, bool nsAware, DOMStringImpl
 	    m_element->parseAttribute(&m_attrs[i]);
 	    m_element->attributeChanged(m_attrs[i].id());
 	    // ### dispatch mutation events
-	    return tqreplaced;
+	    return replaced;
 	}
     }
 
@@ -1142,10 +1142,10 @@ DOMStringImpl *NamedAttrMapImpl::valueAt(unsigned long index) const
 
 DOMStringImpl *NamedAttrMapImpl::getValue(NodeImpl::Id id, bool nsAware, DOMStringImpl* qName) const
 {
-    unsigned int tqmask = nsAware ? ~0L : NodeImpl_IdLocalMask;
-    id = (id & tqmask);
+    unsigned int mask = nsAware ? ~0L : NodeImpl_IdLocalMask;
+    id = (id & mask);
     for (unsigned long i = 0; i < m_attrCount; i++)
-        if ((m_attrs[i].id() & tqmask) == id) {
+        if ((m_attrs[i].id() & mask) == id) {
             // if we are called with a qualified name, filter out NS-aware elements with non-matching name.
             if (qName && (namespacePart(m_attrs[i].id()) != defaultNamespace) &&
                 strcasecmp(m_attrs[i].name(), qName))
@@ -1167,12 +1167,12 @@ void NamedAttrMapImpl::setValue(NodeImpl::Id id, DOMStringImpl *value, DOMString
 	removeNamedItem(id, nsAware, qName, exceptioncode);
 	return;
     }
-    unsigned int tqmask = nsAware ? ~0L : NodeImpl_IdLocalMask;
-    NodeImpl::Id mid = (id & tqmask);
+    unsigned int mask = nsAware ? ~0L : NodeImpl_IdLocalMask;
+    NodeImpl::Id mid = (id & mask);
 
     // Check for an existing attribute.
     for (unsigned long i = 0; i < m_attrCount; i++) {
-	if ((m_attrs[i].id() & tqmask) == mid) {
+	if ((m_attrs[i].id() & mask) == mid) {
             // if we are called with a qualified name, filter out NS-aware elements with non-matching name.
             if (qName && (namespacePart(m_attrs[i].id()) != defaultNamespace) &&
                 strcasecmp(m_attrs[i].name(), DOMString(qName)))
diff --git a/khtml/xml/dom_elementimpl.h b/khtml/xml/dom_elementimpl.h
index 019920b76..ee1be3e4a 100644
--- a/khtml/xml/dom_elementimpl.h
+++ b/khtml/xml/dom_elementimpl.h
@@ -302,7 +302,7 @@ public:
     virtual bool isReadOnly() { return false; }
 
     AttributeImpl *attrAt(unsigned long index) const { return &m_attrs[index]; }
-    // ### tqreplace idAt and getValueAt with attrAt
+    // ### replace idAt and getValueAt with attrAt
     NodeImpl::Id idAt(unsigned long index) const;
     DOMStringImpl *valueAt(unsigned long index) const;
     DOMStringImpl *getValue(NodeImpl::Id id, bool nsAware = false, DOMStringImpl* qName = 0) const;
@@ -333,7 +333,7 @@ inline bool checkQualifiedName(const DOMString &qualifiedName, const DOMString &
         return false;
     }
 
-    // INVALID_CHARACTER_ERR: Raised if the specified qualified name tqcontains an illegal character.
+    // INVALID_CHARACTER_ERR: Raised if the specified qualified name contains an illegal character.
     if (!qualifiedName.isNull() && !Element::khtmlValidQualifiedName(qualifiedName)
         && ( !qualifiedName.isEmpty() || !nameCanBeEmpty ) ) {
         if (pExceptioncode)
diff --git a/khtml/xml/dom_nodeimpl.cpp b/khtml/xml/dom_nodeimpl.cpp
index e51d16523..137928c81 100644
--- a/khtml/xml/dom_nodeimpl.cpp
+++ b/khtml/xml/dom_nodeimpl.cpp
@@ -133,7 +133,7 @@ NodeImpl *NodeImpl::insertBefore( NodeImpl *, NodeImpl *, int &exceptioncode )
     return 0;
 }
 
-void NodeImpl::tqreplaceChild( NodeImpl *, NodeImpl *, int &exceptioncode )
+void NodeImpl::replaceChild( NodeImpl *, NodeImpl *, int &exceptioncode )
 {
   exceptioncode = DOMException::HIERARCHY_REQUEST_ERR;
 }
@@ -588,7 +588,7 @@ void NodeImpl::handleLocalEvents(EventImpl *evt, bool useCapture)
 
     Event ev = evt;
     // removeEventListener (e.g. called from a JS event listener) might
-    // tqinvalidate the item after the current iterator (which "it" is pointing to).
+    // invalidate the item after the current iterator (which "it" is pointing to).
     // So we make a copy of the list.
     TQValueList<RegisteredEventListener> listeners = *m_regdListeners.listeners;
     TQValueList<RegisteredEventListener>::iterator it;
@@ -605,7 +605,7 @@ void NodeImpl::handleLocalEvents(EventImpl *evt, bool useCapture)
         if (current.useCapture == useCapture && evt->id() == EventImpl::CLICK_EVENT) {
             MouseEventImpl* me = static_cast<MouseEventImpl*>(evt);
             if (me->button() == 0) {
-                // To tqfind whether to call onclick or ondblclick, we can't
+                // To find whether to call onclick or ondblclick, we can't
                 // * use me->detail(), it's 2 when clicking twice w/o moving, even very slowly
                 // * use me->qEvent(), it's not available when using initMouseEvent/dispatchEvent
                 // So we currently store a bool in MouseEventImpl. If anyone needs to trigger
@@ -669,7 +669,7 @@ void NodeImpl::checkSetPrefix(const DOMString &_prefix, int &exceptioncode)
     // Perform error checking as required by spec for setting Node.prefix. Used by
     // ElementImpl::setPrefix() and AttrImpl::setPrefix()
 
-    // INVALID_CHARACTER_ERR: Raised if the specified prefix tqcontains an illegal character.
+    // INVALID_CHARACTER_ERR: Raised if the specified prefix contains an illegal character.
     if (!Element::khtmlValidPrefix(_prefix)) {
         exceptioncode = DOMException::INVALID_CHARACTER_ERR;
         return;
@@ -698,7 +698,7 @@ void NodeImpl::checkSetPrefix(const DOMString &_prefix, int &exceptioncode)
 void NodeImpl::checkAddChild(NodeImpl *newChild, int &exceptioncode)
 {
     // Perform error checking as required by spec for adding a new child. Used by
-    // appendChild(), tqreplaceChild() and insertBefore()
+    // appendChild(), replaceChild() and insertBefore()
 
     // Not mentioned in spec: throw NOT_FOUND_ERR if newChild is null
     if (!newChild) {
@@ -768,7 +768,7 @@ bool NodeImpl::childAllowed( NodeImpl *newChild )
 
 NodeImpl::StyleChange NodeImpl::diff( khtml::RenderStyle *s1, khtml::RenderStyle *s2 )
 {
-    // This method won't work when a style tqcontains noninherited properties with "inherit" value.
+    // This method won't work when a style contains noninherited properties with "inherit" value.
     StyleChange ch = NoInherit;
 
     EDisplay display1 = s1 ? s1->display() : NONE;
@@ -989,7 +989,7 @@ DOMStringImpl* NodeImpl::textContent() const
       delete kidText;
     }
   }
-  return new DOMStringImpl(out.tqunicode(), out.length());
+  return new DOMStringImpl(out.unicode(), out.length());
 }
 
 //-------------------------------------------------------------------------
@@ -1099,7 +1099,7 @@ NodeImpl *NodeBaseImpl::insertBefore ( NodeImpl *newChild, NodeImpl *refChild, i
     return newChild;
 }
 
-void NodeBaseImpl::tqreplaceChild ( NodeImpl *newChild, NodeImpl *oldChild, int &exceptioncode )
+void NodeBaseImpl::replaceChild ( NodeImpl *newChild, NodeImpl *oldChild, int &exceptioncode )
 {
     exceptioncode = 0;
 
@@ -1427,7 +1427,7 @@ void NodeBaseImpl::cloneChildNodes(NodeImpl *clone)
     }
 }
 
-// I don't like this way of implementing the method, but I didn't tqfind any
+// I don't like this way of implementing the method, but I didn't find any
 // other way. Lars
 bool NodeBaseImpl::getUpperLeftCorner(int &xPos, int &yPos) const
 {
@@ -1440,7 +1440,7 @@ bool NodeBaseImpl::getUpperLeftCorner(int &xPos, int &yPos) const
         return true;
     }
 
-    // tqfind the next text/image child, to get a position
+    // find the next text/image child, to get a position
     while(o) {
         if(o->firstChild())
             o = o->firstChild();
@@ -1484,7 +1484,7 @@ bool NodeBaseImpl::getLowerRightCorner(int &xPos, int &yPos) const
         yPos += o->height() + o->borderTopExtra() + o->borderBottomExtra();
         return true;
     }
-    // tqfind the last text/image child, to get a position
+    // find the last text/image child, to get a position
     while(o) {
         if(o->lastChild())
             o = o->lastChild();
@@ -2060,7 +2060,7 @@ bool RegisteredListenerList::stillContainsListener(const RegisteredEventListener
 {
     if (!listeners)
         return false;
-    return listeners->tqfind(listener) != listeners->end();
+    return listeners->find(listener) != listeners->end();
 }
 
 RegisteredListenerList::~RegisteredListenerList() {
diff --git a/khtml/xml/dom_nodeimpl.h b/khtml/xml/dom_nodeimpl.h
index 263df8fb6..1e53edf19 100644
--- a/khtml/xml/dom_nodeimpl.h
+++ b/khtml/xml/dom_nodeimpl.h
@@ -86,17 +86,17 @@ private:
 #define NodeImpl_IdNSMask    0xffff0000
 #define NodeImpl_IdLocalMask 0x0000ffff
 
-const TQ_UINT16 defaultNamespace = 0;
-const TQ_UINT16 xhtmlNamespace = 1;
-const TQ_UINT16 emptyNamespace = 2;
-const TQ_UINT16 anyNamespace = 0xffff;
-const TQ_UINT16 anyLocalName = 0xffff;
+const Q_UINT16 defaultNamespace = 0;
+const Q_UINT16 xhtmlNamespace = 1;
+const Q_UINT16 emptyNamespace = 2;
+const Q_UINT16 anyNamespace = 0xffff;
+const Q_UINT16 anyLocalName = 0xffff;
 
-inline TQ_UINT16 localNamePart(TQ_UINT32 id) { return id & NodeImpl_IdLocalMask; }
-inline TQ_UINT16 namespacePart(TQ_UINT32 id) { return (((unsigned int)id) & NodeImpl_IdNSMask) >> 16; }
-inline TQ_UINT32 makeId(TQ_UINT16 n, TQ_UINT16 l) { return (n << 16) | l; }
+inline Q_UINT16 localNamePart(Q_UINT32 id) { return id & NodeImpl_IdLocalMask; }
+inline Q_UINT16 namespacePart(Q_UINT32 id) { return (((unsigned int)id) & NodeImpl_IdNSMask) >> 16; }
+inline Q_UINT32 makeId(Q_UINT16 n, Q_UINT16 l) { return (n << 16) | l; }
 
-const TQ_UINT32 anyQName = makeId(anyNamespace, anyLocalName);
+const Q_UINT32 anyQName = makeId(anyNamespace, anyLocalName);
 
 class NodeImpl : public khtml::TreeShared<NodeImpl>
 {
@@ -116,12 +116,12 @@ public:
     virtual NodeListImpl *childNodes();
     virtual NodeImpl *firstChild() const;
     virtual NodeImpl *lastChild() const;
-    // insertBefore, tqreplaceChild and appendChild also close newChild
+    // insertBefore, replaceChild and appendChild also close newChild
     // unlike the speed optimized addChild (which is used by the parser)
     virtual NodeImpl *insertBefore ( NodeImpl *newChild, NodeImpl *refChild, int &exceptioncode );
     
     /* These two methods may delete the old node, so make sure to reference it if you need it */
-    virtual void tqreplaceChild ( NodeImpl *newChild, NodeImpl *oldChild, int &exceptioncode );
+    virtual void replaceChild ( NodeImpl *newChild, NodeImpl *oldChild, int &exceptioncode );
     virtual void removeChild ( NodeImpl *oldChild, int &exceptioncode );
     virtual NodeImpl *appendChild ( NodeImpl *newChild, int &exceptioncode );
     virtual bool hasChildNodes (  ) const;
@@ -140,7 +140,7 @@ public:
     virtual bool isDocumentNode() const { return false; }
     virtual bool isXMLElementNode() const { return false; }
     virtual bool isGenericFormElement() const { return false; }
-    virtual bool tqcontainsOnlyWhitespace() const { return false; }
+    virtual bool containsOnlyWhitespace() const { return false; }
     virtual bool contentEditable() const;
 
     // helper functions not being part of the DOM
@@ -155,7 +155,7 @@ public:
     // appendChild(), and returns the node into which will be parsed next.
     virtual NodeImpl *addChild(NodeImpl *newChild);
 
-    typedef TQ_UINT32 Id;
+    typedef Q_UINT32 Id;
     // id() is used to easily and exactly identify a node. It
     // is optimized for quick comparison and low memory consumption.
     // its value depends on the owner document of the node and is
@@ -299,7 +299,7 @@ public:
     virtual NodeImpl *childNode(unsigned long index);
 
     /**
-     * Does a pre-order traversal of the tree to tqfind the node next node after this one. This uses the same order that
+     * Does a pre-order traversal of the tree to find the node next node after this one. This uses the same order that
      * the tags appear in the source file.
      *
      * @param stayWithin If not null, the traversal will stop once the specified node is reached. This can be used to
@@ -312,7 +312,7 @@ public:
     NodeImpl *traverseNextNode(NodeImpl *stayWithin = 0) const;
 
     /**
-     * Does a reverse pre-order traversal to tqfind the node that comes before the current one in document order
+     * Does a reverse pre-order traversal to find the node that comes before the current one in document order
      *
      * see traverseNextNode()
      */
@@ -407,7 +407,7 @@ public:
 
     /**
      * Notifies the node that it has been inserted into the document. This is called during document parsing, and also
-     * when a node is added through the DOM methods insertBefore(), appendChild() or tqreplaceChild(). Note that this only
+     * when a node is added through the DOM methods insertBefore(), appendChild() or replaceChild(). Note that this only
      * happens when the node becomes part of the document tree, i.e. only when the document is actually an ancestor of
      * the node. The call happens _after_ the node has been added to the tree.
      *
@@ -497,7 +497,7 @@ public:
     virtual NodeImpl *firstChild() const;
     virtual NodeImpl *lastChild() const;
     virtual NodeImpl *insertBefore ( NodeImpl *newChild, NodeImpl *refChild, int &exceptioncode );
-    virtual void tqreplaceChild ( NodeImpl *newChild, NodeImpl *oldChild, int &exceptioncode );
+    virtual void replaceChild ( NodeImpl *newChild, NodeImpl *oldChild, int &exceptioncode );
     virtual void removeChild ( NodeImpl *oldChild, int &exceptioncode );
     virtual NodeImpl *appendChild ( NodeImpl *newChild, int &exceptioncode );
     virtual bool hasChildNodes (  ) const;
@@ -537,7 +537,7 @@ protected:
     bool checkIsChild( NodeImpl *oldchild, int &exceptioncode );
     // ###
 
-    // tqfind out if a node is allowed to be our child
+    // find out if a node is allowed to be our child
     void dispatchChildInsertedEvents( NodeImpl *child, int &exceptioncode );
     void dispatchChildRemovalEvents( NodeImpl *child, int &exceptioncode );
 };
diff --git a/khtml/xml/dom_restyler.cpp b/khtml/xml/dom_restyler.cpp
index 699a5ab59..0050c4a03 100644
--- a/khtml/xml/dom_restyler.cpp
+++ b/khtml/xml/dom_restyler.cpp
@@ -45,7 +45,7 @@ void DynamicDomRestyler::removeDependency(ElementImpl* subject, ElementImpl* dep
 
 void DynamicDomRestyler::removeDependencies(ElementImpl* subject, StructuralDependencyType type)
 {
-    KMultiMap<ElementImpl>::List* my_dependencies = reverse_map.tqfind(subject);
+    KMultiMap<ElementImpl>::List* my_dependencies = reverse_map.find(subject);
 
     if (!my_dependencies) return;
 
@@ -60,7 +60,7 @@ void DynamicDomRestyler::removeDependencies(ElementImpl* subject, StructuralDepe
 
 void DynamicDomRestyler::resetDependencies(ElementImpl* subject)
 {
-    KMultiMap<ElementImpl>::List* my_dependencies = reverse_map.tqfind(subject);
+    KMultiMap<ElementImpl>::List* my_dependencies = reverse_map.find(subject);
 
     if (!my_dependencies) return;
 
@@ -78,7 +78,7 @@ void DynamicDomRestyler::resetDependencies(ElementImpl* subject)
 void DynamicDomRestyler::restyleDepedent(ElementImpl* dependency, StructuralDependencyType type)
 {
     assert(type < LastStructuralDependency);
-    KMultiMap<ElementImpl>::List* dep = dependency_map[type].tqfind(dependency);
+    KMultiMap<ElementImpl>::List* dep = dependency_map[type].find(dependency);
 
     if (!dep) return;
 
diff --git a/khtml/xml/dom_stringimpl.cpp b/khtml/xml/dom_stringimpl.cpp
index e50babf28..bb1a728e9 100644
--- a/khtml/xml/dom_stringimpl.cpp
+++ b/khtml/xml/dom_stringimpl.cpp
@@ -54,15 +54,15 @@ DOMStringImpl::DOMStringImpl(const char *str)
 }
 
 // FIXME: should be a cached flag maybe.
-bool DOMStringImpl::tqcontainsOnlyWhitespace() const
+bool DOMStringImpl::containsOnlyWhitespace() const
 {
     if (!s)
         return true;
 
     for (uint i = 0; i < l; i++) {
         TQChar c = s[i];
-        if (c.tqunicode() <= 0x7F) {
-            if (c.tqunicode() > ' ')
+        if (c.unicode() <= 0x7F) {
+            if (c.unicode() > ' ')
                 return false;
         } else {
             if (c.direction() != TQChar::DirWS)
@@ -286,18 +286,18 @@ khtml::Length* DOMStringImpl::toCoordsArray(int& len) const
     }
     str = str.simplifyWhiteSpace();
 
-    len = str.tqcontains(' ') + 1;
+    len = str.contains(' ') + 1;
     khtml::Length* r = new khtml::Length[len];
 
     int i = 0;
     int pos = 0;
     int pos2;
 
-    while((pos2 = str.tqfind(' ', pos)) != -1) {
-        r[i++] = parseLength((TQChar *) str.tqunicode()+pos, pos2-pos);
+    while((pos2 = str.find(' ', pos)) != -1) {
+        r[i++] = parseLength((TQChar *) str.unicode()+pos, pos2-pos);
         pos = pos2+1;
     }
-    r[i] = parseLength((TQChar *) str.tqunicode()+pos, str.length()-pos);
+    r[i] = parseLength((TQChar *) str.unicode()+pos, str.length()-pos);
 
     return r;
 }
@@ -307,7 +307,7 @@ khtml::Length* DOMStringImpl::toLengthArray(int& len) const
     TQString str(s, l);
     str = str.simplifyWhiteSpace();
 
-    len = str.tqcontains(',') + 1;
+    len = str.contains(',') + 1;
 
     // If we have no commas, we have no array.
     if( len == 1 )
@@ -319,14 +319,14 @@ khtml::Length* DOMStringImpl::toLengthArray(int& len) const
     int pos = 0;
     int pos2;
 
-    while((pos2 = str.tqfind(',', pos)) != -1) {
-        r[i++] = parseLength((TQChar *) str.tqunicode()+pos, pos2-pos);
+    while((pos2 = str.find(',', pos)) != -1) {
+        r[i++] = parseLength((TQChar *) str.unicode()+pos, pos2-pos);
         pos = pos2+1;
     }
 
     /* IE Quirk: If the last comma is the last char skip it and reduce len by one */
     if (str.length()-pos > 0)
-        r[i] = parseLength((TQChar *) str.tqunicode()+pos, str.length()-pos);
+        r[i] = parseLength((TQChar *) str.unicode()+pos, str.length()-pos);
     else
         len--;
 
diff --git a/khtml/xml/dom_stringimpl.h b/khtml/xml/dom_stringimpl.h
index 78d7dcb0c..cd7128967 100644
--- a/khtml/xml/dom_stringimpl.h
+++ b/khtml/xml/dom_stringimpl.h
@@ -79,7 +79,7 @@ public:
     DOMStringImpl *collapseWhiteSpace(bool preserveLF, bool preserveWS);
 
     const TQChar &operator [] (int pos) { return s[pos]; }
-    bool tqcontainsOnlyWhitespace() const;
+    bool containsOnlyWhitespace() const;
 
     // ignores trailing garbage, unlike QString
     int toInt(bool* ok = 0) const;
@@ -92,7 +92,7 @@ public:
     DOMStringImpl *capitalize(bool noFirstCap=false) const;
     DOMStringImpl *escapeHTML();
 
-    TQChar *tqunicode() const { return s; }
+    TQChar *unicode() const { return s; }
     uint length() const { return l; }
     TQString string() const;
 
diff --git a/khtml/xml/dom_textimpl.cpp b/khtml/xml/dom_textimpl.cpp
index 6c07b9c47..015135428 100644
--- a/khtml/xml/dom_textimpl.cpp
+++ b/khtml/xml/dom_textimpl.cpp
@@ -155,7 +155,7 @@ void CharacterDataImpl::deleteData( const unsigned long offset, const unsigned l
     oldStr->deref();
 }
 
-void CharacterDataImpl::tqreplaceData( const unsigned long offset, const unsigned long count, const DOMString &arg, int &exceptioncode )
+void CharacterDataImpl::replaceData( const unsigned long offset, const unsigned long count, const DOMString &arg, int &exceptioncode )
 {
     exceptioncode = 0;
     if ((long)count < 0)
@@ -189,9 +189,9 @@ DOMString CharacterDataImpl::nodeValue() const
     return str;
 }
 
-bool CharacterDataImpl::tqcontainsOnlyWhitespace() const
+bool CharacterDataImpl::containsOnlyWhitespace() const
 {
-    return str->tqcontainsOnlyWhitespace();
+    return str->containsOnlyWhitespace();
 }
 
 void CharacterDataImpl::setNodeValue( const DOMString &_nodeValue, int &exceptioncode )
@@ -372,7 +372,7 @@ bool TextImpl::rendererIsNeeded(RenderStyle *style)
     if (!CharacterDataImpl::rendererIsNeeded(style)) {
         return false;
     }
-    bool onlyWS = tqcontainsOnlyWhitespace();
+    bool onlyWS = containsOnlyWhitespace();
     if (!onlyWS) {
         return true;
     }
diff --git a/khtml/xml/dom_textimpl.h b/khtml/xml/dom_textimpl.h
index a966a23a4..07e4909f6 100644
--- a/khtml/xml/dom_textimpl.h
+++ b/khtml/xml/dom_textimpl.h
@@ -51,9 +51,9 @@ public:
     virtual void appendData ( const DOMString &arg, int &exceptioncode );
     virtual void insertData ( const unsigned long offset, const DOMString &arg, int &exceptioncode );
     virtual void deleteData ( const unsigned long offset, const unsigned long count, int &exceptioncode );
-    virtual void tqreplaceData ( const unsigned long offset, const unsigned long count, const DOMString &arg, int &exceptioncode );
+    virtual void replaceData ( const unsigned long offset, const unsigned long count, const DOMString &arg, int &exceptioncode );
 
-    virtual bool tqcontainsOnlyWhitespace() const;
+    virtual bool containsOnlyWhitespace() const;
 
     // DOM methods overridden from  parent classes
 
@@ -135,7 +135,7 @@ public:
     DOMStringImpl *renderString() const;
     
     virtual DOMString toString() const;
-    /** Return the text for the node, with < tqreplaced with &lt; and so on.
+    /** Return the text for the node, with < replaced with &lt; and so on.
      *  @param startOffset The number of characters counted from the left, zero indexed, counting "<" as one character, to start from.  Use -1 to start from 0.
      *  @param endOffset The number of characters counted from the left, zero indexed, counting "<" as one character, to end on.  Use -1 to end at the end of the string.
      *  @return An html escaped version of the substring.
diff --git a/khtml/xml/xml_tokenizer.cpp b/khtml/xml/xml_tokenizer.cpp
index 37fc36f02..7c043815a 100644
--- a/khtml/xml/xml_tokenizer.cpp
+++ b/khtml/xml/xml_tokenizer.cpp
@@ -42,7 +42,7 @@ using namespace DOM;
 using namespace khtml;
 
 XMLIncrementalSource::XMLIncrementalSource()
-    : TQXmlInputSource(), m_pos( 0 ), m_tqunicode( 0 ),
+    : TQXmlInputSource(), m_pos( 0 ), m_unicode( 0 ),
       m_finished( false )
 {
 }
@@ -59,13 +59,13 @@ TQChar XMLIncrementalSource::next()
     else if ( m_data.length() <= m_pos )
         return TQXmlInputSource::EndOfData;
     else
-        return m_tqunicode[m_pos++];
+        return m_unicode[m_pos++];
 }
 
 void XMLIncrementalSource::setData( const TQString& str )
 {
     m_data = str;
-    m_tqunicode = m_data.tqunicode();
+    m_unicode = m_data.unicode();
     m_pos = 0;
     if ( !str.isEmpty() )
         m_finished = false;
@@ -78,7 +78,7 @@ void XMLIncrementalSource::setData( const TQByteArray& data )
 void XMLIncrementalSource::appendXML( const TQString& str )
 {
     m_data += str;
-    m_tqunicode = m_data.tqunicode();
+    m_unicode = m_data.unicode();
 }
 
 TQString XMLIncrementalSource::data()
@@ -152,11 +152,11 @@ void XMLHandler::fixUpNSURI(TQString& uri, const TQString& qname)
 {
     /* QXml does not resolve the namespaces of attributes in the same 
        tag that preceed the xmlns declaration. This fixes up that case */
-    if (uri.isEmpty() && qname.tqfind(':') != -1) {
+    if (uri.isEmpty() && qname.find(':') != -1) {
         TQXmlNamespaceSupport ns;
         TQString localName, prefix;
         ns.splitName(qname, prefix, localName);
-        if (namespaceInfo.tqcontains(prefix)) {
+        if (namespaceInfo.contains(prefix)) {
             uri = namespaceInfo[prefix].top();
         }
     }
@@ -289,7 +289,7 @@ bool XMLHandler::comment(const TQString & ch)
     if (currentNode()->nodeType() == Node::TEXT_NODE)
         exitText();
     // ### handle exceptions
-    currentNode()->addChild(m_doc->createComment(new DOMStringImpl(ch.tqunicode(), ch.length())));
+    currentNode()->addChild(m_doc->createComment(new DOMStringImpl(ch.unicode(), ch.length())));
     return true;
 }
 
@@ -299,7 +299,7 @@ bool XMLHandler::processingInstruction(const TQString &target, const TQString &d
         exitText();
     // ### handle exceptions
     ProcessingInstructionImpl *pi =
-        m_doc->createProcessingInstruction(target, new DOMStringImpl(data.tqunicode(), data.length()));
+        m_doc->createProcessingInstruction(target, new DOMStringImpl(data.unicode(), data.length()));
     currentNode()->addChild(pi);
     pi->checkStyleSheet();
     return true;
@@ -364,7 +364,7 @@ bool XMLHandler::internalEntityDecl(const TQString &name, const TQString &value)
 {
     EntityImpl *e = new EntityImpl(m_doc,name);
     // ### further parse entities inside the value and add them as separate nodes (or entityreferences)?
-    e->addChild(m_doc->createTextNode(new DOMStringImpl(value.tqunicode(), value.length())));
+    e->addChild(m_doc->createTextNode(new DOMStringImpl(value.unicode(), value.length())));
      if (m_doc->doctype())
          static_cast<GenericRONamedNodeMapImpl*>(m_doc->doctype()->entities())->addNode(e);
     return true;
diff --git a/khtml/xml/xml_tokenizer.h b/khtml/xml/xml_tokenizer.h
index 0af3ec3a4..cbf5cd5dd 100644
--- a/khtml/xml/xml_tokenizer.h
+++ b/khtml/xml/xml_tokenizer.h
@@ -116,7 +116,7 @@ private:
     State state;
 };
 
-class Tokenizer : public TQObject
+class Tokenizer : public QObject
 {
     Q_OBJECT
 public:
@@ -155,7 +155,7 @@ public:
 private:
     TQString      m_data;
     uint         m_pos;
-    const TQChar *m_tqunicode;
+    const TQChar *m_unicode;
     bool         m_finished;
 };
 
diff --git a/kimgio/dds.cpp b/kimgio/dds.cpp
index 3438de2b3..caacb2a3c 100644
--- a/kimgio/dds.cpp
+++ b/kimgio/dds.cpp
@@ -33,9 +33,9 @@
 #define sqrtf(x) ((float)sqrt(x))
 #endif
 
-typedef TQ_UINT32 uint;
-typedef TQ_UINT16 ushort;
-typedef TQ_UINT8 uchar;
+typedef Q_UINT32 uint;
+typedef Q_UINT16 ushort;
+typedef Q_UINT8 uchar;
 
 namespace {	// Private.
 
@@ -137,10 +137,10 @@ namespace {	// Private.
 		uint flags;
 		uint fourcc;
 		uint bitcount;
-		uint rtqmask;
-		uint gtqmask;
-		uint btqmask;
-		uint atqmask;
+		uint rmask;
+		uint gmask;
+		uint bmask;
+		uint amask;
 	};
 
 	static TQDataStream & operator>> ( TQDataStream & s, DDSPixelFormat & pf )
@@ -149,10 +149,10 @@ namespace {	// Private.
 		s >> pf.flags;
 		s >> pf.fourcc;
 		s >> pf.bitcount;
-		s >> pf.rtqmask;
-		s >> pf.gtqmask;
-		s >> pf.btqmask;
-		s >> pf.atqmask;
+		s >> pf.rmask;
+		s >> pf.gmask;
+		s >> pf.bmask;
+		s >> pf.amask;
 		return s;
 	}
 
@@ -230,7 +230,7 @@ namespace {	// Private.
 			if( header.pf.flags & DDPF_ALPHAPIXELS ) {
 				switch( header.pf.bitcount ) {
 					case 16:
-						return (header.pf.atqmask == 0x8000) ? DDS_A1R5G5B5 : DDS_A4R4G4B4;
+						return (header.pf.amask == 0x8000) ? DDS_A1R5G5B5 : DDS_A4R4G4B4;
 					case 32:
 						return DDS_A8R8G8B8;
 				}
@@ -298,7 +298,7 @@ namespace {	// Private.
 			for( uint x = 0; x < w; x++ ) {
 				uchar r, g, b, a;
 				s >> b >> g >> r >> a;
-				scanline[x] = tqRgba(r, g, b, a);
+				scanline[x] = qRgba(r, g, b, a);
 			}
 		}
 
@@ -315,7 +315,7 @@ namespace {	// Private.
 			for( uint x = 0; x < w; x++ ) {
 				uchar r, g, b;
 				s >> b >> g >> r;
-				scanline[x] = tqRgb(r, g, b);
+				scanline[x] = qRgb(r, g, b);
 			}
 		}
 
@@ -336,7 +336,7 @@ namespace {	// Private.
 				uchar r = (color.c.r << 3) | (color.c.r >> 2);
 				uchar g = (color.c.g << 3) | (color.c.g >> 2);
 				uchar b = (color.c.b << 3) | (color.c.b >> 2);
-				scanline[x] = tqRgba(r, g, b, a);
+				scanline[x] = qRgba(r, g, b, a);
 			}
 		}
 
@@ -357,7 +357,7 @@ namespace {	// Private.
 				uchar r = (color.c.r << 4) | color.c.r;
 				uchar g = (color.c.g << 4) | color.c.g;
 				uchar b = (color.c.b << 4) | color.c.b;
-				scanline[x] = tqRgba(r, g, b, a);
+				scanline[x] = qRgba(r, g, b, a);
 			}
 		}
 
@@ -377,7 +377,7 @@ namespace {	// Private.
 				uchar r = (color.c.r << 3) | (color.c.r >> 2);
 				uchar g = (color.c.g << 2) | (color.c.g >> 4);
 				uchar b = (color.c.b << 3) | (color.c.b >> 2);
-				scanline[x] = tqRgb(r, g, b);
+				scanline[x] = qRgb(r, g, b);
 			}
 		}
 
@@ -539,16 +539,16 @@ namespace {	// Private.
 				Color8888 color_array[4];
 				block.GetColors(color_array);
 
-				// bit tqmasks = 00000011, 00001100, 00110000, 11000000
-				const uint tqmasks[4] = { 3, 3<<2, 3<<4, 3<<6 };
+				// bit masks = 00000011, 00001100, 00110000, 11000000
+				const uint masks[4] = { 3, 3<<2, 3<<4, 3<<6 };
 				const int shift[4] = { 0, 2, 4, 6 };
 
 				// Write color block.
 				for( uint j = 0; j < 4; j++ ) {
 					for( uint i = 0; i < 4; i++ ) {
 						if( img.valid( x+i, y+j ) ) {
-							uint idx = (block.row[j] & tqmasks[i]) >> shift[i];
-							scanline[j][x+i] = tqRgba(color_array[idx].r, color_array[idx].g, color_array[idx].b, color_array[idx].a);
+							uint idx = (block.row[j] & masks[i]) >> shift[i];
+							scanline[j][x+i] = qRgba(color_array[idx].r, color_array[idx].g, color_array[idx].b, color_array[idx].a);
 						}
 					}
 				}
@@ -580,8 +580,8 @@ namespace {	// Private.
 				Color8888 color_array[4];
 				block.GetColors(color_array);
 
-				// bit tqmasks = 00000011, 00001100, 00110000, 11000000
-				const uint tqmasks[4] = { 3, 3<<2, 3<<4, 3<<6 };
+				// bit masks = 00000011, 00001100, 00110000, 11000000
+				const uint masks[4] = { 3, 3<<2, 3<<4, 3<<6 };
 				const int shift[4] = { 0, 2, 4, 6 };
 
 				// Write color block.
@@ -589,10 +589,10 @@ namespace {	// Private.
 					ushort a = alpha.row[j];
 					for( uint i = 0; i < 4; i++ ) {
 						if( img.valid( x+i, y+j ) ) {
-							uint idx = (block.row[j] & tqmasks[i]) >> shift[i];
+							uint idx = (block.row[j] & masks[i]) >> shift[i];
 							color_array[idx].a = a & 0x0f;
 							color_array[idx].a = color_array[idx].a | (color_array[idx].a << 4);
-							scanline[j][x+i] = tqRgba(color_array[idx].r, color_array[idx].g, color_array[idx].b, color_array[idx].a);
+							scanline[j][x+i] = qRgba(color_array[idx].r, color_array[idx].g, color_array[idx].b, color_array[idx].a);
 						}
 						a >>= 4;
 					}
@@ -638,17 +638,17 @@ namespace {	// Private.
 				uchar bit_array[16];
 				alpha.GetBits(bit_array);
 
-				// bit tqmasks = 00000011, 00001100, 00110000, 11000000
-				const uint tqmasks[4] = { 3, 3<<2, 3<<4, 3<<6 };
+				// bit masks = 00000011, 00001100, 00110000, 11000000
+				const uint masks[4] = { 3, 3<<2, 3<<4, 3<<6 };
 				const int shift[4] = { 0, 2, 4, 6 };
 
 				// Write color block.
 				for( uint j = 0; j < 4; j++ ) {
 					for( uint i = 0; i < 4; i++ ) {
 						if( img.valid( x+i, y+j ) ) {
-							uint idx = (block.row[j] & tqmasks[i]) >> shift[i];
+							uint idx = (block.row[j] & masks[i]) >> shift[i];
 							color_array[idx].a = alpha_array[bit_array[j*4+i]];
-							scanline[j][x+i] = tqRgba(color_array[idx].r, color_array[idx].g, color_array[idx].b, color_array[idx].a);
+							scanline[j][x+i] = qRgba(color_array[idx].r, color_array[idx].g, color_array[idx].b, color_array[idx].a);
 						}
 					}
 				}
@@ -693,17 +693,17 @@ namespace {	// Private.
 				uchar bit_array[16];
 				alpha.GetBits(bit_array);
 
-				// bit tqmasks = 00000011, 00001100, 00110000, 11000000
-				const uint tqmasks[4] = { 3, 3<<2, 3<<4, 3<<6 };
+				// bit masks = 00000011, 00001100, 00110000, 11000000
+				const uint masks[4] = { 3, 3<<2, 3<<4, 3<<6 };
 				const int shift[4] = { 0, 2, 4, 6 };
 
 				// Write color block.
 				for( uint j = 0; j < 4; j++ ) {
 					for( uint i = 0; i < 4; i++ ) {
 						if( img.valid( x+i, y+j ) ) {
-							uint idx = (block.row[j] & tqmasks[i]) >> shift[i];
+							uint idx = (block.row[j] & masks[i]) >> shift[i];
 							color_array[idx].a = alpha_array[bit_array[j*4+i]];
-							scanline[j][x+i] = tqRgb(color_array[idx].a, color_array[idx].g, color_array[idx].b);
+							scanline[j][x+i] = qRgb(color_array[idx].a, color_array[idx].g, color_array[idx].b);
 						}
 					}
 				}
@@ -757,7 +757,7 @@ namespace {	// Private.
 							const float fz = sqrtf(1.0f - fx*fx - fy*fy);
 							const uchar nz = uchar((fz + 1.0f) * 127.5f);
 							
-							scanline[j][x+i] = tqRgb(nx, ny, nz);
+							scanline[j][x+i] = qRgb(nx, ny, nz);
 						}
 					}
 				}
diff --git a/kimgio/eps.cpp b/kimgio/eps.cpp
index 118d1ba4b..5067fb8e1 100644
--- a/kimgio/eps.cpp
+++ b/kimgio/eps.cpp
@@ -15,7 +15,7 @@
 #define BBOX "%%BoundingBox:"
 #define BBOX_LEN strlen(BBOX)
 
-static bool seekToCodeStart( TQIODevice * io, TQ_UINT32 & ps_offset, TQ_UINT32 & ps_size )
+static bool seekToCodeStart( TQIODevice * io, Q_UINT32 & ps_offset, Q_UINT32 & ps_size )
 {
     char buf[4]; // We at most need to read 4 bytes at a time
     ps_offset=0L;
@@ -134,13 +134,13 @@ KDE_EXPORT void kimgio_eps_read (TQImageIO *image)
         TQString tmp;
 
         TQIODevice* io = image->ioDevice();
-        TQ_UINT32 ps_offset, ps_size;
+        Q_UINT32 ps_offset, ps_size;
 
-        // tqfind start of PostScript code
+        // find start of PostScript code
         if ( !seekToCodeStart(io, ps_offset, ps_size) )
             return;
 
-        // tqfind bounding box
+        // find bounding box
         if ( !bbox (io, &x1, &y1, &x2, &y2)) {
             kdError(399) << "kimgio EPS: no bounding box found!" << endl;
             return;
@@ -210,7 +210,7 @@ KDE_EXPORT void kimgio_eps_read (TQImageIO *image)
             return;
         }
 
-        fprintf (ghostfd, "\n%d %d translate\n", -tqRound(x1*xScale), -tqRound(y1*yScale));
+        fprintf (ghostfd, "\n%d %d translate\n", -qRound(x1*xScale), -qRound(y1*yScale));
         if ( needsScaling )
             fprintf (ghostfd, "%g %g scale\n", xScale, yScale);
 
diff --git a/kimgio/exr.cpp b/kimgio/exr.cpp
index c28cb799b..e45812700 100644
--- a/kimgio/exr.cpp
+++ b/kimgio/exr.cpp
@@ -110,7 +110,7 @@ QRgb RgbaToQrgba(struct Rgba imagePixel)
 //     the display's maximum intensity).
 //
 //  7) Clamp the values to [0, 255].
-	return tqRgba( char (Imath::clamp ( r * 84.66f, 0.f, 255.f ) ),
+	return qRgba( char (Imath::clamp ( r * 84.66f, 0.f, 255.f ) ),
 				  char (Imath::clamp ( g * 84.66f, 0.f, 255.f ) ),
 				  char (Imath::clamp ( b * 84.66f, 0.f, 255.f ) ),
 				  char (Imath::clamp ( a * 84.66f, 0.f, 255.f ) ) );
diff --git a/kimgio/hdr.cpp b/kimgio/hdr.cpp
index 2916a92e5..bf8bc5f03 100644
--- a/kimgio/hdr.cpp
+++ b/kimgio/hdr.cpp
@@ -16,7 +16,7 @@
 #include <kdebug.h>
 #include <kglobal.h>
 
-typedef TQ_UINT8 uchar;
+typedef Q_UINT8 uchar;
 
 namespace {	// Private.
 
@@ -85,7 +85,7 @@ namespace {	// Private.
 				v = 1.0f / float(1 << -e);
 			}
 			
-			scanline[j] = tqRgb( ClipToByte(float(image[0]) * v),
+			scanline[j] = qRgb( ClipToByte(float(image[0]) * v),
 								ClipToByte(float(image[1]) * v),
 								ClipToByte(float(image[2]) * v) );
 
diff --git a/kimgio/ico.cpp b/kimgio/ico.cpp
index fb2b70e97..01ee37a1b 100644
--- a/kimgio/ico.cpp
+++ b/kimgio/ico.cpp
@@ -29,9 +29,9 @@ namespace
     struct IcoHeader
     {
         enum Type { Icon = 1, Cursor };
-        TQ_UINT16 reserved;
-        TQ_UINT16 type;
-        TQ_UINT16 count;
+        Q_UINT16 reserved;
+        Q_UINT16 type;
+        Q_UINT16 count;
     };
 
     inline TQDataStream& operator >>( TQDataStream& s, IcoHeader& h )
@@ -43,21 +43,21 @@ namespace
     // (c) 1992-2002 Trolltech AS.
     struct BMP_INFOHDR
     {
-        static const TQ_UINT32 Size = 40;
-        TQ_UINT32  biSize;                // size of this struct
-        TQ_UINT32  biWidth;               // pixmap width
-        TQ_UINT32  biHeight;              // pixmap height
-        TQ_UINT16  biPlanes;              // should be 1
-        TQ_UINT16  biBitCount;            // number of bits per pixel
+        static const Q_UINT32 Size = 40;
+        Q_UINT32  biSize;                // size of this struct
+        Q_UINT32  biWidth;               // pixmap width
+        Q_UINT32  biHeight;              // pixmap height
+        Q_UINT16  biPlanes;              // should be 1
+        Q_UINT16  biBitCount;            // number of bits per pixel
         enum Compression { RGB = 0 };
-        TQ_UINT32  biCompression;         // compression method
-        TQ_UINT32  biSizeImage;           // size of image
-        TQ_UINT32  biXPelsPerMeter;       // horizontal resolution
-        TQ_UINT32  biYPelsPerMeter;       // vertical resolution
-        TQ_UINT32  biClrUsed;             // number of colors used
-        TQ_UINT32  biClrImportant;        // number of important colors
+        Q_UINT32  biCompression;         // compression method
+        Q_UINT32  biSizeImage;           // size of image
+        Q_UINT32  biXPelsPerMeter;       // horizontal resolution
+        Q_UINT32  biYPelsPerMeter;       // vertical resolution
+        Q_UINT32  biClrUsed;             // number of colors used
+        Q_UINT32  biClrImportant;        // number of important colors
     };
-    const TQ_UINT32 BMP_INFOHDR::Size;
+    const Q_UINT32 BMP_INFOHDR::Size;
   
     TQDataStream& operator >>( TQDataStream &s, BMP_INFOHDR &bi )
     {
@@ -92,11 +92,11 @@ namespace
     {
         unsigned char width;
         unsigned char height;
-        TQ_UINT16 colors;
-        TQ_UINT16 hotspotX;
-        TQ_UINT16 hotspotY;
-        TQ_UINT32 size;
-        TQ_UINT32 offset;
+        Q_UINT16 colors;
+        Q_UINT16 hotspotX;
+        Q_UINT16 hotspotY;
+        Q_UINT32 size;
+        Q_UINT32 offset;
     };
 
     inline TQDataStream& operator >>( TQDataStream& s, IconRec& r )
@@ -163,7 +163,7 @@ namespace
                 paletteEntries = header.biClrUsed;
         }
         
-        // Always create a 32-bit image to get the tqmask right
+        // Always create a 32-bit image to get the mask right
         // Note: this is safe as rec.width, rec.height are bytes
         icon.create( rec.width, rec.height, 32 );
         if ( icon.isNull() ) return false;
@@ -177,7 +177,7 @@ namespace
             unsigned char rgb[ 4 ];
             stream.readRawBytes( reinterpret_cast< char* >( &rgb ),
                                  sizeof( rgb ) );
-            colorTable[ i ] = tqRgb( rgb[ 2 ], rgb[ 1 ], rgb[ 0 ] );
+            colorTable[ i ] = qRgb( rgb[ 2 ], rgb[ 1 ], rgb[ 0 ] );
         }
 
         unsigned bpl = ( rec.width * header.biBitCount + 31 ) / 32 * 4;
@@ -207,13 +207,13 @@ namespace
                     break;
                 case 24:
                     for ( unsigned x = 0; x < rec.width; ++x )
-                        *p++ = tqRgb( pixel[ 3 * x + 2 ],
+                        *p++ = qRgb( pixel[ 3 * x + 2 ],
                                      pixel[ 3 * x + 1 ],
                                      pixel[ 3 * x ] );
                     break;
                 case 32:
                     for ( unsigned x = 0; x < rec.width; ++x )
-                        *p++ = tqRgba( pixel[ 4 * x + 2 ],
+                        *p++ = qRgba( pixel[ 4 * x + 2 ],
                                       pixel[ 4 * x + 1 ],
                                       pixel[ 4 * x ],
                                       pixel[ 4 * x  + 3] );
@@ -224,7 +224,7 @@ namespace
 
         if ( header.biBitCount < 32 )
         {
-            // Traditional 1-bit tqmask
+            // Traditional 1-bit mask
             bpl = ( rec.width + 31 ) / 32 * 4;
             buf = new unsigned char[ bpl ];
             for ( unsigned y = rec.height; y--; )
@@ -233,7 +233,7 @@ namespace
                 QRgb* p = reinterpret_cast< QRgb* >( lines[ y ] );
                 for ( unsigned x = 0; x < rec.width; ++x, ++p )
                     if ( ( ( buf[ x / 8 ] >> ( 7 - ( x & 0x07 ) ) ) & 1 ) )
-                        *p &= TQRGB_MASK;
+                        *p &= RGB_MASK;
             }
             delete[] buf;
         }
@@ -321,21 +321,21 @@ void kimgio_ico_write(TQImageIO *io)
     dib.setByteOrder(TQDataStream::LittleEndian);
 
     TQImage pixels = io->image();
-    TQImage tqmask;
+    TQImage mask;
     if (io->image().hasAlphaBuffer())
-        tqmask = io->image().createAlphaMask();
+        mask = io->image().createAlphaMask();
     else
-        tqmask = io->image().createHeuristicMask();
-    tqmask.invertPixels();
+        mask = io->image().createHeuristicMask();
+    mask.invertPixels();
     for ( int y = 0; y < pixels.height(); ++y )
         for ( int x = 0; x < pixels.width(); ++x )
-            if ( tqmask.pixel( x, y ) == 0 ) pixels.setPixel( x, y, 0 );
+            if ( mask.pixel( x, y ) == 0 ) pixels.setPixel( x, y, 0 );
 
     if (!qt_write_dib(dib, pixels))
         return;
 
    uint hdrPos = dib.device()->at();
-    if (!qt_write_dib(dib, tqmask))
+    if (!qt_write_dib(dib, mask))
         return;
     memmove(dibData.data() + hdrPos, dibData.data() + hdrPos + BMP_WIN + 8, dibData.size() - hdrPos - BMP_WIN - 8);
     dibData.resize(dibData.size() - BMP_WIN - 8);
diff --git a/kimgio/jp2.cpp b/kimgio/jp2.cpp
index 2200c948c..71b260375 100644
--- a/kimgio/jp2.cpp
+++ b/kimgio/jp2.cpp
@@ -60,7 +60,7 @@ read_image( const TQImageIO* io )
         TQFile* out = tempf->file();
         // 4096 (=4k) is a common page size.
         TQByteArray b( 4096 );
-        TQ_LONG size;
+        Q_LONG size;
         // 0 or -1 is EOF / error
         while( ( size = io->ioDevice()->readBlock( b.data(), 4096 ) ) > 0 ) {
             // in case of a write error, still give the decoder a try
@@ -139,7 +139,7 @@ render_view( gs_t& gs, TQImage& qti )
                 else if( v[k] > 255 ) v[k] = 255;
             } // for k
 
-            *data++ = tqRgb( v[0], v[1], v[2] );
+            *data++ = qRgb( v[0], v[1], v[2] );
         } // for x
     } // for y
     return true;
@@ -211,19 +211,19 @@ write_components( jas_image_t* ji, const TQImage& qi )
     jas_image_setcmpttype( ji, 0, JAS_IMAGE_CT_RGB_R );
     for( uint y = 0; y < height; ++y )
         for( uint x = 0; x < width; ++x )
-            jas_matrix_set( m, y, x, tqRed( qi.pixel( x, y ) ) );
+            jas_matrix_set( m, y, x, qRed( qi.pixel( x, y ) ) );
     jas_image_writecmpt( ji, 0, 0, 0, width, height, m );
 
     jas_image_setcmpttype( ji, 1, JAS_IMAGE_CT_RGB_G );
     for( uint y = 0; y < height; ++y )
         for( uint x = 0; x < width; ++x )
-            jas_matrix_set( m, y, x, tqGreen( qi.pixel( x, y ) ) );
+            jas_matrix_set( m, y, x, qGreen( qi.pixel( x, y ) ) );
     jas_image_writecmpt( ji, 1, 0, 0, width, height, m );
 
     jas_image_setcmpttype( ji, 2, JAS_IMAGE_CT_RGB_B );
     for( uint y = 0; y < height; ++y )
         for( uint x = 0; x < width; ++x )
-            jas_matrix_set( m, y, x, tqBlue( qi.pixel( x, y ) ) );
+            jas_matrix_set( m, y, x, qBlue( qi.pixel( x, y ) ) );
     jas_image_writecmpt( ji, 2, 0, 0, width, height, m );
     jas_matrix_destroy( m );
 
@@ -288,7 +288,7 @@ kimgio_jp2_write( TQImageIO* io )
 		TQFile* in = ktempf->file();
 
 		TQByteArray b( 4096 );
-		TQ_LONG size;
+		Q_LONG size;
 
 		// seek to the beginning of the file.
 		if( !in->at( 0 ) ) { delete ktempf; return; }
diff --git a/kimgio/pcx.cpp b/kimgio/pcx.cpp
index 444bc7974..3d866ad0a 100644
--- a/kimgio/pcx.cpp
+++ b/kimgio/pcx.cpp
@@ -45,7 +45,7 @@ static TQDataStream &operator>>( TQDataStream &s, PCXHEADER &ph )
   s >> ph.VScreenSize;
 
   // Skip the rest of the header
-  TQ_UINT8 byte;
+  Q_UINT8 byte;
   while ( s.device()->at() < 128 )
     s >> byte;
 
@@ -83,7 +83,7 @@ static TQDataStream &operator<<( TQDataStream &s, const PCXHEADER &ph )
   s << ph.HScreenSize;
   s << ph.VScreenSize;
 
-  TQ_UINT8 byte = 0;
+  Q_UINT8 byte = 0;
   for ( int i=0; i<54; ++i )
     s << byte;
 
@@ -101,9 +101,9 @@ PCXHEADER::PCXHEADER()
 
 static void readLine( TQDataStream &s, TQByteArray &buf, const PCXHEADER &header )
 {
-  TQ_UINT32 i=0;
-  TQ_UINT32 size = buf.size();
-  TQ_UINT8 byte, count;
+  Q_UINT32 i=0;
+  Q_UINT32 size = buf.size();
+  Q_UINT8 byte, count;
 
   if ( header.isCompressed() )
   {
@@ -155,8 +155,8 @@ static void readImage1( TQImage &img, TQDataStream &s, const PCXHEADER &header )
   }
 
   // Set the color palette
-  img.setColor( 0, tqRgb( 0, 0, 0 ) );
-  img.setColor( 1, tqRgb( 255, 255, 255 ) );
+  img.setColor( 0, qRgb( 0, 0, 0 ) );
+  img.setColor( 1, qRgb( 255, 255, 255 ) );
 }
 
 static void readImage4( TQImage &img, TQDataStream &s, const PCXHEADER &header )
@@ -180,7 +180,7 @@ static void readImage4( TQImage &img, TQDataStream &s, const PCXHEADER &header )
 
     for ( int i=0; i<4; i++ )
     {
-      TQ_UINT32 offset = i*header.BytesPerLine;
+      Q_UINT32 offset = i*header.BytesPerLine;
       for ( unsigned int x=0; x<header.width(); ++x )
         if ( buf[ offset + ( x/8 ) ] & ( 128 >> ( x%8 ) ) )
           pixbuf[ x ] += ( 1 << i );
@@ -219,18 +219,18 @@ static void readImage8( TQImage &img, TQDataStream &s, const PCXHEADER &header )
       p[ x ] = buf[ x ];
   }
 
-  TQ_UINT8 flag;
+  Q_UINT8 flag;
   s >> flag;
   kdDebug( 399 ) << "Palette Flag: " << flag << endl;
 
   if ( flag == 12 && ( header.Version == 5 || header.Version == 2 ) )
   {
     // Read the palette
-    TQ_UINT8 r, g, b;
+    Q_UINT8 r, g, b;
     for ( int i=0; i<256; ++i )
     {
       s >> r >> g >> b;
-      img.setColor( i, tqRgb( r, g, b ) );
+      img.setColor( i, qRgb( r, g, b ) );
     }
   }
 }
@@ -258,7 +258,7 @@ static void readImage24( TQImage &img, TQDataStream &s, const PCXHEADER &header
 
     uint *p = ( uint * )img.scanLine( y );
     for ( unsigned int x=0; x<header.width(); ++x )
-      p[ x ] = tqRgb( r_buf[ x ], g_buf[ x ], b_buf[ x ] );
+      p[ x ] = qRgb( r_buf[ x ], g_buf[ x ], b_buf[ x ] );
   }
 }
 
@@ -333,9 +333,9 @@ KDE_EXPORT void kimgio_pcx_read( TQImageIO *io )
 
 static void writeLine( TQDataStream &s, TQByteArray &buf )
 {
-  TQ_UINT32 i = 0;
-  TQ_UINT32 size = buf.size();
-  TQ_UINT8 count, data;
+  Q_UINT32 i = 0;
+  Q_UINT32 size = buf.size();
+  Q_UINT8 count, data;
   char byte;
 
   while ( i < size )
@@ -375,7 +375,7 @@ static void writeImage1( TQImage &img, TQDataStream &s, PCXHEADER &header )
 
   for ( int y=0; y<header.height(); ++y )
   {
-    TQ_UINT8 *p = img.scanLine( y );
+    Q_UINT8 *p = img.scanLine( y );
 
     // Invert as TQImage uses reverse palette for monochrome images?
     for ( int i=0; i<header.BytesPerLine; ++i )
@@ -403,7 +403,7 @@ static void writeImage4( TQImage &img, TQDataStream &s, PCXHEADER &header )
 
   for ( int y=0; y<header.height(); ++y )
   {
-    TQ_UINT8 *p = img.scanLine( y );
+    Q_UINT8 *p = img.scanLine( y );
 
     for ( int i=0; i<4; ++i )
       buf[ i ].fill( 0 );
@@ -432,7 +432,7 @@ static void writeImage8( TQImage &img, TQDataStream &s, PCXHEADER &header )
 
   for ( int y=0; y<header.height(); ++y )
   {
-    TQ_UINT8 *p = img.scanLine( y );
+    Q_UINT8 *p = img.scanLine( y );
 
     for ( int i=0; i<header.BytesPerLine; ++i )
       buf[ i ] = p[ i ];
@@ -441,7 +441,7 @@ static void writeImage8( TQImage &img, TQDataStream &s, PCXHEADER &header )
   }
 
   // Write palette flag
-  TQ_UINT8 byte = 12;
+  Q_UINT8 byte = 12;
   s << byte;
 
   // Write palette
@@ -468,9 +468,9 @@ static void writeImage24( TQImage &img, TQDataStream &s, PCXHEADER &header )
     for ( unsigned int x=0; x<header.width(); ++x )
     {
       QRgb rgb = *p++;
-      r_buf[ x ] = tqRed( rgb );
-      g_buf[ x ] = tqGreen( rgb );
-      b_buf[ x ] = tqBlue( rgb );
+      r_buf[ x ] = qRed( rgb );
+      g_buf[ x ] = qGreen( rgb );
+      b_buf[ x ] = qBlue( rgb );
     }
 
     writeLine( s, r_buf );
diff --git a/kimgio/pcx.h b/kimgio/pcx.h
index 0eacba8c0..eef3293c5 100644
--- a/kimgio/pcx.h
+++ b/kimgio/pcx.h
@@ -29,14 +29,14 @@ class RGB
 
     RGB( const QRgb color )
     {
-      r = tqRed( color );
-      g = tqGreen( color );
-      b = tqBlue( color );
+      r = qRed( color );
+      g = qGreen( color );
+      b = qBlue( color );
     }
 
-    TQ_UINT8 r;
-    TQ_UINT8 g;
-    TQ_UINT8 b;
+    Q_UINT8 r;
+    Q_UINT8 g;
+    Q_UINT8 b;
 };
 
 class Palette
@@ -51,7 +51,7 @@ class Palette
 
     QRgb color( int i ) const
     {
-      return tqRgb( rgb[ i ].r, rgb[ i ].g, rgb[ i ].b );
+      return qRgb( rgb[ i ].r, rgb[ i ].g, rgb[ i ].b );
     }
 
     struct RGB rgb[ 16 ];
@@ -66,8 +66,8 @@ class PCXHEADER
     inline int height() const { return ( YMax-YMin ) + 1; }
     inline bool isCompressed() const { return ( Encoding==1 ); }
 
-    TQ_UINT8  Manufacturer;    // Constant Flag, 10 = ZSoft .pcx
-    TQ_UINT8  Version;         // Version information·
+    Q_UINT8  Manufacturer;    // Constant Flag, 10 = ZSoft .pcx
+    Q_UINT8  Version;         // Version information·
                               // 0 = Version 2.5 of PC Paintbrush·
                               // 2 = Version 2.8 w/palette information·
                               // 3 = Version 2.8 w/o palette information·
@@ -77,26 +77,26 @@ class PCXHEADER
                               //     and PC Paintbrush +, includes
                               //     Publisher's Paintbrush . Includes
                               //     24-bit .PCX files·
-    TQ_UINT8  Encoding;        // 1 = .PCX run length encoding
-    TQ_UINT8  Bpp;             // Number of bits to represent a pixel
+    Q_UINT8  Encoding;        // 1 = .PCX run length encoding
+    Q_UINT8  Bpp;             // Number of bits to represent a pixel
                               // (per Plane) - 1, 2, 4, or 8·
-    TQ_UINT16 XMin;
-    TQ_UINT16 YMin;
-    TQ_UINT16 XMax;
-    TQ_UINT16 YMax;
-    TQ_UINT16 HDpi;
-    TQ_UINT16 YDpi;
+    Q_UINT16 XMin;
+    Q_UINT16 YMin;
+    Q_UINT16 XMax;
+    Q_UINT16 YMax;
+    Q_UINT16 HDpi;
+    Q_UINT16 YDpi;
     Palette  ColorMap;
-    TQ_UINT8  Reserved;        // Should be set to 0.
-    TQ_UINT8  NPlanes;         // Number of color planes
-    TQ_UINT16 BytesPerLine;    // Number of bytes to allocate for a scanline
+    Q_UINT8  Reserved;        // Should be set to 0.
+    Q_UINT8  NPlanes;         // Number of color planes
+    Q_UINT16 BytesPerLine;    // Number of bytes to allocate for a scanline
                               // plane.  MUST be an EVEN number.  Do NOT
                               // calculate from Xmax-Xmin.·
-    TQ_UINT16 PaletteInfo;     // How to interpret palette- 1 = Color/BW,
+    Q_UINT16 PaletteInfo;     // How to interpret palette- 1 = Color/BW,
                               // 2 = Grayscale ( ignored in PB IV/ IV + )·
-    TQ_UINT16 HScreenSize;     // Horizontal screen size in pixels. New field
+    Q_UINT16 HScreenSize;     // Horizontal screen size in pixels. New field
                               // found only in PB IV/IV Plus
-    TQ_UINT16 VScreenSize;     // Vertical screen size in pixels. New field
+    Q_UINT16 VScreenSize;     // Vertical screen size in pixels. New field
                               // found only in PB IV/IV Plus
 } KDE_PACKED;
 
diff --git a/kimgio/psd.cpp b/kimgio/psd.cpp
index bf5561c8e..13070a0c2 100644
--- a/kimgio/psd.cpp
+++ b/kimgio/psd.cpp
@@ -24,9 +24,9 @@
 
 #include <kdebug.h>
 
-typedef TQ_UINT32 uint;
-typedef TQ_UINT16 ushort;
-typedef TQ_UINT8 uchar;
+typedef Q_UINT32 uint;
+typedef Q_UINT16 ushort;
+typedef Q_UINT8 uchar;
 
 namespace {	// Private.
 
@@ -145,7 +145,7 @@ namespace {	// Private.
 		
 		// Clear the image.
 		if( channel_num < 4 ) {
-			img.fill(tqRgba(0, 0, 0, 0xFF));
+			img.fill(qRgba(0, 0, 0, 0xFF));
 		}
 		else {
 			// Enable alpha.		
diff --git a/kimgio/rgb.cpp b/kimgio/rgb.cpp
index 806dab389..71976685a 100644
--- a/kimgio/rgb.cpp
+++ b/kimgio/rgb.cpp
@@ -121,7 +121,7 @@ bool SGIImage::getRow(uchar *dest)
 bool SGIImage::readData(TQImage& img)
 {
 	QRgb *c;
-	TQ_UINT32 *start = m_starttab;
+	Q_UINT32 *start = m_starttab;
 	TQByteArray lguard(m_xsize);
 	uchar *line = (uchar *)lguard.data();
 	unsigned x, y;
@@ -136,7 +136,7 @@ bool SGIImage::readData(TQImage& img)
 			return false;
 		c = (QRgb *)img.scanLine(m_ysize - y - 1);
 		for (x = 0; x < m_xsize; x++, c++)
-			*c = tqRgb(line[x], line[x], line[x]);
+			*c = qRgb(line[x], line[x], line[x]);
 	}
 
 	if (m_zsize == 1)
@@ -150,7 +150,7 @@ bool SGIImage::readData(TQImage& img)
 				return false;
 			c = (QRgb *)img.scanLine(m_ysize - y - 1);
 			for (x = 0; x < m_xsize; x++, c++)
-				*c = tqRgb(tqRed(*c), line[x], line[x]);
+				*c = qRgb(qRed(*c), line[x], line[x]);
 		}
 
 		for (y = 0; y < m_ysize; y++) {
@@ -160,7 +160,7 @@ bool SGIImage::readData(TQImage& img)
 				return false;
 			c = (QRgb *)img.scanLine(m_ysize - y - 1);
 			for (x = 0; x < m_xsize; x++, c++)
-				*c = tqRgb(tqRed(*c), tqGreen(*c), line[x]);
+				*c = qRgb(qRed(*c), qGreen(*c), line[x]);
 		}
 
 		if (m_zsize == 3)
@@ -174,7 +174,7 @@ bool SGIImage::readData(TQImage& img)
 			return false;
 		c = (QRgb *)img.scanLine(m_ysize - y - 1);
 		for (x = 0; x < m_xsize; x++, c++)
-			*c = tqRgba(tqRed(*c), tqGreen(*c), tqBlue(*c), line[x]);
+			*c = qRgba(qRed(*c), qGreen(*c), qBlue(*c), line[x]);
 	}
 
 	return true;
@@ -183,9 +183,9 @@ bool SGIImage::readData(TQImage& img)
 
 bool SGIImage::readImage(TQImage& img)
 {
-	TQ_INT8 u8;
-	TQ_INT16 u16;
-	TQ_INT32 u32;
+	Q_INT8 u8;
+	Q_INT16 u16;
+	Q_INT32 u32;
 
 	kdDebug(399) << "reading '" << m_io->fileName() << '\'' << endl;
 
@@ -256,13 +256,13 @@ bool SGIImage::readImage(TQImage& img)
 
 	if (m_rle) {
 		uint l;
-		m_starttab = new TQ_UINT32[m_numrows];
+		m_starttab = new Q_UINT32[m_numrows];
 		for (l = 0; !m_stream.atEnd() && l < m_numrows; l++) {
 			m_stream >> m_starttab[l];
-			m_starttab[l] -= 512 + m_numrows * 2 * sizeof(TQ_UINT32);
+			m_starttab[l] -= 512 + m_numrows * 2 * sizeof(Q_UINT32);
 		}
 
-		m_lengthtab = new TQ_UINT32[m_numrows];
+		m_lengthtab = new Q_UINT32[m_numrows];
 		for (l = 0; l < m_numrows; l++)
 			m_stream >> m_lengthtab[l];
 	}
@@ -323,7 +323,7 @@ bool RLEData::operator<(const RLEData& b) const
 uint RLEMap::insert(const uchar *d, uint l)
 {
 	RLEData data = RLEData(d, l, m_offset);
-	Iterator it = tqfind(data);
+	Iterator it = find(data);
 	if (it != end())
 		return it.data();
 
@@ -389,7 +389,7 @@ uint SGIImage::compact(uchar *d, uchar *s)
 
 bool SGIImage::scanData(const TQImage& img)
 {
-	TQ_UINT32 *start = m_starttab;
+	Q_UINT32 *start = m_starttab;
 	TQCString lineguard(m_xsize * 2);
 	TQCString bufguard(m_xsize);
 	uchar *line = (uchar *)lineguard.data();
@@ -401,7 +401,7 @@ bool SGIImage::scanData(const TQImage& img)
 	for (y = 0; y < m_ysize; y++) {
 		c = reinterpret_cast<QRgb *>(img.scanLine(m_ysize - y - 1));
 		for (x = 0; x < m_xsize; x++)
-			buf[x] = intensity(tqRed(*c++));
+			buf[x] = intensity(qRed(*c++));
 		len = compact(line, buf);
 		*start++ = m_rlemap.insert(line, len);
 	}
@@ -413,7 +413,7 @@ bool SGIImage::scanData(const TQImage& img)
 		for (y = 0; y < m_ysize; y++) {
 			c = reinterpret_cast<QRgb *>(img.scanLine(m_ysize - y - 1));
 			for (x = 0; x < m_xsize; x++)
-				buf[x] = intensity(tqGreen(*c++));
+				buf[x] = intensity(qGreen(*c++));
 			len = compact(line, buf);
 			*start++ = m_rlemap.insert(line, len);
 		}
@@ -421,7 +421,7 @@ bool SGIImage::scanData(const TQImage& img)
 		for (y = 0; y < m_ysize; y++) {
 			c = reinterpret_cast<QRgb *>(img.scanLine(m_ysize - y - 1));
 			for (x = 0; x < m_xsize; x++)
-				buf[x] = intensity(tqBlue(*c++));
+				buf[x] = intensity(qBlue(*c++));
 			len = compact(line, buf);
 			*start++ = m_rlemap.insert(line, len);
 		}
@@ -433,7 +433,7 @@ bool SGIImage::scanData(const TQImage& img)
 	for (y = 0; y < m_ysize; y++) {
 		c = reinterpret_cast<QRgb *>(img.scanLine(m_ysize - y - 1));
 		for (x = 0; x < m_xsize; x++)
-			buf[x] = intensity(tqAlpha(*c++));
+			buf[x] = intensity(qAlpha(*c++));
 		len = compact(line, buf);
 		*start++ = m_rlemap.insert(line, len);
 	}
@@ -444,11 +444,11 @@ bool SGIImage::scanData(const TQImage& img)
 
 void SGIImage::writeHeader()
 {
-	m_stream << TQ_UINT16(0x01da);
+	m_stream << Q_UINT16(0x01da);
 	m_stream << m_rle << m_bpc << m_dim;
 	m_stream << m_xsize << m_ysize << m_zsize;
 	m_stream << m_pixmin << m_pixmax;
-	m_stream << TQ_UINT32(0);
+	m_stream << Q_UINT32(0);
 
 	uint i;
 	TQString desc = m_io->description();
@@ -463,7 +463,7 @@ void SGIImage::writeHeader()
 
 	m_stream << m_colormap;
 	for (i = 0; i < 404; i++)
-		m_stream << TQ_UINT8(0);
+		m_stream << Q_UINT8(0);
 }
 
 
@@ -476,11 +476,11 @@ void SGIImage::writeRle()
 
 	// write start table
 	for (i = 0; i < m_numrows; i++)
-		m_stream << TQ_UINT32(m_rlevector[m_starttab[i]]->offset());
+		m_stream << Q_UINT32(m_rlevector[m_starttab[i]]->offset());
 
 	// write length table
 	for (i = 0; i < m_numrows; i++)
-		m_stream << TQ_UINT32(m_rlevector[m_starttab[i]]->size());
+		m_stream << Q_UINT32(m_rlevector[m_starttab[i]]->size());
 
 	// write data
 	for (i = 0; i < m_rlevector.size(); i++)
@@ -500,7 +500,7 @@ void SGIImage::writeVerbatim(const TQImage& img)
 	for (y = 0; y < m_ysize; y++) {
 		c = reinterpret_cast<QRgb *>(img.scanLine(m_ysize - y - 1));
 		for (x = 0; x < m_xsize; x++)
-			m_stream << TQ_UINT8(tqRed(*c++));
+			m_stream << Q_UINT8(qRed(*c++));
 	}
 
 	if (m_zsize == 1)
@@ -510,13 +510,13 @@ void SGIImage::writeVerbatim(const TQImage& img)
 		for (y = 0; y < m_ysize; y++) {
 			c = reinterpret_cast<QRgb *>(img.scanLine(m_ysize - y - 1));
 			for (x = 0; x < m_xsize; x++)
-				m_stream << TQ_UINT8(tqGreen(*c++));
+				m_stream << Q_UINT8(qGreen(*c++));
 		}
 
 		for (y = 0; y < m_ysize; y++) {
 			c = reinterpret_cast<QRgb *>(img.scanLine(m_ysize - y - 1));
 			for (x = 0; x < m_xsize; x++)
-				m_stream << TQ_UINT8(tqBlue(*c++));
+				m_stream << Q_UINT8(qBlue(*c++));
 		}
 
 		if (m_zsize == 3)
@@ -526,7 +526,7 @@ void SGIImage::writeVerbatim(const TQImage& img)
 	for (y = 0; y < m_ysize; y++) {
 		c = reinterpret_cast<QRgb *>(img.scanLine(m_ysize - y - 1));
 		for (x = 0; x < m_xsize; x++)
-			m_stream << TQ_UINT8(tqAlpha(*c++));
+			m_stream << Q_UINT8(qAlpha(*c++));
 	}
 }
 
@@ -558,8 +558,8 @@ bool SGIImage::writeImage(TQImage& img)
 
 	m_numrows = m_ysize * m_zsize;
 
-	m_starttab = new TQ_UINT32[m_numrows];
-	m_rlemap.setBaseOffset(512 + m_numrows * 2 * sizeof(TQ_UINT32));
+	m_starttab = new Q_UINT32[m_numrows];
+	m_rlemap.setBaseOffset(512 + m_numrows * 2 * sizeof(Q_UINT32));
 
 	if (!scanData(img)) {
 		kdDebug(399) << "this can't happen" << endl;
@@ -569,7 +569,7 @@ bool SGIImage::writeImage(TQImage& img)
 	m_rlevector = m_rlemap.vector();
 
 	long verbatim_size = m_numrows * m_xsize;
-	long rle_size = m_numrows * 2 * sizeof(TQ_UINT32);
+	long rle_size = m_numrows * 2 * sizeof(Q_UINT32);
 	for (uint i = 0; i < m_rlevector.size(); i++)
 		rle_size += m_rlevector[i]->size();
 
diff --git a/kimgio/rgb.h b/kimgio/rgb.h
index 424920221..fae42a900 100644
--- a/kimgio/rgb.h
+++ b/kimgio/rgb.h
@@ -63,19 +63,19 @@ private:
 	QIODevice		*m_dev;
 	QDataStream		m_stream;
 
-	TQ_UINT8			m_rle;
-	TQ_UINT8			m_bpc;
-	TQ_UINT16		m_dim;
-	TQ_UINT16		m_xsize;
-	TQ_UINT16		m_ysize;
-	TQ_UINT16		m_zsize;
-	TQ_UINT32		m_pixmin;
-	TQ_UINT32		m_pixmax;
+	Q_UINT8			m_rle;
+	Q_UINT8			m_bpc;
+	Q_UINT16		m_dim;
+	Q_UINT16		m_xsize;
+	Q_UINT16		m_ysize;
+	Q_UINT16		m_zsize;
+	Q_UINT32		m_pixmin;
+	Q_UINT32		m_pixmax;
 	char			m_imagename[80];
-	TQ_UINT32		m_colormap;
+	Q_UINT32		m_colormap;
 
-	TQ_UINT32		*m_starttab;
-	TQ_UINT32		*m_lengthtab;
+	Q_UINT32		*m_starttab;
+	Q_UINT32		*m_lengthtab;
 	QByteArray		m_data;
 	TQByteArray::Iterator	m_pos;
 	RLEMap			m_rlemap;
diff --git a/kimgio/tga.cpp b/kimgio/tga.cpp
index c68dc6a0c..8fb5fbd7f 100644
--- a/kimgio/tga.cpp
+++ b/kimgio/tga.cpp
@@ -27,9 +27,9 @@
 
 #include <kdebug.h>
 
-typedef TQ_UINT32 uint;
-typedef TQ_UINT16 ushort;
-typedef TQ_UINT8 uchar;
+typedef Q_UINT32 uint;
+typedef Q_UINT16 ushort;
+typedef Q_UINT8 uchar;
 
 namespace {	// Private.
 
@@ -268,13 +268,13 @@ namespace {	// Private.
 				// Paletted.
 				for( int x = 0; x < tga.width; x++ ) {
 					uchar idx = *src++;
-					scanline[x] = tqRgb( palette[3*idx+2], palette[3*idx+1], palette[3*idx+0] );
+					scanline[x] = qRgb( palette[3*idx+2], palette[3*idx+1], palette[3*idx+0] );
 				}
 			}
 			else if( info.grey ) {
 				// Greyscale.
 				for( int x = 0; x < tga.width; x++ ) {
-					scanline[x] = tqRgb( *src, *src, *src );
+					scanline[x] = qRgb( *src, *src, *src );
 					src++;
 				}
 			}
@@ -283,13 +283,13 @@ namespace {	// Private.
 				if( tga.pixel_size == 16 ) {
 					for( int x = 0; x < tga.width; x++ ) {
 						Color555 c = *reinterpret_cast<Color555 *>(src);
-						scanline[x] = tqRgb( (c.r << 3) | (c.r >> 2), (c.g << 3) | (c.g >> 2), (c.b << 3) | (c.b >> 2) );
+						scanline[x] = qRgb( (c.r << 3) | (c.r >> 2), (c.g << 3) | (c.g >> 2), (c.b << 3) | (c.b >> 2) );
 						src += 2;
 					}
 				}
 				else if( tga.pixel_size == 24 ) {
 					for( int x = 0; x < tga.width; x++ ) {
-						scanline[x] = tqRgb( src[2], src[1], src[0] );
+						scanline[x] = qRgb( src[2], src[1], src[0] );
 						src += 3;
 					}
 				}
@@ -297,7 +297,7 @@ namespace {	// Private.
 					for( int x = 0; x < tga.width; x++ ) {
                                                 // ### TODO: verify with images having really some alpha data
                                                 const uchar alpha = ( src[3] << ( 8 - numAlphaBits ) );
-						scanline[x] = tqRgba( src[2], src[1], src[0], alpha );
+						scanline[x] = qRgba( src[2], src[1], src[0], alpha );
 						src += 4;
 					}
 				}
@@ -370,19 +370,19 @@ KDE_EXPORT void kimgio_tga_write( TQImageIO *io )
         s << targaMagic[i];
 
     // write header
-    s << TQ_UINT16( img.width() ); // width
-    s << TQ_UINT16( img.height() ); // height
-    s << TQ_UINT8( hasAlpha ? 32 : 24 ); // depth (24 bit RGB + 8 bit alpha)
-    s << TQ_UINT8( hasAlpha ? 0x24 : 0x20 ); // top left image (0x20) + 8 bit alpha (0x4)
+    s << Q_UINT16( img.width() ); // width
+    s << Q_UINT16( img.height() ); // height
+    s << Q_UINT8( hasAlpha ? 32 : 24 ); // depth (24 bit RGB + 8 bit alpha)
+    s << Q_UINT8( hasAlpha ? 0x24 : 0x20 ); // top left image (0x20) + 8 bit alpha (0x4)
 
     for( int y = 0; y < img.height(); y++ )
         for( int x = 0; x < img.width(); x++ ) {
             const QRgb color = img.pixel( x, y );
-            s << TQ_UINT8( tqBlue( color ) );
-            s << TQ_UINT8( tqGreen( color ) );
-            s << TQ_UINT8( tqRed( color ) );
+            s << Q_UINT8( qBlue( color ) );
+            s << Q_UINT8( qGreen( color ) );
+            s << Q_UINT8( qRed( color ) );
             if( hasAlpha )
-                s << TQ_UINT8( tqAlpha( color ) );
+                s << Q_UINT8( qAlpha( color ) );
         }
 
     io->setStatus( 0 );
diff --git a/kimgio/tiffr.cpp b/kimgio/tiffr.cpp
index 5f319e6b5..f8022d2dd 100644
--- a/kimgio/tiffr.cpp
+++ b/kimgio/tiffr.cpp
@@ -133,7 +133,7 @@ KDE_EXPORT void kimgio_tiff_read( TQImageIO *io )
 
 //	for( int ctr = (image.numBytes() / sizeof(uint32))+1; ctr ; ctr-- ) {
 //		// TODO: manage alpha with TIFFGetA
-//		*data = tqRgb( TIFFGetR( *data ), 
+//		*data = qRgb( TIFFGetR( *data ), 
 //			TIFFGetG( *data ), TIFFGetB( *data ) );
 //		data++;
 //	}
diff --git a/kimgio/xcf.cpp b/kimgio/xcf.cpp
index 327e6eae4..298d17109 100644
--- a/kimgio/xcf.cpp
+++ b/kimgio/xcf.cpp
@@ -78,9 +78,9 @@ const XCFImageFormat::LayerModes XCFImageFormat::layer_modes[] = {
 
 
 //! Change a QRgb value's alpha only.
-inline QRgb tqRgba ( QRgb rgb, int a )
+inline QRgb qRgba ( QRgb rgb, int a )
 {
-	return ((a & 0xff) << 24 | (rgb & TQRGB_MASK));
+	return ((a & 0xff) << 24 | (rgb & RGB_MASK));
 }
 
 
@@ -149,10 +149,10 @@ kdDebug() << tag << " " << xcf_image.width << " " << xcf_image.height << " " <<
 	// all the data of all layers before beginning to construct the
 	// merged image).
 
-	TQValueStack<TQ_INT32> layer_offsets;
+	TQValueStack<Q_INT32> layer_offsets;
 
 	while (true) {
-		TQ_INT32 layer_offset;
+		Q_INT32 layer_offset;
 
 		xcf_io >> layer_offset;
 
@@ -176,7 +176,7 @@ kdDebug() << tag << " " << xcf_image.width << " " << xcf_image.height << " " <<
 
 	// Load each layer and add it to the image
 	while (!layer_offsets.isEmpty()) {
-		TQ_INT32 layer_offset = layer_offsets.pop();
+		Q_INT32 layer_offset = layer_offsets.pop();
 
 		xcf_io.device()->at(layer_offset);
 
@@ -196,7 +196,7 @@ kdDebug() << tag << " " << xcf_image.width << " " << xcf_image.height << " " <<
 
 /*!
  * An XCF file can contain an arbitrary number of properties associated
- * with the image (and layer and tqmask).
+ * with the image (and layer and mask).
  * \param xcf_io the data stream connected to the XCF image
  * \param xcf_image XCF image data.
  * \return true if there were no I/O errors.
@@ -233,11 +233,11 @@ bool XCFImageFormat::loadImageProperties(TQDataStream& xcf_io, XCFImage& xcf_ima
 			case PROP_PARASITES:
 				while (!property.atEnd()) {
 					char* tag;
-					TQ_UINT32 size;
+					Q_UINT32 size;
 
 					property.readBytes(tag, size);
 
-					TQ_UINT32 flags;
+					Q_UINT32 flags;
 					char* data=0;
 					property >> flags >> data;
 
@@ -269,7 +269,7 @@ bool XCFImageFormat::loadImageProperties(TQDataStream& xcf_io, XCFImage& xcf_ima
 					for (int i = 0; i < xcf_image.num_colors; i++) {
 						uchar r, g, b;
 						property >> r >> g >> b;
-						xcf_image.palette.push_back( tqRgb(r,g,b) );
+						xcf_image.palette.push_back( qRgb(r,g,b) );
 					}
 					break;
 
@@ -290,7 +290,7 @@ bool XCFImageFormat::loadImageProperties(TQDataStream& xcf_io, XCFImage& xcf_ima
  * \return true if there were no IO errors.  */
 bool XCFImageFormat::loadProperty(TQDataStream& xcf_io, PropType& type, TQByteArray& bytes)
 {
-	TQ_UINT32 foo;
+	Q_UINT32 foo;
 	xcf_io >> foo;
 	type=PropType(foo);	// TODO urks
 
@@ -300,7 +300,7 @@ bool XCFImageFormat::loadProperty(TQDataStream& xcf_io, PropType& type, TQByteAr
 	}
 
 	char* data;
-	TQ_UINT32 size;
+	Q_UINT32 size;
 
 	// The colormap property size is not the correct number of bytes:
 	// The GIMP source xcf.c has size = 4 + ncolors, but it should be
@@ -324,7 +324,7 @@ bool XCFImageFormat::loadProperty(TQDataStream& xcf_io, PropType& type, TQByteAr
 	} else if (type == PROP_USER_UNIT) {
 		// The USER UNIT property size is not correct. I'm not sure why, though.
 		float factor;
-		TQ_INT32 digits;
+		Q_INT32 digits;
 		char* unit_strings;
 
 		xcf_io >> size >> factor >> digits;
@@ -371,7 +371,7 @@ bool XCFImageFormat::loadProperty(TQDataStream& xcf_io, PropType& type, TQByteAr
  * Load a layer from the XCF file. The data stream must be positioned at
  * the beginning of the layer data.
  * \param xcf_io the image file data stream.
- * \param xcf_image tqcontains the layer and the color table
+ * \param xcf_image contains the layer and the color table
  * (if the image is indexed).
  * \return true if there were no I/O errors.
  */
@@ -404,7 +404,7 @@ bool XCFImageFormat::loadLayer(TQDataStream& xcf_io, XCFImage& xcf_image)
 
 	// If there are any more layers, merge them into the final TQImage.
 
-	xcf_io >> layer.hierarchy_offset >> layer.tqmask_offset;
+	xcf_io >> layer.hierarchy_offset >> layer.mask_offset;
 	if (xcf_io.device()->status() != IO_Ok) {
 		kdDebug(399) << "XCF: read failure on layer image offsets" << endl;
 		return false;
@@ -426,8 +426,8 @@ bool XCFImageFormat::loadLayer(TQDataStream& xcf_io, XCFImage& xcf_image)
 	if (!loadHierarchy(xcf_io, layer))
 		return false;
 
-	if (layer.tqmask_offset != 0) {
-		xcf_io.device()->at(layer.tqmask_offset);
+	if (layer.mask_offset != 0) {
+		xcf_io.device()->at(layer.mask_offset);
 
 		if (!loadMask(xcf_io, layer))
 			return false;
@@ -494,15 +494,15 @@ bool XCFImageFormat::loadLayerProperties(TQDataStream& xcf_io, Layer& layer)
 				break;
 
 			case PROP_APPLY_MASK:
-				property >> layer.apply_tqmask;
+				property >> layer.apply_mask;
 				break;
 
 			case PROP_EDIT_MASK:
-				property >> layer.edit_tqmask;
+				property >> layer.edit_mask;
 				break;
 
 			case PROP_SHOW_MASK:
-				property >> layer.show_tqmask;
+				property >> layer.show_mask;
 				break;
 
 			case PROP_OFFSETS:
@@ -528,7 +528,7 @@ bool XCFImageFormat::loadLayerProperties(TQDataStream& xcf_io, Layer& layer)
 /*!
  * Compute the number of tiles in the current layer and allocate
  * TQImage structures for each of them.
- * \param xcf_image tqcontains the current layer.
+ * \param xcf_image contains the current layer.
  */
 bool XCFImageFormat::composeTiles(XCFImage& xcf_image)
 {
@@ -542,8 +542,8 @@ bool XCFImageFormat::composeTiles(XCFImage& xcf_image)
 	if (layer.type == GRAYA_GIMAGE || layer.type == INDEXEDA_GIMAGE)
 		layer.alpha_tiles.resize(layer.nrows);
 
-	if (layer.tqmask_offset != 0)
-		layer.tqmask_tiles.resize(layer.nrows);
+	if (layer.mask_offset != 0)
+		layer.mask_tiles.resize(layer.nrows);
 
 	for (uint j = 0; j < layer.nrows; j++) {
 		layer.image_tiles[j].resize(layer.ncols);
@@ -551,8 +551,8 @@ bool XCFImageFormat::composeTiles(XCFImage& xcf_image)
 		if (layer.type == GRAYA_GIMAGE || layer.type == INDEXEDA_GIMAGE)
 			layer.alpha_tiles[j].resize(layer.ncols);
 
-		if (layer.tqmask_offset != 0)
-			layer.tqmask_tiles[j].resize(layer.ncols);
+		if (layer.mask_offset != 0)
+			layer.mask_tiles[j].resize(layer.ncols);
 	}
 
 	for (uint j = 0; j < layer.nrows; j++) {
@@ -622,11 +622,11 @@ bool XCFImageFormat::composeTiles(XCFImage& xcf_image)
 					setGrayPalette(layer.alpha_tiles[j][i]);
 			}
 
-			if (layer.tqmask_offset != 0) {
-				layer.tqmask_tiles[j][i] = TQImage(tile_width, tile_height, 8, 256);
-				if( layer.tqmask_tiles[j][i].isNull())
+			if (layer.mask_offset != 0) {
+				layer.mask_tiles[j][i] = TQImage(tile_width, tile_height, 8, 256);
+				if( layer.mask_tiles[j][i].isNull())
 					return false;
-				setGrayPalette(layer.tqmask_tiles[j][i]);
+				setGrayPalette(layer.mask_tiles[j][i]);
 			}
 		}
 	}
@@ -643,7 +643,7 @@ bool XCFImageFormat::composeTiles(XCFImage& xcf_image)
 void XCFImageFormat::setGrayPalette(TQImage& image)
 {
 	for (int i = 0; i < 256; i++)
-		image.setColor(i, tqRgb(i, i, i));
+		image.setColor(i, qRgb(i, i, i));
 }
 
 
@@ -675,7 +675,7 @@ void XCFImageFormat::assignImageBytes(Layer& layer, uint i, uint j)
 			for (int l = 0; l < layer.image_tiles[j][i].height(); l++) {
 				for (int k = 0; k < layer.image_tiles[j][i].width(); k++) {
 					layer.image_tiles[j][i].setPixel(k, l,
-							tqRgb(tile[0], tile[1], tile[2]));
+							qRgb(tile[0], tile[1], tile[2]));
 					tile += sizeof(QRgb);
 				}
 			}
@@ -685,7 +685,7 @@ void XCFImageFormat::assignImageBytes(Layer& layer, uint i, uint j)
 			for ( int l = 0; l < layer.image_tiles[j][i].height(); l++ ) {
 				for ( int k = 0; k < layer.image_tiles[j][i].width(); k++ ) {
 					layer.image_tiles[j][i].setPixel(k, l,
-							tqRgba(tile[0], tile[1], tile[2], tile[3]));
+							qRgba(tile[0], tile[1], tile[2], tile[3]));
 					tile += sizeof(QRgb);
 				}
 			}
@@ -732,10 +732,10 @@ void XCFImageFormat::assignImageBytes(Layer& layer, uint i, uint j)
  */
 bool XCFImageFormat::loadHierarchy(TQDataStream& xcf_io, Layer& layer)
 {
-	TQ_INT32 width;
-	TQ_INT32 height;
-	TQ_INT32 bpp;
-	TQ_UINT32 offset;
+	Q_INT32 width;
+	Q_INT32 height;
+	Q_INT32 bpp;
+	Q_UINT32 offset;
 
 	xcf_io >> width >> height >> bpp >> offset;
 
@@ -748,7 +748,7 @@ bool XCFImageFormat::loadHierarchy(TQDataStream& xcf_io, Layer& layer)
 	// increasingly lower resolution). Only the top level is used here,
 	// however.
 
-	TQ_UINT32 junk;
+	Q_UINT32 junk;
 	do {
 		xcf_io >> junk;
 
@@ -777,11 +777,11 @@ bool XCFImageFormat::loadHierarchy(TQDataStream& xcf_io, Layer& layer)
  * \return true if there were no I/O errors.
  * \sa loadTileRLE().
  */
-bool XCFImageFormat::loadLevel(TQDataStream& xcf_io, Layer& layer, TQ_INT32 bpp)
+bool XCFImageFormat::loadLevel(TQDataStream& xcf_io, Layer& layer, Q_INT32 bpp)
 {
-	TQ_INT32 width;
-	TQ_INT32 height;
-	TQ_UINT32 offset;
+	Q_INT32 width;
+	Q_INT32 height;
+	Q_UINT32 offset;
 
 	xcf_io >> width >> height >> offset;
 
@@ -802,7 +802,7 @@ bool XCFImageFormat::loadLevel(TQDataStream& xcf_io, Layer& layer, TQ_INT32 bpp)
 			}
 
 			TQIODevice::Offset saved_pos = xcf_io.device()->at();
-			TQ_UINT32 offset2;
+			Q_UINT32 offset2;
 			xcf_io >> offset2;
 
 			if (xcf_io.device()->status() != IO_Ok) {
@@ -842,21 +842,21 @@ bool XCFImageFormat::loadLevel(TQDataStream& xcf_io, Layer& layer, TQ_INT32 bpp)
 
 
 /*!
- * A layer can have a one channel image which is used as a tqmask.
+ * A layer can have a one channel image which is used as a mask.
  * \param xcf_io the data stream connected to the XCF image.
- * \param layer the layer to collect the tqmask image.
+ * \param layer the layer to collect the mask image.
  * \return true if there were no I/O errors.
  */
 bool XCFImageFormat::loadMask(TQDataStream& xcf_io, Layer& layer)
 {
-	TQ_INT32 width;
-	TQ_INT32 height;
+	Q_INT32 width;
+	Q_INT32 height;
 	char* name;
 
 	xcf_io >> width >> height >> name;
 
 	if (xcf_io.device()->status() != IO_Ok) {
-		kdDebug(399) << "XCF: read failure on tqmask info" << endl;
+		kdDebug(399) << "XCF: read failure on mask info" << endl;
 		return false;
 	}
 
@@ -865,11 +865,11 @@ bool XCFImageFormat::loadMask(TQDataStream& xcf_io, Layer& layer)
 	if (!loadChannelProperties(xcf_io, layer))
 		return false;
 
-	TQ_UINT32 hierarchy_offset;
+	Q_UINT32 hierarchy_offset;
 	xcf_io >> hierarchy_offset;
 
 	if (xcf_io.device()->status() != IO_Ok) {
-		kdDebug(399) << "XCF: read failure on tqmask image offset" << endl;
+		kdDebug(399) << "XCF: read failure on mask image offset" << endl;
 		return false;
 	}
 
@@ -907,7 +907,7 @@ bool XCFImageFormat::loadMask(TQDataStream& xcf_io, Layer& layer)
  * the RLE data.
  */
 bool XCFImageFormat::loadTileRLE(TQDataStream& xcf_io, uchar* tile, int image_size,
-		int data_length, TQ_INT32 bpp)
+		int data_length, Q_INT32 bpp)
 {
 	uchar* data;
 
@@ -1007,9 +1007,9 @@ bogus_rle:
 
 /*!
  * An XCF file can contain an arbitrary number of properties associated
- * with a channel. Note that this routine only reads tqmask channel properties.
+ * with a channel. Note that this routine only reads mask channel properties.
  * \param xcf_io the data stream connected to the XCF image.
- * \param layer layer containing the tqmask channel to collect the properties.
+ * \param layer layer containing the mask channel to collect the properties.
  * \return true if there were no I/O errors.
  */
 bool XCFImageFormat::loadChannelProperties(TQDataStream& xcf_io, Layer& layer)
@@ -1030,24 +1030,24 @@ bool XCFImageFormat::loadChannelProperties(TQDataStream& xcf_io, Layer& layer)
 				return true;
 
 			case PROP_OPACITY:
-				property >> layer.tqmask_channel.opacity;
+				property >> layer.mask_channel.opacity;
 				break;
 
 			case PROP_VISIBLE:
-				property >> layer.tqmask_channel.visible;
+				property >> layer.mask_channel.visible;
 				break;
 
 			case PROP_SHOW_MASKED:
-				property >> layer.tqmask_channel.show_tqmasked;
+				property >> layer.mask_channel.show_masked;
 				break;
 
 			case PROP_COLOR:
-				property >> layer.tqmask_channel.red >> layer.tqmask_channel.green
-						>> layer.tqmask_channel.blue;
+				property >> layer.mask_channel.red >> layer.mask_channel.green
+						>> layer.mask_channel.blue;
 				break;
 
 			case PROP_TATTOO:
-				property >> layer.tqmask_channel.tattoo;
+				property >> layer.mask_channel.tattoo;
 				break;
 
 			default:
@@ -1059,8 +1059,8 @@ bool XCFImageFormat::loadChannelProperties(TQDataStream& xcf_io, Layer& layer)
 
 
 /*!
- * Copy the bytes from the tile buffer into the tqmask tile TQImage.
- * \param layer layer containing the tile buffer and the tqmask tile matrix.
+ * Copy the bytes from the tile buffer into the mask tile TQImage.
+ * \param layer layer containing the tile buffer and the mask tile matrix.
  * \param i column index of current tile.
  * \param j row index of current tile.
  */
@@ -1070,7 +1070,7 @@ void XCFImageFormat::assignMaskBytes(Layer& layer, uint i, uint j)
 
 	for (int l = 0; l < layer.image_tiles[j][i].height(); l++) {
 		for (int k = 0; k < layer.image_tiles[j][i].width(); k++) {
-			layer.tqmask_tiles[j][i].setPixel(k, l, tile[0]);
+			layer.mask_tiles[j][i].setPixel(k, l, tile[0]);
 			tile += sizeof(QRgb);
 		}
 	}
@@ -1103,7 +1103,7 @@ void XCFImageFormat::assignMaskBytes(Layer& layer, uint i, uint j)
  * the image will not show through if the bottom layer is opaque.
  *
  * For indexed images, translucency is an all or nothing effect.
- * \param xcf_image tqcontains image info and bottom-most layer.
+ * \param xcf_image contains image info and bottom-most layer.
  */
 bool XCFImageFormat::initializeImage(XCFImage& xcf_image)
 {
@@ -1117,7 +1117,7 @@ bool XCFImageFormat::initializeImage(XCFImage& xcf_image)
 				image.create( xcf_image.width, xcf_image.height, 32);
 				if( image.isNull())
 					return false;
-				image.fill(tqRgb(255, 255, 255));
+				image.fill(qRgb(255, 255, 255));
 				break;
 			} // else, fall through to 32-bit representation
 
@@ -1125,7 +1125,7 @@ bool XCFImageFormat::initializeImage(XCFImage& xcf_image)
 			image.create(xcf_image.width, xcf_image.height, 32);
 			if( image.isNull())
 				return false;
-			image.fill(tqRgba(255, 255, 255, 0));
+			image.fill(qRgba(255, 255, 255, 0));
 			// Turning this on prevents fill() from affecting the alpha channel,
 			// by the way.
 			image.setAlphaBuffer(true);
@@ -1145,7 +1145,7 @@ bool XCFImageFormat::initializeImage(XCFImage& xcf_image)
 			image.create(xcf_image.width, xcf_image.height, 32);
 			if( image.isNull())
 				return false;
-			image.fill(tqRgba(255, 255, 255, 0));
+			image.fill(qRgba(255, 255, 255, 0));
 			image.setAlphaBuffer(true);
 			break;
 
@@ -1157,7 +1157,7 @@ bool XCFImageFormat::initializeImage(XCFImage& xcf_image)
 			// individual colors.
 
 			// Note: Qt treats a bitmap with a Black and White color palette
-			// as a tqmask, so only the "on" bits are drawn, regardless of the
+			// as a mask, so only the "on" bits are drawn, regardless of the
 			// order color table entries. Otherwise (i.e., at least one of the
 			// color table entries is not black or white), it obeys the one-
 			// or two-color palette. Have to ask about this...
@@ -1187,7 +1187,7 @@ bool XCFImageFormat::initializeImage(XCFImage& xcf_image)
 				xcf_image.num_colors++;
 				xcf_image.palette.resize(xcf_image.num_colors);
 				xcf_image.palette[1] = xcf_image.palette[0];
-				xcf_image.palette[0] = tqRgba(255, 255, 255, 0);
+				xcf_image.palette[0] = qRgba(255, 255, 255, 0);
 
 				image.create(xcf_image.width, xcf_image.height,
 						1, xcf_image.num_colors,
@@ -1204,7 +1204,7 @@ bool XCFImageFormat::initializeImage(XCFImage& xcf_image)
 				for (int c = xcf_image.num_colors - 1; c >= 1; c--)
 					xcf_image.palette[c] = xcf_image.palette[c - 1];
 
-				xcf_image.palette[0] = tqRgba(255, 255, 255, 0);
+				xcf_image.palette[0] = qRgba(255, 255, 255, 0);
 				image.create( xcf_image.width, xcf_image.height,
 						8, xcf_image.num_colors);
 				if( image.isNull())
@@ -1219,7 +1219,7 @@ bool XCFImageFormat::initializeImage(XCFImage& xcf_image)
 				image.create(xcf_image.width, xcf_image.height, 32);
 				if( image.isNull())
 					return false;
-				image.fill(tqRgba(255, 255, 255, 0));
+				image.fill(qRgba(255, 255, 255, 0));
 				image.setAlphaBuffer(true);
 			}
 			break;
@@ -1233,8 +1233,8 @@ bool XCFImageFormat::initializeImage(XCFImage& xcf_image)
 
 /*!
  * Copy a layer into an image, taking account of the manifold modes. The
- * contents of the image are tqreplaced.
- * \param xcf_image tqcontains the layer and image to be tqreplaced.
+ * contents of the image are replaced.
+ * \param xcf_image contains the layer and image to be replaced.
  */
 void XCFImageFormat::copyLayerToImage(XCFImage& xcf_image)
 {
@@ -1324,15 +1324,15 @@ void XCFImageFormat::copyRGBToRGB(Layer& layer, uint i, uint j, int k, int l,
 	uchar src_a = layer.opacity;
 
 	if (layer.type == RGBA_GIMAGE)
-		src_a = INT_MULT(src_a, tqAlpha(src));
+		src_a = INT_MULT(src_a, qAlpha(src));
 
-	// Apply the tqmask (if any)
+	// Apply the mask (if any)
 
-	if (layer.apply_tqmask == 1 && layer.tqmask_tiles.size() > j &&
-			layer.tqmask_tiles[j].size() > i)
-		src_a = INT_MULT(src_a, layer.tqmask_tiles[j][i].pixelIndex(k, l));
+	if (layer.apply_mask == 1 && layer.mask_tiles.size() > j &&
+			layer.mask_tiles[j].size() > i)
+		src_a = INT_MULT(src_a, layer.mask_tiles[j][i].pixelIndex(k, l));
 
-	image.setPixel(m, n, tqRgba(src, src_a));
+	image.setPixel(m, n, qRgba(src, src_a));
 }
 
 
@@ -1373,7 +1373,7 @@ void XCFImageFormat::copyGrayToRGB(Layer& layer, uint i, uint j, int k, int l,
 {
 	QRgb src = layer.image_tiles[j][i].pixel(k, l);
 	uchar src_a = layer.opacity;
-	image.setPixel(m, n, tqRgba(src, src_a));
+	image.setPixel(m, n, qRgba(src, src_a));
 }
 
 
@@ -1397,13 +1397,13 @@ void XCFImageFormat::copyGrayAToRGB(Layer& layer, uint i, uint j, int k, int l,
 	uchar src_a = layer.alpha_tiles[j][i].pixelIndex(k, l);
 	src_a = INT_MULT(src_a, layer.opacity);
 
-	// Apply the tqmask (if any)
+	// Apply the mask (if any)
 
-	if (layer.apply_tqmask == 1 && layer.tqmask_tiles.size() > j &&
-			layer.tqmask_tiles[j].size() > i)
-		src_a = INT_MULT(src_a, layer.tqmask_tiles[j][i].pixelIndex(k, l));
+	if (layer.apply_mask == 1 && layer.mask_tiles.size() > j &&
+			layer.mask_tiles[j].size() > i)
+		src_a = INT_MULT(src_a, layer.mask_tiles[j][i].pixelIndex(k, l));
 
-	image.setPixel(m, n, tqRgba(src, src_a));
+	image.setPixel(m, n, qRgba(src, src_a));
 }
 
 
@@ -1444,10 +1444,10 @@ void XCFImageFormat::copyIndexedAToIndexed(Layer& layer, uint i, uint j, int k,
 	uchar src_a = layer.alpha_tiles[j][i].pixelIndex(k, l);
 	src_a = INT_MULT(src_a, layer.opacity);
 
-	if (layer.apply_tqmask == 1 &&
-			layer.tqmask_tiles.size() > j &&
-			layer.tqmask_tiles[j].size() > i)
-		src_a = INT_MULT(src_a, layer.tqmask_tiles[j][i].pixelIndex(k, l));
+	if (layer.apply_mask == 1 &&
+			layer.mask_tiles.size() > j &&
+			layer.mask_tiles[j].size() > i)
+		src_a = INT_MULT(src_a, layer.mask_tiles[j][i].pixelIndex(k, l));
 
 	if (src_a > 127)
 		src++;
@@ -1478,10 +1478,10 @@ void XCFImageFormat::copyIndexedAToRGB(Layer& layer, uint i, uint j, int k, int
 	uchar src_a = layer.alpha_tiles[j][i].pixelIndex(k, l);
 	src_a = INT_MULT(src_a, layer.opacity);
 
-	// Apply the tqmask (if any)
-	if (layer.apply_tqmask == 1 && layer.tqmask_tiles.size() > j &&
-			layer.tqmask_tiles[j].size() > i)
-		src_a = INT_MULT(src_a, layer.tqmask_tiles[j][i].pixelIndex(k, l));
+	// Apply the mask (if any)
+	if (layer.apply_mask == 1 && layer.mask_tiles.size() > j &&
+			layer.mask_tiles[j].size() > i)
+		src_a = INT_MULT(src_a, layer.mask_tiles[j][i].pixelIndex(k, l));
 
 	// This is what appears in the GIMP window
 	if (src_a <= 127)
@@ -1489,13 +1489,13 @@ void XCFImageFormat::copyIndexedAToRGB(Layer& layer, uint i, uint j, int k, int
 	else
 		src_a = OPAQUE_OPACITY;
 
-	image.setPixel(m, n, tqRgba(src, src_a));
+	image.setPixel(m, n, qRgba(src, src_a));
 }
 
 
 /*!
  * Merge a layer into an image, taking account of the manifold modes.
- * \param xcf_image tqcontains the layer and image to merge.
+ * \param xcf_image contains the layer and image to merge.
  */
 void XCFImageFormat::mergeLayerIntoImage(XCFImage& xcf_image)
 {
@@ -1586,15 +1586,15 @@ void XCFImageFormat::mergeRGBToRGB(Layer& layer, uint i, uint j, int k, int l,
 	QRgb src = layer.image_tiles[j][i].pixel(k, l);
 	QRgb dst = image.pixel(m, n);
 
-	uchar src_r = tqRed(src);
-	uchar src_g = tqGreen(src);
-	uchar src_b = tqBlue(src);
-	uchar src_a = tqAlpha(src);
+	uchar src_r = qRed(src);
+	uchar src_g = qGreen(src);
+	uchar src_b = qBlue(src);
+	uchar src_a = qAlpha(src);
 
-	uchar dst_r = tqRed(dst);
-	uchar dst_g = tqGreen(dst);
-	uchar dst_b = tqBlue(dst);
-	uchar dst_a = tqAlpha(dst);
+	uchar dst_r = qRed(dst);
+	uchar dst_g = qGreen(dst);
+	uchar dst_b = qBlue(dst);
+	uchar dst_a = qAlpha(dst);
 
 	switch (layer.mode) {
 		case MULTIPLY_MODE: {
@@ -1737,11 +1737,11 @@ void XCFImageFormat::mergeRGBToRGB(Layer& layer, uint i, uint j, int k, int l,
 
 	src_a = INT_MULT(src_a, layer.opacity);
 
-	// Apply the tqmask (if any)
+	// Apply the mask (if any)
 
-	if (layer.apply_tqmask == 1 && layer.tqmask_tiles.size() > j &&
-			layer.tqmask_tiles[j].size() > i)
-		src_a = INT_MULT(src_a, layer.tqmask_tiles[j][i].pixelIndex(k, l));
+	if (layer.apply_mask == 1 && layer.mask_tiles.size() > j &&
+			layer.mask_tiles[j].size() > i)
+		src_a = INT_MULT(src_a, layer.mask_tiles[j][i].pixelIndex(k, l));
 
 	uchar new_r, new_g, new_b, new_a;
 	new_a = dst_a + INT_MULT(OPAQUE_OPACITY - dst_a, src_a);
@@ -1756,7 +1756,7 @@ void XCFImageFormat::mergeRGBToRGB(Layer& layer, uint i, uint j, int k, int l,
 	if (!layer_modes[layer.mode].affect_alpha)
 		new_a = dst_a;
 
-	image.setPixel(m, n, tqRgba(new_r, new_g, new_b, new_a));
+	image.setPixel(m, n, qRgba(new_r, new_g, new_b, new_a));
 }
 
 
@@ -1793,7 +1793,7 @@ void XCFImageFormat::mergeGrayToGray(Layer& layer, uint i, uint j, int k, int l,
 void XCFImageFormat::mergeGrayAToGray(Layer& layer, uint i, uint j, int k, int l,
 		TQImage& image, int m, int n)
 {
-	int src = tqGray(layer.image_tiles[j][i].pixel(k, l));
+	int src = qGray(layer.image_tiles[j][i].pixel(k, l));
 	int dst = image.pixelIndex(m, n);
 
 	uchar src_a = layer.alpha_tiles[j][i].pixelIndex(k, l);
@@ -1839,11 +1839,11 @@ void XCFImageFormat::mergeGrayAToGray(Layer& layer, uint i, uint j, int k, int l
 
 	src_a = INT_MULT(src_a, layer.opacity);
 
-	// Apply the tqmask (if any)
+	// Apply the mask (if any)
 
-	if (layer.apply_tqmask == 1 && layer.tqmask_tiles.size() > j &&
-			layer.tqmask_tiles[j].size() > i)
-		src_a = INT_MULT(src_a, layer.tqmask_tiles[j][i].pixelIndex(k, l));
+	if (layer.apply_mask == 1 && layer.mask_tiles.size() > j &&
+			layer.mask_tiles[j].size() > i)
+		src_a = INT_MULT(src_a, layer.mask_tiles[j][i].pixelIndex(k, l));
 
 	uchar new_a = OPAQUE_OPACITY;
 
@@ -1874,7 +1874,7 @@ void XCFImageFormat::mergeGrayToRGB(Layer& layer, uint i, uint j, int k, int l,
 {
 	QRgb src = layer.image_tiles[j][i].pixel(k, l);
 	uchar src_a = layer.opacity;
-	image.setPixel(m, n, tqRgba(src, src_a));
+	image.setPixel(m, n, qRgba(src, src_a));
 }
 
 
@@ -1894,11 +1894,11 @@ void XCFImageFormat::mergeGrayToRGB(Layer& layer, uint i, uint j, int k, int l,
 void XCFImageFormat::mergeGrayAToRGB(Layer& layer, uint i, uint j, int k, int l,
 		TQImage& image, int m, int n)
 {
-	int src = tqGray(layer.image_tiles[j][i].pixel(k, l));
-	int dst = tqGray(image.pixel(m, n));
+	int src = qGray(layer.image_tiles[j][i].pixel(k, l));
+	int dst = qGray(image.pixel(m, n));
 
 	uchar src_a = layer.alpha_tiles[j][i].pixelIndex(k, l);
-	uchar dst_a = tqAlpha(image.pixel(m, n));
+	uchar dst_a = qAlpha(image.pixel(m, n));
 
 	switch (layer.mode) {
 		case MULTIPLY_MODE: {
@@ -1950,10 +1950,10 @@ void XCFImageFormat::mergeGrayAToRGB(Layer& layer, uint i, uint j, int k, int l,
 
 	src_a = INT_MULT(src_a, layer.opacity);
 
-	// Apply the tqmask (if any)
-	if (layer.apply_tqmask == 1 && layer.tqmask_tiles.size() > j &&
-			layer.tqmask_tiles[j].size() > i)
-		src_a = INT_MULT(src_a, layer.tqmask_tiles[j][i].pixelIndex(k, l));
+	// Apply the mask (if any)
+	if (layer.apply_mask == 1 && layer.mask_tiles.size() > j &&
+			layer.mask_tiles[j].size() > i)
+		src_a = INT_MULT(src_a, layer.mask_tiles[j][i].pixelIndex(k, l));
 
 	uchar new_a = dst_a + INT_MULT(OPAQUE_OPACITY - dst_a, src_a);
 
@@ -1965,7 +1965,7 @@ void XCFImageFormat::mergeGrayAToRGB(Layer& layer, uint i, uint j, int k, int l,
 	if (!layer_modes[layer.mode].affect_alpha)
 		new_a = dst_a;
 
-	image.setPixel(m, n, tqRgba(new_g, new_g, new_g, new_a));
+	image.setPixel(m, n, qRgba(new_g, new_g, new_g, new_a));
 }
 
 
@@ -2006,10 +2006,10 @@ void XCFImageFormat::mergeIndexedAToIndexed(Layer& layer, uint i, uint j, int k,
 	uchar src_a = layer.alpha_tiles[j][i].pixelIndex(k, l);
 	src_a = INT_MULT( src_a, layer.opacity );
 
-	if ( layer.apply_tqmask == 1 &&
-			layer.tqmask_tiles.size() > j &&
-			layer.tqmask_tiles[j].size() > i)
-		src_a = INT_MULT(src_a, layer.tqmask_tiles[j][i].pixelIndex(k, l));
+	if ( layer.apply_mask == 1 &&
+			layer.mask_tiles.size() > j &&
+			layer.mask_tiles[j].size() > i)
+		src_a = INT_MULT(src_a, layer.mask_tiles[j][i].pixelIndex(k, l));
 
 	if (src_a > 127) {
 		src++;
@@ -2038,10 +2038,10 @@ void XCFImageFormat::mergeIndexedAToRGB(Layer& layer, uint i, uint j, int k, int
 	uchar src_a = layer.alpha_tiles[j][i].pixelIndex(k, l);
 	src_a = INT_MULT(src_a, layer.opacity);
 
-	// Apply the tqmask (if any)
-	if (layer.apply_tqmask == 1 && layer.tqmask_tiles.size() > j &&
-			layer.tqmask_tiles[j].size() > i)
-		src_a = INT_MULT(src_a, layer.tqmask_tiles[j][i].pixelIndex(k, l));
+	// Apply the mask (if any)
+	if (layer.apply_mask == 1 && layer.mask_tiles.size() > j &&
+			layer.mask_tiles[j].size() > i)
+		src_a = INT_MULT(src_a, layer.mask_tiles[j][i].pixelIndex(k, l));
 
 	// This is what appears in the GIMP window
 	if (src_a <= 127)
@@ -2049,7 +2049,7 @@ void XCFImageFormat::mergeIndexedAToRGB(Layer& layer, uint i, uint j, int k, int
 	else
 		src_a = OPAQUE_OPACITY;
 
-	image.setPixel(m, n, tqRgba(src, src_a));
+	image.setPixel(m, n, qRgba(src, src_a));
 }
 
 
@@ -2075,8 +2075,8 @@ void XCFImageFormat::dissolveRGBPixels ( TQImage& image, int x, int y )
 			int rand_val = rand() & 0xff;
 			QRgb pixel = image.pixel(k, l);
 
-			if (rand_val > tqAlpha(pixel)) {
-				image.setPixel(k, l, tqRgba(pixel, 0));
+			if (rand_val > qAlpha(pixel)) {
+				image.setPixel(k, l, qRgba(pixel, 0));
 			}
 		}
 	}
diff --git a/kimgio/xcf.h b/kimgio/xcf.h
index 4fa9c72ec..3e92f27c2 100644
--- a/kimgio/xcf.h
+++ b/kimgio/xcf.h
@@ -64,12 +64,12 @@ private:
 	 */
 	class Layer {
 	public:
-		TQ_UINT32 width;			//!< Width of the layer
-		TQ_UINT32 height;		//!< Height of the layer
-		TQ_INT32 type;			//!< Type of the layer (GimpImageType)
+		Q_UINT32 width;			//!< Width of the layer
+		Q_UINT32 height;		//!< Height of the layer
+		Q_INT32 type;			//!< Type of the layer (GimpImageType)
 		char* name;			//!< Name of the layer
-		TQ_UINT32 hierarchy_offset;	//!< File position of Tile hierarchy
-		TQ_UINT32 tqmask_offset;		//!< File position of tqmask image
+		Q_UINT32 hierarchy_offset;	//!< File position of Tile hierarchy
+		Q_UINT32 mask_offset;		//!< File position of mask image
 
 		uint nrows;			//!< Number of rows of tiles (y direction)
 		uint ncols;			//!< Number of columns of tiles (x direction)
@@ -78,36 +78,36 @@ private:
 		//! For Grayscale and Indexed images, the alpha channel is stored
 		//! separately (in this data structure, anyway).
 		Tiles alpha_tiles;
-		Tiles tqmask_tiles;		//!< The layer tqmask (optional)
+		Tiles mask_tiles;		//!< The layer mask (optional)
 
-		//! Additional information about a layer tqmask.
+		//! Additional information about a layer mask.
 		struct {
-			TQ_UINT32 opacity;
-			TQ_UINT32 visible;
-			TQ_UINT32 show_tqmasked;
+			Q_UINT32 opacity;
+			Q_UINT32 visible;
+			Q_UINT32 show_masked;
 			uchar red, green, blue;
-			TQ_UINT32 tattoo;
-		} tqmask_channel;
+			Q_UINT32 tattoo;
+		} mask_channel;
 
 		bool active;			//!< Is this layer the active layer?
-		TQ_UINT32 opacity;		//!< The opacity of the layer
-		TQ_UINT32 visible;		//!< Is the layer visible?
-		TQ_UINT32 linked;		//!< Is this layer linked (geometrically)
-		TQ_UINT32 preserve_transparency; //!< Preserve alpha when drawing on layer?
-		TQ_UINT32 apply_tqmask;		//!< Apply the layer tqmask?
-		TQ_UINT32 edit_tqmask;		//!< Is the layer tqmask the being edited?
-		TQ_UINT32 show_tqmask;		//!< Show the layer tqmask rather than the image?
-		TQ_INT32 x_offset;		//!< x offset of the layer relative to the image
-		TQ_INT32 y_offset;		//!< y offset of the layer relative to the image
-		TQ_UINT32 mode;			//!< Combining mode of layer (LayerModeEffects)
-		TQ_UINT32 tattoo;		//!< (unique identifier?)
+		Q_UINT32 opacity;		//!< The opacity of the layer
+		Q_UINT32 visible;		//!< Is the layer visible?
+		Q_UINT32 linked;		//!< Is this layer linked (geometrically)
+		Q_UINT32 preserve_transparency; //!< Preserve alpha when drawing on layer?
+		Q_UINT32 apply_mask;		//!< Apply the layer mask?
+		Q_UINT32 edit_mask;		//!< Is the layer mask the being edited?
+		Q_UINT32 show_mask;		//!< Show the layer mask rather than the image?
+		Q_INT32 x_offset;		//!< x offset of the layer relative to the image
+		Q_INT32 y_offset;		//!< y offset of the layer relative to the image
+		Q_UINT32 mode;			//!< Combining mode of layer (LayerModeEffects)
+		Q_UINT32 tattoo;		//!< (unique identifier?)
 
 		//! As each tile is read from the file, it is buffered here.
 		uchar tile[TILE_WIDTH * TILE_HEIGHT * sizeof(QRgb)];
 
 		//! The data from tile buffer is copied to the Tile by this
 		//! method.  Depending on the type of the tile (RGB, Grayscale,
-		//! Indexed) and use (image or tqmask), the bytes in the buffer are
+		//! Indexed) and use (image or mask), the bytes in the buffer are
 		//! copied in different ways.
 		void (*assignBytes)(Layer& layer, uint i, uint j);
 
@@ -117,21 +117,21 @@ private:
 
 
 	/*!
-	 * The in-memory representation of the XCF Image. It tqcontains a few
+	 * The in-memory representation of the XCF Image. It contains a few
 	 * metadata items, but is mostly a container for the layer information.
 	 */
 	class XCFImage {
 	public:
-		TQ_UINT32 width;			//!< width of the XCF image
-		TQ_UINT32 height;		//!< height of the XCF image
-		TQ_INT32 type;			//!< type of the XCF image (GimpImageBaseType)
+		Q_UINT32 width;			//!< width of the XCF image
+		Q_UINT32 height;		//!< height of the XCF image
+		Q_INT32 type;			//!< type of the XCF image (GimpImageBaseType)
 
-		TQ_UINT8 compression;		//!< tile compression method (CompressionType)
+		Q_UINT8 compression;		//!< tile compression method (CompressionType)
 		float x_resolution;		//!< x resolution in dots per inch
 		float y_resolution;		//!< y resolution in dots per inch
-		TQ_INT32 tattoo;			//!< (unique identifier?)
-		TQ_UINT32 unit;			//!< Units of The GIMP (inch, mm, pica, etc...)
-		TQ_INT32 num_colors;		//!< number of colors in an indexed image
+		Q_INT32 tattoo;			//!< (unique identifier?)
+		Q_UINT32 unit;			//!< Units of The GIMP (inch, mm, pica, etc...)
+		Q_INT32 num_colors;		//!< number of colors in an indexed image
 		TQValueVector<QRgb> palette;	//!< indexed image color palette
 
 		int num_layers;			//!< number of layers
@@ -146,7 +146,7 @@ private:
 
 	//! In layer DISSOLVE mode, a random number is chosen to compare to a
 	//! pixel's alpha. If the alpha is greater than the random number, the
-	//! pixel is drawn. This table merely tqcontains the random number seeds
+	//! pixel is drawn. This table merely contains the random number seeds
 	//! for each ROW of an image. Therefore, the random numbers chosen
 	//! are consistent from run to run.
 	static int random_table[RANDOM_TABLE_SIZE];
@@ -182,13 +182,13 @@ private:
 	void setPalette(XCFImage& xcf_image, TQImage& image);
 	static void assignImageBytes(Layer& layer, uint i, uint j);
 	bool loadHierarchy(TQDataStream& xcf_io, Layer& layer);
-	bool loadLevel(TQDataStream& xcf_io, Layer& layer, TQ_INT32 bpp);
+	bool loadLevel(TQDataStream& xcf_io, Layer& layer, Q_INT32 bpp);
 	static void assignMaskBytes(Layer& layer, uint i, uint j);
 	bool loadMask(TQDataStream& xcf_io, Layer& layer);
 	bool loadChannelProperties(TQDataStream& xcf_io, Layer& layer);
 	bool initializeImage(XCFImage& xcf_image);
 	bool loadTileRLE(TQDataStream& xcf_io, uchar* tile, int size,
-			int data_length, TQ_INT32 bpp);
+			int data_length, Q_INT32 bpp);
 	static void copyLayerToImage(XCFImage& xcf_image);
 	static void copyRGBToRGB(Layer& layer, uint i, uint j, int k, int l,
 			TQImage& image, int m, int n);
diff --git a/kimgio/xview.cpp b/kimgio/xview.cpp
index f6391eb85..746ddc6bc 100644
--- a/kimgio/xview.cpp
+++ b/kimgio/xview.cpp
@@ -84,7 +84,7 @@ KDE_EXPORT void kimgio_xv_read( TQImageIO *_imageio )
 		r =  rg_255_7[((j >> 5) & 0x07)];
 		g =  rg_255_7[((j >> 2) & 0x07)];
 		b =  b_255_3[((j >> 0) & 0x03)];
-		image.setColor( j, tqRgb( r, g, b ) );
+		image.setColor( j, qRgb( r, g, b ) );
 	}
 
 	for ( int py = 0; py < y; py++ )
@@ -145,17 +145,17 @@ KDE_EXPORT void kimgio_xv_write( TQImageIO *imageio )
 			if ( image.depth() == 32 )
 			{
 				QRgb *data32 = (QRgb*) data;
-				r = tqRed( *data32 ) >> 5;
-				g = tqGreen( *data32 ) >> 5;		
-				b = tqBlue( *data32 ) >> 6;
+				r = qRed( *data32 ) >> 5;
+				g = qGreen( *data32 ) >> 5;		
+				b = qBlue( *data32 ) >> 6;
 				data += sizeof( QRgb );
 			}
 			else 
 			{
 				QRgb color = image.color( *data );
-				r = tqRed( color ) >> 5;
-				g = tqGreen( color ) >> 5;		
-				b = tqBlue( color ) >> 6;
+				r = qRed( color ) >> 5;
+				g = qGreen( color ) >> 5;		
+				b = qBlue( color ) >> 6;
 				data++;
 			}
 			buffer[ px ] = ( r << 5 ) | ( g << 2 ) | b;
diff --git a/kinit/autostart.cpp b/kinit/autostart.cpp
index 9647727f2..8c54a255c 100644
--- a/kinit/autostart.cpp
+++ b/kinit/autostart.cpp
@@ -82,10 +82,10 @@ void AutoStart::setPhaseDone()
 
 static TQString extractName(TQString path)
 {
-  int i = path.tqfindRev('/');
+  int i = path.findRev('/');
   if (i >= 0)
      path = path.mid(i+1);
-  i = path.tqfindRev('.');
+  i = path.findRev('.');
   if (i >= 0)
      path = path.left(i);
   return path;
@@ -141,14 +141,14 @@ AutoStart::loadAutoStartList()
                // Same local file name?
                TQString localOuter;
                TQString localInner;
-               int slashPos = (*it).tqfindRev( '/', -1, TRUE );
+               int slashPos = (*it).findRev( '/', -1, TRUE );
                if (slashPos == -1) {
                    localOuter = (*it);
                }
                else {
                    localOuter = (*it).mid(slashPos+1);
                }
-               slashPos = (*localit).tqfindRev( '/', -1, TRUE );
+               slashPos = (*localit).findRev( '/', -1, TRUE );
                if (slashPos == -1) {
                    localInner = (*localit);
                }
@@ -172,23 +172,23 @@ AutoStart::loadAutoStartList()
 
        if (config.hasKey("OnlyShowIn"))
        {
-          if (!config.readListEntry("OnlyShowIn", ';').tqcontains("KDE"))
+          if (!config.readListEntry("OnlyShowIn", ';').contains("KDE"))
               continue;
        }
        if (config.hasKey("NotShowIn"))
        {
-           if (config.readListEntry("NotShowIn", ';').tqcontains("KDE"))
+           if (config.readListEntry("NotShowIn", ';').contains("KDE"))
                continue;
        }
        
        if (config.hasKey("OnlyShowIn"))
        {
-          if (!config.readListEntry("OnlyShowIn", ';').tqcontains("KDE"))
+          if (!config.readListEntry("OnlyShowIn", ';').contains("KDE"))
               continue;
        }
        if (config.hasKey("NotShowIn"))
        {
-           if (config.readListEntry("NotShowIn", ';').tqcontains("KDE"))
+           if (config.readListEntry("NotShowIn", ';').contains("KDE"))
                continue;
        }
 
diff --git a/kinit/configure.in.in b/kinit/configure.in.in
index 81504da15..2ba692872 100644
--- a/kinit/configure.in.in
+++ b/kinit/configure.in.in
@@ -3,7 +3,7 @@ dnl check if Qt is linked against Xft
 KDE_CHECK_LIB(qt-mt,XftInit,[],[KDEINIT_USE_XFT=])
 
 dnl Xft requires freetype to compile
-KDE_FIND_PATH(fontconfig-config, FONTCONFIG_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [ KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [AC_MSG_WARN([Could not tqfind neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ ])
+KDE_FIND_PATH(fontconfig-config, FONTCONFIG_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [ KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [AC_MSG_WARN([Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ ])
 ])
 ])
 
diff --git a/kinit/kdostartupconfig.cpp b/kinit/kdostartupconfig.cpp
index 48daebbc3..b9885453b 100644
--- a/kinit/kdostartupconfig.cpp
+++ b/kinit/kdostartupconfig.cpp
@@ -105,10 +105,10 @@ int main()
                 {
                 TQString key = it.key();
                 TQString value = *it;
-                startupconfig << file.tqreplace( ' ', '_' ).lower()
-                    << "_" << group.tqreplace( ' ', '_' ).lower()
-                    << "_" << key.tqreplace( ' ', '_' ).lower()
-                    << "=\"" << value.tqreplace( "\"", "\\\"" ) << "\"\n";
+                startupconfig << file.replace( ' ', '_' ).lower()
+                    << "_" << group.replace( ' ', '_' ).lower()
+                    << "_" << key.replace( ' ', '_' ).lower()
+                    << "=\"" << value.replace( "\"", "\\\"" ) << "\"\n";
                 }
             }
         else
@@ -119,10 +119,10 @@ int main()
             cfg.setGroup( group );
             TQString value = cfg.readEntry( key, def );
             startupconfig << "# " << line << "\n";
-            startupconfig << file.tqreplace( ' ', '_' ).lower()
-                << "_" << group.tqreplace( ' ', '_' ).lower()
-                << "_" << key.tqreplace( ' ', '_' ).lower()
-                << "=\"" << value.tqreplace( "\"", "\\\"" ) << "\"\n";
+            startupconfig << file.replace( ' ', '_' ).lower()
+                << "_" << group.replace( ' ', '_' ).lower()
+                << "_" << key.replace( ' ', '_' ).lower()
+                << "=\"" << value.replace( "\"", "\\\"" ) << "\"\n";
             }
         startupconfigfiles << line << endl;
         // use even currently non-existing paths in $KDEDIRS
diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp
index 94ca0fede..f34a6a219 100644
--- a/kinit/kinit.cpp
+++ b/kinit/kinit.cpp
@@ -370,7 +370,7 @@ TQCString execpath_avoid_loops( const TQCString& exec, int envc, const char* env
          s_instance->dirs()->findExe( exec, paths.join( TQString( ":" ))));
      if( avoid_loops && !execpath.isEmpty())
      {
-         int pos = execpath.tqfindRev( '/' );
+         int pos = execpath.findRev( '/' );
          TQString bin_path = execpath.left( pos );
          for( TQStringList::Iterator it = paths.begin();
               it != paths.end();
@@ -456,7 +456,7 @@ static pid_t launch(int argc, const char *_name, const char *args,
   {
      lib = _name;
      name = _name;
-     name = name.mid( name.tqfindRev('/') + 1);
+     name = name.mid( name.findRev('/') + 1);
      exec = _name;
      if (lib.right(3) == ".la")
         libpath = lib;
@@ -535,7 +535,7 @@ static pid_t launch(int argc, const char *_name, const char *args,
               ++it )
          {
              TQCString tmp( it.current());
-             int pos = tmp.tqfind( '=' );
+             int pos = tmp.find( '=' );
              if( pos >= 0 )
                  unsetenv( tmp.left( pos ));
          }
@@ -586,7 +586,7 @@ static pid_t launch(int argc, const char *_name, const char *args,
      d.handle = 0;
      if (libpath.isEmpty() && execpath.isEmpty())
      {
-        TQString errorMsg = i18n("Could not tqfind '%1' executable.").arg(TQFile::decodeName(_name));
+        TQString errorMsg = i18n("Could not find '%1' executable.").arg(TQFile::decodeName(_name));
         exitWithErrorMsg(errorMsg);
      }
 
@@ -644,8 +644,8 @@ static pid_t launch(int argc, const char *_name, const char *args,
            if (!d.sym )
            {
               const char * ltdlError = lt_dlerror();
-              fprintf(stderr, "Could not tqfind kdemain: %s\n", ltdlError != 0 ? ltdlError : "(null)" );
-              TQString errorMsg = i18n("Could not tqfind 'kdemain' in '%1'.\n%2").arg(libpath)
+              fprintf(stderr, "Could not find kdemain: %s\n", ltdlError != 0 ? ltdlError : "(null)" );
+              TQString errorMsg = i18n("Could not find 'kdemain' in '%1'.\n%2").arg(libpath)
                  .arg(ltdlError ? TQFile::decodeName(ltdlError) : i18n("Unknown error"));
               exitWithErrorMsg(errorMsg);
            }
@@ -1477,16 +1477,16 @@ static void kdeinit_library_path()
         it++)
    {
       TQString d = *it;
-      if (ltdl_library_path.tqcontains(d))
+      if (ltdl_library_path.contains(d))
           continue;
-      if (ld_library_path.tqcontains(d))
+      if (ld_library_path.contains(d))
           continue;
       if (d[d.length()-1] == '/')
       {
          d.truncate(d.length()-1);
-         if (ltdl_library_path.tqcontains(d))
+         if (ltdl_library_path.contains(d))
             continue;
-         if (ld_library_path.tqcontains(d))
+         if (ld_library_path.contains(d))
             continue;
       }
       if ((d == "/lib") || (d == "/usr/lib"))
@@ -1517,7 +1517,7 @@ static void kdeinit_library_path()
      exit(255);
    }
    int i;
-   if((i = display.tqfindRev('.')) > display.tqfindRev(':') && i >= 0)
+   if((i = display.findRev('.')) > display.findRev(':') && i >= 0)
      display.truncate(i);
 
    TQCString socketName = TQFile::encodeName(locateLocal("socket", TQString("kdeinit-%1").arg(display), s_instance));
@@ -1529,7 +1529,7 @@ static void kdeinit_library_path()
    }
    strcpy(sock_file_old, socketName.data());
 
-   display.tqreplace(":","_");
+   display.replace(":","_");
    socketName = TQFile::encodeName(locateLocal("socket", TQString("kdeinit_%1").arg(display), s_instance));
    if (socketName.length() >= MAX_SOCK_FILE)
    {
diff --git a/kinit/kioslave.cpp b/kinit/kioslave.cpp
index e4843338a..215f53c67 100644
--- a/kinit/kioslave.cpp
+++ b/kinit/kioslave.cpp
@@ -82,7 +82,7 @@ int main(int argc, char **argv)
         if (!sym )
         {
            const char * ltdlError = lt_dlerror();
-           fprintf(stderr, "Could not tqfind main: %s\n", ltdlError != 0 ? ltdlError : "(null)" );
+           fprintf(stderr, "Could not find main: %s\n", ltdlError != 0 ? ltdlError : "(null)" );
            exit(1);
         }
      }
diff --git a/kinit/klauncher.cpp b/kinit/klauncher.cpp
index a4d5eb041..2b49a0ac8 100644
--- a/kinit/klauncher.cpp
+++ b/kinit/klauncher.cpp
@@ -102,7 +102,7 @@ IdleSlave::gotInput()
       pid_t pid;
       TQCString protocol;
       TQString host;
-      TQ_INT8 b;
+      Q_INT8 b;
       stream >> pid >> protocol >> host >> b;
 // Overload with (bool) onHold, (KURL) url.
       if (!stream.atEnd())
@@ -181,7 +181,7 @@ KLauncher::KLauncher(int _kdeinitSocket, bool new_startup)
                                     objId(), "terminateKDE()", false );
 
    TQString prefix = locateLocal("socket", "klauncher");
-   KTempFile domainname(prefix, TQString::tqfromLatin1(".slave-socket"));
+   KTempFile domainname(prefix, TQString::fromLatin1(".slave-socket"));
    if (domainname.status() != 0)
    {
       // Sever error!
@@ -722,7 +722,7 @@ KLauncher::slotAutoStart()
       s = new KService(service);
    }
    while (!start_service(s, TQStringList(), TQValueList<TQCString>(), "0", false, true));
-   // Loop till we tqfind a service that we can start.
+   // Loop till we find a service that we can start.
 }
 
 void
@@ -892,7 +892,7 @@ KLauncher::exec_blind( const TQCString &name, const TQValueList<TQCString> &arg_
    request->transaction = 0; // No confirmation is send
    request->envs = envs;
    // Find service, if any - strip path if needed
-   KService::Ptr service = KService::serviceByDesktopName( name.mid( name.tqfindRev( '/' ) + 1 ));
+   KService::Ptr service = KService::serviceByDesktopName( name.mid( name.findRev( '/' ) + 1 ));
    if (service != NULL)
        send_service_startup_info( request,  service,
            startup_id, TQValueList< TQCString >());
@@ -915,7 +915,7 @@ KLauncher::start_service_by_name(const TQString &serviceName, const TQStringList
    if (!service)
    {
       DCOPresult.result = ENOENT;
-      DCOPresult.error = i18n("Could not tqfind service '%1'.").arg(serviceName);
+      DCOPresult.error = i18n("Could not find service '%1'.").arg(serviceName);
       cancel_service_startup_info( NULL, startup_id, envs ); // cancel it if any
       return false;
    }
@@ -940,7 +940,7 @@ KLauncher::start_service_by_desktop_path(const TQString &serviceName, const TQSt
    if (!service)
    {
       DCOPresult.result = ENOENT;
-      DCOPresult.error = i18n("Could not tqfind service '%1'.").arg(serviceName);
+      DCOPresult.error = i18n("Could not find service '%1'.").arg(serviceName);
       cancel_service_startup_info( NULL, startup_id, envs ); // cancel it if any
       return false;
    }
@@ -957,7 +957,7 @@ KLauncher::start_service_by_desktop_name(const TQString &serviceName, const TQSt
    if (!service)
    {
       DCOPresult.result = ENOENT;
-      DCOPresult.error = i18n("Could not tqfind service '%1'.").arg(serviceName);
+      DCOPresult.error = i18n("Could not find service '%1'.").arg(serviceName);
       cancel_service_startup_info( NULL, startup_id, envs ); // cancel it if any
       return false;
    }
@@ -1164,7 +1164,7 @@ KLauncher::kdeinit_exec(const TQString &app, const TQStringList &args,
    if( app != "kbuildsycoca" ) // avoid stupid loop
    {
        // Find service, if any - strip path if needed
-       KService::Ptr service = KService::serviceByDesktopName( app.mid( app.tqfindRev( '/' ) + 1 ));
+       KService::Ptr service = KService::serviceByDesktopName( app.mid( app.findRev( '/' ) + 1 ));
        if (service != NULL)
            send_service_startup_info( request,  service,
                startup_id, TQValueList< TQCString >());
@@ -1359,7 +1359,7 @@ KLauncher::acceptSlave(KSocket *slaveSocket)
     mSlaveList.append(slave);
     connect(slave, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotSlaveGone()));
     connect(slave, TQT_SIGNAL(statusUpdate(IdleSlave *)),
-	    this, TQT_SLOT(slotSlavetqStatus(IdleSlave *)));
+	    this, TQT_SLOT(slotSlaveStatus(IdleSlave *)));
     if (!mTimer.isActive())
     {
        mTimer.start(1000*10);
@@ -1367,7 +1367,7 @@ KLauncher::acceptSlave(KSocket *slaveSocket)
 }
 
 void
-KLauncher::slotSlavetqStatus(IdleSlave *slave)
+KLauncher::slotSlaveStatus(IdleSlave *slave)
 {
     SlaveWaitRequest *waitRequest = mSlaveWaitRequest.first();
     while(waitRequest)
diff --git a/kinit/klauncher.h b/kinit/klauncher.h
index c34a48150..e681939e1 100644
--- a/kinit/klauncher.h
+++ b/kinit/klauncher.h
@@ -39,7 +39,7 @@
 
 #include "autostart.h"
 
-class IdleSlave : public TQObject
+class IdleSlave : public QObject
 {
    Q_OBJECT
 public:
@@ -168,7 +168,7 @@ public slots:
    void slotDequeue();
    void slotKDEInitData(int);
    void slotAppRegistered(const TQCString &appId);
-   void slotSlavetqStatus(IdleSlave *);
+   void slotSlaveStatus(IdleSlave *);
    void acceptSlave( KSocket *);
    void slotSlaveGone();
    void idleTimeout();
diff --git a/kinit/kstartupconfig.cpp b/kinit/kstartupconfig.cpp
index 0e4366cbb..0700f22fc 100644
--- a/kinit/kstartupconfig.cpp
+++ b/kinit/kstartupconfig.cpp
@@ -32,7 +32,7 @@ The configuration options are written to $KDEHOME/share/config/startupconfigkeys
 one option per line, as <file> <group> <key> <default>. It is possible to
 use ' for quoting multiword entries. Values of these options will be written
 to $KDEHOME/share/config/startupconfig as a shell script that will set
-the values to shell variables, named <file>_<group>_<key> (all spaces tqreplaced
+the values to shell variables, named <file>_<group>_<key> (all spaces replaced
 by underscores, everything lowercase). So e.g. line
 "ksplashrc KSplash Theme Default" may result in "ksplashrc_ksplash_theme=Default".
 
diff --git a/kinit/lnusertemp.c b/kinit/lnusertemp.c
index 19851f884..fdbf8ae0b 100644
--- a/kinit/lnusertemp.c
+++ b/kinit/lnusertemp.c
@@ -109,7 +109,7 @@ int build_link(const char *tmp_prefix, const char *kde_prefix, int kdehostname)
   pw_ent = getpwuid(uid);
   if (!pw_ent)
   {
-     fprintf(stderr, "Error: Can not tqfind password entry for uid %d.\n", getuid());
+     fprintf(stderr, "Error: Can not find password entry for uid %d.\n", getuid());
      return 1;
   }
 
diff --git a/kinit/tests/klaunchertest.cpp b/kinit/tests/klaunchertest.cpp
index ff1ae0fd1..c42fdf686 100644
--- a/kinit/tests/klaunchertest.cpp
+++ b/kinit/tests/klaunchertest.cpp
@@ -39,13 +39,13 @@ int main(int argc, char *argv[])
    TQCString dcopService;
    int pid;
    int result = KApplication::startServiceByDesktopName(
-		TQString::tqfromLatin1("konsole"), TQString::null, &error, &dcopService, &pid );
+		TQString::fromLatin1("konsole"), TQString::null, &error, &dcopService, &pid );
 
    printf("Result = %d, error = \"%s\", dcopService = \"%s\", pid = %d\n",
       result, error.ascii(), dcopService.data(), pid);
 
    result = KApplication::startServiceByDesktopName(
-		TQString::tqfromLatin1("konqueror"), TQString::null,  &error, &dcopService, &pid );
+		TQString::fromLatin1("konqueror"), TQString::null,  &error, &dcopService, &pid );
 
    printf("Result = %d, error = \"%s\", dcopService = \"%s\", pid = %d\n",
       result, error.ascii(), dcopService.data(), pid);
diff --git a/kio/DESIGN b/kio/DESIGN
index 6cd25dcbb..30a037c81 100644
--- a/kio/DESIGN
+++ b/kio/DESIGN
@@ -91,7 +91,7 @@ job. (This is a quite unlikely situation, but nevertheless possible))
 
 
 File Operations:
-listRecursive is implemented as listDir and tqfinding out if in the result
+listRecursive is implemented as listDir and finding out if in the result
  is a directory. If there is, another listDir job is issued. As listDir
  is a readonly operation it fails when a directory isn't readable
   .. but the main job goes on and discards the error, because
@@ -99,11 +99,11 @@ bIgnoreSubJobsError is true, which is what we want (David)
 
 del is implemented as listRecursive, removing all files and removing all
  empty directories. This basically means if one directory isn't readable
- we don't remove it as listRecursive didn't tqfind it. But the del will later
+ we don't remove it as listRecursive didn't find it. But the del will later
  on try to remove it's parent directory and fail. But there are cases when
  it would be possible to delete the dir in chmod the dir before. On the
  other hand del("/") shouldn't list the whole file system and remove all
- user owned files just to tqfind out it can't remove everything else (this
+ user owned files just to find out it can't remove everything else (this
  basically means we have to take care of things we can remove before we try)
 
  ... Well, rm -rf / refuses to do anything, so we should just do the same:
@@ -181,7 +181,7 @@ There will be two ways how the application can display progress :
     KMail  :
  - app creates Job
  - app creates a progress dialog : this should be a ProgressBase descendant
-    e.g. tqStatusProgress or custom progress dialog
+    e.g. StatusProgress or custom progress dialog
  - app calls progress->setJob( job ) in order to connect job's signals with
     progress dialog slots
 
@@ -197,7 +197,7 @@ B. customized progress dialogs
  - DefaultProgress ( former KIOSimpleProgressDialog ) that will be used for    
     regular progress dialogs created by GUI Progress Server
 
- - tqStatusProgress ( former KIOLittleProgressDialog ) that can be used for      
+ - StatusProgress ( former KIOLittleProgressDialog ) that can be used for      
     embedding in status bar
 
 C. GUI Progress Server
diff --git a/kio/DESIGN.krun b/kio/DESIGN.krun
index bd7846f9a..948ef79a3 100644
--- a/kio/DESIGN.krun
+++ b/kio/DESIGN.krun
@@ -2,7 +2,7 @@
 konq_run / krun should determine the mimetype by actually
 getting the contents of the URL. It should then put the slave
 on hold and tell the job-scheduler which request the
-slave is currently handling. (tqStatus: implemented in konq_run)
+slave is currently handling. (Status: implemented in konq_run)
 
 Now krun/konq_run should determine which client should process the 
 result of the request.
@@ -10,17 +10,17 @@ result of the request.
 * When the client belongs to the same process, no action needs to be
 taken. When a new job is created for the request which is on hold the
 existing slave will be re-used and the request resumed.
-(tqStatus: implemented)
+(Status: implemented)
 
 * When the client is an external process, the on-hold-slave should be 
 removed from the job-scheduler and should connect itself with
 klauncher. This is hard because it must ensure that the external 
 program does not request the slave before it has been transfered to
-klauncher. (tqStatus: to be done)
+klauncher. (Status: to be done)
 
 * When a slave is on hold but not used for a certain period of time, 
 or, when another slave is put on hold, the slave should be killed.
-(tqStatus: almost done)
+(Status: almost done)
 
 =====
 
diff --git a/kio/Makefile.am b/kio/Makefile.am
index 2ad4dbddc..8349d4038 100644
--- a/kio/Makefile.am
+++ b/kio/Makefile.am
@@ -58,8 +58,8 @@ dummy.cpp:
 	echo >dummy.cpp
 
 messages:
-	$(EXTRACTRC) `tqfind . ../kioslave -name "*.rc" -o -name "*.ui"` > rc.cpp
-	$(XGETTEXT) `tqfind . ../kioslave -name "*.cpp" -o -name "*.cc" -o -name "*.h"` -o $(podir)/kio.pot
+	$(EXTRACTRC) `find . ../kioslave -name "*.rc" -o -name "*.ui"` > rc.cpp
+	$(XGETTEXT) `find . ../kioslave -name "*.cpp" -o -name "*.cc" -o -name "*.h"` -o $(podir)/kio.pot
 	rm -f rc.cpp
 
 DOXYGEN_REFERENCES = kdecore kdefx kjs dcop kdeui kio/kio kio/kfile
diff --git a/kio/bookmarks/dptrtemplate.h b/kio/bookmarks/dptrtemplate.h
index a34f021be..2a69d6a54 100644
--- a/kio/bookmarks/dptrtemplate.h
+++ b/kio/bookmarks/dptrtemplate.h
@@ -34,10 +34,10 @@ public:
             d_ptr = new TQPtrDict<PrivateData>;
             qAddPostRoutine( cleanup_d_ptr );
         }
-        PrivateData* ret = d_ptr->tqfind( (void*) instance );
+        PrivateData* ret = d_ptr->find( (void*) instance );
         if ( ! ret ) {
             ret = new PrivateData;
-            d_ptr->tqreplace( (void*) instance, ret );
+            d_ptr->replace( (void*) instance, ret );
         }
         return ret;
     }
diff --git a/kio/bookmarks/kbookmark.cc b/kio/bookmarks/kbookmark.cc
index a33c24ffc..44b8b496c 100644
--- a/kio/bookmarks/kbookmark.cc
+++ b/kio/bookmarks/kbookmark.cc
@@ -220,7 +220,7 @@ bool KBookmarkGroup::isToolbarGroup() const
     return ( element.attribute("toolbar") == "yes" );
 }
 
-TQDomElement KBookmarkGroup::tqfindToolbar() const
+TQDomElement KBookmarkGroup::findToolbar() const
 {
     if ( element.attribute("toolbar") == "yes" )
         return element;
@@ -234,7 +234,7 @@ TQDomElement KBookmarkGroup::tqfindToolbar() const
                 return e;
             else
             {
-                TQDomElement result = KBookmarkGroup(e).tqfindToolbar();
+                TQDomElement result = KBookmarkGroup(e).findToolbar();
                 if (!result.isNull())
                     return result;
             }
@@ -412,7 +412,7 @@ static TQDomText get_or_create_text(TQDomNode node)
 }
 
 // Look for a metadata with owner="http://www.kde.org" or without any owner (for compatibility)
-static TQDomNode tqfindOrCreateMetadata( TQDomNode& parent )
+static TQDomNode findOrCreateMetadata( TQDomNode& parent )
 {
     static const char kdeOwner[] = "http://www.kde.org";
     TQDomElement metadataElement;
@@ -440,14 +440,14 @@ bool KBookmark::hasMetaData() const
     // It doesn't matter much in practice since it's only called for newly-created bookmarks,
     // which will get metadata soon after anyway.
     TQDomNode n = cd_or_create( internalElement(), "info" );
-    return tqfindOrCreateMetadata( n ).hasChildNodes();
+    return findOrCreateMetadata( n ).hasChildNodes();
 }
 
 void KBookmark::updateAccessMetadata()
 {
     kdDebug(7043) << "KBookmark::updateAccessMetadata " << address() << " " << url().prettyURL() << endl;
 
-    const uint timet = TQDateTime::tqcurrentDateTime().toTime_t();
+    const uint timet = TQDateTime::currentDateTime().toTime_t();
     setMetaDataItem( "time_added", TQString::number( timet ), DontOverwriteMetaData );
     setMetaDataItem( "time_visited", TQString::number( timet ) );
 
@@ -465,7 +465,7 @@ void KBookmark::updateAccessMetadata()
 TQString KBookmark::metaDataItem( const TQString &key ) const
 {
     TQDomNode infoNode = cd_or_create( internalElement(), "info" );
-    infoNode = tqfindOrCreateMetadata( infoNode );
+    infoNode = findOrCreateMetadata( infoNode );
     for ( TQDomNode n = infoNode.firstChild(); !n.isNull(); n = n.nextSibling() ) {
         if ( !n.isElement() ) {
             continue;
@@ -481,7 +481,7 @@ TQString KBookmark::metaDataItem( const TQString &key ) const
 void KBookmark::setMetaDataItem( const TQString &key, const TQString &value, MetaDataOverwriteMode mode )
 {
     TQDomNode infoNode = cd_or_create( internalElement(), "info" );
-    infoNode = tqfindOrCreateMetadata( infoNode );
+    infoNode = findOrCreateMetadata( infoNode );
 
     TQDomNode item = cd_or_create( infoNode, key );
     TQDomText text = get_or_create_text( item );
diff --git a/kio/bookmarks/kbookmark.h b/kio/bookmarks/kbookmark.h
index 06915e141..84f177522 100644
--- a/kio/bookmarks/kbookmark.h
+++ b/kio/bookmarks/kbookmark.h
@@ -130,13 +130,13 @@ public:
      * @return address of parent
      */
     static TQString parentAddress( const TQString & address )
-    { return address.left( address.tqfindRev('/') ); }
+    { return address.left( address.findRev('/') ); }
 
     /**
      * @return position in parent (e.g. /4/5/2 -> 2)
      */
     static uint positionInParent( const TQString & address )
-    { return address.mid( address.tqfindRev('/') + 1 ).toInt(); }
+    { return address.mid( address.findRev('/') + 1 ).toInt(); }
 
     /**
      * @return address of previous sibling (e.g. /4/5/2 -> /4/5/1)
@@ -293,7 +293,7 @@ public:
     /**
      * @internal
      */
-    TQDomElement tqfindToolbar() const;
+    TQDomElement findToolbar() const;
 
     /**
      * @return the list of urls of bookmarks at top level of the group
diff --git a/kio/bookmarks/kbookmarkbar.cc b/kio/bookmarks/kbookmarkbar.cc
index 203e6bf33..ec1e3e670 100644
--- a/kio/bookmarks/kbookmarkbar.cc
+++ b/kio/bookmarks/kbookmarkbar.cc
@@ -192,7 +192,7 @@ void KBookmarkBar::fillBookmarkBar(KBookmarkGroup & parent)
     for (KBookmark bm = parent.first(); !bm.isNull(); bm = parent.next(bm))
     {
         TQString text = bm.text();
-        text.tqreplace( '&', "&&" );
+        text.replace( '&', "&&" );
         if (!bm.isGroup())
         {
             if ( bm.isSeparator() )
@@ -282,7 +282,7 @@ static void removeTempSep(KBookmarkBarPrivate* p)
     }
 }
 
-static KAction* tqfindPluggedAction(TQPtrList<KAction> actions, KToolBar *tb, int id)
+static KAction* findPluggedAction(TQPtrList<KAction> actions, KToolBar *tb, int id)
 {
     TQPtrListIterator<KAction> it( actions );
     for (; (*it); ++it )
@@ -313,7 +313,7 @@ static TQString handleToolbarDragMoveEvent(
     int index = 0;
     KToolBarButton* b;
 
-    b = dynamic_cast<KToolBarButton*>(tb->tqchildAt(pos));
+    b = dynamic_cast<KToolBarButton*>(tb->childAt(pos));
     KAction *a = 0;
     TQString address;
     atFirst = false;
@@ -321,7 +321,7 @@ static TQString handleToolbarDragMoveEvent(
     if (b)
     {
         index = tb->itemIndex(b->id());
-        TQRect r = b->tqgeometry();
+        TQRect r = b->geometry();
         if (pos.x() < ((r.left() + r.right())/2))
         {
             // if in first half of button then
@@ -350,28 +350,28 @@ static TQString handleToolbarDragMoveEvent(
     {
         index = actions.count() - 1;
         b = tb->getButton(tb->idAt(index));
-        // if !b and not past last button, we didn't tqfind button
-        if (pos.x() <= b->tqgeometry().left())
+        // if !b and not past last button, we didn't find button
+        if (pos.x() <= b->geometry().left())
             goto skipact; // TODO - rename
     }
 
     if ( !b )
         return TQString::null; // TODO Make it works for that case
 
-    a = tqfindPluggedAction(actions, tb, b->id());
+    a = findPluggedAction(actions, tb, b->id());
     Q_ASSERT(a);
     address = a->property("address").toString();
     p->m_sepIndex = index + (atFirst ? 0 : 1);
 
 #if 0
     { // ugly workaround to fix the goto scoping problems...
-        KBookmark bk = mgr->tqfindByAddress( address );
+        KBookmark bk = mgr->findByAddress( address );
         if (bk.isGroup()) // TODO - fix this ****!!!, manhatten distance should be used!!!
         {
             kdDebug() << "kbookmarkbar:: popping up " << bk.text() << endl;
             KBookmarkActionMenu *menu = dynamic_cast<KBookmarkActionMenu*>(a);
             Q_ASSERT(menu);
-            menu->popup(tb->mapToGlobal(b->tqgeometry().center()));
+            menu->popup(tb->mapToGlobal(b->geometry().center()));
         }
     }
 #endif
@@ -394,12 +394,12 @@ static KAction* handleToolbarMouseButton(TQPoint pos, TQPtrList<KAction> actions
     Q_ASSERT(tb);
 
     KToolBarButton *b;
-    b = dynamic_cast<KToolBarButton*>(tb->tqchildAt(pos));
+    b = dynamic_cast<KToolBarButton*>(tb->childAt(pos));
     if (!b)
         return 0;
 
     KAction *a = 0;
-    a = tqfindPluggedAction(actions, tb, b->id());
+    a = findPluggedAction(actions, tb, b->id());
     Q_ASSERT(a);
     pt = tb->mapToGlobal(pos);
 
@@ -461,7 +461,7 @@ bool KBookmarkBar::eventFilter( TQObject *o, TQEvent *e )
         if (_a && mev->button() == Qt::RightButton)
         {
             dptr()->m_highlightedAddress = _a->property("address").toString();
-            KBookmark bookmark = m_pManager->tqfindByAddress( dptr()->m_highlightedAddress );
+            KBookmark bookmark = m_pManager->findByAddress( dptr()->m_highlightedAddress );
             RMB::begin_rmb_action(this);
             KPopupMenu *pm = new KPopupMenu;
             rmbSelf(this)->fillContextMenu( pm, dptr()->m_highlightedAddress, 0 );
@@ -471,7 +471,7 @@ bool KBookmarkBar::eventFilter( TQObject *o, TQEvent *e )
             mev->accept();
         }
 
-        return !!_a; // ignore the event if we didn't tqfind the button
+        return !!_a; // ignore the event if we didn't find the button
     }
     else if ( e->type() == TQEvent::DragLeave )
     {
@@ -489,7 +489,7 @@ bool KBookmarkBar::eventFilter( TQObject *o, TQEvent *e )
             kdWarning(7043) << "Sorry, currently you can only drop one address "
                 "onto the bookmark bar!" << endl;
         KBookmark toInsert = list.first();
-        KBookmark bookmark = m_pManager->tqfindByAddress( dptr()->m_dropAddress );
+        KBookmark bookmark = m_pManager->findByAddress( dptr()->m_dropAddress );
         Q_ASSERT(!bookmark.isNull());
         kdDebug(7043) << "inserting "
             << TQString(dptr()->m_atFirst ? "before" : "after")
diff --git a/kio/bookmarks/kbookmarkbar.h b/kio/bookmarks/kbookmarkbar.h
index dd3b1ebed..71c2dcc8c 100644
--- a/kio/bookmarks/kbookmarkbar.h
+++ b/kio/bookmarks/kbookmarkbar.h
@@ -39,7 +39,7 @@ class TQPopupMenu;
  * identical to using KBookmarkMenu so follow the directions
  * there.
  */
-class KIO_EXPORT KBookmarkBar : public TQObject
+class KIO_EXPORT KBookmarkBar : public QObject
 {
     Q_OBJECT
     friend class RMB;
diff --git a/kio/bookmarks/kbookmarkdrag.cc b/kio/bookmarks/kbookmarkdrag.cc
index 358e329a9..d13893eed 100644
--- a/kio/bookmarks/kbookmarkdrag.cc
+++ b/kio/bookmarks/kbookmarkdrag.cc
@@ -54,8 +54,8 @@ KBookmarkDrag::KBookmarkDrag( const TQValueList<KBookmark> & bookmarks, const TQ
     : TQUriDrag( urls, dragSource, name ), m_bookmarks( bookmarks ), m_doc("xbel")
 {
     // We need to create the XML for this drag right now and not
-    // in tqencodedData because when cutting a folder, the children
-    // wouldn't be part of the bookmarks anymore, when tqencodedData
+    // in encodedData because when cutting a folder, the children
+    // wouldn't be part of the bookmarks anymore, when encodedData
     // is requested.
     TQDomElement elem = m_doc.createElement("xbel");
     m_doc.appendChild( elem );
@@ -76,16 +76,16 @@ const char* KBookmarkDrag::format( int i ) const
     else return 0;
 }
 
-TQByteArray KBookmarkDrag::tqencodedData( const char* mime ) const
+TQByteArray KBookmarkDrag::encodedData( const char* mime ) const
 {
     TQByteArray a;
     TQCString mimetype( mime );
     if ( mimetype == "text/uri-list" )
-        return TQUriDrag::tqencodedData( mime );
+        return TQUriDrag::encodedData( mime );
     else if ( mimetype == "application/x-xbel" )
     {
         a = m_doc.toCString();
-        //kdDebug(7043) << "KBookmarkDrag::tqencodedData " << m_doc.toCString() << endl;
+        //kdDebug(7043) << "KBookmarkDrag::encodedData " << m_doc.toCString() << endl;
     }
     else if ( mimetype == "text/plain" )
     {
@@ -117,7 +117,7 @@ TQValueList<KBookmark> KBookmarkDrag::decode( const TQMimeSource * e )
     TQValueList<KBookmark> bookmarks;
     if ( e->provides("application/x-xbel") )
     {
-        TQByteArray s( e->tqencodedData("application/x-xbel") );
+        TQByteArray s( e->encodedData("application/x-xbel") );
         //kdDebug(7043) << "KBookmarkDrag::decode s=" << TQCString(s) << endl;
         TQDomDocument doc;
         doc.setContent( s );
diff --git a/kio/bookmarks/kbookmarkdrag.h b/kio/bookmarks/kbookmarkdrag.h
index acdc9efce..98aa3b881 100644
--- a/kio/bookmarks/kbookmarkdrag.h
+++ b/kio/bookmarks/kbookmarkdrag.h
@@ -43,7 +43,7 @@ public:
     virtual ~KBookmarkDrag() {}
 
     virtual const char* format( int i ) const;
-    virtual TQByteArray tqencodedData( const char* mime ) const;
+    virtual TQByteArray encodedData( const char* mime ) const;
 
     static bool canDecode( const TQMimeSource * e );
     static TQValueList<KBookmark> decode( const TQMimeSource * e );
diff --git a/kio/bookmarks/kbookmarkimporter.h b/kio/bookmarks/kbookmarkimporter.h
index 2fd1925d2..bf8d61137 100644
--- a/kio/bookmarks/kbookmarkimporter.h
+++ b/kio/bookmarks/kbookmarkimporter.h
@@ -34,7 +34,7 @@
  * and KActionMenu uses it to create actions directly.
  * @since 3.2
  */
-class KIO_EXPORT KBookmarkImporterBase : public TQObject
+class KIO_EXPORT KBookmarkImporterBase : public QObject
 {
     Q_OBJECT
 public:
@@ -44,7 +44,7 @@ public:
     void setFilename(const TQString &filename) { m_fileName = filename; }
 
     virtual void parse() = 0;
-    virtual TQString tqfindDefaultLocation(bool forSaving = false) const = 0;
+    virtual TQString findDefaultLocation(bool forSaving = false) const = 0;
 
     // TODO - make this static?
     void setupSignalForwards(TQObject *src, TQObject *dst);
@@ -90,7 +90,7 @@ class KIO_EXPORT KXBELBookmarkImporterImpl : public KBookmarkImporterBase, prote
 public:
     KXBELBookmarkImporterImpl() {}
     virtual void parse();
-    virtual TQString tqfindDefaultLocation(bool = false) const { return TQString::null; }
+    virtual TQString findDefaultLocation(bool = false) const { return TQString::null; }
 protected:
     virtual void visit(const KBookmark &);
     virtual void visitEnter(const KBookmarkGroup &);
diff --git a/kio/bookmarks/kbookmarkimporter_crash.cc b/kio/bookmarks/kbookmarkimporter_crash.cc
index 6e83d9a6b..594dc0239 100644
--- a/kio/bookmarks/kbookmarkimporter_crash.cc
+++ b/kio/bookmarks/kbookmarkimporter_crash.cc
@@ -104,7 +104,7 @@ TQStringList KCrashBookmarkImporterImpl::getCrashLogs()
     {
         TQCString &clientId = *it;
 
-        if ( tqstrncmp(clientId, "konqueror", 9) != 0 ) 
+        if ( qstrncmp(clientId, "konqueror", 9) != 0 ) 
             continue;
 
         TQByteArray data, replyData;
@@ -114,7 +114,7 @@ TQStringList KCrashBookmarkImporterImpl::getCrashLogs()
         if ( !dcop->call( clientId.data(), "KonquerorIface", 
                           "crashLogFile()", data, replyType, replyData) ) 
         {
-            kdWarning() << "can't tqfind dcop function KonquerorIface::crashLogFile()" << endl;
+            kdWarning() << "can't find dcop function KonquerorIface::crashLogFile()" << endl;
             continue;
         }
 
@@ -127,7 +127,7 @@ TQStringList KCrashBookmarkImporterImpl::getCrashLogs()
         activeLogs[ret] = true;
     }
 
-    TQDir d( KCrashBookmarkImporterImpl().tqfindDefaultLocation() );
+    TQDir d( KCrashBookmarkImporterImpl().findDefaultLocation() );
     d.setSorting( TQDir::Time );
     d.setFilter( TQDir::Files );
     d.setNameFilter( "konqueror-crash-*.log" );
@@ -141,7 +141,7 @@ TQStringList KCrashBookmarkImporterImpl::getCrashLogs()
     int count = 0;
     for ( ; (( fi = it.current() ) != 0) && (count < 20); ++it, ++count ) 
     {
-        bool stillAlive = activeLogs.tqcontains( fi->absFilePath() );
+        bool stillAlive = activeLogs.contains( fi->absFilePath() );
         if ( !stillAlive )
             crashFiles << fi->absFilePath();
     }
@@ -190,7 +190,7 @@ TQString KCrashBookmarkImporter::crashBookmarksDir()
     static KCrashBookmarkImporterImpl *p = 0;
     if (!p)
         p = new KCrashBookmarkImporterImpl;
-    return p->tqfindDefaultLocation();
+    return p->findDefaultLocation();
 }
 
 void KCrashBookmarkImporterImpl::setShouldDelete( bool shouldDelete ) 
@@ -207,7 +207,7 @@ void KCrashBookmarkImporter::parseCrashBookmarks( bool del )
     importer.parse();
 }
 
-TQString KCrashBookmarkImporterImpl::tqfindDefaultLocation( bool ) const 
+TQString KCrashBookmarkImporterImpl::findDefaultLocation( bool ) const 
 {
     return locateLocal( "tmp", "" );
 }
diff --git a/kio/bookmarks/kbookmarkimporter_crash.h b/kio/bookmarks/kbookmarkimporter_crash.h
index 79b01852e..e22ef1b9e 100644
--- a/kio/bookmarks/kbookmarkimporter_crash.h
+++ b/kio/bookmarks/kbookmarkimporter_crash.h
@@ -34,7 +34,7 @@
  * A class for importing all crash sessions as bookmarks
  * @deprecated
  */
-class KIO_EXPORT_DEPRECATED KCrashBookmarkImporter : public TQObject
+class KIO_EXPORT_DEPRECATED KCrashBookmarkImporter : public QObject
 {
     Q_OBJECT
 public:
@@ -63,7 +63,7 @@ public:
     KCrashBookmarkImporterImpl() : m_shouldDelete(false) { }
     void setShouldDelete(bool);
     virtual void parse();
-    virtual TQString tqfindDefaultLocation(bool forSaving = false) const;
+    virtual TQString findDefaultLocation(bool forSaving = false) const;
     static TQStringList getCrashLogs();
 private:
     bool m_shouldDelete;
diff --git a/kio/bookmarks/kbookmarkimporter_ie.cc b/kio/bookmarks/kbookmarkimporter_ie.cc
index 5c63062fd..f37a6a4be 100644
--- a/kio/bookmarks/kbookmarkimporter_ie.cc
+++ b/kio/bookmarks/kbookmarkimporter_ie.cc
@@ -111,7 +111,7 @@ TQString KIEBookmarkImporter::IEBookmarksDir()
    static KIEBookmarkImporterImpl* p = 0;
    if (!p) 
        p = new KIEBookmarkImporterImpl;
-   return p->tqfindDefaultLocation();
+   return p->findDefaultLocation();
 }
 
 void KIEBookmarkImporterImpl::parse() {
@@ -120,7 +120,7 @@ void KIEBookmarkImporterImpl::parse() {
    importer.parseIEBookmarks();
 }
 
-TQString KIEBookmarkImporterImpl::tqfindDefaultLocation(bool) const
+TQString KIEBookmarkImporterImpl::findDefaultLocation(bool) const
 {
     // notify user that they must give a new dir such 
     // as "Favourites" as otherwise it'll just place
@@ -147,7 +147,7 @@ private:
 
 static TQString ieStyleQuote( const TQString &str ) {
     TQString s(str);
-    s.tqreplace(TQRegExp("[/\\:*?\"<>|]"), "_");
+    s.replace(TQRegExp("[/\\:*?\"<>|]"), "_");
     return s;
 }
 
diff --git a/kio/bookmarks/kbookmarkimporter_ie.h b/kio/bookmarks/kbookmarkimporter_ie.h
index af286d6c1..2a9ddac6d 100644
--- a/kio/bookmarks/kbookmarkimporter_ie.h
+++ b/kio/bookmarks/kbookmarkimporter_ie.h
@@ -33,7 +33,7 @@
  * A class for importing IE bookmarks
  * @deprecated
  */
-class KIO_EXPORT_DEPRECATED KIEBookmarkImporter : public TQObject
+class KIO_EXPORT_DEPRECATED KIEBookmarkImporter : public QObject
 {
     Q_OBJECT
 public:
@@ -67,7 +67,7 @@ class KIO_EXPORT KIEBookmarkImporterImpl : public KBookmarkImporterBase
 public:
     KIEBookmarkImporterImpl() { }
     virtual void parse();
-    virtual TQString tqfindDefaultLocation(bool forSaving = false) const;
+    virtual TQString findDefaultLocation(bool forSaving = false) const;
 private:
     class KIEBookmarkImporterImplPrivate *d;
 };
diff --git a/kio/bookmarks/kbookmarkimporter_kde1.cc b/kio/bookmarks/kbookmarkimporter_kde1.cc
index 79568be02..49999e675 100644
--- a/kio/bookmarks/kbookmarkimporter_kde1.cc
+++ b/kio/bookmarks/kbookmarkimporter_kde1.cc
@@ -48,7 +48,7 @@ void KBookmarkImporter::scanIntern( TQDomElement & parentElem, const TQString &
     TQDir dir( _path );
     TQString canonical = dir.canonicalPath();
 
-    if ( m_lstParsedDirs.tqcontains(canonical) )
+    if ( m_lstParsedDirs.contains(canonical) )
     {
         kdWarning() << "Directory " << canonical << " already parsed" << endl;
         return;
diff --git a/kio/bookmarks/kbookmarkimporter_ns.cc b/kio/bookmarks/kbookmarkimporter_ns.cc
index f9e0c7be4..5521bee7e 100644
--- a/kio/bookmarks/kbookmarkimporter_ns.cc
+++ b/kio/bookmarks/kbookmarkimporter_ns.cc
@@ -50,7 +50,7 @@ void KNSBookmarkImporterImpl::parse()
         static const int g_lineLimit = 16*1024;
         TQCString s(g_lineLimit);
         // skip header
-        while(f.readLine(s.data(), g_lineLimit) >= 0 && !s.tqcontains("<DL>"));
+        while(f.readLine(s.data(), g_lineLimit) >= 0 && !s.contains("<DL>"));
 
         while(f.readLine(s.data(), g_lineLimit)>=0) {
             if ( s[s.length()-1] != '\n' ) // Gosh, this line is longer than g_lineLimit. Skipping.
@@ -61,14 +61,14 @@ void KNSBookmarkImporterImpl::parse()
             TQCString t = s.stripWhiteSpace();
             if(t.left(12).upper() == "<DT><A HREF=" ||
                t.left(16).upper() == "<DT><H3><A HREF=") {
-              int firstQuotes = t.tqfind('"')+1;
-              int secondQuotes = t.tqfind('"', firstQuotes);
+              int firstQuotes = t.find('"')+1;
+              int secondQuotes = t.find('"', firstQuotes);
               if (firstQuotes != -1 && secondQuotes != -1)
               {
                 TQCString link = t.mid(firstQuotes, secondQuotes-firstQuotes);
-                int endTag = t.tqfind('>', secondQuotes+1);
+                int endTag = t.find('>', secondQuotes+1);
                 TQCString name = t.mid(endTag+1);
-                name = name.left(name.tqfindRev('<'));
+                name = name.left(name.findRev('<'));
                 if ( name.right(4) == "</A>" )
                     name = name.left( name.length() - 4 );
                 TQString qname = KCharsets::resolveEntities( codec->toUnicode( name ) );
@@ -79,9 +79,9 @@ void KNSBookmarkImporterImpl::parse()
               }
             }
             else if(t.left(7).upper() == "<DT><H3") {
-                int endTag = t.tqfind('>', 7);
+                int endTag = t.find('>', 7);
                 TQCString name = t.mid(endTag+1);
-                name = name.left(name.tqfindRev('<'));
+                name = name.left(name.findRev('<'));
                 TQString qname = KCharsets::resolveEntities( codec->toUnicode( name ) );
                 TQCString additionalInfo = t.mid( 8, endTag-8 );
                 bool folded = (additionalInfo.left(6) == "FOLDED");
@@ -101,7 +101,7 @@ void KNSBookmarkImporterImpl::parse()
     }
 }
 
-TQString KNSBookmarkImporterImpl::tqfindDefaultLocation(bool forSaving) const
+TQString KNSBookmarkImporterImpl::findDefaultLocation(bool forSaving) const
 {
     if (m_utf8) 
     {
@@ -138,7 +138,7 @@ TQString KNSBookmarkImporter::netscapeBookmarksFile( bool forSaving )
         p = new KNSBookmarkImporterImpl;
         p->setUtf8(false);
     }
-    return p->tqfindDefaultLocation(forSaving);
+    return p->findDefaultLocation(forSaving);
 }
 
 TQString KNSBookmarkImporter::mozillaBookmarksFile( bool forSaving )
@@ -149,7 +149,7 @@ TQString KNSBookmarkImporter::mozillaBookmarksFile( bool forSaving )
         p = new KNSBookmarkImporterImpl;
         p->setUtf8(true);
     }
-    return p->tqfindDefaultLocation(forSaving);
+    return p->findDefaultLocation(forSaving);
 }
 
 
@@ -191,7 +191,7 @@ void KNSBookmarkExporterImpl::write(KBookmarkGroup parent) {
    fstream.setEncoding(m_utf8 ? TQTextStream::UnicodeUTF8 : TQTextStream::Locale);
 
    TQString charset 
-      = m_utf8 ? "UTF-8" : TQString::tqfromLatin1(TQTextCodec::codecForLocale()->name()).upper();
+      = m_utf8 ? "UTF-8" : TQString::fromLatin1(TQTextCodec::codecForLocale()->name()).upper();
 
    fstream << "<!DOCTYPE NETSCAPE-Bookmark-file-1>" << endl
            << i18n("<!-- This file was generated by Konqueror -->") << endl
diff --git a/kio/bookmarks/kbookmarkimporter_ns.h b/kio/bookmarks/kbookmarkimporter_ns.h
index 666cc1e0f..8b5c76338 100644
--- a/kio/bookmarks/kbookmarkimporter_ns.h
+++ b/kio/bookmarks/kbookmarkimporter_ns.h
@@ -34,7 +34,7 @@
  * A class for importing NS bookmarks
  * @deprecated
  */
-class KIO_EXPORT_DEPRECATED KNSBookmarkImporter : public TQObject
+class KIO_EXPORT_DEPRECATED KNSBookmarkImporter : public QObject
 {
     Q_OBJECT
 public:
@@ -70,7 +70,7 @@ public:
     KNSBookmarkImporterImpl() : m_utf8(false) { }
     void setUtf8(bool utf8) { m_utf8 = utf8; }
     virtual void parse();
-    virtual TQString tqfindDefaultLocation(bool forSaving = false) const;
+    virtual TQString findDefaultLocation(bool forSaving = false) const;
 private:
     bool m_utf8;
     class KNSBookmarkImporterImplPrivate *d;
diff --git a/kio/bookmarks/kbookmarkimporter_opera.cc b/kio/bookmarks/kbookmarkimporter_opera.cc
index 648c2ca25..45ac1a7ca 100644
--- a/kio/bookmarks/kbookmarkimporter_opera.cc
+++ b/kio/bookmarks/kbookmarkimporter_opera.cc
@@ -94,7 +94,7 @@ TQString KOperaBookmarkImporter::operaBookmarksFile()
    static KOperaBookmarkImporterImpl *p = 0;
    if (!p) 
        p = new KOperaBookmarkImporterImpl; 
-   return p->tqfindDefaultLocation();
+   return p->findDefaultLocation();
 }
 
 void KOperaBookmarkImporterImpl::parse() {
@@ -103,7 +103,7 @@ void KOperaBookmarkImporterImpl::parse() {
    importer.parseOperaBookmarks();
 }
 
-TQString KOperaBookmarkImporterImpl::tqfindDefaultLocation(bool saving) const
+TQString KOperaBookmarkImporterImpl::findDefaultLocation(bool saving) const
 {
    return saving ? KFileDialog::getSaveFileName( 
                        TQDir::homeDirPath() + "/.opera", 
diff --git a/kio/bookmarks/kbookmarkimporter_opera.h b/kio/bookmarks/kbookmarkimporter_opera.h
index 14087957b..e87df2efe 100644
--- a/kio/bookmarks/kbookmarkimporter_opera.h
+++ b/kio/bookmarks/kbookmarkimporter_opera.h
@@ -32,7 +32,7 @@
  * A class for importing Opera bookmarks
  * @deprecated
  */
-class KIO_EXPORT_DEPRECATED KOperaBookmarkImporter : public TQObject
+class KIO_EXPORT_DEPRECATED KOperaBookmarkImporter : public QObject
 {
     Q_OBJECT
 public:
@@ -63,7 +63,7 @@ class KIO_EXPORT KOperaBookmarkImporterImpl : public KBookmarkImporterBase
 public:
     KOperaBookmarkImporterImpl() { }
     virtual void parse();
-    virtual TQString tqfindDefaultLocation(bool forSaving = false) const;
+    virtual TQString findDefaultLocation(bool forSaving = false) const;
 private:
     class KOperaBookmarkImporterImplPrivate *d;
 };
diff --git a/kio/bookmarks/kbookmarkmanager.cc b/kio/bookmarks/kbookmarkmanager.cc
index 0afdf413a..1a9e5dc4e 100644
--- a/kio/bookmarks/kbookmarkmanager.cc
+++ b/kio/bookmarks/kbookmarkmanager.cc
@@ -63,7 +63,7 @@ class KBookmarkMap : private KBookmarkGroupTraverser {
 public:
     KBookmarkMap( KBookmarkManager * );
     void update();
-    TQValueList<KBookmark> tqfind( const TQString &url ) const
+    TQValueList<KBookmark> find( const TQString &url ) const
     { return m_bk_map[url]; }
 private:
     virtual void visit(const KBookmark &);
@@ -329,7 +329,7 @@ bool KBookmarkManager::saveAs( const TQString & filename, bool toolbarCache ) co
 
     // Save the bookmark toolbar folder for quick loading
     // but only when it will actually make things quicker
-    const TQString cacheFilename = filename + TQString::tqfromLatin1(".tbcache");
+    const TQString cacheFilename = filename + TQString::fromLatin1(".tbcache");
     if(toolbarCache && !root().isToolbarGroup())
     {
         KSaveFile cacheFile( cacheFilename );
@@ -337,7 +337,7 @@ bool KBookmarkManager::saveAs( const TQString & filename, bool toolbarCache ) co
         {
             TQString str;
             TQTextStream stream(&str, IO_WriteOnly);
-            stream << root().tqfindToolbar();
+            stream << root().findToolbar();
             TQCString cstr = str.utf8();
             cacheFile.file()->writeBlock( cstr.data(), cstr.length() );
             cacheFile.close();
@@ -367,7 +367,7 @@ bool KBookmarkManager::saveAs( const TQString & filename, bool toolbarCache ) co
                              "of the error needs to be fixed as quickly as possible, "
                              "which is most likely a full hard drive.")
                         .arg(filename).arg(TQString::fromLocal8Bit(strerror(file.status())));
-        if (tqApp->type() != TQApplication::Tty)
+        if (qApp->type() != TQApplication::Tty)
             KMessageBox::error( 0L, error );
         else
             kdError() << error << endl;
@@ -388,7 +388,7 @@ KBookmarkGroup KBookmarkManager::toolbar()
     if(!m_docIsLoaded)
     {
         kdDebug(7043) << "KBookmarkManager::toolbar trying cache" << endl;
-        const TQString cacheFilename = m_bookmarksFile + TQString::tqfromLatin1(".tbcache");
+        const TQString cacheFilename = m_bookmarksFile + TQString::fromLatin1(".tbcache");
         TQFileInfo bmInfo(m_bookmarksFile);
         TQFileInfo cacheInfo(cacheFilename);
         if (m_toolbarDoc.isNull() &&
@@ -415,16 +415,16 @@ KBookmarkGroup KBookmarkManager::toolbar()
 
     // Fallback to the normal way if there is no cache or if the bookmark file
     // is already loaded
-    TQDomElement elem = root().tqfindToolbar();
+    TQDomElement elem = root().findToolbar();
     if (elem.isNull())
         return root(); // Root is the bookmark toolbar if none has been set.
     else
-        return KBookmarkGroup(root().tqfindToolbar());
+        return KBookmarkGroup(root().findToolbar());
 }
 
-KBookmark KBookmarkManager::tqfindByAddress( const TQString & address, bool tolerant )
+KBookmark KBookmarkManager::findByAddress( const TQString & address, bool tolerant )
 {
-    //kdDebug(7043) << "KBookmarkManager::tqfindByAddress " << address << endl;
+    //kdDebug(7043) << "KBookmarkManager::findByAddress " << address << endl;
     KBookmark result = root();
     // The address is something like /5/10/2+
     TQStringList addresses = TQStringList::split(TQRegExp("[/+]"),address);
@@ -452,7 +452,7 @@ KBookmark KBookmarkManager::tqfindByAddress( const TQString & address, bool tole
        result = bk;
     }
     if (result.isNull()) {
-       kdWarning() << "KBookmarkManager::tqfindByAddress: couldn't tqfind item " << address << endl;
+       kdWarning() << "KBookmarkManager::findByAddress: couldn't find item " << address << endl;
        Q_ASSERT(!tolerant);
     }
     //kdWarning() << "found " << result.address() << endl;
@@ -462,7 +462,7 @@ KBookmark KBookmarkManager::tqfindByAddress( const TQString & address, bool tole
 static TQString pickUnusedTitle( KBookmarkGroup parentBookmark,
                                 const TQString &title, const TQString &url
 ) {
-    // If this title is already used, we'll try to tqfind something unused.
+    // If this title is already used, we'll try to find something unused.
     KBookmark ch = parentBookmark.first();
     int count = 1;
     TQString uniqueTitle = title;
@@ -521,7 +521,7 @@ KBookmarkGroup KBookmarkManager::addBookmarkDialog(
     }
 
     KBookmarkGroup parentBookmark;
-    parentBookmark = tqfindByAddress( parentBookmarkAddress ).toGroup();
+    parentBookmark = findByAddress( parentBookmarkAddress ).toGroup();
     Q_ASSERT( !parentBookmark.isNull() );
 
     TQString uniqueTitle = pickUnusedTitle( parentBookmark, title, url );
@@ -584,7 +584,7 @@ void KBookmarkManager::notifyChanged( TQString groupAddress ) // DCOP call
        parse();
 
     //kdDebug(7043) << "KBookmarkManager::notifyChanged " << groupAddress << endl;
-    //KBookmarkGroup group = tqfindByAddress( groupAddress ).toGroup();
+    //KBookmarkGroup group = findByAddress( groupAddress ).toGroup();
     //Q_ASSERT(!group.isNull());
     emit changed( groupAddress, TQString::null );
 }
@@ -614,11 +614,11 @@ void KBookmarkManager::setEditorOptions( const TQString& caption, bool browser )
 void KBookmarkManager::slotEditBookmarks()
 {
     KProcess proc;
-    proc << TQString::tqfromLatin1("keditbookmarks");
+    proc << TQString::fromLatin1("keditbookmarks");
     if (!dptr()->m_editorCaption.isNull())
-       proc << TQString::tqfromLatin1("--customcaption") << dptr()->m_editorCaption;
+       proc << TQString::fromLatin1("--customcaption") << dptr()->m_editorCaption;
     if (!dptr()->m_browserEditor)
-       proc << TQString::tqfromLatin1("--nobrowser");
+       proc << TQString::fromLatin1("--nobrowser");
     proc << m_bookmarksFile;
     proc.start(KProcess::DontCare);
 }
@@ -626,8 +626,8 @@ void KBookmarkManager::slotEditBookmarks()
 void KBookmarkManager::slotEditBookmarksAtAddress( const TQString& address )
 {
     KProcess proc;
-    proc << TQString::tqfromLatin1("keditbookmarks")
-         << TQString::tqfromLatin1("--address") << address
+    proc << TQString::fromLatin1("keditbookmarks")
+         << TQString::fromLatin1("--address") << address
          << m_bookmarksFile;
     proc.start(KProcess::DontCare);
 }
@@ -649,7 +649,7 @@ bool KBookmarkManager::updateAccessMetadata( const TQString & url, bool emitSign
         s_bk_map->update();
     }
 
-    TQValueList<KBookmark> list = s_bk_map->tqfind(url);
+    TQValueList<KBookmark> list = s_bk_map->find(url);
     if ( list.count() == 0 )
         return false;
 
@@ -672,7 +672,7 @@ void KBookmarkManager::updateFavicon( const TQString &url, const TQString &favic
         s_bk_map->update();
     }
 
-    TQValueList<KBookmark> list = s_bk_map->tqfind(url);
+    TQValueList<KBookmark> list = s_bk_map->find(url);
     for ( TQValueList<KBookmark>::iterator it = list.begin();
           it != list.end(); ++it )
     {
@@ -690,7 +690,7 @@ void KBookmarkManager::updateFavicon( const TQString &url, const TQString &favic
 
 TQString KBookmarkManager::userBookmarksFile()
 {
-    return locateLocal("data", TQString::tqfromLatin1("konqueror/bookmarks.xml"));
+    return locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml"));
 }
 
 KBookmarkManager* KBookmarkManager::userBookmarksManager()
diff --git a/kio/bookmarks/kbookmarkmanager.h b/kio/bookmarks/kbookmarkmanager.h
index e8fcd6196..403a2e1b3 100644
--- a/kio/bookmarks/kbookmarkmanager.h
+++ b/kio/bookmarks/kbookmarkmanager.h
@@ -57,7 +57,7 @@ class KIO_EXPORT KBookmarkManager : public TQObject, public DCOPObject
 protected:
     /**
      * Creates a bookmark manager with a path to the bookmarks.  By
-     * default, it will use the KDE standard dirs to tqfind and create the
+     * default, it will use the KDE standard dirs to find and create the
      * correct location.  If you are using your own app-specific
      * bookmarks directory, you must instantiate this class with your
      * own path <em>before</em> KBookmarkManager::managerForFile() is ever
@@ -152,10 +152,10 @@ public:
     /**
      * @return the bookmark designated by @p address
      * @param address the address belonging to the bookmark you're looking for
-     * @param tolerate when true tries to tqfind the most tolerable bookmark position
+     * @param tolerate when true tries to find the most tolerable bookmark position
      * @see KBookmark::address
      */
-    KBookmark tqfindByAddress( const TQString & address, bool tolerate = false );
+    KBookmark findByAddress( const TQString & address, bool tolerate = false );
 
     /**
      * Saves the bookmark file and notifies everyone.
diff --git a/kio/bookmarks/kbookmarkmenu.cc b/kio/bookmarks/kbookmarkmenu.cc
index a7b3c02a7..69c9debd6 100644
--- a/kio/bookmarks/kbookmarkmenu.cc
+++ b/kio/bookmarks/kbookmarkmenu.cc
@@ -226,7 +226,7 @@ bool RMB::invalid( int val )
 
 KBookmark RMB::atAddress(const TQString & address)
 {
-  KBookmark bookmark = m_pManager->tqfindByAddress( address );
+  KBookmark bookmark = m_pManager->findByAddress( address );
   Q_ASSERT(!bookmark.isNull());
   return bookmark;
 }
@@ -537,7 +537,7 @@ void KBookmarkMenu::addNewFolder()
 
   TQString title = i18n( "&New Bookmark Folder..." );
   int p;
-  while ( ( p = title.tqfind( '&' ) ) >= 0 )
+  while ( ( p = title.find( '&' ) ) >= 0 )
     title.remove( p, 1 );
 
   KAction * paNewFolder = new KAction( title,
@@ -617,13 +617,13 @@ void KBookmarkMenu::fillBookmarkMenu()
     }
   }
 
-  KBookmarkGroup parentBookmark = m_pManager->tqfindByAddress( m_parentAddress ).toGroup();
+  KBookmarkGroup parentBookmark = m_pManager->findByAddress( m_parentAddress ).toGroup();
   Q_ASSERT(!parentBookmark.isNull());
   bool separatorInserted = false;
   for ( KBookmark bm = parentBookmark.first(); !bm.isNull();  bm = parentBookmark.next(bm) )
   {
     TQString text = KStringHandler::csqueeze(bm.fullText(), 60);
-    text.tqreplace( '&', "&&" );
+    text.replace( '&', "&&" );
     if ( !separatorInserted && m_bIsRoot) {
       // inserted before the first konq bookmark, to avoid the separator if no konq bookmark
       m_parentMenu->insertSeparator();
@@ -708,7 +708,7 @@ void KBookmarkMenu::slotAddBookmarksList()
   KExtendedBookmarkOwner::QStringPairList list;
   extOwner->fillBookmarksList( list );
 
-  KBookmarkGroup parentBookmark = m_pManager->tqfindByAddress( m_parentAddress ).toGroup();
+  KBookmarkGroup parentBookmark = m_pManager->findByAddress( m_parentAddress ).toGroup();
   Q_ASSERT(!parentBookmark.isNull());
   KBookmarkGroup group = parentBookmark.createNewFolder( m_pManager );
   if ( group.isNull() )
@@ -733,7 +733,7 @@ void KBookmarkMenu::slotAddBookmark()
 void KBookmarkMenu::slotNewFolder()
 {
   if ( !m_pOwner ) return; // this view doesn't handle bookmarks...
-  KBookmarkGroup parentBookmark = m_pManager->tqfindByAddress( m_parentAddress ).toGroup();
+  KBookmarkGroup parentBookmark = m_pManager->findByAddress( m_parentAddress ).toGroup();
   Q_ASSERT(!parentBookmark.isNull());
   KBookmarkGroup group = parentBookmark.createNewFolder( m_pManager );
   if ( !group.isNull() )
@@ -895,7 +895,7 @@ void KBookmarkEditDialog::slotUser1()
 
   TQString address = KBookmarkFolderTree::selectedAddress( m_folderTree );
   if ( address.isNull() ) return;
-  KBookmarkGroup bm = m_mgr->tqfindByAddress( address ).toGroup();
+  KBookmarkGroup bm = m_mgr->findByAddress( address ).toGroup();
   Q_ASSERT(!bm.isNull());
   Q_ASSERT(m_editType == InsertionMode);
 
@@ -1056,7 +1056,7 @@ void KBookmarkMenuNSImporter::connectToImporter(const TQObject &importer)
 void KBookmarkMenuNSImporter::newBookmark( const TQString & text, const TQCString & url, const TQString & )
 {
   TQString _text = KStringHandler::csqueeze(text);
-  _text.tqreplace( '&', "&&" );
+  _text.replace( '&', "&&" );
   KAction * action = new KBookmarkAction(_text, "html", 0, 0, "", m_actionCollection, 0);
   connect(action, TQT_SIGNAL( activated ( KAction::ActivationReason, Qt::ButtonState )),
           m_menu, TQT_SLOT( slotBookmarkSelected( KAction::ActivationReason, Qt::ButtonState ) ));
@@ -1069,7 +1069,7 @@ void KBookmarkMenuNSImporter::newBookmark( const TQString & text, const TQCStrin
 void KBookmarkMenuNSImporter::newFolder( const TQString & text, bool, const TQString & )
 {
   TQString _text = KStringHandler::csqueeze(text);
-  _text.tqreplace( '&', "&&" );
+  _text.replace( '&', "&&" );
   KActionMenu * actionMenu = new KActionMenu( _text, "folder", m_actionCollection, 0L );
   actionMenu->plug( mstack.top()->m_parentMenu );
   mstack.top()->m_actions.append( actionMenu );
@@ -1175,7 +1175,7 @@ void KBookmarkMenu::setDynamicBookmarks(const TQString &id, const DynMenuInfo &n
 
   // make sure list includes type
   config.setGroup("Bookmarks");
-  if (elist.tqcontains(id) < 1) {
+  if (elist.contains(id) < 1) {
     elist << id;
     config.writeEntry("DynamicMenus", elist);
   }
diff --git a/kio/bookmarks/kbookmarkmenu.h b/kio/bookmarks/kbookmarkmenu.h
index 13691e5e0..f3d1c75b6 100644
--- a/kio/bookmarks/kbookmarkmenu.h
+++ b/kio/bookmarks/kbookmarkmenu.h
@@ -76,7 +76,7 @@ namespace KIO { class Job; }
  * 1a) Reimplement your own KBookmarkOwner
  * 1b) Reimplement and instantiate your own KBookmarkManager
  */
-class KIO_EXPORT KBookmarkMenu : public TQObject
+class KIO_EXPORT KBookmarkMenu : public QObject
 {
   Q_OBJECT
   friend class KBookmarkMenuNSImporter;
@@ -238,7 +238,7 @@ protected:
 /**
  * A class connected to KNSBookmarkImporter, to fill KActionMenus.
  */
-class KIO_EXPORT KBookmarkMenuNSImporter : public TQObject
+class KIO_EXPORT KBookmarkMenuNSImporter : public QObject
 {
   Q_OBJECT
 public:
diff --git a/kio/httpfilter/httpfilter.cc b/kio/httpfilter/httpfilter.cc
index a7e8c87c9..6a5a1346c 100644
--- a/kio/httpfilter/httpfilter.cc
+++ b/kio/httpfilter/httpfilter.cc
@@ -81,7 +81,7 @@ HTTPFilterMD5::HTTPFilterMD5()
 TQString 
 HTTPFilterMD5::md5()
 {
-   return TQString::tqfromLatin1(context.base64Digest());
+   return TQString::fromLatin1(context.base64Digest());
 }
 
 void 
diff --git a/kio/httpfilter/httpfilter.h b/kio/httpfilter/httpfilter.h
index 520a1c627..6d74a56ea 100644
--- a/kio/httpfilter/httpfilter.h
+++ b/kio/httpfilter/httpfilter.h
@@ -33,7 +33,7 @@
 #include <tqobject.h>
 #include <kmdcodec.h>
 
-class HTTPFilterBase : public TQObject
+class HTTPFilterBase : public QObject
 {
     Q_OBJECT
 public:
diff --git a/kio/kfile/ChangeLog b/kio/kfile/ChangeLog
index 3f121b600..bb43f16da 100644
--- a/kio/kfile/ChangeLog
+++ b/kio/kfile/ChangeLog
@@ -34,7 +34,7 @@ Fri Feb 18 23:35:04 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 Thu Feb 17 19:09:54 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 	* kfiledialog.{cpp,h} (KDirComboBox): 
-	Added KDirComboBox and tqreplaced the directory combobox with it. It
+	Added KDirComboBox and replaced the directory combobox with it. It
 	even does something now :) Items need to be indented tho.
 
 	* kfilereader.cpp, kdiroperator.{cpp,h}: 
@@ -43,12 +43,12 @@ Thu Feb 17 19:09:54 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 Tue Feb 15 14:21:41 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 	* kfile.h (class KFile): 
-	added a small class that tqcontains all the enums now.
+	added a small class that contains all the enums now.
 	cleaned up the enums (hope not too many apps will be broken)
 	added flags for "Existing files only" and "local files only"
 
 	* all views (setSelected()):
-	tqreplaced highlightItem(item) with setSelected(item, bool) which makes
+	replaced highlightItem(item) with setSelected(item, bool) which makes
 	it more suitable and more consistent with Qt.
 	added selectionChanged() method (necessary for multiselection)
 
@@ -161,12 +161,12 @@ Sat Jan 29 15:33:37 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 	* kfileview.cpp (compareItems): 
 	- added support to disable sorting directories first (QDir::DirsFirst)
 	- added support to sort by date and to sort reversed
-	- removed unused tqfindCompletion method
+	- removed unused findCompletion method
 	- sort case insensitive by default
 	- some optimization for mergeList
 	- fixed infinite loop in mergeLists, when the lists are the same
 	  (I think another one is still there, but I'm tired now)
-	- changed setSortMode stuff: Switching-mode tqreplaced with 
+	- changed setSortMode stuff: Switching-mode replaced with 
 	  sortReversed(). The enum Switching will be removed, soon.
 	- made setSortMode public
 
@@ -292,7 +292,7 @@ Wed Dec  2 15:59:13 1998  Carsten Pfeiffer  <pfeiffer@kde.org>
 	* kfilesimpleview.cpp: added some checks to prevent division with
 	zero using the latest qt snapshots
 
-	* kfilesimpleview.cpp: added a tqrepaint call after a resize
+	* kfilesimpleview.cpp: added a repaint call after a resize
 
 	* kfiledialog.cpp: new experimental button order
 
@@ -599,7 +599,7 @@ Wed Mar 18 02:56:32 1998  Stephan Kulow  <coolo@kde.org>
 	
 	* kdir.cpp: disable parent button in /
 
-	* kfiledialog.cpp: fixed tqlayout of mkdir dialog
+	* kfiledialog.cpp: fixed layout of mkdir dialog
 
 	* kdir.cpp: use currentDir instead of homeDir as default
 
@@ -666,7 +666,7 @@ Tue Feb 10 01:09:16 1998  Richard Moore <rich@kde.org>
 
 Fri Feb  6 18:08:14 1998  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: tqreplaced the location lineedit with an combo
+	* kfiledialog.cpp: replaced the location lineedit with an combo
 	box. Currently configurable with a compiler define. 
 
 Fri Feb  6 17:07:26 1998  Stephan Kulow  <coolo@kde.org>
@@ -694,7 +694,7 @@ Mon Jan 19 01:10:11 1998  Stephan Kulow  <coolo@kde.org>
 	* kdir.cpp: added isReadable() to indicate, that the dir is not
 	correct
 	
-	* kfiledialog.cpp: played a little bit with the tqgeometry management
+	* kfiledialog.cpp: played a little bit with the geometry management
 
 
 Sun Jan 18 15:00:06 1998  Stephan Kulow  <coolo@kde.org>
diff --git a/kio/kfile/NOTES b/kio/kfile/NOTES
index 0fe395c85..c3fb6fbcb 100644
--- a/kio/kfile/NOTES
+++ b/kio/kfile/NOTES
@@ -29,7 +29,7 @@ for more integration between kfile and konqueror. 16/08/2000.
     has a QWidget * canvas() method, xOffset() and yOffset()
 (4) KFileIconView holds a QPtrDict to look up a QIconViewItem quickly from a
     given KFileItem. This will help for e.g. deleteItems and refreshItems.
-(5) KFileListView holds a QPtrDict to tqfind the QListViewItem for a
+(5) KFileListView holds a QPtrDict to find the QListViewItem for a
     KFileItem.  It implements different modes if we want the tree view in
     kfile ?
 
@@ -86,7 +86,7 @@ KActions for it.
 
 Important :
 
-Make sure to take ktqfind into account. It would be nice if it could use the
+Make sure to take kfind into account. It would be nice if it could use the
 same views as konqueror, to have access to all the view modes, as well as
 image preview, etc.
 
diff --git a/kio/kfile/config-kfile.h b/kio/kfile/config-kfile.h
index 6c18c8019..8715ed273 100644
--- a/kio/kfile/config-kfile.h
+++ b/kio/kfile/config-kfile.h
@@ -3,10 +3,10 @@
 
 const int kfile_area = 250;
 
-#define DefaultViewStyle TQString::tqfromLatin1("SimpleView")
+#define DefaultViewStyle TQString::fromLatin1("SimpleView")
 #define DefaultPannerPosition 40
 #define DefaultMixDirsAndFiles false
-#define DefaultShowtqStatusLine false
+#define DefaultShowStatusLine false
 #define DefaultShowHidden false
 #define DefaultCaseInsensitive true
 #define DefaultDirsFirst true
@@ -14,19 +14,19 @@ const int kfile_area = 250;
 #define DefaultRecentURLsNumber 15
 #define DefaultDirectoryFollowing true
 #define DefaultAutoSelectExtChecked true
-#define ConfigGroup TQString::tqfromLatin1("KFileDialog Settings")
-#define RecentURLs TQString::tqfromLatin1("Recent URLs")
-#define RecentFiles TQString::tqfromLatin1("Recent Files")
-#define RecentURLsNumber TQString::tqfromLatin1("Maximum of recent URLs")
-#define RecentFilesNumber TQString::tqfromLatin1("Maximum of recent files")
-#define DialogWidth TQString::tqfromLatin1("Width (%1)")
-#define DialogHeight TQString::tqfromLatin1("Height (%1)")
-#define ConfigShowtqStatusLine TQString::tqfromLatin1("ShowtqStatusLine")
-#define AutoDirectoryFollowing TQString::tqfromLatin1("Automatic directory following")
-#define PathComboCompletionMode TQString::tqfromLatin1("PathCombo Completionmode")
-#define LocationComboCompletionMode TQString::tqfromLatin1("LocationCombo Completionmode")
-#define ShowSpeedbar TQString::tqfromLatin1("Show Speedbar")
-#define ShowBookmarks TQString::tqfromLatin1("Show Bookmarks")
-#define AutoSelectExtChecked TQString::tqfromLatin1("Automatically select filename extension")
+#define ConfigGroup TQString::fromLatin1("KFileDialog Settings")
+#define RecentURLs TQString::fromLatin1("Recent URLs")
+#define RecentFiles TQString::fromLatin1("Recent Files")
+#define RecentURLsNumber TQString::fromLatin1("Maximum of recent URLs")
+#define RecentFilesNumber TQString::fromLatin1("Maximum of recent files")
+#define DialogWidth TQString::fromLatin1("Width (%1)")
+#define DialogHeight TQString::fromLatin1("Height (%1)")
+#define ConfigShowStatusLine TQString::fromLatin1("ShowStatusLine")
+#define AutoDirectoryFollowing TQString::fromLatin1("Automatic directory following")
+#define PathComboCompletionMode TQString::fromLatin1("PathCombo Completionmode")
+#define LocationComboCompletionMode TQString::fromLatin1("LocationCombo Completionmode")
+#define ShowSpeedbar TQString::fromLatin1("Show Speedbar")
+#define ShowBookmarks TQString::fromLatin1("Show Bookmarks")
+#define AutoSelectExtChecked TQString::fromLatin1("Automatically select filename extension")
 
 #endif
diff --git a/kio/kfile/images.h b/kio/kfile/images.h
index 3d248ba24..f544e2f0a 100644
--- a/kio/kfile/images.h
+++ b/kio/kfile/images.h
@@ -48,7 +48,7 @@ static const QRgb group_data[] = {
     0x0,0x0,0x0,0x0
 };
 
-static const QRgb tqmask_data[] = {
+static const QRgb mask_data[] = {
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x11c84a00,0x1000000,0x0,0x0,0x0,0x0,0x0,
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x68d14e00,0xffda6400,0x72bf4700,0x3000000,0x0,0x0,
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x14d04d00,0xefda6400,0xfffec300,0xf2d86300,0x24742b00,
@@ -234,7 +234,7 @@ static struct EmbedImage {
 } embed_image_vec[] = {
     { 16, 16, 32, (const unsigned char*)group_grey_data, 0, 0, TRUE, "group-grey" },
     { 16, 16, 32, (const unsigned char*)group_data, 0, 0, TRUE, "group" },
-    { 16, 16, 32, (const unsigned char*)tqmask_data, 0, 0, TRUE, "tqmask" },
+    { 16, 16, 32, (const unsigned char*)mask_data, 0, 0, TRUE, "mask" },
     { 16, 16, 32, (const unsigned char*)others_grey_data, 0, 0, TRUE, "others-grey" },
     { 16, 16, 32, (const unsigned char*)others_data, 0, 0, TRUE, "others" },
     { 16, 16, 32, (const unsigned char*)user_green_data, 0, 0, TRUE, "user-green" },
@@ -245,10 +245,10 @@ static struct EmbedImage {
     { 0, 0, 0, 0, 0, 0, 0, 0 }
 };
 
-static const TQImage& qembed_tqfindImage( const TQString& name )
+static const TQImage& qembed_findImage( const TQString& name )
 {
     static TQDict<TQImage> dict;
-    TQImage* img = dict.tqfind( name );
+    TQImage* img = dict.find( name );
     if ( !img ) {
 	for ( int i = 0; embed_image_vec[i].data; i++ ) {
 	    if ( strcmp(embed_image_vec[i].name, name.latin1()) == 0 ) {
diff --git a/kio/kfile/kacleditwidget.cpp b/kio/kfile/kacleditwidget.cpp
index 8e887b59c..7f253f8c5 100644
--- a/kio/kfile/kacleditwidget.cpp
+++ b/kio/kfile/kacleditwidget.cpp
@@ -63,7 +63,7 @@ static struct {
     { I18N_NOOP( "Owner" ), "user-grey", 0 },
     { I18N_NOOP( "Owning Group" ), "group-grey", 0 },
     { I18N_NOOP( "Others" ), "others-grey", 0 },
-    { I18N_NOOP( "Mask" ), "tqmask", 0 },
+    { I18N_NOOP( "Mask" ), "mask", 0 },
     { I18N_NOOP( "Named User" ), "user", 0 },
     { I18N_NOOP( "Named Group" ), "group", 0 },
 };
@@ -85,7 +85,7 @@ KACLEditWidget::KACLEditWidget( TQWidget *parent, const char *name )
     m_DelBtn = new TQPushButton( i18n( "Delete Entry" ), vbox, "delete_entry_button" );
     connect( m_DelBtn, TQT_SIGNAL( clicked() ), m_listView, TQT_SLOT( slotRemoveEntry() ) );
     TQWidget *spacer = new TQWidget( vbox );
-    spacer->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding );
+    spacer->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding );
     slotUpdateButtons();
 }
 
@@ -148,7 +148,7 @@ KACLListViewItem::KACLListViewItem( TQListView* parent,
    qualifier( _qualifier ), isPartial( false )
 {
     m_pACLListView = dynamic_cast<KACLListView*>( parent );
-    tqrepaint();
+    repaint();
 }
 
 
@@ -192,7 +192,7 @@ TQString KACLListViewItem::key( int, bool ) const
 }
 
 void KACLListViewItem::paintCell( TQPainter* p, const TQColorGroup &cg,
-                                  int column, int width, int tqalignment )
+                                  int column, int width, int alignment )
 {
     TQColorGroup mycg = cg;
     if ( isDefault ) {
@@ -204,7 +204,7 @@ void KACLListViewItem::paintCell( TQPainter* p, const TQColorGroup &cg,
         mycg.setColor( TQColorGroup::Text, TQColor( 100, 100, 100 ) );
         p->setFont( font );
     }
-    KListViewItem::paintCell( p, mycg, column, width, tqalignment );
+    KListViewItem::paintCell( p, mycg, column, width, alignment );
 
     KACLListViewItem *below =0;
     if ( itemBelow() )
@@ -247,7 +247,7 @@ void KACLListViewItem::updatePermPixmaps()
         setPixmap( 4, TQPixmap() );
 }
 
-void KACLListViewItem::tqrepaint()
+void KACLListViewItem::repaint()
 {
     int idx = 0;
     switch ( type )
@@ -287,7 +287,7 @@ void KACLListViewItem::calcEffectiveRights()
 {
     TQString strEffective = TQString( "---" );
 
-    // Do we need to worry about the tqmask entry? It applies to named users,
+    // Do we need to worry about the mask entry? It applies to named users,
     // owning group, and named groups
     if ( m_pACLListView->hasMaskEntry()
             && ( type == KACLListView::NamedUser
@@ -296,22 +296,22 @@ void KACLListViewItem::calcEffectiveRights()
             && !isDefault )
     {
 
-        strEffective[0] = ( m_pACLListView->tqmaskPermissions() & value & ACL_READ ) ? 'r' : '-';
-        strEffective[1] = ( m_pACLListView->tqmaskPermissions() & value & ACL_WRITE ) ? 'w' : '-';
-        strEffective[2] = ( m_pACLListView->tqmaskPermissions() & value & ACL_EXECUTE ) ? 'x' : '-';
+        strEffective[0] = ( m_pACLListView->maskPermissions() & value & ACL_READ ) ? 'r' : '-';
+        strEffective[1] = ( m_pACLListView->maskPermissions() & value & ACL_WRITE ) ? 'w' : '-';
+        strEffective[2] = ( m_pACLListView->maskPermissions() & value & ACL_EXECUTE ) ? 'x' : '-';
 /*
         // What about any partial perms?
-        if ( tqmaskPerms & partialPerms & ACL_READ || // Partial perms on entry
-             tqmaskPartialPerms & perms & ACL_READ || // Partial perms on tqmask
-             tqmaskPartialPerms & partialPerms & ACL_READ ) // Partial perms on tqmask and entry
+        if ( maskPerms & partialPerms & ACL_READ || // Partial perms on entry
+             maskPartialPerms & perms & ACL_READ || // Partial perms on mask
+             maskPartialPerms & partialPerms & ACL_READ ) // Partial perms on mask and entry
             strEffective[0] = 'R';
-        if ( tqmaskPerms & partialPerms & ACL_WRITE || // Partial perms on entry
-             tqmaskPartialPerms & perms & ACL_WRITE || // Partial perms on tqmask
-             tqmaskPartialPerms & partialPerms & ACL_WRITE ) // Partial perms on tqmask and entry
+        if ( maskPerms & partialPerms & ACL_WRITE || // Partial perms on entry
+             maskPartialPerms & perms & ACL_WRITE || // Partial perms on mask
+             maskPartialPerms & partialPerms & ACL_WRITE ) // Partial perms on mask and entry
             strEffective[1] = 'W';
-        if ( tqmaskPerms & partialPerms & ACL_EXECUTE || // Partial perms on entry
-             tqmaskPartialPerms & perms & ACL_EXECUTE || // Partial perms on tqmask
-             tqmaskPartialPerms & partialPerms & ACL_EXECUTE ) // Partial perms on tqmask and entry
+        if ( maskPerms & partialPerms & ACL_EXECUTE || // Partial perms on entry
+             maskPartialPerms & perms & ACL_EXECUTE || // Partial perms on mask
+             maskPartialPerms & partialPerms & ACL_EXECUTE ) // Partial perms on mask and entry
             strEffective[2] = 'X';
 */
     }
@@ -339,7 +339,7 @@ bool KACLListViewItem::isDeletable() const
 {
     bool isMaskAndDeletable = false;
     if (type == KACLListView::Mask ) {
-        if ( !isDefault &&  m_pACLListView->tqmaskCanBeDeleted() )
+        if ( !isDefault &&  m_pACLListView->maskCanBeDeleted() )
             isMaskAndDeletable = true;
         else if ( isDefault &&  m_pACLListView->defaultMaskCanBeDeleted() )
             isMaskAndDeletable = true;
@@ -424,8 +424,8 @@ EditACLEntryDialog::EditACLEntryDialog( KACLListView *listView, KACLListViewItem
     m_buttonGroup->insert( owningGroupType, KACLListView::Group );
     TQRadioButton *othersType = new TQRadioButton( i18n("Others"), m_buttonGroup, "othersType" );
     m_buttonGroup->insert( othersType, KACLListView::Others );
-    TQRadioButton *tqmaskType = new TQRadioButton( i18n("Mask"), m_buttonGroup, "tqmaskType" );
-    m_buttonGroup->insert( tqmaskType, KACLListView::Mask );
+    TQRadioButton *maskType = new TQRadioButton( i18n("Mask"), m_buttonGroup, "maskType" );
+    m_buttonGroup->insert( maskType, KACLListView::Mask );
     TQRadioButton *namedUserType = new TQRadioButton( i18n("Named User"), m_buttonGroup, "namesUserType" );
     m_buttonGroup->insert( namedUserType, KACLListView::NamedUser );
     TQRadioButton *namedGroupType = new TQRadioButton( i18n("Named Group"), m_buttonGroup, "namedGroupType" );
@@ -481,9 +481,9 @@ void EditACLEntryDialog::slotUpdateAllowedTypes()
     }
     for ( int i=1; i < KACLListView::AllTypes; i=i*2 ) {
         if ( allowedTypes & i )
-            m_buttonGroup->tqfind( i )->show();
+            m_buttonGroup->find( i )->show();
         else
-            m_buttonGroup->tqfind( i )->hide();
+            m_buttonGroup->find( i )->hide();
     }
 }
 
@@ -495,17 +495,17 @@ void EditACLEntryDialog::slotUpdateAllowedUsersAndGroups()
     m_groupsCombo->clear();
     if ( m_defaultCB && m_defaultCB->isChecked() ) {
         m_usersCombo->insertStringList( m_defaultUsers );
-        if ( m_defaultUsers.tqfind( oldUser ) != m_defaultUsers.end() )
+        if ( m_defaultUsers.find( oldUser ) != m_defaultUsers.end() )
             m_usersCombo->setCurrentText( oldUser );
         m_groupsCombo->insertStringList( m_defaultGroups );
-        if ( m_defaultGroups.tqfind( oldGroup ) != m_defaultGroups.end() )
+        if ( m_defaultGroups.find( oldGroup ) != m_defaultGroups.end() )
             m_groupsCombo->setCurrentText( oldGroup );
     } else {
         m_usersCombo->insertStringList( m_users );
-        if ( m_users.tqfind( oldUser ) != m_users.end() )
+        if ( m_users.find( oldUser ) != m_users.end() )
             m_usersCombo->setCurrentText( oldUser );
         m_groupsCombo->insertStringList( m_groups );
-        if ( m_groups.tqfind( oldGroup ) != m_groups.end() )
+        if ( m_groups.find( oldGroup ) != m_groups.end() )
             m_groupsCombo->setCurrentText( oldGroup );
     }
 }
@@ -527,7 +527,7 @@ void EditACLEntryDialog::slotOk()
     }
     if ( m_defaultCB )
         m_item->isDefault = m_defaultCB->isChecked();
-    m_item->tqrepaint();
+    m_item->repaint();
 
     KDialogBase::slotOk();
 }
@@ -571,10 +571,10 @@ KACLListView::KACLListView( TQWidget* parent, const char* name )
 
     // Load the avatars
     for ( int i=0; i < LAST_IDX; ++i ) {
-        s_itemAttributes[i].pixmap = new TQPixmap( qembed_tqfindImage( s_itemAttributes[i].pixmapName ) );
+        s_itemAttributes[i].pixmap = new TQPixmap( qembed_findImage( s_itemAttributes[i].pixmapName ) );
     }
-    m_yesPixmap = new TQPixmap( qembed_tqfindImage( "yes" ) );
-    m_yesPartialPixmap = new TQPixmap( qembed_tqfindImage( "yespartial" ) );
+    m_yesPixmap = new TQPixmap( qembed_findImage( "yes" ) );
+    m_yesPartialPixmap = new TQPixmap( qembed_findImage( "yespartial" ) );
 
     setSelectionMode( TQListView::Extended );
 
@@ -582,14 +582,14 @@ KACLListView::KACLListView( TQWidget* parent, const char* name )
     struct passwd *user = 0;
     setpwent();
     while ( ( user = getpwent() ) != 0 ) {
-       m_allUsers << TQString::tqfromLatin1( user->pw_name );
+       m_allUsers << TQString::fromLatin1( user->pw_name );
     }
     endpwent();
 
     struct group *gr = 0;
     setgrent();
     while ( ( gr = getgrent() ) != 0 ) {
-       m_allGroups << TQString::tqfromLatin1( gr->gr_name );
+       m_allGroups << TQString::fromLatin1( gr->gr_name );
     }
     endgrent();
     m_allUsers.sort();
@@ -651,9 +651,9 @@ void KACLListView::fillItemsFromACL( const KACL &pACL, bool defaults )
     item = new KACLListViewItem( this, Others, pACL.othersPermissions(), defaults );
 
     bool hasMask = false;
-    unsigned short tqmask = pACL.tqmaskPermissions( hasMask );
+    unsigned short mask = pACL.maskPermissions( hasMask );
     if ( hasMask ) {
-        item = new KACLListViewItem( this, Mask, tqmask, defaults );
+        item = new KACLListViewItem( this, Mask, mask, defaults );
     }
 
     // read all named user entries
@@ -680,7 +680,7 @@ void KACLListView::setACL( const KACL &acl )
     m_ACL = acl;
     fillItemsFromACL( m_ACL );
 
-    m_tqmask = acl.tqmaskPermissions( m_hasMask );
+    m_mask = acl.maskPermissions( m_hasMask );
     calculateEffectiveRights();
 }
 
@@ -818,13 +818,13 @@ void KACLListView::entryClicked( TQListViewItem* pItem, const TQPoint& /*pt*/, i
     {
     // Mark the required entries as no longer being partial entries.
     // That is, they will get applied to all selected directories.
-    KACLListViewItem* pUserObj = tqfindACLEntryByType( this, ACL_USER_OBJ );
+    KACLListViewItem* pUserObj = findACLEntryByType( this, ACL_USER_OBJ );
     pUserObj->entry()->setPartialEntry( false );
 
-    KACLListViewItem* pGroupObj = tqfindACLEntryByType( this, ACL_GROUP_OBJ );
+    KACLListViewItem* pGroupObj = findACLEntryByType( this, ACL_GROUP_OBJ );
     pGroupObj->entry()->setPartialEntry( false );
 
-    KACLListViewItem* pOther = tqfindACLEntryByType( this, ACL_OTHER );
+    KACLListViewItem* pOther = findACLEntryByType( this, ACL_OTHER );
     pOther->entry()->setPartialEntry( false );
 
     update();
@@ -845,29 +845,29 @@ void KACLListView::calculateEffectiveRights()
 }
 
 
-unsigned short KACLListView::tqmaskPermissions() const
+unsigned short KACLListView::maskPermissions() const
 {
-  return m_tqmask;
+  return m_mask;
 }
 
 
-void KACLListView::setMaskPermissions( unsigned short tqmaskPerms )
+void KACLListView::setMaskPermissions( unsigned short maskPerms )
 {
-    m_tqmask = tqmaskPerms;
+    m_mask = maskPerms;
     calculateEffectiveRights();
 }
 
 
-acl_perm_t KACLListView::tqmaskPartialPermissions() const
+acl_perm_t KACLListView::maskPartialPermissions() const
 {
   //  return m_pMaskEntry->m_partialPerms;
   return 0;
 }
 
 
-void KACLListView::setMaskPartialPermissions( acl_perm_t /*tqmaskPartialPerms*/ )
+void KACLListView::setMaskPartialPermissions( acl_perm_t /*maskPartialPerms*/ )
 {
-    //m_pMaskEntry->m_partialPerms = tqmaskPartialPerms;
+    //m_pMaskEntry->m_partialPerms = maskPartialPerms;
     calculateEffectiveRights();
 }
 
@@ -882,12 +882,12 @@ bool KACLListView::hasDefaultEntries() const
     return false;
 }
 
-const KACLListViewItem* KACLListView::tqfindDefaultItemByType( EntryType type ) const
+const KACLListViewItem* KACLListView::findDefaultItemByType( EntryType type ) const
 {
-    return tqfindItemByType( type, true );
+    return findItemByType( type, true );
 }
 
-const KACLListViewItem* KACLListView::tqfindItemByType( EntryType type, bool defaults ) const
+const KACLListViewItem* KACLListView::findItemByType( EntryType type, bool defaults ) const
 {
     TQListViewItemIterator it( const_cast<KACLListView*>( this ) );
     while ( it.current() ) {
@@ -905,7 +905,7 @@ unsigned short KACLListView::calculateMaskValue( bool defaults ) const
 {
     // KACL auto-adds the relevant maks entries, so we can simply query
     bool dummy;
-    return itemsToACL( defaults ).tqmaskPermissions( dummy );
+    return itemsToACL( defaults ).maskPermissions( dummy );
 }
 
 void KACLListView::slotAddEntry()
@@ -914,7 +914,7 @@ void KACLListView::slotAddEntry()
     if ( !m_hasMask )
         allowedTypes |= Mask;
     int allowedDefaultTypes = NamedUser | NamedGroup;
-    if ( !tqfindDefaultItemByType( Mask ) )
+    if ( !findDefaultItemByType( Mask ) )
         allowedDefaultTypes |=  Mask;
     if ( !hasDefaultEntries() )
         allowedDefaultTypes |= User | Group;
@@ -927,24 +927,24 @@ void KACLListView::slotAddEntry()
     if ( !item ) return; // canceled
     if ( item->type == Mask && !item->isDefault ) {
         m_hasMask = true;
-        m_tqmask = item->value;
+        m_mask = item->value;
     }
     if ( item->isDefault && !hasDefaultEntries() ) {
         // first default entry, fill in what is needed
         if ( item->type != User ) {
-            unsigned short v = tqfindDefaultItemByType( User )->value;
+            unsigned short v = findDefaultItemByType( User )->value;
             new KACLListViewItem( this, User, v, true );
         }
         if ( item->type != Group ) {
-            unsigned short v = tqfindDefaultItemByType( Group )->value;
+            unsigned short v = findDefaultItemByType( Group )->value;
             new KACLListViewItem( this, Group, v, true );
         }
         if ( item->type != Others ) {
-            unsigned short v = tqfindDefaultItemByType( Others )->value;
+            unsigned short v = findDefaultItemByType( Others )->value;
             new KACLListViewItem( this, Others, v, true );
         }
     }
-    const KACLListViewItem *defaultMaskItem = tqfindDefaultItemByType( Mask );
+    const KACLListViewItem *defaultMaskItem = findDefaultItemByType( Mask );
     if ( item->isDefault && !defaultMaskItem ) {
         unsigned short v = calculateMaskValue( true );
         new KACLListViewItem( this, Mask, v, true );
@@ -953,11 +953,11 @@ void KACLListView::slotAddEntry()
             ( item->type == Group
               || item->type == NamedUser
               || item->type == NamedGroup ) ) {
-        // auto-add a tqmask entry
+        // auto-add a mask entry
         unsigned short v = calculateMaskValue( false );
         new KACLListViewItem( this, Mask, v, false );
         m_hasMask = true;
-        m_tqmask = v;
+        m_mask = v;
     }
     calculateEffectiveRights();
     sort();
@@ -978,7 +978,7 @@ void KACLListView::slotEditEntry()
     if ( !m_hasMask || itemWasMask )
         allowedTypes |= Mask;
     int allowedDefaultTypes = item->type | NamedUser | NamedGroup;
-    if ( !tqfindDefaultItemByType( Mask ) )
+    if ( !findDefaultItemByType( Mask ) )
         allowedDefaultTypes |=  Mask;
     if ( !hasDefaultEntries() )
         allowedDefaultTypes |= User | Group;
@@ -990,10 +990,10 @@ void KACLListView::slotEditEntry()
     dlg.exec();
     if ( itemWasMask && item->type != Mask ) {
         m_hasMask = false;
-        m_tqmask = 0;
+        m_mask = 0;
     }
     if ( !itemWasMask && item->type == Mask ) {
-        m_tqmask = item->value;
+        m_mask = item->value;
         m_hasMask = true;
     }
     calculateEffectiveRights();
@@ -1006,20 +1006,20 @@ void KACLListView::slotRemoveEntry()
     while ( it.current() ) {
         KACLListViewItem *item = static_cast<KACLListViewItem*>( it.current() );
         ++it;
-        /* First check if it's a tqmask entry and if so, make sure that there is
-         * either no name user or group entry, which means the tqmask can be 
+        /* First check if it's a mask entry and if so, make sure that there is
+         * either no name user or group entry, which means the mask can be 
          * removed, or don't remove it, but reset it. That is allowed. */
         if ( item->type == Mask ) {
             bool itemWasDefault = item->isDefault;
-            if ( !itemWasDefault && tqmaskCanBeDeleted() ) {
+            if ( !itemWasDefault && maskCanBeDeleted() ) {
                 m_hasMask= false;
-                m_tqmask = 0;
+                m_mask = 0;
                 delete item;
             } else if ( itemWasDefault && defaultMaskCanBeDeleted() ) {
                 delete item;
             } else {
                 item->value = 0;
-                item->tqrepaint();
+                item->repaint();
             }
             if ( !itemWasDefault )
                 calculateEffectiveRights();
@@ -1030,7 +1030,7 @@ void KACLListView::slotRemoveEntry()
                       || item->type == Group
                       || item->type == Others ) ) {
                 item->value = 0;
-                item->tqrepaint();
+                item->repaint();
             } else {
                 delete item;
             }
@@ -1038,14 +1038,14 @@ void KACLListView::slotRemoveEntry()
     }
 }
 
-bool KACLListView::tqmaskCanBeDeleted() const
+bool KACLListView::maskCanBeDeleted() const
 {
-   return !tqfindItemByType( NamedUser ) && !tqfindItemByType( NamedGroup );
+   return !findItemByType( NamedUser ) && !findItemByType( NamedGroup );
 }
 
 bool KACLListView::defaultMaskCanBeDeleted() const
 {
-    return !tqfindDefaultItemByType( NamedUser ) && !tqfindDefaultItemByType( NamedGroup );
+    return !findDefaultItemByType( NamedUser ) && !findDefaultItemByType( NamedGroup );
 }
 
 #include "kacleditwidget.moc"
diff --git a/kio/kfile/kacleditwidget_p.h b/kio/kfile/kacleditwidget_p.h
index 4cadf0efe..8bd0292d3 100644
--- a/kio/kfile/kacleditwidget_p.h
+++ b/kio/kfile/kacleditwidget_p.h
@@ -73,16 +73,16 @@ public:
     bool hasDefaultEntries() const;
     bool allowDefaults() const { return m_allowDefaults; }
     void setAllowDefaults( bool v ) { m_allowDefaults = v; }
-    unsigned short tqmaskPermissions() const;
-    void setMaskPermissions( unsigned short tqmaskPerms );
-    acl_perm_t tqmaskPartialPermissions() const;
-    void setMaskPartialPermissions( acl_perm_t tqmaskPerms );
+    unsigned short maskPermissions() const;
+    void setMaskPermissions( unsigned short maskPerms );
+    acl_perm_t maskPartialPermissions() const;
+    void setMaskPartialPermissions( acl_perm_t maskPerms );
 
-    bool tqmaskCanBeDeleted() const;
+    bool maskCanBeDeleted() const;
     bool defaultMaskCanBeDeleted() const;
 
-    const KACLListViewItem* tqfindDefaultItemByType( EntryType type ) const;
-    const KACLListViewItem* tqfindItemByType( EntryType type,
+    const KACLListViewItem* findDefaultItemByType( EntryType type ) const;
+    const KACLListViewItem* findItemByType( EntryType type,
                                             bool defaults = false ) const;
     unsigned short calculateMaskValue( bool defaults ) const;
     void calculateEffectiveRights();
@@ -117,7 +117,7 @@ private:
 
     KACL m_ACL;
     KACL m_defaultACL;
-    unsigned short m_tqmask;
+    unsigned short m_mask;
     bool m_hasMask;
     bool m_allowDefaults;
     TQStringList m_allUsers;
@@ -180,10 +180,10 @@ public:
     void togglePerm( acl_perm_t perm );
 
     virtual void paintCell( TQPainter *p, const TQColorGroup &cg,
-                            int column, int width, int tqalignment );
+                            int column, int width, int alignment );
 
     void updatePermPixmaps();
-    void tqrepaint();
+    void repaint();
 
     KACLListView::EntryType type;
     unsigned short value;
diff --git a/kio/kfile/kcombiview.cpp b/kio/kfile/kcombiview.cpp
index a21eafe05..6baf6d36f 100644
--- a/kio/kfile/kcombiview.cpp
+++ b/kio/kfile/kcombiview.cpp
@@ -282,7 +282,7 @@ KFileItem * KCombiView::prevItem( const KFileItem *fileItem ) const
         // with the next view's last item!
         if ( m_lastViewForPrevItem != otherView ) {
             fileItem = otherView->firstFileItem();
-            while ( otherView->nextItem( fileItem ) ) // tqfind the last item
+            while ( otherView->nextItem( fileItem ) ) // find the last item
                 fileItem = otherView->nextItem( fileItem );
         }
 
@@ -300,7 +300,7 @@ void KCombiView::slotSortingChanged( TQDir::SortSpec sorting )
 
 KFileView *KCombiView::focusView( KFileView *preferred ) const
 {
-    TQWidget *w = tqfocusWidget();
+    TQWidget *w = focusWidget();
     KFileView *other = (right == preferred) ? left : right;
     return (preferred && w == preferred->widget()) ? preferred : other;
 }
diff --git a/kio/kfile/kcustommenueditor.cpp b/kio/kfile/kcustommenueditor.cpp
index 3b4e9a68c..aec3c10f1 100644
--- a/kio/kfile/kcustommenueditor.cpp
+++ b/kio/kfile/kcustommenueditor.cpp
@@ -57,8 +57,8 @@ public:
       TQString serviceName = s->name();
 
       // item names may contain ampersands. To avoid them being converted
-      // to accelators, tqreplace them with two ampersands.
-      serviceName.tqreplace("&", "&&");
+      // to accelators, replace them with two ampersands.
+      serviceName.replace("&", "&&");
 
       TQPixmap normal = KGlobal::instance()->iconLoader()->loadIcon(s->icon(), KIcon::Small,
                               0, KIcon::DefaultState, 0L, true);
@@ -99,7 +99,7 @@ KCustomMenuEditor::KCustomMenuEditor(TQWidget *parent)
    d->pbRemove=buttonBox->addButton(i18n("Remove"), this, TQT_SLOT(slotRemoveItem()));
    d->pbMoveUp=buttonBox->addButton(i18n("Move Up"), this, TQT_SLOT(slotMoveUp()));
    d->pbMoveDown=buttonBox->addButton(i18n("Move Down"), this, TQT_SLOT(slotMoveDown()));
-   buttonBox->tqlayout();
+   buttonBox->layout();
    connect( m_listView, TQT_SIGNAL( selectionChanged () ), this, TQT_SLOT( refreshButton() ) );
    refreshButton();
 }
diff --git a/kio/kfile/kdiroperator.cpp b/kio/kfile/kdiroperator.cpp
index 75d72f258..6013b7c57 100644
--- a/kio/kfile/kdiroperator.cpp
+++ b/kio/kfile/kdiroperator.cpp
@@ -111,13 +111,13 @@ KDirOperator::KDirOperator(const KURL& _url,
         TQString strPath = TQDir::currentDirPath();
         strPath.append('/');
         currUrl = KURL();
-        currUrl.setProtocol(TQString::tqfromLatin1("file"));
+        currUrl.setProtocol(TQString::fromLatin1("file"));
         currUrl.setPath(strPath);
     }
     else {
         currUrl = _url;
         if ( currUrl.protocol().isEmpty() )
-            currUrl.setProtocol(TQString::tqfromLatin1("file"));
+            currUrl.setProtocol(TQString::fromLatin1("file"));
 
         currUrl.addPath("/"); // make sure we have a trailing slash!
     }
@@ -414,7 +414,7 @@ bool KDirOperator::mkdir( const TQString& directory, bool enterDirectory )
     {
         url.addPath( *it );
         exists = KIO::NetAccess::exists( url, false, 0 );
-        writeOk = !exists && KIO::NetAccess::mkdir( url, tqtopLevelWidget() );
+        writeOk = !exists && KIO::NetAccess::mkdir( url, topLevelWidget() );
     }
 
     if ( exists ) // url was already existant
@@ -484,7 +484,7 @@ KIO::DeleteJob * KDirOperator::del( const KFileItemList& items,
 
     if ( doIt ) {
         KIO::DeleteJob *job = KIO::del( urls, false, showProgress );
-        job->setWindow (tqtopLevelWidget());
+        job->setWindow (topLevelWidget());
         job->setAutoErrorHandlingEnabled( true, parent );
         return job;
     }
@@ -547,7 +547,7 @@ KIO::CopyJob * KDirOperator::trash( const KFileItemList& items,
 
     if ( doIt ) {
         KIO::CopyJob *job = KIO::trash( urls, showProgress );
-        job->setWindow (tqtopLevelWidget());
+        job->setWindow (topLevelWidget());
         job->setAutoErrorHandlingEnabled( true, parent );
         return job;
     }
@@ -590,13 +590,13 @@ void KDirOperator::checkPath(const TQString &, bool /*takeFiles*/) // SLOT
     text = text.stripWhiteSpace();
     // if the argument is no URL (the check is quite fragil) and it's
     // no absolute path, we add the current directory to get a correct url
-    if (text.tqfind(':') < 0 && text[0] != '/')
+    if (text.find(':') < 0 && text[0] != '/')
         text.insert(0, currUrl);
 
     // in case we have a selection defined and someone patched the file-
     // name, we check, if the end of the new name is changed.
     if (!selection.isNull()) {
-        int position = text.tqfindRev('/');
+        int position = text.findRev('/');
         ASSERT(position >= 0); // we already inserted the current dir in case
         TQString filename = text.mid(position + 1, text.length());
         if (filename != selection)
@@ -651,7 +651,7 @@ void KDirOperator::setURL(const KURL& _newurl, bool clearforward)
 
     if ( !isReadable( newurl ) ) {
         // maybe newurl is a file? check its parent directory
-        newurl.cd(TQString::tqfromLatin1(".."));
+        newurl.cd(TQString::fromLatin1(".."));
         if ( !isReadable( newurl ) ) {
             resetCursor();
             KMessageBox::error(viewWidget(),
@@ -777,7 +777,7 @@ KURL KDirOperator::url() const
 void KDirOperator::cdUp()
 {
     KURL tmp(currUrl);
-    tmp.cd(TQString::tqfromLatin1(".."));
+    tmp.cd(TQString::fromLatin1(".."));
     setURL(tmp, true);
 }
 
@@ -825,7 +825,7 @@ bool KDirOperator::checkPreviewInternal() const
 {
     TQStringList supported = KIO::PreviewJob::supportedMimeTypes();
     // no preview support for directories?
-    if ( dirOnlyMode() && supported.tqfindIndex( "inode/directory" ) == -1 )
+    if ( dirOnlyMode() && supported.findIndex( "inode/directory" ) == -1 )
         return false;
 
     TQStringList mimeTypes = dir->mimeFilters();
@@ -851,7 +851,7 @@ bool KDirOperator::checkPreviewInternal() const
         }
 
         if ( !nameFilter.isEmpty() ) {
-            // tqfind the mimetypes of all the filter-patterns and
+            // find the mimetypes of all the filter-patterns and
             KServiceTypeFactory *fac = KServiceTypeFactory::self();
             TQStringList::Iterator it1 = nameFilter.begin();
             for ( ; it1 != nameFilter.end(); ++it1 ) {
@@ -859,7 +859,7 @@ bool KDirOperator::checkPreviewInternal() const
                     return true;
                 }
 
-                KMimeType *mt = fac->tqfindFromPattern( *it1 );
+                KMimeType *mt = fac->findFromPattern( *it1 );
                 if ( !mt )
                     continue;
                 TQString mime = mt->name();
@@ -1120,7 +1120,7 @@ void KDirOperator::setDirLister( KDirLister *lister )
 
     dir->setAutoUpdate( true );
 
-    TQWidget* mainWidget = tqtopLevelWidget();
+    TQWidget* mainWidget = topLevelWidget();
     dir->setMainWindow (mainWidget);
     kdDebug (kfile_area) << "mainWidget=" << mainWidget << endl;
 
@@ -1194,7 +1194,7 @@ void KDirOperator::setCurrentItem( const TQString& filename )
         const KFileItem *item = 0L;
 
         if ( !filename.isNull() )
-            item = static_cast<KFileItem *>(dir->tqfindByName( filename ));
+            item = static_cast<KFileItem *>(dir->findByName( filename ));
 
         m_fileView->clearSelection();
         if ( item ) {
@@ -1253,7 +1253,7 @@ void KDirOperator::slotCompletionMatch(const TQString& match)
 
 void KDirOperator::setupActions()
 {
-    myActionCollection = new KActionCollection( tqtopLevelWidget(), this, "KDirOperator::myActionCollection" );
+    myActionCollection = new KActionCollection( topLevelWidget(), this, "KDirOperator::myActionCollection" );
 
     actionMenu = new KActionMenu( i18n("Menu"), myActionCollection, "popupMenu" );
     upAction = KStdAction::up( this, TQT_SLOT( cdUp() ), myActionCollection, "up" );
@@ -1273,7 +1273,7 @@ void KDirOperator::setupActions()
 	     this, TQT_SLOT( trashSelected( KAction::ActivationReason, Qt::ButtonState ) ) );
     new KAction( i18n( "Delete" ), "editdelete", SHIFT+Key_Delete, this,
                   TQT_SLOT( deleteSelected() ), myActionCollection, "delete" );
-    mkdirAction->setIcon( TQString::tqfromLatin1("folder_new") );
+    mkdirAction->setIcon( TQString::fromLatin1("folder_new") );
     reloadAction->setText( i18n("Reload") );
     reloadAction->setShortcut( KStdAccel::shortcut( KStdAccel::Reload ));
 
@@ -1293,7 +1293,7 @@ void KDirOperator::setupActions()
                                        this, TQT_SLOT( slotSortReversed() ),
                                        myActionCollection, "reversed" );
 
-    TQString sortGroup = TQString::tqfromLatin1("sort");
+    TQString sortGroup = TQString::fromLatin1("sort");
     byNameAction->setExclusiveGroup( sortGroup );
     byDateAction->setExclusiveGroup( sortGroup );
     bySizeAction->setExclusiveGroup( sortGroup );
@@ -1337,7 +1337,7 @@ void KDirOperator::setupActions()
              TQT_SLOT( togglePreview( bool )));
 
 
-    TQString viewGroup = TQString::tqfromLatin1("view");
+    TQString viewGroup = TQString::fromLatin1("view");
     shortAction->setExclusiveGroup( viewGroup );
     detailedAction->setExclusiveGroup( viewGroup );
 
@@ -1386,7 +1386,7 @@ void KDirOperator::setupMenu(int whichActions)
         if (currUrl.isLocalFile() && !(KApplication::keyboardMouseState() & Qt::ShiftButton))
             actionMenu->insert( myActionCollection->action( "trash" ) );
         KConfig *globalconfig = KGlobal::config();
-        KConfigGroupSaver cs( globalconfig, TQString::tqfromLatin1("KDE") );
+        KConfigGroupSaver cs( globalconfig, TQString::fromLatin1("KDE") );
         if (!currUrl.isLocalFile() || (KApplication::keyboardMouseState() & Qt::ShiftButton) ||
             globalconfig->readBoolEntry("ShowDeleteCommand", false))
             actionMenu->insert( myActionCollection->action( "delete" ) );
@@ -1450,45 +1450,45 @@ void KDirOperator::readConfig( KConfig *kc, const TQString& group )
     defaultView = 0;
     int sorting = 0;
 
-    TQString viewStyle = kc->readEntry( TQString::tqfromLatin1("View Style"),
-                                       TQString::tqfromLatin1("Simple") );
-    if ( viewStyle == TQString::tqfromLatin1("Detail") )
+    TQString viewStyle = kc->readEntry( TQString::fromLatin1("View Style"),
+                                       TQString::fromLatin1("Simple") );
+    if ( viewStyle == TQString::fromLatin1("Detail") )
         defaultView |= KFile::Detail;
     else
         defaultView |= KFile::Simple;
-    if ( kc->readBoolEntry( TQString::tqfromLatin1("Separate Directories"),
+    if ( kc->readBoolEntry( TQString::fromLatin1("Separate Directories"),
                             DefaultMixDirsAndFiles ) )
         defaultView |= KFile::SeparateDirs;
-    if ( kc->readBoolEntry(TQString::tqfromLatin1("Show Preview"), false))
+    if ( kc->readBoolEntry(TQString::fromLatin1("Show Preview"), false))
         defaultView |= KFile::PreviewContents;
 
-    if ( kc->readBoolEntry( TQString::tqfromLatin1("Sort case insensitively"),
+    if ( kc->readBoolEntry( TQString::fromLatin1("Sort case insensitively"),
                             DefaultCaseInsensitive ) )
         sorting |= TQDir::IgnoreCase;
-    if ( kc->readBoolEntry( TQString::tqfromLatin1("Sort directories first"),
+    if ( kc->readBoolEntry( TQString::fromLatin1("Sort directories first"),
                             DefaultDirsFirst ) )
         sorting |= TQDir::DirsFirst;
 
 
-    TQString name = TQString::tqfromLatin1("Name");
-    TQString sortBy = kc->readEntry( TQString::tqfromLatin1("Sort by"), name );
+    TQString name = TQString::fromLatin1("Name");
+    TQString sortBy = kc->readEntry( TQString::fromLatin1("Sort by"), name );
     if ( sortBy == name )
         sorting |= TQDir::Name;
-    else if ( sortBy == TQString::tqfromLatin1("Size") )
+    else if ( sortBy == TQString::fromLatin1("Size") )
         sorting |= TQDir::Size;
-    else if ( sortBy == TQString::tqfromLatin1("Date") )
+    else if ( sortBy == TQString::fromLatin1("Date") )
         sorting |= TQDir::Time;
 
     mySorting = static_cast<TQDir::SortSpec>( sorting );
     setSorting( mySorting );
 
 
-    if ( kc->readBoolEntry( TQString::tqfromLatin1("Show hidden files"),
+    if ( kc->readBoolEntry( TQString::fromLatin1("Show hidden files"),
                             DefaultShowHidden ) ) {
          showHiddenAction->setChecked( true );
          dir->setShowingDotFiles( true );
     }
-    if ( kc->readBoolEntry( TQString::tqfromLatin1("Sort reversed"),
+    if ( kc->readBoolEntry( TQString::fromLatin1("Sort reversed"),
                             DefaultSortReversed ) )
         reverseAction->setChecked( true );
 
@@ -1505,18 +1505,18 @@ void KDirOperator::writeConfig( KConfig *kc, const TQString& group )
     if ( !group.isEmpty() )
         kc->setGroup( group );
 
-    TQString sortBy = TQString::tqfromLatin1("Name");
+    TQString sortBy = TQString::fromLatin1("Name");
     if ( KFile::isSortBySize( mySorting ) )
-        sortBy = TQString::tqfromLatin1("Size");
+        sortBy = TQString::fromLatin1("Size");
     else if ( KFile::isSortByDate( mySorting ) )
-        sortBy = TQString::tqfromLatin1("Date");
-    kc->writeEntry( TQString::tqfromLatin1("Sort by"), sortBy );
+        sortBy = TQString::fromLatin1("Date");
+    kc->writeEntry( TQString::fromLatin1("Sort by"), sortBy );
 
-    kc->writeEntry( TQString::tqfromLatin1("Sort reversed"),
+    kc->writeEntry( TQString::fromLatin1("Sort reversed"),
                     reverseAction->isChecked() );
-    kc->writeEntry( TQString::tqfromLatin1("Sort case insensitively"),
+    kc->writeEntry( TQString::fromLatin1("Sort case insensitively"),
                     caseInsensitiveAction->isChecked() );
-    kc->writeEntry( TQString::tqfromLatin1("Sort directories first"),
+    kc->writeEntry( TQString::fromLatin1("Sort directories first"),
                     dirsFirstAction->isChecked() );
 
     // don't save the separate dirs or preview when an application specific
@@ -1530,26 +1530,26 @@ void KDirOperator::writeConfig( KConfig *kc, const TQString& group )
 
     if ( !appSpecificPreview ) {
         if ( separateDirsAction->isEnabled() )
-            kc->writeEntry( TQString::tqfromLatin1("Separate Directories"),
+            kc->writeEntry( TQString::fromLatin1("Separate Directories"),
                             separateDirsAction->isChecked() );
 
         KToggleAction *previewAction = static_cast<KToggleAction*>(myActionCollection->action("preview"));
         if ( previewAction->isEnabled() ) {
             bool hasPreview = previewAction->isChecked();
-            kc->writeEntry( TQString::tqfromLatin1("Show Preview"), hasPreview );
+            kc->writeEntry( TQString::fromLatin1("Show Preview"), hasPreview );
         }
     }
 
-    kc->writeEntry( TQString::tqfromLatin1("Show hidden files"),
+    kc->writeEntry( TQString::fromLatin1("Show hidden files"),
                     showHiddenAction->isChecked() );
 
     KFile::FileView fv = static_cast<KFile::FileView>( m_viewKind );
     TQString style;
     if ( KFile::isDetailView( fv ) )
-        style = TQString::tqfromLatin1("Detail");
+        style = TQString::fromLatin1("Detail");
     else if ( KFile::isSimpleView( fv ) )
-        style = TQString::tqfromLatin1("Simple");
-    kc->writeEntry( TQString::tqfromLatin1("View Style"), style );
+        style = TQString::fromLatin1("Simple");
+    kc->writeEntry( TQString::fromLatin1("View Style"), style );
 
     kc->setGroup( oldGroup );
 }
diff --git a/kio/kfile/kdirselectdialog.cpp b/kio/kfile/kdirselectdialog.cpp
index 2df357575..a361a8bde 100644
--- a/kio/kfile/kdirselectdialog.cpp
+++ b/kio/kfile/kdirselectdialog.cpp
@@ -211,7 +211,7 @@ void KDirSelectDialog::setCurrentURL( const KURL& url )
     {
         while ( pos > 0 )
         {
-            pos = path.tqfindRev( '/', pos -1 );
+            pos = path.findRev( '/', pos -1 );
             if ( pos >= 0 )
             {
                 dirToList.setPath( path.left( pos +1 ) );
@@ -232,7 +232,7 @@ void KDirSelectDialog::openNextDir( KFileTreeViewItem * /*parent*/ )
 
     KURL url = d->dirsToList.pop();
 
-    KFileTreeViewItem *item = view()->tqfindItem( d->branch, url.path().mid(1));
+    KFileTreeViewItem *item = view()->findItem( d->branch, url.path().mid(1));
     if ( item )
     {
         if ( !item->isOpen() )
@@ -248,7 +248,7 @@ void KDirSelectDialog::slotNextDirToList( KFileTreeViewItem *item )
 {
     // scroll to make item the topmost item
     view()->ensureItemVisible( item );
-    TQRect r = view()->tqitemRect( item );
+    TQRect r = view()->itemRect( item );
     if ( r.isValid() )
     {
         int x, y;
@@ -376,7 +376,7 @@ void KDirSelectDialog::slotComboTextChanged( const TQString& text )
     if ( d->branch )
     {
         KURL url = KURL::fromPathOrURL( KShell::tildeExpand( text ) );
-        KFileTreeViewItem *item = d->branch->tqfindTVIByURL( url );
+        KFileTreeViewItem *item = d->branch->findTVIByURL( url );
         if ( item )
         {
             view()->setCurrentItem( item );
@@ -390,8 +390,8 @@ void KDirSelectDialog::slotComboTextChanged( const TQString& text )
     if ( item )
     {
         item->setSelected( false );
-        // 2002/12/27, deselected item is not tqrepainted, so force it
-        item->tqrepaint();
+        // 2002/12/27, deselected item is not repainted, so force it
+        item->repaint();
     }
 }
 
@@ -426,7 +426,7 @@ void KDirSelectDialog::slotMkdir()
     {
         folderurl.addPath( *it );
         exists = KIO::NetAccess::exists( folderurl, false, 0 );
-        writeOk = !exists && KIO::NetAccess::mkdir( folderurl, tqtopLevelWidget() );
+        writeOk = !exists && KIO::NetAccess::mkdir( folderurl, topLevelWidget() );
     }
 
     if ( exists ) // url was already existant
diff --git a/kio/kfile/kdirsize.cpp b/kio/kfile/kdirsize.cpp
index 86dfc756d..3c9bfbb8c 100644
--- a/kio/kfile/kdirsize.cpp
+++ b/kio/kfile/kdirsize.cpp
@@ -63,7 +63,7 @@ void KDirSize::processList()
     }
     kdDebug(kfile_area) << "KDirSize::processList finished" << endl;
     if ( !m_bAsync )
-        tqApp->exit_loop();
+        qApp->exit_loop();
     emitResult();
 }
 
@@ -139,7 +139,7 @@ KIO::filesize_t KDirSize::dirSize( const KURL & directory )
 {
     KDirSize * dirSize = dirSizeJob( directory );
     dirSize->setSync();
-    tqApp->enter_loop();
+    qApp->enter_loop();
     return dirSize->totalSize();
 }
 
@@ -155,7 +155,7 @@ void KDirSize::slotResult( KIO::Job * job )
     else
     {
         if ( !m_bAsync )
-            tqApp->exit_loop();
+            qApp->exit_loop();
         KIO::Job::slotResult( job );
     }
 }
diff --git a/kio/kfile/kdiskfreesp.cpp b/kio/kfile/kdiskfreesp.cpp
index 23562b63f..179b69f72 100644
--- a/kio/kfile/kdiskfreesp.cpp
+++ b/kio/kfile/kdiskfreesp.cpp
@@ -100,7 +100,7 @@ void KDiskFreeSp::dfDone()
 
   TQTextStream t (dfStringErrOut, IO_ReadOnly);
   TQString s=t.readLine();
-  if ( (s.isEmpty()) || ( s.left(10) != TQString::tqfromLatin1("Filesystem") ) )
+  if ( (s.isEmpty()) || ( s.left(10) != TQString::fromLatin1("Filesystem") ) )
     kdError() << "Error running df command... got [" << s << "]" << endl;
   while ( !t.eof() ) {
     TQString u,v;
@@ -109,7 +109,7 @@ void KDiskFreeSp::dfDone()
     if ( !s.isEmpty() ) {
       //kdDebug(kfile_area) << "GOT: [" << s << "]" << endl;
 
-      if (s.tqfind(BLANK)<0)      // devicename was too long, rest in next line
+      if (s.find(BLANK)<0)      // devicename was too long, rest in next line
 	if ( !t.eof() ) {       // just appends the next line
             v=t.readLine();
             s=s.append(v);
@@ -119,30 +119,30 @@ void KDiskFreeSp::dfDone()
 
       //kdDebug(kfile_area) << "[" << s << "]" << endl;
 
-      //TQString deviceName = s.left(s.tqfind(BLANK));
-      s=s.remove(0,s.tqfind(BLANK)+1 );
+      //TQString deviceName = s.left(s.find(BLANK));
+      s=s.remove(0,s.find(BLANK)+1 );
       //kdDebug(kfile_area) << "    DeviceName:    [" << deviceName << "]" << endl;
 
       if (!NO_FS_TYPE)
-          s=s.remove(0,s.tqfind(BLANK)+1 ); // eat fs type
+          s=s.remove(0,s.find(BLANK)+1 ); // eat fs type
 
-      u=s.left(s.tqfind(BLANK));
+      u=s.left(s.find(BLANK));
       unsigned long kBSize = u.toULong();
-      s=s.remove(0,s.tqfind(BLANK)+1 );
+      s=s.remove(0,s.find(BLANK)+1 );
       //kdDebug(kfile_area) << "    Size:       [" << kBSize << "]" << endl;
 
-      u=s.left(s.tqfind(BLANK));
+      u=s.left(s.find(BLANK));
       unsigned long kBUsed = u.toULong();
-      s=s.remove(0,s.tqfind(BLANK)+1 );
+      s=s.remove(0,s.find(BLANK)+1 );
       //kdDebug(kfile_area) << "    Used:       [" << kBUsed << "]" << endl;
 
-      u=s.left(s.tqfind(BLANK));
+      u=s.left(s.find(BLANK));
       unsigned long kBAvail = u.toULong();
-      s=s.remove(0,s.tqfind(BLANK)+1 );
+      s=s.remove(0,s.find(BLANK)+1 );
       //kdDebug(kfile_area) << "    Avail:       [" << kBAvail << "]" << endl;
 
 
-      s=s.remove(0,s.tqfind(BLANK)+1 );  // delete the capacity 94%
+      s=s.remove(0,s.find(BLANK)+1 );  // delete the capacity 94%
       TQString mountPoint = s.stripWhiteSpace();
       //kdDebug(kfile_area) << "    MountPoint:       [" << mountPoint << "]" << endl;
 
@@ -160,10 +160,10 @@ void KDiskFreeSp::dfDone()
   delete this;
 }
 
-KDiskFreeSp * KDiskFreeSp::tqfindUsageInfo( const TQString & path )
+KDiskFreeSp * KDiskFreeSp::findUsageInfo( const TQString & path )
 {
     KDiskFreeSp * job = new KDiskFreeSp;
-    TQString mountPoint = KIO::tqfindPathMountPoint( path );
+    TQString mountPoint = KIO::findPathMountPoint( path );
     job->readDF( mountPoint );
     return job;
 }
diff --git a/kio/kfile/kdiskfreesp.h b/kio/kfile/kdiskfreesp.h
index eeb285b08..6a0591d6f 100644
--- a/kio/kfile/kdiskfreesp.h
+++ b/kio/kfile/kdiskfreesp.h
@@ -34,10 +34,10 @@
 class KProcess;
 
 /**
- * This class parses the output of "df" to tqfind the disk usage
+ * This class parses the output of "df" to find the disk usage
  * information for a given partition (mount point).
  */
-class KIO_EXPORT KDiskFreeSp : public TQObject
+class KIO_EXPORT KDiskFreeSp : public QObject
 {  Q_OBJECT
 public:
    KDiskFreeSp( TQObject *parent=0, const char *name=0 );
@@ -60,7 +60,7 @@ public:
     * if this mount point is found, with the info requested.
     * done is emitted in any case.
     */
-   static KDiskFreeSp * tqfindUsageInfo( const TQString & path );
+   static KDiskFreeSp * findUsageInfo( const TQString & path );
 
 signals:
    void foundMountPoint( const TQString & mountPoint, unsigned long kBSize, unsigned long kBUsed, unsigned long kBAvail );
diff --git a/kio/kfile/kencodingfiledialog.cpp b/kio/kfile/kencodingfiledialog.cpp
index be5ca033b..396006504 100644
--- a/kio/kfile/kencodingfiledialog.cpp
+++ b/kio/kfile/kencodingfiledialog.cpp
@@ -54,7 +54,7 @@ KEncodingFileDialog::KEncodingFileDialog(const TQString& startDir, const TQStrin
   d->encoding->clear ();
   TQString sEncoding = encoding;
   if (sEncoding.isEmpty())
-     sEncoding = TQString::tqfromLatin1(KGlobal::locale()->encoding());
+     sEncoding = TQString::fromLatin1(KGlobal::locale()->encoding());
   
   TQStringList encodings (KGlobal::charsets()->availableEncodingNames());
   int insert = 0;
diff --git a/kio/kfile/kencodingfiledialog.h b/kio/kfile/kencodingfiledialog.h
index ae28a9e76..15b44f9c3 100644
--- a/kio/kfile/kencodingfiledialog.h
+++ b/kio/kfile/kencodingfiledialog.h
@@ -32,8 +32,8 @@ struct KEncodingFileDialogPrivate;
  *
  *
  * The dialog has been designed to allow applications to customise it
- * by subclassing. It uses tqgeometry management to ensure that subclasses
- * can easily add children that will be incorporated into the tqlayout.
+ * by subclassing. It uses geometry management to ensure that subclasses
+ * can easily add children that will be incorporated into the layout.
  */
 
 class KIO_EXPORT KEncodingFileDialog : public KFileDialog
diff --git a/kio/kfile/kfiledetailview.cpp b/kio/kfile/kfiledetailview.cpp
index 6643d5a4c..823714396 100644
--- a/kio/kfile/kfiledetailview.cpp
+++ b/kio/kfile/kfiledetailview.cpp
@@ -317,7 +317,7 @@ void KFileDetailView::updateView( const KFileItem *i )
     item->init();
     setSortingKey( item, i );
 
-    //item->tqrepaint(); // only tqrepaints if visible
+    //item->repaint(); // only repaints if visible
 }
 
 void KFileDetailView::setSortingKey( KFileListViewItem *item,
diff --git a/kio/kfile/kfiledetailview.h b/kio/kfile/kfiledetailview.h
index 7e0baff83..937c8f56c 100644
--- a/kio/kfile/kfiledetailview.h
+++ b/kio/kfile/kfiledetailview.h
@@ -78,7 +78,7 @@ public:
 
     TQRect rect() const
     {
-        TQRect r = listView()->tqitemRect(this);
+        TQRect r = listView()->itemRect(this);
         return TQRect( listView()->viewportToContents( r.topLeft() ),
                       TQSize( r.width(), r.height() ) );
     }
diff --git a/kio/kfile/kfiledialog.cpp b/kio/kfile/kfiledialog.cpp
index 0cdeaa029..0c9364943 100644
--- a/kio/kfile/kfiledialog.cpp
+++ b/kio/kfile/kfiledialog.cpp
@@ -117,7 +117,7 @@ struct KFileDialogPrivate
     TQString selection;
 
     // now following all kind of widgets, that I need to rebuild
-    // the tqgeometry management
+    // the geometry management
     TQBoxLayout *boxLayout;
     TQWidget *mainWidget;
 
@@ -204,7 +204,7 @@ void KFileDialog::setLocationLabel(const TQString& text)
 
 void KFileDialog::setFilter(const TQString& filter)
 {
-    int pos = filter.tqfind('/');
+    int pos = filter.find('/');
 
     // Check for an un-escaped '/', if found
     // interpret as a MIME filter.
@@ -219,7 +219,7 @@ void KFileDialog::setFilter(const TQString& filter)
     // escaped '/' characters.
 
     TQString copy (filter);
-    for (pos = 0; (pos = copy.tqfind("\\/", pos)) != -1; ++pos)
+    for (pos = 0; (pos = copy.find("\\/", pos)) != -1; ++pos)
         copy.remove(pos, 1);
 
     ops->clearFilter();
@@ -258,7 +258,7 @@ void KFileDialog::setMimeFilter( const TQStringList& mimeTypes,
     filterWidget->setMimeFilter( mimeTypes, defaultType );
 
     TQStringList types = TQStringList::split(" ", filterWidget->currentFilter());
-    types.append( TQString::tqfromLatin1( "inode/directory" ));
+    types.append( TQString::fromLatin1( "inode/directory" ));
     ops->clearFilter();
     ops->setMimeFilter( types );
     d->hasDefaultFilter = !defaultType.isEmpty();
@@ -357,7 +357,7 @@ void KFileDialog::slotOk()
 
                 bool multi = (mode() & KFile::Files) != 0;
                 KFileItemListIterator it( *items );
-                TQString endQuote = TQString::tqfromLatin1("\" ");
+                TQString endQuote = TQString::fromLatin1("\" ");
                 TQString name, files;
                 while ( it.current() ) {
                     name = (*it)->name();
@@ -402,7 +402,7 @@ void KFileDialog::slotOk()
             }
         }
 
-        KURL url = KIO::NetAccess::mostLocalURL(d->url,tqtopLevelWidget());
+        KURL url = KIO::NetAccess::mostLocalURL(d->url,topLevelWidget());
         if ( (mode() & KFile::LocalOnly) == KFile::LocalOnly &&
              !url.isLocalFile() ) {
 // ### after message freeze, add message for directories!
@@ -422,7 +422,7 @@ void KFileDialog::slotOk()
 
     if ( (mode() & KFile::Files) == KFile::Files ) {// multiselection mode
         TQString locationText = locationEdit->currentText();
-        if ( locationText.tqcontains( '/' )) {
+        if ( locationText.contains( '/' )) {
             // relative path? -> prepend the current directory
             KURL u( ops->url(), KShell::tildeExpand(locationText));
             if ( u.isValid() )
@@ -446,7 +446,7 @@ void KFileDialog::slotOk()
        return;
     }
 
-    KURL url = KIO::NetAccess::mostLocalURL(selectedURL,tqtopLevelWidget());
+    KURL url = KIO::NetAccess::mostLocalURL(selectedURL,topLevelWidget());
     if ( (mode() & KFile::LocalOnly) == KFile::LocalOnly &&
          !url.isLocalFile() ) {
         KMessageBox::sorry( d->mainWidget,
@@ -538,7 +538,7 @@ void KFileDialog::slotOk()
     d->filenames = KShell::tildeExpand(locationEdit->currentText());
 
     if ( (mode() & KFile::Files) == KFile::Files &&
-         !locationEdit->currentText().tqcontains( '/' )) {
+         !locationEdit->currentText().contains( '/' )) {
         kdDebug(kfile_area) << "Files\n";
         KURL::List list = parseSelectedURLs();
         for ( KURL::List::ConstIterator it = list.begin();
@@ -555,7 +555,7 @@ void KFileDialog::slotOk()
               it != list.end(); ++it )
         {
             job = KIO::stat( *it, !(*it).isLocalFile() );
-            job->setWindow (tqtopLevelWidget());
+            job->setWindow (topLevelWidget());
             KIO::Scheduler::scheduleJob( job );
             d->statJobs.append( job );
             connect( job, TQT_SIGNAL( result(KIO::Job *) ),
@@ -565,7 +565,7 @@ void KFileDialog::slotOk()
     }
 
     job = KIO::stat(d->url,!d->url.isLocalFile());
-    job->setWindow (tqtopLevelWidget());
+    job->setWindow (topLevelWidget());
     d->statJobs.append( job );
     connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotStatResult(KIO::Job*)));
 }
@@ -658,7 +658,7 @@ void KFileDialog::accept()
     for ( ; it != list.end(); ++it ) {
         const KURL& url = *it;
         // we strip the last slash (-1) because KURLComboBox does that as well
-        // when operating in file-mode. If we wouldn't , dupe-tqfinding wouldn't
+        // when operating in file-mode. If we wouldn't , dupe-finding wouldn't
         // work.
         TQString file = url.isLocalFile() ? url.path(-1) : url.prettyURL(-1);
 
@@ -831,10 +831,10 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
     d->autoSelectExtChecked = false;
     d->urlBar = 0; // delayed loading
 
-    QtMsgHandler oldHandler = tqInstallMsgHandler( silenceQToolBar );
+    QtMsgHandler oldHandler = qInstallMsgHandler( silenceQToolBar );
     toolbar = new KToolBar( d->mainWidget, "KFileDialog::toolbar", true);
     toolbar->setFlat(true);
-    tqInstallMsgHandler( oldHandler );
+    qInstallMsgHandler( oldHandler );
 
     d->pathCombo = new KURLComboBox( KURLComboBox::Directories, true,
                                      toolbar, "path combo" );
@@ -1063,7 +1063,7 @@ void KFileDialog::initSpeedbar()
 
 void KFileDialog::initGUI()
 {
-    delete d->boxLayout; // deletes all sub tqlayouts
+    delete d->boxLayout; // deletes all sub layouts
 
     d->boxLayout = new TQVBoxLayout( d->mainWidget, 0, KDialog::spacingHint());
     d->boxLayout->addWidget(toolbar, AlignTop);
@@ -1133,7 +1133,7 @@ void KFileDialog::slotFilterChanged()
     TQString filter = filterWidget->currentFilter();
     ops->clearFilter();
 
-    if ( filter.tqfind( '/' ) > -1 ) {
+    if ( filter.find( '/' ) > -1 ) {
         TQStringList types = TQStringList::split( " ", filter );
         types.prepend( "inode/directory" );
         ops->setMimeFilter( types );
@@ -1204,7 +1204,7 @@ void KFileDialog::enterURL( const KURL& url)
 
 void KFileDialog::enterURL( const TQString& url )
 {
-    setURL( KURL::fromPathOrURL( KURLCompletion::tqreplacedPath( url, true, true )) );
+    setURL( KURL::fromPathOrURL( KURLCompletion::replacedPath( url, true, true )) );
 }
 
 void KFileDialog::toolbarCallback(int) // SLOT
@@ -1250,7 +1250,7 @@ void KFileDialog::setSelection(const TQString& url)
     }
     else {
         TQString filename = u.url();
-        int sep = filename.tqfindRev('/');
+        int sep = filename.findRev('/');
         if (sep >= 0) { // there is a / in it
             if ( KProtocolInfo::supportsListing( u )) {
                 KURL dir(u);
@@ -1310,9 +1310,9 @@ void KFileDialog::slotLocationChanged( const TQString& text )
     updateFilter();
 }
 
-void KFileDialog::updatetqStatusLine(int /* dirs */, int /* files */)
+void KFileDialog::updateStatusLine(int /* dirs */, int /* files */)
 {
-    kdWarning() << "KFileDialog::updatetqStatusLine is deprecated! The status line no longer exists. Do not try and use it!" << endl;
+    kdWarning() << "KFileDialog::updateStatusLine is deprecated! The status line no longer exists. Do not try and use it!" << endl;
 }
 
 TQString KFileDialog::getOpenFileName(const TQString& startDir,
@@ -1335,7 +1335,7 @@ TQString KFileDialog::getOpenFileNameWId(const TQString& startDir,
                                         const TQString& filter,
                                         WId parent_id, const TQString& caption)
 {
-    TQWidget* parent = TQWidget::tqfind( parent_id );
+    TQWidget* parent = TQWidget::find( parent_id );
     KFileDialog dlg(startDir, filter, parent, "filedialog", true);
 #ifdef Q_WS_X11
     if( parent == NULL && parent_id != 0 )
@@ -1471,10 +1471,10 @@ KURL::List& KFileDialog::parseSelectedURLs() const
     }
 
     d->urlList.clear();
-    if ( d->filenames.tqcontains( '/' )) { // assume _one_ absolute filename
+    if ( d->filenames.contains( '/' )) { // assume _one_ absolute filename
         static const TQString &prot = KGlobal::staticQString(":/");
         KURL u;
-        if ( d->filenames.tqfind( prot ) != -1 )
+        if ( d->filenames.find( prot ) != -1 )
             u = d->filenames;
         else
             u.setPath( d->filenames );
@@ -1504,7 +1504,7 @@ KURL::List KFileDialog::tokenize( const TQString& line ) const
     KURL u( ops->url() );
     TQString name;
 
-    int count = line.tqcontains( '"' );
+    int count = line.contains( '"' );
     if ( count == 0 ) { // no " " -> assume one single file
         u.setFileName( line );
         if ( u.isValid() )
@@ -1526,8 +1526,8 @@ KURL::List KFileDialog::tokenize( const TQString& line ) const
     int start = 0;
     int index1 = -1, index2 = -1;
     while ( true ) {
-        index1 = line.tqfind( '"', start );
-        index2 = line.tqfind( '"', index1 + 1 );
+        index1 = line.find( '"', start );
+        index2 = line.find( '"', index1 + 1 );
 
         if ( index1 < 0 )
             break;
@@ -1548,7 +1548,7 @@ TQString KFileDialog::selectedFile() const
 {
     if ( result() == TQDialog::Accepted )
     {
-      KURL url = KIO::NetAccess::mostLocalURL(d->url,tqtopLevelWidget());
+      KURL url = KIO::NetAccess::mostLocalURL(d->url,topLevelWidget());
        if (url.isLocalFile())
            return url.path();
        else {
@@ -1570,7 +1570,7 @@ TQStringList KFileDialog::selectedFiles() const
             KURL::List urls = parseSelectedURLs();
             TQValueListConstIterator<KURL> it = urls.begin();
             while ( it != urls.end() ) {
-              url = KIO::NetAccess::mostLocalURL(*it,tqtopLevelWidget());
+              url = KIO::NetAccess::mostLocalURL(*it,topLevelWidget());
                 if ( url.isLocalFile() )
                     list.append( url.path() );
                 ++it;
@@ -1617,7 +1617,7 @@ TQString KFileDialog::getSaveFileNameWId(const TQString& dir, const TQString& fi
                                      const TQString& caption)
 {
     bool specialDir = dir.at(0) == ':';
-    TQWidget* parent = TQWidget::tqfind( parent_id );
+    TQWidget* parent = TQWidget::find( parent_id );
     KFileDialog dlg( specialDir ? dir : TQString::null, filter, parent, "filedialog", true);
 #ifdef Q_WS_X11
     if( parent == NULL && parent_id != 0 )
@@ -1737,8 +1737,8 @@ void KFileDialog::readConfig( KConfig *kc, const TQString& group )
     d->autoSelectExtChecked = kc->readBoolEntry (AutoSelectExtChecked, DefaultAutoSelectExtChecked);
     updateAutoSelectExtension ();
 
-    int w1 = tqminimumSize().width();
-    int w2 = toolbar->tqsizeHint().width() + 10;
+    int w1 = minimumSize().width();
+    int w2 = toolbar->sizeHint().width() + 10;
     if (w1 < w2)
         setMinimumWidth(w2);
 
@@ -1885,7 +1885,7 @@ static TQString getExtensionFromPatternList (const TQStringList &patternList)
         // *.JP?
         if ((*it).startsWith ("*.") &&
             (*it).length () > 2 &&
-            (*it).tqfind ('*', 2) < 0 && (*it).tqfind ('?', 2) < 0)
+            (*it).find ('*', 2) < 0 && (*it).find ('?', 2) < 0)
         {
             ret = (*it).mid (1);
             break;
@@ -1937,7 +1937,7 @@ void KFileDialog::updateAutoSelectExtension (void)
         if (!filter.isEmpty ())
         {
             // e.g. "*.cpp"
-            if (filter.tqfind ('/') < 0)
+            if (filter.find ('/') < 0)
             {
                 d->extension = getExtensionFromPatternList (TQStringList::split (" ", filter)).lower ();
                 kdDebug (kfile_area) << "\tsetFilter-style: pattern ext=\'"
@@ -2056,10 +2056,10 @@ void KFileDialog::updateLocationEditExtension (const TQString &lastExtension)
     KURL url = getCompleteURL (urlStr);
     kdDebug (kfile_area) << "updateLocationEditExtension (" << url << ")" << endl;
 
-    const int fileNameOffset = urlStr.tqfindRev ('/') + 1;
+    const int fileNameOffset = urlStr.findRev ('/') + 1;
     TQString fileName = urlStr.mid (fileNameOffset);
 
-    const int dot = fileName.tqfindRev ('.');
+    const int dot = fileName.findRev ('.');
     const int len = fileName.length ();
     if (dot > 0 && // has an extension already and it's not a hidden file
                    // like ".hidden" (but we do accept ".hidden.ext")
@@ -2068,7 +2068,7 @@ void KFileDialog::updateLocationEditExtension (const TQString &lastExtension)
     {
         // exists?
         KIO::UDSEntry t;
-        if (KIO::NetAccess::stat (url, t, tqtopLevelWidget()))
+        if (KIO::NetAccess::stat (url, t, topLevelWidget()))
         {
             kdDebug (kfile_area) << "\tfile exists" << endl;
 
@@ -2112,10 +2112,10 @@ void KFileDialog::updateFilter ()
         if (urlStr.isEmpty ())
             return;
 
-        KMimeType::Ptr mime = KMimeType::tqfindByPath(urlStr, 0, true);
+        KMimeType::Ptr mime = KMimeType::findByPath(urlStr, 0, true);
         if (mime && mime->name() != KMimeType::defaultMimeType()) {
             if (filterWidget->currentFilter() != mime->name() &&
-                filterWidget->filters.tqfindIndex(mime->name()) != -1) {
+                filterWidget->filters.findIndex(mime->name()) != -1) {
                 filterWidget->setCurrentFilter(mime->name());
             }
         }
@@ -2135,7 +2135,7 @@ void KFileDialog::appendExtension (KURL &url)
     kdDebug (kfile_area) << "appendExtension(" << url << ")" << endl;
 
     const int len = fileName.length ();
-    const int dot = fileName.tqfindRev ('.');
+    const int dot = fileName.findRev ('.');
 
     const bool suppressExtension = (dot == len - 1);
     const bool unspecifiedExtension = (dot <= 0);
@@ -2146,7 +2146,7 @@ void KFileDialog::appendExtension (KURL &url)
 
     // exists?
     KIO::UDSEntry t;
-    if (KIO::NetAccess::stat (url, t, tqtopLevelWidget()))
+    if (KIO::NetAccess::stat (url, t, topLevelWidget()))
     {
         kdDebug (kfile_area) << "\tfile exists - won't append extension" << endl;
         return;
@@ -2265,7 +2265,7 @@ void KFileDialog::toggleBookmarks(bool show)
         connect( d->bookmarkHandler, TQT_SIGNAL( openURL( const TQString& )),
                     TQT_SLOT( enterURL( const TQString& )));
 
-        toolbar->insertButton(TQString::tqfromLatin1("bookmark"),
+        toolbar->insertButton(TQString::fromLatin1("bookmark"),
                               (int)HOTLIST_BUTTON, true,
                               i18n("Bookmarks"), 5);
         toolbar->getButton(HOTLIST_BUTTON)->setPopup(d->bookmarkHandler->menu(),
@@ -2359,13 +2359,13 @@ void KFileDialog::setNonExtSelection()
 {
     // Enhanced rename: Don't highlight the file extension.
     TQString pattern, filename = locationEdit->currentText().stripWhiteSpace();
-    KServiceTypeFactory::self()->tqfindFromPattern( filename, &pattern );
+    KServiceTypeFactory::self()->findFromPattern( filename, &pattern );
 
-    if ( !pattern.isEmpty() && pattern.at( 0 ) == '*' && pattern.tqfind( '*' , 1 ) == -1 )
+    if ( !pattern.isEmpty() && pattern.at( 0 ) == '*' && pattern.find( '*' , 1 ) == -1 )
        locationEdit->lineEdit()->setSelection( 0, filename.length() - pattern.stripWhiteSpace().length()+1 );
     else
     {
-       int lastDot = filename.tqfindRev( '.' );
+       int lastDot = filename.findRev( '.' );
        if ( lastDot > 0 )
           locationEdit->lineEdit()->setSelection( 0, lastDot );
     }
diff --git a/kio/kfile/kfiledialog.h b/kio/kfile/kfiledialog.h
index 1fd4f7b7f..33e0c9b12 100644
--- a/kio/kfile/kfiledialog.h
+++ b/kio/kfile/kfiledialog.h
@@ -57,7 +57,7 @@ struct KFileDialogPrivate;
  * Provides a user (and developer) friendly way to
  * select files and directories.
  *
- * The widget can be used as a drop in tqreplacement for the
+ * The widget can be used as a drop in replacement for the
  * TQFileDialog widget, but has greater functionality and a nicer GUI.
  *
  * You will usually want to use one of the static methods
@@ -65,8 +65,8 @@ struct KFileDialogPrivate;
  * or for multiple files getOpenFileNames() or getOpenURLs().
  *
  * The dialog has been designed to allow applications to customise it
- * by subclassing. It uses tqgeometry management to ensure that subclasses
- * can easily add children that will be incorporated into the tqlayout.
+ * by subclassing. It uses geometry management to ensure that subclasses
+ * can easily add children that will be incorporated into the layout.
  *
  * \image html kfiledialog.png "KDE File Dialog"
  *
@@ -276,7 +276,7 @@ public:
      * want to show the suffix to select by a specific filter, you must
      * repeat it.
      *
-     * If the filter tqcontains an unescaped '/', a mimetype-filter is assumed.
+     * If the filter contains an unescaped '/', a mimetype-filter is assumed.
      * If you would like a '/' visible in your filter it can be escaped with
      * a '\'. You can specify multiple mimetypes like this (separated with
      * space):
@@ -356,7 +356,7 @@ public:
      * Add a preview widget and enter the preview mode.
      *
      * In this mode
-     * the dialog is split and the right part tqcontains your widget.
+     * the dialog is split and the right part contains your widget.
      * This widget has to inherit TQWidget and it has to implement
      * a slot showPreview(const KURL &); which is called
      * every time the file changes. You may want to look at
@@ -370,7 +370,7 @@ public:
     /**
      * Adds a preview widget and enters the preview mode.
      *
-     * In this mode the dialog is split and the right part tqcontains your
+     * In this mode the dialog is split and the right part contains your
      * preview widget.
      *
      * Ownership is transferred to KFileDialog. You need to create the
@@ -811,7 +811,7 @@ signals:
      * Emitted when the filter changed, i.e. the user entered an own filter
      * or chose one of the predefined set via setFilter().
      *
-     * @param filter tqcontains the new filter (only the extension part,
+     * @param filter contains the new filter (only the extension part,
      * not the explanation), i.e. "*.cpp" or "*.cpp *.cc".
      *
      * @see setFilter()
@@ -840,7 +840,7 @@ protected:
     void init(const TQString& startDir, const TQString& filter, TQWidget* widget);
 
     /**
-      * rebuild tqgeometry management.
+      * rebuild geometry management.
       *
       */
     virtual void initGUI();
@@ -946,7 +946,7 @@ protected slots:
     /**
      * @deprecated
      */
-    virtual void updatetqStatusLine(int dirs, int files);
+    virtual void updateStatusLine(int dirs, int files);
 
     virtual void slotOk();
     virtual void accept();
diff --git a/kio/kfile/kfilefiltercombo.cpp b/kio/kfile/kfilefiltercombo.cpp
index 492c36d55..c865cc0e1 100644
--- a/kio/kfile/kfilefiltercombo.cpp
+++ b/kio/kfile/kfilefiltercombo.cpp
@@ -68,11 +68,11 @@ void KFileFilterCombo::setFilter(const TQString& filter)
 
     if (!filter.isEmpty()) {
 	TQString tmp = filter;
-	int index = tmp.tqfind('\n');
+	int index = tmp.find('\n');
 	while (index > 0) {
 	    filters.append(tmp.left(index));
 	    tmp = tmp.mid(index + 1);
-	    index = tmp.tqfind('\n');
+	    index = tmp.find('\n');
 	}
 	filters.append(tmp);
     } 
@@ -82,7 +82,7 @@ void KFileFilterCombo::setFilter(const TQString& filter)
     TQStringList::ConstIterator it;
 	TQStringList::ConstIterator end(filters.end());
     for (it = filters.begin(); it != end; ++it) {
-	int tab = (*it).tqfind('|');
+	int tab = (*it).find('|');
 	insertItem((tab < 0) ? *it :
 		   (*it).mid(tab + 1));
     }
@@ -101,7 +101,7 @@ TQString KFileFilterCombo::currentFilter() const
         }
     }
 
-    int tab = f.tqfind('|');
+    int tab = f.find('|');
     if (tab < 0)
 	return f;
     else
@@ -129,7 +129,7 @@ void KFileFilterCombo::setMimeFilter( const TQStringList& types,
 {
     clear();
     filters.clear();
-    TQString delim = TQString::tqfromLatin1(", ");
+    TQString delim = TQString::fromLatin1(", ");
     d->hasAllSupportedFiles = false;
 
     m_allTypes = defaultType.isEmpty() && (types.count() > 1);
diff --git a/kio/kfile/kfileiconview.cpp b/kio/kfile/kfileiconview.cpp
index ab68cba4a..a4c65924d 100644
--- a/kio/kfile/kfileiconview.cpp
+++ b/kio/kfile/kfileiconview.cpp
@@ -70,8 +70,8 @@ public:
 				      parent->actionCollection(),
 				      "large rows" );
 
-	smallColumns->setExclusiveGroup(TQString::tqfromLatin1("IconView mode"));
-	largeRows->setExclusiveGroup(TQString::tqfromLatin1("IconView mode"));
+	smallColumns->setExclusiveGroup(TQString::fromLatin1("IconView mode"));
+	largeRows->setExclusiveGroup(TQString::fromLatin1("IconView mode"));
 
         previews = new KToggleAction( i18n("Thumbnail Previews"), 0,
                                       parent->actionCollection(),
@@ -191,7 +191,7 @@ void KFileIconView::readConfig( KConfig *kc, const TQString& group )
 {
     TQString gr = group.isEmpty() ? TQString("KFileIconView") : group;
     KConfigGroupSaver cs( kc, gr );
-    TQString small = TQString::tqfromLatin1("SmallColumns");
+    TQString small = TQString::fromLatin1("SmallColumns");
     d->previewIconSize = kc->readNumEntry( "Preview Size", DEFAULT_PREVIEW_SIZE );
     d->previews->setChecked( kc->readBoolEntry( "ShowPreviews", DEFAULT_SHOW_PREVIEWS ) );
 
@@ -214,8 +214,8 @@ void KFileIconView::writeConfig( KConfig *kc, const TQString& group )
     KConfigGroupSaver cs( kc, gr );
 
     TQString viewMode =  d->smallColumns->isChecked() ?
-        TQString::tqfromLatin1("SmallColumns") :
-        TQString::tqfromLatin1("LargeRows");
+        TQString::fromLatin1("SmallColumns") :
+        TQString::fromLatin1("LargeRows");
     if(!kc->hasDefault( "ViewMode" ) && viewMode == DEFAULT_VIEW_MODE )
         kc->revertToDefault( "ViewMode" );
     else
@@ -251,12 +251,12 @@ void KFileIconView::showToolTip( TQIconViewItem *item )
     int w = maxItemWidth() - ( itemTextPos() == TQIconView::Bottom ? 0 :
 			       item->pixmapRect().width() ) - 4;
     if ( fontMetrics().width( item->text() ) >= w ) {
-	toolTip = new TQLabel( TQString::tqfromLatin1(" %1 ").arg(item->text()), 0,
+	toolTip = new TQLabel( TQString::fromLatin1(" %1 ").arg(item->text()), 0,
 			      "myToolTip",
 			      WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM );
 	toolTip->setFrameStyle( TQFrame::Plain | TQFrame::Box );
 	toolTip->setLineWidth( 1 );
-	toolTip->tqsetAlignment( AlignLeft | AlignTop );
+	toolTip->setAlignment( AlignLeft | AlignTop );
 	toolTip->move( TQCursor::pos() + TQPoint( 14, 14 ) );
 	toolTip->adjustSize();
 	TQRect screen = TQApplication::desktop()->screenGeometry(
@@ -338,7 +338,7 @@ void KFileIconView::insertItem( KFileItem *i )
     KFileView::insertItem( i );
 
     TQIconView* qview = static_cast<TQIconView*>( this );
-    // Since creating and initializing an item leads to a tqrepaint,
+    // Since creating and initializing an item leads to a repaint,
     // we disable updates on the IconView for a while.
     qview->setUpdatesEnabled( false );
     KFileIconViewItem *item = new KFileIconViewItem( qview, i );
@@ -450,7 +450,7 @@ void KFileIconView::updateView( bool b )
                 if ( !item->pixmapSize().isNull() )
                     item->setPixmapSize( TQSize( 0, 0 ) );
             }
-            // recalculate item parameters but avoid an in-place tqrepaint
+            // recalculate item parameters but avoid an in-place repaint
             item->setPixmap( (item->fileInfo())->pixmap( myIconSize ), true, false );
             item = static_cast<KFileIconViewItem *>(item->nextItem());
         } while ( item != 0L );
@@ -763,7 +763,7 @@ void KFileIconView::initItem( KFileIconViewItem *item, const KFileItem *i,
 
     if ( updateTextAndPixmap )
     {
-        // this causes a tqrepaint of the item, which we want to avoid during
+        // this causes a repaint of the item, which we want to avoid during
         // directory listing, when all items are created. We want to paint all
         // items at once, not every single item in that case.
         item->setText( i->text() , false, false );
@@ -866,7 +866,7 @@ void KFileIconView::contentsDragEnterEvent( TQDragEnterEvent *e )
     if ((dropOptions() & AutoOpenDirs) == 0)
        return;
 
-    KFileIconViewItem *item = dynamic_cast<KFileIconViewItem*>(tqfindItem( contentsToViewport( e->pos() ) ));
+    KFileIconViewItem *item = dynamic_cast<KFileIconViewItem*>(findItem( contentsToViewport( e->pos() ) ));
     if ( item ) {  // are we over an item ?
        d->dropItem = item;
        d->autoOpenTimer.start( autoOpenDelay() ); // restart timer
@@ -889,7 +889,7 @@ void KFileIconView::contentsDragMoveEvent( TQDragMoveEvent *e )
     if ((dropOptions() & AutoOpenDirs) == 0)
        return;
 
-    KFileIconViewItem *item = dynamic_cast<KFileIconViewItem*>(tqfindItem( contentsToViewport( e->pos() ) ));
+    KFileIconViewItem *item = dynamic_cast<KFileIconViewItem*>(findItem( contentsToViewport( e->pos() ) ));
     if ( item ) {  // are we over an item ?
        if (d->dropItem != item)
        {
@@ -921,7 +921,7 @@ void KFileIconView::contentsDropEvent( TQDropEvent *e )
     }
     e->acceptAction();     // Yes
 
-    KFileIconViewItem *item = dynamic_cast<KFileIconViewItem*>(tqfindItem( contentsToViewport( e->pos() ) ));
+    KFileIconViewItem *item = dynamic_cast<KFileIconViewItem*>(findItem( contentsToViewport( e->pos() ) ));
     KFileItem * fileItem = 0;
     if (item)
         fileItem = item->fileInfo();
diff --git a/kio/kfile/kfilemetapreview.cpp b/kio/kfile/kfilemetapreview.cpp
index 3b409158c..1be7743a1 100644
--- a/kio/kfile/kfilemetapreview.cpp
+++ b/kio/kfile/kfilemetapreview.cpp
@@ -21,9 +21,9 @@ KFileMetaPreview::KFileMetaPreview( TQWidget *parent, const char *name )
     : KPreviewWidgetBase( parent, name ),
       haveAudioPreview( false )
 {
-    TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 0, 0 );
+    TQHBoxLayout *layout = new TQHBoxLayout( this, 0, 0 );
     m_stack = new TQWidgetStack( this );
-    tqlayout->addWidget( m_stack );
+    layout->addWidget( m_stack );
 
     // ###
 //     m_previewProviders.setAutoDelete( true );
@@ -43,7 +43,7 @@ void KFileMetaPreview::initPreviewProviders()
     KImageFilePreview *imagePreview = new KImageFilePreview( m_stack );
     (void) m_stack->addWidget( imagePreview );
     m_stack->raiseWidget( imagePreview );
-    resize( imagePreview->tqsizeHint() );
+    resize( imagePreview->sizeHint() );
 
     TQStringList mimeTypes = imagePreview->supportedMimeTypes();
     TQStringList::ConstIterator it = mimeTypes.begin();
@@ -62,11 +62,11 @@ KPreviewWidgetBase * KFileMetaPreview::previewProviderFor( const TQString& mimeT
     if ( mimeType == "inode/directory" ) 
         return 0L;
 
-    KPreviewWidgetBase *provider = m_previewProviders.tqfind( mimeType );
+    KPreviewWidgetBase *provider = m_previewProviders.find( mimeType );
     if ( provider )
         return provider;
 
-//qDebug("#### didn't tqfind anything for: %s", mimeType.latin1());
+//qDebug("#### didn't find anything for: %s", mimeType.latin1());
 
     if ( s_tryAudioPreview && 
          !mimeType.startsWith("text/") && !mimeType.startsWith("image/") )
@@ -87,15 +87,15 @@ KPreviewWidgetBase * KFileMetaPreview::previewProviderFor( const TQString& mimeT
     }
 
     // with the new mimetypes from the audio-preview, try again
-    provider = m_previewProviders.tqfind( mimeType );
+    provider = m_previewProviders.find( mimeType );
     if ( provider )
         return provider;
 
     // ### mimetype may be image/* for example, try that
-    int index = mimeType.tqfind( '/' );
+    int index = mimeType.find( '/' );
     if ( index > 0 )
     {
-        provider = m_previewProviders.tqfind( mimeType.left( index + 1 ) + "*" );
+        provider = m_previewProviders.find( mimeType.left( index + 1 ) + "*" );
         if ( provider )
             return provider;
     }
@@ -107,7 +107,7 @@ KPreviewWidgetBase * KFileMetaPreview::previewProviderFor( const TQString& mimeT
         TQString parentMimeType = mimeInfo->parentMimeType();
         while ( !parentMimeType.isEmpty() )
         {
-            provider = m_previewProviders.tqfind( parentMimeType );
+            provider = m_previewProviders.find( parentMimeType );
             if ( provider )
                 return provider;
 
@@ -123,11 +123,11 @@ KPreviewWidgetBase * KFileMetaPreview::previewProviderFor( const TQString& mimeT
         {
             if ( textProperty.toBool() )
             {
-                provider = m_previewProviders.tqfind( "text/plain" );
+                provider = m_previewProviders.find( "text/plain" );
                 if ( provider )
                     return provider;
 
-                provider = m_previewProviders.tqfind( "text/*" );
+                provider = m_previewProviders.find( "text/*" );
                 if ( provider )
                     return provider;
             }
diff --git a/kio/kfile/kfilepreview.cpp b/kio/kfile/kfilepreview.cpp
index c0f73949e..b221a1ebb 100644
--- a/kio/kfile/kfilepreview.cpp
+++ b/kio/kfile/kfilepreview.cpp
@@ -53,7 +53,7 @@ KFilePreview::~KFilePreview()
 
     // don't delete the preview, we can reuse it
     // (it will get deleted by ~KDirOperator)
-    if ( preview && preview->tqparentWidget() == this ) {
+    if ( preview && preview->parentWidget() == this ) {
         preview->reparent(0L, 0, TQPoint(0, 0), false);
     }
 }
@@ -68,9 +68,9 @@ void KFilePreview::init( KFileView *view )
     preview = new TQWidget((TQSplitter*)this, "preview");
     TQString tmp = i18n("No preview available.");
     TQLabel *l = new TQLabel(tmp, preview);
-    l->setMinimumSize(l->tqsizeHint());
+    l->setMinimumSize(l->sizeHint());
     l->move(10, 5);
-    preview->setMinimumWidth(l->tqsizeHint().width()+20);
+    preview->setMinimumWidth(l->sizeHint().width()+20);
     setResizeMode(preview, TQSplitter::KeepSize);
 
     // Why copy the actions? --ellis, 13 Jan 02.
@@ -123,7 +123,7 @@ void KFilePreview::setPreviewWidget(const TQWidget *w, const KURL &)
     delete preview;
     preview = const_cast<TQWidget*>(w);
     preview->reparent((TQSplitter*)this, 0, TQPoint(0, 0), true);
-    preview->resize(preview->tqsizeHint());
+    preview->resize(preview->sizeHint());
     preview->show();
 }
 
@@ -149,7 +149,7 @@ void KFilePreview::updateView(bool b)
 {
     left->updateView(b);
     if(preview)
-        preview->tqrepaint(b);
+        preview->repaint(b);
 }
 
 void KFilePreview::updateView(const KFileItem *i)
diff --git a/kio/kfile/kfilepreview.h b/kio/kfile/kfilepreview.h
index 2bb2d860c..123d221f1 100644
--- a/kio/kfile/kfilepreview.h
+++ b/kio/kfile/kfilepreview.h
@@ -88,7 +88,7 @@ public:
 
     /**
      * This overrides KFileView::actionCollection() by returning
-     * the actionCollection() of the KFileView (member left) it tqcontains.
+     * the actionCollection() of the KFileView (member left) it contains.
      * This means that KFilePreview will never create a KActionCollection
      * object of its own.
      */
diff --git a/kio/kfile/kfilesharedlg.cpp b/kio/kfile/kfilesharedlg.cpp
index fa82539a8..329bd19dc 100644
--- a/kio/kfile/kfilesharedlg.cpp
+++ b/kio/kfile/kfilesharedlg.cpp
@@ -124,13 +124,13 @@ void KFileSharePropsPlugin::init()
             // 0 => not shared
             // 1 => shared read only
             // 3 => shared writeable
-            int dirtqStatus = KFileShare::isDirectoryShared( path );
+            int dirStatus = KFileShare::isDirectoryShared( path );
             if ( !path.startsWith( home ) )
                 ok = false;
-            if ( dirtqStatus == 1 ) {
+            if ( dirStatus == 1 ) {
                 d->m_bAllUnshared = false;
             }
-            else if ( dirtqStatus == 3 ) {
+            else if ( dirStatus == 3 ) {
                 d->m_bAllUnshared = false;
                 d->m_bAllReadOnly = false;
             }
@@ -184,13 +184,13 @@ void KFileSharePropsPlugin::init()
 
             // Some help text
             TQLabel *label = new TQLabel( i18n("Sharing this folder makes it available under Linux/UNIX (NFS) and Windows (Samba).") , m_widget );
-            label->tqsetAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::WordBreak );
+            label->setAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::WordBreak );
             vbox->addWidget( label, 0 );
 
 	    KSeparator* sep=new KSeparator(m_widget);
 	    vbox->addWidget( sep, 0 );
 	    label = new TQLabel( i18n("You can also reconfigure file sharing authorization.") , m_widget );
-            label->tqsetAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::WordBreak );
+            label->setAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::WordBreak );
 	    vbox->addWidget( label, 0 );
 	    m_pbConfig = new TQPushButton( i18n("Configure File Sharing..."), m_widget );
 	    connect( m_pbConfig, TQT_SIGNAL( clicked() ), TQT_SLOT( slotConfigureFileSharing() ) );
diff --git a/kio/kfile/kfilespeedbar.cpp b/kio/kfile/kfilespeedbar.cpp
index c96e1a60e..154009625 100644
--- a/kio/kfile/kfilespeedbar.cpp
+++ b/kio/kfile/kfilespeedbar.cpp
@@ -81,17 +81,17 @@ KFileSpeedBar::KFileSpeedBar( TQWidget *parent, const char *name )
 			while (!line.isNull())
 			{
 				if (line.startsWith("XDG_DOWNLOAD_DIR="))
-					download = line.remove("XDG_DOWNLOAD_DIR=").remove("\"").tqreplace("$HOME", TQDir::homeDirPath());
+					download = line.remove("XDG_DOWNLOAD_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
 				else if (line.startsWith("XDG_MUSIC_DIR="))
-					music = line.remove("XDG_MUSIC_DIR=").remove("\"").tqreplace("$HOME", TQDir::homeDirPath());
+					music = line.remove("XDG_MUSIC_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
 				else if (line.startsWith("XDG_PICTURES_DIR="))
-					pictures = line.remove("XDG_PICTURES_DIR=").remove("\"").tqreplace("$HOME", TQDir::homeDirPath());
+					pictures = line.remove("XDG_PICTURES_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
 				else if (line.startsWith("XDG_VIDEOS_DIR="))
-					videos = line.remove("XDG_VIDEOS_DIR=").remove("\"").tqreplace("$HOME", TQDir::homeDirPath());
+					videos = line.remove("XDG_VIDEOS_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
 				else if (line.startsWith("XDG_TEMPLATES_DIR="))
-					templates = line.remove("XDG_TEMPLATES_DIR=").remove("\"").tqreplace("$HOME", TQDir::homeDirPath());
+					templates = line.remove("XDG_TEMPLATES_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
 				else if (line.startsWith("XDG_PUBLICSHARES_DIR="))
-					publicShares = line.remove("XDG_PUBLICSHARES_DIR=").remove("\"").tqreplace("$HOME", TQDir::homeDirPath());
+					publicShares = line.remove("XDG_PUBLICSHARES_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
 
 				line = s.readLine();
 			}
@@ -133,15 +133,15 @@ void KFileSpeedBar::save( KConfig *config )
     writeConfig( config, "KFileDialog Speedbar" );
 }
 
-TQSize KFileSpeedBar::tqsizeHint() const
+TQSize KFileSpeedBar::sizeHint() const
 {
-    TQSize tqsizeHint = KURLBar::tqsizeHint();
+    TQSize sizeHint = KURLBar::sizeHint();
     int ems = fontMetrics().width("mmmmmmmmmmmm");
-    if (tqsizeHint.width() < ems)
+    if (sizeHint.width() < ems)
     {
-        tqsizeHint.setWidth(ems);
+        sizeHint.setWidth(ems);
     }
-    return tqsizeHint;
+    return sizeHint;
 }
 
 #include "kfilespeedbar.moc"
diff --git a/kio/kfile/kfilespeedbar.h b/kio/kfile/kfilespeedbar.h
index 171081101..28c621651 100644
--- a/kio/kfile/kfilespeedbar.h
+++ b/kio/kfile/kfilespeedbar.h
@@ -31,7 +31,7 @@ public:
     ~KFileSpeedBar();
 
     virtual void save( KConfig *config );
-    virtual TQSize tqsizeHint() const;
+    virtual TQSize sizeHint() const;
 
 private:
     bool m_initializeSpeedbar : 1;
diff --git a/kio/kfile/kfiletreebranch.cpp b/kio/kfile/kfiletreebranch.cpp
index c0a5d1b6e..352bd875e 100644
--- a/kio/kfile/kfiletreebranch.cpp
+++ b/kio/kfile/kfiletreebranch.cpp
@@ -126,7 +126,7 @@ KFileTreeViewItem *KFileTreeBranch::parentKFTVItem( KFileItem *item )
     dirUrl.setFileName( TQString::null );
     // kdDebug(250) << "Directory url is " << dirUrl.prettyURL() << endl;
 
-    parent  = tqfindTVIByURL( dirUrl );
+    parent  = findTVIByURL( dirUrl );
     // kdDebug(250) << "Returning as parent item <" << parent <<  ">" << endl;
     return( parent );
 }
@@ -141,7 +141,7 @@ void KFileTreeBranch::slotRefreshItems( const KFileItemList& list )
 
     while ( (currItem = it.current()) != 0 )
     {
-        item = tqfindTVIByURL(currItem->url());
+        item = findTVIByURL(currItem->url());
         if (item) {
             item->setPixmap(0, item->fileItem()->pixmap( KIcon::SizeSmall ));
             item->setText( 0, item->fileItem()->text());
@@ -182,14 +182,14 @@ void KFileTreeBranch::addItems( const KFileItemList& list )
             if( !m_showExtensions && !currItem->isDir() )	/* Need to cut the extension */
             {
                 TQString name = currItem->text();
-                int mPoint = name.tqfindRev( '.' );
+                int mPoint = name.findRev( '.' );
                 if( mPoint > 0 )
                     name = name.left( mPoint );
                 newKFTVI->setText( 0, name );
             }
         }
 
-        /* Now try to tqfind out if there are children for dirs in the treeview */
+        /* Now try to find out if there are children for dirs in the treeview */
         /* This stats a directory on the local file system and checks the */
         /* hardlink entry in the stat-buf. This works only for local directories. */
         if( dirOnlyMode() && !m_recurseChildren && currItem->isLocalFile( ) && currItem->isDir() )
@@ -197,7 +197,7 @@ void KFileTreeBranch::addItems( const KFileItemList& list )
             KURL url = currItem->url();
             TQString filename = url.directory( false, true ) + url.fileName();
             /* do the stat trick of Carsten. The problem is, that the hardlink
-             *  count only tqcontains directory links. Thus, this method only seem
+             *  count only contains directory links. Thus, this method only seem
              * to work in dir-only mode */
             kdDebug(250) << "Doing stat on " << filename << endl;
             KDE_struct_stat statBuf;
@@ -321,7 +321,7 @@ void KFileTreeBranch::slotCanceled( const KURL& url )
     m_openChildrenURLs.remove( url);
 
     // stop animations etc.
-    KFileTreeViewItem *item = tqfindTVIByURL(url);
+    KFileTreeViewItem *item = findTVIByURL(url);
     if (!item) return; // Uh oh...
     emit populateFinished(item);
 }
@@ -365,7 +365,7 @@ void KFileTreeBranch::slotRedirect( const KURL& oldUrl, const KURL&newUrl )
     }
 }
 
-KFileTreeViewItem* KFileTreeBranch::tqfindTVIByURL( const KURL& url )
+KFileTreeViewItem* KFileTreeBranch::findTVIByURL( const KURL& url )
 {
     KFileTreeViewItem *resultItem = 0;
 
@@ -400,7 +400,7 @@ KFileTreeViewItem* KFileTreeBranch::tqfindTVIByURL( const KURL& url )
 void KFileTreeBranch::slCompleted( const KURL& url )
 {
     kdDebug(250) << "SlotCompleted hit for " << url.prettyURL() << endl;
-    KFileTreeViewItem *currParent = tqfindTVIByURL( url );
+    KFileTreeViewItem *currParent = findTVIByURL( url );
     if( ! currParent ) return;
 
     kdDebug(250) << "current parent " << currParent << " is already listed: "
@@ -463,7 +463,7 @@ void KFileTreeBranch::slCompleted( const KURL& url )
         if( nextChild ) /* This implies that idx > -1 */
         {
             /* Next child is defined. We start a dirlister job on every child item
-             * which is a directory to tqfind out how much children are in the child
+             * which is a directory to find out how much children are in the child
              * of the last opened dir
              */
 
diff --git a/kio/kfile/kfiletreebranch.h b/kio/kfile/kfiletreebranch.h
index 03976a8d7..30f5cf47c 100644
--- a/kio/kfile/kfiletreebranch.h
+++ b/kio/kfile/kfiletreebranch.h
@@ -166,9 +166,9 @@ protected:
 
 public:
    /**
-    * tqfind the according KFileTreeViewItem by an url
+    * find the according KFileTreeViewItem by an url
     */
-   virtual KFileTreeViewItem *tqfindTVIByURL( const KURL& );
+   virtual KFileTreeViewItem *findTVIByURL( const KURL& );
 
 signals:
    /**
@@ -213,7 +213,7 @@ private:
    KURL::List           m_openChildrenURLs;
 
 
-   /* The next two members are used for caching purposes in tqfindTVIByURL. */
+   /* The next two members are used for caching purposes in findTVIByURL. */
    KURL                 m_lastFoundURL;
    KFileTreeViewItem   *m_lastFoundItem;
 
diff --git a/kio/kfile/kfiletreeview.cpp b/kio/kfile/kfiletreeview.cpp
index 2b38635b9..e8451077d 100644
--- a/kio/kfile/kfiletreeview.cpp
+++ b/kio/kfile/kfiletreeview.cpp
@@ -342,7 +342,7 @@ void KFileTreeView::slotAutoOpenFolder()
       return;
 
    m_dropItem->setOpen( true );
-   m_dropItem->tqrepaint();
+   m_dropItem->repaint();
 }
 
 
@@ -413,7 +413,7 @@ KFileTreeBranchList& KFileTreeView::branches()
 
 bool KFileTreeView::removeBranch( KFileTreeBranch *branch )
 {
-   if(m_branches.tqcontains(branch))
+   if(m_branches.contains(branch))
    {
       delete (branch->root());
       m_branches.remove( branch );
@@ -522,7 +522,7 @@ void KFileTreeView::slotAnimation()
       }
          
       uint & iconNumber = it.data().iconNumber;
-      TQString icon = TQString::tqfromLatin1( it.data().iconBaseName ).append( TQString::number( iconNumber ) );
+      TQString icon = TQString::fromLatin1( it.data().iconBaseName ).append( TQString::number( iconNumber ) );
       // kdDebug(250) << "Loading icon " << icon << endl;
       item->setPixmap( 0, DesktopIcon( icon,KIcon::SizeSmall,KIcon::ActiveState )); // KFileTreeViewFactory::instance() ) );
 
@@ -558,7 +558,7 @@ void KFileTreeView::stopAnimation( KFileTreeViewItem * item )
 
    kdDebug(250) << "Stoping Animation !" << endl;
 
-   MapCurrentOpeningFolders::Iterator it = m_mapCurrentOpeningFolders.tqfind(item);
+   MapCurrentOpeningFolders::Iterator it = m_mapCurrentOpeningFolders.find(item);
    if ( it != m_mapCurrentOpeningFolders.end() )
    {
       if( item->isDir() && isOpen( item) )
@@ -575,7 +575,7 @@ void KFileTreeView::stopAnimation( KFileTreeViewItem * item )
    else
    {
       if( item )
-	 kdDebug(250)<< "StopAnimation - could not tqfind item " << item->url().prettyURL()<< endl;
+	 kdDebug(250)<< "StopAnimation - could not find item " << item->url().prettyURL()<< endl;
       else
 	 kdDebug(250)<< "StopAnimation - item is zero !" << endl;
    }
@@ -616,13 +616,13 @@ void KFileTreeView::slotItemRenamed(TQListViewItem* item, const TQString &name,
    kdDebug(250) << "Do not bother: " << name << col << endl;
 }
 
-KFileTreeViewItem *KFileTreeView::tqfindItem( const TQString& branchName, const TQString& relUrl )
+KFileTreeViewItem *KFileTreeView::findItem( const TQString& branchName, const TQString& relUrl )
 {
    KFileTreeBranch *br = branch( branchName );
-   return( tqfindItem( br, relUrl ));
+   return( findItem( br, relUrl ));
 }
 
-KFileTreeViewItem *KFileTreeView::tqfindItem( KFileTreeBranch* brnch, const TQString& relUrl )
+KFileTreeViewItem *KFileTreeView::findItem( KFileTreeBranch* brnch, const TQString& relUrl )
 {
    KFileTreeViewItem *ret = 0;
    if( brnch )
@@ -666,7 +666,7 @@ void KFileTreeViewToolTip::maybeTip( const TQPoint & )
     if ( item ) {
 	TQString text = static_cast<KFileViewItem*>( item )->toolTipText();
 	if ( !text.isEmpty() )
-	    tip ( m_view->tqitemRect( item ), text );
+	    tip ( m_view->itemRect( item ), text );
     }
 #endif
 }
diff --git a/kio/kfile/kfiletreeview.h b/kio/kfile/kfiletreeview.h
index 03c4661b2..92565269d 100644
--- a/kio/kfile/kfiletreeview.h
+++ b/kio/kfile/kfiletreeview.h
@@ -58,7 +58,7 @@ private:
  * KFileTreeBranch.
  *
  * Typical usage:
- * 1. create a KFileTreeView fitting in your tqlayout and add columns to it
+ * 1. create a KFileTreeView fitting in your layout and add columns to it
  * 2. call addBranch to create one or more branches
  * 3. retrieve the root item with KFileTreeBranch::root() and set it open
  *    if desired. That starts the listing.
@@ -133,18 +133,18 @@ public:
 
    /**
     * searches a branch for a KFileTreeViewItem identified by the relative url given as
-    * second parameter. The method adds the branches base url to the relative path and tqfinds
+    * second parameter. The method adds the branches base url to the relative path and finds
     * the item.
     * @returns a pointer to the item or zero if the item does not exist.
     * @param brnch  is a pointer to the branch to search in
     * @param relUrl is the branch relativ url
     */
-   KFileTreeViewItem *tqfindItem( KFileTreeBranch* brnch, const TQString& relUrl );
+   KFileTreeViewItem *findItem( KFileTreeBranch* brnch, const TQString& relUrl );
 
    /**
     * see method above, differs only in the first parameter. Finds the branch by its name.
     */
-   KFileTreeViewItem *tqfindItem( const TQString& branchName, const TQString& relUrl );
+   KFileTreeViewItem *findItem( const TQString& branchName, const TQString& relUrl );
 
    /**
     * @returns a flag indicating if extended folder pixmaps are displayed or not.
diff --git a/kio/kfile/kfileview.cpp b/kio/kfile/kfileview.cpp
index eb12a9498..165801652 100644
--- a/kio/kfile/kfileview.cpp
+++ b/kio/kfile/kfileview.cpp
@@ -258,7 +258,7 @@ sort_by_name:
 
 void  KFileView::updateView(bool f)
 {
-    widget()->tqrepaint(f);
+    widget()->repaint(f);
 }
 
 void KFileView::updateView(const KFileItem *)
diff --git a/kio/kfile/kfileview.h b/kio/kfile/kfileview.h
index 1a13e264e..05b32e863 100644
--- a/kio/kfile/kfileview.h
+++ b/kio/kfile/kfileview.h
@@ -34,7 +34,7 @@ class KActionCollection;
  * internal class to make easier to use signals possible
  * @internal
  **/
-class KIO_EXPORT KFileViewSignaler : public TQObject
+class KIO_EXPORT KFileViewSignaler : public QObject
 {
     Q_OBJECT
 
@@ -146,11 +146,11 @@ public:
     virtual void clear();
 
     /**
-      * does a tqrepaint of the view.
+      * does a repaint of the view.
       *
       * The default implementation calls
       * \code
-      * widget()->tqrepaint(f)
+      * widget()->repaint(f)
       * \endcode
       **/
     virtual void updateView(bool f = true);
diff --git a/kio/kfile/kicondialog.cpp b/kio/kfile/kicondialog.cpp
index e33db8d69..164abd35a 100644
--- a/kio/kfile/kicondialog.cpp
+++ b/kio/kfile/kicondialog.cpp
@@ -68,7 +68,7 @@ protected:
 public:
  IconPath(const TQString &ip) : TQString (ip)
  {
-   int n = tqfindRev('/');
+   int n = findRev('/');
    m_iconName = (n==-1) ? static_cast<TQString>(*this) : mid(n+1);
  }
 
@@ -136,8 +136,8 @@ void KIconCanvas::slotLoadFiles()
     for (it=mFiles.begin(), i=0; it!=end; ++it, i++)
     {
 	// Calling kapp->processEvents() makes the iconview flicker like hell
-	// (it's being tqrepainted once for every new item), so we don't do this.
-	// Instead, we directly tqrepaint the progress bar without going through
+	// (it's being repainted once for every new item), so we don't do this.
+	// Instead, we directly repaint the progress bar without going through
 	// the event-loop. We do that just once for every 10th item so that
 	// the progress bar doesn't flicker in turn. (pfeiffer)
 	if ( emitProgress >= 10 ) {
@@ -259,7 +259,7 @@ void KIconDialog::init()
     mGroupOrSize = KIcon::Desktop;
     mContext = KIcon::Any;
     mType = 0;
-    mFileList = KGlobal::dirs()->findAllResources("appicon", TQString::tqfromLatin1("*.png"));
+    mFileList = KGlobal::dirs()->findAllResources("appicon", TQString::fromLatin1("*.png"));
 
     TQWidget *main = new TQWidget( this );
     setMainWidget(main);
@@ -268,11 +268,11 @@ void KIconDialog::init()
     top->setSpacing( spacingHint() );
 
     TQButtonGroup *bgroup = new TQButtonGroup(0, Qt::Vertical, i18n("Icon Source"), main);
-    bgroup->tqlayout()->setSpacing(KDialog::spacingHint());
-    bgroup->tqlayout()->setMargin(KDialog::marginHint());
+    bgroup->layout()->setSpacing(KDialog::spacingHint());
+    bgroup->layout()->setMargin(KDialog::marginHint());
     top->addWidget(bgroup);
     connect(bgroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotButtonClicked(int)));
-    TQGridLayout *grid = new TQGridLayout(bgroup->tqlayout(), 3, 2);
+    TQGridLayout *grid = new TQGridLayout(bgroup->layout(), 3, 2);
     mpRb1 = new TQRadioButton(i18n("S&ystem icons:"), bgroup);
     grid->addWidget(mpRb1, 1, 0);
     mpCombo = new TQComboBox(bgroup);
@@ -338,7 +338,7 @@ void KIconDialog::init()
         I18N_NOOP( "International" ),
         I18N_NOOP( "Mimetypes" ),
         I18N_NOOP( "Places" ),
-        I18N_NOOP( "tqStatus" ) };
+        I18N_NOOP( "Status" ) };
     static const KIcon::Context context_id[] = {
         KIcon::Action,
         KIcon::Animation,
@@ -351,7 +351,7 @@ void KIconDialog::init()
         KIcon::International,
         KIcon::MimeType,
         KIcon::Place,
-        KIcon::tqStatusIcon };
+        KIcon::StatusIcon };
     mNumContext = 0;
     int cnt = sizeof( context_text ) / sizeof( context_text[ 0 ] );
     // check all 3 arrays have same sizes
@@ -367,7 +367,7 @@ void KIconDialog::init()
             mContextMap[ mNumContext++ ] = context_id[ i ];
         }
     }
-    mpCombo->setFixedSize(mpCombo->tqsizeHint());
+    mpCombo->setFixedSize(mpCombo->sizeHint());
 
     mpBrowseBut->setFixedWidth(mpCombo->width());
 
@@ -631,8 +631,8 @@ void KIconDialog::slotProgress(int p)
 {
     mpProgress->setProgress(p);
     // commented out the following since setProgress already paints ther
-    // progress bar. ->tqrepaint() only makes it flicker
-    //mpProgress->tqrepaint();
+    // progress bar. ->repaint() only makes it flicker
+    //mpProgress->repaint();
 }
 
 void KIconDialog::slotFinished()
diff --git a/kio/kfile/kimagefilepreview.cpp b/kio/kfile/kimagefilepreview.cpp
index f2869314c..2d9f7881a 100644
--- a/kio/kfile/kimagefilepreview.cpp
+++ b/kio/kfile/kimagefilepreview.cpp
@@ -43,8 +43,8 @@ KImageFilePreview::KImageFilePreview( TQWidget *parent )
 
     imageLabel = new TQLabel( this );
     imageLabel->setFrameStyle( TQFrame::NoFrame );
-    imageLabel->tqsetAlignment( Qt::AlignHCenter | Qt::AlignVCenter );
-    imageLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding) );
+    imageLabel->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter );
+    imageLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding) );
     vb->addWidget( imageLabel );
 
     TQHBoxLayout *hb = new TQHBoxLayout( 0 );
@@ -137,7 +137,7 @@ void KImageFilePreview::resizeEvent( TQResizeEvent * )
     timer->start( 100, true ); // forces a new preview
 }
 
-TQSize KImageFilePreview::tqsizeHint() const
+TQSize KImageFilePreview::sizeHint() const
 {
     return TQSize( 20, 200 ); // otherwise it ends up huge???
 }
diff --git a/kio/kfile/kimagefilepreview.h b/kio/kfile/kimagefilepreview.h
index 3e64f2a7b..864fc5d31 100644
--- a/kio/kfile/kimagefilepreview.h
+++ b/kio/kfile/kimagefilepreview.h
@@ -36,7 +36,7 @@ class KIO_EXPORT KImageFilePreview : public KPreviewWidgetBase
 		KImageFilePreview(TQWidget *parent);
 		~KImageFilePreview();
 
-		virtual TQSize tqsizeHint() const;
+		virtual TQSize sizeHint() const;
 
 	public slots:
 		virtual void showPreview(const KURL &url);
diff --git a/kio/kfile/kmetaprops.cpp b/kio/kfile/kmetaprops.cpp
index a8c859792..281fbc622 100644
--- a/kio/kfile/kmetaprops.cpp
+++ b/kio/kfile/kmetaprops.cpp
@@ -56,8 +56,8 @@ protected:
     virtual void viewportResizeEvent(TQResizeEvent* ev)
     {
       TQScrollView::viewportResizeEvent(ev);
-      m_frame->resize( kMax(m_frame->tqsizeHint().width(), ev->size().width()),
-                       kMax(m_frame->tqsizeHint().height(), ev->size().height()));
+      m_frame->resize( kMax(m_frame->sizeHint().width(), ev->size().width()),
+                       kMax(m_frame->sizeHint().height(), ev->size().height()));
     };
 
 private:
@@ -71,7 +71,7 @@ public:
     ~KFileMetaPropsPluginPrivate() {}
 
     TQFrame*                       m_frame;
-    TQGridLayout*                  m_frametqlayout;
+    TQGridLayout*                  m_framelayout;
     KFileMetaInfo                 m_info;
 //    TQPushButton*                m_add;
     TQPtrList<KFileMetaInfoWidget> m_editWidgets;
@@ -138,8 +138,8 @@ void KFileMetaPropsPlugin::createLayout()
 
     d->m_frame = view->frame();
 
-    TQVBoxLayout *toptqlayout = new TQVBoxLayout(d->m_frame);
-    toptqlayout->setSpacing(KDialog::spacingHint());
+    TQVBoxLayout *toplayout = new TQVBoxLayout(d->m_frame);
+    toplayout->setSpacing(KDialog::spacingHint());
 
     for (TQStringList::Iterator git=groupList.begin(); 
             git!=groupList.end(); ++git)
@@ -154,7 +154,7 @@ void KFileMetaPropsPlugin::createLayout()
             TQStyleSheet::escape(mtinfo->groupInfo(*git)->translatedName()), 
             d->m_frame);
 
-        toptqlayout->addWidget(groupBox);
+        toplayout->addWidget(groupBox);
 
         TQValueList<KFileMetaInfoItem> readItems;
         TQValueList<KFileMetaInfoItem> editItems;
@@ -174,12 +174,12 @@ void KFileMetaPropsPlugin::createLayout()
         }
 
         KFileMetaInfoWidget* w = 0L;
-        // then first add the editable items to the tqlayout
+        // then first add the editable items to the layout
         for (TQValueList<KFileMetaInfoItem>::Iterator iit= editItems.begin(); 
                 iit!=editItems.end(); ++iit)
         {
             TQLabel* l = new TQLabel((*iit).translatedKey() + ":", groupBox);
-            l->tqsetAlignment( AlignAuto | AlignTop | ExpandTabs );
+            l->setAlignment( AlignAuto | AlignTop | ExpandTabs );
             TQValidator* val = mtinfo->createValidator(*git, (*iit).key());
             if (!val) kdDebug(7033) << "didn't get a validator for " << *git << "/" << (*iit).key() << endl;
             w = new KFileMetaInfoWidget(*iit, val, groupBox);
@@ -192,16 +192,16 @@ void KFileMetaPropsPlugin::createLayout()
                 iit!=readItems.end(); ++iit)
         {
             TQLabel* l = new TQLabel((*iit).translatedKey() + ":", groupBox);
-            l->tqsetAlignment( AlignAuto | AlignTop | ExpandTabs );
+            l->setAlignment( AlignAuto | AlignTop | ExpandTabs );
             (new KFileMetaInfoWidget(*iit, KFileMetaInfoWidget::ReadOnly, 0L, groupBox));
         }
     }
 
-    toptqlayout->addStretch(1);
+    toplayout->addStretch(1);
 
     // the add key (disabled until fully implemented)
 /*    d->m_add = new TQPushButton(i18n("&Add"), topframe);
-    d->m_add->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,
+    d->m_add->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,
                                         TQSizePolicy::Fixed));
     connect(d->m_add, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAdd()));
     tmp->addWidget(d->m_add);
@@ -216,7 +216,7 @@ void KFileMetaPropsPlugin::createLayout()
         d->m_add->setEnabled(false);
         for (TQStringList::Iterator it = sk.begin(); it!=sk.end(); ++it)
         {
-                if ( l.tqfind(*it)==l.end() )
+                if ( l.find(*it)==l.end() )
                 {
                     d->m_add->setEnabled(true);
                     kdDebug(250) << "**first addable key is " << (*it).latin1() << "**" <<endl;
diff --git a/kio/kfile/knotifydialog.cpp b/kio/kfile/knotifydialog.cpp
index 3ed69ec71..9e370643f 100644
--- a/kio/kfile/knotifydialog.cpp
+++ b/kio/kfile/knotifydialog.cpp
@@ -65,7 +65,7 @@ enum
 };
 
 //
-// I don't feel like subclassing KComboBox and tqfind ways to insert that into
+// I don't feel like subclassing KComboBox and find ways to insert that into
 // the .ui file...
 //
 namespace KNotify
@@ -130,7 +130,7 @@ namespace KNotify
     protected:
         virtual void maybeTip ( const TQPoint& p )
         {
-            TQHeader *header = static_cast<TQHeader*>( tqparentWidget() );
+            TQHeader *header = static_cast<TQHeader*>( parentWidget() );
             int section = 0;
 
             if ( header->orientation() == Horizontal )
@@ -181,7 +181,7 @@ KNotifyDialog::~KNotifyDialog()
 void KNotifyDialog::addApplicationEvents( const char *appName )
 {
     addApplicationEvents( TQString::fromUtf8( appName ) +
-                          TQString::tqfromLatin1( "/eventsrc" ) );
+                          TQString::fromLatin1( "/eventsrc" ) );
 }
 
 void KNotifyDialog::addApplicationEvents( const TQString& path )
@@ -514,7 +514,7 @@ void KNotifyWidget::updatePixmaps( ListViewItem *item )
 
 void KNotifyWidget::addVisibleApp( Application *app )
 {
-    if ( !app || (m_visibleApps.tqfindRef( app ) != -1) )
+    if ( !app || (m_visibleApps.findRef( app ) != -1) )
         return;
 
     m_visibleApps.append( app );
@@ -830,8 +830,8 @@ void KNotifyWidget::save()
 // "/opt/kde3/share/apps/kwin/eventsrc"
 TQString KNotifyWidget::makeRelative( const TQString& fullPath )
 {
-    int slash = fullPath.tqfindRev( '/' ) - 1;
-    slash = fullPath.tqfindRev( '/', slash );
+    int slash = fullPath.findRev( '/' ) - 1;
+    slash = fullPath.findRev( '/', slash );
 
     if ( slash < 0 )
         return TQString::null;
@@ -861,7 +861,7 @@ void KNotifyWidget::openSoundDialog( KURLRequester *requester )
             << "audio/x-adpcm";
     fileDialog->setMimeFilter( filters );
 
-    // tqfind the first "sound"-resource that tqcontains files
+    // find the first "sound"-resource that contains files
     const Application *app = currentEvent()->application();
     TQStringList soundDirs =
         KGlobal::dirs()->findDirs("data", app->appName() + "/sounds");
@@ -918,7 +918,7 @@ void KNotifyWidget::playSound()
     if (!KIO::NetAccess::exists( m_soundPath->url(), true, 0 )) {        
         bool foundSound=false;
 
-        // tqfind the first "sound"-resource that tqcontains files
+        // find the first "sound"-resource that contains files
         const Application *app = currentEvent()->application();
         TQStringList soundDirs = KGlobal::dirs()->findDirs("data", app->appName() + "/sounds");
         soundDirs += KGlobal::dirs()->resourceDirs( "sound" );
@@ -1001,17 +1001,17 @@ void KNotifyWidget::enableAll( int what, bool enable )
 Application::Application( const TQString &path )
 {
     TQString config_file = path;
-    config_file[config_file.tqfind('/')] = '.';
+    config_file[config_file.find('/')] = '.';
     m_events = 0L;
     config = new KConfig(config_file, false, false);
     kc = new KConfig(path, true, false, "data");
-    kc->setGroup( TQString::tqfromLatin1("!Global!") );
-    m_icon = kc->readEntry(TQString::tqfromLatin1("IconName"),
-                           TQString::tqfromLatin1("misc"));
-    m_description = kc->readEntry( TQString::tqfromLatin1("Comment"),
+    kc->setGroup( TQString::fromLatin1("!Global!") );
+    m_icon = kc->readEntry(TQString::fromLatin1("IconName"),
+                           TQString::fromLatin1("misc"));
+    m_description = kc->readEntry( TQString::fromLatin1("Comment"),
                                    i18n("No description available") );
 
-    int index = path.tqfind( '/' );
+    int index = path.find( '/' );
     if ( index >= 0 )
         m_appname = path.left( index );
     else
@@ -1070,10 +1070,10 @@ void Application::reloadEvents( bool revertToDefaults )
 
     Event *e = 0L;
 
-    TQString global = TQString::tqfromLatin1("!Global!");
-    TQString default_group = TQString::tqfromLatin1("<default>");
-    TQString name = TQString::tqfromLatin1("Name");
-    TQString comment = TQString::tqfromLatin1("Comment");
+    TQString global = TQString::fromLatin1("!Global!");
+    TQString default_group = TQString::fromLatin1("<default>");
+    TQString name = TQString::fromLatin1("Name");
+    TQString comment = TQString::fromLatin1("Comment");
 
     TQStringList conflist = kc->groupList();
     TQStringList::ConstIterator it = conflist.begin();
diff --git a/kio/kfile/knotifydialog.h b/kio/kfile/knotifydialog.h
index cc801ae8c..70e195aba 100644
--- a/kio/kfile/knotifydialog.h
+++ b/kio/kfile/knotifydialog.h
@@ -64,7 +64,7 @@ public:
      * @param name The widget name
      * @param modal If true, this will be a modal dialog, otherwise non-modal.
      * @param aboutData A pointer to a KAboutData object. KAboutData::appName()
-     *                  will be used to tqfind the KNotify events (in the eventsrc file).
+     *                  will be used to find the KNotify events (in the eventsrc file).
      *                  Set this to 0L if you want to add all events yourself with
      * addApplicationEvents().
      */
@@ -83,7 +83,7 @@ public:
      * @param parent The parent widget for the dialog
      * @param name The widget name
      * @param aboutData A pointer to a KAboutData object. KAboutData::appName()
-     *                  will be used to tqfind the KNotify events (in the eventsrc file).
+     *                  will be used to find the KNotify events (in the eventsrc file).
      * @see exec for the return values.
      * @return The value of TQDialog::exec()
      */
@@ -169,7 +169,7 @@ namespace KNotify
         EventList *m_events;
 
         KConfig *kc; // The file that defines the events.
-        KConfig *config; // The file that tqcontains the settings for the events
+        KConfig *config; // The file that contains the settings for the events
     };
 
 
diff --git a/kio/kfile/knotifywidgetbase.ui b/kio/kfile/knotifywidgetbase.ui
index 87eff311b..99fd07582 100644
--- a/kio/kfile/knotifywidgetbase.ui
+++ b/kio/kfile/knotifywidgetbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>KNotifyWidgetBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -138,7 +138,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>20</height>
@@ -155,7 +155,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>318</width>
                             <height>16</height>
@@ -286,7 +286,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>20</height>
@@ -391,7 +391,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>0</height>
@@ -464,6 +464,6 @@
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
     <include location="global" impldecl="in implementation">kcombobox.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kio/kfile/kopenwith.cpp b/kio/kfile/kopenwith.cpp
index e9a13b7c5..2a3e7e690 100644
--- a/kio/kfile/kopenwith.cpp
+++ b/kio/kfile/kopenwith.cpp
@@ -279,8 +279,8 @@ void KApplicationTree::slotSelectionChanged(TQListViewItem* i)
 
 void KApplicationTree::resizeEvent( TQResizeEvent * e)
 {
-    setColumnWidth(0, width()-TQApplication::style().tqpixelMetric(TQStyle::PM_ScrollBarExtent)
-                         -2*TQApplication::style().tqpixelMetric(TQStyle::PM_DefaultFrameWidth));
+    setColumnWidth(0, width()-TQApplication::style().pixelMetric(TQStyle::PM_ScrollBarExtent)
+                         -2*TQApplication::style().pixelMetric(TQStyle::PM_DefaultFrameWidth));
     KListView::resizeEvent(e);
 }
 
@@ -340,7 +340,7 @@ KOpenWithDlg::KOpenWithDlg( const KURL::List& _urls, const TQString&_text,
 {
   TQString caption = KStringHandler::csqueeze( _urls.first().prettyURL() );
   if (_urls.count() > 1)
-      caption += TQString::tqfromLatin1("...");
+      caption += TQString::fromLatin1("...");
   setCaption(caption);
   setServiceType( _urls );
   init( _text, _value );
@@ -376,7 +376,7 @@ void KOpenWithDlg::setServiceType( const KURL::List& _urls )
   if ( _urls.count() == 1 )
   {
     qServiceType = KMimeType::findByURL( _urls.first())->name();
-    if (qServiceType == TQString::tqfromLatin1("application/octet-stream"))
+    if (qServiceType == TQString::fromLatin1("application/octet-stream"))
       qServiceType = TQString::null;
   }
   else
@@ -401,7 +401,7 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value )
 
   TQToolButton *clearButton = new TQToolButton( this );
   clearButton->setIconSet( BarIcon( "locationbar_erase" ) );
-  clearButton->setFixedSize( clearButton->tqsizeHint() );
+  clearButton->setFixedSize( clearButton->sizeHint() );
   connect( clearButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotClear() ) );
   TQToolTip::add( clearButton, i18n( "Clear input field" ) );
 
@@ -413,13 +413,13 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value )
     KHistoryCombo *combo = new KHistoryCombo();
     combo->setDuplicatesEnabled( false );
     KConfig *kc = KGlobal::config();
-    KConfigGroupSaver ks( kc, TQString::tqfromLatin1("Open-with settings") );
-    int max = kc->readNumEntry( TQString::tqfromLatin1("Maximum history"), 15 );
+    KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") );
+    int max = kc->readNumEntry( TQString::fromLatin1("Maximum history"), 15 );
     combo->setMaxCount( max );
-    int mode = kc->readNumEntry(TQString::tqfromLatin1("CompletionMode"),
+    int mode = kc->readNumEntry(TQString::fromLatin1("CompletionMode"),
 				KGlobalSettings::completionMode());
     combo->setCompletionMode((KGlobalSettings::Completion)mode);
-    TQStringList list = kc->readListEntry( TQString::tqfromLatin1("History") );
+    TQStringList list = kc->readListEntry( TQString::fromLatin1("History") );
     combo->setHistoryItems( list, true );
     edit = new KURLRequester( combo, this );
   }
@@ -433,7 +433,7 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value )
 
   edit->setURL( _value );
   TQWhatsThis::add(edit,i18n(
-    "Following the command, you can have several place holders which will be tqreplaced "
+    "Following the command, you can have several place holders which will be replaced "
     "with the actual values when the actual program is run:\n"
     "%f - a single file name\n"
     "%F - a list of files; use for applications that can open several local files at once\n"
@@ -483,8 +483,8 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value )
 
   // check to see if we use konsole if not disable the nocloseonexit
   // because we don't know how to do this on other terminal applications
-  KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") );
-  TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::tqfromLatin1("konsole"));
+  KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") );
+  TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole"));
 
   if (bReadOnly || preferredTerminal != "konsole")
      nocloseonexit->hide();
@@ -512,13 +512,13 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value )
   TQPushButton* cancel = b->addButton(  KStdGuiItem::cancel() );
   connect(  cancel, TQT_SIGNAL( clicked() ), TQT_SLOT( reject() ) );
 
-  b->tqlayout();
+  b->layout();
   topLayout->addWidget( b );
 
   //edit->setText( _value );
   // This is what caused "can't click on items before clicking on Name header".
   // Probably due to the resizeEvent handler using width().
-  //resize( minimumWidth(), tqsizeHint().height() );
+  //resize( minimumWidth(), sizeHint().height() );
   edit->setFocus();
   slotTextChanged();
 }
@@ -564,7 +564,7 @@ void KOpenWithDlg::slotHighlighted( const TQString& _name, const TQString& )
         // ### indicate that default value was restored
         terminal->setChecked(d->curService->terminal());
         TQString terminalOptions = d->curService->terminalOptions();
-        nocloseonexit->setChecked( (terminalOptions.tqcontains( "--noclose" ) > 0) );
+        nocloseonexit->setChecked( (terminalOptions.contains( "--noclose" ) > 0) );
         m_terminaldirty = false; // slotTerminalToggled changed it
     }
 }
@@ -629,17 +629,17 @@ void KOpenWithDlg::slotOK()
         kdDebug(250) << "looking for service " << serviceName << endl;
         KService::Ptr serv = KService::serviceByDesktopName( serviceName );
         ok = !serv; // ok if no such service yet
-        // also ok if we tqfind the exact same service (well, "kwrite" == "kwrite %U"
+        // also ok if we find the exact same service (well, "kwrite" == "kwrite %U"
         if ( serv && serv->type() == "Application")
         {
             TQString exec = serv->exec();
             fullExec = exec;
-            exec.tqreplace("%u", "", false);
-            exec.tqreplace("%f", "", false);
-            exec.tqreplace("-caption %c", "");
-            exec.tqreplace("-caption \"%c\"", "");
-            exec.tqreplace("%i", "");
-            exec.tqreplace("%m", "");
+            exec.replace("%u", "", false);
+            exec.replace("%f", "", false);
+            exec.replace("-caption %c", "");
+            exec.replace("-caption \"%c\"", "");
+            exec.replace("%i", "");
+            exec.replace("%m", "");
             exec = exec.simplifyWhiteSpace();
             if (exec == typedExec)
             {
@@ -666,13 +666,13 @@ void KOpenWithDlg::slotOK()
 
   if (terminal->isChecked())
   {
-    KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") );
-    preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::tqfromLatin1("konsole"));
+    KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") );
+    preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole"));
     m_command = preferredTerminal;
     // only add --noclose when we are sure it is konsole we're using
     if (preferredTerminal == "konsole" && nocloseonexit->isChecked())
-      m_command += TQString::tqfromLatin1(" --noclose");
-    m_command += TQString::tqfromLatin1(" -e ");
+      m_command += TQString::fromLatin1(" --noclose");
+    m_command += TQString::fromLatin1(" -e ");
     m_command += edit->url();
     kdDebug(250) << "Setting m_command to " << m_command << endl;
   }
@@ -702,7 +702,7 @@ void KOpenWithDlg::slotOK()
     return;
   }
 
-  // if we got here, we can't seem to tqfind a service for what they
+  // if we got here, we can't seem to find a service for what they
   // wanted.  The other possibility is that they have asked for the
   // association to be remembered.  Create/update service.
 
@@ -740,7 +740,7 @@ void KOpenWithDlg::slotOK()
   {
      desktop = new KDesktopFile(newPath);
   }
-  desktop->writeEntry("Type", TQString::tqfromLatin1("Application"));
+  desktop->writeEntry("Type", TQString::fromLatin1("Application"));
   desktop->writeEntry("Name", initialServiceName);
   desktop->writePathEntry("Exec", fullExec);
   if (terminal->isChecked())
@@ -760,7 +760,7 @@ void KOpenWithDlg::slotOK()
   if (bRemember || d->saveNewApps)
   {
     TQStringList mimeList = desktop->readListEntry("MimeType", ';');
-    if (!qServiceType.isEmpty() && !mimeList.tqcontains(qServiceType))
+    if (!qServiceType.isEmpty() && !mimeList.contains(qServiceType))
       mimeList.append(qServiceType);
     desktop->writeEntry("MimeType", mimeList, ';');
 
@@ -814,11 +814,11 @@ void KOpenWithDlg::accept()
         combo->addToHistory( edit->url() );
 
         KConfig *kc = KGlobal::config();
-        KConfigGroupSaver ks( kc, TQString::tqfromLatin1("Open-with settings") );
-        kc->writeEntry( TQString::tqfromLatin1("History"), combo->historyItems() );
-	kc->writeEntry(TQString::tqfromLatin1("CompletionMode"),
+        KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") );
+        kc->writeEntry( TQString::fromLatin1("History"), combo->historyItems() );
+	kc->writeEntry(TQString::fromLatin1("CompletionMode"),
 		       combo->completionMode());
-        // don't store the completion-list, as it tqcontains all of KURLCompletion's
+        // don't store the completion-list, as it contains all of KURLCompletion's
         // executables
         kc->sync();
     }
diff --git a/kio/kfile/kpreviewwidgetbase.h b/kio/kfile/kpreviewwidgetbase.h
index f435fc3fd..3a2a49b31 100644
--- a/kio/kfile/kpreviewwidgetbase.h
+++ b/kio/kfile/kpreviewwidgetbase.h
@@ -84,7 +84,7 @@ protected:
 private:
     class KPreviewWidgetBasePrivate;
     KPreviewWidgetBasePrivate * d() const {
-        return s_private->tqfind( const_cast<KPreviewWidgetBase*>( this ) );
+        return s_private->find( const_cast<KPreviewWidgetBase*>( this ) );
     }
     static TQPtrDict<KPreviewWidgetBasePrivate> * s_private;
 };
diff --git a/kio/kfile/kpropertiesdesktopadvbase.ui b/kio/kfile/kpropertiesdesktopadvbase.ui
index a146807f4..fe1122136 100644
--- a/kio/kfile/kpropertiesdesktopadvbase.ui
+++ b/kio/kfile/kpropertiesdesktopadvbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>widget11</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -40,7 +40,7 @@
                     <property name="sizeType">
                         <enum>Minimum</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -119,7 +119,7 @@
                     <property name="sizeType">
                         <enum>Minimum</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -229,7 +229,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>50</width>
                             <height>20</height>
@@ -275,5 +275,5 @@
 <includes>
     <include location="global" impldecl="in implementation">klineedit.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kio/kfile/kpropertiesdesktopbase.ui b/kio/kfile/kpropertiesdesktopbase.ui
index ad12885f5..7809d5135 100644
--- a/kio/kfile/kpropertiesdesktopbase.ui
+++ b/kio/kfile/kpropertiesdesktopbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>KPropertiesDesktopBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Minimum</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -174,7 +174,7 @@
             <property name="whatsThis" stdset="0">
                 <string>Type the command to start this application here.
 
-Following the command, you can have several place holders which will be tqreplaced with the actual values when the actual program is run:
+Following the command, you can have several place holders which will be replaced with the actual values when the actual program is run:
 %f - a single file name
 %F - a list of files; use for applications that can open several local files at once
 %u - a single URL
@@ -193,7 +193,7 @@ Following the command, you can have several place holders which will be tqreplac
             <property name="whatsThis" stdset="0">
                 <string>Type the command to start this application here.
 
-Following the command, you can have several place holders which will be tqreplaced with the actual values when the actual program is run:
+Following the command, you can have several place holders which will be replaced with the actual values when the actual program is run:
 %f - a single file name
 %F - a list of files; use for applications that can open several local files at once
 %u - a single URL
@@ -213,7 +213,7 @@ Following the command, you can have several place holders which will be tqreplac
                 <string>&amp;Browse...</string>
             </property>
             <property name="whatsThis" stdset="0">
-                <string>Click here to browse your file system in order to tqfind the desired executable.</string>
+                <string>Click here to browse your file system in order to find the desired executable.</string>
             </property>
         </widget>
         <widget class="QLabel" row="4" column="0" rowspan="1" colspan="2">
@@ -259,7 +259,7 @@ Following the command, you can have several place holders which will be tqreplac
             <property name="sizeType">
                 <enum>MinimumExpanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>53</width>
                     <height>20</height>
@@ -287,7 +287,7 @@ Following the command, you can have several place holders which will be tqreplac
             <property name="sizeType">
                 <enum>MinimumExpanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>53</width>
                     <height>20</height>
@@ -312,5 +312,5 @@ Following the command, you can have several place holders which will be tqreplac
     <include location="global" impldecl="in implementation">kurlrequester.h</include>
     <include location="global" impldecl="in implementation">klistview.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp
index b06e688ef..0116123f1 100644
--- a/kio/kfile/kpropertiesdialog.cpp
+++ b/kio/kfile/kpropertiesdialog.cpp
@@ -28,12 +28,12 @@
  *
  * some FilePermissionsPropsPlugin-changes by
  *  Henner Zeller <zeller@think.de>
- * some tqlayout management by
+ * some layout management by
  *  Bertrand Leconte <B.Leconte@mail.dotcom.fr>
- * the rest of the tqlayout management, bug fixes, adaptation to libkio,
+ * the rest of the layout management, bug fixes, adaptation to libkio,
  * template feature by
  *  David Faure <faure@kde.org>
- * More tqlayout, cleanups, and fixes by
+ * More layout, cleanups, and fixes by
  *  Preston Brown <pbrown@kde.org>
  * Plugin capability, cleanups and port to KDialogBase by
  *  Simon Hausmann <hausmann@kde.org>
@@ -203,7 +203,7 @@ KPropertiesDialog::KPropertiesDialog (KFileItemList _items,
                                       TQWidget* parent, const char* name,
                                       bool modal, bool autoShow)
   : KDialogBase (KDialogBase::Tabbed,
-                 // TODO: tqreplace <never used> with "Properties for 1 item". It's very confusing how it has to be translated otherwise
+                 // TODO: replace <never used> with "Properties for 1 item". It's very confusing how it has to be translated otherwise
                  // (empty translation before the "\n" is not allowed by msgfmt...)
 		 _items.count()>1 ? i18n( "<never used>","Properties for %n Selected Items",_items.count()) :
 		 i18n( "Properties for %1" ).arg(KIO::decodeFileName(_items.first()->url().fileName())),
@@ -516,7 +516,7 @@ void KPropertiesDialog::insertPages()
   if ( mimetype.isEmpty() )
     return;
 
-  TQString query = TQString::tqfromLatin1(
+  TQString query = TQString::fromLatin1(
       "('KPropsDlg/Plugin' in ServiceTypes) and "
       "((not exist [X-KDE-Protocol]) or "
       " ([X-KDE-Protocol] == '%1'  )   )"          ).arg(item->url().protocol());
@@ -704,7 +704,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
   d = new KFilePropsPluginPrivate;
   d->bMultiple = (properties->items().count() > 1);
   d->bIconChanged = false;
-  d->bKDesktopMode = (TQCString(tqApp->name()) == "kdesktop"); // nasty heh?
+  d->bKDesktopMode = (TQCString(qApp->name()) == "kdesktop"); // nasty heh?
   d->bDesktopFile = KDesktopPropsPlugin::supports(properties->items());
   kdDebug(250) << "KFilePropsPlugin::KFilePropsPlugin bMultiple=" << d->bMultiple << endl;
 
@@ -718,7 +718,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
   kdDebug() << "url=" << url << " bDesktopFile=" << bDesktopFile << " isLocal=" << isLocal << " isReallyLocal=" << isReallyLocal << endl;
   mode_t mode = item->mode();
   bool hasDirs = item->isDir() && !item->isLink();
-  bool hasRoot = url.path() == TQString::tqfromLatin1("/");
+  bool hasRoot = url.path() == TQString::fromLatin1("/");
   TQString iconStr = KMimeType::iconForURL(url, mode);
   TQString directory = properties->kurl().directory();
   TQString protocol = properties->kurl().protocol();
@@ -728,7 +728,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
   KIO::filesize_t totalSize = item->size(hasTotalSize);
   TQString magicMimeComment;
   if ( isLocal ) {
-      KMimeType::Ptr magicMimeType = KMimeType::tqfindByFileContent( url.path() );
+      KMimeType::Ptr magicMimeType = KMimeType::findByFileContent( url.path() );
       if ( magicMimeType->name() != KMimeType::defaultMimeType() )
           magicMimeComment = magicMimeType->comment();
   }
@@ -759,8 +759,8 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
   {
     TQString path;
     if ( !m_bFromTemplate ) {
-      isTrash = ( properties->kurl().protocol().tqfind( "trash", 0, false)==0 );
-      if ( properties->kurl().protocol().tqfind("device", 0, false)==0)
+      isTrash = ( properties->kurl().protocol().find( "trash", 0, false)==0 );
+      if ( properties->kurl().protocol().find("device", 0, false)==0)
             isDevice = true;
       // Extract the full name, but without file: for local files
       if ( isReallyLocal )
@@ -826,12 +826,12 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
       if ( !mimeComment.isNull() && (*it)->mimeComment() != mimeComment )
         mimeComment = TQString::null;
       if ( isLocal && !magicMimeComment.isNull() ) {
-          KMimeType::Ptr magicMimeType = KMimeType::tqfindByFileContent( url.path() );
+          KMimeType::Ptr magicMimeType = KMimeType::findByFileContent( url.path() );
           if ( magicMimeType->comment() != magicMimeComment )
               magicMimeComment = TQString::null;
       }
 
-      if ( url.path() == TQString::tqfromLatin1("/") )
+      if ( url.path() == TQString::fromLatin1("/") )
         hasRoot = true;
       if ( (*it)->isDir() && !(*it)->isLink() )
       {
@@ -859,7 +859,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
   if ( !isDevice && !isTrash && (bDesktopFile || S_ISDIR(mode)) && !d->bMultiple /*not implemented for multiple*/ )
   {
     KIconButton *iconButton = new KIconButton( d->m_frame );
-    int bsize = 66 + 2 * iconButton->style().tqpixelMetric(TQStyle::PM_ButtonMargin);
+    int bsize = 66 + 2 * iconButton->style().pixelMetric(TQStyle::PM_ButtonMargin);
     iconButton->setFixedSize(bsize, bsize);
     iconButton->setIconSize(48);
     iconButton->setStrictIconSize(false);
@@ -883,7 +883,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
              this, TQT_SLOT( slotIconChanged() ) );
   } else {
     TQLabel *iconLabel = new TQLabel( d->m_frame );
-    int bsize = 66 + 2 * iconLabel->style().tqpixelMetric(TQStyle::PM_ButtonMargin);
+    int bsize = 66 + 2 * iconLabel->style().pixelMetric(TQStyle::PM_ButtonMargin);
     iconLabel->setFixedSize(bsize, bsize);
     iconLabel->setPixmap( KGlobal::iconLoader()->loadIcon( iconStr, KIcon::Desktop, 48) );
     iconArea = iconLabel;
@@ -907,12 +907,12 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
 
     // Enhanced rename: Don't highlight the file extension.
     TQString pattern;
-    KServiceTypeFactory::self()->tqfindFromPattern( filename, &pattern );
-    if (!pattern.isEmpty() && pattern.at(0)=='*' && pattern.tqfind('*',1)==-1)
+    KServiceTypeFactory::self()->findFromPattern( filename, &pattern );
+    if (!pattern.isEmpty() && pattern.at(0)=='*' && pattern.find('*',1)==-1)
       d->m_lined->setSelection(0, filename.length()-pattern.stripWhiteSpace().length()+1);
     else
     {
-      int lastDot = filename.tqfindRev('.');
+      int lastDot = filename.findRev('.');
       if (lastDot > 0)
         d->m_lined->setSelection(0, lastDot);
     }
@@ -942,7 +942,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
     //TODO: wrap for win32 or mac?
     TQPushButton *button = new TQPushButton(box);
 
-    TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("configure"));
+    TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("configure"));
     TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
     button->setIconSet( iconSet );
     button->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
@@ -1074,7 +1074,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
     grid->addMultiCellWidget(sep, curRow, curRow, 0, 2);
     ++curRow;
 
-    TQString mountPoint = KIO::tqfindPathMountPoint( url.path() );
+    TQString mountPoint = KIO::findPathMountPoint( url.path() );
 
     if (mountPoint != "/")
     {
@@ -1127,7 +1127,7 @@ void KFilePropsPlugin::slotEditFileType()
 #ifdef Q_WS_X11
   TQString mime;
   if ( d->mimeType == KMimeType::defaultMimeType() ) {
-    int pos = d->oldFileName.tqfindRev( '.' );
+    int pos = d->oldFileName.findRev( '.' );
     if ( pos != -1 )
 	mime = "*" + d->oldFileName.mid(pos);
     else
@@ -1136,9 +1136,9 @@ void KFilePropsPlugin::slotEditFileType()
   else
     mime = d->mimeType;
     //TODO: wrap for win32 or mac?
-  TQString keditfiletype = TQString::tqfromLatin1("keditfiletype");
+  TQString keditfiletype = TQString::fromLatin1("keditfiletype");
   KRun::runCommand( keditfiletype
-                    + " --parent " + TQString::number( (ulong)properties->tqtopLevelWidget()->winId())
+                    + " --parent " + TQString::number( (ulong)properties->topLevelWidget()->winId())
                     + " " + KProcess::quote(mime),
                     keditfiletype, keditfiletype /*unused*/);
 #endif
@@ -1234,7 +1234,7 @@ void KFilePropsPlugin::slotDirSizeFinished( KIO::Job * job )
     KIO::filesize_t totalSize = static_cast<KDirSize*>(job)->totalSize();
 	KIO::filesize_t totalFiles = static_cast<KDirSize*>(job)->totalFiles();
 	KIO::filesize_t totalSubdirs = static_cast<KDirSize*>(job)->totalSubdirs();
-    m_sizeLabel->setText( TQString::tqfromLatin1("%1 (%2)\n%3, %4")
+    m_sizeLabel->setText( TQString::fromLatin1("%1 (%2)\n%3, %4")
 			  .arg(KIO::convertSize(totalSize))
 			  .arg(KGlobal::locale()->formatNumber(totalSize, 0))
         .arg(i18n("1 file","%n files",totalFiles))
@@ -1270,7 +1270,7 @@ void KFilePropsPlugin::slotSizeDetermine()
     bool isLocal;
     KFileItem * item = properties->item();
     KURL url = item->mostLocalURL( isLocal );
-    TQString mountPoint = KIO::tqfindPathMountPoint( url.path() );
+    TQString mountPoint = KIO::findPathMountPoint( url.path() );
 
     KDiskFreeSp * job = new KDiskFreeSp;
     connect( job, TQT_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&,
@@ -1364,7 +1364,7 @@ void KFilePropsPlugin::applyChanges()
       // wait for job
       TQWidget dummy(0,0,WType_Dialog|WShowModal);
       qt_enter_modal(&dummy);
-      tqApp->enter_loop();
+      qApp->enter_loop();
       qt_leave_modal(&dummy);
       return;
     }
@@ -1384,7 +1384,7 @@ void KFilePropsPlugin::slotCopyFinished( KIO::Job * job )
   if (job)
   {
     // allow apply() to return
-    tqApp->exit_loop();
+    qApp->exit_loop();
     if ( job->error() )
     {
         job->showErrorDialog( d->m_frame );
@@ -1439,7 +1439,7 @@ void KFilePropsPlugin::applyIconChanges()
 
     if (S_ISDIR(properties->item()->mode()))
     {
-      path = url.path(1) + TQString::tqfromLatin1(".directory");
+      path = url.path(1) + TQString::fromLatin1(".directory");
       // don't call updateUrl because the other tabs (i.e. permissions)
       // apply to the directory, not the .directory file.
     }
@@ -1563,7 +1563,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
   TQString path = properties->kurl().path(-1);
   TQString fname = properties->kurl().fileName();
   bool isLocal = properties->kurl().isLocalFile();
-  bool isTrash = ( properties->kurl().protocol().tqfind("trash", 0, false)==0 );
+  bool isTrash = ( properties->kurl().protocol().find("trash", 0, false)==0 );
   bool IamRoot = (geteuid() == 0);
 
   KFileItem * item = properties->item();
@@ -1654,11 +1654,11 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
 
   /* Group: Access Permissions */
   gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Access Permissions"), d->m_frame );
-  gb->tqlayout()->setSpacing(KDialog::spacingHint());
-  gb->tqlayout()->setMargin(KDialog::marginHint());
+  gb->layout()->setSpacing(KDialog::spacingHint());
+  gb->layout()->setMargin(KDialog::marginHint());
   box->addWidget (gb);
 
-  gl = new TQGridLayout (gb->tqlayout(), 7, 2);
+  gl = new TQGridLayout (gb->layout(), 7, 2);
   gl->setColStretch(1, 1);
 
   l = d->explanationLabel = new TQLabel( "", gb );
@@ -1723,11 +1723,11 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
 
   /**** Group: Ownership ****/
   gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Ownership"), d->m_frame );
-  gb->tqlayout()->setSpacing(KDialog::spacingHint());
-  gb->tqlayout()->setMargin(KDialog::marginHint());
+  gb->layout()->setSpacing(KDialog::spacingHint());
+  gb->layout()->setMargin(KDialog::marginHint());
   box->addWidget (gb);
 
-  gl = new TQGridLayout (gb->tqlayout(), 4, 3);
+  gl = new TQGridLayout (gb->layout(), 4, 3);
   gl->addRowSpacing(0, 10);
 
   /*** Set Owner ***/
@@ -1753,7 +1753,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
     kcom->setOrder(KCompletion::Sorted);
     setpwent();
     for (i=0; ((user = getpwent()) != 0L) && (i < maxEntries); i++)
-      kcom->addItem(TQString::tqfromLatin1(user->pw_name));
+      kcom->addItem(TQString::fromLatin1(user->pw_name));
     endpwent();
     usrEdit->setCompletionMode((i < maxEntries) ? KGlobalSettings::CompletionAuto :
                                KGlobalSettings::CompletionNone);
@@ -1781,7 +1781,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
   for (i=0; ((ge = getgrent()) != 0L) && (i < maxEntries); i++)
   {
     if (IamRoot)
-      groupList += TQString::tqfromLatin1(ge->gr_name);
+      groupList += TQString::fromLatin1(ge->gr_name);
     else
     {
       /* pick the groups to which the user belongs */
@@ -1802,14 +1802,14 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
   /* add the effective Group to the list .. */
   ge = getgrgid (getegid());
   if (ge) {
-    TQString name = TQString::tqfromLatin1(ge->gr_name);
+    TQString name = TQString::fromLatin1(ge->gr_name);
     if (name.isEmpty())
       name.setNum(ge->gr_gid);
-    if (groupList.tqfind(name) == groupList.end())
+    if (groupList.find(name) == groupList.end())
       groupList += name;
   }
 
-  bool isMyGroup = groupList.tqcontains(strGroup);
+  bool isMyGroup = groupList.contains(strGroup);
 
   /* add the group the file currently belongs to ..
    * .. if its not there already
@@ -1843,7 +1843,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
   {
     grpCombo = new TQComboBox(gb, "combogrouplist");
     grpCombo->insertStringList(groupList);
-    grpCombo->setCurrentItem(groupList.tqfindIndex(strGroup));
+    grpCombo->setCurrentItem(groupList.findIndex(strGroup));
     gl->addWidget(grpCombo, 2, 1);
     connect( grpCombo, TQT_SIGNAL( activated( int ) ),
              this, TQT_SIGNAL( changed() ) );
@@ -1915,10 +1915,10 @@ void KFilePermissionsPropsPlugin::slotShowAdvancedPermissions() {
 
   // Group: Access Permissions
   gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Access Permissions"), mainVBox );
-  gb->tqlayout()->setSpacing(KDialog::spacingHint());
-  gb->tqlayout()->setMargin(KDialog::marginHint());
+  gb->layout()->setSpacing(KDialog::spacingHint());
+  gb->layout()->setMargin(KDialog::marginHint());
 
-  gl = new TQGridLayout (gb->tqlayout(), 6, 6);
+  gl = new TQGridLayout (gb->layout(), 6, 6);
   gl->addRowSpacing(0, 10);
 
   TQValueVector<TQWidget*> theNotSpecials;
@@ -1966,7 +1966,7 @@ void KFilePermissionsPropsPlugin::slotShowAdvancedPermissions() {
   TQWhatsThis::add(l, execWhatsThis);
   theNotSpecials.append( l );
   // GJ: Add space between normal and special modes
-  TQSize size = l->tqsizeHint();
+  TQSize size = l->sizeHint();
   size.setWidth(size.width() + 15);
   l->setFixedSize(size);
   gl->addWidget (l, 1, 3);
@@ -2368,7 +2368,7 @@ void KFilePermissionsPropsPlugin::updateAccessControls() {
   }
 }
 
-// gets tqmasks for files and dirs from the Access Control frame widgets
+// gets masks for files and dirs from the Access Control frame widgets
 void KFilePermissionsPropsPlugin::getPermissionMasks(mode_t &andFilePermissions,
 						     mode_t &andDirPermissions,
 						     mode_t &orFilePermissions,
@@ -2520,7 +2520,7 @@ void KFilePermissionsPropsPlugin::applyChanges()
     // Wait for job
     TQWidget dummy(0,0,WType_Dialog|WShowModal);
     qt_enter_modal(&dummy);
-    tqApp->enter_loop();
+    qApp->enter_loop();
     qt_leave_modal(&dummy);
   }
   if (dirs.count() > 0) {
@@ -2536,7 +2536,7 @@ void KFilePermissionsPropsPlugin::applyChanges()
     // Wait for job
     TQWidget dummy(0,0,WType_Dialog|WShowModal);
     qt_enter_modal(&dummy);
-    tqApp->enter_loop();
+    qApp->enter_loop();
     qt_leave_modal(&dummy);
   }
 }
@@ -2547,7 +2547,7 @@ void KFilePermissionsPropsPlugin::slotChmodResult( KIO::Job * job )
   if (job->error())
     job->showErrorDialog( d->m_frame );
   // allow apply() to return
-  tqApp->exit_loop();
+  qApp->exit_loop();
 }
 
 
@@ -2571,15 +2571,15 @@ KURLPropsPlugin::KURLPropsPlugin( KPropertiesDialog *_props )
 {
   d = new KURLPropsPluginPrivate;
   d->m_frame = properties->addPage(i18n("U&RL"));
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(d->m_frame, 0, KDialog::spacingHint());
+  TQVBoxLayout *layout = new TQVBoxLayout(d->m_frame, 0, KDialog::spacingHint());
 
   TQLabel *l;
   l = new TQLabel( d->m_frame, "Label_1" );
   l->setText( i18n("URL:") );
-  tqlayout->addWidget(l);
+  layout->addWidget(l);
 
   URLEdit = new KURLRequester( d->m_frame, "URL Requester" );
-  tqlayout->addWidget(URLEdit);
+  layout->addWidget(URLEdit);
 
   TQString path = properties->kurl().path();
 
@@ -2598,7 +2598,7 @@ KURLPropsPlugin::KURLPropsPlugin( KPropertiesDialog *_props )
   connect( URLEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
            this, TQT_SIGNAL( changed() ) );
 
-  tqlayout->addStretch (1);
+  layout->addStretch (1);
 }
 
 KURLPropsPlugin::~KURLPropsPlugin()
@@ -2639,7 +2639,7 @@ void KURLPropsPlugin::applyChanges()
 
   KSimpleConfig config( path );
   config.setDesktopGroup();
-  config.writeEntry( "Type", TQString::tqfromLatin1("Link"));
+  config.writeEntry( "Type", TQString::fromLatin1("Link"));
   config.writePathEntry( "URL", URLEdit->url() );
   // Users can't create a Link .desktop file with a Name field,
   // but distributions can. Update the Name field in that case.
@@ -2680,48 +2680,48 @@ KBindingPropsPlugin::KBindingPropsPlugin( KPropertiesDialog *_props ) : KPropsDl
   commentEdit = new KLineEdit( d->m_frame, "LineEdit_2" );
   mimeEdit = new KLineEdit( d->m_frame, "LineEdit_3" );
 
-  TQBoxLayout *maintqlayout = new TQVBoxLayout(d->m_frame, 0, KDialog::spacingHint());
+  TQBoxLayout *mainlayout = new TQVBoxLayout(d->m_frame, 0, KDialog::spacingHint());
   TQLabel* tmpQLabel;
 
   tmpQLabel = new TQLabel( d->m_frame, "Label_1" );
   tmpQLabel->setText(  i18n("Pattern ( example: *.html;*.htm )") );
-  tmpQLabel->setMinimumSize(tmpQLabel->tqsizeHint());
-  maintqlayout->addWidget(tmpQLabel, 1);
+  tmpQLabel->setMinimumSize(tmpQLabel->sizeHint());
+  mainlayout->addWidget(tmpQLabel, 1);
 
   //patternEdit->setGeometry( 10, 40, 210, 30 );
   //patternEdit->setText( "" );
   patternEdit->setMaxLength( 512 );
-  patternEdit->setMinimumSize( patternEdit->tqsizeHint() );
+  patternEdit->setMinimumSize( patternEdit->sizeHint() );
   patternEdit->setFixedHeight( fontHeight );
-  maintqlayout->addWidget(patternEdit, 1);
+  mainlayout->addWidget(patternEdit, 1);
 
   tmpQLabel = new TQLabel( d->m_frame, "Label_2" );
   tmpQLabel->setText(  i18n("Mime Type") );
-  tmpQLabel->setMinimumSize(tmpQLabel->tqsizeHint());
-  maintqlayout->addWidget(tmpQLabel, 1);
+  tmpQLabel->setMinimumSize(tmpQLabel->sizeHint());
+  mainlayout->addWidget(tmpQLabel, 1);
 
   //mimeEdit->setGeometry( 10, 160, 210, 30 );
   mimeEdit->setMaxLength( 256 );
-  mimeEdit->setMinimumSize( mimeEdit->tqsizeHint() );
+  mimeEdit->setMinimumSize( mimeEdit->sizeHint() );
   mimeEdit->setFixedHeight( fontHeight );
-  maintqlayout->addWidget(mimeEdit, 1);
+  mainlayout->addWidget(mimeEdit, 1);
 
   tmpQLabel = new TQLabel( d->m_frame, "Label_3" );
   tmpQLabel->setText(  i18n("Comment") );
-  tmpQLabel->setMinimumSize(tmpQLabel->tqsizeHint());
-  maintqlayout->addWidget(tmpQLabel, 1);
+  tmpQLabel->setMinimumSize(tmpQLabel->sizeHint());
+  mainlayout->addWidget(tmpQLabel, 1);
 
   //commentEdit->setGeometry( 10, 100, 210, 30 );
   commentEdit->setMaxLength( 256 );
-  commentEdit->setMinimumSize( commentEdit->tqsizeHint() );
+  commentEdit->setMinimumSize( commentEdit->sizeHint() );
   commentEdit->setFixedHeight( fontHeight );
-  maintqlayout->addWidget(commentEdit, 1);
+  mainlayout->addWidget(commentEdit, 1);
 
   cbAutoEmbed = new TQCheckBox( i18n("Left click previews"), d->m_frame, "cbAutoEmbed" );
-  maintqlayout->addWidget(cbAutoEmbed, 1);
+  mainlayout->addWidget(cbAutoEmbed, 1);
 
-  maintqlayout->addStretch (10);
-  maintqlayout->activate();
+  mainlayout->addStretch (10);
+  mainlayout->activate();
 
   TQFile f( _props->kurl().path() );
   if ( !f.open( IO_ReadOnly ) )
@@ -2796,7 +2796,7 @@ void KBindingPropsPlugin::applyChanges()
 
   KSimpleConfig config( path );
   config.setDesktopGroup();
-  config.writeEntry( "Type", TQString::tqfromLatin1("MimeType") );
+  config.writeEntry( "Type", TQString::fromLatin1("MimeType") );
 
   config.writeEntry( "Patterns",  patternEdit->text() );
   config.writeEntry( "Comment", commentEdit->text() );
@@ -2852,60 +2852,60 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP
      if ((mountPoint != "-") && (mountPoint != "none") && !mountPoint.isEmpty()
           && device != "none")
      {
-        devices.append( device + TQString::tqfromLatin1(" (")
-                        + mountPoint + TQString::tqfromLatin1(")") );
+        devices.append( device + TQString::fromLatin1(" (")
+                        + mountPoint + TQString::fromLatin1(")") );
         m_devicelist.append(device);
         d->mountpointlist.append(mountPoint);
      }
   }
 
-  TQGridLayout *tqlayout = new TQGridLayout( d->m_frame, 0, 2, 0,
+  TQGridLayout *layout = new TQGridLayout( d->m_frame, 0, 2, 0,
                                         KDialog::spacingHint());
-  tqlayout->setColStretch(1, 1);
+  layout->setColStretch(1, 1);
 
   TQLabel* label;
   label = new TQLabel( d->m_frame );
   label->setText( devices.count() == 0 ?
                       i18n("Device (/dev/fd0):") : // old style
                       i18n("Device:") ); // new style (combobox)
-  tqlayout->addWidget(label, 0, 0);
+  layout->addWidget(label, 0, 0);
 
   device = new TQComboBox( true, d->m_frame, "ComboBox_device" );
   device->insertStringList( devices );
-  tqlayout->addWidget(device, 0, 1);
+  layout->addWidget(device, 0, 1);
   connect( device, TQT_SIGNAL( activated( int ) ),
            this, TQT_SLOT( slotActivated( int ) ) );
 
   readonly = new TQCheckBox( d->m_frame, "CheckBox_readonly" );
   readonly->setText(  i18n("Read only") );
-  tqlayout->addWidget(readonly, 1, 1);
+  layout->addWidget(readonly, 1, 1);
 
   label = new TQLabel( d->m_frame );
   label->setText( i18n("File system:") );
-  tqlayout->addWidget(label, 2, 0);
+  layout->addWidget(label, 2, 0);
 
   TQLabel *fileSystem = new TQLabel( d->m_frame );
-  tqlayout->addWidget(fileSystem, 2, 1);
+  layout->addWidget(fileSystem, 2, 1);
 
   label = new TQLabel( d->m_frame );
   label->setText( devices.count()==0 ?
                       i18n("Mount point (/mnt/floppy):") : // old style
                       i18n("Mount point:")); // new style (combobox)
-  tqlayout->addWidget(label, 3, 0);
+  layout->addWidget(label, 3, 0);
 
   mountpoint = new TQLabel( d->m_frame, "LineEdit_mountpoint" );
 
-  tqlayout->addWidget(mountpoint, 3, 1);
+  layout->addWidget(mountpoint, 3, 1);
 
   // show disk free
   d->m_freeSpaceText = new TQLabel(i18n("Free disk space:"), d->m_frame );
-  tqlayout->addWidget(d->m_freeSpaceText, 4, 0);
+  layout->addWidget(d->m_freeSpaceText, 4, 0);
 
   d->m_freeSpaceLabel = new TQLabel( d->m_frame );
-  tqlayout->addWidget( d->m_freeSpaceLabel, 4, 1 );
+  layout->addWidget( d->m_freeSpaceLabel, 4, 1 );
 
   d->m_freeSpaceBar = new TQProgressBar( d->m_frame, "freeSpaceBar" );
-  tqlayout->addMultiCellWidget(d->m_freeSpaceBar, 5, 5, 0, 1);
+  layout->addMultiCellWidget(d->m_freeSpaceBar, 5, 5, 0, 1);
 
   // we show it in the slot when we know the values
   d->m_freeSpaceText->hide();
@@ -2913,18 +2913,18 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP
   d->m_freeSpaceBar->hide();
 
   KSeparator* sep = new KSeparator( KSeparator::HLine, d->m_frame);
-  tqlayout->addMultiCellWidget(sep, 6, 6, 0, 1);
+  layout->addMultiCellWidget(sep, 6, 6, 0, 1);
 
   unmounted = new KIconButton( d->m_frame );
-  int bsize = 66 + 2 * unmounted->style().tqpixelMetric(TQStyle::PM_ButtonMargin);
+  int bsize = 66 + 2 * unmounted->style().pixelMetric(TQStyle::PM_ButtonMargin);
   unmounted->setFixedSize(bsize, bsize);
   unmounted->setIconType(KIcon::Desktop, KIcon::Device);
-  tqlayout->addWidget(unmounted, 7, 0);
+  layout->addWidget(unmounted, 7, 0);
 
   label = new TQLabel( i18n("Unmounted Icon"),  d->m_frame );
-  tqlayout->addWidget(label, 7, 1);
+  layout->addWidget(label, 7, 1);
 
-  tqlayout->setRowStretch(8, 1);
+  layout->setRowStretch(8, 1);
 
   TQString path( _props->kurl().path() );
 
@@ -2945,7 +2945,7 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP
   device->setEditText( deviceStr );
   if ( !deviceStr.isEmpty() ) {
     // Set default options for this device (first matching entry)
-    int index = m_devicelist.tqfindIndex(deviceStr);
+    int index = m_devicelist.findIndex(deviceStr);
     if (index != -1)
     {
       //kdDebug(250) << "found it " << index << endl;
@@ -3020,7 +3020,7 @@ void KDevicePropsPlugin::slotActivated( int index )
 void KDevicePropsPlugin::slotDeviceChanged()
 {
   // Update mountpoint so that it matches the typed device
-  int index = m_devicelist.tqfindIndex( device->currentText() );
+  int index = m_devicelist.findIndex( device->currentText() );
   if ( index != -1 )
     mountpoint->setText( d->mountpointlist[index] );
   else
@@ -3077,7 +3077,7 @@ void KDevicePropsPlugin::applyChanges()
 
   KSimpleConfig config( path );
   config.setDesktopGroup();
-  config.writeEntry( "Type", TQString::tqfromLatin1("FSDevice") );
+  config.writeEntry( "Type", TQString::fromLatin1("FSDevice") );
 
   config.writeEntry( "Dev", device->currentText() );
   config.writeEntry( "MountPoint", mountpoint->text() );
@@ -3102,12 +3102,12 @@ KDesktopPropsPlugin::KDesktopPropsPlugin( KPropertiesDialog *_props )
   : KPropsDlgPlugin( _props )
 {
   TQFrame *frame = properties->addPage(i18n("&Application"));
-  TQVBoxLayout *maintqlayout = new TQVBoxLayout( frame, 0, KDialog::spacingHint() );
+  TQVBoxLayout *mainlayout = new TQVBoxLayout( frame, 0, KDialog::spacingHint() );
 
   w = new KPropertiesDesktopBase(frame);
-  maintqlayout->addWidget(w);
+  mainlayout->addWidget(w);
 
-  bool bKDesktopMode = (TQCString(tqApp->name()) == "kdesktop"); // nasty heh?
+  bool bKDesktopMode = (TQCString(qApp->name()) == "kdesktop"); // nasty heh?
 
   if (bKDesktopMode)
   {
@@ -3255,11 +3255,11 @@ void KDesktopPropsPlugin::slotAddFiletype()
         TQString mimetype = (*it)->name();
         if (mimetype == KMimeType::defaultMimeType())
            continue;
-        int index = mimetype.tqfind("/");
+        int index = mimetype.find("/");
         TQString maj = mimetype.left(index);
         TQString min = mimetype.mid(index+1);
 
-        TQMapIterator<TQString,TQListViewItem*> mit = majorMap.tqfind( maj );
+        TQMapIterator<TQString,TQListViewItem*> mit = majorMap.find( maj );
         if ( mit == majorMap.end() ) {
            majorGroup = new TQListViewItem( mw->listView, maj );
            majorGroup->setExpandable(true);
@@ -3274,7 +3274,7 @@ void KDesktopPropsPlugin::slotAddFiletype()
         TQListViewItem *item = new TQListViewItem(majorGroup, min, (*it)->comment());
         item->setPixmap(0, (*it)->pixmap(KIcon::Small, IconSize(KIcon::Small)));
      }
-     TQMapIterator<TQString,TQListViewItem*> mit = majorMap.tqfind( "all" );
+     TQMapIterator<TQString,TQListViewItem*> mit = majorMap.find( "all" );
      if ( mit != majorMap.end())
      {
         mw->listView->setCurrentItem(mit.data());
@@ -3362,7 +3362,7 @@ void KDesktopPropsPlugin::applyChanges()
 
   KSimpleConfig config( path );
   config.setDesktopGroup();
-  config.writeEntry( "Type", TQString::tqfromLatin1("Application"));
+  config.writeEntry( "Type", TQString::fromLatin1("Application"));
   config.writeEntry( "Comment", w->commentEdit->text() );
   config.writeEntry( "Comment", w->commentEdit->text(), true, false, true ); // for compat
   config.writeEntry( "GenericName", w->genNameEdit->text() );
@@ -3446,17 +3446,17 @@ void KDesktopPropsPlugin::slotAdvanced()
 
   // check to see if we use konsole if not do not add the nocloseonexit
   // because we don't know how to do this on other terminal applications
-  KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") );
+  KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") );
   TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication",
-						  TQString::tqfromLatin1("konsole"));
+						  TQString::fromLatin1("konsole"));
 
   bool terminalCloseBool = false;
 
   if (preferredTerminal == "konsole")
   {
-     terminalCloseBool = (m_terminalOptionStr.tqcontains( "--noclose" ) > 0);
+     terminalCloseBool = (m_terminalOptionStr.contains( "--noclose" ) > 0);
      w->terminalCloseCheck->setChecked(terminalCloseBool);
-     m_terminalOptionStr.tqreplace( "--noclose", "");
+     m_terminalOptionStr.replace( "--noclose", "");
   }
   else
   {
@@ -3493,7 +3493,7 @@ void KDesktopPropsPlugin::slotAdvanced()
   int i, maxEntries = 1000;
   setpwent();
   for (i=0; ((pw = getpwent()) != 0L) && (i < maxEntries); i++)
-    kcom->addItem(TQString::tqfromLatin1(pw->pw_name));
+    kcom->addItem(TQString::fromLatin1(pw->pw_name));
   endpwent();
   if (i < maxEntries)
   {
@@ -3594,22 +3594,22 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
 {
   d = new KExecPropsPluginPrivate;
   d->m_frame = properties->addPage(i18n("E&xecute"));
-  TQVBoxLayout * maintqlayout = new TQVBoxLayout( d->m_frame, 0,
+  TQVBoxLayout * mainlayout = new TQVBoxLayout( d->m_frame, 0,
       KDialog::spacingHint());
 
-  // Now the widgets in the top tqlayout
+  // Now the widgets in the top layout
 
   TQLabel* l;
   l = new TQLabel( i18n( "Comman&d:" ), d->m_frame );
-  maintqlayout->addWidget(l);
+  mainlayout->addWidget(l);
 
-  TQHBoxLayout * htqlayout;
-  htqlayout = new TQHBoxLayout(KDialog::spacingHint());
-  maintqlayout->addLayout(htqlayout);
+  TQHBoxLayout * hlayout;
+  hlayout = new TQHBoxLayout(KDialog::spacingHint());
+  mainlayout->addLayout(hlayout);
 
   execEdit = new KLineEdit( d->m_frame );
   TQWhatsThis::add(execEdit,i18n(
-    "Following the command, you can have several place holders which will be tqreplaced "
+    "Following the command, you can have several place holders which will be replaced "
     "with the actual values when the actual program is run:\n"
     "%f - a single file name\n"
     "%F - a list of files; use for applications that can open several local files at once\n"
@@ -3620,22 +3620,22 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
     "%i - the icon\n"
     "%m - the mini-icon\n"
     "%c - the caption"));
-  htqlayout->addWidget(execEdit, 1);
+  hlayout->addWidget(execEdit, 1);
 
   l->setBuddy( execEdit );
 
   execBrowse = new TQPushButton( d->m_frame );
   execBrowse->setText( i18n("&Browse...") );
-  htqlayout->addWidget(execBrowse);
+  hlayout->addWidget(execBrowse);
 
   // The groupbox about swallowing
   TQGroupBox* tmpQGroupBox;
   tmpQGroupBox = new TQGroupBox( i18n("Panel Embedding"), d->m_frame );
   tmpQGroupBox->setColumnLayout( 0, Qt::Horizontal );
 
-  maintqlayout->addWidget(tmpQGroupBox);
+  mainlayout->addWidget(tmpQGroupBox);
 
-  TQGridLayout *grid = new TQGridLayout(tmpQGroupBox->tqlayout(), 2, 2);
+  TQGridLayout *grid = new TQGridLayout(tmpQGroupBox->layout(), 2, 2);
   grid->setSpacing( KDialog::spacingHint() );
   grid->setColStretch(1, 1);
 
@@ -3660,9 +3660,9 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
   tmpQGroupBox = new TQGroupBox( d->m_frame );
   tmpQGroupBox->setColumnLayout( 0, Qt::Horizontal );
 
-  maintqlayout->addWidget(tmpQGroupBox);
+  mainlayout->addWidget(tmpQGroupBox);
 
-  grid = new TQGridLayout(tmpQGroupBox->tqlayout(), 3, 2);
+  grid = new TQGridLayout(tmpQGroupBox->layout(), 3, 2);
   grid->setSpacing( KDialog::spacingHint() );
   grid->setColStretch(1, 1);
 
@@ -3672,9 +3672,9 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
 
   // check to see if we use konsole if not do not add the nocloseonexit
   // because we don't know how to do this on other terminal applications
-  KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") );
+  KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") );
   TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication",
-						  TQString::tqfromLatin1("konsole"));
+						  TQString::fromLatin1("konsole"));
 
   int posOptions = 1;
   d->nocloseonexitCheck = 0L;
@@ -3699,9 +3699,9 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
   tmpQGroupBox = new TQGroupBox( d->m_frame );
   tmpQGroupBox->setColumnLayout( 0, Qt::Horizontal );
 
-  maintqlayout->addWidget(tmpQGroupBox);
+  mainlayout->addWidget(tmpQGroupBox);
 
-  grid = new TQGridLayout(tmpQGroupBox->tqlayout(), 2, 2);
+  grid = new TQGridLayout(tmpQGroupBox->layout(), 2, 2);
   grid->setSpacing(KDialog::spacingHint());
   grid->setColStretch(1, 1);
 
@@ -3717,7 +3717,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
 
   suidLabel->setBuddy( suidEdit );
 
-  maintqlayout->addStretch(1);
+  mainlayout->addStretch(1);
 
   // now populate the page
   TQString path = _props->kurl().path();
@@ -3747,8 +3747,8 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
 
   if ( d->nocloseonexitCheck )
   {
-    d->nocloseonexitCheck->setChecked( (termOptionsStr.tqcontains( "--noclose" ) > 0) );
-    termOptionsStr.tqreplace( "--noclose", "");
+    d->nocloseonexitCheck->setChecked( (termOptionsStr.contains( "--noclose" ) > 0) );
+    termOptionsStr.replace( "--noclose", "");
   }
   if ( !termOptionsStr.isNull() )
     terminalEdit->setText( termOptionsStr );
@@ -3767,7 +3767,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
   int i, maxEntries = 1000;
   setpwent();
   for (i=0; ((pw = getpwent()) != 0L) && (i < maxEntries); i++)
-    kcom->addItem(TQString::tqfromLatin1(pw->pw_name));
+    kcom->addItem(TQString::fromLatin1(pw->pw_name));
   endpwent();
   if (i < maxEntries)
   {
@@ -3854,7 +3854,7 @@ void KExecPropsPlugin::applyChanges()
 
   KSimpleConfig config( path );
   config.setDesktopGroup();
-  config.writeEntry( "Type", TQString::tqfromLatin1("Application"));
+  config.writeEntry( "Type", TQString::fromLatin1("Application"));
   config.writePathEntry( "Exec", execEdit->text() );
   config.writePathEntry( "SwallowExec", swallowExecEdit->text() );
   config.writeEntry( "SwallowTitle", swallowTitleEdit->text() );
@@ -3862,7 +3862,7 @@ void KExecPropsPlugin::applyChanges()
   TQString temp = terminalEdit->text();
   if (d->nocloseonexitCheck )
     if ( d->nocloseonexitCheck->isChecked() )
-      temp += TQString::tqfromLatin1("--noclose ");
+      temp += TQString::fromLatin1("--noclose ");
   temp = temp.stripWhiteSpace();
   config.writeEntry( "TerminalOptions", temp );
   config.writeEntry( "X-KDE-SubstituteUID", suidCheck->isChecked() );
@@ -3892,7 +3892,7 @@ class KApplicationPropsPlugin::KApplicationPropsPluginPrivate
 public:
   KApplicationPropsPluginPrivate()
   {
-      m_kdesktopMode = TQCString(tqApp->name()) == "kdesktop"; // nasty heh?
+      m_kdesktopMode = TQCString(qApp->name()) == "kdesktop"; // nasty heh?
   }
   ~KApplicationPropsPluginPrivate()
   {
@@ -3907,7 +3907,7 @@ KApplicationPropsPlugin::KApplicationPropsPlugin( KPropertiesDialog *_props )
 {
   d = new KApplicationPropsPluginPrivate;
   d->m_frame = properties->addPage(i18n("&Application"));
-  TQVBoxLayout *toptqlayout = new TQVBoxLayout( d->m_frame, 0, KDialog::spacingHint());
+  TQVBoxLayout *toplayout = new TQVBoxLayout( d->m_frame, 0, KDialog::spacingHint());
 
   TQIconSet iconSet;
   TQPixmap pixMap;
@@ -3931,7 +3931,7 @@ KApplicationPropsPlugin::KApplicationPropsPlugin( KPropertiesDialog *_props )
 
   TQGridLayout *grid = new TQGridLayout(2, 2);
   grid->setColStretch(1, 1);
-  toptqlayout->addLayout(grid);
+  toplayout->addLayout(grid);
 
   if ( d->m_kdesktopMode )
   {
@@ -3960,14 +3960,14 @@ KApplicationPropsPlugin::KApplicationPropsPlugin( KPropertiesDialog *_props )
   grid->addWidget(commentEdit, 2, 1);
 
   l = new TQLabel(i18n("File types:"), d->m_frame);
-  toptqlayout->addWidget(l, 0, AlignLeft);
+  toplayout->addWidget(l, 0, AlignLeft);
 
   grid = new TQGridLayout(4, 3);
   grid->setColStretch(0, 1);
   grid->setColStretch(2, 1);
   grid->setRowStretch( 0, 1 );
   grid->setRowStretch( 3, 1 );
-  toptqlayout->addLayout(grid, 2);
+  toplayout->addLayout(grid, 2);
 
   extensionsList = new TQListBox( d->m_frame );
   extensionsList->setSelectionMode( TQListBox::Extended );
@@ -4097,7 +4097,7 @@ void KApplicationPropsPlugin::applyChanges()
 
   KSimpleConfig config( path );
   config.setDesktopGroup();
-  config.writeEntry( "Type", TQString::tqfromLatin1("Application"));
+  config.writeEntry( "Type", TQString::fromLatin1("Application"));
   config.writeEntry( "Comment", commentEdit->text() );
   config.writeEntry( "Comment", commentEdit->text(), true, false, true ); // for compat
   config.writeEntry( "GenericName", genNameEdit->text() );
diff --git a/kio/kfile/kpropertiesdialog.h b/kio/kfile/kpropertiesdialog.h
index 4c734b13b..dc6a621f9 100644
--- a/kio/kfile/kpropertiesdialog.h
+++ b/kio/kfile/kpropertiesdialog.h
@@ -434,7 +434,7 @@ private:
  * You can also include X-KDE-Protocol=file if you want that plugin
  * to be loaded only for local files, for instance.
  */
-class KIO_EXPORT KPropsDlgPlugin : public TQObject
+class KIO_EXPORT KPropsDlgPlugin : public QObject
 {
   Q_OBJECT
 public:
@@ -819,7 +819,7 @@ private:
  *
  * Such files are used to represent a program in kicker and konqueror.
  * @internal
- * @deprecated tqreplaced with KDesktopPropsPlugin
+ * @deprecated replaced with KDesktopPropsPlugin
  */
  /// Remove in KDE4
 class KIO_EXPORT_DEPRECATED KExecPropsPlugin : public KPropsDlgPlugin
@@ -875,7 +875,7 @@ private:
  *
  * Such files are used to represent a program in kicker and konqueror.
  * @internal
- * @deprecated tqreplaced with KDesktopPropsPlugin
+ * @deprecated replaced with KDesktopPropsPlugin
  */
  /// Remove in KDE4
 class KIO_EXPORT_DEPRECATED KApplicationPropsPlugin : public KPropsDlgPlugin
diff --git a/kio/kfile/kpropertiesmimetypebase.ui b/kio/kfile/kpropertiesmimetypebase.ui
index d67d8eaaf..0223f22a6 100644
--- a/kio/kfile/kpropertiesmimetypebase.ui
+++ b/kio/kfile/kpropertiesmimetypebase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>widget2</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -66,5 +66,5 @@
 <includes>
     <include location="global" impldecl="in implementation">klistview.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kio/kfile/krecentdirs.cpp b/kio/kfile/krecentdirs.cpp
index 85cdebb02..22b4cd477 100644
--- a/kio/kfile/krecentdirs.cpp
+++ b/kio/kfile/krecentdirs.cpp
@@ -52,13 +52,13 @@ static KConfig *recentdirs_readList(TQString &key, TQStringList &result, bool re
    if (key[1] == ':') 
    {
       key = key.mid(2);
-      config = new KSimpleConfig(TQString::tqfromLatin1("krecentdirsrc"), readOnly);
+      config = new KSimpleConfig(TQString::fromLatin1("krecentdirsrc"), readOnly);
    }
    else
    {
       key = key.mid(1);
       config = KGlobal::config();
-      config->setGroup(TQString::tqfromLatin1("Recent Dirs"));
+      config->setGroup(TQString::fromLatin1("Recent Dirs"));
    }
 
    result=config->readPathListEntry(key);
diff --git a/kio/kfile/krecentdocument.cpp b/kio/kfile/krecentdocument.cpp
index b54bdf325..69fd63df5 100644
--- a/kio/kfile/krecentdocument.cpp
+++ b/kio/kfile/krecentdocument.cpp
@@ -45,7 +45,7 @@
 TQString KRecentDocument::recentDocumentDirectory()
 {
     // need to change this path, not sure where
-    return locateLocal("data", TQString::tqfromLatin1("RecentDocuments/"));
+    return locateLocal("data", TQString::fromLatin1("RecentDocuments/"));
 }
 
 TQStringList KRecentDocument::recentDocuments()
@@ -74,7 +74,7 @@ TQStringList KRecentDocument::recentDocuments()
 
 void KRecentDocument::add(const KURL& url)
 {
-    KRecentDocument::add(url, tqApp->argv()[0]); // ### argv[0] might not match the service filename!
+    KRecentDocument::add(url, qApp->argv()[0]); // ### argv[0] might not match the service filename!
 }
 
 void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName)
@@ -83,14 +83,14 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName)
 		return;
 
     TQString openStr = url.url();
-    openStr.tqreplace( TQRegExp("\\$"), "$$" ); // Desktop files with type "Link" are $-variable expanded
+    openStr.replace( TQRegExp("\\$"), "$$" ); // Desktop files with type "Link" are $-variable expanded
 
     kdDebug(250) << "KRecentDocument::add for " << openStr << endl;
     KConfig *config = KGlobal::config();
     TQString oldGrp = config->group();
-    config->setGroup(TQString::tqfromLatin1("RecentDocuments"));
-    bool useRecent = config->readBoolEntry(TQString::tqfromLatin1("UseRecent"), true);
-    int maxEntries = config->readNumEntry(TQString::tqfromLatin1("MaxEntries"), 10);
+    config->setGroup(TQString::fromLatin1("RecentDocuments"));
+    bool useRecent = config->readBoolEntry(TQString::fromLatin1("UseRecent"), true);
+    int maxEntries = config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10);
 
     config->setGroup(oldGrp);
     if(!useRecent)
@@ -100,7 +100,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName)
 
     TQString dStr = path + url.fileName();
 
-    TQString ddesktop = dStr + TQString::tqfromLatin1(".desktop");
+    TQString ddesktop = dStr + TQString::fromLatin1(".desktop");
 
     int i=1;
     // check for duplicates
@@ -108,7 +108,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName)
         // see if it points to the same file and application
         KSimpleConfig tmp(ddesktop);
         tmp.setDesktopGroup();
-        if(tmp.readEntry(TQString::tqfromLatin1("X-KDE-LastOpenedWith"))
+        if(tmp.readEntry(TQString::fromLatin1("X-KDE-LastOpenedWith"))
 	   == desktopEntryName)
 	{
             utime(TQFile::encodeName(ddesktop), NULL);
@@ -118,7 +118,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName)
         ++i;
         if ( i > maxEntries )
             break;
-        ddesktop = dStr + TQString::tqfromLatin1("[%1].desktop").arg(i);
+        ddesktop = dStr + TQString::fromLatin1("[%1].desktop").arg(i);
     }
 
     TQDir dir(path);
@@ -129,7 +129,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName)
         TQStringList::Iterator it;
         it = list.begin();
         while(i > maxEntries-1){
-            TQFile::remove(dir.absPath() + TQString::tqfromLatin1("/") + (*it));
+            TQFile::remove(dir.absPath() + TQString::fromLatin1("/") + (*it));
             --i, ++it;
         }
     }
@@ -137,15 +137,15 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName)
     // create the applnk
     KSimpleConfig conf(ddesktop);
     conf.setDesktopGroup();
-    conf.writeEntry( TQString::tqfromLatin1("Type"), TQString::tqfromLatin1("Link") );
-    conf.writePathEntry( TQString::tqfromLatin1("URL"), openStr );
+    conf.writeEntry( TQString::fromLatin1("Type"), TQString::fromLatin1("Link") );
+    conf.writePathEntry( TQString::fromLatin1("URL"), openStr );
     // If you change the line below, change the test in the above loop
-    conf.writeEntry( TQString::tqfromLatin1("X-KDE-LastOpenedWith"), desktopEntryName );
+    conf.writeEntry( TQString::fromLatin1("X-KDE-LastOpenedWith"), desktopEntryName );
     TQString name = url.fileName();
     if (name.isEmpty())
       name = openStr;
-    conf.writeEntry( TQString::tqfromLatin1("Name"), name );
-    conf.writeEntry( TQString::tqfromLatin1("Icon"), KMimeType::iconForURL( url ) );
+    conf.writeEntry( TQString::fromLatin1("Name"), name );
+    conf.writeEntry( TQString::fromLatin1("Icon"), KMimeType::iconForURL( url ) );
 }
 
 void KRecentDocument::add(const TQString &openStr, bool isUrl)
@@ -170,8 +170,8 @@ void KRecentDocument::clear()
 int KRecentDocument::maximumItems()
 {
     KConfig *config = KGlobal::config();
-    KConfigGroupSaver sa(config, TQString::tqfromLatin1("RecentDocuments"));
-    return config->readNumEntry(TQString::tqfromLatin1("MaxEntries"), 10);
+    KConfigGroupSaver sa(config, TQString::fromLatin1("RecentDocuments"));
+    return config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10);
 }
 
 
diff --git a/kio/kfile/kurlbar.cpp b/kio/kfile/kurlbar.cpp
index 2d6edc0b9..d1a9de4ea 100644
--- a/kio/kfile/kurlbar.cpp
+++ b/kio/kfile/kurlbar.cpp
@@ -64,7 +64,7 @@ protected:
         if ( item ) {
             TQString text = static_cast<KURLBarItem*>( item )->toolTip();
             if ( !text.isEmpty() )
-                tip( m_view->tqitemRect( item ), text );
+                tip( m_view->itemRect( item ), text );
         }
     }
 
@@ -188,11 +188,11 @@ void KURLBarItem::paint( TQPainter *p )
     if ( isCurrent() || isSelected() ) {
         int h = height( box );
 
-        TQBrush brush = box->tqcolorGroup().brush( TQColorGroup::Highlight );
+        TQBrush brush = box->colorGroup().brush( TQColorGroup::Highlight );
         p->fillRect( 0, 0, w, h, brush );
         TQPen pen = p->pen();
         TQPen oldPen = pen;
-        pen.setColor( box->tqcolorGroup().mid() );
+        pen.setColor( box->colorGroup().mid() );
         p->setPen( pen );
 
         p->drawPoint( 0, 0 );
@@ -225,10 +225,10 @@ void KURLBarItem::paint( TQPainter *p )
             int xPos = pm->width() + margin + 2;
 
             if ( isCurrent() || isSelected() ) {
-                p->setPen( box->tqcolorGroup().highlight().dark(115) );
+                p->setPen( box->colorGroup().highlight().dark(115) );
                 p->drawText( xPos + ( TQApplication::reverseLayout() ? -1 : 1),
                              yPos + 1, visibleText );
-                p->setPen( box->tqcolorGroup().highlightedText() );
+                p->setPen( box->colorGroup().highlightedText() );
             }
 
             p->drawText( xPos, yPos, visibleText );
@@ -257,10 +257,10 @@ void KURLBarItem::paint( TQPainter *p )
             x = QMAX( x, margin );
 
             if ( isCurrent() || isSelected() ) {
-                p->setPen( box->tqcolorGroup().highlight().dark(115) );
+                p->setPen( box->colorGroup().highlight().dark(115) );
                 p->drawText( x + ( TQApplication::reverseLayout() ? -1 : 1),
                              y + 1, visibleText );
-                p->setPen( box->tqcolorGroup().highlightedText() );
+                p->setPen( box->colorGroup().highlightedText() );
             }
 
             p->drawText( x, y, visibleText );
@@ -268,7 +268,7 @@ void KURLBarItem::paint( TQPainter *p )
     }
 }
 
-TQSize KURLBarItem::tqsizeHint() const
+TQSize KURLBarItem::sizeHint() const
 {
     int wmin = 0;
     int hmin = 0;
@@ -284,9 +284,9 @@ TQSize KURLBarItem::tqsizeHint() const
     }
 
     if ( lb->isVertical() )
-        wmin = QMIN( wmin, lb->viewport()->tqsizeHint().width() );
+        wmin = QMIN( wmin, lb->viewport()->sizeHint().width() );
     else
-        hmin = QMIN( hmin, lb->viewport()->tqsizeHint().height() );
+        hmin = QMIN( hmin, lb->viewport()->sizeHint().height() );
 
     return TQSize( wmin, hmin );
 }
@@ -294,17 +294,17 @@ TQSize KURLBarItem::tqsizeHint() const
 int KURLBarItem::width( const TQListBox *lb ) const
 {
     if ( static_cast<const KURLBarListBox *>( lb )->isVertical() )
-        return QMAX( tqsizeHint().width(), lb->viewport()->width() );
+        return QMAX( sizeHint().width(), lb->viewport()->width() );
     else
-        return tqsizeHint().width();
+        return sizeHint().width();
 }
 
 int KURLBarItem::height( const TQListBox *lb ) const
 {
     if ( static_cast<const KURLBarListBox *>( lb )->isVertical() )
-        return tqsizeHint().height();
+        return sizeHint().height();
     else
-        return QMAX( tqsizeHint().height(), lb->viewport()->height() );
+        return QMAX( sizeHint().height(), lb->viewport()->height() );
 }
 
 bool KURLBarItem::isPersistent() const
@@ -341,7 +341,7 @@ KURLBar::KURLBar( bool useGlobalItems, TQWidget *parent, const char *name, WFlag
     d = new KURLBarPrivate();
 
     setListBox( 0L );
-    tqsetSizePolicy( TQSizePolicy( isVertical() ?
+    setSizePolicy( TQSizePolicy( isVertical() ?
                                 TQSizePolicy::Maximum :
                                 TQSizePolicy::Preferred,
                                 isVertical() ?
@@ -378,7 +378,7 @@ KURLBarItem * KURLBar::insertDynamicItem(const KURL& url, const TQString& descri
 void KURLBar::setOrientation( Qt::Orientation orient )
 {
     m_listBox->setOrientation( orient );
-    tqsetSizePolicy( TQSizePolicy( isVertical() ?
+    setSizePolicy( TQSizePolicy( isVertical() ?
                                 TQSizePolicy::Maximum :
                                 TQSizePolicy::Preferred,
                                 isVertical() ?
@@ -401,7 +401,7 @@ void KURLBar::setListBox( KURLBarListBox *view )
     }
     else {
         m_listBox = view;
-        if ( m_listBox->tqparentWidget() != this )
+        if ( m_listBox->parentWidget() != this )
             m_listBox->reparent( this, TQPoint(0,0) );
         m_listBox->resize( width(), height() );
     }
@@ -435,7 +435,7 @@ void KURLBar::setIconSize( int size )
         item = static_cast<KURLBarItem*>( item->next() );
     }
 
-    resize( tqsizeHint() );
+    resize( sizeHint() );
     updateGeometry();
 }
 
@@ -466,14 +466,14 @@ void KURLBar::paletteChange( const TQPalette & )
     setPalette( pal );
 }
 
-TQSize KURLBar::tqsizeHint() const
+TQSize KURLBar::sizeHint() const
 {
-    return m_listBox->tqsizeHint();
+    return m_listBox->sizeHint();
 
 #if 0
     // this code causes vertical and or horizontal scrollbars appearing
     // depending on the text, font, moonphase and earth rotation. Just using
-    // m_listBox->tqsizeHint() fixes this (although the widget can then be
+    // m_listBox->sizeHint() fixes this (although the widget can then be
     // resized to a smaller size so that scrollbars appear).
     int w = 0;
     int h = 0;
@@ -484,7 +484,7 @@ TQSize KURLBar::tqsizeHint() const
           item;
           item = static_cast<KURLBarItem*>( item->next() ) ) {
 
-        TQSize sh = item->tqsizeHint();
+        TQSize sh = item->sizeHint();
 
         if ( vertical ) {
             w = QMAX( w, sh.width() );
@@ -508,9 +508,9 @@ TQSize KURLBar::tqsizeHint() const
 #endif
 }
 
-TQSize KURLBar::tqminimumSizeHint() const
+TQSize KURLBar::minimumSizeHint() const
 {
-    TQSize s = tqsizeHint(); // ###
+    TQSize s = sizeHint(); // ###
     int w = s.width()  + m_listBox->verticalScrollBar()->width();
     int h = s.height() + m_listBox->horizontalScrollBar()->height();
     return TQSize( w, h );
@@ -844,7 +844,7 @@ KURLBarListBox::~KURLBarListBox()
 void KURLBarListBox::paintEvent( TQPaintEvent* )
 {
     TQPainter p(this);
-    p.setPen( tqcolorGroup().mid() );
+    p.setPen( colorGroup().mid() );
     p.drawRect( 0, 0, width(), height() );
 }
 
@@ -980,7 +980,7 @@ KURLBarItemDialog::KURLBarItemDialog( bool allowGlobal, const KURL& url,
         if ( KGlobal::instance()->aboutData() )
             appName = KGlobal::instance()->aboutData()->programName();
         if ( appName.isEmpty() )
-            appName = TQString::tqfromLatin1( KGlobal::instance()->instanceName() );
+            appName = TQString::fromLatin1( KGlobal::instance()->instanceName() );
         m_appLocal = new TQCheckBox( i18n("&Only show when using this application (%1)").arg( appName ), box );
         m_appLocal->setChecked( appLocal );
         TQWhatsThis::add( m_appLocal,
diff --git a/kio/kfile/kurlbar.h b/kio/kfile/kurlbar.h
index 8f247623b..8da43ff15 100644
--- a/kio/kfile/kurlbar.h
+++ b/kio/kfile/kurlbar.h
@@ -109,7 +109,7 @@ public:
      * returns the preferred size of this item
      * @since 3.1
      */
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
 
     /**
      * returns the width of this item.
@@ -319,12 +319,12 @@ public:
      * @returns a proper sizehint, depending on the orientation and the number
      * of items available.
      */
-    virtual TQSize tqsizeHint() const;
+    virtual TQSize sizeHint() const;
 
     /**
      * @returns a proper minimum size (reimplemented)
      */
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
     /**
      * Call this method to read a saved configuration from @p config,
diff --git a/kio/kfile/kurlcombobox.cpp b/kio/kfile/kurlcombobox.cpp
index f7bf58bc0..72c7cbd07 100644
--- a/kio/kfile/kurlcombobox.cpp
+++ b/kio/kfile/kurlcombobox.cpp
@@ -31,7 +31,7 @@ class KURLComboBox::KURLComboBoxPrivate
 {
 public:
     KURLComboBoxPrivate() {
-	dirpix = SmallIcon(TQString::tqfromLatin1("folder"));
+	dirpix = SmallIcon(TQString::fromLatin1("folder"));
     }
 
     TQPixmap dirpix;
@@ -70,9 +70,9 @@ void KURLComboBox::init( Mode mode )
     defaultList.setAutoDelete( true );
     setInsertionPolicy( NoInsertion );
     setTrapReturnKey( true );
-    tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+    setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
 
-    opendirPix = SmallIcon(TQString::tqfromLatin1("folder_open"));
+    opendirPix = SmallIcon(TQString::fromLatin1("folder_open"));
 
     connect( this, TQT_SIGNAL( activated( int )), TQT_SLOT( slotActivated( int )));
 }
@@ -152,7 +152,7 @@ void KURLComboBox::setURLs( TQStringList urls, OverLoadResolving remove )
     // kill duplicates
     TQString text;
     while ( it != urls.end() ) {
-        while ( urls.tqcontains( *it ) > 1 ) {
+        while ( urls.contains( *it ) > 1 ) {
             it = urls.remove( it );
             continue;
         }
diff --git a/kio/kfile/kurlcombobox.h b/kio/kfile/kurlcombobox.h
index 60db16dce..d65cd91f5 100644
--- a/kio/kfile/kurlcombobox.h
+++ b/kio/kfile/kurlcombobox.h
@@ -83,7 +83,7 @@ public:
     /**
      * Sets the current url. This combo handles exactly one url additionally
      * to the default items and those set via setURLs(). So you can call
-     * setURL() as often as you want, it will always tqreplace the previous one
+     * setURL() as often as you want, it will always replace the previous one
      * set via setURL().
      * If @p url is already in the combo, the last item will stay there
      * and the existing item becomes the current item.
@@ -98,7 +98,7 @@ public:
      * Inserts @p urls into the combobox below the "default urls" (see
      * addDefaultURL).
      *
-     * If the list of urls tqcontains more items than maxItems, the first items
+     * If the list of urls contains more items than maxItems, the first items
      * will be stripped.
      */
     void setURLs( TQStringList urls );
@@ -107,13 +107,13 @@ public:
      * Inserts @p urls into the combobox below the "default urls" (see
      * addDefaultURL).
      *
-     * If the list of urls tqcontains more items than maxItems, the @p remove
+     * If the list of urls contains more items than maxItems, the @p remove
      * parameter determines whether the first or last items will be stripped.
      */
     void setURLs( TQStringList urls, OverLoadResolving remove );
 
     /**
-     * @returns a list of all urls currently handled. The list tqcontains at most
+     * @returns a list of all urls currently handled. The list contains at most
      * maxItems() items.
      * Use this to save the list of urls in a config-file and reinsert them
      * via setURLs() next time.
diff --git a/kio/kfile/kurlrequester.cpp b/kio/kfile/kurlrequester.cpp
index aa102548a..ae8f5b623 100644
--- a/kio/kfile/kurlrequester.cpp
+++ b/kio/kfile/kurlrequester.cpp
@@ -132,7 +132,7 @@ public:
     }
 
     /**
-     * tqreplaces ~user or $FOO, if necessary
+     * replaces ~user or $FOO, if necessary
      */
     TQString url() {
         TQString txt = combo ? combo->currentText() : edit->text();
@@ -143,7 +143,7 @@ public:
             comp = dynamic_cast<KURLCompletion*>(edit->completionObject());
 
         if ( comp )
-            return comp->tqreplacedPath( txt );
+            return comp->replacedPath( txt );
         else
             return txt;
     }
@@ -206,7 +206,7 @@ void KURLRequester::init()
 	d->edit = new KLineEdit( this, "line edit" );
 
     myButton = new KURLDragPushButton( this, "kfile button");
-    TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("fileopen"));
+    TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("fileopen"));
     TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
     myButton->setIconSet( iconSet );
     myButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
@@ -340,7 +340,7 @@ TQString KURLRequester::filter( ) const
 KFileDialog * KURLRequester::fileDialog() const
 {
     if ( !myFileDialog ) {
-        TQWidget *p = tqparentWidget();
+        TQWidget *p = parentWidget();
         myFileDialog = new KFileDialog( TQString::null, d->fileDialogFilter, p,
                                         "file dialog", true );
 
@@ -402,7 +402,7 @@ KPushButton * KURLRequester::button() const
 
 KEditListBox::CustomEditor KURLRequester::customEditor()
 {
-    tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Preferred,
+    setSizePolicy(TQSizePolicy( TQSizePolicy::Preferred,
                                TQSizePolicy::Fixed));
 
     KLineEdit *edit = d->edit;
diff --git a/kio/kfile/kurlrequester.h b/kio/kfile/kurlrequester.h
index 7322d309b..1bdbeee3e 100644
--- a/kio/kfile/kurlrequester.h
+++ b/kio/kfile/kurlrequester.h
@@ -76,7 +76,7 @@ public:
     /**
      * Special constructor, which creates a KURLRequester widget with a custom
      * edit-widget. The edit-widget can be either a KComboBox or a KLineEdit
-     * (or inherited thereof). Note: for tqgeometry management reasons, the
+     * (or inherited thereof). Note: for geometry management reasons, the
      * edit-widget is reparented to have the KURLRequester as parent.
      */
     KURLRequester( TQWidget *editWidget, TQWidget *parent, const char *name=0 );
@@ -218,7 +218,7 @@ signals:
     // forwards from LineEdit
     /**
      * Emitted when the text in the lineedit changes.
-     * The parameter tqcontains the contents of the lineedit.
+     * The parameter contains the contents of the lineedit.
      * @since 3.1
      */
     void textChanged( const TQString& );
@@ -230,7 +230,7 @@ signals:
 
     /**
      * Emitted when return or enter was pressed in the lineedit.
-     * The parameter tqcontains the contents of the lineedit.
+     * The parameter contains the contents of the lineedit.
      */
     void returnPressed( const TQString& );
 
@@ -249,7 +249,7 @@ signals:
 
     /**
      * Emitted when the user changed the URL via the file dialog.
-     * The parameter tqcontains the contents of the lineedit.
+     * The parameter contains the contents of the lineedit.
      * // TODO KDE4: Use KURL instead
      */
     void urlSelected( const TQString& );
diff --git a/kio/kfile/kurlrequesterdlg.cpp b/kio/kfile/kurlrequesterdlg.cpp
index defa09264..19409afdc 100644
--- a/kio/kfile/kurlrequesterdlg.cpp
+++ b/kio/kfile/kurlrequesterdlg.cpp
@@ -67,7 +67,7 @@ void KURLRequesterDlg::initDialog(const TQString &text,const TQString &urlName)
     topLayout->addWidget( label );
 
     urlRequester_ = new KURLRequester( urlName, plainPage(), "urlRequester" );
-    urlRequester_->setMinimumWidth( urlRequester_->tqsizeHint().width() * 3 );
+    urlRequester_->setMinimumWidth( urlRequester_->sizeHint().width() * 3 );
     topLayout->addWidget( urlRequester_ );
     urlRequester_->setFocus();
     connect( urlRequester_->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)),
diff --git a/kio/kfile/tests/kdirselectdialogtest.cpp b/kio/kfile/tests/kdirselectdialogtest.cpp
index c66ed3ff2..47fcd02ca 100644
--- a/kio/kfile/tests/kdirselectdialogtest.cpp
+++ b/kio/kfile/tests/kdirselectdialogtest.cpp
@@ -10,7 +10,7 @@ int main( int argc, char **argv )
     KURL u = KDirSelectDialog::selectDirectory( (argc >= 1) ? argv[1] : TQString::null );
     if ( u.isValid() )
         KMessageBox::information( 0L,
-                                TQString::tqfromLatin1("You selected the url: %1")
+                                TQString::fromLatin1("You selected the url: %1")
                                 .arg( u.prettyURL() ), "Selected URL" );
 
     return 0;
diff --git a/kio/kfile/tests/kfdtest.cpp b/kio/kfile/tests/kfdtest.cpp
index 43dbb4fd0..25e2da949 100644
--- a/kio/kfile/tests/kfdtest.cpp
+++ b/kio/kfile/tests/kfdtest.cpp
@@ -25,10 +25,10 @@ void KFDTest::doit()
 
     if ( dlg->exec() == KDialog::Accepted )
     {
-        KMessageBox::information(0, TQString::tqfromLatin1("You selected the file: %1").arg( dlg->selectedURL().prettyURL() ));
+        KMessageBox::information(0, TQString::fromLatin1("You selected the file: %1").arg( dlg->selectedURL().prettyURL() ));
     }
     
-//     tqApp->quit();
+//     qApp->quit();
 }
 
 #include "kfdtest.moc"
diff --git a/kio/kfile/tests/kfdtest.h b/kio/kfile/tests/kfdtest.h
index 6c59550b8..3f980bc94 100644
--- a/kio/kfile/tests/kfdtest.h
+++ b/kio/kfile/tests/kfdtest.h
@@ -10,7 +10,7 @@
 
 #include <tqobject.h>
 
-class KFDTest : public TQObject
+class KFDTest : public QObject
 {
     Q_OBJECT
 
diff --git a/kio/kfile/tests/kfiletreeviewtest.cpp b/kio/kfile/tests/kfiletreeviewtest.cpp
index bad100809..5c520dd5d 100644
--- a/kio/kfile/tests/kfiletreeviewtest.cpp
+++ b/kio/kfile/tests/kfiletreeviewtest.cpp
@@ -148,7 +148,7 @@ int main(int argc, char **argv)
     {
        for( int i = 1; i < argc; i++ )
        {
-	  argv1 = TQString::tqfromLatin1(argv[i]);
+	  argv1 = TQString::fromLatin1(argv[i]);
 	  kdDebug() << "Opening " << argv1 << endl;
 	  if( argv1 == "-d" )
 	     tf->setDirOnly();
diff --git a/kio/kfile/tests/kfstest.cpp b/kio/kfile/tests/kfstest.cpp
index 48c8a1a2b..b84cbc967 100644
--- a/kio/kfile/tests/kfstest.cpp
+++ b/kio/kfile/tests/kfstest.cpp
@@ -51,11 +51,11 @@ int main(int argc, char **argv)
     TQString argv1;
     TQString startDir;
     if (argc > 1)
-	argv1 = TQString::tqfromLatin1(argv[1]);
+	argv1 = TQString::fromLatin1(argv[1]);
     if ( argc > 2 )
-        startDir = TQString::tqfromLatin1( argv[2]);
+        startDir = TQString::fromLatin1( argv[2]);
 
-    if (argv1 == TQString::tqfromLatin1("diroperator")) {
+    if (argv1 == TQString::fromLatin1("diroperator")) {
 	KDirOperator *op = new KDirOperator(startDir, 0, "operator");
 	op->setViewConfig( KGlobal::config(), "TestGroup" );
 	op->setView(KFile::Simple);
@@ -64,24 +64,24 @@ int main(int argc, char **argv)
 	a.exec();
     }
 
-    else if (argv1 == TQString::tqfromLatin1("justone")) {
+    else if (argv1 == TQString::fromLatin1("justone")) {
         TQString name = KFileDialog::getOpenFileName(startDir);
         qDebug("filename=%s",name.latin1());
     }
 
-    else if (argv1 == TQString::tqfromLatin1("existingURL")) {
+    else if (argv1 == TQString::fromLatin1("existingURL")) {
         KURL url = KFileDialog::getExistingURL();
         qDebug("URL=%s",url.url().latin1());
         name1 = url.url();
     }
 
-    else if (argv1 == TQString::tqfromLatin1("preview")) {
+    else if (argv1 == TQString::fromLatin1("preview")) {
         KURL u =  KFileDialog::getImageOpenURL();
         qDebug("filename=%s", u.url().latin1());
     }
 
-    else if (argv1 == TQString::tqfromLatin1("preselect")) {
-        names = KFileDialog::getOpenFileNames(TQString::tqfromLatin1("/etc/passwd"));
+    else if (argv1 == TQString::fromLatin1("preselect")) {
+        names = KFileDialog::getOpenFileNames(TQString::fromLatin1("/etc/passwd"));
         TQStringList::Iterator it = names.begin();
         while ( it != names.end() ) {
             qDebug("selected file: %s", (*it).latin1());
@@ -89,10 +89,10 @@ int main(int argc, char **argv)
         }
     }
 
-    else if (argv1 == TQString::tqfromLatin1("dirs"))
+    else if (argv1 == TQString::fromLatin1("dirs"))
 	name1 = KFileDialog::getExistingDirectory();
 
-    else if (argv1 == TQString::tqfromLatin1("heap")) {
+    else if (argv1 == TQString::fromLatin1("heap")) {
 	KFileDialog *dlg = new KFileDialog( startDir, TQString::null, 0L,
 					    "file dialog", true );
 	dlg->setMode( KFile::File);
@@ -104,33 +104,33 @@ int main(int argc, char **argv)
     if ( urlBar )
     {
         urlBar->insertDynamicItem( KURL("ftp://ftp.kde.org"), 
-                                   TQString::tqfromLatin1("KDE FTP Server") );
+                                   TQString::fromLatin1("KDE FTP Server") );
     }
 
 	if ( dlg->exec() == KDialog::Accepted )
 	    name1 = dlg->selectedURL().url();
     }
 
-    else if ( argv1 == TQString::tqfromLatin1("eventloop") )
+    else if ( argv1 == TQString::fromLatin1("eventloop") )
     {
         KFDTest *test = new KFDTest( startDir );
         return a.exec();
     }
 
-    else if (argv1 == TQString::tqfromLatin1("save")) {
+    else if (argv1 == TQString::fromLatin1("save")) {
         KURL u = KFileDialog::getSaveURL();
-//        TQString(TQDir::homeDirPath() + TQString::tqfromLatin1("/testfile")),
+//        TQString(TQDir::homeDirPath() + TQString::fromLatin1("/testfile")),
 //        TQString::null, 0L);
         name1 = u.url();
     }
 
-    else if (argv1 == TQString::tqfromLatin1("icon")) {
+    else if (argv1 == TQString::fromLatin1("icon")) {
     	KIconDialog dlg;
 	TQString icon = dlg.selectIcon();
 	kdDebug() << icon << endl;
     }
 
-//     else if ( argv1 == TQString::tqfromLatin1("dirselect") ) {
+//     else if ( argv1 == TQString::fromLatin1("dirselect") ) {
 //         KURL url;
 //         url.setPath( "/" );
 //         KURL selected = KDirSelectDialog::selectDirectory( url );
@@ -140,7 +140,7 @@ int main(int argc, char **argv)
 
     else {
 	KFileDialog dlg(startDir,
-			TQString::tqfromLatin1("*|All Files\n"
+			TQString::fromLatin1("*|All Files\n"
 					    "*.lo *.o *.la|All libtool Files"),
 			0, 0, true);
 //    dlg.setFilter( "*.kdevelop" );
@@ -177,7 +177,7 @@ int main(int argc, char **argv)
     }
 
     if (!(name1.isNull()))
-	KMessageBox::information(0, TQString::tqfromLatin1("You selected the file " ) + name1,
-				 TQString::tqfromLatin1("Your Choice"));
+	KMessageBox::information(0, TQString::fromLatin1("You selected the file " ) + name1,
+				 TQString::fromLatin1("Your Choice"));
     return 0;
 }
diff --git a/kio/kfile/tests/kurlrequestertest.cpp b/kio/kfile/tests/kurlrequestertest.cpp
index 4a1d4bec0..9248eec5d 100644
--- a/kio/kfile/tests/kurlrequestertest.cpp
+++ b/kio/kfile/tests/kurlrequestertest.cpp
@@ -10,7 +10,7 @@ int main( int argc, char **argv )
     qDebug( "Selected url: %s", url.url().latin1());
 
     KURLRequester *req = new KURLRequester();
-    KEditListBox *el = new KEditListBox( TQString::tqfromLatin1("Test"), req->customEditor() );
+    KEditListBox *el = new KEditListBox( TQString::fromLatin1("Test"), req->customEditor() );
     el->show();
     return app.exec();
 }
diff --git a/kio/kio/authinfo.cpp b/kio/kio/authinfo.cpp
index 318e99277..d4aa27353 100644
--- a/kio/kio/authinfo.cpp
+++ b/kio/kio/authinfo.cpp
@@ -76,17 +76,17 @@ TQDataStream& KIO::operator<< (TQDataStream& s, const AuthInfo& a)
 {
     s << a.url << a.username << a.password << a.prompt << a.caption
       << a.comment << a.commentLabel << a.realmValue << a.digestInfo
-      << TQ_UINT8(a.verifyPath ? 1:0) << TQ_UINT8(a.readOnly ? 1:0)
-      << TQ_UINT8(a.keepPassword ? 1:0) << TQ_UINT8(a.modified ? 1:0);
+      << Q_UINT8(a.verifyPath ? 1:0) << Q_UINT8(a.readOnly ? 1:0)
+      << Q_UINT8(a.keepPassword ? 1:0) << Q_UINT8(a.modified ? 1:0);
     return s;
 }
 
 TQDataStream& KIO::operator>> (TQDataStream& s, AuthInfo& a)
 {
-    TQ_UINT8 verify = 0;
-    TQ_UINT8 ro = 0;
-    TQ_UINT8 keep = 0;
-    TQ_UINT8 mod  = 0;
+    Q_UINT8 verify = 0;
+    Q_UINT8 ro = 0;
+    Q_UINT8 keep = 0;
+    Q_UINT8 mod  = 0;
 
     s >> a.url >> a.username >> a.password >> a.prompt >> a.caption
       >> a.comment >> a.commentLabel >> a.realmValue >> a.digestInfo
@@ -146,7 +146,7 @@ bool NetRC::lookup( const KURL& url, AutoLogin& login, bool userealnetrc,
       return false;
   }
 
-  if ( !loginMap.tqcontains( type ) )
+  if ( !loginMap.contains( type ) )
     return false;
 
   LoginList l = loginMap[type];
@@ -158,7 +158,7 @@ bool NetRC::lookup( const KURL& url, AutoLogin& login, bool userealnetrc,
     AutoLogin &log = *it;
 
     if ( (mode & defaultOnly) == defaultOnly &&
-          log.machine == TQString::tqfromLatin1("default") &&
+          log.machine == TQString::fromLatin1("default") &&
           (login.login.isEmpty() || login.login == log.login) )
     {
       login.type = log.type;
@@ -169,7 +169,7 @@ bool NetRC::lookup( const KURL& url, AutoLogin& login, bool userealnetrc,
     }
 
     if ( (mode & presetOnly) == presetOnly &&
-          log.machine == TQString::tqfromLatin1("preset") &&
+          log.machine == TQString::fromLatin1("preset") &&
           (login.login.isEmpty() || login.login == log.login) )
     {
       login.type = log.type;
@@ -237,7 +237,7 @@ TQString NetRC::extract( const char* buf, const char* key, int& pos )
       if ( idx > start )
       {
         pos = idx;
-        return TQString::tqfromLatin1( buf+start, idx-start);
+        return TQString::fromLatin1( buf+start, idx-start);
       }
     }
   }
@@ -280,7 +280,7 @@ bool NetRC::parse( int fd )
       while( buf[tail-1] == '\n' || buf[tail-1] =='\r' )
         tail--;
 
-      TQString mac = TQString::tqfromLatin1(buf, tail).stripWhiteSpace();
+      TQString mac = TQString::fromLatin1(buf, tail).stripWhiteSpace();
       if ( !mac.isEmpty() )
         loginMap[type][index].macdef[macro].append( mac );
 
@@ -294,12 +294,12 @@ bool NetRC::parse( int fd )
       if (strncasecmp(buf+pos, "default", 7) == 0 )
       {
         pos += 7;
-        l.machine = TQString::tqfromLatin1("default");
+        l.machine = TQString::fromLatin1("default");
       }
       else if (strncasecmp(buf+pos, "preset", 6) == 0 )
       {
         pos += 6;
-        l.machine = TQString::tqfromLatin1("preset");
+        l.machine = TQString::fromLatin1("preset");
       }
     }
     // kdDebug() << "Machine: " << l.machine << endl;
@@ -314,7 +314,7 @@ bool NetRC::parse( int fd )
 
     type = l.type = extract( buf, "type", pos );
     if ( l.type.isEmpty() && !l.machine.isEmpty() )
-      type = l.type = TQString::tqfromLatin1("ftp");
+      type = l.type = TQString::fromLatin1("ftp");
     // kdDebug() << "Type: " << l.type << endl;
 
     macro = extract( buf, "macdef", pos );
diff --git a/kio/kio/chmodjob.cpp b/kio/kio/chmodjob.cpp
index 9d8c271ad..e1d343c10 100644
--- a/kio/kio/chmodjob.cpp
+++ b/kio/kio/chmodjob.cpp
@@ -40,11 +40,11 @@
 
 using namespace KIO;
 
-ChmodJob::ChmodJob( const KFileItemList& lstItems, int permissions, int tqmask,
+ChmodJob::ChmodJob( const KFileItemList& lstItems, int permissions, int mask,
                     int newOwner, int newGroup,
                     bool recursive, bool showProgressInfo )
     : KIO::Job( showProgressInfo ), state( STATE_LISTING ),
-      m_permissions( permissions ), m_tqmask( tqmask ),
+      m_permissions( permissions ), m_mask( mask ),
       m_newOwner( newOwner ), m_newGroup( newGroup ),
       m_recursive( recursive ), m_lstItems( lstItems )
 {
@@ -62,12 +62,12 @@ void ChmodJob::processList()
             ChmodInfo info;
             info.url = item->url();
             // This is a toplevel file, we apply changes directly (no +X emulation here)
-            info.permissions = ( m_permissions & m_tqmask ) | ( item->permissions() & ~m_tqmask );
+            info.permissions = ( m_permissions & m_mask ) | ( item->permissions() & ~m_mask );
             /*kdDebug(7007) << "\n current permissions=" << TQString::number(item->permissions(),8)
                           << "\n wanted permission=" << TQString::number(m_permissions,8)
-                          << "\n with tqmask=" << TQString::number(m_tqmask,8)
-                          << "\n with ~tqmask (tqmask bits we keep) =" << TQString::number((uint)~m_tqmask,8)
-                          << "\n bits we keep =" << TQString::number(item->permissions() & ~m_tqmask,8)
+                          << "\n with mask=" << TQString::number(m_mask,8)
+                          << "\n with ~mask (mask bits we keep) =" << TQString::number((uint)~m_mask,8)
+                          << "\n bits we keep =" << TQString::number(item->permissions() & ~m_mask,8)
                           << "\n new permissions = " << TQString::number(info.permissions,8)
                           << endl;*/
             m_infos.prepend( info );
@@ -121,33 +121,33 @@ void ChmodJob::slotEntries( KIO::Job*, const KIO::UDSEntryList & list )
               break;
           }
         }
-        if ( !isLink && relativePath != TQString::tqfromLatin1("..") )
+        if ( !isLink && relativePath != TQString::fromLatin1("..") )
         {
             ChmodInfo info;
             info.url = m_lstItems.first()->url(); // base directory
             info.url.addPath( relativePath );
-            int tqmask = m_tqmask;
+            int mask = m_mask;
             // Emulate -X: only give +x to files that had a +x bit already
             // So the check is the opposite : if the file had no x bit, don't touch x bits
             // For dirs this doesn't apply
             if ( !isDir )
             {
-                int newPerms = m_permissions & tqmask;
+                int newPerms = m_permissions & mask;
                 if ( (newPerms & 0111) && !(permissions & 0111) )
                 {
                     // don't interfere with mandatory file locking
                     if ( newPerms & 02000 )
-                      tqmask = tqmask & ~0101;
+                      mask = mask & ~0101;
                     else
-                      tqmask = tqmask & ~0111;
+                      mask = mask & ~0111;
                 }
             }
-            info.permissions = ( m_permissions & tqmask ) | ( permissions & ~tqmask );
+            info.permissions = ( m_permissions & mask ) | ( permissions & ~mask );
             /*kdDebug(7007) << "\n current permissions=" << TQString::number(permissions,8)
                           << "\n wanted permission=" << TQString::number(m_permissions,8)
-                          << "\n with tqmask=" << TQString::number(tqmask,8)
-                          << "\n with ~tqmask (tqmask bits we keep) =" << TQString::number((uint)~tqmask,8)
-                          << "\n bits we keep =" << TQString::number(permissions & ~tqmask,8)
+                          << "\n with mask=" << TQString::number(mask,8)
+                          << "\n with ~mask (mask bits we keep) =" << TQString::number((uint)~mask,8)
+                          << "\n bits we keep =" << TQString::number(permissions & ~mask,8)
                           << "\n new permissions = " << TQString::number(info.permissions,8)
                           << endl;*/
             // Prepend this info in our todo list.
@@ -227,7 +227,7 @@ void ChmodJob::slotResult( KIO::Job * job )
 }
 
 // antlarr: KDE 4: Make owner and group be const TQString &
-KIO_EXPORT ChmodJob *KIO::chmod( const KFileItemList& lstItems, int permissions, int tqmask,
+KIO_EXPORT ChmodJob *KIO::chmod( const KFileItemList& lstItems, int permissions, int mask,
                       TQString owner, TQString group,
                       bool recursive, bool showProgressInfo )
 {
@@ -249,7 +249,7 @@ KIO_EXPORT ChmodJob *KIO::chmod( const KFileItemList& lstItems, int permissions,
         else
             newGroupID = g->gr_gid;
     }
-    return new ChmodJob( lstItems, permissions, tqmask, newOwnerID, newGroupID, recursive, showProgressInfo );
+    return new ChmodJob( lstItems, permissions, mask, newOwnerID, newGroupID, recursive, showProgressInfo );
 }
 
 void ChmodJob::virtual_hook( int id, void* data )
diff --git a/kio/kio/chmodjob.h b/kio/kio/chmodjob.h
index d1fe572f9..fdb873b17 100644
--- a/kio/kio/chmodjob.h
+++ b/kio/kio/chmodjob.h
@@ -42,7 +42,7 @@ namespace KIO {
 	/**
 	 * Create new ChmodJobs using the KIO::chmod() function.
 	 */
-        ChmodJob( const KFileItemList & lstItems,  int permissions, int tqmask,
+        ChmodJob( const KFileItemList & lstItems,  int permissions, int mask,
                   int newOwner, int newGroup,
                   bool recursive, bool showProgressInfo );
 
@@ -63,7 +63,7 @@ namespace KIO {
         };
         enum { STATE_LISTING, STATE_CHMODING } state;
         int m_permissions;
-        int m_tqmask;
+        int m_mask;
         int m_newOwner;
         int m_newGroup;
         bool m_recursive;
@@ -91,8 +91,8 @@ namespace KIO {
      *
      * @param lstItems The file items representing several files or directories.
      * @param permissions the permissions we want to set
-     * @param tqmask the bits we are allowed to change.
-     * For instance, if tqmask is 0077, we don't change
+     * @param mask the bits we are allowed to change.
+     * For instance, if mask is 0077, we don't change
      * the "user" bits, only "group" and "others".
      * @param newOwner If non-empty, the new owner for the files
      * @param newGroup If non-empty, the new group for the files
@@ -100,7 +100,7 @@ namespace KIO {
      * @param showProgressInfo true to show progess information
      * @return The job handling the operation.
      */
-    KIO_EXPORT ChmodJob * chmod( const KFileItemList& lstItems, int permissions, int tqmask,
+    KIO_EXPORT ChmodJob * chmod( const KFileItemList& lstItems, int permissions, int mask,
                       TQString newOwner, TQString newGroup,
                       bool recursive, bool showProgressInfo = true );
 
diff --git a/kio/kio/configure.in.in b/kio/kio/configure.in.in
index 1aea61653..8683dfec1 100644
--- a/kio/kio/configure.in.in
+++ b/kio/kio/configure.in.in
@@ -1,5 +1,5 @@
 dnl ------------------------------------------------------------------------
-dnl Try to tqfind if FAM is installed
+dnl Try to find if FAM is installed
 dnl ------------------------------------------------------------------------
 dnl
 kde_have_fam=yes
@@ -23,7 +23,7 @@ if test "$kde_have_fam" = "yes" ; then
 fi
 AC_SUBST(LIBFAM)
 dnl ------------------------------------------------------------------------
-dnl Try to tqfind if LIBZ is installed
+dnl Try to find if LIBZ is installed
 dnl ------------------------------------------------------------------------
 dnl
 
@@ -47,7 +47,7 @@ int getmntinfo(struct statfs **mntbufp, int flags);
 ])
 
 dnl ------------------------------------------------------------------------
-dnl Try to tqfind if libvolmgt is installed (Solaris)
+dnl Try to find if libvolmgt is installed (Solaris)
 dnl ------------------------------------------------------------------------
 kde_have_volmgt=yes
 AC_CHECK_LIB(volmgt, volmgt_running, [LIBVOLMGT=-lvolmgt], kde_have_volmgt=no)
@@ -57,7 +57,7 @@ if test "$kde_have_volmgt" = "yes"; then
 fi
 
 dnl ------------------------------------------------------------------------
-dnl Try to tqfind if we have Linux Dir Notification
+dnl Try to find if we have Linux Dir Notification
 dnl ------------------------------------------------------------------------
 
 AC_ARG_ENABLE(dnotify,
@@ -103,7 +103,7 @@ if test "x$kde_enable_dnotify" = "xyes"; then
 fi
 
 dnl ------------------------------------------------------------------------
-dnl Try to tqfind if we have Linux Inode based Dir Notification
+dnl Try to find if we have Linux Inode based Dir Notification
 dnl ------------------------------------------------------------------------
 
 AC_ARG_ENABLE(inotify,
diff --git a/kio/kio/connection.h b/kio/kio/connection.h
index 758202968..6858c8422 100644
--- a/kio/kio/connection.h
+++ b/kio/kio/connection.h
@@ -46,7 +46,7 @@ namespace KIO {
      * It handles a queue of commands to be sent which makes it possible to
      * queue data before an actual connection has been established.
      */
-    class KIO_EXPORT Connection : public TQObject
+    class KIO_EXPORT Connection : public QObject
     {
 	Q_OBJECT
     public:
diff --git a/kio/kio/dataprotocol.cpp b/kio/kio/dataprotocol.cpp
index 659efbf3d..161c82296 100644
--- a/kio/kio/dataprotocol.cpp
+++ b/kio/kio/dataprotocol.cpp
@@ -88,11 +88,11 @@ const TQChar base64_str[] = { 'b','a','s','e','6','4' };
   * @p c1 to @p c3 or buf.length() if none is contained.
   * @param buf buffer where to look for c
   * @param begin zero-indexed starting position
-  * @param c1 character to tqfind
-  * @param c2 alternative character to tqfind or '\0' to ignore
-  * @param c3 alternative character to tqfind or '\0' to ignore
+  * @param c1 character to find
+  * @param c2 alternative character to find or '\0' to ignore
+  * @param c3 alternative character to find or '\0' to ignore
   */
-static int tqfind(const TQString &buf, int begin, TQChar c1, TQChar c2 = '\0',
+static int find(const TQString &buf, int begin, TQChar c1, TQChar c2 = '\0',
 		TQChar c3 = '\0') {
   int pos = begin;
   int size = (int)buf.length();
@@ -113,15 +113,15 @@ static int tqfind(const TQString &buf, int begin, TQChar c1, TQChar c2 = '\0',
  * neither character occurred.
  * @param buf buffer where to look for
  * @param pos zero-indexed position within buffer
- * @param c1 character to tqfind
- * @param c2 alternative character to tqfind or 0 to ignore
- * @param c3 alternative character to tqfind or 0 to ignore
+ * @param c1 character to find
+ * @param c2 alternative character to find or 0 to ignore
+ * @param c3 alternative character to find or 0 to ignore
  */
 inline TQString extract(const TQString &buf, int &pos, TQChar c1,
 		TQChar c2 = '\0', TQChar c3 = '\0') {
   int oldpos = pos;
-  pos = tqfind(buf,oldpos,c1,c2,c3);
-  return TQString(buf.tqunicode() + oldpos, pos - oldpos);
+  pos = find(buf,oldpos,c1,c2,c3);
+  return TQString(buf.unicode() + oldpos, pos - oldpos);
 }
 
 /** ignores all whitespaces
@@ -186,11 +186,11 @@ static void parseDataHeader(const KURL &url, DataHeader &header_info) {
   header_info.is_base64 = false;
 
   // decode url and save it
-  TQString &raw_url = header_info.url = TQString::tqfromLatin1("data:") + url.path();
+  TQString &raw_url = header_info.url = TQString::fromLatin1("data:") + url.path();
   int raw_url_len = (int)raw_url.length();
 
   // jump over scheme part (must be "data:", we don't even check that)
-  header_info.data_offset = raw_url.tqfind(':');
+  header_info.data_offset = raw_url.find(':');
   header_info.data_offset++;	// jump over colon or to begin if scheme was missing
 
   // read mime type
diff --git a/kio/kio/dataslave.cpp b/kio/kio/dataslave.cpp
index 8ec90b2a7..d16ecc0d4 100644
--- a/kio/kio/dataslave.cpp
+++ b/kio/kio/dataslave.cpp
@@ -137,7 +137,7 @@ void DataSlave::send(int cmd, const TQByteArray &arr) {
       break;
     default:
       error(ERR_UNSUPPORTED_ACTION,
-		unsupportedActionErrorString(TQString::tqfromLatin1("data"),cmd));
+		unsupportedActionErrorString(TQString::fromLatin1("data"),cmd));
   }/*end switch*/
 }
 
diff --git a/kio/kio/davjob.cpp b/kio/kio/davjob.cpp
index 6b2201c22..1f3b208a6 100644
--- a/kio/kio/davjob.cpp
+++ b/kio/kio/davjob.cpp
@@ -46,7 +46,7 @@ class DavJob::DavJobPrivate
 {
 public:
   TQByteArray savedStaticData;
-	TQByteArray str_response; // tqreplaces the TQString previously used in DavJob itself
+	TQByteArray str_response; // replaces the TQString previously used in DavJob itself
 };
 
 DavJob::DavJob( const KURL& url, int method, const TQString& request, bool showProgressInfo )
diff --git a/kio/kio/davjob.h b/kio/kio/davjob.h
index 98cdc0080..98d0fe702 100644
--- a/kio/kio/davjob.h
+++ b/kio/kio/davjob.h
@@ -89,7 +89,7 @@ namespace KIO {
     * the properties of the resource identified by the given @p url.
     *
     * @param url the URL of the resource
-    * @param properties a proptqfind document that describes the properties that
+    * @param properties a propfind document that describes the properties that
     *        should be retrieved
     * @param depth the depth of the request. Can be "0", "1" or "infinity"
     * @param showProgressInfo true to show progress information
diff --git a/kio/kio/defaultprogress.cpp b/kio/kio/defaultprogress.cpp
index 0ca33d184..8293901ae 100644
--- a/kio/kio/defaultprogress.cpp
+++ b/kio/kio/defaultprogress.cpp
@@ -130,9 +130,9 @@ void DefaultProgress::init()
   hBox->addWidget(resumeLabel);
 
   progressLabel = new TQLabel( this );
-/*  progressLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
+/*  progressLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
                                              TQSizePolicy::Preferred ) );*/
-  progressLabel->tqsetAlignment( TQLabel::AlignRight );
+  progressLabel->setAlignment( TQLabel::AlignRight );
   hBox->addWidget( progressLabel );
 
   hBox = new TQHBoxLayout();
@@ -171,8 +171,8 @@ void DefaultProgress::init()
   connect( d->cancelClose, TQT_SIGNAL( clicked() ), TQT_SLOT( slotStop() ) );
   hBox->addWidget( d->cancelClose );
 
-  resize( tqsizeHint() );
-  setMaximumHeight(tqsizeHint().height());
+  resize( sizeHint() );
+  setMaximumHeight(sizeHint().height());
 
   d->keepOpenChecked = false;
   d->noCaptionYet = true;
@@ -273,7 +273,7 @@ void DefaultProgress::slotPercent( KIO::Job*, unsigned long percent )
 void DefaultProgress::slotInfoMessage( KIO::Job*, const TQString & msg )
 {
   speedLabel->setText( msg );
-  speedLabel->tqsetAlignment( speedLabel->tqalignment() & ~Qt::WordBreak );
+  speedLabel->setAlignment( speedLabel->alignment() & ~Qt::WordBreak );
 }
 
 
@@ -472,7 +472,7 @@ void DefaultProgress::checkDestination(const KURL& dest) {
       TQString path = dest.path( -1 );
       TQStringList tmpDirs = KGlobal::dirs()->resourceDirs( "tmp" );
       for ( TQStringList::Iterator it = tmpDirs.begin() ; ok && it != tmpDirs.end() ; ++it )
-          if ( path.tqcontains( *it ) )
+          if ( path.contains( *it ) )
               ok = false; // it's in the tmp resource
   }
 
diff --git a/kio/kio/forwardingslavebase.cpp b/kio/kio/forwardingslavebase.cpp
index c83d5750c..5caa08465 100644
--- a/kio/kio/forwardingslavebase.cpp
+++ b/kio/kio/forwardingslavebase.cpp
@@ -126,7 +126,7 @@ void ForwardingSlaveBase::get(const KURL &url)
         KIO::TransferJob *job = KIO::get(new_url, false, false);
         connectTransferJob(job);
 
-        tqApp->eventLoop()->enterLoop();
+        qApp->eventLoop()->enterLoop();
     }
 }
 
@@ -142,7 +142,7 @@ void ForwardingSlaveBase::put(const KURL &url, int permissions,
                                          resume, false);
         connectTransferJob(job);
 
-        tqApp->eventLoop()->enterLoop();
+        qApp->eventLoop()->enterLoop();
     }
 }
 
@@ -156,7 +156,7 @@ void ForwardingSlaveBase::stat(const KURL &url)
         KIO::SimpleJob *job = KIO::stat(new_url, false);
         connectSimpleJob(job);
 
-        tqApp->eventLoop()->enterLoop();
+        qApp->eventLoop()->enterLoop();
     }
 }
 
@@ -170,7 +170,7 @@ void ForwardingSlaveBase::mimetype(const KURL &url)
         KIO::TransferJob *job = KIO::mimetype(new_url, false);
         connectTransferJob(job);
 
-        tqApp->eventLoop()->enterLoop();
+        qApp->eventLoop()->enterLoop();
     }
 }
 
@@ -184,7 +184,7 @@ void ForwardingSlaveBase::listDir(const KURL &url)
         KIO::ListJob *job = KIO::listDir(new_url, false);
         connectListJob(job);
 
-        tqApp->eventLoop()->enterLoop();
+        qApp->eventLoop()->enterLoop();
     }
 }
 
@@ -198,7 +198,7 @@ void ForwardingSlaveBase::mkdir(const KURL &url, int permissions)
         KIO::SimpleJob *job = KIO::mkdir(new_url, permissions);
         connectSimpleJob(job);
 
-        tqApp->eventLoop()->enterLoop();
+        qApp->eventLoop()->enterLoop();
     }
 }
 
@@ -213,7 +213,7 @@ void ForwardingSlaveBase::rename(const KURL &src, const KURL &dest,
         KIO::Job *job = KIO::rename(new_src, new_dest, overwrite);
         connectJob(job);
 
-        tqApp->eventLoop()->enterLoop();
+        qApp->eventLoop()->enterLoop();
     }
 }
 
@@ -228,7 +228,7 @@ void ForwardingSlaveBase::symlink(const TQString &target, const KURL &dest,
         KIO::SimpleJob *job = KIO::symlink(target, new_dest, overwrite, false);
         connectSimpleJob(job);
 
-        tqApp->eventLoop()->enterLoop();
+        qApp->eventLoop()->enterLoop();
     }
 }
 
@@ -242,7 +242,7 @@ void ForwardingSlaveBase::chmod(const KURL &url, int permissions)
         KIO::SimpleJob *job = KIO::chmod(new_url, permissions);
         connectSimpleJob(job);
 
-        tqApp->eventLoop()->enterLoop();
+        qApp->eventLoop()->enterLoop();
     }
 }
 
@@ -258,7 +258,7 @@ void ForwardingSlaveBase::copy(const KURL &src, const KURL &dest,
                                        overwrite, false);
         connectJob(job);
 
-        tqApp->eventLoop()->enterLoop();
+        qApp->eventLoop()->enterLoop();
     }
 }
 
@@ -280,7 +280,7 @@ void ForwardingSlaveBase::del(const KURL &url, bool isfile)
             connectSimpleJob(job);
         }
 
-        tqApp->eventLoop()->enterLoop();
+        qApp->eventLoop()->enterLoop();
     }
 }
 
@@ -363,7 +363,7 @@ void ForwardingSlaveBase::slotResult(KIO::Job *job)
         finished();
     }
 
-    tqApp->eventLoop()->exitLoop();
+    qApp->eventLoop()->exitLoop();
 }
 
 void ForwardingSlaveBase::slotWarning(KIO::Job* /*job*/, const TQString &msg)
@@ -399,7 +399,7 @@ void ForwardingSlaveBase::slotRedirection(KIO::Job *job, const KURL &url)
     job->kill( true );
     finished();
 
-    tqApp->eventLoop()->exitLoop();
+    qApp->eventLoop()->exitLoop();
 }
 
 void ForwardingSlaveBase::slotEntries(KIO::Job* /*job*/,
diff --git a/kio/kio/global.cpp b/kio/kio/global.cpp
index a8bd85d17..f99219524 100644
--- a/kio/kio/global.cpp
+++ b/kio/kio/global.cpp
@@ -97,7 +97,7 @@ KIO_EXPORT TQString KIO::number( KIO::filesize_t size )
 {
     char charbuf[256];
     sprintf(charbuf, "%lld", size);
-    return TQString::tqfromLatin1(charbuf);
+    return TQString::fromLatin1(charbuf);
 }
 
 KIO_EXPORT unsigned int KIO::calculateRemainingSeconds( KIO::filesize_t totalSize,
@@ -167,13 +167,13 @@ KIO_EXPORT TQString KIO::encodeFileName( const TQString & _str )
   TQString str( _str );
 
   int i = 0;
-  while ( ( i = str.tqfind( "%", i ) ) != -1 )
+  while ( ( i = str.find( "%", i ) ) != -1 )
   {
-    str.tqreplace( i, 1, "%%");
+    str.replace( i, 1, "%%");
     i += 2;
   }
-  while ( ( i = str.tqfind( "/" ) ) != -1 )
-      str.tqreplace( i, 1, "%2f");
+  while ( ( i = str.find( "/" ) ) != -1 )
+      str.replace( i, 1, "%2f");
   return str;
 }
 
@@ -284,7 +284,7 @@ KIO_EXPORT TQString KIO::buildErrorString(int errorCode, const TQString &errorTe
       result = i18n( "Could not create socket for accessing %1." ).arg( errorText );
       break;
     case  KIO::ERR_COULD_NOT_CONNECT:
-      result = i18n( "Could not connect to host %1." ).arg( errorText.isEmpty() ? TQString::tqfromLatin1("localhost") : errorText );
+      result = i18n( "Could not connect to host %1." ).arg( errorText.isEmpty() ? TQString::fromLatin1("localhost") : errorText );
       break;
     case  KIO::ERR_CONNECTION_BROKEN:
       result = i18n( "Connection to host %1 is broken." ).arg( errorText );
@@ -477,16 +477,16 @@ KIO_EXPORT TQStringList KIO::Job::detailedErrorStrings( const KURL *reqUrl /*= 0
     url = i18n( "(unknown)" );
   }
 
-  datetime = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(),
+  datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(),
                                                 false );
 
   ret << errorName;
-  ret << TQString::tqfromLatin1( "<qt><p><b>" ) + errorName +
-         TQString::tqfromLatin1( "</b></p><p>" ) + description +
-         TQString::tqfromLatin1( "</p>" );
-  ret2 = TQString::tqfromLatin1( "<qt><p>" );
+  ret << TQString::fromLatin1( "<qt><p><b>" ) + errorName +
+         TQString::fromLatin1( "</b></p><p>" ) + description +
+         TQString::fromLatin1( "</p>" );
+  ret2 = TQString::fromLatin1( "<qt><p>" );
   if ( !techName.isEmpty() )
-    ret2 += i18n( "<b>Technical reason</b>: " ) + techName + TQString::tqfromLatin1( "</p>" );
+    ret2 += i18n( "<b>Technical reason</b>: " ) + techName + TQString::fromLatin1( "</p>" );
   ret2 += i18n( "</p><p><b>Details of the request</b>:" );
   ret2 += i18n( "</p><ul><li>URL: %1</li>" ).arg( url );
   if ( !protocol.isEmpty() ) {
@@ -497,12 +497,12 @@ KIO_EXPORT TQStringList KIO::Job::detailedErrorStrings( const KURL *reqUrl /*= 0
   if ( !causes.isEmpty() ) {
     ret2 += i18n( "<p><b>Possible causes</b>:</p><ul><li>" );
     ret2 += causes.join( "</li><li>" );
-    ret2 += TQString::tqfromLatin1( "</li></ul>" );
+    ret2 += TQString::fromLatin1( "</li></ul>" );
   }
   if ( !solutions.isEmpty() ) {
     ret2 += i18n( "<p><b>Possible solutions</b>:</p><ul><li>" );
     ret2 += solutions.join( "</li><li>" );
-    ret2 += TQString::tqfromLatin1( "</li></ul>" );
+    ret2 += TQString::fromLatin1( "</li></ul>" );
   }
   ret << ret2;
   return ret;
@@ -559,7 +559,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
     protocol = i18n( "(unknown)" );
   }
 
-  datetime = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(),
+  datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(),
                                                 false );
 
   TQString errorName, techName, description;
@@ -700,7 +700,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       causes << i18n( "This error is very much dependent on the KDE program. The "
         "additional information should give you more information than is available "
         "to the KDE input/output architecture." );
-      solutions << i18n( "Attempt to tqfind another way to accomplish the same "
+      solutions << i18n( "Attempt to find another way to accomplish the same "
         "outcome." );
       break;
 
@@ -988,7 +988,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       break;
 
     case  KIO::ERR_COULD_NOT_STAT:
-      errorName = i18n( "Could Not Determine Resource tqStatus" );
+      errorName = i18n( "Could Not Determine Resource Status" );
       techName = i18n( "Could Not Stat Resource" );
       description = i18n( "An attempt to determine information about the status "
         "of the resource <strong>%1</strong>, such as the resource name, type, "
@@ -1291,7 +1291,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
 #include <sys/vmount.h>
 #include <sys/vfs.h>
 
-/* AIX does not prototype mntctl anywhere that I can tqfind */
+/* AIX does not prototype mntctl anywhere that I can find */
 #ifndef mntctl
 extern "C" {
 int mntctl(int command, int size, void* buffer);
@@ -1384,7 +1384,7 @@ TQString KIO::findDeviceMountPoint( const TQString& filename )
 
 	if( (volpath = volmgt_root()) == NULL ) {
 		kdDebug( 7007 ) << "findDeviceMountPoint: "
-			<< "VOLMGT: can't tqfind volmgt root dir" << endl;
+			<< "VOLMGT: can't find volmgt root dir" << endl;
 		return TQString::null;
 	}
 
@@ -1403,7 +1403,7 @@ TQString KIO::findDeviceMountPoint( const TQString& filename )
 //		<< endl;
 
 	/*
-	 *  tqfind the mountpoint
+	 *  find the mountpoint
 	 *  floppies:
 	 *	/dev/disketteN    => <volpath>/dev/disketteN
 	 *  CDROM, ZIP, and other media:
@@ -1432,7 +1432,7 @@ TQString KIO::findDeviceMountPoint( const TQString& filename )
     TQCString realname;
 
     realname = TQFile::encodeName(filename);
-    /* If the path tqcontains symlinks, get the real name */
+    /* If the path contains symlinks, get the real name */
     if (realpath(realname, realpath_buffer) != 0)
       // succes, use result from realpath
       realname = realpath_buffer;
@@ -1453,7 +1453,7 @@ TQString KIO::findDeviceMountPoint( const TQString& filename )
 
         TQCString device_name = mounted[i].f_mntfromname;
 
-        // If the path tqcontains symlinks, get
+        // If the path contains symlinks, get
         // the real name
         if (realpath(device_name, realpath_buffer) != 0)
             // succes, use result from realpath
@@ -1546,7 +1546,7 @@ TQString KIO::findDeviceMountPoint( const TQString& filename )
         return TQString::null;
     }
 
-    /* Loop over all file systems and see if we can tqfind our
+    /* Loop over all file systems and see if we can find our
      * mount point.
      * Note that this is the mount point with the longest match.
      * XXX: Fails if me->mnt_dir is not a realpath but goes
@@ -1561,14 +1561,14 @@ TQString KIO::findDeviceMountPoint( const TQString& filename )
     while (GETMNTENT(mtab, me))
     {
       // There may be symbolic links into the /etc/mnttab
-      // So we have to tqfind the real device name here as well!
+      // So we have to find the real device name here as well!
       TQCString device_name = FSNAME(me);
       if (device_name.isEmpty() || (device_name == "none"))
          continue;
 
       //kdDebug( 7007 ) << "device_name=" << device_name << endl;
 
-      // If the path tqcontains symlinks, get
+      // If the path contains symlinks, get
       // the real name
       if (realpath(device_name, realpath_buffer) != 0)
           // succes, use result from realpath
@@ -1690,7 +1690,7 @@ static TQString get_mount_info(const TQString& filename,
 
     memset(realname, 0, MAXPATHLEN);
 
-    /* If the path tqcontains symlinks, get the real name */
+    /* If the path contains symlinks, get the real name */
     if (realpath(TQFile::encodeName(filename), realname) == 0) {
         if( strlcpy(realname, TQFile::encodeName(filename), MAXPATHLEN)>=MAXPATHLEN)
             return TQString::null;
@@ -1699,7 +1699,7 @@ static TQString get_mount_info(const TQString& filename,
     int max = 0;
     TQString mountPoint;
 
-    /* Loop over all file systems and see if we can tqfind our
+    /* Loop over all file systems and see if we can find our
      * mount point.
      * Note that this is the mount point with the longest match.
      * XXX: Fails if me->mnt_dir is not a realpath but goes
@@ -1725,7 +1725,7 @@ static TQString get_mount_info(const TQString& filename,
 
         TQCString device_name = mounted[i].f_mntfromname;
 
-        // If the path tqcontains symlinks, get
+        // If the path contains symlinks, get
         // the real name
         if (realpath(device_name, realpath_buffer) != 0)
             // succes, use result from realpath
@@ -1738,7 +1738,7 @@ static TQString get_mount_info(const TQString& filename,
         if ( is_my_mountpoint( mounted[i].f_mntonname, realname, max ) )
         {
             mountPoint = TQFile::decodeName(mounted[i].f_mntonname);
-            fstype = TQString::tqfromLatin1(mounttype);
+            fstype = TQString::fromLatin1(mounttype);
             check_mount_point( mounttype, mounted[i].f_mntfromname,
                                isautofs, isslow );
             // keep going, looking for a potentially better one
@@ -1805,12 +1805,12 @@ static TQString get_mount_info(const TQString& filename,
             if ( is_my_mountpoint( mountedto, realname, max ) )
             {
                 mountPoint = TQFile::decodeName(mountedto);
-                fstype = TQString::tqfromLatin1(ent->vfsent_name);
+                fstype = TQString::fromLatin1(ent->vfsent_name);
                 check_mount_point(ent->vfsent_name, device_name, isautofs, isslow);
 
                 if (ismanual == Unseen)
                 {
-                    // TODO: add check for ismanual, I couldn't tqfind any way
+                    // TODO: add check for ismanual, I couldn't find any way
                     // how to get the mount attribute from /etc/filesystems
                     ismanual == Wrong;
                 }
@@ -1915,7 +1915,7 @@ TQString KIO::findDeviceMountPoint( const TQString& filename )
 }
 #endif
 
-TQString KIO::tqfindPathMountPoint(const TQString& filename)
+TQString KIO::findPathMountPoint(const TQString& filename)
 {
 #ifdef Q_OS_UNIX
   MountState isautofs = Unseen, isslow = Unseen, ismanual = Wrong;
diff --git a/kio/kio/global.h b/kio/kio/global.h
index fc18f1953..402d7b431 100644
--- a/kio/kio/global.h
+++ b/kio/kio/global.h
@@ -420,12 +420,12 @@ namespace KIO
 
   /**
    * Returns the mount point on which resides @p filename.
-   * For instance if /home is a separate partition, tqfindPathMountPoint("/home/user/blah")
+   * For instance if /home is a separate partition, findPathMountPoint("/home/user/blah")
    * will return /home
    * @param filename the file name to check
    * @return the mount point of the given @p filename
    */
-  KIO_EXPORT TQString tqfindPathMountPoint( const TQString & filename );
+  KIO_EXPORT TQString findPathMountPoint( const TQString & filename );
 
   /**
    * Checks if the path belongs to a filesystem that is probably
@@ -475,12 +475,12 @@ namespace KIO
  *
  * Any file or URL can be represented by the UDSEntry type below
  * A UDSEntry is a list of atoms
- * Each atom tqcontains a specific bit of information for the file
+ * Each atom contains a specific bit of information for the file
  *
  * The following UDS constants represent the different possible values
  * for m_uds in the UDS atom structure below
  *
- * Each atom tqcontains a specific bit of information for the file
+ * Each atom contains a specific bit of information for the file
  */
 class KIO_EXPORT UDSAtom
 {
@@ -536,7 +536,7 @@ public:
            it !=  metaData.end();
            ++it)
       {
-         tqreplace(it.key(), it.data());
+         replace(it.key(), it.data());
       }
       return *this;
    }
diff --git a/kio/kio/job.cpp b/kio/kio/job.cpp
index 3fdb5d1e0..b20c09c10 100644
--- a/kio/kio/job.cpp
+++ b/kio/kio/job.cpp
@@ -318,10 +318,10 @@ void Job::showErrorDialog( TQWidget * parent )
   }
 }
 
-void Job::setAutoErrorHandlingEnabled( bool enable, TQWidget *tqparentWidget )
+void Job::setAutoErrorHandlingEnabled( bool enable, TQWidget *parentWidget )
 {
   d->m_autoErrorHandling = enable;
-  d->m_errorParentWidget = tqparentWidget;
+  d->m_errorParentWidget = parentWidget;
 }
 
 bool Job::isAutoErrorHandlingEnabled() const
@@ -392,7 +392,7 @@ MetaData Job::metaData() const
 
 TQString Job::queryMetaData(const TQString &key)
 {
-    if (!m_incomingMetaData.tqcontains(key))
+    if (!m_incomingMetaData.contains(key))
        return TQString::null;
     return m_incomingMetaData[key];
 }
@@ -758,7 +758,7 @@ SimpleJob *KIO::mkdir( const KURL& url, int permissions )
 SimpleJob *KIO::rmdir( const KURL& url )
 {
     //kdDebug(7007) << "rmdir " << url << endl;
-    KIO_ARGS << url << TQ_INT8(false); // isFile is false
+    KIO_ARGS << url << Q_INT8(false); // isFile is false
     return new SimpleJob(url, CMD_DEL, packedArgs, false);
 }
 
@@ -772,14 +772,14 @@ SimpleJob *KIO::chmod( const KURL& url, int permissions )
 SimpleJob *KIO::rename( const KURL& src, const KURL & dest, bool overwrite )
 {
     //kdDebug(7007) << "rename " << src << " " << dest << endl;
-    KIO_ARGS << src << dest << (TQ_INT8) overwrite;
+    KIO_ARGS << src << dest << (Q_INT8) overwrite;
     return new SimpleJob(src, CMD_RENAME, packedArgs, false);
 }
 
 SimpleJob *KIO::symlink( const TQString& target, const KURL & dest, bool overwrite, bool showProgressInfo )
 {
     //kdDebug(7007) << "symlink target=" << target << " " << dest << endl;
-    KIO_ARGS << target << dest << (TQ_INT8) overwrite;
+    KIO_ARGS << target << dest << (Q_INT8) overwrite;
     return new SimpleJob(dest, CMD_SYMLINK, packedArgs, showProgressInfo);
 }
 
@@ -791,8 +791,8 @@ SimpleJob *KIO::special(const KURL& url, const TQByteArray & data, bool showProg
 
 SimpleJob *KIO::mount( bool ro, const char *fstype, const TQString& dev, const TQString& point, bool showProgressInfo )
 {
-    KIO_ARGS << int(1) << TQ_INT8( ro ? 1 : 0 )
-             << TQString::tqfromLatin1(fstype) << dev << point;
+    KIO_ARGS << int(1) << Q_INT8( ro ? 1 : 0 )
+             << TQString::fromLatin1(fstype) << dev << point;
     SimpleJob *job = special( KURL("file:/"), packedArgs, showProgressInfo );
     if ( showProgressInfo )
          Observer::self()->mounting( job, dev, point );
@@ -821,8 +821,8 @@ StatJob::StatJob( const KURL& url, int command,
 
 void StatJob::start(Slave *slave)
 {
-    m_outgoingMetaData.tqreplace( "statSide", m_bSource ? "source" : "dest" );
-    m_outgoingMetaData.tqreplace( "details", TQString::number(m_details) );
+    m_outgoingMetaData.replace( "statSide", m_bSource ? "source" : "dest" );
+    m_outgoingMetaData.replace( "details", TQString::number(m_details) );
 
     connect( slave, TQT_SIGNAL( statEntry( const KIO::UDSEntry& ) ),
              TQT_SLOT( slotStatEntry( const KIO::UDSEntry & ) ) );
@@ -946,7 +946,7 @@ void TransferJob::slotRedirection( const KURL &url)
     // Some websites keep redirecting to themselves where each redirection
     // acts as the stage in a state-machine. We define "endless redirections"
     // as 5 redirections to the same URL.
-    if (m_redirectionList.tqcontains(url) > 5)
+    if (m_redirectionList.contains(url) > 5)
     {
        kdDebug(7007) << "TransferJob::slotRedirection: CYCLIC REDIRECTION!" << endl;
        m_error = ERR_CYCLIC_LINK;
@@ -997,7 +997,7 @@ void TransferJob::slotFinished()
             }
             case CMD_PUT: {
                 int permissions;
-                TQ_INT8 iOverwrite, iResume;
+                Q_INT8 iOverwrite, iResume;
                 istream >> dummyUrl >> iOverwrite >> iResume >> permissions;
                 m_packedArgs.truncate(0);
                 TQDataStream stream( m_packedArgs, IO_WriteOnly );
@@ -1328,7 +1328,7 @@ TransferJob *KIO::http_post( const KURL& url, const TQByteArray &postData, bool
 	for( TQValueList< int >::ConstIterator it = overriden_ports->begin();
 	     it != overriden_ports->end();
 	     ++it )
-	    if( overriden_ports->tqcontains( url.port()))
+	    if( overriden_ports->contains( url.port()))
 		_error = 0;
     }
 
@@ -1380,7 +1380,7 @@ void TransferJob::slotPostRedirection()
 TransferJob *KIO::put( const KURL& url, int permissions,
                   bool overwrite, bool resume, bool showProgressInfo )
 {
-    KIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions;
+    KIO_ARGS << url << Q_INT8( overwrite ? 1 : 0 ) << Q_INT8( resume ? 1 : 0 ) << permissions;
     TransferJob * job = new TransferJob( url, CMD_PUT, packedArgs, TQByteArray(), showProgressInfo );
     return job;
 }
@@ -1451,7 +1451,7 @@ StoredTransferJob *KIO::storedGet( const KURL& url, bool reload, bool showProgre
 StoredTransferJob *KIO::storedPut( const TQByteArray& arr, const KURL& url, int permissions,
                                    bool overwrite, bool resume, bool showProgressInfo )
 {
-    KIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions;
+    KIO_ARGS << url << Q_INT8( overwrite ? 1 : 0 ) << Q_INT8( resume ? 1 : 0 ) << permissions;
     StoredTransferJob * job = new StoredTransferJob( url, CMD_PUT, packedArgs, TQByteArray(), showProgressInfo );
     job->setData( arr );
     return job;
@@ -1480,7 +1480,7 @@ void MimetypeJob::slotFinished( )
         // Due to the "protocol doesn't support listing" code in KRun, we
         // assumed it was a file.
         kdDebug(7007) << "It is in fact a directory!" << endl;
-        m_mimetype = TQString::tqfromLatin1("inode/directory");
+        m_mimetype = TQString::fromLatin1("inode/directory");
         emit TransferJob::mimetype( this, m_mimetype );
         m_error = 0;
     }
@@ -1663,7 +1663,7 @@ void FileCopyJob::startCopyJob()
 void FileCopyJob::startCopyJob(const KURL &slave_url)
 {
     //kdDebug(7007) << "FileCopyJob::startCopyJob()" << endl;
-    KIO_ARGS << m_src << m_dest << m_permissions << (TQ_INT8) m_overwrite;
+    KIO_ARGS << m_src << m_dest << m_permissions << (Q_INT8) m_overwrite;
     m_copyJob = new DirectCopyJob(slave_url, CMD_COPY, packedArgs, false);
     addSubjob( m_copyJob );
     connectSubjob( m_copyJob );
@@ -1673,7 +1673,7 @@ void FileCopyJob::startCopyJob(const KURL &slave_url)
 
 void FileCopyJob::startRenameJob(const KURL &slave_url)
 {
-    KIO_ARGS << m_src << m_dest << (TQ_INT8) m_overwrite;
+    KIO_ARGS << m_src << m_dest << (Q_INT8) m_overwrite;
     m_moveJob = new SimpleJob(slave_url, CMD_RENAME, packedArgs, false);
     addSubjob( m_moveJob );
     connectSubjob( m_moveJob );
@@ -1974,7 +1974,7 @@ FileCopyJob *KIO::file_move( const KURL& src, const KURL& dest, int permissions,
 
 SimpleJob *KIO::file_delete( const KURL& src, bool showProgressInfo)
 {
-    KIO_ARGS << src << TQ_INT8(true); // isFile
+    KIO_ARGS << src << Q_INT8(true); // isFile
     return new SimpleJob(src, CMD_DEL, packedArgs, showProgressInfo );
 }
 
@@ -2571,11 +2571,11 @@ void CopyJob::slotEntries(KIO::Job* job, const UDSEntryList& list)
                      KProtocolInfo::fileNameUsedForCopying( url ) == KProtocolInfo::FromURL ) {
                     //destFileName = url.fileName(); // Doesn't work for recursive listing
                     // Count the number of prefixes used by the recursive listjob
-                    int numberOfSlashes = displayName.tqcontains( '/' ); // don't make this a tqfind()!
+                    int numberOfSlashes = displayName.contains( '/' ); // don't make this a find()!
                     TQString path = url.path();
                     int pos = 0;
                     for ( int n = 0; n < numberOfSlashes + 1; ++n ) {
-                        pos = path.tqfindRev( '/', pos - 1 );
+                        pos = path.findRev( '/', pos - 1 );
                         if ( pos == -1 ) { // error
                             kdWarning(7007) << "kioslave bug: not enough slashes in UDS_URL " << path << " - looking for " << numberOfSlashes << " slashes" << endl;
                             break;
@@ -2677,7 +2677,7 @@ void CopyJob::statCurrentSrc()
             return;
         }
         else if ( m_mode == Move && (
-                // Don't go renaming right away if we need a stat() to tqfind out the destination filename
+                // Don't go renaming right away if we need a stat() to find out the destination filename
                 KProtocolInfo::fileNameUsedForCopying( m_currentSrcURL ) == KProtocolInfo::FromURL ||
                 destinationState != DEST_IS_DIR || m_asMethod )
             )
@@ -2763,7 +2763,7 @@ void CopyJob::startRenameJob( const KURL& slave_url )
     files.append(info);
     emit aboutToCreate( this, files );
 
-    KIO_ARGS << m_currentSrcURL << dest << (TQ_INT8) false /*no overwrite*/;
+    KIO_ARGS << m_currentSrcURL << dest << (Q_INT8) false /*no overwrite*/;
     SimpleJob * newJob = new SimpleJob(slave_url, CMD_RENAME, packedArgs, false);
     Scheduler::scheduleJob(newJob);
     addSubjob( newJob );
@@ -2789,7 +2789,7 @@ void CopyJob::skip( const KURL & sourceUrl )
     // Check if this is one if toplevel sources
     // If yes, remove it from m_srcList, for a correct FilesRemoved() signal
     //kdDebug(7007) << "CopyJob::skip: looking for " << sourceUrl << endl;
-    KURL::List::Iterator sit = m_srcList.tqfind( sourceUrl );
+    KURL::List::Iterator sit = m_srcList.find( sourceUrl );
     if ( sit != m_srcList.end() )
     {
         //kdDebug(7007) << "CopyJob::skip: removing " << sourceUrl << " from list" << endl;
@@ -2967,7 +2967,7 @@ void CopyJob::slotResultConflictCreatingDirs( KIO::Job * job )
                 TQString path = (*renamedirit).uDest.path();
                 if ( path.left(oldPath.length()) == oldPath ) {
                     TQString n = path;
-                    n.tqreplace( 0, oldPath.length(), newPath );
+                    n.replace( 0, oldPath.length(), newPath );
                     kdDebug(7007) << "dirs list: " << (*renamedirit).uSource.path()
                                   << " was going to be " << path
                                   << ", changed into " << n << endl;
@@ -2981,7 +2981,7 @@ void CopyJob::slotResultConflictCreatingDirs( KIO::Job * job )
                 TQString path = (*renamefileit).uDest.path();
                 if ( path.left(oldPath.length()) == oldPath ) {
                     TQString n = path;
-                    n.tqreplace( 0, oldPath.length(), newPath );
+                    n.replace( 0, oldPath.length(), newPath );
                     kdDebug(7007) << "files list: " << (*renamefileit).uSource.path()
                                   << " was going to be " << path
                                   << ", changed into " << n << endl;
@@ -3359,7 +3359,7 @@ void CopyJob::copyNextFile()
                     bool devicesOk=false;
 
                     // if the source is a devices url, handle it a littlebit special
-                    if ((*it).uSource.protocol()==TQString::tqfromLatin1("devices"))
+                    if ((*it).uSource.protocol()==TQString::fromLatin1("devices"))
                     {
                        TQByteArray data;
                        TQByteArray param;
@@ -3395,20 +3395,20 @@ void CopyJob::copyNextFile()
                            config.setDesktopGroup();
                            KURL url = (*it).uSource;
                            url.setPass( "" );
-                           config.writePathEntry( TQString::tqfromLatin1("URL"), url.url() );
-                           config.writeEntry( TQString::tqfromLatin1("Name"), url.url() );
-                           config.writeEntry( TQString::tqfromLatin1("Type"), TQString::tqfromLatin1("Link") );
+                           config.writePathEntry( TQString::fromLatin1("URL"), url.url() );
+                           config.writeEntry( TQString::fromLatin1("Name"), url.url() );
+                           config.writeEntry( TQString::fromLatin1("Type"), TQString::fromLatin1("Link") );
                            TQString protocol = (*it).uSource.protocol();
-                           if ( protocol == TQString::tqfromLatin1("ftp") )
-                               config.writeEntry( TQString::tqfromLatin1("Icon"), TQString::tqfromLatin1("ftp") );
-                           else if ( protocol == TQString::tqfromLatin1("http") )
-                               config.writeEntry( TQString::tqfromLatin1("Icon"), TQString::tqfromLatin1("www") );
-                           else if ( protocol == TQString::tqfromLatin1("info") )
-                               config.writeEntry( TQString::tqfromLatin1("Icon"), TQString::tqfromLatin1("info") );
-                           else if ( protocol == TQString::tqfromLatin1("mailto") )   // sven:
-                               config.writeEntry( TQString::tqfromLatin1("Icon"), TQString::tqfromLatin1("kmail") ); // added mailto: support
+                           if ( protocol == TQString::fromLatin1("ftp") )
+                               config.writeEntry( TQString::fromLatin1("Icon"), TQString::fromLatin1("ftp") );
+                           else if ( protocol == TQString::fromLatin1("http") )
+                               config.writeEntry( TQString::fromLatin1("Icon"), TQString::fromLatin1("www") );
+                           else if ( protocol == TQString::fromLatin1("info") )
+                               config.writeEntry( TQString::fromLatin1("Icon"), TQString::fromLatin1("info") );
+                           else if ( protocol == TQString::fromLatin1("mailto") )   // sven:
+                               config.writeEntry( TQString::fromLatin1("Icon"), TQString::fromLatin1("kmail") ); // added mailto: support
                            else
-                               config.writeEntry( TQString::tqfromLatin1("Icon"), TQString::tqfromLatin1("unknown") );
+                               config.writeEntry( TQString::fromLatin1("Icon"), TQString::fromLatin1("unknown") );
                            config.sync();
                            files.remove( it );
                            m_processedFiles++;
@@ -4305,7 +4305,7 @@ void DeleteJob::slotResult( Job *job )
          {
             // Add toplevel dir in list of dirs
             dirs.append( url );
-            if ( url.isLocalFile() && !m_parentDirs.tqcontains( url.path(-1) ) )
+            if ( url.isLocalFile() && !m_parentDirs.contains( url.path(-1) ) )
                 m_parentDirs.append( url.path(-1) );
 
             if ( !KProtocolInfo::canDeleteRecursive( url ) ) {
@@ -4334,7 +4334,7 @@ void DeleteJob::slotResult( Job *job )
                 //kdDebug(7007) << " Target is a file" << endl;
                 files.append( url );
             }
-            if ( url.isLocalFile() && !m_parentDirs.tqcontains( url.directory(false) ) )
+            if ( url.isLocalFile() && !m_parentDirs.contains( url.directory(false) ) )
                 m_parentDirs.append( url.directory(false) );
             ++m_currentStat;
             statNextSrc();
@@ -4435,7 +4435,7 @@ void MultiGetJob::flushQueue(TQPtrList<GetRequest> &queue)
       }
    }
    // Send number of URLs, (URL, metadata)*
-   KIO_ARGS << (TQ_INT32) queue.count();
+   KIO_ARGS << (Q_INT32) queue.count();
    for(entry = queue.first(); entry; entry = queue.next())
    {
       stream << entry->url << entry->metaData;
@@ -4471,7 +4471,7 @@ void MultiGetJob::start(Slave *slave)
    TransferJob::start(slave); // Anything else to do??
 }
 
-bool MultiGetJob::tqfindCurrentEntry()
+bool MultiGetJob::findCurrentEntry()
 {
    if (b_multiGetActive)
    {
@@ -4496,7 +4496,7 @@ bool MultiGetJob::tqfindCurrentEntry()
 
 void MultiGetJob::slotRedirection( const KURL &url)
 {
-  if (!tqfindCurrentEntry()) return; // Error
+  if (!findCurrentEntry()) return; // Error
   if (kapp && !kapp->authorizeURLAction("redirect", m_url, url))
   {
      kdWarning(7007) << "MultiGetJob: Redirection from " << m_currentEntry->url << " to " << url << " REJECTED!" << endl;
@@ -4511,7 +4511,7 @@ void MultiGetJob::slotRedirection( const KURL &url)
 
 void MultiGetJob::slotFinished()
 {
-  if (!tqfindCurrentEntry()) return;
+  if (!findCurrentEntry()) return;
   if (m_redirectionURL.isEmpty())
   {
      // No redirection, tell the world that we are finished.
@@ -4561,7 +4561,7 @@ void MultiGetJob::slotMimetype( const TQString &_mimetype )
         m_slave->send( m_command, m_packedArgs );
      }
   }
-  if (!tqfindCurrentEntry()) return; // Error, unknown request!
+  if (!findCurrentEntry()) return; // Error, unknown request!
   emit mimetype(m_currentEntry->id, _mimetype);
 }
 
@@ -4585,12 +4585,12 @@ TQString CacheInfo::cachedFileName()
 
    TQString CEF = m_url.path();
 
-   int p = CEF.tqfind('/');
+   int p = CEF.find('/');
 
    while(p != -1)
    {
       CEF[p] = separator;
-      p = CEF.tqfind('/', p);
+      p = CEF.find('/', p);
    }
 
    TQString host = m_url.host().lower();
@@ -4651,7 +4651,7 @@ TQFile *CacheInfo::cachedFile()
       ok = false;
 
    time_t date;
-   time_t tqcurrentDate = time(0);
+   time_t currentDate = time(0);
 
    // URL
    if (ok && (!fgets(buffer, 400, fs)))
@@ -4673,10 +4673,10 @@ TQFile *CacheInfo::cachedFile()
    if (ok)
    {
       date = (time_t) strtoul(buffer, 0, 10);
-      if (m_maxCacheAge && (difftime(tqcurrentDate, date) > m_maxCacheAge))
+      if (m_maxCacheAge && (difftime(currentDate, date) > m_maxCacheAge))
       {
          m_bMustRevalidate = true;
-         m_expireDate = tqcurrentDate;
+         m_expireDate = currentDate;
       }
    }
 
@@ -4690,7 +4690,7 @@ TQFile *CacheInfo::cachedFile()
       {
          date = (time_t) strtoul(buffer, 0, 10);
          // After the expire date we need to revalidate.
-         if (!date || difftime(tqcurrentDate, date) >= 0)
+         if (!date || difftime(currentDate, date) >= 0)
             m_bMustRevalidate = true;
          m_expireDate = date;
       }
diff --git a/kio/kio/jobclasses.h b/kio/kio/jobclasses.h
index f5fa1134c..03ff3d452 100644
--- a/kio/kio/jobclasses.h
+++ b/kio/kio/jobclasses.h
@@ -155,17 +155,17 @@ namespace KIO {
         /**
          * Enable or disable the automatic error handling. When automatic
          * error handling is enabled and an error occurs, then showErrorDialog()
-         * is called with the specified @p tqparentWidget (if supplied) , right before
+         * is called with the specified @p parentWidget (if supplied) , right before
          * the emission of the result signal.
          *
          * The default is false.
          *
          * @param enable enable or disable automatic error handling
-         * @param tqparentWidget the parent widget, passed to showErrorDialog.
+         * @param parentWidget the parent widget, passed to showErrorDialog.
 	 *        Can be 0 for top-level
 	 * @see isAutoErrorHandlingEnabled(), showErrorDialog()
          */
-        void setAutoErrorHandlingEnabled( bool enable, TQWidget *tqparentWidget = 0 );
+        void setAutoErrorHandlingEnabled( bool enable, TQWidget *parentWidget = 0 );
 
         /**
          * Returns whether automatic error handling is enabled or disabled.
@@ -1186,7 +1186,7 @@ namespace KIO {
            KURL url;
            MetaData metaData;
         };
-        bool tqfindCurrentEntry();
+        bool findCurrentEntry();
         void flushQueue(TQPtrList<GetRequest> &queue);
 
         TQPtrList<GetRequest> m_waitQueue;
diff --git a/kio/kio/kacl.cpp b/kio/kio/kacl.cpp
index e152d29cd..432a50d31 100644
--- a/kio/kio/kacl.cpp
+++ b/kio/kio/kacl.cpp
@@ -271,7 +271,7 @@ mode_t KACL::basePermissions() const
    return perms;
 }
 
-unsigned short KACL::tqmaskPermissions( bool &exists ) const
+unsigned short KACL::maskPermissions( bool &exists ) const
 {
     exists = true;
 #ifdef USE_POSIX_ACL
@@ -376,7 +376,7 @@ bool KACL::KACLPrivate::setNamedUserOrGroupPermissions( const TQString& name, un
     }
     if ( allIsWell && createdNewEntry ) {
         // 23.1.1 of 1003.1e states that as soon as there is a named user or
-        // named group entry, there needs to be a tqmask entry as well, so add
+        // named group entry, there needs to be a mask entry as well, so add
         // one, if the user hasn't explicitely set one.
         if ( entryForTag( newACL, ACL_MASK ) == 0 ) {
             acl_calc_mask( &newACL );
@@ -447,7 +447,7 @@ bool KACL::KACLPrivate::setAllUsersOrGroups( const TQValueList< QPair<TQString,
         if ( currentTag ==  type ) {
             acl_delete_entry( newACL, entry );
             // we have to start from the beginning, the iterator is
-            // tqinvalidated, on deletion
+            // invalidated, on deletion
             ret = acl_get_entry( newACL, ACL_FIRST_ENTRY, &entry );
         } else {
             ret = acl_get_entry( newACL, ACL_NEXT_ENTRY, &entry );
@@ -475,7 +475,7 @@ bool KACL::KACLPrivate::setAllUsersOrGroups( const TQValueList< QPair<TQString,
 //printACL( newACL, "After adding entries: " );
     if ( allIsWell && atLeastOneUserOrGroup ) {
         // 23.1.1 of 1003.1e states that as soon as there is a named user or
-        // named group entry, there needs to be a tqmask entry as well, so add
+        // named group entry, there needs to be a mask entry as well, so add
         // one, if the user hasn't explicitely set one.
         if ( entryForTag( newACL, ACL_MASK ) == 0 ) {
             acl_calc_mask( &newACL );
@@ -619,12 +619,12 @@ TQString KACL::asString() const
 TQString KACL::KACLPrivate::getUserName( uid_t uid ) const
 {
     TQString *temp;
-    temp = m_usercache.tqfind( uid );
+    temp = m_usercache.find( uid );
     if ( !temp ) {
         struct passwd *user = getpwuid( uid );
         if ( user ) {
-            m_usercache.insert( uid, new TQString(TQString::tqfromLatin1(user->pw_name)) );
-            return TQString::tqfromLatin1( user->pw_name );
+            m_usercache.insert( uid, new TQString(TQString::fromLatin1(user->pw_name)) );
+            return TQString::fromLatin1( user->pw_name );
         }
         else
             return TQString::number( uid );
@@ -637,12 +637,12 @@ TQString KACL::KACLPrivate::getUserName( uid_t uid ) const
 TQString KACL::KACLPrivate::getGroupName( gid_t gid ) const
 {
     TQString *temp;
-    temp = m_groupcache.tqfind( gid );
+    temp = m_groupcache.find( gid );
     if ( !temp ) {
         struct group *grp = getgrgid( gid );
         if ( grp ) {
-            m_groupcache.insert( gid, new TQString(TQString::tqfromLatin1(grp->gr_name)) );
-            return TQString::tqfromLatin1( grp->gr_name );
+            m_groupcache.insert( gid, new TQString(TQString::fromLatin1(grp->gr_name)) );
+            return TQString::fromLatin1( grp->gr_name );
         }
         else
             return TQString::number( gid );
@@ -654,7 +654,7 @@ TQString KACL::KACLPrivate::getGroupName( gid_t gid ) const
 static TQString aclAsString(const acl_t acl)
 {
     char *aclString = acl_to_text( acl, 0 );
-    TQString ret = TQString::tqfromLatin1( aclString );
+    TQString ret = TQString::fromLatin1( aclString );
     acl_free( (void*)aclString );
     return ret;
 }
diff --git a/kio/kio/kacl.h b/kio/kio/kacl.h
index 6fe415603..53bc762b0 100644
--- a/kio/kio/kacl.h
+++ b/kio/kio/kacl.h
@@ -111,24 +111,24 @@ public:
   /** @return the basic (owner/group/others) part of the ACL as a mode_t */
   mode_t basePermissions() const;
 
-  /** The interface to the extended ACL. This is a tqmask, permissions for 
+  /** The interface to the extended ACL. This is a mask, permissions for 
    * n named users and permissions for m named groups. */
 
   /**
-   * Return whether the ACL tqcontains extended entries or can be expressed
+   * Return whether the ACL contains extended entries or can be expressed
    * using only basic file permissions.
-   * @return whether the ACL tqcontains extended entries */
+   * @return whether the ACL contains extended entries */
   bool isExtended() const;
 
   /**
-   * Return the entry for the permissions tqmask if there is one and sets
+   * Return the entry for the permissions mask if there is one and sets
    * @p exists to true. If there is no such entry, @p exists is set to false.
-   * @return the permissions tqmask entry */
-  unsigned short tqmaskPermissions( bool &exists ) const;
+   * @return the permissions mask entry */
+  unsigned short maskPermissions( bool &exists ) const;
 
-  /** Set the permissions tqmask for the ACL. Permissions set for individual 
-   * entries will be tqmasked with this, such that their effective permissions
-   * are the result of the logical and of their entry and the tqmask. 
+  /** Set the permissions mask for the ACL. Permissions set for individual 
+   * entries will be masked with this, such that their effective permissions
+   * are the result of the logical and of their entry and the mask. 
    * @return success or failure */
   bool setMaskPermissions( unsigned short );
 
diff --git a/kio/kio/kar.cpp b/kio/kio/kar.cpp
index 8d8d0bba5..9f9435294 100644
--- a/kio/kio/kar.cpp
+++ b/kio/kio/kar.cpp
@@ -86,7 +86,7 @@ bool KAr::openArchive( int mode )
 
     char magic[8];
     dev->readBlock (magic, 8);
-    if (tqstrncmp(magic, "!<arch>", 7) != 0) {
+    if (qstrncmp(magic, "!<arch>", 7) != 0) {
         kdWarning(7042) << "Invalid main magic" << endl;
         return false;
     }
@@ -140,13 +140,13 @@ bool KAr::openArchive( int mode )
                     return false;
                 }
                 name = &ar_longnames[name.mid(1, 15).toInt()];
-                name = name.left(name.tqfind("/"));
+                name = name.left(name.find("/"));
             }
         }
         if (skip_entry) continue;
 
         name = name.stripWhiteSpace(); // Process filename
-        name.tqreplace( "/", "" );
+        name.replace( "/", "" );
         kdDebug(7042) << "Filename: " << name << " Size: " << size << endl;
 
         KArchiveEntry* entry;
diff --git a/kio/kio/karchive.cpp b/kio/kio/karchive.cpp
index dd424fe69..592e513d4 100644
--- a/kio/kio/karchive.cpp
+++ b/kio/kio/karchive.cpp
@@ -362,7 +362,7 @@ bool KArchive::writeData( const char* data, uint size )
 bool KArchive::writeData_impl( const char* data, uint size )
 {
     Q_ASSERT( device() );
-    return device()->writeBlock( data, size ) == (TQ_LONG)size;
+    return device()->writeBlock( data, size ) == (Q_LONG)size;
 }
 
 KArchiveDirectory * KArchive::rootDir()
@@ -375,17 +375,17 @@ KArchiveDirectory * KArchive::rootDir()
         TQString username = pw ? TQFile::decodeName(pw->pw_name) : TQString::number( getuid() );
         TQString groupname = grp ? TQFile::decodeName(grp->gr_name) : TQString::number( getgid() );
 
-        d->rootDir = new KArchiveDirectory( this, TQString::tqfromLatin1("/"), (int)(0777 + S_IFDIR), 0, username, groupname, TQString::null );
+        d->rootDir = new KArchiveDirectory( this, TQString::fromLatin1("/"), (int)(0777 + S_IFDIR), 0, username, groupname, TQString::null );
     }
     return d->rootDir;
 }
 
-KArchiveDirectory * KArchive::tqfindOrCreate( const TQString & path )
+KArchiveDirectory * KArchive::findOrCreate( const TQString & path )
 {
-    //kdDebug() << "KArchive::tqfindOrCreate " << path << endl;
+    //kdDebug() << "KArchive::findOrCreate " << path << endl;
     if ( path.isEmpty() || path == "/" || path == "." ) // root dir => found
     {
-        //kdDebug() << "KArchive::tqfindOrCreate returning rootdir" << endl;
+        //kdDebug() << "KArchive::findOrCreate returning rootdir" << endl;
         return rootDir();
     }
     // Important note : for tar files containing absolute paths
@@ -399,14 +399,14 @@ KArchiveDirectory * KArchive::tqfindOrCreate( const TQString & path )
     if ( ent )
     {
         if ( ent->isDirectory() )
-            //kdDebug() << "KArchive::tqfindOrCreate found it" << endl;
+            //kdDebug() << "KArchive::findOrCreate found it" << endl;
             return (KArchiveDirectory *) ent;
         else
             kdWarning() << "Found " << path << " but it's not a directory" << endl;
     }
 
     // Otherwise go up and try again
-    int pos = path.tqfindRev( '/' );
+    int pos = path.findRev( '/' );
     KArchiveDirectory * parent;
     TQString dirname;
     if ( pos == -1 ) // no more slash => create in root dir
@@ -418,7 +418,7 @@ KArchiveDirectory * KArchive::tqfindOrCreate( const TQString & path )
     {
         TQString left = path.left( pos );
         dirname = path.mid( pos + 1 );
-        parent = tqfindOrCreate( left ); // recursive call... until we tqfind an existing dir.
+        parent = findOrCreate( left ); // recursive call... until we find an existing dir.
     }
 
     //kdDebug() << "KTar : found parent " << parent->name() << " adding " << dirname << " to ensure " << path << endl;
@@ -548,13 +548,13 @@ KArchiveEntry* KArchiveDirectory::entry( TQString name )
   // not "const TQString & name" since we want a local copy
   // (to remove leading slash if any)
 {
-  int pos = name.tqfind( '/' );
-  if ( pos == 0 ) // ouch absolute path (see also KArchive::tqfindOrCreate)
+  int pos = name.find( '/' );
+  if ( pos == 0 ) // ouch absolute path (see also KArchive::findOrCreate)
   {
     if (name.length()>1)
     {
       name = name.mid( 1 ); // remove leading slash
-      pos = name.tqfind( '/' ); // look again
+      pos = name.find( '/' ); // look again
     }
     else // "/"
       return this;
@@ -563,7 +563,7 @@ KArchiveEntry* KArchiveDirectory::entry( TQString name )
   if ( pos != -1 && pos == (int)name.length()-1 )
   {
     name = name.left( pos );
-    pos = name.tqfind( '/' ); // look again
+    pos = name.find( '/' ); // look again
   }
   if ( pos != -1 )
   {
diff --git a/kio/kio/karchive.h b/kio/kio/karchive.h
index c764fb3be..dbfe02bff 100644
--- a/kio/kio/karchive.h
+++ b/kio/kio/karchive.h
@@ -304,7 +304,7 @@ protected:
      * @param path the path of the directory
      * @return the directory with the given @p path
      */
-    KArchiveDirectory * tqfindOrCreate( const TQString & path );
+    KArchiveDirectory * findOrCreate( const TQString & path );
 
     /**
      * @internal for inherited constructors
@@ -512,12 +512,12 @@ public:
      * Position of the data in the [uncompressed] archive.
      * @return the position of the file
      */
-    int position() const; // TODO use TQ_LONG in KDE-4.0
+    int position() const; // TODO use Q_LONG in KDE-4.0
     /**
      * Size of the data.
      * @return the size of the file
      */
-    int size() const; // TODO use TQ_LONG in KDE-4.0
+    int size() const; // TODO use Q_LONG in KDE-4.0
     /**
      * Set size of data, usually after writing the file.
      * @param s the new size of the file
@@ -555,8 +555,8 @@ public:
     void copyTo(const TQString& dest) const;
 
 private:
-    int m_pos; // TODO use TQ_LONG in KDE-4.0
-    int m_size; // TODO use TQ_LONG in KDE-4.0
+    int m_pos; // TODO use Q_LONG in KDE-4.0
+    int m_size; // TODO use Q_LONG in KDE-4.0
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
diff --git a/kio/kio/kautomount.cpp b/kio/kio/kautomount.cpp
index 3bbe47c52..a4782c313 100644
--- a/kio/kio/kautomount.cpp
+++ b/kio/kio/kautomount.cpp
@@ -56,7 +56,7 @@ void KAutoMount::slotResult( KIO::Job * job )
     Q_ASSERT( mountpoint.isValid() );
 
     if ( mountpoint.path().isEmpty() )
-        kdWarning(7015) << m_strDevice << " was correctly mounted, but KIO::findDeviceMountPoint didn't tqfind it. "
+        kdWarning(7015) << m_strDevice << " was correctly mounted, but KIO::findDeviceMountPoint didn't find it. "
                         << "This looks like a bug, please report it on http://bugs.kde.org, together with your /etc/fstab line" << endl;
     else if ( m_bShowFilemanagerWindow )
       KRun::runURL( mountpoint, "inode/directory" );
diff --git a/kio/kio/kautomount.h b/kio/kio/kautomount.h
index 3130ddec0..1d8662590 100644
--- a/kio/kio/kautomount.h
+++ b/kio/kio/kautomount.h
@@ -38,7 +38,7 @@ class Job;
  *
  * @short This class implements synchronous mounting of devices.
  */
-class KIO_EXPORT KAutoMount : public TQObject
+class KIO_EXPORT KAutoMount : public QObject
 {
   Q_OBJECT
   friend class gcc_gives_a_warning_without_this;
@@ -83,14 +83,14 @@ private:
  *
  * @short This class implements synchronous unmounting of devices,
  */
-class KIO_EXPORT KAutoUnmount : public TQObject
+class KIO_EXPORT KAutoUnmount : public QObject
 {
   Q_OBJECT
   friend class gcc_gives_a_warning_without_this;
 public:
   /**
    * Unmounts a device.
-   * @param mountpoint the mount point - KAutoUnmount tqfinds the device from that
+   * @param mountpoint the mount point - KAutoUnmount finds the device from that
    * @param desktopFile the file the user clicked on - to notify KDirWatch of the fact that
    * it should emit fileDirty for it (to have the icon change)
    */
diff --git a/kio/kio/kdatatool.cpp b/kio/kio/kdatatool.cpp
index 6905b3c31..bb6462006 100644
--- a/kio/kio/kdatatool.cpp
+++ b/kio/kio/kdatatool.cpp
@@ -47,7 +47,7 @@ KDataToolInfo::KDataToolInfo( const KService::Ptr& service, KInstance* instance
     m_service = service;
     m_instance = instance;
 
-    if ( !!m_service && !m_service->serviceTypes().tqcontains( "KDataTool" ) )
+    if ( !!m_service && !m_service->serviceTypes().contains( "KDataTool" ) )
     {
         kdDebug(30003) << "The service " << m_service->name().latin1()
                        << " does not feature the service type KDataTool" << endl;
@@ -167,11 +167,11 @@ TQValueList<KDataToolInfo> KDataToolInfo::query( const TQString& datatype, const
 
     if ( !datatype.isEmpty() )
     {
-        constr = TQString::tqfromLatin1( "DataType == '%1'" ).arg( datatype );
+        constr = TQString::fromLatin1( "DataType == '%1'" ).arg( datatype );
     }
     if ( !mimetype.isEmpty() )
     {
-        TQString tmp = TQString::tqfromLatin1( "'%1' in DataMimeTypes" ).arg( mimetype );
+        TQString tmp = TQString::fromLatin1( "'%1' in DataMimeTypes" ).arg( mimetype );
         if ( constr.isEmpty() )
             constr = tmp;
         else
@@ -180,7 +180,7 @@ TQValueList<KDataToolInfo> KDataToolInfo::query( const TQString& datatype, const
 /* Bug in KTrader ? Test with HEAD-kdelibs!
     if ( instance )
     {
-        TQString tmp = TQString::tqfromLatin1( "not ('%1' in ExcludeFrom)" ).arg( instance->instanceName() );
+        TQString tmp = TQString::fromLatin1( "not ('%1' in ExcludeFrom)" ).arg( instance->instanceName() );
         if ( constr.isEmpty() )
             constr = tmp;
         else
@@ -194,9 +194,9 @@ TQValueList<KDataToolInfo> KDataToolInfo::query( const TQString& datatype, const
     KTrader::OfferList::ConstIterator it = offers.begin();
     for( ; it != offers.end(); ++it )
     {
-        // Temporary tqreplacement for the non-working trader query above
+        // Temporary replacement for the non-working trader query above
         if ( !instance || !(*it)->property("ExcludeFrom").toStringList()
-             .tqcontains( instance->instanceName() ) )
+             .contains( instance->instanceName() ) )
             lst.append( KDataToolInfo( *it, instance ) );
         else
             kdDebug() << (*it)->entryPath() << " excluded." << endl;
diff --git a/kio/kio/kdatatool.h b/kio/kio/kdatatool.h
index 819382380..69751db79 100644
--- a/kio/kio/kdatatool.h
+++ b/kio/kio/kdatatool.h
@@ -250,7 +250,7 @@ private:
  * @see KDataToolAction, and for activating a tool, passing it the data
  * (and possibly getting modified data from it).
  */
-class KIO_EXPORT KDataTool : public TQObject
+class KIO_EXPORT KDataTool : public QObject
 {
     Q_OBJECT
 public:
diff --git a/kio/kio/kdcopservicestarter.cpp b/kio/kio/kdcopservicestarter.cpp
index 27c4d3514..3c9b55501 100644
--- a/kio/kio/kdcopservicestarter.cpp
+++ b/kio/kio/kdcopservicestarter.cpp
@@ -46,7 +46,7 @@ KDCOPServiceStarter::~KDCOPServiceStarter()
 {
 }
 
-int KDCOPServiceStarter::tqfindServiceFor( const TQString& serviceType,
+int KDCOPServiceStarter::findServiceFor( const TQString& serviceType,
                                          const TQString& _constraint,
                                          const TQString& preferences,
                                          TQString *error, TQCString* pDcopService,
diff --git a/kio/kio/kdcopservicestarter.h b/kio/kio/kdcopservicestarter.h
index 501bef030..b267476e7 100644
--- a/kio/kio/kdcopservicestarter.h
+++ b/kio/kio/kdcopservicestarter.h
@@ -40,7 +40,7 @@ public:
     /**
      * Check if a given DCOP interface is available - from the serviceType it's supposed to implement.
      *
-     * The trader is queried to tqfind the preferred application for this serviceType,
+     * The trader is queried to find the preferred application for this serviceType,
      * with the constraint that its X-DCOP-ServiceName property must be defined.
      * Then the DCOP server is checked. If the service is not available,
      * this method will call startServiceFor to start it.
@@ -48,17 +48,17 @@ public:
      * @param serviceType the type of service we're looking for
      * @param constraint see KTrader
      * @param preferences see KTrader
-     * @param error On failure, @p error tqcontains a description of the error
+     * @param error On failure, @p error contains a description of the error
      *         that occurred. If the pointer is 0, the argument will be
      *         ignored
-     * @param dcopService On success, @p dcopService tqcontains the DCOP name
+     * @param dcopService On success, @p dcopService contains the DCOP name
      *         under which this service is available. If the pointer is 0 the argument
      *         will be ignored
      * @param flags for future extensions (currently unused)
      *
      * @return an error code indicating success (== 0) or failure (> 0).
      */
-    int tqfindServiceFor( const TQString& serviceType,
+    int findServiceFor( const TQString& serviceType,
                         const TQString& constraint = TQString::null,
                         const TQString& preferences = TQString::null,
                         TQString *error=0, TQCString* dcopService=0,
@@ -67,7 +67,7 @@ public:
     /**
      * Find an implementation of the given @p serviceType,
      * and start it, to use its DCOP interface.
-     * The default implementation uses KTrader to tqfind the preferred Application,
+     * The default implementation uses KTrader to find the preferred Application,
      * and then starts it using kapp->startService...
      *
      * However applications (like kontact) can reimplement this method, to provide
@@ -76,10 +76,10 @@ public:
      * @param serviceType the type of service we're looking for
      * @param constraint see KTrader
      * @param preferences see KTrader
-     * @param error On failure, @p error tqcontains a description of the error
+     * @param error On failure, @p error contains a description of the error
      *         that occurred. If the pointer is 0, the argument will be
      *         ignored
-     * @param dcopService On success, @p dcopService tqcontains the DCOP name
+     * @param dcopService On success, @p dcopService contains the DCOP name
      *         under which this service is available. If the pointer is 0 the argument
      *         will be ignored
      * @param flags for future extensions (currently unused)
diff --git a/kio/kio/kdirlister.cpp b/kio/kio/kdirlister.cpp
index 5664e2572..901f382b8 100644
--- a/kio/kio/kdirlister.cpp
+++ b/kio/kio/kdirlister.cpp
@@ -113,7 +113,7 @@ bool KDirListerCache::listDir( KDirLister *lister, const KURL& _u,
 
     lister->d->rootFileItem = 0;
   }
-  else if ( lister->d->lstDirs.tqfind( _url ) != lister->d->lstDirs.end() )
+  else if ( lister->d->lstDirs.find( _url ) != lister->d->lstDirs.end() )
   {
     // stop the job listing _url for this lister
     stop( lister, _url );
@@ -311,7 +311,7 @@ void KDirListerCache::stop( KDirLister *lister )
   TQPtrList<KDirLister> *listers;
   while ( (listers = it.current()) )
   {
-    if ( listers->tqfindRef( lister ) > -1 )
+    if ( listers->findRef( lister ) > -1 )
     {
       // lister is listing url
       TQString url = it.currentKey();
@@ -456,8 +456,8 @@ void KDirListerCache::forgetDirs( KDirLister *lister, const KURL& _url, bool not
   // remove the dir from lister->d->lstDirs so that it doesn't contain things
   // that itemsInUse doesn't. When emitting the canceled signals lstDirs must
   // not contain anything that itemsInUse does not contain. (otherwise it 
-  // might crash in tqfindByName()).
-  lister->d->lstDirs.remove( lister->d->lstDirs.tqfind( url ) );
+  // might crash in findByName()).
+  lister->d->lstDirs.remove( lister->d->lstDirs.find( url ) );
 
   DirItem *item = itemsInUse[urlStr];
 
@@ -498,7 +498,7 @@ void KDirListerCache::forgetDirs( KDirLister *lister, const KURL& _url, bool not
         // unmounting a removable device (#37780)
         const bool isLocal = item->url.isLocalFile();
         const bool isManuallyMounted = isLocal && KIO::manually_mounted( item->url.path() );
-        bool tqcontainsManuallyMounted = false;
+        bool containsManuallyMounted = false;
         if ( !isManuallyMounted && item->lstItems && isLocal ) 
         {
           // Look for a manually-mounted directory inside
@@ -506,15 +506,15 @@ void KDirListerCache::forgetDirs( KDirLister *lister, const KURL& _url, bool not
           // I hope this isn't too slow (manually_mounted caches the last device so most
           // of the time this is just a stat per subdir)
           KFileItemListIterator kit( *item->lstItems );
-          for ( ; kit.current() && !tqcontainsManuallyMounted; ++kit )
+          for ( ; kit.current() && !containsManuallyMounted; ++kit )
             if ( (*kit)->isDir() && KIO::manually_mounted( (*kit)->url().path() ) )
-              tqcontainsManuallyMounted = true;
+              containsManuallyMounted = true;
         }
 
-        if ( isManuallyMounted || tqcontainsManuallyMounted ) 
+        if ( isManuallyMounted || containsManuallyMounted ) 
         {
           kdDebug(7004) << "Not adding a watch on " << item->url << " because it " <<
-            ( isManuallyMounted ? "is manually mounted" : "tqcontains a manually mounted subdir" ) << endl;
+            ( isManuallyMounted ? "is manually mounted" : "contains a manually mounted subdir" ) << endl;
           item->complete = false; // set to "dirty"
         }
         else
@@ -570,7 +570,7 @@ void KDirListerCache::updateDirectory( const KURL& _dir )
   }
   kdDebug(7004) << k_funcinfo << "Killed = " << killed << endl;
 
-  // we don't need to emit canceled signals since we only tqreplaced the job,
+  // we don't need to emit canceled signals since we only replaced the job,
   // the listing is continuing.
 
   Q_ASSERT( !listers || (listers && killed) );
@@ -645,7 +645,7 @@ KFileItemList *KDirListerCache::itemsForDir( const KURL &_dir ) const
   return item ? item->lstItems : 0;
 }
 
-KFileItem *KDirListerCache::tqfindByName( const KDirLister *lister, const TQString& _name ) const
+KFileItem *KDirListerCache::findByName( const KDirLister *lister, const TQString& _name ) const
 {
   Q_ASSERT( lister );
 
@@ -669,8 +669,8 @@ KFileItem *KDirListerCache::findByURL( const KDirLister *lister, const KURL& _u
   KURL parentDir( _url );
   parentDir.setPath( parentDir.directory() );
 
-  // If lister is set, check that it tqcontains this dir
-  if ( lister && !lister->d->lstDirs.tqcontains( parentDir ) )
+  // If lister is set, check that it contains this dir
+  if ( lister && !lister->d->lstDirs.contains( parentDir ) )
       return 0L;
 
   KFileItemList *itemList = itemsForDir( parentDir );
@@ -760,7 +760,7 @@ void KDirListerCache::FilesChanged( const KURL::List &fileList )
       // Let's update the dir.
       KURL dir( *it );
       dir.setPath( dir.directory( true ) );
-      if ( dirsToUpdate.tqfind( dir ) == dirsToUpdate.end() )
+      if ( dirsToUpdate.find( dir ) == dirsToUpdate.end() )
         dirsToUpdate.prepend( dir );
     }
   }
@@ -959,7 +959,7 @@ void KDirListerCache::slotEntries( KIO::Job *job, const KIO::UDSEntryList &entri
   {
     TQString name;
 
-    // tqfind out about the name
+    // find out about the name
     KIO::UDSEntry::ConstIterator entit = (*it).begin();
     for( ; entit != (*it).end(); ++entit )
       if ( (*entit).m_uds == KIO::UDS_NAME )
@@ -1110,7 +1110,7 @@ void KDirListerCache::slotRedirection( KIO::Job *j, const KURL& url )
       kdl->d->url = newUrl;
     }
 
-    *kdl->d->lstDirs.tqfind( oldUrl ) = newUrl;
+    *kdl->d->lstDirs.find( oldUrl ) = newUrl;
 
     if ( kdl->d->lstDirs.count() == 1 )
     {
@@ -1147,7 +1147,7 @@ void KDirListerCache::slotRedirection( KIO::Job *j, const KURL& url )
         kdl->d->url = newUrl;
       }
 
-      *kdl->d->lstDirs.tqfind( oldUrl ) = newUrl;
+      *kdl->d->lstDirs.find( oldUrl ) = newUrl;
 
       if ( kdl->d->lstDirs.count() == 1 )
       {
@@ -1429,7 +1429,7 @@ void KDirListerCache::emitRedirections( const KURL &oldUrl, const KURL &url )
     // And notify the dirlisters of the redirection
     for ( KDirLister *kdl = holders->first(); kdl; kdl = holders->next() )
     {
-      *kdl->d->lstDirs.tqfind( oldUrl ) = url;
+      *kdl->d->lstDirs.find( oldUrl ) = url;
 
       if ( kdl->d->lstDirs.count() == 1 )
         emit kdl->redirection( url );
@@ -1478,7 +1478,7 @@ void KDirListerCache::slotUpdateResult( KIO::Job * j )
     if ( listers )
       for ( kdl = tmpLst->first(); kdl; kdl = tmpLst->next() )
       {
-        Q_ASSERT( listers->tqcontainsRef( kdl ) == 0 );
+        Q_ASSERT( listers->containsRef( kdl ) == 0 );
         listers->append( kdl );
       }
     else
@@ -1755,7 +1755,7 @@ void KDirListerCache::deleteDir( const KURL& dirUrl )
 
       DirItem *dir = itemsInUse.take( deletedUrl.url() );
       Q_ASSERT( !dir );
-      if ( !dir ) // take didn't tqfind it - move on
+      if ( !dir ) // take didn't find it - move on
           ++itu;
     }
     else
@@ -2049,13 +2049,13 @@ KFileItem *KDirLister::findByURL( const KURL& _url ) const
   return s_pCache->findByURL( this, _url );
 }
 
-KFileItem *KDirLister::tqfindByName( const TQString& _name ) const
+KFileItem *KDirLister::findByName( const TQString& _name ) const
 {
-  return s_pCache->tqfindByName( this, _name );
+  return s_pCache->findByName( this, _name );
 }
 
 #ifndef KDE_NO_COMPAT
-KFileItem *KDirLister::tqfind( const KURL& _url ) const
+KFileItem *KDirLister::find( const KURL& _url ) const
 {
   return findByURL( _url );
 }
@@ -2095,8 +2095,8 @@ void KDirLister::setMimeFilter( const TQStringList& mimeFilter )
   if ( !(d->changes & MIME_FILTER) )
     d->oldMimeFilter = d->mimeFilter;
 
-  if ( mimeFilter.tqfind("all/allfiles") != mimeFilter.end() || 
-       mimeFilter.tqfind("all/all") != mimeFilter.end() )
+  if ( mimeFilter.find("all/allfiles") != mimeFilter.end() || 
+       mimeFilter.find("all/all") != mimeFilter.end() )
     d->mimeFilter.clear();
   else
     d->mimeFilter = mimeFilter;
diff --git a/kio/kio/kdirlister.h b/kio/kio/kdirlister.h
index af5d7de22..8a0109e89 100644
--- a/kio/kio/kdirlister.h
+++ b/kio/kio/kdirlister.h
@@ -52,7 +52,7 @@ namespace KIO { class Job; class ListJob; }
  * @short Helper class for the kiojob used to list and update a directory.
  * @author Michael Brade <brade@kde.org>
  */
-class KIO_EXPORT KDirLister : public TQObject
+class KIO_EXPORT KDirLister : public QObject
 {
   class KDirListerPrivate;
   friend class KDirListerPrivate;
@@ -251,7 +251,7 @@ public:
    */
   virtual KFileItem *findByURL( const KURL& _url ) const;
 #ifndef KDE_NO_COMPAT
-  KFileItem *tqfind( const KURL& _url ) const;
+  KFileItem *find( const KURL& _url ) const;
 #endif
 
   /**
@@ -259,7 +259,7 @@ public:
    * @param name the item name
    * @return the pointer to the KFileItem
    */
-  virtual KFileItem *tqfindByName( const TQString& name ) const;
+  virtual KFileItem *findByName( const TQString& name ) const;
 
   /**
    * Set a name filter to only list items matching this name, e.g. "*.cpp".
@@ -334,7 +334,7 @@ public:
 
   /**
    * Checks whether @p mime matches a filter in the list of mime types
-   * @param mime the mimetype to tqfind in the filter list.
+   * @param mime the mimetype to find in the filter list.
    * @return true if @p name matches a filter in the list,
    * otherwise false.
    * @see setMimeFilter.
diff --git a/kio/kio/kdirlister_p.h b/kio/kio/kdirlister_p.h
index 9a91e57df..a98521905 100644
--- a/kio/kio/kdirlister_p.h
+++ b/kio/kio/kdirlister_p.h
@@ -70,7 +70,7 @@ public:
 
   /**
    * List of dirs handled by this dirlister. The first entry is the base URL.
-   * For a tree view, it tqcontains all the dirs shown.
+   * For a tree view, it contains all the dirs shown.
    */
   KURL::List lstDirs;
 
@@ -150,13 +150,13 @@ public:
 
   KFileItemList *itemsForDir( const KURL &_dir ) const;
 
-  KFileItem *tqfindByName( const KDirLister *lister, const TQString &_name ) const;
+  KFileItem *findByName( const KDirLister *lister, const TQString &_name ) const;
   // if lister is set, it is checked that the url is held by the lister
   KFileItem *findByURL( const KDirLister *lister, const KURL &_url ) const;
 
   /**
    * Notify that files have been added in @p directory
-   * The receiver will list that directory again to tqfind
+   * The receiver will list that directory again to find
    * the new items (since it needs more than just the names anyway).
    * Reimplemented from KDirNotify.
    */
diff --git a/kio/kio/kdirnotify.h b/kio/kio/kdirnotify.h
index 8c8051524..2082569a1 100644
--- a/kio/kio/kdirnotify.h
+++ b/kio/kio/kdirnotify.h
@@ -41,7 +41,7 @@ k_dcop:
   /**
    * Notify that files have been added in @p directory
    * Note: this is ASYNC so that it can be used with a broadcast.
-   * @param directory the directory that tqcontains the new files
+   * @param directory the directory that contains the new files
    */
   virtual ASYNC FilesAdded( const KURL & directory ) = 0;
 
diff --git a/kio/kio/kdirwatch.cpp b/kio/kio/kdirwatch.cpp
index 83d8dac9f..bbea148fa 100644
--- a/kio/kio/kdirwatch.cpp
+++ b/kio/kio/kdirwatch.cpp
@@ -123,7 +123,7 @@ static int dnotify_signal = 0;
  *
  * As this is called asynchronously, only a flag is set and
  * a rescan is requested.
- * This is done by writing into a pipe to trigger a TQSocketNotifier
+ * This is done by writing into a pipe to trigger a QSocketNotifier
  * watching on this pipe: a timer is started and after a timeout,
  * the rescan is done.
  */
@@ -135,7 +135,7 @@ void KDirWatchPrivate::dnotify_handler(int, siginfo_t *si, void *)
   // (Richard Stevens, Advanced programming in the Unix Environment)
   int saved_errno = errno;
 
-  Entry* e = dwp_self->fd_Entry.tqfind(si->si_fd);
+  Entry* e = dwp_self->fd_Entry.find(si->si_fd);
 
 //  kdDebug(7001) << "DNOTIFY Handler: fd " << si->si_fd << " path "
 //		<< TQString(e ? e->path:"unknown") << endl;
@@ -413,9 +413,9 @@ void KDirWatchPrivate::slotActivated()
       if ( path.length() && isNoisyFile( path.latin1() ) )
         continue;
 
-      kdDebug(7001) << "ev wd: " << event->wd << " tqmask " << event->tqmask << " path: " << path << endl;
+      kdDebug(7001) << "ev wd: " << event->wd << " mask " << event->mask << " path: " << path << endl;
 
-      // now we're in deep trouble of tqfinding the
+      // now we're in deep trouble of finding the
       // associated entries
       // for now, we suck and iterate
       for ( EntryMap::Iterator it = m_mapEntries.begin();
@@ -425,7 +425,7 @@ void KDirWatchPrivate::slotActivated()
           e->dirty = true;
 
           if ( 1 || e->isDir) {
-            if( event->tqmask & IN_DELETE_SELF) {
+            if( event->mask & IN_DELETE_SELF) {
               kdDebug(7001) << "-->got deleteself signal for " << e->path << endl;
               e->m_status = NonExistent;
               if (e->isDir)
@@ -433,10 +433,10 @@ void KDirWatchPrivate::slotActivated()
               else
                 addEntry(0, TQFileInfo(e->path).dirPath(true), e, true);
             }
-            if ( event->tqmask & IN_IGNORED ) {
+            if ( event->mask & IN_IGNORED ) {
               e->wd = 0;
             }
-            if ( event->tqmask & (IN_CREATE|IN_MOVED_TO) ) {
+            if ( event->mask & (IN_CREATE|IN_MOVED_TO) ) {
               Entry *sub_entry = e->m_entries.first();
               for(;sub_entry; sub_entry = e->m_entries.next())
                 if (sub_entry->path == e->path + "/" + path) break;
@@ -551,7 +551,7 @@ KDirWatchPrivate::Entry* KDirWatchPrivate::entry(const TQString& _path)
   if ( path.length() > 1 && path.right(1) == "/" )
     path.truncate( path.length() - 1 );
 
-  EntryMap::Iterator it = m_mapEntries.tqfind( path );
+  EntryMap::Iterator it = m_mapEntries.find( path );
   if ( it == m_mapEntries.end() )
     return 0;
   else
@@ -668,13 +668,13 @@ bool KDirWatchPrivate::useDNotify(Entry* e)
 	return false;
       }
 
-      int tqmask = DN_DELETE|DN_CREATE|DN_RENAME|DN_MULTISHOT;
+      int mask = DN_DELETE|DN_CREATE|DN_RENAME|DN_MULTISHOT;
       // if dependant is a file watch, we check for MODIFY & ATTRIB too
       for(Entry* dep=e->m_entries.first();dep;dep=e->m_entries.next())
-	if (!dep->isDir) { tqmask |= DN_MODIFY|DN_ATTRIB; break; }
+	if (!dep->isDir) { mask |= DN_MODIFY|DN_ATTRIB; break; }
 
       if(fcntl(fd, F_SETSIG, dnotify_signal) < 0 ||
-	 fcntl(fd, F_NOTIFY, tqmask) < 0) {
+	 fcntl(fd, F_NOTIFY, mask) < 0) {
 
 	kdDebug(7001) << "Not using Linux Directory Notifications."
 		      << endl;
@@ -684,7 +684,7 @@ bool KDirWatchPrivate::useDNotify(Entry* e)
 	return false;
       }
 
-      fd_Entry.tqreplace(fd, e);
+      fd_Entry.replace(fd, e);
       e->dn_fd = fd;
 
       kdDebug(7001) << " Setup DNotify (fd " << fd
@@ -714,19 +714,19 @@ bool KDirWatchPrivate::useINotify( Entry* e )
 
   e->m_mode = INotifyMode;
 
-  int tqmask = IN_DELETE|IN_DELETE_SELF|IN_CREATE|IN_MOVE|IN_MOVE_SELF|IN_DONT_FOLLOW;
+  int mask = IN_DELETE|IN_DELETE_SELF|IN_CREATE|IN_MOVE|IN_MOVE_SELF|IN_DONT_FOLLOW;
   if(!e->isDir)
-    tqmask |= IN_MODIFY|IN_ATTRIB;
+    mask |= IN_MODIFY|IN_ATTRIB;
   else
-    tqmask |= IN_ONLYDIR;
+    mask |= IN_ONLYDIR;
 
   // if dependant is a file watch, we check for MODIFY & ATTRIB too
   for(Entry* dep=e->m_entries.first();dep;dep=e->m_entries.next()) {
-    if (!dep->isDir) { tqmask |= IN_MODIFY|IN_ATTRIB; break; }
+    if (!dep->isDir) { mask |= IN_MODIFY|IN_ATTRIB; break; }
   }
 
   if ( ( e->wd = inotify_add_watch( m_inotify_fd,
-        TQFile::encodeName( e->path ), tqmask) ) > 0 )
+        TQFile::encodeName( e->path ), mask) ) > 0 )
     return true;
 
   if ( e->m_status == NonExistent ) {
@@ -782,7 +782,7 @@ void KDirWatchPrivate::addEntry(KDirWatch* instance, const TQString& _path,
   if ( path.length() > 1 && path.right(1) == "/" )
     path.truncate( path.length() - 1 );
 
-  EntryMap::Iterator it = m_mapEntries.tqfind( path );
+  EntryMap::Iterator it = m_mapEntries.find( path );
   if ( it != m_mapEntries.end() )
   {
     if (sub_entry) {
@@ -794,11 +794,11 @@ void KDirWatchPrivate::addEntry(KDirWatch* instance, const TQString& _path,
      {
        Entry* e = &(*it);
        if( (e->m_mode == DNotifyMode) && (e->dn_fd > 0) ) {
-         int tqmask = DN_DELETE|DN_CREATE|DN_RENAME|DN_MULTISHOT;
+         int mask = DN_DELETE|DN_CREATE|DN_RENAME|DN_MULTISHOT;
          // if dependant is a file watch, we check for MODIFY & ATTRIB too
          for(Entry* dep=e->m_entries.first();dep;dep=e->m_entries.next())
-     	   if (!dep->isDir) { tqmask |= DN_MODIFY|DN_ATTRIB; break; }
-	 if( fcntl(e->dn_fd, F_NOTIFY, tqmask) < 0) { // shouldn't happen
+     	   if (!dep->isDir) { mask |= DN_MODIFY|DN_ATTRIB; break; }
+	 if( fcntl(e->dn_fd, F_NOTIFY, mask) < 0) { // shouldn't happen
 	   ::close(e->dn_fd);
 	   e->m_mode = UnknownMode;
   	   fd_Entry.remove(e->dn_fd);
@@ -813,14 +813,14 @@ void KDirWatchPrivate::addEntry(KDirWatch* instance, const TQString& _path,
      {
        Entry* e = &(*it);
        if( (e->m_mode == INotifyMode) && (e->wd > 0) ) {
-         int tqmask = IN_DELETE|IN_DELETE_SELF|IN_CREATE|IN_MOVE|IN_MOVE_SELF|IN_DONT_FOLLOW;
+         int mask = IN_DELETE|IN_DELETE_SELF|IN_CREATE|IN_MOVE|IN_MOVE_SELF|IN_DONT_FOLLOW;
          if(!e->isDir)
-           tqmask |= IN_MODIFY|IN_ATTRIB;
+           mask |= IN_MODIFY|IN_ATTRIB;
          else
-           tqmask |= IN_ONLYDIR;
+           mask |= IN_ONLYDIR;
 
          inotify_rm_watch (m_inotify_fd, e->wd);
-         e->wd = inotify_add_watch( m_inotify_fd, TQFile::encodeName( e->path ), tqmask);
+         e->wd = inotify_add_watch( m_inotify_fd, TQFile::encodeName( e->path ), mask);
        }
     }
 #endif
@@ -923,7 +923,7 @@ void KDirWatchPrivate::removeEntry( KDirWatch* instance,
 
   if (delayRemove) {
     // removeList is allowed to contain any entry at most once
-    if (removeList.tqfindRef(e)==-1)
+    if (removeList.findRef(e)==-1)
       removeList.append(e);
     // now e->isValid() is false
     return;
@@ -1704,7 +1704,7 @@ void KDirWatch::startScan( bool notify, bool skippedToo )
 }
 
 
-bool KDirWatch::tqcontains( const TQString& _path ) const
+bool KDirWatch::contains( const TQString& _path ) const
 {
   KDirWatchPrivate::Entry* e = d->entry(_path);
   if (!e)
diff --git a/kio/kio/kdirwatch.h b/kio/kio/kdirwatch.h
index 591627a70..36f2737b3 100644
--- a/kio/kio/kdirwatch.h
+++ b/kio/kio/kdirwatch.h
@@ -60,7 +60,7 @@ class KDirWatchPrivate;
   * @short Class for watching directory and file changes.
   * @author Sven Radej <sven@lisa.exp.univie.ac.at>
   */
-class KIO_EXPORT KDirWatch : public TQObject
+class KIO_EXPORT KDirWatch : public QObject
 {
   Q_OBJECT
     
@@ -194,7 +194,7 @@ class KIO_EXPORT KDirWatch : public TQObject
     * @param path the directory to check
     * @return true if the directory is being watched
     */
-   bool tqcontains( const TQString& path ) const;
+   bool contains( const TQString& path ) const;
 
    /**
     * Dump statistic information about all KDirWatch instances.
diff --git a/kio/kio/kdirwatch_p.h b/kio/kio/kdirwatch_p.h
index 473f1e468..9920b866d 100644
--- a/kio/kio/kdirwatch_p.h
+++ b/kio/kio/kdirwatch_p.h
@@ -1,6 +1,6 @@
 /* Private Header for class of KDirWatchPrivate
  *
- * this separate header file is needed for TQMOC processing
+ * this separate header file is needed for MOC processing
  * because KDirWatchPrivate has signals and slots
  */
 
@@ -18,12 +18,12 @@
 /* KDirWatchPrivate is a singleton and does the watching
  * for every KDirWatch instance in the application.
  */
-class KDirWatchPrivate : public TQObject
+class KDirWatchPrivate : public QObject
 {
   Q_OBJECT
 public:
 
-  enum entrytqStatus { Normal = 0, NonExistent };
+  enum entryStatus { Normal = 0, NonExistent };
   enum entryMode { UnknownMode = 0, StatMode, DNotifyMode, INotifyMode, FAMMode };
   enum { NoChange=0, Changed=1, Created=2, Deleted=4 };
 
@@ -43,7 +43,7 @@ public:
     time_t m_ctime;
     // the last observed link count
     int m_nlink;
-    entrytqStatus m_status;
+    entryStatus m_status;
     entryMode m_mode;
     bool isDir;
     // instances interested in events
diff --git a/kio/kio/kfileitem.cpp b/kio/kio/kfileitem.cpp
index b503be761..010832573 100644
--- a/kio/kio/kfileitem.cpp
+++ b/kio/kio/kfileitem.cpp
@@ -179,7 +179,7 @@ void KFileItem::init( bool _determineMimeTypeOnDemand )
       m_pMimeType = KMimeType::findByURL( url, m_fileMode, isLocalURL,
                                           // use fast mode if not mimetype on demand
                                           _determineMimeTypeOnDemand, &accurate );
-      //kdDebug() << "tqfinding mimetype for " << url.url() << " : " << m_pMimeType->name() << endl;
+      //kdDebug() << "finding mimetype for " << url.url() << " : " << m_pMimeType->name() << endl;
       // if we didn't use fast mode, or if we got a result, then this is the mimetype
       // otherwise, determineMimeType will be able to do better.
       m_bMimeTypeKnown = (!_determineMimeTypeOnDemand) || accurate;
@@ -518,7 +518,7 @@ KMimeType::Ptr KFileItem::determineMimeType()
     KURL url = mostLocalURL(isLocalURL);
 
     m_pMimeType = KMimeType::findByURL( url, m_fileMode, isLocalURL );
-    //kdDebug() << "tqfinding mimetype for " << url.url() << " : " << m_pMimeType->name() << endl;
+    //kdDebug() << "finding mimetype for " << url.url() << " : " << m_pMimeType->name() << endl;
     m_bMimeTypeKnown = true;
   }
 
@@ -541,7 +541,7 @@ TQString KFileItem::mimeComment()
  KURL url = mostLocalURL(isLocalURL);
 
  TQString comment = mType->comment( url, isLocalURL );
- //kdDebug() << "tqfinding comment for " << url.url() << " : " << m_pMimeType->name() << endl;
+ //kdDebug() << "finding comment for " << url.url() << " : " << m_pMimeType->name() << endl;
   if (!comment.isEmpty())
     return comment;
   else
@@ -555,7 +555,7 @@ TQString KFileItem::iconName()
   bool isLocalURL;
   KURL url = mostLocalURL(isLocalURL);
 
-  //kdDebug() << "tqfinding icon for " << url.url() << " : " << m_pMimeType->name() << endl;
+  //kdDebug() << "finding icon for " << url.url() << " : " << m_pMimeType->name() << endl;
   return determineMimeType()->icon(url, isLocalURL);
 }
 
@@ -626,7 +626,7 @@ TQPixmap KFileItem::pixmap( int _size, int _state ) const
   KURL url = mostLocalURL(isLocalURL);
 
   TQPixmap p = mime->pixmap( url, KIcon::Desktop, _size, _state );
-  //kdDebug() << "tqfinding pixmap for " << url.url() << " : " << mime->name() << endl;
+  //kdDebug() << "finding pixmap for " << url.url() << " : " << mime->name() << endl;
   if (p.isNull())
       kdWarning() << "Pixmap not found for mimetype " << m_pMimeType->name() << endl;
 
@@ -774,7 +774,7 @@ TQString KFileItem::getStatusBarInfo()
       text += "  ";
       text += mimeComment();
   }
-  text.tqreplace('\n', " "); // tqreplace any newlines with a space, so the statusbar doesn't get a two-line string which messes the display up, Alex
+  text.replace('\n', " "); // replace any newlines with a space, so the statusbar doesn't get a two-line string which messes the display up, Alex
   return text;
 }
 
@@ -973,12 +973,12 @@ void KFileItem::setExtraData( const void *key, void *value )
     if ( !key )
         return;
 
-    m_extra.tqreplace( key, value );
+    m_extra.replace( key, value );
 }
 
 const void * KFileItem::extraData( const void *key ) const
 {
-    TQMapConstIterator<const void*,void*> it = m_extra.tqfind( key );
+    TQMapConstIterator<const void*,void*> it = m_extra.find( key );
     if ( it != m_extra.end() )
         return it.data();
     return 0L;
@@ -986,7 +986,7 @@ const void * KFileItem::extraData( const void *key ) const
 
 void * KFileItem::extraData( const void *key )
 {
-    TQMapIterator<const void*,void*> it = m_extra.tqfind( key );
+    TQMapIterator<const void*,void*> it = m_extra.find( key );
     if ( it != m_extra.end() )
         return it.data();
     return 0L;
@@ -1041,7 +1041,7 @@ TQString KFileItem::parsePermissions(mode_t perm) const
     if (hasExtendedACL())
         p[10]='+';
 
-    return TQString::tqfromLatin1(p);
+    return TQString::fromLatin1(p);
 }
 
 // check if we need to cache this
@@ -1098,7 +1098,7 @@ void KFileItem::virtual_hook( int, void* )
 
 TQDataStream & operator<< ( TQDataStream & s, const KFileItem & a )
 {
-    // We don't need to save/restore anything that refresh() tqinvalidates,
+    // We don't need to save/restore anything that refresh() invalidates,
     // since that means we can re-determine those by ourselves.
     s << a.m_url;
     s << a.m_strName;
diff --git a/kio/kio/kfileitem.h b/kio/kio/kfileitem.h
index b0ce59d88..cf6344669 100644
--- a/kio/kio/kfileitem.h
+++ b/kio/kio/kfileitem.h
@@ -47,7 +47,7 @@ public:
    * Creates an item representing a file, from a UDSEntry.
    * This is the preferred constructor when using KIO::listDir().
    *
-   * @param _entry the KIO entry used to get the file, tqcontains info about it
+   * @param _entry the KIO entry used to get the file, contains info about it
    * @param _url the file url
    * @param _determineMimeTypeOnDemand specifies if the mimetype of the given
    *       URL should be determined immediately or on demand
diff --git a/kio/kio/kfilemetainfo.cpp b/kio/kio/kfilemetainfo.cpp
index 8ecf1af16..fcab35f19 100644
--- a/kio/kio/kfilemetainfo.cpp
+++ b/kio/kio/kfilemetainfo.cpp
@@ -410,7 +410,7 @@ TQStringList KFileMetaInfo::preferredGroups() const
     // move all keys from the preferred groups that are in our list to a new list
     for ( pref = preferred.begin(); pref != preferred.end(); ++pref )
     {
-        TQStringList::Iterator group = list.tqfind(*pref);
+        TQStringList::Iterator group = list.find(*pref);
         if ( group != list.end() )
         {
              newlist.append( *group );
@@ -418,7 +418,7 @@ TQStringList KFileMetaInfo::preferredGroups() const
         }
     }
 
-    // now the old list only tqcontains the non-preferred items, so we
+    // now the old list only contains the non-preferred items, so we
     // add the remaining ones to newlist
     newlist += list;
 
@@ -440,7 +440,7 @@ TQStringList KFileMetaInfo::preferredKeys() const
 
 KFileMetaInfoGroup KFileMetaInfo::group(const TQString& key) const
 {
-    TQMapIterator<TQString,KFileMetaInfoGroup> it = d->groups.tqfind( key );
+    TQMapIterator<TQString,KFileMetaInfoGroup> it = d->groups.find( key );
     if ( it != d->groups.end() )
         return it.data();
     else
@@ -450,8 +450,8 @@ KFileMetaInfoGroup KFileMetaInfo::group(const TQString& key) const
 bool KFileMetaInfo::addGroup( const TQString& name )
 {
     assert(isValid());
-    if ( d->mimeTypeInfo->supportedGroups().tqcontains(name) &&
-         ! d->groups.tqcontains(name) )
+    if ( d->mimeTypeInfo->supportedGroups().contains(name) &&
+         ! d->groups.contains(name) )
     {
         KFileMetaInfoGroup group( name, d->mimeTypeInfo );
 
@@ -486,7 +486,7 @@ bool KFileMetaInfo::addGroup( const TQString& name )
 
 bool KFileMetaInfo::removeGroup( const TQString& name )
 {
-    TQMapIterator<TQString, KFileMetaInfoGroup> it = d->groups.tqfind(name);
+    TQMapIterator<TQString, KFileMetaInfoGroup> it = d->groups.find(name);
     if ( (it==d->groups.end()) ||
         !((*it).attributes() & KFileMimeTypeInfo::Removable))
         return false;
@@ -595,20 +595,20 @@ TQString KFileMetaInfo::mimeType() const
     return d->mimeTypeInfo->mimeType();
 }
 
-bool KFileMetaInfo::tqcontains(const TQString& key) const
+bool KFileMetaInfo::contains(const TQString& key) const
 {
     TQStringList glist = groups();
     for (TQStringList::Iterator it = glist.begin(); it != glist.end(); ++it)
     {
         KFileMetaInfoGroup g = d->groups[*it];
-        if (g.tqcontains(key)) return true;
+        if (g.contains(key)) return true;
     }
     return false;
 }
 
-bool KFileMetaInfo::tqcontainsGroup(const TQString& key) const
+bool KFileMetaInfo::containsGroup(const TQString& key) const
 {
-    return groups().tqcontains(key);
+    return groups().contains(key);
 }
 
 KFileMetaInfoItem KFileMetaInfo::item( const TQString& key) const
@@ -642,15 +642,15 @@ KFileMetaInfoItem KFileMetaInfo::saveItem( const TQString& key,
     // try the preferred groups first
     if ( !preferredGroup.isEmpty() ) {
         TQMapIterator<TQString,KFileMetaInfoGroup> it =
-            d->groups.tqfind( preferredGroup );
+            d->groups.find( preferredGroup );
 
         // try to create the preferred group, if necessary
         if ( it == d->groups.end() && createGroup ) {
             const KFileMimeTypeInfo::GroupInfo *groupInfo =
                 d->mimeTypeInfo->groupInfo( preferredGroup );
-            if ( groupInfo && groupInfo->supportedKeys().tqcontains( key ) ) {
+            if ( groupInfo && groupInfo->supportedKeys().contains( key ) ) {
                 if ( addGroup( preferredGroup ) )
-                    it = d->groups.tqfind( preferredGroup );
+                    it = d->groups.find( preferredGroup );
             }
         }
 
@@ -668,11 +668,11 @@ KFileMetaInfoItem KFileMetaInfo::saveItem( const TQString& key,
     TQStringList::ConstIterator groupIt = groups.begin();
     for ( ; groupIt != groups.end(); ++groupIt )
     {
-        TQMapIterator<TQString,KFileMetaInfoGroup> it = d->groups.tqfind( *groupIt );
+        TQMapIterator<TQString,KFileMetaInfoGroup> it = d->groups.find( *groupIt );
         if ( it != d->groups.end() )
         {
             KFileMetaInfoGroup group = it.data();
-            item = tqfindEditableItem( group, key );
+            item = findEditableItem( group, key );
             if ( item.isValid() )
                 return item;
         }
@@ -680,7 +680,7 @@ KFileMetaInfoItem KFileMetaInfo::saveItem( const TQString& key,
         {
             const KFileMimeTypeInfo::GroupInfo *groupInfo =
                 d->mimeTypeInfo->groupInfo( *groupIt );
-            if ( groupInfo && groupInfo->supportedKeys().tqcontains( key ) )
+            if ( groupInfo && groupInfo->supportedKeys().contains( key ) )
             {
                 if ( addGroup( *groupIt ) )
                 {
@@ -700,7 +700,7 @@ KFileMetaInfoItem KFileMetaInfo::saveItem( const TQString& key,
     return item;
 }
 
-KFileMetaInfoItem KFileMetaInfo::tqfindEditableItem( KFileMetaInfoGroup& group,
+KFileMetaInfoItem KFileMetaInfo::findEditableItem( KFileMetaInfoGroup& group,
                                                    const TQString& key )
 {
     assert(isValid());
@@ -717,8 +717,8 @@ KFileMetaInfoItem KFileMetaInfo::tqfindEditableItem( KFileMetaInfoGroup& group,
 KFileMetaInfoGroup KFileMetaInfo::appendGroup(const TQString& name)
 {
     assert(isValid());
-    if ( d->mimeTypeInfo->supportedGroups().tqcontains(name) &&
-         ! d->groups.tqcontains(name) )
+    if ( d->mimeTypeInfo->supportedGroups().contains(name) &&
+         ! d->groups.contains(name) )
     {
         KFileMetaInfoGroup group( name, d->mimeTypeInfo );
         d->groups.insert(name, group);
@@ -937,7 +937,7 @@ KFilePlugin* KFileMetaInfoProvider::loadPlugin( const TQString& mimeType, const
         query = "(not exist [X-KDE-Protocol])";
         queryMimeType = mimeType;
     } else {
-        query = TQString::tqfromLatin1( "[X-KDE-Protocol] == '%1'" ).arg(protocol);
+        query = TQString::fromLatin1( "[X-KDE-Protocol] == '%1'" ).arg(protocol);
         // querying for a protocol: we have no mimetype, so we need to use KFilePlugin as one
         queryMimeType = "KFilePlugin";
         // hopefully using KFilePlugin as genericMimeType too isn't a problem
@@ -986,7 +986,7 @@ KFilePlugin* KFileMetaInfoProvider::loadAndRegisterPlugin( const TQString& mimeT
             first = false;
         }
         // Hopefully the above includes the mimetype we asked for!
-        if ( m_pendingMimetypeInfos.tqfind( mimeType ) == 0 )
+        if ( m_pendingMimetypeInfos.find( mimeType ) == 0 )
             kdWarning(7033) << plugin->className() << " was created for " << mimeType << " but doesn't call addMimeTypeInfo for it!" << endl;
     }
     m_pendingMimetypeInfos.clear();
@@ -1003,7 +1003,7 @@ KFilePlugin * KFileMetaInfoProvider::plugin(const TQString& mimeType, const TQSt
     //kdDebug(7033) << "plugin() : looking for plugin for protocol=" << protocol << " mimeType=" << mimeType << endl;
 
     if ( !protocol.isEmpty() ) {
-        CachedPluginInfo *cache = m_plugins.tqfind( protocol );
+        CachedPluginInfo *cache = m_plugins.find( protocol );
         if ( cache && cache->plugin ) {
             return cache->plugin;
         }
@@ -1014,7 +1014,7 @@ KFilePlugin * KFileMetaInfoProvider::plugin(const TQString& mimeType, const TQSt
         }
     }
 
-    CachedPluginInfo *cache = m_plugins.tqfind( mimeType );
+    CachedPluginInfo *cache = m_plugins.find( mimeType );
     if ( cache ) {
         return cache->plugin;
     }
@@ -1072,27 +1072,27 @@ const KFileMimeTypeInfo * KFileMetaInfoProvider::mimeTypeInfo( const TQString& m
 {
     //kdDebug(7033) << "mimeTypeInfo() : looking for plugin for protocol=" << protocol << " mimeType=" << mimeType << endl;
     if ( !protocol.isEmpty() ) {
-        CachedPluginInfo *cache = m_plugins.tqfind( protocol );
+        CachedPluginInfo *cache = m_plugins.find( protocol );
         if ( cache && cache->mimeTypeInfo ) {
             return cache->mimeTypeInfo;
         }
 
         if ( !cache ) {
             loadAndRegisterPlugin( TQString::null, protocol );
-            cache = m_plugins.tqfind( protocol );
+            cache = m_plugins.find( protocol );
             if ( cache && cache->mimeTypeInfo ) {
                 return cache->mimeTypeInfo;
             }
         }
     }
 
-    CachedPluginInfo *cache = m_plugins.tqfind( mimeType );
+    CachedPluginInfo *cache = m_plugins.find( mimeType );
     if ( cache ) {
         return cache->mimeTypeInfo;
     }
 
     loadAndRegisterPlugin( mimeType, TQString::null );
-    cache = m_plugins.tqfind( mimeType );
+    cache = m_plugins.find( mimeType );
     if ( cache ) {
         return cache->mimeTypeInfo;
     }
@@ -1103,7 +1103,7 @@ KFileMimeTypeInfo * KFileMetaInfoProvider::addMimeTypeInfo(
     const TQString& mimeType )
 {
 
-    KFileMimeTypeInfo *info = m_pendingMimetypeInfos.tqfind( mimeType );
+    KFileMimeTypeInfo *info = m_pendingMimetypeInfos.find( mimeType );
     Q_ASSERT( !info );
     if ( !info )
     {
@@ -1129,7 +1129,7 @@ TQStringList KFileMetaInfoProvider::supportedMimeTypes() const
         const TQStringList mimeTypes = (*it)->serviceTypes();
         TQStringList::ConstIterator it2 = mimeTypes.begin();
         for ( ; it2 != mimeTypes.end(); ++it2 )
-            if ( allMimeTypes.tqfind( *it2 ) == allMimeTypes.end() &&
+            if ( allMimeTypes.find( *it2 ) == allMimeTypes.end() &&
                  *it2 != kfilePlugin ) // also in serviceTypes()
                 allMimeTypes.append( *it2 );
     }
@@ -1235,7 +1235,7 @@ TQStringList KFileMetaInfoGroup::preferredKeys() const
     // move all keys from the preferred keys that are in our list to a new list
     for ( pref = begin; pref!=end; ++pref )
     {
-        TQStringList::Iterator item = list.tqfind(*pref);
+        TQStringList::Iterator item = list.find(*pref);
         if ( item != list.end() )
         {
              newlist.append( *item );
@@ -1243,7 +1243,7 @@ TQStringList KFileMetaInfoGroup::preferredKeys() const
         }
     }
 
-    // now the old list only tqcontains the non-preferred items, so we
+    // now the old list only contains the non-preferred items, so we
     // add the remaining ones to newlist
     newlist += list;
 
@@ -1286,14 +1286,14 @@ bool KFileMetaInfoGroup::supportsVariableKeys() const
     return d->mimeTypeInfo->groupInfo(d->name)->supportsVariableKeys();
 }
 
-bool KFileMetaInfoGroup::tqcontains( const TQString& key ) const
+bool KFileMetaInfoGroup::contains( const TQString& key ) const
 {
-    return d->items.tqcontains(key);
+    return d->items.contains(key);
 }
 
 KFileMetaInfoItem KFileMetaInfoGroup::item( const TQString& key) const
 {
-    TQMapIterator<TQString,KFileMetaInfoItem> it = d->items.tqfind( key );
+    TQMapIterator<TQString,KFileMetaInfoItem> it = d->items.find( key );
     if ( it != d->items.end() )
         return it.data();
 
@@ -1356,7 +1356,7 @@ void KFileMetaInfoGroup::deref()
 KFileMetaInfoItem KFileMetaInfoGroup::addItem( const TQString& key )
 {
     assert(isValid());
-    TQMapIterator<TQString,KFileMetaInfoItem> it = d->items.tqfind( key );
+    TQMapIterator<TQString,KFileMetaInfoItem> it = d->items.find( key );
     if ( it != d->items.end() )
         return it.data();
 
@@ -1395,7 +1395,7 @@ bool KFileMetaInfoGroup::removeItem( const TQString& key )
           return false;
     }
 
-    TQMapIterator<TQString, KFileMetaInfoItem> it = d->items.tqfind(key);
+    TQMapIterator<TQString, KFileMetaInfoItem> it = d->items.find(key);
     if ( it==d->items.end() )
     {
           kdDebug(7033) << "trying to remove the non existant item " << key << "\n";
@@ -1482,7 +1482,7 @@ KFileMimeTypeInfo::~KFileMimeTypeInfo()
 
 const KFileMimeTypeInfo::GroupInfo * KFileMimeTypeInfo::groupInfo( const TQString& group ) const
 {
-    return m_groups.tqfind( group );
+    return m_groups.find( group );
 }
 
 KFileMimeTypeInfo::GroupInfo * KFileMimeTypeInfo::addGroupInfo(
@@ -1523,7 +1523,7 @@ TQStringList KFileMimeTypeInfo::supportedKeys() const
     for ( ; it.current(); ++it ) { // need to nuke dupes
         TQStringList list = it.current()->supportedKeys();
         for ( lit = list.begin(); lit != list.end(); ++lit ) {
-            if ( keys.tqfind( *lit ) == keys.end() )
+            if ( keys.find( *lit ) == keys.end() )
                 keys.append( *lit );
         }
     }
@@ -1564,7 +1564,7 @@ KFileMimeTypeInfo::GroupInfo::~GroupInfo()
 
 const KFileMimeTypeInfo::ItemInfo * KFileMimeTypeInfo::GroupInfo::itemInfo( const TQString& key ) const
 {
-    ItemInfo* item = m_itemDict.tqfind( key );
+    ItemInfo* item = m_itemDict.find( key );
 
     // if we the item isn't found and variable keys are supported, we need to
     // return the default variable key iteminfo.
diff --git a/kio/kio/kfilemetainfo.h b/kio/kio/kfilemetainfo.h
index 1fedc4c8c..d6a6e7e4c 100644
--- a/kio/kio/kfilemetainfo.h
+++ b/kio/kio/kfilemetainfo.h
@@ -105,7 +105,7 @@ public:
      * This enum exists so that you can specify units for items, which you
      * can usually use for integer items, so an application knows how to
      * display it (e.g. a time in seconds in a hh:mm:ss form). You can either
-     * use one of those units, or if you don't tqfind one that fits, you can
+     * use one of those units, or if you don't find one that fits, you can
      * add it yourself using a prefix and/or suffix.
      */
     enum Unit {
@@ -132,7 +132,7 @@ public:
      *  @brief Information about a meta information group
      *
      *  This is the class for one group of items of a KFileMimeTypeInfo.
-     *  It tqcontains, among other things, the information about the group's name
+     *  It contains, among other things, the information about the group's name
      *  and a list of supported items.
      */
     class KIO_EXPORT GroupInfo
@@ -244,7 +244,7 @@ public:
 
     /**
      *  This is the class for one item of a KFileMimeTypeInfo.
-     *  It tqcontains every information about a KFileMetaInfoItem that this
+     *  It contains every information about a KFileMetaInfoItem that this
      *  item has in common for each file of a specific mimetype.
      **/
     class KIO_EXPORT ItemInfo
@@ -606,7 +606,7 @@ public:
      * KFileMetaInfo::applyChanges() , the change will be written to the
      * file. With this method, you can ask if this item is dirty.
      *
-     * @return true if the item tqcontains changes that have not yet been written
+     * @return true if the item contains changes that have not yet been written
      * back into the file. Removing or adding an item counts as such a change
      */
     bool isModified() const;
@@ -651,9 +651,9 @@ public:
     uint attributes() const;
 
     /**
-     * Return true if the item is valid, i.e. if it tqcontains data, false
+     * Return true if the item is valid, i.e. if it contains data, false
      * if it's invalid (created with the default constructor and not been
-     * assigned anything), or if KFileMetaInfoGroup::item() didn't tqfind
+     * assigned anything), or if KFileMetaInfoGroup::item() didn't find
      * your requested item).
      *
      * @return true if valid, false if invalid
@@ -724,9 +724,9 @@ public:
     ~KFileMetaInfoGroup();
 
     /**
-     * Returns true if the item is valid, i.e. if it tqcontains data, false
+     * Returns true if the item is valid, i.e. if it contains data, false
      * if it's invalid (created with the default constructor and not been
-     * assigned anything), or if KFileMetaInfoGroup::item() didn't tqfind
+     * assigned anything), or if KFileMetaInfoGroup::item() didn't find
      * your requested item).
      *
      * @return true if valid, false if invalid
@@ -734,7 +734,7 @@ public:
     bool isValid() const;
 
     /**
-     * Returns false if the object tqcontains data, true if it's empty. An
+     * Returns false if the object contains data, true if it's empty. An
      * empty group is a group with no items (amazing, isn't it?).
      *
      * @return true if empty, false otherwise
@@ -812,7 +812,7 @@ public:
      *
      * @return true if an item for this @p key exists.
      */
-    bool tqcontains( const TQString& key ) const;
+    bool contains( const TQString& key ) const;
 
     /**
      * Returns a list of all keys.
@@ -949,7 +949,7 @@ public:
                                  like comments or id3 tags */
       ExtenedAttr   = 0x10, /**< read filesystem based extended attributes if
                                  they are supported for the filesystem */
-      Thumbnail     = 0x20, /**< only read the file's thumbnail, if it tqcontains
+      Thumbnail     = 0x20, /**< only read the file's thumbnail, if it contains
                                  one */
       Preferred     = 0x40,  ///< get at least the preferred items
       Everything    = 0xffff ///< read everything, even if it might take a while
@@ -1164,7 +1164,7 @@ public:
      * @param key the key to check
      * @return whether an item for this @p key exists.
      */
-    bool tqcontains( const TQString& key ) const;
+    bool contains( const TQString& key ) const;
 
     /**
      * Checks whether a group with the given @p key exists.
@@ -1172,7 +1172,7 @@ public:
      * @param key the key to check
      * @return whether a group with this name exists.
      */
-    bool tqcontainsGroup( const TQString& key ) const;
+    bool containsGroup( const TQString& key ) const;
 
     /**
      * Returns the value with the given @p key.
@@ -1195,7 +1195,7 @@ public:
     bool isValid() const;
 
     /**
-     * Returns false if the object tqcontains data, true if it's empty. You'll
+     * Returns false if the object contains data, true if it's empty. You'll
      * get an empty object if no plugin for the file could be found.
      *
      * @return true if empty, false otherwise
@@ -1242,7 +1242,7 @@ protected:
     Data* d;
 
 private:
-    KFileMetaInfoItem tqfindEditableItem( KFileMetaInfoGroup& group,
+    KFileMetaInfoItem findEditableItem( KFileMetaInfoGroup& group,
                                         const TQString& key );
 
     void init( const KURL& url,
@@ -1391,7 +1391,7 @@ private:
  *  PreferredItems=Items,Size
  *  @endcode
  **/
-class KIO_EXPORT KFilePlugin : public TQObject
+class KIO_EXPORT KFilePlugin : public QObject
 {
     Q_OBJECT
 
@@ -1639,11 +1639,11 @@ private:
  * @internal
  * Synchronous access to metadata of a local file. Usually, you don't want
  * to use this class for getting metainfo from a file. Use KFileMetaInfo
- *  directly. However, if you want to tqfind out if a specific mimetype is
+ *  directly. However, if you want to find out if a specific mimetype is
  *  supported and which groups and items are provided for it, you can ask
  *  the KFileMetainfoProvider for it.
  **/
-class KIO_EXPORT KFileMetaInfoProvider: private TQObject
+class KIO_EXPORT KFileMetaInfoProvider: private QObject
 {
     friend class KFilePlugin;
 
diff --git a/kio/kio/kfileshare.cpp b/kio/kio/kfileshare.cpp
index e93cf37d4..1f6dca285 100644
--- a/kio/kio/kfileshare.cpp
+++ b/kio/kio/kfileshare.cpp
@@ -90,7 +90,7 @@ void KFileShare::readConfig() // static
 {    
     // Create KFileSharePrivate instance
     KFileSharePrivate::self();
-    KSimpleConfig config(TQString::tqfromLatin1(FILESHARECONF),true);
+    KSimpleConfig config(TQString::fromLatin1(FILESHARECONF),true);
     
     s_sharingEnabled = config.readEntry("FILESHARING", "yes") == "yes";
     s_restricted = config.readEntry("RESTRICT", "yes") == "yes";
@@ -105,7 +105,7 @@ void KFileShare::readConfig() // static
     else {
         // check if current user is in fileshare group
         KUserGroup shareGroup(s_fileShareGroup);
-        if (shareGroup.users().tqfindIndex(KUser()) > -1 ) 
+        if (shareGroup.users().findIndex(KUser()) > -1 ) 
             s_authorization = Authorized;
         else
             s_authorization = UserNotAllowed;
@@ -220,10 +220,10 @@ int KFileShare::isDirectoryShared( const TQString& _path )
     TQString path( _path );
     if ( path[path.length()-1] != '/' )
         path += '/';
-    //return s_shareList && s_shareList->tqcontains( path );
-    if( (*s_shareMap).tqcontains(path) && !((*s_shareMap)[path].isEmpty()) ) {
+    //return s_shareList && s_shareList->contains( path );
+    if( (*s_shareMap).contains(path) && !((*s_shareMap)[path].isEmpty()) ) {
         ret+=1;
-        if( (*s_shareMap)[path].tqfind("readwrite") != -1 )
+        if( (*s_shareMap)[path].find("readwrite") != -1 )
             ret+=2;
     }
     
@@ -241,7 +241,7 @@ KFileShare::Authorization KFileShare::authorization()
 TQString KFileShare::findExe( const char* exeName )
 {
    // /usr/sbin on Mandrake, $PATH allows flexibility for other distributions
-   TQString path = TQString::fromLocal8Bit(getenv("PATH")) + TQString::tqfromLatin1(":/usr/sbin");
+   TQString path = TQString::fromLocal8Bit(getenv("PATH")) + TQString::fromLatin1(":/usr/sbin");
    TQString exe = KStandardDirs::findExe( exeName, path );
    if (exe.isEmpty())
        kdError() << exeName << " not found in " << path << endl;
diff --git a/kio/kio/kfileshare.h b/kio/kio/kfileshare.h
index a7158bf71..6fddebd65 100644
--- a/kio/kio/kfileshare.h
+++ b/kio/kio/kfileshare.h
@@ -29,7 +29,7 @@ class KDirWatch;
  * @internal
  * Do not use, ever.
  */
-class KFileSharePrivate : public TQObject
+class KFileSharePrivate : public QObject
 {
   Q_OBJECT
 
diff --git a/kio/kio/kfilterbase.cpp b/kio/kio/kfilterbase.cpp
index 081a58587..50ff5498a 100644
--- a/kio/kio/kfilterbase.cpp
+++ b/kio/kio/kfilterbase.cpp
@@ -39,21 +39,21 @@ void KFilterBase::setDevice( TQIODevice * dev, bool autodelete )
     m_bAutoDel = autodelete;
 }
 
-KFilterBase * KFilterBase::tqfindFilterByFileName( const TQString & fileName )
+KFilterBase * KFilterBase::findFilterByFileName( const TQString & fileName )
 {
-    KMimeType::Ptr mime = KMimeType::tqfindByPath( fileName );
-    kdDebug(7005) << "KFilterBase::tqfindFilterByFileName mime=" << mime->name() << endl;
-    return tqfindFilterByMimeType(mime->name());
+    KMimeType::Ptr mime = KMimeType::findByPath( fileName );
+    kdDebug(7005) << "KFilterBase::findFilterByFileName mime=" << mime->name() << endl;
+    return findFilterByMimeType(mime->name());
 }
 
-KFilterBase * KFilterBase::tqfindFilterByMimeType( const TQString & mimeType )
+KFilterBase * KFilterBase::findFilterByMimeType( const TQString & mimeType )
 {
     KTrader::OfferList offers = KTrader::self()->query( "KDECompressionFilter",
                                                         TQString("'") + mimeType + "' in ServiceTypes" );
     KTrader::OfferList::ConstIterator it = offers.begin();
     KTrader::OfferList::ConstIterator end = offers.end();
 
-    kdDebug(7005) << "KFilterBase::tqfindFilterByMimeType(" << mimeType << ") got " << offers.count() << " offers" << endl;
+    kdDebug(7005) << "KFilterBase::findFilterByMimeType(" << mimeType << ") got " << offers.count() << " offers" << endl;
     for (; it != end; ++it )
     {
         if ((*it)->library().isEmpty()) { continue; }
@@ -65,7 +65,7 @@ KFilterBase * KFilterBase::tqfindFilterByMimeType( const TQString & mimeType )
     }
 
     if ( mimeType == "application/x-bzip2" || mimeType == "application/x-gzip" ) // #88574
-        kdWarning(7005) << "KFilterBase::tqfindFilterByMimeType : no filter found for " << mimeType << endl;
+        kdWarning(7005) << "KFilterBase::findFilterByMimeType : no filter found for " << mimeType << endl;
 
     return 0L;
 }
diff --git a/kio/kio/kfilterbase.h b/kio/kio/kfilterbase.h
index 32b96e2ad..b46706241 100644
--- a/kio/kio/kfilterbase.h
+++ b/kio/kio/kfilterbase.h
@@ -94,7 +94,7 @@ public:
      * @param fileName the name of the file to filter
      * @return the filter for the @p fileName, or 0 if not found
      */
-    static KFilterBase * tqfindFilterByFileName( const TQString & fileName );
+    static KFilterBase * findFilterByFileName( const TQString & fileName );
 
     /**
      * Call this to create the appropriate filter for the mimetype
@@ -102,7 +102,7 @@ public:
      * @param mimeType the mime type of the file to filter
      * @return the filter for the @p mimeType, or 0 if not found
      */
-    static KFilterBase * tqfindFilterByMimeType( const TQString & mimeType );
+    static KFilterBase * findFilterByMimeType( const TQString & mimeType );
 
 protected:
     TQIODevice * m_dev;
diff --git a/kio/kio/kfilterdev.cpp b/kio/kio/kfilterdev.cpp
index 3a177385d..224d68761 100644
--- a/kio/kio/kfilterdev.cpp
+++ b/kio/kio/kfilterdev.cpp
@@ -82,8 +82,8 @@ TQIODevice * KFilterDev::deviceForFile( const TQString & fileName, const TQStrin
                                        bool forceFilter )
 {
     TQFile * f = new TQFile( fileName );
-    KFilterBase * base = mimetype.isEmpty() ? KFilterBase::tqfindFilterByFileName( fileName )
-                         : KFilterBase::tqfindFilterByMimeType( mimetype );
+    KFilterBase * base = mimetype.isEmpty() ? KFilterBase::findFilterByFileName( fileName )
+                         : KFilterBase::findFilterByMimeType( mimetype );
     if ( base )
     {
         base->setDevice(f, true);
@@ -107,7 +107,7 @@ TQIODevice * KFilterDev::device( TQIODevice* inDevice, const TQString & mimetype
 {
    if (inDevice==0)
       return 0;
-   KFilterBase * base = KFilterBase::tqfindFilterByMimeType(mimetype);
+   KFilterBase * base = KFilterBase::findFilterByMimeType(mimetype);
    if ( base )
    {
       base->setDevice(inDevice, autoDeleteInDevice);
@@ -232,7 +232,7 @@ bool KFilterDev::atEnd() const
                                      && d->ungetchBuffer.isEmpty();
 }
 
-TQ_LONG KFilterDev::readBlock( char *data, TQ_ULONG maxlen )
+Q_LONG KFilterDev::readBlock( char *data, Q_ULONG maxlen )
 {
     Q_ASSERT ( filter->mode() == IO_ReadOnly );
     //kdDebug(7005) << "KFilterDev::readBlock maxlen=" << maxlen << endl;
@@ -268,7 +268,7 @@ TQ_LONG KFilterDev::readBlock( char *data, TQ_ULONG maxlen )
         return -1;
 
 
-    TQ_ULONG outBufferSize;
+    Q_ULONG outBufferSize;
     if ( d->bIgnoreData )
     {
         outBufferSize = QMIN( maxlen, 3*BUFFER_SIZE );
@@ -278,7 +278,7 @@ TQ_LONG KFilterDev::readBlock( char *data, TQ_ULONG maxlen )
         outBufferSize = maxlen;
     }
     outBufferSize -= dataReceived;
-    TQ_ULONG availOut = outBufferSize;
+    Q_ULONG availOut = outBufferSize;
     filter->setOutBuffer( data, outBufferSize );
 
     bool decompressedAll = false;
@@ -351,7 +351,7 @@ TQ_LONG KFilterDev::readBlock( char *data, TQ_ULONG maxlen )
     return dataReceived;
 }
 
-TQ_LONG KFilterDev::writeBlock( const char *data /*0 to finish*/, TQ_ULONG len )
+Q_LONG KFilterDev::writeBlock( const char *data /*0 to finish*/, Q_ULONG len )
 {
     Q_ASSERT ( filter->mode() == IO_WriteOnly );
     // If we had an error, return 0.
diff --git a/kio/kio/kfilterdev.h b/kio/kio/kfilterdev.h
index 6ee9314be..d36229859 100644
--- a/kio/kio/kfilterdev.h
+++ b/kio/kio/kfilterdev.h
@@ -87,8 +87,8 @@ public:
 
     virtual bool atEnd() const;
 
-    virtual TQ_LONG readBlock( char *data, TQ_ULONG maxlen );
-    virtual TQ_LONG writeBlock( const char *data, TQ_ULONG len );
+    virtual Q_LONG readBlock( char *data, Q_ULONG maxlen );
+    virtual Q_LONG writeBlock( const char *data, Q_ULONG len );
     //int readLine( char *data, uint maxlen );
 
     virtual int getch();
@@ -119,14 +119,14 @@ public:
      *
      * Warning: application/x-bzip2 may not be available.
      * In that case a TQFile opened on the compressed data will be returned !
-     * Use KFilterBase::tqfindFilterByMimeType and code similar to what
+     * Use KFilterBase::findFilterByMimeType and code similar to what
      * deviceForFile is doing, to better control what's happening.
      *
      * The returned TQIODevice has to be deleted after using.
      *
      * @param fileName the name of the file to filter
      * @param mimetype the mime type of the file to filter, or TQString::null if unknown
-     * @param forceFilter if true, the function will either tqfind a compression filter, or return 0.
+     * @param forceFilter if true, the function will either find a compression filter, or return 0.
      *                    If false, it will always return a TQIODevice. If no
      *                    filter is available it will return a simple TQFile.
      *                    This can be useful if the file is usable without a filter.
diff --git a/kio/kio/kimageio.cpp b/kio/kio/kimageio.cpp
index a26f25596..8d4a45db4 100644
--- a/kio/kio/kimageio.cpp
+++ b/kio/kio/kimageio.cpp
@@ -68,7 +68,7 @@ KImageIOFormat::~KImageIOFormat()
 void
 KImageIOFormat::load( TQDataStream& _str)
 {
-   TQ_INT8 iRead, iWrite;
+   Q_INT8 iRead, iWrite;
    KSycocaEntry::read(_str, mType);
    KSycocaEntry::read(_str, mHeader);
    KSycocaEntry::read(_str, mFlags);
@@ -86,8 +86,8 @@ void
 KImageIOFormat::save( TQDataStream& _str)
 {
    KSycocaEntry::save( _str );
-   TQ_INT8 iRead = bRead ? 1 : 0;
-   TQ_INT8 iWrite = bWrite ? 1 : 0;
+   Q_INT8 iRead = bRead ? 1 : 0;
+   Q_INT8 iWrite = bWrite ? 1 : 0;
 
    _str << mType << mHeader << mFlags << iRead << iWrite
         << mSuffices << mMimetype << mLib << mPattern << rPaths;
@@ -124,7 +124,7 @@ KImageIOFormat::callLibFunc( bool read, TQImageIO *iio)
 
          if (func == NULL) {
             iio->setStatus(1); // error
-            kdWarning() << "couln't tqfind " << funcName << " (" << lt_dlerror() << ")" << endl;
+            kdWarning() << "couln't find " << funcName << " (" << lt_dlerror() << ")" << endl;
          }
          mReadFunc = (void (*)(TQImageIO *))func;
       }
@@ -135,7 +135,7 @@ KImageIOFormat::callLibFunc( bool read, TQImageIO *iio)
 
          if (func == NULL) {
             iio->setStatus(1); // error
-            kdWarning() << "couln't tqfind " << funcName << " (" << lt_dlerror() << ")" << endl;
+            kdWarning() << "couln't find " << funcName << " (" << lt_dlerror() << ")" << endl;
          }
          mWriteFunc = (void (*)(TQImageIO *))func;
       }
@@ -232,7 +232,7 @@ KImageIOFactory::createPattern( KImageIO::Mode _mode)
   patterns.sort();
   patterns.prepend(allPatterns);
 
-  TQString pattern = patterns.join(TQString::tqfromLatin1("\n"));
+  TQString pattern = patterns.join(TQString::fromLatin1("\n"));
   return pattern;
 }
 
@@ -489,7 +489,7 @@ TQString KImageIO::type(const TQString& filename)
 {
   KImageIOFormatList *formatList = KImageIOFactory::self()->formatList;
   TQString suffix = filename;
-  int dot = suffix.tqfindRev('.');
+  int dot = suffix.findRev('.');
   if (dot >= 0)
     suffix = suffix.mid(dot + 1);
 
@@ -500,7 +500,7 @@ TQString KImageIO::type(const TQString& filename)
            ++it )
       {
           KImageIOFormat *format = (*it);
-          if (format->mSuffices.tqcontains(suffix))
+          if (format->mSuffices.contains(suffix))
               return format->mType;
       }
   }
diff --git a/kio/kio/klimitediodevice.h b/kio/kio/klimitediodevice.h
index 6b777129a..035a3cd15 100644
--- a/kio/kio/klimitediodevice.h
+++ b/kio/kio/klimitediodevice.h
@@ -69,12 +69,12 @@ public:
 
     virtual Offset size() const { return m_length; }
 
-    virtual TQ_LONG readBlock ( char * data, TQ_ULONG maxlen )
+    virtual Q_LONG readBlock ( char * data, Q_ULONG maxlen )
     {
         maxlen = QMIN( maxlen, m_length - at() ); // Apply upper limit
         return m_dev->readBlock( data, maxlen );
     }
-    virtual TQ_LONG writeBlock ( const char *, TQ_ULONG ) { return -1; } // unsupported
+    virtual Q_LONG writeBlock ( const char *, Q_ULONG ) { return -1; } // unsupported
     virtual int putch( int ) { return -1; } // unsupported
 
     virtual int getch() {
@@ -94,8 +94,8 @@ public:
     virtual bool atEnd() const { return m_dev->atEnd() || m_dev->at() >= m_start + m_length; }
 private:
     TQIODevice* m_dev;
-    TQ_ULONG m_start;
-    TQ_ULONG m_length;
+    Q_ULONG m_start;
+    Q_ULONG m_length;
 };
 
 #endif
diff --git a/kio/kio/kmimemagic.cpp b/kio/kio/kmimemagic.cpp
index 4aed63808..72b249249 100644
--- a/kio/kio/kmimemagic.cpp
+++ b/kio/kio/kmimemagic.cpp
@@ -141,10 +141,10 @@ struct magic {
 #define LELONG    11
 #define LEDATE    12
 	VALUETYPE value;        /* either number or string */
-	unsigned long tqmask;     /* tqmask before comparison with value */
+	unsigned long mask;     /* mask before comparison with value */
 	char nospflag;          /* suppress space character */
 
-	/* NOTE: this string is suspected of overrunning - tqfind it! */
+	/* NOTE: this string is suspected of overrunning - find it! */
 	char desc[MAXDESC];     /* description */
 };
 
@@ -525,7 +525,7 @@ class KMimeMagicUtimeConf
 public:
     KMimeMagicUtimeConf()
     {
-        tmpDirs << TQString::tqfromLatin1("/tmp"); // default value
+        tmpDirs << TQString::fromLatin1("/tmp"); // default value
 
         // The trick is that we also don't want the user to override globally set
         // directories. So we have to misuse KStandardDirs :}
@@ -565,8 +565,8 @@ public:
 
     bool restoreAccessTime( const TQString & file ) const
     {
-        TQString dir = file.left( file.tqfindRev( '/' ) );
-        bool res = tmpDirs.tqcontains( dir );
+        TQString dir = file.left( file.findRev( '/' ) );
+        bool res = tmpDirs.contains( dir );
         //kdDebug(7018) << "restoreAccessTime " << file << " dir=" << dir << " result=" << res << endl;
         return res;
     }
@@ -909,9 +909,9 @@ int KMimeMagic::parse(char *l, int
 	/* New-style anding: "0 byte&0x80 =0x80 dynamically linked" */
 	if (*l == '&') {
 		++l;
-		m->tqmask = signextend(m, strtol(l, &l, 0));
+		m->mask = signextend(m, strtol(l, &l, 0));
 	} else
-		m->tqmask = (unsigned long) ~0L;
+		m->mask = (unsigned long) ~0L;
 	EATAB;
 
 	switch (*l) {
@@ -1297,7 +1297,7 @@ mcheck(union VALUETYPE *p, struct magic *m)
 #if 0
 	qDebug("Before signextend %08x", v);
 #endif
-	v = signextend(m, v) & m->tqmask;
+	v = signextend(m, v) & m->mask;
 #if 0
 	qDebug("After signextend %08x", v);
 #endif
@@ -1550,7 +1550,7 @@ fsmagic(struct config_rec* conf, const char *fn, KDE_struct_stat *sb)
 }
 
 /*
- * Go through the whole list, stopping if you tqfind a match.  Process all the
+ * Go through the whole list, stopping if you find a match.  Process all the
  * continuations of that match before returning.
  *
  * We support multi-level continuations:
@@ -2214,7 +2214,7 @@ KMimeMagic::setFollowLinks( bool _enable )
 }
 
 KMimeMagicResult *
-KMimeMagic::tqfindBufferType(const TQByteArray &array)
+KMimeMagic::findBufferType(const TQByteArray &array)
 {
 	unsigned char buf[HOWMANY + 1];	/* one extra for terminating '\0' */
 
@@ -2261,7 +2261,7 @@ refineResult(KMimeMagicResult *r, const TQString & _filename)
 		if ( _filename.endsWith(".h")
 		  || _filename.endsWith(".hh")
 		  || _filename.endsWith(".H")
-		  || !_filename.right(4).tqcontains('.'))
+		  || !_filename.right(4).contains('.'))
 			tmp += "hdr";
 		else
 			tmp += "src";
@@ -2270,7 +2270,7 @@ refineResult(KMimeMagicResult *r, const TQString & _filename)
 	else
 	if ( tmp == "application/x-sharedlib" )
 	{
-		if ( _filename.tqfind( ".so" ) == -1 ) 
+		if ( _filename.find( ".so" ) == -1 ) 
 		{
 			tmp = "application/x-executable";
 			r->setMimeType( tmp );
@@ -2279,10 +2279,10 @@ refineResult(KMimeMagicResult *r, const TQString & _filename)
 }
 
 KMimeMagicResult *
-KMimeMagic::tqfindBufferFileType( const TQByteArray &data,
+KMimeMagic::findBufferFileType( const TQByteArray &data,
 				const TQString &fn)
 {
-        KMimeMagicResult * r = tqfindBufferType( data );
+        KMimeMagicResult * r = findBufferType( data );
 	refineResult(r, fn);
         return r;
 }
@@ -2290,10 +2290,10 @@ KMimeMagic::tqfindBufferFileType( const TQByteArray &data,
 /*
  * Find the content-type of the given file.
  */
-KMimeMagicResult* KMimeMagic::tqfindFileType(const TQString & fn)
+KMimeMagicResult* KMimeMagic::findFileType(const TQString & fn)
 {
 #ifdef DEBUG_MIMEMAGIC
-    kdDebug(7018) << "KMimeMagic::tqfindFileType " << fn << endl;
+    kdDebug(7018) << "KMimeMagic::findFileType " << fn << endl;
 #endif
     conf->resultBuf = TQString::null;
 
diff --git a/kio/kio/kmimemagic.h b/kio/kio/kmimemagic.h
index 8a10be2cd..d73dd306a 100644
--- a/kio/kio/kmimemagic.h
+++ b/kio/kio/kmimemagic.h
@@ -36,11 +36,11 @@
 class KMimeMagic; // see below (read this one first)
 
 /**
- * @deprecated Use KMimeType::tqfindByContent() instead
+ * @deprecated Use KMimeType::findByContent() instead
  * May be removed in KDE 4.0.
- * Returned by KMimeMagic @p tqfind...Type methods.
+ * Returned by KMimeMagic @p find...Type methods.
  *
- * It tqcontains the mimetype and the encoding of
+ * It contains the mimetype and the encoding of
  * the file or buffer read.
  */
 class KIO_EXPORT_DEPRECATED KMimeMagicResult
@@ -75,7 +75,7 @@ protected:
 };
 
 /**
- * @deprecated Use KMimeType::tqfindByContent() instead
+ * @deprecated Use KMimeType::findByContent() instead
  * May be removed in KDE 4.0.
  * Determine auto-magically the type of file,
  * not only by using its extension, but also by reading its contents.
@@ -94,7 +94,7 @@ protected:
  * The basic usage of KMimeMagic is :
  * @li Get a pointer to it, using KMimeMagic::self().
  * @li Use it for any file or buffer you want, using one of the three
- * @p tqfind...Type() methods.
+ * @p find...Type() methods.
  *
  * The result is contained in the class KMimeMagicResult.
  */
@@ -142,7 +142,7 @@ public:
   void setFollowLinks( bool _enable );
 
   /**
-   * Try to tqfind a MimeType for the given file.
+   * Try to find a MimeType for the given file.
    *
    * If no special
    * MimeType is found, the default MimeType is returned.
@@ -153,7 +153,7 @@ public:
    *         the returned result object changes its value
    *         since it is reused by KMimeMagic.
    */
-  KMimeMagicResult* tqfindFileType( const TQString & _filename );
+  KMimeMagicResult* findFileType( const TQString & _filename );
 
   /**
    * Same functionality as above, except data is not
@@ -167,10 +167,10 @@ public:
    *         the returned result object changes its value
    *         since it is reused by KMimeMagic.
    */
-  KMimeMagicResult* tqfindBufferType( const TQByteArray &p );
+  KMimeMagicResult* findBufferType( const TQByteArray &p );
 
   /**
-   * Same functionality as tqfindBufferType() but with
+   * Same functionality as findBufferType() but with
    * additional capability of distinguishing between
    * C-headers and C-Source.
    *
@@ -183,7 +183,7 @@ public:
    *         the returned result object changes its value
    *         since it is reused by KMimeMagic.
    */
-  KMimeMagicResult * tqfindBufferFileType( const TQByteArray &, const TQString & filename );
+  KMimeMagicResult * findBufferFileType( const TQByteArray &, const TQString & filename );
 
   /**
    * Returns a pointer to the unique KMimeMagic instance in this process.
diff --git a/kio/kio/kmimetype.cpp b/kio/kio/kmimetype.cpp
index 1e74f90de..a698e7495 100644
--- a/kio/kio/kmimetype.cpp
+++ b/kio/kio/kmimetype.cpp
@@ -68,9 +68,9 @@ bool KMimeType::s_bChecked = false;
 void KMimeType::buildDefaultType()
 {
   assert ( !s_pDefaultType );
-  // Try to tqfind the default type
+  // Try to find the default type
   KServiceType * mime = KServiceTypeFactory::self()->
-        tqfindServiceTypeByName( defaultMimeType() );
+        findServiceTypeByName( defaultMimeType() );
 
   if (mime && mime->isType( KST_KMimeType ))
   {
@@ -133,18 +133,18 @@ void KMimeType::checkEssentialMimeTypes()
 
 void KMimeType::errorMissingMimeType( const TQString& _type )
 {
-  TQString tmp = i18n( "Could not tqfind mime type\n%1" ).arg( _type );
+  TQString tmp = i18n( "Could not find mime type\n%1" ).arg( _type );
 
   KMessageBoxWrapper::sorry( 0, tmp );
 }
 
 KMimeType::Ptr KMimeType::mimeType( const TQString& _name )
 {
-  KServiceType * mime = KServiceTypeFactory::self()->tqfindServiceTypeByName( _name );
+  KServiceType * mime = KServiceTypeFactory::self()->findServiceTypeByName( _name );
 
   if ( !mime || !mime->isType( KST_KMimeType ) )
   {
-    // When building ksycoca, tqfindServiceTypeByName doesn't create an object
+    // When building ksycoca, findServiceTypeByName doesn't create an object
     // but returns one from a dict.
     if ( !KSycoca::self()->isBuilding() )
         delete mime;
@@ -207,8 +207,8 @@ KMimeType::Ptr KMimeType::findByURL( const KURL& _url, mode_t _mode,
   static const TQString& slash = KGlobal::staticQString("/");
   if ( ! fileName.isNull() && !path.endsWith( slash ) )
   {
-      // Try to tqfind it out by looking at the filename
-      KMimeType::Ptr mime = KServiceTypeFactory::self()->tqfindFromPattern( fileName );
+      // Try to find it out by looking at the filename
+      KMimeType::Ptr mime = KServiceTypeFactory::self()->findFromPattern( fileName );
       if ( mime )
       {
         // Found something - can we trust it ? (e.g. don't trust *.pl over HTTP, could be anything)
@@ -219,7 +219,7 @@ KMimeType::Ptr KMimeType::findByURL( const KURL& _url, mode_t _mode,
                 if ( mime->patternsAccuracy()<100 )
                 {
                     KMimeMagicResult* result =
-                            KMimeMagic::self()->tqfindFileType( path );
+                            KMimeMagic::self()->findFileType( path );
 
                     if ( result && result->isValid() && result->accuracy() > 0 )
                         return mimeType( result->mimeType() );
@@ -265,7 +265,7 @@ KMimeType::Ptr KMimeType::findByURL( const KURL& _url, mode_t _mode,
       {
           // Assume inode/directory, if the protocol supports listing.
           if ( KProtocolInfo::supportsListing( _url ) )
-              return mimeType( TQString::tqfromLatin1("inode/directory") );
+              return mimeType( TQString::fromLatin1("inode/directory") );
           else
               return defaultMimeTypePtr(); // == 'no idea', e.g. for "data:,foo/"
       }
@@ -276,10 +276,10 @@ KMimeType::Ptr KMimeType::findByURL( const KURL& _url, mode_t _mode,
   }
 
   // Do some magic for local files
-  //kdDebug(7009) << TQString("Mime Type tqfinding for '%1'").arg(path) << endl;
-  KMimeMagicResult* result = KMimeMagic::self()->tqfindFileType( path );
+  //kdDebug(7009) << TQString("Mime Type finding for '%1'").arg(path) << endl;
+  KMimeMagicResult* result = KMimeMagic::self()->findFileType( path );
 
-  // If we still did not tqfind it, we must assume the default mime type
+  // If we still did not find it, we must assume the default mime type
   if ( !result || !result->isValid() )
     return defaultMimeTypePtr();
 
@@ -298,27 +298,27 @@ KMimeType::Ptr KMimeType::findByURL( const KURL& _url, mode_t _mode,
 
 KMimeType::Ptr KMimeType::diagnoseFileName(const TQString &fileName, TQString &pattern)
 {
-  return KServiceTypeFactory::self()->tqfindFromPattern( fileName, &pattern );
+  return KServiceTypeFactory::self()->findFromPattern( fileName, &pattern );
 }
 
-KMimeType::Ptr KMimeType::tqfindByPath( const TQString& path, mode_t mode, bool fast_mode )
+KMimeType::Ptr KMimeType::findByPath( const TQString& path, mode_t mode, bool fast_mode )
 {
     KURL u;
     u.setPath(path);
     return findByURL( u, mode, true, fast_mode );
 }
 
-KMimeType::Ptr KMimeType::tqfindByContent( const TQByteArray &data, int *accuracy )
+KMimeType::Ptr KMimeType::findByContent( const TQByteArray &data, int *accuracy )
 {
-  KMimeMagicResult *result = KMimeMagic::self()->tqfindBufferType(data);
+  KMimeMagicResult *result = KMimeMagic::self()->findBufferType(data);
   if (accuracy)
       *accuracy = result->accuracy();
   return mimeType( result->mimeType() );
 }
 
-KMimeType::Ptr KMimeType::tqfindByFileContent( const TQString &fileName, int *accuracy )
+KMimeType::Ptr KMimeType::findByFileContent( const TQString &fileName, int *accuracy )
 {
-  KMimeMagicResult *result = KMimeMagic::self()->tqfindFileType(fileName);
+  KMimeMagicResult *result = KMimeMagic::self()->findFileType(fileName);
   if (accuracy)
       *accuracy = result->accuracy();
   return mimeType( result->mimeType() );
@@ -327,11 +327,11 @@ KMimeType::Ptr KMimeType::tqfindByFileContent( const TQString &fileName, int *ac
 #define GZIP_MAGIC1	0x1f
 #define GZIP_MAGIC2	0x8b
 
-KMimeType::Format KMimeType::tqfindFormatByFileContent( const TQString &fileName )
+KMimeType::Format KMimeType::findFormatByFileContent( const TQString &fileName )
 {
   KMimeType::Format result;
   result.compression = Format::NoCompression;
-  KMimeType::Ptr mime = tqfindByPath(fileName);
+  KMimeType::Ptr mime = findByPath(fileName);
 
   result.text = mime->name().startsWith("text/");
   TQVariant v = mime->property("X-KDE-text");
@@ -382,15 +382,15 @@ void KMimeType::init( KDesktopFile * config )
   m_lstPatterns = config->readListEntry( "Patterns", ';' );
 
   // Read the X-KDE-AutoEmbed setting and store it in the properties map
-  TQString XKDEAutoEmbed = TQString::tqfromLatin1("X-KDE-AutoEmbed");
+  TQString XKDEAutoEmbed = TQString::fromLatin1("X-KDE-AutoEmbed");
   if ( config->hasKey( XKDEAutoEmbed ) )
     m_mapProps.insert( XKDEAutoEmbed, TQVariant( config->readBoolEntry( XKDEAutoEmbed ), 0 ) );
 
-  TQString XKDEText = TQString::tqfromLatin1("X-KDE-text");
+  TQString XKDEText = TQString::fromLatin1("X-KDE-text");
   if ( config->hasKey( XKDEText ) )
     m_mapProps.insert( XKDEText, config->readBoolEntry( XKDEText ) );
 
-  TQString XKDEIsAlso = TQString::tqfromLatin1("X-KDE-IsAlso");
+  TQString XKDEIsAlso = TQString::fromLatin1("X-KDE-IsAlso");
   if ( config->hasKey( XKDEIsAlso ) ) {
     TQString inherits = config->readEntry( XKDEIsAlso );
     if ( inherits != name() )
@@ -399,7 +399,7 @@ void KMimeType::init( KDesktopFile * config )
         kdWarning(7009) << "Error: " << inherits << " inherits from itself!!!!" << endl;
   }
 
-  TQString XKDEPatternsAccuracy = TQString::tqfromLatin1("X-KDE-PatternsAccuracy");
+  TQString XKDEPatternsAccuracy = TQString::fromLatin1("X-KDE-PatternsAccuracy");
   if ( config->hasKey( XKDEPatternsAccuracy ) )
     m_mapProps.insert( XKDEPatternsAccuracy, config->readEntry( XKDEPatternsAccuracy ) );
 
@@ -508,7 +508,7 @@ TQString KMimeType::iconForURL( const KURL & _url, mode_t _mode )
     const TQString mimeTypeIcon = mt->icon( _url, _url.isLocalFile() );
     TQString i = mimeTypeIcon;
 
-    // if we don't tqfind an icon, maybe we can use the one for the protocol
+    // if we don't find an icon, maybe we can use the one for the protocol
     if ( i == unknown || i.isEmpty() || mt == defaultMimeTypePtr()
         // and for the root of the protocol (e.g. trash:/) the protocol icon has priority over the mimetype icon
         || _url.path().length() <= 1 )
@@ -632,9 +632,9 @@ TQString KFolderType::icon( const KURL& _url, bool _is_local ) const
           entries.append( ep->d_name );
           if ( readdir( dp ) == 0 ) { // only three
             // check if we got "." ".." and ".directory"
-            isempty = entries.tqfind( "." ) != entries.end() &&
-                      entries.tqfind( ".." ) != entries.end() &&
-                      entries.tqfind( ".directory" ) != entries.end();
+            isempty = entries.find( "." ) != entries.end() &&
+                      entries.find( ".." ) != entries.end() &&
+                      entries.find( ".directory" ) != entries.end();
           }
         }
         if (!isempty && !strcmp(ep->d_name, ".directory"))
@@ -728,10 +728,10 @@ TQString KDEDesktopMimeType::icon( const KURL& _url, bool _is_local ) const
           const TQString u = cfg.readPathEntry( "URL" );
           const KURL url( u );
           if ( url.protocol() == "trash" ) {
-              // We need to tqfind if the trash is empty, preferrably without using a KIO job.
+              // We need to find if the trash is empty, preferrably without using a KIO job.
               // So instead kio_trash leaves an entry in its config file for us.
               KSimpleConfig trashConfig( "trashrc", true );
-              trashConfig.setGroup( "tqStatus" );
+              trashConfig.setGroup( "Status" );
               if ( trashConfig.readBoolEntry( "Empty", true ) ) {
                   return emptyIcon;
               }
@@ -838,7 +838,7 @@ pid_t KDEDesktopMimeType::runFSDevice( const KURL& _url, const KSimpleConfig &cf
     KURL mpURL;
     mpURL.setPath( mp );
     // Open a new window
-    retval = KRun::runURL( mpURL, TQString::tqfromLatin1("inode/directory") );
+    retval = KRun::runURL( mpURL, TQString::fromLatin1("inode/directory") );
   }
   else
   {
@@ -1005,7 +1005,7 @@ TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::userDefinedServices
     TQCString object =    dcopcall.section(' ', 1,-2).utf8();
     TQString function =  dcopcall.section(' ', -1);
     if(!function.endsWith("(KURL::List)")) {
-      kdWarning() << "Desktop file " << path << " tqcontains an invalid X-KDE-ShowIfDcopCall - the function must take the exact parameter (KURL::List) and must be specified." << endl;
+      kdWarning() << "Desktop file " << path << " contains an invalid X-KDE-ShowIfDcopCall - the function must take the exact parameter (KURL::List) and must be specified." << endl;
     } else {
       if(kapp->dcopClient()->call( app, object,
                    function.utf8(),
@@ -1051,7 +1051,7 @@ TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::userDefinedServices
       else
       {
         TQString exec = cfg.readPathEntry( "Exec" );
-        if ( bLocalFiles || exec.tqcontains("%U") || exec.tqcontains("%u") )
+        if ( bLocalFiles || exec.contains("%U") || exec.contains("%u") )
         {
           Service s;
           s.m_strName = cfg.readEntry( "Name" );
diff --git a/kio/kio/kmimetype.h b/kio/kio/kmimetype.h
index 131724d63..22f9b72ef 100644
--- a/kio/kio/kmimetype.h
+++ b/kio/kio/kmimetype.h
@@ -39,7 +39,7 @@ class KSimpleConfig;
  *
  * The starting point you need is often the static methods.
  *
- * KMimeType inherits KServiceType because "text/plain" can be used to tqfind
+ * KMimeType inherits KServiceType because "text/plain" can be used to find
  * services (apps and components) "which can open text/plain".
  *
  * @see KServiceType
@@ -113,7 +113,7 @@ public:
    * Use this function only if you don't have a special URL
    * for which you search a pixmap.
    *
-   * This function is useful to tqfind
+   * This function is useful to find
    * out, which icon is usually chosen for a certain mime type. Since
    * no URL is passed, it is impossible to obey icon hints in desktop
    * entries for example.
@@ -149,7 +149,7 @@ public:
 	    int _state = 0, TQString * _path = 0L ) const;
 
   /**
-   * Convenience method to tqfind the pixmap for a URL.
+   * Convenience method to find the pixmap for a URL.
    *
    * Call this one when you don't know the mimetype.
    *
@@ -282,7 +282,7 @@ public:
    * "application/octet-stream" is returned otherwise.
    *
    * @param _url Is the right most URL with a filesystem protocol. It
-   *        is up to you to tqfind out about that if you have a nested
+   *        is up to you to find out about that if you have a nested
    *        URL.  For example
    *        "http://localhost/mist.gz#gzip:/decompress" would have to
    *        pass the "http://..." URL part, while
@@ -293,7 +293,7 @@ public:
    *              executables)
    * @param _is_local_file true if the file is local
    * @param _fast_mode If set to true no disk access is allowed to
-   *        tqfind out the mimetype. The result may be suboptimal, but
+   *        find out the mimetype. The result may be suboptimal, but
    *        it is @em fast.
    * @return A pointer to the matching mimetype. 0L is never returned.
    * @em Very @em Important: Don't store the result in a KMimeType* !
@@ -326,14 +326,14 @@ public:
    * @param mode the mode of the file (used, for example, to identify
    *              executables)
    * @param fast_mode If set to true no disk access is allowed to
-   *        tqfind out the mimetype. The result may be suboptimal, but
+   *        find out the mimetype. The result may be suboptimal, but
    *        it is @em fast.
    * @return A pointer to the matching mimetype. 0L is never returned.
    */
-  static Ptr tqfindByPath( const TQString& path, mode_t mode = 0, bool fast_mode = false );
+  static Ptr findByPath( const TQString& path, mode_t mode = 0, bool fast_mode = false );
 
   /**
-   * Tries to tqfind out the MIME type of a data chunk by looking for
+   * Tries to find out the MIME type of a data chunk by looking for
    * certain magic numbers and characteristic strings in it.
    *
    * @param data the data to examine
@@ -342,10 +342,10 @@ public:
    * @return a pointer to the KMimeType. application/octet-stream's KMimeType of the
    *         type can not be found this way.
    */
-  static Ptr tqfindByContent( const TQByteArray &data, int *accuracy=0 );
+  static Ptr findByContent( const TQByteArray &data, int *accuracy=0 );
 
   /**
-   * Tries to tqfind out the MIME type of a file by looking for
+   * Tries to find out the MIME type of a file by looking for
    * certain magic numbers and characteristic strings in it.
    * This function is similar to the previous one. Note that the
    * file name is not used for determining the file type, it is just
@@ -357,7 +357,7 @@ public:
    * @return a pointer to the KMimeType. application/octet-stream's KMimeType of the
    *         type can not be found this way.
    */
-  static Ptr tqfindByFileContent( const TQString &fileName, int *accuracy=0 );
+  static Ptr findByFileContent( const TQString &fileName, int *accuracy=0 );
 
   struct Format{
      bool text : 1;
@@ -370,7 +370,7 @@ public:
    * or that would be human readable after decompression.
    * @since 3.2
    */
-  static Format tqfindFormatByFileContent( const TQString &fileName );
+  static Format findFormatByFileContent( const TQString &fileName );
 
   /**
    * Get all the mimetypes.
diff --git a/kio/kio/kmimetypechooser.cpp b/kio/kio/kmimetypechooser.cpp
index 763e2bfc5..d8ceb930b 100644
--- a/kio/kio/kmimetypechooser.cpp
+++ b/kio/kio/kmimetypechooser.cpp
@@ -90,7 +90,7 @@ KMimeTypeChooser::KMimeTypeChooser( const TQString &text,
   if (visuals & KMimeTypeChooser::EditButton)
   {
     TQHBox *btns = new TQHBox( this );
-    ((TQBoxLayout*)btns->tqlayout())->addStretch(1);
+    ((TQBoxLayout*)btns->layout())->addStretch(1);
     d->btnEditMimeType = new TQPushButton( i18n("&Edit..."), btns );
 
     connect( d->btnEditMimeType, TQT_SIGNAL(clicked()), this, TQT_SLOT(editMimeType()) );
@@ -134,15 +134,15 @@ void KMimeTypeChooser::loadMimeTypes( const TQStringList &_selectedMimeTypes )
   for (; it != mimetypes.end(); ++it)
   {
     TQString mimetype = (*it)->name();
-    int index = mimetype.tqfind("/");
+    int index = mimetype.find("/");
     TQString maj = mimetype.left(index);
 
-    if ( d->groups.count() && !d->groups.tqcontains( maj ) )
+    if ( d->groups.count() && !d->groups.contains( maj ) )
       continue;
 
     TQString min = mimetype.right(mimetype.length() - (index+1));
 
-    TQMapIterator<TQString,TQListViewItem*> mit = groups.tqfind( maj );
+    TQMapIterator<TQString,TQListViewItem*> mit = groups.find( maj );
     if ( mit == groups.end() )
     {
       groupItem = new TQListViewItem( d->lvMimeTypes, maj );
@@ -167,7 +167,7 @@ void KMimeTypeChooser::loadMimeTypes( const TQStringList &_selectedMimeTypes )
     if ( d->visuals & Patterns )
       item->setText( cl, (*it)->patterns().join("; ") );
 
-    if ( selMimeTypes.tqcontains(mimetype) )
+    if ( selMimeTypes.contains(mimetype) )
     {
       item->setOn( true );
       groupItem->setOpen( true );
@@ -195,9 +195,9 @@ void KMimeTypeChooser::editMimeType()
   // thanks to libkonq/konq_operations.cc
   connect( KSycoca::self(), TQT_SIGNAL(databaseChanged()),
            this, TQT_SLOT(slotSycocaDatabaseChanged()) );
-  TQString keditfiletype = TQString::tqfromLatin1("keditfiletype");
+  TQString keditfiletype = TQString::fromLatin1("keditfiletype");
   KRun::runCommand( keditfiletype
-                    + " --parent " + TQString::number( (ulong)tqtopLevelWidget()->winId())
+                    + " --parent " + TQString::number( (ulong)topLevelWidget()->winId())
                     + " " + KProcess::quote(mt),
                     keditfiletype, keditfiletype /*unused*/);
 }
@@ -294,5 +294,5 @@ KMimeTypeChooserDialog::~KMimeTypeChooserDialog()
 
 //END KMimeTypeChooserDialog
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
 #include "kmimetypechooser.moc"
diff --git a/kio/kio/kmimetypechooser.h b/kio/kio/kmimetypechooser.h
index 45d35446f..0827d5b30 100644
--- a/kio/kio/kmimetypechooser.h
+++ b/kio/kio/kmimetypechooser.h
@@ -177,4 +177,4 @@ class KIO_EXPORT KMimeTypeChooserDialog : public KDialogBase
     KMimeTypeChooser *m_chooser;
 };
 #endif // _KMIMETYPE_CHOOSER_H_
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kio/kio/kmimetyperesolver.h b/kio/kio/kmimetyperesolver.h
index ea332dc32..4ac6347f2 100644
--- a/kio/kio/kmimetyperesolver.h
+++ b/kio/kio/kmimetyperesolver.h
@@ -42,11 +42,11 @@ protected:
 
 /**
  * @internal
- * This class is used by KMimeTypeResolver, because it can't be a TQObject
+ * This class is used by KMimeTypeResolver, because it can't be a QObject
  * itself. So an object of this class is used to handle signals, slots etc.
  * and forwards them to the KMimeTypeResolver instance.
  */
-class KIO_EXPORT KMimeTypeResolverHelper : public TQObject
+class KIO_EXPORT KMimeTypeResolverHelper : public QObject
 {
     Q_OBJECT
 
@@ -168,7 +168,7 @@ private:
      * (no more visible icon to process).
      * @return the file item that was just processed.
      */
-    IconItem * tqfindVisibleIcon();
+    IconItem * findVisibleIcon();
 
     Parent * m_parent;
     KMimeTypeResolverHelper *m_helper;
@@ -186,10 +186,10 @@ inline void KMimeTypeResolver<IconItem, Parent>::slotProcessMimeIcons()
 
     if ( m_lstPendingMimeIconItems.count() > 0 )
     {
-        // We only tqfind mimetypes for icons that are visible. When more
+        // We only find mimetypes for icons that are visible. When more
         // of our viewport is exposed, we'll get a signal and then get
         // the mimetypes for the newly visible icons. (Rikkus)
-        item = tqfindVisibleIcon();
+        item = findVisibleIcon();
     }
 
     // No more visible items.
@@ -217,7 +217,7 @@ template<class IconItem, class Parent>
 inline void KMimeTypeResolver<IconItem, Parent>::slotViewportAdjusted()
 {
     if (m_lstPendingMimeIconItems.isEmpty()) return;
-    IconItem * item = tqfindVisibleIcon();
+    IconItem * item = findVisibleIcon();
     if (item)
     {
         m_parent->determineIcon( item );
@@ -227,7 +227,7 @@ inline void KMimeTypeResolver<IconItem, Parent>::slotViewportAdjusted()
 }
 
 template<class IconItem, class Parent>
-inline IconItem * KMimeTypeResolver<IconItem, Parent>::tqfindVisibleIcon()
+inline IconItem * KMimeTypeResolver<IconItem, Parent>::findVisibleIcon()
 {
     // Find an icon that's visible and whose mimetype we don't know.
 
diff --git a/kio/kio/knfsshare.cpp b/kio/kio/knfsshare.cpp
index 861176c94..f0fdfce6d 100644
--- a/kio/kio/knfsshare.cpp
+++ b/kio/kio/knfsshare.cpp
@@ -33,7 +33,7 @@ public:
   KNFSSharePrivate();
   
   bool readExportsFile();
-  bool tqfindExportsFile();
+  bool findExportsFile();
   
   TQDict<bool> sharedPaths;
   TQString exportsFile;
@@ -41,17 +41,17 @@ public:
 
 KNFSSharePrivate::KNFSSharePrivate() 
 {
-  if (tqfindExportsFile())
+  if (findExportsFile())
       readExportsFile();
 }  
 
 /**
- * Try to tqfind the nfs config file path
+ * Try to find the nfs config file path
  * First tries the kconfig, then checks
  * several well-known paths
  * @return wether an 'exports' file was found.
  **/
-bool KNFSSharePrivate::tqfindExportsFile() {
+bool KNFSSharePrivate::findExportsFile() {
   KConfig config("knfsshare");
   config.setGroup("General");
   exportsFile = config.readPathEntry("exportsFile");
@@ -123,7 +123,7 @@ bool KNFSSharePrivate::readExportsFile() {
     
     // Handle quotation marks
     if ( completeLine[0] == '"' ) {
-      int i = completeLine.tqfind('"',1);
+      int i = completeLine.find('"',1);
       if (i == -1) {
         kdError() << "KNFSShare: Parse error: Missing quotation mark: " << completeLine << endl;   
         continue;
@@ -131,9 +131,9 @@ bool KNFSSharePrivate::readExportsFile() {
       path = completeLine.mid(1,i-1);
       
     } else { // no quotation marks
-      int i = completeLine.tqfind(' ');
+      int i = completeLine.find(' ');
       if (i == -1)
-          i = completeLine.tqfind('\t');
+          i = completeLine.find('\t');
           
       if (i == -1) 
         path = completeLine;
@@ -180,7 +180,7 @@ bool KNFSShare::isDirectoryShared( const TQString & path ) const {
   if ( path[path.length()-1] != '/' )
        fixedPath += '/';
   
-  return d->sharedPaths.tqfind(fixedPath) != 0;
+  return d->sharedPaths.find(fixedPath) != 0;
 }
 
 TQStringList KNFSShare::sharedDirectories() const {
diff --git a/kio/kio/kprotocolinfo.cpp b/kio/kio/kprotocolinfo.cpp
index 416a365f2..01e3e6c18 100644
--- a/kio/kio/kprotocolinfo.cpp
+++ b/kio/kio/kprotocolinfo.cpp
@@ -27,7 +27,7 @@
 #include "kprotocolmanager.h"
 
 // Most of this class is implemented in kdecore/kprotocolinfo_kdecore.cpp
-// This file only tqcontains a few static class-functions that depend on
+// This file only contains a few static class-functions that depend on
 // KProtocolManager
 
 KProtocolInfo* KProtocolInfo::findProtocol(const KURL &url)
diff --git a/kio/kio/kprotocolinfo.h b/kio/kio/kprotocolinfo.h
index f297028a0..dba4694db 100644
--- a/kio/kio/kprotocolinfo.h
+++ b/kio/kio/kprotocolinfo.h
@@ -31,7 +31,7 @@
  * Information about I/O (Internet, etc.) protocols supported by KDE.
 
  * This class is useful if you want to know which protocols
- * KDE supports. In addition you can tqfind out lots of information
+ * KDE supports. In addition you can find out lots of information
  * about a certain protocol. A KProtocolInfo instance represents a
  * single protocol. Most of the functionality is provided by the static
  * methods that scan the *.protocol files of all installed kioslaves to get
@@ -545,7 +545,7 @@ public:
    * The following parsing modes are defined:
    * @li "url" for a standards compliant URL
    * @li "rawuri" for a non-conformant URI for which URL parsing would be meaningless
-   * @li "mailto" for a mailto style URI (the path part tqcontains only an email address)
+   * @li "mailto" for a mailto style URI (the path part contains only an email address)
    *
    * @param protocol the protocol to check
    * @return the suggested parsing mode, or KURL::Auto if unspecified
diff --git a/kio/kio/kprotocolmanager.cpp b/kio/kio/kprotocolmanager.cpp
index 3b4206ddd..8fb8b3227 100644
--- a/kio/kio/kprotocolmanager.cpp
+++ b/kio/kio/kprotocolmanager.cpp
@@ -277,7 +277,7 @@ TQString KProtocolManager::proxyForURL( const KURL &url )
           break;
   }
 
-  return (proxy.isEmpty() ? TQString::tqfromLatin1("DIRECT") : proxy);
+  return (proxy.isEmpty() ? TQString::fromLatin1("DIRECT") : proxy);
 }
 
 void KProtocolManager::badProxy( const TQString &proxy )
@@ -305,7 +305,7 @@ static bool revmatch(const char *host, const char *nplist)
     {
       hptr = shptr;
 
-      // Try to tqfind another domain or host in the list
+      // Try to find another domain or host in the list
       while(--nptr>=nplist && *nptr!=',' && *nptr!=' ') ;
 
       // Strip out multiple spaces and commas
@@ -453,31 +453,31 @@ TQString KProtocolManager::defaultUserAgent( const TQString &_modifiers )
   struct utsname nam;
   if( uname(&nam) >= 0 )
   {
-    if( modifiers.tqcontains('o') )
+    if( modifiers.contains('o') )
     {
       supp += TQString("; %1").arg(nam.sysname);
-      if ( modifiers.tqcontains('v') )
+      if ( modifiers.contains('v') )
         supp += TQString(" %1").arg(nam.release);
     }
-    if( modifiers.tqcontains('p') )
+    if( modifiers.contains('p') )
     {
       // TODO: determine this value instead of hardcoding it...
-      supp += TQString::tqfromLatin1("; X11");
+      supp += TQString::fromLatin1("; X11");
     }
-    if( modifiers.tqcontains('m') )
+    if( modifiers.contains('m') )
     {
       supp += TQString("; %1").arg(nam.machine);
     }
-    if( modifiers.tqcontains('l') )
+    if( modifiers.contains('l') )
     {
       TQStringList languageList = KGlobal::locale()->languageList();
-      TQStringList::Iterator it = languageList.tqfind( TQString::tqfromLatin1("C") );
+      TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") );
       if( it != languageList.end() )
       {
-        if( languageList.tqcontains( TQString::tqfromLatin1("en") ) > 0 )
+        if( languageList.contains( TQString::fromLatin1("en") ) > 0 )
           languageList.remove( it );
         else
-          (*it) = TQString::tqfromLatin1("en");
+          (*it) = TQString::fromLatin1("en");
       }
       if( languageList.count() )
         supp += TQString("; %1").arg(languageList.join(", "));
diff --git a/kio/kio/kprotocolmanager.h b/kio/kio/kprotocolmanager.h
index d4463eddd..ec59342af 100644
--- a/kio/kio/kprotocolmanager.h
+++ b/kio/kio/kprotocolmanager.h
@@ -302,8 +302,8 @@ public:
   static int maxCacheSize(); // Maximum cache size in Kb.
 
   /**
-   * The directory which tqcontains the cache files.
-   * @return the directory that tqcontains the cache files
+   * The directory which contains the cache files.
+   * @return the directory that contains the cache files
    */
   static TQString cacheDir();
 
@@ -371,7 +371,7 @@ public:
    * It's usually the same, except that FTP, when handled by a proxy,
    * needs an HTTP ioslave.
    *
-   * When a proxy is to be used, proxy tqcontains the URL for the proxy.
+   * When a proxy is to be used, proxy contains the URL for the proxy.
    * @param url the url to check
    * @param proxy the URL of the proxy to use
    * @return the slave protocol (e.g. 'http'), can be null if unknown
diff --git a/kio/kio/kremoteencoding.cpp b/kio/kio/kremoteencoding.cpp
index 23fd0563d..632eeb8b2 100644
--- a/kio/kio/kremoteencoding.cpp
+++ b/kio/kio/kremoteencoding.cpp
@@ -37,13 +37,13 @@ TQString KRemoteEncoding::decode(const TQCString& name) const
 {
 #ifdef CHECK_UTF8
   if (codec->mibEnum() == 106 && !KStringHandler::isUtf8(name))
-    return TQString::tqfromLatin1(name);
+    return TQString::fromLatin1(name);
 #endif
 
   TQString result = codec->toUnicode(name);
   if (codec->fromUnicode(result) != name)
     // fallback in case of decoding failure
-    return TQString::tqfromLatin1(name);
+    return TQString::fromLatin1(name);
 
   return result;
 }
diff --git a/kio/kio/krun.cpp b/kio/kio/krun.cpp
index a48c8c449..9e51a2938 100644
--- a/kio/kio/krun.cpp
+++ b/kio/kio/krun.cpp
@@ -237,7 +237,7 @@ void KRun::shellQuote( TQString &_str )
     if (_str.isEmpty()) // Don't create an explicit empty parameter
         return;
     TQChar q('\'');
-    _str.tqreplace(q, "'\\''").prepend(q).append(q);
+    _str.replace(q, "'\\''").prepend(q).append(q);
 }
 
 
@@ -260,16 +260,16 @@ KRunMX1::expandEscapedMacro( const TQString &str, uint pos, TQStringList &ret )
    uint option = str[pos + 1];
    switch( option ) {
    case 'c':
-      ret << service.name().tqreplace( '%', "%%" );
+      ret << service.name().replace( '%', "%%" );
       break;
    case 'k':
-      ret << service.desktopEntryPath().tqreplace( '%', "%%" );
+      ret << service.desktopEntryPath().replace( '%', "%%" );
       break;
    case 'i':
-      ret << "-icon" << service.icon().tqreplace( '%', "%%" );
+      ret << "-icon" << service.icon().replace( '%', "%%" );
       break;
    case 'm':
-      ret << "-miniicon" << service.icon().tqreplace( '%', "%%" );
+      ret << "-miniicon" << service.icon().replace( '%', "%%" );
       break;
    case 'u':
    case 'U':
@@ -388,13 +388,13 @@ TQStringList KRun::processDesktopExec(const KService &_service, const KURL::List
   if (!re.search( exec )) {
     exec = re.cap( 1 ).stripWhiteSpace();
     for (uint pos = 0; pos < exec.length(); ) {
-      TQChar c = exec.tqunicode()[pos];
+      TQChar c = exec.unicode()[pos];
       if (c != '\'' && c != '"')
         goto synerr; // what else can we do? after normal parsing the substs would be insecure
-      int pos2 = exec.tqfind( c, pos + 1 ) - 1;
+      int pos2 = exec.find( c, pos + 1 ) - 1;
       if (pos2 < 0)
         goto synerr; // quoting error
-      memcpy( (void *)(exec.tqunicode() + pos), exec.tqunicode() + pos + 1, (pos2 - pos) * sizeof(TQChar));
+      memcpy( (void *)(exec.unicode() + pos), exec.unicode() + pos + 1, (pos2 - pos) * sizeof(TQChar));
       pos = pos2;
       exec.remove( pos, 2 );
     }
@@ -543,9 +543,9 @@ TQString KRun::binaryName( const TQString & execLine, bool removePath )
   // Remove parameters and/or trailing spaces.
   TQStringList args = KShell::splitArgs( execLine );
   for (TQStringList::ConstIterator it = args.begin(); it != args.end(); ++it)
-    if (!(*it).tqcontains('='))
+    if (!(*it).contains('='))
       // Remove path if wanted
-      return removePath ? (*it).mid((*it).tqfindRev('/') + 1) : *it;
+      return removePath ? (*it).mid((*it).findRev('/') + 1) : *it;
   return TQString::null;
 }
 
@@ -708,7 +708,7 @@ static KURL::List resolveURLs( const KURL::List& _urls, const KService& _service
     {
       // compat mode: assume KIO if not set and it's a KDE app
       TQStringList categories = _service.property("Categories").toStringList();
-      if ( categories.tqfind("KDE") != categories.end() )
+      if ( categories.find("KDE") != categories.end() )
          supportedProtocols.append( "KIO" );
       else { // if no KDE app, be a bit over-generic
          supportedProtocols.append( "http");
@@ -719,10 +719,10 @@ static KURL::List resolveURLs( const KURL::List& _urls, const KService& _service
   kdDebug(7010) << "supportedProtocols:" << supportedProtocols << endl;
 
   KURL::List urls( _urls );
-  if ( supportedProtocols.tqfind( "KIO" ) == supportedProtocols.end() ) {
+  if ( supportedProtocols.find( "KIO" ) == supportedProtocols.end() ) {
     for( KURL::List::Iterator it = urls.begin(); it != urls.end(); ++it ) {
       const KURL url = *it;
-      bool supported = url.isLocalFile() || supportedProtocols.tqfind( url.protocol().lower() ) != supportedProtocols.end();
+      bool supported = url.isLocalFile() || supportedProtocols.find( url.protocol().lower() ) != supportedProtocols.end();
       kdDebug(7010) << "Looking at url=" << url << " supported=" << supported << endl;
       if ( !supported && KProtocolInfo::protocolClass(url.protocol()) == ":local" )
       {
@@ -861,7 +861,7 @@ pid_t KRun::runCommand( const TQString& cmd, const TQString &execName, const TQS
   *proc << cmd;
   KService::Ptr service = KService::serviceByDesktopName( binaryName( execName, true ) );
   TQString bin = binaryName( cmd, false );
-  int pos = bin.tqfindRev( '/' );
+  int pos = bin.findRev( '/' );
   if (pos != -1) {
     proc->setWorkingDirectory( bin.mid(0, pos) );
   }
@@ -927,7 +927,7 @@ void KRun::init()
   if (m_strURL.url().startsWith("$(")) {
       // check for environment variables and make necessary translations
       TQString aValue = m_strURL.url();
-      int nDollarPos = aValue.tqfind( '$' );
+      int nDollarPos = aValue.find( '$' );
 
       while( nDollarPos != -1 && nDollarPos+1 < static_cast<int>(aValue.length())) {
         // there is at least one $
@@ -949,7 +949,7 @@ void KRun::init()
              }
              pclose(fs);
           }
-          aValue.tqreplace( nDollarPos, nEndPos-nDollarPos, result );
+          aValue.replace( nDollarPos, nEndPos-nDollarPos, result );
         } else if( (aValue)[nDollarPos+1] != '$' ) {
           uint nEndPos = nDollarPos+1;
           // the next character is no $
@@ -975,7 +975,7 @@ void KRun::init()
             // !!! Sergey A. Sukiyazov <corwin@micom.don.ru> !!!
             // A environment variables may contain values in 8bit
             // locale cpecified encoding or in UTF8 encoding.
-            aValue.tqreplace( nDollarPos, nEndPos-nDollarPos, KStringHandler::from8Bit( pEnv ) );
+            aValue.replace( nDollarPos, nEndPos-nDollarPos, KStringHandler::from8Bit( pEnv ) );
           } else
             aValue.remove( nDollarPos, nEndPos-nDollarPos );
         } else {
@@ -983,7 +983,7 @@ void KRun::init()
           aValue.remove( nDollarPos, 1 );
           nDollarPos++;
         }
-        nDollarPos = aValue.tqfind( '$', nDollarPos );
+        nDollarPos = aValue.find( '$', nDollarPos );
       }
       m_strURL = KURL(aValue);
       bypassErrorMessage = true;
@@ -1280,7 +1280,7 @@ void KRun::slotStatResult( KIO::Job * job )
 void KRun::slotScanMimeType( KIO::Job *, const TQString &mimetype )
 {
   if ( mimetype.isEmpty() )
-    kdWarning(7010) << "KRun::slotScanFinished : MimetypeJob didn't tqfind a mimetype! Probably a kioslave bug." << endl;
+    kdWarning(7010) << "KRun::slotScanFinished : MimetypeJob didn't find a mimetype! Probably a kioslave bug." << endl;
   foundMimeType( mimetype );
   m_job = 0;
 }
@@ -1380,7 +1380,7 @@ void KRun::foundMimeType( const TQString& type )
           lst.append( m_strURL );
           m_bFinished = KRun::run( *serv, lst, d->m_window, d->m_asn );
           /// Note: the line above means that if that service failed, we'll
-          /// go to runURL to maybe tqfind another service, even though a dialog
+          /// go to runURL to maybe find another service, even though a dialog
           /// box was displayed. That's good if runURL tries another service,
           /// but it's not good if it tries the same one :}
       }
@@ -1547,12 +1547,12 @@ KProcessRunner::slotProcessExited(KProcess * p)
   {
     // Often we get 1 (zsh, csh) or 127 (ksh, bash) because the binary doesn't exist.
     // We can't just rely on that, but it's a good hint.
-    // Before assuming its really so, we'll try to tqfind the binName
+    // Before assuming its really so, we'll try to find the binName
     // relatively to current directory,  and then in the PATH.
     if ( !TQFile( binName ).exists() && KStandardDirs::findExe( binName ).isEmpty() )
     {
       kapp->ref();
-      KMessageBox::sorry( 0L, i18n("Could not tqfind the program '%1'").arg( binName ) );
+      KMessageBox::sorry( 0L, i18n("Could not find the program '%1'").arg( binName ) );
       kapp->deref();
     }
   }
diff --git a/kio/kio/krun.h b/kio/kio/krun.h
index 3f2dd6108..17fa434e3 100644
--- a/kio/kio/krun.h
+++ b/kio/kio/krun.h
@@ -55,7 +55,7 @@ namespace KIO {
  *
  * @short Opens files with their associated applications in KDE
  */
-class KIO_EXPORT KRun : public TQObject
+class KIO_EXPORT KRun : public QObject
 {
   Q_OBJECT
 public:
@@ -71,7 +71,7 @@ public:
    *
    * @param isLocalFile
    *        If this parameter is set to @p false then @p url is
-   *        examined to tqfind out whether it is a local URL or
+   *        examined to find out whether it is a local URL or
    *        not. This flag is just used to improve speed, since the
    *        function KURL::isLocalFile is a bit slow.
    *
@@ -98,7 +98,7 @@ public:
    *
    * @param isLocalFile
    *        If this parameter is set to @p false then @p url is
-   *        examined to tqfind out whether it is a local URL or
+   *        examined to find out whether it is a local URL or
    *        not. This flag is just used to improve speed, since the
    *        function KURL::isLocalFile is a bit slow.
    *
@@ -296,7 +296,7 @@ public:
 
   /**
    * Same as the other runCommand(), but it also takes the name of the
-   * binary, to display an error message in case it couldn't tqfind it.
+   * binary, to display an error message in case it couldn't find it.
    *
    * @param cmd must be a shell command. You must not append "&"
    * to it, since the function will do that for you.
@@ -338,7 +338,7 @@ public:
    *        If false, the arguments are going to be fed into a exec() kind
    *        call.
    *        If the arguments are intended for an exec() kind of call and
-   *        the Exec line tqcontains shell commands then "/bin/sh -c" is added.
+   *        the Exec line contains shell commands then "/bin/sh -c" is added.
    * @param tempFiles if true and _urls are local files, they will be deleted
    *        when the application exits.
    * @return a list of arguments suitable for either system() or exec().
@@ -475,7 +475,7 @@ public:
  * It sends a notification when the process exits (for the taskbar)
  * and it will show an error message if necessary (e.g. "program not found").
  */
-class KIO_EXPORT KProcessRunner : public TQObject
+class KIO_EXPORT KProcessRunner : public QObject
 {
   Q_OBJECT
 
diff --git a/kio/kio/ksambashare.cpp b/kio/kio/ksambashare.cpp
index 7fba51ae2..defeae4a7 100644
--- a/kio/kio/ksambashare.cpp
+++ b/kio/kio/ksambashare.cpp
@@ -33,7 +33,7 @@ public:
   KSambaSharePrivate();
   
   bool readSmbConf();
-  bool tqfindSmbConf();
+  bool findSmbConf();
   bool load();
   
   TQDict<bool> sharedPaths;
@@ -49,20 +49,20 @@ KSambaSharePrivate::KSambaSharePrivate()
 #define FILESHARECONF "/etc/security/fileshare.conf"
 
 bool KSambaSharePrivate::load() {
-  if (!tqfindSmbConf())
+  if (!findSmbConf())
       return false;
       
   return readSmbConf();
 }
 
 /**
- * Try to tqfind the samba config file path
+ * Try to find the samba config file path
  * First tries the kconfig, then checks
  * several well-known paths
  * @return wether a smb.conf was found.
  **/
-bool KSambaSharePrivate::tqfindSmbConf() {
-  KSimpleConfig config(TQString::tqfromLatin1(FILESHARECONF),true);
+bool KSambaSharePrivate::findSmbConf() {
+  KSimpleConfig config(TQString::fromLatin1(FILESHARECONF),true);
   smbConf = config.readEntry("SMBCONF");
 
   if ( TQFile::exists(smbConf) )
@@ -144,7 +144,7 @@ bool KSambaSharePrivate::readSmbConf() {
     }
 
     // parameter
-    int i = completeLine.tqfind('=');
+    int i = completeLine.find('=');
 
     if (i>-1)
     {
@@ -203,7 +203,7 @@ bool KSambaShare::isDirectoryShared( const TQString & path ) const {
   if ( path[path.length()-1] != '/' )
        fixedPath += '/';
   
-  return d->sharedPaths.tqfind(fixedPath) != 0;
+  return d->sharedPaths.find(fixedPath) != 0;
 }
 
 TQStringList KSambaShare::sharedDirectories() const {
diff --git a/kio/kio/kscan.h b/kio/kio/kscan.h
index d3991e4a4..bb5731eec 100644
--- a/kio/kio/kscan.h
+++ b/kio/kio/kscan.h
@@ -98,7 +98,7 @@ protected:
      * customize it with the usual KDialogBase flags.
      *
      * @param dialogFace the KDialogBase::DialogType
-     * @param buttonMask a ORed tqmask of all buttons (see
+     * @param buttonMask a ORed mask of all buttons (see
      * KDialogBase::ButtonCode)
      * @param parent the QWidget's parent, or 0
      * @param name the name of the TQObject, can be 0
@@ -258,7 +258,7 @@ protected:
      * customize it with the usual KDialogBase flags.
      *
      * @param dialogFace the KDialogBase::DialogType
-     * @param buttonMask a ORed tqmask of all buttons (see
+     * @param buttonMask a ORed mask of all buttons (see
      * KDialogBase::ButtonCode)
      * @param parent the QWidget's parent, or 0
      * @param name the name of the TQObject, can be 0
diff --git a/kio/kio/kservice.cpp b/kio/kio/kservice.cpp
index 23ae54380..3af62f26f 100644
--- a/kio/kio/kservice.cpp
+++ b/kio/kio/kservice.cpp
@@ -128,9 +128,9 @@ KService::init( KDesktopFile *config )
     }
     // Try to make up a name.
     m_strName = entryPath();
-    int i = m_strName.tqfindRev('/');
+    int i = m_strName.findRev('/');
     m_strName = m_strName.mid(i+1);
-    i = m_strName.tqfindRev('.');
+    i = m_strName.findRev('.');
     if (i != -1)
        m_strName = m_strName.left(i);
   }
@@ -189,10 +189,10 @@ KService::init( KDesktopFile *config )
   }
 
   TQString name = entryPath();
-  int pos = name.tqfindRev('/');
+  int pos = name.findRev('/');
   if (pos != -1)
      name = name.mid(pos+1);
-  pos = name.tqfind('.');
+  pos = name.find('.');
   if (pos != -1)
      name = name.left(pos);
 
@@ -200,12 +200,12 @@ KService::init( KDesktopFile *config )
   if (kde4application && !m_strExec.startsWith("/")) {
     m_strExec = "KDEHOME=$HOME/.kde XDG_DATA_DIRS=/usr/share KDEDIRS=/usr/ XDG_CONFIG_DIRS=/etc/xdg/ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:$PATH "+m_strExec;
   } else if (config->readBoolEntry("X-KDE-SubstituteUID")) {
-    int space = m_strExec.tqfind(" ");
+    int space = m_strExec.find(" ");
     if (space==-1)
       m_strExec = KStandardDirs::findExe(m_strExec);
     else {
       const TQString command = m_strExec.left(space);
-      m_strExec.tqreplace(command,KStandardDirs::findExe(command));
+      m_strExec.replace(command,KStandardDirs::findExe(command));
     }
   }
 
@@ -253,7 +253,7 @@ KService::init( KDesktopFile *config )
      m_lstServiceTypes += config->readListEntry( "MimeType", ';' );
   entryMap.remove("MimeType");
 
-  if ( m_strType == "Application" && !m_lstServiceTypes.tqcontains("Application") )
+  if ( m_strType == "Application" && !m_lstServiceTypes.contains("Application") )
     // Applications implement the service type "Application" ;-)
     m_lstServiceTypes += "Application";
 
@@ -327,11 +327,11 @@ void KService::load( TQDataStream& s )
   // dummies are here because of fields that were removed, to keep bin compat.
   // Feel free to re-use, but fields for Applications only (not generic services)
   // should rather be added to application.desktop
-  TQ_INT8 def, term, dummy1, dummy2;
-  TQ_INT8 dst, initpref;
+  Q_INT8 def, term, dummy1, dummy2;
+  Q_INT8 dst, initpref;
   TQString dummyStr1, dummyStr2;
   int dummyI1, dummyI2;
-  TQ_UINT32 dummyUI32;
+  Q_UINT32 dummyUI32;
 
   // WARNING: IN KDE 3.x THIS NEEDS TO REMAIN COMPATIBLE WITH KDE 2.x!
   // !! This data structure should remain binary compatible at all times !!
@@ -358,13 +358,13 @@ void KService::load( TQDataStream& s )
 void KService::save( TQDataStream& s )
 {
   KSycocaEntry::save( s );
-  TQ_INT8 def = m_bAllowAsDefault, initpref = m_initialPreference;
-  TQ_INT8 term = m_bTerminal;
-  TQ_INT8 dst = (TQ_INT8) m_DCOPServiceType;
-  TQ_INT8 dummy1 = 0, dummy2 = 0; // see ::load
+  Q_INT8 def = m_bAllowAsDefault, initpref = m_initialPreference;
+  Q_INT8 term = m_bTerminal;
+  Q_INT8 dst = (Q_INT8) m_DCOPServiceType;
+  Q_INT8 dummy1 = 0, dummy2 = 0; // see ::load
   TQString dummyStr1, dummyStr2;
   int dummyI1 = 0, dummyI2 = 0;
-  TQ_UINT32 dummyUI32 = 0;
+  Q_UINT32 dummyUI32 = 0;
 
   // WARNING: IN KDE 3.x THIS NEEDS TO REMAIN COMPATIBLE WITH KDE 2.x!
   // !! This data structure should remain binary compatible at all times !!
@@ -562,7 +562,7 @@ TQVariant KService::property( const TQString& _name, TQVariant::Type t ) const
   {
     // No luck, let's ask KServiceTypeFactory what the type of this property
     // is supposed to be.
-    t = KServiceTypeFactory::self()->tqfindPropertyTypeByName(_name);
+    t = KServiceTypeFactory::self()->findPropertyTypeByName(_name);
     if (t == TQVariant::Invalid)
     {
       kdDebug(7012) << "Request for unknown property '" << _name << "'\n";
@@ -572,7 +572,7 @@ TQVariant KService::property( const TQString& _name, TQVariant::Type t ) const
 
   // Then we use a homebuild class based on KConfigBase to convert the TQString.
   // For some often used property types we do the conversion ourselves.
-  TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.tqfind( _name );
+  TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.find( _name );
   if ( (it == m_mapProps.end()) || (!it.data().isValid()))
   {
      //kdDebug(7012) << "Property not found " << _name << endl;
@@ -646,27 +646,27 @@ KService::List KService::allServices()
 
 KService::Ptr KService::serviceByName( const TQString& _name )
 {
-  KService * s = KServiceFactory::self()->tqfindServiceByName( _name );
+  KService * s = KServiceFactory::self()->findServiceByName( _name );
   return KService::Ptr( s );
 }
 
 KService::Ptr KService::serviceByDesktopPath( const TQString& _name )
 {
-  KService * s = KServiceFactory::self()->tqfindServiceByDesktopPath( _name );
+  KService * s = KServiceFactory::self()->findServiceByDesktopPath( _name );
   return KService::Ptr( s );
 }
 
 KService::Ptr KService::serviceByDesktopName( const TQString& _name )
 {
-  KService * s = KServiceFactory::self()->tqfindServiceByDesktopName( _name.lower() );
+  KService * s = KServiceFactory::self()->findServiceByDesktopName( _name.lower() );
   if (!s && !_name.startsWith("kde-"))
-     s = KServiceFactory::self()->tqfindServiceByDesktopName( "kde-"+_name.lower() );
+     s = KServiceFactory::self()->findServiceByDesktopName( "kde-"+_name.lower() );
   return KService::Ptr( s );
 }
 
 KService::Ptr KService::serviceByMenuId( const TQString& _name )
 {
-  KService * s = KServiceFactory::self()->tqfindServiceByMenuId( _name );
+  KService * s = KServiceFactory::self()->findServiceByMenuId( _name );
   return KService::Ptr( s );
 }
 
@@ -684,7 +684,7 @@ KService::Ptr KService::serviceByStorageId( const TQString& _storageId )
      return new KService(_storageId);
 
   TQString tmp = _storageId;
-  tmp = tmp.mid(tmp.tqfindRev('/')+1); // Strip dir
+  tmp = tmp.mid(tmp.findRev('/')+1); // Strip dir
 
   if (tmp.endsWith(".desktop"))
      tmp.truncate(tmp.length()-8);
@@ -720,7 +720,7 @@ TQString KService::username() const {
 }
 
 bool KService::noDisplay() const {
-  TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.tqfind( "NoDisplay" );
+  TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.find( "NoDisplay" );
   if ( (it != m_mapProps.end()) && (it.data().isValid()))
   {
      TQString aValue = it.data().toString().lower();
@@ -728,21 +728,21 @@ bool KService::noDisplay() const {
         return true;
   }
 
-  it = m_mapProps.tqfind( "OnlyShowIn" );
+  it = m_mapProps.find( "OnlyShowIn" );
   if ( (it != m_mapProps.end()) && (it.data().isValid()))
   {
      TQString aValue = it.data().toString();
      TQStringList aList = TQStringList::split(';', aValue);
-     if (!aList.tqcontains("KDE"))
+     if (!aList.contains("KDE"))
         return true;
   }
 
-  it = m_mapProps.tqfind( "NotShowIn" );
+  it = m_mapProps.find( "NotShowIn" );
   if ( (it != m_mapProps.end()) && (it.data().isValid()))
   {
      TQString aValue = it.data().toString();
      TQStringList aList = TQStringList::split(';', aValue);
-     if (aList.tqcontains("KDE"))
+     if (aList.contains("KDE"))
         return true;
   }
   
@@ -758,7 +758,7 @@ TQString KService::untranslatedGenericName() const {
 }
 
 bool KService::SuSEunimportant() const {
-  TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.tqfind( "X-SuSE-Unimportant" );
+  TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.find( "X-SuSE-Unimportant" );
   if ( (it == m_mapProps.end()) || (!it.data().isValid()))
   {
      return false;
@@ -772,7 +772,7 @@ bool KService::SuSEunimportant() const {
 }
 
 TQString KService::parentApp() const {
-  TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.tqfind( "X-KDE-ParentApp" );
+  TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.find( "X-KDE-ParentApp" );
   if ( (it == m_mapProps.end()) || (!it.data().isValid()))
   {
      return TQString::null;
@@ -783,8 +783,8 @@ TQString KService::parentApp() const {
 
 bool KService::allowMultipleFiles() const {
   // Can we pass multiple files on the command line or do we have to start the application for every single file ?
-  if ( m_strExec.tqfind( "%F" ) != -1 || m_strExec.tqfind( "%U" ) != -1 ||
-       m_strExec.tqfind( "%N" ) != -1 || m_strExec.tqfind( "%D" ) != -1 )
+  if ( m_strExec.find( "%F" ) != -1 || m_strExec.find( "%U" ) != -1 ||
+       m_strExec.find( "%N" ) != -1 || m_strExec.find( "%D" ) != -1 )
     return true;
   else
     return false;
@@ -836,7 +836,7 @@ TQString KService::newServicePath(bool showInMenu, const TQString &suggestedName
       else
          result = base + TQString("-%1.desktop").arg(i);
 
-      if (reservedMenuIds && reservedMenuIds->tqcontains(result))
+      if (reservedMenuIds && reservedMenuIds->contains(result))
          continue;
 
       // Lookup service by menu-id
diff --git a/kio/kio/kservice.h b/kio/kio/kservice.h
index ed863ed55..c276e8369 100644
--- a/kio/kio/kservice.h
+++ b/kio/kio/kservice.h
@@ -104,7 +104,7 @@ public:
   TQString exec() const { return m_strExec; }
   /**
    * Returns the name of the service's library.
-   * @return the name of the library that tqcontains the services
+   * @return the name of the library that contains the services
    *         implementation,
    *         or TQString::null if not set
    */
@@ -125,7 +125,7 @@ public:
   TQString icon() const { return m_strIcon; }
   /**
    * Returns the pixmap that represents the icon.
-   * @return a pixmap for this service (tqfinds and loads icon()),
+   * @return a pixmap for this service (finds and loads icon()),
    *         null if not set
    * @see icon()
    */
@@ -463,7 +463,7 @@ public:
 
   /**
    * Find a service by its storage-id or desktop-file path. This
-   * function will try very hard to tqfind a matching service.
+   * function will try very hard to find a matching service.
    *
    * @param _storageId the storage id or desktop-file path of the service
    * @return a pointer to the requested service or 0 if the service is
diff --git a/kio/kio/kservicefactory.cpp b/kio/kio/kservicefactory.cpp
index 6480737cf..1f79deb19 100644
--- a/kio/kio/kservicefactory.cpp
+++ b/kio/kio/kservicefactory.cpp
@@ -40,7 +40,7 @@ KServiceFactory::KServiceFactory()
    if (m_str)
    {
       // Read Header
-      TQ_INT32 i;
+      Q_INT32 i;
       (*m_str) >> i;
       m_nameDictOffset = i;
       (*m_str) >> i;
@@ -87,12 +87,12 @@ KServiceFactory * KServiceFactory::self()
     return _self;
 }
 
-KService * KServiceFactory::tqfindServiceByName(const TQString &_name)
+KService * KServiceFactory::findServiceByName(const TQString &_name)
 {
    if (!m_sycocaDict) return 0; // Error!
 
    // Warning : this assumes we're NOT building a database
-   // But since tqfindServiceByName isn't called in that case...
+   // But since findServiceByName isn't called in that case...
    // [ see KServiceTypeFactory for how to do it if needed ]
 
    int offset = m_sycocaDict->find_string( _name );
@@ -110,12 +110,12 @@ KService * KServiceFactory::tqfindServiceByName(const TQString &_name)
    return newService;
 }
 
-KService * KServiceFactory::tqfindServiceByDesktopName(const TQString &_name)
+KService * KServiceFactory::findServiceByDesktopName(const TQString &_name)
 {
    if (!m_nameDict) return 0; // Error!
 
    // Warning : this assumes we're NOT building a database
-   // But since tqfindServiceByName isn't called in that case...
+   // But since findServiceByName isn't called in that case...
    // [ see KServiceTypeFactory for how to do it if needed ]
 
    int offset = m_nameDict->find_string( _name );
@@ -133,12 +133,12 @@ KService * KServiceFactory::tqfindServiceByDesktopName(const TQString &_name)
    return newService;
 }
 
-KService * KServiceFactory::tqfindServiceByDesktopPath(const TQString &_name)
+KService * KServiceFactory::findServiceByDesktopPath(const TQString &_name)
 {
    if (!m_relNameDict) return 0; // Error!
 
    // Warning : this assumes we're NOT building a database
-   // But since tqfindServiceByName isn't called in that case...
+   // But since findServiceByName isn't called in that case...
    // [ see KServiceTypeFactory for how to do it if needed ]
 
    int offset = m_relNameDict->find_string( _name );
@@ -156,12 +156,12 @@ KService * KServiceFactory::tqfindServiceByDesktopPath(const TQString &_name)
    return newService;
 }
 
-KService * KServiceFactory::tqfindServiceByMenuId(const TQString &_menuId)
+KService * KServiceFactory::findServiceByMenuId(const TQString &_menuId)
 {
    if (!m_menuIdDict) return 0; // Error!
 
    // Warning : this assumes we're NOT building a database
-   // But since tqfindServiceByMenuId isn't called in that case...
+   // But since findServiceByMenuId isn't called in that case...
    // [ see KServiceTypeFactory for how to do it if needed ]
 
    int offset = m_menuIdDict->find_string( _menuId );
@@ -226,10 +226,10 @@ KService::List KServiceFactory::allInitServices()
    // Assume we're NOT building a database
 
    m_str->device()->at(m_initListOffset);
-   TQ_INT32 entryCount;
+   Q_INT32 entryCount;
    (*m_str) >> entryCount;
 
-   TQ_INT32 *offsetList = new TQ_INT32[entryCount];
+   Q_INT32 *offsetList = new Q_INT32[entryCount];
    for(int i = 0; i < entryCount; i++)
    {
       (*m_str) >> offsetList[i];
@@ -255,8 +255,8 @@ KService::List KServiceFactory::offers( int serviceTypeOffset )
    // Jump to the offer list
    str->device()->at( m_offerListOffset );
 
-   TQ_INT32 aServiceTypeOffset;
-   TQ_INT32 aServiceOffset;
+   Q_INT32 aServiceTypeOffset;
+   Q_INT32 aServiceOffset;
    // We might want to do a binary search instead of a linear search
    // since servicetype offsets are sorted. Bah.
    while (true)
@@ -275,7 +275,7 @@ KService::List KServiceFactory::offers( int serviceTypeOffset )
                 list.append( KService::Ptr( serv ) );
             // Restore position
             str->device()->at( savedPos );
-         } else if ( aServiceTypeOffset > (TQ_INT32)serviceTypeOffset )
+         } else if ( aServiceTypeOffset > (Q_INT32)serviceTypeOffset )
             break; // too far
       }
       else
diff --git a/kio/kio/kservicefactory.h b/kio/kio/kservicefactory.h
index b52f30d5a..1a828364e 100644
--- a/kio/kio/kservicefactory.h
+++ b/kio/kio/kservicefactory.h
@@ -54,22 +54,22 @@ public:
   /**
    * Find a service (by name, e.g. "Terminal")
    */
-  KService * tqfindServiceByName( const TQString &_name );
+  KService * findServiceByName( const TQString &_name );
 
   /**
    * Find a service (by desktop file name, e.g. "konsole")
    */
-  KService * tqfindServiceByDesktopName( const TQString &_name );
+  KService * findServiceByDesktopName( const TQString &_name );
 
   /**
    * Find a service ( by desktop path, e.g. "System/konsole.desktop")
    */
-  KService * tqfindServiceByDesktopPath( const TQString &_name );
+  KService * findServiceByDesktopPath( const TQString &_name );
 
   /**
    * Find a service ( by menu id, e.g. "kde-konsole.desktop")
    */
-  KService * tqfindServiceByMenuId( const TQString &_menuId );
+  KService * findServiceByMenuId( const TQString &_menuId );
 
   /**
    * @return the services supporting the given service type
diff --git a/kio/kio/kservicegroup.cpp b/kio/kio/kservicegroup.cpp
index d8d1ddd0b..f5d2970a9 100644
--- a/kio/kio/kservicegroup.cpp
+++ b/kio/kio/kservicegroup.cpp
@@ -84,12 +84,12 @@ KServiceGroup::KServiceGroup( const TQString &configFile, const TQString & _relp
   TQStringList tmpList;
   if (config.hasKey("OnlyShowIn"))
   {
-     if (!config.readListEntry("OnlyShowIn", ';').tqcontains("KDE"))
+     if (!config.readListEntry("OnlyShowIn", ';').contains("KDE"))
         d->m_bNoDisplay = true;
   }
   if (config.hasKey("NotShowIn"))
   {
-     if (config.readListEntry("NotShowIn", ';').tqcontains("KDE"))
+     if (config.readListEntry("NotShowIn", ';').contains("KDE"))
         d->m_bNoDisplay = true;
   }
 
@@ -103,7 +103,7 @@ KServiceGroup::KServiceGroup( const TQString &configFile, const TQString & _relp
      m_strCaption = _relpath;
      if (m_strCaption.right(1) == "/")
         m_strCaption = m_strCaption.left(m_strCaption.length()-1);
-     int i = m_strCaption.tqfindRev('/');
+     int i = m_strCaption.findRev('/');
      if (i > 0)
         m_strCaption = m_strCaption.mid(i+1);
   }
@@ -229,11 +229,11 @@ bool KServiceGroup::SuSEshortMenu() const
 void KServiceGroup::load( TQDataStream& s )
 {
   TQStringList groupList;
-  TQ_INT8 noDisplay;
-  TQ_INT8 _showEmptyMenu;
-  TQ_INT8 inlineHeader;
-  TQ_INT8 _inlineAlias;
-  TQ_INT8 _allowInline;
+  Q_INT8 noDisplay;
+  Q_INT8 _showEmptyMenu;
+  Q_INT8 inlineHeader;
+  Q_INT8 _inlineAlias;
+  Q_INT8 _allowInline;
   s >> m_strCaption >> m_strIcon >>
       m_strComment >> groupList >> m_strBaseGroupName >> m_childCount >>
       noDisplay >> d->suppressGenericNames >> d->directoryEntryPath >>
@@ -255,14 +255,14 @@ void KServiceGroup::load( TQDataStream& s )
         if (path[path.length()-1] == '/')
         {
            KServiceGroup *serviceGroup;
-           serviceGroup = KServiceGroupFactory::self()->tqfindGroupByDesktopPath(path, false);
+           serviceGroup = KServiceGroupFactory::self()->findGroupByDesktopPath(path, false);
            if (serviceGroup)
               m_serviceList.append( SPtr(serviceGroup) );
         }
         else
         {
            KService *service;
-           service = KServiceFactory::self()->tqfindServiceByDesktopPath(path);
+           service = KServiceFactory::self()->findServiceByDesktopPath(path);
            if (service)
               m_serviceList.append( SPtr(service) );
         }
@@ -302,11 +302,11 @@ void KServiceGroup::save( TQDataStream& s )
 
   (void) childCount();
 
-  TQ_INT8 noDisplay = d->m_bNoDisplay ? 1 : 0;
-  TQ_INT8 _showEmptyMenu = d->m_bShowEmptyMenu ? 1 : 0;
-  TQ_INT8 inlineHeader = d->m_bShowInlineHeader ? 1 : 0;
-  TQ_INT8 _inlineAlias = d->m_bInlineAlias ? 1 : 0;
-  TQ_INT8 _allowInline = d->m_bAllowInline ? 1 : 0;
+  Q_INT8 noDisplay = d->m_bNoDisplay ? 1 : 0;
+  Q_INT8 _showEmptyMenu = d->m_bShowEmptyMenu ? 1 : 0;
+  Q_INT8 inlineHeader = d->m_bShowInlineHeader ? 1 : 0;
+  Q_INT8 _inlineAlias = d->m_bInlineAlias ? 1 : 0;
+  Q_INT8 _allowInline = d->m_bAllowInline ? 1 : 0;
   s << m_strCaption << m_strIcon <<
       m_strComment << groupList << m_strBaseGroupName << m_childCount <<
       noDisplay << d->suppressGenericNames << d->directoryEntryPath <<
@@ -352,7 +352,7 @@ KServiceGroup::SuSEentries(bool sort, bool excludeNoDisplay, bool allowSeparator
     if (!m_bDeep) {
 
         group =
-            KServiceGroupFactory::self()->tqfindGroupByDesktopPath(relPath(), true);
+            KServiceGroupFactory::self()->findGroupByDesktopPath(relPath(), true);
 
         if (0 == group) // No guarantee that we still exist!
             return List();
@@ -491,7 +491,7 @@ KServiceGroup::SuSEsortEntries( KSortableValueList<SPtr,TQCString> slist, KSorta
              if (allowSeparators)
                 needSeparator = true;
           }
-          else if ( item.tqcontains( ":O" ) )
+          else if ( item.contains( ":O" ) )
           {
               //todo parse attribute:
               TQString tmp(  item );
@@ -657,7 +657,7 @@ void KServiceGroup::parseAttribute( const TQString &item ,  bool &showEmptyMenu,
         showInlineAlias = true;
     else if (  item == "NIA") //not inline alias!
         showInlineAlias = false;
-    else if( ( item ).tqcontains( "IL" )) //inline limite!
+    else if( ( item ).contains( "IL" )) //inline limite!
     {
         TQString tmp( item );
         tmp = tmp.remove( "IL[" );
@@ -672,12 +672,12 @@ void KServiceGroup::parseAttribute( const TQString &item ,  bool &showEmptyMenu,
         kdDebug()<<" This attribute is not supported :"<<item<<endl;
 }
 
-void KServiceGroup::setLayoutInfo(const TQStringList &tqlayout)
+void KServiceGroup::setLayoutInfo(const TQStringList &layout)
 {
-    d->sortOrder = tqlayout;
+    d->sortOrder = layout;
 }
 
-TQStringList KServiceGroup::tqlayoutInfo() const
+TQStringList KServiceGroup::layoutInfo() const
 {
     return d->sortOrder;
 }
@@ -685,26 +685,26 @@ TQStringList KServiceGroup::tqlayoutInfo() const
 KServiceGroup::Ptr
 KServiceGroup::baseGroup( const TQString & _baseGroupName )
 {
-    return KServiceGroupFactory::self()->tqfindBaseGroup(_baseGroupName, true);
+    return KServiceGroupFactory::self()->findBaseGroup(_baseGroupName, true);
 }
 
 KServiceGroup::Ptr
 KServiceGroup::root()
 {
-   return KServiceGroupFactory::self()->tqfindGroupByDesktopPath("/", true);
+   return KServiceGroupFactory::self()->findGroupByDesktopPath("/", true);
 }
 
 KServiceGroup::Ptr
 KServiceGroup::group(const TQString &relPath)
 {
    if (relPath.isEmpty()) return root();
-   return KServiceGroupFactory::self()->tqfindGroupByDesktopPath(relPath, true);
+   return KServiceGroupFactory::self()->findGroupByDesktopPath(relPath, true);
 }
 
 KServiceGroup::Ptr
 KServiceGroup::childGroup(const TQString &parent)
 {
-   return KServiceGroupFactory::self()->tqfindGroupByDesktopPath("#parent#"+parent, true);
+   return KServiceGroupFactory::self()->findGroupByDesktopPath("#parent#"+parent, true);
 }
 
 QString
diff --git a/kio/kio/kservicegroup.h b/kio/kio/kservicegroup.h
index ea923ff0d..69242e6ed 100644
--- a/kio/kio/kservicegroup.h
+++ b/kio/kio/kservicegroup.h
@@ -197,9 +197,9 @@ public:
 
   /**
    * @internal
-   * Sets information related to the tqlayout of services in this group.
+   * Sets information related to the layout of services in this group.
    */
-  void setLayoutInfo(const TQStringList &tqlayout);
+  void setLayoutInfo(const TQStringList &layout);
 
   /**
    * Original API and feature kindly provided by SuSE
@@ -209,9 +209,9 @@ public:
 
   /**
    * @internal
-   * Returns information related to the tqlayout of services in this group.
+   * Returns information related to the layout of services in this group.
    */
-  TQStringList tqlayoutInfo() const;
+  TQStringList layoutInfo() const;
 
   /**
    * @internal
diff --git a/kio/kio/kservicegroupfactory.cpp b/kio/kio/kservicegroupfactory.cpp
index 9a2ae33f2..9bca4dc63 100644
--- a/kio/kio/kservicegroupfactory.cpp
+++ b/kio/kio/kservicegroupfactory.cpp
@@ -36,7 +36,7 @@ KServiceGroupFactory::KServiceGroupFactory()
    if (m_str)
    {
       // Read Header
-      TQ_INT32 i;
+      Q_INT32 i;
       (*m_str) >> i;
       m_baseGroupDictOffset = i;
 
@@ -66,12 +66,12 @@ KServiceGroupFactory * KServiceGroupFactory::self()
   return _self;
 }
 
-KServiceGroup * KServiceGroupFactory::tqfindGroupByDesktopPath(const TQString &_name, bool deep)
+KServiceGroup * KServiceGroupFactory::findGroupByDesktopPath(const TQString &_name, bool deep)
 {
    if (!m_sycocaDict) return 0; // Error!
 
    // Warning : this assumes we're NOT building a database
-   // But since tqfindServiceByName isn't called in that case...
+   // But since findServiceByName isn't called in that case...
    // [ see KServiceTypeFactory for how to do it if needed ]
 
    int offset = m_sycocaDict->find_string( _name );
@@ -89,12 +89,12 @@ KServiceGroup * KServiceGroupFactory::tqfindGroupByDesktopPath(const TQString &_
    return newGroup;
 }
 
-KServiceGroup * KServiceGroupFactory::tqfindBaseGroup(const TQString &_baseGroupName, bool deep)
+KServiceGroup * KServiceGroupFactory::findBaseGroup(const TQString &_baseGroupName, bool deep)
 {
    if (!m_baseGroupDict) return 0; // Error!
 
    // Warning : this assumes we're NOT building a database
-   // But since tqfindServiceByName isn't called in that case...
+   // But since findServiceByName isn't called in that case...
    // [ see KServiceTypeFactory for how to do it if needed ]
 
    int offset = m_baseGroupDict->find_string( _baseGroupName );
diff --git a/kio/kio/kservicegroupfactory.h b/kio/kio/kservicegroupfactory.h
index 352ca2d1c..b1131b398 100644
--- a/kio/kio/kservicegroupfactory.h
+++ b/kio/kio/kservicegroupfactory.h
@@ -52,12 +52,12 @@ public:
   /**
    * Find a group ( by desktop path, e.g. "Applications/Editors")
    */
-  KServiceGroup * tqfindGroupByDesktopPath( const TQString &_name, bool deep = true );
+  KServiceGroup * findGroupByDesktopPath( const TQString &_name, bool deep = true );
 
   /**
    * Find a base group by name, e.g. "settings"
    */
-  KServiceGroup * tqfindBaseGroup( const TQString &_baseGroupName, bool deep = true );
+  KServiceGroup * findBaseGroup( const TQString &_baseGroupName, bool deep = true );
 
   /**
    * @return the unique service group factory, creating it if necessary
diff --git a/kio/kio/kservicetype.cpp b/kio/kio/kservicetype.cpp
index 5a44210de..48693aceb 100644
--- a/kio/kio/kservicetype.cpp
+++ b/kio/kio/kservicetype.cpp
@@ -82,7 +82,7 @@ KServiceType::init( KDesktopFile *config)
 
   for( ; gIt != tmpList.end(); ++gIt )
   {
-    if ( (*gIt).tqfind( "Property::" ) == 0 )
+    if ( (*gIt).find( "Property::" ) == 0 )
     {
       config->setGroup( *gIt );
       TQVariant v = config->readPropertyEntry( "Value",
@@ -95,7 +95,7 @@ KServiceType::init( KDesktopFile *config)
   gIt = tmpList.begin();
   for( ; gIt != tmpList.end(); ++gIt )
   {
-    if( (*gIt).tqfind( "PropertyDef::" ) == 0 )
+    if( (*gIt).find( "PropertyDef::" ) == 0 )
     {
       config->setGroup( *gIt );
       m_mapPropDefs.insert( (*gIt).mid( 13 ),
@@ -125,11 +125,11 @@ KServiceType::KServiceType( TQDataStream& _str, int offset )
 void
 KServiceType::load( TQDataStream& _str )
 {
-  TQ_INT8 b;
+  Q_INT8 b;
   _str >> m_strName >> m_strIcon >> m_strComment >> m_mapProps >> m_mapPropDefs
        >> b;
   m_bValid = b;
-  m_bDerived = m_mapProps.tqcontains("X-KDE-Derived");
+  m_bDerived = m_mapProps.contains("X-KDE-Derived");
 }
 
 void
@@ -140,7 +140,7 @@ KServiceType::save( TQDataStream& _str )
   // You may add new fields at the end. Make sure to update the version
   // number in ksycoca.h
   _str << m_strName << m_strIcon << m_strComment << m_mapProps << m_mapPropDefs
-       << (TQ_INT8)m_bValid;
+       << (Q_INT8)m_bValid;
 }
 
 KServiceType::~KServiceType()
@@ -182,7 +182,7 @@ KServiceType::property( const TQString& _name ) const
   else if ( _name == "Comment" )
     v = TQVariant( m_strComment );
   else {
-    TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.tqfind( _name );
+    TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.find( _name );
     if ( it != m_mapProps.end() )
       v = it.data();
   }
@@ -209,7 +209,7 @@ KServiceType::propertyNames() const
 TQVariant::Type
 KServiceType::propertyDef( const TQString& _name ) const
 {
-  TQMap<TQString,TQVariant::Type>::ConstIterator it = m_mapPropDefs.tqfind( _name );
+  TQMap<TQString,TQVariant::Type>::ConstIterator it = m_mapPropDefs.find( _name );
   if ( it == m_mapPropDefs.end() )
     return TQVariant::Invalid;
   return it.data();
@@ -229,7 +229,7 @@ KServiceType::propertyDefNames() const
 
 KServiceType::Ptr KServiceType::serviceType( const TQString& _name )
 {
-  KServiceType * p = KServiceTypeFactory::self()->tqfindServiceTypeByName( _name );
+  KServiceType * p = KServiceTypeFactory::self()->findServiceTypeByName( _name );
   return KServiceType::Ptr( p );
 }
 
@@ -239,7 +239,7 @@ static void addUnique(KService::List &lst, TQDict<KService> &dict, const KServic
   for( ; it != newLst.end(); ++it )
   {
      KService *service = static_cast<KService*>(*it);
-     if (dict.tqfind(service->desktopEntryPath()))
+     if (dict.find(service->desktopEntryPath()))
         continue;
      dict.insert(service->desktopEntryPath(), service);
      lst.append(service);
@@ -254,7 +254,7 @@ KService::List KServiceType::offers( const TQString& _servicetype )
   KService::List lst;
 
   // Services associated directly with this servicetype (the normal case)
-  KServiceType::Ptr serv = KServiceTypeFactory::self()->tqfindServiceTypeByName( _servicetype );
+  KServiceType::Ptr serv = KServiceTypeFactory::self()->findServiceTypeByName( _servicetype );
   if ( serv )
     addUnique(lst, dict, KServiceFactory::self()->offers( serv->offset() ), false);
   else
@@ -270,7 +270,7 @@ KService::List KServiceType::offers( const TQString& _servicetype )
         TQString parent = mime->parentMimeType();
         if (parent.isEmpty())
            break;
-        mime = dynamic_cast<KMimeType *>(KServiceTypeFactory::self()->tqfindServiceTypeByName( parent ));
+        mime = dynamic_cast<KMimeType *>(KServiceTypeFactory::self()->findServiceTypeByName( parent ));
         if (!mime)
            break;
         
@@ -291,7 +291,7 @@ KService::List KServiceType::offers( const TQString& _servicetype )
        && _servicetype.left(4) != "all/" )
   {
     // Support for services associated with "all"
-    KServiceType * servAll = KServiceTypeFactory::self()->tqfindServiceTypeByName( "all/all" );
+    KServiceType * servAll = KServiceTypeFactory::self()->findServiceTypeByName( "all/all" );
     if ( servAll )
     {
         addUnique(lst, dict, KServiceFactory::self()->offers( servAll->offset() ), true);
@@ -303,7 +303,7 @@ KService::List KServiceType::offers( const TQString& _servicetype )
     // Support for services associated with "allfiles"
     if ( _servicetype != "inode/directory" && _servicetype != "inode/directory-locked" )
     {
-      KServiceType * servAllFiles = KServiceTypeFactory::self()->tqfindServiceTypeByName( "all/allfiles" );
+      KServiceType * servAllFiles = KServiceTypeFactory::self()->findServiceTypeByName( "all/allfiles" );
       if ( servAllFiles )
       {
         addUnique(lst, dict, KServiceFactory::self()->offers( servAllFiles->offset() ), true);
@@ -333,7 +333,7 @@ KServiceType::Ptr KServiceType::parentType()
   TQString parentSt = parentServiceType();
   if (!parentSt.isEmpty())
   {
-    d->parentType = KServiceTypeFactory::self()->tqfindServiceTypeByName( parentSt );
+    d->parentType = KServiceTypeFactory::self()->findServiceTypeByName( parentSt );
     if (!d->parentType)
       kdWarning(7009) << "'" << desktopEntryPath() << "' specifies undefined mimetype/servicetype '"<< parentSt << "'" << endl;
   }
diff --git a/kio/kio/kservicetypefactory.cpp b/kio/kio/kservicetypefactory.cpp
index ac0a3d37c..8287bca44 100644
--- a/kio/kio/kservicetypefactory.cpp
+++ b/kio/kio/kservicetypefactory.cpp
@@ -39,7 +39,7 @@ KServiceTypeFactory::KServiceTypeFactory()
    if (m_str)
    {
       // Read Header
-      TQ_INT32 i,n;
+      Q_INT32 i,n;
       (*m_str) >> i;
       m_fastPatternOffset = i;
       (*m_str) >> i;
@@ -77,7 +77,7 @@ KServiceTypeFactory * KServiceTypeFactory::self()
   return _self;
 }
 
-KServiceType * KServiceTypeFactory::tqfindServiceTypeByName(const TQString &_name)
+KServiceType * KServiceTypeFactory::findServiceTypeByName(const TQString &_name)
 {
    if (!m_sycocaDict) return 0L; // Error!
    assert (!KSycoca::self()->isBuilding());
@@ -95,14 +95,14 @@ KServiceType * KServiceTypeFactory::tqfindServiceTypeByName(const TQString &_nam
    return newServiceType;
 }
 
-TQVariant::Type KServiceTypeFactory::tqfindPropertyTypeByName(const TQString &_name)
+TQVariant::Type KServiceTypeFactory::findPropertyTypeByName(const TQString &_name)
 {
    if (!m_sycocaDict)
       return TQVariant::Invalid; // Error!
 
    assert (!KSycoca::self()->isBuilding());
 
-   TQMapConstIterator<TQString,int> it = m_propertyTypeDict.tqfind(_name);
+   TQMapConstIterator<TQString,int> it = m_propertyTypeDict.find(_name);
    if (it != m_propertyTypeDict.end()) {
      return (TQVariant::Type)it.data();
    }
@@ -110,7 +110,7 @@ TQVariant::Type KServiceTypeFactory::tqfindPropertyTypeByName(const TQString &_n
    return TQVariant::Invalid;
 }
 
-KMimeType * KServiceTypeFactory::tqfindFromPattern(const TQString &_filename, TQString *match)
+KMimeType * KServiceTypeFactory::findFromPattern(const TQString &_filename, TQString *match)
 {
    // Assume we're NOT building a database
    if (!m_str) return 0;
@@ -120,21 +120,21 @@ KMimeType * KServiceTypeFactory::tqfindFromPattern(const TQString &_filename, TQ
 
    str->device()->at( m_fastPatternOffset );
 
-   TQ_INT32 nrOfEntries;
+   Q_INT32 nrOfEntries;
    (*str) >> nrOfEntries;
-   TQ_INT32 entrySize;
+   Q_INT32 entrySize;
    (*str) >> entrySize;
 
-   TQ_INT32 fastOffset =  str->device()->at( );
+   Q_INT32 fastOffset =  str->device()->at( );
 
-   TQ_INT32 matchingOffset = 0;
+   Q_INT32 matchingOffset = 0;
 
    // Let's go for a binary search in the "fast" pattern index
-   TQ_INT32 left = 0;
-   TQ_INT32 right = nrOfEntries - 1;
-   TQ_INT32 middle;
+   Q_INT32 left = 0;
+   Q_INT32 right = nrOfEntries - 1;
+   Q_INT32 middle;
    // Extract extension
-   int lastDot = _filename.tqfindRev('.');
+   int lastDot = _filename.findRev('.');
    int ext_len = _filename.length() - lastDot - 1;
    if (lastDot != -1 && ext_len <= 4) // if no '.', skip the extension lookup
    {
@@ -169,7 +169,7 @@ KMimeType * KServiceTypeFactory::tqfindFromPattern(const TQString &_filename, TQ
       str->device()->at( m_otherPatternOffset );
 
       TQString pattern;
-      TQ_INT32 mimetypeOffset;
+      Q_INT32 mimetypeOffset;
 
       while (true)
       {
@@ -186,7 +186,7 @@ KMimeType * KServiceTypeFactory::tqfindFromPattern(const TQString &_filename, TQ
 
    TQStringList::const_iterator it = m_patterns.begin();
    TQStringList::const_iterator end = m_patterns.end();
-   TQValueVector<TQ_INT32>::const_iterator it_offset = m_pattern_offsets.begin();
+   TQValueVector<Q_INT32>::const_iterator it_offset = m_pattern_offsets.begin();
 
   for ( ; it != end; ++it, ++it_offset )
    {
diff --git a/kio/kio/kservicetypefactory.h b/kio/kio/kservicetypefactory.h
index ae7e56785..db64aa115 100644
--- a/kio/kio/kservicetypefactory.h
+++ b/kio/kio/kservicetypefactory.h
@@ -63,19 +63,19 @@ public:
    * Find a service type in the database file (allocates it)
    * Overloaded by KBuildServiceTypeFactory to return a memory one.
    */
-  virtual KServiceType * tqfindServiceTypeByName(const TQString &_name);
+  virtual KServiceType * findServiceTypeByName(const TQString &_name);
 
   /**
    * Find a the property type of a named property.
    */
-  TQVariant::Type tqfindPropertyTypeByName(const TQString &_name);
+  TQVariant::Type findPropertyTypeByName(const TQString &_name);
 
   /**
    * Find a mimetype from a filename (using the pattern list)
    * @param _filename filename to check.
    * @param match if provided, returns the pattern that matched.
    */
-  KMimeType * tqfindFromPattern(const TQString &_filename, TQString *match = 0);
+  KMimeType * findFromPattern(const TQString &_filename, TQString *match = 0);
 
   /**
    * @return all mimetypes
@@ -113,7 +113,7 @@ protected:
 
 private:
   TQStringList m_patterns;
-  TQValueVector<TQ_INT32> m_pattern_offsets;
+  TQValueVector<Q_INT32> m_pattern_offsets;
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
diff --git a/kio/kio/kshellcompletion.cpp b/kio/kio/kshellcompletion.cpp
index b27e04054..2fb67a31f 100644
--- a/kio/kio/kshellcompletion.cpp
+++ b/kio/kio/kshellcompletion.cpp
@@ -217,33 +217,33 @@ bool KShellCompletion::quoteText(TQString *text, bool force, bool skip_last) con
 	int pos = 0;
 
 	if ( !force ) {
-		pos = text->tqfind( m_word_break_char );
+		pos = text->find( m_word_break_char );
 		if ( skip_last && (pos == (int)(text->length())-1) ) pos = -1;
 	}
 
 	if ( !force && pos == -1 ) {
-		pos = text->tqfind( m_quote_char1 );
+		pos = text->find( m_quote_char1 );
 		if ( skip_last && (pos == (int)(text->length())-1) ) pos = -1;
 	}
 
 	if ( !force && pos == -1 ) {
-		pos = text->tqfind( m_quote_char2 );
+		pos = text->find( m_quote_char2 );
 		if ( skip_last && (pos == (int)(text->length())-1) ) pos = -1;
 	}
 
 	if ( !force && pos == -1 ) {
-		pos = text->tqfind( m_escape_char );
+		pos = text->find( m_escape_char );
 		if ( skip_last && (pos == (int)(text->length())-1) ) pos = -1;
 	}
 
 	if ( force || (pos >= 0) ) {
 
 		// Escape \ in the string
-		text->tqreplace( m_escape_char,
+		text->replace( m_escape_char,
 		               TQString( m_escape_char ) + m_escape_char );
 
 		// Escape " in the string
-		text->tqreplace( m_quote_char1,
+		text->replace( m_quote_char1,
 		               TQString( m_escape_char ) + m_quote_char1 );
 
 		// " at the beginning
diff --git a/kio/kio/ktar.cpp b/kio/kio/ktar.cpp
index 768d0bc63..0b77fff52 100644
--- a/kio/kio/ktar.cpp
+++ b/kio/kio/ktar.cpp
@@ -66,9 +66,9 @@ KTar::KTar( const TQString& filename, const TQString & _mimetype )
     if ( mimetype.isEmpty() ) // Find out mimetype manually
     {
         if ( TQFile::exists( filename ) )
-            mimetype = KMimeType::tqfindByFileContent( filename )->name();
+            mimetype = KMimeType::findByFileContent( filename )->name();
         else
-            mimetype = KMimeType::tqfindByPath( filename, 0, true )->name();
+            mimetype = KMimeType::findByPath( filename, 0, true )->name();
         kdDebug(7041) << "KTar::KTar mimetype = " << mimetype << endl;
 
         // Don't move to prepareDevice - the other constructor theoretically allows ANY filter
@@ -137,7 +137,7 @@ void KTar::prepareDevice( const TQString & filename,
     // the file is completly extracted instead,
     // and we work on the extracted tar file.
     // This improves the extraction speed by the tar ioslave dramatically,
-    // if the archive file tqcontains many files.
+    // if the archive file contains many files.
     // This is because the tar ioslave extracts one file after the other and normally
     // has to walk through the decompression filter each time.
     // Which is in fact nearly as slow as a complete decompression for each file.
@@ -185,9 +185,9 @@ void KTar::setOrigFileName( const TQCString & fileName )
     d->origFileName = fileName;
 }
 
-TQ_LONG KTar::readRawHeader(char *buffer) {
+Q_LONG KTar::readRawHeader(char *buffer) {
   // Read header
-  TQ_LONG n = device()->readBlock( buffer, 0x200 );
+  Q_LONG n = device()->readBlock( buffer, 0x200 );
   if ( n == 0x200 && buffer[0] != 0 ) {
     // Make sure this is actually a tar header
     if (strncmp(buffer + 257, "ustar", 5)) {
@@ -223,7 +223,7 @@ TQ_LONG KTar::readRawHeader(char *buffer) {
 }
 
 bool KTar::readLonglink(char *buffer,TQCString &longlink) {
-  TQ_LONG n = 0;
+  Q_LONG n = 0;
   TQIODevice *dev = device();
   // read size of longlink from size field in header
   // size is in bytes including the trailing null (which we ignore)
@@ -252,11 +252,11 @@ bool KTar::readLonglink(char *buffer,TQCString &longlink) {
   return true;
 }
 
-TQ_LONG KTar::readHeader(char *buffer,TQString &name,TQString &symlink) {
+Q_LONG KTar::readHeader(char *buffer,TQString &name,TQString &symlink) {
   name.truncate(0);
   symlink.truncate(0);
   while (true) {
-    TQ_LONG n = readRawHeader(buffer);
+    Q_LONG n = readRawHeader(buffer);
     if (n != 0x200) return n;
 
     // is it a longlink?
@@ -320,7 +320,7 @@ bool KTar::KTarPrivate::fillTempFile( const TQString & filename) {
             delete filterDev;
             return false;
         }
-        TQ_LONG len = -1;
+        Q_LONG len = -1;
         while ( !filterDev->atEnd() && len != 0) {
             len = filterDev->readBlock(buffer.data(),buffer.size());
             if ( len < 0 ) { // corrupted archive
@@ -353,7 +353,7 @@ bool KTar::openArchive( int mode )
         return false;
 
     // We'll use the permission and user/group of d->rootDir
-    // for any directory we emulate (see tqfindOrCreate)
+    // for any directory we emulate (see findOrCreate)
     //struct stat buf;
     //stat( m_filename, &buf );
 
@@ -372,7 +372,7 @@ bool KTar::openArchive( int mode )
         TQString symlink;
 
         // Read header
-        TQ_LONG n = readHeader(buffer,name,symlink);
+        Q_LONG n = readHeader(buffer,name,symlink);
         if (n < 0) return false;
         if (n == 0x200)
         {
@@ -385,7 +385,7 @@ bool KTar::openArchive( int mode )
                 name = name.left( name.length() - 1 );
             }
 
-            int pos = name.tqfindRev( '/' );
+            int pos = name.findRev( '/' );
             if ( pos == -1 )
                 nm = name;
             else
@@ -485,10 +485,10 @@ bool KTar::openArchive( int mode )
             }
             else
             {
-                // In some tar files we can tqfind dir/./file => call cleanDirPath
+                // In some tar files we can find dir/./file => call cleanDirPath
                 TQString path = TQDir::cleanDirPath( name.left( pos ) );
                 // Ensure container directory exists, create otherwise
-                KArchiveDirectory * d = tqfindOrCreate( path );
+                KArchiveDirectory * d = findOrCreate( path );
                 d->addEntry( e );
             }
         }
@@ -534,7 +534,7 @@ bool KTar::KTarPrivate::writeBackTempFile( const TQString & filename ) {
         if ( forced )
             static_cast<KFilterDev *>(dev)->setOrigFileName( origFileName );
         TQByteArray buffer(8*1024);
-        TQ_LONG len;
+        Q_LONG len;
         while ( ! file->atEnd()) {
             len = file->readBlock(buffer.data(),buffer.size());
             dev->writeBlock(buffer.data(),len);
@@ -579,14 +579,14 @@ bool KTar::writeDir( const TQString& name, const TQString& user, const TQString&
         return false;
     }
 
-    // In some tar files we can tqfind dir/./ => call cleanDirPath
+    // In some tar files we can find dir/./ => call cleanDirPath
     TQString dirName ( TQDir::cleanDirPath( name ) );
 
     // Need trailing '/'
     if ( dirName.right(1) != "/" )
         dirName += "/";
 
-    if ( d->dirList.tqcontains( dirName ) )
+    if ( d->dirList.contains( dirName ) )
         return true; // already there
 
     char buffer[ 0x201 ];
@@ -618,7 +618,7 @@ bool KTar::writeDir( const TQString& name, const TQString& user, const TQString&
     device()->writeBlock( buffer, 0x200 );
     if ( mode() & IO_ReadWrite )  d->tarEnd = device()->at();
 
-    d->dirList.append( dirName ); // tqcontains trailing slash
+    d->dirList.append( dirName ); // contains trailing slash
     return true; // TODO if wanted, better error control
 #endif
 }
@@ -633,7 +633,7 @@ bool KTar::prepareWriting( const TQString& name, const TQString& user, const TQS
 
 bool KTar::doneWriting( uint size )
 {
-    // Write tqalignment
+    // Write alignment
     int rest = size % 0x200;
     if ( mode() & IO_ReadWrite )
         d->tarEnd = device()->at() + (rest ? 0x200 - rest : 0); // Record our new end of archive
@@ -642,7 +642,7 @@ bool KTar::doneWriting( uint size )
         char buffer[ 0x201 ];
         for( uint i = 0; i < 0x200; ++i )
             buffer[i] = 0;
-        TQ_LONG nwritten = device()->writeBlock( buffer, 0x200 - rest );
+        Q_LONG nwritten = device()->writeBlock( buffer, 0x200 - rest );
         return nwritten == 0x200 - rest;
     }
     return true;
@@ -699,7 +699,7 @@ void KTar::fillBuffer( char * buffer,
   strcpy( buffer + 0x88, s.data() );
   buffer[ 0x93 ] = ' '; // space-terminate (no null after)
 
-  // spaces, tqreplaced by the check sum later
+  // spaces, replaced by the check sum later
   buffer[ 0x94 ] = 0x20;
   buffer[ 0x95 ] = 0x20;
   buffer[ 0x96 ] = 0x20;
@@ -775,21 +775,21 @@ bool KTar::prepareWriting_impl(const TQString &name, const TQString &user,
         return false;
     }
 
-    // In some tar files we can tqfind dir/./file => call cleanDirPath
+    // In some tar files we can find dir/./file => call cleanDirPath
     TQString fileName ( TQDir::cleanDirPath( name ) );
 
     /*
       // Create toplevel dirs
       // Commented out by David since it's not necessary, and if anybody thinks it is,
-      // he needs to implement a tqfindOrCreate equivalent in writeDir.
+      // he needs to implement a findOrCreate equivalent in writeDir.
       // But as KTar and the "tar" program both handle tar files without
       // dir entries, there's really no need for that
       TQString tmp ( fileName );
-      int i = tmp.tqfindRev( '/' );
+      int i = tmp.findRev( '/' );
       if ( i != -1 )
       {
-      TQString d = tmp.left( i + 1 ); // tqcontains trailing slash
-      if ( !m_dirList.tqcontains( d ) )
+      TQString d = tmp.left( i + 1 ); // contains trailing slash
+      if ( !m_dirList.contains( d ) )
       {
       tmp = tmp.mid( i + 1 );
       writeDir( d, user, group ); // WARNING : this one doesn't create its toplevel dirs
@@ -846,14 +846,14 @@ bool KTar::writeDir_impl(const TQString &name, const TQString &user,
         return false;
     }
 
-    // In some tar files we can tqfind dir/./ => call cleanDirPath
+    // In some tar files we can find dir/./ => call cleanDirPath
     TQString dirName ( TQDir::cleanDirPath( name ) );
 
     // Need trailing '/'
     if ( dirName.right(1) != "/" )
         dirName += "/";
 
-    if ( d->dirList.tqcontains( dirName ) )
+    if ( d->dirList.contains( dirName ) )
         return true; // already there
 
     char buffer[ 0x201 ];
@@ -884,7 +884,7 @@ bool KTar::writeDir_impl(const TQString &name, const TQString &user,
     device()->writeBlock( buffer, 0x200 );
     if ( mode() & IO_ReadWrite )  d->tarEnd = device()->at();
 
-    d->dirList.append( dirName ); // tqcontains trailing slash
+    d->dirList.append( dirName ); // contains trailing slash
     return true; // TODO if wanted, better error control
 }
 
@@ -911,7 +911,7 @@ bool KTar::writeSymLink_impl(const TQString &name, const TQString &target,
 
     device()->flush();
 
-    // In some tar files we can tqfind dir/./file => call cleanDirPath
+    // In some tar files we can find dir/./file => call cleanDirPath
     TQString fileName ( TQDir::cleanDirPath( name ) );
 
     char buffer[ 0x201 ];
diff --git a/kio/kio/ktar.h b/kio/kio/ktar.h
index 67f004a39..95c52a32c 100644
--- a/kio/kio/ktar.h
+++ b/kio/kio/ktar.h
@@ -139,9 +139,9 @@ private:
     void writeLonglink(char *buffer, const TQCString &name, char typeflag,
 			const char *uname, const char *gname);
 
-    TQ_LONG readRawHeader(char *buffer);
+    Q_LONG readRawHeader(char *buffer);
     bool readLonglink(char *buffer,TQCString &longlink);
-    TQ_LONG readHeader(char *buffer,TQString &name,TQString &symlink);
+    Q_LONG readHeader(char *buffer,TQString &name,TQString &symlink);
 
     TQString m_filename;
 protected:
diff --git a/kio/kio/ktrader.h b/kio/kio/ktrader.h
index 7f6e9d4af..e5bb734e6 100644
--- a/kio/kio/ktrader.h
+++ b/kio/kio/ktrader.h
@@ -27,7 +27,7 @@
  *
  * Basically, it provides a way for an application to query
  * all KDE services (that is, applications and components) that match
- * a specific set of requirements.  This allows you to tqfind an
+ * a specific set of requirements.  This allows you to find an
  * application in real-time without you having to hard-code the name
  * and/or path of the application.
  *
@@ -82,7 +82,7 @@
  *        applications or components.
  * @author Torben Weis <weis@kde.org>
  */
-class KIO_EXPORT KTrader : public TQObject
+class KIO_EXPORT KTrader : public QObject
 {
     Q_OBJECT
 public:
diff --git a/kio/kio/ktraderparsetree.cpp b/kio/kio/ktraderparsetree.cpp
index 969599db6..711ec5356 100644
--- a/kio/kio/ktraderparsetree.cpp
+++ b/kio/kio/ktraderparsetree.cpp
@@ -415,7 +415,7 @@ bool ParseTreeMATCH::eval( ParseContext *_context ) const
   if ( c1.type != ParseContext::T_STRING || c2.type != ParseContext::T_STRING )
     return false;
 
-  _context->b = ( c2.str.tqfind( c1.str ) != -1 );
+  _context->b = ( c2.str.find( c1.str ) != -1 );
 
   return true;
 }
@@ -465,7 +465,7 @@ bool ParseTreeIN::eval( ParseContext *_context ) const
 
   if ( c1.type == ParseContext::T_STRING && c2.type == ParseContext::T_STR_SEQ )
   {
-    _context->b = ( c2.strSeq.tqfind( c1.str ) != c2.strSeq.end() );
+    _context->b = ( c2.strSeq.find( c1.str ) != c2.strSeq.end() );
     return true;
   }
 
@@ -535,7 +535,7 @@ bool ParseTreeMIN2::eval( ParseContext *_context ) const
   if ( !_context->initMaxima( m_strId ) )
     return false;
 
-  TQMap<TQString,PreferencesMaxima>::Iterator it = _context->maxima.tqfind( m_strId );
+  TQMap<TQString,PreferencesMaxima>::Iterator it = _context->maxima.find( m_strId );
   if ( it == _context->maxima.end() )
     return false;
 
@@ -568,7 +568,7 @@ bool ParseTreeMAX2::eval( ParseContext *_context ) const
     return false;
 
   // Find extrema
-  TQMap<TQString,PreferencesMaxima>::Iterator it = _context->maxima.tqfind( m_strId );
+  TQMap<TQString,PreferencesMaxima>::Iterator it = _context->maxima.find( m_strId );
   if ( it == _context->maxima.end() )
     return false;
 
@@ -651,7 +651,7 @@ bool ParseContext::initMaxima( const TQString& _prop )
     return false;
 
   // Did we cache the result ?
-  TQMap<TQString,PreferencesMaxima>::Iterator it = maxima.tqfind( _prop );
+  TQMap<TQString,PreferencesMaxima>::Iterator it = maxima.find( _prop );
   if ( it != maxima.end() )
     return ( it.data().type == PreferencesMaxima::PM_DOUBLE ||
 	     it.data().type == PreferencesMaxima::PM_INT );
diff --git a/kio/kio/kurifilter.cpp b/kio/kio/kurifilter.cpp
index a2c4ff9d3..2c4c5b12e 100644
--- a/kio/kio/kurifilter.cpp
+++ b/kio/kio/kurifilter.cpp
@@ -35,7 +35,7 @@ template class TQPtrList<KURIFilterPlugin>;
 KURIFilterPlugin::KURIFilterPlugin( TQObject *parent, const char *name, double pri )
                  :TQObject( parent, name )
 {
-    m_strName = TQString::tqfromLatin1( name );
+    m_strName = TQString::fromLatin1( name );
     m_dblPriority = pri;
 }
 
@@ -171,32 +171,32 @@ TQString KURIFilterData::iconName()
             case KURIFilterData::EXECUTABLE:
             {
                 TQString exeName = m_pURI.url();
-                exeName = exeName.mid( exeName.tqfindRev( '/' ) + 1 ); // strip path if given
+                exeName = exeName.mid( exeName.findRev( '/' ) + 1 ); // strip path if given
                 KService::Ptr service = KService::serviceByDesktopName( exeName );
-                if (service && service->icon() != TQString::tqfromLatin1( "unknown" ))
+                if (service && service->icon() != TQString::fromLatin1( "unknown" ))
                     m_strIconName = service->icon();
-                // Try to tqfind an icon with the same name as the binary (useful for non-kde apps)
+                // Try to find an icon with the same name as the binary (useful for non-kde apps)
                 else if ( !KGlobal::iconLoader()->loadIcon( exeName, KIcon::NoGroup, 16, KIcon::DefaultState, 0, true ).isNull() )
                     m_strIconName = exeName;
                 else
                     // not found, use default
-                    m_strIconName = TQString::tqfromLatin1("exec");
+                    m_strIconName = TQString::fromLatin1("exec");
                 break;
             }
             case KURIFilterData::HELP:
             {
-                m_strIconName = TQString::tqfromLatin1("khelpcenter");
+                m_strIconName = TQString::fromLatin1("khelpcenter");
                 break;
             }
             case KURIFilterData::SHELL:
             {
-                m_strIconName = TQString::tqfromLatin1("konsole");
+                m_strIconName = TQString::fromLatin1("konsole");
                 break;
             }
             case KURIFilterData::ERROR:
             case KURIFilterData::BLOCKED:
             {
-                m_strIconName = TQString::tqfromLatin1("error");
+                m_strIconName = TQString::fromLatin1("error");
                 break;
             }
             default:
diff --git a/kio/kio/kurifilter.h b/kio/kio/kurifilter.h
index 0a6b01045..0960c1419 100644
--- a/kio/kio/kurifilter.h
+++ b/kio/kio/kurifilter.h
@@ -347,7 +347,7 @@ private:
  *
  * @short Abstract class for URI filter plugins.
  */
-class KIO_EXPORT KURIFilterPlugin : public TQObject
+class KIO_EXPORT KURIFilterPlugin : public QObject
 {
     Q_OBJECT
 
@@ -525,7 +525,7 @@ private:
  *
  * KURIFilter also allows richer data exchange through a simple
  * meta-object called @p KURIFilterData. Using this meta-object
- * you can tqfind out more information about the URL you want to
+ * you can find out more information about the URL you want to
  * filter. See KURIFilterData for examples and details.
  *
  * @short Filters a given URL into its proper format whenever possible.
@@ -550,7 +550,7 @@ public:
      * The given URL is filtered based on the specified list of filters.
      * If the list is empty all available filters would be used.
      *
-     * @param data object that tqcontains the URI to be filtered.
+     * @param data object that contains the URI to be filtered.
      * @param filters specify the list of filters to be used.
      *
      * @return a boolean indicating whether the URI has been changed
@@ -631,7 +631,7 @@ protected:
      * A protected constructor.
      *
      * This constructor creates a KURIFilter and
-     * initializes all plugins it can tqfind by invoking
+     * initializes all plugins it can find by invoking
      * loadPlugins.
      */
     KURIFilter();
diff --git a/kio/kio/kurlcompletion.cpp b/kio/kio/kurlcompletion.cpp
index 75a6fd106..88a566b5f 100644
--- a/kio/kio/kurlcompletion.cpp
+++ b/kio/kio/kurlcompletion.cpp
@@ -66,7 +66,7 @@ static bool expandEnv(TQString &);
 
 static TQString unescape(const TQString &text);
 
-// Permission tqmask for files that are executable by
+// Permission mask for files that are executable by
 // user, group or other
 #define MODE_EXE (S_IXUSR | S_IXGRP | S_IXOTH)
 
@@ -330,7 +330,7 @@ public:
 	// Is the initial string a URL, or just a path (whether absolute or relative)
 	bool isURL() const { return m_isURL; }
 
-	void filter( bool tqreplace_user_dir, bool tqreplace_env );
+	void filter( bool replace_user_dir, bool replace_env );
 
 private:
 	void init(const TQString &url, const TQString &cwd);
@@ -363,9 +363,9 @@ void KURLCompletion::MyURL::init(const TQString &url, const TQString &cwd)
 	// Special shortcuts for "man:" and "info:"
 	if ( url_copy[0] == '#' ) {
 		if ( url_copy[1] == '#' )
-			url_copy.tqreplace( 0, 2, TQString("info:") );
+			url_copy.replace( 0, 2, TQString("info:") );
 		else
-			url_copy.tqreplace( 0, 1, TQString("man:") );
+			url_copy.replace( 0, 1, TQString("man:") );
 	}
 
 	// Look for a protocol in 'url'
@@ -414,11 +414,11 @@ KURLCompletion::MyURL::~MyURL()
 	delete m_kurl;
 }
 
-void KURLCompletion::MyURL::filter( bool tqreplace_user_dir, bool tqreplace_env )
+void KURLCompletion::MyURL::filter( bool replace_user_dir, bool replace_env )
 {
 	TQString d = dir() + file();
-	if ( tqreplace_user_dir ) expandTilde( d );
-	if ( tqreplace_env ) expandEnv( d );
+	if ( replace_user_dir ) expandTilde( d );
+	if ( replace_env ) expandEnv( d );
 	m_kurl->setPath( d );
 }
 
@@ -455,8 +455,8 @@ public:
 	TQString cwd; // "current directory" = base dir for completion
 
 	KURLCompletion::Mode mode; // ExeCompletion, FileCompletion, DirCompletion
-	bool tqreplace_env;
-	bool tqreplace_home;
+	bool replace_env;
+	bool replace_home;
 	bool complete_url; // if true completing a URL (i.e. 'prepend' is a URL), otherwise a path
 
 	KIO::ListJob *list_job; // kio job to list directories
@@ -511,8 +511,8 @@ void KURLCompletion::init()
 
 	d->cwd = TQDir::homeDirPath();
 
-	d->tqreplace_home = true;
-	d->tqreplace_env = true;
+	d->replace_home = true;
+	d->replace_env = true;
 	d->last_no_hidden = false;
 	d->last_compl_type = 0;
 	d->list_job = 0L;
@@ -547,24 +547,24 @@ void KURLCompletion::setMode( Mode mode )
 	d->mode = mode;
 }
 
-bool KURLCompletion::tqreplaceEnv() const
+bool KURLCompletion::replaceEnv() const
 {
-	return d->tqreplace_env;
+	return d->replace_env;
 }
 
-void KURLCompletion::setReplaceEnv( bool tqreplace )
+void KURLCompletion::setReplaceEnv( bool replace )
 {
-	d->tqreplace_env = tqreplace;
+	d->replace_env = replace;
 }
 
-bool KURLCompletion::tqreplaceHome() const
+bool KURLCompletion::replaceHome() const
 {
-	return d->tqreplace_home;
+	return d->replace_home;
 }
 
-void KURLCompletion::setReplaceHome( bool tqreplace )
+void KURLCompletion::setReplaceHome( bool replace )
 {
-	d->tqreplace_home = tqreplace;
+	d->replace_home = replace;
 }
 
 /*
@@ -592,16 +592,16 @@ TQString KURLCompletion::makeCompletion(const TQString &text)
 
 	// Environment variables
 	//
-	if ( d->tqreplace_env && envCompletion( url, &match ) )
+	if ( d->replace_env && envCompletion( url, &match ) )
 		return match;
 
 	// User directories
 	//
-	if ( d->tqreplace_home && userCompletion( url, &match ) )
+	if ( d->replace_home && userCompletion( url, &match ) )
 		return match;
 
 	// Replace user directories and variables
-	url.filter( d->tqreplace_home, d->tqreplace_env );
+	url.filter( d->replace_home, d->replace_env );
 
 	//kdDebug() << "Filtered: proto=" << url.protocol()
 	//          << ", dir=" << url.dir()
@@ -786,7 +786,7 @@ bool KURLCompletion::envCompletion(const MyURL &url, TQString *match)
 		while ( *env ) {
 			TQString s = TQString::fromLocal8Bit( *env );
 
-			int pos = s.tqfind('=');
+			int pos = s.find('=');
 
 			if ( pos == -1 )
 				pos = s.length();
@@ -1370,23 +1370,23 @@ void KURLCompletion::customEvent(TQCustomEvent *e)
 }
 
 // static
-TQString KURLCompletion::tqreplacedPath( const TQString& text, bool tqreplaceHome, bool tqreplaceEnv )
+TQString KURLCompletion::replacedPath( const TQString& text, bool replaceHome, bool replaceEnv )
 {
 	if ( text.isEmpty() )
 		return text;
 
-	MyURL url( text, TQString::null ); // no need to tqreplace something of our current cwd
+	MyURL url( text, TQString::null ); // no need to replace something of our current cwd
 	if ( !url.kurl()->isLocalFile() )
 		return text;
 
-	url.filter( tqreplaceHome, tqreplaceEnv );
+	url.filter( replaceHome, replaceEnv );
 	return url.dir() + url.file();
 }
 
 
-TQString KURLCompletion::tqreplacedPath( const TQString& text )
+TQString KURLCompletion::replacedPath( const TQString& text )
 {
-	return tqreplacedPath( text, d->tqreplace_home, d->tqreplace_env );
+	return replacedPath( text, d->replace_home, d->replace_env );
 }
 
 /////////////////////////////////////////////////////////
@@ -1407,7 +1407,7 @@ static bool expandEnv( TQString &text )
 
 	bool expanded = false;
 
-	while ( (pos = text.tqfind('$', pos)) != -1 ) {
+	while ( (pos = text.find('$', pos)) != -1 ) {
 
 		// Skip escaped '$'
 		//
@@ -1419,8 +1419,8 @@ static bool expandEnv( TQString &text )
 		else {
 			// Find the end of the variable = next '/' or ' '
 			//
-			int pos2 = text.tqfind( ' ', pos+1 );
-			int pos_tmp = text.tqfind( '/', pos+1 );
+			int pos2 = text.find( ' ', pos+1 );
+			int pos_tmp = text.find( '/', pos+1 );
 
 			if ( pos2 == -1 || (pos_tmp != -1 && pos_tmp < pos2) )
 				pos2 = pos_tmp;
@@ -1439,7 +1439,7 @@ static bool expandEnv( TQString &text )
 
 				if ( !value.isEmpty() ) {
 					expanded = true;
-					text.tqreplace( pos, len, value );
+					text.replace( pos, len, value );
 					pos = pos + value.length();
 				}
 				else {
@@ -1467,8 +1467,8 @@ static bool expandTilde(TQString &text)
 
 	// Find the end of the user name = next '/' or ' '
 	//
-	int pos2 = text.tqfind( ' ', 1 );
-	int pos_tmp = text.tqfind( '/', 1 );
+	int pos2 = text.find( ' ', 1 );
+	int pos_tmp = text.find( '/', 1 );
 
 	if ( pos2 == -1 || (pos_tmp != -1 && pos_tmp < pos2) )
 		pos2 = pos_tmp;
@@ -1483,12 +1483,12 @@ static bool expandTilde(TQString &text)
 		TQString user = text.mid( 1, pos2-1 );
 		TQString dir;
 
-		// A single ~ is tqreplaced with $HOME
+		// A single ~ is replaced with $HOME
 		//
 		if ( user.isEmpty() ) {
 			dir = TQDir::homeDirPath();
 		}
-		// ~user is tqreplaced with the dir from passwd
+		// ~user is replaced with the dir from passwd
 		//
 		else {
 			struct passwd *pw = ::getpwnam( user.local8Bit() );
@@ -1501,7 +1501,7 @@ static bool expandTilde(TQString &text)
 
 		if ( !dir.isEmpty() ) {
 			expanded = true;
-			text.tqreplace(0, pos2, dir);
+			text.replace(0, pos2, dir);
 		}
 	}
 
diff --git a/kio/kio/kurlcompletion.h b/kio/kio/kurlcompletion.h
index d2759ae5d..a06d7dc4b 100644
--- a/kio/kio/kurlcompletion.h
+++ b/kio/kio/kurlcompletion.h
@@ -119,34 +119,34 @@ public:
 
 	/**
 	 * Checks whether environment variables are completed and
-	 * whether they are tqreplaced internally while tqfinding completions.
+	 * whether they are replaced internally while finding completions.
 	 * Default is enabled.
-	 * @return true if environment vvariables will be tqreplaced
+	 * @return true if environment vvariables will be replaced
 	 */
-	virtual bool tqreplaceEnv() const;
+	virtual bool replaceEnv() const;
 
 	/**
-	 * Enables/disables completion and tqreplacement (internally) of
+	 * Enables/disables completion and replacement (internally) of
 	 * environment variables in URLs. Default is enabled.
-	 * @param tqreplace true to tqreplace environment variables
+	 * @param replace true to replace environment variables
 	 */
-	virtual void setReplaceEnv( bool tqreplace );
+	virtual void setReplaceEnv( bool replace );
 
 	/**
 	 * Returns whether ~username is completed and whether ~username
-	 * is tqreplaced internally with the user's home directory while
-	 * tqfinding completions. Default is enabled.
-	 * @return true to tqreplace tilde with the home directory
+	 * is replaced internally with the user's home directory while
+	 * finding completions. Default is enabled.
+	 * @return true to replace tilde with the home directory
 	 */
-	virtual bool tqreplaceHome() const;
+	virtual bool replaceHome() const;
 
 	/**
-	 * Enables/disables completion of ~username and tqreplacement
+	 * Enables/disables completion of ~username and replacement
 	 * (internally) of ~username with the user's home directory.
 	 * Default is enabled.
-	 * @param tqreplace true to tqreplace tilde with the home directory
+	 * @param replace true to replace tilde with the home directory
 	 */
-	virtual void setReplaceHome( bool tqreplace );
+	virtual void setReplaceHome( bool replace );
 
 	/**
 	 * Replaces username and/or environment variables, depending on the
@@ -157,14 +157,14 @@ public:
 	 * @return the path or URL resulting from this operation. If you
          * want to convert it to a KURL, use KURL::fromPathOrURL.
 	 */
-	TQString tqreplacedPath( const TQString& text );
+	TQString replacedPath( const TQString& text );
 
 	/**
 	 * @internal I'll let ossi add a real one to KShell :)
 	 * @since 3.2
 	*/
-	static TQString tqreplacedPath( const TQString& text,
-                                     bool tqreplaceHome, bool tqreplaceEnv = true );
+	static TQString replacedPath( const TQString& text,
+                                     bool replaceHome, bool replaceEnv = true );
 
 	class MyURL;
 protected:
diff --git a/kio/kio/kuserprofile.cpp b/kio/kio/kuserprofile.cpp
index 690b3ff96..b7ef68c76 100644
--- a/kio/kio/kuserprofile.cpp
+++ b/kio/kio/kuserprofile.cpp
@@ -165,7 +165,7 @@ KServiceTypeProfile::OfferList KServiceTypeProfile::offers( const TQString& _ser
         if (_genericServiceType.isEmpty() /*no constraint*/ || (*it)->hasServiceType( _genericServiceType ))
         {
             // Check that we don't already have it ;)
-            if ( serviceList.tqfind( (*it)->desktopEntryPath() ) == serviceList.end() )
+            if ( serviceList.find( (*it)->desktopEntryPath() ) == serviceList.end() )
             {
                 bool allow = (*it)->allowAsDefault();
                 KServiceOffer o( (*it), (*it)->initialPreferenceForMimeType(_servicetype), allow );
@@ -215,7 +215,7 @@ int KServiceTypeProfile::preference( const TQString& _service ) const
   KService::Ptr service = KService::serviceByName( _service );
   if (!service)
     return 0;
-  TQMap<TQString,Service>::ConstIterator it = m_mapServices.tqfind( service->storageId() );
+  TQMap<TQString,Service>::ConstIterator it = m_mapServices.find( service->storageId() );
   if ( it == m_mapServices.end() )
     return 0;
 
@@ -233,7 +233,7 @@ bool KServiceTypeProfile::allowAsDefault( const TQString& _service ) const
     return false;
 
   // Look what the user says ...
-  TQMap<TQString,Service>::ConstIterator it = m_mapServices.tqfind( service->storageId() );
+  TQMap<TQString,Service>::ConstIterator it = m_mapServices.find( service->storageId() );
   if ( it == m_mapServices.end() )
     return 0;
 
@@ -269,8 +269,8 @@ KServiceTypeProfile::OfferList KServiceTypeProfile::offers() const
     //kdDebug(7014) << "KServiceTypeProfile::offers considering " << (*it)->name() << endl;
     if ( m_strGenericServiceType.isEmpty() || (*it)->hasServiceType( m_strGenericServiceType ) )
     {
-      // Now look into the profile, to tqfind this service's preference.
-      TQMap<TQString,Service>::ConstIterator it2 = m_mapServices.tqfind( (*it)->storageId() );
+      // Now look into the profile, to find this service's preference.
+      TQMap<TQString,Service>::ConstIterator it2 = m_mapServices.find( (*it)->storageId() );
 
       if( it2 != m_mapServices.end() )
       {
diff --git a/kio/kio/kuserprofile.h b/kio/kio/kuserprofile.h
index 1282d182b..061657625 100644
--- a/kio/kio/kuserprofile.h
+++ b/kio/kio/kuserprofile.h
@@ -106,7 +106,7 @@ private:
  * It consists of a list of services (service offers) for the service type
  * that is sorted by the user's preference.
  * KTrader uses KServiceTypeProfile to sort its results, so usually
- * you can just use KTrader to tqfind the user's preferred service.
+ * you can just use KTrader to find the user's preferred service.
  *
  * @see KService
  * @see KServiceType
diff --git a/kio/kio/kzip.cpp b/kio/kio/kzip.cpp
index 46bd39725..6f29bb264 100644
--- a/kio/kio/kzip.cpp
+++ b/kio/kio/kzip.cpp
@@ -60,7 +60,7 @@ static void transformToMsDos(const TQDateTime& dt, char* buffer)
 {
     if ( dt.isValid() )
     {
-        const TQ_UINT16 time =
+        const Q_UINT16 time =
              ( dt.time().hour() << 11 )    // 5 bit hour
            | ( dt.time().minute() << 5 )   // 6 bit minute
            | ( dt.time().second() >> 1 );  // 5 bit double seconds
@@ -68,7 +68,7 @@ static void transformToMsDos(const TQDateTime& dt, char* buffer)
         buffer[0] = char(time);
         buffer[1] = char(time >> 8);
 
-        const TQ_UINT16 date =
+        const Q_UINT16 date =
              ( ( dt.date().year() - 1980 ) << 9 ) // 7 bit year 1980-based
            | ( dt.date().month() << 5 )           // 4 bit month
            | ( dt.date().day() );                 // 5 bit day
@@ -87,13 +87,13 @@ static void transformToMsDos(const TQDateTime& dt, char* buffer)
 
 static time_t transformFromMsDos(const char* buffer)
 {
-    TQ_UINT16 time = (uchar)buffer[0] | ( (uchar)buffer[1] << 8 );
+    Q_UINT16 time = (uchar)buffer[0] | ( (uchar)buffer[1] << 8 );
     int h = time >> 11;
     int m = ( time & 0x7ff ) >> 5;
     int s = ( time & 0x1f ) * 2 ;
     TQTime qt(h, m, s);
 
-    TQ_UINT16 date = (uchar)buffer[2] | ( (uchar)buffer[3] << 8 );
+    Q_UINT16 date = (uchar)buffer[2] | ( (uchar)buffer[3] << 8 );
     int y = ( date >> 9 ) + 1980;
     int o = ( date & 0x1ff ) >> 5;
     int d = ( date & 0x1f );
@@ -148,7 +148,7 @@ static bool parseExtTimestamp(const char *buffer, int size, bool islocal,
   buffer += 1;
   size -= 1;
 
-  if (flags & 1) {		// tqcontains modification time
+  if (flags & 1) {		// contains modification time
     if (size < 4) {
       kdDebug(7040) << "premature end of extended timestamp (#2)" << endl;
       return false;
@@ -165,7 +165,7 @@ static bool parseExtTimestamp(const char *buffer, int size, bool islocal,
     return true;
   }/*end if*/
 
-  if (flags & 2) {		// tqcontains last access time
+  if (flags & 2) {		// contains last access time
     if (size < 4) {
       kdDebug(7040) << "premature end of extended timestamp (#3)" << endl;
       return true;
@@ -176,7 +176,7 @@ static bool parseExtTimestamp(const char *buffer, int size, bool islocal,
     size -= 4;
   }/*end if*/
 
-  if (flags & 4) {		// tqcontains creation time
+  if (flags & 4) {		// contains creation time
     if (size < 4) {
       kdDebug(7040) << "premature end of extended timestamp (#4)" << endl;
       return true;
@@ -234,7 +234,7 @@ static bool parseInfoZipUnixOld(const char *buffer, int size, bool islocal,
   */
 static bool parseInfoZipUnixNew(const char *buffer, int size, bool islocal,
 			ParseFileInfo &pfi) {
-  if (!islocal) {	// tqcontains nothing in central field
+  if (!islocal) {	// contains nothing in central field
     pfi.newinfounix = true;
     return true;
   }/*end if*/
@@ -417,7 +417,7 @@ bool KZip::openArchive( int mode )
     uint offset = 0; // holds offset, where we read
     int n;
 
-    // tqcontains information gathered from the local file headers
+    // contains information gathered from the local file headers
     TQAsciiDict<ParseFileInfo> pfi_map(1009, true /*case sensitive */, true /*copy keys*/);
     pfi_map.setAutoDelete(true);
 
@@ -462,9 +462,9 @@ kdDebug(7040) << "dev->at() now : " << dev->at() << endl;
 	    int compression_mode = (uchar)buffer[2] | (uchar)buffer[3] << 8;
 	    time_t mtime = transformFromMsDos( buffer+4 );
 
-	    TQ_LONG compr_size = (uchar)buffer[12] | (uchar)buffer[13] << 8
+	    Q_LONG compr_size = (uchar)buffer[12] | (uchar)buffer[13] << 8
 	    			| (uchar)buffer[14] << 16 | (uchar)buffer[15] << 24;
-	    TQ_LONG uncomp_size = (uchar)buffer[16] | (uchar)buffer[17] << 8
+	    Q_LONG uncomp_size = (uchar)buffer[16] | (uchar)buffer[17] << 8
 	    			| (uchar)buffer[18] << 16 | (uchar)buffer[19] << 24;
 	    int namelen = (uchar)buffer[20] | (uchar)buffer[21] << 8;
 	    int extralen = (uchar)buffer[22] | (uchar)buffer[23] << 8;
@@ -512,7 +512,7 @@ kdDebug(7040) << "dev->at() now : " << dev->at() << endl;
             // the file and we look for the signature 'PK\7\8'.
             if ( gpf & 8 )
             {
-	    	// here we have to read through the compressed data to tqfind
+	    	// here we have to read through the compressed data to find
 		// the next PKxx
 	        kdDebug(7040) << "trying to seek for next PK78" << endl;
                 bool foundSignature = false;
@@ -563,7 +563,7 @@ kdDebug(7040) << "dev->at() now : " << dev->at() << endl;
             else
             {
 	    	// here we skip the compressed data and jump to the next header
-	        kdDebug(7040) << "general purpose bit flag indicates, that local file header tqcontains valid size" << endl;
+	        kdDebug(7040) << "general purpose bit flag indicates, that local file header contains valid size" << endl;
 		// check if this could be a symbolic link
 		if (compression_mode == NoCompression
 	    		&& uncomp_size <= max_path_len
@@ -578,10 +578,10 @@ kdDebug(7040) << "dev->at() now : " << dev->at() << endl;
 		    }
 		} else {
 
-	            if ( compr_size > (TQ_LONG)dev->size() )
+	            if ( compr_size > (Q_LONG)dev->size() )
 		    {
 		    	// here we cannot trust the compressed size, so scan through the compressed
-			// data to tqfind the next header
+			// data to find the next header
 			bool foundSignature = false;
 
 			while (!foundSignature)
@@ -736,7 +736,7 @@ kdDebug(7040) << "dev->at() now : " << dev->at() << endl;
 		else Q_ASSERT(access & S_IFDIR);
             }
 
-            int pos = name.tqfindRev( '/' );
+            int pos = name.findRev( '/' );
             if ( pos == -1 )
                 entryName = name;
             else
@@ -782,10 +782,10 @@ kdDebug(7040) << "dev->at() now : " << dev->at() << endl;
                 }
                 else
                 {
-                    // In some tar files we can tqfind dir/./file => call cleanDirPath
+                    // In some tar files we can find dir/./file => call cleanDirPath
                     TQString path = TQDir::cleanDirPath( name.left( pos ) );
                     // Ensure container directory exists, create otherwise
-                    KArchiveDirectory * tdir = tqfindOrCreate( path );
+                    KArchiveDirectory * tdir = findOrCreate( path );
                     tdir->addEntry(entry);
                 }
             }
@@ -800,7 +800,7 @@ kdDebug(7040) << "dev->at() now : " << dev->at() << endl;
         else if ( startOfFile )
         {
             // The file does not start with any ZIP header (e.g. self-extractable ZIP files)
-            // Therefore we need to tqfind the first PK\003\004 (local header)
+            // Therefore we need to find the first PK\003\004 (local header)
             kdDebug(7040) << "Try to skip start of file" << endl;
             startOfFile = false;
             bool foundSignature = false;
@@ -871,9 +871,9 @@ bool KZip::closeArchive()
     char buffer[ 22 ]; // first used for 12, then for 22 at the end
     uLong crc = crc32(0L, Z_NULL, 0);
 
-    TQ_LONG centraldiroffset = device()->at();
+    Q_LONG centraldiroffset = device()->at();
     //kdDebug(7040) << "closearchive: centraldiroffset: " << centraldiroffset << endl;
-    TQ_LONG atbackup = centraldiroffset;
+    Q_LONG atbackup = centraldiroffset;
     TQPtrListIterator<KZipFileEntry> it( d->m_fileList );
 
     for ( ; it.current() ; ++it )
@@ -994,7 +994,7 @@ bool KZip::closeArchive()
         if ( !ok )
             return false;
     }
-    TQ_LONG centraldirendoffset = device()->at();
+    Q_LONG centraldirendoffset = device()->at();
     //kdDebug(7040) << "closearchive: centraldirendoffset: " << centraldirendoffset << endl;
     //kdDebug(7040) << "closearchive: device()->at(): " << device()->at() << endl;
 
@@ -1133,13 +1133,13 @@ bool KZip::prepareWriting_impl(const TQString &name, const TQString &user,
     // Find or create parent dir
     KArchiveDirectory* parentDir = rootDir();
     TQString fileName( name );
-    int i = name.tqfindRev( '/' );
+    int i = name.findRev( '/' );
     if ( i != -1 )
     {
         TQString dir = name.left( i );
         fileName = name.mid( i + 1 );
         //kdDebug(7040) << "KZip::prepareWriting ensuring " << dir << " exists. fileName=" << fileName << endl;
-        parentDir = tqfindOrCreate( dir );
+        parentDir = findOrCreate( dir );
     }
 
     // construct a KZipFileEntry and add it to list
@@ -1212,7 +1212,7 @@ bool KZip::prepareWriting_impl(const TQString &name, const TQString &user,
         extfield[1] = 'T';
         extfield[2] = 13; // data size
         extfield[3] = 0;
-        extfield[4] = 1 | 2 | 4;	// tqcontains mtime, atime, ctime
+        extfield[4] = 1 | 2 | 4;	// contains mtime, atime, ctime
 
         extfield[5] = char(mtime);
         extfield[6] = char(mtime >> 8);
@@ -1383,9 +1383,9 @@ bool KZip::writeData_impl(const char * c, uint i)
     // and they didn't mention it in their docs...
     d->m_crc = crc32(d->m_crc, (const Bytef *) c , i);
 
-    TQ_LONG written = d->m_currentDev->writeBlock( c, i );
+    Q_LONG written = d->m_currentDev->writeBlock( c, i );
     //kdDebug(7040) << "KZip::writeData wrote " << i << " bytes." << endl;
-    bool ok = written == (TQ_LONG)i;
+    bool ok = written == (Q_LONG)i;
     if ( !ok )
         abort();
     return ok;
@@ -1453,7 +1453,7 @@ TQIODevice* KZipFileEntry::device() const
         return filterDev;
     }
 
-    kdError() << "This zip file tqcontains files compressed with method "
+    kdError() << "This zip file contains files compressed with method "
               << encoding() <<", this method is currently not supported by KZip,"
               <<" please use a command-line tool to handle this file." << endl;
     return 0L;
diff --git a/kio/kio/kzip.h b/kio/kio/kzip.h
index 26bfc71d3..291f827f8 100644
--- a/kio/kio/kzip.h
+++ b/kio/kio/kzip.h
@@ -230,8 +230,8 @@ public:
       {}*/
     KZipFileEntry( KZip* zip, const TQString& name, int access, int date,
                    const TQString& user, const TQString& group, const TQString& symlink,
-                   const TQString& path, TQ_LONG start, TQ_LONG uncompressedSize,
-                   int encoding, TQ_LONG compressedSize) :
+                   const TQString& path, Q_LONG start, Q_LONG uncompressedSize,
+                   int encoding, Q_LONG compressedSize) :
         KArchiveFile( zip, name, access, date, user, group, symlink,
                       start, uncompressedSize ),
         m_crc(0),
@@ -241,14 +241,14 @@ public:
         m_path( path )
     {}
     int encoding() const { return m_encoding; }
-    TQ_LONG compressedSize() const { return m_compressedSize; }
+    Q_LONG compressedSize() const { return m_compressedSize; }
 
     /// Only used when writing
-    void setCompressedSize(TQ_LONG compressedSize) { m_compressedSize = compressedSize; }
+    void setCompressedSize(Q_LONG compressedSize) { m_compressedSize = compressedSize; }
 
     /// Header start: only used when writing
-    void setHeaderStart(TQ_LONG headerstart) { m_headerStart = headerstart; }
-    TQ_LONG headerStart() const {return m_headerStart; }
+    void setHeaderStart(Q_LONG headerstart) { m_headerStart = headerstart; }
+    Q_LONG headerStart() const {return m_headerStart; }
 
     /// CRC: only used when writing
     unsigned long crc32() const { return m_crc; }
@@ -274,8 +274,8 @@ public:
 
 private:
     unsigned long m_crc;
-    TQ_LONG m_compressedSize;
-    TQ_LONG m_headerStart;
+    Q_LONG m_compressedSize;
+    Q_LONG m_headerStart;
     int m_encoding;
     TQString m_path;
     // KDE4: d pointer or at least some int for future extensions
diff --git a/kio/kio/lex.c b/kio/kio/lex.c
index 012981d1c..4b8cb21f7 100644
--- a/kio/kio/lex.c
+++ b/kio/kio/lex.c
@@ -656,7 +656,7 @@ yy_match:
 			}
 		while ( yy_base[yy_current_state] != 96 );
 
-yy_tqfind_action:
+yy_find_action:
 		yy_act = yy_accept[yy_current_state];
 		if ( yy_act == 0 )
 			{ /* have to back up */
@@ -678,7 +678,7 @@ do_action:	/* This label is used only to access EOF actions. */
 			*yy_cp = yy_hold_char;
 			yy_cp = yy_last_accepting_cpos;
 			yy_current_state = yy_last_accepting_state;
-			goto yy_tqfind_action;
+			goto yy_find_action;
 
 case 1:
 YY_RULE_SETUP
@@ -873,7 +873,7 @@ case YY_STATE_EOF(INITIAL):
 			else
 				{
 				yy_cp = yy_c_buf_p;
-				goto yy_tqfind_action;
+				goto yy_find_action;
 				}
 			}
 
@@ -926,7 +926,7 @@ case YY_STATE_EOF(INITIAL):
 
 				yy_cp = yy_c_buf_p;
 				yy_bp = yytext_ptr + YY_MORE_ADJ;
-				goto yy_tqfind_action;
+				goto yy_find_action;
 			}
 		break;
 		}
diff --git a/kio/kio/metainfojob.cpp b/kio/kio/metainfojob.cpp
index 28bc23633..3998584e3 100644
--- a/kio/kio/metainfojob.cpp
+++ b/kio/kio/metainfojob.cpp
@@ -86,7 +86,7 @@ void MetaInfoJob::removeItem(const KFileItem* item)
         determineNextFile();
     }
 
-    d->items.remove(d->items.tqfind(item));
+    d->items.remove(d->items.find(item));
 }
 
 void MetaInfoJob::determineNextFile()
diff --git a/kio/kio/metainfojob.h b/kio/kio/metainfojob.h
index 742841d93..3b96713fb 100644
--- a/kio/kio/metainfojob.h
+++ b/kio/kio/metainfojob.h
@@ -53,7 +53,7 @@ namespace KIO {
 
         /**
          * Returns a list of all available metainfo plugins. The list
-         * tqcontains the basenames of the plugins' .desktop files (no path,
+         * contains the basenames of the plugins' .desktop files (no path,
          * no .desktop).
 	 * @return the list of available meta info plugins
          */
diff --git a/kio/kio/netaccess.cpp b/kio/kio/netaccess.cpp
index 696690a8c..5189b93d6 100644
--- a/kio/kio/netaccess.cpp
+++ b/kio/kio/netaccess.cpp
@@ -293,7 +293,7 @@ void NetAccess::removeTempFile(const TQString& name)
 {
   if (!tmpfiles)
     return;
-  if (tmpfiles->tqcontains(name))
+  if (tmpfiles->contains(name))
   {
     unlink(TQFile::encodeName(name));
     tmpfiles->remove(name);
@@ -373,7 +373,7 @@ bool NetAccess::mkdirInternal( const KURL & url, int permissions,
 TQString NetAccess::mimetypeInternal( const KURL & url, TQWidget* window )
 {
   bJobOK = true; // success unless further error occurs
-  m_mimetype = TQString::tqfromLatin1("unknown");
+  m_mimetype = TQString::fromLatin1("unknown");
   KIO::Job * job = KIO::mimetype( url );
   job->setWindow (window);
   connect( job, TQT_SIGNAL( result (KIO::Job *) ),
@@ -403,7 +403,7 @@ TQString NetAccess::fish_executeInternal(const KURL & url, const TQString comman
     remoteTempFileName = tmpFile.name();
     // only need the filename KTempFile adds some KDE specific dirs
     // that probably does not exist on the remote side
-    int pos = remoteTempFileName.tqfindRev('/');
+    int pos = remoteTempFileName.findRev('/');
     remoteTempFileName = "/tmp/fishexec_" + remoteTempFileName.mid(pos + 1);
     tempPathUrl.setPath( remoteTempFileName );
     bJobOK = true; // success unless further error occurs
@@ -462,16 +462,16 @@ bool NetAccess::synchronousRunInternal( Job* job, TQWidget* window, TQByteArray*
   connect( job, TQT_SIGNAL( result (KIO::Job *) ),
            this, TQT_SLOT( slotResult (KIO::Job *) ) );
 
-  TQMetaObject *meta = job->tqmetaObject();
+  TQMetaObject *meta = job->metaObject();
 
   static const char dataSignal[] = "data(KIO::Job*,const TQByteArray&)";
-  if ( meta->tqfindSignal( dataSignal ) != -1 ) {
+  if ( meta->findSignal( dataSignal ) != -1 ) {
       connect( job, TQT_SIGNAL(data(KIO::Job*,const TQByteArray&)),
                this, TQT_SLOT(slotData(KIO::Job*,const TQByteArray&)) );
   }
 
   static const char redirSignal[] = "redirection(KIO::Job*,const KURL&)";
-  if ( meta->tqfindSignal( redirSignal ) != -1 ) {
+  if ( meta->findSignal( redirSignal ) != -1 ) {
       connect( job, TQT_SIGNAL(redirection(KIO::Job*,const KURL&)),
                this, TQT_SLOT(slotRedirection(KIO::Job*, const KURL&)) );
   }
@@ -495,7 +495,7 @@ void NetAccess::enter_loop()
   TQWidget dummy(0,0,WType_Dialog | WShowModal);
   dummy.setFocusPolicy( TQWidget::NoFocus );
   qt_enter_modal(&dummy);
-  tqApp->enter_loop();
+  qApp->enter_loop();
   qt_leave_modal(&dummy);
 }
 
@@ -515,7 +515,7 @@ void NetAccess::slotResult( KIO::Job * job )
   if ( m_metaData )
     *m_metaData = job->metaData();
 
-  tqApp->exit_loop();
+  qApp->exit_loop();
 }
 
 void NetAccess::slotData( KIO::Job*, const TQByteArray& data )
diff --git a/kio/kio/netaccess.h b/kio/kio/netaccess.h
index 3fb9103af..caeb7b985 100644
--- a/kio/kio/netaccess.h
+++ b/kio/kio/netaccess.h
@@ -56,7 +56,7 @@ namespace KIO {
    *
    * @short Provides an easy, synchronous interface to KIO file operations.
    */
-class KIO_EXPORT NetAccess : public TQObject
+class KIO_EXPORT NetAccess : public QObject
 {
   Q_OBJECT
 
@@ -92,7 +92,7 @@ public:
      * }
      * \endcode
      *
-     * Of course, your user interface will still process exposure/tqrepaint
+     * Of course, your user interface will still process exposure/repaint
      * events during the download.
      *
      * If the download fails, lastError() and lastErrorString() will be set.
diff --git a/kio/kio/observer.cpp b/kio/kio/observer.cpp
index b09b8b39a..2a468b1e6 100644
--- a/kio/kio/observer.cpp
+++ b/kio/kio/observer.cpp
@@ -101,7 +101,7 @@ void Observer::killJob( int progressId )
     KIO::Job * job = m_dctJobs[ progressId ];
     if (!job)
     {
-        kdWarning() << "Can't tqfind job to kill ! There is no job with progressId=" << progressId << " in this process" << endl;
+        kdWarning() << "Can't find job to kill ! There is no job with progressId=" << progressId << " in this process" << endl;
         return;
     }
     job->kill( false /* not quietly */ );
diff --git a/kio/kio/passdlg.cpp b/kio/kio/passdlg.cpp
index 11257abdd..83434906b 100644
--- a/kio/kio/passdlg.cpp
+++ b/kio/kio/passdlg.cpp
@@ -37,7 +37,7 @@ using namespace KIO;
 
 struct PasswordDialog::PasswordDialogPrivate
 {
-    TQGridLayout *tqlayout;
+    TQGridLayout *layout;
     TQLineEdit* userEdit;
     KLineEdit* passEdit;
     TQLabel* userNameLabel;
@@ -77,8 +77,8 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user,
     KConfig* cfg = KGlobal::config();
     KConfigGroupSaver saver( cfg, "Passwords" );
 
-    d->tqlayout = new TQGridLayout( main, 9, 3, spacingHint(), marginHint());
-    d->tqlayout->addColSpacing(1, 5);
+    d->layout = new TQGridLayout( main, 9, 3, spacingHint(), marginHint());
+    d->layout->addColSpacing(1, 5);
 
     // Row 0: pixmap  prompt
     TQLabel* lbl;
@@ -87,69 +87,69 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user,
     {
         lbl = new TQLabel( main );
         lbl->setPixmap( pix );
-        lbl->tqsetAlignment( Qt::AlignLeft|Qt::AlignVCenter );
-        lbl->setFixedSize( lbl->tqsizeHint() );
-        d->tqlayout->addWidget( lbl, 0, 0, Qt::AlignLeft );
+        lbl->setAlignment( Qt::AlignLeft|Qt::AlignVCenter );
+        lbl->setFixedSize( lbl->sizeHint() );
+        d->layout->addWidget( lbl, 0, 0, Qt::AlignLeft );
     }
     d->prompt = new TQLabel( main );
-    d->prompt->tqsetAlignment( Qt::AlignLeft|Qt::AlignVCenter|Qt::WordBreak );
-    d->tqlayout->addWidget( d->prompt, 0, 2, Qt::AlignLeft );
+    d->prompt->setAlignment( Qt::AlignLeft|Qt::AlignVCenter|Qt::WordBreak );
+    d->layout->addWidget( d->prompt, 0, 2, Qt::AlignLeft );
     if ( prompt.isEmpty() )
         setPrompt( i18n( "You need to supply a username and a password" ) );
     else
         setPrompt( prompt );
 
     // Row 1: Row Spacer
-    d->tqlayout->addRowSpacing( 1, 7 );
+    d->layout->addRowSpacing( 1, 7 );
 
     // Row 2-3: Reserved for an additional comment
 
     // Row 4: Username field
     d->userNameLabel = new TQLabel( i18n("&Username:"), main );
-    d->userNameLabel->tqsetAlignment( Qt::AlignVCenter | Qt::AlignLeft );
-    d->userNameLabel->setFixedSize( d->userNameLabel->tqsizeHint() );
+    d->userNameLabel->setAlignment( Qt::AlignVCenter | Qt::AlignLeft );
+    d->userNameLabel->setFixedSize( d->userNameLabel->sizeHint() );
     d->userNameHBox = new TQHBox( main );
 
     d->userEdit = new KLineEdit( d->userNameHBox );
-    TQSize s = d->userEdit->tqsizeHint();
+    TQSize s = d->userEdit->sizeHint();
     d->userEdit->setFixedHeight( s.height() );
     d->userEdit->setMinimumWidth( s.width() );
     d->userNameLabel->setBuddy( d->userEdit );
-    d->tqlayout->addWidget( d->userNameLabel, 4, 0 );
-    d->tqlayout->addWidget( d->userNameHBox, 4, 2 );
+    d->layout->addWidget( d->userNameLabel, 4, 0 );
+    d->layout->addWidget( d->userNameHBox, 4, 2 );
 
     // Row 5: Row spacer
-    d->tqlayout->addRowSpacing( 5, 4 );
+    d->layout->addRowSpacing( 5, 4 );
 
     // Row 6: Password field
     lbl = new TQLabel( i18n("&Password:"), main );
-    lbl->tqsetAlignment( Qt::AlignVCenter | Qt::AlignLeft );
-    lbl->setFixedSize( lbl->tqsizeHint() );
+    lbl->setAlignment( Qt::AlignVCenter | Qt::AlignLeft );
+    lbl->setFixedSize( lbl->sizeHint() );
     TQHBox* hbox = new TQHBox( main );
     d->passEdit = new KLineEdit( hbox );
     if ( cfg->readEntry("EchoMode", "OneStar") == "NoEcho" )
         d->passEdit->setEchoMode( TQLineEdit::NoEcho );
     else
         d->passEdit->setEchoMode( TQLineEdit::Password );
-    s = d->passEdit->tqsizeHint();
+    s = d->passEdit->sizeHint();
     d->passEdit->setFixedHeight( s.height() );
     d->passEdit->setMinimumWidth( s.width() );
     lbl->setBuddy( d->passEdit );
-    d->tqlayout->addWidget( lbl, 6, 0 );
-    d->tqlayout->addWidget( hbox, 6, 2 );
+    d->layout->addWidget( lbl, 6, 0 );
+    d->layout->addWidget( hbox, 6, 2 );
 
     if ( enableKeep )
     {
         // Row 7: Add spacer
-        d->tqlayout->addRowSpacing( 7, 4 );
+        d->layout->addRowSpacing( 7, 4 );
         // Row 8: Keep Password
         hbox = new TQHBox( main );
         d->keepCheckBox = new TQCheckBox( i18n("&Keep password"), hbox );
-        d->keepCheckBox->setFixedSize( d->keepCheckBox->tqsizeHint() );
+        d->keepCheckBox->setFixedSize( d->keepCheckBox->sizeHint() );
         d->keep = cfg->readBoolEntry("Keep", false );
         d->keepCheckBox->setChecked( d->keep );
         connect(d->keepCheckBox, TQT_SIGNAL(toggled( bool )), TQT_SLOT(slotKeep( bool )));
-        d->tqlayout->addWidget( hbox, 8, 2 );
+        d->layout->addWidget( hbox, 8, 2 );
     }
 
     // Configure necessary key-bindings and connect necessar slots and signals
@@ -165,7 +165,7 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user,
         d->userEdit->setFocus();
 
     d->userEditCombo = 0;
-//    setFixedSize( tqsizeHint() );
+//    setFixedSize( sizeHint() );
 }
 
 TQString PasswordDialog::username() const
@@ -198,7 +198,7 @@ static void calculateLabelSize(TQLabel *label)
    // Calculate a proper size for the text.
    {
        TQSimpleRichText rt(qt_text, label->font());
-       TQRect d = KGlobalSettings::desktopGeometry(label->tqtopLevelWidget());
+       TQRect d = KGlobalSettings::desktopGeometry(label->topLevelWidget());
 
        pref_width = d.width() / 4;
        rt.setWidth(pref_width-10);
@@ -239,14 +239,14 @@ void PasswordDialog::addCommentLine( const TQString& label,
     TQWidget *main = mainWidget();
 
     TQLabel* lbl = new TQLabel( label, main);
-    lbl->tqsetAlignment( Qt::AlignVCenter|Qt::AlignRight );
-    lbl->setFixedSize( lbl->tqsizeHint() );
-    d->tqlayout->addWidget( lbl, d->nRow+2, 0, Qt::AlignLeft );
+    lbl->setAlignment( Qt::AlignVCenter|Qt::AlignRight );
+    lbl->setFixedSize( lbl->sizeHint() );
+    d->layout->addWidget( lbl, d->nRow+2, 0, Qt::AlignLeft );
     lbl = new TQLabel( comment, main);
-    lbl->tqsetAlignment( Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak );
+    lbl->setAlignment( Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak );
     calculateLabelSize(lbl);
-    d->tqlayout->addWidget( lbl, d->nRow+2, 2, Qt::AlignLeft );
-    d->tqlayout->addRowSpacing( 3, 10 ); // Add a spacer
+    d->layout->addWidget( lbl, d->nRow+2, 2, Qt::AlignLeft );
+    d->layout->addRowSpacing( 3, 10 ); // Add a spacer
     d->nRow++;
 }
 
@@ -304,11 +304,11 @@ void PasswordDialog::setKnownLogins( const TQMap<TQString, TQString>& knownLogin
         delete d->userEdit;
         d->userEditCombo = new KComboBox( true, d->userNameHBox );
         d->userEdit = d->userEditCombo->lineEdit();
-        TQSize s = d->userEditCombo->tqsizeHint();
+        TQSize s = d->userEditCombo->sizeHint();
         d->userEditCombo->setFixedHeight( s.height() );
         d->userEditCombo->setMinimumWidth( s.width() );
         d->userNameLabel->setBuddy( d->userEditCombo );
-        d->tqlayout->addWidget( d->userNameHBox, 4, 2 );
+        d->layout->addWidget( d->userNameHBox, 4, 2 );
     }
 
     d->knownLogins = knownLogins;
@@ -321,7 +321,7 @@ void PasswordDialog::setKnownLogins( const TQMap<TQString, TQString>& knownLogin
 
 void PasswordDialog::slotActivated( const TQString& userName )
 {
-    TQMap<TQString, TQString>::ConstIterator it = d->knownLogins.tqfind( userName );
+    TQMap<TQString, TQString>::ConstIterator it = d->knownLogins.find( userName );
     if ( it != d->knownLogins.end() )
         setPassword( it.data() );
 }
diff --git a/kio/kio/paste.cpp b/kio/kio/paste.cpp
index 6a232d045..399350236 100644
--- a/kio/kio/paste.cpp
+++ b/kio/kio/paste.cpp
@@ -137,7 +137,7 @@ static KIO::CopyJob* chooseAndPaste( const KURL& u, TQMimeSource* data,
     if ( clipboard ) {
         data = TQApplication::clipboard()->data();
     }
-    const TQByteArray ba = data->tqencodedData( chosenFormat );
+    const TQByteArray ba = data->encodedData( chosenFormat );
     return pasteDataAsyncTo( new_url, ba );
 }
 #endif
@@ -147,13 +147,13 @@ KIO_EXPORT bool KIO::isClipboardEmpty()
 {
 #ifndef QT_NO_MIMECLIPBOARD
   TQMimeSource *data = TQApplication::clipboard()->data();
-  if ( data->provides( "text/uri-list" ) && data->tqencodedData( "text/uri-list" ).size() > 0 )
+  if ( data->provides( "text/uri-list" ) && data->encodedData( "text/uri-list" ).size() > 0 )
     return false;
 #else
   // Happens with some versions of Qt Embedded... :/
   // Guess.
   TQString data = TQApplication::clipboard()->text();
-  if(data.tqcontains("://"))
+  if(data.contains("://"))
 	  return false;
 #endif
   return true;
@@ -194,7 +194,7 @@ KIO::CopyJob* KIO::pasteMimeSource( TQMimeSource* data, const KURL& dest_url,
       if ( formats.size() > 1 ) {
           return chooseAndPaste( dest_url, data, formats, dialogText, widget, clipboard );
       }
-      ba = data->tqencodedData( formats.first() );
+      ba = data->encodedData( formats.first() );
   }
   if ( ba.size() == 0 )
   {
diff --git a/kio/kio/paste.h b/kio/kio/paste.h
index dceddad9e..a65e956e1 100644
--- a/kio/kio/paste.h
+++ b/kio/kio/paste.h
@@ -105,7 +105,7 @@ namespace KIO {
                                        bool clipboard = false );
 
   /**
-   * Checks whether the clipboard tqcontains any URLs.
+   * Checks whether the clipboard contains any URLs.
    * @return true if not
    * Not used anymore, wrong method name, so it will disappear in KDE4.
    */
diff --git a/kio/kio/pastedialog.cpp b/kio/kio/pastedialog.cpp
index dd9d947e8..480eaaba8 100644
--- a/kio/kio/pastedialog.cpp
+++ b/kio/kio/pastedialog.cpp
@@ -35,23 +35,23 @@ KIO::PasteDialog::PasteDialog( const TQString &caption, const TQString &label,
     : KDialogBase( parent, 0 /*name*/, true, caption, Ok|Cancel, Ok, true )
 {
     TQFrame *frame = makeMainWidget();
-    TQVBoxLayout *tqlayout = new TQVBoxLayout( frame, 0, spacingHint() );
+    TQVBoxLayout *layout = new TQVBoxLayout( frame, 0, spacingHint() );
 
     m_label = new TQLabel( label, frame );
-    tqlayout->addWidget( m_label );
+    layout->addWidget( m_label );
 
     m_lineEdit = new KLineEdit( value, frame );
-    tqlayout->addWidget( m_lineEdit );
+    layout->addWidget( m_lineEdit );
 
     m_lineEdit->setFocus();
     m_label->setBuddy( m_lineEdit );
 
-    tqlayout->addWidget( new TQLabel( i18n( "Data format:" ), frame ) );
+    layout->addWidget( new TQLabel( i18n( "Data format:" ), frame ) );
     m_comboBox = new TQComboBox( frame );
     m_comboBox->insertStringList( items );
-    tqlayout->addWidget( m_comboBox );
+    layout->addWidget( m_comboBox );
 
-    tqlayout->addStretch();
+    layout->addStretch();
 
     //connect( m_lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
     //    TQT_SLOT( slotEditTextChanged( const TQString & ) ) );
diff --git a/kio/kio/previewjob.cpp b/kio/kio/previewjob.cpp
index 9939880b5..3802093c1 100644
--- a/kio/kio/previewjob.cpp
+++ b/kio/kio/previewjob.cpp
@@ -96,7 +96,7 @@ struct KIO::PreviewJobPrivate
     // If the file to create a thumb for was a temp file, this is its name
     TQString tempName;
     // Over that, it's too much
-    unsigned long tqmaximumSize;
+    unsigned long maximumSize;
     // the size for the icon overlay
     int iconSize;
     // the transparency of the blended mimetype icon
@@ -163,7 +163,7 @@ void PreviewJob::startPreview()
     TQMap<TQString, KService::Ptr> mimeMap;
 
     for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
-        if (!d->enabledPlugins || d->enabledPlugins->tqcontains((*it)->desktopEntryName()))
+        if (!d->enabledPlugins || d->enabledPlugins->contains((*it)->desktopEntryName()))
     {
         TQStringList mimeTypes = (*it)->property("MimeTypes").toStringList();
         for (TQStringList::ConstIterator mt = mimeTypes.begin(); mt != mimeTypes.end(); ++mt)
@@ -176,7 +176,7 @@ void PreviewJob::startPreview()
     {
         PreviewItem item;
         item.item = it.current();
-        TQMap<TQString, KService::Ptr>::ConstIterator plugin = mimeMap.tqfind(it.current()->mimetype());
+        TQMap<TQString, KService::Ptr>::ConstIterator plugin = mimeMap.find(it.current()->mimetype());
         if (plugin == mimeMap.end()
             && (it.current()->mimetype() != "application/x-desktop")
             && (it.current()->mimetype() != "media/builtin-mydocuments")
@@ -187,7 +187,7 @@ void PreviewJob::startPreview()
             && (it.current()->mimetype() != "media/builtin-webbrowser"))
         {
             TQString mimeType = it.current()->mimetype();
-            plugin = mimeMap.tqfind(mimeType.tqreplace(TQRegExp("/.*"), "/*"));
+            plugin = mimeMap.find(mimeType.replace(TQRegExp("/.*"), "/*"));
 
             if (plugin == mimeMap.end())
             {
@@ -196,7 +196,7 @@ void PreviewJob::startPreview()
                 TQString parentMimeType = mimeInfo->parentMimeType();
                 while (!parentMimeType.isEmpty())
                 {
-                    plugin = mimeMap.tqfind(parentMimeType);
+                    plugin = mimeMap.find(parentMimeType);
                     if (plugin != mimeMap.end()) break;
 
                     KMimeType::Ptr parentMimeInfo = KMimeType::mimeType(parentMimeType);
@@ -215,10 +215,10 @@ void PreviewJob::startPreview()
                 {
                     if (textProperty.toBool())
                     {
-                        plugin = mimeMap.tqfind("text/plain");
+                        plugin = mimeMap.find("text/plain");
                         if (plugin == mimeMap.end())
                         {
-                            plugin = mimeMap.tqfind( "text/*" );
+                            plugin = mimeMap.find( "text/*" );
                         }
                     }
                 }
@@ -246,7 +246,7 @@ void PreviewJob::startPreview()
   // Read configuration value for the maximum allowed size
     KConfig * config = KGlobal::config();
     KConfigGroupSaver cgs( config, "PreviewSettings" );
-    d->tqmaximumSize = config->readNumEntry( "MaximumSize", 1024*1024 /* 1MB */ );
+    d->maximumSize = config->readNumEntry( "MaximumSize", 1024*1024 /* 1MB */ );
 
     if (bNeedCache)
     {
@@ -339,7 +339,7 @@ void PreviewJob::slotResult( KIO::Job *job )
                 }
                 else if ( (*it).m_uds == KIO::UDS_SIZE )
                     {
-                    if ( filesize_t((*it).m_long) > d->tqmaximumSize &&
+                    if ( filesize_t((*it).m_long) > d->maximumSize &&
                          !d->ignoreMaximumSize &&
                          !d->currentItem.plugin->property("IgnoreMaximumSize").toBool() )
                     {
@@ -553,7 +553,7 @@ TQStringList PreviewJob::availablePlugins()
     TQStringList result;
     KTrader::OfferList plugins = KTrader::self()->query("ThumbCreator");
     for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
-        if (!result.tqcontains((*it)->desktopEntryName()))
+        if (!result.contains((*it)->desktopEntryName()))
             result.append((*it)->desktopEntryName());
     return result;
 }
diff --git a/kio/kio/previewjob.h b/kio/kio/previewjob.h
index ea3875cd1..d7686505e 100644
--- a/kio/kio/previewjob.h
+++ b/kio/kio/previewjob.h
@@ -77,7 +77,7 @@ namespace KIO {
 
         /**
          * Returns a list of all available preview plugins. The list
-         * tqcontains the basenames of the plugins' .desktop files (no path,
+         * contains the basenames of the plugins' .desktop files (no path,
          * no .desktop).
 	 * @return the list of plugins
          */
diff --git a/kio/kio/progressbase.h b/kio/kio/progressbase.h
index fce482fb8..d9e3d8f96 100644
--- a/kio/kio/progressbase.h
+++ b/kio/kio/progressbase.h
@@ -47,7 +47,7 @@ namespace KIO
 * Add your GUI code to the constructor and implemement those virtual
 * methods which you need in order to display progress.
 *
-* E.g. tqStatusbarProgress only implements slotTotalSize(),
+* E.g. StatusbarProgress only implements slotTotalSize(),
 * slotPercent() and slotSpeed().
 *
 * Custom progress dialog will be used like this :
diff --git a/kio/kio/renamedlg.cpp b/kio/kio/renamedlg.cpp
index cca120266..fe830b2e3 100644
--- a/kio/kio/renamedlg.cpp
+++ b/kio/kio/renamedlg.cpp
@@ -317,11 +317,11 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption,
         TQLabel *lb = new KSqueezedTextLabel( sentence1.arg(d->dest.pathOrURL()), this );
         pLayout->addWidget(lb);
     }
-    TQHBoxLayout* tqlayout2 = new TQHBoxLayout();
-    pLayout->addLayout( tqlayout2 );
+    TQHBoxLayout* layout2 = new TQHBoxLayout();
+    pLayout->addLayout( layout2 );
 
     d->m_pLineEdit = new TQLineEdit( this );
-    tqlayout2->addWidget( d->m_pLineEdit );
+    layout2->addWidget( d->m_pLineEdit );
     TQString fileName = d->dest.fileName();
     d->m_pLineEdit->setText( KIO::decodeFileName( fileName ) );
     if ( d->bRename || d->bOverwrite )
@@ -329,58 +329,58 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption,
                 TQT_SLOT(enableRenameButton(const TQString &)));
     if ( d->bSuggestNewName )
     {
-        tqlayout2->addWidget( d->bSuggestNewName );
+        layout2->addWidget( d->bSuggestNewName );
         setTabOrder( d->m_pLineEdit, d->bSuggestNewName );
     }
 
     KSeparator* separator = new KSeparator( this );
     pLayout->addWidget( separator );
 
-    TQHBoxLayout* tqlayout = new TQHBoxLayout();
-    pLayout->addLayout( tqlayout );
+    TQHBoxLayout* layout = new TQHBoxLayout();
+    pLayout->addLayout( layout );
 
-    tqlayout->addStretch(1);
+    layout->addStretch(1);
 
     if ( d->bRename )
     {
-        tqlayout->addWidget( d->bRename );
+        layout->addWidget( d->bRename );
         setTabOrder( d->bRename, d->bCancel );
     }
     if ( d->bSkip )
     {
-        tqlayout->addWidget( d->bSkip );
+        layout->addWidget( d->bSkip );
         setTabOrder( d->bSkip, d->bCancel );
     }
     if ( d->bAutoSkip )
     {
-        tqlayout->addWidget( d->bAutoSkip );
+        layout->addWidget( d->bAutoSkip );
         setTabOrder( d->bAutoSkip, d->bCancel );
     }
     if ( d->bOverwrite )
     {
-        tqlayout->addWidget( d->bOverwrite );
+        layout->addWidget( d->bOverwrite );
         setTabOrder( d->bOverwrite, d->bCancel );
     }
     if ( d->bOverwriteAll )
     {
-        tqlayout->addWidget( d->bOverwriteAll );
+        layout->addWidget( d->bOverwriteAll );
         setTabOrder( d->bOverwriteAll, d->bCancel );
     }
     if ( d->bResume )
     {
-        tqlayout->addWidget( d->bResume );
+        layout->addWidget( d->bResume );
         setTabOrder( d->bResume, d->bCancel );
     }
     if ( d->bResumeAll )
     {
-        tqlayout->addWidget( d->bResumeAll );
+        layout->addWidget( d->bResumeAll );
         setTabOrder( d->bResumeAll, d->bCancel );
     }
 
     d->bCancel->setDefault( true );
-    tqlayout->addWidget( d->bCancel );
+    layout->addWidget( d->bCancel );
 
-    resize( tqsizeHint() );
+    resize( sizeHint() );
 }
 
 RenameDlg::~RenameDlg()
@@ -440,13 +440,13 @@ TQString RenameDlg::suggestName(const KURL& baseURL, const TQString& oldName)
   TQString dotSuffix, suggestedName;
   TQString basename = oldName;
 
-  int index = basename.tqfind( '.' );
+  int index = basename.find( '.' );
   if ( index != -1 ) {
     dotSuffix = basename.mid( index );
     basename.truncate( index );
   }
 
-  int pos = basename.tqfindRev( '_' );
+  int pos = basename.findRev( '_' );
   if(pos != -1 ){
     TQString tmp = basename.mid( pos+1 );
     bool ok;
@@ -456,7 +456,7 @@ TQString RenameDlg::suggestName(const KURL& baseURL, const TQString& oldName)
     }
     else {
      // yes there's already a number behind the _ so increment it by one
-      basename.tqreplace( pos+1, tmp.length(), TQString::number(number+1) );
+      basename.replace( pos+1, tmp.length(), TQString::number(number+1) );
       suggestedName = basename + dotSuffix;
     }
   }
diff --git a/kio/kio/scheduler.cpp b/kio/kio/scheduler.cpp
index eaa9af646..8ab080486 100644
--- a/kio/kio/scheduler.cpp
+++ b/kio/kio/scheduler.cpp
@@ -110,7 +110,7 @@ class KIO::Scheduler::ProtocolInfoDict : public TQDict<KIO::Scheduler::ProtocolI
 KIO::Scheduler::ProtocolInfo *
 KIO::Scheduler::ProtocolInfoDict::get(const TQString &protocol)
 {
-    ProtocolInfo *info = tqfind(protocol);
+    ProtocolInfo *info = find(protocol);
     if (!info)
     {
         info = new ProtocolInfo;
@@ -206,7 +206,7 @@ void Scheduler::_doJob(SimpleJob *job) {
        jobData->checkOnHold = checkOnHold;
        checkOnHold = false;
     }
-    extraJobData->tqreplace(job, jobData);
+    extraJobData->replace(job, jobData);
     newJobs.append(job);
     slaveTimer.start(0, true);
 #ifndef NDEBUG
@@ -217,7 +217,7 @@ void Scheduler::_doJob(SimpleJob *job) {
 
 void Scheduler::_scheduleJob(SimpleJob *job) {
     newJobs.removeRef(job);
-    JobData *jobData = extraJobData->tqfind(job);
+    JobData *jobData = extraJobData->find(job);
     if (!jobData)
 {
     kdFatal(7006) << "BUG! _ScheduleJob(): No extraJobData for job!" << endl;
@@ -237,7 +237,7 @@ void Scheduler::_cancelJob(SimpleJob *job) {
     if ( !slave  )
     {
         // was not yet running (don't call this on a finished job!)
-        JobData *jobData = extraJobData->tqfind(job);
+        JobData *jobData = extraJobData->find(job);
         if (!jobData)
            return; // I said: "Don't call this on a finished job!"
 
@@ -249,7 +249,7 @@ void Scheduler::_cancelJob(SimpleJob *job) {
         slave = slaveList->first();
         for(; slave; slave = slaveList->next())
         {
-           JobList *list = coSlaves.tqfind(slave);
+           JobList *list = coSlaves.find(slave);
            if (list && list->removeRef(job))
               break; // Job was found and removed.
                      // Fall through to kill the slave as well!
@@ -347,7 +347,7 @@ bool Scheduler::startJobScheduled(ProtocolInfo *protInfo)
        // 2 times in a row. The
        protInfo->skipCount = 0;
        job = protInfo->joblist.at(0);
-       slave = tqfindIdleSlave(protInfo, job, dummy );
+       slave = findIdleSlave(protInfo, job, dummy );
     }
     else
     {
@@ -357,7 +357,7 @@ bool Scheduler::startJobScheduled(ProtocolInfo *protInfo)
        for(uint i = 0; (i < protInfo->joblist.count()) && (i < 10); i++)
        {
           job = protInfo->joblist.at(i);
-          slave = tqfindIdleSlave(protInfo, job, exact);
+          slave = findIdleSlave(protInfo, job, exact);
           if (!firstSlave)
           {
              firstJob = job;
@@ -402,7 +402,7 @@ bool Scheduler::startJobScheduled(ProtocolInfo *protInfo)
 //       kdDebug(7006) << "scheduler: job started " << job << endl;
 
 
-    JobData *jobData = extraJobData->tqfind(job);
+    JobData *jobData = extraJobData->find(job);
     setupSlave(slave, job->url(), jobData->protocol, jobData->proxy, newSlave);
     job->start(slave);
 
@@ -414,7 +414,7 @@ bool Scheduler::startJobDirect()
 {
     debug_info();
     SimpleJob *job = newJobs.take(0);
-    JobData *jobData = extraJobData->tqfind(job);
+    JobData *jobData = extraJobData->find(job);
     if (!jobData)
     {
         kdFatal(7006) << "BUG! startjobDirect(): No extraJobData for job!"
@@ -428,7 +428,7 @@ bool Scheduler::startJobDirect()
     bool dummy;
 
     // Look for matching slave
-    Slave *slave = tqfindIdleSlave(protInfo, job, dummy);
+    Slave *slave = findIdleSlave(protInfo, job, dummy);
 
     if (!slave)
     {
@@ -478,13 +478,13 @@ static Slave *searchIdleList(SlaveList *idleSlaves, const KURL &url, const TQStr
     return 0;
 }
 
-Slave *Scheduler::tqfindIdleSlave(ProtocolInfo *, SimpleJob *job, bool &exact)
+Slave *Scheduler::findIdleSlave(ProtocolInfo *, SimpleJob *job, bool &exact)
 {
     Slave *slave = 0;
-    JobData *jobData = extraJobData->tqfind(job);
+    JobData *jobData = extraJobData->find(job);
     if (!jobData)
     {
-        kdFatal(7006) << "BUG! tqfindIdleSlave(): No extraJobData for job!" << endl;
+        kdFatal(7006) << "BUG! findIdleSlave(): No extraJobData for job!" << endl;
         return 0;
     }
     if (jobData->checkOnHold)
@@ -504,7 +504,7 @@ Slave *Scheduler::tqfindIdleSlave(ProtocolInfo *, SimpleJob *job, bool &exact)
           if ( bCanReuse )
           {
             KIO::MetaData outgoing = tJob->outgoingMetaData();
-            TQString resume = (!outgoing.tqcontains("resume")) ? TQString::null : outgoing["resume"];
+            TQString resume = (!outgoing.contains("resume")) ? TQString::null : outgoing["resume"];
             kdDebug(7006) << "Resume metadata is '" << resume << "'" << endl;
             bCanReuse = (resume.isEmpty() || resume == "0");
           }
@@ -543,8 +543,8 @@ Slave *Scheduler::createSlave(ProtocolInfo *protInfo, SimpleJob *job, const KURL
       idleSlaves->append(slave);
       connect(slave, TQT_SIGNAL(slaveDied(KIO::Slave *)),
                 TQT_SLOT(slotSlaveDied(KIO::Slave *)));
-      connect(slave, TQT_SIGNAL(slavetqStatus(pid_t,const TQCString &,const TQString &, bool)),
-                TQT_SLOT(slotSlavetqStatus(pid_t,const TQCString &, const TQString &, bool)));
+      connect(slave, TQT_SIGNAL(slaveStatus(pid_t,const TQCString &,const TQString &, bool)),
+                TQT_SLOT(slotSlaveStatus(pid_t,const TQCString &, const TQString &, bool)));
 
       connect(slave,TQT_SIGNAL(authorizationKey(const TQCString&, const TQCString&, bool)),
               sessionData,TQT_SLOT(slotAuthData(const TQCString&, const TQCString&, bool)));
@@ -564,7 +564,7 @@ Slave *Scheduler::createSlave(ProtocolInfo *protInfo, SimpleJob *job, const KURL
    return slave;
 }
 
-void Scheduler::slotSlavetqStatus(pid_t, const TQCString &, const TQString &, bool)
+void Scheduler::slotSlaveStatus(pid_t, const TQCString &, const TQString &, bool)
 {
 }
 
@@ -582,11 +582,11 @@ void Scheduler::_jobFinished(SimpleJob *job, Slave *slave)
     protInfo->activeSlaves.removeRef(slave);
     if (slave->isAlive())
     {
-       JobList *list = coSlaves.tqfind(slave);
+       JobList *list = coSlaves.find(slave);
        if (list)
        {
           assert(slave->isConnected());
-          assert(!coIdleSlaves->tqcontains(slave));
+          assert(!coIdleSlaves->contains(slave));
           coIdleSlaves->append(slave);
           if (!list->isEmpty())
              coSlaveTimer.start(0, true);
@@ -618,7 +618,7 @@ void Scheduler::slotSlaveDied(KIO::Slave *slave)
        urlOnHold = KURL();
     }
     idleSlaves->removeRef(slave);
-    JobList *list = coSlaves.tqfind(slave);
+    JobList *list = coSlaves.find(slave);
     if (list)
     {
        // coSlave dies, kill jobs waiting in queue
@@ -733,7 +733,7 @@ Scheduler::slotScheduleCoSlave()
         slave = nextSlave)
     {
         nextSlave = coIdleSlaves->next();
-        JobList *list = coSlaves.tqfind(slave);
+        JobList *list = coSlaves.find(slave);
         assert(list);
         if (list && !list->isEmpty())
         {
@@ -741,7 +741,7 @@ Scheduler::slotScheduleCoSlave()
            coIdleSlaves->removeRef(slave);
 //           kdDebug(7006) << "scheduler: job started " << job << endl;
 
-           assert(!coIdleSlaves->tqcontains(slave));
+           assert(!coIdleSlaves->contains(slave));
 
            KURL url =job->url();
            TQString host = url.host();
@@ -775,7 +775,7 @@ Scheduler::slotSlaveConnected()
     disconnect(slave, TQT_SIGNAL(connected()),
                this, TQT_SLOT(slotSlaveConnected()));
     emit slaveConnected(slave);
-    assert(!coIdleSlaves->tqcontains(slave));
+    assert(!coIdleSlaves->contains(slave));
     coIdleSlaves->append(slave);
     coSlaveTimer.start(0, true);
 }
@@ -784,7 +784,7 @@ void
 Scheduler::slotSlaveError(int errorNr, const TQString &errorMsg)
 {
     Slave *slave = (Slave *)sender();
-    if (!slave->isConnected() || (coIdleSlaves->tqfind(slave) != -1))
+    if (!slave->isConnected() || (coIdleSlaves->find(slave) != -1))
     {
        // Only forward to application if slave is idle or still connecting.
        emit slaveError(slave, errorNr, errorMsg);
@@ -805,7 +805,7 @@ Scheduler::_assignJobToSlave(KIO::Slave *slave, SimpleJob *job)
         return false;
     }
 
-    JobList *list = coSlaves.tqfind(slave);
+    JobList *list = coSlaves.find(slave);
     assert(list);
     if (!list)
     {
@@ -814,7 +814,7 @@ Scheduler::_assignJobToSlave(KIO::Slave *slave, SimpleJob *job)
         return false;
     }
 
-    assert(list->tqcontains(job) == 0);
+    assert(list->contains(job) == 0);
     list->append(job);
     coSlaveTimer.start(0, true); // Start job on timer event
 
@@ -837,7 +837,7 @@ Scheduler::_disconnectSlave(KIO::Slave *slave)
     }
     delete list;
     coIdleSlaves->removeRef(slave);
-    assert(!coIdleSlaves->tqcontains(slave));
+    assert(!coIdleSlaves->contains(slave));
     disconnect(slave, TQT_SIGNAL(connected()),
                this, TQT_SLOT(slotSlaveConnected()));
     disconnect(slave, TQT_SIGNAL(error(int, const TQString &)),
@@ -866,7 +866,7 @@ Scheduler::_registerWindow(TQWidget *wid)
       return;
 
    TQObject *obj = static_cast<TQObject *>(wid);
-   if (!m_windowList.tqcontains(obj))
+   if (!m_windowList.contains(obj))
    {
       // We must store the window Id because by the time
       // the destroyed signal is emitted we can no longer
@@ -890,7 +890,7 @@ Scheduler::slotUnregisterWindow(TQObject *obj)
    if (!obj)
       return;
 
-   TQMap<TQObject *, WId>::Iterator it = m_windowList.tqfind(obj);
+   TQMap<TQObject *, WId>::Iterator it = m_windowList.find(obj);
    if (it == m_windowList.end())
       return;
    WId windowId = it.data();
diff --git a/kio/kio/scheduler.h b/kio/kio/scheduler.h
index e90bf1f90..4a4f104ba 100644
--- a/kio/kio/scheduler.h
+++ b/kio/kio/scheduler.h
@@ -46,7 +46,7 @@ namespace KIO {
      *
      * <h3>1. Direct</h3>
      * This is the default. When you create a job the
-     * KIO::Scheduler will be notified and will tqfind either an existing
+     * KIO::Scheduler will be notified and will find either an existing
      * slave that is idle or it will create a new slave for the job.
      *
      * Example:
@@ -288,7 +288,7 @@ namespace KIO {
 
     public slots:
         void slotSlaveDied(KIO::Slave *slave);
-        void slotSlavetqStatus(pid_t pid, const TQCString &protocol,
+        void slotSlaveStatus(pid_t pid, const TQCString &protocol,
                              const TQString &host, bool connected);
     signals:
         void slaveConnected(KIO::Slave *slave);
@@ -330,7 +330,7 @@ namespace KIO {
         void _publishSlaveOnHold();
         void _registerWindow(TQWidget *wid);
         
-        Slave *tqfindIdleSlave(ProtocolInfo *protInfo, SimpleJob *job, bool &exact);
+        Slave *findIdleSlave(ProtocolInfo *protInfo, SimpleJob *job, bool &exact);
         Slave *createSlave(ProtocolInfo *protInfo, SimpleJob *job, const KURL &url);
         
 
diff --git a/kio/kio/sessiondata.cpp b/kio/kio/sessiondata.cpp
index 2381bde91..258f03e2a 100644
--- a/kio/kio/sessiondata.cpp
+++ b/kio/kio/sessiondata.cpp
@@ -236,8 +236,8 @@ SessionData::~SessionData()
 void SessionData::configDataFor( MetaData &configData, const TQString &proto,
                              const TQString & )
 {
-  if ( (proto.tqfind("http", 0, false) == 0 ) ||
-     (proto.tqfind("webdav", 0, false) == 0) )
+  if ( (proto.find("http", 0, false) == 0 ) ||
+     (proto.find("webdav", 0, false) == 0) )
   {
     if (!d->initDone)
         reset();
@@ -273,20 +273,20 @@ void SessionData::reset()
 
     // Get language settings...
     TQStringList languageList = KGlobal::locale()->languagesTwoAlpha();
-    TQStringList::Iterator it = languageList.tqfind( TQString::tqfromLatin1("C") );
+    TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") );
     if ( it != languageList.end() )
     {
-        if ( languageList.tqcontains( english ) > 0 )
+        if ( languageList.contains( english ) > 0 )
           languageList.remove( it );
         else
           (*it) = english;
     }
-    if ( !languageList.tqcontains( english ) )
+    if ( !languageList.contains( english ) )
        languageList.append( english );
 
     d->language = languageList.join( ", " );
 
-    d->charsets = TQString::tqfromLatin1(TQTextCodec::codecForLocale()->mimeName()).lower();
+    d->charsets = TQString::fromLatin1(TQTextCodec::codecForLocale()->mimeName()).lower();
     KProtocolManager::reparseConfiguration();
 }
 
diff --git a/kio/kio/sessiondata.h b/kio/kio/sessiondata.h
index 80433679c..408045260 100644
--- a/kio/kio/sessiondata.h
+++ b/kio/kio/sessiondata.h
@@ -32,7 +32,7 @@ class SlaveConfig;
 /**
  * @internal
  */
-class KIO_EXPORT SessionData : public TQObject
+class KIO_EXPORT SessionData : public QObject
 {
     Q_OBJECT
 
diff --git a/kio/kio/skipdlg.cpp b/kio/kio/skipdlg.cpp
index b0aa662a0..f014b10d9 100644
--- a/kio/kio/skipdlg.cpp
+++ b/kio/kio/skipdlg.cpp
@@ -67,41 +67,41 @@ SkipDlg::SkipDlg(TQWidget *parent, bool _multi, const TQString& _error_text, boo
     connect(b2, TQT_SIGNAL(clicked()), this, TQT_SLOT(b2Pressed()));
   }
 
-  TQVBoxLayout *vtqlayout = new TQVBoxLayout( this, 10, 0 );
-  // vtqlayout->addStrut( 360 );	makes dlg at least that wide
+  TQVBoxLayout *vlayout = new TQVBoxLayout( this, 10, 0 );
+  // vlayout->addStrut( 360 );	makes dlg at least that wide
 
   TQLabel * lb = new TQLabel( _error_text, this );
-  lb->setFixedHeight( lb->tqsizeHint().height() );
-  lb->setMinimumWidth( lb->tqsizeHint().width() );
-  vtqlayout->addWidget( lb );
+  lb->setFixedHeight( lb->sizeHint().height() );
+  lb->setMinimumWidth( lb->sizeHint().width() );
+  vlayout->addWidget( lb );
 
-  vtqlayout->addSpacing( 10 );
+  vlayout->addSpacing( 10 );
 
-  TQHBoxLayout* tqlayout = new TQHBoxLayout();
-  vtqlayout->addLayout( tqlayout );
+  TQHBoxLayout* layout = new TQHBoxLayout();
+  vlayout->addLayout( layout );
   if ( b0 )
   {
     b0->setDefault( true );
-    b0->setFixedSize( b0->tqsizeHint() );
-    tqlayout->addWidget( b0 );
-    tqlayout->addSpacing( 5 );
+    b0->setFixedSize( b0->sizeHint() );
+    layout->addWidget( b0 );
+    layout->addSpacing( 5 );
   }
   if ( b1 )
   {
-    b1->setFixedSize( b1->tqsizeHint() );
-    tqlayout->addWidget( b1 );
-    tqlayout->addSpacing( 5 );
+    b1->setFixedSize( b1->sizeHint() );
+    layout->addWidget( b1 );
+    layout->addSpacing( 5 );
   }
   if ( b2 )
   {
-    b2->setFixedSize( b2->tqsizeHint() );
-    tqlayout->addWidget( b2 );
-    tqlayout->addSpacing( 5 );
+    b2->setFixedSize( b2->sizeHint() );
+    layout->addWidget( b2 );
+    layout->addSpacing( 5 );
   }
 
-  vtqlayout->addStretch( 10 );
-  vtqlayout->activate();
-  resize( tqsizeHint() );
+  vlayout->addStretch( 10 );
+  vlayout->activate();
+  resize( sizeHint() );
 }
 
 SkipDlg::~SkipDlg()
diff --git a/kio/kio/slave.cpp b/kio/kio/slave.cpp
index 4fbac8049..c1a701711 100644
--- a/kio/kio/slave.cpp
+++ b/kio/kio/slave.cpp
@@ -364,7 +364,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error
 	client->attach();
 
     TQString prefix = locateLocal("socket", KGlobal::instance()->instanceName());
-    KTempFile socketfile(prefix, TQString::tqfromLatin1(".slave-socket"));
+    KTempFile socketfile(prefix, TQString::fromLatin1(".slave-socket"));
     if ( socketfile.status() != 0 )
     {
 	error_text = i18n("Unable to create io-slave: %1").arg(strerror(errno));
@@ -406,7 +406,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error
        TQString lib_path = KLibLoader::findLibrary(_name.latin1());
        if (lib_path.isEmpty())
        {
-          error_text = i18n("Can not tqfind io-slave for protocol '%1'.").arg(protocol);
+          error_text = i18n("Can not find io-slave for protocol '%1'.").arg(protocol);
           error = KIO::ERR_CANNOT_LAUNCH_PROCESS;
           return 0;
        }
@@ -469,7 +469,7 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url )
 	client->attach();
 
     TQString prefix = locateLocal("socket", KGlobal::instance()->instanceName());
-    KTempFile socketfile(prefix, TQString::tqfromLatin1(".slave-socket"));
+    KTempFile socketfile(prefix, TQString::fromLatin1(".slave-socket"));
     if ( socketfile.status() != 0 )
 	return 0;
 
diff --git a/kio/kio/slavebase.cpp b/kio/kio/slavebase.cpp
index bd9a688a1..ad683a009 100644
--- a/kio/kio/slavebase.cpp
+++ b/kio/kio/slavebase.cpp
@@ -358,23 +358,23 @@ void SlaveBase::disconnectSlave()
 
 void SlaveBase::setMetaData(const TQString &key, const TQString &value)
 {
-   mOutgoingMetaData.tqreplace(key, value);
+   mOutgoingMetaData.replace(key, value);
 }
 
 TQString SlaveBase::metaData(const TQString &key) const
 {
-   if (mIncomingMetaData.tqcontains(key))
+   if (mIncomingMetaData.contains(key))
       return mIncomingMetaData[key];
-   if (d->configData.tqcontains(key))
+   if (d->configData.contains(key))
       return d->configData[key];
    return TQString::null;
 }
 
 bool SlaveBase::hasMetaData(const TQString &key) const
 {
-   if (mIncomingMetaData.tqcontains(key))
+   if (mIncomingMetaData.contains(key))
       return true;
-   if (d->configData.tqcontains(key))
+   if (d->configData.contains(key))
       return true;
    return false;
 }
@@ -434,7 +434,7 @@ void SlaveBase::error( int _errid, const TQString &_text )
 {
     mIncomingMetaData.clear(); // Clear meta data
     mOutgoingMetaData.clear();
-    KIO_DATA << (TQ_INT32) _errid << _text;
+    KIO_DATA << (Q_INT32) _errid << _text;
 
     m_pConnection->send( MSG_ERROR, data );
     //reset
@@ -468,10 +468,10 @@ void SlaveBase::needSubURLData()
     m_pConnection->send( MSG_NEED_SUBURL_DATA );
 }
 
-void SlaveBase::slavetqStatus( const TQString &host, bool connected )
+void SlaveBase::slaveStatus( const TQString &host, bool connected )
 {
     pid_t pid = getpid();
-    TQ_INT8 b = connected ? 1 : 0;
+    Q_INT8 b = connected ? 1 : 0;
     KIO_DATA << pid << mProtocol << host << b;
     if (d->onHold)
        stream << d->onHoldUrl;
@@ -543,7 +543,7 @@ void SlaveBase::processedPercent( float /* percent */ )
 
 void SlaveBase::speed( unsigned long _bytes_per_second )
 {
-    KIO_DATA << (TQ_UINT32) _bytes_per_second;
+    KIO_DATA << (Q_UINT32) _bytes_per_second;
     slaveWriteError = false;
     m_pConnection->send( INF_SPEED, data );
     if (slaveWriteError) exit();
@@ -700,7 +700,7 @@ void SlaveBase::listEntry( const UDSEntry& entry, bool _ready )
 
 void SlaveBase::listEntries( const UDSEntryList& list )
 {
-    KIO_DATA << (TQ_UINT32)list.count();
+    KIO_DATA << (Q_UINT32)list.count();
     UDSEntryListConstIterator it = list.begin();
     UDSEntryListConstIterator end = list.end();
     for (; it != end; ++it)
@@ -801,7 +801,7 @@ void SlaveBase::multiGet(const TQByteArray &)
 
 
 void SlaveBase::slave_status()
-{ slavetqStatus( TQString::null, false ); }
+{ slaveStatus( TQString::null, false ); }
 
 void SlaveBase::reparseConfiguration()
 {
@@ -898,7 +898,7 @@ int SlaveBase::messageBox( const TQString &text, MessageBoxType type, const TQSt
                            const TQString &buttonYes, const TQString &buttonNo, const TQString &dontAskAgainName )
 {
     kdDebug(7019) << "messageBox " << type << " " << text << " - " << caption << buttonYes << buttonNo << endl;
-    KIO_DATA << (TQ_INT32)type << text << caption << buttonYes << buttonNo << dontAskAgainName;
+    KIO_DATA << (Q_INT32)type << text << caption << buttonYes << buttonNo << dontAskAgainName;
     m_pConnection->send( INF_MESSAGEBOX, data );
     if ( waitForAnswer( CMD_MESSAGEBOXANSWER, 0, data ) != -1 )
     {
@@ -1048,7 +1048,7 @@ void SlaveBase::dispatch( int command, const TQByteArray &data )
     case CMD_PUT:
     {
         int permissions;
-        TQ_INT8 iOverwrite, iResume;
+        Q_INT8 iOverwrite, iResume;
         stream >> url >> iOverwrite >> iResume >> permissions;
         bool overwrite = ( iOverwrite != 0 );
         bool resume = ( iResume != 0 );
@@ -1078,7 +1078,7 @@ void SlaveBase::dispatch( int command, const TQByteArray &data )
         break;
     case CMD_RENAME:
     {
-        TQ_INT8 iOverwrite;
+        Q_INT8 iOverwrite;
         KURL url2;
         stream >> url >> url2 >> iOverwrite;
         bool overwrite = (iOverwrite != 0);
@@ -1086,7 +1086,7 @@ void SlaveBase::dispatch( int command, const TQByteArray &data )
     } break;
     case CMD_SYMLINK:
     {
-        TQ_INT8 iOverwrite;
+        Q_INT8 iOverwrite;
         TQString target;
         stream >> target >> url >> iOverwrite;
         bool overwrite = (iOverwrite != 0);
@@ -1095,7 +1095,7 @@ void SlaveBase::dispatch( int command, const TQByteArray &data )
     case CMD_COPY:
     {
         int permissions;
-        TQ_INT8 iOverwrite;
+        Q_INT8 iOverwrite;
         KURL url2;
         stream >> url >> url2 >> permissions >> iOverwrite;
         bool overwrite = (iOverwrite != 0);
@@ -1103,7 +1103,7 @@ void SlaveBase::dispatch( int command, const TQByteArray &data )
     } break;
     case CMD_DEL:
     {
-        TQ_INT8 isFile;
+        Q_INT8 isFile;
         stream >> url >> isFile;
         del( url, isFile != 0);
     } break;
diff --git a/kio/kio/slavebase.h b/kio/kio/slavebase.h
index 5060131ef..82370ce56 100644
--- a/kio/kio/slavebase.h
+++ b/kio/kio/slavebase.h
@@ -130,11 +130,11 @@ public:
      *        empty if not connected)
      * @param connected Whether an actual network connection exists.
      **/
-    void slavetqStatus(const TQString &host, bool connected);
+    void slaveStatus(const TQString &host, bool connected);
 
     /**
      * Call this from stat() to express details about an object, the
-     * UDSEntry customarily tqcontains the atoms describing file name, size,
+     * UDSEntry customarily contains the atoms describing file name, size,
      * mimetype, etc.
      * @param _entry The UDSEntry containing all of the object attributes.
      */
@@ -505,7 +505,7 @@ public:
 
     /**
      * Called to get the status of the slave. Slave should respond
-     * by calling slavetqStatus(...)
+     * by calling slaveStatus(...)
      */
     virtual void slave_status();
 
@@ -618,10 +618,10 @@ public:
      * KIO::AuthInfo authInfo;
      * if ( openPassDlg( authInfo ) )
      * {
-     *    kdDebug() << TQString::tqfromLatin1("User: ")
+     *    kdDebug() << TQString::fromLatin1("User: ")
      *              << authInfo.username << endl;
-     *    kdDebug() << TQString::tqfromLatin1("Password: ")
-     *              << TQString::tqfromLatin1("Not displayed here!") << endl;
+     *    kdDebug() << TQString::fromLatin1("Password: ")
+     *              << TQString::fromLatin1("Not displayed here!") << endl;
      * }
      * \endcode
      *
@@ -635,10 +635,10 @@ public:
      * TQString errorMsg = "You entered an incorrect password.";
      * if ( openPassDlg( authInfo, errorMsg ) )
      * {
-     *    kdDebug() << TQString::tqfromLatin1("User: ")
+     *    kdDebug() << TQString::fromLatin1("User: ")
      *              << authInfo.username << endl;
-     *    kdDebug() << TQString::tqfromLatin1("Password: ")
-     *              << TQString::tqfromLatin1("Not displayed here!") << endl;
+     *    kdDebug() << TQString::fromLatin1("Password: ")
+     *              << TQString::fromLatin1("Not displayed here!") << endl;
      * }
      * \endcode
      *
diff --git a/kio/kio/slaveconfig.cpp b/kio/kio/slaveconfig.cpp
index 826aeb50c..fe888c99c 100644
--- a/kio/kio/slaveconfig.cpp
+++ b/kio/kio/slaveconfig.cpp
@@ -79,7 +79,7 @@ void SlaveConfigPrivate::readGlobalConfig()
 
 SlaveConfigProtocol* SlaveConfigPrivate::readProtocolConfig(const TQString &_protocol)
 {
-   SlaveConfigProtocol *scp = protocol.tqfind(_protocol);
+   SlaveConfigProtocol *scp = protocol.find(_protocol);
    if (!scp)
    {
       TQString filename = KProtocolInfo::config(_protocol);
@@ -94,7 +94,7 @@ SlaveConfigProtocol* SlaveConfigPrivate::readProtocolConfig(const TQString &_pro
 
 SlaveConfigProtocol* SlaveConfigPrivate::findProtocolConfig(const TQString &_protocol)
 {
-   SlaveConfigProtocol *scp = protocol.tqfind(_protocol);
+   SlaveConfigProtocol *scp = protocol.find(_protocol);
    if (!scp)
       scp = readProtocolConfig(_protocol);
    return scp;
@@ -103,13 +103,13 @@ SlaveConfigProtocol* SlaveConfigPrivate::findProtocolConfig(const TQString &_pro
 void SlaveConfigPrivate::readConfigProtocolHost(const TQString &, SlaveConfigProtocol *scp, const TQString &host)
 {
    MetaData *metaData = new MetaData;
-   scp->host.tqreplace(host, metaData);
+   scp->host.replace(host, metaData);
 
    // Read stuff
    // Break host into domains
    TQString domain = host;
 
-   if (!domain.tqcontains('.'))
+   if (!domain.contains('.'))
    {
       // Host without domain.
       if (scp->configFile->hasGroup("<local>"))
@@ -119,7 +119,7 @@ void SlaveConfigPrivate::readConfigProtocolHost(const TQString &, SlaveConfigPro
    int pos = 0;
    do
    {
-      pos = host.tqfindRev('.', pos-1);
+      pos = host.findRev('.', pos-1);
 
       if (pos < 0)
         domain = host;
@@ -178,11 +178,11 @@ void SlaveConfig::setConfigData(const TQString &protocol, const TQString &host,
       }
       else
       {
-         MetaData *hostConfig = scp->host.tqfind(host);
+         MetaData *hostConfig = scp->host.find(host);
          if (!hostConfig)
          {
             d->readConfigProtocolHost(protocol, scp, host);
-            hostConfig = scp->host.tqfind(host);
+            hostConfig = scp->host.find(host);
             assert(hostConfig);
          }
          *hostConfig += config;
@@ -197,12 +197,12 @@ MetaData SlaveConfig::configData(const TQString &protocol, const TQString &host)
    config += scp->global;
    if (host.isEmpty())
       return config;
-   MetaData *hostConfig = scp->host.tqfind(host);
+   MetaData *hostConfig = scp->host.find(host);
    if (!hostConfig)
    {
       d->readConfigProtocolHost(protocol, scp, host);
       emit configNeeded(protocol, host);
-      hostConfig = scp->host.tqfind(host);
+      hostConfig = scp->host.find(host);
       assert(hostConfig);
    }
    config += *hostConfig;
diff --git a/kio/kio/slaveconfig.h b/kio/kio/slaveconfig.h
index a7ded457d..1eaaa55e4 100644
--- a/kio/kio/slaveconfig.h
+++ b/kio/kio/slaveconfig.h
@@ -44,7 +44,7 @@ namespace KIO {
      * only applied when the slave is connecting with a host that matches with 
      * the host and/or domain specified by the group.
      */
-    class KIO_EXPORT SlaveConfig : public TQObject
+    class KIO_EXPORT SlaveConfig : public QObject
     {
 	Q_OBJECT
     public:
diff --git a/kio/kio/slaveinterface.cpp b/kio/kio/slaveinterface.cpp
index 61d42ba35..563aad17e 100644
--- a/kio/kio/slaveinterface.cpp
+++ b/kio/kio/slaveinterface.cpp
@@ -43,7 +43,7 @@ TQDataStream &operator <<(TQDataStream &s, const KIO::UDSEntry &e )
     // We do the same on 64-bit platforms in case we run in a mixed 32/64bit
     // environment.
 
-    TQ_UINT32 size = 0;
+    Q_UINT32 size = 0;
     KIO::UDSEntry::ConstIterator it = e.begin();
     for( ; it != e.end(); ++it )
     {
@@ -70,7 +70,7 @@ TQDataStream &operator <<(TQDataStream &s, const KIO::UDSEntry &e )
 TQDataStream &operator >>(TQDataStream &s, KIO::UDSEntry &e )
 {
     e.clear();
-    TQ_UINT32 size;
+    Q_UINT32 size;
     s >> size;
 
     // On 32-bit platforms we send UDS_SIZE with UDS_SIZE_LARGE in front
@@ -79,7 +79,7 @@ TQDataStream &operator >>(TQDataStream &s, KIO::UDSEntry &e )
     // We do the same on 64-bit platforms in case we run in a mixed 32/64bit
     // environment.
     Q_LLONG msb = 0;
-    for(TQ_UINT32 i = 0; i < size; i++)
+    for(Q_UINT32 i = 0; i < size; i++)
     {
        KIO::UDSAtom a;
        s >> a;
@@ -225,9 +225,9 @@ bool SlaveInterface::dispatch( int _cmd, const TQByteArray &rawdata )
     TQDataStream stream( rawdata, IO_ReadOnly );
 
     TQString str1;
-    TQ_INT32 i;
-    TQ_INT8 b;
-    TQ_UINT32 ul;
+    Q_INT32 i;
+    Q_INT8 b;
+    Q_UINT32 ul;
 
     switch( _cmd ) {
     case MSG_DATA:
@@ -251,7 +251,7 @@ bool SlaveInterface::dispatch( int _cmd, const TQByteArray &rawdata )
 	break;
     case MSG_LIST_ENTRIES:
 	{
-	    TQ_UINT32 count;
+	    Q_UINT32 count;
 	    stream >> count;
 
 	    UDSEntryList list;
@@ -284,7 +284,7 @@ bool SlaveInterface::dispatch( int _cmd, const TQByteArray &rawdata )
            pid_t pid;
            TQCString protocol;
            stream >> pid >> protocol >> str1 >> b;
-           emit slavetqStatus(pid, protocol, str1, (b != 0));
+           emit slaveStatus(pid, protocol, str1, (b != 0));
         }
         break;
     case MSG_CONNECTED:
diff --git a/kio/kio/slaveinterface.h b/kio/kio/slaveinterface.h
index faaea16c4..5cca5dd77 100644
--- a/kio/kio/slaveinterface.h
+++ b/kio/kio/slaveinterface.h
@@ -89,7 +89,7 @@ class SlaveInterfacePrivate;
  *
  * A call to foo() results in a call to slotFoo() on the other end.
  */
-class KIO_EXPORT SlaveInterface : public TQObject
+class KIO_EXPORT SlaveInterface : public QObject
 {
     Q_OBJECT
 
@@ -121,7 +121,7 @@ signals:
     void error( int , const TQString & );
     void connected();
     void finished();
-    void slavetqStatus(pid_t, const TQCString &, const TQString &, bool);
+    void slaveStatus(pid_t, const TQCString &, const TQString &, bool);
     void listEntries( const KIO::UDSEntryList& );
     void statEntry( const KIO::UDSEntry& );
     void needSubURLData();
@@ -252,7 +252,7 @@ private:
 
 inline TQDataStream &operator >>(TQDataStream &s, KIO::UDSAtom &a )
 {
-    TQ_INT32 l;
+    Q_INT32 l;
     s >> a.m_uds;
 
     if ( a.m_uds & KIO::UDS_LONG ) {
@@ -273,7 +273,7 @@ inline TQDataStream &operator <<(TQDataStream &s, const KIO::UDSAtom &a )
     s << a.m_uds;
 
     if ( a.m_uds & KIO::UDS_LONG )
-        s << (TQ_INT32) a.m_long;
+        s << (Q_INT32) a.m_long;
     else if ( a.m_uds & KIO::UDS_STRING )
         s << a.m_str;
     else {} // DIE!
diff --git a/kio/kio/statusbarprogress.cpp b/kio/kio/statusbarprogress.cpp
index 1c038e724..910155799 100644
--- a/kio/kio/statusbarprogress.cpp
+++ b/kio/kio/statusbarprogress.cpp
@@ -32,7 +32,7 @@
 
 namespace KIO {
 
-tqStatusbarProgress::tqStatusbarProgress( TQWidget* parent, bool button )
+StatusbarProgress::StatusbarProgress( TQWidget* parent, bool button )
   : ProgressBase( parent ) {
 
   m_bShowButton = button;
@@ -60,18 +60,18 @@ tqStatusbarProgress::tqStatusbarProgress( TQWidget* parent, bool button )
   stack->addWidget( m_pProgressBar, 1 );
 
   m_pLabel = new TQLabel( "", this );
-  m_pLabel->tqsetAlignment( AlignHCenter | AlignVCenter );
+  m_pLabel->setAlignment( AlignHCenter | AlignVCenter );
   m_pLabel->installEventFilter( this );
   m_pLabel->setMinimumWidth( w );
   stack->addWidget( m_pLabel, 2 );
-  setMinimumSize( tqsizeHint() );
+  setMinimumSize( sizeHint() );
 
   mode = None;
   setMode();
 }
 
 
-void tqStatusbarProgress::setJob( KIO::Job *job )
+void StatusbarProgress::setJob( KIO::Job *job )
 {
   ProgressBase::setJob( job );
 
@@ -80,7 +80,7 @@ void tqStatusbarProgress::setJob( KIO::Job *job )
 }
 
 
-void tqStatusbarProgress::setMode() {
+void StatusbarProgress::setMode() {
   switch ( mode ) {
   case None:
     if ( m_bShowButton ) {
@@ -108,7 +108,7 @@ void tqStatusbarProgress::setMode() {
 }
 
 
-void tqStatusbarProgress::slotClean() {
+void StatusbarProgress::slotClean() {
   // we don't want to delete this widget, only clean
   m_pProgressBar->setValue( 0 );
   m_pLabel->clear();
@@ -118,16 +118,16 @@ void tqStatusbarProgress::slotClean() {
 }
 
 
-void tqStatusbarProgress::slotTotalSize( KIO::Job*, KIO::filesize_t size ) {
+void StatusbarProgress::slotTotalSize( KIO::Job*, KIO::filesize_t size ) {
   m_iTotalSize = size;  // size is measured in bytes
 }
 
-void tqStatusbarProgress::slotPercent( KIO::Job*, unsigned long percent ) {
+void StatusbarProgress::slotPercent( KIO::Job*, unsigned long percent ) {
   m_pProgressBar->setValue( percent );
 }
 
 
-void tqStatusbarProgress::slotSpeed( KIO::Job*, unsigned long speed ) {
+void StatusbarProgress::slotSpeed( KIO::Job*, unsigned long speed ) {
   if ( speed == 0 ) { // spped is measured in bytes-per-second
     m_pLabel->setText( i18n( " Stalled ") );
   } else {
@@ -136,7 +136,7 @@ void tqStatusbarProgress::slotSpeed( KIO::Job*, unsigned long speed ) {
 }
 
 
-bool tqStatusbarProgress::eventFilter( TQObject *, TQEvent *ev ) {
+bool StatusbarProgress::eventFilter( TQObject *, TQEvent *ev ) {
   if ( ! m_pJob ) { // don't react when there isn't any job doing IO
     return true;
   }
@@ -159,7 +159,7 @@ bool tqStatusbarProgress::eventFilter( TQObject *, TQEvent *ev ) {
   return false;
 }
 
-void tqStatusbarProgress::virtual_hook( int id, void* data )
+void StatusbarProgress::virtual_hook( int id, void* data )
 { ProgressBase::virtual_hook( id, data ); }
 
 } /* namespace */
diff --git a/kio/kio/statusbarprogress.h b/kio/kio/statusbarprogress.h
index e4b25b509..6fb460283 100644
--- a/kio/kio/statusbarprogress.h
+++ b/kio/kio/statusbarprogress.h
@@ -40,12 +40,12 @@ class Job;
 * Instead of creating a separate window, this is only a widget that can be
 * easily embedded in a statusbar.
 *
-* Usage of tqStatusbarProgress is little different.
+* Usage of StatusbarProgress is little different.
 * This dialog will be a part of some application.
 * \code
 * // create a dialog
-* tqStatusbarProgress *statusProgress;
-* statusProgress = new tqStatusbarProgress( statusBar() );
+* StatusbarProgress *statusProgress;
+* statusProgress = new StatusbarProgress( statusBar() );
 * statusBar()->insertWidget( statusProgress, statusProgress->width() , 0 );
 * ...
 * // create job and connect it to the progress
@@ -57,20 +57,20 @@ class Job;
 * @short IO progress widget for embedding in a statusbar.
 * @author Matej Koss <koss@miesto.sk>
 */
-class KIO_EXPORT tqStatusbarProgress : public ProgressBase {
+class KIO_EXPORT StatusbarProgress : public ProgressBase {
 
   Q_OBJECT
 
 public:
 
   /**
-   * Creates a new tqStatusbarProgress.
+   * Creates a new StatusbarProgress.
    * @param parent the parent of this widget
    * @param button true to add an abort button. The button will be
    *               connected to ProgressBase::slotStop()
    */
-  tqStatusbarProgress( TQWidget* parent, bool button = true );
-  ~tqStatusbarProgress() {}
+  StatusbarProgress( TQWidget* parent, bool button = true );
+  ~StatusbarProgress() {}
 
   /**
    * Sets the job to monitor.
@@ -104,7 +104,7 @@ protected:
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
-  class tqStatusbarProgressPrivate* d;
+  class StatusbarProgressPrivate* d;
 };
 
 } /* namespace */
diff --git a/kio/kio/tcpslavebase.cpp b/kio/kio/tcpslavebase.cpp
index 144aaa6b1..78093577d 100644
--- a/kio/kio/tcpslavebase.cpp
+++ b/kio/kio/tcpslavebase.cpp
@@ -223,7 +223,7 @@ if ((m_bIsSSL || d->usingTLS) && !d->useSSLTunneling) {       // SSL CASE
         return -1;
       }
 
-      bytes = rc;   // in case it tqcontains no \n
+      bytes = rc;   // in case it contains no \n
       for (int i = 0; i < rc; i++) {
         if (tmpbuf[i] == '\n') {
           bytes = i+1;
@@ -774,7 +774,7 @@ int TCPSlaveBase::verifyCertificate()
       }
 #endif
       if (!_IPmatchesCN && !d->militantSSL) { // force this if the user wants it
-         if (d->cc->getHostList(pc).tqcontains(ourHost)) {
+         if (d->cc->getHostList(pc).contains(ourHost)) {
             _IPmatchesCN = true;
          }
       }
diff --git a/kio/kioexec/main.h b/kio/kioexec/main.h
index 6a5dee65e..59f1cdac2 100644
--- a/kio/kioexec/main.h
+++ b/kio/kioexec/main.h
@@ -8,7 +8,7 @@
 
 namespace KIO { class Job; }
 
-class KIOExec : public TQObject
+class KIOExec : public QObject
 {
     Q_OBJECT
 public:
diff --git a/kio/kpasswdserver/kpasswdserver.cpp b/kio/kpasswdserver/kpasswdserver.cpp
index 20c59750b..42cbad3a4 100644
--- a/kio/kpasswdserver/kpasswdserver.cpp
+++ b/kio/kpasswdserver/kpasswdserver.cpp
@@ -94,7 +94,7 @@ static TQString makeWalletKey( const TQString& key, const TQString& realm )
 // Helper for storeInWallet/readFromWallet
 static TQString makeMapKey( const char* key, int entryNumber )
 {
-    TQString str = TQString::tqfromLatin1( key );
+    TQString str = TQString::fromLatin1( key );
     if ( entryNumber > 1 )
         str += "-" + TQString::number( entryNumber );
     return str;
@@ -107,7 +107,7 @@ static bool storeInWallet( KWallet::Wallet* wallet, const TQString& key, const K
             return false;
     wallet->setFolder( KWallet::Wallet::PasswordFolder() );
     // Before saving, check if there's already an entry with this login.
-    // If so, tqreplace it (with the new password). Otherwise, add a new entry.
+    // If so, replace it (with the new password). Otherwise, add a new entry.
     typedef TQMap<TQString,TQString> Map;
     int entryNumber = 1;
     Map map;
@@ -115,12 +115,12 @@ static bool storeInWallet( KWallet::Wallet* wallet, const TQString& key, const K
     kdDebug(130) << "storeInWallet: walletKey=" << walletKey << "  reading existing map" << endl;
     if ( wallet->readMap( walletKey, map ) == 0 ) {
         Map::ConstIterator end = map.end();
-        Map::ConstIterator it = map.tqfind( "login" );
+        Map::ConstIterator it = map.find( "login" );
         while ( it != end ) {
             if ( it.data() == info.username ) {
                 break; // OK, overwrite this entry
             }
-            it = map.tqfind( TQString( "login-" ) + TQString::number( ++entryNumber ) );
+            it = map.find( TQString( "login-" ) + TQString::number( ++entryNumber ) );
         }
         // If no entry was found, create a new entry - entryNumber is set already.
     }
@@ -148,17 +148,17 @@ static bool readFromWallet( KWallet::Wallet* wallet, const TQString& key, const
             typedef TQMap<TQString,TQString> Map;
             int entryNumber = 1;
             Map::ConstIterator end = map.end();
-            Map::ConstIterator it = map.tqfind( "login" );
+            Map::ConstIterator it = map.find( "login" );
             while ( it != end ) {
                 //kdDebug(130) << "readFromWallet: found " << it.key() << "=" << it.data() << endl;
-                Map::ConstIterator pwdIter = map.tqfind( makeMapKey( "password", entryNumber ) );
+                Map::ConstIterator pwdIter = map.find( makeMapKey( "password", entryNumber ) );
                 if ( pwdIter != end ) {
                     if ( it.data() == username )
                         password = pwdIter.data();
                     knownLogins.insert( it.data(), pwdIter.data() );
                 }
 
-                it = map.tqfind( TQString( "login-" ) + TQString::number( ++entryNumber ) );
+                it = map.find( TQString( "login-" ) + TQString::number( ++entryNumber ) );
             }
             //kdDebug(130) << knownLogins.count() << " known logins" << endl;
 
@@ -214,7 +214,7 @@ KPasswdServer::checkAuthInfo(KIO::AuthInfo info, long windowId, unsigned long us
        return info;
     }
 
-    const AuthInfo *result = tqfindAuthInfoItem(key, info);
+    const AuthInfo *result = findAuthInfoItem(key, info);
     if (!result || result->isCanceled)
     {
        if (!result &&
@@ -320,7 +320,7 @@ KPasswdServer::processRequest()
 
     kdDebug(130) << "KPasswdServer::processRequest: User= " << info.username
               << ", Message= " << info.prompt << endl;
-    const AuthInfo *result = tqfindAuthInfoItem(request->key, request->info);
+    const AuthInfo *result = findAuthInfoItem(request->key, request->info);
 
     if (result && (request->seqNr < result->seqNr))
     {
@@ -464,7 +464,7 @@ KPasswdServer::processRequest()
        }
        else
        {
-           const AuthInfo *result = tqfindAuthInfoItem(waitRequest->key, waitRequest->info);
+           const AuthInfo *result = findAuthInfoItem(waitRequest->key, waitRequest->info);
 
            TQCString replyType;
            TQByteArray replyData;
@@ -500,7 +500,7 @@ KPasswdServer::processRequest()
 TQString KPasswdServer::createCacheKey( const KIO::AuthInfo &info )
 {
     if( !info.url.isValid() ) {
-        // Note that a null key will break tqfindAuthInfoItem later on...
+        // Note that a null key will break findAuthInfoItem later on...
         kdWarning(130) << "createCacheKey: invalid URL " << info.url << endl;
         return TQString::null;
     }
@@ -539,9 +539,9 @@ KPasswdServer::copyAuthInfo(const AuthInfo *i)
 }
 
 const KPasswdServer::AuthInfo *
-KPasswdServer::tqfindAuthInfoItem(const TQString &key, const KIO::AuthInfo &info)
+KPasswdServer::findAuthInfoItem(const TQString &key, const KIO::AuthInfo &info)
 {
-   AuthInfoList *authList = m_authDict.tqfind(key);
+   AuthInfoList *authList = m_authDict.find(key);
    if (!authList)
       return 0;
 
@@ -579,7 +579,7 @@ KPasswdServer::tqfindAuthInfoItem(const TQString &key, const KIO::AuthInfo &info
 void
 KPasswdServer::removeAuthInfoItem(const TQString &key, const KIO::AuthInfo &info)
 {
-   AuthInfoList *authList = m_authDict.tqfind(key);
+   AuthInfoList *authList = m_authDict.find(key);
    if (!authList)
       return;
 
@@ -606,7 +606,7 @@ KPasswdServer::removeAuthInfoItem(const TQString &key, const KIO::AuthInfo &info
 void
 KPasswdServer::addAuthInfoItem(const TQString &key, const KIO::AuthInfo &info, long windowId, long seqNr, bool canceled)
 {
-   AuthInfoList *authList = m_authDict.tqfind(key);
+   AuthInfoList *authList = m_authDict.find(key);
    if (!authList)
    {
       authList = new AuthInfoList;
@@ -659,7 +659,7 @@ KPasswdServer::updateAuthExpire(const TQString &key, const AuthInfo *auth, long
    else if (windowId && (current->expire != AuthInfo::expNever))
    {
       current->expire = AuthInfo::expWindowClose;
-      if (!current->windowList.tqcontains(windowId))
+      if (!current->windowList.contains(windowId))
          current->windowList.append(windowId);
    }
    else if (current->expire == AuthInfo::expTime)
@@ -670,13 +670,13 @@ KPasswdServer::updateAuthExpire(const TQString &key, const AuthInfo *auth, long
    // Update mWindowIdList
    if (windowId)
    {
-      TQStringList *keysChanged = mWindowIdList.tqfind(windowId);
+      TQStringList *keysChanged = mWindowIdList.find(windowId);
       if (!keysChanged)
       {
          keysChanged = new TQStringList;
          mWindowIdList.insert(windowId, keysChanged);
       }
-      if (!keysChanged->tqcontains(key))
+      if (!keysChanged->contains(key))
          keysChanged->append(key);
    }
 }
@@ -684,14 +684,14 @@ KPasswdServer::updateAuthExpire(const TQString &key, const AuthInfo *auth, long
 void
 KPasswdServer::removeAuthForWindowId(long windowId)
 {
-   TQStringList *keysChanged = mWindowIdList.tqfind(windowId);
+   TQStringList *keysChanged = mWindowIdList.find(windowId);
    if (!keysChanged) return;
 
    for(TQStringList::ConstIterator it = keysChanged->begin();
        it != keysChanged->end(); ++it)
    {
       TQString key = *it;
-      AuthInfoList *authList = m_authDict.tqfind(key);
+      AuthInfoList *authList = m_authDict.find(key);
       if (!authList)
          continue;
 
diff --git a/kio/kpasswdserver/kpasswdserver.h b/kio/kpasswdserver/kpasswdserver.h
index ed86d5064..cf44681bf 100644
--- a/kio/kpasswdserver/kpasswdserver.h
+++ b/kio/kpasswdserver/kpasswdserver.h
@@ -61,12 +61,12 @@ protected:
   struct AuthInfo;
 
   TQString createCacheKey( const KIO::AuthInfo &info );
-  const AuthInfo *tqfindAuthInfoItem(const TQString &key, const KIO::AuthInfo &info);
+  const AuthInfo *findAuthInfoItem(const TQString &key, const KIO::AuthInfo &info);
   void removeAuthInfoItem(const TQString &key, const KIO::AuthInfo &info);
   void addAuthInfoItem(const TQString &key, const KIO::AuthInfo &info, long windowId, long seqNr, bool canceled);
   KIO::AuthInfo copyAuthInfo(const AuthInfo *);
   void updateAuthExpire(const TQString &key, const AuthInfo *, long windowId, bool keep);
-  int tqfindWalletEntry( const TQMap<TQString,TQString>& map, const TQString& username );
+  int findWalletEntry( const TQMap<TQString,TQString>& map, const TQString& username );
   bool openWallet( WId windowId );
 
   struct AuthInfo {
diff --git a/kio/kssl/keygenwizard.ui b/kio/kssl/keygenwizard.ui
index 64bb82dde..1cecbd5fc 100644
--- a/kio/kssl/keygenwizard.ui
+++ b/kio/kssl/keygenwizard.ui
@@ -5,7 +5,7 @@
     <property name="name">
         <cstring>KGWizardPage1</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -30,7 +30,7 @@
             <property name="scaledContents">
                 <bool>false</bool>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter|AlignLeft</set>
             </property>
             <property name="wordwrap" stdset="0">
@@ -41,6 +41,6 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kio/kssl/keygenwizard2.ui b/kio/kssl/keygenwizard2.ui
index 1fb91cd4c..9512e4ba9 100644
--- a/kio/kssl/keygenwizard2.ui
+++ b/kio/kssl/keygenwizard2.ui
@@ -5,7 +5,7 @@
     <property name="name">
         <cstring>KGWizardPage2</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -24,7 +24,7 @@
             <property name="text">
                 <string>You must now provide a password for the certificate request. Please choose a very secure password as this will be used to encrypt your private key.</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter|AlignLeft</set>
             </property>
             <property name="wordwrap" stdset="0">
@@ -73,6 +73,6 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kio/kssl/kopenssl.cc b/kio/kssl/kopenssl.cc
index b5c679d76..70d36cd8e 100644
--- a/kio/kssl/kopenssl.cc
+++ b/kio/kssl/kopenssl.cc
@@ -228,7 +228,7 @@ void KOpenSSLProxy::destroy() {
 #include <tqstring.h>
 #include <tqstringlist.h>
 
-static TQString tqfindMostRecentLib(TQString dir, TQString name)
+static TQString findMostRecentLib(TQString dir, TQString name)
 {
        // Grab all shared libraries in the directory
        TQString filter = "lib"+name+".so.*";
@@ -245,7 +245,7 @@ static TQString tqfindMostRecentLib(TQString dir, TQString name)
        uint s = filter.length()-1;
        for (TQStringList::Iterator it = l.begin(); it != l.end(); ++it) {
                TQString numberpart = (*it).mid(s);
-               uint endmaj = numberpart.tqfind('.');
+               uint endmaj = numberpart.find('.');
                if (endmaj == -1)
                        continue;
                bool ok;
@@ -288,7 +288,7 @@ KConfig *cfg;
 
 #ifdef __OpenBSD__
    {
-   TQString libname = tqfindMostRecentLib("/usr/lib" KDELIBSUFF, "crypto");
+   TQString libname = findMostRecentLib("/usr/lib" KDELIBSUFF, "crypto");
    if (!libname.isNull())
          _cryptoLib = ll->globalLibrary(libname.latin1());
    }
@@ -369,7 +369,7 @@ KConfig *cfg;
             alib += "/";
          alib += *shit;
 	 TQString tmpStr(alib.latin1());
-	 tmpStr.tqreplace(TQRegExp("\\(.*\\)"), "");
+	 tmpStr.replace(TQRegExp("\\(.*\\)"), "");
 	 if (!access(tmpStr.latin1(), R_OK))
             _cryptoLib = ll->globalLibrary(alib.latin1());
          if (_cryptoLib) break;
@@ -511,7 +511,7 @@ KConfig *cfg;
 
 #ifdef __OpenBSD__
    {
-   TQString libname = tqfindMostRecentLib("/usr/lib", "ssl");
+   TQString libname = findMostRecentLib("/usr/lib", "ssl");
    if (!libname.isNull())
          _sslLib = ll->globalLibrary(libname.latin1());
    }
@@ -527,7 +527,7 @@ KConfig *cfg;
             alib += "/";
          alib += *shit;
 	 TQString tmpStr(alib.latin1());
-	 tmpStr.tqreplace(TQRegExp("\\(.*\\)"), "");
+	 tmpStr.replace(TQRegExp("\\(.*\\)"), "");
 	 if (!access(tmpStr.latin1(), R_OK))
          	_sslLib = ll->globalLibrary(alib.latin1());
          if (_sslLib) break;
diff --git a/kio/kssl/kssl/StartCom.pem b/kio/kssl/kssl/StartCom.pem
index 399902b03..a7c9b39a0 100644
--- a/kio/kssl/kssl/StartCom.pem
+++ b/kio/kssl/kssl/StartCom.pem
@@ -112,7 +112,7 @@ U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
 cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA
 A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk
 pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf
-OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TQEceWzVI9ujPW3U3eCztKS5/C
+OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C
 Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT
 Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi
 HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM
diff --git a/kio/kssl/kssl/SwissSign-Gold-G2.pem b/kio/kssl/kssl/SwissSign-Gold-G2.pem
index bb9742074..d72118781 100644
--- a/kio/kssl/kssl/SwissSign-Gold-G2.pem
+++ b/kio/kssl/kssl/SwissSign-Gold-G2.pem
@@ -25,7 +25,7 @@ O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOfMke6UiI0HTJ6CVanfCU2qT1L2sCC
 bwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6mGu6uLftIdxf+u+yv
 GPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxpmo/a
 77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCC
-hdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmtqtKay20EIhid3
+hdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid3
 92qgQmwLOM7XdVAyksLfKzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEpp
 Ld6leNcG2mqeSz53OiATIgHQv2ieY2BrNU0LbbqhPcCT4H8js1WtciVORvnSFu+w
 ZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6LqjviOvrv1vA+ACOzB2+htt
diff --git a/kio/kssl/kssl/caroot/ca-bundle.crt b/kio/kssl/kssl/caroot/ca-bundle.crt
index c9bb22213..ca5d292c9 100644
--- a/kio/kssl/kssl/caroot/ca-bundle.crt
+++ b/kio/kssl/kssl/caroot/ca-bundle.crt
@@ -1442,7 +1442,7 @@ QTEvMC0GA1UECxMmVmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRp
 b24xEjAQBgNVBAMTCUdQIFJvb3QgMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
 AQoCggEBALrsQ7g06qNn33cJHxoQoh6pTpVMdOcM3GzGmNCr+hckmmejSRRkiY+T
 Ei/vj9jOEASLhcDcL7wpmK+cQsXL0pbP9KXFLW5NjDiOsmoImdWRG6jtM5NJXcvn
-FUNtUvHI6NfaTQMOCYKqlbo8PRAQOBXX62CZXo2zJu/TrDtZ6b/VkZILMjwOJq7kSW
+FUNtUvHI6NfaMOCYKqlbo8PRAQOBXX62CZXo2zJu/TrDtZ6b/VkZILMjwOJq7kSW
 gO9oCUCUwrczSYPlya4tIDeQGD0gNtp5Oa+4V59672AqIYT4/6A5IdPYbVTHw2o8
 yFwfLkdyFGxVSwkGzY7FawvnB0c6fZJffQ+wXDNXg4M/HoSoeZCfl04i3HUiyG4v
 1tDLduEMV5fhJo8phFPy5Y6TykuKTDUCAwEAAaNCMEAwHQYDVR0OBBYEFKJcbg1l
@@ -2931,7 +2931,7 @@ O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOfMke6UiI0HTJ6CVanfCU2qT1L2sCC
 bwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6mGu6uLftIdxf+u+yv
 GPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxpmo/a
 77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCC
-hdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmtqtKay20EIhid3
+hdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid3
 92qgQmwLOM7XdVAyksLfKzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEpp
 Ld6leNcG2mqeSz53OiATIgHQv2ieY2BrNU0LbbqhPcCT4H8js1WtciVORvnSFu+w
 ZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6LqjviOvrv1vA+ACOzB2+htt
diff --git a/kio/kssl/kssl/cert_extract.c b/kio/kssl/kssl/cert_extract.c
index a1563c3bc..095f810f4 100644
--- a/kio/kssl/kssl/cert_extract.c
+++ b/kio/kssl/kssl/cert_extract.c
@@ -22,7 +22,7 @@
 **
 **  Originally written and released under the GPL by 
 **  Ariel Glenn from the AcIS R&D group at Columbia
-**  as the two sources tqfindoffset.c and dblist.c. See under
+**  as the two sources findoffset.c and dblist.c. See under
 **  http://www.columbia.edu/~ariel/good-certs/ for more details.
 **
 **  Merged into one single program in August 1998 
@@ -46,9 +46,9 @@
 #include "openssl/asn1.h"
 #include "openssl/x509.h"
 
-int tqfindoffset(char *dbname);
+int findoffset(char *dbname);
 
-int tqfindoffset(char *dbname)
+int findoffset(char *dbname)
 {
     DB *db;
     DBT dkey, dvalue;
@@ -100,7 +100,7 @@ int main(int argc, char **argv)
     int result;
     char oname[40];
     int fout;
-    int tqfind;
+    int find;
     char *p;
     int ptag = 0, pclass, plen;
     X509 *mycert;
@@ -113,7 +113,7 @@ int main(int argc, char **argv)
     }
 
     dbname = argv[1];
-    offset = tqfindoffset(dbname);
+    offset = findoffset(dbname);
     if (offset == 0) {
         fprintf(stderr, "Could not determine cert offset in DB file '%s'\n", dbname);
         exit(1);
@@ -126,7 +126,7 @@ int main(int argc, char **argv)
         fprintf(stderr, "Failed to open DB file '%s': %s\n", dbname, strerror(errno));
         exit(1);
     }
-    if ((tqfind = open("cert.index", O_WRONLY | O_CREAT | O_TRUNC, 0755)) == -1) {
+    if ((find = open("cert.index", O_WRONLY | O_CREAT | O_TRUNC, 0755)) == -1) {
         fprintf(stderr, "Failed to open Index file '%s': %s\n", "cert-index", strerror(errno));
         exit(1);
     }
@@ -161,11 +161,11 @@ int main(int argc, char **argv)
                 }
                 write(fout, (char *) dvalue.data + offset - 1, plen);
                 close(fout);
-                write(tqfind, oname, strlen(oname));
-                write(tqfind, ": ", 2);
+                write(find, oname, strlen(oname));
+                write(find, ": ", 2);
                 shortname = (char *) dvalue.data + offset - 1 + plen;
-                write(tqfind, shortname, dvalue.size - plen - offset);
-                write(tqfind, "\n", 1);
+                write(find, shortname, dvalue.size - plen - offset);
+                write(find, "\n", 1);
                 fprintf(stderr, "Extracted: %s (", oname);
                 write(fileno(stderr), shortname, dvalue.size - plen - offset);
                 fprintf(stderr, ")\n");
@@ -175,7 +175,7 @@ int main(int argc, char **argv)
             }
         }
     }
-    close(tqfind);
+    close(find);
     db->close(db);
 
     return (0);
diff --git a/kio/kssl/kssl/certbundle_Makefile b/kio/kssl/kssl/certbundle_Makefile
index 666eef93b..5a288f3b6 100644
--- a/kio/kssl/kssl/certbundle_Makefile
+++ b/kio/kssl/kssl/certbundle_Makefile
@@ -33,7 +33,7 @@ distclean: clean
 	-rm -f cert.*.der cert.index
 
 dist: distclean
-	gtar --no-recursion -cvf - `tqfind * -depth -print | sort` |\
+	gtar --no-recursion -cvf - `find * -depth -print | sort` |\
     tardy --user_number=1000  --user_name=rse \
           --group_number=1000 --group_name=en \
           --prefix=certbundle-$(V) - |\
diff --git a/kio/kssl/kssl/ksslcalist b/kio/kssl/kssl/ksslcalist
index c4423c874..a0761cf4a 100644
--- a/kio/kssl/kssl/ksslcalist
+++ b/kio/kssl/kssl/ksslcalist
@@ -432,7 +432,7 @@ email=true
 code=false
 
 [/C=US/O=VISA/OU=Visa International Service Association/CN=GP Root 3]
-x509=MIIDgDCCAmigAwIBAgICAx8wDQYJKoZIhvcNAQEFBQAwYTELMAkGA1UEBhMCVVMxDTALBgNVBAoTBFZJU0ExLzAtBgNVBAsTJlZpc2EgSW50ZXJuYXRpb25hbCBTZXJ2aWNlIEFzc29jaWF0aW9uMRIwEAYDVQQDEwlHUCBSb290IDMwHhcNMDAwODE2MjMzNDAwWhcNMjAwODE1MjM1OTAwWjBhMQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xEjAQBgNVBAMTCUdQIFJvb3QgMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALrsQ7g06qNn33cJHxoQoh6pTpVMdOcM3GzGmNCr+hckmmejSRRkiY+TEi/vj9jOEASLhcDcL7wpmK+cQsXL0pbP9KXFLW5NjDiOsmoImdWRG6jtM5NJXcvnFUNtUvHI6NfaTQMOCYKqlbo8PRAQOBXX62CZXo2zJu/TrDtZ6b/VkZILMjwOJq7kSWgO9oCUCUwrczSYPlya4tIDeQGD0gNtp5Oa+4V59672AqIYT4/6A5IdPYbVTHw2o8yFwfLkdyFGxVSwkGzY7FawvnB0c6fZJffQ+wXDNXg4M/HoSoeZCfl04i3HUiyG4v1tDLduEMV5fhJo8phFPy5Y6TykuKTDUCAwEAAaNCMEAwHQYDVR0OBBYEFKJcbg1lCMH3TlvJbfDQVhs5gkO7MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQADjVYIs6Gt/XNC2WcsbprPvx7ITfJN0tk3yThEja6JDO+MmStKk/VtrGZKP1dqEKWiGhOmLOpi54D5vf3k/9oRnzlYbfVD8vT9pr+dsauaRgff4fBbP/5dWUAGrBgIR0w8TEhGzojhqLaedaag934btsSN7fAqUxVK2ylPOVPnUlijvtzkkC21yc6Y/yyGoQigyM73gjkJDMHC1KmkKg4zgcc8cMswbaRWt5tcfAIivuUHfW0k0Sex1h0eXEc8vy5u+ByESOz14aCVEc3nMOtc8Cl7dYICBrLzkznSDqzfXyQTFTBD9VDUx4OgQzlPZTS9punO4XS+IN/SchZLiUZ2
+x509=MIIDgDCCAmigAwIBAgICAx8wDQYJKoZIhvcNAQEFBQAwYTELMAkGA1UEBhMCVVMxDTALBgNVBAoTBFZJU0ExLzAtBgNVBAsTJlZpc2EgSW50ZXJuYXRpb25hbCBTZXJ2aWNlIEFzc29jaWF0aW9uMRIwEAYDVQQDEwlHUCBSb290IDMwHhcNMDAwODE2MjMzNDAwWhcNMjAwODE1MjM1OTAwWjBhMQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xEjAQBgNVBAMTCUdQIFJvb3QgMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALrsQ7g06qNn33cJHxoQoh6pTpVMdOcM3GzGmNCr+hckmmejSRRkiY+TEi/vj9jOEASLhcDcL7wpmK+cQsXL0pbP9KXFLW5NjDiOsmoImdWRG6jtM5NJXcvnFUNtUvHI6NfaMOCYKqlbo8PRAQOBXX62CZXo2zJu/TrDtZ6b/VkZILMjwOJq7kSWgO9oCUCUwrczSYPlya4tIDeQGD0gNtp5Oa+4V59672AqIYT4/6A5IdPYbVTHw2o8yFwfLkdyFGxVSwkGzY7FawvnB0c6fZJffQ+wXDNXg4M/HoSoeZCfl04i3HUiyG4v1tDLduEMV5fhJo8phFPy5Y6TykuKTDUCAwEAAaNCMEAwHQYDVR0OBBYEFKJcbg1lCMH3TlvJbfDQVhs5gkO7MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQADjVYIs6Gt/XNC2WcsbprPvx7ITfJN0tk3yThEja6JDO+MmStKk/VtrGZKP1dqEKWiGhOmLOpi54D5vf3k/9oRnzlYbfVD8vT9pr+dsauaRgff4fBbP/5dWUAGrBgIR0w8TEhGzojhqLaedaag934btsSN7fAqUxVK2ylPOVPnUlijvtzkkC21yc6Y/yyGoQigyM73gjkJDMHC1KmkKg4zgcc8cMswbaRWt5tcfAIivuUHfW0k0Sex1h0eXEc8vy5u+ByESOz14aCVEc3nMOtc8Cl7dYICBrLzkznSDqzfXyQTFTBD9VDUx4OgQzlPZTS9punO4XS+IN/SchZLiUZ2
 site=true
 email=true
 code=false
@@ -697,7 +697,7 @@ email=true
 code=true
 
 [/C=US/O=GeoTrust Inc./CN=GeoTrust Universal CA]
-x509=MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVyc2FsIENBMB4XDTA0MDMwNDA1MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xHjAcBgNVBAMTFUdlb1RydXN0IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKYVVaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9tJPi8cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTQjOgNB0eRXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFhF7em6fgemdtzbvQKoiFs7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2vc7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d8Lsrlh/eezJS/R27tQahsiFepdaVaH/wmZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7VqnJNk22CDtucvc+081xdVHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3CgaRr0BHdCXteGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZf9hBZ3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfReBi9Fi1jUIxaS5BZuKGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+nhutxx9z3SxPGWX9f5NAEC7S8O08ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0XG0D08DYj3rWMB8GA1UdIwQYMBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRcaanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fXIwjhmF7DWgh2qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzynANXH/KttgCJwpQzgXQQpAvvLoJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0zuzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsKxr2EoyNB3tZ3b4XUhRxQ4K5RirqNPnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxFKyDuSN/n3QmOGKjaQI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2DFKWkoRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9ER/frslKxfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQtDF4JbAiXfKM9fJP/P6EUp8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/SfuvmbJxPgWp6ZKy7PtXny3YuxadIwVyQD8vIP/rmMuGNG2+k5o7Y+SlIis5z/iw=
+x509=MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVyc2FsIENBMB4XDTA0MDMwNDA1MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xHjAcBgNVBAMTFUdlb1RydXN0IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKYVVaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9tJPi8cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTTQjOgNB0eRXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFhF7em6fgemdtzbvQKoiFs7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2vc7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d8Lsrlh/eezJS/R27tQahsiFepdaVaH/wmZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7VqnJNk22CDtucvc+081xdVHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3CgaRr0BHdCXteGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZf9hBZ3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfReBi9Fi1jUIxaS5BZuKGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+nhutxx9z3SxPGWX9f5NAEC7S8O08ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0XG0D08DYj3rWMB8GA1UdIwQYMBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRcaanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fXIwjhmF7DWgh2qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzynANXH/KttgCJwpQzgXQQpAvvLoJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0zuzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsKxr2EoyNB3tZ3b4XUhRxQ4K5RirqNPnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxFKyDuSN/n3QmOGKjaQI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2DFKWkoRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9ER/frslKxfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQtDF4JbAiXfKM9fJP/P6EUp8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/SfuvmbJxPgWp6ZKy7PtXny3YuxadIwVyQD8vIP/rmMuGNG2+k5o7Y+SlIis5z/iw=
 site=true
 email=true
 code=true
@@ -757,7 +757,7 @@ email=true
 code=true
 
 [/C=IL/O=StartCom Ltd./OU=Secure Digital Certificate Signing/CN=StartCom Certification Authority]
-x509=MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM2WhcNMzYwOTE3MTk0NjM2WjB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZkpMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rfOQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TQEceWzVI9ujPW3U3eCztKS5/CJi/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYTKqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNiHzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMMAv+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w+2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwIDAQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYEFE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9jZXJ0LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3JsLnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFMBgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUHAgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRwOi8vY2VydC5zdGFydGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYgU3RhcnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlhYmlsaXR5LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2YgdGhlIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFpbGFibGUgYXQgaHR0cDovL2NlcnQuc3RhcnRjb20ub3JnL3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOCAgEAFmyZ9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8jhvh3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUWFjgKXlf2Ysd6AgXmvB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJzewT4F+irsfMuXGRuczE6Eri8sxHkfY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3fsNrarnDy0RLrHiQi+fHLB5LEUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZEoalHmdkrQYuL6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+PwqyvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuCO3NJo2pXh5Tl1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6Vum0ABj6y6koQOdjQK/W/7HW/lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkyShNOsF/5oirpt9P/FlUQqmMGqz9IgcgA38corog14=
+x509=MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM2WhcNMzYwOTE3MTk0NjM2WjB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZkpMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rfOQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/CJi/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYTKqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNiHzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMMAv+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w+2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwIDAQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYEFE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9jZXJ0LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3JsLnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFMBgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUHAgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRwOi8vY2VydC5zdGFydGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYgU3RhcnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlhYmlsaXR5LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2YgdGhlIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFpbGFibGUgYXQgaHR0cDovL2NlcnQuc3RhcnRjb20ub3JnL3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOCAgEAFmyZ9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8jhvh3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUWFjgKXlf2Ysd6AgXmvB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJzewT4F+irsfMuXGRuczE6Eri8sxHkfY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3fsNrarnDy0RLrHiQi+fHLB5LEUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZEoalHmdkrQYuL6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+PwqyvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuCO3NJo2pXh5Tl1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6Vum0ABj6y6koQOdjQK/W/7HW/lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkyShNOsF/5oirpt9P/FlUQqmMGqz9IgcgA38corog14=
 site=true
 email=true
 code=false
@@ -775,7 +775,7 @@ email=true
 code=true
 
 [/C=CH/O=SwissSign AG/CN=SwissSign Gold CA - G2]
-x509=MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2lnbiBHb2xkIENBIC0gRzIwHhcNMDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBFMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dpc3NTaWduIEFHMR8wHQYDVQQDExZTd2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUqt2/876LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+bbqBHH5CjCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c6bM8K8vzARO/Ws/BtQpgvd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqEemA8atufK+ze3gE/bk3lUIbLtK/tREDFylqM2tIrfKjuvqblCqoOpd8FUrdVxyJdMmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvRAiTysybUa9oEVeXBCsdtMDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuendjIj3o02yMszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69yFGkOpeUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPiaG59je883WX0XaxR7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxMgI93e2CaHt+28kgeDrpOVG2Y4OGiGqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUWyV7lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64OfPAeGZe6Drn8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe645R88a7A3hfm5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczOUYrHUDFu4Up+GC9pWbY9ZIEr44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOfMke6UiI0HTJ6CVanfCU2qT1L2sCCbwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6mGu6uLftIdxf+u+yvGPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxpmo/a77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCChdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmtqtKay20EIhid392qgQmwLOM7XdVAyksLfKzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEppLd6leNcG2mqeSz53OiATIgHQv2ieY2BrNU0LbbqhPcCT4H8js1WtciVORvnSFu+wZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6LqjviOvrv1vA+ACOzB2+httQc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
+x509=MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2lnbiBHb2xkIENBIC0gRzIwHhcNMDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBFMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dpc3NTaWduIEFHMR8wHQYDVQQDExZTd2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUqt2/876LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+bbqBHH5CjCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c6bM8K8vzARO/Ws/BtQpgvd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqEemA8atufK+ze3gE/bk3lUIbLtK/tREDFylqM2tIrfKjuvqblCqoOpd8FUrdVxyJdMmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvRAiTysybUa9oEVeXBCsdtMDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuendjIj3o02yMszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69yFGkOpeUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPiaG59je883WX0XaxR7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxMgI93e2CaHt+28kgeDrpOVG2Y4OGiGqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUWyV7lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64OfPAeGZe6Drn8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe645R88a7A3hfm5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczOUYrHUDFu4Up+GC9pWbY9ZIEr44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOfMke6UiI0HTJ6CVanfCU2qT1L2sCCbwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6mGu6uLftIdxf+u+yvGPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxpmo/a77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCChdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid392qgQmwLOM7XdVAyksLfKzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEppLd6leNcG2mqeSz53OiATIgHQv2ieY2BrNU0LbbqhPcCT4H8js1WtciVORvnSFu+wZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6LqjviOvrv1vA+ACOzB2+httQc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
 site=true
 email=true
 code=true
diff --git a/kio/kssl/kssl/startssl.pem b/kio/kssl/kssl/startssl.pem
index f441f5dac..960f2657b 100644
--- a/kio/kssl/kssl/startssl.pem
+++ b/kio/kssl/kssl/startssl.pem
@@ -8,7 +8,7 @@ U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
 cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA
 A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk
 pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf
-OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TQEceWzVI9ujPW3U3eCztKS5/C
+OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C
 Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT
 Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi
 HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM
diff --git a/kio/kssl/ksslcertdlg.cc b/kio/kssl/ksslcertdlg.cc
index 511bd4021..21bff52b1 100644
--- a/kio/kssl/ksslcertdlg.cc
+++ b/kio/kssl/ksslcertdlg.cc
@@ -155,13 +155,13 @@ void KSSLCertDlg::slotDont() {
 
 
 TQDataStream& operator<<(TQDataStream& s, const KSSLCertDlgRet& r) {
-   s << TQ_INT8(r.ok?1:0) <<  r.choice << TQ_INT8(r.save?1:0) << TQ_INT8(r.send?1:0);
+   s << Q_INT8(r.ok?1:0) <<  r.choice << Q_INT8(r.save?1:0) << Q_INT8(r.send?1:0);
    return s;
 }
 
 
 TQDataStream& operator>>(TQDataStream& s, KSSLCertDlgRet& r) {
-TQ_INT8 tmp;
+Q_INT8 tmp;
    s >> tmp; r.ok = (tmp == 1);
    s >> r.choice;
    s >> tmp; r.save = (tmp == 1);
diff --git a/kio/kssl/ksslcertdlg.h b/kio/kssl/ksslcertdlg.h
index 4d9b3c2c9..314ae677d 100644
--- a/kio/kssl/ksslcertdlg.h
+++ b/kio/kssl/ksslcertdlg.h
@@ -33,7 +33,7 @@ class TQPushButton;
 /**
  * KDE X.509 Certificate Dialog
  *
- * This class is used to create and display a dialog which tqcontains the user's
+ * This class is used to create and display a dialog which contains the user's
  * X.509 certificates and allows the user to present it during SSL sessions.
  *
  * @author George Staikos <staikos@kde.org>
diff --git a/kio/kssl/ksslcertificate.cc b/kio/kssl/ksslcertificate.cc
index d712c185c..285bb1d2d 100644
--- a/kio/kssl/ksslcertificate.cc
+++ b/kio/kssl/ksslcertificate.cc
@@ -243,7 +243,7 @@ TQString KSSLCertificate::getKDEKey() const {
 
 TQString KSSLCertificate::getMD5DigestFromKDEKey(const TQString &k) {
 	TQString rc;
-	int pos = k.tqfindRev('(');
+	int pos = k.findRev('(');
 	if (pos != -1) {
 		unsigned int len = k.length();
 		if (k.at(len-1) == ')') {
@@ -871,7 +871,7 @@ TQDateTime KSSLCertificate::getQDTNotBefore() const {
 #ifdef KSSL_HAVE_SSL
 return ASN1_UTCTIME_QDateTime(X509_get_notBefore(d->m_cert), NULL);
 #else
-return TQDateTime::tqcurrentDateTime();
+return TQDateTime::currentDateTime();
 #endif
 }
 
@@ -880,7 +880,7 @@ TQDateTime KSSLCertificate::getQDTNotAfter() const {
 #ifdef KSSL_HAVE_SSL
 return ASN1_UTCTIME_QDateTime(X509_get_notAfter(d->m_cert), NULL);
 #else
-return TQDateTime::tqcurrentDateTime();
+return TQDateTime::currentDateTime();
 #endif
 }
 
diff --git a/kio/kssl/ksslcertificatecache.cc b/kio/kssl/ksslcertificatecache.cc
index 226e21c71..eb4ff2d86 100644
--- a/kio/kssl/ksslcertificatecache.cc
+++ b/kio/kssl/ksslcertificatecache.cc
@@ -381,13 +381,13 @@ KSSLCertificate *KSSLCertificateCache::getCertByMD5Digest(const TQString &key) {
 
 
 TQDataStream& operator<<(TQDataStream& s, const KSSLCertificateCache::KSSLCertificatePolicy& p) {
-  s << (TQ_UINT32)p;
+  s << (Q_UINT32)p;
 return s;
 }
 
 
 TQDataStream& operator>>(TQDataStream& s, KSSLCertificateCache::KSSLCertificatePolicy& p) {
-  TQ_UINT32 pd;
+  Q_UINT32 pd;
   s >> pd;
   p = (KSSLCertificateCache::KSSLCertificatePolicy) pd;
   return s;
diff --git a/kio/kssl/ksslconnectioninfo.h b/kio/kssl/ksslconnectioninfo.h
index 095e7c2b2..4d82c6ce2 100644
--- a/kio/kssl/ksslconnectioninfo.h
+++ b/kio/kssl/ksslconnectioninfo.h
@@ -30,7 +30,7 @@ class KSSL;
 /**
  * KDE SSL Connection Information
  *
- * This class tqcontains the information about an SSL connection.  It is
+ * This class contains the information about an SSL connection.  It is
  * generally referenced through KSSL.
  *
  * @author George Staikos <staikos@kde.org>
diff --git a/kio/kssl/ksslinfodlg.cc b/kio/kssl/ksslinfodlg.cc
index 6b0660ebc..70e8a094c 100644
--- a/kio/kssl/ksslinfodlg.cc
+++ b/kio/kssl/ksslinfodlg.cc
@@ -51,7 +51,7 @@ class KSSLInfoDlg::KSSLInfoDlgPrivate {
     private:
         friend class KSSLInfoDlg;
         bool m_secCon;
-        TQGridLayout *m_tqlayout;
+        TQGridLayout *m_layout;
         KComboBox *_chain;
         KSSLCertificate *_cert;
         KSSLCertificate::KSSLValidationList _cert_ksvl;
@@ -76,15 +76,15 @@ KSSLInfoDlg::KSSLInfoDlg(bool secureConnection, TQWidget *parent, const char *na
     : KDialog(parent, name, modal, Qt::WDestructiveClose), d(new KSSLInfoDlgPrivate) {
         TQVBoxLayout *topLayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
         d->m_secCon = secureConnection;
-        d->m_tqlayout = new TQGridLayout(topLayout, 3, 3, KDialog::spacingHint());
-        d->m_tqlayout->setColStretch(1, 1);
-        d->m_tqlayout->setColStretch(2, 1);
+        d->m_layout = new TQGridLayout(topLayout, 3, 3, KDialog::spacingHint());
+        d->m_layout->setColStretch(1, 1);
+        d->m_layout->setColStretch(2, 1);
 
         d->pixmap = new TQLabel(this);
-        d->m_tqlayout->addWidget(d->pixmap, 0, 0);
+        d->m_layout->addWidget(d->pixmap, 0, 0);
 
         d->info = new TQLabel(this);
-        d->m_tqlayout->addWidget(d->info, 0, 1);
+        d->m_layout->addWidget(d->info, 0, 1);
 
         if (KSSL::doesSSLWork()) {
             if (d->m_secCon) {
@@ -98,7 +98,7 @@ KSSLInfoDlg::KSSLInfoDlg(bool secureConnection, TQWidget *parent, const char *na
             d->pixmap->setPixmap(BarIcon("decrypted"));
             d->info->setText(i18n("SSL support is not available in this build of KDE."));
         }
-        d->m_tqlayout->addRowSpacing( 0, 50 ); // give minimum height to look better
+        d->m_layout->addRowSpacing( 0, 50 ); // give minimum height to look better
 
         TQHBoxLayout *buttonLayout = new TQHBoxLayout(topLayout, KDialog::spacingHint());
         buttonLayout->addStretch( 1 );
@@ -175,15 +175,15 @@ void KSSLInfoDlg::setup(KSSLCertificate *cert,
         const TQString& cipher, const TQString& cipherdesc,
         const TQString& sslversion, int usedbits, int bits,
         KSSLCertificate::KSSLValidation /*certState*/) {
-    // Needed to put the GUI stuff here to get the tqlayouting right
+    // Needed to put the GUI stuff here to get the layouting right
 
     d->_cert = cert;
 
-    TQGridLayout *tqlayout = new TQGridLayout(4, 2, KDialog::spacingHint());
+    TQGridLayout *layout = new TQGridLayout(4, 2, KDialog::spacingHint());
 
-    tqlayout->addWidget(new TQLabel(i18n("Chain:"), this), 0, 0);
+    layout->addWidget(new TQLabel(i18n("Chain:"), this), 0, 0);
     d->_chain = new KComboBox(this);
-    tqlayout->addMultiCellWidget(d->_chain, 1, 1, 0, 1);
+    layout->addMultiCellWidget(d->_chain, 1, 1, 0, 1);
     connect(d->_chain, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChain(int)));
 
     d->_chain->clear();
@@ -207,51 +207,51 @@ void KSSLInfoDlg::setup(KSSLCertificate *cert,
         d->_chain->setCurrentItem(0);
     } else d->_chain->setEnabled(false);
 
-    tqlayout->addWidget(new TQLabel(i18n("Peer certificate:"), this), 2, 0);
-    tqlayout->addWidget(d->_subject = static_cast<KSSLCertBox*>(buildCertInfo(cert->getSubject())), 3, 0);
-    tqlayout->addWidget(new TQLabel(i18n("Issuer:"), this), 2, 1);
-    tqlayout->addWidget(d->_issuer = static_cast<KSSLCertBox*>(buildCertInfo(cert->getIssuer())), 3, 1);
-    d->m_tqlayout->addMultiCell(tqlayout, 1, 1, 0, 2);
+    layout->addWidget(new TQLabel(i18n("Peer certificate:"), this), 2, 0);
+    layout->addWidget(d->_subject = static_cast<KSSLCertBox*>(buildCertInfo(cert->getSubject())), 3, 0);
+    layout->addWidget(new TQLabel(i18n("Issuer:"), this), 2, 1);
+    layout->addWidget(d->_issuer = static_cast<KSSLCertBox*>(buildCertInfo(cert->getIssuer())), 3, 1);
+    d->m_layout->addMultiCell(layout, 1, 1, 0, 2);
 
-    tqlayout = new TQGridLayout(11, 2, KDialog::spacingHint());
-    tqlayout->setColStretch(1, 1);
+    layout = new TQGridLayout(11, 2, KDialog::spacingHint());
+    layout->setColStretch(1, 1);
     TQLabel *ipl = new TQLabel(i18n("IP address:"), this);
-    tqlayout->addWidget(ipl, 0, 0);
+    layout->addWidget(ipl, 0, 0);
     if (ip.isEmpty()) {
         ipl->hide();
     }
-    tqlayout->addWidget(ipl = new TQLabel(ip, this), 0, 1);
+    layout->addWidget(ipl = new TQLabel(ip, this), 0, 1);
     if (ip.isEmpty()) {
         ipl->hide();
     }
-    tqlayout->addWidget(new TQLabel(i18n("URL:"), this), 1, 0);
+    layout->addWidget(new TQLabel(i18n("URL:"), this), 1, 0);
     KSqueezedTextLabel *urlLabel = new KSqueezedTextLabel(url, this);
-    tqlayout->addWidget(urlLabel, 1, 1);
-    tqlayout->addWidget(new TQLabel(i18n("Certificate state:"), this), 2, 0);
+    layout->addWidget(urlLabel, 1, 1);
+    layout->addWidget(new TQLabel(i18n("Certificate state:"), this), 2, 0);
 
-    tqlayout->addWidget(d->_csl = new TQLabel("", this), 2, 1);
+    layout->addWidget(d->_csl = new TQLabel("", this), 2, 1);
 
     update();
 
-    tqlayout->addWidget(new TQLabel(i18n("Valid from:"), this), 3, 0);
-    tqlayout->addWidget(d->_validFrom = new TQLabel("", this), 3, 1);
-    tqlayout->addWidget(new TQLabel(i18n("Valid until:"), this), 4, 0);
-    tqlayout->addWidget(d->_validUntil = new TQLabel("", this), 4, 1);
-
-    tqlayout->addWidget(new TQLabel(i18n("Serial number:"), this), 5, 0);
-    tqlayout->addWidget(d->_serialNum = new TQLabel("", this), 5, 1);
-    tqlayout->addWidget(new TQLabel(i18n("MD5 digest:"), this), 6, 0);
-    tqlayout->addWidget(d->_digest = new TQLabel("", this), 6, 1);
-
-    tqlayout->addWidget(new TQLabel(i18n("Cipher in use:"), this), 7, 0);
-    tqlayout->addWidget(new TQLabel(cipher, this), 7, 1);
-    tqlayout->addWidget(new TQLabel(i18n("Details:"), this), 8, 0);
-    tqlayout->addWidget(new TQLabel(cipherdesc.simplifyWhiteSpace(), this), 8, 1);
-    tqlayout->addWidget(new TQLabel(i18n("SSL version:"), this), 9, 0);
-    tqlayout->addWidget(new TQLabel(sslversion, this), 9, 1);
-    tqlayout->addWidget(new TQLabel(i18n("Cipher strength:"), this), 10, 0);
-    tqlayout->addWidget(new TQLabel(i18n("%1 bits used of a %2 bit cipher").arg(usedbits).arg(bits), this), 10, 1);
-    d->m_tqlayout->addMultiCell(tqlayout, 2, 2, 0, 2);
+    layout->addWidget(new TQLabel(i18n("Valid from:"), this), 3, 0);
+    layout->addWidget(d->_validFrom = new TQLabel("", this), 3, 1);
+    layout->addWidget(new TQLabel(i18n("Valid until:"), this), 4, 0);
+    layout->addWidget(d->_validUntil = new TQLabel("", this), 4, 1);
+
+    layout->addWidget(new TQLabel(i18n("Serial number:"), this), 5, 0);
+    layout->addWidget(d->_serialNum = new TQLabel("", this), 5, 1);
+    layout->addWidget(new TQLabel(i18n("MD5 digest:"), this), 6, 0);
+    layout->addWidget(d->_digest = new TQLabel("", this), 6, 1);
+
+    layout->addWidget(new TQLabel(i18n("Cipher in use:"), this), 7, 0);
+    layout->addWidget(new TQLabel(cipher, this), 7, 1);
+    layout->addWidget(new TQLabel(i18n("Details:"), this), 8, 0);
+    layout->addWidget(new TQLabel(cipherdesc.simplifyWhiteSpace(), this), 8, 1);
+    layout->addWidget(new TQLabel(i18n("SSL version:"), this), 9, 0);
+    layout->addWidget(new TQLabel(sslversion, this), 9, 1);
+    layout->addWidget(new TQLabel(i18n("Cipher strength:"), this), 10, 0);
+    layout->addWidget(new TQLabel(i18n("%1 bits used of a %2 bit cipher").arg(usedbits).arg(bits), this), 10, 1);
+    d->m_layout->addMultiCell(layout, 2, 2, 0, 2);
 
     displayCert(cert);
 }
@@ -273,14 +273,14 @@ void KSSLInfoDlg::displayCert(KSSLCertificate *x) {
     d->_serialNum->setText(x->getSerialNumber());
 
     cspl = d->_validFrom->palette();
-    if (x->getQDTNotBefore() > TQDateTime::tqcurrentDateTime(Qt::UTC))
+    if (x->getQDTNotBefore() > TQDateTime::currentDateTime(Qt::UTC))
         cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
     else cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
     d->_validFrom->setPalette(cspl);
     d->_validFrom->setText(x->getNotBefore());
 
     cspl = d->_validUntil->palette();
-    if (x->getQDTNotAfter() < TQDateTime::tqcurrentDateTime(Qt::UTC))
+    if (x->getQDTNotAfter() < TQDateTime::currentDateTime(Qt::UTC))
         cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
     else cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
     d->_validUntil->setPalette(cspl);
@@ -305,8 +305,8 @@ void KSSLInfoDlg::displayCert(KSSLCertificate *x) {
         ksv = ksvl.first();
 
         if (ksv == KSSLCertificate::SelfSigned) {
-            if (x->getQDTNotAfter() > TQDateTime::tqcurrentDateTime(Qt::UTC) &&
-                    x->getQDTNotBefore() < TQDateTime::tqcurrentDateTime(Qt::UTC)) {
+            if (x->getQDTNotAfter() > TQDateTime::currentDateTime(Qt::UTC) &&
+                    x->getQDTNotBefore() < TQDateTime::currentDateTime(Qt::UTC)) {
                 if (KSSLSigners().useForSSL(*x))
                     ksv = KSSLCertificate::Ok;
             } else {
@@ -331,7 +331,7 @@ void KSSLInfoDlg::displayCert(KSSLCertificate *x) {
     }
 
     d->_csl->setText(errorStr);
-    d->_csl->setMinimumSize(d->_csl->tqsizeHint());
+    d->_csl->setMinimumSize(d->_csl->sizeHint());
 
     d->_subject->setValues(x->getSubject());
     d->_issuer->setValues(x->getIssuer());
@@ -399,37 +399,37 @@ void KSSLCertBox::setValues(TQString certName, TQWidget *mailCatcher) {
     TQLabel *label = 0L;
     if (!(tmp = cert.getValue("O")).isEmpty()) {
         label = new TQLabel(i18n("Organization:"), _frame);
-        label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop);
+        label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
         new TQLabel(tmp, _frame);
     }
     if (!(tmp = cert.getValue("OU")).isEmpty()) {
         label = new TQLabel(i18n("Organizational unit:"), _frame);
-        label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop);
+        label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
         new TQLabel(tmp, _frame);
     }
     if (!(tmp = cert.getValue("L")).isEmpty()) {
         label = new TQLabel(i18n("Locality:"), _frame);
-        label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop);
+        label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
         new TQLabel(tmp, _frame);
     }
     if (!(tmp = cert.getValue("ST")).isEmpty()) {
         label = new TQLabel(i18n("Federal State","State:"), _frame);
-        label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop);
+        label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
         new TQLabel(tmp, _frame);
     }
     if (!(tmp = cert.getValue("C")).isEmpty()) {
         label = new TQLabel(i18n("Country:"), _frame);
-        label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop);
+        label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
         new TQLabel(tmp, _frame);
     }
     if (!(tmp = cert.getValue("CN")).isEmpty()) {
         label = new TQLabel(i18n("Common name:"), _frame);
-        label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop);
+        label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
         new TQLabel(tmp, _frame);
     }
     if (!(tmp = cert.getValue("Email")).isEmpty()) {
         label = new TQLabel(i18n("Email:"), _frame);
-        label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop);
+        label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
         if (mailCatcher) {
             KURLLabel *mail = new KURLLabel(tmp, tmp, _frame);
             connect(mail, TQT_SIGNAL(leftClickedURL(const TQString &)), mailCatcher, TQT_SLOT(mailClicked(const TQString &)));
diff --git a/kio/kssl/ksslpeerinfo.cc b/kio/kssl/ksslpeerinfo.cc
index c5075e049..d1c2d00fc 100644
--- a/kio/kssl/ksslpeerinfo.cc
+++ b/kio/kssl/ksslpeerinfo.cc
@@ -65,7 +65,7 @@ void KSSLPeerInfo::setPeerHost(TQString realHost) {
 #ifdef Q_WS_WIN //TODO kresolver not ported
 	d->peerHost = d->peerHost.lower();
 #else	
-	d->peerHost = TQString::tqfromLatin1(KNetwork::KResolver::domainToAscii(d->peerHost));
+	d->peerHost = TQString::fromLatin1(KNetwork::KResolver::domainToAscii(d->peerHost));
 #endif	
 }
 
@@ -95,7 +95,7 @@ bool KSSLPeerInfo::cnMatchesAddress(TQString cn) {
 
 	// Check for invalid characters
 	if (TQRegExp("[^a-zA-Z0-9\\.\\*\\-]").search(cn) >= 0) {
-		kdDebug(7029) << "CN tqcontains invalid characters!  Failing." << endl;
+		kdDebug(7029) << "CN contains invalid characters!  Failing." << endl;
 		return false;
 	}
 
@@ -117,7 +117,7 @@ bool KSSLPeerInfo::cnMatchesAddress(TQString cn) {
 	if (rx.exactMatch(d->peerHost))
 		return d->peerHost == cn;
 
-	if (cn.tqcontains('*')) {
+	if (cn.contains('*')) {
 		// First make sure that there are at least two valid parts
 		// after the wildcard (*).
 		TQStringList parts = TQStringList::split('.', cn, false);
@@ -129,7 +129,7 @@ bool KSSLPeerInfo::cnMatchesAddress(TQString cn) {
 			return false;  // we don't allow *.root - that's bad
 		}
 
-		if (parts[0].tqcontains('*') || parts[1].tqcontains('*')) {
+		if (parts[0].contains('*') || parts[1].contains('*')) {
 			return false;
 		}
 
diff --git a/kio/kssl/ksslpeerinfo.h b/kio/kssl/ksslpeerinfo.h
index dfd44fff5..bdcf91231 100644
--- a/kio/kssl/ksslpeerinfo.h
+++ b/kio/kssl/ksslpeerinfo.h
@@ -33,7 +33,7 @@ class KInetSocketAddress;
 /**
  * KDE SSL Peer Data
  *
- * This class tqcontains data about the peer of an SSL connection.
+ * This class contains data about the peer of an SSL connection.
  *
  * @author George Staikos <staikos@kde.org>
  * @see KSSL
diff --git a/kio/kssl/ksslsession.h b/kio/kssl/ksslsession.h
index 74ae5b7d6..202781418 100644
--- a/kio/kssl/ksslsession.h
+++ b/kio/kssl/ksslsession.h
@@ -32,7 +32,7 @@ class KSSLSessionPrivate;
 /**
  * KDE SSL Session Information
  *
- * This class tqcontains data about an SSL session.
+ * This class contains data about an SSL session.
  * It is just used as a container that is taken from or passed to KSSL objects.
  *
  * @author George Staikos <staikos@kde.org>
diff --git a/kio/kssl/ksslsettings.cc b/kio/kssl/ksslsettings.cc
index 55f34dd18..5a77b12bf 100644
--- a/kio/kssl/ksslsettings.cc
+++ b/kio/kssl/ksslsettings.cc
@@ -169,7 +169,7 @@ TQString KSSLSettings::getCipherList() {
 		int bits = d->kossl->SSL_CIPHER_get_bits(sc, NULL);
 		if (m_cfg->readBoolEntry(tcipher, bits >= 56)) {
 			CipherNode *xx = new CipherNode(sc->name,bits);
-			if (!cipherList.tqcontains(xx))
+			if (!cipherList.contains(xx))
 				cipherList.prepend(xx);
 			else
 				delete xx;
@@ -183,7 +183,7 @@ TQString KSSLSettings::getCipherList() {
 	for (unsigned int i = 0; i < cipherList.count(); i++) {
 		CipherNode *j = 0L;
 		while ((j = cipherList.at(i)) != 0L) {
-			if (j->name.tqcontains("ADH-") || j->name.tqcontains("NULL-") || j->name.tqcontains("DES-CBC3-SHA") || j->name.tqcontains("FZA")) {
+			if (j->name.contains("ADH-") || j->name.contains("NULL-") || j->name.contains("DES-CBC3-SHA") || j->name.contains("FZA")) {
 				cipherList.remove(j);
 			} else {
 				break;
@@ -298,7 +298,7 @@ void KSSLSettings::save() {
   for (unsigned int i = 0; i < v2ciphers.count(); i++) {
     TQString ciphername;
     ciphername.sprintf("cipher_%s", v2ciphers[i].ascii());
-    if (v2selectedciphers.tqcontains(v2ciphers[i])) {
+    if (v2selectedciphers.contains(v2ciphers[i])) {
       m_cfg->writeEntry(ciphername, true);
     } else m_cfg->writeEntry(ciphername, false);
   }
@@ -307,7 +307,7 @@ void KSSLSettings::save() {
   for (unsigned int i = 0; i < v3ciphers.count(); i++) {
     TQString ciphername;
     ciphername.sprintf("cipher_%s", v3ciphers[i].ascii());
-    if (v3selectedciphers.tqcontains(v3ciphers[i])) {
+    if (v3selectedciphers.contains(v3ciphers[i])) {
       m_cfg->writeEntry(ciphername, true);
     } else m_cfg->writeEntry(ciphername, false);
   }
@@ -315,7 +315,7 @@ void KSSLSettings::save() {
  
   m_cfg->sync();
  
-  // insure proper permissions -- tqcontains sensitive data
+  // insure proper permissions -- contains sensitive data
   TQString cfgName(KGlobal::dirs()->findResource("config", "cryptodefaults"));
   if (!cfgName.isEmpty())
     ::chmod(TQFile::encodeName(cfgName), 0600);
diff --git a/kio/kssl/ksslsettings.h b/kio/kssl/ksslsettings.h
index e7e348196..44345937b 100644
--- a/kio/kssl/ksslsettings.h
+++ b/kio/kssl/ksslsettings.h
@@ -30,7 +30,7 @@ class KSSLSettingsPrivate;
 /**
  * KDE SSL Settings
  *
- * This class tqcontains some of the SSL settings for easy use.
+ * This class contains some of the SSL settings for easy use.
  *
  * @author George Staikos <staikos@kde.org>
  * @see KSSL
diff --git a/kio/kssl/ksslx509map.cc b/kio/kssl/ksslx509map.cc
index 222d187cb..7896fdfcf 100644
--- a/kio/kssl/ksslx509map.cc
+++ b/kio/kssl/ksslx509map.cc
@@ -33,12 +33,12 @@ KSSLX509Map::~KSSLX509Map() {
 
 
 void KSSLX509Map::setValue(const TQString& key, const TQString& value) {
-	m_pairs.tqreplace(key, value);
+	m_pairs.replace(key, value);
 }
 
 
 TQString KSSLX509Map::getValue(const TQString& key) const {
-	if (!m_pairs.tqcontains(key)) {
+	if (!m_pairs.contains(key)) {
 		return TQString::null;
 	}
 
@@ -63,7 +63,7 @@ unsigned int length = str.length();
 	for(head = 0, tail = 0; tail < length-1; head = tail+1) {
 		TQString thisline;
 
-		tail = str.tqfind(tok, head);
+		tail = str.find(tok, head);
 
 		if (tail > length)           // last token - none at end
 			tail = length;
@@ -85,11 +85,11 @@ TQStringList vl = tokenizeBy(name, TQRegExp("/[A-Za-z]+="), false);
 
 	for (TQStringList::Iterator j = vl.begin(); j != vl.end(); ++j) {
 		TQStringList apair = tokenizeBy(*j, TQRegExp("="), false);
-		if (m_pairs.tqcontains(apair[0])) {
+		if (m_pairs.contains(apair[0])) {
 			TQString oldValue = m_pairs[apair[0]];
 			oldValue += "\n";
 			oldValue += apair[1];
-			m_pairs.tqreplace(apair[0], oldValue);
+			m_pairs.replace(apair[0], oldValue);
 		} else {
 			m_pairs.insert(apair[0], apair[1]);
 		}
diff --git a/kio/magic b/kio/magic
index 12d534d9e..c12cec4ba 100644
--- a/kio/magic
+++ b/kio/magic
@@ -894,7 +894,7 @@
 # xmcd database file for kscd
 0		string	\#\ xmcd                text/xmcd
 # SQLite database files
-0	string		**\ This\ file\ tqcontains\ an\ SQLite	application/x-sqlite2
+0	string		**\ This\ file\ contains\ an\ SQLite	application/x-sqlite2
 0	string		SQLite\ format\ 3	application/x-sqlite3
 
 #------------------------------------------------------------------------------
@@ -1062,4 +1062,4 @@
 >160    string          NAXIS\ \ \ =\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 2	image/fits
 >160    string          NAXIS\ \ \ =\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 3	image/fits
 
-# kate: space-indent off; tqreplace-tabs off;
+# kate: space-indent off; replace-tabs off;
diff --git a/kio/misc/fileshareset b/kio/misc/fileshareset
index a4f534593..4c921ba38 100755
--- a/kio/misc/fileshareset
+++ b/kio/misc/fileshareset
@@ -183,7 +183,7 @@ sub check {
 ################################################################################
 package exports;
 
-sub tqfind {
+sub find {
     my ($exports, $mntpoint) = @_;
     foreach (@$exports) {
 	$_->{mntpoint} eq $mntpoint and return $_;
@@ -396,8 +396,8 @@ sub name_mangle {
 		    last A;
 		}
 	    }
-	    $_ or die "can't tqfind a unique name";
-	    # can't tqfind a unique name, dropping the last letter
+	    $_ or die "can't find a unique name";
+	    # can't find a unique name, dropping the last letter
 	    s|(.*).|$1|;
 	}
     }
@@ -422,7 +422,7 @@ sub update_server {
 	system('/etc/rc.d/rc.samba', $_) foreach 'stop', 'start';
 	  }
       else {
-	print STDERR "Error: Can't tqfind the samba init script \n";
+	print STDERR "Error: Can't find the samba init script \n";
       }
     }
     exit 0;
diff --git a/kio/misc/kdesasl/kdesasl.cpp b/kio/misc/kdesasl/kdesasl.cpp
index e9bc75dc1..b547f7e6b 100644
--- a/kio/misc/kdesasl/kdesasl.cpp
+++ b/kio/misc/kdesasl/kdesasl.cpp
@@ -49,10 +49,10 @@ KDESasl::~KDESasl() {
 
 TQCString KDESasl::chooseMethod(const TQStrIList aMethods)
 {
-  if (aMethods.tqcontains("DIGEST-MD5")) mMethod = "DIGEST-MD5";
-  else if (aMethods.tqcontains("CRAM-MD5")) mMethod = "CRAM-MD5";
-  else if (aMethods.tqcontains("PLAIN")) mMethod = "PLAIN";
-  else if (aMethods.tqcontains("LOGIN")) mMethod = "LOGIN";
+  if (aMethods.contains("DIGEST-MD5")) mMethod = "DIGEST-MD5";
+  else if (aMethods.contains("CRAM-MD5")) mMethod = "CRAM-MD5";
+  else if (aMethods.contains("PLAIN")) mMethod = "PLAIN";
+  else if (aMethods.contains("LOGIN")) mMethod = "LOGIN";
   else mMethod = TQCString();
   return mMethod;
 }
diff --git a/kio/misc/kfile/fileprops.cpp b/kio/misc/kfile/fileprops.cpp
index 0d8854eb5..096fc1f03 100644
--- a/kio/misc/kfile/fileprops.cpp
+++ b/kio/misc/kfile/fileprops.cpp
@@ -329,7 +329,7 @@ static void processMetaDataOptions( const TQPtrList<FileProps> propList,
     for ( ; (props = it.current()); ++it )
     {
         TQString file = props->fileName() + " ";
-        TQString fileString = line.tqreplace( 3, file.length(), file );
+        TQString fileString = line.replace( 3, file.length(), file );
         cout << TQFile::encodeName( fileString ) << endl;
             
         if ( args->isSet( "listsupported" ) )
diff --git a/kio/misc/kntlm/des.cpp b/kio/misc/kntlm/des.cpp
index e1029a4ca..b6683ac34 100644
--- a/kio/misc/kntlm/des.cpp
+++ b/kio/misc/kntlm/des.cpp
@@ -25,7 +25,7 @@ static void permute_fp (unsigned char *inblock, DES_KEY * key, unsigned char *ou
 static void perminit_ip (DES_KEY * key);
 static void spinit (DES_KEY * key);
 static void perminit_fp (DES_KEY * key);
-static TQ_UINT32 f (DES_KEY * key,  TQ_UINT32 r,  char *subkey);
+static Q_UINT32 f (DES_KEY * key,  Q_UINT32 r,  char *subkey);
 
 
 /* Tables defined in the Data Encryption Standard documents */
@@ -211,8 +211,8 @@ ntlm_des_set_key (DES_KEY * dkey, char *user_key, int /*len*/)
   for (j = 0; j < 56; j++)
     {				/* convert pc1 to bits of key */
       l = pc1[j] - 1;		/* integer bit location  */
-      m = l & 07;		/* tqfind bit              */
-      pc1m[j] = (user_key[l >> 3] &	/* tqfind which key byte l is in */
+      m = l & 07;		/* find bit              */
+      pc1m[j] = (user_key[l >> 3] &	/* find which key byte l is in */
 		 bytebit[m])	/* and which bit of that byte */
 	? 1 : 0;		/* and store 1-bit result */
 
@@ -227,7 +227,7 @@ ntlm_des_set_key (DES_KEY * dkey, char *user_key, int /*len*/)
 	  /* check bit that goes to kn[j] */
 	  if (pcr[pc2[j] - 1])
 	    {
-	      /* tqmask it in if it's there */
+	      /* mask it in if it's there */
 	      l = j % 6;
 	      dkey->kn[i][j / 6] |= bytebit[l] >> 2;
 	    }
@@ -240,9 +240,9 @@ ntlm_des_set_key (DES_KEY * dkey, char *user_key, int /*len*/)
 static void
 ntlm_des_encrypt (DES_KEY * key, unsigned char *block)
 {
-  TQ_UINT32 left, right;
+  Q_UINT32 left, right;
   char *knp;
-  TQ_UINT32 work[2];		/* Working data storage */
+  Q_UINT32 work[2];		/* Working data storage */
 
   permute_ip (block, key, (unsigned char *) work);	/* Initial Permutation */
   left = KFromToBigEndian(work[0]);
@@ -310,7 +310,7 @@ permute_ip (unsigned char *inblock, DES_KEY * key, unsigned char *outblock)
       ob = outblock;
       p = key->iperm[j][(*ib >> 4) & 0xf];
       q = key->iperm[j + 1][*ib & 0xf];
-      /* and each output byte, OR the tqmasks together */
+      /* and each output byte, OR the masks together */
       *ob++ |= *p++ | *q++;
       *ob++ |= *p++ | *q++;
       *ob++ |= *p++ | *q++;
@@ -339,7 +339,7 @@ permute_fp (unsigned char *inblock, DES_KEY * key, unsigned char *outblock)
       ob = outblock;
       p = key->fperm[j][(*ib >> 4) & 0xf];
       q = key->fperm[j + 1][*ib & 0xf];
-      /* and each output byte, OR the tqmasks together */
+      /* and each output byte, OR the masks together */
       *ob++ |= *p++ | *q++;
       *ob++ |= *p++ | *q++;
       *ob++ |= *p++ | *q++;
@@ -352,11 +352,11 @@ permute_fp (unsigned char *inblock, DES_KEY * key, unsigned char *outblock)
 }
 
 /* The nonlinear function f(r,k), the heart of DES */
-static TQ_UINT32
-f (DES_KEY * key,  TQ_UINT32 r,  char *subkey)
+static Q_UINT32
+f (DES_KEY * key,  Q_UINT32 r,  char *subkey)
 {
-   TQ_UINT32 *spp;
-   TQ_UINT32 rval, rt;
+   Q_UINT32 *spp;
+   Q_UINT32 rval, rt;
    int er;
 
 #ifdef	TRACE
@@ -377,7 +377,7 @@ f (DES_KEY * key,  TQ_UINT32 r,  char *subkey)
   spp = &key->sp[7][0];
   rval = spp[(er ^ *subkey--) & 0x3f];
   spp -= 64;
-  rt = (TQ_UINT32) r >> 3;
+  rt = (Q_UINT32) r >> 3;
   rval |= spp[((int) rt ^ *subkey--) & 0x3f];
   spp -= 64;
   rt >>= 4;
@@ -457,7 +457,7 @@ spinit (DES_KEY * key)
 {
   char pbox[32];
   int p, i, s, j, rowcol;
-  TQ_UINT32 val;
+  Q_UINT32 val;
 
   /* Compute pbox, the inverse of p32i.
    * This is easier to work with
diff --git a/kio/misc/kntlm/des.h b/kio/misc/kntlm/des.h
index 0f6f59dc9..1cb2f27e5 100644
--- a/kio/misc/kntlm/des.h
+++ b/kio/misc/kntlm/des.h
@@ -6,7 +6,7 @@
 typedef struct des_key
 {
   char kn[16][8];
-  TQ_UINT32 sp[8][64];
+  Q_UINT32 sp[8][64];
   char iperm[16][16][8];
   char fperm[16][16][8];
 } DES_KEY;
diff --git a/kio/misc/kntlm/kntlm.cpp b/kio/misc/kntlm/kntlm.cpp
index db2b45b6c..a3eca3bdd 100644
--- a/kio/misc/kntlm/kntlm.cpp
+++ b/kio/misc/kntlm/kntlm.cpp
@@ -32,12 +32,12 @@
 #include "des.h"
 #include "kntlm.h"
 
-TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool tqunicode )
+TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool unicode )
 {
   //watch for buffer overflows
-  TQ_UINT32 offset;
-  TQ_UINT16 len;
-  offset = KFromToLittleEndian((TQ_UINT32)secbuf.offset);
+  Q_UINT32 offset;
+  Q_UINT16 len;
+  offset = KFromToLittleEndian((Q_UINT32)secbuf.offset);
   len = KFromToLittleEndian(secbuf.len);
   if ( offset > buf.size() ||
        offset + len > buf.size() ) return TQString::null;
@@ -45,10 +45,10 @@ TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool tq
   TQString str;
   const char *c = buf.data() + offset;
   
-  if ( tqunicode ) {
+  if ( unicode ) {
     str = UnicodeLE2TQString( (TQChar*) c, len >> 1 );
   } else {
-    str = TQString::tqfromLatin1( c, len );
+    str = TQString::fromLatin1( c, len );
   }
   return str;
 }
@@ -56,9 +56,9 @@ TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool tq
 TQByteArray KNTLM::getBuf( const TQByteArray &buf, const SecBuf &secbuf )
 {
   TQByteArray ret;
-  TQ_UINT32 offset;
-  TQ_UINT16 len;
-  offset = KFromToLittleEndian((TQ_UINT32)secbuf.offset);
+  Q_UINT32 offset;
+  Q_UINT16 len;
+  offset = KFromToLittleEndian((Q_UINT32)secbuf.offset);
   len = KFromToLittleEndian(secbuf.len);
   //watch for buffer overflows
   if ( offset > buf.size() ||
@@ -67,11 +67,11 @@ TQByteArray KNTLM::getBuf( const TQByteArray &buf, const SecBuf &secbuf )
   return ret;
 }
 
-void KNTLM::addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bool tqunicode )
+void KNTLM::addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bool unicode )
 {
   TQByteArray tmp;
 
-  if ( tqunicode ) {
+  if ( unicode ) {
     tmp = QString2UnicodeLE( str );
     addBuf( buf, secbuf, tmp );
   } else {
@@ -85,26 +85,26 @@ void KNTLM::addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bo
 
 void KNTLM::addBuf( TQByteArray &buf, SecBuf &secbuf, TQByteArray &data )
 {
-  TQ_UINT32 offset;
-  TQ_UINT16 len, maxlen;
+  Q_UINT32 offset;
+  Q_UINT16 len, maxlen;
   offset = (buf.size() + 1) & 0xfffffffe;
   len = data.size();
   maxlen = data.size();
   
-  secbuf.offset = KFromToLittleEndian((TQ_UINT32)offset);
+  secbuf.offset = KFromToLittleEndian((Q_UINT32)offset);
   secbuf.len = KFromToLittleEndian(len);
   secbuf.maxlen = KFromToLittleEndian(maxlen);
   buf.resize( offset + len );
   memcpy( buf.data() + offset, data.data(), data.size() );
 }
 
-bool KNTLM::getNegotiate( TQByteArray &negotiate, const TQString &domain, const TQString &workstation, TQ_UINT32 flags )
+bool KNTLM::getNegotiate( TQByteArray &negotiate, const TQString &domain, const TQString &workstation, Q_UINT32 flags )
 {
   TQByteArray rbuf( sizeof(Negotiate) );
   
   rbuf.fill( 0 );
   memcpy( rbuf.data(), "NTLMSSP", 8 );
-  ((Negotiate*) rbuf.data())->msgType = KFromToLittleEndian( (TQ_UINT32)1 );
+  ((Negotiate*) rbuf.data())->msgType = KFromToLittleEndian( (Q_UINT32)1 );
   if ( !domain.isEmpty() ) {
     flags |= Negotiate_Domain_Supplied;
     addString( rbuf, ((Negotiate*) rbuf.data())->domain, domain );
@@ -126,21 +126,21 @@ bool KNTLM::getAuth( TQByteArray &auth, const TQByteArray &challenge, const TQSt
   Challenge *ch = (Challenge *) challenge.data();
   TQByteArray response;
   uint chsize = challenge.size();
-  bool tqunicode = false;
+  bool unicode = false;
   TQString dom;
 
   //challenge structure too small
   if ( chsize < 32 ) return false;
 
-  tqunicode = KFromToLittleEndian(ch->flags) & Negotiate_Unicode;
+  unicode = KFromToLittleEndian(ch->flags) & Negotiate_Unicode;
   if ( domain.isEmpty() )
-    dom = getString( challenge, ch->targetName, tqunicode );
+    dom = getString( challenge, ch->targetName, unicode );
   else
     dom = domain;
     
   rbuf.fill( 0 );
   memcpy( rbuf.data(), "NTLMSSP", 8 );
-  ((Auth*) rbuf.data())->msgType = KFromToLittleEndian( (TQ_UINT32)3 );
+  ((Auth*) rbuf.data())->msgType = KFromToLittleEndian( (Q_UINT32)3 );
   ((Auth*) rbuf.data())->flags = ch->flags;
   TQByteArray targetInfo = getBuf( challenge, ch->targetInfo );
 
@@ -164,10 +164,10 @@ bool KNTLM::getAuth( TQByteArray &auth, const TQByteArray &challenge, const TQSt
     addBuf( rbuf, ((Auth*) rbuf.data())->lmResponse, response );
 //  }
   if ( !dom.isEmpty() )
-    addString( rbuf, ((Auth*) rbuf.data())->domain, dom, tqunicode );
-  addString( rbuf, ((Auth*) rbuf.data())->user, user, tqunicode );
+    addString( rbuf, ((Auth*) rbuf.data())->domain, dom, unicode );
+  addString( rbuf, ((Auth*) rbuf.data())->user, user, unicode );
   if ( !workstation.isEmpty() )
-    addString( rbuf, ((Auth*) rbuf.data())->workstation, workstation, tqunicode );
+    addString( rbuf, ((Auth*) rbuf.data())->workstation, workstation, unicode );
 
   auth = rbuf;
 
@@ -241,10 +241,10 @@ TQByteArray KNTLM::getNTLMResponse( const TQString &password, const unsigned cha
 TQByteArray KNTLM::ntlmHash( const TQString &password )
 {
   KMD4::Digest digest;
-  TQByteArray ret, tqunicode;
-  tqunicode = QString2UnicodeLE( password );
+  TQByteArray ret, unicode;
+  unicode = QString2UnicodeLE( password );
 
-  KMD4 md4( tqunicode );
+  KMD4 md4( unicode );
   md4.rawDigest( digest );
   ret.duplicate( (const char*) digest, sizeof( digest ) );
   return ret;
@@ -298,10 +298,10 @@ TQByteArray KNTLM::createBlob( const TQByteArray &targetinfo )
   blob.fill( 0 );
   
   Blob *bl = (Blob *) blob.data();
-  bl->signature = KFromToBigEndian( (TQ_UINT32) 0x01010000 );
-  TQ_UINT64 now = TQDateTime::tqcurrentDateTime().toTime_t();
-  now += (TQ_UINT64)3600*(TQ_UINT64)24*(TQ_UINT64)134774;
-  now *= (TQ_UINT64)10000000;
+  bl->signature = KFromToBigEndian( (Q_UINT32) 0x01010000 );
+  Q_UINT64 now = TQDateTime::currentDateTime().toTime_t();
+  now += (Q_UINT64)3600*(Q_UINT64)24*(Q_UINT64)134774;
+  now *= (Q_UINT64)10000000;
   bl->timestamp = KFromToLittleEndian( now );
   for ( uint i = 0; i<8; i++ ) {
     bl->challenge[i] = KApplication::random() % 0xff;
@@ -312,7 +312,7 @@ TQByteArray KNTLM::createBlob( const TQByteArray &targetinfo )
 
 TQByteArray KNTLM::hmacMD5( const TQByteArray &data, const TQByteArray &key )
 {
-  TQ_UINT8 ipad[64], opad[64];
+  Q_UINT8 ipad[64], opad[64];
   KMD5::Digest digest;
   TQByteArray ret;
   
@@ -372,18 +372,18 @@ void KNTLM::convertKey( unsigned char *key_56, void* ks )
 
 TQByteArray KNTLM::QString2UnicodeLE( const TQString &target )
 {
-  TQByteArray tqunicode( target.length() * 2 );
+  TQByteArray unicode( target.length() * 2 );
   for ( uint i = 0; i < target.length(); i++ ) {
-    ((TQ_UINT16*)tqunicode.data())[ i ] = KFromToLittleEndian( target[i].tqunicode() );
+    ((Q_UINT16*)unicode.data())[ i ] = KFromToLittleEndian( target[i].unicode() );
   }
-  return tqunicode;
+  return unicode;
 }
 
 TQString KNTLM::UnicodeLE2TQString( const TQChar* data, uint len )
 {
   TQString ret;
   for ( uint i = 0; i < len; i++ ) {
-    ret += KFromToLittleEndian( data[ i ].tqunicode() );
+    ret += KFromToLittleEndian( data[ i ].unicode() );
   }
   return ret;
 }
diff --git a/kio/misc/kntlm/kntlm.h b/kio/misc/kntlm/kntlm.h
index 23f00aa2a..9be4ea357 100644
--- a/kio/misc/kntlm/kntlm.h
+++ b/kio/misc/kntlm/kntlm.h
@@ -33,7 +33,7 @@
  * can be used for various servers which implements NTLM type authentication.
  * A comprehensive description of the NTLM authentication protocol can be found
  * at http://davenport.sourceforge.net/ntlm.html
- * The class also tqcontains methods to create the LanManager and NT (MD4) hashes
+ * The class also contains methods to create the LanManager and NT (MD4) hashes
  * of a password. 
  * This class doesn't maintain any state information, so all methods are static.
  */
@@ -70,9 +70,9 @@ public:
 
   typedef struct
   {
-    TQ_UINT16 len;
-    TQ_UINT16 maxlen;
-    TQ_UINT32 offset;
+    Q_UINT16 len;
+    Q_UINT16 maxlen;
+    Q_UINT32 offset;
   } SecBuf;
 
   /**
@@ -81,8 +81,8 @@ public:
   typedef struct
   {
     char signature[8]; /* "NTLMSSP\0" */
-    TQ_UINT32 msgType; /* 1 */
-    TQ_UINT32 flags;
+    Q_UINT32 msgType; /* 1 */
+    Q_UINT32 flags;
     SecBuf domain;
     SecBuf workstation;
   } Negotiate;
@@ -93,11 +93,11 @@ public:
   typedef struct
   {
     char signature[8];
-    TQ_UINT32 msgType; /* 2 */
+    Q_UINT32 msgType; /* 2 */
     SecBuf targetName;
-    TQ_UINT32 flags;
-    TQ_UINT8 challengeData[8];
-    TQ_UINT32 context[2];
+    Q_UINT32 flags;
+    Q_UINT8 challengeData[8];
+    Q_UINT32 context[2];
     SecBuf targetInfo;
   } Challenge;
 
@@ -107,23 +107,23 @@ public:
   typedef struct
   {
     char signature[8];
-    TQ_UINT32 msgType; /* 3 */
+    Q_UINT32 msgType; /* 3 */
     SecBuf lmResponse;
     SecBuf ntResponse;
     SecBuf domain;
     SecBuf user;
     SecBuf workstation;
     SecBuf sessionKey;
-    TQ_UINT32 flags;
+    Q_UINT32 flags;
   } Auth;
   
   typedef struct
   {
-    TQ_UINT32 signature;
-    TQ_UINT32 reserved;
-    TQ_UINT64 timestamp;
-    TQ_UINT8  challenge[8];
-    TQ_UINT8  unknown[4];
+    Q_UINT32 signature;
+    Q_UINT32 reserved;
+    Q_UINT64 timestamp;
+    Q_UINT8  challenge[8];
+    Q_UINT8  unknown[4];
     //Target info block - variable length
   } Blob;
 
@@ -139,7 +139,7 @@ public:
    */
   static bool getNegotiate( TQByteArray &negotiate, const TQString &domain = TQString::null, 
     const TQString &workstation = TQString::null,
-    TQ_UINT32 flags = Negotiate_Unicode | Request_Target | Negotiate_NTLM );
+    Q_UINT32 flags = Negotiate_Unicode | Request_Target | Negotiate_NTLM );
   /**
    * Creates the type 3 message which should be sent to the server after 
    * the challenge (type 2) received.
@@ -212,7 +212,7 @@ public:
   /**
    * Extracts a string field from an NTLM structure.
    */
-  static TQString getString( const TQByteArray &buf, const SecBuf &secbuf, bool tqunicode );
+  static TQString getString( const TQByteArray &buf, const SecBuf &secbuf, bool unicode );
   /**
    * Extracts a byte array from an NTLM structure.
    */
@@ -226,7 +226,7 @@ private:
   static TQString UnicodeLE2TQString( const TQChar* data, uint len );
 
   static void addBuf( TQByteArray &buf, SecBuf &secbuf, TQByteArray &data );
-  static void addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bool tqunicode = false );
+  static void addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bool unicode = false );
   static void convertKey( unsigned char *key_56, void* ks );
 };
 
diff --git a/kio/misc/kntlm/kswap.h b/kio/misc/kntlm/kswap.h
index 6f935237e..336321fd4 100644
--- a/kio/misc/kntlm/kswap.h
+++ b/kio/misc/kntlm/kswap.h
@@ -28,7 +28,7 @@
 
 /** 
  * \defgroup KSWAP Byte-swapping functions
- * kswap.h tqcontains functions that will help converting
+ * kswap.h contains functions that will help converting
  * 16, 32 and 64 bit length data between little-endian and
  * big-endian representations.
  *
@@ -47,52 +47,52 @@
 #ifdef HAVE_BYTESWAP_H
 #include <byteswap.h>
 
-  inline TQ_UINT16 KSWAP_16( TQ_UINT16 b ) { return bswap_16( b ); }
-  inline TQ_INT16 KSWAP_16( TQ_INT16 b ) { return bswap_16( (TQ_UINT16)b ); }
-  inline TQ_UINT32 KSWAP_32( TQ_UINT32 b ) { return bswap_32( b ); }
-  inline TQ_INT32 KSWAP_32( TQ_INT32 b ) { return bswap_32( (TQ_UINT32)b ); }
-  inline TQ_UINT64 KSWAP_64( TQ_UINT64 b ) { return bswap_64( b ); }
-  inline TQ_INT64 KSWAP_64( TQ_INT64 b ) { return bswap_64( (TQ_UINT64)b ); }
+  inline Q_UINT16 KSWAP_16( Q_UINT16 b ) { return bswap_16( b ); }
+  inline Q_INT16 KSWAP_16( Q_INT16 b ) { return bswap_16( (Q_UINT16)b ); }
+  inline Q_UINT32 KSWAP_32( Q_UINT32 b ) { return bswap_32( b ); }
+  inline Q_INT32 KSWAP_32( Q_INT32 b ) { return bswap_32( (Q_UINT32)b ); }
+  inline Q_UINT64 KSWAP_64( Q_UINT64 b ) { return bswap_64( b ); }
+  inline Q_INT64 KSWAP_64( Q_INT64 b ) { return bswap_64( (Q_UINT64)b ); }
 
 #else /* HAVE_BYTESWAP_H */
 #ifdef WORDS_BIGENDIAN
-  inline TQ_UINT16 KSWAP_16( TQ_UINT16 b ) 
+  inline Q_UINT16 KSWAP_16( Q_UINT16 b ) 
   { 
     return (((b) & 0x00ff) << 8 | ((b) & 0xff00) >> 8); 
   }
 
-  inline TQ_INT16 KSWAP_16( TQ_INT16 b ) 
+  inline Q_INT16 KSWAP_16( Q_INT16 b ) 
   { 
-    return ((((TQ_UINT16)b) & 0x00ff) << 8 | (((TQ_UINT16)b) & 0xff00) >> 8); 
+    return ((((Q_UINT16)b) & 0x00ff) << 8 | (((Q_UINT16)b) & 0xff00) >> 8); 
   }
 
-  inline TQ_UINT32 KSWAP_32( TQ_UINT32 b ) 
+  inline Q_UINT32 KSWAP_32( Q_UINT32 b ) 
   {
     return
       ((((b) & 0xff000000) >> 24) | (((b) & 0x00ff0000) >>  8) | \
        (((b) & 0x0000ff00) <<  8) | (((b) & 0x000000ff) << 24)); 
   }
 
-  inline TQ_INT32 KSWAP_32( TQ_INT32 b ) 
+  inline Q_INT32 KSWAP_32( Q_INT32 b ) 
   {
     return 
-      (((((TQ_UINT32)b) & 0xff000000) >> 24) | ((((TQ_UINT32)b) & 0x00ff0000) >>  8) | \
-       ((((TQ_UINT32)b) & 0x0000ff00) <<  8) | ((((TQ_UINT32)b) & 0x000000ff) << 24)); 
+      (((((Q_UINT32)b) & 0xff000000) >> 24) | ((((Q_UINT32)b) & 0x00ff0000) >>  8) | \
+       ((((Q_UINT32)b) & 0x0000ff00) <<  8) | ((((Q_UINT32)b) & 0x000000ff) << 24)); 
   }
 #else /* WORDS_BIGENDIAN */
 #include <sys/types.h>
 #include <netinet/in.h>
 
-  inline TQ_UINT16 KSWAP_16( TQ_UINT16 b ) { return htons(b); }
-  inline TQ_INT16 KSWAP_16( TQ_INT16 b ) { return htons((TQ_UINT16)b); }
-  inline TQ_UINT32 KSWAP_32( TQ_UINT32 b ) { return htonl(b); }
-  inline TQ_INT32 KSWAP_32( TQ_INT32 b ) { return htonl((TQ_UINT32)b); }
+  inline Q_UINT16 KSWAP_16( Q_UINT16 b ) { return htons(b); }
+  inline Q_INT16 KSWAP_16( Q_INT16 b ) { return htons((Q_UINT16)b); }
+  inline Q_UINT32 KSWAP_32( Q_UINT32 b ) { return htonl(b); }
+  inline Q_INT32 KSWAP_32( Q_INT32 b ) { return htonl((Q_UINT32)b); }
 #endif
-  inline TQ_UINT64 KSWAP_64( TQ_UINT64 b ) 
+  inline Q_UINT64 KSWAP_64( Q_UINT64 b ) 
   {
     union { 
-        TQ_UINT64 ll;
-        TQ_UINT32 l[2]; 
+        Q_UINT64 ll;
+        Q_UINT32 l[2]; 
     } w, r;
     w.ll = b;
     r.l[0] = KSWAP_32( w.l[1] );
@@ -100,13 +100,13 @@
     return r.ll;
   }
 
-  inline TQ_INT64 KSWAP_64( TQ_INT64 b ) 
+  inline Q_INT64 KSWAP_64( Q_INT64 b ) 
   {
     union { 
-        TQ_UINT64 ll;
-        TQ_UINT32 l[2]; 
+        Q_UINT64 ll;
+        Q_UINT32 l[2]; 
     } w, r;
-    w.ll = (TQ_UINT64) b;
+    w.ll = (Q_UINT64) b;
     r.l[0] = KSWAP_32( w.l[1] );
     r.l[1] = KSWAP_32( w.l[0] );
     return r.ll;
@@ -117,7 +117,7 @@
  * \ingroup KSWAP
  * Converts a 16 bit unsigned value from/to big-endian byte order to/from the machine order.
  */
-inline TQ_UINT16 KFromToBigEndian( TQ_UINT16 b )
+inline Q_UINT16 KFromToBigEndian( Q_UINT16 b )
 {
 #ifdef WORDS_BIGENDIAN
   return b;
@@ -130,7 +130,7 @@ inline TQ_UINT16 KFromToBigEndian( TQ_UINT16 b )
  * \ingroup KSWAP
  * Converts a 16 bit unsigned array from/to big-endian byte order to/from the machine order.
  */
-inline void KFromToBigEndian( TQ_UINT16 *out, TQ_UINT16 *in, uint len )
+inline void KFromToBigEndian( Q_UINT16 *out, Q_UINT16 *in, uint len )
 {
 #ifdef WORDS_BIGENDIAN
   if ( out != in ) memcpy( out, in, len<<1 ) ;
@@ -143,7 +143,7 @@ inline void KFromToBigEndian( TQ_UINT16 *out, TQ_UINT16 *in, uint len )
  * \ingroup KSWAP
  * Converts a 32 bit unsigned value from/to big-endian byte order to/from the machine order.
  */
-inline TQ_UINT32 KFromToBigEndian( TQ_UINT32 b )
+inline Q_UINT32 KFromToBigEndian( Q_UINT32 b )
 {
 #ifdef WORDS_BIGENDIAN
   return b;
@@ -156,7 +156,7 @@ inline TQ_UINT32 KFromToBigEndian( TQ_UINT32 b )
  * \ingroup KSWAP
  * Converts a 32 bit unsigned array from/to big-endian byte order to/from the machine order.
  */
-inline void KFromToBigEndian( TQ_UINT32 *out, TQ_UINT32 *in, uint len )
+inline void KFromToBigEndian( Q_UINT32 *out, Q_UINT32 *in, uint len )
 {
 #ifdef WORDS_BIGENDIAN
   if ( out != in ) memcpy( out, in, len<<2 ) ;
@@ -169,7 +169,7 @@ inline void KFromToBigEndian( TQ_UINT32 *out, TQ_UINT32 *in, uint len )
  * \ingroup KSWAP
  * Converts a 64 bit unsigned value from/to big-endian byte order to/from the machine order.
  */
-inline TQ_UINT64 KFromToBigEndian( TQ_UINT64 b )
+inline Q_UINT64 KFromToBigEndian( Q_UINT64 b )
 {
 #ifdef WORDS_BIGENDIAN
   return b;
@@ -182,7 +182,7 @@ inline TQ_UINT64 KFromToBigEndian( TQ_UINT64 b )
  * \ingroup KSWAP
  * Converts a 64 bit unsigned array from/to big-endian byte order to/from the machine order.
  */
-inline void KFromToBigEndian( TQ_UINT64 *out, TQ_UINT64 *in, uint len )
+inline void KFromToBigEndian( Q_UINT64 *out, Q_UINT64 *in, uint len )
 {
 #ifdef WORDS_BIGENDIAN
   if ( out != in ) memcpy( out, in, len<<3 ) ;
@@ -195,7 +195,7 @@ inline void KFromToBigEndian( TQ_UINT64 *out, TQ_UINT64 *in, uint len )
  * \ingroup KSWAP
  * Converts a 16 bit signed value from/to big-endian byte order to/from the machine order.
  */
-inline TQ_INT16 KFromToBigEndian( TQ_INT16 b )
+inline Q_INT16 KFromToBigEndian( Q_INT16 b )
 {
 #ifdef WORDS_BIGENDIAN
   return b;
@@ -208,7 +208,7 @@ inline TQ_INT16 KFromToBigEndian( TQ_INT16 b )
  * \ingroup KSWAP
  * Converts a 16 bit signed array from/to big-endian byte order to/from the machine order.
  */
-inline void KFromToBigEndian( TQ_INT16 *out, TQ_INT16 *in, uint len )
+inline void KFromToBigEndian( Q_INT16 *out, Q_INT16 *in, uint len )
 {
 #ifdef WORDS_BIGENDIAN
   if ( out != in ) memcpy( out, in, len<<1 ) ;
@@ -221,7 +221,7 @@ inline void KFromToBigEndian( TQ_INT16 *out, TQ_INT16 *in, uint len )
  * \ingroup KSWAP
  * Converts a 32 bit signed value from/to big-endian byte order to/from the machine order.
  */
-inline TQ_INT32 KFromToBigEndian( TQ_INT32 b )
+inline Q_INT32 KFromToBigEndian( Q_INT32 b )
 {
 #ifdef WORDS_BIGENDIAN
   return b;
@@ -234,7 +234,7 @@ inline TQ_INT32 KFromToBigEndian( TQ_INT32 b )
  * \ingroup KSWAP
  * Converts a 32 bit signed array from/to big-endian byte order to/from the machine order.
  */
-inline void KFromToBigEndian( TQ_INT32 *out, TQ_INT32 *in, uint len )
+inline void KFromToBigEndian( Q_INT32 *out, Q_INT32 *in, uint len )
 {
 #ifdef WORDS_BIGENDIAN
   if ( out != in ) memcpy( out, in, len<<2 ) ;
@@ -247,7 +247,7 @@ inline void KFromToBigEndian( TQ_INT32 *out, TQ_INT32 *in, uint len )
  * \ingroup KSWAP
  * Converts a 64 bit signed value from/to big-endian byte order to/from the machine order.
  */
-inline TQ_INT64 KFromToBigEndian( TQ_INT64 b )
+inline Q_INT64 KFromToBigEndian( Q_INT64 b )
 {
 #ifdef WORDS_BIGENDIAN
   return b;
@@ -260,7 +260,7 @@ inline TQ_INT64 KFromToBigEndian( TQ_INT64 b )
  * \ingroup KSWAP
  * Converts a 64 bit signed array from/to big-endian byte order to/from the machine order.
  */
-inline void KFromToBigEndian( TQ_INT64 *out, TQ_INT64 *in, uint len )
+inline void KFromToBigEndian( Q_INT64 *out, Q_INT64 *in, uint len )
 {
 #ifdef WORDS_BIGENDIAN
   if ( out != in ) memcpy( out, in, len<<3 ) ;
@@ -273,7 +273,7 @@ inline void KFromToBigEndian( TQ_INT64 *out, TQ_INT64 *in, uint len )
  * \ingroup KSWAP
  * Converts a 16 bit unsigned value from/to little-endian byte order to/from the machine order.
  */
-inline TQ_UINT16 KFromToLittleEndian( TQ_UINT16 b )
+inline Q_UINT16 KFromToLittleEndian( Q_UINT16 b )
 {
 #ifndef WORDS_BIGENDIAN
   return b;
@@ -286,7 +286,7 @@ inline TQ_UINT16 KFromToLittleEndian( TQ_UINT16 b )
  * \ingroup KSWAP
  * Converts a 16 bit unsigned array from/to little-endian byte order to/from the machine order.
  */
-inline void KFromToLittleEndian( TQ_UINT16 *out, TQ_UINT16 *in, uint len )
+inline void KFromToLittleEndian( Q_UINT16 *out, Q_UINT16 *in, uint len )
 {
 #ifndef WORDS_BIGENDIAN
   if ( out != in ) memcpy( out, in, len<<1 ) ;
@@ -299,7 +299,7 @@ inline void KFromToLittleEndian( TQ_UINT16 *out, TQ_UINT16 *in, uint len )
  * \ingroup KSWAP
  * Converts a 32 bit unsigned value from/to little-endian byte order to/from the machine order.
  */
-inline TQ_UINT32 KFromToLittleEndian( TQ_UINT32 b )
+inline Q_UINT32 KFromToLittleEndian( Q_UINT32 b )
 {
 #ifndef WORDS_BIGENDIAN
   return b;
@@ -312,7 +312,7 @@ inline TQ_UINT32 KFromToLittleEndian( TQ_UINT32 b )
  * \ingroup KSWAP
  * Converts a 32 bit unsigned array from/to little-endian byte order to/from the machine order.
  */
-inline void KFromToLittleEndian( TQ_UINT32 *out, TQ_UINT32 *in, uint len )
+inline void KFromToLittleEndian( Q_UINT32 *out, Q_UINT32 *in, uint len )
 {
 #ifndef WORDS_BIGENDIAN
   if ( out != in ) memcpy( out, in, len<<2 ) ;
@@ -325,7 +325,7 @@ inline void KFromToLittleEndian( TQ_UINT32 *out, TQ_UINT32 *in, uint len )
  * \ingroup KSWAP
  * Converts a 64 bit unsigned value from/to little-endian byte order to/from the machine order.
  */
-inline TQ_UINT64 KFromToLittleEndian( TQ_UINT64 b )
+inline Q_UINT64 KFromToLittleEndian( Q_UINT64 b )
 {
 #ifndef WORDS_BIGENDIAN
   return b;
@@ -338,7 +338,7 @@ inline TQ_UINT64 KFromToLittleEndian( TQ_UINT64 b )
  * \ingroup KSWAP
  * Converts a 64 bit unsigned array from/to little-endian byte order to/from the machine order.
  */
-inline void KFromToLittleEndian( TQ_UINT64 *out, TQ_UINT64 *in, uint len )
+inline void KFromToLittleEndian( Q_UINT64 *out, Q_UINT64 *in, uint len )
 {
 #ifndef WORDS_BIGENDIAN
   if ( out != in ) memcpy( out, in, len<<3 ) ;
@@ -351,7 +351,7 @@ inline void KFromToLittleEndian( TQ_UINT64 *out, TQ_UINT64 *in, uint len )
  * \ingroup KSWAP
  * Converts a 16 bit signed value from/to little-endian byte order to/from the machine order.
  */
-inline TQ_INT16 KFromToLittleEndian( TQ_INT16 b )
+inline Q_INT16 KFromToLittleEndian( Q_INT16 b )
 {
 #ifndef WORDS_BIGENDIAN
   return b;
@@ -364,7 +364,7 @@ inline TQ_INT16 KFromToLittleEndian( TQ_INT16 b )
  * \ingroup KSWAP
  * Converts a 16 bit signed array from/to little-endian byte order to/from the machine order.
  */
-inline void KFromToLittleEndian( TQ_INT16 *out, TQ_INT16 *in, uint len )
+inline void KFromToLittleEndian( Q_INT16 *out, Q_INT16 *in, uint len )
 {
 #ifndef WORDS_BIGENDIAN
   if ( out != in ) memcpy( out, in, len<<1 ) ;
@@ -377,7 +377,7 @@ inline void KFromToLittleEndian( TQ_INT16 *out, TQ_INT16 *in, uint len )
  * \ingroup KSWAP
  * Converts a 32 bit signed value from/to little-endian byte order to/from the machine order.
  */
-inline TQ_INT32 KFromToLittleEndian( TQ_INT32 b )
+inline Q_INT32 KFromToLittleEndian( Q_INT32 b )
 {
 #ifndef WORDS_BIGENDIAN
   return b;
@@ -390,7 +390,7 @@ inline TQ_INT32 KFromToLittleEndian( TQ_INT32 b )
  * \ingroup KSWAP
  * Converts a 32 bit signed array from/to little-endian byte order to/from the machine order.
  */
-inline void KFromToLittleEndian( TQ_INT32 *out, TQ_INT32 *in, uint len )
+inline void KFromToLittleEndian( Q_INT32 *out, Q_INT32 *in, uint len )
 {
 #ifndef WORDS_BIGENDIAN
   if ( out != in ) memcpy( out, in, len<<2 ) ;
@@ -403,7 +403,7 @@ inline void KFromToLittleEndian( TQ_INT32 *out, TQ_INT32 *in, uint len )
  * \ingroup KSWAP
  * Converts a 64 bit signed value from/to little-endian byte order to/from the machine order.
  */
-inline TQ_INT64 KFromToLittleEndian( TQ_INT64 b )
+inline Q_INT64 KFromToLittleEndian( Q_INT64 b )
 {
 #ifndef WORDS_BIGENDIAN
   return b;
@@ -416,7 +416,7 @@ inline TQ_INT64 KFromToLittleEndian( TQ_INT64 b )
  * \ingroup KSWAP
  * Converts a 64 bit signed array from/to little-endian byte order to/from the machine order.
  */
-inline void KFromToLittleEndian( TQ_INT64 *out, TQ_INT64 *in, uint len )
+inline void KFromToLittleEndian( Q_INT64 *out, Q_INT64 *in, uint len )
 {
 #ifndef WORDS_BIGENDIAN
   if ( out != in ) memcpy( out, in, len<<3 ) ;
diff --git a/kio/misc/kpac/README.wpad b/kio/misc/kpac/README.wpad
index ed18a36b5..f63d25764 100644
--- a/kio/misc/kpac/README.wpad
+++ b/kio/misc/kpac/README.wpad
@@ -2,7 +2,7 @@ Web Proxy Auto Discovery (WPAD)
 ===============================
 
 This README is intended for network administrators who want to enable the
-users on their network to fully automatically tqfind the proxy settings.
+users on their network to fully automatically find the proxy settings.
 
 Automatic proxy discovery works in two steps:
 1) Find a configuration script
@@ -12,7 +12,7 @@ The configuration script is a "PAC" (JavaScript) file just as in plain Proxy
 Auto Configuration as described here:
 http://home.netscape.com/eng/mozilla/2.0/relnotes/demo/proxy-live.html
 
-The WPAD part of the process (#1 above) described here is about how to tqfind
+The WPAD part of the process (#1 above) described here is about how to find
 this script without having the users enter its URL into the proxy settings.
 (All they have to do in a WPAD-enabled network is to select "Automatically
 detected script file" in KDE's proxy setup.
diff --git a/kio/misc/kpac/discovery.cpp b/kio/misc/kpac/discovery.cpp
index 193b46d98..7a84958f7 100644
--- a/kio/misc/kpac/discovery.cpp
+++ b/kio/misc/kpac/discovery.cpp
@@ -113,11 +113,11 @@ namespace KPAC
 
     void Discovery::failed()
     {
-        setError( i18n( "Could not tqfind a usable proxy configuration script" ) );
+        setError( i18n( "Could not find a usable proxy configuration script" ) );
 
         // If this is the first DNS query, initialize our host name or abort
         // on failure. Otherwise abort if the current domain (which was already
-        // queried for a host called "wpad" tqcontains a SOA record)
+        // queried for a host called "wpad" contains a SOA record)
         bool firstQuery = m_hostname.isEmpty();
         if ( ( firstQuery && !initHostName() ) ||
              ( !firstQuery && !checkDomain() ) )
@@ -126,7 +126,7 @@ namespace KPAC
             return;
         }
 
-        int dot = m_hostname.tqfind( '.' );
+        int dot = m_hostname.find( '.' );
         if ( dot >= 0 )
         {
             m_hostname.remove( 0, dot + 1 ); // remove one domain level
diff --git a/kio/misc/kpac/downloader.h b/kio/misc/kpac/downloader.h
index 82418882f..05d8569cc 100644
--- a/kio/misc/kpac/downloader.h
+++ b/kio/misc/kpac/downloader.h
@@ -29,7 +29,7 @@ namespace KIO { class Job; }
 
 namespace KPAC
 {
-    class Downloader : public TQObject
+    class Downloader : public QObject
     {
         Q_OBJECT
     public:
diff --git a/kio/misc/kpac/proxyscout.cpp b/kio/misc/kpac/proxyscout.cpp
index f843dc045..6cba79db6 100644
--- a/kio/misc/kpac/proxyscout.cpp
+++ b/kio/misc/kpac/proxyscout.cpp
@@ -162,9 +162,9 @@ namespace KPAC
                     // this particular case, simply calling setProtocol() on
                     // it trashes the whole URL.
                     int len = proxyURL.protocol().length();
-                    if ( !proxyURL.isValid() || proxy.tqfind( ":/", len ) != len )
+                    if ( !proxyURL.isValid() || proxy.find( ":/", len ) != len )
                         proxy.prepend("http://");
-                    BlackList::Iterator it = m_blackList.tqfind( proxy );
+                    BlackList::Iterator it = m_blackList.find( proxy );
                     if ( it == m_blackList.end() ) return proxy;
                     else if ( std::time( 0 ) - *it > 1800 ) // 30 minutes
                     {
diff --git a/kio/misc/kpac/script.cpp b/kio/misc/kpac/script.cpp
index 752fb4cc5..55faef8a1 100644
--- a/kio/misc/kpac/script.cpp
+++ b/kio/misc/kpac/script.cpp
@@ -49,7 +49,7 @@ TQString UString::qstring() const
 UString::UString( const TQString &s )
 {
     UChar* data = new UChar[ s.length() ];
-    std::memcpy( data, s.tqunicode(), s.length() * sizeof( UChar ) );
+    std::memcpy( data, s.unicode(), s.length() * sizeof( UChar ) );
     rep = Rep::create( data, s.length() );
 }
 
@@ -98,7 +98,7 @@ namespace
 
         virtual bool implementsCall() const { return true; }
 
-        static int tqfindString( const UString& s, const char* const* values )
+        static int findString( const UString& s, const char* const* values )
         {
             int index = 0;
             UString lower = s.toLower();
@@ -123,13 +123,13 @@ namespace
     };
 
     // isPlainHostName( host )
-    // @returns true if @p host doesn't tqcontains a domain part
+    // @returns true if @p host doesn't contains a domain part
     struct IsPlainHostName : public Function
     {
         virtual Value call( ExecState* exec, Object&, const List& args )
         {
             if ( args.size() != 1 ) return Undefined();
-            return Boolean( args[ 0 ].toString( exec ).tqfind( "." ) == -1 );
+            return Boolean( args[ 0 ].toString( exec ).find( "." ) == -1 );
         }
     };
 
@@ -154,7 +154,7 @@ namespace
         {
             if ( args.size() != 2 ) return Undefined();
             UString host = args[ 0 ].toString( exec ).toLower();
-            if ( host.tqfind( "." ) == -1 ) return Boolean( true );
+            if ( host.find( "." ) == -1 ) return Boolean( true );
             UString fqdn = args[ 1 ].toString( exec ).toLower();
             return Boolean( host == fqdn );
         }
@@ -173,9 +173,9 @@ namespace
         }
     };
 
-    // isInNet( host, subnet, tqmask )
+    // isInNet( host, subnet, mask )
     // @returns true if @p host is within the IP subnet
-    //          specified via @p subnet and @p tqmask
+    //          specified via @p subnet and @p mask
     struct IsInNet : public Function
     {
         virtual Value call( ExecState* exec, Object&, const List& args )
@@ -185,8 +185,8 @@ namespace
             {
                 in_addr_t host = Address::resolve( args[ 0 ].toString( exec ) );
                 in_addr_t subnet = Address::parse( args[ 1 ].toString( exec ) );
-                in_addr_t tqmask = Address::parse( args[ 2 ].toString( exec ) );
-                return Boolean( ( host & tqmask ) == ( subnet & tqmask ) );
+                in_addr_t mask = Address::parse( args[ 2 ].toString( exec ) );
+                return Boolean( ( host & mask ) == ( subnet & mask ) );
             }
             catch ( const Address::Error& )
             {
@@ -259,10 +259,10 @@ namespace
             if ( args.size() < 1 || args.size() > 3 ) return Undefined();
             static const char* const days[] =
                 { "sun", "mon", "tue", "wed", "thu", "fri", "sat", 0 };
-            int d1 = tqfindString( args[ 0 ].toString( exec ), days );
+            int d1 = findString( args[ 0 ].toString( exec ), days );
             if ( d1 == -1 ) return Undefined();
 
-            int d2 = tqfindString( args[ 1 ].toString( exec ), days );
+            int d2 = findString( args[ 1 ].toString( exec ), days );
             if ( d2 == -1 ) d2 = d1;
             return checkRange( getTime( exec, args )->tm_wday, d1, d2 );
         }
@@ -293,7 +293,7 @@ namespace
                 int value = -1;
                 if ( args[ i ].isA( NumberType ) )
                     value = args[ i ].toInteger( exec );
-                else value = tqfindString( args[ i ].toString( exec ), months );
+                else value = findString( args[ i ].toString( exec ), months );
                 if ( value >= 0 ) values.push_back( value );
                 else break;
             }
@@ -441,16 +441,16 @@ namespace KPAC
     TQString Script::evaluate( const KURL& url )
     {
 	ExecState *exec = m_interpreter.globalExec();
-	Value tqfindFunc = m_interpreter.globalObject().get( exec, "FindProxyForURL" );
-	Object tqfindObj = Object::dynamicCast( tqfindFunc );
-	if (!tqfindObj.isValid() || !tqfindObj.implementsCall())
+	Value findFunc = m_interpreter.globalObject().get( exec, "FindProxyForURL" );
+	Object findObj = Object::dynamicCast( findFunc );
+	if (!findObj.isValid() || !findObj.implementsCall())
 	  throw Error( "No such function FindProxyForURL" );
 
 	Object thisObj;
 	List args;
 	args.append(String(url.url()));
 	args.append(String(url.host()));
-	Value retval = tqfindObj.call( exec, thisObj, args );
+	Value retval = findObj.call( exec, thisObj, args );
 
 	if ( exec->hadException() ) {
 	  Value ex = exec->exception();
diff --git a/kio/misc/ksendbugmail/main.cpp b/kio/misc/ksendbugmail/main.cpp
index 4a4449ba2..d84e4c297 100644
--- a/kio/misc/ksendbugmail/main.cpp
+++ b/kio/misc/ksendbugmail/main.cpp
@@ -101,11 +101,11 @@ int main(int argc, char **argv) {
     if (!fromaddr.isEmpty()) {
         TQString name = emailConfig.getSetting(KEMailSettings::RealName);
         if (!name.isEmpty())
-            fromaddr = name + TQString::tqfromLatin1(" <") + fromaddr + TQString::tqfromLatin1(">");
+            fromaddr = name + TQString::fromLatin1(" <") + fromaddr + TQString::fromLatin1(">");
     } else {
         struct passwd *p;
         p = getpwuid(getuid());
-        fromaddr = TQString::tqfromLatin1(p->pw_name);
+        fromaddr = TQString::fromLatin1(p->pw_name);
         fromaddr += "@";
         char buffer[256];
 	buffer[0] = '\0';
@@ -117,7 +117,7 @@ int main(int argc, char **argv) {
 
     TQString  server = emailConfig.getSetting(KEMailSettings::OutServer);
     if (server.isEmpty())
-        server=TQString::tqfromLatin1("bugs.kde.org");
+        server=TQString::fromLatin1("bugs.kde.org");
 
     SMTP *sm = new SMTP;
     BugMailer bm(sm);
@@ -129,7 +129,7 @@ int main(int argc, char **argv) {
     sm->setSenderAddress(fromaddr);
     sm->setRecipientAddress(recipient);
     sm->setMessageSubject(subject);
-    sm->setMessageHeader(TQString::tqfromLatin1("From: %1\r\nTo: %2\r\n").arg(fromaddr).arg(recipient));
+    sm->setMessageHeader(TQString::fromLatin1("From: %1\r\nTo: %2\r\n").arg(fromaddr).arg(recipient));
     sm->setMessageBody(text);
     sm->sendMessage();
 
diff --git a/kio/misc/ksendbugmail/smtp.cpp b/kio/misc/ksendbugmail/smtp.cpp
index 4581d01d4..36a417b88 100644
--- a/kio/misc/ksendbugmail/smtp.cpp
+++ b/kio/misc/ksendbugmail/smtp.cpp
@@ -74,22 +74,22 @@ void SMTP::setTimeOut(int timeout)
 void SMTP::setSenderAddress(const TQString& sender)
 {
     senderAddress = sender;
-    int index = senderAddress.tqfind('<');
+    int index = senderAddress.find('<');
     if (index == -1)
         return;
     senderAddress = senderAddress.mid(index + 1);
-    index =  senderAddress.tqfind('>');
+    index =  senderAddress.find('>');
     if (index != -1)
         senderAddress = senderAddress.left(index);
     senderAddress = senderAddress.simplifyWhiteSpace();
     while (1) {
-        index =  senderAddress.tqfind(' ');
+        index =  senderAddress.find(' ');
         if (index != -1)
             senderAddress = senderAddress.mid(index + 1); // take one side
         else
             break;
     }
-    index = senderAddress.tqfind('@');
+    index = senderAddress.find('@');
     if (index == -1)
         senderAddress.append("@localhost"); // won't go through without a local mail system
 
@@ -134,7 +134,7 @@ void SMTP::sendMessage(void)
         kdDebug() << "state was == FINISHED\n" << endl;
         finished = false;
         state = IN;
-        writeString = TQString::tqfromLatin1("helo %1\r\n").arg(domainName);
+        writeString = TQString::fromLatin1("helo %1\r\n").arg(domainName);
         write(sock->socket(), writeString.ascii(), writeString.length());
     }
     if(connected){
@@ -218,7 +218,7 @@ void SMTP::socketRead(KSocket *socket)
 
     readBuffer[n] = '\0';
     lineBuffer += readBuffer;
-    nl = lineBuffer.tqfind('\n');
+    nl = lineBuffer.find('\n');
     if(nl == -1)
         return;
     lastLine = lineBuffer.left(nl);
@@ -249,12 +249,12 @@ void SMTP::processLine(TQString *line)
     int i, stat;
     TQString tmpstr;
 
-    i = line->tqfind(' ');
+    i = line->find(' ');
     tmpstr = line->left(i);
     if(i > 3)
         kdDebug() << "warning: SMTP status code longer then 3 digits: " << tmpstr << endl;
     stat = tmpstr.toInt();
-    serverState = (SMTPServertqStatus)stat;
+    serverState = (SMTPServerStatus)stat;
     lastState = state;
 
     kdDebug() << "smtp state: [" << stat << "][" << *line << "]" << endl;
@@ -262,7 +262,7 @@ void SMTP::processLine(TQString *line)
     switch(stat){
     case GREET:     //220
         state = IN;
-        writeString = TQString::tqfromLatin1("helo %1\r\n").arg(domainName);
+        writeString = TQString::fromLatin1("helo %1\r\n").arg(domainName);
         kdDebug() << "out: " << writeString << endl;
 	write(sock->socket(), writeString.ascii(), writeString.length());
         break;
@@ -273,19 +273,19 @@ void SMTP::processLine(TQString *line)
         switch(state){
         case IN:
             state = READY;
-            writeString = TQString::tqfromLatin1("mail from: %1\r\n").arg(senderAddress);
+            writeString = TQString::fromLatin1("mail from: %1\r\n").arg(senderAddress);
             kdDebug() << "out: " << writeString << endl;
             write(sock->socket(), writeString.ascii(), writeString.length());
             break;
         case READY:
             state = SENTFROM;
-            writeString = TQString::tqfromLatin1("rcpt to: %1\r\n").arg(recipientAddress);
+            writeString = TQString::fromLatin1("rcpt to: %1\r\n").arg(recipientAddress);
              kdDebug() << "out: " << writeString << endl;
             write(sock->socket(), writeString.ascii(), writeString.length());
             break;
         case SENTFROM:
             state = SENTTO;
-            writeString = TQString::tqfromLatin1("data\r\n");
+            writeString = TQString::fromLatin1("data\r\n");
              kdDebug() << "out: " << writeString << endl;
             write(sock->socket(), writeString.ascii(), writeString.length());
             break;
@@ -305,11 +305,11 @@ void SMTP::processLine(TQString *line)
         break;
     case READYDATA: //354
         state = DATA;
-        writeString = TQString::tqfromLatin1("Subject: %1\r\n").arg(messageSubject);
+        writeString = TQString::fromLatin1("Subject: %1\r\n").arg(messageSubject);
         writeString += messageHeader;
         writeString += "\r\n";
         writeString += messageBody;
-        writeString += TQString::tqfromLatin1(".\r\n");
+        writeString += TQString::fromLatin1(".\r\n");
         kdDebug() << "out: " << writeString;
         write(sock->socket(), writeString.ascii(), writeString.length());
         break;
diff --git a/kio/misc/ksendbugmail/smtp.h b/kio/misc/ksendbugmail/smtp.h
index b8e782cb9..707d20ae4 100644
--- a/kio/misc/ksendbugmail/smtp.h
+++ b/kio/misc/ksendbugmail/smtp.h
@@ -7,7 +7,7 @@
 #include <tqtimer.h>
 #include <ksock.h>
 
-/*int SMTPServertqStatus[] = {
+/*int SMTPServerStatus[] = {
     220,  // greeting from server
     221,  // server acknolages goodbye
     250,  // command successful
@@ -17,7 +17,7 @@
     0     // null
 };
 
-int SMTPClienttqStatus[] = {
+int SMTPClientStatus[] = {
     50,   // not logged in yet.
     100,  // logged in, got 220
     150,  // sent helo, got 250
@@ -37,7 +37,7 @@ int SMTPClienttqStatus[] = {
 
 #define SMTP_READ_BUFFER_SIZE 256
 
-class SMTP:public TQObject
+class SMTP:public QObject
 {
     Q_OBJECT
 public:
@@ -66,7 +66,7 @@ public:
         READYDATA = 354,      // server ready to receive data
         ERROR = 501,          // error
         UNKNOWN = 550        // user unknown
-    }SMTPServertqStatus;
+    }SMTPServerStatus;
 
     typedef enum {
         INIT = 50,            // not logged in yet
@@ -79,7 +79,7 @@ public:
         QUIT = 400,           // sent QUIT, got 221
         OUT = 450,            // finished, logged out
         CERROR = 500           // didn't finish, had error or connection drop
-    }SMTPClienttqStatus;
+    }SMTPClientStatus;
 
     typedef enum {
         NOERROR = 0,
@@ -125,9 +125,9 @@ private:
     TQString messageSubject;
     TQString messageBody, messageHeader;
 
-    SMTPClienttqStatus state;
-    SMTPClienttqStatus lastState;
-    SMTPServertqStatus serverState;
+    SMTPClientStatus state;
+    SMTPClientStatus lastState;
+    SMTPServerStatus serverState;
 
     TQString domainName;
 
diff --git a/kio/misc/kssld/kssld.cpp b/kio/misc/kssld/kssld.cpp
index cd911de4a..9e8b85574 100644
--- a/kio/misc/kssld/kssld.cpp
+++ b/kio/misc/kssld/kssld.cpp
@@ -72,7 +72,7 @@ static void updatePoliciesConfig(KConfig *cfg) {
 		cfg->setGroup(*i);
 
 		// remove it if it has expired
-		if (!cfg->readBoolEntry("Permanent") && cfg->readDateTimeEntry("Expires") < TQDateTime::tqcurrentDateTime()) {
+		if (!cfg->readBoolEntry("Permanent") && cfg->readDateTimeEntry("Expires") < TQDateTime::currentDateTime()) {
 			cfg->deleteGroup(*i);
 			continue;
 		}
@@ -164,7 +164,7 @@ KSSLCNode *node;
 
 	for (node = certList.first(); node; node = certList.next()) {
 		if (node->permanent ||
-			node->expires > TQDateTime::tqcurrentDateTime()) {
+			node->expires > TQDateTime::currentDateTime()) {
 			// First convert to a binary format and then write the
 			// kconfig entry write the (CN, policy, cert) to
 			// KSimpleConfig
@@ -194,7 +194,7 @@ KSSLCNode *node;
 
 	cfg->sync();
 
-	// insure proper permissions -- tqcontains sensitive data
+	// insure proper permissions -- contains sensitive data
 	TQString cfgName(KGlobal::dirs()->findResource("config", "ksslpolicies"));
 
 	if (!cfgName.isEmpty()) {
@@ -239,7 +239,7 @@ TQStringList groups = cfg->groupList();
 		// remove it if it has expired
 		if (!cfg->readBoolEntry("Permanent") &&
 			cfg->readDateTimeEntry("Expires") <
-				TQDateTime::tqcurrentDateTime()) {
+				TQDateTime::currentDateTime()) {
 			cfg->deleteGroup(*i);
 			continue;
 		}
@@ -278,7 +278,7 @@ KSSLCNode *node;
 			node->permanent = permanent;
 
 			if (!permanent) {
-				node->expires = TQDateTime::tqcurrentDateTime();
+				node->expires = TQDateTime::currentDateTime();
 				// FIXME: make this configurable
 				node->expires = node->expires.addSecs(3600);
 			}
@@ -297,7 +297,7 @@ KSSLCNode *node;
 	certList.prepend(n); 
 
 	if (!permanent) {
-		n->expires = TQDateTime::tqcurrentDateTime();
+		n->expires = TQDateTime::currentDateTime();
 		n->expires = n->expires.addSecs(3600);
 	}
 
@@ -312,7 +312,7 @@ KSSLCNode *node;
 	for (node = certList.first(); node; node = certList.next()) {
 		if (KSSLX509Map(node->cert->getSubject()).getValue("CN") == cn) {
 			if (!node->permanent &&
-				node->expires < TQDateTime::tqcurrentDateTime()) {
+				node->expires < TQDateTime::currentDateTime()) {
 				certList.remove(node);
 				cfg->deleteGroup(node->cert->getMD5Digest());
 				delete node;
@@ -338,7 +338,7 @@ KSSLCNode *node;
 	for (node = certList.first(); node; node = certList.next()) {
 		if (cert == *(node->cert)) {  
 			if (!node->permanent &&
-				node->expires < TQDateTime::tqcurrentDateTime()) {
+				node->expires < TQDateTime::currentDateTime()) {
 				certList.remove(node);
 				cfg->deleteGroup(node->cert->getMD5Digest());
 				delete node;
@@ -362,7 +362,7 @@ KSSLCNode *node;
 	for (node = certList.first(); node; node = certList.next()) {
 		if (KSSLX509Map(node->cert->getSubject()).getValue("CN") == cn) {
 			if (!node->permanent &&
-				node->expires < TQDateTime::tqcurrentDateTime()) {
+				node->expires < TQDateTime::currentDateTime()) {
 				certList.remove(node);
 				cfg->deleteGroup(node->cert->getMD5Digest());
 				delete node;
@@ -386,7 +386,7 @@ KSSLCNode *node;
 	for (node = certList.first(); node; node = certList.next()) {
 		if (cert == *(node->cert)) {
 			if (!node->permanent &&
-				node->expires < TQDateTime::tqcurrentDateTime()) {
+				node->expires < TQDateTime::currentDateTime()) {
 				certList.remove(node);
 				cfg->deleteGroup(node->cert->getMD5Digest());
 				delete node;
@@ -410,7 +410,7 @@ KSSLCNode *node;
 	for (node = certList.first(); node; node = certList.next()) {
 		if (cert == *(node->cert)) {
 			if (!node->permanent && node->expires <
-					TQDateTime::tqcurrentDateTime()) {
+					TQDateTime::currentDateTime()) {
 				certList.remove(node);
 				cfg->deleteGroup(node->cert->getMD5Digest());
 				delete node;
@@ -535,7 +535,7 @@ KSSLCNode *node;
 	for (node = certList.first(); node; node = certList.next()) {
 		if (cert == *(node->cert)) {
 			if (!node->permanent && node->expires <
-				       TQDateTime::tqcurrentDateTime()) {
+				       TQDateTime::currentDateTime()) {
 				certList.remove(node);
 				cfg->deleteGroup(node->cert->getMD5Digest());
 				searchRemoveCert(node->cert);
@@ -563,7 +563,7 @@ KSSLCNode *node;
 	for (node = certList.first(); node; node = certList.next()) {
 		if (cert == *(node->cert)) {
 			if (!node->permanent && node->expires <
-				       	TQDateTime::tqcurrentDateTime()) {
+				       	TQDateTime::currentDateTime()) {
 				certList.remove(node);
 				cfg->deleteGroup(node->cert->getMD5Digest());
 				searchRemoveCert(node->cert);
@@ -572,7 +572,7 @@ KSSLCNode *node;
 				return false;
 			}
 
-			if (!node->hosts.tqcontains(host)) {
+			if (!node->hosts.contains(host)) {
 				node->hosts << host;
 			}
 
@@ -593,7 +593,7 @@ KSSLCNode *node;
 	for (node = certList.first(); node; node = certList.next()) {
 		if (cert == *(node->cert)) {
 			if (!node->permanent && node->expires <
-				       	TQDateTime::tqcurrentDateTime()) {
+				       	TQDateTime::currentDateTime()) {
 				certList.remove(node);
 				cfg->deleteGroup(node->cert->getMD5Digest());
 				searchRemoveCert(node->cert);
@@ -623,8 +623,8 @@ void KSSLD::caVerifyUpdate() {
 		return;
 	
 	cfg->setGroup(TQString::null);
-	TQ_UINT32 newStamp = KGlobal::dirs()->calcResourceHash("config", "ksslcalist", true);
-	TQ_UINT32 oldStamp = cfg->readUnsignedNumEntry("ksslcalistStamp");
+	Q_UINT32 newStamp = KGlobal::dirs()->calcResourceHash("config", "ksslcalist", true);
+	Q_UINT32 oldStamp = cfg->readUnsignedNumEntry("ksslcalistStamp");
 	if (oldStamp != newStamp)
 	{
 		caRegenerate();
@@ -857,14 +857,14 @@ void KSSLD::searchAddCert(KSSLCertificate *cert) {
 	cert->getEmails(mails);
 	for(TQStringList::const_iterator iter = mails.begin(); iter != mails.end(); ++iter) {
 		TQString email = static_cast<const TQString &>(*iter).lower();
-		TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.tqfind(email);
+		TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.find(email);
 
 		if (it == skEmail.end())
 			it = skEmail.insert(email, TQPtrVector<KSSLCertificate>());
 
 		TQPtrVector<KSSLCertificate> &elem = *it;
 		
-		if (elem.tqfindRef(cert) == -1) {
+		if (elem.findRef(cert) == -1) {
 			unsigned int n = 0;
 			for(; n < elem.size(); n++) {
 				if (!elem.at(n)) {
@@ -887,14 +887,14 @@ void KSSLD::searchRemoveCert(KSSLCertificate *cert) {
 	TQStringList mails;
 	cert->getEmails(mails);
 	for(TQStringList::const_iterator iter = mails.begin(); iter != mails.end(); ++iter) {
-		TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.tqfind(static_cast<const TQString &>(*iter).lower());
+		TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.find(static_cast<const TQString &>(*iter).lower());
 
 		if (it == skEmail.end())
 		       break;
 
 		TQPtrVector<KSSLCertificate> &elem = *it;
 
-		int n = elem.tqfindRef(cert);
+		int n = elem.findRef(cert);
 		if (n != -1)
 			elem.remove(n);
 	}
@@ -903,7 +903,7 @@ void KSSLD::searchRemoveCert(KSSLCertificate *cert) {
 
 TQStringList KSSLD::getKDEKeyByEmail(const TQString &email) {
 	TQStringList rc;
-	TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.tqfind(email.lower());
+	TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.find(email.lower());
 
 	kdDebug() << "GETKDEKey " << email.latin1() << endl;
 
@@ -924,7 +924,7 @@ TQStringList KSSLD::getKDEKeyByEmail(const TQString &email) {
 
 
 KSSLCertificate KSSLD::getCertByMD5Digest(const TQString &key) {
-	TQMap<TQString, KSSLCertificate *>::iterator iter = skMD5Digest.tqfind(key);
+	TQMap<TQString, KSSLCertificate *>::iterator iter = skMD5Digest.find(key);
 	
 	kdDebug() << "Searching cert for " << key.latin1() << endl;
 
diff --git a/kio/misc/kwalletd/kbetterthankdialogbase.ui b/kio/misc/kwalletd/kbetterthankdialogbase.ui
index e3fadec5d..ecf2d236f 100644
--- a/kio/misc/kwalletd/kbetterthankdialogbase.ui
+++ b/kio/misc/kwalletd/kbetterthankdialogbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>KBetterThanKDialogBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -37,7 +37,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>41</width>
                     <height>21</height>
@@ -46,7 +46,7 @@
         </spacer>
         <widget class="QLayoutWidget" row="1" column="1">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -99,7 +99,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>61</width>
                     <height>21</height>
@@ -147,7 +147,7 @@
     <slot access="protected">accept()</slot>
     <slot access="protected">reject()</slot>
 </slots>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kactivelabel.h</includehint>
 </includehints>
diff --git a/kio/misc/kwalletd/ktimeout.cpp b/kio/misc/kwalletd/ktimeout.cpp
index d4c87bd28..c431ecf69 100644
--- a/kio/misc/kwalletd/ktimeout.cpp
+++ b/kio/misc/kwalletd/ktimeout.cpp
@@ -39,7 +39,7 @@ void KTimeout::clear() {
 
 
 void KTimeout::removeTimer(int id) {
-	TQTimer *t = _timers.tqfind(id);
+	TQTimer *t = _timers.find(id);
 	if (t != 0L) {
 		_timers.remove(id); // autodeletes
 	}
@@ -47,7 +47,7 @@ void KTimeout::removeTimer(int id) {
 
 
 void KTimeout::addTimer(int id, int timeout) {
-	if (_timers.tqfind(id) != 0L) {
+	if (_timers.find(id) != 0L) {
 		return;
 	}
 
@@ -59,7 +59,7 @@ void KTimeout::addTimer(int id, int timeout) {
 
 
 void KTimeout::resetTimer(int id, int timeout) {
-	TQTimer *t = _timers.tqfind(id);
+	TQTimer *t = _timers.find(id);
 	if (t) {
 		t->changeInterval(timeout);
 	}
diff --git a/kio/misc/kwalletd/kwalletd.cpp b/kio/misc/kwalletd/kwalletd.cpp
index 8df3ddb63..069575710 100644
--- a/kio/misc/kwalletd/kwalletd.cpp
+++ b/kio/misc/kwalletd/kwalletd.cpp
@@ -121,7 +121,7 @@ int KWalletD::generateHandle() {
 	// ASSUMPTION: RAND_MAX is fairly large.
 	do {
 		rc = rand();
-	} while (_wallets.tqfind(rc) || rc == 0);
+	} while (_wallets.find(rc) || rc == 0);
 
 	return rc;
 }
@@ -308,7 +308,7 @@ void KWalletD::checkActiveDialog() {
 }
 
 int KWalletD::doTransactionOpen(const TQCString& appid, const TQString& wallet, uint wId, bool modal) {
-	if (_firstUse && !wallets().tqcontains(KWallet::Wallet::LocalWallet())) {
+	if (_firstUse && !wallets().contains(KWallet::Wallet::LocalWallet())) {
 		// First use wizard
 		KWalletWizard *wiz = new KWalletWizard(0);
 		setupDialog( wiz, wId, appid, modal );
@@ -529,11 +529,11 @@ int KWalletD::internalOpen(const TQCString& appid, const TQString& wallet, bool
 			KApplication::startServiceByDesktopName("kwalletmanager-kwalletd");
 		}
 	} else {
-		if (!_handles[appid].tqcontains(rc) && _openPrompt && !isAuthorizedApp(appid, wallet, w)) {
+		if (!_handles[appid].contains(rc) && _openPrompt && !isAuthorizedApp(appid, wallet, w)) {
 			return -1;
 		}
 		_handles[appid].append(rc);
-		_wallets.tqfind(rc)->ref();
+		_wallets.find(rc)->ref();
 	}
 
 	return rc;
@@ -567,7 +567,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W
 			KConfig cfg("kwalletrc");
 			cfg.setGroup("Auto Allow");
 			TQStringList apps = cfg.readListEntry(wallet);
-			if (!apps.tqcontains(thisApp)) {
+			if (!apps.contains(thisApp)) {
 				apps += thisApp;
 				_implicitAllowMap[wallet] += thisApp;
 				cfg.writeEntry(wallet, apps);
@@ -578,7 +578,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W
 		KConfig cfg("kwalletrc");
 		cfg.setGroup("Auto Deny");
 		TQStringList apps = cfg.readListEntry(wallet);
-		if (!apps.tqcontains(thisApp)) {
+		if (!apps.contains(thisApp)) {
 			apps += thisApp;
 			_implicitDenyMap[wallet] += thisApp;
 			cfg.writeEntry(wallet, apps);
@@ -646,7 +646,7 @@ void KWalletD::doTransactionChangePassword(const TQCString& appid, const TQStrin
 			return;
 		}
 
-		w = _wallets.tqfind(handle);
+		w = _wallets.find(handle);
 		reclose = true;
 	} else {
 		handle = it.currentKey();
@@ -710,14 +710,14 @@ int KWalletD::close(const TQString& wallet, bool force) {
 int KWalletD::closeWallet(KWallet::Backend *w, int handle, bool force) {
 	if (w) {
 		const TQString& wallet = w->walletName();
-		assert(_passwords.tqcontains(wallet));
+		assert(_passwords.contains(wallet));
 		if (w->refCount() == 0 || force) {
-			tqinvalidateHandle(handle);
+			invalidateHandle(handle);
 			if (_closeIdle && _timeouts) {
 				_timeouts->removeTimer(handle);
 			}
 			_wallets.remove(handle);
-			if (_passwords.tqcontains(wallet)) {
+			if (_passwords.contains(wallet)) {
 				w->close(TQByteArray().duplicate(_passwords[wallet].data(), _passwords[wallet].length()));
 				_passwords[wallet].fill(0);
 				_passwords.remove(wallet);
@@ -735,15 +735,15 @@ int KWalletD::closeWallet(KWallet::Backend *w, int handle, bool force) {
 
 int KWalletD::close(int handle, bool force) {
 	TQCString appid = friendlyDCOPPeerName();
-	KWallet::Backend *w = _wallets.tqfind(handle);
-	bool tqcontains = false;
+	KWallet::Backend *w = _wallets.find(handle);
+	bool contains = false;
 
 	if (w) { // the handle is valid
-		if (_handles.tqcontains(appid)) { // we know this app
-			if (_handles[appid].tqcontains(handle)) {
+		if (_handles.contains(appid)) { // we know this app
+			if (_handles[appid].contains(handle)) {
 				// the app owns this handle
-				_handles[appid].remove(_handles[appid].tqfind(handle));
-				tqcontains = true;
+				_handles[appid].remove(_handles[appid].find(handle));
+				contains = true;
 				if (_handles[appid].isEmpty()) {
 					_handles.remove(appid);
 				}
@@ -751,15 +751,15 @@ int KWalletD::close(int handle, bool force) {
 		}
 
 		// watch the side effect of the deref()
-		if ((tqcontains && w->deref() == 0 && !_leaveOpen) || force) {
+		if ((contains && w->deref() == 0 && !_leaveOpen) || force) {
 			if (_closeIdle && _timeouts) {
 				_timeouts->removeTimer(handle);
 			}
 			_wallets.remove(handle);
 			if (force) {
-				tqinvalidateHandle(handle);
+				invalidateHandle(handle);
 			}
-			if (_passwords.tqcontains(w->walletName())) {
+			if (_passwords.contains(w->walletName())) {
 				w->close(TQByteArray().duplicate(_passwords[w->walletName()].data(), _passwords[w->walletName()].length()));
 				_passwords[w->walletName()].fill(0);
 				_passwords.remove(w->walletName());
@@ -792,7 +792,7 @@ bool KWalletD::isOpen(int handle) {
 		return false;
 	}
 
-	KWallet::Backend *rc = _wallets.tqfind(handle);
+	KWallet::Backend *rc = _wallets.find(handle);
 
 	if (rc == 0 && ++_failed > 5) {
 		_failed = 0;
@@ -1179,11 +1179,11 @@ int KWalletD::removeEntry(int handle, const TQString& folder, const TQString& ke
 
 
 void KWalletD::slotAppUnregistered(const TQCString& app) {
-	if (_handles.tqcontains(app)) {
+	if (_handles.contains(app)) {
 		TQValueList<int> l = _handles[app];
 		for (TQValueList<int>::Iterator i = l.begin(); i != l.end(); ++i) {
 			_handles[app].remove(*i);
-			KWallet::Backend *w = _wallets.tqfind(*i);
+			KWallet::Backend *w = _wallets.find(*i);
 			if (w && !_leaveOpen && 0 == w->deref()) {
 				close(w->walletName(), true);
 			}
@@ -1193,7 +1193,7 @@ void KWalletD::slotAppUnregistered(const TQCString& app) {
 }
 
 
-void KWalletD::tqinvalidateHandle(int handle) {
+void KWalletD::invalidateHandle(int handle) {
 	for (TQMap<TQCString,TQValueList<int> >::Iterator i = _handles.begin();
 							i != _handles.end();
 									++i) {
@@ -1207,11 +1207,11 @@ KWallet::Backend *KWalletD::getWallet(const TQCString& appid, int handle) {
 		return 0L;
 	}
 
-	KWallet::Backend *w = _wallets.tqfind(handle);
+	KWallet::Backend *w = _wallets.find(handle);
 
 	if (w) { // the handle is valid
-		if (_handles.tqcontains(appid)) { // we know this app
-			if (_handles[appid].tqcontains(handle)) {
+		if (_handles.contains(appid)) { // we know this app
+			if (_handles[appid].contains(handle)) {
 				// the app owns this handle
 				_failed = 0;
 				if (_closeIdle && _timeouts) {
@@ -1285,7 +1285,7 @@ TQStringList KWalletD::users(const TQString& wallet) const {
 							++it) {
 		if (it.current()->walletName() == wallet) {
 			for (TQMap<TQCString,TQValueList<int> >::ConstIterator hit = _handles.begin(); hit != _handles.end(); ++hit) {
-				if (hit.data().tqcontains(it.currentKey())) {
+				if (hit.data().contains(it.currentKey())) {
 					rc += hit.key();
 				}
 			}
@@ -1302,7 +1302,7 @@ bool KWalletD::disconnectApplication(const TQString& wallet, const TQCString& ap
 						it.current();
 							++it) {
 		if (it.current()->walletName() == wallet) {
-			if (_handles[application].tqcontains(it.currentKey())) {
+			if (_handles[application].contains(it.currentKey())) {
 				_handles[application].remove(it.currentKey());
 
 				if (_handles[application].isEmpty()) {
@@ -1416,7 +1416,7 @@ bool KWalletD::isEnabled() const {
 
 
 bool KWalletD::folderDoesNotExist(const TQString& wallet, const TQString& folder) {
-	if (!wallets().tqcontains(wallet)) {
+	if (!wallets().contains(wallet)) {
 		return true;
 	}
 
@@ -1435,7 +1435,7 @@ bool KWalletD::folderDoesNotExist(const TQString& wallet, const TQString& folder
 
 
 bool KWalletD::keyDoesNotExist(const TQString& wallet, const TQString& folder, const TQString& key) {
-	if (!wallets().tqcontains(wallet)) {
+	if (!wallets().contains(wallet)) {
 		return true;
 	}
 
@@ -1454,12 +1454,12 @@ bool KWalletD::keyDoesNotExist(const TQString& wallet, const TQString& folder, c
 
 
 bool KWalletD::implicitAllow(const TQString& wallet, const TQCString& app) {
-	return _implicitAllowMap[wallet].tqcontains(TQString::fromLocal8Bit(app));
+	return _implicitAllowMap[wallet].contains(TQString::fromLocal8Bit(app));
 }
 
 
 bool KWalletD::implicitDeny(const TQString& wallet, const TQCString& app) {
-	return _implicitDenyMap[wallet].tqcontains(TQString::fromLocal8Bit(app));
+	return _implicitDenyMap[wallet].contains(TQString::fromLocal8Bit(app));
 }
 
 
@@ -1468,12 +1468,12 @@ TQCString KWalletD::friendlyDCOPPeerName() {
 	if (!dc) {
 		return "";
 	}
-	return dc->senderId().tqreplace(TQRegExp("-[0-9]+$"), "");
+	return dc->senderId().replace(TQRegExp("-[0-9]+$"), "");
 }
 
 
 void KWalletD::timedOut(int id) {
-	KWallet::Backend *w = _wallets.tqfind(id);
+	KWallet::Backend *w = _wallets.find(id);
 	if (w) {
 		closeWallet(w, id, true);
 	}
diff --git a/kio/misc/kwalletd/kwalletd.h b/kio/misc/kwalletd/kwalletd.h
index ba83b4efc..2aea371ba 100644
--- a/kio/misc/kwalletd/kwalletd.h
+++ b/kio/misc/kwalletd/kwalletd.h
@@ -161,7 +161,7 @@ class KWalletD : public KDEDModule {
 		// Generate a new unique handle.
 		int generateHandle();
 		// Invalidate a handle (remove it from the TQMap)
-		void tqinvalidateHandle(int handle);
+		void invalidateHandle(int handle);
 		// Emit signals about closing wallets
 		void doCloseSignals(int,const TQString&);
 		void emitFolderUpdated(const TQString&, const TQString&);
diff --git a/kio/misc/kwalletd/kwalletwizard.ui b/kio/misc/kwalletd/kwalletwizard.ui
index a6278e3e9..609508e11 100644
--- a/kio/misc/kwalletd/kwalletwizard.ui
+++ b/kio/misc/kwalletd/kwalletwizard.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>KWalletWizard</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -36,7 +36,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="tqsizeHint">
+                <property name="sizeHint">
                     <size>
                         <width>21</width>
                         <height>21</height>
@@ -58,7 +58,7 @@
                 <property name="textFormat">
                     <enum>RichText</enum>
                 </property>
-                <property name="tqalignment">
+                <property name="alignment">
                     <set>WordBreak|AlignCenter</set>
                 </property>
             </widget>
@@ -83,7 +83,7 @@
                 <property name="textFormat">
                     <enum>RichText</enum>
                 </property>
-                <property name="tqalignment">
+                <property name="alignment">
                     <set>WordBreak|AlignVCenter</set>
                 </property>
             </widget>
@@ -135,7 +135,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="tqsizeHint">
+                <property name="sizeHint">
                     <size>
                         <width>140</width>
                         <height>21</height>
@@ -152,7 +152,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="tqsizeHint">
+                <property name="sizeHint">
                     <size>
                         <width>140</width>
                         <height>31</height>
@@ -209,7 +209,7 @@
             </widget>
             <widget class="QLayoutWidget" row="3" column="1">
                 <property name="name">
-                    <cstring>tqlayout7</cstring>
+                    <cstring>layout7</cstring>
                 </property>
                 <hbox>
                     <property name="name">
@@ -217,7 +217,7 @@
                     </property>
                     <widget class="QLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout5</cstring>
+                            <cstring>layout5</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -233,7 +233,7 @@
                                 <property name="text">
                                     <string>Enter a new password:</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignVCenter|AlignRight</set>
                                 </property>
                                 <property name="buddy" stdset="0">
@@ -250,7 +250,7 @@
                                 <property name="text">
                                     <string>Verify password:</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignVCenter|AlignRight</set>
                                 </property>
                                 <property name="buddy" stdset="0">
@@ -261,7 +261,7 @@
                     </widget>
                     <widget class="QLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout4</cstring>
+                            <cstring>layout4</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -311,7 +311,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="tqsizeHint">
+                <property name="sizeHint">
                     <size>
                         <width>21</width>
                         <height>51</height>
@@ -328,7 +328,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="tqsizeHint">
+                <property name="sizeHint">
                     <size>
                         <width>101</width>
                         <height>21</height>
@@ -345,7 +345,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="tqsizeHint">
+                <property name="sizeHint">
                     <size>
                         <width>111</width>
                         <height>31</height>
@@ -362,7 +362,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="tqsizeHint">
+                <property name="sizeHint">
                     <size>
                         <width>21</width>
                         <height>70</height>
@@ -376,7 +376,7 @@
                 <property name="text">
                     <string></string>
                 </property>
-                <property name="tqalignment">
+                <property name="alignment">
                     <set>WordBreak|AlignVCenter|AlignRight</set>
                 </property>
             </widget>
@@ -403,7 +403,7 @@
                 <property name="textFormat">
                     <enum>RichText</enum>
                 </property>
-                <property name="tqalignment">
+                <property name="alignment">
                     <set>WordBreak|AlignVCenter</set>
                 </property>
             </widget>
@@ -417,7 +417,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="tqsizeHint">
+                <property name="sizeHint">
                     <size>
                         <width>21</width>
                         <height>121</height>
@@ -450,7 +450,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="tqsizeHint">
+                <property name="sizeHint">
                     <size>
                         <width>21</width>
                         <height>51</height>
@@ -541,5 +541,5 @@
     <slot>setBasic()</slot>
     <slot access="private">destroy()</slot>
 </slots>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kio/misc/uiserver.cpp b/kio/misc/uiserver.cpp
index 2f24779be..b1d060f21 100644
--- a/kio/misc/uiserver.cpp
+++ b/kio/misc/uiserver.cpp
@@ -126,7 +126,7 @@ ProgressConfigDialog::ProgressConfigDialog(TQWidget *parent)
 :KDialogBase(KDialogBase::Plain,i18n("Configure Network Operation Window"),KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel,
              KDialogBase::Ok, parent, "configprog", false)
 {
-   TQVBoxLayout *tqlayout=new TQVBoxLayout(plainPage(),spacingHint());
+   TQVBoxLayout *layout=new TQVBoxLayout(plainPage(),spacingHint());
    m_showSystemTrayCb=new TQCheckBox(i18n("Show system tray icon"), plainPage());
    m_keepOpenCb=new TQCheckBox(i18n("Keep network operation window always open"), plainPage());
    m_headerCb=new TQCheckBox(i18n("Show column headers"), plainPage());
@@ -150,14 +150,14 @@ ProgressConfigDialog::ProgressConfigDialog(TQWidget *parent)
    m_items[ListProgress::TB_LOCAL_FILENAME] =new TQCheckListItem(m_columns, i18n("Local Filename"), TQCheckListItem::CheckBox);
    m_items[ListProgress::TB_OPERATION]      =new TQCheckListItem(m_columns, i18n("Operation"), TQCheckListItem::CheckBox);
 
-   tqlayout->addWidget(m_showSystemTrayCb);
-   tqlayout->addWidget(m_keepOpenCb);
-   tqlayout->addWidget(m_headerCb);
-   tqlayout->addWidget(m_toolBarCb);
-   tqlayout->addWidget(m_statusBarCb);
-   tqlayout->addWidget(m_fixedWidthCb);
-   tqlayout->addWidget(label);
-   tqlayout->addWidget(m_columns);
+   layout->addWidget(m_showSystemTrayCb);
+   layout->addWidget(m_keepOpenCb);
+   layout->addWidget(m_headerCb);
+   layout->addWidget(m_toolBarCb);
+   layout->addWidget(m_statusBarCb);
+   layout->addWidget(m_fixedWidthCb);
+   layout->addWidget(label);
+   layout->addWidget(m_columns);
 }
 
 void ProgressConfigDialog::setChecked(int i, bool on)
@@ -272,8 +272,8 @@ void ProgressItem::setPercent( unsigned long percent ) {
 
 void ProgressItem::setInfoMessage( const TQString & msg ) {
   TQString plainTextMsg(msg);
-  plainTextMsg.tqreplace( TQRegExp( "</?b>" ), TQString::null );
-  plainTextMsg.tqreplace( TQRegExp( "<img.*>" ), TQString::null );
+  plainTextMsg.replace( TQRegExp( "</?b>" ), TQString::null );
+  plainTextMsg.replace( TQRegExp( "<img.*>" ), TQString::null );
   setText( ListProgress::TB_PROGRESS, plainTextMsg );
 
   defaultProgress->slotInfoMessage( 0, msg );
@@ -529,7 +529,7 @@ void ListProgress::applySettings()
 void ListProgress::readSettings() {
   KConfig config("uiserverrc");
 
-  // read listview tqgeometry properties
+  // read listview geometry properties
   config.setGroup( "ProgressList" );
   for ( int i = 0; i < TB_MAX; i++ ) {
      TQString tmps="Col"+TQString::number(i);
@@ -562,7 +562,7 @@ void ListProgress::columnWidthChanged(int column)
 void ListProgress::writeSettings() {
    KConfig config("uiserverrc");
 
-   // write listview tqgeometry properties
+   // write listview geometry properties
    config.setGroup( "ProgressList" );
    for ( int i = 0; i < TB_MAX; i++ ) {
       if (!m_lpcc[i].enabled) {
@@ -750,7 +750,7 @@ int UIServer::newJob( TQCString observerAppId, bool showProgress )
 
   TQListViewItemIterator it( listProgress );
   for ( ; it.current(); ++it ) {
-    if ( it.current()->itemBelow() == 0L ) { // this will tqfind the end of list
+    if ( it.current()->itemBelow() == 0L ) { // this will find the end of list
       break;
     }
   }
@@ -773,7 +773,7 @@ int UIServer::newJob( TQCString observerAppId, bool showProgress )
 }
 
 
-ProgressItem* UIServer::tqfindItem( int id )
+ProgressItem* UIServer::findItem( int id )
 {
   TQListViewItemIterator it( listProgress );
 
@@ -806,7 +806,7 @@ void UIServer::setItemVisible( ProgressItem * item, bool visible )
 void UIServer::setJobVisible( int id, bool visible )
 {
   kdDebug(7024) << "UIServer::setJobVisible id=" << id << " visible=" << visible << endl;
-  ProgressItem *item = tqfindItem( id );
+  ProgressItem *item = findItem( id );
   Q_ASSERT( item );
   if ( item )
       setItemVisible( item, visible );
@@ -815,7 +815,7 @@ void UIServer::setJobVisible( int id, bool visible )
 void UIServer::jobFinished( int id )
 {
   kdDebug(7024) << "UIServer::jobFinished id=" << id << endl;
-  ProgressItem *item = tqfindItem( id );
+  ProgressItem *item = findItem( id );
 
   // remove item from the list and delete the corresponding defaultprogress
   if ( item ) {
@@ -834,7 +834,7 @@ void UIServer::totalSize64( int id, KIO::filesize_t size )
 {
 //  kdDebug(7024) << "UIServer::totalSize " << id << " " << KIO::number(size) << endl;
 
-  ProgressItem *item = tqfindItem( id );
+  ProgressItem *item = findItem( id );
   if ( item ) {
     item->setTotalSize( size );
   }
@@ -844,7 +844,7 @@ void UIServer::totalFiles( int id, unsigned long files )
 {
   kdDebug(7024) << "UIServer::totalFiles " << id << " " << (unsigned int) files << endl;
 
-  ProgressItem *item = tqfindItem( id );
+  ProgressItem *item = findItem( id );
   if ( item ) {
     item->setTotalFiles( files );
   }
@@ -854,7 +854,7 @@ void UIServer::totalDirs( int id, unsigned long dirs )
 {
   kdDebug(7024) << "UIServer::totalDirs " << id << " " << (unsigned int) dirs << endl;
 
-  ProgressItem *item = tqfindItem( id );
+  ProgressItem *item = findItem( id );
   if ( item ) {
     item->setTotalDirs( dirs );
   }
@@ -867,7 +867,7 @@ void UIServer::processedSize64( int id, KIO::filesize_t size )
 {
   //kdDebug(7024) << "UIServer::processedSize " << id << " " << KIO::number(size) << endl;
 
-  ProgressItem *item = tqfindItem( id );
+  ProgressItem *item = findItem( id );
   if ( item ) {
     item->setProcessedSize( size );
   }
@@ -877,7 +877,7 @@ void UIServer::processedFiles( int id, unsigned long files )
 {
   //kdDebug(7024) << "UIServer::processedFiles " << id << " " << (unsigned int) files << endl;
 
-  ProgressItem *item = tqfindItem( id );
+  ProgressItem *item = findItem( id );
   if ( item ) {
     item->setProcessedFiles( files );
   }
@@ -887,7 +887,7 @@ void UIServer::processedDirs( int id, unsigned long dirs )
 {
   kdDebug(7024) << "UIServer::processedDirs " << id << " " << (unsigned int) dirs << endl;
 
-  ProgressItem *item = tqfindItem( id );
+  ProgressItem *item = findItem( id );
   if ( item ) {
     item->setProcessedDirs( dirs );
   }
@@ -897,7 +897,7 @@ void UIServer::percent( int id, unsigned long ipercent )
 {
   //kdDebug(7024) << "UIServer::percent " << id << " " << (unsigned int) ipercent << endl;
 
-  ProgressItem *item = tqfindItem( id );
+  ProgressItem *item = findItem( id );
   if ( item ) {
     item->setPercent( ipercent );
   }
@@ -907,7 +907,7 @@ void UIServer::speed( int id, unsigned long bytes_per_second )
 {
   //kdDebug(7024) << "UIServer::speed " << id << " " << (unsigned int) bytes_per_second << endl;
 
-  ProgressItem *item = tqfindItem( id );
+  ProgressItem *item = findItem( id );
   if ( item ) {
     item->setSpeed( bytes_per_second );
   }
@@ -917,7 +917,7 @@ void UIServer::infoMessage( int id, const TQString & msg )
 {
   //kdDebug(7024) << "UIServer::infoMessage " << id << " " << msg << endl;
 
-  ProgressItem *item = tqfindItem( id );
+  ProgressItem *item = findItem( id );
   if ( item ) {
     item->setInfoMessage( msg );
   }
@@ -930,7 +930,7 @@ void UIServer::canResume64( int id, KIO::filesize_t offset )
 {
   //kdDebug(7024) << "UIServer::canResume " << id << " " << offset << endl;
 
-  ProgressItem *item = tqfindItem( id );
+  ProgressItem *item = findItem( id );
   if ( item ) {
     item->setCanResume( offset );
   }
@@ -940,7 +940,7 @@ void UIServer::copying( int id, KURL from, KURL to )
 {
   //kdDebug(7024) << "UIServer::copying " << id << " " << from.url() << "  " << to.url() << endl;
 
-  ProgressItem *item = tqfindItem( id );
+  ProgressItem *item = findItem( id );
   if ( item ) {
     item->setCopying( from, to );
   }
@@ -950,7 +950,7 @@ void UIServer::moving( int id, KURL from, KURL to )
 {
   //kdDebug(7024) << "UIServer::moving " << id << " " << from.url() << "  " << to.url() << endl;
 
-  ProgressItem *item = tqfindItem( id );
+  ProgressItem *item = findItem( id );
   if ( item ) {
     item->setMoving( from, to );
   }
@@ -960,7 +960,7 @@ void UIServer::deleting( int id, KURL url )
 {
   //kdDebug(7024) << "UIServer::deleting " << id << " " << url.url() << endl;
 
-  ProgressItem *item = tqfindItem( id );
+  ProgressItem *item = findItem( id );
   if ( item ) {
     item->setDeleting( url );
   }
@@ -970,7 +970,7 @@ void UIServer::transferring( int id, KURL url )
 {
   //kdDebug(7024) << "UIServer::transferring " << id << " " << url.url() << endl;
 
-  ProgressItem *item = tqfindItem( id );
+  ProgressItem *item = findItem( id );
   if ( item ) {
     item->setTransferring( url );
   }
@@ -980,7 +980,7 @@ void UIServer::creatingDir( int id, KURL dir )
 {
   kdDebug(7024) << "UIServer::creatingDir " << id << " " << dir.url() << endl;
 
-  ProgressItem *item = tqfindItem( id );
+  ProgressItem *item = findItem( id );
   if ( item ) {
     item->setCreatingDir( dir );
   }
@@ -990,7 +990,7 @@ void UIServer::stating( int id, KURL url )
 {
   kdDebug(7024) << "UIServer::stating " << id << " " << url.url() << endl;
 
-  ProgressItem *item = tqfindItem( id );
+  ProgressItem *item = findItem( id );
   if ( item ) {
     item->setStating( url );
   }
@@ -1000,7 +1000,7 @@ void UIServer::mounting( int id, TQString dev, TQString point )
 {
   kdDebug(7024) << "UIServer::mounting " << id << " " << dev << " " << point << endl;
 
-  ProgressItem *item = tqfindItem( id );
+  ProgressItem *item = findItem( id );
   if ( item ) {
     item->setMounting( dev, point );
   }
@@ -1010,7 +1010,7 @@ void UIServer::unmounting( int id, TQString point )
 {
   kdDebug(7024) << "UIServer::unmounting " << id << " " << point << endl;
 
-  ProgressItem *item = tqfindItem( id );
+  ProgressItem *item = findItem( id );
   if ( item ) {
     item->setUnmounting( point );
   }
@@ -1195,7 +1195,7 @@ void UIServer::showSSLInfoDialog(const TQString &url, const KIO::MetaData &meta,
 
       kdDebug(7024) << "ssl_cert_errors=" << meta["ssl_cert_errors"] << endl;
       kid->setCertState(meta["ssl_cert_errors"]);
-      TQString ip = meta.tqcontains("ssl_proxied") ? "" : meta["ssl_peer_ip"];
+      TQString ip = meta.contains("ssl_proxied") ? "" : meta["ssl_peer_ip"];
       kid->setup( x,
                   ip,
                   url, // the URL
@@ -1278,7 +1278,7 @@ TQByteArray UIServer::open_RenameDlg64( int id,
                                      )
 {
   // Hide existing dialog box if any
-  ProgressItem *item = tqfindItem( id );
+  ProgressItem *item = findItem( id );
   if ( item )
     setItemVisible( item, false );
   TQString newDest;
@@ -1291,7 +1291,7 @@ TQByteArray UIServer::open_RenameDlg64( int id,
   kdDebug(7024) << "KIO::open_RenameDlg done" << endl;
   TQByteArray data;
   TQDataStream stream( data, IO_WriteOnly );
-  stream << TQ_UINT8(result) << newDest;
+  stream << Q_UINT8(result) << newDest;
   if ( item && result != KIO::R_CANCEL )
     setItemVisible( item, true );
   return data;
@@ -1302,7 +1302,7 @@ int UIServer::open_SkipDlg( int id,
                             const TQString & error_text )
 {
   // Hide existing dialog box if any
-  ProgressItem *item = tqfindItem( id );
+  ProgressItem *item = findItem( id );
   if ( item )
     setItemVisible( item, false );
   kdDebug(7024) << "Calling KIO::open_SkipDlg" << endl;
diff --git a/kio/misc/uiserver.h b/kio/misc/uiserver.h
index 2cd6e5fbd..85e255a43 100644
--- a/kio/misc/uiserver.h
+++ b/kio/misc/uiserver.h
@@ -386,7 +386,7 @@ protected slots:
 
 protected:
 
-  ProgressItem* tqfindItem( int id );
+  ProgressItem* findItem( int id );
 
   virtual void resizeEvent(TQResizeEvent* e);
   virtual bool queryClose();
diff --git a/kio/tests/dataprotocoltest.cpp b/kio/tests/dataprotocoltest.cpp
index c75615145..0c8470a61 100644
--- a/kio/tests/dataprotocoltest.cpp
+++ b/kio/tests/dataprotocoltest.cpp
@@ -47,7 +47,7 @@ public:
 //    meta_data[key] = value;
 //    cout << "§ " << key << " = " << value << endl;
     TQString prefix = "Metadata[\""+key+"\"]: ";
-    KIO::MetaData::Iterator it = attributes_expected.tqfind(key);
+    KIO::MetaData::Iterator it = attributes_expected.find(key);
     if (it != attributes_expected.end()) {
       testStrings(prefix,it.data(),value);
       // remove key from map
@@ -59,7 +59,7 @@ public:
   }
 
   void sendMetaData() {
-    // check here if attributes_expected tqcontains any excess keys
+    // check here if attributes_expected contains any excess keys
     KIO::MetaData::ConstIterator it = attributes_expected.begin();
     KIO::MetaData::ConstIterator end = attributes_expected.end();
     for (; it != end; ++it) {
@@ -92,9 +92,9 @@ private:
 
   // -- testcase related members
   TQString mime_type_expected;	// expected mime type
-  /** tqcontains all attributes and values the testcase has to set */
+  /** contains all attributes and values the testcase has to set */
   KIO::MetaData attributes_expected;
-  /** tqcontains the content as it is expected to be returned */
+  /** contains the content as it is expected to be returned */
   TQByteArray content_expected;
   int passed;		// # of passed tests
   int total;		// # of total tests
diff --git a/kio/tests/jobtest.cpp b/kio/tests/jobtest.cpp
index 93b250075..9fe4b4c49 100644
--- a/kio/tests/jobtest.cpp
+++ b/kio/tests/jobtest.cpp
@@ -532,7 +532,7 @@ void JobTest::slotEntries( KIO::Job*, const KIO::UDSEntryList& lst )
 
 void JobTest::copyFileToSystem()
 {
-    if ( !KProtocolInfo::isKnownProtocol( TQString::tqfromLatin1( "system" ) ) ) {
+    if ( !KProtocolInfo::isKnownProtocol( TQString::fromLatin1( "system" ) ) ) {
         kdDebug() << k_funcinfo << "no kio_system, skipping test" << endl;
         return;
     }
diff --git a/kio/tests/jobtest.h b/kio/tests/jobtest.h
index 83ec2da7c..533ffba8c 100644
--- a/kio/tests/jobtest.h
+++ b/kio/tests/jobtest.h
@@ -24,7 +24,7 @@
 #include <tqobject.h>
 #include <kio/job.h>
 
-class JobTest : public TQObject
+class JobTest : public QObject
 {
     Q_OBJECT
 
diff --git a/kio/tests/kacltest.cpp b/kio/tests/kacltest.cpp
index 0f9ac9e7a..58ae319b2 100644
--- a/kio/tests/kacltest.cpp
+++ b/kio/tests/kacltest.cpp
@@ -80,22 +80,22 @@ int main(int argc, char *argv[])
 }
 
 #ifdef Q_OS_FREEBSD
-static const TQString s_group1 = TQString::tqfromLatin1("staff");
-static const TQString s_group2 = TQString::tqfromLatin1("guest");
+static const TQString s_group1 = TQString::fromLatin1("staff");
+static const TQString s_group2 = TQString::fromLatin1("guest");
 #else
-static const TQString s_group1 = TQString::tqfromLatin1("audio");
-static const TQString s_group2 = TQString::tqfromLatin1("users");
+static const TQString s_group1 = TQString::fromLatin1("audio");
+static const TQString s_group2 = TQString::fromLatin1("users");
 #endif
 
-static const TQString s_testACL = TQString::tqfromLatin1( "user::rw-\nuser:bin:rwx\ngroup::rw-\ntqmask::rwx\nother::r--\n" );
-static const TQString s_testACL2 = TQString::tqfromLatin1( "user::rwx\nuser:bin:rwx\ngroup::rw-\n") +
-                                  TQString::tqfromLatin1( "group:" ) + s_group1 + TQString::tqfromLatin1( ":--x\n" ) +
-                                  TQString::tqfromLatin1( "group:" ) + s_group2 + TQString::tqfromLatin1( ":r--\n" ) +
-                                  TQString::tqfromLatin1( "tqmask::r-x\nother::r--\n" );
-static const TQString s_testACLEffective = TQString::tqfromLatin1( "user::rwx\nuser:bin:rwx #effective:r-x\ngroup::rw- #effective:r--\n" ) + 
-                                          TQString::tqfromLatin1( "group:" ) + s_group1 + TQString::tqfromLatin1( ":--x\n" ) +
-                                          TQString::tqfromLatin1( "group:" ) + s_group2 + TQString::tqfromLatin1( ":r--\n" ) +
-                                          TQString::tqfromLatin1( "tqmask::r-x\nother::r--\n" );
+static const TQString s_testACL = TQString::fromLatin1( "user::rw-\nuser:bin:rwx\ngroup::rw-\nmask::rwx\nother::r--\n" );
+static const TQString s_testACL2 = TQString::fromLatin1( "user::rwx\nuser:bin:rwx\ngroup::rw-\n") +
+                                  TQString::fromLatin1( "group:" ) + s_group1 + TQString::fromLatin1( ":--x\n" ) +
+                                  TQString::fromLatin1( "group:" ) + s_group2 + TQString::fromLatin1( ":r--\n" ) +
+                                  TQString::fromLatin1( "mask::r-x\nother::r--\n" );
+static const TQString s_testACLEffective = TQString::fromLatin1( "user::rwx\nuser:bin:rwx #effective:r-x\ngroup::rw- #effective:r--\n" ) + 
+                                          TQString::fromLatin1( "group:" ) + s_group1 + TQString::fromLatin1( ":--x\n" ) +
+                                          TQString::fromLatin1( "group:" ) + s_group2 + TQString::fromLatin1( ":r--\n" ) +
+                                          TQString::fromLatin1( "mask::r-x\nother::r--\n" );
 
 KACLTest::KACLTest()
 :m_acl( s_testACL )
@@ -163,8 +163,8 @@ void KACLTest::testGetOthersPermissions()
 void KACLTest::testGetMaskPermissions()
 {
   bool exists = false;
-  unsigned short tqmask = m_acl.tqmaskPermissions( exists );
-  check( "Mask permissions: ", TQString::number( tqmask ), "7" );
+  unsigned short mask = m_acl.maskPermissions( exists );
+  check( "Mask permissions: ", TQString::number( mask ), "7" );
   check( "Mask permissions: ", exists, true );
 }
 
@@ -245,9 +245,9 @@ void KACLTest::testSettingExtended()
   KACL CharlesII( s_testACL );
   CharlesII.setMaskPermissions( 7 ); // clearly
   bool dummy = false;
-  check( "setMaskPermissions: ", TQString::number( CharlesII.tqmaskPermissions( dummy ) ),"7" );
+  check( "setMaskPermissions: ", TQString::number( CharlesII.maskPermissions( dummy ) ),"7" );
 
-  const TQString expected( "user::rw-\nuser:root:rwx\nuser:bin:r--\ngroup::rw-\ntqmask::rwx\nother::r--\n" );
+  const TQString expected( "user::rw-\nuser:root:rwx\nuser:bin:r--\ngroup::rw-\nmask::rwx\nother::r--\n" );
   
   ACLUserPermissionsList users;
   ACLUserPermissions user = qMakePair( TQString( "root" ), ( unsigned short )7 );
@@ -265,8 +265,8 @@ void KACLTest::testSettingExtended()
 
   // groups, all and named
   
-  const TQString expected2 = TQString::tqfromLatin1( "user::rw-\nuser:bin:rwx\ngroup::rw-\ngroup:" ) + s_group1 +
-                            TQString::tqfromLatin1( ":-wx\ngroup:" ) + s_group2 + TQString::tqfromLatin1(":r--\ntqmask::rwx\nother::r--\n" );
+  const TQString expected2 = TQString::fromLatin1( "user::rw-\nuser:bin:rwx\ngroup::rw-\ngroup:" ) + s_group1 +
+                            TQString::fromLatin1( ":-wx\ngroup:" ) + s_group2 + TQString::fromLatin1(":r--\nmask::rwx\nother::r--\n" );
   CharlesII.setACL( s_testACL ); // reset
   ACLGroupPermissionsList groups;
   ACLGroupPermissions group = qMakePair( s_group1, ( unsigned short )3 );
@@ -300,10 +300,10 @@ void KACLTest::testNewMask()
 {
   KACL CharlesII( "user::rw-\ngroup::rw-\nother::rw\n" );
   bool dummy = false;
-  CharlesII.tqmaskPermissions( dummy );
-  check( "tqmask exists: ", dummy, false );
+  CharlesII.maskPermissions( dummy );
+  check( "mask exists: ", dummy, false );
 
   CharlesII.setMaskPermissions( 6 );
-  check( "new tqmask set: ", TQString::number( CharlesII.tqmaskPermissions( dummy ) ), "6" );
-  check( "tqmask exists now: ", dummy, true );
+  check( "new mask set: ", TQString::number( CharlesII.maskPermissions( dummy ) ), "6" );
+  check( "mask exists now: ", dummy, true );
 }
diff --git a/kio/tests/kdcopcheck.h b/kio/tests/kdcopcheck.h
index 9a76e6246..c3572d929 100644
--- a/kio/tests/kdcopcheck.h
+++ b/kio/tests/kdcopcheck.h
@@ -5,7 +5,7 @@
 #include <tqstring.h>
 #include <tqobject.h>
 
-class TestService : public TQObject
+class TestService : public QObject
 {
     Q_OBJECT
 public:
diff --git a/kio/tests/kdefaultprogresstest.cpp b/kio/tests/kdefaultprogresstest.cpp
index c2a642c1f..a831041e1 100644
--- a/kio/tests/kdefaultprogresstest.cpp
+++ b/kio/tests/kdefaultprogresstest.cpp
@@ -18,7 +18,7 @@ int main(int argc, char **argv)
     dlg->slotTotalDirs( 0L, 1 );
 
     dlg->slotSpeed( 0L, 55 );
-    dlg->slotInfoMessage( 0L, TQString::tqfromLatin1( "Starting..." ) );
+    dlg->slotInfoMessage( 0L, TQString::fromLatin1( "Starting..." ) );
 
     int files = 0;
     for ( int size = 0 ; size < 12000 ; size += 1 )
@@ -31,7 +31,7 @@ int main(int argc, char **argv)
         }
         kapp->processEvents();
     }
-    dlg->slotInfoMessage( 0L, TQString::tqfromLatin1( "Done." ) );
+    dlg->slotInfoMessage( 0L, TQString::fromLatin1( "Done." ) );
 
     delete dlg;
     return 0;
diff --git a/kio/tests/kdirlistertest.cpp b/kio/tests/kdirlistertest.cpp
index 73d526387..6137f5e71 100644
--- a/kio/tests/kdirlistertest.cpp
+++ b/kio/tests/kdirlistertest.cpp
@@ -36,18 +36,18 @@ KDirListerTest::KDirListerTest( TQWidget *parent, const char *name )
   lister = new KDirLister( false /* true */ );
   debug = new PrintSignals;
 
-  TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
+  TQVBoxLayout* layout = new TQVBoxLayout( this );
 
   TQPushButton* startH = new TQPushButton( "Start listing $HOME", this );
   TQPushButton* startR= new TQPushButton( "Start listing /", this );
   TQPushButton* test = new TQPushButton( "Many", this );
   TQPushButton* startT = new TQPushButton( "tarfile", this );
 
-  tqlayout->addWidget( startH );
-  tqlayout->addWidget( startR );
-  tqlayout->addWidget( startT );
-  tqlayout->addWidget( test );
-  resize( tqlayout->tqsizeHint() );
+  layout->addWidget( startH );
+  layout->addWidget( startR );
+  layout->addWidget( startT );
+  layout->addWidget( test );
+  resize( layout->sizeHint() );
 
   connect( startR, TQT_SIGNAL( clicked() ), TQT_SLOT( startRoot() ) );
   connect( startH, TQT_SIGNAL( clicked() ), TQT_SLOT( startHome() ) );
diff --git a/kio/tests/kdirlistertest.h b/kio/tests/kdirlistertest.h
index 27a04ee47..6b1e831f5 100644
--- a/kio/tests/kdirlistertest.h
+++ b/kio/tests/kdirlistertest.h
@@ -31,7 +31,7 @@
 
 using namespace std;
 
-class PrintSignals : public TQObject
+class PrintSignals : public QObject
 {
    Q_OBJECT
 public:
diff --git a/kio/tests/kdirwatchunittest.cpp b/kio/tests/kdirwatchunittest.cpp
index 870b85de9..1bd17edd6 100644
--- a/kio/tests/kdirwatchunittest.cpp
+++ b/kio/tests/kdirwatchunittest.cpp
@@ -26,7 +26,7 @@ void KDirWatchTest::VERIFY_NOTHING()
 
     for (int i = 0; i < 20; ++i) {
       usleep(100*1000);
-      tqApp->processEvents();
+      qApp->processEvents();
     }
 
     bool nothing_failed = true;
@@ -47,7 +47,7 @@ void KDirWatchTest::VERIFY_DIRTY(const TQString& alert)
 
     for (int i = 0; i < 20; ++i) {
       usleep(100*1000);
-      tqApp->processEvents();
+      qApp->processEvents();
     }
 
     VERIFY (m_s[sigCreated] == m_signals[sigCreated] &&
@@ -64,7 +64,7 @@ void KDirWatchTest::VERIFY_CREATED(const TQString& alert)
 
     for (int i = 0; i < 20; ++i) {
       usleep(100*1000);
-      tqApp->processEvents();
+      qApp->processEvents();
     }
 
     VERIFY (m_s[sigDirty] == m_signals[sigDirty] &&
@@ -81,7 +81,7 @@ void KDirWatchTest::VERIFY_DELETED(const TQString& alert)
 
     for (int i = 0; i < 20; ++i) {
       usleep(100*1000);
-      tqApp->processEvents();
+      qApp->processEvents();
     }
 
     VERIFY (m_s[sigDirty] == m_signals[sigDirty] &&
diff --git a/kio/tests/kioslavetest.cpp b/kio/tests/kioslavetest.cpp
index e183fa23c..0db23457d 100644
--- a/kio/tests/kioslavetest.cpp
+++ b/kio/tests/kioslavetest.cpp
@@ -129,39 +129,39 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr )
   progressButtons->insert( rbProgressDefault, ProgressDefault );
   hbLayout->addWidget( rbProgressDefault, 5 );
 
-  rbProgresstqStatus = new TQRadioButton( "tqStatus", progressButtons );
-  progressButtons->insert( rbProgresstqStatus, ProgresstqStatus );
-  hbLayout->addWidget( rbProgresstqStatus, 5 );
+  rbProgressStatus = new TQRadioButton( "Status", progressButtons );
+  progressButtons->insert( rbProgressStatus, ProgressStatus );
+  hbLayout->addWidget( rbProgressStatus, 5 );
 
   progressButtons->setButton( pr );
   changeProgressMode( pr );
 
   // statusbar progress widget
-  statusProgress = new tqStatusbarProgress( statusBar() );
+  statusProgress = new StatusbarProgress( statusBar() );
   statusBar()->addWidget( statusProgress, 0, true );
 
   // run & stop butons
   hbLayout = new TQHBoxLayout( topLayout, 15 );
 
   pbStart = new TQPushButton( "&Start", main_widget );
-  pbStart->setFixedSize( pbStart->tqsizeHint() );
+  pbStart->setFixedSize( pbStart->sizeHint() );
   connect( pbStart, TQT_SIGNAL(clicked()), TQT_SLOT(startJob()) );
   hbLayout->addWidget( pbStart, 5 );
 
   pbStop = new TQPushButton( "Sto&p", main_widget );
-  pbStop->setFixedSize( pbStop->tqsizeHint() );
+  pbStop->setFixedSize( pbStop->sizeHint() );
   pbStop->setEnabled( false );
   connect( pbStop, TQT_SIGNAL(clicked()), TQT_SLOT(stopJob()) );
   hbLayout->addWidget( pbStop, 5 );
 
   // close button
   close = new TQPushButton( "&Close", main_widget );
-  close->setFixedSize( close->tqsizeHint() );
+  close->setFixedSize( close->sizeHint() );
   connect(close, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotQuit()));
 
   topLayout->addWidget( close, 5 );
 
-  main_widget->setMinimumSize( main_widget->tqsizeHint() );
+  main_widget->setMinimumSize( main_widget->sizeHint() );
   setCentralWidget( main_widget );
 
   slave = 0;
@@ -201,7 +201,7 @@ void KioslaveTest::changeOperation( int id ) {
 void KioslaveTest::changeProgressMode( int id ) {
   progressMode = id;
 
-  if ( progressMode == ProgresstqStatus ) {
+  if ( progressMode == ProgressStatus ) {
     statusBar()->show();
   } else {
     statusBar()->hide();
@@ -306,7 +306,7 @@ void KioslaveTest::startJob() {
   connect( job, TQT_SIGNAL( canceled( KIO::Job * ) ),
            TQT_SLOT( slotResult( KIO::Job * ) ) );
 
-  if (progressMode == ProgresstqStatus) {
+  if (progressMode == ProgressStatus) {
     statusProgress->setJob( job );
   }
 
@@ -537,15 +537,15 @@ int main(int argc, char **argv) {
   } else if ( tmps == "default") {
     pr = KioslaveTest::ProgressDefault;
   } else if ( tmps == "status") {
-    pr = KioslaveTest::ProgresstqStatus;
+    pr = KioslaveTest::ProgressStatus;
   } else KCmdLineArgs::usage("unknown progress mode");
 
   args->clear(); // Free up memory
 
   KioslaveTest test( src, dest, op, pr );
   test.show();
-  // Bug in KTMW / Qt / tqlayouts ?
-  test.resize( test.tqsizeHint() );
+  // Bug in KTMW / Qt / layouts ?
+  test.resize( test.sizeHint() );
 
   app.setMainWidget(&test);
   app.exec();
diff --git a/kio/tests/kioslavetest.h b/kio/tests/kioslavetest.h
index 1f99fbbdf..02fae7f23 100644
--- a/kio/tests/kioslavetest.h
+++ b/kio/tests/kioslavetest.h
@@ -35,7 +35,7 @@ public:
 
   enum Operations { List, ListRecursive, Stat, Get, Put, Copy, Move, Delete, Shred, Mkdir, Mimetype };
 
-  enum ProgressModes { ProgressNone, ProgressDefault, ProgresstqStatus };
+  enum ProgressModes { ProgressNone, ProgressDefault, ProgressStatus };
 
 protected:
 
@@ -70,7 +70,7 @@ protected:
 
   TQRadioButton *rbProgressNone;
   TQRadioButton *rbProgressDefault;
-  TQRadioButton *rbProgresstqStatus;
+  TQRadioButton *rbProgressStatus;
 
   TQPushButton *pbStart;
   TQPushButton *pbStop;
@@ -97,7 +97,7 @@ private:
   KIO::Job *job;
   TQWidget *main_widget;
 
-  KIO::tqStatusbarProgress *statusProgress;
+  KIO::StatusbarProgress *statusProgress;
 
   int selectedOperation;
   int progressMode;
diff --git a/kio/tests/kmfitest.cpp b/kio/tests/kmfitest.cpp
index 83d5798a2..25e96759f 100644
--- a/kio/tests/kmfitest.cpp
+++ b/kio/tests/kmfitest.cpp
@@ -19,8 +19,8 @@ int main (int argc, char **argv)
 		TQString file = TQFile::decodeName(argv[i]);
 		qWarning("File: %s", file.local8Bit().data());
 		KMimeType::Ptr p;
-		p = KMimeType::tqfindByPath(file);
-		qWarning("Mime type (tqfindByPath): %s", p->name().latin1());
+		p = KMimeType::findByPath(file);
+		qWarning("Mime type (findByPath): %s", p->name().latin1());
 		KFileMetaInfo meta(file, TQString::null, KFileMetaInfo::TechnicalInfo | KFileMetaInfo::ContentInfo);
 	}
 
diff --git a/kio/tests/kmimefromext.cpp b/kio/tests/kmimefromext.cpp
index 4d2cbe67b..248407f95 100644
--- a/kio/tests/kmimefromext.cpp
+++ b/kio/tests/kmimefromext.cpp
@@ -43,7 +43,7 @@ int main(int argc, char *argv[])
   // The "true" here means only the filename will be looked at.
   // "Mime-magic" will not interfer. The file doesn't exist.
   // TODO: a cmd line parameter for controlling this bool ;)
-  KMimeType::Ptr mime = KMimeType::tqfindByPath( fileName, 0, true );
+  KMimeType::Ptr mime = KMimeType::findByPath( fileName, 0, true );
   if ( mime && mime->name() != KMimeType::defaultMimeType() )
     printf( "%s\n", mime->name().latin1());
   else
diff --git a/kio/tests/kmimemagictest.cpp b/kio/tests/kmimemagictest.cpp
index d6b500d1f..eb01137c9 100644
--- a/kio/tests/kmimemagictest.cpp
+++ b/kio/tests/kmimemagictest.cpp
@@ -34,14 +34,14 @@ int main( int argc, char** argv )
 
   TQString file = TQString::fromLocal8Bit( argv[1] );
 
-  KMimeMagicResult * result = KMimeMagic::self()->tqfindFileType( file );
+  KMimeMagicResult * result = KMimeMagic::self()->findFileType( file );
 
   if ( result->isValid() )
       printf( "Found %s, accuracy %d\n", result->mimeType().latin1(), result->accuracy() );
   else
       printf( "Invalid result\n");
 
-  KMimeType::Format f = KMimeType::tqfindFormatByFileContent( file );
+  KMimeType::Format f = KMimeType::findFormatByFileContent( file );
   if (f.text)
     printf("Text\n");
   else
diff --git a/kio/tests/kprotocolinfotest.cpp b/kio/tests/kprotocolinfotest.cpp
index 65e60f99b..b0fe392f2 100644
--- a/kio/tests/kprotocolinfotest.cpp
+++ b/kio/tests/kprotocolinfotest.cpp
@@ -53,7 +53,7 @@ int main(int argc, char **argv) {
 
     TQStringList capabilities = KProtocolInfo::capabilities( "imap" );
     kdDebug() << "kio_imap capabilities: " << capabilities << endl;
-    //assert(capabilities.tqcontains("ACL"));
+    //assert(capabilities.contains("ACL"));
 
     return 0;
 }
diff --git a/kio/tests/ksycocatest.cpp b/kio/tests/ksycocatest.cpp
index a9fa8198a..4a4fcabb0 100644
--- a/kio/tests/ksycocatest.cpp
+++ b/kio/tests/ksycocatest.cpp
@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
    KApplication k(argc,argv,"whatever",false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption
 
    TQCString instname = "kword";
-   TQString desktopPath = TQString::tqfromLatin1( "Office/%1.desktop" ).arg( instname );
+   TQString desktopPath = TQString::fromLatin1( "Office/%1.desktop" ).arg( instname );
    qDebug( "Looking for %s", desktopPath.latin1() );
    KService::Ptr service = KService::serviceByDesktopPath( desktopPath );
    if ( service )
diff --git a/kio/tests/kurifiltertest.cpp b/kio/tests/kurifiltertest.cpp
index 667e6014d..8e4b023cb 100644
--- a/kio/tests/kurifiltertest.cpp
+++ b/kio/tests/kurifiltertest.cpp
@@ -45,7 +45,7 @@ void filter( const char* u, const char * expectedResult = 0, int expectedUriType
 
     if( abs_path )
     {
-        m_filterData->setAbsolutePath( TQString::tqfromLatin1( abs_path ) );
+        m_filterData->setAbsolutePath( TQString::fromLatin1( abs_path ) );
         kdDebug() << "Filtering: " << a << " with abs_path=" << abs_path << endl;
     }
     else
@@ -97,8 +97,8 @@ void filter( const char* u, const char * expectedResult = 0, int expectedUriType
         if ( expectedResult )
         {
             // Hack for other locales than english, normalize google hosts to google.com
-            cmd = cmd.tqreplace( TQRegExp( "www\\.google\\.[^/]*/" ), "www.google.com/" );
-            if ( cmd != TQString::tqfromLatin1( expectedResult ) )
+            cmd = cmd.replace( TQRegExp( "www\\.google\\.[^/]*/" ), "www.google.com/" );
+            if ( cmd != TQString::fromLatin1( expectedResult ) )
             {
                 kdError() << " Got " << cmd << " expected " << expectedResult << endl;
                 ::exit(1);
diff --git a/kio/tests/kurlcompletiontest.cpp b/kio/tests/kurlcompletiontest.cpp
index f5113f05b..612dab558 100644
--- a/kio/tests/kurlcompletiontest.cpp
+++ b/kio/tests/kurlcompletiontest.cpp
@@ -96,9 +96,9 @@ void KURLCompletionTest::testLocalRelativePath()
     waitForCompletion();
     TQStringList comp1all = m_completion->allMatches();
     assert( comp1all.count() == 2 );
-    assert( comp1all.tqfind( "file1" ) != comp1all.end() );
-    assert( comp1all.tqfind( "file#a" ) != comp1all.end() );
-    TQString comp1 = m_completion->tqreplacedPath( "file1" ); // like KURLRequester does
+    assert( comp1all.find( "file1" ) != comp1all.end() );
+    assert( comp1all.find( "file#a" ) != comp1all.end() );
+    TQString comp1 = m_completion->replacedPath( "file1" ); // like KURLRequester does
     assert( comp1 == "file1" );
 
     // Completion from relative path
@@ -109,7 +109,7 @@ void KURLCompletionTest::testLocalRelativePath()
     kdDebug() << compall << endl;
     assert( compall.count() == 1 );
     assert( compall.first() == "file#a" );
-    TQString comp2 = m_completion->tqreplacedPath( compall.first() ); // like KURLRequester does
+    TQString comp2 = m_completion->replacedPath( compall.first() ); // like KURLRequester does
     assert( comp2 == "file#a" );
 }
 
@@ -124,7 +124,7 @@ void KURLCompletionTest::testLocalAbsolutePath()
     assert( compall.count() == 1 );
     TQString comp = compall.first();
     assert( comp == m_dir + "file#a" );
-    comp = m_completion->tqreplacedPath( comp ); // like KURLRequester does
+    comp = m_completion->replacedPath( comp ); // like KURLRequester does
     assert( comp == m_dir + "file#a" );
 }
 
@@ -138,10 +138,10 @@ void KURLCompletionTest::testLocalURL()
     TQStringList comp1all = m_completion->allMatches();
     kdDebug() << comp1all << endl;
     assert( comp1all.count() == 2 );
-    assert( comp1all.tqfind( m_dirURL.url() + "file1" ) != comp1all.end() );
+    assert( comp1all.find( m_dirURL.url() + "file1" ) != comp1all.end() );
     TQString filehash = m_dirURL.url() + "file%23a";
-    assert( comp1all.tqfind( filehash ) != comp1all.end() );
-    TQString filehashPath = m_completion->tqreplacedPath( filehash ); // note that it returns a path!!
+    assert( comp1all.find( filehash ) != comp1all.end() );
+    TQString filehashPath = m_completion->replacedPath( filehash ); // note that it returns a path!!
     kdDebug() << filehashPath << endl;
     assert( filehashPath == m_dirURL.path() + "file#a" );
 
diff --git a/kio/tests/previewtest.cpp b/kio/tests/previewtest.cpp
index f64cb75f9..f2b740224 100644
--- a/kio/tests/previewtest.cpp
+++ b/kio/tests/previewtest.cpp
@@ -14,16 +14,16 @@
 PreviewTest::PreviewTest()
     :TQWidget()
 {
-    TQGridLayout *tqlayout = new TQGridLayout(this, 2, 2);
+    TQGridLayout *layout = new TQGridLayout(this, 2, 2);
     m_url = new KLineEdit(this);
     m_url->setText("/home/malte/gore_bush.jpg");
-    tqlayout->addWidget(m_url, 0, 0);
+    layout->addWidget(m_url, 0, 0);
     TQPushButton *btn = new TQPushButton("Generate", this);
     connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotGenerate()));
-    tqlayout->addWidget(btn, 0, 1);
+    layout->addWidget(btn, 0, 1);
     m_preview = new TQLabel(this);
     m_preview->setMinimumSize(400, 300);
-    tqlayout->addMultiCellWidget(m_preview, 1, 1, 0, 1);
+    layout->addMultiCellWidget(m_preview, 1, 1, 0, 1);
 }
 
 void PreviewTest::slotGenerate()
diff --git a/kio/tests/speed.cpp b/kio/tests/speed.cpp
index 4b29e1815..d8ddae20a 100644
--- a/kio/tests/speed.cpp
+++ b/kio/tests/speed.cpp
@@ -87,7 +87,7 @@ int main(int argc, char **argv) {
     } else
         kdDebug() << mp << " is the mount point for device " << url.url() << endl;
 
-    mp = KIO::tqfindPathMountPoint(url.path());
+    mp = KIO::findPathMountPoint(url.path());
     if (mp.isEmpty()) {
         kdDebug() << "no mount point for path " << url.url() << " found\n";
     } else
@@ -95,7 +95,7 @@ int main(int argc, char **argv) {
     // SpeedTest test( url );
     // app.exec();
 
-    mp = KIO::tqfindPathMountPoint(url.path());
+    mp = KIO::findPathMountPoint(url.path());
     if (mp.isEmpty()) {
         kdDebug() << "no mount point for path " << url.url() << " found\n";
     } else
@@ -105,7 +105,7 @@ int main(int argc, char **argv) {
 
     url.setPath(TQDir::homeDirPath());
 
-    mp = KIO::tqfindPathMountPoint(url.path());
+    mp = KIO::findPathMountPoint(url.path());
     if (mp.isEmpty()) {
         kdDebug() << "no mount point for path " << url.url() << " found\n";
     } else
@@ -113,7 +113,7 @@ int main(int argc, char **argv) {
     // SpeedTest test( url );
     // app.exec();
 
-    mp = KIO::tqfindPathMountPoint(url.path());
+    mp = KIO::findPathMountPoint(url.path());
     if (mp.isEmpty()) {
         kdDebug() << "no mount point for path " << url.url() << " found\n";
     } else
@@ -126,7 +126,7 @@ int main(int argc, char **argv) {
     else
       url = "file:" + TQDir::currentDirPath();
 
-    mp = KIO::tqfindPathMountPoint(url.path());
+    mp = KIO::findPathMountPoint(url.path());
     if (mp.isEmpty()) {
         kdDebug() << "no mount point for path " << url.url() << " found\n";
     } else
diff --git a/kioslave/file/file.cc b/kioslave/file/file.cc
index 6d829ad7c..441d03b98 100644
--- a/kioslave/file/file.cc
+++ b/kioslave/file/file.cc
@@ -379,7 +379,7 @@ void FileProtocol::put( const KURL& url, int _mode, bool _overwrite, bool _resum
     kdDebug(7101) << "put(): " << dest_orig << ", mode=" << _mode << endl;
 
     TQString dest_part( dest_orig );
-    dest_part += TQString::tqfromLatin1(".part");
+    dest_part += TQString::fromLatin1(".part");
     TQCString _dest_part( TQFile::encodeName(dest_part));
 
     KDE_struct_stat buff_orig;
@@ -809,7 +809,7 @@ void FileProtocol::copy( const KURL &src, const KURL &dest,
     ut.modtime = buff_src.st_mtime;
     if ( ::utime( _dest.data(), &ut ) != 0 )
     {
-        kdWarning() << TQString::tqfromLatin1("Couldn't preserve access and modification time for\n%1").arg( dest.path() ) << endl;
+        kdWarning() << TQString::fromLatin1("Couldn't preserve access and modification time for\n%1").arg( dest.path() ) << endl;
     }
 
     processedSize( buff_src.st_size );
@@ -859,7 +859,7 @@ void FileProtocol::rename( const KURL &src, const KURL &dest,
             error( KIO::ERR_ACCESS_DENIED, dest.path() );
         }
         else if (errno == EXDEV) {
-           error( KIO::ERR_UNSUPPORTED_ACTION, TQString::tqfromLatin1("rename"));
+           error( KIO::ERR_UNSUPPORTED_ACTION, TQString::fromLatin1("rename"));
         }
         else if (errno == EROFS) { // The file is on a read-only filesystem
            error( KIO::ERR_CANNOT_DELETE, src.path() );
@@ -960,12 +960,12 @@ void FileProtocol::del( const KURL& url, bool isfile)
 TQString FileProtocol::getUserName( uid_t uid )
 {
     TQString *temp;
-    temp = usercache.tqfind( uid );
+    temp = usercache.find( uid );
     if ( !temp ) {
         struct passwd *user = getpwuid( uid );
         if ( user ) {
-            usercache.insert( uid, new TQString(TQString::tqfromLatin1(user->pw_name)) );
-            return TQString::tqfromLatin1( user->pw_name );
+            usercache.insert( uid, new TQString(TQString::fromLatin1(user->pw_name)) );
+            return TQString::fromLatin1( user->pw_name );
         }
         else
             return TQString::number( uid );
@@ -977,12 +977,12 @@ TQString FileProtocol::getUserName( uid_t uid )
 TQString FileProtocol::getGroupName( gid_t gid )
 {
     TQString *temp;
-    temp = groupcache.tqfind( gid );
+    temp = groupcache.find( gid );
     if ( !temp ) {
         struct group *grp = getgrgid( gid );
         if ( grp ) {
-            groupcache.insert( gid, new TQString(TQString::tqfromLatin1(grp->gr_name)) );
-            return TQString::tqfromLatin1( grp->gr_name );
+            groupcache.insert( gid, new TQString(TQString::fromLatin1(grp->gr_name)) );
+            return TQString::fromLatin1( grp->gr_name );
         }
         else
             return TQString::number( gid );
@@ -1116,7 +1116,7 @@ void FileProtocol::stat( const KURL & url )
      */
     TQCString _path( TQFile::encodeName(url.path(-1)));
 
-    TQString sDetails = metaData(TQString::tqfromLatin1("details"));
+    TQString sDetails = metaData(TQString::fromLatin1("details"));
     int details = sDetails.isEmpty() ? 2 : sDetails.toInt();
     kdDebug(7101) << "FileProtocol::stat details=" << details << endl;
 
@@ -1303,7 +1303,7 @@ void FileProtocol::special( const TQByteArray &data)
     case 1:
       {
 	TQString fstype, dev, point;
-	TQ_INT8 iRo;
+	Q_INT8 iRo;
 
 	stream >> iRo >> fstype >> dev >> point;
 
@@ -1419,13 +1419,13 @@ void FileProtocol::mount( bool _ro, const char *_fstype, const TQString& _dev, c
     bool fstype_empty = !_fstype || !*_fstype;
     TQCString fstype = KProcess::quote(_fstype).latin1(); // good guess
     TQCString readonly = _ro ? "-r" : "";
-    TQString epath = TQString::tqfromLatin1(getenv("PATH"));
-    TQString path = TQString::tqfromLatin1("/sbin:/bin");
+    TQString epath = TQString::fromLatin1(getenv("PATH"));
+    TQString path = TQString::fromLatin1("/sbin:/bin");
     if(!epath.isEmpty())
-        path += TQString::tqfromLatin1(":") + epath;
+        path += TQString::fromLatin1(":") + epath;
     TQString mountProg = KGlobal::dirs()->findExe("mount", path);
     if (mountProg.isEmpty()){
-      error( KIO::ERR_COULD_NOT_MOUNT, i18n("Could not tqfind program \"mount\""));
+      error( KIO::ERR_COULD_NOT_MOUNT, i18n("Could not find program \"mount\""));
       return;
     }
 
@@ -1543,7 +1543,7 @@ void FileProtocol::unmount( const TQString& _point )
 		/*
 		 *  since there's no way to derive the device name from
 		 *  the mount point through the volmgt library (and
-		 *  media_tqfindname() won't work in this case), we have to
+		 *  media_findname() won't work in this case), we have to
 		 *  look ourselves...
 		 */
 		devname = NULL;
@@ -1604,13 +1604,13 @@ void FileProtocol::unmount( const TQString& _point )
 	}
 #else
     TQString epath = getenv("PATH");
-    TQString path = TQString::tqfromLatin1("/sbin:/bin");
+    TQString path = TQString::fromLatin1("/sbin:/bin");
     if (!epath.isEmpty())
        path += ":" + epath;
     TQString umountProg = KGlobal::dirs()->findExe("umount", path);
 
     if (umountProg.isEmpty()) {
-        error( KIO::ERR_COULD_NOT_UNMOUNT, i18n("Could not tqfind program \"umount\""));
+        error( KIO::ERR_COULD_NOT_UNMOUNT, i18n("Could not find program \"umount\""));
         return;
     }
     buffer.sprintf( "%s %s 2>%s", umountProg.latin1(), TQFile::encodeName(KProcess::quote(_point)).data(), tmp );
@@ -1619,7 +1619,7 @@ void FileProtocol::unmount( const TQString& _point )
 
     err = testLogFile( tmp );
 
-    if (err.tqcontains("fstab") || err.tqcontains("root")) {
+    if (err.contains("fstab") || err.contains("root")) {
        TQString olderr;
        err = TQString::null;
 
@@ -1658,7 +1658,7 @@ void FileProtocol::unmount( const TQString& _point )
 bool FileProtocol::pmount(const TQString &dev)
 {
     TQString epath = getenv("PATH");
-    TQString path = TQString::tqfromLatin1("/sbin:/bin");
+    TQString path = TQString::fromLatin1("/sbin:/bin");
     if (!epath.isEmpty())
         path += ":" + epath;
     TQString pmountProg = KGlobal::dirs()->findExe("pmount", path);
@@ -1700,7 +1700,7 @@ bool FileProtocol::pumount(const TQString &point)
     if (dev.endsWith("/")) dev.truncate(dev.length()-1);
 
     TQString epath = getenv("PATH");
-    TQString path = TQString::tqfromLatin1("/sbin:/bin");
+    TQString path = TQString::fromLatin1("/sbin:/bin");
     if (!epath.isEmpty())
         path += ":" + epath;
     TQString pumountProg = KGlobal::dirs()->findExe("pumount", path);
@@ -1774,7 +1774,7 @@ static bool isExtendedACL( acl_t acl )
 static TQString aclAsString(  acl_t acl )
 {
     char *aclString = acl_to_text( acl, 0 );
-    TQString ret = TQString::tqfromLatin1( aclString );
+    TQString ret = TQString::fromLatin1( aclString );
     acl_free( (void*)aclString );
     return ret;
 }
diff --git a/kioslave/ftp/ftp.cc b/kioslave/ftp/ftp.cc
index f04a28894..9e4fc21d9 100644
--- a/kioslave/ftp/ftp.cc
+++ b/kioslave/ftp/ftp.cc
@@ -71,9 +71,9 @@
 #endif
 
 // JPF: a remark on coding style (2004-03-06):
-// Some calls to TQString::tqfromLatin1() were removed from the code. In most places
+// Some calls to TQString::fromLatin1() were removed from the code. In most places
 // the KDE code relies on implicit creation of QStrings. Also Qt has a lot of
-// const char* overloads, so that using TQString::tqfromLatin1() can be ineffectient!
+// const char* overloads, so that using TQString::fromLatin1() can be ineffectient!
 
 #define FTP_LOGIN   "anonymous"
 #define FTP_PASSWD  "anonymous@"
@@ -81,7 +81,7 @@
 //#undef  kdDebug
 #define ENABLE_CAN_RESUME
 
-// JPF: somebody should tqfind a better solution for this or move this to KIO
+// JPF: somebody should find a better solution for this or move this to KIO
 // JPF: anyhow, in KDE 3.2.0 I found diffent MAX_IPC_SIZE definitions!
 namespace KIO {
     enum buffersizes
@@ -96,7 +96,7 @@ namespace KIO {
          */
         initialIpcSize =  2 * 1024,
         /**
-         * recommended size of a data block passed to tqfindBufferFileType()
+         * recommended size of a data block passed to findBufferFileType()
          */
         mimimumMimeSize =     1024
     };
@@ -279,7 +279,7 @@ void FtpSocket::closeSocket()
     ::close(m_server);
     m_server = -1;
   }
-  if(sockettqStatus() > nothing)
+  if(socketStatus() > nothing)
     reset();
   textClear();
 }
@@ -693,8 +693,8 @@ bool Ftp::ftpLogin()
   }
 
   TQString sTmp = remoteEncoding()->decode( ftpResponse(3) );
-  int iBeg = sTmp.tqfind('"');
-  int iEnd = sTmp.tqfindRev('"');
+  int iBeg = sTmp.find('"');
+  int iEnd = sTmp.findRev('"');
   if(iBeg > 0 && iBeg < iEnd)
   {
     m_initialPath = sTmp.mid(iBeg+1, iEnd-iBeg-1);
@@ -749,9 +749,9 @@ bool Ftp::ftpSendCmd( const TQCString& cmd, int maxretries )
 {
   assert(m_control != NULL);    // must have control connection socket
 
-  if ( cmd.tqfind( '\r' ) != -1 || cmd.tqfind( '\n' ) != -1)
+  if ( cmd.find( '\r' ) != -1 || cmd.find( '\n' ) != -1)
   {
-    kdWarning(7102) << "Invalid command received (tqcontains CR or LF):"
+    kdWarning(7102) << "Invalid command received (contains CR or LF):"
                     << cmd.data() << endl;
     error( ERR_UNSUPPORTED_ACTION, m_host );
     return false;
@@ -968,7 +968,7 @@ int Ftp::ftpOpenEPRTDataConnection()
   if (sin == NULL)
     return ERR_INTERNAL;
 
-  //  TQString command = TQString::tqfromLatin1("eprt |%1|%2|%3|").arg(sin->ianaFamily())
+  //  TQString command = TQString::fromLatin1("eprt |%1|%2|%3|").arg(sin->ianaFamily())
   //  .arg(sin->nodeName())
   //  .arg(sin->port());
   TQCString command;
@@ -991,7 +991,7 @@ int Ftp::ftpOpenEPRTDataConnection()
 /*
  * ftpOpenDataConnection - set up data connection
  *
- * The routine calls several ftpOpenXxxxConnection() helpers to tqfind
+ * The routine calls several ftpOpenXxxxConnection() helpers to find
  * the best connection mode. If a helper cannot connect if returns
  * ERR_INTERNAL - so this is not really an error! All other error
  * codes are treated as fatal, e.g. they are passed back to the caller
@@ -1111,10 +1111,10 @@ int Ftp::ftpAcceptConnect()
   struct sockaddr addr;
   for(;;)
   {
-    fd_set tqmask;
-    FD_ZERO(&tqmask);
-    FD_SET(sSock,&tqmask);
-    int r = KSocks::self()->select(sSock + 1, &tqmask, NULL, NULL, 0L);
+    fd_set mask;
+    FD_ZERO(&mask);
+    FD_SET(sSock,&mask);
+    int r = KSocks::self()->select(sSock + 1, &mask, NULL, NULL, 0L);
     if( r < 0 && errno != EINTR && errno != EAGAIN )
       continue;
     if( r > 0 )
@@ -1285,7 +1285,7 @@ bool Ftp::ftpRename( const TQString & src, const TQString & dst, bool overwrite
       return false;
   }
 
-  int pos = src.tqfindRev("/");
+  int pos = src.findRev("/");
   if( !ftpFolder(src.left(pos+1), false) )
       return false;
 
@@ -1627,7 +1627,7 @@ void Ftp::stat( const KURL &url)
                     // Relative link (stat will take care of cleaning ../.. etc.)
                     linkURL.setPath( listarg ); // this is what we were listing (the link)
                     linkURL.setPath( linkURL.directory() ); // go up one dir
-                    linkURL.addPath( ftpEnt.link ); // tqreplace link by its destination
+                    linkURL.addPath( ftpEnt.link ); // replace link by its destination
                     kdDebug(7102) << "linkURL now " << linkURL.prettyURL() << endl;
                 }
                 // Re-add the filename we're looking for
@@ -1732,7 +1732,7 @@ void Ftp::listDir( const KURL &url )
 void Ftp::slave_status()
 {
   kdDebug(7102) << "Got slave_status host = " << (m_host.ascii() ? m_host.ascii() : "[None]") << " [" << (m_bLoggedOn ? "Connected" : "Not connected") << "]" << endl;
-  slavetqStatus( m_host, m_bLoggedOn );
+  slaveStatus( m_host, m_bLoggedOn );
 }
 
 bool Ftp::ftpOpenDir( const TQString & path )
@@ -1807,7 +1807,7 @@ bool Ftp::ftpReadDir(FtpEntry& de)
     // So we just ignore the number in front of the ",". Ok, its a hack :-)
     if ( strchr( p_size, ',' ) != 0L )
     {
-      //kdDebug(7102) << "Size tqcontains a ',' -> reading size again (/dev hack)" << endl;
+      //kdDebug(7102) << "Size contains a ',' -> reading size again (/dev hack)" << endl;
       if ((p_size = strtok(NULL," ")) == 0)
         continue;
     }
@@ -1838,7 +1838,7 @@ bool Ftp::ftpReadDir(FtpEntry& de)
         TQCString tmp( p_name );
         if ( p_access[0] == 'l' )
         {
-          int i = tmp.tqfindRev( " -> " );
+          int i = tmp.findRev( " -> " );
           if ( i != -1 ) {
             de.link = remoteEncoding()->decode(p_name + i + 4);
             tmp.truncate( i );
@@ -1852,7 +1852,7 @@ bool Ftp::ftpReadDir(FtpEntry& de)
         if ( tmp[0] == '/' ) // listing on ftp://ftp.gnupg.org/ starts with '/'
           tmp.remove( 0, 1 );
 
-        if (tmp.tqfind('/') != -1)
+        if (tmp.find('/') != -1)
           continue; // Don't trick us!
         // Some sites put more than one space between the date and the name
         // e.g. ftp://ftp.uni-marburg.de/mirror/
@@ -1953,7 +1953,7 @@ bool Ftp::ftpReadDir(FtpEntry& de)
         if ( tmptr->tm_mon > currentMonth + 1 )
           tmptr->tm_year--;
 
-        // and p_date_3 tqcontains probably a time
+        // and p_date_3 contains probably a time
         char * semicolon;
         if ( ( semicolon = (char*)strchr( p_date_3, ':' ) ) )
         {
@@ -1987,13 +1987,13 @@ void Ftp::get( const KURL & url )
   ftpCloseCommand();                        // must close command!
 }
 
-Ftp::tqStatusCode Ftp::ftpGet(int& iError, int iCopyFile, const KURL& url, KIO::fileoffset_t llOffset)
+Ftp::StatusCode Ftp::ftpGet(int& iError, int iCopyFile, const KURL& url, KIO::fileoffset_t llOffset)
 {
   // Calls error() by itself!
   if( !ftpOpenConnection(loginImplicit) )
     return statusServerError;
 
-  // Try to tqfind the size of the file (and check that it exists at
+  // Try to find the size of the file (and check that it exists at
   // the same time). If we get back a 550, "File does not exist"
   // or "not a plain file", check if it is a directory. If it is a
   // directory, return an error; otherwise simply try to retrieve
@@ -2082,16 +2082,16 @@ Ftp::tqStatusCode Ftp::ftpGet(int& iError, int iCopyFile, const KURL& url, KIO::
     {
       mimetypeEmitted = true;
 
-      // We need a KMimeType::tqfindByNameAndContent(data,filename)
-      // For now we do: tqfind by extension, and if not found (or extension not reliable)
-      // then tqfind by content.
+      // We need a KMimeType::findByNameAndContent(data,filename)
+      // For now we do: find by extension, and if not found (or extension not reliable)
+      // then find by content.
       bool accurate = false;
       KMimeType::Ptr mime = KMimeType::findByURL( url, 0, false, true, &accurate );
       if ( !mime || mime->name() == KMimeType::defaultMimeType()
            || !accurate )
       {
         array.setRawData(buffer, n);
-        KMimeMagicResult * result = KMimeMagic::self()->tqfindBufferFileType(array, url.fileName());
+        KMimeMagicResult * result = KMimeMagic::self()->findBufferFileType(array, url.fileName());
         array.resetRawData(buffer, n);
         if ( result->mimeType() != KMimeType::defaultMimeType() )
           mime = KMimeType::mimeType( result->mimeType() );
@@ -2204,7 +2204,7 @@ void Ftp::put(const KURL& url, int permissions, bool overwrite, bool resume)
   ftpCloseCommand();                        // must close command!
 }
 
-Ftp::tqStatusCode Ftp::ftpPut(int& iError, int iCopyFile, const KURL& dest_url,
+Ftp::StatusCode Ftp::ftpPut(int& iError, int iCopyFile, const KURL& dest_url,
                             int permissions, bool overwrite, bool resume)
 {
   if( !ftpOpenConnection(loginImplicit) )
@@ -2489,7 +2489,7 @@ void Ftp::copy( const KURL &src, const KURL &dest, int permissions, bool overwri
 {
   int iError = 0;
   int iCopyFile = -1;
-  tqStatusCode cs = statusSuccess;
+  StatusCode cs = statusSuccess;
   bool bSrcLocal = src.isLocalFile();
   bool bDestLocal = dest.isLocalFile();
   TQString  sCopyFile;
@@ -2522,7 +2522,7 @@ void Ftp::copy( const KURL &src, const KURL &dest, int permissions, bool overwri
 }
 
 
-Ftp::tqStatusCode Ftp::ftpCopyPut(int& iError, int& iCopyFile, TQString sCopyFile,
+Ftp::StatusCode Ftp::ftpCopyPut(int& iError, int& iCopyFile, TQString sCopyFile,
                                 const KURL& url, int permissions, bool overwrite)
 {
   // check if source is ok ...
@@ -2559,7 +2559,7 @@ Ftp::tqStatusCode Ftp::ftpCopyPut(int& iError, int& iCopyFile, TQString sCopyFil
 }
 
 
-Ftp::tqStatusCode Ftp::ftpCopyGet(int& iError, int& iCopyFile, const TQString sCopyFile,
+Ftp::StatusCode Ftp::ftpCopyGet(int& iError, int& iCopyFile, const TQString sCopyFile,
                                 const KURL& url, int permissions, bool overwrite)
 {
   // check if destination is ok ...
@@ -2645,7 +2645,7 @@ Ftp::tqStatusCode Ftp::ftpCopyGet(int& iError, int& iCopyFile, const TQString sC
   }
 
   // delegate the real work (iError gets status) ...
-  tqStatusCode iRes = ftpGet(iError, iCopyFile, url, hCopyOffset);
+  StatusCode iRes = ftpGet(iError, iCopyFile, url, hCopyOffset);
   if( ::close(iCopyFile) && iRes == statusSuccess )
   {
     iError = ERR_COULD_NOT_WRITE;
diff --git a/kioslave/ftp/ftp.h b/kioslave/ftp/ftp.h
index ac48c6c41..44f0bdc71 100644
--- a/kioslave/ftp/ftp.h
+++ b/kioslave/ftp/ftp.h
@@ -284,14 +284,14 @@ private:
   // ------------------------------------------------------------------------
 
   /**
-   * tqStatus Code returned from ftpPut() and ftpGet(), used to select
+   * Status Code returned from ftpPut() and ftpGet(), used to select
    * source or destination url for error messages
    */
   typedef enum {
     statusSuccess,
     statusClientError,
     statusServerError
-  } tqStatusCode;
+  } StatusCode;
 
   /**
    * Login Mode for ftpOpenConnection
@@ -482,7 +482,7 @@ private:
    * @param hCopyOffset local file only: non-zero for resume
    * @return 0 for success, -1 for server error, -2 for client error
    */
-  tqStatusCode ftpGet(int& iError, int iCopyFile, const KURL& url, KIO::fileoffset_t hCopyOffset);
+  StatusCode ftpGet(int& iError, int iCopyFile, const KURL& url, KIO::fileoffset_t hCopyOffset);
 
   /**
    * This is the internal implementation of put() - see copy().
@@ -494,7 +494,7 @@ private:
    * @param iCopyFile   -1 -or- handle of a local source file
    * @return 0 for success, -1 for server error, -2 for client error
    */
-  tqStatusCode ftpPut(int& iError, int iCopyFile, const KURL& url, int permissions, bool overwrite, bool resume);
+  StatusCode ftpPut(int& iError, int iCopyFile, const KURL& url, int permissions, bool overwrite, bool resume);
 
   /**
    * helper called from copy() to implement FILE -> FTP transfers
@@ -504,7 +504,7 @@ private:
    * @param sCopyFile   path of the local source file
    * @return 0 for success, -1 for server error, -2 for client error
    */
-  tqStatusCode ftpCopyPut(int& iError, int& iCopyFile, TQString sCopyFile, const KURL& url, int permissions, bool overwrite);
+  StatusCode ftpCopyPut(int& iError, int& iCopyFile, TQString sCopyFile, const KURL& url, int permissions, bool overwrite);
 
   /**
    * helper called from copy() to implement FTP -> FILE transfers
@@ -514,7 +514,7 @@ private:
    * @param sCopyFile   path of the local destination file
    * @return 0 for success, -1 for server error, -2 for client error
    */
-  tqStatusCode ftpCopyGet(int& iError, int& iCopyFile, TQString sCopyFile, const KURL& url, int permissions, bool overwrite);
+  StatusCode ftpCopyGet(int& iError, int& iCopyFile, TQString sCopyFile, const KURL& url, int permissions, bool overwrite);
 
 private: // data members
 
@@ -544,7 +544,7 @@ private: // data members
   int  m_iRespType;
 
   /**
-   * This flag is maintained by ftpDataMode() and tqcontains I or A after
+   * This flag is maintained by ftpDataMode() and contains I or A after
    * ftpDataMode() has successfully set the mode.
    */
   char m_cDataMode;
diff --git a/kioslave/gzip/kgzipfilter.cpp b/kioslave/gzip/kgzipfilter.cpp
index a7ee6498f..375f9f9bc 100644
--- a/kioslave/gzip/kgzipfilter.cpp
+++ b/kioslave/gzip/kgzipfilter.cpp
@@ -133,7 +133,7 @@ bool KGzipFilter::readHeader()
 #endif
     // Assume not compressed until we successfully decode the header
     d->bCompressed = false;
-    // Assume the first block of data tqcontains the whole header.
+    // Assume the first block of data contains the whole header.
     // The right way is to build this as a big state machine which
     // is a pain in the ass.
     // With 8K-blocks, we don't risk much anyway.
diff --git a/kioslave/http/configure.in.in b/kioslave/http/configure.in.in
index fed7f4da7..a7d1ca7cf 100644
--- a/kioslave/http/configure.in.in
+++ b/kioslave/http/configure.in.in
@@ -12,7 +12,7 @@ AC_ARG_WITH(gssapi,
 if test "x$with_gssapi" = "xCHECK" ; then
   with_gssapi=NOTFOUND
   KDE_FIND_PATH(krb5-config, KRB5_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin /usr/lib/mit/bin], [
-    AC_MSG_WARN([Could not tqfind krb5-config])
+    AC_MSG_WARN([Could not find krb5-config])
   ])
 
   if test -n "$KRB5_CONFIG"; then
diff --git a/kioslave/http/http.cc b/kioslave/http/http.cc
index 803bad7f5..f59de0db0 100644
--- a/kioslave/http/http.cc
+++ b/kioslave/http/http.cc
@@ -171,7 +171,7 @@ static TQString sanitizeCustomHTTPHeader(const TQString& _header)
     TQString header = (*it).lower();
     // Do not allow Request line to be specified and ignore
     // the other HTTP headers.
-    if (header.tqfind(':') == -1 ||
+    if (header.find(':') == -1 ||
         header.startsWith("host") ||
         header.startsWith("via"))
       continue;
@@ -320,7 +320,7 @@ void HTTPProtocol::resetSessionSettings()
         TQString protocol = referrerURL.protocol();
         if (protocol.startsWith("webdav"))
         {
-           protocol.tqreplace(0, 6, "http");
+           protocol.replace(0, 6, "http");
            referrerURL.setProtocol(protocol);
         }
 
@@ -431,7 +431,7 @@ void HTTPProtocol::setHost( const TQString& host, int port,
     m_davHostOk = m_davHostUnsupported = false;
 
   // is it an IPv6 address?
-  if (host.tqfind(':') == -1)
+  if (host.find(':') == -1)
     {
       m_request.hostname = host;
       m_request.encoded_hostname = KIDNA::toAscii(host);
@@ -439,7 +439,7 @@ void HTTPProtocol::setHost( const TQString& host, int port,
   else
     {
       m_request.hostname = host;
-      int pos = host.tqfind('%');
+      int pos = host.find('%');
       if (pos == -1)
 	m_request.encoded_hostname = '[' + host + ']';
       else
@@ -607,7 +607,7 @@ void HTTPProtocol::stat(const KURL& url)
 
   if ( m_protocol != "webdav" && m_protocol != "webdavs" )
   {
-    TQString statSide = metaData(TQString::tqfromLatin1("statSide"));
+    TQString statSide = metaData(TQString::fromLatin1("statSide"));
     if ( statSide != "source" )
     {
       // When uploading we assume the file doesn't exit
@@ -686,7 +686,7 @@ void HTTPProtocol::davStatList( const KURL& url, bool stat )
     // We are only after certain features...
     TQCString request;
     request = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>"
-    "<D:proptqfind xmlns:D=\"DAV:\">";
+    "<D:propfind xmlns:D=\"DAV:\">";
 
     // insert additional XML request from the davRequestResponse metadata
     if ( hasMetaData( "davRequestResponse" ) )
@@ -708,7 +708,7 @@ void HTTPProtocol::davStatList( const KURL& url, bool stat )
       "<D:resourcetype/>"
       "</D:prop>";
     }
-    request += "</D:proptqfind>";
+    request += "</D:propfind>";
 
     davSetRequest( request );
   }
@@ -828,8 +828,8 @@ void HTTPProtocol::davGeneric( const KURL& url, KIO::HTTP_METHOD method )
 
 int HTTPProtocol::codeFromResponse( const TQString& response )
 {
-  int firstSpace = response.tqfind( ' ' );
-  int secondSpace = response.tqfind( ' ', firstSpace + 1 );
+  int firstSpace = response.find( ' ' );
+  int secondSpace = response.find( ' ', firstSpace + 1 );
   return response.mid( firstSpace + 1, secondSpace - firstSpace - 1 ).toInt();
 }
 
@@ -1267,12 +1267,12 @@ void HTTPProtocol::put( const KURL &url, int, bool overwrite, bool)
 
     TQCString request;
     request = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>"
-    "<D:proptqfind xmlns:D=\"DAV:\"><D:prop>"
+    "<D:propfind xmlns:D=\"DAV:\"><D:prop>"
       "<D:creationdate/>"
       "<D:getcontentlength/>"
       "<D:displayname/>"
       "<D:resourcetype/>"
-      "</D:prop></D:proptqfind>";
+      "</D:prop></D:propfind>";
 
     davSetRequest( request );
 
@@ -1797,15 +1797,15 @@ void HTTPProtocol::httpError()
 
 bool HTTPProtocol::isOffline(const KURL &url)
 {
-  const int NetWorktqStatusUnknown = 1;
-  const int NetWorktqStatusOnline = 8;
+  const int NetWorkStatusUnknown = 1;
+  const int NetWorkStatusOnline = 8;
   TQCString replyType;
   TQByteArray params;
   TQByteArray reply;
 
   TQDataStream stream(params, IO_WriteOnly);
 
-  if ( url.host() == TQString::tqfromLatin1("localhost") || url.host() == TQString::tqfromLatin1("127.0.0.1") || url.host() == TQString::tqfromLatin1("::") ) {
+  if ( url.host() == TQString::fromLatin1("localhost") || url.host() == TQString::fromLatin1("127.0.0.1") || url.host() == TQString::fromLatin1("::") ) {
       return false;
   }
   if ( dcopClient()->call( "kded", "networkstatus", "status()",
@@ -1815,7 +1815,7 @@ bool HTTPProtocol::isOffline(const KURL &url)
      TQDataStream stream2( reply, IO_ReadOnly );
      stream2 >> result;
      kdDebug(7113) << "(" << m_pid << ") networkstatus status = " << result << endl;
-     return (result != NetWorktqStatusUnknown) && (result != NetWorktqStatusOnline);
+     return (result != NetWorkStatusUnknown) && (result != NetWorkStatusOnline);
   }
   kdDebug(7113) << "(" << m_pid << ") networkstatus <unreachable>" << endl;
   return false; // On error, assume we are online
@@ -1824,7 +1824,7 @@ bool HTTPProtocol::isOffline(const KURL &url)
 void HTTPProtocol::multiGet(const TQByteArray &data)
 {
   TQDataStream stream(data, IO_ReadOnly);
-  TQ_UINT32 n;
+  Q_UINT32 n;
   stream >> n;
 
   kdDebug(7113) << "(" << m_pid << ") HTTPProtcool::multiGet n = " << n << endl;
@@ -2485,7 +2485,7 @@ bool HTTPProtocol::httpOpen()
     {
       m_request.cookieMode = HTTPRequest::CookiesAuto;
       if (m_request.bUseCookiejar)
-        cookieStr = tqfindCookies( m_request.url.url());
+        cookieStr = findCookies( m_request.url.url());
     }
 
     if (!cookieStr.isEmpty())
@@ -2786,7 +2786,7 @@ try_again:
       // by assuming that they will be sending html.
       kdDebug(7113) << "(" << m_pid << ") HTTPPreadHeader: HEAD -> returned "
                     << "mimetype: " << DEFAULT_MIME_TYPE << endl;
-      mimeType(TQString::tqfromLatin1(DEFAULT_MIME_TYPE));
+      mimeType(TQString::fromLatin1(DEFAULT_MIME_TYPE));
       return true;
     }
 
@@ -2847,7 +2847,7 @@ try_again:
 
     // Store the the headers so they can be passed to the
     // calling application later
-    m_responseHeader << TQString::tqfromLatin1(buf);
+    m_responseHeader << TQString::fromLatin1(buf);
 
     if ((strncasecmp(buf, "HTTP/", 5) == 0) ||
         (strncasecmp(buf, "ICY ", 4) == 0)) // Shoutcast support
@@ -3030,7 +3030,7 @@ try_again:
     // Keep Alive
     else if (strncasecmp(buf, "Keep-Alive:", 11) == 0) {
       TQStringList options = TQStringList::split(',',
-                                     TQString::tqfromLatin1(trimLead(buf+11)));
+                                     TQString::fromLatin1(trimLead(buf+11)));
       for(TQStringList::ConstIterator it = options.begin();
           it != options.end();
           it++)
@@ -3046,7 +3046,7 @@ try_again:
     // Cache control
     else if (strncasecmp(buf, "Cache-Control:", 14) == 0) {
       TQStringList cacheControls = TQStringList::split(',',
-                                     TQString::tqfromLatin1(trimLead(buf+14)));
+                                     TQString::fromLatin1(trimLead(buf+14)));
       for(TQStringList::ConstIterator it = cacheControls.begin();
           it != cacheControls.end();
           it++)
@@ -3081,7 +3081,7 @@ try_again:
 
     else if (strncasecmp(buf, "Content-location:", 17) == 0) {
       setMetaData ("content-location",
-                   TQString::tqfromLatin1(trimLead(buf+17)).stripWhiteSpace());
+                   TQString::fromLatin1(trimLead(buf+17)).stripWhiteSpace());
     }
 
     // what type of data do we have?
@@ -3093,7 +3093,7 @@ try_again:
       while ( *pos && *pos != ';' )  pos++;
 
       // Assign the mime-type.
-      m_strMimeType = TQString::tqfromLatin1(start, pos-start).stripWhiteSpace().lower();
+      m_strMimeType = TQString::fromLatin1(start, pos-start).stripWhiteSpace().lower();
       kdDebug(7113) << "(" << m_pid << ") Content-type: " << m_strMimeType << endl;
 
       // If we still have text, then it means we have a mime-type with a
@@ -3108,8 +3108,8 @@ try_again:
 
         if (*pos)
         {
-          mediaAttribute = TQString::tqfromLatin1(start, pos-start).stripWhiteSpace().lower();
-          mediaValue = TQString::tqfromLatin1(pos+1, end-pos-1).stripWhiteSpace();
+          mediaAttribute = TQString::fromLatin1(start, pos-start).stripWhiteSpace().lower();
+          mediaValue = TQString::fromLatin1(pos+1, end-pos-1).stripWhiteSpace();
 	  pos = end;
           if (mediaValue.length() &&
               (mediaValue[0] == '"') &&
@@ -3153,7 +3153,7 @@ try_again:
 
     // Cache management
     else if (strncasecmp(buf, "Last-Modified:", 14) == 0) {
-      m_request.lastModified = (TQString::tqfromLatin1(trimLead(buf+14))).stripWhiteSpace();
+      m_request.lastModified = (TQString::fromLatin1(trimLead(buf+14))).stripWhiteSpace();
     }
 
     // whoops.. we received a warning
@@ -3177,7 +3177,7 @@ try_again:
     // The deprecated Refresh Response
     else if (strncasecmp(buf,"Refresh:", 8) == 0) {
       mayCache = false;  // Do not cache page as it defeats purpose of Refresh tag!
-      setMetaData( "http-refresh", TQString::tqfromLatin1(trimLead(buf+8)).stripWhiteSpace() );
+      setMetaData( "http-refresh", TQString::fromLatin1(trimLead(buf+8)).stripWhiteSpace() );
     }
 
     // In fact we should do redirection only if we got redirection code
@@ -3254,7 +3254,7 @@ try_again:
               dispositionBuf--;
 
             if ( dispositionBuf > bufStart )
-              dispositionFilename = TQString::tqfromLatin1( bufStart, dispositionBuf-bufStart );
+              dispositionFilename = TQString::fromLatin1( bufStart, dispositionBuf-bufStart );
 
             break;
           }
@@ -3267,7 +3267,7 @@ try_again:
             dispositionBuf++;
 
           if ( dispositionBuf > bufStart )
-            dispositionType = TQString::tqfromLatin1( bufStart, dispositionBuf-bufStart ).stripWhiteSpace();
+            dispositionType = TQString::fromLatin1( bufStart, dispositionBuf-bufStart ).stripWhiteSpace();
 
           while ( *dispositionBuf == ';' || *dispositionBuf == ' ' )
             dispositionBuf++;
@@ -3278,7 +3278,7 @@ try_again:
       // path, thus we extract the filename only.
       if ( !dispositionFilename.isEmpty() )
       {
-        int pos = dispositionFilename.tqfindRev( '/' );
+        int pos = dispositionFilename.findRev( '/' );
 
         if( pos > -1 )
           dispositionFilename = dispositionFilename.mid(pos+1);
@@ -3288,7 +3288,7 @@ try_again:
       }
     }
     else if(strncasecmp(buf, "Content-Language:", 17) == 0) {
-      TQString language = TQString::tqfromLatin1(trimLead(buf+17)).stripWhiteSpace();
+      TQString language = TQString::fromLatin1(trimLead(buf+17)).stripWhiteSpace();
       if (!language.isEmpty())
         setMetaData("content-language", language);
     }
@@ -3302,14 +3302,14 @@ try_again:
     else if (strncasecmp(buf, "Link:", 5) == 0) {
       // We only support Link: <url>; rel="type"   so far
       TQStringList link = TQStringList::split(";", TQString(buf)
-                                                 .tqreplace(TQRegExp("^Link:[ ]*"),
+                                                 .replace(TQRegExp("^Link:[ ]*"),
                                                           ""));
       if (link.count() == 2) {
         TQString rel = link[1].stripWhiteSpace();
         if (rel.startsWith("rel=\"")) {
           rel = rel.mid(5, rel.length() - 6);
           if (rel.lower() == "pageservices") {
-            TQString url = link[0].tqreplace(TQRegExp("[<>]"),"").stripWhiteSpace();
+            TQString url = link[0].replace(TQRegExp("[<>]"),"").stripWhiteSpace();
             setMetaData("PageServices", url);
           }
         }
@@ -3327,14 +3327,14 @@ try_again:
 
          if (policy.count() == 2) {
             if (policy[0].lower() == "policyref") {
-               policyrefs << policy[1].tqreplace(TQRegExp("[\"\']"), "")
+               policyrefs << policy[1].replace(TQRegExp("[\"\']"), "")
                                       .stripWhiteSpace();
             } else if (policy[0].lower() == "cp") {
                // We convert to cp\ncp\ncp\n[...]\ncp to be consistent with
                // other metadata sent in strings.  This could be a bit more
                // efficient but I'm going for correctness right now.
                TQStringList cps = TQStringList::split(" ",
-                                        policy[1].tqreplace(TQRegExp("[\"\']"), "")
+                                        policy[1].replace(TQRegExp("[\"\']"), "")
                                                  .simplifyWhiteSpace());
 
                for (TQStringList::Iterator j = cps.begin(); j != cps.end(); ++j)
@@ -3381,17 +3381,17 @@ try_again:
 
       // md5 signature
       else if (strncasecmp(buf, "Content-MD5:", 12) == 0) {
-        m_sContentMD5 = TQString::tqfromLatin1(trimLead(buf + 12));
+        m_sContentMD5 = TQString::fromLatin1(trimLead(buf + 12));
       }
 
       // *** Responses to the HTTP OPTIONS method follow
       // WebDAV capabilities
       else if (strncasecmp(buf, "DAV:", 4) == 0) {
         if (m_davCapabilities.isEmpty()) {
-          m_davCapabilities << TQString::tqfromLatin1(trimLead(buf + 4));
+          m_davCapabilities << TQString::fromLatin1(trimLead(buf + 4));
         }
         else {
-          m_davCapabilities << TQString::tqfromLatin1(trimLead(buf + 4));
+          m_davCapabilities << TQString::fromLatin1(trimLead(buf + 4));
         }
       }
       // *** Responses to the HTTP OPTIONS method finished
@@ -3667,14 +3667,14 @@ try_again:
      if (m_strMimeType == "application/x-tar")
      {
         m_qContentEncodings.remove(m_qContentEncodings.fromLast());
-        m_strMimeType = TQString::tqfromLatin1("application/x-tgz");
+        m_strMimeType = TQString::fromLatin1("application/x-tgz");
      }
      else if (m_strMimeType == "application/postscript")
      {
         // LEONB: Adding another exception for psgz files.
         // Could we use the mimelnk files instead of hardcoding all this?
         m_qContentEncodings.remove(m_qContentEncodings.fromLast());
-        m_strMimeType = TQString::tqfromLatin1("application/x-gzpostscript");
+        m_strMimeType = TQString::fromLatin1("application/x-gzpostscript");
      }
      else if ( m_request.allowCompressedPage &&
                m_strMimeType != "application/x-tgz" &&
@@ -3683,7 +3683,7 @@ try_again:
                m_request.url.path().right(6) == ".ps.gz" )
      {
         m_qContentEncodings.remove(m_qContentEncodings.fromLast());
-        m_strMimeType = TQString::tqfromLatin1("application/x-gzpostscript");
+        m_strMimeType = TQString::fromLatin1("application/x-gzpostscript");
      }
      else if ( (m_request.allowCompressedPage &&
                 m_strMimeType == "text/html")
@@ -3700,7 +3700,7 @@ try_again:
      else
      {
         m_qContentEncodings.remove(m_qContentEncodings.fromLast());
-        m_strMimeType = TQString::tqfromLatin1("application/x-gzip");
+        m_strMimeType = TQString::fromLatin1("application/x-gzip");
      }
   }
 
@@ -3713,34 +3713,34 @@ try_again:
   if (m_qContentEncodings.last() == "bzip2")
   {
      m_qContentEncodings.remove(m_qContentEncodings.fromLast());
-     m_strMimeType = TQString::tqfromLatin1("application/x-bzip2");
+     m_strMimeType = TQString::fromLatin1("application/x-bzip2");
   }
 
   // Convert some common mimetypes to standard KDE mimetypes
   if (m_strMimeType == "application/x-targz")
-     m_strMimeType = TQString::tqfromLatin1("application/x-tgz");
+     m_strMimeType = TQString::fromLatin1("application/x-tgz");
   else if (m_strMimeType == "application/zip")
-     m_strMimeType = TQString::tqfromLatin1("application/x-zip");
+     m_strMimeType = TQString::fromLatin1("application/x-zip");
   else if (m_strMimeType == "image/x-png")
-     m_strMimeType = TQString::tqfromLatin1("image/png");
+     m_strMimeType = TQString::fromLatin1("image/png");
   else if (m_strMimeType == "image/bmp")
-     m_strMimeType = TQString::tqfromLatin1("image/x-bmp");
+     m_strMimeType = TQString::fromLatin1("image/x-bmp");
   else if (m_strMimeType == "audio/mpeg" || m_strMimeType == "audio/x-mpeg" || m_strMimeType == "audio/mp3")
-     m_strMimeType = TQString::tqfromLatin1("audio/x-mp3");
+     m_strMimeType = TQString::fromLatin1("audio/x-mp3");
   else if (m_strMimeType == "audio/microsoft-wave")
-     m_strMimeType = TQString::tqfromLatin1("audio/x-wav");
+     m_strMimeType = TQString::fromLatin1("audio/x-wav");
   else if (m_strMimeType == "audio/midi")
-     m_strMimeType = TQString::tqfromLatin1("audio/x-midi");
+     m_strMimeType = TQString::fromLatin1("audio/x-midi");
   else if (m_strMimeType == "image/x-xpixmap")
-     m_strMimeType = TQString::tqfromLatin1("image/x-xpm");
+     m_strMimeType = TQString::fromLatin1("image/x-xpm");
   else if (m_strMimeType == "application/rtf")
-     m_strMimeType = TQString::tqfromLatin1("text/rtf");
+     m_strMimeType = TQString::fromLatin1("text/rtf");
 
   // Crypto ones....
   else if (m_strMimeType == "application/pkix-cert" ||
            m_strMimeType == "application/binary-certificate")
   {
-     m_strMimeType = TQString::tqfromLatin1("application/x-x509-ca-cert");
+     m_strMimeType = TQString::fromLatin1("application/x-x509-ca-cert");
   }
 
   // Prefer application/x-tgz or x-gzpostscript over application/x-gzip.
@@ -3748,9 +3748,9 @@ try_again:
   {
      if ((m_request.url.path().right(7) == ".tar.gz") ||
          (m_request.url.path().right(4) == ".tar"))
-        m_strMimeType = TQString::tqfromLatin1("application/x-tgz");
+        m_strMimeType = TQString::fromLatin1("application/x-tgz");
      if ((m_request.url.path().right(6) == ".ps.gz"))
-        m_strMimeType = TQString::tqfromLatin1("application/x-gzpostscript");
+        m_strMimeType = TQString::fromLatin1("application/x-gzpostscript");
   }
 
   // Some webservers say "text/plain" when they mean "application/x-bzip2"
@@ -3758,15 +3758,15 @@ try_again:
   {
      TQString ext = m_request.url.path().right(4).upper();
      if (ext == ".BZ2")
-        m_strMimeType = TQString::tqfromLatin1("application/x-bzip2");
+        m_strMimeType = TQString::fromLatin1("application/x-bzip2");
      else if (ext == ".PEM")
-        m_strMimeType = TQString::tqfromLatin1("application/x-x509-ca-cert");
+        m_strMimeType = TQString::fromLatin1("application/x-x509-ca-cert");
      else if (ext == ".SWF")
-        m_strMimeType = TQString::tqfromLatin1("application/x-shockwave-flash");
+        m_strMimeType = TQString::fromLatin1("application/x-shockwave-flash");
      else if (ext == ".PLS")
-        m_strMimeType = TQString::tqfromLatin1("audio/x-scpls");
+        m_strMimeType = TQString::fromLatin1("audio/x-scpls");
      else if (ext == ".WMV")
-        m_strMimeType = TQString::tqfromLatin1("video/x-ms-wmv");
+        m_strMimeType = TQString::fromLatin1("video/x-ms-wmv");
   }
 
 #if 0
@@ -3871,11 +3871,11 @@ void HTTPProtocol::addEncoding(TQString encoding, TQStringList &encs)
     //if ( m_cmd != CMD_COPY )
       m_iSize = NO_SIZE;
   } else if ((encoding == "x-gzip") || (encoding == "gzip")) {
-    encs.append(TQString::tqfromLatin1("gzip"));
+    encs.append(TQString::fromLatin1("gzip"));
   } else if ((encoding == "x-bzip2") || (encoding == "bzip2")) {
-    encs.append(TQString::tqfromLatin1("bzip2")); // Not yet supported!
+    encs.append(TQString::fromLatin1("bzip2")); // Not yet supported!
   } else if ((encoding == "x-deflate") || (encoding == "deflate")) {
-    encs.append(TQString::tqfromLatin1("deflate"));
+    encs.append(TQString::fromLatin1("deflate"));
   } else {
     kdDebug(7113) << "(" << m_pid << ") Unknown encoding encountered.  "
                     << "Please write code. Encoding = \"" << encoding
@@ -4018,7 +4018,7 @@ void HTTPProtocol::slave_status()
   if ( m_iSock != -1 && !isConnectionValid() )
      httpCloseConnection();
 
-  slavetqStatus( m_state.hostname, (m_iSock != -1) );
+  slaveStatus( m_state.hostname, (m_iSock != -1) );
 }
 
 void HTTPProtocol::mimetype( const KURL& url )
@@ -4259,7 +4259,7 @@ void HTTPProtocol::slotData(const TQByteArray &_d)
                       << endl;
 
         KMimeMagicResult *result;
-        result = KMimeMagic::self()->tqfindBufferFileType( m_mimeTypeBuffer,
+        result = KMimeMagic::self()->findBufferFileType( m_mimeTypeBuffer,
                                                          m_request.url.fileName() );
         if( result )
         {
@@ -4270,7 +4270,7 @@ void HTTPProtocol::slotData(const TQByteArray &_d)
 
         if ( m_strMimeType.isEmpty() )
         {
-          m_strMimeType = TQString::tqfromLatin1( DEFAULT_MIME_TYPE );
+          m_strMimeType = TQString::fromLatin1( DEFAULT_MIME_TYPE );
           kdDebug(7113) << "(" << m_pid << ") Using default mimetype: "
                         <<  m_strMimeType << endl;
         }
@@ -4344,7 +4344,7 @@ bool HTTPProtocol::readBody( bool dataInternal /* = false */ )
   // Update the application with total size except when
   // it is compressed, or when the data is to be handled
   // internally (webDAV).  If compressed we have to wait
-  // until we uncompress to tqfind out the actual data size
+  // until we uncompress to find out the actual data size
   if ( !dataInternal ) {
     if ( (m_iSize > 0) && (m_iSize != NO_SIZE)) {
        totalSize(m_iSize);
@@ -4609,7 +4609,7 @@ void HTTPProtocol::addCookies( const TQString &url, const TQCString &cookieHeade
    }
 }
 
-TQString HTTPProtocol::tqfindCookies( const TQString &url)
+TQString HTTPProtocol::findCookies( const TQString &url)
 {
   TQCString replyType;
   TQByteArray params;
@@ -4621,7 +4621,7 @@ TQString HTTPProtocol::tqfindCookies( const TQString &url)
   TQDataStream stream(params, IO_WriteOnly);
   stream << url << windowId;
 
-  if ( !dcopClient()->call( "kded", "kcookiejar", "tqfindCookies(TQString,long int)",
+  if ( !dcopClient()->call( "kded", "kcookiejar", "findCookies(TQString,long int)",
                             params, replyType, reply ) )
   {
      kdWarning(7113) << "(" << m_pid << ") Can't communicate with kded_kcookiejar!" << endl;
@@ -4634,7 +4634,7 @@ TQString HTTPProtocol::tqfindCookies( const TQString &url)
   }
   else
   {
-     kdError(7113) << "(" << m_pid << ") DCOP function tqfindCookies(...) returns "
+     kdError(7113) << "(" << m_pid << ") DCOP function findCookies(...) returns "
                           << replyType << ", expected TQString" << endl;
   }
   return result;
@@ -4680,12 +4680,12 @@ FILE* HTTPProtocol::checkCacheEntry( bool readWrite)
 
    TQString CEF = m_request.path;
 
-   int p = CEF.tqfind('/');
+   int p = CEF.find('/');
 
    while(p != -1)
    {
       CEF[p] = separator;
-      p = CEF.tqfind('/', p);
+      p = CEF.find('/', p);
    }
 
    TQString host = m_request.hostname.lower();
@@ -4739,7 +4739,7 @@ FILE* HTTPProtocol::checkCacheEntry( bool readWrite)
       ok = false;
 
    time_t date;
-   time_t tqcurrentDate = time(0);
+   time_t currentDate = time(0);
 
    // URL
    if (ok && (!fgets(buffer, 400, fs)))
@@ -4762,10 +4762,10 @@ FILE* HTTPProtocol::checkCacheEntry( bool readWrite)
    {
       date = (time_t) strtoul(buffer, 0, 10);
       m_request.creationDate = date;
-      if (m_maxCacheAge && (difftime(tqcurrentDate, date) > m_maxCacheAge))
+      if (m_maxCacheAge && (difftime(currentDate, date) > m_maxCacheAge))
       {
          m_request.bMustRevalidate = true;
-         m_request.expireDate = tqcurrentDate;
+         m_request.expireDate = currentDate;
       }
    }
 
@@ -4779,14 +4779,14 @@ FILE* HTTPProtocol::checkCacheEntry( bool readWrite)
       {
          date = (time_t) strtoul(buffer, 0, 10);
          // After the expire date we need to revalidate.
-         if (!date || difftime(tqcurrentDate, date) >= 0)
+         if (!date || difftime(currentDate, date) >= 0)
             m_request.bMustRevalidate = true;
          m_request.expireDate = date;
       }
       else if (m_request.cache == CC_Refresh)
       {
          m_request.bMustRevalidate = true;
-         m_request.expireDate = tqcurrentDate;
+         m_request.expireDate = currentDate;
       }
    }
 
@@ -4875,7 +4875,7 @@ void HTTPProtocol::updateExpireDate(time_t expireDate, bool updateCreationDate)
 void HTTPProtocol::createCacheEntry( const TQString &mimetype, time_t expireDate)
 {
    TQString dir = m_request.cef;
-   int p = dir.tqfindRev('/');
+   int p = dir.findRev('/');
    if (p == -1) return; // Error.
    dir.truncate(p);
 
@@ -5114,7 +5114,7 @@ void HTTPProtocol::configAuth( char *p, bool isForProxy )
     {
       //for sites like lib.homelinux.org
       TQTextCodec* oldCodec=TQTextCodec::codecForCStrings();
-      if (KGlobal::locale()->language().tqcontains("ru"))
+      if (KGlobal::locale()->language().contains("ru"))
         TQTextCodec::setCodecForCStrings(TQTextCodec::codecForName("CP1251"));
 
       p += 6;
@@ -5135,12 +5135,12 @@ void HTTPProtocol::configAuth( char *p, bool isForProxy )
   if( isForProxy )
   {
     ProxyAuthentication = f;
-    m_strProxyAuthorization = TQString::tqfromLatin1( strAuth );
+    m_strProxyAuthorization = TQString::fromLatin1( strAuth );
   }
   else
   {
     Authentication = f;
-    m_strAuthorization = TQString::tqfromLatin1( strAuth );
+    m_strAuthorization = TQString::fromLatin1( strAuth );
   }
 }
 
@@ -5233,13 +5233,13 @@ bool HTTPProtocol::getAuthorization()
     {
       bool isStaleNonce = false;
       TQString auth = ( m_responseCode == 401 ) ? m_strAuthorization : m_strProxyAuthorization;
-      int pos = auth.tqfind("stale", 0, false);
+      int pos = auth.find("stale", 0, false);
       if ( pos != -1 )
       {
         pos += 5;
         int len = auth.length();
         while( pos < len && (auth[pos] == ' ' || auth[pos] == '=') ) pos++;
-        if ( pos < len && auth.tqfind("true", pos, false) != -1 )
+        if ( pos < len && auth.find("true", pos, false) != -1 )
         {
           isStaleNonce = true;
           kdDebug(7113) << "(" << m_pid << ") Stale nonce value. "
@@ -5311,7 +5311,7 @@ bool HTTPProtocol::getAuthorization()
   }
   else
   {
-    // At this point we know more details, so use it to tqfind
+    // At this point we know more details, so use it to find
     // out if we have a cached version and avoid a re-prompt!
     // We also do not use verify path unlike the pre-emptive
     // requests because we already know the realm value...
@@ -5358,13 +5358,13 @@ bool HTTPProtocol::getAuthorization()
       else
         auth = m_strProxyAuthorization;
 
-      int pos = auth.tqfind("stale", 0, false);
+      int pos = auth.find("stale", 0, false);
       if ( pos != -1 )
       {
         pos += 5;
         int len = auth.length();
         while( pos < len && (auth[pos] == ' ' || auth[pos] == '=') ) pos++;
-        if ( pos < len && auth.tqfind("true", pos, false) != -1 )
+        if ( pos < len && auth.find("true", pos, false) != -1 )
         {
           info.digestInfo = (m_responseCode == 401) ? m_strAuthorization : m_strProxyAuthorization;
           kdDebug(7113) << "(" << m_pid << ") Just a stale nonce value! "
@@ -5612,7 +5612,7 @@ TQString HTTPProtocol::createNTLMAuth( bool isForProxy )
     strauth = m_strAuthorization.latin1();
     len = m_strAuthorization.length();
   }
-  if ( user.tqcontains('\\') ) {
+  if ( user.contains('\\') ) {
     domain = user.section( '\\', 0, 0);
     user = user.section( '\\', 1 );
   }
@@ -5880,7 +5880,7 @@ TQString HTTPProtocol::createDigestAuth ( bool isForProxy )
       TQCString uri = TQCString(p,i+1);
       do
       {
-        pos = uri.tqfind( ' ', idx );
+        pos = uri.find( ' ', idx );
         if ( pos != -1 )
         {
           KURL u (m_request.url, uri.mid(idx, pos-idx));
@@ -6032,7 +6032,7 @@ TQString HTTPProtocol::proxyAuthenticationHeader()
     info.password = m_proxyURL.pass();
     info.verifyPath = true;
 
-    // If the proxy URL already tqcontains username
+    // If the proxy URL already contains username
     // and password simply attempt to retrieve it
     // without prompting the user...
     if ( !info.username.isNull() && !info.password.isNull() )
diff --git a/kioslave/http/http.h b/kioslave/http/http.h
index 2ce6de664..2985eb938 100644
--- a/kioslave/http/http.h
+++ b/kioslave/http/http.h
@@ -335,7 +335,7 @@ protected:
   /**
    * Look for cookies in the cookiejar
    */
-  TQString tqfindCookies( const TQString &url);
+  TQString findCookies( const TQString &url);
 
   /**
    * Do a cache lookup for the current url. (m_state.url)
@@ -403,7 +403,7 @@ protected:
 
   /**
    * Resets any per connection settings.  These are different from
-   * per-session settings in that they must be tqinvalidates every time
+   * per-session settings in that they must be invalidates every time
    * a request is made, e.g. a retry to re-send the header to the
    * server, as compared to only when a new request arrives.
    */
diff --git a/kioslave/http/http_cache_cleaner.cpp b/kioslave/http/http_cache_cleaner.cpp
index 80fc2c69a..74b0b8102 100644
--- a/kioslave/http/http_cache_cleaner.cpp
+++ b/kioslave/http/http_cache_cleaner.cpp
@@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <kdebug.h>
 
-time_t tqcurrentDate;
+time_t currentDate;
 int m_maxCacheAge;
 int m_maxCacheSize;
 
@@ -109,7 +109,7 @@ FileInfo *readEntry( const TQString &filename)
    if (ok)
    {
       creationDate = (time_t) strtoul(buffer, 0, 10);
-      age = (int) difftime(tqcurrentDate, creationDate);
+      age = (int) difftime(currentDate, creationDate);
       if ( m_maxCacheAge && ( age > m_maxCacheAge))
       {
          ok = false; // Expired
@@ -125,7 +125,7 @@ FileInfo *readEntry( const TQString &filename)
 #if 0
       time_t expireDate;
       expireDate = (time_t) strtoul(buffer, 0, 10);
-      if (expireDate && (expireDate < tqcurrentDate))
+      if (expireDate && (expireDate < currentDate))
          ok = false; // Expired
 #endif
    }
@@ -213,7 +213,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
       }
    }
 
-   tqcurrentDate = time(0);
+   currentDate = time(0);
    m_maxCacheAge = KProtocolManager::maxCacheAge();
    m_maxCacheSize = KProtocolManager::maxCacheSize();
 
diff --git a/kioslave/http/kcookiejar/kcookiejar.cpp b/kioslave/http/kcookiejar/kcookiejar.cpp
index 555f8e897..909f92dcb 100644
--- a/kioslave/http/kcookiejar/kcookiejar.cpp
+++ b/kioslave/http/kcookiejar/kcookiejar.cpp
@@ -84,12 +84,12 @@
 #define READ_BUFFER_SIZE 8192
 #define IP_ADDRESS_EXPRESSION "(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"
 
-// Note with respect to TQString::tqfromLatin1( )
+// Note with respect to TQString::fromLatin1( )
 // Cookies are stored as 8 bit data and passed to kio_http as
 // latin1 regardless of their actual encoding.
 
 // L1 is used to indicate latin1 constants
-#define L1(x) TQString::tqfromLatin1(x)
+#define L1(x) TQString::fromLatin1(x)
 
 template class TQPtrList<KHttpCookie>;
 template class TQPtrDict<KHttpCookieList>;
@@ -154,9 +154,9 @@ KHttpCookie::KHttpCookie(const TQString &_host,
 //
 // Checks if a cookie has been expired
 //
-bool    KHttpCookie::isExpired(time_t tqcurrentDate)
+bool    KHttpCookie::isExpired(time_t currentDate)
 {
-    return (mExpireDate != 0) && (mExpireDate < tqcurrentDate);
+    return (mExpireDate != 0) && (mExpireDate < currentDate);
 }
 
 //
@@ -194,14 +194,14 @@ bool KHttpCookie::match(const TQString &fqdn, const TQStringList &domains,
        if (fqdn != mHost)
           return false;
     }
-    else if (!domains.tqcontains(mDomain))
+    else if (!domains.contains(mDomain))
     {
         if (mDomain[0] == '.')
             return false;
 
         // Maybe the domain needs an extra dot.
         TQString domain = '.' + mDomain;
-        if ( !domains.tqcontains( domain ) )
+        if ( !domains.contains( domain ) )
           if ( fqdn != mDomain )
             return false;
     }
@@ -261,7 +261,7 @@ KCookieJar::KCookieJar()
     for(TQStringList::ConstIterator it = countries.begin();
         it != countries.end(); ++it)
     {
-       m_twoLevelTLD.tqreplace(*it, (int *) 1);
+       m_twoLevelTLD.replace(*it, (int *) 1);
     }
 }
 
@@ -301,7 +301,7 @@ static void removeDuplicateFromList(KHttpCookieList *list, KHttpCookie *cookiePt
                 it != cookie->windowIds().end(); ++it)
             {
                long windowId = *it;
-               if (windowId && (cookiePtr->windowIds().tqfind(windowId) == cookiePtr->windowIds().end()))
+               if (windowId && (cookiePtr->windowIds().find(windowId) == cookiePtr->windowIds().end()))
                {
                   cookiePtr->windowIds().append(windowId);
                }
@@ -325,7 +325,7 @@ static void removeDuplicateFromList(KHttpCookieList *list, KHttpCookie *cookiePt
 // Returned is a string containing all appropriate cookies in a format
 // which can be added to a HTTP-header without any additional processing.
 //
-TQString KCookieJar::tqfindCookies(const TQString &_url, bool useDOMFormat, long windowId, KHttpCookieList *pendingCookies)
+TQString KCookieJar::findCookies(const TQString &_url, bool useDOMFormat, long windowId, KHttpCookieList *pendingCookies)
 {
     TQString cookieStr;
     TQStringList domains;
@@ -337,10 +337,10 @@ TQString KCookieJar::tqfindCookies(const TQString &_url, bool useDOMFormat, long
     if (!parseURL(_url, fqdn, path))
         return cookieStr;
 
-    bool secureRequest = (_url.tqfind( L1("https://"), 0, false) == 0 ||
-                          _url.tqfind( L1("webdavs://"), 0, false) == 0);
+    bool secureRequest = (_url.find( L1("https://"), 0, false) == 0 ||
+                          _url.find( L1("webdavs://"), 0, false) == 0);
 
-    // kdDebug(7104) << "tqfindCookies: URL= " << _url << ", secure = " << secureRequest << endl;
+    // kdDebug(7104) << "findCookies: URL= " << _url << ", secure = " << secureRequest << endl;
 
     extractDomains(fqdn, domains);
 
@@ -399,7 +399,7 @@ TQString KCookieJar::tqfindCookies(const TQString &_url, bool useDOMFormat, long
              continue;
           }
 
-          if (windowId && (cookie->windowIds().tqfind(windowId) == cookie->windowIds().end()))
+          if (windowId && (cookie->windowIds().find(windowId) == cookie->windowIds().end()))
           {
              cookie->windowIds().append(windowId);
           }
@@ -479,7 +479,7 @@ static const char * parseNameValue(const char *header,
             // No '=' sign -> use string as the value, name is empty
             // (behavior found in Mozilla and IE)
             Name = "";
-            Value = TQString::tqfromLatin1(header);
+            Value = TQString::fromLatin1(header);
             Value.truncate( s - header );
             Value = Value.stripWhiteSpace();
             return (s);
@@ -516,12 +516,12 @@ static const char * parseNameValue(const char *header,
             if ((*s=='\0') || (*s=='\n'))
             {
                 // End of Name
-                Value = TQString::tqfromLatin1(header);
+                Value = TQString::fromLatin1(header);
                 Value.truncate(s - header);
                 return (s);
             }
         }
-        Value = TQString::tqfromLatin1(header);
+        Value = TQString::fromLatin1(header);
         // *s == '\"';
         if (keepQuotes)
            Value.truncate( ++s - header );
@@ -542,7 +542,7 @@ static const char * parseNameValue(const char *header,
         while ((*s != '\0') && (*s != ';') && (*s != '\n'))
             s++;
         // End of Name
-        Value = TQString::tqfromLatin1(header);
+        Value = TQString::fromLatin1(header);
         Value.truncate( s - header );
         Value = Value.stripWhiteSpace();
     }
@@ -591,7 +591,7 @@ bool KCookieJar::parseURL(const TQString &_url,
     // Cookie spoofing protection.  Since there is no way a path separator
     // or escape encoded character is allowed in the hostname according
     // to RFC 2396, reject attempts to include such things there!
-    if(_fqdn.tqfind('/') > -1 || _fqdn.tqfind('%') > -1)
+    if(_fqdn.find('/') > -1 || _fqdn.find('%') > -1)
     {
         return false;  // deny everything!!
     }
@@ -620,7 +620,7 @@ void KCookieJar::extractDomains(const TQString &_fqdn,
     // Return numeric IPv4 addresses as is...
     if ((_fqdn[0] >= '0') && (_fqdn[0] <= '9'))
     {
-       if (_fqdn.tqfind(TQRegExp(IP_ADDRESS_EXPRESSION)) > -1)
+       if (_fqdn.find(TQRegExp(IP_ADDRESS_EXPRESSION)) > -1)
        {
           _domains.append( _fqdn );
           return;
@@ -683,7 +683,7 @@ void KCookieJar::extractDomains(const TQString &_fqdn,
 */
 static TQString fixupDateTime(const TQString& dt)
 {
-  const int index = dt.tqfind(TQRegExp("[0-9]{1,2}:[0-9]{1,2}:[0-9]{1,2}"));
+  const int index = dt.find(TQRegExp("[0-9]{1,2}:[0-9]{1,2}:[0-9]{1,2}"));
 
   if (index > -1)
   {
@@ -694,7 +694,7 @@ static TQString fixupDateTime(const TQString& dt)
       dateStrList[0] = dateStrList[1];
       dateStrList[1] = date;
       date = dt;
-      return date.tqreplace(index, date.length(), dateStrList.join(" "));
+      return date.replace(index, date.length(), dateStrList.join(" "));
     }
   }
 
@@ -729,7 +729,7 @@ KHttpCookieList KCookieJar::makeCookies(const TQString &_url,
         return KHttpCookieList();
     }
     TQString defaultPath;
-    int i = path.tqfindRev('/');
+    int i = path.findRev('/');
     if (i > 0)
        defaultPath = path.left(i);
 
@@ -811,7 +811,7 @@ KHttpCookieList KCookieJar::makeCookies(const TQString &_url,
                 if(dom.length() > 2 && dom[dom.length()-1] == '.')
                     dom = dom.left(dom.length()-1);
 
-                if(dom.tqcontains('.') > 1 || dom == ".local")
+                if(dom.contains('.') > 1 || dom == ".local")
                     lastCookie->mDomain = dom;
             }
             else if (cName == "max-age")
@@ -1020,7 +1020,7 @@ KCookieAdvice KCookieJar::cookieAdvice(KHttpCookiePtr cookiePtr)
     // cross-site cookie injection.
     if (!cookiePtr->domain().isEmpty())
     {
-      if (!domains.tqcontains(cookiePtr->domain()) && 
+      if (!domains.contains(cookiePtr->domain()) && 
           !cookiePtr->domain().endsWith("."+cookiePtr->host()))
           cookiePtr->fixDomain(TQString::null);
     }
@@ -1457,11 +1457,11 @@ bool KCookieJar::loadCookies(const TQString &_filename)
             if ((expDate == 0) || (expDate < curTime))
                 continue;
 
-            KHttpCookie *cookie = new KHttpCookie(TQString::tqfromLatin1(host),
-                                                  TQString::tqfromLatin1(domain), 
-                                                  TQString::tqfromLatin1(path), 
-                                                  TQString::tqfromLatin1(name),
-                                                  TQString::tqfromLatin1(value), 
+            KHttpCookie *cookie = new KHttpCookie(TQString::fromLatin1(host),
+                                                  TQString::fromLatin1(domain), 
+                                                  TQString::fromLatin1(path), 
+                                                  TQString::fromLatin1(name),
+                                                  TQString::fromLatin1(value), 
                                                   expDate, protVer,
                                                   secure, httpOnly, explicitPath);
             addCookie(cookie);
@@ -1546,7 +1546,7 @@ void KCookieJar::loadConfig(KConfig *_config, bool reparse )
     {
         const TQString &value = *it++;
 
-        int sepPos = value.tqfindRev(':');
+        int sepPos = value.findRev(':');
 
         if (sepPos <= 0)
           continue;
diff --git a/kioslave/http/kcookiejar/kcookiejar.h b/kioslave/http/kcookiejar/kcookiejar.h
index 32bd5e8c1..eb64485ea 100644
--- a/kioslave/http/kcookiejar/kcookiejar.h
+++ b/kioslave/http/kcookiejar/kcookiejar.h
@@ -89,7 +89,7 @@ public:
     time_t  expireDate(void) { return mExpireDate; }
     int     protocolVersion(void) { return mProtocolVersion; }
     bool    isSecure(void) { return mSecure; }
-    bool    isExpired(time_t tqcurrentDate);
+    bool    isExpired(time_t currentDate);
     bool    isCrossDomain(void) { return mCrossDomain; }
     bool    isHttpOnly(void) { return mHttpOnly; }
     bool    hasExplicitPath(void) { return mExplicitPath; }
@@ -160,11 +160,11 @@ public:
      *
      * If @p useDOMFormat is true, the string is formatted in a format
      * in compliance with the DOM standard.
-     * @p pendingCookies tqcontains a list of cookies that have not been
+     * @p pendingCookies contains a list of cookies that have not been
      * approved yet by the user but that will be included in the result
      * none the less.
      */
-    TQString tqfindCookies(const TQString &_url, bool useDOMFormat, long windowId, KHttpCookieList *pendingCookies=0);
+    TQString findCookies(const TQString &_url, bool useDOMFormat, long windowId, KHttpCookieList *pendingCookies=0);
 
     /**
      * This function parses cookie_headers and returns a linked list of
diff --git a/kioslave/http/kcookiejar/kcookieserver.cpp b/kioslave/http/kcookiejar/kcookieserver.cpp
index 884f08877..e6469f127 100644
--- a/kioslave/http/kcookiejar/kcookieserver.cpp
+++ b/kioslave/http/kcookiejar/kcookieserver.cpp
@@ -277,7 +277,7 @@ void KCookieServer::checkCookies( KHttpCookieList *cookieList)
         {
            TQCString replyType;
            TQByteArray replyData;
-           TQString res = mCookieJar->tqfindCookies( request->url, request->DOM, request->windowId );
+           TQString res = mCookieJar->findCookies( request->url, request->DOM, request->windowId );
 
            TQDataStream stream2(replyData, IO_WriteOnly);
            stream2 << res;
@@ -369,14 +369,14 @@ bool KCookieServer::cookieMatches( KHttpCookiePtr c,
 
 // DCOP function
 QString
-KCookieServer::tqfindCookies(TQString url)
+KCookieServer::findCookies(TQString url)
 {
-  return tqfindCookies(url, 0);
+  return findCookies(url, 0);
 }
 
 // DCOP function
 QString
-KCookieServer::tqfindCookies(TQString url, long windowId)
+KCookieServer::findCookies(TQString url, long windowId)
 {
    if (cookiesPending(url))
    {
@@ -390,7 +390,7 @@ KCookieServer::tqfindCookies(TQString url, long windowId)
       return TQString::null; // Talk to you later :-)
    }
 
-   TQString cookies = mCookieJar->tqfindCookies(url, false, windowId);
+   TQString cookies = mCookieJar->findCookies(url, false, windowId);
 
    if (mCookieJar->changed())
       saveCookieJar();
@@ -400,7 +400,7 @@ KCookieServer::tqfindCookies(TQString url, long windowId)
 
 // DCOP function
 QStringList
-KCookieServer::tqfindDomains()
+KCookieServer::findDomains()
 {
    TQStringList result;
    const TQStringList domains = mCookieJar->getDomainList();
@@ -418,7 +418,7 @@ KCookieServer::tqfindDomains()
 
 // DCOP function
 QStringList
-KCookieServer::tqfindCookies(TQValueList<int> fields,
+KCookieServer::findCookies(TQValueList<int> fields,
                            TQString domain,
                            TQString fqdn,
                            TQString path,
@@ -450,14 +450,14 @@ KCookieServer::tqfindCookies(TQValueList<int> fields,
 
 // DCOP function
 QString
-KCookieServer::tqfindDOMCookies(TQString url)
+KCookieServer::findDOMCookies(TQString url)
 {
-   return tqfindDOMCookies(url, 0);
+   return findDOMCookies(url, 0);
 }
 
 // DCOP function
 QString
-KCookieServer::tqfindDOMCookies(TQString url, long windowId)
+KCookieServer::findDOMCookies(TQString url, long windowId)
 {
    // We don't wait for pending cookies because it locks up konqueror 
    // which can cause a deadlock if it happens to have a popup-menu up.
@@ -465,7 +465,7 @@ KCookieServer::tqfindDOMCookies(TQString url, long windowId)
    KHttpCookieList pendingCookies;
    cookiesPending(url, &pendingCookies);
 
-   return mCookieJar->tqfindCookies(url, true, windowId, &pendingCookies);
+   return mCookieJar->findCookies(url, true, windowId, &pendingCookies);
 }
 
 // DCOP function
diff --git a/kioslave/http/kcookiejar/kcookieserver.h b/kioslave/http/kcookiejar/kcookieserver.h
index 042d75521..0c36f10b1 100644
--- a/kioslave/http/kcookiejar/kcookieserver.h
+++ b/kioslave/http/kcookiejar/kcookieserver.h
@@ -45,12 +45,12 @@ public:
   ~KCookieServer();
 
 k_dcop:
-  TQString tqfindCookies(TQString);
-  TQString tqfindCookies(TQString, long);
-  TQStringList tqfindDomains();
-  TQStringList tqfindCookies(TQValueList<int>,TQString,TQString,TQString,TQString);
-  TQString tqfindDOMCookies(TQString);
-  TQString tqfindDOMCookies(TQString, long);
+  TQString findCookies(TQString);
+  TQString findCookies(TQString, long);
+  TQStringList findDomains();
+  TQStringList findCookies(TQValueList<int>,TQString,TQString,TQString,TQString);
+  TQString findDOMCookies(TQString);
+  TQString findDOMCookies(TQString, long);
   void addCookies(TQString, TQCString, long);
   void deleteCookie(TQString, TQString, TQString, TQString);
   void deleteCookiesFromDomain(TQString);
diff --git a/kioslave/http/kcookiejar/kcookiewin.cpp b/kioslave/http/kcookiejar/kcookiewin.cpp
index f0d29b05a..2c11c33cb 100644
--- a/kioslave/http/kcookiejar/kcookiewin.cpp
+++ b/kioslave/http/kcookiejar/kcookiewin.cpp
@@ -93,17 +93,17 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList,
     }
 # endif
 #endif
-    // Main widget's tqlayout manager...
-    TQVBoxLayout* vtqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
-    vtqlayout->setResizeMode( TQLayout::Fixed );
+    // Main widget's layout manager...
+    TQVBoxLayout* vlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
+    vlayout->setResizeMode( TQLayout::Fixed );
 
     // Cookie image and message to user
     TQHBox* hBox = new TQHBox( this );
     hBox->setSpacing( KDialog::spacingHint() );
     TQLabel* icon = new TQLabel( hBox );
     icon->setPixmap( TQMessageBox::standardIcon(TQMessageBox::Warning) );
-    icon->tqsetAlignment( Qt::AlignCenter );
-    icon->setFixedSize( 2*icon->tqsizeHint() );
+    icon->setAlignment( Qt::AlignCenter );
+    icon->setFixedSize( 2*icon->sizeHint() );
 
     int count = cookieList.count();
 
@@ -111,11 +111,11 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList,
     TQString txt = i18n("You received a cookie from",
                        "You received %n cookies from", count);
     TQLabel* lbl = new TQLabel( txt, vBox );
-    lbl->tqsetAlignment( Qt::AlignCenter );
+    lbl->setAlignment( Qt::AlignCenter );
     KHttpCookiePtr cookie = cookieList.first();
 
     TQString host (cookie->host());
-    int pos = host.tqfind(':');
+    int pos = host.find(':');
     if ( pos > 0 )
     {
       TQString portNum = host.left(pos);
@@ -128,14 +128,14 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList,
     if (cookie->isCrossDomain())
        txt += i18n(" <b>[Cross Domain!]</b>");
     lbl = new TQLabel( txt, vBox );
-    lbl->tqsetAlignment( Qt::AlignCenter );
+    lbl->setAlignment( Qt::AlignCenter );
     lbl = new TQLabel( i18n("Do you want to accept or reject?"), vBox );
-    lbl->tqsetAlignment( Qt::AlignCenter );
-    vtqlayout->addWidget( hBox, 0, Qt::AlignLeft );
+    lbl->setAlignment( Qt::AlignCenter );
+    vlayout->addWidget( hBox, 0, Qt::AlignLeft );
 
     // Cookie Details dialog...
     m_detailView = new KCookieDetail( cookieList, count, this );
-    vtqlayout->addWidget( m_detailView );
+    vlayout->addWidget( m_detailView );
     m_showDetails = showDetails;
     m_showDetails ? m_detailView->show():m_detailView->hide();
 
@@ -168,7 +168,7 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList,
                               "<em>(see WebBrowsing/Cookies in the Control Center)</em>.") );
 #endif
     m_btnGrp->insert( rb );
-    vtqlayout->addWidget( m_btnGrp );
+    vlayout->addWidget( m_btnGrp );
 
     if ( defaultButton > -1 && defaultButton < 3 )
         m_btnGrp->setButton( defaultButton );
@@ -202,8 +202,8 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList,
 #endif
 
 
-    vtqlayout->addWidget( bbox );
-    setFixedSize( tqsizeHint() );
+    vlayout->addWidget( bbox );
+    setFixedSize( sizeHint() );
 }
 
 KCookieWin::~KCookieWin()
@@ -313,7 +313,7 @@ KCookieDetail::KCookieDetail( KHttpCookieList cookieList, int cookieCount,
     if ( cookieCount > 1 )
     {
         TQPushButton* btnNext = new TQPushButton( i18n("Next cookie","&Next >>"), this );
-        btnNext->setFixedSize( btnNext->tqsizeHint() );
+        btnNext->setFixedSize( btnNext->sizeHint() );
         grid->addMultiCellWidget( btnNext, 8, 8, 0, 1 );
         connect( btnNext, TQT_SIGNAL(clicked()), TQT_SLOT(slotNextCookie()) );
 #ifndef QT_NO_TOOLTIP
diff --git a/kioslave/http/kcookiejar/netscape_cookie_spec.html b/kioslave/http/kcookiejar/netscape_cookie_spec.html
index afd1f1565..eb190f2e3 100644
--- a/kioslave/http/kcookiejar/netscape_cookie_spec.html
+++ b/kioslave/http/kcookiejar/netscape_cookie_spec.html
@@ -151,7 +151,7 @@ the URL request. The path "/foo"
 would match "/foobar" and "/foo/bar.html".  The path "/" is the most
 general path. <P>
 If the <B>path</B> is not specified, it as assumed to be the same path
-as the document being described by the header which tqcontains the cookie.
+as the document being described by the header which contains the cookie.
 <P>
 <DT> <B>secure</B>
 <DD>
@@ -223,16 +223,16 @@ as long as it is less than 4 kilobytes.
 <LI>If a CGI script wishes to delete a cookie, it can do so by
 returning a cookie with the same name, and an <B>expires</B> time
 which is in the past.  The path and name must match exactly
-in order for the expiring cookie to tqreplace the valid cookie.
+in order for the expiring cookie to replace the valid cookie.
 This requirement makes it difficult for anyone but the originator
 of a cookie to delete a cookie.
 <P><LI>When caching HTTP, as a proxy server might do, the <B>Set-cookie</B>
 response header should never be cached.
 <P><LI>If a proxy server receives a response which
-tqcontains a <B>Set-cookie</B> header, it should propagate the <B>Set-cookie</B>
+contains a <B>Set-cookie</B> header, it should propagate the <B>Set-cookie</B>
 header to the client, regardless of whether the response was 304
 (Not Modified) or 200 (OK).
-<P>Similarly, if a client request tqcontains a Cookie: header, it
+<P>Similarly, if a client request contains a Cookie: header, it
 should be forwarded through a proxy, even if the conditional
 If-modified-since request is being made.
 </UL>
diff --git a/kioslave/http/kcookiejar/rfc2109 b/kioslave/http/kcookiejar/rfc2109
index 86a4fc7e9..432fdcc6e 100644
--- a/kioslave/http/kcookiejar/rfc2109
+++ b/kioslave/http/kcookiejar/rfc2109
@@ -13,7 +13,7 @@ Category: Standards Track                                    L. Montulli
 
                     HTTP State Management Mechanism
 
-tqStatus of this Memo
+Status of this Memo
 
    This document specifies an Internet standards track protocol for the
    Internet community, and requests discussion and suggestions for
@@ -374,7 +374,7 @@ RFC 2109            HTTP State Management Mechanism        February 1997
    * The value for the Path attribute is not a prefix of the request-
      URI.
 
-   * The value for the Domain attribute tqcontains no embedded dots or
+   * The value for the Domain attribute contains no embedded dots or
      does not start with a dot.
 
    * The value for the request-host does not domain-match the Domain
@@ -382,12 +382,12 @@ RFC 2109            HTTP State Management Mechanism        February 1997
 
    * The request-host is a FQDN (not IP address) and has the form HD,
      where D is the value of the Domain attribute, and H is a string
-     that tqcontains one or more dots.
+     that contains one or more dots.
 
    Examples:
 
    * A Set-Cookie from request-host y.x.foo.com for Domain=.foo.com
-     would be rejected, because H is y.x and tqcontains a dot.
+     would be rejected, because H is y.x and contains a dot.
 
 
 
@@ -433,7 +433,7 @@ RFC 2109            HTTP State Management Mechanism        February 1997
    checkbox (or, conversely, its immediate destruction).
 
    Privacy considerations dictate that the user have considerable
-   control over cookie management.  The PRIVACY section tqcontains more
+   control over cookie management.  The PRIVACY section contains more
    information.
 
 4.3.4  Sending Cookies to the Origin Server
@@ -666,7 +666,7 @@ RFC 2109            HTTP State Management Mechanism        February 1997
          Set-Cookie: Part_Number="Rocket_Launcher_0001"; Version="1";
                  Path="/acme"
 
-         Shopping basket tqcontains an item.
+         Shopping basket contains an item.
 
 
 
@@ -714,7 +714,7 @@ RFC 2109            HTTP State Management Mechanism        February 1997
    each of which it receives a new cookie.  All the cookies have the
    same Path attribute and (default) domain.  Because the request URLs
    all have /acme as a prefix, and that matches the Path attribute, each
-   request tqcontains all the cookies received so far.
+   request contains all the cookies received so far.
 
 5.2  Example 2
 
@@ -803,7 +803,7 @@ RFC 2109            HTTP State Management Mechanism        February 1997
    inherently.  For example, if a shopping-basket-style application
    always displays a user's current basket contents on each page, those
    pages cannot be cached, because each user's basket's contents would
-   be different.  On the other hand, if each page tqcontains just a link
+   be different.  On the other hand, if each page contains just a link
    that allows the user to "Look at My Shopping Basket", the page can be
    cached.
 
@@ -862,7 +862,7 @@ RFC 2109            HTTP State Management Mechanism        February 1997
    of a user through the server.  Users may object to this behavior as
    an intrusive accumulation of information, even if their identity is
    not evident.  (Identity might become evident if a user subsequently
-   fills out a form that tqcontains identifying information.)  This state
+   fills out a form that contains identifying information.)  This state
    management specification therefore requires that a user agent give
    the user control over such a possible intrusion, although the
    interface through which the user is given this control is left
@@ -1053,7 +1053,7 @@ RFC 2109            HTTP State Management Mechanism        February 1997
 
    Wdy, DD-Mon-YY HH:MM:SS GMT
 
-   Note that the Expires date format tqcontains embedded spaces, and that
+   Note that the Expires date format contains embedded spaces, and that
    "old" cookies did not have quotes around values.  Clients that
    implement to this specification should be aware of "old" cookies and
    Expires.
diff --git a/kioslave/http/kcookiejar/rfc2965 b/kioslave/http/kcookiejar/rfc2965
index 1de450b13..8a4d02b17 100644
--- a/kioslave/http/kcookiejar/rfc2965
+++ b/kioslave/http/kcookiejar/rfc2965
@@ -13,7 +13,7 @@ Category: Standards Track                             Epinions.com, Inc.
 
                     HTTP State Management Mechanism
 
-tqStatus of this Memo
+Status of this Memo
 
    This document specifies an Internet standards track protocol for the
    Internet community, and requests discussion and suggestions for
@@ -71,7 +71,7 @@ RFC 2965            HTTP State Management Mechanism         October 2000
    request line.  Note that request-host is a HN.
 
    The term effective host name is related to host name.  If a host name
-   tqcontains no dots, the effective host name is that name with the
+   contains no dots, the effective host name is that name with the
    string .local appended to it.  Otherwise the effective host name is
    the same as the host name.  Note that all effective host names
    contain at least one dot.
@@ -472,7 +472,7 @@ RFC 2965            HTTP State Management Mechanism         October 2000
       *  The value for the Path attribute is not a prefix of the
          request-URI.
 
-      *  The value for the Domain attribute tqcontains no embedded dots,
+      *  The value for the Domain attribute contains no embedded dots,
          and the value is not .local.
 
       *  The effective host name that derives from the request-host does
@@ -480,7 +480,7 @@ RFC 2965            HTTP State Management Mechanism         October 2000
 
       *  The request-host is a HDN (not IP address) and has the form HD,
          where D is the value of the Domain attribute, and H is a string
-         that tqcontains one or more dots.
+         that contains one or more dots.
 
       *  The Port attribute has a "port-list", and the request-port was
          not in the list.
@@ -488,7 +488,7 @@ RFC 2965            HTTP State Management Mechanism         October 2000
    Examples:
 
       *  A Set-Cookie2 from request-host y.x.foo.com for Domain=.foo.com
-         would be rejected, because H is y.x and tqcontains a dot.
+         would be rejected, because H is y.x and contains a dot.
 
       *  A Set-Cookie2 from request-host x.foo.com for Domain=.foo.com
          would be accepted.
@@ -548,7 +548,7 @@ RFC 2965            HTTP State Management Mechanism         October 2000
    response header, whether or not to accept the cookie.  A potentially
    confusing situation could arise if the following sequence occurs:
 
-      *  the user agent receives a cookie that tqcontains a CommentURL
+      *  the user agent receives a cookie that contains a CommentURL
          attribute;
 
       *  the user agent's cookie inspection interface is configured so
@@ -585,7 +585,7 @@ RFC 2965            HTTP State Management Mechanism         October 2000
    immediate destruction).
 
    Privacy considerations dictate that the user have considerable
-   control over cookie management.  The PRIVACY section tqcontains more
+   control over cookie management.  The PRIVACY section contains more
    information.
 
    3.3.4  Sending Cookies to the Origin Server  When it sends a request
@@ -693,7 +693,7 @@ RFC 2965            HTTP State Management Mechanism         October 2000
    request header facilitates interoperation between clients and servers
    that understand different versions of the cookie specification.  When
    the client sends one or more cookies to an origin server, if at least
-   one of those cookies tqcontains a $Version attribute whose value is
+   one of those cookies contains a $Version attribute whose value is
    different from the version that the client understands, then the
    client MUST also send a Cookie2 request header, the syntax for which
    is
@@ -865,7 +865,7 @@ RFC 2965            HTTP State Management Mechanism         October 2000
         Set-Cookie2: Part_Number="Rocket_Launcher_0001"; Version="1";
                 Path="/acme"
 
-        Shopping basket tqcontains an item.
+        Shopping basket contains an item.
 
       5. User Agent -> Server
 
@@ -912,7 +912,7 @@ RFC 2965            HTTP State Management Mechanism         October 2000
    each of which it receives a new cookie.  All the cookies have the
    same Path attribute and (default) domain.  Because the request-URIs
    all path-match /acme, the Path attribute of each cookie, each request
-   tqcontains all the cookies received so far.
+   contains all the cookies received so far.
 
 4.2  Example 2
 
@@ -996,7 +996,7 @@ RFC 2965            HTTP State Management Mechanism         October 2000
    inherently.  For example, if a shopping-basket-style application
    always displays a user's current basket contents on each page, those
    pages cannot be cached, because each user's basket's contents would
-   be different.  On the other hand, if each page tqcontains just a link
+   be different.  On the other hand, if each page contains just a link
    that allows the user to "Look at My Shopping Basket", the page can be
    cached.
 
@@ -1052,7 +1052,7 @@ RFC 2965            HTTP State Management Mechanism         October 2000
 6.  PRIVACY
 
    Informed consent should guide the design of systems that use cookies.
-   A user should be able to tqfind out how a web site plans to use
+   A user should be able to find out how a web site plans to use
    information in a cookie and should be able to choose whether or not
    those policies are acceptable.  Both the user agent and the origin
    server must assist informed consent.
@@ -1074,7 +1074,7 @@ RFC 2965            HTTP State Management Mechanism         October 2000
    of a user through the server.  Users may object to this behavior as
    an intrusive accumulation of information, even if their identity is
    not evident.  (Identity might become evident, for example, if a user
-   subsequently fills out a form that tqcontains identifying information.)
+   subsequently fills out a form that contains identifying information.)
    This state management specification therefore requires that a user
    agent give the user control over such a possible intrusion, although
    the interface through which the user is given this control is left
@@ -1267,7 +1267,7 @@ RFC 2965            HTTP State Management Mechanism         October 2000
    understand Cookie request headers that also follow this
    specification.
 
-   New cookies MUST tqreplace both equivalent old- and new-style cookies.
+   New cookies MUST replace both equivalent old- and new-style cookies.
    That is, if a user agent that follows both this specification and
    Netscape's original specification receives a Set-Cookie2 response
    header, and the NAME and the Domain and Path attributes match (per
diff --git a/kioslave/http/kcookiejar/tests/kcookiejartest.cpp b/kioslave/http/kcookiejar/tests/kcookiejartest.cpp
index 53a039310..0ad238ab7 100644
--- a/kioslave/http/kcookiejar/tests/kcookiejartest.cpp
+++ b/kioslave/http/kcookiejar/tests/kcookiejartest.cpp
@@ -53,7 +53,7 @@ static void FAIL(const TQString &msg)
 
 static void popArg(TQCString &command, TQCString & line)
 {
-   int i = line.tqfind(' ');
+   int i = line.find(' ');
    if (i != -1)
    {
       command = line.left(i);
@@ -69,15 +69,15 @@ static void popArg(TQCString &command, TQCString & line)
 
 static void popArg(TQString &command, TQCString & line)
 {
-   int i = line.tqfind(' ');
+   int i = line.find(' ');
    if (i != -1)
    {
-      command = TQString::tqfromLatin1(line.left(i));
+      command = TQString::fromLatin1(line.left(i));
       line = line.mid(i+1);
    }
    else
    {
-      command = TQString::tqfromLatin1(line);
+      command = TQString::fromLatin1(line);
       line = 0;
    }   
 }
@@ -128,8 +128,8 @@ static void processCookie(TQCString &line)
    if (url.isEmpty())
       FAIL(TQString("Missing URL"));
 
-   line.tqreplace("%LASTYEAR%", *lastYear);
-   line.tqreplace("%NEXTYEAR%", *nextYear);
+   line.replace("%LASTYEAR%", *lastYear);
+   line.replace("%NEXTYEAR%", *nextYear);
 
    KHttpCookieList list = jar->makeCookies(urlStr, line, 0);
    
@@ -158,9 +158,9 @@ static void processCheck(TQCString &line)
    if (url.isEmpty())
       FAIL(TQString("Missing URL"));
 
-   TQString expectedCookies = TQString::tqfromLatin1(line);
+   TQString expectedCookies = TQString::fromLatin1(line);
 
-   TQString cookies = jar->tqfindCookies(urlStr, false, 0, 0).stripWhiteSpace();
+   TQString cookies = jar->findCookies(urlStr, false, 0, 0).stripWhiteSpace();
    if (cookies != expectedCookies)
       FAIL(urlStr+TQString("\nGot '%1' expected '%2'")
               .arg(cookies, expectedCookies));
@@ -246,8 +246,8 @@ int main(int argc, char *argv[])
    TQCString arg2;
    TQString result;
 
-   lastYear = new TQCString(TQString("Fri, 04-May-%1 01:00:00 GMT").arg(TQDate::tqcurrentDate().year()-1).utf8());
-   nextYear = new TQCString(TQString(" expires=Fri, 04-May-%1 01:00:00 GMT").arg(TQDate::tqcurrentDate().year()+1).utf8());
+   lastYear = new TQCString(TQString("Fri, 04-May-%1 01:00:00 GMT").arg(TQDate::currentDate().year()-1).utf8());
+   nextYear = new TQCString(TQString(" expires=Fri, 04-May-%1 01:00:00 GMT").arg(TQDate::currentDate().year()+1).utf8());
 
    KAboutData about("kcookietest", "kcookietest", "1.0", description, KAboutData::License_GPL, "(C) 2004 Waldo Bastian");
    KCmdLineArgs::init( argc, argv, &about);
diff --git a/kioslave/http/shoutcast-icecast.txt b/kioslave/http/shoutcast-icecast.txt
index b1eb5b40e..f7bdcf1e7 100644
--- a/kioslave/http/shoutcast-icecast.txt
+++ b/kioslave/http/shoutcast-icecast.txt
@@ -84,7 +84,7 @@ Contents:
 
  Although the current HTML 4.01 [HTML4] says to use the object element
  many browsers out on the market today still look for the embed element.
- Below tqfind a little snipbit that will work work in many browsers.
+ Below find a little snipbit that will work work in many browsers.
 
   <object type="audio/x-midi" data="../media/sound.mid" width="200" height="26">
     <param name="src" value="../media/sound.mid">
diff --git a/kioslave/iso/Makefile.am b/kioslave/iso/Makefile.am
index 0a928a6e8..8151bec5c 100644
--- a/kioslave/iso/Makefile.am
+++ b/kioslave/iso/Makefile.am
@@ -39,9 +39,9 @@ uninstall-local:
 # kde_appsdir         Where your application's menu entry (.desktop) should go to.
 # kde_icondir         Where your icon should go to - better use KDE_ICON.
 # kde_sounddir        Where your sounds should go to.
-# kde_htmldir         Where your docs should go to. (tqcontains lang subdirs)
+# kde_htmldir         Where your docs should go to. (contains lang subdirs)
 # kde_datadir         Where you install application data. (Use a subdir)
-# kde_locale          Where translation files should go to. (tqcontains lang subdirs)
+# kde_locale          Where translation files should go to. (contains lang subdirs)
 # kde_cgidir          Where cgi-bin executables should go to.
 # kde_confdir         Where config files should go to (system-wide ones with default values).
 # kde_mimedir         Where mimetypes .desktop files should go to.
@@ -60,7 +60,7 @@ uninstall-local:
 # make messages.po. Move this one to ../po/ and "make merge" in po
 # the -x is for skipping messages already translated in kdelibs
 messages:
-	LIST=`tqfind . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
+	LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
 	if test -n "$$LIST"; then \
 		 $(XGETTEXT) -C -ki18n -x $(kde_includes)/kde.pot $$LIST -o ../po/iso.pot; \
 	fi
diff --git a/kioslave/iso/iso.cpp b/kioslave/iso/iso.cpp
index 542654f74..268805770 100644
--- a/kioslave/iso/iso.cpp
+++ b/kioslave/iso/iso.cpp
@@ -130,7 +130,7 @@ bool kio_isoProtocol::checkNewFile( TQString fullPath, TQString & path, int star
         fullPath += '/';
 
     kdDebug()   << "the full path is " << fullPath << endl;
-    while ( (pos=fullPath.tqfind( '/', pos+1 )) != -1 )
+    while ( (pos=fullPath.find( '/', pos+1 )) != -1 )
     {
         TQString tryPath = fullPath.left( pos );
         kdDebug()   << fullPath << "  trying " << tryPath << endl;
@@ -150,7 +150,7 @@ bool kio_isoProtocol::checkNewFile( TQString fullPath, TQString & path, int star
                     path.truncate( len - 1 );
             }
             else
-                path = TQString::tqfromLatin1("/");
+                path = TQString::fromLatin1("/");
             kdDebug()   << "Found. isoFile=" << isoFile << " path=" << path << endl;
             break;
         }
@@ -259,10 +259,10 @@ void kio_isoProtocol::listDir( const KURL & url )
 
     if ( path.isEmpty() )
     {
-        KURL redir( TQString::tqfromLatin1( "iso:/") );
+        KURL redir( TQString::fromLatin1( "iso:/") );
         kdDebug() << "url.path()==" << url.path() << endl;
         if (url.hasRef()) redir.setRef(url.htmlRef());
-        redir.setPath( url.path() + TQString::tqfromLatin1("/") );
+        redir.setPath( url.path() + TQString::fromLatin1("/") );
         kdDebug() << "kio_isoProtocol::listDir: redirection " << redir.url() << endl;
         redirection( redir );
         finished();
@@ -356,7 +356,7 @@ void kio_isoProtocol::stat( const KURL & url )
     const KArchiveEntry* isoEntry;
     if ( path.isEmpty() )
     {
-        path = TQString::tqfromLatin1( "/" );
+        path = TQString::fromLatin1( "/" );
         isoEntry = root;
     } else {
         isoEntry = root->entry( path );
@@ -463,7 +463,7 @@ void kio_isoProtocol::getFile( const KIsoFile *isoFileEntry, const TQString &pat
             if (fileData.size()==0) break;
         }
         if (!mime) {
-            KMimeMagicResult * result = KMimeMagic::self()->tqfindBufferFileType( fileData, path );
+            KMimeMagicResult * result = KMimeMagic::self()->findBufferFileType( fileData, path );
             kdDebug() << "Emitting mimetype " << result->mimeType() << endl;
             mimeType( result->mimeType() );
             mime=true;
diff --git a/kioslave/iso/kiso.cpp b/kioslave/iso/kiso.cpp
index 67481d75b..dff111bff 100644
--- a/kioslave/iso/kiso.cpp
+++ b/kioslave/iso/kiso.cpp
@@ -55,7 +55,7 @@
 ////////////////////////////////////////////////////////////////////////
 
 /**
- * puts the track tqlayout of the device 'fname' into 'tracks'
+ * puts the track layout of the device 'fname' into 'tracks'
  * tracks structure: start sector, track number, ...
  * tracks should be 100*2 entry long (this is the maximum in the CD-ROM standard)
  * currently it's linux only, porters are welcome
@@ -115,7 +115,7 @@ KIso::KIso( const TQString& filename, const TQString & _mimetype )
     bool forced = true;
     if ( mimetype.isEmpty() )
     {
-        mimetype = KMimeType::tqfindByFileContent( filename )->name();
+        mimetype = KMimeType::findByFileContent( filename )->name();
         kdDebug() << "KIso::KIso mimetype=" << mimetype << endl;
 
         // Don't move to prepareDevice - the other constructor theoretically allows ANY filter
@@ -359,7 +359,7 @@ bool KIso::openArchive( int mode )
         memset(&buf,0,sizeof(struct stat));
         buf.st_mode=0777;
     } else {
-        /* If it's a block device, try to query the track tqlayout (for multisession) */
+        /* If it's a block device, try to query the track layout (for multisession) */
         if (m_startsec == -1 && S_ISBLK(buf.st_mode))
             trackno=getTracks(m_filename.latin1(),(int*) &tracks);
     }
diff --git a/kioslave/iso/libisofs/COPYING b/kioslave/iso/libisofs/COPYING
index e6ed46e1b..c7aea1896 100644
--- a/kioslave/iso/libisofs/COPYING
+++ b/kioslave/iso/libisofs/COPYING
@@ -59,7 +59,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"
@@ -96,7 +96,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.
 
@@ -154,7 +154,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
diff --git a/kjs/ChangeLog b/kjs/ChangeLog
index e08ec6eed..c5f42ace2 100644
--- a/kjs/ChangeLog
+++ b/kjs/ChangeLog
@@ -408,7 +408,7 @@
 
 2001-01-04  Harri Porten  <harri@trolltech.com>
 
-	* ustring.h: pack bytes to avoid tqalignment problems (ARM) reported
+	* ustring.h: pack bytes to avoid alignment problems (ARM) reported
 	by Stefan Hanske <sh990154@mail.uni-greifswald.de>
 	* nodes.cpp: typeof fix by Emmeran Seehuber <the_emmy@gmx.de>
 	* nodes.cpp: fixed order of function declaration proccessing
diff --git a/kjs/DESIGN.ideas b/kjs/DESIGN.ideas
index e493afe75..d7684b45b 100644
--- a/kjs/DESIGN.ideas
+++ b/kjs/DESIGN.ideas
@@ -31,7 +31,7 @@ Proposal for a new object model. Far from being complete.
               Garbage Collector
 
 Features:
-        - offers class static data (nice tqreplacement for pointers to member
+        - offers class static data (nice replacement for pointers to member
 	function objects in the prototype object)
 	- no more need to pass around ExecState pointers for the C++ user
 	(substituted with the need for Object* in the type implementation)
diff --git a/kjs/collector.cpp b/kjs/collector.cpp
index d3de0352a..b8d233850 100644
--- a/kjs/collector.cpp
+++ b/kjs/collector.cpp
@@ -117,7 +117,7 @@ void* Collector::allocate(size_t s)
   heap.firstBlockWithPossibleSpace = i;
 
   if (targetBlock == NULL) {
-    // didn't tqfind one, need to allocate a new block
+    // didn't find one, need to allocate a new block
 
     if (heap.usedBlocks == heap.numBlocks) {
       static const size_t maxNumBlocks = ULONG_MAX / sizeof(CollectorBlock*) / GROWTH_FACTOR;
@@ -133,7 +133,7 @@ void* Collector::allocate(size_t s)
     heap.usedBlocks++;
   }
 
-  // tqfind a free spot in the block and detach it from the free list
+  // find a free spot in the block and detach it from the free list
   CollectorCell *newCell = targetBlock->freeList;
 
   ValueImp *imp = (ValueImp*)newCell;
diff --git a/kjs/configure.in.in b/kjs/configure.in.in
index 5da8d1f84..fd23612e0 100644
--- a/kjs/configure.in.in
+++ b/kjs/configure.in.in
@@ -79,7 +79,7 @@ AC_DEFUN([AC_CHECK_PCREPOSIX],
         AC_DEFINE(HAVE_PCREPOSIX, 1, [Define if you have pcreposix libraries and header files.])
     else
         AC_MSG_ERROR([You're missing libpcre.
-Download libpcre from http://www.pcre.org or tqfind a binary package for your platform.
+Download libpcre from http://www.pcre.org or find a binary package for your platform.
 Alternatively, you can specify --disable-pcre, but some web pages - using regular
 expressions in Javascript code - will not work correctly, the regexp support being
 quite limited if libpcre isn't present.])
diff --git a/kjs/create_hash_table b/kjs/create_hash_table
index c8c4d1ff9..a7df5eddf 100755
--- a/kjs/create_hash_table
+++ b/kjs/create_hash_table
@@ -7,10 +7,10 @@
 
 $file = $ARGV[0];
 shift;
-my $tqfindSize = 0;
+my $findSize = 0;
 my $includelookup = 0;
 # Use -s as second argument to make it try many hash sizes
-$tqfindSize = 1 if (defined($ARGV[0]) && $ARGV[0] eq "-s");
+$findSize = 1 if (defined($ARGV[0]) && $ARGV[0] eq "-s");
 # Use -i as second argument to make it include "lookup.h"
 $includelookup = 1 if (defined($ARGV[0]) && $ARGV[0] eq "-i");
 print STDERR "Creating hashtable for $file\n";
@@ -49,7 +49,7 @@ while (<IN>) {
       }
     } elsif (/^\@end\s*$/ && $inside) {
 
-      if($tqfindSize) {
+      if($findSize) {
 	my $entriesnum=@keys;
         print STDERR "Table: $name   $entriesnum entries\n";
 	for( $i=3 ; $i<79 ; ++$i) { $hashsize=$i ; calcTable(); }
@@ -114,7 +114,7 @@ sub calcTable() {
   }
   #print STDERR "After loop: size=$size table=".($#table+1)."\n";
 
-  if ($tqfindSize) {
+  if ($findSize) {
     my $emptycount = 0;
     foreach $entry (@table) {
       $emptycount++ if (!defined($entry));
diff --git a/kjs/date_object.cpp b/kjs/date_object.cpp
index 65be661f1..26635611d 100644
--- a/kjs/date_object.cpp
+++ b/kjs/date_object.cpp
@@ -844,7 +844,7 @@ double KJS::makeTime(struct tm *t, double ms, bool utc)
 }
 
 // returns 0-11 (Jan-Dec); -1 on failure
-static int tqfindMonth(const char *monthStr)
+static int findMonth(const char *monthStr)
 {
   assert(monthStr);
   static const char haystack[37] = "janfebmaraprmayjunjulaugsepoctnovdec";
@@ -911,7 +911,7 @@ double KJS::KRFCDate_parseDate(const UString &_date)
      {
         if (isSpaceLike(*dateString) && dateString - wordStart >= 3)
         {
-          month = tqfindMonth(wordStart);
+          month = findMonth(wordStart);
           while(*dateString && isSpaceLike(*dateString))
              dateString++;
           wordStart = dateString;
@@ -921,7 +921,7 @@ double KJS::KRFCDate_parseDate(const UString &_date)
      }
      // missing delimiter between month and day (like "January29")?
      if (month == -1 && dateString && wordStart != dateString) {
-       month = tqfindMonth(wordStart);
+       month = findMonth(wordStart);
        // TODO: emit warning about dubious format found
      }
 
@@ -991,7 +991,7 @@ double KJS::KRFCDate_parseDate(const UString &_date)
 
        if ( month == -1 ) // not found yet
        {
-         month = tqfindMonth(dateString);
+         month = findMonth(dateString);
          if (month == -1)
            return invalidDate;
 
diff --git a/kjs/dtoa.cpp b/kjs/dtoa.cpp
index a4d86f208..054450f12 100644
--- a/kjs/dtoa.cpp
+++ b/kjs/dtoa.cpp
@@ -307,19 +307,19 @@ typedef union { double d; ULong L[2]; } U;
 #define Exp_shift1 20
 #define Exp_msk1    0x100000
 #define Exp_msk11   0x100000
-#define Exp_tqmask  0x7ff00000
+#define Exp_mask  0x7ff00000
 #define P 53
 #define Bias 1023
 #define Emin (-1022)
 #define Exp_1  0x3ff00000
 #define Exp_11 0x3ff00000
 #define Ebits 11
-#define Frac_tqmask  0xfffff
-#define Frac_tqmask1 0xfffff
+#define Frac_mask  0xfffff
+#define Frac_mask1 0xfffff
 #define Ten_pmax 22
 #define Bletch 0x10
-#define Bndry_tqmask  0xfffff
-#define Bndry_tqmask1 0xfffff
+#define Bndry_mask  0xfffff
+#define Bndry_mask1 0xfffff
 #define LSB 1
 #define Sign_bit 0x80000000
 #define Log2P 1
@@ -363,18 +363,18 @@ typedef union { double d; ULong L[2]; } U;
 #define Exp_shift1 24
 #define Exp_msk1   0x1000000
 #define Exp_msk11  0x1000000
-#define Exp_tqmask  0x7f000000
+#define Exp_mask  0x7f000000
 #define P 14
 #define Bias 65
 #define Exp_1  0x41000000
 #define Exp_11 0x41000000
 #define Ebits 8	/* exponent has 7 bits, but 8 is the right value in b2d */
-#define Frac_tqmask  0xffffff
-#define Frac_tqmask1 0xffffff
+#define Frac_mask  0xffffff
+#define Frac_mask1 0xffffff
 #define Bletch 4
 #define Ten_pmax 22
-#define Bndry_tqmask  0xefffff
-#define Bndry_tqmask1 0xffffff
+#define Bndry_mask  0xefffff
+#define Bndry_mask1 0xffffff
 #define LSB 1
 #define Sign_bit 0x80000000
 #define Log2P 4
@@ -389,18 +389,18 @@ typedef union { double d; ULong L[2]; } U;
 #define Exp_shift1 7
 #define Exp_msk1    0x80
 #define Exp_msk11   0x800000
-#define Exp_tqmask  0x7f80
+#define Exp_mask  0x7f80
 #define P 56
 #define Bias 129
 #define Exp_1  0x40800000
 #define Exp_11 0x4080
 #define Ebits 8
-#define Frac_tqmask  0x7fffff
-#define Frac_tqmask1 0xffff007f
+#define Frac_mask  0x7fffff
+#define Frac_mask1 0xffff007f
 #define Ten_pmax 24
 #define Bletch 2
-#define Bndry_tqmask  0xffff007f
-#define Bndry_tqmask1 0xffff007f
+#define Bndry_mask  0xffff007f
+#define Bndry_mask1 0xffff007f
 #define LSB 0x10000
 #define Sign_bit 0x8000
 #define Log2P 1
@@ -424,7 +424,7 @@ extern double rnd_prod(double, double), rnd_quot(double, double);
 #define rounded_quotient(a,b) a /= b
 #endif
 
-#define Big0 (Frac_tqmask1 | Exp_msk1*(DBL_MAX_EXP+Bias-1))
+#define Big0 (Frac_mask1 | Exp_msk1*(DBL_MAX_EXP+Bias-1))
 #define Big1 0xffffffff
 
 #ifndef Pack_32
@@ -1039,7 +1039,7 @@ ulp
 	U x, a;
 
 	dval(x) = dx;
-	L = (word0(x) & Exp_tqmask) - (P-1)*Exp_msk1;
+	L = (word0(x) & Exp_mask) - (P-1)*Exp_msk1;
 #ifndef Avoid_Underflow
 #ifndef Sudden_Underflow
 	if (L > 0) {
@@ -1166,7 +1166,7 @@ d2b
 #endif
 	x = b->x;
 
-	z = d0 & Frac_tqmask;
+	z = d0 & Frac_mask;
 	d0 &= 0x7fffffff;	/* clear sign bit, which we ignore */
 #ifdef Sudden_Underflow
 	de = (int)(d0 >> Exp_shift);
@@ -1253,7 +1253,7 @@ d2b
 #endif
 #ifdef IBM
 		*e = (de - Bias - (P-1) << 2) + k;
-		*bits = 4*P + 8 - k - hi0bits(word0(d) & Frac_tqmask);
+		*bits = 4*P + 8 - k - hi0bits(word0(d) & Frac_mask);
 #else
 		*e = de - Bias - (P-1) + k;
 		*bits = P - k;
@@ -1423,7 +1423,7 @@ hexnan
 		x[1] = (x[1] << 4) | c;
 		}
 	if ((x[0] &= 0xfffff) || x[1]) {
-		word0(*rvp) = Exp_tqmask | x[0];
+		word0(*rvp) = Exp_mask | x[0];
 		word1(*rvp) = x[1];
 		}
 	}
@@ -1680,7 +1680,7 @@ strtod
  vax_ovfl_check:
 				word0(rv) -= P*Exp_msk1;
 				/* rv = */ rounded_product(dval(rv), tens[e]);
-				if ((word0(rv) & Exp_tqmask)
+				if ((word0(rv) & Exp_mask)
 				 > Exp_msk1*(DBL_MAX_EXP+Bias-1-P))
 					goto ovfl;
 				word0(rv) += P*Exp_msk1;
@@ -1747,11 +1747,11 @@ strtod
 					word1(rv) = Big1;
 					break;
 				  default:
-					word0(rv) = Exp_tqmask;
+					word0(rv) = Exp_mask;
 					word1(rv) = 0;
 				  }
 #else /*Honor_FLT_ROUNDS*/
-				word0(rv) = Exp_tqmask;
+				word0(rv) = Exp_mask;
 				word1(rv) = 0;
 #endif /*Honor_FLT_ROUNDS*/
 #ifdef SET_INEXACT
@@ -1774,7 +1774,7 @@ strtod
 		/* The last multiplication could overflow. */
 			word0(rv) -= P*Exp_msk1;
 			dval(rv) *= bigtens[j];
-			if ((z = word0(rv) & Exp_tqmask)
+			if ((z = word0(rv) & Exp_mask)
 			 > Exp_msk1*(DBL_MAX_EXP+Bias-P))
 				goto ovfl;
 			if (z > Exp_msk1*(DBL_MAX_EXP+Bias-1-P)) {
@@ -1800,7 +1800,7 @@ strtod
 			for(j = 0; e1 > 0; j++, e1 >>= 1)
 				if (e1 & 1)
 					dval(rv) *= tinytens[j];
-			if (scale && (j = 2*P + 1 - ((word0(rv) & Exp_tqmask)
+			if (scale && (j = 2*P + 1 - ((word0(rv) & Exp_mask)
 						>> Exp_shift)) > 0) {
 				/* scaled rv is denormal; zap j low bits */
 				if (j >= 32) {
@@ -1948,8 +1948,8 @@ strtod
 				else if (!dsign) {
 					adj = -1.;
 					if (!word1(rv)
-					 && !(word0(rv) & Frac_tqmask)) {
-						y = word0(rv) & Exp_tqmask;
+					 && !(word0(rv) & Frac_mask)) {
+						y = word0(rv) & Exp_mask;
 #ifdef Avoid_Underflow
 						if (!scale || y > 2*P*Exp_msk1)
 #else
@@ -1963,12 +1963,12 @@ strtod
 						}
  apply_adj:
 #ifdef Avoid_Underflow
-					if (scale && (y = word0(rv) & Exp_tqmask)
+					if (scale && (y = word0(rv) & Exp_mask)
 						<= 2*P*Exp_msk1)
 					  word0(adj) += (2*P+1)*Exp_msk1 - y;
 #else
 #ifdef Sudden_Underflow
-					if ((word0(rv) & Exp_tqmask) <=
+					if ((word0(rv) & Exp_mask) <=
 							P*Exp_msk1) {
 						word0(rv) += P*Exp_msk1;
 						dval(rv) += adj*ulp(dval(rv));
@@ -1994,11 +1994,11 @@ strtod
 					}
 				}
 #ifdef Avoid_Underflow
-			if (scale && (y = word0(rv) & Exp_tqmask) <= 2*P*Exp_msk1)
+			if (scale && (y = word0(rv) & Exp_mask) <= 2*P*Exp_msk1)
 				word0(adj) += (2*P+1)*Exp_msk1 - y;
 #else
 #ifdef Sudden_Underflow
-			if ((word0(rv) & Exp_tqmask) <= P*Exp_msk1) {
+			if ((word0(rv) & Exp_mask) <= P*Exp_msk1) {
 				word0(rv) += P*Exp_msk1;
 				adj *= ulp(dval(rv));
 				if (dsign)
@@ -2023,12 +2023,12 @@ strtod
 			/* Error is less than half an ulp -- check for
 			 * special case of mantissa a power of two.
 			 */
-			if (dsign || word1(rv) || word0(rv) & Bndry_tqmask
+			if (dsign || word1(rv) || word0(rv) & Bndry_mask
 #ifdef IEEE_Arith
 #ifdef Avoid_Underflow
-			 || (word0(rv) & Exp_tqmask) <= (2*P+1)*Exp_msk1
+			 || (word0(rv) & Exp_mask) <= (2*P+1)*Exp_msk1
 #else
-			 || (word0(rv) & Exp_tqmask) <= Exp_msk1
+			 || (word0(rv) & Exp_mask) <= Exp_msk1
 #endif
 #endif
 				) {
@@ -2053,15 +2053,15 @@ strtod
 		if (i == 0) {
 			/* exactly half-way between */
 			if (dsign) {
-				if ((word0(rv) & Bndry_tqmask1) == Bndry_tqmask1
+				if ((word0(rv) & Bndry_mask1) == Bndry_mask1
 				 &&  word1(rv) == (
 #ifdef Avoid_Underflow
-			(scale && (y = word0(rv) & Exp_tqmask) <= 2*P*Exp_msk1)
+			(scale && (y = word0(rv) & Exp_mask) <= 2*P*Exp_msk1)
 		? (0xffffffff & (0xffffffff << (2*P+1-(y>>Exp_shift)))) :
 #endif
 						   0xffffffff)) {
 					/*boundary case -- increment exponent*/
-					word0(rv) = (word0(rv) & Exp_tqmask)
+					word0(rv) = (word0(rv) & Exp_mask)
 						+ Exp_msk1
 #ifdef IBM
 						| Exp_msk1 >> 4
@@ -2074,11 +2074,11 @@ strtod
 					break;
 					}
 				}
-			else if (!(word0(rv) & Bndry_tqmask) && !word1(rv)) {
+			else if (!(word0(rv) & Bndry_mask) && !word1(rv)) {
  drop_down:
 				/* boundary case -- decrement exponent */
 #ifdef Sudden_Underflow /*{{*/
-				L = word0(rv) & Exp_tqmask;
+				L = word0(rv) & Exp_mask;
 #ifdef IBM
 				if (L <  Exp_msk1)
 #else
@@ -2093,7 +2093,7 @@ strtod
 #else /*Sudden_Underflow}{*/
 #ifdef Avoid_Underflow
 				if (scale) {
-					L = word0(rv) & Exp_tqmask;
+					L = word0(rv) & Exp_mask;
 					if (L <= (2*P+1)*Exp_msk1) {
 						if (L > (P+2)*Exp_msk1)
 							/* round even ==> */
@@ -2104,9 +2104,9 @@ strtod
 						}
 					}
 #endif /*Avoid_Underflow*/
-				L = (word0(rv) & Exp_tqmask) - Exp_msk1;
+				L = (word0(rv) & Exp_mask) - Exp_msk1;
 #endif /*Sudden_Underflow}}*/
-				word0(rv) = L | Bndry_tqmask1;
+				word0(rv) = L | Bndry_mask1;
 				word1(rv) = 0xffffffff;
 #ifdef IBM
 				goto cont;
@@ -2137,7 +2137,7 @@ strtod
 		if ((aadj = ratio(delta, bs)) <= 2.) {
 			if (dsign)
 				aadj = aadj1 = 1.;
-			else if (word1(rv) || word0(rv) & Bndry_tqmask) {
+			else if (word1(rv) || word0(rv) & Bndry_mask) {
 #ifndef Sudden_Underflow
 				if (word1(rv) == Tiny1 && !word0(rv))
 					goto undfl;
@@ -2173,7 +2173,7 @@ strtod
 				aadj1 += 0.5;
 #endif /*Check_FLT_ROUNDS*/
 			}
-		y = word0(rv) & Exp_tqmask;
+		y = word0(rv) & Exp_mask;
 
 		/* Check for overflow */
 
@@ -2182,7 +2182,7 @@ strtod
 			word0(rv) -= P*Exp_msk1;
 			adj = aadj1 * ulp(dval(rv));
 			dval(rv) += adj;
-			if ((word0(rv) & Exp_tqmask) >=
+			if ((word0(rv) & Exp_mask) >=
 					Exp_msk1*(DBL_MAX_EXP+Bias-P)) {
 				if (word0(rv0) == Big0 && word1(rv0) == Big1)
 					goto ovfl;
@@ -2210,15 +2210,15 @@ strtod
 			dval(rv) += adj;
 #else
 #ifdef Sudden_Underflow
-			if ((word0(rv) & Exp_tqmask) <= P*Exp_msk1) {
+			if ((word0(rv) & Exp_mask) <= P*Exp_msk1) {
 				dval(rv0) = dval(rv);
 				word0(rv) += P*Exp_msk1;
 				adj = aadj1 * ulp(dval(rv));
 				dval(rv) += adj;
 #ifdef IBM
-				if ((word0(rv) & Exp_tqmask) <  P*Exp_msk1)
+				if ((word0(rv) & Exp_mask) <  P*Exp_msk1)
 #else
-				if ((word0(rv) & Exp_tqmask) <= P*Exp_msk1)
+				if ((word0(rv) & Exp_mask) <= P*Exp_msk1)
 #endif
 					{
 					if (word0(rv0) == Tiny0
@@ -2253,7 +2253,7 @@ strtod
 #endif /*Sudden_Underflow*/
 #endif /*Avoid_Underflow*/
 			}
-		z = word0(rv) & Exp_tqmask;
+		z = word0(rv) & Exp_mask;
 #ifndef SET_INEXACT
 #ifdef Avoid_Underflow
 		if (!scale)
@@ -2263,7 +2263,7 @@ strtod
 			L = (Long)aadj;
 			aadj -= L;
 			/* The tolerances below are conservative. */
-			if (dsign || word1(rv) || word0(rv) & Bndry_tqmask) {
+			if (dsign || word1(rv) || word0(rv) & Bndry_mask) {
 				if (aadj < .4999999 || aadj > .5000001)
 					break;
 				}
@@ -2301,7 +2301,7 @@ strtod
 		}
 #endif /* Avoid_Underflow */
 #ifdef SET_INEXACT
-	if (inexact && !(word0(rv) & Exp_tqmask)) {
+	if (inexact && !(word0(rv) & Exp_mask)) {
 		/* set underflow bit */
 		dval(rv0) = 1e-300;
 		dval(rv0) *= dval(rv0);
@@ -2595,7 +2595,7 @@ dtoa
 
 #if defined(IEEE_Arith) + defined(VAX)
 #ifdef IEEE_Arith
-	if ((word0(d) & Exp_tqmask) == Exp_tqmask)
+	if ((word0(d) & Exp_mask) == Exp_mask)
 #else
 	if (word0(d)  == 0x8000)
 #endif
@@ -2633,15 +2633,15 @@ dtoa
 
 	b = d2b(dval(d), &be, &bbits);
 #ifdef Sudden_Underflow
-	i = (int)(word0(d) >> Exp_shift1 & (Exp_tqmask>>Exp_shift1));
+	i = (int)(word0(d) >> Exp_shift1 & (Exp_mask>>Exp_shift1));
 #else
-	if ((i = (int)(word0(d) >> Exp_shift1 & (Exp_tqmask>>Exp_shift1)))) {
+	if ((i = (int)(word0(d) >> Exp_shift1 & (Exp_mask>>Exp_shift1)))) {
 #endif
 		dval(d2) = dval(d);
-		word0(d2) &= Frac_tqmask1;
+		word0(d2) &= Frac_mask1;
 		word0(d2) |= Exp_11;
 #ifdef IBM
-		if (j = 11 - hi0bits(word0(d2) & Frac_tqmask))
+		if (j = 11 - hi0bits(word0(d2) & Frac_mask))
 			dval(d2) /= 1 << j;
 #endif
 
@@ -2969,9 +2969,9 @@ dtoa
 			&& rounding == 1
 #endif
 				) {
-		if (!word1(d) && !(word0(d) & Bndry_tqmask)
+		if (!word1(d) && !(word0(d) & Bndry_mask)
 #ifndef Sudden_Underflow
-		 && word0(d) & (Exp_tqmask & ~Exp_msk1)
+		 && word0(d) & (Exp_mask & ~Exp_msk1)
 #endif
 				) {
 			/* The special case */
diff --git a/kjs/function.cpp b/kjs/function.cpp
index 9827cbff7..ef5410cf8 100644
--- a/kjs/function.cpp
+++ b/kjs/function.cpp
@@ -55,7 +55,7 @@ UString encodeURI(ExecState *exec, UString string, UString unescapedSet)
   for (int k = 0; k < string.size(); k++) {
 
     UChar C = string[k];
-    if (unescapedSet.tqfind(C) >= 0) {
+    if (unescapedSet.find(C) >= 0) {
       if (encbufLen+1 >= encbufAlloc)
 	encbuf = (UChar*)realloc(encbuf,(encbufAlloc *= 2)*sizeof(UChar));
       encbuf[encbufLen++] = C;
@@ -244,7 +244,7 @@ UString decodeURI(ExecState *exec, UString string, UString reservedSet)
       }
 
       // UTF-8 transform
-      const unsigned long tqreplacementChar = 0xFFFD;
+      const unsigned long replacementChar = 0xFFFD;
       unsigned long V;
       if (n == 2) {
 	unsigned long yyyyy = octets[0] & 0x1F;
@@ -252,7 +252,7 @@ UString decodeURI(ExecState *exec, UString string, UString reservedSet)
 	V = (yyyyy << 6) | zzzzzz;
 	// 2-byte sequence overlong for this value?       
 	if (V < 0x80)
-	  V = tqreplacementChar;
+	  V = replacementChar;
 	C = UChar((unsigned short)V);
       }
       else if (n == 3) {
@@ -264,7 +264,7 @@ UString decodeURI(ExecState *exec, UString string, UString reservedSet)
 	// an invalid value or UTF-16 surrogate?
 	if (V < 0x800 || V == 0xFFFE || V == 0xFFFF ||
 	    (V >= 0xD800 && V <= 0xDFFF))
-	  V = tqreplacementChar;
+	  V = replacementChar;
 	C = UChar((unsigned short)V);
       }
       else {
@@ -289,7 +289,7 @@ UString decodeURI(ExecState *exec, UString string, UString reservedSet)
       }
     }
 
-    if (reservedSet.tqfind(C) < 0) {
+    if (reservedSet.find(C) < 0) {
         decbuf[decbufLen++] = C;
     }
     else {
diff --git a/kjs/grammar.cpp b/kjs/grammar.cpp
index ea524d5e1..03eb07876 100644
--- a/kjs/grammar.cpp
+++ b/kjs/grammar.cpp
@@ -1495,7 +1495,7 @@ yystpcpy (yydest, yysrc)
 /* Copy to YYRES the contents of YYSTR after stripping away unnecessary
    quotes and backslashes, so that it's suitable for yyerror.  The
    heuristic is that double-quoting is unnecessary unless the string
-   tqcontains an apostrophe, a comma, or backslash (other than
+   contains an apostrophe, a comma, or backslash (other than
    backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
    null, do not copy; instead, return the length of what the result
    would have been.  */
diff --git a/kjs/internal.cpp b/kjs/internal.cpp
index 4e913c508..25f7b6e31 100644
--- a/kjs/internal.cpp
+++ b/kjs/internal.cpp
@@ -52,7 +52,7 @@ extern int kjsyyparse();
 using namespace KJS;
 
 namespace KJS {
-  /* work around some strict tqalignment requirements
+  /* work around some strict alignment requirements
      for double variables on some architectures (e.g. PA-RISC) */
   typedef union { unsigned char b[8]; double d; } kjs_double_t;
 
@@ -320,7 +320,7 @@ LabelStack &LabelStack::operator=(const LabelStack &other)
 
 bool LabelStack::push(const Identifier &id)
 {
-  if (id.isEmpty() || tqcontains(id))
+  if (id.isEmpty() || contains(id))
     return false;
 
   StackElem *newtos = new StackElem;
@@ -330,7 +330,7 @@ bool LabelStack::push(const Identifier &id)
   return true;
 }
 
-bool LabelStack::tqcontains(const Identifier &id) const
+bool LabelStack::contains(const Identifier &id) const
 {
   if (id.isEmpty())
     return true;
diff --git a/kjs/internal.h b/kjs/internal.h
index 988b1a347..413fdaa52 100644
--- a/kjs/internal.h
+++ b/kjs/internal.h
@@ -175,7 +175,7 @@ namespace KJS {
     /**
      * Is the id in the stack?
      */
-    bool tqcontains(const Identifier &id) const;
+    bool contains(const Identifier &id) const;
     /**
      * Removes from the stack the last pushed id (what else?)
      */
@@ -318,7 +318,7 @@ namespace KJS {
     Debugger *dbg;
 
     // Built-in properties of the object prototype. These are accessible
-    // from here even if they are tqreplaced by js code (e.g. assigning to
+    // from here even if they are replaced by js code (e.g. assigning to
     // Array.prototype)
 
     Object b_Object;
diff --git a/kjs/interpreter.h b/kjs/interpreter.h
index f7fee0727..e8f4f84f3 100644
--- a/kjs/interpreter.h
+++ b/kjs/interpreter.h
@@ -56,7 +56,7 @@ namespace KJS {
    * Represents an execution context, as specified by section 10 of the ECMA
    * spec.
    *
-   * An execution context tqcontains information about the current state of the
+   * An execution context contains information about the current state of the
    * script - the scope for variable lookup, the value of "this", etc. A new
    * execution context is entered whenever global code is executed (e.g. with
    * Interpreter::evaluate()), a function is called (see
@@ -86,7 +86,7 @@ namespace KJS {
     const ScopeChain &scopeChain() const;
 
     /**
-     * Returns the variable object for the execution context. This tqcontains a
+     * Returns the variable object for the execution context. This contains a
      * property for each variable declared in the execution context.
      *
      * @return The execution context's variable object
@@ -211,7 +211,7 @@ namespace KJS {
      * Returns the execution state object which can be used to execute
      * scripts using this interpreter at a the "global" level, i.e. one
      * with a execution context that has the global object as the "this"
-     * value, and who's scope chain tqcontains only the global object.
+     * value, and who's scope chain contains only the global object.
      *
      * Note: this pointer remains constant for the life of the interpreter
      * and should not be manually deleted.
@@ -266,7 +266,7 @@ namespace KJS {
     /**
      * Returns the builtin "Object" object. This is the object that was set
      * as a property of the global object during construction; if the property
-     * is tqreplaced by script code, this method will still return the original
+     * is replaced by script code, this method will still return the original
      * object.
      *
      * @return The builtin "Object" object
diff --git a/kjs/lexer.cpp b/kjs/lexer.cpp
index 09842c883..054defb88 100644
--- a/kjs/lexer.cpp
+++ b/kjs/lexer.cpp
@@ -542,7 +542,7 @@ int Lexer::lex()
     }
     break;
   case IdentifierOrKeyword:
-    if ((token = Lookup::tqfind(&mainTable, buffer16, pos16)) < 0) {
+    if ((token = Lookup::find(&mainTable, buffer16, pos16)) < 0) {
   case Identifier:
       // Lookup for keyword failed, means this is an identifier
       // Apply anonymous-function hack below (convert the identifier)
@@ -604,7 +604,7 @@ bool Lexer::isIdentLetter(unsigned short c)
   // Uppercase letter (Lu), Lowercase letter (Ll),
   // Titlecase letter (Lt)", Modifier letter (Lm),
   // Other letter (Lo), or Letter number (Nl).
-  // Also see: http://www.tqunicode.org/Public/UNIDATA/UnicodeData.txt */
+  // Also see: http://www.unicode.org/Public/UNIDATA/UnicodeData.txt */
   return (c >= 'a' && c <= 'z' ||
           c >= 'A' && c <= 'Z' ||
           // A with grave - O with diaeresis
diff --git a/kjs/lexer.h b/kjs/lexer.h
index da7c5ac7e..c6cb6aa88 100644
--- a/kjs/lexer.h
+++ b/kjs/lexer.h
@@ -144,7 +144,7 @@ namespace KJS {
     int bol;     // begin of line
 #endif
 
-    // current and following tqunicode characters (int to allow for -1 for end-of-file marker)
+    // current and following unicode characters (int to allow for -1 for end-of-file marker)
     int current, next1, next2, next3;
 
     UString **strings;
diff --git a/kjs/lookup.cpp b/kjs/lookup.cpp
index 30ea46eef..899238949 100644
--- a/kjs/lookup.cpp
+++ b/kjs/lookup.cpp
@@ -75,7 +75,7 @@ const HashEntry* Lookup::findEntry( const struct HashTable *table,
   return findEntry( table, s.data(), s.size() );
 }
 
-int Lookup::tqfind(const struct HashTable *table,
+int Lookup::find(const struct HashTable *table,
 		 const UChar *c, unsigned int len)
 {
   const HashEntry *entry = findEntry( table, c, len );
@@ -84,9 +84,9 @@ int Lookup::tqfind(const struct HashTable *table,
   return -1;
 }
 
-int Lookup::tqfind(const struct HashTable *table, const Identifier &s)
+int Lookup::find(const struct HashTable *table, const Identifier &s)
 {
-  return tqfind(table, s.data(), s.size());
+  return find(table, s.data(), s.size());
 }
 
 unsigned int Lookup::hash(const UChar *c, unsigned int len)
diff --git a/kjs/lookup.h b/kjs/lookup.h
index d1b3cc594..a77b0b633 100644
--- a/kjs/lookup.h
+++ b/kjs/lookup.h
@@ -104,8 +104,8 @@ namespace KJS {
     /**
      * Find an entry in the table, and return its value (i.e. the value field of HashEntry)
      */
-    static int tqfind(const struct HashTable *table, const Identifier &s);
-    static int tqfind(const struct HashTable *table,
+    static int find(const struct HashTable *table, const Identifier &s);
+    static int find(const struct HashTable *table,
 		    const UChar *c, unsigned int len);
 
     /**
diff --git a/kjs/nodes.cpp b/kjs/nodes.cpp
index 9e6c22535..c6ee18bf1 100644
--- a/kjs/nodes.cpp
+++ b/kjs/nodes.cpp
@@ -408,7 +408,7 @@ Reference ResolveNode::evaluateReference(ExecState *exec) const
 
   // identifier not found
 #ifdef KJS_VERBOSE
-  cerr << "Resolve::evaluateReference: didn't tqfind '" << ident.ustring().ascii() << "'" << endl;
+  cerr << "Resolve::evaluateReference: didn't find '" << ident.ustring().ascii() << "'" << endl;
 #endif
   return Reference(Null(), ident);
 }
@@ -2072,8 +2072,8 @@ Completion DoWhileNode::execute(ExecState *exec)
     exec->context().imp()->seenLabels()->pushIteration();
     c = statement->execute(exec);
     exec->context().imp()->seenLabels()->popIteration();
-    if (!((c.complType() == Continue) && ls.tqcontains(c.target()))) {
-      if ((c.complType() == Break) && ls.tqcontains(c.target()))
+    if (!((c.complType() == Continue) && ls.contains(c.target()))) {
+      if ((c.complType() == Break) && ls.contains(c.target()))
         return Completion(Normal, value);
       if (c.complType() != Normal)
         return c;
@@ -2134,9 +2134,9 @@ Completion WhileNode::execute(ExecState *exec)
     if (c.isValueCompletion())
       value = c.value();
 
-    if ((c.complType() == Continue) && ls.tqcontains(c.target()))
+    if ((c.complType() == Continue) && ls.contains(c.target()))
       continue;
-    if ((c.complType() == Break) && ls.tqcontains(c.target()))
+    if ((c.complType() == Break) && ls.contains(c.target()))
       return Completion(Normal, value);
     if (c.complType() != Normal)
       return c;
@@ -2200,8 +2200,8 @@ Completion ForNode::execute(ExecState *exec)
     exec->context().imp()->seenLabels()->popIteration();
     if (c.isValueCompletion())
       cval = c.value();
-    if (!((c.complType() == Continue) && ls.tqcontains(c.target()))) {
-      if ((c.complType() == Break) && ls.tqcontains(c.target()))
+    if (!((c.complType() == Continue) && ls.contains(c.target()))) {
+      if ((c.complType() == Break) && ls.contains(c.target()))
         return Completion(Normal, cval);
       if (c.complType() != Normal)
         return c;
@@ -2308,8 +2308,8 @@ Completion ForInNode::execute(ExecState *exec)
     if (c.isValueCompletion())
       retval = c.value();
 
-    if (!((c.complType() == Continue) && ls.tqcontains(c.target()))) {
-      if ((c.complType() == Break) && ls.tqcontains(c.target()))
+    if (!((c.complType() == Continue) && ls.contains(c.target()))) {
+      if ((c.complType() == Break) && ls.contains(c.target()))
         break;
       if (c.complType() != Normal) {
         return c;
@@ -2342,7 +2342,7 @@ Completion ContinueNode::execute(ExecState *exec)
   if (ident.isEmpty() && !exec->context().imp()->seenLabels()->inIteration())
     return Completion(Throw,
 		      throwError(exec, SyntaxError, "continue used outside of iteration statement"));
-  else if (!ident.isEmpty() && !exec->context().imp()->seenLabels()->tqcontains(ident))
+  else if (!ident.isEmpty() && !exec->context().imp()->seenLabels()->contains(ident))
     return Completion(Throw,
                       throwError(exec, SyntaxError, "Label %s not found in containing block. Can't continue.", ident));
   else
@@ -2362,7 +2362,7 @@ Completion BreakNode::execute(ExecState *exec)
       !exec->context().imp()->seenLabels()->inSwitch())
     return Completion(Throw,
 		      throwError(exec, SyntaxError, "break used outside of iteration or switch statement"));
-  else if (!ident.isEmpty() && !exec->context().imp()->seenLabels()->tqcontains(ident))
+  else if (!ident.isEmpty() && !exec->context().imp()->seenLabels()->contains(ident))
     return Completion(Throw,
                       throwError(exec, SyntaxError, "Label %s not found in containing block. Can't break.", ident));
   else
@@ -2680,7 +2680,7 @@ Completion SwitchNode::execute(ExecState *exec)
   Completion res = block->evalBlock(exec,v);
   exec->context().imp()->seenLabels()->popSwitch();
 
-  if ((res.complType() == Break) && ls.tqcontains(res.target()))
+  if ((res.complType() == Break) && ls.contains(res.target()))
     return Completion(Normal, res.value());
   else
     return res;
@@ -2998,7 +2998,7 @@ void FuncDeclNode::processFuncDecl(ExecState *exec)
 
   if (body) {
     // hack the scope so that the function gets put as a property of func, and it's scope
-    // tqcontains the func as well as our current scope
+    // contains the func as well as our current scope
     Object oldVar = ctx->variableObject();
     ctx->setVariableObject(func);
     ctx->pushScope(func);
diff --git a/kjs/number_object.cpp b/kjs/number_object.cpp
index b7d20a299..0d6698142 100644
--- a/kjs/number_object.cpp
+++ b/kjs/number_object.cpp
@@ -156,7 +156,7 @@ Value NumberProtoFuncImp::call(ExecState *exec, Object &thisObj, const List &arg
       const char digits[] = "0123456789abcdefghijklmnopqrstuvwxyz";
       // INT_MAX results in 1024 characters left of the dot with radix 2
       // give the same space on the right side. safety checks are in place
-      // unless someone tqfinds a precise rule.
+      // unless someone finds a precise rule.
       char s[2048 + 3];
       double x = v.toNumber(exec);
       if (isNaN(x) || isInf(x))
diff --git a/kjs/object.cpp b/kjs/object.cpp
index 0e0d0f966..fba1e0257 100644
--- a/kjs/object.cpp
+++ b/kjs/object.cpp
@@ -234,7 +234,7 @@ bool ObjectImp::canPut(ExecState *, const Identifier &propertyName) const
     return!(attributes & ReadOnly);
 
   // Look in the static hashtable of properties
-  const HashEntry* e = tqfindPropertyHashEntry(propertyName);
+  const HashEntry* e = findPropertyHashEntry(propertyName);
   if (e)
     return !(e->attr & ReadOnly);
 
@@ -250,7 +250,7 @@ bool ObjectImp::hasProperty(ExecState *exec, const Identifier &propertyName) con
     return true;
 
   // Look in the static hashtable of properties
-  if (tqfindPropertyHashEntry(propertyName))
+  if (findPropertyHashEntry(propertyName))
       return true;
 
   // non-standard netscape extension
@@ -280,7 +280,7 @@ bool ObjectImp::deleteProperty(ExecState * /*exec*/, const Identifier &propertyN
   }
 
   // Look in the static hashtable of properties
-  const HashEntry* entry = tqfindPropertyHashEntry(propertyName);
+  const HashEntry* entry = findPropertyHashEntry(propertyName);
   if (entry && entry->attr & DontDelete)
     return false; // this builtin property can't be deleted
   return true;
@@ -351,7 +351,7 @@ Value ObjectImp::defaultValue(ExecState *exec, Type hint) const
   return err;
 }
 
-const HashEntry* ObjectImp::tqfindPropertyHashEntry( const Identifier& propertyName ) const
+const HashEntry* ObjectImp::findPropertyHashEntry( const Identifier& propertyName ) const
 {
   const ClassInfo *info = classInfo();
   while (info) {
diff --git a/kjs/object.h b/kjs/object.h
index 49c637866..ca795460c 100644
--- a/kjs/object.h
+++ b/kjs/object.h
@@ -602,7 +602,7 @@ namespace KJS {
   protected:
     PropertyMap _prop;
   private:
-    const HashEntry* tqfindPropertyHashEntry( const Identifier& propertyName ) const;
+    const HashEntry* findPropertyHashEntry( const Identifier& propertyName ) const;
     ObjectImpPrivate *_od;
     ValueImp *_proto;
     ValueImp *_internalValue;
diff --git a/kjs/object_object.cpp b/kjs/object_object.cpp
index c429b96a0..e17835df6 100644
--- a/kjs/object_object.cpp
+++ b/kjs/object_object.cpp
@@ -119,7 +119,7 @@ Value ObjectProtoFuncImp::call(ExecState *exec, Object &thisObj, const List &arg
     if (propertyName == specialPrototypePropertyName)
       return Value(BooleanImp::staticFalse);
 
-    const HashEntry *entry = obj->tqfindPropertyHashEntry(propertyName);
+    const HashEntry *entry = obj->findPropertyHashEntry(propertyName);
     return Value((entry && !(entry->attr & DontEnum)) ?
 		 BooleanImp::staticTrue : BooleanImp::staticFalse);
   }
diff --git a/kjs/reference.cpp b/kjs/reference.cpp
index fdb4dea3b..778db8a53 100644
--- a/kjs/reference.cpp
+++ b/kjs/reference.cpp
@@ -124,7 +124,7 @@ Value Reference::getValue(ExecState *exec) const
   Value o = getBase(exec);
 
   if (!o.isValid() || o.type() == NullType) {
-    UString m = I18N_NOOP("Can't tqfind variable: ") + getPropertyName(exec).ustring();
+    UString m = I18N_NOOP("Can't find variable: ") + getPropertyName(exec).ustring();
     Object err = Error::create(exec, ReferenceError, m.ascii());
     exec->setException(err);
     return err;
diff --git a/kjs/regexp.cpp b/kjs/regexp.cpp
index 446cc7d3d..06defcc53 100644
--- a/kjs/regexp.cpp
+++ b/kjs/regexp.cpp
@@ -38,7 +38,7 @@ RegExp::UTF8SupportState RegExp::utf8Support = RegExp::Unknown;
 RegExp::RegExp(const UString &p, int f)
   : pat(p), flgs(f), m_notEmpty(false), valid(true), buffer(0), originalPos(0)
 {
-  // Determine whether libpcre has tqunicode support if need be..
+  // Determine whether libpcre has unicode support if need be..
 #ifdef PCRE_CONFIG_UTF8
   if (utf8Support == Unknown) {
     int supported;
@@ -56,7 +56,7 @@ RegExp::RegExp(const UString &p, int f)
   // expects null termination..
   UString intern;
   const char* const nil = "\\x00";
-  if (p.tqfind('\\') >= 0 || p.tqfind(KJS::UChar('\0')) >= 0) {
+  if (p.find('\\') >= 0 || p.find(KJS::UChar('\0')) >= 0) {
     bool escape = false;
     for (int i = 0; i < p.size(); ++i) {
       UChar c = p[i];
@@ -64,13 +64,13 @@ RegExp::RegExp(const UString &p, int f)
         escape = false;
         // we only care about \u
         if (c == 'u') {
-	  // standard tqunicode escape sequence looks like \uxxxx but
+	  // standard unicode escape sequence looks like \uxxxx but
 	  // other browsers also accept less then 4 hex digits
 	  unsigned short u = 0;
 	  int j = 0;
 	  for (j = 0; j < 4; ++j) {
-	    if (i + 1 < p.size() && Lexer::isHexDigit(p[i + 1].tqunicode())) {
-	      u = (u << 4) + Lexer::convertHex(p[i + 1].tqunicode());
+	    if (i + 1 < p.size() && Lexer::isHexDigit(p[i + 1].unicode())) {
+	      u = (u << 4) + Lexer::convertHex(p[i + 1].unicode());
 	      ++i;
 	    } else {
 	      // sequence incomplete. restore index.
@@ -222,7 +222,7 @@ void RegExp::prepareUtf8(const UString& s)
   int  *posOut = originalPos;
   const UChar *d = s.data();
   for (int i = 0; i != length; ++i) {
-    unsigned short c = d[i].tqunicode();
+    unsigned short c = d[i].unicode();
 
     int sequenceLen;
     if (c < 0x80) {
diff --git a/kjs/regexp_object.cpp b/kjs/regexp_object.cpp
index 4b8064644..edd2bbeca 100644
--- a/kjs/regexp_object.cpp
+++ b/kjs/regexp_object.cpp
@@ -234,7 +234,7 @@ int **RegExpObjectImp::registerRegexp( const RegExp* re, const UString& s )
 Object RegExpObjectImp::arrayOfMatches(ExecState *exec, const UString &result) const
 {
   List list;
-  // The returned array tqcontains 'result' as first item, followed by the list of matches
+  // The returned array contains 'result' as first item, followed by the list of matches
   list.append(String(result));
   if ( lastOvector )
     for ( unsigned int i = 1 ; i < lastNrSubPatterns + 1 ; ++i )
@@ -292,7 +292,7 @@ RegExp* RegExpObjectImp::makeEngine(ExecState *exec, const UString &p, const Val
 
   // Check for validity of flags
   for (int pos = 0; pos < flags.size(); ++pos) {
-    switch (flags[pos].tqunicode()) {
+    switch (flags[pos].unicode()) {
     case 'g':
     case 'i':
     case 'm':
@@ -306,9 +306,9 @@ RegExp* RegExpObjectImp::makeEngine(ExecState *exec, const UString &p, const Val
     }
   }
 
-  bool global = (flags.tqfind("g") >= 0);
-  bool ignoreCase = (flags.tqfind("i") >= 0);
-  bool multiline = (flags.tqfind("m") >= 0);
+  bool global = (flags.find("g") >= 0);
+  bool ignoreCase = (flags.find("i") >= 0);
+  bool multiline = (flags.find("m") >= 0);
 
   int reflags = RegExp::None;
   if (global)
diff --git a/kjs/simple_number.h b/kjs/simple_number.h
index cf5d91ef3..1f5830dff 100644
--- a/kjs/simple_number.h
+++ b/kjs/simple_number.h
@@ -33,9 +33,9 @@ namespace KJS {
 
     class SimpleNumber {
     public:
-	enum { tag = 1, shift = 2, tqmask = (1 << shift) - 1, sign = 1L << (sizeof(long) * 8 - 1 ), max = (1L << ((sizeof(long) * 8 - 1) - shift)) - 1, min = -max - 1, imax = (1L << ((sizeof(int) * 8 - 1) - shift)) - 1, imin = -imax - 1 };
+	enum { tag = 1, shift = 2, mask = (1 << shift) - 1, sign = 1L << (sizeof(long) * 8 - 1 ), max = (1L << ((sizeof(long) * 8 - 1) - shift)) - 1, min = -max - 1, imax = (1L << ((sizeof(int) * 8 - 1) - shift)) - 1, imin = -imax - 1 };
 
-	static inline bool is(const ValueImp *imp) { return ((long)imp & tqmask) == tag; }
+	static inline bool is(const ValueImp *imp) { return ((long)imp & mask) == tag; }
 	static inline long value(const ValueImp *imp) { return ((long)imp >> shift) | (((long)imp & sign) ? ~max : 0); }
 
 	static inline bool fits(int i) { return i <= imax && i >= imin; }
diff --git a/kjs/string_object.cpp b/kjs/string_object.cpp
index e7cc22242..b56620a8c 100644
--- a/kjs/string_object.cpp
+++ b/kjs/string_object.cpp
@@ -136,7 +136,7 @@ const ClassInfo StringPrototypeImp::info = {"String", &StringInstanceImp::info,
   indexOf		StringProtoFuncImp::IndexOf	DontEnum|Function	1
   lastIndexOf		StringProtoFuncImp::LastIndexOf	DontEnum|Function	1
   match			StringProtoFuncImp::Match	DontEnum|Function	1
-  tqreplace		StringProtoFuncImp::Replace	DontEnum|Function	2
+  replace		StringProtoFuncImp::Replace	DontEnum|Function	2
   search		StringProtoFuncImp::Search	DontEnum|Function	1
   slice			StringProtoFuncImp::Slice	DontEnum|Function	2
   split			StringProtoFuncImp::Split	DontEnum|Function	2
@@ -266,7 +266,7 @@ Value StringProtoFuncImp::call(ExecState *exec, Object &thisObj, const List &arg
       pos = 0;
     else
       pos = a1.toInteger(exec);
-    d = s.tqfind(u2, pos);
+    d = s.find(u2, pos);
     result = Number(d);
     break;
   case LastIndexOf:
@@ -281,7 +281,7 @@ Value StringProtoFuncImp::call(ExecState *exec, Object &thisObj, const List &arg
       else if (dpos > len)
         dpos = len;
     }
-    result = Number(s.rtqfind(u2, int(dpos)));
+    result = Number(s.rfind(u2, int(dpos)));
     break;
   case Match:
   case Search: {
@@ -296,7 +296,7 @@ Value StringProtoFuncImp::call(ExecState *exec, Object &thisObj, const List &arg
     { /*
        *  ECMA 15.5.4.12 String.prototype.search (regexp)
        *  If regexp is not an object whose [[Class]] property is "RegExp", it is
-       *  tqreplaced with the result of the expression new RegExp(regexp).
+       *  replaced with the result of the expression new RegExp(regexp).
        */
       reg = tmpReg = new RegExp(a0.toString(exec), RegExp::None);
     }
@@ -352,7 +352,7 @@ Value StringProtoFuncImp::call(ExecState *exec, Object &thisObj, const List &arg
       if ( a1.type() == ObjectType && a1.toObject(exec).implementsCall() )
         o1 = a1.toObject(exec);
       else
-        u3 = a1.toString(exec); // 2nd arg is the tqreplacement string
+        u3 = a1.toString(exec); // 2nd arg is the replacement string
 
       UString out;
 
@@ -368,13 +368,13 @@ Value StringProtoFuncImp::call(ExecState *exec, Object &thisObj, const List &arg
         len = mstr.size();
 
         UString rstr;
-        // Prepare tqreplacement
+        // Prepare replacement
         if (!o1.isValid())
         {
           rstr = u3;
           bool ok;
           // check if u3 matches $1 or $2 etc
-          for (int i = 0; (i = rstr.tqfind(UString("$"), i)) != -1; i++) {
+          for (int i = 0; (i = rstr.find(UString("$"), i)) != -1; i++) {
             if (i+1<rstr.size() && rstr[i+1] == '$') {  // "$$" -> "$"
               rstr = rstr.substr(0,i) + "$" + rstr.substr(i+2);
               continue;
@@ -408,7 +408,7 @@ Value StringProtoFuncImp::call(ExecState *exec, Object &thisObj, const List &arg
         if (pos != lastIndex)
           out += s.substr(lastIndex, pos - lastIndex);
 
-        // Append the tqreplacement..
+        // Append the replacement..
         out += rstr;
 
         lastIndex = pos + len; // Skip over the matched stuff...
@@ -425,9 +425,9 @@ Value StringProtoFuncImp::call(ExecState *exec, Object &thisObj, const List &arg
       result = String(out);
     } else { // First arg is a string
       u2 = a0.toString(exec);
-      pos = s.tqfind(u2);
+      pos = s.find(u2);
       len = u2.size();
-      // Do the tqreplacement
+      // Do the replacement
       if (pos == -1)
         result = String(s);
       else {
@@ -505,7 +505,7 @@ Value StringProtoFuncImp::call(ExecState *exec, Object &thisObj, const List &arg
 	    res.put(exec,i++, String(s.substr(p0++, 1)));
 	}
       } else {
-	while (static_cast<uint32_t>(i) != limit && (pos = s.tqfind(u2, p0)) >= 0) {
+	while (static_cast<uint32_t>(i) != limit && (pos = s.find(u2, p0)) >= 0) {
 	  res.put(exec,i, String(s.substr(p0, pos-p0)));
 	  p0 = pos + u2.size();
 	  i++;
diff --git a/kjs/ustring.cpp b/kjs/ustring.cpp
index 92644d009..36f201863 100644
--- a/kjs/ustring.cpp
+++ b/kjs/ustring.cpp
@@ -134,7 +134,7 @@ static int statBufferSize = 0;
 
 UChar UChar::toLower() const
 {
-  // ### properly support tqunicode tolower
+  // ### properly support unicode tolower
   if (uc >= 256)
     return *this;
 
@@ -746,7 +746,7 @@ unsigned int UString::toStrictUInt32(bool *ok) const
   if (len == 0)
     return 0;
   const UChar *p = rep->dat;
-  unsigned short c = p->tqunicode();
+  unsigned short c = p->unicode();
 
   // If the first digit is 0, only 0 itself is OK.
   if (c == '0') {
@@ -782,7 +782,7 @@ unsigned int UString::toStrictUInt32(bool *ok) const
     }
 
     // Get next character.
-    c = (++p)->tqunicode();
+    c = (++p)->unicode();
   }
 }
 
@@ -796,7 +796,7 @@ unsigned UString::toArrayIndex(bool *ok) const
   return i;
 }
 
-int UString::tqfind(const UString &f, int pos) const
+int UString::find(const UString &f, int pos) const
 {
   int sz = size();
   int fsz = f.size();
@@ -818,7 +818,7 @@ int UString::tqfind(const UString &f, int pos) const
   return -1;
 }
 
-int UString::tqfind(UChar ch, int pos) const
+int UString::find(UChar ch, int pos) const
 {
   if (pos < 0)
     pos = 0;
@@ -830,7 +830,7 @@ int UString::tqfind(UChar ch, int pos) const
   return -1;
 }
 
-int UString::rtqfind(const UString &f, int pos) const
+int UString::rfind(const UString &f, int pos) const
 {
   int sz = size();
   int fsz = f.size();
@@ -852,7 +852,7 @@ int UString::rtqfind(const UString &f, int pos) const
   return -1;
 }
 
-int UString::rtqfind(UChar ch, int pos) const
+int UString::rfind(UChar ch, int pos) const
 {
   if (isEmpty())
     return -1;
diff --git a/kjs/ustring.h b/kjs/ustring.h
index f681a726e..0cdfa3f0f 100644
--- a/kjs/ustring.h
+++ b/kjs/ustring.h
@@ -79,7 +79,7 @@ namespace KJS {
     /**
      * @return the 16 bit Unicode value of the character
      */
-    unsigned short tqunicode() const { return uc; }
+    unsigned short unicode() const { return uc; }
   public:
     /**
      * @return The character converted to lower case.
@@ -132,7 +132,7 @@ namespace KJS {
     /**
      * @return Unicode value.
      */
-    unsigned short tqunicode() const { return ref().uc; }
+    unsigned short unicode() const { return ref().uc; }
     /**
      * @return Lower byte.
      */
@@ -158,7 +158,7 @@ namespace KJS {
     int offset;
   };
 
-  inline UChar::UChar(const UCharReference &c) : uc(c.tqunicode()) { }
+  inline UChar::UChar(const UCharReference &c) : uc(c.unicode()) { }
 
   /**
    * @short 8 bit char based string class
@@ -410,15 +410,15 @@ namespace KJS {
      * @return Position of first occurrence of f starting at position pos.
      * -1 if the search was not successful.
      */
-    int tqfind(const UString &f, int pos = 0) const;
-    int tqfind(UChar, int pos = 0) const;
+    int find(const UString &f, int pos = 0) const;
+    int find(UChar, int pos = 0) const;
     /**
      * @return Position of first occurrence of f searching backwards from
      * position pos.
      * -1 if the search was not successful.
      */
-    int rtqfind(const UString &f, int pos) const;
-    int rtqfind(UChar, int pos) const;
+    int rfind(const UString &f, int pos) const;
+    int rfind(UChar, int pos) const;
     /**
      * @return The sub string starting at position pos and length len.
      */
diff --git a/kmdi/kmdi/dockcontainer.cpp b/kmdi/kmdi/dockcontainer.cpp
index 1761e86cd..3455fe1e8 100644
--- a/kmdi/kmdi/dockcontainer.cpp
+++ b/kmdi/kmdi/dockcontainer.cpp
@@ -90,7 +90,7 @@ DockContainer::DockContainer(TQWidget *parent, TQWidget *win, int position, int
 
   m_ws=new TQWidgetStack(this);
 
-  m_ws->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding));
+  m_ws->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding));
 
   if ( (position==KDockWidget::DockLeft) || (position==KDockWidget::DockTop))
   {
@@ -118,7 +118,7 @@ DockContainer::~DockContainer()
   while (m_map.count()) {
     it = m_map.begin();
     KDockWidget *w=it.key();
-      if (m_overlapButtons.tqcontains(w)) {
+      if (m_overlapButtons.contains(w)) {
         (static_cast<KDockWidgetHeader*>(w->getHeader()->qt_cast("KDockWidgetHeader")))->removeButton(m_overlapButtons[w]);
         m_overlapButtons.remove(w);
       }
@@ -164,7 +164,7 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt
 {
   KDockWidget* w = (KDockWidget*) dwdg;
   int tab;
-  bool alreadyThere=m_map.tqcontains(w);
+  bool alreadyThere=m_map.contains(w);
 
   if (alreadyThere)
   {
@@ -181,8 +181,8 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt
     m_revMap.insert(tab,w);
 
 
-    if (((KDockWidget*)tqparentWidget())->mayBeShow())
-      ((KDockWidget*)tqparentWidget())->dockBack();
+    if (((KDockWidget*)parentWidget())->mayBeShow())
+      ((KDockWidget*)parentWidget())->dockBack();
 
     if (w->getHeader()->qt_cast("KDockWidgetHeader"))
     {
@@ -298,7 +298,7 @@ bool DockContainer::eventFilter( TQObject *obj, TQEvent *event )
 }
 
 void DockContainer::showWidget(KDockWidget *w) {
-    if (!m_map.tqcontains(w)) return;
+    if (!m_map.contains(w)) return;
 
     kdDebug()<<"KMDI::DockContainer::<showWidget"<<endl;
     int id=m_map[w];
@@ -337,13 +337,13 @@ void DockContainer::changeOverlapMode()
 void DockContainer::hideIfNeeded() {
   kdDebug(760)<<"************************* hideIfNeeded *************************"<<endl;
   if (!itemNames.count())
-    ((KDockWidget*)tqparentWidget())->undock();
+    ((KDockWidget*)parentWidget())->undock();
 }
 
 void DockContainer::removeWidget(KDockWidget* dwdg)
 {
     KDockWidget* w = (KDockWidget*) dwdg;
-  if (!m_map.tqcontains(w)) return;
+  if (!m_map.contains(w)) return;
   int id=m_map[w];
   if (m_tb->isTabRaised(id)) {
     //why do we hide the tab if we're just going
@@ -356,7 +356,7 @@ void DockContainer::removeWidget(KDockWidget* dwdg)
   m_ws->removeWidget(w);
   m_map.remove(w);
   m_revMap.remove(id);
-  if (m_overlapButtons.tqcontains(w)) {
+  if (m_overlapButtons.contains(w)) {
     (static_cast<KDockWidgetHeader*>(w->getHeader()->qt_cast("KDockWidgetHeader")))->removeButton(m_overlapButtons[w]);
     m_overlapButtons.remove(w);
   }
@@ -365,14 +365,14 @@ void DockContainer::removeWidget(KDockWidget* dwdg)
   tabCaptions.remove(w->name());
   tabTooltips.remove(w->name());
   if (!itemNames.count())
-    ((KDockWidget*)tqparentWidget())->undock();
+    ((KDockWidget*)parentWidget())->undock();
 }
 
 void DockContainer::undockWidget(KDockWidget *dwdg)
 {
   KDockWidget* w = (KDockWidget*) dwdg;
 
-  if (!m_map.tqcontains(w))
+  if (!m_map.contains(w))
     return;
 
   int id=m_map[w];
@@ -631,7 +631,7 @@ void DockContainer::toggle() {
 
 void DockContainer::prevToolView() {
     TQPtrList<KMultiTabBarTab>* tabs=m_tb->tabs();
-    int pos=tabs->tqfindRef(m_tb->tab(oldtab));
+    int pos=tabs->findRef(m_tb->tab(oldtab));
     if (pos==-1) return;
     pos--;
     if (pos<0) pos=tabs->count()-1;
@@ -643,7 +643,7 @@ void DockContainer::prevToolView() {
 
 void DockContainer::nextToolView() {
     TQPtrList<KMultiTabBarTab>* tabs=m_tb->tabs();
-    int pos=tabs->tqfindRef(m_tb->tab(oldtab));
+    int pos=tabs->findRef(m_tb->tab(oldtab));
     if (pos==-1) return;
     pos++;
     if (pos>=(int)tabs->count()) pos=0;
@@ -655,4 +655,4 @@ void DockContainer::nextToolView() {
 
 }
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kmdi/kmdi/dockcontainer.h b/kmdi/kmdi/dockcontainer.h
index 7a1c8ae9d..ac27f8644 100644
--- a/kmdi/kmdi/dockcontainer.h
+++ b/kmdi/kmdi/dockcontainer.h
@@ -141,4 +141,4 @@ class DockContainer: public TQWidget, public KDockContainer
 
 #endif
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kmdi/kmdi/guiclient.cpp b/kmdi/kmdi/guiclient.cpp
index d034db948..882916f30 100644
--- a/kmdi/kmdi/guiclient.cpp
+++ b/kmdi/kmdi/guiclient.cpp
@@ -68,7 +68,7 @@ GUIClient::GUIClient (KMDI::MainWindow* mdiMainFrm,const char* name)
 
   if ( domDocument().documentElement().isNull() )
   {
-    TQString completeDescription = TQString::tqfromLatin1( guiDescription ).arg( actionListName );
+    TQString completeDescription = TQString::fromLatin1( guiDescription ).arg( actionListName );
 
     setXML( completeDescription, false /*merge*/ );
   }
@@ -227,4 +227,4 @@ void ToggleToolViewAction::slotWidgetDestroyed()
 
 }
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kmdi/kmdi/guiclient.h b/kmdi/kmdi/guiclient.h
index 196da3fd6..c3784fe6e 100644
--- a/kmdi/kmdi/guiclient.h
+++ b/kmdi/kmdi/guiclient.h
@@ -100,4 +100,4 @@ class ToggleToolViewAction:public KToggleAction
 
 #endif
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kmdi/kmdi/mainwindow.cpp b/kmdi/kmdi/mainwindow.cpp
index 6976887de..d6e332780 100644
--- a/kmdi/kmdi/mainwindow.cpp
+++ b/kmdi/kmdi/mainwindow.cpp
@@ -97,8 +97,8 @@ namespace KMDI
 {
 
 //============ constructor ============//
-MainWindow::MainWindow(TQWidget* tqparentWidget, const char* name)
- : KParts::DockMainWindow( tqparentWidget, name)
+MainWindow::MainWindow(TQWidget* parentWidget, const char* name)
+ : KParts::DockMainWindow( parentWidget, name)
  , m_toolViews (new TQMap<TQWidget*,KMDI::ToolViewAccessor*>)
  , d(new KMDIPrivate::MainWindowPrivate())
 {
@@ -156,19 +156,19 @@ void MainWindow::setupToolViews ()
     w=static_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent());
   }
 
-  TQPtrList<KDockWidget> leftRetqparentWidgets;
-  TQPtrList<KDockWidget> rightRetqparentWidgets;
-  TQPtrList<KDockWidget> bottomRetqparentWidgets;
-  TQPtrList<KDockWidget> topRetqparentWidgets;
+  TQPtrList<KDockWidget> leftReparentWidgets;
+  TQPtrList<KDockWidget> rightReparentWidgets;
+  TQPtrList<KDockWidget> bottomReparentWidgets;
+  TQPtrList<KDockWidget> topReparentWidgets;
 
   if (mainDock->parentDockTabGroup()) {
     mainDock=static_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent());
   }
 
-  tqfindToolViewsDockedToMain(&leftRetqparentWidgets,KDockWidget::DockLeft);
-  tqfindToolViewsDockedToMain(&rightRetqparentWidgets,KDockWidget::DockRight);
-  tqfindToolViewsDockedToMain(&bottomRetqparentWidgets,KDockWidget::DockBottom);
-  tqfindToolViewsDockedToMain(&topRetqparentWidgets,KDockWidget::DockTop);
+  findToolViewsDockedToMain(&leftReparentWidgets,KDockWidget::DockLeft);
+  findToolViewsDockedToMain(&rightReparentWidgets,KDockWidget::DockRight);
+  findToolViewsDockedToMain(&bottomReparentWidgets,KDockWidget::DockBottom);
+  findToolViewsDockedToMain(&topReparentWidgets,KDockWidget::DockTop);
 
   mainDock->setEnableDocking(KDockWidget::DockNone); //::DockCorner);
   mainDock->setDockSite(KDockWidget::DockCorner);
@@ -220,10 +220,10 @@ void MainWindow::setupToolViews ()
   m_topContainer->setDockSite( KDockWidget::DockCenter );
   m_bottomContainer->setDockSite( KDockWidget::DockCenter );
 
-  dockToolViewsIntoContainers(leftRetqparentWidgets,m_leftContainer);
-  dockToolViewsIntoContainers(rightRetqparentWidgets,m_rightContainer);
-  dockToolViewsIntoContainers(bottomRetqparentWidgets,m_bottomContainer);
-  dockToolViewsIntoContainers(topRetqparentWidgets,m_topContainer);
+  dockToolViewsIntoContainers(leftReparentWidgets,m_leftContainer);
+  dockToolViewsIntoContainers(rightReparentWidgets,m_rightContainer);
+  dockToolViewsIntoContainers(bottomReparentWidgets,m_bottomContainer);
+  dockToolViewsIntoContainers(topReparentWidgets,m_topContainer);
 
   dockManager->setSpecialLeftDockContainer(m_leftContainer);
   dockManager->setSpecialRightDockContainer(m_rightContainer);
@@ -273,7 +273,7 @@ KMDI::ToolViewAccessor *MainWindow::addToolWindow( TQWidget* pWnd, KDockWidget::
     pWnd=pDW;
   }
 
-  TQRect r=pWnd->tqgeometry();
+  TQRect r=pWnd->geometry();
 
   KMDI::ToolViewAccessor *mtva=new KMDI::ToolViewAccessor(this,pWnd,tabToolTip,(tabCaption==0)?pWnd->caption():tabCaption);
   m_toolViews->insert(tvta,mtva);
@@ -302,7 +302,7 @@ void MainWindow::deleteToolWindow( TQWidget* pWnd)
   if (!pWnd)
     return;
 
-  if (m_toolViews->tqcontains(pWnd)) {
+  if (m_toolViews->contains(pWnd)) {
     deleteToolWindow((*m_toolViews)[pWnd]);
   }
 }
@@ -370,14 +370,14 @@ void MainWindow::dockToolViewsIntoContainers(TQPtrList<KDockWidget>& widgetsToRe
   }
 }
 
-void MainWindow::tqfindToolViewsDockedToMain(TQPtrList<KDockWidget>* list,KDockWidget::DockPosition dprtmw) {
+void MainWindow::findToolViewsDockedToMain(TQPtrList<KDockWidget>* list,KDockWidget::DockPosition dprtmw) {
   KDockWidget *mainDock=getMainDockWidget();
   if (mainDock->parentDockTabGroup()) {
     mainDock=dynamic_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent());
     // FIXME: will likely crash below due to unchecked cast
   }
 
-  KDockWidget* widget=mainDock->tqfindNearestDockWidget(dprtmw);
+  KDockWidget* widget=mainDock->findNearestDockWidget(dprtmw);
   if (widget) {
     if (widget->parentDockTabGroup()) {
       widget=static_cast<KDockWidget*>(widget->parentDockTabGroup()->parent());
@@ -448,4 +448,4 @@ void MainWindow::nextToolViewInDock() {
 
 }
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kmdi/kmdi/mainwindow.h b/kmdi/kmdi/mainwindow.h
index d0003e579..d7351a330 100644
--- a/kmdi/kmdi/mainwindow.h
+++ b/kmdi/kmdi/mainwindow.h
@@ -79,7 +79,7 @@ class KMDI_EXPORT MainWindow : public KParts::DockMainWindow
     /**
      * Constructor.
      */
-    MainWindow ( TQWidget* tqparentWidget, const char* name = "");
+    MainWindow ( TQWidget* parentWidget, const char* name = "");
 
     /**
      * Destructor.
@@ -141,7 +141,7 @@ class KMDI_EXPORT MainWindow : public KParts::DockMainWindow
     void collapseOverlapContainers();
 
   protected:
-    void tqfindToolViewsDockedToMain(TQPtrList<KDockWidget>* list,KDockWidget::DockPosition dprtmw);
+    void findToolViewsDockedToMain(TQPtrList<KDockWidget>* list,KDockWidget::DockPosition dprtmw);
     void dockToolViewsIntoContainers(TQPtrList<KDockWidget>& widgetsToReparent,KDockWidget *container);
 
   private:
@@ -196,4 +196,4 @@ class KMDI_EXPORT MainWindow : public KParts::DockMainWindow
 
 #endif //_MainWindow_H_
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kmdi/kmdi/tabwidget.cpp b/kmdi/kmdi/tabwidget.cpp
index 98a756cd6..0d21bd2ea 100644
--- a/kmdi/kmdi/tabwidget.cpp
+++ b/kmdi/kmdi/tabwidget.cpp
@@ -182,7 +182,7 @@ void TabWidget::insertTab ( TQWidget * child, const TQString & label, int index)
   KTabWidget::insertTab(child,label,index);
   showPage(child);
   maybeShow();
-  tabBar()->tqrepaint();
+  tabBar()->repaint();
 }
 
 void TabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label, int index )
@@ -190,7 +190,7 @@ void TabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const T
   KTabWidget::insertTab(child,iconset,label,index);
   showPage(child);
   maybeShow();
-  tabBar()->tqrepaint();
+  tabBar()->repaint();
 }
 
 void TabWidget::insertTab ( TQWidget * child, TQTab * tab, int index)
@@ -198,7 +198,7 @@ void TabWidget::insertTab ( TQWidget * child, TQTab * tab, int index)
   KTabWidget::insertTab(child,tab,index);
   showPage(child);
   maybeShow();
-  tabBar()->tqrepaint();
+  tabBar()->repaint();
 }
 
 void TabWidget::removePage ( TQWidget * w )
@@ -281,4 +281,4 @@ KMDI::TabWidgetVisibility TabWidget::tabWidgetVisibility( ) const
 
 }
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kmdi/kmdi/tabwidget.h b/kmdi/kmdi/tabwidget.h
index d44d4bd4a..04e8f3c20 100644
--- a/kmdi/kmdi/tabwidget.h
+++ b/kmdi/kmdi/tabwidget.h
@@ -112,4 +112,4 @@ class KMDI_EXPORT TabWidget : public KTabWidget
 
 #endif
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kmdi/kmdi/toolviewaccessor.cpp b/kmdi/kmdi/toolviewaccessor.cpp
index 01523a423..21f621ec5 100644
--- a/kmdi/kmdi/toolviewaccessor.cpp
+++ b/kmdi/kmdi/toolviewaccessor.cpp
@@ -184,16 +184,16 @@ void ToolViewAccessor::place(KDockWidget::DockPosition pos, TQWidget* pTargetWnd
         // this is not inheriting TQWidget*, its plain impossible that this condition is true
         //if (pTargetWnd == this) DockToOurself = true;
         if (!DockToOurself) if(pTargetWnd != 0L) {
-            pTargetDock = mdiMainFrm->dockManager->tqfindWidgetParentDock( pTargetWnd);
+            pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd);
             if (!pTargetDock) {
-                if (pTargetWnd->tqparentWidget()) {
-                    pTargetDock = mdiMainFrm->dockManager->tqfindWidgetParentDock( pTargetWnd->tqparentWidget());
+                if (pTargetWnd->parentWidget()) {
+                    pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd->parentWidget());
                 }
             }
         }
       /*  if (!pTargetDock || pTargetWnd == mdiMainFrm->getMainDockWidget()) {
             if (mdiMainFrm->m_managedDockPositionMode && (mdiMainFrm->m_pMdi || mdiMainFrm->m_documentTabWidget)) {
-                KDockWidget *dw1=pTargetDock->tqfindNearestDockWidget(pos);
+                KDockWidget *dw1=pTargetDock->findNearestDockWidget(pos);
                 if (dw1)
                     pCover->manualDock(dw1,KDockWidget::DockCenter,percent);
                 else
@@ -220,4 +220,4 @@ void ToolViewAccessor::show() {
 
 }
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kmdi/kmdi/toolviewaccessor.h b/kmdi/kmdi/toolviewaccessor.h
index d92da19a8..180ba56a3 100644
--- a/kmdi/kmdi/toolviewaccessor.h
+++ b/kmdi/kmdi/toolviewaccessor.h
@@ -37,7 +37,7 @@ namespace KMDI {
 
 class MainWindow;
 
-class ToolViewAccessor : public TQObject
+class ToolViewAccessor : public QObject
 {
    Q_OBJECT
 
@@ -85,4 +85,4 @@ protected:
 
 #endif //_KMDITOOLVIEWACCESSOR_H_
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kmdi/kmdi/toolviewaccessor_p.h b/kmdi/kmdi/toolviewaccessor_p.h
index ab349e3ab..71ffb286a 100644
--- a/kmdi/kmdi/toolviewaccessor_p.h
+++ b/kmdi/kmdi/toolviewaccessor_p.h
@@ -55,6 +55,6 @@ class ToolViewAccessorPrivate
 
 #endif
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
 
 
diff --git a/kmdi/kmdichildarea.cpp b/kmdi/kmdichildarea.cpp
index 8d28b3091..923b55372 100644
--- a/kmdi/kmdichildarea.cpp
+++ b/kmdi/kmdichildarea.cpp
@@ -75,11 +75,11 @@ void KMdiChildArea::manageChild( KMdiChildFrm* child, bool show, bool cascade )
 	KMdiChildFrm* top = topChild();
 	
 	//remove old references. There can be more than one so we remove them all
-	if ( m_pZ->tqfindRef( child ) != -1 )
+	if ( m_pZ->findRef( child ) != -1 )
 	{
-		//TQPtrList::tqfind* moves current() to the found item
+		//TQPtrList::find* moves current() to the found item
 		m_pZ->take(); 
-		while ( m_pZ->tqfindNextRef( child ) != -1 )
+		while ( m_pZ->findNextRef( child ) != -1 )
 			m_pZ->take();
 	}
 
@@ -240,7 +240,7 @@ void KMdiChildArea::resizeEvent( TQResizeEvent* e )
 		               height() + child->m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR + KMDI_CHILDFRM_DOUBLE_BORDER );
 
 	}
-	tqlayoutMinimizedChildren();
+	layoutMinimizedChildren();
 	TQWidget::resizeEvent( e );
 }
 
@@ -318,8 +318,8 @@ TQPoint KMdiChildArea::getCascadePoint( int indexOfWindow )
 
 void KMdiChildArea::childMinimized( KMdiChildFrm *minimizedChild, bool wasMaximized )
 {
-	//can't tqfind the child in our list, so we don't care.
-	if ( m_pZ->tqfindRef( minimizedChild ) == -1 )
+	//can't find the child in our list, so we don't care.
+	if ( m_pZ->findRef( minimizedChild ) == -1 )
 	{
 		kdDebug( 760 ) << k_funcinfo << "child was minimized but wasn't in our list!" << endl;
 		return;
@@ -420,10 +420,10 @@ void KMdiChildArea::cascadeMaximized()
 			childFrm->move( pnt );
 			TQSize curSize( width() - pnt.x(), height() - pnt.y() );
 			
-			if ( ( childFrm->tqminimumSize().width() > curSize.width() ) ||
-			     ( childFrm->tqminimumSize().height() > curSize.height() ) )
+			if ( ( childFrm->minimumSize().width() > curSize.width() ) ||
+			     ( childFrm->minimumSize().height() > curSize.height() ) )
 			{
-				childFrm->resize( childFrm->tqminimumSize() );
+				childFrm->resize( childFrm->minimumSize() );
 			}
 			else
 				childFrm->resize( curSize );
@@ -607,7 +607,7 @@ void KMdiChildArea::tileAnodine()
 		return ;
 	
 	int numCols = int( sqrt( ( double ) numVisible ) ); // set columns to square root of visible count
-	// create an array to form grid tqlayout
+	// create an array to form grid layout
 	int *numRows = new int[ numCols ];
 	int numCurCol = 0;
 	
@@ -720,7 +720,7 @@ void KMdiChildArea::tileVertically()
 }
 
 
-void KMdiChildArea::tqlayoutMinimizedChildren()
+void KMdiChildArea::layoutMinimizedChildren()
 {
 	int posX = 0;
 	int posY = height();
@@ -738,7 +738,7 @@ void KMdiChildArea::tqlayoutMinimizedChildren()
 			}
 			
 			child->move( posX, posY - child->height() );
-			posX = child->tqgeometry().right();
+			posX = child->geometry().right();
 		}
 	}
 }
@@ -786,4 +786,4 @@ void KMdiChildArea::getCaptionColors( const TQPalette& /*pal*/, TQColor& activeB
 	inactiveFG = KGlobalSettings::inactiveTextColor();
 }
 
-// kate: space-indent off; tqreplace-tabs off; tab-width 4; indent-mode csands;
+// kate: space-indent off; replace-tabs off; tab-width 4; indent-mode csands;
diff --git a/kmdi/kmdichildarea.h b/kmdi/kmdichildarea.h
index dac64cff4..37ce3336f 100644
--- a/kmdi/kmdichildarea.h
+++ b/kmdi/kmdichildarea.h
@@ -154,31 +154,31 @@ public:
 
 	/**
 	 * Sets the MDI childframe window caption font
-	 * A retqlayout does not occur when using this function
+	 * A relayout does not occur when using this function
 	 */
 	void setMdiCaptionFont( const TQFont &fnt );
 
 	/**
 	 * Sets the foreground color of the active MDI childframe window caption
-	 * A retqlayout does not occur when using this function
+	 * A relayout does not occur when using this function
 	 */
 	void setMdiCaptionActiveForeColor( const TQColor &clr );
 
 	/**
 	 * Sets the background color of the active MDI childframe window captions
-	 * A retqlayout does not occur when using this function
+	 * A relayout does not occur when using this function
 	 */
 	void setMdiCaptionActiveBackColor( const TQColor &clr );
 
 	/**
 	 * Sets the foreground color of inactive MDI childframe window captions
-	 * A retqlayout does not occur when using this function
+	 * A relayout does not occur when using this function
 	 */
 	void setMdiCaptionInactiveForeColor( const TQColor &clr );
 
 	/**
 	 * Sets the background color of inactive MDI childframe window captions
-	 * A retqlayout does not occur when using this function
+	 * A relayout does not occur when using this function
 	 */
 	void setMdiCaptionInactiveBackColor( const TQColor &clr );
 
@@ -237,9 +237,9 @@ public slots:
 	void tileVertically();
 
 	/**
-	 * Position and tqlayout the minimized child frames
+	 * Position and layout the minimized child frames
 	 */
-	void tqlayoutMinimizedChildren();
+	void layoutMinimizedChildren();
 
 protected:
 
@@ -249,7 +249,7 @@ protected:
 	void tileAllInternal( int maxWnds );
 
 	/**
-	 * Automatically resizes a maximized MDI view and tqlayouts the positions of minimized MDI views.
+	 * Automatically resizes a maximized MDI view and layouts the positions of minimized MDI views.
 	 */
 	virtual void resizeEvent( TQResizeEvent * );
 
diff --git a/kmdi/kmdichildfrm.cpp b/kmdi/kmdichildfrm.cpp
index e663a33ea..f471cf6c3 100644
--- a/kmdi/kmdichildfrm.cpp
+++ b/kmdi/kmdichildfrm.cpp
@@ -278,7 +278,7 @@ void KMdiChildFrm::mouseMoveEvent( TQMouseEvent *e )
 	if ( !m_pClient )
 		return;
 	
-	if ( m_pClient->tqminimumSize() == m_pClient->tqmaximumSize() )
+	if ( m_pClient->minimumSize() == m_pClient->maximumSize() )
 		return; 
 
 	if ( m_bResizing )
@@ -286,7 +286,7 @@ void KMdiChildFrm::mouseMoveEvent( TQMouseEvent *e )
 		if ( !( e->state() & RightButton ) && !( e->state() & MidButton ) )
 		{
 			// same as: if no button or left button pressed
-			TQPoint p = tqparentWidget()->mapFromGlobal( e->globalPos() );
+			TQPoint p = parentWidget()->mapFromGlobal( e->globalPos() );
 			resizeWindow( m_iResizeCorner, p.x(), p.y() );
 		}
 		else
@@ -329,11 +329,11 @@ void KMdiChildFrm::resizeWindow( int resizeCorner, int xPos, int yPos )
 	// it could be the client forces the childframe to enlarge its minimum size
 	if ( m_pClient )
 	{
-		minWidth = m_pClient->tqminimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER;
-		minHeight = m_pClient->tqminimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
+		minWidth = m_pClient->minimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER;
+		minHeight = m_pClient->minimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
 		            m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR;
-		maxWidth = m_pClient->tqmaximumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER;
-		maxHeight = m_pClient->tqmaximumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
+		maxWidth = m_pClient->maximumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER;
+		maxHeight = m_pClient->maximumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
 		            m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR;
 	}
 	
@@ -521,22 +521,22 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
 		case Maximized:
 			m_pClient->m_stateChanged = true;
 			m_state = state;
-			// client min / max size / tqlayout behavior don't change
+			// client min / max size / layout behavior don't change
 			// set frame max size indirectly by setting the clients max size to
 			// it's current value (calls setMaxSize() of frame)
-			m_pClient->setMaximumSize( m_pClient->tqmaximumSize().width(), m_pClient->tqmaximumSize().height() );
+			m_pClient->setMaximumSize( m_pClient->maximumSize().width(), m_pClient->maximumSize().height() );
 			m_pMaximize->setPixmap( *m_pMaxButtonPixmap );
 			setGeometry( m_restoredRect );
 			break;
 		case Minimized:
 			m_pClient->m_stateChanged = true;
 			m_state = state;
-			// restore client min / max size / tqlayout behavior
+			// restore client min / max size / layout behavior
 			m_pClient->setMinimumSize( m_oldClientMinSize.width(), m_oldClientMinSize.height() );
 			m_pClient->setMaximumSize( m_oldClientMaxSize.width(), m_oldClientMaxSize.height() );
-			if ( m_pClient->tqlayout() != 0L )
+			if ( m_pClient->layout() != 0L )
 			{
-				m_pClient->tqlayout() ->setResizeMode( m_oldLayoutResizeMode );
+				m_pClient->layout() ->setResizeMode( m_oldLayoutResizeMode );
 			}
 			m_pMinimize->setPixmap( *m_pMinButtonPixmap );
 			m_pMaximize->setPixmap( *m_pMaxButtonPixmap );
@@ -555,12 +555,12 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
 			{
 				m_pClient->m_stateChanged = true;
 				m_state = state;
-				// restore client min / max size / tqlayout behavior
+				// restore client min / max size / layout behavior
 				m_pClient->setMinimumSize( m_oldClientMinSize.width(), m_oldClientMinSize.height() );
 				m_pClient->setMaximumSize( m_oldClientMaxSize.width(), m_oldClientMaxSize.height() );
-				if ( m_pClient->tqlayout() != 0L )
+				if ( m_pClient->layout() != 0L )
 				{
-					m_pClient->tqlayout() ->setResizeMode( m_oldLayoutResizeMode );
+					m_pClient->layout() ->setResizeMode( m_oldLayoutResizeMode );
 				}
 				setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX );
 				// reset to maximize-captionbar
@@ -581,7 +581,7 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
 			{
 				m_pClient->m_stateChanged = true;
 				m_state = state;
-				// client min / max size / tqlayout behavior don't change
+				// client min / max size / layout behavior don't change
 				setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX );
 				m_pMaximize->setPixmap( *m_pRestoreButtonPixmap );
 				int nFrameWidth = KMDI_CHILDFRM_DOUBLE_BORDER;
@@ -590,7 +590,7 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
 				TQRect maximizedFrmRect( -m_pClient->x(), -m_pClient->y(),
 				                        m_pManager->width() + nFrameWidth,
 				                        m_pManager->height() + nFrameHeight );
-				if ( tqgeometry() != maximizedFrmRect )
+				if ( geometry() != maximizedFrmRect )
 				{
 					setGeometry( maximizedFrmRect );
 				}
@@ -607,18 +607,18 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
 		case Maximized:
 			m_pClient->m_stateChanged = true;
 			m_state = state;
-			// save client min / max size / tqlayout behavior
-			m_oldClientMinSize = m_pClient->tqminimumSize();
-			m_oldClientMaxSize = m_pClient->tqmaximumSize();
-			if ( m_pClient->tqlayout() != 0L )
+			// save client min / max size / layout behavior
+			m_oldClientMinSize = m_pClient->minimumSize();
+			m_oldClientMaxSize = m_pClient->maximumSize();
+			if ( m_pClient->layout() != 0L )
 			{
-				m_oldLayoutResizeMode = m_pClient->tqlayout() ->resizeMode();
+				m_oldLayoutResizeMode = m_pClient->layout() ->resizeMode();
 			}
 			m_pClient->setMinimumSize( 0, 0 );
 			m_pClient->setMaximumSize( 0, 0 );
-			if ( m_pClient->tqlayout() != 0L )
+			if ( m_pClient->layout() != 0L )
 			{
-				m_pClient->tqlayout() ->setResizeMode( TQLayout::FreeResize );
+				m_pClient->layout() ->setResizeMode( TQLayout::FreeResize );
 			}
 			switchToMinimizeLayout();
 			m_pManager->childMinimized( this, true );
@@ -626,19 +626,19 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
 		case Normal:
 			m_pClient->m_stateChanged = true;
 			m_state = state;
-			// save client min / max size / tqlayout behavior
-			m_oldClientMinSize = m_pClient->tqminimumSize();
-			m_oldClientMaxSize = m_pClient->tqmaximumSize();
-			if ( m_pClient->tqlayout() != 0L )
+			// save client min / max size / layout behavior
+			m_oldClientMinSize = m_pClient->minimumSize();
+			m_oldClientMaxSize = m_pClient->maximumSize();
+			if ( m_pClient->layout() != 0L )
 			{
-				m_oldLayoutResizeMode = m_pClient->tqlayout() ->resizeMode();
+				m_oldLayoutResizeMode = m_pClient->layout() ->resizeMode();
 			}
-			m_restoredRect = tqgeometry();
+			m_restoredRect = geometry();
 			m_pClient->setMinimumSize( 0, 0 );
 			m_pClient->setMaximumSize( 0, 0 );
-			if ( m_pClient->tqlayout() != 0L )
+			if ( m_pClient->layout() != 0L )
 			{
-				m_pClient->tqlayout() ->setResizeMode( TQLayout::FreeResize );
+				m_pClient->layout() ->setResizeMode( TQLayout::FreeResize );
 			}
 			switchToMinimizeLayout();
 			m_pManager->childMinimized( this, false );
@@ -694,7 +694,7 @@ void KMdiChildFrm::setCaption( const TQString& text )
 void KMdiChildFrm::enableClose( bool bEnable )
 {
 	m_pClose->setEnabled( bEnable );
-	m_pClose->tqrepaint( false );
+	m_pClose->repaint( false );
 }
 
 //============ setIcon ==================//
@@ -779,8 +779,8 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize )
 	{
 		//reparent to this widget , no flags , point , show it
 		TQPoint pnt2( KMDI_CHILDFRM_BORDER, clientYPos );
-		TQSize mincs = w->tqminimumSize();
-		TQSize maxcs = w->tqmaximumSize();
+		TQSize mincs = w->minimumSize();
+		TQSize maxcs = w->maximumSize();
 		w->setMinimumSize( 0, 0 );
 		w->setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX );
 
@@ -798,11 +798,11 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize )
 	TQObject::connect( m_pClient, TQT_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQT_SIGNAL( nowMaximized( bool ) ) );
 
 	if ( m_pClient->minimumWidth() > m_pManager->m_defaultChildFrmSize.width() )
-		setMinimumWidth( m_pClient->tqminimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER );
+		setMinimumWidth( m_pClient->minimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER );
 
 	if ( m_pClient->minimumHeight() > m_pManager->m_defaultChildFrmSize.height() )
 	{
-		setMinimumHeight( m_pClient->tqminimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
+		setMinimumHeight( m_pClient->minimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
 		                  m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR );
 	}
 }
@@ -826,8 +826,8 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
 	if ( focusedChildWidget != 0 )
 		nameOfFocusedWidget = focusedChildWidget->name();
 
-	TQSize mins = m_pClient->tqminimumSize();
-	TQSize maxs = m_pClient->tqmaximumSize();
+	TQSize mins = m_pClient->minimumSize();
+	TQSize maxs = m_pClient->maximumSize();
 	m_pClient->reparent( 0, 0, mapToGlobal( pos() ) - pos() + positionOffset, isVisible() );
 	m_pClient->setMinimumSize( mins.width(), mins.height() );
 	m_pClient->setMaximumSize( maxs.width(), maxs.height() );
@@ -842,7 +842,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
 	{ // for each found object...
 		TQWidget * widg = ( TQWidget* ) obj;
 		++it;
-		FocusPolicy* pFocPol = pFocPolDict->tqfind( widg->name() ); // remember the focus policy from before the reparent
+		FocusPolicy* pFocPol = pFocPolDict->find( widg->name() ); // remember the focus policy from before the reparent
 		if ( pFocPol )
 			widg->setFocusPolicy( *pFocPol );
 		
@@ -894,7 +894,7 @@ void KMdiChildFrm::linkChildren( TQDict<FocusPolicy>* pFocPolDict )
 	{ // for each found object...
 		TQWidget* widg = ( TQWidget* ) obj;
 		++it;
-		FocusPolicy* pFocPol = pFocPolDict->tqfind( widg->name() ); // remember the focus policy from before the reparent
+		FocusPolicy* pFocPol = pFocPolDict->find( widg->name() ); // remember the focus policy from before the reparent
 		
 		if ( pFocPol != 0 )
 			widg->setFocusPolicy( *pFocPol );
@@ -1105,7 +1105,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
 				{
 					// in case we didn't click on the icon button
 					TQFocusEvent focusEvent( TQFocusEvent::FocusIn );
-					TQApplication::sendEvent( tqApp->mainWidget(), &focusEvent );
+					TQApplication::sendEvent( qApp->mainWidget(), &focusEvent );
 					if ( m_pClient )
 					{
 						m_pClient->updateTimeStamp();
@@ -1284,9 +1284,9 @@ void KMdiChildFrm::showSystemMenu()
 	
 	TQRect iconGeom;
 	if ( KMdiMainFrm::frameDecorOfAttachedViews() == KMdi::Win95Look )
-		iconGeom = m_pWinIcon->tqgeometry();
+		iconGeom = m_pWinIcon->geometry();
 	else
-		iconGeom = m_pUnixIcon->tqgeometry();
+		iconGeom = m_pUnixIcon->geometry();
 	
 	popupmenuPosition = TQPoint( iconGeom.x(), iconGeom.y() + captionHeight() + KMDI_CHILDFRM_BORDER );
 	systemMenu() ->popup( mapToGlobal( popupmenuPosition ) );
@@ -1308,7 +1308,7 @@ void KMdiChildFrm::switchToMinimizeLayout()
 	resize( 300, minimumHeight() );
 
 	// positioning
-	m_pManager->tqlayoutMinimizedChildren();
+	m_pManager->layoutMinimizedChildren();
 }
 
 void KMdiChildFrm::slot_resizeViaSystemMenu()
@@ -1394,7 +1394,7 @@ void KMdiChildFrm::redecorateButtons()
 
 TQRect KMdiChildFrm::mdiAreaContentsRect() const
 {
-	TQFrame * p = ( TQFrame* ) tqparentWidget();
+	TQFrame * p = ( TQFrame* ) parentWidget();
 	if ( p )
 	{
 		return p->contentsRect();
@@ -1406,4 +1406,4 @@ TQRect KMdiChildFrm::mdiAreaContentsRect() const
 	}
 }
 
-// kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off;
+// kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off;
diff --git a/kmdi/kmdichildfrm.h b/kmdi/kmdichildfrm.h
index 88bea1f80..23435479e 100644
--- a/kmdi/kmdichildfrm.h
+++ b/kmdi/kmdichildfrm.h
@@ -124,7 +124,7 @@ class KMdiChildFrmPrivate;
 //==============================================================================
 /**
   * @short Internal class.
-  * It's an MDI child frame widget. It tqcontains a view widget and a frame caption. Usually you derive from its view.
+  * It's an MDI child frame widget. It contains a view widget and a frame caption. Usually you derive from its view.
   */ 
 //------------------------------------------------------------------------------
 class KMDI_EXPORT KMdiChildFrm : public QFrame
@@ -245,12 +245,12 @@ public:
 	TQRect mdiAreaContentsRect() const;
 	
 	/**
-	 * Returns the tqgeometry that will be restored by calling restore().
+	 * Returns the geometry that will be restored by calling restore().
 	 */
 	TQRect restoreGeometry() const;
 	
 	/**
-	 * Sets the tqgeometry that will be restored by calling restore().
+	 * Sets the geometry that will be restored by calling restore().
 	 */
 	void setRestoreGeometry( const TQRect& newRestGeo );
 	
@@ -306,7 +306,7 @@ protected:
 	
 	/**
 	 * Reimplemented from the base class.
-	 * Resizes the captionbar, retqlayouts the position of the system buttons,
+	 * Resizes the captionbar, relayouts the position of the system buttons,
 	 * and calls resize for its embedded KMdiChildView with the proper size
 	 */
 	virtual void resizeEvent( TQResizeEvent * );
@@ -352,7 +352,7 @@ protected:
 	virtual bool eventFilter( TQObject*, TQEvent* ); 
 	
 	/**
-	 * Calculates the new tqgeometry from the new mouse position given as parameters
+	 * Calculates the new geometry from the new mouse position given as parameters
 	 * and calls KMdiChildFrm::setGeometry
 	 */
 	void resizeWindow( int resizeCorner, int x, int y );
@@ -443,4 +443,4 @@ private:
 
 #endif //_KMDICHILDFRM_H_
 
-// kate: space-indent off; tqreplace-tabs off; tab-width 4; indent-mode csands;
+// kate: space-indent off; replace-tabs off; tab-width 4; indent-mode csands;
diff --git a/kmdi/kmdichildfrmcaption.cpp b/kmdi/kmdichildfrmcaption.cpp
index d9b412f35..65d348f30 100644
--- a/kmdi/kmdichildfrmcaption.cpp
+++ b/kmdi/kmdichildfrmcaption.cpp
@@ -146,7 +146,7 @@ void KMdiChildFrmCaption::mouseMoveEvent( TQMouseEvent *e )
 	TQPoint relMousePosInChildArea = m_pParent->m_pManager->mapFromGlobal( e->globalPos() );
 
 	// mouse out of child area? stop child frame dragging
-	if ( !m_pParent->m_pManager->rect().tqcontains( relMousePosInChildArea ) )
+	if ( !m_pParent->m_pManager->rect().contains( relMousePosInChildArea ) )
 	{
 		if ( relMousePosInChildArea.x() < 0 )
 			relMousePosInChildArea.rx() = 0;
@@ -163,7 +163,7 @@ void KMdiChildFrmCaption::mouseMoveEvent( TQMouseEvent *e )
 	TQPoint mousePosInChildArea = relMousePosInChildArea - m_offset;
 
 	// set new child frame position
-	tqparentWidget() ->move( mousePosInChildArea );
+	parentWidget() ->move( mousePosInChildArea );
 }
 
 //=============== setActive ===============//
@@ -182,7 +182,7 @@ void KMdiChildFrmCaption::setActive( bool bActive )
 	                                            m_pParent->m_pManager->m_captionInactiveBackColor );
 
 	m_bActive = bActive;
-	tqrepaint( false );
+	repaint( false );
 }
 
 //=============== setCaption ===============//
@@ -190,7 +190,7 @@ void KMdiChildFrmCaption::setActive( bool bActive )
 void KMdiChildFrmCaption::setCaption( const TQString& text )
 {
 	m_szCaption = text;
-	tqrepaint( false );
+	repaint( false );
 }
 
 //============== heightHint ===============//
@@ -319,4 +319,4 @@ void KMdiChildFrmCaption::slot_moveViaSystemMenu()
 	m_offset = mapFromGlobal( TQCursor::pos() );
 }
 
-// kate: space-indent off; tqreplace-tabs off; indent-mode csands; tab-width 4;
+// kate: space-indent off; replace-tabs off; indent-mode csands; tab-width 4;
diff --git a/kmdi/kmdichildfrmcaption.h b/kmdi/kmdichildfrmcaption.h
index 6a2e731df..1bc47ac1f 100644
--- a/kmdi/kmdichildfrmcaption.h
+++ b/kmdi/kmdichildfrmcaption.h
@@ -142,4 +142,4 @@ private:
 
 #endif //_KMDICAPTION_H_
 
-// kate: space-indent off; tqreplace-tabs off; indent-mode csands; tab-width 4;
+// kate: space-indent off; replace-tabs off; indent-mode csands; tab-width 4;
diff --git a/kmdi/kmdichildview.cpp b/kmdi/kmdichildview.cpp
index 94ee99710..37414fe0a 100644
--- a/kmdi/kmdichildview.cpp
+++ b/kmdi/kmdichildview.cpp
@@ -44,8 +44,8 @@
 
 //============ KMdiChildView ============//
 
-KMdiChildView::KMdiChildView( const TQString& caption, TQWidget* tqparentWidget, const char* name, WFlags f )
-	: TQWidget( tqparentWidget, name, f )
+KMdiChildView::KMdiChildView( const TQString& caption, TQWidget* parentWidget, const char* name, WFlags f )
+	: TQWidget( parentWidget, name, f )
 	, m_focusedChildWidget( 0L )
 	, m_firstFocusableChildWidget( 0L )
 	, m_lastFocusableChildWidget( 0L )
@@ -73,8 +73,8 @@ KMdiChildView::KMdiChildView( const TQString& caption, TQWidget* tqparentWidget,
 
 //============ KMdiChildView ============//
 
-KMdiChildView::KMdiChildView( TQWidget* tqparentWidget, const char* name, WFlags f )
-	: TQWidget( tqparentWidget, name, f )
+KMdiChildView::KMdiChildView( TQWidget* parentWidget, const char* name, WFlags f )
+	: TQWidget( parentWidget, name, f )
 	, m_focusedChildWidget( 0L )
 	, m_firstFocusableChildWidget( 0L )
 	, m_lastFocusableChildWidget( 0L )
@@ -108,14 +108,14 @@ void KMdiChildView::trackIconAndCaptionChanges( TQWidget *view )
 }
 
 
-//============== internal tqgeometry ==============//
+//============== internal geometry ==============//
 
 TQRect KMdiChildView::internalGeometry() const
 {
 	if ( mdiParent() )
 	{ // is attached
 		// get the client area coordinates inside the MDI child frame
-		TQRect posInFrame = tqgeometry();
+		TQRect posInFrame = geometry();
 		// map these values to the parent of the MDI child frame
 		// (this usually is the MDI child area) and return
 		TQPoint ptTopLeft = mdiParent() ->mapToParent( posInFrame.topLeft() );
@@ -124,14 +124,14 @@ TQRect KMdiChildView::internalGeometry() const
 	}
 	else
 	{
-		TQRect geo = tqgeometry();
+		TQRect geo = geometry();
 		TQRect frameGeo = externalGeometry();
 		return TQRect( frameGeo.x(), frameGeo.y(), geo.width(), geo.height() );
-		//      return tqgeometry();
+		//      return geometry();
 	}
 }
 
-//============== set internal tqgeometry ==============//
+//============== set internal geometry ==============//
 
 void KMdiChildView::setInternalGeometry( const TQRect& newGeometry )
 {
@@ -143,7 +143,7 @@ void KMdiChildView::setInternalGeometry( const TQRect& newGeometry )
 		int nFrameSizeTop = geo.y() - frameGeo.y();
 		int nFrameSizeLeft = geo.x() - frameGeo.x();
 
-		// create the new tqgeometry that is accepted by the TQWidget::setGeometry() method
+		// create the new geometry that is accepted by the TQWidget::setGeometry() method
 		TQRect newGeoQt;
 		newGeoQt.setX( newGeometry.x() - nFrameSizeLeft );
 		newGeoQt.setY( newGeometry.y() - nFrameSizeTop );
@@ -153,7 +153,7 @@ void KMdiChildView::setInternalGeometry( const TQRect& newGeometry )
 		//      newGeoQt.setWidth(newGeometry.width()+KMDI_MDI_CHILDFRM_DOUBLE_BORDER);
 		//      newGeoQt.setHeight(newGeometry.height()+mdiParent()->captionHeight()+KMDI_MDI_CHILDFRM_DOUBLE_BORDER);
 
-		// set the tqgeometry
+		// set the geometry
 		mdiParent()->setGeometry( newGeoQt );
 	}
 	else
@@ -164,7 +164,7 @@ void KMdiChildView::setInternalGeometry( const TQRect& newGeometry )
 		int nFrameSizeTop = geo.y() - frameGeo.y();
 		int nFrameSizeLeft = geo.x() - frameGeo.x();
 
-		// create the new tqgeometry that is accepted by the TQWidget::setGeometry() method
+		// create the new geometry that is accepted by the TQWidget::setGeometry() method
 		TQRect newGeoQt;
 
 		newGeoQt.setX( newGeometry.x() - nFrameSizeLeft );
@@ -173,19 +173,19 @@ void KMdiChildView::setInternalGeometry( const TQRect& newGeometry )
 		newGeoQt.setWidth( newGeometry.width() );
 		newGeoQt.setHeight( newGeometry.height() );
 
-		// set the tqgeometry
+		// set the geometry
 		setGeometry( newGeoQt );
 	}
 }
 
-//============== external tqgeometry ==============//
+//============== external geometry ==============//
 
 TQRect KMdiChildView::externalGeometry() const
 {
 	return mdiParent() ? mdiParent()->frameGeometry() : frameGeometry();
 }
 
-//============== set external tqgeometry ==============//
+//============== set external geometry ==============//
 
 void KMdiChildView::setExternalGeometry( const TQRect& newGeometry )
 {
@@ -203,7 +203,7 @@ void KMdiChildView::setExternalGeometry( const TQRect& newGeometry )
 		int nFrameSizeTop = geo.y() - frameGeo.y();
 		int nFrameSizeLeft = geo.x() - frameGeo.x();
 
-		// create the new tqgeometry that is accepted by the TQWidget::setGeometry() method
+		// create the new geometry that is accepted by the TQWidget::setGeometry() method
 		// not attached => the window system makes the frame
 		TQRect newGeoQt;
 		newGeoQt.setX( newGeometry.x() + nFrameSizeLeft );
@@ -211,7 +211,7 @@ void KMdiChildView::setExternalGeometry( const TQRect& newGeometry )
 		newGeoQt.setWidth( newGeometry.width() - nTotalFrameWidth );
 		newGeoQt.setHeight( newGeometry.height() - nTotalFrameHeight );
 
-		// set the tqgeometry
+		// set the geometry
 		setGeometry( newGeoQt );
 	}
 }
@@ -278,7 +278,7 @@ TQRect KMdiChildView::restoreGeometry()
 	if ( mdiParent() )
 		return mdiParent() ->restoreGeometry();
 	else //FIXME not really supported, may be we must use Windows or X11 funtions
-		return tqgeometry();
+		return geometry();
 }
 
 //============== setRestoreGeometry ================//
@@ -546,7 +546,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
 		if ( obj->isWidgetType() )
 		{
 			TQObjectList * list = queryList( "TQWidget" );
-			if ( list->tqfind( obj ) != -1 )
+			if ( list->find( obj ) != -1 )
 				m_focusedChildWidget = ( TQWidget* ) obj;
 
 			delete list;   // delete the list, not the objects
@@ -771,4 +771,4 @@ void KMdiChildView::raise()
 	TQWidget::raise();
 }
 
-// kate: space-indent off; tqreplace-tabs off; indent-mode csands; tab-width 4;
+// kate: space-indent off; replace-tabs off; indent-mode csands; tab-width 4;
diff --git a/kmdi/kmdichildview.h b/kmdi/kmdichildview.h
index b2e44361f..656c17fd7 100644
--- a/kmdi/kmdichildview.h
+++ b/kmdi/kmdichildview.h
@@ -71,14 +71,14 @@ class KMdiChildViewPrivate;
   *   KMdiChildView* pMDICover = new KMdiChildView( pNewView->caption());
   *   pMDICover->setIcon(icon);
   *   m_MDICoverList.append( pMDICover);
-  *   TQBoxLayout* pLayout = new TQHBoxLayout( pMDICover, 0, -1, "tqlayout");
+  *   TQBoxLayout* pLayout = new TQHBoxLayout( pMDICover, 0, -1, "layout");
   *   pNewView->reparent( pMDICover, TQPoint(0,0));
   *   pLayout->addWidget( pNewView);
   *   pMDICover->setName( pNewView->name());
   *   // captions
   *   TQString shortName = pNewView->caption();
   *   int length = shortName.length();
-  *   shortName = shortName.right(length - (shortName.tqfindRev('/') +1));
+  *   shortName = shortName.right(length - (shortName.findRev('/') +1));
   *   pMDICover->setTabCaption( shortName);
   *   pMDICover->setCaption(pNewView->caption());
   *
@@ -182,13 +182,13 @@ public:
 	/**
 	 * Constructor
 	 */
-	KMdiChildView( const TQString& caption, TQWidget* tqparentWidget = 0L, const char* name = 0L, WFlags f = 0 );
+	KMdiChildView( const TQString& caption, TQWidget* parentWidget = 0L, const char* name = 0L, WFlags f = 0 );
 	
 	/**
 	 * Constructor 
 	 * sets "Unnamed" as default caption
 	 */
-	KMdiChildView( TQWidget* tqparentWidget = 0L, const char* name = 0L, WFlags f = 0 );
+	KMdiChildView( TQWidget* parentWidget = 0L, const char* name = 0L, WFlags f = 0 );
 	
 	/**
 	 * Destructor
@@ -196,7 +196,7 @@ public:
 	~KMdiChildView();
 	
 	/**
-	 * This method does the same as focusInEvent(). That's why it is a tqreplacement for the setFocus() call. It makes
+	 * This method does the same as focusInEvent(). That's why it is a replacement for the setFocus() call. It makes
 	 * sense if you for instance want to focus (I mean raise and activate) this view although the real focus is
 	 * in another toplevel widget. focusInEvent() will never get called in that case and your setFocus() call for this
 	 * widget would fail without any effect.
@@ -270,12 +270,12 @@ public:
 	bool isMaximized() const;
 	
 	/**
-	 * Returns the tqgeometry of this MDI child window as TQWidget::tqgeometry() does.
+	 * Returns the geometry of this MDI child window as TQWidget::geometry() does.
 	 */
 	TQRect internalGeometry() const;
 	
 	/**
-	 * Sets the tqgeometry of the client area of this MDI child window. The
+	 * Sets the geometry of the client area of this MDI child window. The
 	 * top left position of the argument is the position of the top left point
 	 * of the client area in its parent coordinates and the arguments width
 	 * and height is the width and height of the client area. Please note: This
@@ -284,12 +284,12 @@ public:
 	void setInternalGeometry( const TQRect& newGeomety );
 	
 	/**
-	 * Returns the frame tqgeometry of this window or of the parent if there is any...
+	 * Returns the frame geometry of this window or of the parent if there is any...
 	 */
 	TQRect externalGeometry() const;
 	
 	/**
-	 * Sets the tqgeometry of the frame of this MDI child window. The top left
+	 * Sets the geometry of the frame of this MDI child window. The top left
 	 * position of the argument is the position of the top left point of the
 	 * frame in its parent coordinates and the arguments width and height is
 	 * the width and height of the widget frame. Please note: This differs
@@ -315,12 +315,12 @@ public:
 	virtual void maximize( bool bAnimate );
 	
 	/**
-	 * Returns the tqgeometry that will be restored by calling restore().
+	 * Returns the geometry that will be restored by calling restore().
 	 */
 	TQRect restoreGeometry();
 	
 	/**
-	 * Sets the tqgeometry that will be restored by calling restore().
+	 * Sets the geometry that will be restored by calling restore().
 	 */
 	void setRestoreGeometry( const TQRect& newRestGeo );
 	
@@ -358,7 +358,7 @@ public:
 	 */
 	inline void updateTimeStamp()
 	{
-		m_time.setDate( TQDate::tqcurrentDate() );
+		m_time.setDate( TQDate::currentDate() );
 		m_time.setTime( TQTime::currentTime() );
 	}
 	
@@ -603,7 +603,7 @@ private:
 
 inline KMdiChildFrm *KMdiChildView::mdiParent() const
 {
-	TQWidget * pw = tqparentWidget();
+	TQWidget * pw = parentWidget();
 	if ( pw != 0L )
 		if ( pw->inherits( "KMdiChildFrm" ) )
 			return ( KMdiChildFrm * ) pw;
@@ -612,4 +612,4 @@ inline KMdiChildFrm *KMdiChildView::mdiParent() const
 
 #endif //_KMDICHILDVIEW_H_
 
-// kate: space-indent off; tqreplace-tabs off; indent-mode csands; tab-width 4;
+// kate: space-indent off; replace-tabs off; indent-mode csands; tab-width 4;
diff --git a/kmdi/kmdidefines.h b/kmdi/kmdidefines.h
index fc1227eee..16be290a6 100644
--- a/kmdi/kmdidefines.h
+++ b/kmdi/kmdidefines.h
@@ -66,7 +66,7 @@ namespace KMdi
       /**
       * standard is: show normal, attached, visible, document view (not toolview). Maximize, Minimize, Hide adds
       * appropriately. Detach adds a view that appears toplevel, ToolWindow adds the view as tool view.
-      * That means it is stay-on-top and toplevel. UseKMdiSizeHint should use the restore tqgeometry of the
+      * That means it is stay-on-top and toplevel. UseKMdiSizeHint should use the restore geometry of the
       * latest current top childframe but is not supported yet.
       */
       StandardAdd = 0,
diff --git a/kmdi/kmdidockcontainer.cpp b/kmdi/kmdidockcontainer.cpp
index fed6147a8..df82a4e6c 100644
--- a/kmdi/kmdidockcontainer.cpp
+++ b/kmdi/kmdidockcontainer.cpp
@@ -70,9 +70,9 @@ KMdiDockContainer::KMdiDockContainer( TQWidget *parent, TQWidget *win, int posit
 
 
 	if ( m_horizontal )
-		l = new TQVBoxLayout( this ); //vertical tqlayout for top and bottom docks
+		l = new TQVBoxLayout( this ); //vertical layout for top and bottom docks
 	else
-		l = new TQHBoxLayout( this ); //horizontal tqlayout for left and right docks
+		l = new TQHBoxLayout( this ); //horizontal layout for left and right docks
 
 	l->setAutoAdd( false );
 
@@ -104,9 +104,9 @@ KMdiDockContainer::KMdiDockContainer( TQWidget *parent, TQWidget *win, int posit
 
 	m_ws = new TQWidgetStack( this );
 
-	m_ws->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
+	m_ws->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
 
-	//tqlayout the tabbar
+	//layout the tabbar
 	if ( position == KDockWidget::DockLeft || position == KDockWidget::DockTop )
 	{
 		//add the tabbar then the widget stack
@@ -138,7 +138,7 @@ KMdiDockContainer::~KMdiDockContainer()
 	{
 		it = m_map.begin();
 		KDockWidget *w = it.key();
-		if ( m_overlapButtons.tqcontains( w ) )
+		if ( m_overlapButtons.contains( w ) )
 		{
 			( static_cast<KDockWidgetHeader*>( w->getHeader()->qt_cast( "KDockWidgetHeader" ) ) )->removeButton( m_overlapButtons[w] );
 			m_overlapButtons.remove( w );
@@ -188,7 +188,7 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const
 	kdDebug( 760 ) << k_funcinfo << "Adding a dockwidget to the dock container" << endl;
 	KDockWidget* w = dwdg;
 	int tab;
-	bool alreadyThere = m_map.tqcontains( w );
+	bool alreadyThere = m_map.contains( w );
 
 	if ( alreadyThere )
 	{
@@ -204,8 +204,8 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const
 		m_map.insert( w, tab );
 		m_revMap.insert( tab, w );
 
-		if ( ( ( KDockWidget* ) tqparentWidget() ) ->mayBeShow() )
-			( ( KDockWidget* ) tqparentWidget() ) ->dockBack();
+		if ( ( ( KDockWidget* ) parentWidget() ) ->mayBeShow() )
+			( ( KDockWidget* ) parentWidget() ) ->dockBack();
 
 		if ( w->getHeader()->qt_cast( "KDockWidgetHeader" ) )
 		{
@@ -322,7 +322,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event )
 
 void KMdiDockContainer::showWidget( KDockWidget *w )
 {
-	if ( !m_map.tqcontains( w ) )
+	if ( !m_map.contains( w ) )
 		return ;
 
 	int id = m_map[ w ];
@@ -362,14 +362,14 @@ void KMdiDockContainer::hideIfNeeded()
 	if ( itemNames.count() == 0 )
 	{
 		kdDebug( 760 ) << k_funcinfo << "Hiding the dock container" << endl;
-		( ( KDockWidget* ) tqparentWidget() )->undock();
+		( ( KDockWidget* ) parentWidget() )->undock();
 	}
 }
 
 void KMdiDockContainer::removeWidget( KDockWidget* dwdg )
 {
 	KDockWidget * w = dwdg;
-	if ( !m_map.tqcontains( w ) )
+	if ( !m_map.contains( w ) )
 		return; //we don't have this widget in our container
 
 	kdDebug( 760 ) << k_funcinfo << endl;
@@ -385,7 +385,7 @@ void KMdiDockContainer::removeWidget( KDockWidget* dwdg )
 	m_ws->removeWidget( w );
 	m_map.remove( w );
 	m_revMap.remove( id );
-	if ( m_overlapButtons.tqcontains( w ) )
+	if ( m_overlapButtons.contains( w ) )
 	{
 		( static_cast<KDockWidgetHeader*>( w->getHeader() ->qt_cast( "KDockWidgetHeader" ) ) )->removeButton( m_overlapButtons[ w ] );
 		m_overlapButtons.remove( w );
@@ -401,7 +401,7 @@ void KMdiDockContainer::undockWidget( KDockWidget *dwdg )
 {
 	KDockWidget * w = dwdg;
 
-	if ( !m_map.tqcontains( w ) )
+	if ( !m_map.contains( w ) )
 		return ;
 
 	int id = m_map[ w ];
@@ -818,7 +818,7 @@ void KMdiDockContainer::prevToolView()
 {
 	kdDebug( 760 ) << k_funcinfo << endl;
 	TQPtrList<KMultiTabBarTab>* tabs = m_tb->tabs();
-	int pos = tabs->tqfindRef( m_tb->tab( oldtab ) );
+	int pos = tabs->findRef( m_tb->tab( oldtab ) );
 
 	if ( pos == -1 )
 		return ;
@@ -839,7 +839,7 @@ void KMdiDockContainer::nextToolView()
 {
 	kdDebug( 760 ) << k_funcinfo << endl;
 	TQPtrList<KMultiTabBarTab>* tabs = m_tb->tabs();
-	int pos = tabs->tqfindRef( m_tb->tab( oldtab ) );
+	int pos = tabs->findRef( m_tb->tab( oldtab ) );
 
 	if ( pos == -1 )
 		return ;
@@ -856,4 +856,4 @@ void KMdiDockContainer::nextToolView()
 	tabClicked( tab->id() );
 }
 
-// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
diff --git a/kmdi/kmdidockcontainer.h b/kmdi/kmdidockcontainer.h
index 389703b14..cb0d6e4ce 100644
--- a/kmdi/kmdidockcontainer.h
+++ b/kmdi/kmdidockcontainer.h
@@ -164,4 +164,4 @@ signals:
 
 #endif
 
-// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
diff --git a/kmdi/kmdidocumentviewtabwidget.cpp b/kmdi/kmdidocumentviewtabwidget.cpp
index d49712e48..90b618e47 100644
--- a/kmdi/kmdidocumentviewtabwidget.cpp
+++ b/kmdi/kmdidocumentviewtabwidget.cpp
@@ -54,7 +54,7 @@ void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, const TQString & l
 	KTabWidget::insertTab( child, label, index );
 	showPage( child );
 	TQTimer::singleShot(0, this, TQT_SLOT(maybeShow()));
-	tabBar() ->tqrepaint();
+	tabBar() ->repaint();
 }
 
 void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label, int index )
@@ -62,7 +62,7 @@ void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, const TQIconSet &
 	KTabWidget::insertTab( child, iconset, label, index );
 	showPage( child );
 	TQTimer::singleShot(0, this, TQT_SLOT(maybeShow()));
-	tabBar() ->tqrepaint();
+	tabBar() ->repaint();
 }
 
 void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, TQTab * tab, int index )
@@ -70,7 +70,7 @@ void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, TQTab * tab, int i
 	KTabWidget::insertTab( child, tab, index );
 	showPage( child );
 	TQTimer::singleShot(0, this, TQT_SLOT(maybeShow()));
-	tabBar() ->tqrepaint();
+	tabBar() ->repaint();
 }
 
 void KMdiDocumentViewTabWidget::removePage ( TQWidget * w )
@@ -140,9 +140,9 @@ KMdi::TabWidgetVisibility KMdiDocumentViewTabWidget::tabWidgetVisibility( )
 }
 
 
-#ifndef NO_INCLUDE_TQMOCFILES
+#ifndef NO_INCLUDE_MOCFILES
 #include "kmdidocumentviewtabwidget.moc"
 #endif
 
-// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
 
diff --git a/kmdi/kmdidocumentviewtabwidget.h b/kmdi/kmdidocumentviewtabwidget.h
index 8485c57a1..d731a9a03 100644
--- a/kmdi/kmdidocumentviewtabwidget.h
+++ b/kmdi/kmdidocumentviewtabwidget.h
@@ -121,5 +121,5 @@ signals:
 
 
 #endif 
-// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
 
diff --git a/kmdi/kmdifocuslist.cpp b/kmdi/kmdifocuslist.cpp
index 683b58c06..fe907aab8 100644
--- a/kmdi/kmdifocuslist.cpp
+++ b/kmdi/kmdifocuslist.cpp
@@ -67,4 +67,4 @@ void KMdiFocusList::objectHasBeenDestroyed( TQObject * o )
 	m_list.remove( w );
 }
 
-// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
diff --git a/kmdi/kmdifocuslist.h b/kmdi/kmdifocuslist.h
index fad27e07c..71e2f05cb 100644
--- a/kmdi/kmdifocuslist.h
+++ b/kmdi/kmdifocuslist.h
@@ -23,7 +23,7 @@
 #include <tqwidget.h>
 #include <kdelibs_export.h>
 
-class KMDI_EXPORT KMdiFocusList: public TQObject
+class KMDI_EXPORT KMdiFocusList: public QObject
 {
 	Q_OBJECT
 public:
@@ -39,4 +39,4 @@ private:
 };
 
 #endif 
-// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
diff --git a/kmdi/kmdiguiclient.cpp b/kmdi/kmdiguiclient.cpp
index 3e40a3846..6279253bc 100644
--- a/kmdi/kmdiguiclient.cpp
+++ b/kmdi/kmdiguiclient.cpp
@@ -128,7 +128,7 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c
 	if ( domDocument().documentElement().isNull() )
 	{
 
-		TQString completeDescription = TQString::tqfromLatin1( guiDescription )
+		TQString completeDescription = TQString::fromLatin1( guiDescription )
 		                              .arg( actionListName );
 
 		setXML( completeDescription, false /*merge*/ );
@@ -317,4 +317,4 @@ void KMDIGUIClient::mdiModeHasBeenChangedTo( KMdi::MdiMode mode )
 }
 
 
-// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
diff --git a/kmdi/kmdiguiclient.h b/kmdi/kmdiguiclient.h
index 00280db93..9c9634314 100644
--- a/kmdi/kmdiguiclient.h
+++ b/kmdi/kmdiguiclient.h
@@ -143,4 +143,4 @@ protected slots:
 }
 
 #endif 
-// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
diff --git a/kmdi/kmdiiterator.h b/kmdi/kmdiiterator.h
index ef7ee52a3..6bb6f7eac 100644
--- a/kmdi/kmdiiterator.h
+++ b/kmdi/kmdiiterator.h
@@ -47,5 +47,5 @@ protected:
 ;
 
 #endif // _KMDIITERATOR_H_ 
-// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
 
diff --git a/kmdi/kmdilistiterator.h b/kmdi/kmdilistiterator.h
index 10444d8ff..9e788b28e 100644
--- a/kmdi/kmdilistiterator.h
+++ b/kmdi/kmdilistiterator.h
@@ -57,5 +57,5 @@ private:
 };
 
 #endif // _KMDILISTITERATOR_H_ 
-// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
 
diff --git a/kmdi/kmdimainfrm.cpp b/kmdi/kmdimainfrm.cpp
index 1db7b17b1..e62b61cb2 100644
--- a/kmdi/kmdimainfrm.cpp
+++ b/kmdi/kmdimainfrm.cpp
@@ -136,8 +136,8 @@ public:
 };
 
 //============ constructor ============//
-KMdiMainFrm::KMdiMainFrm( TQWidget* tqparentWidget, const char* name, KMdi::MdiMode mdiMode, WFlags flags )
-		: KParts::DockMainWindow( tqparentWidget, name, flags )
+KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMode mdiMode, WFlags flags )
+		: KParts::DockMainWindow( parentWidget, name, flags )
 		, m_mdiMode( KMdi::UndefinedMode )
 		, m_pMdi( 0L )
 		, m_pTaskBar( 0L )
@@ -294,7 +294,7 @@ void KMdiMainFrm::setStandardMDIMenuEnabled( bool showModeMenu )
 //============ ~KMdiMainFrm ============//
 KMdiMainFrm::~KMdiMainFrm()
 {
-	//save the children first to a list, as removing tqinvalidates our iterator
+	//save the children first to a list, as removing invalidates our iterator
 	TQValueList<KMdiChildView*> children;
 	for ( KMdiChildView * w = m_pDocumentViews->first();w;w = m_pDocumentViews->next() )
 		children.append( w );
@@ -303,7 +303,7 @@ KMdiMainFrm::~KMdiMainFrm()
 	TQValueListIterator<KMdiChildView*> childIt;
 	for ( childIt = children.begin(); childIt != children.end(); ++childIt )
 	{
-		closeWindow( *childIt, false ); // without re-tqlayout taskbar!
+		closeWindow( *childIt, false ); // without re-layout taskbar!
 	}
 
 	emit lastChildViewClosed();
@@ -391,7 +391,7 @@ void KMdiMainFrm::slot_toggleTaskBar()
 
 void KMdiMainFrm::resizeEvent( TQResizeEvent *e )
 {
-	if ( ( m_mdiMode == KMdi::ToplevelMode ) && !tqparentWidget() )
+	if ( ( m_mdiMode == KMdi::ToplevelMode ) && !parentWidget() )
 	{
 		if ( e->oldSize().height() != e->size().height() )
 			return ;
@@ -406,7 +406,7 @@ void KMdiMainFrm::resizeEvent( TQResizeEvent *e )
 
 void KMdiMainFrm::setMinimumSize( int minw, int minh )
 {
-	if ( ( m_mdiMode == KMdi::ToplevelMode ) && !tqparentWidget() )
+	if ( ( m_mdiMode == KMdi::ToplevelMode ) && !parentWidget() )
 		return ;
 	DockMainWindow::setMinimumSize( minw, minh );
 }
@@ -419,7 +419,7 @@ KMdiChildView* KMdiMainFrm::createWrapper( TQWidget *view, const TQString& name,
 
 	KMdiChildView* pMDICover = new KMdiChildView( name /*caption*/, 0L /*parent*/,
 	                                              name.latin1() );
-	TQBoxLayout* pLayout = new TQHBoxLayout( pMDICover, 0, -1, "tqlayout" );
+	TQBoxLayout* pLayout = new TQHBoxLayout( pMDICover, 0, -1, "layout" );
 	view->reparent( pMDICover, TQPoint( 0, 0 ) );
 	pLayout->addWidget( view );
 	//  pMDICover->setName(name);
@@ -553,7 +553,7 @@ KMdiToolViewAccessor *KMdiMainFrm::createToolWindow()
 
 void KMdiMainFrm::deleteToolWindow( TQWidget* pWnd )
 {
-	if ( m_pToolViews->tqcontains( pWnd ) )
+	if ( m_pToolViews->contains( pWnd ) )
 		deleteToolWindow( ( *m_pToolViews ) [ pWnd ] );
 }
 
@@ -582,7 +582,7 @@ KMdiToolViewAccessor *KMdiMainFrm::addToolWindow( TQWidget* pWnd, KDockWidget::D
 		pWnd = pDW;
 	}
 
-	TQRect r = pWnd->tqgeometry();
+	TQRect r = pWnd->geometry();
 
 	KMdiToolViewAccessor *mtva = new KMdiToolViewAccessor( this, pWnd, tabToolTip, ( tabCaption == 0 ) ? pWnd->caption() : tabCaption );
 	m_pToolViews->insert( tvta, mtva );
@@ -610,7 +610,7 @@ void KMdiMainFrm::attachWindow( KMdiChildView *pWnd, bool bShow, bool bAutomatic
 	TQRect frameGeo = pWnd->frameGeometry();
 	TQPoint topLeftScreen = pWnd->mapToGlobal( TQPoint( 0, 0 ) );
 	TQPoint topLeftMdiChildArea = m_pMdi->mapFromGlobal( topLeftScreen );
-	TQRect childAreaGeo = m_pMdi->tqgeometry();
+	TQRect childAreaGeo = m_pMdi->geometry();
 	if ( topLeftMdiChildArea.x() < 0 || topLeftMdiChildArea.y() < 0 ||
 	     ( topLeftMdiChildArea.x() + frameGeo.width() > childAreaGeo.width() ) ||
 	     ( topLeftMdiChildArea.y() + frameGeo.height() > childAreaGeo.height() ) )
@@ -627,7 +627,7 @@ void KMdiMainFrm::attachWindow( KMdiChildView *pWnd, bool bShow, bool bAutomatic
 	lpC->setClient( pWnd, bAutomaticResize );
 	lpC->setFocus();
 	pWnd->youAreAttached( lpC );
-	if ( ( m_mdiMode == KMdi::ToplevelMode ) && !tqparentWidget() )
+	if ( ( m_mdiMode == KMdi::ToplevelMode ) && !parentWidget() )
 	{
 		setMinimumHeight( m_oldMainFrmMinHeight );
 		setMaximumHeight( m_oldMainFrmMaxHeight );
@@ -639,7 +639,7 @@ void KMdiMainFrm::attachWindow( KMdiChildView *pWnd, bool bShow, bool bAutomatic
 	m_pMdi->manageChild( lpC, false, bCascade );
 	if ( m_pMdi->topChild() && m_pMdi->topChild() ->isMaximized() )
 	{
-		TQRect r = lpC->tqgeometry();
+		TQRect r = lpC->geometry();
 		lpC->setGeometry( -lpC->m_pClient->x(), -lpC->m_pClient->y(),
 		                  m_pMdi->width() + KMDI_CHILDFRM_DOUBLE_BORDER,
 		                  m_pMdi->height() + lpC->captionHeight() + KMDI_CHILDFRM_SEPARATOR + KMDI_CHILDFRM_DOUBLE_BORDER );
@@ -701,7 +701,7 @@ void KMdiMainFrm::detachWindow( KMdiChildView *pWnd, bool bShow )
 #ifdef Q_WS_X11
 		if ( mdiMode() == KMdi::ToplevelMode )
 		{
-			XSetTransientForHint( qt_xdisplay(), pWnd->winId(), tqtopLevelWidget() ->winId() );
+			XSetTransientForHint( qt_xdisplay(), pWnd->winId(), topLevelWidget() ->winId() );
 		}
 #endif
 
@@ -711,7 +711,7 @@ void KMdiMainFrm::detachWindow( KMdiChildView *pWnd, bool bShow )
 #ifdef Q_WS_X11
 	if ( mdiMode() == KMdi::ToplevelMode )
 	{
-		XSetTransientForHint( qt_xdisplay(), pWnd->winId(), tqtopLevelWidget() ->winId() );
+		XSetTransientForHint( qt_xdisplay(), pWnd->winId(), topLevelWidget() ->winId() );
 	}
 #endif
 
@@ -772,12 +772,12 @@ void KMdiMainFrm::removeWindowFromMdi( KMdiChildView *pWnd )
 			m_pDockbaseOfTabPage = m_pDockbaseAreaOfDocumentViews;
 			m_pClose->hide();
 		}
-		KDockWidget* pDockW = ( KDockWidget* ) pWnd->tqparentWidget();
+		KDockWidget* pDockW = ( KDockWidget* ) pWnd->parentWidget();
 		pWnd->reparent( 0L, TQPoint( 0, 0 ) );
 		pDockW->setWidget( 0L );
 		if ( pDockW == m_pDockbaseOfTabPage )
 		{
-			TQTabWidget * pTab = ( TQTabWidget* ) pDockW->tqparentWidget() ->tqparentWidget();
+			TQTabWidget * pTab = ( TQTabWidget* ) pDockW->parentWidget() ->parentWidget();
 			int cnt = pTab->count();
 			m_pDockbaseOfTabPage = ( KDockWidget* ) pTab->page( cnt - 2 );
 			if ( pDockW == m_pDockbaseOfTabPage )
@@ -825,7 +825,7 @@ void KMdiMainFrm::removeWindowFromMdi( KMdiChildView *pWnd )
 }
 
 //============== closeWindow ==============//
-void KMdiMainFrm::closeWindow( KMdiChildView *pWnd, bool tqlayoutTaskBar )
+void KMdiMainFrm::closeWindow( KMdiChildView *pWnd, bool layoutTaskBar )
 {
 	if ( !pWnd )
 		return ;
@@ -836,7 +836,7 @@ void KMdiMainFrm::closeWindow( KMdiChildView *pWnd, bool tqlayoutTaskBar )
 
 	if ( m_pTaskBar )
 	{
-		m_pTaskBar->removeWinButton( pWnd, tqlayoutTaskBar );
+		m_pTaskBar->removeWinButton( pWnd, layoutTaskBar );
 	}
 
 	if ( ( m_mdiMode == KMdi::TabPageMode ) || ( m_mdiMode == KMdi::IDEAlMode ) )
@@ -874,12 +874,12 @@ void KMdiMainFrm::closeWindow( KMdiChildView *pWnd, bool tqlayoutTaskBar )
 			m_pClose->hide();
 		}
 #if 0
-		KDockWidget* pDockW = ( KDockWidget* ) pWnd->tqparentWidget();
+		KDockWidget* pDockW = ( KDockWidget* ) pWnd->parentWidget();
 		pWnd->reparent( 0L, TQPoint( 0, 0 ) );
 		pDockW->setWidget( 0L );
 		if ( pDockW == m_pDockbaseOfTabPage )
 		{
-			TQTabWidget * pTab = ( TQTabWidget* ) pDockW->tqparentWidget() ->tqparentWidget();
+			TQTabWidget * pTab = ( TQTabWidget* ) pDockW->parentWidget() ->parentWidget();
 			int cnt = pTab->count();
 			m_pDockbaseOfTabPage = ( KDockWidget* ) pTab->page( cnt - 2 );
 			if ( pDockW == m_pDockbaseOfTabPage )
@@ -936,8 +936,8 @@ void KMdiMainFrm::closeWindow( KMdiChildView *pWnd, bool tqlayoutTaskBar )
 	}
 }
 
-//================== tqfindWindow =================//
-KMdiChildView* KMdiMainFrm::tqfindWindow( const TQString& caption )
+//================== findWindow =================//
+KMdiChildView* KMdiMainFrm::findWindow( const TQString& caption )
 {
 	TQPtrListIterator<KMdiChildView> it( *m_pDocumentViews );
 	for ( ; ( *it ); ++it )
@@ -959,13 +959,13 @@ bool KMdiMainFrm::windowExists( KMdiChildView *pWnd, ExistsAs as )
 {
 	if ( ( as == ToolView ) || ( as == AnyView ) )
 	{
-		if ( m_pToolViews->tqcontains( pWnd ) )
+		if ( m_pToolViews->contains( pWnd ) )
 			return true;
 		if ( as == ToolView )
 			return false;
 	}
 	
-	if ( m_pDocumentViews->tqfindRef( pWnd ) != -1  )
+	if ( m_pDocumentViews->findRef( pWnd ) != -1  )
 		return true;
 
 	return false;
@@ -1234,7 +1234,7 @@ bool KMdiMainFrm::eventFilter( TQObject * /*obj*/, TQEvent *e )
  */
 void KMdiMainFrm::closeAllViews()
 {
-	//save the children first to a list, as removing tqinvalidates our iterator
+	//save the children first to a list, as removing invalidates our iterator
 	TQValueList<KMdiChildView*> children;
 	for ( KMdiChildView * w = m_pDocumentViews->first();w;w = m_pDocumentViews->next() )
 	{
@@ -1269,8 +1269,8 @@ void KMdiMainFrm::closeActiveView()
 		m_pCurrentWindow->close();
 }
 
-/** tqfind the root dockwidgets and store their tqgeometry */
-void KMdiMainFrm::tqfindRootDockWidgets( TQPtrList<KDockWidget>* rootDockWidgetList, TQValueList<TQRect>* positionList )
+/** find the root dockwidgets and store their geometry */
+void KMdiMainFrm::findRootDockWidgets( TQPtrList<KDockWidget>* rootDockWidgetList, TQValueList<TQRect>* positionList )
 {
 	//nothing is valid
 	if ( !rootDockWidgetList && !positionList )
@@ -1293,7 +1293,7 @@ void KMdiMainFrm::tqfindRootDockWidgets( TQPtrList<KDockWidget>* rootDockWidgetL
 		KDockWidget* undockCandidate = 0L; /* pUndockCandidate */
 		TQWidget* pW = static_cast<TQWidget*>( ( *it ) );
 		
-		// tqfind the oldest ancestor of the current dockwidget that can be undocked
+		// find the oldest ancestor of the current dockwidget that can be undocked
 		while ( !pW->isTopLevel() )
 		{
 			if ( ::qt_cast<KDockWidget*>( pW ) ||  pW->inherits( "KDockWidget_Compat::KDockWidget" ) )
@@ -1302,7 +1302,7 @@ void KMdiMainFrm::tqfindRootDockWidgets( TQPtrList<KDockWidget>* rootDockWidgetL
 				if ( undockCandidate->enableDocking() != KDockWidget::DockNone )
 					rootDockWindow = undockCandidate;
 			}
-			pW = pW->tqparentWidget();
+			pW = pW->parentWidget();
 		}
 		
 		if ( rootDockWindow )
@@ -1353,7 +1353,7 @@ void KMdiMainFrm::switchToToplevelMode()
 	const int frameBorderWidth = 7;  // @todo: Can we / do we need to ask the window manager?
 	setUndockPositioningOffset( TQPoint( 0, ( m_pTaskBar ? m_pTaskBar->height() : 0 ) + frameBorderWidth ) );
 
-	// 1.) select the dockwidgets to be undocked and store their tqgeometry
+	// 1.) select the dockwidgets to be undocked and store their geometry
 	TQPtrList<KDockWidget> rootDockWidgetList;
 	TQValueList<TQRect> positionList;
 
@@ -1368,7 +1368,7 @@ void KMdiMainFrm::switchToToplevelMode()
 		break;
 	case KMdi::IDEAlMode:
 		finishIDEAlMode();
-		tqfindRootDockWidgets( &rootDockWidgetList, &positionList );
+		findRootDockWidgets( &rootDockWidgetList, &positionList );
 		break;
 	default:
 		break; //do nothing
@@ -1395,7 +1395,7 @@ void KMdiMainFrm::switchToToplevelMode()
 		setMainDockWidget( m_pDockbaseAreaOfDocumentViews );
 	}
 	//	TQApplication::sendPostedEvents(); //why do we need to empty the event queue?
-	if ( !tqparentWidget() )
+	if ( !parentWidget() )
 	{
 		//if we don't have a parent widget ( which i expect we wouldn't )
 		//make sure we take into account the size of the docks provided by
@@ -1466,8 +1466,8 @@ void KMdiMainFrm::switchToChildframeMode()
 	if ( m_mdiMode == KMdi::TabPageMode )
 	{
 		kdDebug(760) << k_funcinfo << "finishing tab page mode" << endl;
-		// select the dockwidgets to be undocked and store their tqgeometry
-		tqfindRootDockWidgets( &rootDockWidgetList, &positionList );
+		// select the dockwidgets to be undocked and store their geometry
+		findRootDockWidgets( &rootDockWidgetList, &positionList );
 		kdDebug(760) << k_funcinfo << "Found " << rootDockWidgetList.count() << " widgets to undock" << endl;
 		
 		// undock all these found oldest ancestors (being KDockWidgets)
@@ -1486,8 +1486,8 @@ void KMdiMainFrm::switchToChildframeMode()
 		kdDebug(760) << k_funcinfo << "finishing ideal mode" << endl;
 		finishIDEAlMode( false );
 
-		// select the dockwidgets to be undocked and store their tqgeometry
-		tqfindRootDockWidgets( &rootDockWidgetList, &positionList );
+		// select the dockwidgets to be undocked and store their geometry
+		findRootDockWidgets( &rootDockWidgetList, &positionList );
 		kdDebug(760) << k_funcinfo << "Found " << rootDockWidgetList.count() << " widgets to undock" << endl;
 		
 		// undock all these found oldest ancestors (being KDockWidgets)
@@ -1556,7 +1556,7 @@ void KMdiMainFrm::switchToChildframeMode()
 		if ( !pView->isToolView() )
 			pView->show();
 	}
-	if ( ( oldMdiMode == KMdi::ToplevelMode ) && !tqparentWidget() )
+	if ( ( oldMdiMode == KMdi::ToplevelMode ) && !parentWidget() )
 	{
 		setMinimumHeight( m_oldMainFrmMinHeight );
 		setMaximumHeight( m_oldMainFrmMaxHeight );
@@ -1659,10 +1659,10 @@ void KMdiMainFrm::finishTabPageMode()
 			if ( pView->isToolView() )
 				continue;
 			kdDebug(760) << "KMdiMainFrm::finishTabPageMode: in loop" << endl;
-			TQSize mins = pView->tqminimumSize();
-			TQSize maxs = pView->tqmaximumSize();
+			TQSize mins = pView->minimumSize();
+			TQSize maxs = pView->maximumSize();
 			TQSize sz = pView->size();
-			TQWidget* pParent = pView->tqparentWidget();
+			TQWidget* pParent = pView->parentWidget();
 			TQPoint p( pParent->mapToGlobal( pParent->pos() ) - pParent->pos() + m_undockPositioningOffset );
 			m_documentTabWidget->removePage( pView );
 			pView->reparent( 0, 0, p );
@@ -1688,7 +1688,7 @@ void KMdiMainFrm::finishTabPageMode()
 void KMdiMainFrm::setupTabbedDocumentViewSpace()
 {
 	// resize to childframe mode size of the mainwindow if we were in toplevel mode
-	if ( ( m_mdiMode == KMdi::ToplevelMode ) && !tqparentWidget() )
+	if ( ( m_mdiMode == KMdi::ToplevelMode ) && !parentWidget() )
 	{
 		setMinimumHeight( m_oldMainFrmMinHeight );
 		setMaximumHeight( m_oldMainFrmMaxHeight );
@@ -1881,7 +1881,7 @@ void KMdiMainFrm::dockToolViewsIntoContainers( TQPtrList<KDockWidget>& widgetsTo
 	}
 }
 
-void KMdiMainFrm::tqfindToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDockWidget::DockPosition dprtmw )
+void KMdiMainFrm::findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDockWidget::DockPosition dprtmw )
 {
 	KDockWidget* mainDock = getMainDockWidget();
 	if ( mainDock->parentDockTabGroup() )
@@ -1896,7 +1896,7 @@ void KMdiMainFrm::tqfindToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDo
 		return;
 	}
 	
-	KDockWidget* widget = mainDock->tqfindNearestDockWidget( dprtmw );
+	KDockWidget* widget = mainDock->findNearestDockWidget( dprtmw );
 	if ( widget && widget->parentDockTabGroup() )
 	{
 		widget = static_cast<KDockWidget*>( widget->parentDockTabGroup() ->parent() );
@@ -1933,18 +1933,18 @@ void KMdiMainFrm::setupToolViewsForIDEALMode()
 	if ( mainDock->parentDockTabGroup() )
 		w = static_cast<KDockWidget*>( mainDock->parentDockTabGroup()->parent() );
 
-	TQPtrList<KDockWidget> leftRetqparentWidgets;
-	TQPtrList<KDockWidget> rightRetqparentWidgets;
-	TQPtrList<KDockWidget> bottomRetqparentWidgets;
-	TQPtrList<KDockWidget> topRetqparentWidgets;
+	TQPtrList<KDockWidget> leftReparentWidgets;
+	TQPtrList<KDockWidget> rightReparentWidgets;
+	TQPtrList<KDockWidget> bottomReparentWidgets;
+	TQPtrList<KDockWidget> topReparentWidgets;
 
 	if ( mainDock->parentDockTabGroup() )
 		mainDock = static_cast<KDockWidget*>( mainDock->parentDockTabGroup() ->parent() );
 
-	tqfindToolViewsDockedToMain( &leftRetqparentWidgets, KDockWidget::DockLeft );
-	tqfindToolViewsDockedToMain( &rightRetqparentWidgets, KDockWidget::DockRight );
-	tqfindToolViewsDockedToMain( &bottomRetqparentWidgets, KDockWidget::DockBottom );
-	tqfindToolViewsDockedToMain( &topRetqparentWidgets, KDockWidget::DockTop );
+	findToolViewsDockedToMain( &leftReparentWidgets, KDockWidget::DockLeft );
+	findToolViewsDockedToMain( &rightReparentWidgets, KDockWidget::DockRight );
+	findToolViewsDockedToMain( &bottomReparentWidgets, KDockWidget::DockBottom );
+	findToolViewsDockedToMain( &topReparentWidgets, KDockWidget::DockTop );
 
 	mainDock->setEnableDocking( KDockWidget::DockNone ); //::DockCorner);
 	mainDock->setDockSite( KDockWidget::DockCorner );
@@ -1996,10 +1996,10 @@ void KMdiMainFrm::setupToolViewsForIDEALMode()
 	m_topContainer->setDockSite( KDockWidget::DockCenter );
 	m_bottomContainer->setDockSite( KDockWidget::DockCenter );
 
-	dockToolViewsIntoContainers( leftRetqparentWidgets, m_leftContainer );
-	dockToolViewsIntoContainers( rightRetqparentWidgets, m_rightContainer );
-	dockToolViewsIntoContainers( bottomRetqparentWidgets, m_bottomContainer );
-	dockToolViewsIntoContainers( topRetqparentWidgets, m_topContainer );
+	dockToolViewsIntoContainers( leftReparentWidgets, m_leftContainer );
+	dockToolViewsIntoContainers( rightReparentWidgets, m_rightContainer );
+	dockToolViewsIntoContainers( bottomReparentWidgets, m_bottomContainer );
+	dockToolViewsIntoContainers( topReparentWidgets, m_topContainer );
 
 
 	dockManager->setSpecialLeftDockContainer( m_leftContainer );
@@ -2075,10 +2075,10 @@ void KMdiMainFrm::finishIDEAlMode( bool full )
 			KMdiChildView* pView = it.current();
 			if ( pView->isToolView() )
 				continue;
-			TQSize mins = pView->tqminimumSize();
-			TQSize maxs = pView->tqmaximumSize();
+			TQSize mins = pView->minimumSize();
+			TQSize maxs = pView->maximumSize();
 			TQSize sz = pView->size();
-			TQWidget* pParent = pView->tqparentWidget();
+			TQWidget* pParent = pView->parentWidget();
 			TQPoint p( pParent->mapToGlobal( pParent->pos() ) - pParent->pos() + m_undockPositioningOffset );
 			pView->reparent( 0, 0, p );
 			pView->reparent( 0, 0, p );
@@ -2086,7 +2086,7 @@ void KMdiMainFrm::finishIDEAlMode( bool full )
 			pView->setMinimumSize( mins.width(), mins.height() );
 			pView->setMaximumSize( maxs.width(), maxs.height() );
 			KDockWidget* pDockW = 0L;
-			// tqfind the oldest ancestor of the current dockwidget that can be undocked
+			// find the oldest ancestor of the current dockwidget that can be undocked
 			do
 			{
 				if ( pParent->inherits( "KDockWidget" ) || pParent->inherits( "KDockWidget_Compat::KDockWidget" ) )
@@ -2101,7 +2101,7 @@ void KMdiMainFrm::finishIDEAlMode( bool full )
 				}
 				else
 				{
-					pParent = pParent->tqparentWidget();
+					pParent = pParent->parentWidget();
 				}
 			}
 			while ( pParent && !pDockW );
@@ -2262,10 +2262,10 @@ void KMdiMainFrm::setSysButtonsAtMenuPosition()
 {
 	if ( m_pMainMenuBar == 0L )
 		return ;
-	if ( m_pMainMenuBar->tqparentWidget() == 0L )
+	if ( m_pMainMenuBar->parentWidget() == 0L )
 		return ;
 
-	int menuW = m_pMainMenuBar->tqparentWidget() ->width();
+	int menuW = m_pMainMenuBar->parentWidget() ->width();
 	int h;
 	int y;
 	if ( frameDecorOfAttachedViews() == KMdi::Win95Look )
@@ -2357,7 +2357,7 @@ void KMdiMainFrm::activateFirstWin()
 		return ;
 
 	TQDateTime current = activeWindow() ->getTimeStamp();
-	TQMap<TQDateTime, KMdiChildView*>::iterator pos( m.tqfind( current ) );
+	TQMap<TQDateTime, KMdiChildView*>::iterator pos( m.find( current ) );
 	TQMap<TQDateTime, KMdiChildView*>::iterator newPos = pos;
 	if ( pos != m.end() )
 	{
@@ -2390,7 +2390,7 @@ void KMdiMainFrm::activateLastWin()
 		return ;
 
 	TQDateTime current = activeWindow() ->getTimeStamp();
-	TQMap<TQDateTime, KMdiChildView*>::iterator pos( m.tqfind( current ) );
+	TQMap<TQDateTime, KMdiChildView*>::iterator pos( m.find( current ) );
 	if ( pos != m.begin() )
 	{
 		--pos;
@@ -2934,4 +2934,4 @@ KTabWidget * KMdiMainFrm::tabWidget() const
 #include "kmdimainfrm.moc"
 
 // vim: ts=2 sw=2 et
-// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
diff --git a/kmdi/kmdimainfrm.h b/kmdi/kmdimainfrm.h
index 3468c1995..47ca34b9f 100644
--- a/kmdi/kmdimainfrm.h
+++ b/kmdi/kmdimainfrm.h
@@ -78,7 +78,7 @@ public:
 /**
  * \short Base class for all your special main frames.
  *
- * It tqcontains the child frame area (QMainWindow's central widget) and a child view taskbar
+ * It contains the child frame area (QMainWindow's central widget) and a child view taskbar
  * for switching the MDI views. Most methods are virtual functions for later overriding.
  *
  * Basically, this class provides functionality for docking/undocking view windows and
@@ -98,7 +98,7 @@ public:
  *
  * \code
  *		MyMainWindow mainframe;
- *		tqApp->setMainWidget(&mainframe);
+ *		qApp->setMainWidget(&mainframe);
  *		mainframe->addWindow(view1); // put it under MDI control
  *		mainframe->addWindow(view2);
  * \endcode
@@ -142,7 +142,7 @@ public:
  * use fakeSDIApplication() to fake it and isFakingSDIApplication() to query whether or not an SDI
  * interface is being faked.
  *
- * You can dynamically change the tqshape of the attached MDI views using setFrameDecorOfAttachedViews().
+ * You can dynamically change the shape of the attached MDI views using setFrameDecorOfAttachedViews().
  *
  * Additionally, here's a hint how to restore the mainframe's settings from config file:
  * \code
@@ -188,7 +188,7 @@ public:
  * - expandHorizontal() - expand all the windows to use the most amount of horizontal space
  *
  * activateView(KMdiChildView*) and activateView(int index) set the appropriate MDI child view as the active
- * one. It will be raised, will get an active MDI frame and will get the focus. Call activeView() to tqfind out what the
+ * one. It will be raised, will get an active MDI frame and will get the focus. Call activeView() to find out what the
  * current MDI view is.
  *
  * Use detachWindow() and attachWindow() for docking the MDI views to desktop and back.
@@ -296,7 +296,7 @@ private:
 
 	// methods
 public:
-	KMdiMainFrm( TQWidget* tqparentWidget, const char* name = "", KMdi::MdiMode mdiMode = KMdi::ChildframeMode, WFlags flags = WType_TopLevel | WDestructiveClose );
+	KMdiMainFrm( TQWidget* parentWidget, const char* name = "", KMdi::MdiMode mdiMode = KMdi::ChildframeMode, WFlags flags = WType_TopLevel | WDestructiveClose );
 	virtual ~KMdiMainFrm();
 
 	/**
@@ -345,7 +345,7 @@ public:
 	/**
 	 * Returns the KMdiChildView belonging to the given caption string.
 	 */
-	KMdiChildView * tqfindWindow( const TQString& caption );
+	KMdiChildView * findWindow( const TQString& caption );
 
 	enum ExistsAs {DocumentView, ToolView, AnyView};
 	/**
@@ -411,7 +411,7 @@ public:
 	}
 
 	/**
-	 * Returns a popup menu that tqcontains the MDI controlled view list.
+	 * Returns a popup menu that contains the MDI controlled view list.
 	 * Additionally, this menu provides some placing actions for these views.
 	 * Usually, you insert this popup menu in your main menubar as "Window" menu.
 	 */
@@ -474,7 +474,7 @@ public:
 	bool isFakingSDIApplication() const { return m_bSDIApplication; }
 
 	virtual bool eventFilter( TQObject *obj, TQEvent *e );
-	void tqfindRootDockWidgets( TQPtrList<KDockWidget>* pRootDockWidgetList, TQValueList<TQRect>* pPositionList );
+	void findRootDockWidgets( TQPtrList<KDockWidget>* pRootDockWidgetList, TQValueList<TQRect>* pPositionList );
 
 	/** We're switching something.*/
 	void setSwitching( const bool switching ) { m_bSwitching = switching; }
@@ -532,7 +532,7 @@ public slots:
 	/**
 	 * Adds a KMdiChildView to the MDI system. The main frame takes control of it.
 	 * \param pWnd the parent view.
-	 * \param rectNormal Sets the tqgeometry for this child view
+	 * \param rectNormal Sets the geometry for this child view
 	 * \param flags the flags for the view such as:
 	 * \li whether the view should be attached or detached.
 	 * \li whether the view should be shown or hidden
@@ -570,7 +570,7 @@ public slots:
 	 * Removes a KMdiChildView from the MDI system and from the main frame`s control.
 	 * Note: The view will be deleted!
 	 */
-	virtual void closeWindow( KMdiChildView *pWnd, bool tqlayoutTaskBar = true );
+	virtual void closeWindow( KMdiChildView *pWnd, bool layoutTaskBar = true );
 
 	/**
 	 * Switches the KMdiTaskBar on and off.
@@ -763,7 +763,7 @@ protected:
 	 */
 	void blockClearingOfWindowMenu( bool bBlocked ) { m_bClearingOfWindowMenuBlocked = bBlocked; }
 
-	void tqfindToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDockWidget::DockPosition dprtmw );
+	void findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDockWidget::DockPosition dprtmw );
 	void dockToolViewsIntoContainers( TQPtrList<KDockWidget>& widgetsToReparent, KDockWidget *container );
 	TQStringList prepareIdealToTabs( KDockWidget* container );
 	void idealToolViewsToStandardTabs( TQStringList widgetNames, KDockWidget::DockPosition pos, int sizee );
@@ -876,4 +876,4 @@ signals:
 
 #endif //_KMDIMAINFRM_H_
 
-// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
diff --git a/kmdi/kmdinulliterator.h b/kmdi/kmdinulliterator.h
index ff671af4a..3c976caac 100644
--- a/kmdi/kmdinulliterator.h
+++ b/kmdi/kmdinulliterator.h
@@ -45,5 +45,5 @@ public:
 };
 
 #endif // _KMDINULLITERATOR_H_
-// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
 
diff --git a/kmdi/kmditaskbar.cpp b/kmdi/kmditaskbar.cpp
index 6beecb24e..71c3de454 100644
--- a/kmdi/kmditaskbar.cpp
+++ b/kmdi/kmditaskbar.cpp
@@ -102,7 +102,7 @@ void KMdiTaskBarButton::fitText( const TQString& origStr, int newWidth )
 {
 	TQButton::setText( m_actualText );
 
-	int actualWidth = tqsizeHint().width();
+	int actualWidth = sizeHint().width();
 	int realLetterCount = origStr.length();
 	int newLetterCount = ( newWidth * realLetterCount ) / actualWidth;
 	int w = newWidth + 1;
@@ -144,7 +144,7 @@ KMdiTaskBar::KMdiTaskBar( KMdiMainFrm *parent, TQMainWindow::ToolBarDock dock )
 		: KToolBar( parent, "KMdiTaskBar",  /*honor_style*/ false,  /*readConfig*/ true )
 		, m_pCurrentFocusedWindow( 0 )
 		, m_pStretchSpace( 0 )
-		, m_tqlayoutIsPending( false )
+		, m_layoutIsPending( false )
 		, m_bSwitchedOn( false )
 {
 	m_pFrm = parent;
@@ -175,12 +175,12 @@ KMdiTaskBarButton * KMdiTaskBar::addWinButton( KMdiChildView *win_ptr )
 	TQObject::connect( b, TQT_SIGNAL( clicked( KMdiChildView* ) ), this, TQT_SLOT( setActiveButton( KMdiChildView* ) ) );
 	TQObject::connect( b, TQT_SIGNAL( leftMouseButtonClicked( KMdiChildView* ) ), m_pFrm, TQT_SLOT( activateView( KMdiChildView* ) ) );
 	TQObject::connect( b, TQT_SIGNAL( rightMouseButtonClicked( KMdiChildView* ) ), m_pFrm, TQT_SLOT( taskbarButtonRightClicked( KMdiChildView* ) ) );
-	TQObject::connect( b, TQT_SIGNAL( buttonTextChanged( int ) ), this, TQT_SLOT( tqlayoutTaskBar( int ) ) );
+	TQObject::connect( b, TQT_SIGNAL( buttonTextChanged( int ) ), this, TQT_SLOT( layoutTaskBar( int ) ) );
 	m_pButtonList->append( b );
 	b->setToggleButton( true );
 	b->setText( win_ptr->tabCaption() );
 
-	tqlayoutTaskBar();
+	layoutTaskBar();
 
 	m_pStretchSpace = new TQLabel( this, "empty" );
 	m_pStretchSpace->setText( "" );
@@ -202,7 +202,7 @@ void KMdiTaskBar::removeWinButton( KMdiChildView *win_ptr, bool haveToLayoutTask
 	{
 		m_pButtonList->removeRef( b );
 		if ( haveToLayoutTaskBar )
-			tqlayoutTaskBar();
+			layoutTaskBar();
 	}
 	if ( m_pButtonList->count() == 0 )
 	{
@@ -303,11 +303,11 @@ void KMdiTaskBar::setActiveButton( KMdiChildView *win_ptr )
 	}
 }
 
-void KMdiTaskBar::tqlayoutTaskBar( int taskBarWidth )
+void KMdiTaskBar::layoutTaskBar( int taskBarWidth )
 {
-	if ( m_tqlayoutIsPending )
+	if ( m_layoutIsPending )
 		return ;
-	m_tqlayoutIsPending = true;
+	m_layoutIsPending = true;
 
 	if ( !taskBarWidth )
 		// no width is given
@@ -337,16 +337,16 @@ void KMdiTaskBar::tqlayoutTaskBar( int taskBarWidth )
 	// if there's enough space, use actual width
 	int buttonCount = m_pButtonList->count();
 	int tbHandlePixel;
-	tbHandlePixel = style().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
-	int buttonAreaWidth = taskBarWidth - tbHandlePixel - style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, this ) - 5;
-	if ( ( ( allButtonsWidthHint ) <= buttonAreaWidth ) || ( width() < tqparentWidget() ->width() ) )
+	tbHandlePixel = style().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
+	int buttonAreaWidth = taskBarWidth - tbHandlePixel - style().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ) - 5;
+	if ( ( ( allButtonsWidthHint ) <= buttonAreaWidth ) || ( width() < parentWidget() ->width() ) )
 	{
 		for ( b = m_pButtonList->first();b;b = m_pButtonList->next() )
 		{
 			b->setText( b->actualText() );
-			if ( b->width() != b->tqsizeHint().width() )
+			if ( b->width() != b->sizeHint().width() )
 			{
-				b->setFixedWidth( b->tqsizeHint().width() );
+				b->setFixedWidth( b->sizeHint().width() );
 				b->show();
 			}
 		}
@@ -372,19 +372,19 @@ void KMdiTaskBar::tqlayoutTaskBar( int taskBarWidth )
 				}
 			}
 	}
-	m_tqlayoutIsPending = false;
+	m_layoutIsPending = false;
 }
 
 void KMdiTaskBar::resizeEvent( TQResizeEvent* rse )
 {
-	if ( !m_tqlayoutIsPending )
+	if ( !m_layoutIsPending )
 	{
 		if ( m_pButtonList->count() != 0 )
 		{
-			tqlayoutTaskBar( rse->size().width() );
+			layoutTaskBar( rse->size().width() );
 		}
 	}
 	KToolBar::resizeEvent( rse );
 }
 
-// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
diff --git a/kmdi/kmditaskbar.h b/kmdi/kmditaskbar.h
index a97159135..39c4efa2e 100644
--- a/kmdi/kmditaskbar.h
+++ b/kmdi/kmditaskbar.h
@@ -87,7 +87,7 @@ signals:
 	*/
 	void rightMouseButtonClicked( KMdiChildView* );
 	/**
-	* Emitted when the button text has changed. Internally connected with KMdiTaskBar::tqlayoutTaskBar
+	* Emitted when the button text has changed. Internally connected with KMdiTaskBar::layoutTaskBar
 	*/
 	void buttonTextChanged( int );
 public slots:
@@ -171,7 +171,7 @@ public:
 	};
 protected:
 	/**
-	* Reimplemented from its base class to call tqlayoutTaskBar, additionally.
+	* Reimplemented from its base class to call layoutTaskBar, additionally.
 	*/
 	void resizeEvent( TQResizeEvent* );
 protected slots:
@@ -182,7 +182,7 @@ protected slots:
 	* fixed width and show() is called for each one.
 	* If one drags the taskbar to a vertical orientation, the button width is set to 80 pixel.
 	*/
-	void tqlayoutTaskBar( int taskBarWidth = 0 );
+	void layoutTaskBar( int taskBarWidth = 0 );
 public slots:
 	/**
 	* Pushes the desired taskbar button down (switch on), the old one is released (switched off).
@@ -207,7 +207,7 @@ protected:
 	* A stretchable widget used as 'space' at the end of a half filled taskbar
 	*/
 	TQLabel* m_pStretchSpace;
-	bool m_tqlayoutIsPending;
+	bool m_layoutIsPending;
 	bool m_bSwitchedOn;
 
 private:
@@ -215,5 +215,5 @@ private:
 };
 
 #endif //_KMDITASKBAR_H_ 
-// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
 
diff --git a/kmdi/kmditoolviewaccessor.cpp b/kmdi/kmditoolviewaccessor.cpp
index 17eb2a44f..1d2cce946 100644
--- a/kmdi/kmditoolviewaccessor.cpp
+++ b/kmdi/kmditoolviewaccessor.cpp
@@ -219,12 +219,12 @@ void KMdiToolViewAccessor::place( KDockWidget::DockPosition pos, TQWidget* pTarg
 		if ( !DockToOurself )
 			if ( pTargetWnd != 0L )
 			{
-				pTargetDock = mdiMainFrm->dockManager->tqfindWidgetParentDock( pTargetWnd );
+				pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd );
 				if ( !pTargetDock )
 				{
-					if ( pTargetWnd->tqparentWidget() )
+					if ( pTargetWnd->parentWidget() )
 					{
-						pTargetDock = mdiMainFrm->dockManager->tqfindWidgetParentDock( pTargetWnd->tqparentWidget() );
+						pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd->parentWidget() );
 					}
 				}
 			}
@@ -232,7 +232,7 @@ void KMdiToolViewAccessor::place( KDockWidget::DockPosition pos, TQWidget* pTarg
 		{
 			if ( mdiMainFrm->m_managedDockPositionMode && ( mdiMainFrm->m_pMdi || mdiMainFrm->m_documentTabWidget ) )
 			{
-				KDockWidget * dw1 = pTargetDock->tqfindNearestDockWidget( pos );
+				KDockWidget * dw1 = pTargetDock->findNearestDockWidget( pos );
 				if ( dw1 )
 					pCover->manualDock( dw1, KDockWidget::DockCenter, percent );
 				else
@@ -262,8 +262,8 @@ void KMdiToolViewAccessor::show()
 }
 
 
-#ifndef NO_INCLUDE_TQMOCFILES
+#ifndef NO_INCLUDE_MOCFILES
 #include "kmditoolviewaccessor.moc"
 #endif 
-// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
 
diff --git a/kmdi/kmditoolviewaccessor.h b/kmdi/kmditoolviewaccessor.h
index 346100478..28241ea3b 100644
--- a/kmdi/kmditoolviewaccessor.h
+++ b/kmdi/kmditoolviewaccessor.h
@@ -35,7 +35,7 @@ class KMDIGUIClient;
 }
 
 
-class KMDI_EXPORT KMdiToolViewAccessor : public TQObject
+class KMDI_EXPORT KMdiToolViewAccessor : public QObject
 {
 	Q_OBJECT
 
@@ -82,5 +82,5 @@ protected:
 
 
 #endif //_KMDITOOLVIEWACCESSOR_H_ 
-// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
 
diff --git a/kmdi/test/hello.cpp b/kmdi/test/hello.cpp
index e6d86eea9..d92233ea6 100644
--- a/kmdi/test/hello.cpp
+++ b/kmdi/test/hello.cpp
@@ -18,8 +18,8 @@
   Constructs a Hello widget. Starts a 40 ms animation timer.
 */
 
-Hello::Hello( const char *title, const char *text, TQWidget *tqparentWidget )
-    : KMdiChildView(title, tqparentWidget), t(text), b(0)
+Hello::Hello( const char *title, const char *text, TQWidget *parentWidget )
+    : KMdiChildView(title, parentWidget), t(text), b(0)
 {
     TQTimer *timer = new TQTimer(this);
     TQObject::connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(animate()) );
@@ -36,7 +36,7 @@ Hello::Hello( const char *title, const char *text, TQWidget *tqparentWidget )
 void Hello::animate()
 {
     b = (b + 1) & 15;
-    tqrepaint( false );
+    repaint( false );
 }
 
 
@@ -49,7 +49,7 @@ void Hello::animate()
 
 void Hello::mouseReleaseEvent( TQMouseEvent *e )
 {
-    if ( rect().tqcontains( e->pos() ) )
+    if ( rect().contains( e->pos() ) )
         emit clicked();
 }
 
diff --git a/kmdi/test/hello.h b/kmdi/test/hello.h
index 762318d87..808d25b90 100644
--- a/kmdi/test/hello.h
+++ b/kmdi/test/hello.h
@@ -22,7 +22,7 @@ class Hello : public KMdiChildView
 {
     Q_OBJECT
 public:
-    Hello( const char *title, const char *text, TQWidget* tqparentWidget = 0 );
+    Hello( const char *title, const char *text, TQWidget* parentWidget = 0 );
 signals:
     void clicked();
 protected:
diff --git a/knewstuff/data/README b/knewstuff/data/README
index 4417ccc89..6e50ceb2c 100644
--- a/knewstuff/data/README
+++ b/knewstuff/data/README
@@ -1,5 +1,5 @@
-This directory tqcontains example files for the providers list and the description
+This directory contains example files for the providers list and the description
 of downloadable entries.
 
-It also tqcontains the DTDs for the XML files. You can check the XML files for
+It also contains the DTDs for the XML files. You can check the XML files for
 validity e.g with "xmllint <filename> --valid".
diff --git a/knewstuff/downloaddialog.cpp b/knewstuff/downloaddialog.cpp
index 8cfe97acc..4e1d298c8 100644
--- a/knewstuff/downloaddialog.cpp
+++ b/knewstuff/downloaddialog.cpp
@@ -338,7 +338,7 @@ void DownloadDialog::slotResult(KIO::Job *job)
 
   kdDebug() << "got data: " << m_data[job] << endl;
 
-  kapp->config()->setGroup("KNewStufftqStatus");
+  kapp->config()->setGroup("KNewStuffStatus");
 
   dom.setContent(m_data[job]);
   knewstuff = dom.documentElement();
@@ -386,7 +386,7 @@ void DownloadDialog::slotResult(KIO::Job *job)
   }
 }
 
-int DownloadDialog::installtqStatus(Entry *entry)
+int DownloadDialog::installStatus(Entry *entry)
 {
   TQDate date;
   TQString datestring;
@@ -394,7 +394,7 @@ int DownloadDialog::installtqStatus(Entry *entry)
 
   TQString lang = KGlobal::locale()->language();
 
-  kapp->config()->setGroup("KNewStufftqStatus");
+  kapp->config()->setGroup("KNewStuffStatus");
   datestring = kapp->config()->readEntry(entry->name(lang));
   if(datestring.isNull()) installed = 0;
   else
@@ -413,7 +413,7 @@ void DownloadDialog::addEntry(Entry *entry, const TQStringList& variants)
   TQPixmap pix;
   int installed;
 
-  installed = installtqStatus(entry);
+  installed = installStatus(entry);
 
   if(installed > 0) pix = KGlobal::iconLoader()->loadIcon("ok", KIcon::Small);
   else if(installed < 0) pix = KGlobal::iconLoader()->loadIcon("history", KIcon::Small);
@@ -421,19 +421,19 @@ void DownloadDialog::addEntry(Entry *entry, const TQStringList& variants)
 
   TQString lang = KGlobal::locale()->language();
 
-  if(variants.tqcontains("score"))
+  if(variants.contains("score"))
   {
     KListViewItem *tmp_r = new NumSortListViewItem(lv_r,
       entry->name(lang), entry->version(), TQString("%1").arg(entry->rating()));
     tmp_r->setPixmap(0, pix);
   }
-  if(variants.tqcontains("downloads"))
+  if(variants.contains("downloads"))
   {
     KListViewItem *tmp_d = new NumSortListViewItem(lv_d,
       entry->name(lang), entry->version(), TQString("%1").arg(entry->downloads()));
     tmp_d->setPixmap(0, pix);
   }
-  if(variants.tqcontains("latest"))
+  if(variants.contains("latest"))
   {
     KListViewItem *tmp_l = new DateSortListViewItem(lv_l,
       entry->name(lang), entry->version(), KGlobal::locale()->formatDate(entry->releaseDate()));
@@ -546,7 +546,7 @@ void DownloadDialog::slotInstall()
 
 void DownloadDialog::install(Entry *e)
 {
-  kapp->config()->setGroup("KNewStufftqStatus");
+  kapp->config()->setGroup("KNewStuffStatus");
   kapp->config()->writeEntry(m_entryname, e->releaseDate().toString(Qt::ISODate));
   kapp->config()->sync();
 
@@ -559,11 +559,11 @@ void DownloadDialog::install(Entry *e)
     m_entryitem->setPixmap(0, pix);
 
     TQListViewItem *item;
-    item = lv_r->tqfindItem(e->name(lang), 0);
+    item = lv_r->findItem(e->name(lang), 0);
     if(item) item->setPixmap(0, pix);
-    item = lv_d->tqfindItem(e->name(lang), 0);
+    item = lv_d->findItem(e->name(lang), 0);
     if(item) item->setPixmap(0, pix);
-    item = lv_l->tqfindItem(e->name(lang), 0);
+    item = lv_l->findItem(e->name(lang), 0);
     if(item) item->setPixmap(0, pix);
   }
 
@@ -651,19 +651,19 @@ void DownloadDialog::slotSelected()
     if(m_curtab != 0)
     {
       lv_r->clearSelection();
-      item = lv_r->tqfindItem(e->name(lang), 0);
+      item = lv_r->findItem(e->name(lang), 0);
       if(item) lv_r->setSelected(item, true);
     }
     if(m_curtab != 1)
     {
       lv_d->clearSelection();
-      item = lv_d->tqfindItem(e->name(lang), 0);
+      item = lv_d->findItem(e->name(lang), 0);
       if(item) lv_d->setSelected(item, true);
     }
     if(m_curtab != 2)
     {
       lv_l->clearSelection();
-      item = lv_l->tqfindItem(e->name(lang), 0);
+      item = lv_l->findItem(e->name(lang), 0);
       if(item) lv_l->setSelected(item, true);
     }
 
@@ -701,7 +701,7 @@ void DownloadDialog::slotSelected()
     m_rt->clear();
     m_rt->setText(desc);
 
-    if(installtqStatus(e) == 1) enabled = false;
+    if(installStatus(e) == 1) enabled = false;
     else enabled = true;
 
     TQPushButton *de, *in;
@@ -743,7 +743,7 @@ void DownloadDialog::slotPage(TQWidget *w)
 
   kdDebug() << "changed widget!!!" << endl;
 
-  if(m_map.tqfind(w) == m_map.end()) return;
+  if(m_map.find(w) == m_map.end()) return;
 
   d->m_page = w;
 
@@ -794,7 +794,7 @@ void DownloadDialog::loadProvider(Provider *p)
   for(TQStringList::Iterator it = variants.begin(); it != variants.end(); it++)
   {
     TQString url = p->downloadUrlVariant((*it)).url();
-    if(!urls.tqcontains(url))
+    if(!urls.contains(url))
     {
       urls[url] = TQStringList();
     }
diff --git a/knewstuff/downloaddialog.h b/knewstuff/downloaddialog.h
index 235c6686d..2c30ee9ba 100644
--- a/knewstuff/downloaddialog.h
+++ b/knewstuff/downloaddialog.h
@@ -227,7 +227,7 @@ class KDE_EXPORT DownloadDialog : public KDialogBase
     Entry *getEntry();
     void loadProvider(Provider *p);
     void install(Entry *e);
-    int installtqStatus(Entry *e);
+    int installStatus(Entry *e);
     TQListViewItem *currentEntryItem();
 
     ProviderLoader *m_loader;
diff --git a/knewstuff/engine.cpp b/knewstuff/engine.cpp
index 5063f3ef6..799ce9898 100644
--- a/knewstuff/engine.cpp
+++ b/knewstuff/engine.cpp
@@ -46,8 +46,8 @@ struct Engine::Private
 };
 
 Engine::Engine( KNewStuff *newStuff, const TQString &type,
-                TQWidget *tqparentWidget ) :
-  mParentWidget( tqparentWidget ), mDownloadDialog( 0 ),
+                TQWidget *parentWidget ) :
+  mParentWidget( parentWidget ), mDownloadDialog( 0 ),
   mUploadDialog( 0 ), mProviderDialog( 0 ), mUploadProvider( 0 ),
   d(new Private), mType( type )
 {
@@ -57,8 +57,8 @@ Engine::Engine( KNewStuff *newStuff, const TQString &type,
 }
 
 Engine::Engine( KNewStuff *newStuff, const TQString &type,
-                const TQString &providerList, TQWidget *tqparentWidget ) :
-                mParentWidget( tqparentWidget ),
+                const TQString &providerList, TQWidget *parentWidget ) :
+                mParentWidget( parentWidget ),
 		mDownloadDialog( 0 ), mUploadDialog( 0 ),
 		mProviderDialog( 0 ), mUploadProvider( 0 ),
                 mProviderList( providerList ), d(new Private),
diff --git a/knewstuff/engine.h b/knewstuff/engine.h
index 14c7e2b3d..d3834566f 100644
--- a/knewstuff/engine.h
+++ b/knewstuff/engine.h
@@ -48,7 +48,7 @@ class ProviderDialog;
  * \par Maintainer:
  * Josef Spillner (spillner@kde.org)
  */
-class KDE_EXPORT Engine : public TQObject
+class KDE_EXPORT Engine : public QObject
 {
     Q_OBJECT
     struct Private;
@@ -58,18 +58,18 @@ class KDE_EXPORT Engine : public TQObject
 
       @param newStuff a KNewStuff object
       @param type the Hotstuff data type such as "korganizer/calendar"
-      @param tqparentWidget the parent window
+      @param parentWidget the parent window
     */
-    Engine( KNewStuff *newStuff, const TQString &type, TQWidget *tqparentWidget = 0 );
+    Engine( KNewStuff *newStuff, const TQString &type, TQWidget *parentWidget = 0 );
     /**
       Constructor.
 
       @param newStuff a KNewStuff object
       @param type the Hotstuff data type such as "korganizer/calendar"
       @param providerList the URL of the provider list
-      @param tqparentWidget the parent window
+      @param parentWidget the parent window
     */
-    Engine( KNewStuff *newStuff, const TQString &type, const TQString &providerList, TQWidget *tqparentWidget = 0 );
+    Engine( KNewStuff *newStuff, const TQString &type, const TQString &providerList, TQWidget *parentWidget = 0 );
 
     /**
       Destructor.
@@ -88,7 +88,7 @@ class KDE_EXPORT Engine : public TQObject
 
       @return parent widget
     */
-    TQWidget *tqparentWidget() const { return mParentWidget; }
+    TQWidget *parentWidget() const { return mParentWidget; }
 
     /**
       Initiates the download process, retrieving provider lists and invoking
diff --git a/knewstuff/entry.cpp b/knewstuff/entry.cpp
index 97950b9da..cdbf4dbe7 100644
--- a/knewstuff/entry.cpp
+++ b/knewstuff/entry.cpp
@@ -47,11 +47,11 @@ static EntryPrivate *d(const Entry *e)
     d_ptr = new TQPtrDict<EntryPrivate>();
     d_ptr->setAutoDelete(true);
   }
-  EntryPrivate *ret = d_ptr->tqfind((void*)e);
+  EntryPrivate *ret = d_ptr->find((void*)e);
   if(!ret)
   {
     ret = new EntryPrivate();
-    d_ptr->tqreplace((void*)e, ret);
+    d_ptr->replace((void*)e, ret);
   }
   return ret;
 }
@@ -84,13 +84,13 @@ void Entry::setName( const TQString &name, const TQString &lang )
 {
   d(this)->mNameMap.insert( lang, name );
 
-  if ( mLangs.tqfind( lang ) == mLangs.end() ) mLangs.append( lang );
+  if ( mLangs.find( lang ) == mLangs.end() ) mLangs.append( lang );
 }
 
 // BCI part ends here
 
 Entry::Entry() :
-  mRelease( 0 ), mReleaseDate( TQDate::tqcurrentDate() ), mRating( 0 ),
+  mRelease( 0 ), mReleaseDate( TQDate::currentDate() ), mRating( 0 ),
   mDownloads( 0 )
 {
 }
@@ -105,7 +105,7 @@ Entry::~Entry()
 {
     if (d_ptr)
     {
-        EntryPrivate *p = d_ptr->tqfind(this);
+        EntryPrivate *p = d_ptr->find(this);
         if (p)
             d_ptr->remove(p);
 
@@ -166,7 +166,7 @@ void Entry::setSummary( const TQString &text, const TQString &lang )
 {
   mSummaryMap.insert( lang, text );
 
-  if ( mLangs.tqfind( lang ) == mLangs.end() ) mLangs.append( lang );
+  if ( mLangs.find( lang ) == mLangs.end() ) mLangs.append( lang );
 }
 
 TQString Entry::summary( const TQString &lang ) const
@@ -221,7 +221,7 @@ void Entry::setPayload( const KURL &url, const TQString &lang )
 {
   mPayloadMap.insert( lang, url );
 
-  if ( mLangs.tqfind( lang ) == mLangs.end() ) mLangs.append( lang );
+  if ( mLangs.find( lang ) == mLangs.end() ) mLangs.append( lang );
 }
 
 KURL Entry::payload( const TQString &lang ) const
@@ -244,7 +244,7 @@ void Entry::setPreview( const KURL &url, const TQString &lang )
 {
   mPreviewMap.insert( lang, url );
   
-  if ( mLangs.tqfind( lang ) == mLangs.end() ) mLangs.append( lang );
+  if ( mLangs.find( lang ) == mLangs.end() ) mLangs.append( lang );
 }
 
 KURL Entry::preview( const TQString &lang ) const
diff --git a/knewstuff/knewstuff.cpp b/knewstuff/knewstuff.cpp
index 84fef0ac1..6a37aa61d 100644
--- a/knewstuff/knewstuff.cpp
+++ b/knewstuff/knewstuff.cpp
@@ -39,14 +39,14 @@ KAction* KNS::standardAction(const TQString& what,
                        0, recvr, slot, parent, name);
 }
 
-KNewStuff::KNewStuff( const TQString &type, TQWidget *tqparentWidget )
+KNewStuff::KNewStuff( const TQString &type, TQWidget *parentWidget )
 {
-    mEngine = new Engine( this, type, tqparentWidget );
+    mEngine = new Engine( this, type, parentWidget );
 }
 
-KNewStuff::KNewStuff( const TQString &type, const TQString &providerList, TQWidget *tqparentWidget )
+KNewStuff::KNewStuff( const TQString &type, const TQString &providerList, TQWidget *parentWidget )
 {
-  mEngine = new Engine( this, type, providerList, tqparentWidget );
+  mEngine = new Engine( this, type, providerList, parentWidget );
 }
 
 TQString KNewStuff::type() const
@@ -54,9 +54,9 @@ TQString KNewStuff::type() const
   return mEngine->type();
 }
 
-TQWidget *KNewStuff::tqparentWidget() const
+TQWidget *KNewStuff::parentWidget() const
 {
-  return mEngine->tqparentWidget();
+  return mEngine->parentWidget();
 }
 
 KNewStuff::~KNewStuff()
diff --git a/knewstuff/knewstuff.h b/knewstuff/knewstuff.h
index 0891aa4de..5d2319aec 100644
--- a/knewstuff/knewstuff.h
+++ b/knewstuff/knewstuff.h
@@ -74,10 +74,10 @@ class KDE_EXPORT KNewStuff
 
       @param type type of data to be handled, should be something like
                   korganizer/calendar, kword/template, kdesktop/wallpaper
-      @param tqparentWidget parent widget of dialogs opened by the KNewStuff
+      @param parentWidget parent widget of dialogs opened by the KNewStuff
                           engine
     */
-    KNewStuff( const TQString &type, TQWidget *tqparentWidget = 0 );
+    KNewStuff( const TQString &type, TQWidget *parentWidget = 0 );
     
     /**
       Constructor.
@@ -85,10 +85,10 @@ class KDE_EXPORT KNewStuff
       @param type type of data to be handled, should be something like
                   korganizer/calendar, kword/template, kdesktop/wallpaper
       @param providerList the URL of the provider list
-      @param tqparentWidget parent widget of dialogs opened by the KNewStuff
+      @param parentWidget parent widget of dialogs opened by the KNewStuff
                           engine
     */
-    KNewStuff( const TQString &type, const TQString &providerList, TQWidget *tqparentWidget = 0 );
+    KNewStuff( const TQString &type, const TQString &providerList, TQWidget *parentWidget = 0 );
     virtual ~KNewStuff();
 
     /**
@@ -99,7 +99,7 @@ class KDE_EXPORT KNewStuff
     /**
       Return parent widget.
     */
-    TQWidget *tqparentWidget() const;
+    TQWidget *parentWidget() const;
 
     /**
       Start download process.
diff --git a/knewstuff/knewstuffgeneric.cpp b/knewstuff/knewstuffgeneric.cpp
index ef8615b36..8438e25ea 100644
--- a/knewstuff/knewstuffgeneric.cpp
+++ b/knewstuff/knewstuffgeneric.cpp
@@ -70,7 +70,7 @@ bool KNewStuffGeneric::install( const TQString &fileName )
     kdDebug() << "InstallationCommand: " << cmd << endl;
     list = TQStringList::split( " ", cmd );
     for ( TQStringList::iterator it = list.begin(); it != list.end(); ++it ) {
-        list2 << (*it).tqreplace("%f", fileName);
+        list2 << (*it).replace("%f", fileName);
     }
     KProcess proc;
     proc << list2;
@@ -135,7 +135,7 @@ TQString KNewStuffGeneric::downloadDestination( KNS::Entry *entry )
   TQString file = destinationPath(entry);
 
   if ( KStandardDirs::exists( file ) ) {
-    int result = KMessageBox::warningContinueCancel( tqparentWidget(),
+    int result = KMessageBox::warningContinueCancel( parentWidget(),
         i18n("The file '%1' already exists. Do you want to overwrite it?")
         .arg( file ),
         TQString::null, i18n("Overwrite") );
diff --git a/knewstuff/knewstuffsecure.cpp b/knewstuff/knewstuffsecure.cpp
index d3b3b333c..f68be7ae3 100644
--- a/knewstuff/knewstuffsecure.cpp
+++ b/knewstuff/knewstuffsecure.cpp
@@ -33,8 +33,8 @@
 
 using namespace KNS;
 
-KNewStuffSecure::KNewStuffSecure(const TQString &type,  TQWidget *tqparentWidget)
- : KNewStuff(type, tqparentWidget)
+KNewStuffSecure::KNewStuffSecure(const TQString &type,  TQWidget *parentWidget)
+ : KNewStuff(type, parentWidget)
 {
   m_tempDir = 0L;
   connect(engine(), TQT_SIGNAL(uploadFinished(bool)), TQT_SLOT(slotUploadFinished(bool)));
@@ -80,7 +80,7 @@ bool KNewStuffSecure::install(const TQString &fileName)
   } else
       ok = false;
   if (!ok)
-    KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded resource tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Resource Installation Error"));
+    KMessageBox::error(parentWidget(), i18n("There was an error with the downloaded resource tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Resource Installation Error"));
   return ok;
 }
 
@@ -134,10 +134,10 @@ void KNewStuffSecure::slotValidated(int result)
   if (!valid)
   {
       signatureStr.prepend( "<br>");
-      if (KMessageBox::warningContinueCancel(tqparentWidget(), i18n("<qt>There is a problem with the resource file you have downloaded. The errors are :<b>%1</b><br>%2<br><br>Installation of the resource is <b>not recommended</b>.<br><br>Do you want to proceed with the installation?</qt>").arg(errorString).arg(signatureStr), i18n("Problematic Resource File")) == KMessageBox::Continue)
+      if (KMessageBox::warningContinueCancel(parentWidget(), i18n("<qt>There is a problem with the resource file you have downloaded. The errors are :<b>%1</b><br>%2<br><br>Installation of the resource is <b>not recommended</b>.<br><br>Do you want to proceed with the installation?</qt>").arg(errorString).arg(signatureStr), i18n("Problematic Resource File")) == KMessageBox::Continue)
           valid = true;
   } else
-    KMessageBox::information(tqparentWidget(), i18n("<qt>%1<br><br>Press OK to install it.</qt>").arg(signatureStr), i18n("Valid Resource"), "Show Valid Signature Information");
+    KMessageBox::information(parentWidget(), i18n("<qt>%1<br><br>Press OK to install it.</qt>").arg(signatureStr), i18n("Valid Resource"), "Show Valid Signature Information");
   if (valid)
   {
      installResource();
@@ -145,8 +145,8 @@ void KNewStuffSecure::slotValidated(int result)
   } else
   {
     KConfig *cfg = KGlobal::config();
-    cfg->deleteGroup("KNewStufftqStatus");
-    cfg->setGroup("KNewStufftqStatus");
+    cfg->deleteGroup("KNewStuffStatus");
+    cfg->setGroup("KNewStuffStatus");
     for (TQMap<TQString, TQString>::ConstIterator it = m_installedResources.constBegin(); it != m_installedResources.constEnd(); ++it)
     {
       cfg->writeEntry(it.key(), it.data());
@@ -160,7 +160,7 @@ void KNewStuffSecure::slotValidated(int result)
 void KNewStuffSecure::downloadResource()
 {
   KConfig *cfg = KGlobal::config();
-  m_installedResources = cfg->entryMap("KNewStufftqStatus");
+  m_installedResources = cfg->entryMap("KNewStuffStatus");
   engine()->ignoreInstallResult(true);
   KNewStuff::download();
 }
@@ -187,12 +187,12 @@ void KNewStuffSecure::slotFileSigned(int result)
 {
   if (result == 0)
   {
-    KMessageBox::error(tqparentWidget(), i18n("The signing failed for unknown reason."));    
+    KMessageBox::error(parentWidget(), i18n("The signing failed for unknown reason."));    
   } else
   {
     if (result & Security::BAD_PASSPHRASE)
     {
-      if (KMessageBox::warningContinueCancel(tqparentWidget(), i18n("There are no keys usable for signing or you did not entered the correct passphrase.\nProceed without signing the resource?")) == KMessageBox::Cancel)
+      if (KMessageBox::warningContinueCancel(parentWidget(), i18n("There are no keys usable for signing or you did not entered the correct passphrase.\nProceed without signing the resource?")) == KMessageBox::Cancel)
       {
         disconnect(Security::ref(), TQT_SIGNAL(fileSigned(int)), this, TQT_SLOT(slotFileSigned(int)));
         removeTempDirectory();
@@ -231,7 +231,7 @@ void KNewStuffSecure::removeTempDirectory()
 {
   if (m_tempDir)
   {
-    KIO::NetAccess::del(KURL().fromPathOrURL(m_tempDir->name()), tqparentWidget());
+    KIO::NetAccess::del(KURL().fromPathOrURL(m_tempDir->name()), parentWidget());
     delete m_tempDir;
     m_tempDir = 0L;
   }
diff --git a/knewstuff/knewstuffsecure.h b/knewstuff/knewstuffsecure.h
index 52a8d856b..1a6bc44a1 100644
--- a/knewstuff/knewstuffsecure.h
+++ b/knewstuff/knewstuffsecure.h
@@ -46,10 +46,10 @@ public:
 
       @param type type of data to be handled, should be something like
              korganizer/calendar, kword/template, kdesktop/wallpaper
-      @param tqparentWidget parent widget of dialogs opened by the KNewStuff
+      @param parentWidget parent widget of dialogs opened by the KNewStuff
               engine
      */
-    KNewStuffSecure(const TQString &type,  TQWidget *tqparentWidget=0);
+    KNewStuffSecure(const TQString &type,  TQWidget *parentWidget=0);
     virtual ~KNewStuffSecure();
 
     /** Installs the downloaded resource. Do not call or reimplement directly. 
diff --git a/knewstuff/provider.cpp b/knewstuff/provider.cpp
index 1d059d34f..c1d12853c 100644
--- a/knewstuff/provider.cpp
+++ b/knewstuff/provider.cpp
@@ -53,11 +53,11 @@ static ProviderPrivate *d_prov(const Provider *p)
     d_ptr_prov = new TQPtrDict<ProviderPrivate>();
     d_ptr_prov->setAutoDelete(true);
   }
-  ProviderPrivate *ret = d_ptr_prov->tqfind((void*)p);
+  ProviderPrivate *ret = d_ptr_prov->find((void*)p);
   if(!ret)
   {
     ret = new ProviderPrivate();
-    d_ptr_prov->tqreplace((void*)p, ret);
+    d_ptr_prov->replace((void*)p, ret);
   }
   return ret;
 }
@@ -89,7 +89,7 @@ Provider::~Provider()
 {
     if (d_ptr_prov)
     {
-        ProviderPrivate *p = d_ptr_prov->tqfind(this);
+        ProviderPrivate *p = d_ptr_prov->find(this);
         if (p)
             d_ptr_prov->remove(p);
 
@@ -206,8 +206,8 @@ TQDomElement Provider::createDomElement( TQDomDocument &doc, TQDomElement &paren
 }
 
 
-ProviderLoader::ProviderLoader( TQWidget *tqparentWidget ) :
-  TQObject( tqparentWidget )
+ProviderLoader::ProviderLoader( TQWidget *parentWidget ) :
+  TQObject( parentWidget )
 {
   mProviders.setAutoDelete( true );
 }
diff --git a/knewstuff/provider.h b/knewstuff/provider.h
index 98b5b7def..6a0972319 100644
--- a/knewstuff/provider.h
+++ b/knewstuff/provider.h
@@ -169,16 +169,16 @@ class KDE_EXPORT Provider
  * the main provider database for this specific application.
  * It should probably not be used directly by the application.
  */
-class KDE_EXPORT ProviderLoader : public TQObject
+class KDE_EXPORT ProviderLoader : public QObject
 {
     Q_OBJECT
   public:
     /**
      * Constructor.
      *
-     * @param tqparentWidget the parent widget
+     * @param parentWidget the parent widget
      */
-    ProviderLoader( TQWidget *tqparentWidget );
+    ProviderLoader( TQWidget *parentWidget );
 
     /**
      * Starts asynchronously loading the list of providers of the
diff --git a/knewstuff/security.cpp b/knewstuff/security.cpp
index a6a25f07f..8ef377b78 100644
--- a/knewstuff/security.cpp
+++ b/knewstuff/security.cpp
@@ -125,7 +125,7 @@ void Security::slotDataArrived(KProcIO *procIO)
               key.mail=data.section('<', -1, -1);
               key.mail.truncate(key.mail.length() - 1);
               key.name=data.section('<',0,0);
-              if (key.name.tqfind("(")!=-1)
+              if (key.name.find("(")!=-1)
                   key.name=key.name.section('(',0,0);
               m_keys[shortId] = key;
           }
@@ -137,7 +137,7 @@ void Security::slotDataArrived(KProcIO *procIO)
               m_result &= SIGNED_BAD_CLEAR;
               m_result |= SIGNED_OK;
               TQString id = data.section(" ", 1 , 1).right(8);
-              if (!m_keys.tqcontains(id))
+              if (!m_keys.contains(id))
               {
                   m_result |= UNKNOWN;
               } else
@@ -154,7 +154,7 @@ void Security::slotDataArrived(KProcIO *procIO)
           {
               m_result |= SIGNED_BAD;
               TQString id = data.section(" ", 1 , 1).right(8);
-              if (!m_keys.tqcontains(id))
+              if (!m_keys.contains(id))
               {
                   m_result |= UNKNOWN;
               } else
@@ -170,7 +170,7 @@ void Security::slotDataArrived(KProcIO *procIO)
           break;
 
        case Sign:
-         if (data.tqfind("passphrase.enter") != -1)
+         if (data.find("passphrase.enter") != -1)
          {
            TQCString password;
            KeyStruct key = m_keys[m_secretKey];
@@ -187,7 +187,7 @@ void Security::slotDataArrived(KProcIO *procIO)
              return;
            }
          } else
-         if (data.tqfind("BAD_PASSPHRASE") != -1)
+         if (data.find("BAD_PASSPHRASE") != -1)
          {
            m_result |= BAD_PASSPHRASE;
          }
diff --git a/knewstuff/security.h b/knewstuff/security.h
index 2831770e0..2a4eca536 100644
--- a/knewstuff/security.h
+++ b/knewstuff/security.h
@@ -41,7 +41,7 @@ It is a private class, not meant to be used by third party applications.
 
 namespace KNS {
 
-class Security : public TQObject
+class Security : public QObject
 {
 Q_OBJECT
 public:
diff --git a/kparts/COMMENTS b/kparts/COMMENTS
index 9c6142b23..e3e4d8589 100644
--- a/kparts/COMMENTS
+++ b/kparts/COMMENTS
@@ -11,7 +11,7 @@ the BarPosition of the toolbars is solved. Nice :-)
 
 (David) Not sure we want to save whether the statusbar is shown/hidden.
 
-(Simon) Another thought: Perhaps we should store the tqgeometry information of
+(Simon) Another thought: Perhaps we should store the geometry information of
 	the containers of the KPartHost in the KPart itself?
 	(something like KPart-Session Management ;-)
 (David) Sounds strange (the child taking care of its host's containers...)
@@ -44,7 +44,7 @@ I think what it wants is "really" activated, no ?
 gets activated", in this simple model (no Document/View). The Part gets activated when you can see
 its items in the menus/toolbars, there is no "in between" IMO ?
         2 - Remind me what konq does with the *bars when a part gets activated ?
-I couldn't tqfind anything with a quick grep in the sources...
+I couldn't find anything with a quick grep in the sources...
 I'm still looking for an example when it's useful :)
 
 (Simon) I think that's the whole idea of making KPartManager independent from
@@ -344,7 +344,7 @@ changes.
 
 --------------------------
 
-David wondering about tqStatus Bar
+David wondering about Status Bar
 --------------------------------
 Should the statusbar be a *bar like toolbar/menubar, handled by the XML GUI building
 (soon "KPartsMainWindow"), and shown/hidden depending on the
@@ -576,7 +576,7 @@ issue compared to what's above though.
          delegation.
          It works like this:
          We have KReadOnlyPart (short KROP) and KonqyViewerExtension (short KVE). KVE is just
-	 a child of KROP that you can query with the TQObject::child method.
+	 a child of KROP that you can query with the QObject::child method.
          Views which are konquy aware feature their own implementation of KVE and konquy is
          happy :-)
          If a KROP does not feature a KVE then Konqui installs a default KVE that just ignores
diff --git a/kparts/browserextension.cpp b/kparts/browserextension.cpp
index aa34f13de..060d9220e 100644
--- a/kparts/browserextension.cpp
+++ b/kparts/browserextension.cpp
@@ -276,14 +276,14 @@ WindowArgs &WindowArgs::operator=( const WindowArgs &args )
     return *this;
 }
 
-WindowArgs::WindowArgs( const TQRect &_tqgeometry, bool _fullscreen, bool _menuBarVisible,
+WindowArgs::WindowArgs( const TQRect &_geometry, bool _fullscreen, bool _menuBarVisible,
                         bool _toolBarsVisible, bool _statusBarVisible, bool _resizable )
 {
     d = 0;
-    x = _tqgeometry.x();
-    y = _tqgeometry.y();
-    width = _tqgeometry.width();
-    height = _tqgeometry.height();
+    x = _geometry.x();
+    y = _geometry.y();
+    width = _geometry.width();
+    height = _geometry.height();
     fullscreen = _fullscreen;
     menuBarVisible = _menuBarVisible;
     toolBarsVisible = _toolBarsVisible;
@@ -342,7 +342,7 @@ public:
   };
   TQValueList<DelayedRequest> m_requests;
   bool m_urlDropHandlingEnabled;
-  KBitArray m_actiontqStatus;
+  KBitArray m_actionStatus;
   TQMap<int, TQString> m_actionText;
   BrowserInterface *m_browserInterface;
 };
@@ -370,11 +370,11 @@ BrowserExtension::BrowserExtension( KParts::ReadOnlyPart *parent,
   // they're supported or not
   ActionSlotMap::ConstIterator it = s_actionSlotMap->begin();
   ActionSlotMap::ConstIterator itEnd = s_actionSlotMap->end();
-  TQStrList slotNames = tqmetaObject()->slotNames();
+  TQStrList slotNames = metaObject()->slotNames();
   for ( int i=0 ; it != itEnd ; ++it, ++i )
   {
       // Does the extension have a slot with the name of this action ?
-      d->m_actiontqStatus.setBit( i, slotNames.tqcontains( it.key()+"()" ) );
+      d->m_actionStatus.setBit( i, slotNames.contains( it.key()+"()" ) );
   }
 
   connect( m_part, TQT_SIGNAL( completed() ),
@@ -415,13 +415,13 @@ int BrowserExtension::yOffset()
 
 void BrowserExtension::saveState( TQDataStream &stream )
 {
-  stream << m_part->url() << (TQ_INT32)xOffset() << (TQ_INT32)yOffset();
+  stream << m_part->url() << (Q_INT32)xOffset() << (Q_INT32)yOffset();
 }
 
 void BrowserExtension::restoreState( TQDataStream &stream )
 {
   KURL u;
-  TQ_INT32 xOfs, yOfs;
+  Q_INT32 xOfs, yOfs;
   stream >> u >> xOfs >> yOfs;
 
   URLArgs args( urlArgs() );
@@ -483,7 +483,7 @@ void BrowserExtension::pasteRequest()
     {
         if ( KMessageBox::questionYesNo( m_part->widget(),
 		    i18n( "<qt>Do you want to search the Internet for <b>%1</b>?" ).arg( TQStyleSheet::escape(url) ),
-		    i18n( "Internet Search" ), KGuiItem( i18n( "&Search" ), "tqfind"),
+		    i18n( "Internet Search" ), KGuiItem( i18n( "&Search" ), "find"),
 		    KStdGuiItem::cancel(), "MiddleClickSearch" ) == KMessageBox::Yes)
           slotOpenURLRequest( filterData.uri(), KParts::URLArgs() );
     }
@@ -521,10 +521,10 @@ BrowserInterface *BrowserExtension::browserInterface() const
 void BrowserExtension::slotEnableAction( const char * name, bool enabled )
 {
     //kdDebug() << "BrowserExtension::slotEnableAction " << name << " " << enabled << endl;
-    ActionNumberMap::ConstIterator it = s_actionNumberMap->tqfind( name );
+    ActionNumberMap::ConstIterator it = s_actionNumberMap->find( name );
     if ( it != s_actionNumberMap->end() )
     {
-        d->m_actiontqStatus.setBit( it.data(), enabled );
+        d->m_actionStatus.setBit( it.data(), enabled );
         //kdDebug() << "BrowserExtension::slotEnableAction setting bit " << it.data() << " to " << enabled << endl;
     }
     else
@@ -534,13 +534,13 @@ void BrowserExtension::slotEnableAction( const char * name, bool enabled )
 bool BrowserExtension::isActionEnabled( const char * name ) const
 {
     int actionNumber = (*s_actionNumberMap)[ name ];
-    return d->m_actiontqStatus[ actionNumber ];
+    return d->m_actionStatus[ actionNumber ];
 }
 
 void BrowserExtension::slotSetActionText( const char * name, const TQString& text )
 {
     kdDebug() << "BrowserExtension::slotSetActionText " << name << " " << text << endl;
-    ActionNumberMap::ConstIterator it = s_actionNumberMap->tqfind( name );
+    ActionNumberMap::ConstIterator it = s_actionNumberMap->find( name );
     if ( it != s_actionNumberMap->end() )
     {
         d->m_actionText[ it.data() ] = text;
@@ -552,7 +552,7 @@ void BrowserExtension::slotSetActionText( const char * name, const TQString& tex
 TQString BrowserExtension::actionText( const char * name ) const
 {
     int actionNumber = (*s_actionNumberMap)[ name ];
-    TQMap<int, TQString>::ConstIterator it = d->m_actionText.tqfind( actionNumber );
+    TQMap<int, TQString>::ConstIterator it = d->m_actionText.find( actionNumber );
     if ( it != d->m_actionText.end() )
         return *it;
     return TQString::null;
@@ -684,7 +684,7 @@ void BrowserExtension::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 BrowserHostExtension *
-BrowserHostExtension::tqfindFrameParent(KParts::ReadOnlyPart *callingPart, const TQString &frame)
+BrowserHostExtension::findFrameParent(KParts::ReadOnlyPart *callingPart, const TQString &frame)
 {
     FindFrameParentParams param;
     param.parent = 0;
diff --git a/kparts/browserextension.h b/kparts/browserextension.h
index 889f8d2fb..edb376d27 100644
--- a/kparts/browserextension.h
+++ b/kparts/browserextension.h
@@ -187,7 +187,7 @@ struct KPARTS_EXPORT WindowArgs
     ~WindowArgs();
     WindowArgs( const WindowArgs &args );
     WindowArgs &operator=( const WindowArgs &args );
-    WindowArgs( const TQRect &_tqgeometry, bool _fullscreen, bool _menuBarVisible,
+    WindowArgs( const TQRect &_geometry, bool _fullscreen, bool _menuBarVisible,
                 bool _toolBarsVisible, bool _statusBarVisible, bool _resizable );
     WindowArgs( int _x, int _y, int _width, int _height, bool _fullscreen,
                 bool _menuBarVisible, bool _toolBarsVisible,
@@ -257,7 +257,7 @@ class BrowserExtensionPrivate;
   * to implement the virtual methods [and the standard-actions slots, see below].
   *
   * The way to associate the BrowserExtension with the part is to simply
-  * create the BrowserExtension as a child of the part (in TQObject's terms).
+  * create the BrowserExtension as a child of the part (in QObject's terms).
   * The hosting application will look for it automatically.
   *
   * Another aspect of the browser integration is that a set of standard
@@ -305,7 +305,7 @@ class BrowserExtensionPrivate;
   *                                       otherwise, they are saved globally.
   * @li @p disableScrolling: no scrollbars
   */
-class KPARTS_EXPORT BrowserExtension : public TQObject
+class KPARTS_EXPORT BrowserExtension : public QObject
 {
   Q_OBJECT
   Q_PROPERTY( bool urlDropHandling READ isURLDropHandlingEnabled WRITE setURLDropHandlingEnabled )
@@ -333,7 +333,7 @@ public:
    * ShowBookmark: show "add to bookmarks" (usually not done on the local filesystem)
    * ShowCreateDirectory: show "create directory" (usually only done on the background of the view, or
    *                      in hierarchical views like directory trees, where the new dir would be visible)
-   * ShowTextSelectionItems: set when selecting text, for a popup that only tqcontains text-related items.
+   * ShowTextSelectionItems: set when selecting text, for a popup that only contains text-related items.
    * NoDeletion: deletion, trashing and renaming not allowed (e.g. parent dir not writeable).
    *            (this is only needed if the protocol itself supports deletion, unlike e.g. HTTP)
    *
@@ -446,7 +446,7 @@ public:
    * Checking if the extension implements a certain slot can be done like this:
    *
    * \code
-   *   extension->tqmetaObject()->slotNames().tqcontains( actionName + "()" )
+   *   extension->metaObject()->slotNames().contains( actionName + "()" )
    * \endcode
    *
    * (note that @p actionName is the iterator's key value if already
@@ -721,7 +721,7 @@ private:
  * other parts.
  * For instance a KHTMLPart hosts one part per frame.
  */
-class KPARTS_EXPORT BrowserHostExtension : public TQObject
+class KPARTS_EXPORT BrowserHostExtension : public QObject
 {
   Q_OBJECT
 public:
@@ -745,11 +745,11 @@ public:
   virtual const TQPtrList<KParts::ReadOnlyPart> frames() const;
 
   /**
-   * Returns the part that tqcontains @p frame and that may be accessed
+   * Returns the part that contains @p frame and that may be accessed
    * by @p callingPart
    * @since 3.3
    */
-  BrowserHostExtension *tqfindFrameParent(KParts::ReadOnlyPart *callingPart, const TQString &frame);
+  BrowserHostExtension *findFrameParent(KParts::ReadOnlyPart *callingPart, const TQString &frame);
 
   /**
    * Opens the given url in a hosted child frame. The frame name is specified in the
@@ -789,7 +789,7 @@ private:
  * A part can have an object hierarchie by using objid as a reference
  * to an object.
  */
-class KPARTS_EXPORT LiveConnectExtension : public TQObject
+class KPARTS_EXPORT LiveConnectExtension : public QObject
 {
   Q_OBJECT
 public:
diff --git a/kparts/browserinterface.cpp b/kparts/browserinterface.cpp
index b8de62539..fc9909a9f 100644
--- a/kparts/browserinterface.cpp
+++ b/kparts/browserinterface.cpp
@@ -19,7 +19,7 @@ BrowserInterface::~BrowserInterface()
 
 void BrowserInterface::callMethod( const char *name, const TQVariant &argument )
 {
-    int slot = tqmetaObject()->tqfindSlot( name );
+    int slot = metaObject()->findSlot( name );
 
     if ( slot == -1 )
         return;
diff --git a/kparts/browserinterface.h b/kparts/browserinterface.h
index 37e6cef41..8d3f0ad98 100644
--- a/kparts/browserinterface.h
+++ b/kparts/browserinterface.h
@@ -35,7 +35,7 @@ namespace KParts
  * </code>
  *
  */
-class KPARTS_EXPORT BrowserInterface : public TQObject
+class KPARTS_EXPORT BrowserInterface : public QObject
 {
     Q_OBJECT
 public:
diff --git a/kparts/browserrun.cpp b/kparts/browserrun.cpp
index e77f1f87e..4d23d6300 100644
--- a/kparts/browserrun.cpp
+++ b/kparts/browserrun.cpp
@@ -71,7 +71,7 @@ void BrowserRun::init()
 {
   if ( d->m_bHideErrorDialog )
   {
-    // ### KRun doesn't call a virtual method when it tqfinds out that the URL
+    // ### KRun doesn't call a virtual method when it finds out that the URL
     // is either malformed, or points to a non-existing local file...
     // So we need to reimplement some of the checks, to handle m_bHideErrorDialog
     if ( !m_strURL.isValid() ) {
@@ -128,7 +128,7 @@ void BrowserRun::scanFile()
       }
 
       // Set the PropagateHttpHeader meta-data if it has not already been set...
-      if (!m_args.metaData().tqcontains("PropagateHttpHeader"))
+      if (!m_args.metaData().contains("PropagateHttpHeader"))
           m_args.metaData().insert("PropagateHttpHeader", "TRUE");
   }
 
@@ -209,7 +209,7 @@ BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable( const TQString&
          !m_strURL.isLocalFile() )
     {
         if ( isTextExecutable(mimeType) )
-            mimeType = TQString::tqfromLatin1("text/plain"); // view, don't execute
+            mimeType = TQString::fromLatin1("text/plain"); // view, don't execute
         kdDebug(1000) << "BrowserRun: ask for saving" << endl;
         KService::Ptr offer = KServiceTypeProfile::preferredService(mimeType, "Application");
         // ... -> ask whether to save
@@ -236,7 +236,7 @@ BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable( const TQString&
                 m_sMimeType = mimeType;
                 TQString extension;
                 TQString fileName = m_suggestedFilename.isEmpty() ? m_strURL.fileName() : m_suggestedFilename;
-                int extensionPos = fileName.tqfindRev( '.' );
+                int extensionPos = fileName.findRev( '.' );
                 if ( extensionPos != -1 )
                     extension = fileName.mid( extensionPos ); // keep the '.'
                 KTempFile tempFile( TQString::null, extension );
@@ -313,7 +313,7 @@ BrowserRun::AskSaveResult BrowserRun::askSave( const KURL & url, KService::Ptr o
     int choice = KMessageBox::questionYesNoCancel(
         0L, question, url.host(),
         KStdGuiItem::saveAs(), openText,
-        TQString::tqfromLatin1("askSave")+ mimeType ); // dontAskAgainName, KEEP IN SYNC!!!
+        TQString::fromLatin1("askSave")+ mimeType ); // dontAskAgainName, KEEP IN SYNC!!!
 
     return choice == KMessageBox::Yes ? Save : ( choice == KMessageBox::No ? Open : Cancel );
     // SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC
@@ -341,8 +341,8 @@ BrowserRun::AskSaveResult BrowserRun::askEmbedOrSave( const KURL & url, const TQ
          mime->is( "text/xml" ) ||
          mime->is( "inode/directory" ) ||
          mimeType.startsWith( "image" ) ||
-         mime->is( "multipart/x-mixed-tqreplace" ) ||
-         mime->is( "multipart/tqreplace" ) ||
+         mime->is( "multipart/x-mixed-replace" ) ||
+         mime->is( "multipart/replace" ) ||
          mimeType.startsWith( "print" ) ) )
         return Open;
 
@@ -351,7 +351,7 @@ BrowserRun::AskSaveResult BrowserRun::askEmbedOrSave( const KURL & url, const TQ
     int choice = KMessageBox::questionYesNoCancel(
         0L, question, url.host(),
         KStdGuiItem::saveAs(), KGuiItem( i18n( "&Open" ), "fileopen"),
-        TQString::tqfromLatin1("askEmbedOrSave")+ mimeType ); // dontAskAgainName, KEEP IN SYNC!!!
+        TQString::fromLatin1("askEmbedOrSave")+ mimeType ); // dontAskAgainName, KEEP IN SYNC!!!
     return choice == KMessageBox::Yes ? Save : ( choice == KMessageBox::No ? Open : Cancel );
     // SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC
 }
@@ -372,7 +372,7 @@ void BrowserRun::simpleSave( const KURL & url, const TQString & suggestedFilenam
                              TQWidget* window )
 {
     // DownloadManager <-> konqueror integration
-    // tqfind if the integration is enabled
+    // find if the integration is enabled
     // the empty key  means no integration
     // only use the downloadmanager for non-local urls
     if ( !url.isLocalFile() )
@@ -382,7 +382,7 @@ void BrowserRun::simpleSave( const KURL & url, const TQString & suggestedFilenam
         TQString downloadManger = cfg.readPathEntry("DownloadManager");
         if (!downloadManger.isEmpty())
         {
-            // then tqfind the download manager location
+            // then find the download manager location
             kdDebug(1000) << "Using: "<<downloadManger <<" as Download Manager" <<endl;
             TQString cmd=KStandardDirs::findExe(downloadManger);
             if (cmd.isEmpty())
diff --git a/kparts/browserrun.h b/kparts/browserrun.h
index 0a0ec1be4..79a7386c6 100644
--- a/kparts/browserrun.h
+++ b/kparts/browserrun.h
@@ -98,7 +98,7 @@ namespace KParts {
 	 */
         TQString contentDisposition() const;
 
-        bool serverSuggestsSave() const { return contentDisposition() == TQString::tqfromLatin1("attachment"); }
+        bool serverSuggestsSave() const { return contentDisposition() == TQString::fromLatin1("attachment"); }
 
         enum AskSaveResult { Save, Open, Cancel };
         /**
diff --git a/kparts/componentfactory.h b/kparts/componentfactory.h
index dc85663b0..7e9de4280 100644
--- a/kparts/componentfactory.h
+++ b/kparts/componentfactory.h
@@ -82,7 +82,7 @@ namespace KParts
          * \endcode
          *
          * @param factory The factory to ask for the creation of the component
-         * @param tqparentWidget the parent widget for the part
+         * @param parentWidget the parent widget for the part
          * @param widgetName the name of the part's widget
          * @param parent The parent object (see TQObject constructor)
          * @param name The name of the object to create (see TQObject constructor)
@@ -93,13 +93,13 @@ namespace KParts
          */
         template <class T>
         static T *createPartInstanceFromFactory( KParts::Factory *factory,
-                                                 TQWidget *tqparentWidget = 0,
+                                                 TQWidget *parentWidget = 0,
                                                  const char *widgetName = 0,
                                                  TQObject *parent = 0,
                                                  const char *name = 0,
                                                  const TQStringList &args = TQStringList() )
         {
-            KParts::Part *object = factory->createPart( tqparentWidget, widgetName,
+            KParts::Part *object = factory->createPart( parentWidget, widgetName,
                                                         parent, name,
                                                         T::staticMetaObject()->className(),
                                                         args );
@@ -156,7 +156,7 @@ namespace KParts
 
         template <class T>
         static T *createPartInstanceFromLibrary( const char *libraryName,
-                                                 TQWidget *tqparentWidget = 0,
+                                                 TQWidget *parentWidget = 0,
                                                  const char *widgetName = 0,
                                                  TQObject *parent = 0,
                                                  const char *name = 0,
@@ -186,7 +186,7 @@ namespace KParts
                     *error = ErrNoFactory;
                 return 0;
             }
-            T *res = createPartInstanceFromFactory<T>( partFactory, tqparentWidget,
+            T *res = createPartInstanceFromFactory<T>( partFactory, parentWidget,
                                                        widgetName, parent, name, args );
             if ( !res )
             {
@@ -218,7 +218,7 @@ namespace KParts
 
         template <class T>
         static T *createPartInstanceFromService( const KService::Ptr &service,
-                                                 TQWidget *tqparentWidget = 0,
+                                                 TQWidget *parentWidget = 0,
                                                  const char *widgetName = 0,
                                                  TQObject *parent = 0,
                                                  const char *name = 0,
@@ -233,7 +233,7 @@ namespace KParts
                 return 0;
             }
 
-            return createPartInstanceFromLibrary<T>( library.local8Bit().data(), tqparentWidget,
+            return createPartInstanceFromLibrary<T>( library.local8Bit().data(), parentWidget,
                                                      widgetName, parent, name, args, error );
         }
 
@@ -267,7 +267,7 @@ namespace KParts
         template <class T, class ServiceIterator>
         static T *createPartInstanceFromServices( ServiceIterator begin,
                                                   ServiceIterator end,
-                                                  TQWidget *tqparentWidget = 0,
+                                                  TQWidget *parentWidget = 0,
                                                   const char *widgetName = 0,
                                                   TQObject *parent = 0,
                                                   const char *name = 0,
@@ -281,7 +281,7 @@ namespace KParts
                 if ( error )
                     *error = 0;
 
-                T *component = createPartInstanceFromService<T>( service, tqparentWidget,
+                T *component = createPartInstanceFromService<T>( service, parentWidget,
                                                                  widgetName, parent,
                                                                  name, args, error );
                 if ( component )
@@ -306,7 +306,7 @@ namespace KParts
          * }
          * \endcode
          *
-         * @param serviceType the type of service for which to tqfind a plugin
+         * @param serviceType the type of service for which to find a plugin
          * @param constraint an optional constraint to pass to the trader (see KIO::KTrader)
          * @param parent the parent object for the part itself
          * @param name the name that will be given to the part
@@ -344,18 +344,18 @@ namespace KParts
          * You can use this method to create a generic viewer - that can display any
          * kind of file, provided that there is a ReadOnlyPart installed for it - in 5 lines:
          * \code
-         * // Given the following: KURL url, TQWidget* tqparentWidget and TQObject* parentObject.
+         * // Given the following: KURL url, TQWidget* parentWidget and TQObject* parentObject.
          * TQString mimetype = KMimeType::findByURL( url )->name();
-         * KParts::ReadOnlyPart* part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString::null, tqparentWidget, 0, parentObject, 0 );
+         * KParts::ReadOnlyPart* part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString::null, parentWidget, 0, parentObject, 0 );
          * if ( part ) {
          *     part->openURL( url );
-         *     part->widget()->show();  // also insert the widget into a tqlayout, or simply use a TQVBox as tqparentWidget
+         *     part->widget()->show();  // also insert the widget into a layout, or simply use a TQVBox as parentWidget
          * }
          * \endcode
          *
-         * @param serviceType the type of service for which to tqfind a part, e.g. a mimetype
+         * @param serviceType the type of service for which to find a part, e.g. a mimetype
          * @param constraint an optional constraint to pass to the trader (see KTrader)
-         * @param tqparentWidget the parent widget, will be set as the parent of the part's widget
+         * @param parentWidget the parent widget, will be set as the parent of the part's widget
          * @param widgetName the name that will be given to the part's widget
          * @param parent the parent object for the part itself
          * @param name the name that will be given to the part
@@ -369,14 +369,14 @@ namespace KParts
         template <class T>
         static T *createPartInstanceFromQuery( const TQString &serviceType,
                                                const TQString &constraint,
-                                               TQWidget *tqparentWidget = 0,
+                                               TQWidget *parentWidget = 0,
                                                const char *widgetName = 0,
                                                TQObject *parent = 0,
                                                const char *name = 0,
                                                const TQStringList &args = TQStringList(),
                                                int *error = 0 )
         {
-            KTrader::OfferList offers = KTrader::self()->query( serviceType, TQString::tqfromLatin1("KParts/ReadOnlyPart"), constraint, TQString::null );
+            KTrader::OfferList offers = KTrader::self()->query( serviceType, TQString::fromLatin1("KParts/ReadOnlyPart"), constraint, TQString::null );
             if ( offers.isEmpty() )
             {
                 if ( error )
@@ -385,7 +385,7 @@ namespace KParts
             }
 
             return createPartInstanceFromServices<T>( offers.begin(), offers.end(),
-                                                      tqparentWidget, widgetName,
+                                                      parentWidget, widgetName,
                                                       parent, name, args, error );
         }
 
diff --git a/kparts/factory.cpp b/kparts/factory.cpp
index b26cccf22..9be2f4f92 100644
--- a/kparts/factory.cpp
+++ b/kparts/factory.cpp
@@ -39,9 +39,9 @@ Factory::~Factory()
 {
 }
 
-Part *Factory::createPart( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args )
+Part *Factory::createPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args )
 {
-    Part* part = createPartObject( tqparentWidget, widgetName, parent, name, classname, args );
+    Part* part = createPartObject( parentWidget, widgetName, parent, name, classname, args );
     if ( part )
 	emit objectCreated( part );
     return part;
diff --git a/kparts/factory.h b/kparts/factory.h
index 2ac834ba4..c1b98eca1 100644
--- a/kparts/factory.h
+++ b/kparts/factory.h
@@ -60,7 +60,7 @@ public:
      * \endcode
      * This could result in a call to
      * \code
-     *     createPart( tqparentWidget, name, parentObject, parentName, "KParts::Part",
+     *     createPart( parentWidget, name, parentObject, parentName, "KParts::Part",
      *                 TQStringList("name1="value1"", "name2="value2") );
      * \endcode
      *
@@ -71,7 +71,7 @@ public:
      * important for reference counting, and allows unloading the
      * library automatically once all its objects have been destroyed.
      */
-     Part *createPart( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KParts::Part", const TQStringList &args = TQStringList() );
+     Part *createPart( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KParts::Part", const TQStringList &args = TQStringList() );
 
      /**
       * If you have a part contained in a shared library you might want to query
@@ -108,13 +108,13 @@ protected:
      * \endcode
      * This could result in a call to
      * \code
-     *     createPart( tqparentWidget, name, parentObject, parentName, "Kparts::Part",
+     *     createPart( parentWidget, name, parentObject, parentName, "Kparts::Part",
      *                 TQStringList("name1="value1"", "name2="value2") );
      * \endcode
      *
      * @returns the newly created part.
      */
-    virtual Part *createPartObject( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KParts::Part", const TQStringList &args = TQStringList() ) = 0;
+    virtual Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KParts::Part", const TQStringList &args = TQStringList() ) = 0;
     
     /**
      * Reimplemented from KLibFactory. Calls createPart()
diff --git a/kparts/genericfactory.h b/kparts/genericfactory.h
index 99ce7c3be..950214ee5 100644
--- a/kparts/genericfactory.h
+++ b/kparts/genericfactory.h
@@ -66,7 +66,7 @@ namespace KParts
      *
      * The template argument has to inherit from KParts::Part and has to implement two methods:
      *  1) There needs to be a public constructor with the following signature:
-     *         MyPart( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& args )
+     *         MyPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& args )
      *
      *  2) It needs to provide one static method to create a KAboutData object per
      *     request, holding information about the component's name, its authors, license, etc.
@@ -97,12 +97,12 @@ namespace KParts
     public:
         GenericFactory() { }
 
-        virtual KParts::Part *createPartObject( TQWidget *tqparentWidget, const char *widgetName,
+        virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName,
                                                 TQObject *parent, const char *name,
                                                 const char *className,
                                                 const TQStringList &args )
         {
-            T *part = KDEPrivate::ConcreteFactory<T>::create( tqparentWidget,
+            T *part = KDEPrivate::ConcreteFactory<T>::create( parentWidget,
                                                               widgetName,
                                                               parent,
                                                               name,
@@ -125,12 +125,12 @@ namespace KParts
     public:
         GenericFactory() { }
 
-        virtual KParts::Part *createPartObject( TQWidget *tqparentWidget, const char *widgetName,
+        virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName,
                                                 TQObject *parent, const char *name,
                                                 const char *className,
                                                 const TQStringList &args )
         {
-            TQObject *object = KDEPrivate::MultiFactory< KTypeList<T1, T2> >::create( tqparentWidget,
+            TQObject *object = KDEPrivate::MultiFactory< KTypeList<T1, T2> >::create( parentWidget,
                                                                                      widgetName,
                                                                                      parent, name,
                                                                                      className,
diff --git a/kparts/historyprovider.cpp b/kparts/historyprovider.cpp
index a62c48a8e..416a109f6 100644
--- a/kparts/historyprovider.cpp
+++ b/kparts/historyprovider.cpp
@@ -61,15 +61,15 @@ HistoryProvider::~HistoryProvider()
 	s_self = 0;
 }
 
-bool HistoryProvider::tqcontains( const TQString& item ) const
+bool HistoryProvider::contains( const TQString& item ) const
 {
-    return (bool) d->dict.tqfind( item );
+    return (bool) d->dict.find( item );
 }
 
 void HistoryProvider::insert( const TQString& item )
 {
     // no need to allocate memory, we only want to have fast lookup, no mapping
-    d->dict.tqreplace( item, (void*) 1 );
+    d->dict.replace( item, (void*) 1 );
     emit inserted( item );
 }
 
diff --git a/kparts/historyprovider.h b/kparts/historyprovider.h
index 3040a95bf..40bf36aa7 100644
--- a/kparts/historyprovider.h
+++ b/kparts/historyprovider.h
@@ -38,7 +38,7 @@ namespace KParts {
  *
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class KPARTS_EXPORT HistoryProvider : public TQObject
+class KPARTS_EXPORT HistoryProvider : public QObject
 {
     Q_OBJECT
 
@@ -58,7 +58,7 @@ public:
     /**
      * @returns true if @p item is present in the history.
      */
-    virtual bool tqcontains( const TQString& item ) const;
+    virtual bool contains( const TQString& item ) const;
 
     /**
      * Inserts @p item into the history.
diff --git a/kparts/mainwindow.h b/kparts/mainwindow.h
index 80ae87d0f..1dbc43975 100644
--- a/kparts/mainwindow.h
+++ b/kparts/mainwindow.h
@@ -88,10 +88,10 @@ protected slots:
   virtual void slotSetStatusBarText( const TQString & );
 
   /**
-   * Rebuilds the GUI after KEditToolbar changed the toolbar tqlayout.
+   * Rebuilds the GUI after KEditToolbar changed the toolbar layout.
    * @see configureToolbars()
    * KDE4: make this virtual. (For now we rely on the fact that it's called
-   * as a slot, so the metaobject tqfinds it here).
+   * as a slot, so the metaobject finds it here).
    */
   void saveNewToolbarConfig();
 
diff --git a/kparts/part.cpp b/kparts/part.cpp
index d8549706e..fcd426abf 100644
--- a/kparts/part.cpp
+++ b/kparts/part.cpp
@@ -114,7 +114,7 @@ void PartBase::setInstance( KInstance *inst, bool bLoadPlugins )
   // install 'instancename'data resource type
   KGlobal::dirs()->addResourceType( inst->instanceName() + "data",
                                     KStandardDirs::kde_default( "data" )
-                                    + TQString::tqfromLatin1( inst->instanceName() ) + '/' );
+                                    + TQString::fromLatin1( inst->instanceName() ) + '/' );
   if ( bLoadPlugins )
     loadPlugins( m_obj, this, instance() );
 }
@@ -162,10 +162,10 @@ Part::~Part()
   delete d;
 }
 
-void Part::embed( TQWidget * tqparentWidget )
+void Part::embed( TQWidget * parentWidget )
 {
   if ( widget() )
-    widget()->reparent( tqparentWidget, 0, TQPoint( 0, 0 ), true );
+    widget()->reparent( parentWidget, 0, TQPoint( 0, 0 ), true );
 }
 
 TQWidget *Part::widget()
@@ -365,7 +365,7 @@ bool ReadOnlyPart::openURL( const KURL &url )
     KURL destURL;
     destURL.setPath( m_file );
     d->m_job = KIO::file_copy( m_url, destURL, 0600, true, false, d->m_showProgressInfo );
-    d->m_job->setWindow( widget() ? widget()->tqtopLevelWidget() : 0 );
+    d->m_job->setWindow( widget() ? widget()->topLevelWidget() : 0 );
     emit started( d->m_job );
     connect( d->m_job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotJobFinished ( KIO::Job * ) ) );
     return true;
@@ -638,7 +638,7 @@ bool ReadWritePart::saveToURL()
        return false;
     }
     d->m_uploadJob = KIO::file_move( uploadUrl, m_url, -1, true /*overwrite*/ );
-    d->m_uploadJob->setWindow( widget() ? widget()->tqtopLevelWidget() : 0 );
+    d->m_uploadJob->setWindow( widget() ? widget()->topLevelWidget() : 0 );
     connect( d->m_uploadJob, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (KIO::Job *) ) );
     return true;
   }
@@ -674,7 +674,7 @@ void ReadWritePart::slotUploadFinished( KIO::Job * )
   d->m_originalFilePath = TQString::null;
   if (d->m_waitForSave)
   {
-     tqApp->exit_loop();
+     qApp->exit_loop();
   }
 }
 
@@ -692,7 +692,7 @@ bool ReadWritePart::waitSaveComplete()
   TQWidget dummy(0,0,WType_Dialog | WShowModal);
   dummy.setFocusPolicy( TQWidget::NoFocus );
   qt_enter_modal(&dummy);
-  tqApp->enter_loop();
+  qApp->enter_loop();
   qt_leave_modal(&dummy);
 
   d->m_waitForSave = false;
diff --git a/kparts/part.h b/kparts/part.h
index 794db0b55..0c4023f6c 100644
--- a/kparts/part.h
+++ b/kparts/part.h
@@ -172,7 +172,7 @@ private:
  * <b>About the GUI elements:</b>\n
  *
  * Those elements trigger actions, defined by the part (action()).
- * The tqlayout of the actions in the GUI is defined by an XML file (setXMLFile()).
+ * The layout of the actions in the GUI is defined by an XML file (setXMLFile()).
  *
  * See also ReadOnlyPart and ReadWritePart, which define the
  * framework for a "viewer" part and for an "editor"-like part.
@@ -208,7 +208,7 @@ public:
      * This method is not recommended since creating the widget with the correct
      * parent is simpler anyway.
      */
-    virtual void embed( TQWidget * tqparentWidget );
+    virtual void embed( TQWidget * parentWidget );
 
     /**
      * @return The widget defined by this part, set by setWidget().
diff --git a/kparts/partmanager.cpp b/kparts/partmanager.cpp
index 2059af928..0ff139532 100644
--- a/kparts/partmanager.cpp
+++ b/kparts/partmanager.cpp
@@ -97,7 +97,7 @@ PartManager::PartManager( TQWidget * parent, const char * name )
 {
   d = new PartManagerPrivate;
 
-  tqApp->installEventFilter( this );
+  qApp->installEventFilter( this );
 
   d->m_policy = Direct;
 
@@ -109,7 +109,7 @@ PartManager::PartManager( TQWidget *topLevel, TQObject *parent, const char *name
 {
   d = new PartManagerPrivate;
 
-  tqApp->installEventFilter( this );
+  qApp->installEventFilter( this );
 
   d->m_policy = Direct;
 
@@ -129,7 +129,7 @@ PartManager::~PartManager()
   }
 
   // core dumps ... setActivePart( 0L );
-  tqApp->removeEventFilter( this );
+  qApp->removeEventFilter( this );
   delete d;
 }
 
@@ -206,7 +206,7 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev )
   {
     TQPoint pos;
 
-    if ( !d->m_managedTopLevelWidgets.tqcontainsRef( w->tqtopLevelWidget() ) )
+    if ( !d->m_managedTopLevelWidgets.containsRef( w->topLevelWidget() ) )
       return false;
 
     if ( d->m_bIgnoreScrollBars && w->inherits( "QScrollBar" ) )
@@ -215,9 +215,9 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev )
     if ( mev ) // mouse press or mouse double-click event
     {
       pos = mev->globalPos();
-      part = tqfindPartFromWidget( w, pos );
+      part = findPartFromWidget( w, pos );
     } else
-      part = tqfindPartFromWidget( w );
+      part = findPartFromWidget( w );
 
 #ifdef DEBUG_PARTMANAGER
     TQCString evType = ( ev->type() == TQEvent::MouseButtonPress ) ? "MouseButtonPress"
@@ -288,7 +288,7 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev )
       return false;
     }
 
-    w = w->tqparentWidget();
+    w = w->parentWidget();
 
     if ( w && ( ( w->testWFlags( WType_Dialog ) && w->isModal() ) ||
                 w->testWFlags( WType_Popup ) || w->testWFlags( WStyle_Tool ) ) )
@@ -307,19 +307,19 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev )
   return false;
 }
 
-Part * PartManager::tqfindPartFromWidget( TQWidget * widget, const TQPoint &pos )
+Part * PartManager::findPartFromWidget( TQWidget * widget, const TQPoint &pos )
 {
   TQPtrListIterator<Part> it ( d->m_parts );
   for ( ; it.current() ; ++it )
   {
     Part *part = it.current()->hitTest( widget, pos );
-    if ( part && d->m_parts.tqfindRef( part ) != -1 )
+    if ( part && d->m_parts.findRef( part ) != -1 )
       return part;
   }
   return 0L;
 }
 
-Part * PartManager::tqfindPartFromWidget( TQWidget * widget )
+Part * PartManager::findPartFromWidget( TQWidget * widget )
 {
   TQPtrListIterator<Part> it ( d->m_parts );
   for ( ; it.current() ; ++it )
@@ -332,7 +332,7 @@ Part * PartManager::tqfindPartFromWidget( TQWidget * widget )
 
 void PartManager::addPart( Part *part, bool setActive )
 {
-  if ( d->m_parts.tqfindRef( part ) != -1 ) // don't add parts more than once :)
+  if ( d->m_parts.findRef( part ) != -1 ) // don't add parts more than once :)
   {
 #ifdef DEBUG_PARTMANAGER
     kdWarning(1000) << k_funcinfo << part << " already added" << kdBacktrace(5) << endl;
@@ -368,7 +368,7 @@ void PartManager::addPart( Part *part, bool setActive )
 
 void PartManager::removePart( Part *part )
 {
-  if ( d->m_parts.tqfindRef( part ) == -1 )
+  if ( d->m_parts.findRef( part ) == -1 )
   {
     kdFatal(1000) << TQString("Can't remove part %1, not in KPartManager's list.").arg(part->name()) << endl;
     return;
@@ -390,11 +390,11 @@ void PartManager::removePart( Part *part )
     setSelectedPart( 0 );
 }
 
-void PartManager::tqreplacePart( Part * oldPart, Part * newPart, bool setActive )
+void PartManager::replacePart( Part * oldPart, Part * newPart, bool setActive )
 {
-  //kdDebug(1000) << "tqreplacePart " << oldPart->name() << "-> " << newPart->name() << " setActive=" << setActive << endl;
+  //kdDebug(1000) << "replacePart " << oldPart->name() << "-> " << newPart->name() << " setActive=" << setActive << endl;
   // This methods does exactly removePart + addPart but without calling setActivePart(0) in between
-  if ( d->m_parts.tqfindRef( oldPart ) == -1 )
+  if ( d->m_parts.findRef( oldPart ) == -1 )
   {
     kdFatal(1000) << TQString("Can't remove part %1, not in KPartManager's list.").arg(oldPart->name()) << endl;
     return;
@@ -410,7 +410,7 @@ void PartManager::tqreplacePart( Part * oldPart, Part * newPart, bool setActive
 
 void PartManager::setActivePart( Part *part, TQWidget *widget )
 {
-  if ( part && d->m_parts.tqfindRef( part ) == -1 )
+  if ( part && d->m_parts.findRef( part ) == -1 )
   {
       kdWarning( 1000 ) << "PartManager::setActivePart : trying to activate a non-registered part! " << part->name() << endl;
       return; // don't allow someone call setActivePart with a part we don't know about
@@ -565,7 +565,7 @@ void PartManager::addManagedTopLevelWidget( const TQWidget *topLevel )
   if ( !topLevel->isTopLevel() )
     return;
 
-  if ( d->m_managedTopLevelWidgets.tqcontainsRef( topLevel ) )
+  if ( d->m_managedTopLevelWidgets.containsRef( topLevel ) )
     return;
 
   d->m_managedTopLevelWidgets.append( topLevel );
@@ -578,7 +578,7 @@ void PartManager::removeManagedTopLevelWidget( const TQWidget *topLevel )
   if ( !topLevel->isTopLevel() )
     return;
 
-  if ( d->m_managedTopLevelWidgets.tqfindRef( topLevel ) == -1 )
+  if ( d->m_managedTopLevelWidgets.findRef( topLevel ) == -1 )
     return;
 
   d->m_managedTopLevelWidgets.remove();
diff --git a/kparts/partmanager.h b/kparts/partmanager.h
index cf2687456..a9b150a67 100644
--- a/kparts/partmanager.h
+++ b/kparts/partmanager.h
@@ -47,7 +47,7 @@ class PartManagerPrivate;
  * Parts know about the part manager to add nested parts to it.
  * See also KParts::Part::manager() and KParts::Part::setManager().
  */
-class KPARTS_EXPORT PartManager : public TQObject
+class KPARTS_EXPORT PartManager : public QObject
 {
   Q_OBJECT
   Q_ENUMS( SelectionPolicy )
@@ -165,7 +165,7 @@ public:
    * @p setActive is true.
    * This is an optimised version of removePart + addPart
    */
-  virtual void tqreplacePart( Part * oldPart, Part * newPart, bool setActive = true );
+  virtual void replacePart( Part * oldPart, Part * newPart, bool setActive = true );
 
   /**
    * Sets the active part.
@@ -274,8 +274,8 @@ protected slots:
    */
   void slotManagedTopLevelWidgetDestroyed();
 private:
-  Part * tqfindPartFromWidget( TQWidget * widget, const TQPoint &pos );
-  Part * tqfindPartFromWidget( TQWidget * widget );
+  Part * findPartFromWidget( TQWidget * widget, const TQPoint &pos );
+  Part * findPartFromWidget( TQWidget * widget );
 
 protected:
   virtual void virtual_hook( int id, void* data );
diff --git a/kparts/plugin.cpp b/kparts/plugin.cpp
index b9b60fc0b..c9b0d2e36 100644
--- a/kparts/plugin.cpp
+++ b/kparts/plugin.cpp
@@ -68,7 +68,7 @@ TQString Plugin::xmlFile() const
     if ( !d->m_parentInstance || ( path.length() > 0 && path[ 0 ] == '/' ) )
         return path;
 
-    TQString absPath = locate( "data", TQString::tqfromLatin1( d->m_parentInstance->instanceName() ) + '/' + path );
+    TQString absPath = locate( "data", TQString::fromLatin1( d->m_parentInstance->instanceName() ) + '/' + path );
     assert( !absPath.isEmpty() );
     return absPath;
 }
@@ -80,7 +80,7 @@ TQString Plugin::localXMLFile() const
     if ( !d->m_parentInstance || ( path.length() > 0 && path[ 0 ] == '/' ) )
         return path;
 
-    TQString absPath = locateLocal( "data", TQString::tqfromLatin1( d->m_parentInstance->instanceName() ) + '/' + path );
+    TQString absPath = locateLocal( "data", TQString::fromLatin1( d->m_parentInstance->instanceName() ) + '/' + path );
     assert( !absPath.isEmpty() );
     return absPath;
 }
@@ -104,10 +104,10 @@ TQValueList<Plugin::PluginInfo> Plugin::pluginInfos( const KInstance * instance
   for (; pIt != pEnd; ++pIt )
   {
       TQFileInfo fInfo( *pIt );
-      if ( fInfo.extension() == TQString::tqfromLatin1( "desktop" ) )
+      if ( fInfo.extension() == TQString::fromLatin1( "desktop" ) )
           continue;
 
-      TQMap<TQString,TQStringList>::Iterator mapIt = sortedPlugins.tqfind( fInfo.fileName() );
+      TQMap<TQString,TQStringList>::Iterator mapIt = sortedPlugins.find( fInfo.fileName() );
       if ( mapIt == sortedPlugins.end() )
           mapIt = sortedPlugins.insert( fInfo.fileName(), TQStringList() );
 
@@ -249,7 +249,7 @@ void Plugin::loadPlugins( TQObject *parent, KXMLGUIClient* parentGUIClient, KIns
         else
         { // no user-setting, load plugin default setting
             TQString relPath = TQString( instance->instanceName() ) + "/" + (*pIt).m_relXMLFileName;
-            relPath.truncate( relPath.tqfindRev( '.' ) ); // remove extension
+            relPath.truncate( relPath.findRev( '.' ) ); // remove extension
             relPath += ".desktop";
             //kdDebug(1000) << "looking for " << relPath << endl;
             const TQString desktopfile = instance->dirs()->findResource( "data", relPath );
diff --git a/kparts/plugin.h b/kparts/plugin.h
index 9c2c16512..829687c6e 100644
--- a/kparts/plugin.h
+++ b/kparts/plugin.h
@@ -111,7 +111,7 @@ public:
      * Plugin objects children of @p parent, and insert the plugin as a child GUI client
      * of @p parentGUIClient.
      *
-     * This method uses the KConfig object of the given instance, to tqfind out which
+     * This method uses the KConfig object of the given instance, to find out which
      * plugins are enabled and which are disabled. What happens by default (i.e.
      * for new plugins that are not in that config file) is controlled by
      * @p enableNewPluginsByDefault. It can be overridden by the plugin if it
diff --git a/kparts/statusbarextension.cpp b/kparts/statusbarextension.cpp
index 7dcf3d800..6b0ee3cb2 100644
--- a/kparts/statusbarextension.cpp
+++ b/kparts/statusbarextension.cpp
@@ -135,7 +135,7 @@ KStatusBar * StatusBarExtension::statusBar() const
 {
   if ( !m_statusBar )  {
     TQWidget* w = static_cast<KParts::ReadOnlyPart*>(parent())->widget();
-    KMainWindow* mw = dynamic_cast<KMainWindow *>( w->tqtopLevelWidget() );
+    KMainWindow* mw = dynamic_cast<KMainWindow *>( w->topLevelWidget() );
     if ( mw )
       m_statusBar = mw->statusBar();
   }
diff --git a/kparts/statusbarextension.h b/kparts/statusbarextension.h
index 81bf6854b..79d449a98 100644
--- a/kparts/statusbarextension.h
+++ b/kparts/statusbarextension.h
@@ -50,7 +50,7 @@ namespace KParts
    *
    * @since 3.2
    */
-  class KPARTS_EXPORT StatusBarExtension : public TQObject
+  class KPARTS_EXPORT StatusBarExtension : public QObject
   {
     Q_OBJECT
 
diff --git a/kparts/tests/example.cpp b/kparts/tests/example.cpp
index 22c87f30c..a1e8110e5 100644
--- a/kparts/tests/example.cpp
+++ b/kparts/tests/example.cpp
@@ -79,7 +79,7 @@ void Shell::embedEditor()
   if ( m_manager->activePart() == m_part2 )
     createGUI( 0L );
 
-  // tqreplace part2 with the editor part
+  // replace part2 with the editor part
   delete m_part2;
   m_part2 = 0L;
   m_editorpart = new NotepadPart( m_splitter, "editor", 
diff --git a/kparts/tests/ghostview.cpp b/kparts/tests/ghostview.cpp
index 2ba2bd1d2..a1ace7720 100644
--- a/kparts/tests/ghostview.cpp
+++ b/kparts/tests/ghostview.cpp
@@ -25,7 +25,7 @@ Shell::Shell()
 
   KAction * paQuit = new KAction( "&Quit" , "exit", 0, this, TQT_SLOT( close() ), actionCollection(), "file_quit" );
 
-  // Try to tqfind a postscript component first
+  // Try to find a postscript component first
   KTrader::OfferList offers = KTrader::self()->query("application/postscript", "('KParts/ReadOnlyPart' in ServiceTypes) or ('Browser/View' in ServiceTypes)");
 
   KLibFactory *factory = 0;
@@ -47,7 +47,7 @@ Shell::Shell()
     }
   }
 
-  // if we couldn't tqfind a component with the trader, try the
+  // if we couldn't find a component with the trader, try the
   // kghostview library directly.  if this ever happens, then something
   // is seriously screwed up, though -- the kghostview component
   // should be picked up by the trader
diff --git a/kparts/tests/normalktm.cpp b/kparts/tests/normalktm.cpp
index e8fdae56d..ec4420a7e 100644
--- a/kparts/tests/normalktm.cpp
+++ b/kparts/tests/normalktm.cpp
@@ -74,7 +74,7 @@ void Shell::slotFileOpenRemote()
 
 void Shell::embedEditor()
 {
-  // tqreplace part2 with the editor part
+  // replace part2 with the editor part
   delete m_part2;
   m_part2 = 0L;
   m_editorpart = new NotepadPart( m_splitter, "editor", 
diff --git a/kparts/tests/notepad.cpp b/kparts/tests/notepad.cpp
index 3a46f76c3..e0857a51e 100644
--- a/kparts/tests/notepad.cpp
+++ b/kparts/tests/notepad.cpp
@@ -16,17 +16,17 @@
 #include <kstatusbar.h>
 #include <kstandarddirs.h>
 
-NotepadPart::NotepadPart( TQWidget* tqparentWidget, const char*,
+NotepadPart::NotepadPart( TQWidget* parentWidget, const char*,
                           TQObject* parent, const char* name,
                           const TQStringList& )
  : KParts::ReadWritePart( parent, name )
 {
   setInstance( NotepadFactory::instance() );
 
-  m_edit = new TQMultiLineEdit( tqparentWidget, "NotepadPart's multiline edit" );
+  m_edit = new TQMultiLineEdit( parentWidget, "NotepadPart's multiline edit" );
   setWidget( m_edit );
 
-  (void)new KAction( "Search and tqreplace", 0, this, TQT_SLOT( slotSearchReplace() ), actionCollection(), "searchtqreplace" );
+  (void)new KAction( "Search and replace", 0, this, TQT_SLOT( slotSearchReplace() ), actionCollection(), "searchreplace" );
   setXMLFile( "notepadpart.rc" );
   setReadWrite( true );
 }
diff --git a/kparts/tests/notepad.desktop b/kparts/tests/notepad.desktop
index 29fd1b17c..e7f1bb432 100644
--- a/kparts/tests/notepad.desktop
+++ b/kparts/tests/notepad.desktop
@@ -80,7 +80,7 @@ Name[zh_CN]=记事本(例�)
 Name[zh_HK]=記事本(範例)
 Name[zh_TW]=記事本(範例)
 Name[zu]=Incwadi yokubhala (umfanekiso)
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-tqmoc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
 ServiceTypes=KParts/ReadOnlyPart
 X-KDE-Library=libnotepadpart
 Type=Service
diff --git a/kparts/tests/notepadpart.rc b/kparts/tests/notepadpart.rc
index 272f6cbc9..ba30eb322 100644
--- a/kparts/tests/notepadpart.rc
+++ b/kparts/tests/notepadpart.rc
@@ -3,11 +3,11 @@
 <MenuBar>
  <Menu name="file"><Text>&amp;File</Text>
   <Menu name="NotepadSubMenu"><text>Notepad Stuff</text>
-    <Action name="searchtqreplace"/>
+    <Action name="searchreplace"/>
   </Menu>
  </Menu>
  <Menu name="edit"><Text>&amp;Edit</Text>
-  <Action name="searchtqreplace"/>
+  <Action name="searchreplace"/>
  </Menu>
 </MenuBar>
 <StatusBar/>
diff --git a/kparts/tests/parts.cpp b/kparts/tests/parts.cpp
index f11f0194f..d932a168f 100644
--- a/kparts/tests/parts.cpp
+++ b/kparts/tests/parts.cpp
@@ -18,12 +18,12 @@
 #include <kaction.h>
 #include <klocale.h>
 
-Part1::Part1( TQObject *parent, TQWidget * tqparentWidget )
+Part1::Part1( TQObject *parent, TQWidget * parentWidget )
  : KParts::ReadOnlyPart( parent, "Part1" )
 {
   m_instance = new KInstance( "kpartstestpart" );
   setInstance( m_instance );
-  m_edit = new TQMultiLineEdit( tqparentWidget );
+  m_edit = new TQMultiLineEdit( parentWidget );
   setWidget( m_edit );
   setXMLFile( "kpartstest_part1.rc" );
 
@@ -56,12 +56,12 @@ bool Part1::openFile()
   return true;
 }
 
-Part2::Part2( TQObject *parent, TQWidget * tqparentWidget )
+Part2::Part2( TQObject *parent, TQWidget * parentWidget )
  : KParts::Part( parent, "Part2" )
 {
   m_instance = new KInstance( "part2" );
   setInstance( m_instance );
-  TQWidget * w = new TQWidget( tqparentWidget, "Part2Widget" );
+  TQWidget * w = new TQWidget( parentWidget, "Part2Widget" );
   setWidget( w );
 
   TQCheckBox * cb = new TQCheckBox( "something", w );
diff --git a/kparts/tests/parts.h b/kparts/tests/parts.h
index 873a6fea4..6f373a85c 100644
--- a/kparts/tests/parts.h
+++ b/kparts/tests/parts.h
@@ -13,7 +13,7 @@ class Part1 : public KParts::ReadOnlyPart
 {
   Q_OBJECT
 public:
-  Part1( TQObject *parent, TQWidget * tqparentWidget );
+  Part1( TQObject *parent, TQWidget * parentWidget );
   virtual ~Part1();
 
 protected:
@@ -28,7 +28,7 @@ class Part2 : public KParts::Part
 {
   Q_OBJECT
 public:
-  Part2( TQObject *parent, TQWidget * tqparentWidget );
+  Part2( TQObject *parent, TQWidget * parentWidget );
   virtual ~Part2();
 
 protected:
diff --git a/kparts/tests/plugin_foobar.rc b/kparts/tests/plugin_foobar.rc
index 377c6b901..e614e505f 100644
--- a/kparts/tests/plugin_foobar.rc
+++ b/kparts/tests/plugin_foobar.rc
@@ -2,10 +2,10 @@
 <kpartplugin library="libfoobar">
 <MenuBar>
  <Menu name="file"><Text>&amp;File</Text>
-  <Action name="searchtqreplace"/>
+  <Action name="searchreplace"/>
  </Menu>
  <Menu name="woohoo"><Text>fun</Text>
-  <Action name="searchtqreplace"/>
+  <Action name="searchreplace"/>
  </Menu>
 </MenuBar>
 <ToolBar name="gah"/>
diff --git a/kparts/tests/plugin_spellcheck.rc b/kparts/tests/plugin_spellcheck.rc
index 495148d91..1980186cf 100644
--- a/kparts/tests/plugin_spellcheck.rc
+++ b/kparts/tests/plugin_spellcheck.rc
@@ -6,9 +6,9 @@
  </Menu>
  <Menu name="SomePluginMenu"><text>Some Cool Plugin Menu</text>
   <Action name="spellcheck"/>
-  <Action name="searchtqreplace"/>
+  <Action name="searchreplace"/>
   <Menu name="WhatASubMenu"><text>Yep</text>
-    <Action name="searchtqreplace"/>
+    <Action name="searchreplace"/>
   </Menu>
  </Menu>
 </MenuBar>
diff --git a/krandr/ktimerdialog.cpp b/krandr/ktimerdialog.cpp
index 3885ca438..55302b407 100644
--- a/krandr/ktimerdialog.cpp
+++ b/krandr/ktimerdialog.cpp
@@ -95,7 +95,7 @@ void KTimerDialog::setMainWidget( TQWidget *widget )
     // yuck, here goes.
     TQVBox *newWidget = new TQVBox( this );
 
-    if ( widget->tqparentWidget() != mainWidget ) {
+    if ( widget->parentWidget() != mainWidget ) {
         widget->reparent( newWidget, 0, TQPoint(0,0) );
     } else {
         newWidget->insertChild( widget );
diff --git a/krandr/ktimerdialog.h b/krandr/ktimerdialog.h
index 71748c546..965a72393 100644
--- a/krandr/ktimerdialog.h
+++ b/krandr/ktimerdialog.h
@@ -144,7 +144,7 @@ class KTimerDialog : public KDialogBase
 
   private:
     /**
-     * Prepares the tqlayout that manages the widgets of the dialog
+     * Prepares the layout that manages the widgets of the dialog
      */
     void setupLayout();
 
diff --git a/krandr/libkrandr.cc b/krandr/libkrandr.cc
index e3e245b2e..cbb023e4f 100644
--- a/krandr/libkrandr.cc
+++ b/krandr/libkrandr.cc
@@ -32,7 +32,7 @@ TQString KRandrSimpleAPI::getIccFileName(TQString profileName, TQString screenNa
 	TQString retval;
 
 	if (profileName != NULL) {
-		t_config = new KSimpleConfig( TQString::tqfromLatin1( "kiccconfigrc" ));
+		t_config = new KSimpleConfig( TQString::fromLatin1( "kiccconfigrc" ));
 	}
 	else {
 		t_systemconfig = new KSimpleConfig( kde_confdir + TQString("/kicc/kiccconfigrc") );
@@ -216,7 +216,7 @@ TQString KRandrSimpleAPI::applyIccConfiguration(TQString profileName, TQString k
 	int screenNumber = 0;
 	TQString errorstr = "";
 
-	t_config = new KSimpleConfig( TQString::tqfromLatin1( "kiccconfigrc" ));
+	t_config = new KSimpleConfig( TQString::fromLatin1( "kiccconfigrc" ));
 
 	// Find all screens
 	if (isValid() == true) {
@@ -248,7 +248,7 @@ TQString KRandrSimpleAPI::getCurrentProfile () {
 	TQString profileName;
 	KSimpleConfig *t_config;
 
-	t_config = new KSimpleConfig( TQString::tqfromLatin1( "kiccconfigrc" ));
+	t_config = new KSimpleConfig( TQString::fromLatin1( "kiccconfigrc" ));
 	profileName = t_config->readEntry("CurrentProfile");
 	delete t_config;
 	return profileName;
@@ -332,14 +332,14 @@ void KRandrSimpleAPI::output_off(ScreenInfo *screen_info, OutputInfo *output)
     internal_output_off(screen_info, output);
 }
 
-CrtcInfo* KRandrSimpleAPI::auto_tqfind_crtc (ScreenInfo *screen_info, OutputInfo *output_info)
+CrtcInfo* KRandrSimpleAPI::auto_find_crtc (ScreenInfo *screen_info, OutputInfo *output_info)
 {
-    return internal_auto_tqfind_crtc (screen_info, output_info);
+    return internal_auto_find_crtc (screen_info, output_info);
 }
 
-XRRModeInfo *KRandrSimpleAPI::tqfind_mode_by_xid (ScreenInfo *screen_info, RRMode mode_id)
+XRRModeInfo *KRandrSimpleAPI::find_mode_by_xid (ScreenInfo *screen_info, RRMode mode_id)
 {
-    return internal_tqfind_mode_by_xid (screen_info, mode_id);
+    return internal_find_mode_by_xid (screen_info, mode_id);
 }
 
 int KRandrSimpleAPI::mode_height (XRRModeInfo *mode_info, Rotation rotation)
@@ -367,12 +367,12 @@ char *KRandrSimpleAPI::get_output_name (ScreenInfo *screen_info, RROutput id)
     return internal_get_output_name (screen_info, id);
 }
 
-tqStatus KRandrSimpleAPI::crtc_apply (CrtcInfo *crtc_info)
+Status KRandrSimpleAPI::crtc_apply (CrtcInfo *crtc_info)
 {
     return internal_crtc_apply (crtc_info);
 }
 
-tqStatus KRandrSimpleAPI::crtc_disable (CrtcInfo *crtc)
+Status KRandrSimpleAPI::crtc_disable (CrtcInfo *crtc)
 {
     return internal_crtc_disable (crtc);
 }
diff --git a/krandr/libkrandr.h b/krandr/libkrandr.h
index 4fab82e3d..ced69a68d 100644
--- a/krandr/libkrandr.h
+++ b/krandr/libkrandr.h
@@ -101,14 +101,14 @@ class KRANDR_EXPORT KRandrSimpleAPI : public RandRDisplay
     void output_off(ScreenInfo *screen_info, OutputInfo *output);
 
     /**
-     * Automatically tqfinds the CRTC structure.
+     * Automatically finds the CRTC structure.
      */
-    CrtcInfo* auto_tqfind_crtc (ScreenInfo *screen_info, OutputInfo *output_info);
+    CrtcInfo* auto_find_crtc (ScreenInfo *screen_info, OutputInfo *output_info);
 
     /**
      * Finds a mode by XID.
      */
-    XRRModeInfo *tqfind_mode_by_xid (ScreenInfo *screen_info, RRMode mode_id);
+    XRRModeInfo *find_mode_by_xid (ScreenInfo *screen_info, RRMode mode_id);
 
     /**
      * Returns specified mode height in pixels.
@@ -138,12 +138,12 @@ class KRANDR_EXPORT KRandrSimpleAPI : public RandRDisplay
     /**
      * Applies specified CRTC.
      */
-    tqStatus crtc_apply (CrtcInfo *crtc_info);
+    Status crtc_apply (CrtcInfo *crtc_info);
 
     /**
      * Disables specificed CRTC
      */
-    tqStatus crtc_disable (CrtcInfo *crtc);
+    Status crtc_disable (CrtcInfo *crtc);
 
     /**
      * Applies all previously configured settings to the specified screen.
@@ -183,15 +183,15 @@ extern "C" {
 // KRANDR_EXPORT int         set_screen_size (ScreenInfo *screen_info);
 // KRANDR_EXPORT void        output_auto (ScreenInfo *screen_info, OutputInfo *output_info);
 // KRANDR_EXPORT void        output_off(ScreenInfo *screen_info, OutputInfo *output);
-// KRANDR_EXPORT CrtcInfo*   auto_tqfind_crtc (ScreenInfo *screen_info, OutputInfo *output_info);
-// KRANDR_EXPORT XRRModeInfo *tqfind_mode_by_xid (ScreenInfo *screen_info, RRMode mode_id);
+// KRANDR_EXPORT CrtcInfo*   auto_find_crtc (ScreenInfo *screen_info, OutputInfo *output_info);
+// KRANDR_EXPORT XRRModeInfo *find_mode_by_xid (ScreenInfo *screen_info, RRMode mode_id);
 // KRANDR_EXPORT int         mode_height (XRRModeInfo *mode_info, Rotation rotation);
 // KRANDR_EXPORT int         mode_width (XRRModeInfo *mode_info, Rotation rotation);
 // KRANDR_EXPORT int         get_width_by_output_id (ScreenInfo *screen_info, RROutput output_id);
 // KRANDR_EXPORT int         get_height_by_output_id (ScreenInfo *screen_info, RROutput output_id);
 // KRANDR_EXPORT char        *get_output_name (ScreenInfo *screen_info, RROutput id);
-// KRANDR_EXPORT tqStatus      crtc_apply (CrtcInfo *crtc_info);
-// KRANDR_EXPORT tqStatus      crtc_disable (CrtcInfo *crtc);
+// KRANDR_EXPORT Status      crtc_apply (CrtcInfo *crtc_info);
+// KRANDR_EXPORT Status      crtc_disable (CrtcInfo *crtc);
 // KRANDR_EXPORT int         main_low_apply (ScreenInfo *screen_info);
 // KRANDR_EXPORT bool        kRandrHasRandr();
 
diff --git a/krandr/lowlevel_randr.c b/krandr/lowlevel_randr.c
index 2d2856f06..251d3bef5 100644
--- a/krandr/lowlevel_randr.c
+++ b/krandr/lowlevel_randr.c
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 
-tqStatus internal_crtc_disable (struct CrtcInfo *crtc);
+Status internal_crtc_disable (struct CrtcInfo *crtc);
 
 char * internal_get_output_name (struct ScreenInfo *screen_info, RROutput id)
 {
@@ -45,7 +45,7 @@ char * internal_get_output_name (struct ScreenInfo *screen_info, RROutput id)
 	return output_name;
 }
 
-XRRModeInfo * internal_tqfind_mode_by_xid (struct ScreenInfo *screen_info, RRMode mode_id)
+XRRModeInfo * internal_find_mode_by_xid (struct ScreenInfo *screen_info, RRMode mode_id)
 {
 	XRRModeInfo *mode_info = NULL;
 	XRRScreenResources *res;
@@ -62,7 +62,7 @@ XRRModeInfo * internal_tqfind_mode_by_xid (struct ScreenInfo *screen_info, RRMod
 	return mode_info;
 }
 
-static XRRCrtcInfo * internal_tqfind_crtc_by_xid (struct ScreenInfo *screen_info, RRCrtc crtc_id)
+static XRRCrtcInfo * internal_find_crtc_by_xid (struct ScreenInfo *screen_info, RRCrtc crtc_id)
 {
 	XRRCrtcInfo *crtc_info;
 	Display *dpy;
@@ -93,7 +93,7 @@ int internal_get_width_by_output_id (struct ScreenInfo *screen_info, RROutput ou
 				break;
 			}
 			mode_id = crtc_info->cur_mode_id;
-			mode_info = internal_tqfind_mode_by_xid (screen_info, mode_id);
+			mode_info = internal_find_mode_by_xid (screen_info, mode_id);
 
 			width = internal_mode_width (mode_info, crtc_info->cur_rotation);
 
@@ -121,7 +121,7 @@ int internal_get_height_by_output_id (struct ScreenInfo *screen_info, RROutput o
 				break;
 			}
 			mode_id = crtc_info->cur_mode_id;
-			mode_info = internal_tqfind_mode_by_xid (screen_info, mode_id);
+			mode_info = internal_find_mode_by_xid (screen_info, mode_id);
 
 			height = internal_mode_height (mode_info, crtc_info->cur_rotation);
 
@@ -161,7 +161,7 @@ int internal_mode_width (XRRModeInfo *mode_info, Rotation rotation)
 }
 
 
-static struct CrtcInfo * internal_tqfind_crtc (struct ScreenInfo *screen_info, XRROutputInfo *output)
+static struct CrtcInfo * internal_find_crtc (struct ScreenInfo *screen_info, XRROutputInfo *output)
 {
 	struct CrtcInfo *crtc_info = NULL;
 	int i;
@@ -176,7 +176,7 @@ static struct CrtcInfo * internal_tqfind_crtc (struct ScreenInfo *screen_info, X
 	return crtc_info;
 }
 
-struct CrtcInfo * internal_auto_tqfind_crtc (struct ScreenInfo *screen_info, struct OutputInfo *output_info)
+struct CrtcInfo * internal_auto_find_crtc (struct ScreenInfo *screen_info, struct OutputInfo *output_info)
 {
 	struct CrtcInfo *crtc_info = NULL;
 	int i;
@@ -215,7 +215,7 @@ int internal_set_screen_size (struct ScreenInfo *screen_info)
 		if (!crtc->cur_mode_id) {
 			continue;
 		}
-		mode_info = internal_tqfind_mode_by_xid (screen_info, crtc->cur_mode_id);
+		mode_info = internal_find_mode_by_xid (screen_info, crtc->cur_mode_id);
 		cur_x = crtc->cur_x;
 		cur_y = crtc->cur_y;
 
@@ -302,7 +302,7 @@ void internal_screen_apply (struct ScreenInfo *screen_info)
 	}
 }
 
-tqStatus internal_crtc_apply (struct CrtcInfo *crtc_info)
+Status internal_crtc_apply (struct CrtcInfo *crtc_info)
 {
 	struct ScreenInfo *screen_info;
 	XRRCrtcInfo *rr_crtc_info;
@@ -314,7 +314,7 @@ tqStatus internal_crtc_apply (struct CrtcInfo *crtc_info)
 	Rotation rotation;
 	RROutput *outputs;
 	int noutput;
-	tqStatus s;
+	Status s;
 	int i;
 
 	/*if (!crtc_info->changed) {
@@ -361,7 +361,7 @@ tqStatus internal_crtc_apply (struct CrtcInfo *crtc_info)
 	return s;
 }
 
-tqStatus internal_crtc_disable (struct CrtcInfo *crtc)
+Status internal_crtc_disable (struct CrtcInfo *crtc)
 {
 	struct ScreenInfo *screen_info;
 
@@ -433,7 +433,7 @@ struct ScreenInfo* internal_read_screen_info (Display *display)
 
 		output->id = sr->outputs[i];
 		output->info = XRRGetOutputInfo (display, sr, sr->outputs[i]);
-		output->cur_crtc = internal_tqfind_crtc (screen_info, output->info);
+		output->cur_crtc = internal_find_crtc (screen_info, output->info);
 		output->auto_set = 0;
 		if (output->cur_crtc) {
 			output->off_set = 0;
@@ -548,7 +548,7 @@ internal_preferred_mode (struct ScreenInfo *screen_info, struct OutputInfo *outp
     best = NULL;
     bestDist = 0;
     for (m = 0; m < output_info->nmode; m++) {
-        XRRModeInfo *mode_info = internal_tqfind_mode_by_xid (screen_info, output_info->modes[m]);
+        XRRModeInfo *mode_info = internal_find_mode_by_xid (screen_info, output_info->modes[m]);
         int         dist;
 
         if (m < output_info->npreferred)
@@ -584,7 +584,7 @@ int internal_main_low_apply (struct ScreenInfo *screen_info)
 		int old_x, old_y, old_w, old_h;
 
 		XRRCrtcInfo *crtc_info = XRRGetCrtcInfo (screen_info->dpy, screen_info->res, screen_info->crtcs[i]->id);
-		XRRModeInfo *old_mode = internal_tqfind_mode_by_xid (screen_info, crtc_info->mode);
+		XRRModeInfo *old_mode = internal_find_mode_by_xid (screen_info, crtc_info->mode);
 
 		if (crtc_info->mode == None) {
 			continue;
@@ -606,7 +606,7 @@ int internal_main_low_apply (struct ScreenInfo *screen_info)
 	internal_screen_apply (screen_info);
 
 	for (i = 0; i < screen_info->n_crtc; i++) {
-		tqStatus s;
+		Status s;
 		crtc_info = screen_info->crtcs[i];
 
 			s = internal_crtc_apply (crtc_info);
@@ -632,7 +632,7 @@ void internal_output_auto (struct ScreenInfo *screen_info, struct OutputInfo *ou
 		probe_output_info = XRRGetOutputInfo (screen_info->dpy, cur_res, output_info->id);
 		if (RR_Disconnected != probe_output_info->connection) {
 			output_info->info = probe_output_info;
-			output_info->cur_crtc = internal_auto_tqfind_crtc (screen_info, output_info);
+			output_info->cur_crtc = internal_auto_find_crtc (screen_info, output_info);
 		}
 	}
 
@@ -646,10 +646,10 @@ void internal_output_auto (struct ScreenInfo *screen_info, struct OutputInfo *ou
 	if (crtc_info) {
 		crtc_info->cur_mode_id = mode_id;
 	} else {
-		crtc_info = internal_auto_tqfind_crtc (screen_info, output_info);
+		crtc_info = internal_auto_find_crtc (screen_info, output_info);
 		if (!crtc_info) {
 #if RANDR_GUI_DEBUG
-			fprintf (stderr, "Can not tqfind usable CRTC\n");
+			fprintf (stderr, "Can not find usable CRTC\n");
 #endif
 			return;
 		} else {
diff --git a/krandr/lowlevel_randr.h b/krandr/lowlevel_randr.h
index e01c41acf..54538aa44 100644
--- a/krandr/lowlevel_randr.h
+++ b/krandr/lowlevel_randr.h
@@ -85,16 +85,16 @@ struct ScreenInfo* internal_read_screen_info (Display *);
 int internal_set_screen_size (struct ScreenInfo *screen_info);
 void internal_output_auto (struct ScreenInfo *screen_info, struct OutputInfo *output_info);
 void internal_output_off (struct ScreenInfo *screen_info, struct OutputInfo *output);
-struct CrtcInfo* internal_auto_tqfind_crtc (struct ScreenInfo *screen_info, struct OutputInfo *output_info);
+struct CrtcInfo* internal_auto_find_crtc (struct ScreenInfo *screen_info, struct OutputInfo *output_info);
 
-XRRModeInfo *internal_tqfind_mode_by_xid (struct ScreenInfo *screen_info, RRMode mode_id);
+XRRModeInfo *internal_find_mode_by_xid (struct ScreenInfo *screen_info, RRMode mode_id);
 int internal_mode_height (XRRModeInfo *mode_info, Rotation rotation);
 int internal_mode_width (XRRModeInfo *mode_info, Rotation rotation);
 int internal_get_width_by_output_id (struct ScreenInfo *screen_info, RROutput output_id);
 int internal_get_height_by_output_id (struct ScreenInfo *screen_info, RROutput output_id);
 char *internal_get_output_name (struct ScreenInfo *screen_info, RROutput id);
-tqStatus internal_crtc_apply (struct CrtcInfo *crtc_info);
-tqStatus internal_crtc_disable (struct CrtcInfo *crtc);
+Status internal_crtc_apply (struct CrtcInfo *crtc_info);
+Status internal_crtc_disable (struct CrtcInfo *crtc);
 int internal_main_low_apply (struct ScreenInfo *screen_info);
 
 #ifdef __cplusplus
diff --git a/krandr/randr.cpp b/krandr/randr.cpp
index 94ce5801e..e891c8a2d 100644
--- a/krandr/randr.cpp
+++ b/krandr/randr.cpp
@@ -103,7 +103,7 @@ bool RandRScreen::applyProposed()
 {
 	//kdDebug() << k_funcinfo << " size " << (SizeID)proposedSize() << ", rotation " << proposedRotation() << ", refresh " << refreshRateIndexToHz(proposedSize(), proposedRefreshRate()) << endl;
 
-	tqStatus status;
+	Status status;
 
 	if (proposedRefreshRate() < 0)
 		status = XRRSetScreenConfig(qt_xdisplay(), d->config, DefaultRootWindow(qt_xdisplay()), (SizeID)proposedSize(), (Rotation)proposedRotation(), CurrentTime);
@@ -555,7 +555,7 @@ RandRDisplay::RandRDisplay()
 	: m_valid(true)
 {
 	// Check extension
-	tqStatus s = XRRQueryExtension(qt_xdisplay(), &m_eventBase, &m_errorBase);
+	Status s = XRRQueryExtension(qt_xdisplay(), &m_eventBase, &m_errorBase);
 	if (!s) {
 		m_errorCode = TQString("%1, base %1").arg(s).arg(m_errorBase);
 		m_valid = false;
diff --git a/krandr/randr.h b/krandr/randr.h
index 54d9d2f44..355f3d866 100644
--- a/krandr/randr.h
+++ b/krandr/randr.h
@@ -29,7 +29,7 @@
 class KTimerDialog;
 class RandRScreenPrivate;
 
-class RandRScreen : public TQObject
+class RandRScreen : public QObject
 {
 	Q_OBJECT
 
diff --git a/kresources/README.design b/kresources/README.design
index df37dad40..563d0aeed 100644
--- a/kresources/README.design
+++ b/kresources/README.design
@@ -27,7 +27,7 @@ Resource families are usually implemented as (abstract) classes
 in a library, e.g. the calendar resource in libkcal en the
 addressbook resource family in libkabc. Resource type are like 
 plugins: that can be loaded on-demand, they are implemented in
-their own library, and a .desktop file tells KDE where to tqfind 
+their own library, and a .desktop file tells KDE where to find 
 them.
 
 The user then configures one or more resources for a certain
@@ -94,7 +94,7 @@ For examples, check the following files in kdepim/libkcal:
 - kcmcalendars.{h,cpp}
   Defines the KControl applet for calendar resources
 - kcalendars.desktop
-  This .desktop files tells KControl where to tqfind the 
+  This .desktop files tells KControl where to find the 
   applet for calendar resources.
 - Makefile.am
   How to build and install the calendar resource family
@@ -119,7 +119,7 @@ kdepim/kresources/exchange:
   Defines the configuration widget for the exchange resource
 - exchange.desktop
   This file is installed so that the resource manager can
-  tqfind the exchange resource type
+  find the exchange resource type
 - Makefile.am
   How to build and install the exchange resource type
 
diff --git a/kresources/configdialog.cpp b/kresources/configdialog.cpp
index 69fcc798a..bbebc47a3 100644
--- a/kresources/configdialog.cpp
+++ b/kresources/configdialog.cpp
@@ -47,7 +47,7 @@ ConfigDialog::ConfigDialog( TQWidget *parent, const TQString& resourceFamily,
   TQVBoxLayout *mainLayout = new TQVBoxLayout( main, 0, spacingHint() );
 
   TQGroupBox *generalGroupBox = new TQGroupBox( 2, Qt::Horizontal, main );
-  generalGroupBox->tqlayout()->setSpacing( spacingHint() );
+  generalGroupBox->layout()->setSpacing( spacingHint() );
   generalGroupBox->setTitle( i18n( "General Settings" ) );
 
   new TQLabel( i18n( "Name:" ), generalGroupBox );
@@ -62,7 +62,7 @@ ConfigDialog::ConfigDialog( TQWidget *parent, const TQString& resourceFamily,
   mainLayout->addWidget( generalGroupBox );
 
   TQGroupBox *resourceGroupBox = new TQGroupBox( 2, Qt::Horizontal,  main );
-  resourceGroupBox->tqlayout()->setSpacing( spacingHint() );
+  resourceGroupBox->layout()->setSpacing( spacingHint() );
   resourceGroupBox->setTitle( i18n( "%1 Resource Settings" )
                               .arg( factory->typeName( resource->type() ) ) );
   mainLayout->addWidget( resourceGroupBox );
@@ -82,7 +82,7 @@ ConfigDialog::ConfigDialog( TQWidget *parent, const TQString& resourceFamily,
       TQT_SLOT( slotNameChanged(const TQString &)));
 
   slotNameChanged( mName->text() );
-  setMinimumSize( tqsizeHint() );
+  setMinimumSize( sizeHint() );
 }
 
 void ConfigDialog::setInEditMode( bool value )
diff --git a/kresources/configpage.cpp b/kresources/configpage.cpp
index d84db12f1..5e5e61198 100644
--- a/kresources/configpage.cpp
+++ b/kresources/configpage.cpp
@@ -106,9 +106,9 @@ ConfigPage::ConfigPage( TQWidget *parent, const char *name )
 
   TQGroupBox *groupBox = new TQGroupBox( i18n( "Resources" ), this );
   groupBox->setColumnLayout(0, Qt::Vertical );
-  groupBox->tqlayout()->setSpacing( 6 );
-  groupBox->tqlayout()->setMargin( 11 );
-  TQGridLayout *groupBoxLayout = new TQGridLayout( groupBox->tqlayout(), 2, 2 );
+  groupBox->layout()->setSpacing( 6 );
+  groupBox->layout()->setMargin( 11 );
+  TQGridLayout *groupBoxLayout = new TQGridLayout( groupBox->layout(), 2, 2 );
 
   mFamilyCombo = new KComboBox( false, groupBox );
   groupBoxLayout->addMultiCellWidget( mFamilyCombo, 0, 0, 0, 1 );
@@ -130,7 +130,7 @@ ConfigPage::ConfigPage( TQWidget *parent, const char *name )
   mEditButton->setEnabled( false );
   mStandardButton = buttonBox->addButton( i18n( "&Use as Standard" ), this, TQT_SLOT(slotStandard()) );
   mStandardButton->setEnabled( false );
-  buttonBox->tqlayout();
+  buttonBox->layout();
 
   groupBoxLayout->addWidget( buttonBox, 1, 1 );
 
@@ -179,7 +179,7 @@ void ConfigPage::load()
   KTrader::OfferList::ConstIterator end = plugins.end();
   for ( ; it != end; ++it ) {
     const TQString family = (*it)->property( "X-KDE-ResourceFamily" ).toString();
-    if ( compatFamilyNames.tqfind( family ) == compatFamilyNames.end() )
+    if ( compatFamilyNames.find( family ) == compatFamilyNames.end() )
         compatFamilyNames.append( family );
   }
 
@@ -300,7 +300,7 @@ void ConfigPage::slotAdd()
   if ( !ok )
     return;
 
-  TQString type = types[ descs.tqfindIndex( desc ) ];
+  TQString type = types[ descs.findIndex( desc ) ];
 
   // Create new resource
   Resource *resource = mCurrentManager->createResource( type );
@@ -460,7 +460,7 @@ void ConfigPage::resourceModified( Resource *resource )
 {
   kdDebug(5650) << "ConfigPage::resourceModified( " << resource->resourceName()
                 << " )" << endl;
-  ConfigViewItem *item = tqfindItem( resource );
+  ConfigViewItem *item = findItem( resource );
   if ( !item ) return;
 
   // TODO: Reread resource config. Otherwise we won't see the modification.
@@ -473,13 +473,13 @@ void ConfigPage::resourceDeleted( Resource *resource )
   kdDebug(5650) << "ConfigPage::resourceDeleted( " << resource->resourceName()
                 << " )" << endl;
 
-  ConfigViewItem *item = tqfindItem( resource );
+  ConfigViewItem *item = findItem( resource );
   if ( !item ) return;
 
   delete item;
 }
 
-ConfigViewItem *ConfigPage::tqfindItem( Resource *resource )
+ConfigViewItem *ConfigPage::findItem( Resource *resource )
 {
   TQListViewItem *i;
   for( i = mListView->firstChild(); i; i = i->nextSibling() ) {
diff --git a/kresources/configpage.h b/kresources/configpage.h
index 919731b6c..ec1fb3799 100644
--- a/kresources/configpage.h
+++ b/kresources/configpage.h
@@ -76,7 +76,7 @@ class KRESOURCES_EXPORT ConfigPage : public TQWidget, public ManagerObserver<Res
     virtual void resourceDeleted( Resource *resource );
 
   protected:
-    ConfigViewItem *tqfindItem( Resource *resource );
+    ConfigViewItem *findItem( Resource *resource );
 
   protected slots:
     void slotItemClicked( TQListViewItem * );
diff --git a/kresources/factory.cpp b/kresources/factory.cpp
index 14f905603..462d6be9c 100644
--- a/kresources/factory.cpp
+++ b/kresources/factory.cpp
@@ -45,7 +45,7 @@ Factory *Factory::self( const TQString& resourceFamily )
   if ( !mSelves )
     staticDeleter.setObject( mSelves, new TQDict<Factory> );
 
-  factory = mSelves->tqfind( resourceFamily );
+  factory = mSelves->find( resourceFamily );
 
   if ( !factory ) {
     factory = new Factory( resourceFamily );
@@ -79,7 +79,7 @@ TQStringList Factory::typeNames() const
 
 ConfigWidget *Factory::configWidget( const TQString& type, TQWidget *parent )
 {
-  if ( type.isEmpty() || !mTypeMap.tqcontains( type ) )
+  if ( type.isEmpty() || !mTypeMap.contains( type ) )
     return 0;
 
   KService::Ptr ptr = mTypeMap[ type ];
@@ -109,7 +109,7 @@ ConfigWidget *Factory::configWidget( const TQString& type, TQWidget *parent )
 
 TQString Factory::typeName( const TQString &type ) const
 {
-  if ( type.isEmpty() || !mTypeMap.tqcontains( type ) )
+  if ( type.isEmpty() || !mTypeMap.contains( type ) )
     return TQString();
 
   KService::Ptr ptr = mTypeMap[ type ];
@@ -118,7 +118,7 @@ TQString Factory::typeName( const TQString &type ) const
 
 TQString Factory::typeDescription( const TQString &type ) const
 {
-  if ( type.isEmpty() || !mTypeMap.tqcontains( type ) )
+  if ( type.isEmpty() || !mTypeMap.contains( type ) )
     return TQString();
 
   KService::Ptr ptr = mTypeMap[ type ];
@@ -129,7 +129,7 @@ Resource *Factory::resource( const TQString& type, const KConfig *config )
 {
   kdDebug(5650) << "Factory::resource( " << type << ", config )" << endl;
 
-  if ( type.isEmpty() || !mTypeMap.tqcontains( type ) ) {
+  if ( type.isEmpty() || !mTypeMap.contains( type ) ) {
     kdDebug(5650) << "Factory::resource() no such type " << type << endl;
     return 0;
   }
diff --git a/kresources/kcmkresources.cpp b/kresources/kcmkresources.cpp
index 9929e24ab..41fdb91fe 100644
--- a/kresources/kcmkresources.cpp
+++ b/kresources/kcmkresources.cpp
@@ -35,9 +35,9 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kresources, ResourcesFactory( "kcmkresources" )
 KCMKResources::KCMKResources( TQWidget *parent, const char *name, const TQStringList& )
   : KCModule( ResourcesFactory::instance(), parent, name )
 {
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+  TQVBoxLayout *layout = new TQVBoxLayout( this );
   mConfigPage = new KRES::ConfigPage( this );
-  tqlayout->addWidget( mConfigPage );
+  layout->addWidget( mConfigPage );
   connect( mConfigPage, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) );
   setButtons( Help | Apply );
   KAboutData *about =
diff --git a/kresources/manager.h b/kresources/manager.h
index c11ecaab5..ab1562716 100644
--- a/kresources/manager.h
+++ b/kresources/manager.h
@@ -335,7 +335,7 @@ class Manager : private ManagerNotifier
             ++it ) {
         TQString desc = mFactory->typeName( *it );
         if ( !mFactory->typeDescription( *it ).isEmpty() )
-          desc += TQString::tqfromLatin1(" (") + mFactory->typeDescription( *it ) + TQString::tqfromLatin1(")");
+          desc += TQString::fromLatin1(" (") + mFactory->typeDescription( *it ) + TQString::fromLatin1(")");
 
         typeDescs.append( desc );
       }
diff --git a/kresources/managerimpl.cpp b/kresources/managerimpl.cpp
index 15dd33428..b5d9ec32f 100644
--- a/kresources/managerimpl.cpp
+++ b/kresources/managerimpl.cpp
@@ -353,7 +353,7 @@ Resource *ManagerImpl::readResourceConfig( const TQString &identifier,
 
   if ( checkActive ) {
     TQStringList activeKeys = mConfig->readListEntry( "ResourceKeys" );
-    resource->setActive( activeKeys.tqcontains( identifier ) );
+    resource->setActive( activeKeys.contains( identifier ) );
   }
   mResources.append( resource );
 
@@ -383,20 +383,20 @@ void ManagerImpl::writeResourceConfig( Resource *resource, bool checkActive )
     TQStringList activeKeys = mConfig->readListEntry( "ResourceKeys" );
     TQStringList passiveKeys = mConfig->readListEntry( "PassiveResourceKeys" );
     if ( resource->isActive() ) {
-      if ( passiveKeys.tqcontains( key ) ) { // remove it from passive list
+      if ( passiveKeys.contains( key ) ) { // remove it from passive list
         passiveKeys.remove( key );
         mConfig->writeEntry( "PassiveResourceKeys", passiveKeys );
       }
-      if ( !activeKeys.tqcontains( key ) ) { // add it to active list
+      if ( !activeKeys.contains( key ) ) { // add it to active list
         activeKeys.append( key );
         mConfig->writeEntry( "ResourceKeys", activeKeys );
       }
     } else if ( !resource->isActive() ) {
-      if ( activeKeys.tqcontains( key ) ) { // remove it from active list
+      if ( activeKeys.contains( key ) ) { // remove it from active list
         activeKeys.remove( key );
         mConfig->writeEntry( "ResourceKeys", activeKeys );
       }
-      if ( !passiveKeys.tqcontains( key ) ) { // add it to passive list
+      if ( !passiveKeys.contains( key ) ) { // add it to passive list
         passiveKeys.append( key );
         mConfig->writeEntry( "PassiveResourceKeys", passiveKeys );
       }
@@ -414,7 +414,7 @@ void ManagerImpl::removeResource( Resource *resource )
   
   mConfig->setGroup( "General" );
   TQStringList activeKeys = mConfig->readListEntry( "ResourceKeys" );
-  if ( activeKeys.tqcontains( key ) ) {
+  if ( activeKeys.contains( key ) ) {
     activeKeys.remove( key );
     mConfig->writeEntry( "ResourceKeys", activeKeys );
   } else {
diff --git a/kresources/resource.h b/kresources/resource.h
index eec790bbe..63190378d 100644
--- a/kresources/resource.h
+++ b/kresources/resource.h
@@ -252,7 +252,7 @@ service_DATA = resourceexample.desktop
   data. Subclasses of ResourceCalendar would implement this API for local files,
   remote files, specific calendar servers etc.
 */
-class KRESOURCES_EXPORT Resource : public TQObject
+class KRESOURCES_EXPORT Resource : public QObject
 {
     friend class Factory;
     friend class ManagerImpl;
diff --git a/kresources/selectdialog.cpp b/kresources/selectdialog.cpp
index 4e2d28ec7..cc1c7e593 100644
--- a/kresources/selectdialog.cpp
+++ b/kresources/selectdialog.cpp
@@ -59,7 +59,7 @@ SelectDialog::SelectDialog( TQPtrList<Resource> list, TQWidget *parent,
   buttonBox->addStretch();
   buttonBox->addButton( KStdGuiItem::ok(), this, TQT_SLOT( accept() ) );
   buttonBox->addButton( KStdGuiItem::cancel(), this, TQT_SLOT( reject() ) );
-  buttonBox->tqlayout();
+  buttonBox->layout();
 
   mainLayout->addWidget( buttonBox );
 
diff --git a/kspell2/backgroundchecker.h b/kspell2/backgroundchecker.h
index 9346b0c89..e5418d7ec 100644
--- a/kspell2/backgroundchecker.h
+++ b/kspell2/backgroundchecker.h
@@ -46,7 +46,7 @@ namespace KSpell2
      * @author Zack Rusin <zack@kde.org>
      * @short class used for spell checking in the background
      */
-    class KDE_EXPORT BackgroundChecker : public TQObject
+    class KDE_EXPORT BackgroundChecker : public QObject
     {
         Q_OBJECT
     public:
diff --git a/kspell2/backgroundengine.h b/kspell2/backgroundengine.h
index d5bee8ca5..9534e970c 100644
--- a/kspell2/backgroundengine.h
+++ b/kspell2/backgroundengine.h
@@ -31,7 +31,7 @@ namespace KSpell2
     class Filter;
     class Broker;
     class Dictionary;
-    class BackgroundEngine : public TQObject
+    class BackgroundEngine : public QObject
     {
         Q_OBJECT
     public:
diff --git a/kspell2/broker.cpp b/kspell2/broker.cpp
index b24f20beb..7f572bb01 100644
--- a/kspell2/broker.cpp
+++ b/kspell2/broker.cpp
@@ -65,7 +65,7 @@ Broker *Broker::openBroker( KSharedConfig *config )
         preventDeletion = config;
 
     if ( s_brokers ) {
-        Broker *broker = s_brokers->tqfind( preventDeletion );
+        Broker *broker = s_brokers->find( preventDeletion );
         if ( broker )
             return broker;
     }
@@ -189,8 +189,8 @@ void Broker::loadPlugin( const TQString& pluginId )
     kdDebug()<<"Loading plugin " << pluginId << endl;
 
     Client *client = KParts::ComponentFactory::createInstanceFromQuery<Client>(
-        TQString::tqfromLatin1( "KSpell/Client" ),
-        TQString::tqfromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg( pluginId ),
+        TQString::fromLatin1( "KSpell/Client" ),
+        TQString::fromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg( pluginId ),
         this, 0, TQStringList(), &error );
 
     if ( client )
diff --git a/kspell2/client.h b/kspell2/client.h
index f06b760bf..86046e204 100644
--- a/kspell2/client.h
+++ b/kspell2/client.h
@@ -38,7 +38,7 @@ namespace KSpell2
      * I don't really feel like writting my own KLibFactory
      * that would load anything else then TQObject derivatives.
      */
-    class KDE_EXPORT Client : public TQObject
+    class KDE_EXPORT Client : public QObject
     {
         Q_OBJECT
     public:
diff --git a/kspell2/dictionary.h b/kspell2/dictionary.h
index 9f4777f35..31567ece9 100644
--- a/kspell2/dictionary.h
+++ b/kspell2/dictionary.h
@@ -59,7 +59,7 @@ namespace KSpell2
                                       TQStringList& suggestions ) =0;
 
         /**
-         * Stores user defined good tqreplacement for the bad word.
+         * Stores user defined good replacement for the bad word.
          * @returns true on success
          */
         virtual bool storeReplacement( const TQString& bad,
diff --git a/kspell2/filter.cpp b/kspell2/filter.cpp
index 6b62481ad..1604bcae1 100644
--- a/kspell2/filter.cpp
+++ b/kspell2/filter.cpp
@@ -202,7 +202,7 @@ int Filter::currentPosition() const
     return m_currentPosition;
 }
 
-void Filter::tqreplace( const Word& w, const TQString& newWord)
+void Filter::replace( const Word& w, const TQString& newWord)
 {
     int oldLen = w.word.length();
     int newLen = newWord.length();
@@ -213,7 +213,7 @@ void Filter::tqreplace( const Word& w, const TQString& newWord)
             m_currentPosition += len;
         }
     }
-    m_buffer = m_buffer.tqreplace( w.start, oldLen, newWord );
+    m_buffer = m_buffer.replace( w.start, oldLen, newWord );
 }
 
 TQString Filter::context() const
@@ -227,7 +227,7 @@ TQString Filter::context() const
 
     TQString buffer = m_buffer;
     Word word = wordAtPosition( m_currentPosition );
-    buffer = buffer.tqreplace( word.start, word.word.length(),
+    buffer = buffer.replace( word.start, word.word.length(),
                              TQString( "<b>%1</b>" ).arg( word.word ) );
 
     TQString context;
@@ -238,7 +238,7 @@ TQString Filter::context() const
         context = TQString( "...%1..." )
                   .arg( buffer.mid(  m_currentPosition - 20, len ) );
 
-    context = context.tqreplace( '\n', ' ' );
+    context = context.replace( '\n', ' ' );
 
     return context;
 }
diff --git a/kspell2/filter.h b/kspell2/filter.h
index e0f2ba3a0..5e4635493 100644
--- a/kspell2/filter.h
+++ b/kspell2/filter.h
@@ -95,7 +95,7 @@ namespace KSpell2
 
         virtual void setCurrentPosition( int );
         virtual int currentPosition() const;
-        virtual void tqreplace( const Word& w, const TQString& newWord );
+        virtual void replace( const Word& w, const TQString& newWord );
 
         /**
          * Should return the sentence containing the current word
diff --git a/kspell2/plugins/configure.in.bot b/kspell2/plugins/configure.in.bot
index d4e0e407c..e47c874e0 100644
--- a/kspell2/plugins/configure.in.bot
+++ b/kspell2/plugins/configure.in.bot
@@ -1,13 +1,13 @@
 if test -z "$LIBASPELL"; then
    echo ""
-   echo "Your libaspell is too old or not installed, I couldn't tqfind aspell.h."
+   echo "Your libaspell is too old or not installed, I couldn't find aspell.h."
    echo "You must download aspell >= 0.50.2, see http://aspell.net"
    echo "Spell-checking with libaspell will not be available, only with ispell dicts."
    echo ""
 fi
 if test -z "$LIBHSPELL"; then
 echo ""
-echo "The development package of Hspell is not installed, I couldn't tqfind hspell.h."
+echo "The development package of Hspell is not installed, I couldn't find hspell.h."
 echo "Spell-checking Hebrew with libhspell will not be available."
 echo "If you need it, install hspell >= 0.9 from sources"
 echo "see http://www.ivrix.org.il/projects/spell-checker/"
diff --git a/kspell2/plugins/configure.in.in b/kspell2/plugins/configure.in.in
index 16efb6b2f..8aaf6de2c 100644
--- a/kspell2/plugins/configure.in.in
+++ b/kspell2/plugins/configure.in.in
@@ -8,7 +8,7 @@
        KDE_CHECK_HEADER(aspell.h)
        if test -z "$ac_cv_header_aspell_h"; then
            echo ""
-           echo "Your libaspell is too old or not installed, I couldn't tqfind aspell.h."
+           echo "Your libaspell is too old or not installed, I couldn't find aspell.h."
            echo "You must download aspell >= 0.50.2, see http://aspell.net"
            echo "Spell-checking with libaspell will not be available, only with ispell dicts."
            echo ""
diff --git a/kspell2/plugins/ispell/correct.cpp b/kspell2/plugins/ispell/correct.cpp
index 7e52dff2f..65e98fa6d 100644
--- a/kspell2/plugins/ispell/correct.cpp
+++ b/kspell2/plugins/ispell/correct.cpp
@@ -789,9 +789,9 @@ ISpellChecker::save_root_cap (ichar_t *word, ichar_t *pattern,
 #else /* NO_CAPITALIZATION_SUPPORT */
 #define flagsareok(dent)    \
     ((pfxent == NULL \
-	||  TSTMASKBIT (dent->tqmask, pfxent->flagbit)) \
+	||  TSTMASKBIT (dent->mask, pfxent->flagbit)) \
       &&  (sufent == NULL \
-	||  TSTMASKBIT (dent->tqmask, sufent->flagbit)))
+	||  TSTMASKBIT (dent->mask, sufent->flagbit)))
 
     dent = firstdent;
     if ((dent->flagfield & (CAPTYPEMASK | MOREVARIANTS)) == ALLCAPS)
diff --git a/kspell2/plugins/ispell/good.cpp b/kspell2/plugins/ispell/good.cpp
index 1cd3c0dc0..351106d99 100644
--- a/kspell2/plugins/ispell/good.cpp
+++ b/kspell2/plugins/ispell/good.cpp
@@ -145,7 +145,7 @@
  *
  * I've doctored the ispell code pretty extensively here.  It is now
  * warning-free on Win32.  It also *works* on Win32 now, since I
- * tqreplaced all the I/O calls with ANSI standard ones.
+ * replaced all the I/O calls with ANSI standard ones.
  *
  * Revision 1.3  1998/12/28 23:11:30  eric
  *
@@ -161,13 +161,13 @@
  * of this is a hack.
  *
  * 1.  added other/spell to the -I list in config/abi_defs
- * 2.  tqreplaced other/spell/Makefile with one which is more like
+ * 2.  replaced other/spell/Makefile with one which is more like
  * 	our build system.
  * 3.  added other/spell to other/Makefile so that the build will now
  * 	dive down and build the spell check library.
  * 4.  added the AbiSpell library to the Makefiles in wp/main
  * 5.  added a call to SpellCheckInit in wp/main/unix/UnixMain.cpp.
- * 	This call is a HACK and should be tqreplaced with something
+ * 	This call is a HACK and should be replaced with something
  * 	proper later.
  * 6.  added code to fv_View.cpp as follows:
  * 	whenever you double-click on a word, the spell checker
@@ -231,9 +231,9 @@ int		good P ((ichar_t * word, int ignoreflagbits, int allhits,
 */
 static int entryhasaffixes (struct dent *dent, struct success *hit)
 {
-    if (hit->prefix  &&  !TSTMASKBIT (dent->tqmask, hit->prefix->flagbit))
+    if (hit->prefix  &&  !TSTMASKBIT (dent->mask, hit->prefix->flagbit))
 		return 0;
-    if (hit->suffix  &&  !TSTMASKBIT (dent->tqmask, hit->suffix->flagbit))
+    if (hit->suffix  &&  !TSTMASKBIT (dent->mask, hit->suffix->flagbit))
 		return 0;
     return 1;			/* Yes, these affixes are legal */
 }
diff --git a/kspell2/plugins/ispell/hash.cpp b/kspell2/plugins/ispell/hash.cpp
index a072c080a..03bd880bb 100644
--- a/kspell2/plugins/ispell/hash.cpp
+++ b/kspell2/plugins/ispell/hash.cpp
@@ -138,7 +138,7 @@
  *
  * I've doctored the ispell code pretty extensively here.  It is now
  * warning-free on Win32.  It also *works* on Win32 now, since I
- * tqreplaced all the I/O calls with ANSI standard ones.
+ * replaced all the I/O calls with ANSI standard ones.
  *
  * Revision 1.2  1998/12/28 23:11:30  eric
  *
diff --git a/kspell2/plugins/ispell/ispell.h b/kspell2/plugins/ispell/ispell.h
index 01e1aa8a2..587defc07 100644
--- a/kspell2/plugins/ispell/ispell.h
+++ b/kspell2/plugins/ispell/ispell.h
@@ -199,7 +199,7 @@
  *
  * I've doctored the ispell code pretty extensively here.  It is now
  * warning-free on Win32.  It also *works* on Win32 now, since I
- * tqreplaced all the I/O calls with ANSI standard ones.
+ * replaced all the I/O calls with ANSI standard ones.
  *
  * Revision 1.1  1998/12/28 18:04:43  davet
  * Spell checker code stripped from ispell.  At this point, there are
@@ -268,7 +268,7 @@ extern "C" {
 #endif
 
 /*
-** Number of tqmask bits (affix flags) supported.  Must be 32, 64, 128, or
+** Number of mask bits (affix flags) supported.  Must be 32, 64, 128, or
 ** 256.  If MASKBITS is 32 or 64, there are really only 26 or 58 flags
 ** available, respectively.  If it is 32, the flags are named with the
 ** 26 English uppercase letters;  lowercase will be converted to uppercase.
@@ -290,7 +290,7 @@ extern "C" {
 extern int		gnMaskBits;
 
 /*
-** C type to use for tqmasks.  This should be a type that the processor
+** C type to use for masks.  This should be a type that the processor
 ** accesses efficiently.
 **
 ** MASKTYPE_WIDTH must correctly reflect the number of bits in a
@@ -401,11 +401,11 @@ extern int		gnMaskBits;
 #define MASKSIZE	(gnMaskBits / MASKTYPE_WIDTH)
 
 #ifdef lint
-extern int	TSTMASKBIT P ((MASKTYPE * tqmask, int bit));
+extern int	TSTMASKBIT P ((MASKTYPE * mask, int bit));
 #else /* lint */
 /* The following is really testing for MASKSIZE <= 1, but cpp can't do that */
-#define TSTMASKBIT(tqmask, bit) \
-		    ((tqmask)[(bit) / MASKTYPE_WIDTH] & \
+#define TSTMASKBIT(mask, bit) \
+		    ((mask)[(bit) / MASKTYPE_WIDTH] & \
 		      ((MASKTYPE) 1 << ((bit) & (MASKTYPE_WIDTH - 1))))
 #endif /* lint */
 
@@ -466,7 +466,7 @@ struct dent
 {
     struct dent *	next;
     char *			word;
-    MASKTYPE		tqmask[2];
+    MASKTYPE		mask[2];
 #ifdef FULLMASKSET
     char			flags;
 #endif
@@ -474,7 +474,7 @@ struct dent
 
 /*
 ** Flags in the directory entry.  If FULLMASKSET is undefined, these are
-** stored in the highest bits of the last longword of the tqmask field.  If
+** stored in the highest bits of the last longword of the mask field.  If
 ** FULLMASKSET is defined, they are stored in the extra "flags" field.
 #ifndef NO_CAPITALIZATION_SUPPORT
 **
@@ -498,14 +498,14 @@ struct dent
 ** entries for it, linked together by the "next" field.  The initial
 ** entry for such words will be a dummy entry, primarily for use by code
 ** that ignores capitalization.  The "word" field of this entry will
-** again point to an all-uppercase copy of the word.  The "tqmask" field
-** will contain the logical OR of the tqmask fields of all variants.
+** again point to an all-uppercase copy of the word.  The "mask" field
+** will contain the logical OR of the mask fields of all variants.
 ** A header entry is indicated by a capitalization type of ALLCAPS,
 ** with the MOREVARIANTS bit set.
 **
 ** The following entries will define the individual variants.  Each
 ** entry except the last has the MOREVARIANTS flag set, and each
-** tqcontains one of the following capitalization options:
+** contains one of the following capitalization options:
 **
 **	ALLCAPS		The word must appear in all capitals.
 **	CAPITALIZED	The word must be capitalized (e.g., London).
@@ -519,7 +519,7 @@ struct dent
 **	ANYCASE		The word may appear in lowercase, capitalized,
 **			or all-capitals.
 **
-** The "tqmask" field for the entry tqcontains only the affix flag bits that
+** The "mask" field for the entry contains only the affix flag bits that
 ** are legal for that capitalization.  The "word" field will be null
 ** except for FOLLOWCASE entries, where it will point to the
 ** correctly-capitalized spelling of the root word.
@@ -532,7 +532,7 @@ struct dent
 ** that is illegal due to an affix.
 **
 ** Finally, note that variations in the KEEP flag can cause a multiple-variant
-** entry as well.  For example, if the personal dictionary tqcontains "ALPHA",
+** entry as well.  For example, if the personal dictionary contains "ALPHA",
 ** (KEEP flag set) and the user adds "alpha" with the KEEP flag clear, a
 ** multiple-variant entry will be created so that "alpha" will be accepted
 ** but only "ALPHA" will actually be kept.
@@ -541,7 +541,7 @@ struct dent
 #ifdef FULLMASKSET
 #define flagfield	flags
 #else
-#define flagfield	tqmask[1]
+#define flagfield	mask[1]
 #endif
 #define USED		((MASKTYPE) 1 << (FLAGBASE + 0))
 #define KEEP		((MASKTYPE) 1 << (FLAGBASE + 1))
diff --git a/kspell2/plugins/ispell/ispell_checker.cpp b/kspell2/plugins/ispell/ispell_checker.cpp
index 2d96395dc..6b3d382af 100644
--- a/kspell2/plugins/ispell/ispell_checker.cpp
+++ b/kspell2/plugins/ispell/ispell_checker.cpp
@@ -423,7 +423,7 @@ ISpellChecker::setDictionaryEncoding( const TQString& hashname, const char * enc
 	if (m_translate_in)
 		{
 			/* We still have to setup prefstringchar*/
-			prefstringchar = tqfindfiletype("utf8", 1, deftflag < 0 ? &deftflag
+			prefstringchar = findfiletype("utf8", 1, deftflag < 0 ? &deftflag
 						      : static_cast<int *>(NULL));
 
 			if (prefstringchar < 0)
@@ -432,7 +432,7 @@ ISpellChecker::setDictionaryEncoding( const TQString& hashname, const char * enc
 					for(int n1 = 1; n1 <= 15; n1++)
 						{
 							teststring = "latin" + n1;
-							prefstringchar = tqfindfiletype(teststring.c_str(), 1,
+							prefstringchar = findfiletype(teststring.c_str(), 1,
 										      deftflag < 0 ? &deftflag : static_cast<int *>(NULL));
 							if (prefstringchar >= 0)
 								break;
@@ -443,7 +443,7 @@ ISpellChecker::setDictionaryEncoding( const TQString& hashname, const char * enc
 		}
 
 	/* Test for UTF-8 first */
-	prefstringchar = tqfindfiletype("utf8", 1, deftflag < 0 ? &deftflag : static_cast<int *>(NULL));
+	prefstringchar = findfiletype("utf8", 1, deftflag < 0 ? &deftflag : static_cast<int *>(NULL));
 	if (prefstringchar >= 0)
 		{
 			m_translate_in = TQTextCodec::codecForName("utf8");
@@ -459,7 +459,7 @@ ISpellChecker::setDictionaryEncoding( const TQString& hashname, const char * enc
 			for(int n1 = 1; n1 <= 15; n1++)
 				{
 					TQString teststring = TQString("latin%1").arg(n1);
-					prefstringchar = tqfindfiletype(teststring.latin1(), 1,
+					prefstringchar = findfiletype(teststring.latin1(), 1,
 								      deftflag < 0 ? &deftflag : static_cast<int *>(NULL));
 					if (prefstringchar >= 0)
 						{
diff --git a/kspell2/plugins/ispell/ispell_checker.h b/kspell2/plugins/ispell/ispell_checker.h
index 52d8bfd41..08783922a 100644
--- a/kspell2/plugins/ispell/ispell_checker.h
+++ b/kspell2/plugins/ispell/ispell_checker.h
@@ -107,12 +107,12 @@ private:
 	int strtoichar (ichar_t* out, char* in, int outlen, int canonical);
 	int ichartostr (char* out, ichar_t* in, int outlen, int canonical);
 	char * ichartosstr (ichar_t* in, int canonical);
-	int	tqfindfiletype (const char * name, int searchnames, int * deformatter);
+	int	findfiletype (const char * name, int searchnames, int * deformatter);
 	long whatcap (ichar_t* word);
 
 	/*
-		HACK: macros tqreplaced with function implementations
-		so we could do a side-effect-free check for tqunicode
+		HACK: macros replaced with function implementations
+		so we could do a side-effect-free check for unicode
 		characters which aren't in hashheader
 	*/
 	char myupper(ichar_t c);
@@ -167,12 +167,12 @@ private:
 			  struct flagptr * ind, int optflags, struct flagent * pfxent,
 			  int ignoreflagbits, int allhits));
 	int		expand_pre P ((char * croot, ichar_t * rootword,
-			  MASKTYPE tqmask[], int option, char * extra));
+			  MASKTYPE mask[], int option, char * extra));
 	int	pr_pre_expansion P ((char * croot, ichar_t * rootword,
-			  struct flagent * flent, MASKTYPE tqmask[], int option,
+			  struct flagent * flent, MASKTYPE mask[], int option,
 			  char * extra));
 	int		expand_suf P ((char * croot, ichar_t * rootword,
-			  MASKTYPE tqmask[], int optflags, int option, char * extra));
+			  MASKTYPE mask[], int optflags, int option, char * extra));
 	int	pr_suf_expansion P ((char * croot, ichar_t * rootword,
 			  struct flagent * flent, int option, char * extra));
 	void	forcelc P ((ichar_t * dst, int len));
@@ -261,7 +261,7 @@ private:
 					/* ..(defined as those using legal affixes) */
 
 	/*
-	 * The following array tqcontains a list of characters that should be tried
+	 * The following array contains a list of characters that should be tried
 	 * in "missingletter."  Note that lowercase characters are omitted.
 	 */
 	int	m_Trynum;		/* Size of "Try" array */
diff --git a/kspell2/plugins/ispell/lookup.cpp b/kspell2/plugins/ispell/lookup.cpp
index cf49641e6..6030f49d0 100644
--- a/kspell2/plugins/ispell/lookup.cpp
+++ b/kspell2/plugins/ispell/lookup.cpp
@@ -193,7 +193,7 @@
  *
  * I've doctored the ispell code pretty extensively here.  It is now
  * warning-free on Win32.  It also *works* on Win32 now, since I
- * tqreplaced all the I/O calls with ANSI standard ones.
+ * replaced all the I/O calls with ANSI standard ones.
  *
  * Revision 1.3  1998/12/28 23:11:30  eric
  *
@@ -209,13 +209,13 @@
  * of this is a hack.
  *
  * 1.  added other/spell to the -I list in config/abi_defs
- * 2.  tqreplaced other/spell/Makefile with one which is more like
+ * 2.  replaced other/spell/Makefile with one which is more like
  * 	our build system.
  * 3.  added other/spell to other/Makefile so that the build will now
  * 	dive down and build the spell check library.
  * 4.  added the AbiSpell library to the Makefiles in wp/main
  * 5.  added a call to SpellCheckInit in wp/main/unix/UnixMain.cpp.
- * 	This call is a HACK and should be tqreplaced with something
+ * 	This call is a HACK and should be replaced with something
  * 	proper later.
  * 6.  added code to fv_View.cpp as follows:
  * 	whenever you double-click on a word, the spell checker
diff --git a/kspell2/plugins/ispell/makedent.cpp b/kspell2/plugins/ispell/makedent.cpp
index c2d9a1909..9c168dc17 100644
--- a/kspell2/plugins/ispell/makedent.cpp
+++ b/kspell2/plugins/ispell/makedent.cpp
@@ -162,13 +162,13 @@
  *
  * I've doctored the ispell code pretty extensively here.  It is now
  * warning-free on Win32.  It also *works* on Win32 now, since I
- * tqreplaced all the I/O calls with ANSI standard ones.
+ * replaced all the I/O calls with ANSI standard ones.
  *
  * Revision 1.3  1998/12/29 14:55:33  eric
  *
  * I've doctored the ispell code pretty extensively here.  It is now
  * warning-free on Win32.  It also *works* on Win32 now, since I
- * tqreplaced all the I/O calls with ANSI standard ones.
+ * replaced all the I/O calls with ANSI standard ones.
  *
  * Revision 1.2  1998/12/28 23:11:30  eric
  *
@@ -361,7 +361,7 @@ int ISpellChecker::addvheader ( struct dent *dp)
 ** If 1 is returned, newp->word may have been be freed using myfree.
 **
 ** Life is made much more difficult by the KEEP flag's possibilities.  We
-** must ensure that a !KEEP word doesn't tqfind its way into the personal
+** must ensure that a !KEEP word doesn't find its way into the personal
 ** dictionary as a result of this routine's actions.  However, a !KEEP
 ** word that has affixes must have come from the main dictionary, so it
 ** is acceptable to combine entries in that case (got that?).
@@ -370,7 +370,7 @@ int ISpellChecker::addvheader ( struct dent *dp)
 ** to figure out.  Basically, we want to choose one of the following actions:
 **
 **	(1) Add newp's affixes and KEEP flag to oldp, and discard newp.
-**	(2) Add oldp's affixes and KEEP flag to newp, tqreplace oldp with
+**	(2) Add oldp's affixes and KEEP flag to newp, replace oldp with
 **	    newp, and discard newp.
 #ifndef NO_CAPITALIZATION_SUPPORT
 **	(3) Insert newp as a new entry in the variants list.  If there is
@@ -858,7 +858,7 @@ icharncmp (ichar_t *s1, ichar_t *s2, int n)
  * \return
  */
 int
-ISpellChecker::tqfindfiletype (const char *name, int searchnames, int *deformatter)
+ISpellChecker::findfiletype (const char *name, int searchnames, int *deformatter)
 {
     char *		cp;		/* Pointer into suffix list */
     int			cplen;		/* Length of current suffix */
@@ -902,8 +902,8 @@ ISpellChecker::tqfindfiletype (const char *name, int searchnames, int *deformatt
 }
 
 /*
-	HACK: macros tqreplaced with function implementations 
-	so we could do a side-effect-free check for tqunicode
+	HACK: macros replaced with function implementations 
+	so we could do a side-effect-free check for unicode
 	characters which aren't in hashheader
 
 	TODO: this is just a workaround to keep us from crashing. 
diff --git a/kspell2/plugins/ispell/msgs.h b/kspell2/plugins/ispell/msgs.h
index 11fd3e636..e3f30220c 100644
--- a/kspell2/plugins/ispell/msgs.h
+++ b/kspell2/plugins/ispell/msgs.h
@@ -72,7 +72,7 @@
 /*
  * Messages header file.
  *
- * This file tqcontains all text strings that are written by any of the
+ * This file contains all text strings that are written by any of the
  * C programs in the ispell package.  The strings are collected here so that
  * you can have the option of translating them into your local language for
  * the benefit of your users.
@@ -120,7 +120,7 @@
  * The code resembles the ispell code as much as possible still.
  *
  * Revision 1.31  1994/12/27  23:08:57  geoff
- * Add a message to be issued if a word tqcontains illegal characters.
+ * Add a message to be issued if a word contains illegal characters.
  *
  * Revision 1.30  1994/10/25  05:46:40  geoff
  * Improve a couple of error messages relating to affix flags.
@@ -167,7 +167,7 @@
   "    Warning:  this language table may exceed the maximum total affix length\nof %d by up to %d bytes.  You should either increase MAXAFFIXLEN in config.X\nor shorten your largest affix/strip string difference.  (This is the\n", \
 				  max, excess
 #define BHASH_C_BAFF_2 \
-  "difference between the affix length and the strip length in a given\ntqreplacement rule, or the affix length if there is no strip string\nin that rule.)\n"
+  "difference between the affix length and the strip length in a given\nreplacement rule, or the affix length if there is no strip string\nin that rule.)\n"
 #define BHASH_C_OVERFLOW	"Hash table overflowed by %d words\n"
 #define BHASH_C_CANT_OPEN_DICT "Can't open dictionary\n"
 #define BHASH_C_NO_SPACE	"Couldn't allocate hash table\n"
@@ -181,7 +181,7 @@
  */
 #define CORR_C_HELP_1		"Whenever a word is found that is not in the dictionary,\r\n"
 #define CORR_C_HELP_2		"it is printed on the first line of the screen.  If the dictionary\r\n"
-#define CORR_C_HELP_3		"tqcontains any similar words, they are listed with a number\r\n"
+#define CORR_C_HELP_3		"contains any similar words, they are listed with a number\r\n"
 #define CORR_C_HELP_4		"next to each one.  You have the option of replacing the word\r\n"
 #define CORR_C_HELP_5		"completely, or choosing one of the suggested words.\r\n"
     /* You may add HELP_6 through HELP_9 if your language needs more lines */
@@ -274,7 +274,7 @@
  * The following strings are used in makedent.c:
  */
 #define MAKEDENT_C_NO_WORD_SPACE "\r\nCouldn't allocate space for word '%s'\r\n"
-#define MAKEDENT_C_BAD_WORD_CHAR "\r\nWord '%s' tqcontains illegal characters\r\n"
+#define MAKEDENT_C_BAD_WORD_CHAR "\r\nWord '%s' contains illegal characters\r\n"
 
 /*
  * The following strings are used in parse.y:
diff --git a/kspell2/plugins/ispell/tgood.cpp b/kspell2/plugins/ispell/tgood.cpp
index 58c3efcfa..06fbc99ef 100644
--- a/kspell2/plugins/ispell/tgood.cpp
+++ b/kspell2/plugins/ispell/tgood.cpp
@@ -153,13 +153,13 @@
  *
  * I've doctored the ispell code pretty extensively here.  It is now
  * warning-free on Win32.  It also *works* on Win32 now, since I
- * tqreplaced all the I/O calls with ANSI standard ones.
+ * replaced all the I/O calls with ANSI standard ones.
  *
  * Revision 1.4  1998/12/29 14:55:33  eric
  *
  * I've doctored the ispell code pretty extensively here.  It is now
  * warning-free on Win32.  It also *works* on Win32 now, since I
- * tqreplaced all the I/O calls with ANSI standard ones.
+ * replaced all the I/O calls with ANSI standard ones.
  *
  * Revision 1.3  1998/12/28 23:11:30  eric
  *
@@ -175,13 +175,13 @@
  * of this is a hack.
  *
  * 1.  added other/spell to the -I list in config/abi_defs
- * 2.  tqreplaced other/spell/Makefile with one which is more like
+ * 2.  replaced other/spell/Makefile with one which is more like
  * 	our build system.
  * 3.  added other/spell to other/Makefile so that the build will now
  * 	dive down and build the spell check library.
  * 4.  added the AbiSpell library to the Makefiles in wp/main
  * 5.  added a call to SpellCheckInit in wp/main/unix/UnixMain.cpp.
- * 	This call is a HACK and should be tqreplaced with something
+ * 	This call is a HACK and should be replaced with something
  * 	proper later.
  * 6.  added code to fv_View.cpp as follows:
  * 	whenever you double-click on a word, the spell checker
@@ -325,7 +325,7 @@ void ISpellChecker::pfx_list_chk (ichar_t *word, ichar_t *ucword, int len, int o
 		  &&  tlen + flent->stripl >= flent->numconds)
 		{
 			/*
-			 * The prefix matches.  Remove it, tqreplace it by the "strip"
+			 * The prefix matches.  Remove it, replace it by the "strip"
 			 * string (if any), and check the original conditions.
 			 */
 			if (flent->stripl)
@@ -367,7 +367,7 @@ void ISpellChecker::pfx_list_chk (ichar_t *word, ichar_t *ucword, int len, int o
 					}
 				}
 				else if ((dent = ispell_lookup (tword, 1)) != NULL
-				  &&  TSTMASKBIT (dent->tqmask, flent->flagbit))
+				  &&  TSTMASKBIT (dent->mask, flent->flagbit))
 				{
 					if (m_numhits < MAX_HITS)
 					{
@@ -495,7 +495,7 @@ void ISpellChecker::suf_list_chk (ichar_t *word, ichar_t *ucword,
 		  &&  tlen + flent->stripl >= flent->numconds)
 		{
 			/*
-			 * The suffix matches.  Remove it, tqreplace it by the "strip"
+			 * The suffix matches.  Remove it, replace it by the "strip"
 			 * string (if any), and check the original conditions.
 			 */
 			icharcpy (tword, ucword);
@@ -556,9 +556,9 @@ void ISpellChecker::suf_list_chk (ichar_t *word, ichar_t *ucword,
 					}
 				}
 				else if ((dent = ispell_lookup (tword, 1)) != NULL
-				  &&  TSTMASKBIT (dent->tqmask, flent->flagbit)
+				  &&  TSTMASKBIT (dent->mask, flent->flagbit)
 				  &&  ((optflags & FF_CROSSPRODUCT) == 0
-					|| TSTMASKBIT (dent->tqmask, pfxent->flagbit)))
+					|| TSTMASKBIT (dent->mask, pfxent->flagbit)))
 				{
 					if (m_numhits < MAX_HITS)
 					{
@@ -588,13 +588,13 @@ void ISpellChecker::suf_list_chk (ichar_t *word, ichar_t *ucword,
  *
  * \param croot Char version of rootword
  * \param rootword Root word to expand
- * \param tqmask Mask bits to expand on
+ * \param mask Mask bits to expand on
  * \param option Option, see expandmode
  * \param extra Extra info to add to line
  *
  * \return
  */
-int ISpellChecker::expand_pre (char *croot, ichar_t *rootword, MASKTYPE tqmask[], 
+int ISpellChecker::expand_pre (char *croot, ichar_t *rootword, MASKTYPE mask[], 
 				int option, char *extra)
 {
     int				entcount;	/* No. of entries to process */
@@ -606,9 +606,9 @@ int ISpellChecker::expand_pre (char *croot, ichar_t *rootword, MASKTYPE tqmask[]
       entcount > 0;
       flent++, entcount--)
 	{
-		if (TSTMASKBIT (tqmask, flent->flagbit))
+		if (TSTMASKBIT (mask, flent->flagbit))
 			explength +=
-			  pr_pre_expansion (croot, rootword, flent, tqmask, option, extra);
+			  pr_pre_expansion (croot, rootword, flent, mask, option, extra);
 	}
     return explength;
 }
@@ -619,14 +619,14 @@ int ISpellChecker::expand_pre (char *croot, ichar_t *rootword, MASKTYPE tqmask[]
  * \param croot Char version of rootword
  * \param rootword Root word to expand
  * \param flent Current table entry
- * \param tqmask Mask bits to expand on
+ * \param mask Mask bits to expand on
  * \param option Option, see	expandmode
  * \param extra Extra info to add to line
  *
  * \return
  */
 int ISpellChecker::pr_pre_expansion ( char *croot, ichar_t *rootword, 
-							struct flagent *flent, MASKTYPE tqmask[], int option, 
+							struct flagent *flent, MASKTYPE mask[], int option, 
 							char *extra)
 {
     int				cond;		/* Current condition number */
@@ -706,7 +706,7 @@ int ISpellChecker::pr_pre_expansion ( char *croot, ichar_t *rootword,
 		printf (" %s%s", ichartosstr (tword, 1), extra);
     if (flent->flagflags & FF_CROSSPRODUCT)
 		return tlen
-		  + expand_suf (croot, tword, tqmask, FF_CROSSPRODUCT, option, extra);
+		  + expand_suf (croot, tword, mask, FF_CROSSPRODUCT, option, extra);
     else
 		return tlen;
 }
@@ -716,14 +716,14 @@ int ISpellChecker::pr_pre_expansion ( char *croot, ichar_t *rootword,
  *
  * \param croot Char version of rootword
  * \param rootword Root word to expand 
- * \param tqmask Mask bits to expand on
+ * \param mask Mask bits to expand on
  * \param optflags Affix option flags
  * \param option Option, see expandmode
  * \param extra Extra info to add to line
  *
  * \return
  */
-int ISpellChecker::expand_suf (char *croot, ichar_t *rootword, MASKTYPE tqmask[], 
+int ISpellChecker::expand_suf (char *croot, ichar_t *rootword, MASKTYPE mask[], 
 				int optflags, int option, char *extra)
 {
     int				entcount;	/* No. of entries to process */
@@ -735,7 +735,7 @@ int ISpellChecker::expand_suf (char *croot, ichar_t *rootword, MASKTYPE tqmask[]
       entcount > 0;
       flent++, entcount--)
 	{
-		if (TSTMASKBIT (tqmask, flent->flagbit))
+		if (TSTMASKBIT (mask, flent->flagbit))
 		{
 			if ((optflags & FF_CROSSPRODUCT) == 0
 			  ||  (flent->flagflags & FF_CROSSPRODUCT))
diff --git a/kspell2/settings.cpp b/kspell2/settings.cpp
index c220520e6..664ae24e0 100644
--- a/kspell2/settings.cpp
+++ b/kspell2/settings.cpp
@@ -75,7 +75,7 @@ KSharedConfig *Settings::sharedConfig() const
 void Settings::setDefaultLanguage( const TQString& lang )
 {
     TQStringList cs = d->broker->languages();
-    if ( cs.tqfind( lang ) != cs.end() &&
+    if ( cs.find( lang ) != cs.end() &&
          d->defaultLanguage != lang ) {
         d->defaultLanguage = lang;
         readIgnoreList();
@@ -94,7 +94,7 @@ void Settings::setDefaultClient( const TQString& client )
     //Different from setDefaultLanguage because
     //the number of clients can't be even close
     //as big as the number of languages
-    if ( d->broker->clients().tqcontains( client ) ) {
+    if ( d->broker->clients().contains( client ) ) {
         d->defaultClient = client;
         d->modified = true;
         d->broker->changed();
@@ -167,7 +167,7 @@ TQStringList Settings::currentIgnoreList() const
 
 void Settings::addWordToIgnore( const TQString& word )
 {
-    if ( !d->ignore.tqcontains( word ) ) {
+    if ( !d->ignore.contains( word ) ) {
         d->modified = true;
         d->ignore.insert( word, true );
     }
@@ -175,7 +175,7 @@ void Settings::addWordToIgnore( const TQString& word )
 
 bool Settings::ignore( const TQString& word )
 {
-    return d->ignore.tqcontains( word );
+    return d->ignore.contains( word );
 }
 
 void Settings::readIgnoreList()
diff --git a/kspell2/tests/backgroundtest.h b/kspell2/tests/backgroundtest.h
index 2f08e9ce0..fcdf9db55 100644
--- a/kspell2/tests/backgroundtest.h
+++ b/kspell2/tests/backgroundtest.h
@@ -26,7 +26,7 @@
 
 #include "backgroundchecker.h"
 
-class BackgroundTest : public TQObject
+class BackgroundTest : public QObject
 {
     Q_OBJECT
 public:
diff --git a/kspell2/tests/test_dialog.cpp b/kspell2/tests/test_dialog.cpp
index bc5d808a8..f0ee1ab3b 100644
--- a/kspell2/tests/test_dialog.cpp
+++ b/kspell2/tests/test_dialog.cpp
@@ -49,7 +49,7 @@ void TestDialog::check( const TQString& buffer )
 void TestDialog::doneChecking( const TQString& buf )
 {
     kdDebug()<<"Done with :"<<buf<<endl;
-    tqApp->quit();
+    qApp->quit();
 }
 
 int main( int argc, char** argv )
diff --git a/kspell2/tests/test_dialog.h b/kspell2/tests/test_dialog.h
index e8a6cf970..5ef2dd189 100644
--- a/kspell2/tests/test_dialog.h
+++ b/kspell2/tests/test_dialog.h
@@ -26,7 +26,7 @@
 
 #include <tqobject.h>
 
-class TestDialog : public TQObject
+class TestDialog : public QObject
 {
     Q_OBJECT
 public:
diff --git a/kspell2/ui/configui.ui b/kspell2/ui/configui.ui
index 9ab8f8e62..bf645b9c9 100644
--- a/kspell2/ui/configui.ui
+++ b/kspell2/ui/configui.ui
@@ -6,7 +6,7 @@
     <property name="name">
         <cstring>KSpell2ConfigUI</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -105,7 +105,7 @@
     <include location="global" impldecl="in implementation">keditlistbox.h</include>
     <include location="global" impldecl="in implementation">kcombobox.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>keditlistbox.h</includehint>
diff --git a/kspell2/ui/configwidget.cpp b/kspell2/ui/configwidget.cpp
index 65db6dd9d..6d98955ae 100644
--- a/kspell2/ui/configwidget.cpp
+++ b/kspell2/ui/configwidget.cpp
@@ -56,7 +56,7 @@ void ConfigWidget::init( Broker *broker )
     d = new Private;
     d->broker = broker;
 
-    TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, 0, "KSpell2ConfigUILayout");
+    TQVBoxLayout *layout = new TQVBoxLayout( this, 0, 0, "KSpell2ConfigUILayout");
     d->ui = new KSpell2ConfigUI( this );
 
     TQStringList langs = d->broker->languages();
@@ -73,7 +73,7 @@ void ConfigWidget::init( Broker *broker )
     d->ui->m_bgSpellCB->hide();//hidden by default
     connect( d->ui->m_ignoreListBox, TQT_SIGNAL(changed()), TQT_SLOT(slotChanged()) );
 
-    tqlayout->addWidget( d->ui );
+    layout->addWidget( d->ui );
 }
 
 void KSpell2::ConfigWidget::save()
diff --git a/kspell2/ui/dialog.cpp b/kspell2/ui/dialog.cpp
index 18641a986..93b81fd94 100644
--- a/kspell2/ui/dialog.cpp
+++ b/kspell2/ui/dialog.cpp
@@ -53,7 +53,7 @@ public:
     BackgroundChecker *checker;
 
     Word   currentWord;
-    TQMap<TQString, TQString> tqreplaceAllMap;
+    TQMap<TQString, TQString> replaceAllMap;
 };
 
 Dialog::Dialog( BackgroundChecker *checker,
@@ -81,9 +81,9 @@ void Dialog::initConnections()
 {
     connect( d->ui->m_addBtn, TQT_SIGNAL(clicked()),
              TQT_SLOT(slotAddWord()) );
-    connect( d->ui->m_tqreplaceBtn, TQT_SIGNAL(clicked()),
+    connect( d->ui->m_replaceBtn, TQT_SIGNAL(clicked()),
              TQT_SLOT(slotReplaceWord()) );
-    connect( d->ui->m_tqreplaceAllBtn, TQT_SIGNAL(clicked()),
+    connect( d->ui->m_replaceAllBtn, TQT_SIGNAL(clicked()),
              TQT_SLOT(slotReplaceAll()) );
     connect( d->ui->m_skipBtn, TQT_SIGNAL(clicked()),
              TQT_SLOT(slotSkip()) );
@@ -105,7 +105,7 @@ void Dialog::initConnections()
              TQT_SLOT( slotReplaceWord() ) );
     connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotFinished()) );
     connect( this, TQT_SIGNAL(cancelClicked()),this, TQT_SLOT(slotCancel()) );
-    connect( d->ui->m_tqreplacement, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotReplaceWord()) );
+    connect( d->ui->m_replacement, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotReplaceWord()) );
     connect( d->ui->m_autoCorrect, TQT_SIGNAL(clicked()),
              TQT_SLOT(slotAutocorrect()) );
     // button use by kword/kpresenter
@@ -139,7 +139,7 @@ void Dialog::activeAutoCorrect( bool _active )
 void Dialog::slotAutocorrect()
 {
     kdDebug()<<"void Dialog::slotAutocorrect()\n";
-    emit autoCorrect(d->currentWord.word, d->ui->m_tqreplacement->text() );
+    emit autoCorrect(d->currentWord.word, d->ui->m_replacement->text() );
     slotReplaceWord();
 }
 
@@ -185,7 +185,7 @@ void Dialog::updateDialog( const TQString& word )
     d->ui->m_unknownWord->setText( word );
     d->ui->m_contextLabel->setText( d->checker->filter()->context() );
     TQStringList suggs = d->checker->suggest( word );
-    d->ui->m_tqreplacement->setText( suggs.first() );
+    d->ui->m_replacement->setText( suggs.first() );
     fillSuggestions( suggs );
 }
 
@@ -206,16 +206,16 @@ void Dialog::slotAddWord()
 
 void Dialog::slotReplaceWord()
 {
-    emit tqreplace( d->currentWord.word, d->currentWord.start,
-                  d->ui->m_tqreplacement->text() );
-    d->checker->filter()->tqreplace( d->currentWord, d->ui->m_tqreplacement->text() );
+    emit replace( d->currentWord.word, d->currentWord.start,
+                  d->ui->m_replacement->text() );
+    d->checker->filter()->replace( d->currentWord, d->ui->m_replacement->text() );
     d->checker->continueChecking();
 }
 
 void Dialog::slotReplaceAll()
 {
-    d->tqreplaceAllMap.insert( d->currentWord.word,
-                             d->ui->m_tqreplacement->text() );
+    d->replaceAllMap.insert( d->currentWord.word,
+                             d->ui->m_replacement->text() );
     slotReplaceWord();
 }
 
@@ -227,13 +227,13 @@ void Dialog::slotSkip()
 void Dialog::slotSkipAll()
 {
     //### do we want that or should we have a d->ignoreAll list?
-    d->checker->broker()->settings()->addWordToIgnore( d->ui->m_tqreplacement->text() );
+    d->checker->broker()->settings()->addWordToIgnore( d->ui->m_replacement->text() );
     d->checker->continueChecking();
 }
 
 void Dialog::slotSuggest()
 {
-    TQStringList suggs = d->checker->suggest( d->ui->m_tqreplacement->text() );
+    TQStringList suggs = d->checker->suggest( d->ui->m_replacement->text() );
     fillSuggestions( suggs );
 }
 
@@ -245,7 +245,7 @@ void Dialog::slotChangeLanguage( const TQString& lang )
 
 void Dialog::slotSelectionChanged( TQListViewItem *item )
 {
-    d->ui->m_tqreplacement->setText( item->text( 0 ) );
+    d->ui->m_replacement->setText( item->text( 0 ) );
 }
 
 void Dialog::fillSuggestions( const TQStringList& suggs )
@@ -261,8 +261,8 @@ void Dialog::slotMisspelling(const TQString& word, int start )
 {
     kdDebug()<<"Dialog misspelling!!"<<endl;
     d->currentWord = Word( word, start );
-    if ( d->tqreplaceAllMap.tqcontains( word ) ) {
-        d->ui->m_tqreplacement->setText( d->tqreplaceAllMap[ word ] );
+    if ( d->replaceAllMap.contains( word ) ) {
+        d->ui->m_replacement->setText( d->replaceAllMap[ word ] );
         slotReplaceWord();
     } else {
         updateDialog( word );
diff --git a/kspell2/ui/dialog.h b/kspell2/ui/dialog.h
index cee715b48..1da714c7c 100644
--- a/kspell2/ui/dialog.h
+++ b/kspell2/ui/dialog.h
@@ -49,12 +49,12 @@ namespace KSpell2
     signals:
         void done( const TQString& newBuffer );
         void misspelling( const TQString& word, int start );
-        void tqreplace( const TQString& oldWord, int start,
+        void replace( const TQString& oldWord, int start,
                       const TQString& newWord );
 
         void stop();
         void cancel();
-        void autoCorrect( const TQString & currentWord, const TQString & tqreplaceWord );
+        void autoCorrect( const TQString & currentWord, const TQString & replaceWord );
     private slots:
         void slotMisspelling(const TQString& word, int start );
         void slotDone();
diff --git a/kspell2/ui/highlighter.cpp b/kspell2/ui/highlighter.cpp
index a3c33d7ae..2d185462d 100644
--- a/kspell2/ui/highlighter.cpp
+++ b/kspell2/ui/highlighter.cpp
@@ -110,7 +110,7 @@ TQString Highlighter::currentLanguage() const
 
 void Highlighter::setCurrentLanguage( const TQString& lang )
 {
-    if ( !d->dictCache.tqfind( lang ) ) {
+    if ( !d->dictCache.find( lang ) ) {
         Dictionary *dict = d->broker->dictionary( lang );
         if ( dict ) {
             d->dictCache.insert( lang, dict );
diff --git a/kspell2/ui/kspell2ui.ui b/kspell2/ui/kspell2ui.ui
index 1822ef4b9..b8870f2f5 100644
--- a/kspell2/ui/kspell2ui.ui
+++ b/kspell2/ui/kspell2ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>KSpell2UI</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>430</width>
             <height>300</height>
@@ -40,7 +40,7 @@
             <property name="whatsThis" stdset="0">
                 <string>&lt;qt&gt;&lt;p&gt;This word was considered to be an "unknown word" because it does not match any entry in the dictionary currently in use. It may also be a word in a foreign language.&lt;/p&gt;
 &lt;p&gt;If the word is not misspelled, you may add it to the dictionary by clicking &lt;b&gt;Add to Dictionary&lt;/b&gt;. If you don't want to add the unknown word to the dictionary, but you want to leave it unchanged, click &lt;b&gt;Ignore&lt;/b&gt; or &lt;b&gt;Ignore All&lt;/b&gt;.&lt;/p&gt;
-&lt;p&gt;However, if the word is misspelled, you can try to tqfind the correct tqreplacement in the list below. If you cannot tqfind a tqreplacement there, you may type it in the text box below, and click &lt;b&gt;Replace&lt;/b&gt; or &lt;b&gt;Replace All&lt;/b&gt;.&lt;/p&gt;
+&lt;p&gt;However, if the word is misspelled, you can try to find the correct replacement in the list below. If you cannot find a replacement there, you may type it in the text box below, and click &lt;b&gt;Replace&lt;/b&gt; or &lt;b&gt;Replace All&lt;/b&gt;.&lt;/p&gt;
 &lt;/qt&gt;</string>
             </property>
         </widget>
@@ -57,7 +57,7 @@
             <property name="whatsThis" stdset="0">
                 <string>&lt;qt&gt;&lt;p&gt;This word was considered to be an "unknown word" because it does not match any entry in the dictionary currently in use. It may also be a word in a foreign language.&lt;/p&gt;
 &lt;p&gt;If the word is not misspelled, you may add it to the dictionary by clicking &lt;b&gt;Add to Dictionary&lt;/b&gt;. If you don't want to add the unknown word to the dictionary, but you want to leave it unchanged, click &lt;b&gt;Ignore&lt;/b&gt; or &lt;b&gt;Ignore All&lt;/b&gt;.&lt;/p&gt;
-&lt;p&gt;However, if the word is misspelled, you can try to tqfind the correct tqreplacement in the list below. If you cannot tqfind a tqreplacement there, you may type it in the text box below, and click &lt;b&gt;Replace&lt;/b&gt; or &lt;b&gt;Replace All&lt;/b&gt;.&lt;/p&gt;
+&lt;p&gt;However, if the word is misspelled, you can try to find the correct replacement in the list below. If you cannot find a replacement there, you may type it in the text box below, and click &lt;b&gt;Replace&lt;/b&gt; or &lt;b&gt;Replace All&lt;/b&gt;.&lt;/p&gt;
 &lt;/qt&gt;</string>
             </property>
         </widget>
@@ -87,7 +87,7 @@
             <property name="text">
                 <string>... the &lt;b&gt;misspelled&lt;/b&gt; word shown in context ...</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignCenter</set>
             </property>
             <property name="toolTip" stdset="0">
@@ -95,7 +95,7 @@
             </property>
             <property name="whatsThis" stdset="0">
                 <string>&lt;qt&gt;
-&lt;p&gt;Here you can see a text excerpt showing the unknown word in its context. If this information is not sufficient to choose the best tqreplacement for the unknown word, you can click on the document you are proofing, read a larger part of the text and then return here to continue proofing.&lt;/p&gt;
+&lt;p&gt;Here you can see a text excerpt showing the unknown word in its context. If this information is not sufficient to choose the best replacement for the unknown word, you can click on the document you are proofing, read a larger part of the text and then return here to continue proofing.&lt;/p&gt;
 &lt;/qt&gt;</string>
             </property>
         </widget>
@@ -123,7 +123,7 @@ Click here if you consider that the unknown word is not misspelled and you want
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>74</width>
                     <height>20</height>
@@ -153,7 +153,7 @@ Click here if you consider that the unknown word is not misspelled and you want
             </property>
             <property name="whatsThis" stdset="0">
                 <string>&lt;qt&gt;
-&lt;p&gt;If the unknown word is misspelled, you should check if the correction for it is available and if it is, click on it. If none of the words in this list is a good tqreplacement you may type the correct word in the edit box above.&lt;/p&gt;
+&lt;p&gt;If the unknown word is misspelled, you should check if the correction for it is available and if it is, click on it. If none of the words in this list is a good replacement you may type the correct word in the edit box above.&lt;/p&gt;
 &lt;p&gt;To correct this word click &lt;b&gt;Replace&lt;/b&gt; if you want to correct only this occurrence or &lt;b&gt;Replace All&lt;/b&gt; if you want to correct all occurrences.&lt;/p&gt;
 &lt;/qt&gt;</string>
             </property>
@@ -166,7 +166,7 @@ Click here if you consider that the unknown word is not misspelled and you want
                 <string>Replace &amp;with:</string>
             </property>
             <property name="buddy" stdset="0">
-                <cstring>m_tqreplacement</cstring>
+                <cstring>m_replacement</cstring>
             </property>
             <property name="whatsThis" stdset="0">
                 <string>&lt;qt&gt;
@@ -177,7 +177,7 @@ Click here if you consider that the unknown word is not misspelled and you want
         </widget>
         <widget class="QLineEdit" row="2" column="2" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>m_tqreplacement</cstring>
+                <cstring>m_replacement</cstring>
             </property>
             <property name="whatsThis" stdset="0">
                 <string>&lt;qt&gt;
@@ -206,7 +206,7 @@ Click here if you consider that the unknown word is not misspelled and you want
         </widget>
         <widget class="QLayoutWidget" row="2" column="5" rowspan="3" colspan="1">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -222,27 +222,27 @@ Click here if you consider that the unknown word is not misspelled and you want
                 </widget>
                 <widget class="QPushButton">
                     <property name="name">
-                        <cstring>m_tqreplaceBtn</cstring>
+                        <cstring>m_replaceBtn</cstring>
                     </property>
                     <property name="text">
                         <string>&amp;Replace</string>
                     </property>
                     <property name="whatsThis" stdset="0">
                         <string>&lt;qt&gt;
-&lt;p&gt;Click here to tqreplace this occurrence of the unknown text with the text in the edit box above (to the left).&lt;/p&gt;
+&lt;p&gt;Click here to replace this occurrence of the unknown text with the text in the edit box above (to the left).&lt;/p&gt;
 &lt;/qt&gt;</string>
                     </property>
                 </widget>
                 <widget class="QPushButton">
                     <property name="name">
-                        <cstring>m_tqreplaceAllBtn</cstring>
+                        <cstring>m_replaceAllBtn</cstring>
                     </property>
                     <property name="text">
                         <string>R&amp;eplace All</string>
                     </property>
                     <property name="whatsThis" stdset="0">
                         <string>&lt;qt&gt;
-&lt;p&gt;Click here to tqreplace all occurrences of the unknown text with the text in the edit box above (to the left).&lt;/p&gt;
+&lt;p&gt;Click here to replace all occurrences of the unknown text with the text in the edit box above (to the left).&lt;/p&gt;
 &lt;/qt&gt;</string>
                     </property>
                 </widget>
@@ -298,7 +298,7 @@ Click here if you consider that the unknown word is not misspelled and you want
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -311,14 +311,14 @@ Click here if you consider that the unknown word is not misspelled and you want
 </widget>
 <tabstops>
     <tabstop>m_addBtn</tabstop>
-    <tabstop>m_tqreplacement</tabstop>
+    <tabstop>m_replacement</tabstop>
     <tabstop>m_suggestBtn</tabstop>
-    <tabstop>m_tqreplaceBtn</tabstop>
-    <tabstop>m_tqreplaceAllBtn</tabstop>
+    <tabstop>m_replaceBtn</tabstop>
+    <tabstop>m_replaceAllBtn</tabstop>
     <tabstop>m_skipBtn</tabstop>
     <tabstop>m_skipAllBtn</tabstop>
     <tabstop>m_suggestions</tabstop>
     <tabstop>m_language</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kstyles/highcolor/bitmaps.h b/kstyles/highcolor/bitmaps.h
index 807eae3e0..43e96bd8e 100644
--- a/kstyles/highcolor/bitmaps.h
+++ b/kstyles/highcolor/bitmaps.h
@@ -22,7 +22,7 @@ static const unsigned char radiooff_center_bits[] = {
    0xfc, 0x07, 0xfc, 0x07, 0xfc, 0x07, 0xf8, 0x03, 0xf0, 0x01, 0x00, 0x00,
    0x00, 0x00};
 
-static const unsigned char radiotqmask_bits[] = {
+static const unsigned char radiomask_bits[] = {
    0xf0, 0x01, 0xfc, 0x07, 0xfe, 0x0b, 0xfe, 0x0b, 0xff, 0x17, 0xff, 0x17,
    0xff, 0x17, 0xff, 0x17, 0xff, 0x17, 0xfe, 0x0b, 0xf2, 0x09, 0x0c, 0x06,
    0xf0, 0x01};
diff --git a/kstyles/highcolor/highcolor.cpp b/kstyles/highcolor/highcolor.cpp
index cb485f85c..a3a520f84 100644
--- a/kstyles/highcolor/highcolor.cpp
+++ b/kstyles/highcolor/highcolor.cpp
@@ -84,7 +84,7 @@ static TQBitmap lightBmp;
 static TQBitmap grayBmp;
 static TQBitmap dgrayBmp;
 static TQBitmap centerBmp;
-static TQBitmap tqmaskBmp;
+static TQBitmap maskBmp;
 static TQBitmap xBmp;
 static TQIntDict<GradientSet> gDict;
 
@@ -242,7 +242,7 @@ void HighColorStyle::renderMenuBlendPixmap( KPixmap& pix, const TQColorGroup &cg
 }
 
 
-// This function draws primitive elements as well as their tqmasks.
+// This function draws primitive elements as well as their masks.
 void HighColorStyle::drawPrimitive( PrimitiveElement pe,
 									TQPainter *p,
 									const TQRect &r,
@@ -709,16 +709,16 @@ void HighColorStyle::drawPrimitive( PrimitiveElement pe,
 		}
 
 
-		// RADIOBUTTON (exclusive indicator) tqmask
+		// RADIOBUTTON (exclusive indicator) mask
 		// -------------------------------------------------------------------
 		case PE_ExclusiveIndicatorMask: {
-			if (tqmaskBmp.isNull()) {
-				tqmaskBmp = TQBitmap(13, 13, radiotqmask_bits, true);
-				tqmaskBmp.setMask(tqmaskBmp);
+			if (maskBmp.isNull()) {
+				maskBmp = TQBitmap(13, 13, radiomask_bits, true);
+				maskBmp.setMask(maskBmp);
 			}
 				
 			p->setPen(Qt::color1);
-			p->drawPixmap(r.x(), r.y(), tqmaskBmp);
+			p->drawPixmap(r.x(), r.y(), maskBmp);
 			break;
 		}
 
@@ -760,7 +760,7 @@ void HighColorStyle::drawPrimitive( PrimitiveElement pe,
 		case PE_WindowFrame:
 		case PE_PanelLineEdit: {
 			bool sunken  = flags & Style_Sunken;
-			int lw = opt.isDefault() ? tqpixelMetric(PM_DefaultFrameWidth)
+			int lw = opt.isDefault() ? pixelMetric(PM_DefaultFrameWidth)
 										: opt.lineWidth();
 			if (lw == 2)
 			{
@@ -795,7 +795,7 @@ void HighColorStyle::drawPrimitive( PrimitiveElement pe,
 		case PE_PanelDockWindow: {		// Toolbar
 			int x2 = r.x()+r.width()-1;
 			int y2 = r.y()+r.height()-1;
-			int lw = opt.isDefault() ? tqpixelMetric(PM_DefaultFrameWidth)
+			int lw = opt.isDefault() ? pixelMetric(PM_DefaultFrameWidth)
 				: opt.lineWidth();
 			
 			if (lw)
@@ -889,8 +889,8 @@ void HighColorStyle::drawPrimitive( PrimitiveElement pe,
 					
 				p->save();
 				if ( flags & Style_Down )
-					p->translate( tqpixelMetric( PM_ButtonShiftHorizontal ),
-								  tqpixelMetric( PM_ButtonShiftVertical ) );
+					p->translate( pixelMetric( PM_ButtonShiftHorizontal ),
+								  pixelMetric( PM_ButtonShiftVertical ) );
 
 				if ( flags & Style_Enabled ) {
 					a.translate( r.x() + r.width() / 2, r.y() + r.height() / 2 );
@@ -1092,7 +1092,7 @@ void HighColorStyle::drawKStylePrimitive( KStylePrimitive kpe,
 }
 
 
-void HighColorStyle::tqdrawControl( ControlElement element,
+void HighColorStyle::drawControl( ControlElement element,
 								  TQPainter *p,
 								  const TQWidget *widget,
 								  const TQRect &r,
@@ -1115,7 +1115,7 @@ void HighColorStyle::tqdrawControl( ControlElement element,
 				
 				if ( btnDefault || button->autoDefault() ) {
 					// Compensate for default indicator
-					static int di = tqpixelMetric( PM_ButtonDefaultIndicator );
+					static int di = pixelMetric( PM_ButtonDefaultIndicator );
 					br.addCoords( di, di, -di, -di );
 				}
 
@@ -1141,14 +1141,14 @@ void HighColorStyle::tqdrawControl( ControlElement element,
 
 			// Shift button contents if pushed.
 			if ( active ) {
-				x += tqpixelMetric(PM_ButtonShiftHorizontal, widget); 
-				y += tqpixelMetric(PM_ButtonShiftVertical, widget);
+				x += pixelMetric(PM_ButtonShiftHorizontal, widget); 
+				y += pixelMetric(PM_ButtonShiftVertical, widget);
 				flags |= Style_Sunken;
 			}
 
 			// Does the button have a popup menu?
 			if ( button->isMenuButton() ) {
-				int dx = tqpixelMetric( PM_MenuButtonIndicator, widget );
+				int dx = pixelMetric( PM_MenuButtonIndicator, widget );
 				drawPrimitive( PE_ArrowDown, p, TQRect(x + w - dx - 2, y + 2, dx, h - 4),
 							   cg, flags, opt );
 				w -= dx;
@@ -1181,7 +1181,7 @@ void HighColorStyle::tqdrawControl( ControlElement element,
 			// Make the label indicate if the button is a default button or not
 			if ( active || button->isDefault() ) {
 				// Draw "fake" bold text  - this enables the font metrics to remain
-				// the same as computed in TQPushButton::tqsizeHint(), but gives
+				// the same as computed in TQPushButton::sizeHint(), but gives
 				// a reasonable bold effect.
 				int i;
 
@@ -1189,25 +1189,25 @@ void HighColorStyle::tqdrawControl( ControlElement element,
 				if (button->isEnabled()) // Don't draw double-shadow when disabled
 					for(i=0; i<2; i++)
 						drawItem( p, TQRect(x+i+1, y+1, w, h), AlignCenter | ShowPrefix, 
-								button->tqcolorGroup(), button->isEnabled(), NULL,
+								button->colorGroup(), button->isEnabled(), NULL,
 								button->text(), -1,	
-								active ? &button->tqcolorGroup().dark() : &button->tqcolorGroup().mid() );
+								active ? &button->colorGroup().dark() : &button->colorGroup().mid() );
 
 				// Normal Text
 				for(i=0; i<2; i++)
 					drawItem( p, TQRect(x+i, y, w, h), AlignCenter | ShowPrefix, 
-							button->tqcolorGroup(), button->isEnabled(), i == 0 ? button->pixmap() : NULL,
+							button->colorGroup(), button->isEnabled(), i == 0 ? button->pixmap() : NULL,
 							button->text(), -1,
-							active ? &button->tqcolorGroup().light() : &button->tqcolorGroup().buttonText() );
+							active ? &button->colorGroup().light() : &button->colorGroup().buttonText() );
 			} else
-				drawItem( p, TQRect(x, y, w, h), AlignCenter | ShowPrefix, button->tqcolorGroup(),
+				drawItem( p, TQRect(x, y, w, h), AlignCenter | ShowPrefix, button->colorGroup(),
 						button->isEnabled(), button->pixmap(), button->text(), -1,
-						active ? &button->tqcolorGroup().light() : &button->tqcolorGroup().buttonText() );
+						active ? &button->colorGroup().light() : &button->colorGroup().buttonText() );
 
 			// Draw a focus rect if the button has focus
 			if ( flags & Style_HasFocus )
 				drawPrimitive( PE_FocusRect, p,
-						TQStyle::tqvisualRect(subRect(SR_PushButtonFocusRect, widget), widget),
+						TQStyle::visualRect(subRect(SR_PushButtonFocusRect, widget), widget),
 						cg, flags );
 			break;
 		}
@@ -1293,7 +1293,7 @@ void HighColorStyle::tqdrawControl( ControlElement element,
 			bool enabled    = mi->isEnabled();
 			bool checkable  = popupmenu->isCheckable();
 			bool active     = flags & Style_Active;
-			bool etchtext   = tqstyleHint( SH_EtchDisabledText );
+			bool etchtext   = styleHint( SH_EtchDisabledText );
 			bool reverse    = TQApplication::reverseLayout();
 			int x, y, w, h;
 			r.rect( &x, &y, &w, &h );
@@ -1324,7 +1324,7 @@ void HighColorStyle::tqdrawControl( ControlElement element,
 			// Do we have an icon?
 			if ( mi->iconSet() ) {
 				TQIconSet::Mode mode;
-				TQRect cr = tqvisualRect( TQRect(x, y, checkcol, h), r );
+				TQRect cr = visualRect( TQRect(x, y, checkcol, h), r );
 				
 				// Select the correct icon from the iconset
 				if ( active )
@@ -1404,7 +1404,7 @@ void HighColorStyle::tqdrawControl( ControlElement element,
 
 				// Does the menu item have a text label?
 				if ( !s.isNull() ) {
-					int t = s.tqfind( '\t' );
+					int t = s.find( '\t' );
 					int m = itemVMargin;
 					int text_flags = AlignVCenter | ShowPrefix | DontClip | SingleLine;
 					text_flags |= reverse ? AlignRight : AlignLeft;
@@ -1459,8 +1459,8 @@ void HighColorStyle::tqdrawControl( ControlElement element,
 			// Does the menu item have a submenu?
 			if ( mi->popup() ) {
 				PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
-				int dim = tqpixelMetric(PM_MenuButtonIndicator);
-				TQRect vr = tqvisualRect( TQRect( x + w - arrowHMargin - 2*itemFrame - dim,
+				int dim = pixelMetric(PM_MenuButtonIndicator);
+				TQRect vr = visualRect( TQRect( x + w - arrowHMargin - 2*itemFrame - dim,
 							y + h / 2 - dim / 2, dim, dim), r );
 
 				// Draw an arrow at the far end of the menu item
@@ -1480,12 +1480,12 @@ void HighColorStyle::tqdrawControl( ControlElement element,
 		}
 
 		default:
-			KStyle::tqdrawControl(element, p, widget, r, cg, flags, opt);
+			KStyle::drawControl(element, p, widget, r, cg, flags, opt);
 	}
 }
 
 
-void HighColorStyle::tqdrawControlMask( ControlElement element,
+void HighColorStyle::drawControlMask( ControlElement element,
 								  	  TQPainter *p,
 								  	  const TQWidget *widget,
 								  	  const TQRect &r,
@@ -1506,12 +1506,12 @@ void HighColorStyle::tqdrawControlMask( ControlElement element,
 		}
 
 		default:
-			KStyle::tqdrawControlMask(element, p, widget, r, opt);
+			KStyle::drawControlMask(element, p, widget, r, opt);
 	}
 }
 
 
-void HighColorStyle::tqdrawComplexControl( ComplexControl control,
+void HighColorStyle::drawComplexControl( ComplexControl control,
                                          TQPainter *p,
                                          const TQWidget *widget,
                                          const TQRect &r,
@@ -1562,7 +1562,7 @@ void HighColorStyle::tqdrawComplexControl( ComplexControl control,
 				p->drawLine(x+1, y+2, x+1, y2-2);
 
 				// Get the button bounding box
-				TQRect ar = TQStyle::tqvisualRect(
+				TQRect ar = TQStyle::visualRect(
 					querySubControlMetrics(CC_ComboBox, widget, SC_ComboBoxArrow),
 					widget );
 
@@ -1581,7 +1581,7 @@ void HighColorStyle::tqdrawComplexControl( ComplexControl control,
 			if ( controls & SC_ComboBoxEditField )
 			{
 				const TQComboBox * cb = (const TQComboBox *) widget;
-				TQRect re = TQStyle::tqvisualRect(
+				TQRect re = TQStyle::visualRect(
 					querySubControlMetrics( CC_ComboBox, widget,
 						                    SC_ComboBoxEditField), widget );
 
@@ -1605,7 +1605,7 @@ void HighColorStyle::tqdrawComplexControl( ComplexControl control,
 					p->fillRect( re.x(), re.y(), re.width(), re.height(),
 								 cg.brush( TQColorGroup::Highlight ) );
 
-					TQRect re = TQStyle::tqvisualRect( 
+					TQRect re = TQStyle::visualRect( 
 								subRect(SR_ComboBoxFocusRect, cb), widget);
 
 					drawPrimitive( PE_FocusRect, p, re, cg,
@@ -1639,11 +1639,11 @@ void HighColorStyle::tqdrawComplexControl( ComplexControl control,
 					drawPrimitive(PE_ButtonTool, p, button, cg, bflags, opt);
 
 				// Check whether to draw a background pixmap
-				else if ( toolbutton->tqparentWidget() &&
-						  toolbutton->tqparentWidget()->backgroundPixmap() &&
-						  !toolbutton->tqparentWidget()->backgroundPixmap()->isNull() )
+				else if ( toolbutton->parentWidget() &&
+						  toolbutton->parentWidget()->backgroundPixmap() &&
+						  !toolbutton->parentWidget()->backgroundPixmap()->isNull() )
 				{
-					TQPixmap pixmap = *(toolbutton->tqparentWidget()->backgroundPixmap());
+					TQPixmap pixmap = *(toolbutton->parentWidget()->backgroundPixmap());
 					p->drawTiledPixmap( r, pixmap, toolbutton->pos() );
 				}
 				else if (widget->parent())
@@ -1693,14 +1693,14 @@ void HighColorStyle::tqdrawComplexControl( ComplexControl control,
 
 
 		default:
-			KStyle::tqdrawComplexControl(control, p, widget,
+			KStyle::drawComplexControl(control, p, widget,
 						r, cg, flags, controls, active, opt);
 			break;
 	}
 }
 
 
-void HighColorStyle::tqdrawComplexControlMask( ComplexControl control,
+void HighColorStyle::drawComplexControlMask( ComplexControl control,
 											 TQPainter *p,
 											 const TQWidget *widget,
 											 const TQRect &r,
@@ -1722,7 +1722,7 @@ void HighColorStyle::tqdrawComplexControlMask( ComplexControl control,
 		}
 
 		default:
-			KStyle::tqdrawComplexControlMask(control, p, widget, r, opt);
+			KStyle::drawComplexControlMask(control, p, widget, r, opt);
 	}
 }
 
@@ -1765,11 +1765,11 @@ TQRect HighColorStyle::subRect(SubRect r, const TQWidget *widget) const
 		int dbw1 = 0, dbw2 = 0;
 
 		if (button->isDefault() || button->autoDefault()) {
-			dbw1 = tqpixelMetric(PM_ButtonDefaultIndicator, widget);
+			dbw1 = pixelMetric(PM_ButtonDefaultIndicator, widget);
 			dbw2 = dbw1 * 2;
 		}
 
-		int dfw1 = tqpixelMetric(PM_DefaultFrameWidth, widget) * 2,
+		int dfw1 = pixelMetric(PM_DefaultFrameWidth, widget) * 2,
 			dfw2 = dfw1 * 2;
 
 		return TQRect(wrect.x()      + dfw1 + dbw1 + 1,
@@ -1781,7 +1781,7 @@ TQRect HighColorStyle::subRect(SubRect r, const TQWidget *widget) const
 }
 
 
-int HighColorStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const
+int HighColorStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const
 {
 	switch(m)
 	{
@@ -1814,7 +1814,7 @@ int HighColorStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const
 		}
 
 		default:
-			return KStyle::tqpixelMetric(m, widget);
+			return KStyle::pixelMetric(m, widget);
 	}
 }
 
@@ -1832,8 +1832,8 @@ TQSize HighColorStyle::sizeFromContents( ContentsType contents,
 			const TQPushButton* button = (const TQPushButton*) widget;
 			int w  = contentSize.width();
 			int h  = contentSize.height();
-			int bm = tqpixelMetric( PM_ButtonMargin, widget );
-			int fw = tqpixelMetric( PM_DefaultFrameWidth, widget ) * 2;
+			int bm = pixelMetric( PM_ButtonMargin, widget );
+			int fw = pixelMetric( PM_DefaultFrameWidth, widget ) * 2;
 
 			w += bm + fw + 6;	// ### Add 6 to make way for bold font.
 			h += bm + fw;
@@ -1845,7 +1845,7 @@ TQSize HighColorStyle::sizeFromContents( ContentsType contents,
 
 				if ( type != HighColor ) {
 					// Compensate for default indicator
-					int di = tqpixelMetric( PM_ButtonDefaultIndicator );
+					int di = pixelMetric( PM_ButtonDefaultIndicator );
 					w += di * 2;
 					h += di * 2;
 				}
@@ -1871,8 +1871,8 @@ TQSize HighColorStyle::sizeFromContents( ContentsType contents,
 			int w = contentSize.width(), h = contentSize.height();
 
 			if ( mi->custom() ) {
-				w = mi->custom()->tqsizeHint().width();
-				h = mi->custom()->tqsizeHint().height();
+				w = mi->custom()->sizeHint().width();
+				h = mi->custom()->sizeHint().height();
 				if ( ! mi->custom()->fullSpan() )
 					h += 2*itemVMargin + 2*itemFrame;
 			}
@@ -1898,7 +1898,7 @@ TQSize HighColorStyle::sizeFromContents( ContentsType contents,
 								2 * itemFrame );
 			}
 
-			if ( ! mi->text().isNull() && mi->text().tqfind('\t') >= 0 )
+			if ( ! mi->text().isNull() && mi->text().find('\t') >= 0 )
 				w += 12;
 			else if ( mi->popup() )
 				w += 2 * arrowHMargin;
@@ -1922,7 +1922,7 @@ TQSize HighColorStyle::sizeFromContents( ContentsType contents,
 }
 
 
-// Fix Qt's wacky image tqalignment
+// Fix Qt's wacky image alignment
 TQPixmap HighColorStyle::stylePixmap(StylePixmap stylepixmap,
 									const TQWidget* widget,
 									const TQStyleOption& opt) const
@@ -1954,12 +1954,12 @@ bool HighColorStyle::eventFilter( TQObject *object, TQEvent *event )
 		if ( (event->type() == TQEvent::Enter) &&
 			 (button->isEnabled()) ) {
 			hoverWidget = button;
-			button->tqrepaint( false );
+			button->repaint( false );
 		} 
 		else if ( (event->type() == TQEvent::Leave) &&
 				  (object == hoverWidget) ) {
 			hoverWidget = 0L;
-			button->tqrepaint( false );
+			button->repaint( false );
 		}
 	} else if ( object->parent() && !qstrcmp( object->name(), kdeToolbarWidget ) )
 	{
@@ -1988,7 +1988,7 @@ bool HighColorStyle::eventFilter( TQObject *object, TQEvent *event )
 			if (tb) horiz_grad = tb->orientation() == Qt::Vertical;
 
 			TQPainter p( widget );
-			renderGradient(&p, r, parent->tqcolorGroup().button(), horiz_grad,
+			renderGradient(&p, r, parent->colorGroup().button(), horiz_grad,
 					x_offset, y_offset, pr.width(), pr.height());
 
 			return false;	// Now draw the contents
@@ -2002,11 +2002,11 @@ bool HighColorStyle::eventFilter( TQObject *object, TQEvent *event )
 			TQWidget *widget = static_cast<TQWidget*>(object);
 			TQRect wr = widget->rect(), tr = toolbar->rect();
 			TQPainter p( widget );
-			renderGradient(&p, wr, toolbar->tqcolorGroup().button(),
+			renderGradient(&p, wr, toolbar->colorGroup().button(),
 					toolbar->orientation() == Qt::Vertical,
 					wr.x(), wr.y(), tr.width() - 2, tr.height() - 2);
 			
-			p.setPen( toolbar->tqcolorGroup().dark() );
+			p.setPen( toolbar->colorGroup().dark() );
 			if ( toolbar->orientation() == Qt::Horizontal )
 				p.drawLine( wr.width()-1, 0, wr.width()-1, wr.height()-1 );
 			else
@@ -2034,7 +2034,7 @@ void HighColorStyle::renderGradient( TQPainter* p, const TQRect& r,
 	// We use these to draw parent-relative pixmaps for toolbar buttons
 	// and menubar items.
 
-	GradientSet* grSet = gDict.tqfind( clr.rgb() );
+	GradientSet* grSet = gDict.find( clr.rgb() );
 
 	if (!grSet) {
 		grSet = new GradientSet(clr);
diff --git a/kstyles/highcolor/highcolor.h b/kstyles/highcolor/highcolor.h
index 98fe2f651..f1fc44c33 100644
--- a/kstyles/highcolor/highcolor.h
+++ b/kstyles/highcolor/highcolor.h
@@ -86,7 +86,7 @@ class HighColorStyle : public KStyle
 					SFlags flags = Style_Default,
 					const TQStyleOption& = TQStyleOption::Default ) const;
 
-		void tqdrawControl( ControlElement element,
+		void drawControl( ControlElement element,
 					TQPainter *p,
 					const TQWidget *widget,
 					const TQRect &r,
@@ -94,13 +94,13 @@ class HighColorStyle : public KStyle
 					SFlags flags = Style_Default,
 					const TQStyleOption& = TQStyleOption::Default ) const;
 
-		void tqdrawControlMask( ControlElement element,
+		void drawControlMask( ControlElement element,
 					TQPainter *p,
 					const TQWidget *widget,
 					const TQRect &r,
 					const TQStyleOption& = TQStyleOption::Default ) const;
 		
-		void tqdrawComplexControl( ComplexControl control,
+		void drawComplexControl( ComplexControl control,
 					TQPainter *p,
 					const TQWidget *widget,
 					const TQRect &r,
@@ -110,7 +110,7 @@ class HighColorStyle : public KStyle
 					SCFlags active = SC_None,
 					const TQStyleOption& = TQStyleOption::Default ) const;
 
-		void tqdrawComplexControlMask( ComplexControl control,
+		void drawComplexControlMask( ComplexControl control,
 					TQPainter *p,
 					const TQWidget *widget,
 					const TQRect &r,
@@ -126,7 +126,7 @@ class HighColorStyle : public KStyle
 		                int len = -1,
 		                const TQColor *penColor = 0 ) const;
 
-		int tqpixelMetric( PixelMetric m, 
+		int pixelMetric( PixelMetric m, 
 					const TQWidget *widget = 0 ) const;
 
 		TQSize sizeFromContents( ContentsType contents,
diff --git a/kstyles/highcontrast/config/highcontrastconfig.cpp b/kstyles/highcontrast/config/highcontrastconfig.cpp
index fa980af2c..233fb7365 100644
--- a/kstyles/highcontrast/config/highcontrastconfig.cpp
+++ b/kstyles/highcontrast/config/highcontrastconfig.cpp
@@ -43,13 +43,13 @@ HighContrastStyleConfig::HighContrastStyleConfig(
         TQWidget* parent): TQWidget(parent)
 {
     // Should have no margins here, the dialog provides them
-    TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 0, 0);
+    TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0);
     KGlobal::locale()->insertCatalogue("kstyle_highcontrast_config");
 
     wideLinesBox = new TQCheckBox(i18n("Use wider lines"), this);
 
-    tqlayout->add(wideLinesBox);
-    tqlayout->addStretch(1);
+    layout->add(wideLinesBox);
+    layout->addStretch(1);
 
     TQSettings s;
 
diff --git a/kstyles/highcontrast/highcontrast.cpp b/kstyles/highcontrast/highcontrast.cpp
index bc53393f5..0b9c0cfcf 100644
--- a/kstyles/highcontrast/highcontrast.cpp
+++ b/kstyles/highcontrast/highcontrast.cpp
@@ -702,13 +702,13 @@ void HighContrastStyle::drawKStylePrimitive (KStylePrimitive kpe,
 		}
 
 		case KPE_ListViewExpander: {
-			// TODO There is no tqpixelMetric associated with the
+			// TODO There is no pixelMetric associated with the
 			// ListViewExpander in KStyle.
 			// To have a properly large expander, the CC_ListView case of
-			// tqdrawComplexControl should be handled.
+			// drawComplexControl should be handled.
 			// Probably it would be better to add a KPM_ListViewExpander metric
 			// to the KStyle KStylePixelMetric enum, and have the KStyle
-			// tqdrawComplexControl handle it.
+			// drawComplexControl handle it.
 			PrimitiveElement direction;
 			if (flags & Style_On) { // Collapsed = On
 				direction = PE_ArrowRight;
@@ -729,7 +729,7 @@ void HighContrastStyle::drawKStylePrimitive (KStylePrimitive kpe,
 }
 
 
-void HighContrastStyle::tqdrawControl (ControlElement element,
+void HighContrastStyle::drawControl (ControlElement element,
 								TQPainter *p,
 								const TQWidget *widget,
 								const TQRect &r,
@@ -755,9 +755,9 @@ void HighContrastStyle::tqdrawControl (ControlElement element,
 			drawRoundRect (p, r);
 			
 			const TQTabBar *tb = static_cast< const TQTabBar * >(widget);
-            TQTabBar::Shape tqshape = tb->tqshape();
-			if (tqshape == TQTabBar::TriangularBelow || 
-				tqshape == TQTabBar::RoundedBelow) {
+            TQTabBar::Shape shape = tb->shape();
+			if (shape == TQTabBar::TriangularBelow || 
+				shape == TQTabBar::RoundedBelow) {
 				p->fillRect (r.left(), r.top(), 
 							 r.width(), 2*basicLineWidth, 
 							 p->pen().color());
@@ -789,7 +789,7 @@ void HighContrastStyle::tqdrawControl (ControlElement element,
 
 			if (( btnDefault || button->autoDefault() ) && (button->isEnabled())) {
 				// Compensate for default indicator
-				static int di = tqpixelMetric( PM_ButtonDefaultIndicator );
+				static int di = pixelMetric( PM_ButtonDefaultIndicator );
 				addOffset (&br, di);
 			}
 
@@ -860,7 +860,7 @@ void HighContrastStyle::tqdrawControl (ControlElement element,
 
 			// Does the button have a popup menu?
 			if (popup) {
-				int dx = tqpixelMetric (PM_MenuButtonIndicator, widget);
+				int dx = pixelMetric (PM_MenuButtonIndicator, widget);
 				drawArrow (p, TQRect(x + w - dx - 2, y + 2, dx, h - 4), PE_ArrowDown);
 				w -= dx;
 			}
@@ -1009,7 +1009,7 @@ void HighContrastStyle::tqdrawControl (ControlElement element,
 			// Do we have an icon?
 			if ( mi->iconSet() && !mi->iconSet()->isNull() ) {
 				TQIconSet::Mode mode;
-				TQRect cr = tqvisualRect( TQRect(x, y, checkcol, h), r );
+				TQRect cr = visualRect( TQRect(x, y, checkcol, h), r );
 
 				// Select the correct icon from the iconset
 				if (!(flags & Style_Enabled))
@@ -1075,7 +1075,7 @@ void HighContrastStyle::tqdrawControl (ControlElement element,
 
 				// Does the menu item have a text label?
 				if ( !s.isNull() ) {
-					int t = s.tqfind( '\t' );
+					int t = s.find( '\t' );
 					int m = itemVMargin;
 					int text_flags = AlignVCenter | ShowPrefix | DontClip | SingleLine;
 					text_flags |= reverse ? AlignRight : AlignLeft;
@@ -1118,8 +1118,8 @@ void HighContrastStyle::tqdrawControl (ControlElement element,
 			// Does the menu item have a submenu?
 			if ( mi->popup() ) {
 				PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
-				int dim = tqpixelMetric(PM_MenuButtonIndicator);
-				TQRect vr = tqvisualRect( TQRect( x + w - arrowHMargin - 2*itemFrame - dim,
+				int dim = pixelMetric(PM_MenuButtonIndicator);
+				TQRect vr = visualRect( TQRect( x + w - arrowHMargin - 2*itemFrame - dim,
 							y + h / 2 - dim / 2, dim, dim), r );
 
 				// Draw an arrow at the far end of the menu item
@@ -1129,11 +1129,11 @@ void HighContrastStyle::tqdrawControl (ControlElement element,
 		}
 
 		default:
-			KStyle::tqdrawControl(element, p, widget, r, cg, flags, opt);
+			KStyle::drawControl(element, p, widget, r, cg, flags, opt);
 	}
 }
 
-void HighContrastStyle::tqdrawControlMask (ControlElement element,
+void HighContrastStyle::drawControlMask (ControlElement element,
 										TQPainter *p,
 										const TQWidget *w,
 										const TQRect &r,
@@ -1157,12 +1157,12 @@ void HighContrastStyle::tqdrawControlMask (ControlElement element,
 		}
 
 		default: {
-			KStyle::tqdrawControlMask (element, p, w, r, opt);
+			KStyle::drawControlMask (element, p, w, r, opt);
 		}
 	}
 }
 
-// Helper to tqfind the next sibling that's not hidden
+// Helper to find the next sibling that's not hidden
 // Lifted from kstyle.cpp
 static TQListViewItem* nextVisibleSibling(TQListViewItem* item)
 {
@@ -1176,7 +1176,7 @@ static TQListViewItem* nextVisibleSibling(TQListViewItem* item)
     return sibling;
 }
 
-void HighContrastStyle::tqdrawComplexControl (ComplexControl control,
+void HighContrastStyle::drawComplexControl (ComplexControl control,
 									TQPainter *p,
 									const TQWidget *widget,
 									const TQRect &r,
@@ -1197,7 +1197,7 @@ void HighContrastStyle::tqdrawComplexControl (ComplexControl control,
 			setColorsText (p, cg, flags);
 			drawRoundRect (p, r);
 			
-			TQRect r2 = TQStyle::tqvisualRect (querySubControlMetrics (CC_ComboBox, widget, SC_ComboBoxArrow), widget);
+			TQRect r2 = TQStyle::visualRect (querySubControlMetrics (CC_ComboBox, widget, SC_ComboBoxArrow), widget);
 			if (flags & Style_HasFocus) {
 				TQRect r3 (r);
 				if (r2.left() > 0)
@@ -1232,12 +1232,12 @@ void HighContrastStyle::tqdrawComplexControl (ComplexControl control,
 			setColorsButton (p, cg, flags);
 			// Draw arrows if required
 			if (controls & SC_SpinWidgetDown) {
-				TQRect r2 = TQStyle::tqvisualRect (querySubControlMetrics (CC_SpinWidget, widget, SC_SpinWidgetDown), widget);
+				TQRect r2 = TQStyle::visualRect (querySubControlMetrics (CC_SpinWidget, widget, SC_SpinWidgetDown), widget);
 				drawRoundRect (p, r2);
 				drawArrow (p, r2, PE_SpinWidgetDown, 2*basicLineWidth);
 			}
 			if (controls & SC_SpinWidgetUp) {
-				TQRect r2 = TQStyle::tqvisualRect (querySubControlMetrics (CC_SpinWidget, widget, SC_SpinWidgetUp), widget);
+				TQRect r2 = TQStyle::visualRect (querySubControlMetrics (CC_SpinWidget, widget, SC_SpinWidgetUp), widget);
 				drawRoundRect (p, r2);
 				drawArrow (p, r2, PE_SpinWidgetUp, 2*basicLineWidth);
 			}
@@ -1273,11 +1273,11 @@ void HighContrastStyle::tqdrawComplexControl (ComplexControl control,
 					drawPrimitive(PE_ButtonTool, p, button, cg, bflags, opt);
 
 				// Check whether to draw a background pixmap
-				else if ( toolbutton->tqparentWidget() &&
-						  toolbutton->tqparentWidget()->backgroundPixmap() &&
-						  !toolbutton->tqparentWidget()->backgroundPixmap()->isNull() )
+				else if ( toolbutton->parentWidget() &&
+						  toolbutton->parentWidget()->backgroundPixmap() &&
+						  !toolbutton->parentWidget()->backgroundPixmap()->isNull() )
 				{
-					TQPixmap pixmap = *(toolbutton->tqparentWidget()->backgroundPixmap());
+					TQPixmap pixmap = *(toolbutton->parentWidget()->backgroundPixmap());
 					p->drawTiledPixmap( r, pixmap, toolbutton->pos() );
 				}
 			}
@@ -1312,7 +1312,7 @@ void HighContrastStyle::tqdrawComplexControl (ComplexControl control,
 
 			// Paint the icon and text.
 			if ( controls & SC_ListView )
-				TQCommonStyle::tqdrawComplexControl( control, p, widget, r, cg, flags, controls, active, opt );
+				TQCommonStyle::drawComplexControl( control, p, widget, r, cg, flags, controls, active, opt );
 
 			// If we're have a branch or are expanded...
 			if ( controls & (SC_ListViewBranch | SC_ListViewExpand) )
@@ -1458,13 +1458,13 @@ void HighContrastStyle::tqdrawComplexControl (ComplexControl control,
 		}
 
 		default:
-			KStyle::tqdrawComplexControl(control, p, widget,
+			KStyle::drawComplexControl(control, p, widget,
 						r, cg, flags, controls, active, opt);
 			break;
 	}
 }
 
-void HighContrastStyle::tqdrawComplexControlMask(ComplexControl c,
+void HighContrastStyle::drawComplexControlMask(ComplexControl c,
 											   TQPainter *p,
 											   const TQWidget *w,
 											   const TQRect &r,
@@ -1478,7 +1478,7 @@ void HighContrastStyle::tqdrawComplexControlMask(ComplexControl c,
 			break;
 		}
 		default: {
-			KStyle::tqdrawComplexControlMask (c, p, w, r, o);
+			KStyle::drawComplexControlMask (c, p, w, r, o);
 		}
 	}
 }
@@ -1515,7 +1515,7 @@ TQRect HighContrastStyle::querySubControlMetrics( ComplexControl control,
 	switch (control)
 	{
 		case CC_ComboBox : {
-			int arrow = tqpixelMetric (PM_ScrollBarExtent, widget);
+			int arrow = pixelMetric (PM_ScrollBarExtent, widget);
 			switch (subcontrol)
 			{
 				case SC_ComboBoxFrame:
@@ -1531,7 +1531,7 @@ TQRect HighContrastStyle::querySubControlMetrics( ComplexControl control,
 			break;
 		}
 		case CC_SpinWidget : {
-			int arrow = tqpixelMetric (PM_ScrollBarExtent, 0);
+			int arrow = pixelMetric (PM_ScrollBarExtent, 0);
 			switch (subcontrol)
 			{
 				case SC_SpinWidgetFrame:
@@ -1559,7 +1559,7 @@ TQRect HighContrastStyle::querySubControlMetrics( ComplexControl control,
 }
 
 
-int HighContrastStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const
+int HighContrastStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const
 {
 	//### TODO: Use the tab metrics changes from Ker.
 	switch(m)
@@ -1643,7 +1643,7 @@ int HighContrastStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) cons
 		}
 
 		default:
-			return KStyle::tqpixelMetric(m, widget);
+			return KStyle::pixelMetric(m, widget);
 	}
 }
 
@@ -1672,8 +1672,8 @@ TQSize HighContrastStyle::sizeFromContents( ContentsType contents,
 			const TQPushButton* button = (const TQPushButton*) widget;
 			int w  = contentSize.width();
 			int h  = contentSize.height();
-			int bm = tqpixelMetric( PM_ButtonMargin, widget );
-			int fw = tqpixelMetric( PM_DefaultFrameWidth, widget ) * 2;
+			int bm = pixelMetric( PM_ButtonMargin, widget );
+			int fw = pixelMetric( PM_DefaultFrameWidth, widget ) * 2;
 
 			w += bm + fw + 6;	// ### Add 6 to make way for bold font.
 			h += bm + fw;
@@ -1684,7 +1684,7 @@ TQSize HighContrastStyle::sizeFromContents( ContentsType contents,
 					w = 80;
 
 				// Compensate for default indicator
-				int di = tqpixelMetric( PM_ButtonDefaultIndicator );
+				int di = pixelMetric( PM_ButtonDefaultIndicator );
 				w += di * 2;
 				h += di * 2;
 			}
@@ -1709,7 +1709,7 @@ TQSize HighContrastStyle::sizeFromContents( ContentsType contents,
 		case CT_ComboBox: {
 			const TQComboBox *cb = static_cast< const TQComboBox* > (widget);
 			int borderSize =  (cb->editable() ? 4 : 2) * basicLineWidth;
-			int arrowSize = tqpixelMetric (PM_ScrollBarExtent, cb);
+			int arrowSize = pixelMetric (PM_ScrollBarExtent, cb);
 			return TQSize(borderSize + basicLineWidth + arrowSize, borderSize) + contentSize;
 		}
 
@@ -1726,8 +1726,8 @@ TQSize HighContrastStyle::sizeFromContents( ContentsType contents,
 			int w = contentSize.width(), h = contentSize.height();
 
 			if ( mi->custom() ) {
-				w = mi->custom()->tqsizeHint().width();
-				h = mi->custom()->tqsizeHint().height();
+				w = mi->custom()->sizeHint().width();
+				h = mi->custom()->sizeHint().height();
 				if ( ! mi->custom()->fullSpan() )
 					h += 2*itemVMargin + 2*itemFrame;
 			}
@@ -1753,7 +1753,7 @@ TQSize HighContrastStyle::sizeFromContents( ContentsType contents,
 								2 * itemFrame );
 			}
 
-			if ( ! mi->text().isNull() && mi->text().tqfind('\t') >= 0 )
+			if ( ! mi->text().isNull() && mi->text().find('\t') >= 0 )
 				w += 12;
 			else if ( mi->popup() )
 				w += 2 * arrowHMargin;
@@ -1807,7 +1807,7 @@ bool HighContrastStyle::eventFilter (TQObject *object, TQEvent *event)
 					|| widget->inherits ("QSpinWidget")))
 		{
 			hoverWidget = widget;
-			widget->tqrepaint (false);
+			widget->repaint (false);
 		}
 		else if (event->type() == TQEvent::Leave
 					&& (widget->inherits ("QButton")
@@ -1816,7 +1816,7 @@ bool HighContrastStyle::eventFilter (TQObject *object, TQEvent *event)
 		{
 			if (object == hoverWidget)
 				hoverWidget = 0L;
-			widget->tqrepaint (false);
+			widget->repaint (false);
 		}
 		// Make sure the focus rectangle is shown correctly.
 		else if (event->type() == TQEvent::FocusIn || event->type() == TQEvent::FocusOut)
@@ -1830,9 +1830,9 @@ bool HighContrastStyle::eventFilter (TQObject *object, TQEvent *event)
 			}
 
 			if (widgetparent)
-				widgetparent->tqrepaint (false);
+				widgetparent->repaint (false);
 			else
-				widget->tqrepaint (false);
+				widget->repaint (false);
 		}
 	}
 	
@@ -1840,4 +1840,4 @@ bool HighContrastStyle::eventFilter (TQObject *object, TQEvent *event)
 }
 
 // vim: set noet ts=4 sw=4:
-// kate: indent-width 4; tqreplace-tabs off; smart-indent on; tab-width 4;
+// kate: indent-width 4; replace-tabs off; smart-indent on; tab-width 4;
diff --git a/kstyles/highcontrast/highcontrast.h b/kstyles/highcontrast/highcontrast.h
index 5b9bd0fb9..fb3db68b1 100644
--- a/kstyles/highcontrast/highcontrast.h
+++ b/kstyles/highcontrast/highcontrast.h
@@ -74,7 +74,7 @@ class HighContrastStyle : public KStyle
 					SFlags flags = Style_Default,
 					const TQStyleOption& = TQStyleOption::Default ) const;
 
-		void tqdrawControl( ControlElement element,
+		void drawControl( ControlElement element,
 					TQPainter *p,
 					const TQWidget *widget,
 					const TQRect &r,
@@ -82,13 +82,13 @@ class HighContrastStyle : public KStyle
 					SFlags flags = Style_Default,
 					const TQStyleOption& = TQStyleOption::Default ) const;
 
-		void tqdrawControlMask( ControlElement element,
+		void drawControlMask( ControlElement element,
 					TQPainter *p,
 					const TQWidget *widget,
 					const TQRect &r,
 					const TQStyleOption& = TQStyleOption::Default ) const;
 
-		void tqdrawComplexControl( ComplexControl control,
+		void drawComplexControl( ComplexControl control,
 					TQPainter *p,
 					const TQWidget *widget,
 					const TQRect &r,
@@ -98,7 +98,7 @@ class HighContrastStyle : public KStyle
 					SCFlags active = SC_None,
 					const TQStyleOption& = TQStyleOption::Default ) const;
 
-		void tqdrawComplexControlMask( ComplexControl control,
+		void drawComplexControlMask( ComplexControl control,
 					TQPainter *p,
 					const TQWidget *widget,
 					const TQRect &r,
@@ -120,7 +120,7 @@ class HighContrastStyle : public KStyle
 					int len = -1,
 					const TQColor *penColor = 0 ) const;
 
-		int tqpixelMetric( PixelMetric m,
+		int pixelMetric( PixelMetric m,
 					const TQWidget *widget = 0 ) const;
 
 		int kPixelMetric( KStylePixelMetric m,
@@ -157,6 +157,6 @@ class HighContrastStyle : public KStyle
 };
 
 // vim: set noet ts=4 sw=4:
-// kate: indent-width 4; tqreplace-tabs off; smart-indent on; tab-width 4;
+// kate: indent-width 4; replace-tabs off; smart-indent on; tab-width 4;
 
 #endif
diff --git a/kstyles/keramik/genembed.cpp b/kstyles/keramik/genembed.cpp
index e47e7e6e7..2fecf94d1 100644
--- a/kstyles/keramik/genembed.cpp
+++ b/kstyles/keramik/genembed.cpp
@@ -146,7 +146,7 @@ int main(int argc, char** argv)
 		int readJustID = 0;
 
 
-		if ((pos = s.tqfindRev("-")) != -1)
+		if ((pos = s.findRev("-")) != -1)
 		{
 				int suffix = evalSuffix(s.mid(pos));
 				if (suffix !=-1 )
@@ -156,16 +156,16 @@ int main(int argc, char** argv)
 				}
 		}
 
-		if (!assignID.tqcontains(id))
+		if (!assignID.contains(id))
 		{
 			assignID[id] = nextID;
 			nextID += 256;
 		}
 
-		s.tqreplace("-","_");
+		s.replace("-","_");
 
 
-		if (s.tqcontains("button"))
+		if (s.contains("button"))
 			KImageEffect::contrastHSV(input);
 
 		int fullID = assignID[id] + readJustID;//Subwidget..
@@ -178,7 +178,7 @@ int main(int argc, char** argv)
 
 
 
-		if (s.tqcontains("toolbar") || s.tqcontains("tab-top-active") || s.tqcontains("menubar") )
+		if (s.contains("toolbar") || s.contains("tab-top-active") || s.contains("menubar") )
 		{
 //			highlights = false;
 			gamma    = 1/1.25f;
@@ -186,7 +186,7 @@ int main(int argc, char** argv)
 			shadows = false;
 		}
 
-		if (s.tqcontains("scrollbar") && s.tqcontains("groove"))
+		if (s.contains("scrollbar") && s.contains("groove"))
 		{
 			//highlights = false;
 			//gamma = 1.5;
@@ -194,7 +194,7 @@ int main(int argc, char** argv)
 		}
 			//brightAdj = -10;
 
-		if (s.tqcontains("scrollbar") && s.tqcontains("slider"))
+		if (s.contains("scrollbar") && s.contains("slider"))
 		{
 			//highlights = false;
 			gamma =1/0.7f;
@@ -202,7 +202,7 @@ int main(int argc, char** argv)
 		}
 
 
-		if (s.tqcontains("menuitem"))
+		if (s.contains("menuitem"))
 		{
 			//highlights = false;
 			gamma =1/0.6f;
@@ -222,14 +222,14 @@ int main(int argc, char** argv)
 
 		cout<<"static const unsigned char "<<s.latin1()<<"[]={\n";
 
-		TQ_UINT32* read  = reinterpret_cast< TQ_UINT32* >(input.bits() );
+		Q_UINT32* read  = reinterpret_cast< Q_UINT32* >(input.bits() );
 		int size = input.width()*input.height();
 
 		for (int pos=0; pos<size; pos++)
 		{
 			QRgb basePix = (QRgb)*read;
 
-			if (tqAlpha(basePix) != 255)
+			if (qAlpha(basePix) != 255)
 				reallySolid = false;
 			else
 				pixSolid++;
@@ -242,7 +242,7 @@ int main(int argc, char** argv)
 
 		images.push_back(image);
 
-		read  = reinterpret_cast< TQ_UINT32* >(input.bits() );
+		read  = reinterpret_cast< Q_UINT32* >(input.bits() );
 		for (int pos=0; pos<size; pos++)
 		{
 			QRgb basePix = (QRgb)*read;
@@ -252,10 +252,10 @@ int main(int argc, char** argv)
 			int h,s,v;
 			clr.hsv(&h,&s,&v);
 
-			v=tqGray(basePix);
+			v=qGray(basePix);
 
 			int targetColorAlpha = 0 , greyAdd = 0;
-			//int srcAlpha = tqAlpha(basePix);
+			//int srcAlpha = qAlpha(basePix);
 
 			if (s>0 || v > 128)
 			{ //Non-shadow
@@ -296,8 +296,8 @@ int main(int argc, char** argv)
 			if (reallySolid)
 				cout<<targetColorAlpha<<","<<greyAdd<<",";
 			else
-				cout<<targetColorAlpha<<","<<greyAdd<<","<<tqAlpha(basePix)<<",";
-			//cout<<tqRed(basePix)<<","<<tqGreen(basePix)<<","<<tqBlue(basePix)<<","<<tqAlpha(basePix)<<",";
+				cout<<targetColorAlpha<<","<<greyAdd<<","<<qAlpha(basePix)<<",";
+			//cout<<qRed(basePix)<<","<<qGreen(basePix)<<","<<qBlue(basePix)<<","<<qAlpha(basePix)<<",";
 
 			if (pos%8 == 7)
 				cout<<"\n";
@@ -373,7 +373,7 @@ int main(int argc, char** argv)
 	for (TQMap<TQString, int>::iterator i = assignID.begin(); i != assignID.end(); ++i)
 	{
 		TQString name = "keramik_"+i.key();
-		name.tqreplace("-","_");
+		name.replace("-","_");
 		ts<<"\t"<<name<<" = "<<i.data()<<",\n";
 	}
 	ts<<"\tkeramik_last\n";
diff --git a/kstyles/keramik/gradients.cpp b/kstyles/keramik/gradients.cpp
index 4a5c7dfc9..ab804d117 100644
--- a/kstyles/keramik/gradients.cpp
+++ b/kstyles/keramik/gradients.cpp
@@ -96,7 +96,7 @@ void GradientPainter::renderGradient( TQPainter* p, const TQRect& r, TQColor c,
 	
 	int key = entry.key();
 	
-	if ((cacheEntry = cache.tqfind(key, false)))
+	if ((cacheEntry = cache.find(key, false)))
 	{
 		if (entry == *cacheEntry)
 		{
diff --git a/kstyles/keramik/keramik.cpp b/kstyles/keramik/keramik.cpp
index 9ac37d2b9..6921efa2f 100644
--- a/kstyles/keramik/keramik.cpp
+++ b/kstyles/keramik/keramik.cpp
@@ -102,7 +102,7 @@ TQBitmap lightBmp;
 TQBitmap grayBmp;
 TQBitmap dgrayBmp;
 TQBitmap centerBmp;
-TQBitmap tqmaskBmp;
+TQBitmap maskBmp;
 TQBitmap xBmp;
 */
 namespace
@@ -146,8 +146,8 @@ namespace
 
 		p->save();
 		/*if ( down )
-			p->translate( tqpixelMetric( PM_ButtonShiftHorizontal ),
-						tqpixelMetric( PM_ButtonShiftVertical ) );
+			p->translate( pixelMetric( PM_ButtonShiftHorizontal ),
+						pixelMetric( PM_ButtonShiftVertical ) );
 		*/
 
 		if ( enabled ) {
@@ -277,7 +277,7 @@ TQPixmap KeramikStyle::stylePixmap(StylePixmap stylepixmap,
 
 KeramikStyle::KeramikStyle()
 	:KStyle( AllowMenuTransparency | FilledFrameWorkaround, ThreeButtonScrollBar ),
-		tqmaskMode(false), formMode(false),
+		maskMode(false), formMode(false),
 		toolbarBlendWidget(0), titleBarMode(None), flatMode(false), customScrollMode(false), kickerMode(false)
 {
 	forceSmallMode = false;
@@ -346,8 +346,8 @@ void KeramikStyle::polish(TQWidget* widget)
 	else if ( widget->inherits( "QMenuBar" ) || widget->inherits( "QPopupMenu" ) )
 		widget->setBackgroundMode( NoBackground );
 
- 	else if ( widget->tqparentWidget() &&
-			  ( ( widget->inherits( "QListBox" ) && widget->tqparentWidget()->inherits( "QComboBox" ) ) ||
+ 	else if ( widget->parentWidget() &&
+			  ( ( widget->inherits( "QListBox" ) && widget->parentWidget()->inherits( "QComboBox" ) ) ||
 	            widget->inherits( "KCompletionBox" ) ) ) {
 		TQListBox* listbox = (TQListBox*) widget;
 		listbox->setLineWidth( 4 );
@@ -387,8 +387,8 @@ void KeramikStyle::unPolish(TQWidget* widget)
 	else if ( widget->inherits( "QMenuBar" ) || widget->inherits( "QPopupMenu" ) )
 		widget->setBackgroundMode( PaletteBackground );
 
- 	else if ( widget->tqparentWidget() &&
-			  ( ( widget->inherits( "QListBox" ) && widget->tqparentWidget()->inherits( "QComboBox" ) ) ||
+ 	else if ( widget->parentWidget() &&
+			  ( ( widget->inherits( "QListBox" ) && widget->parentWidget()->inherits( "QComboBox" ) ) ||
 	            widget->inherits( "KCompletionBox" ) ) ) {
 		TQListBox* listbox = (TQListBox*) widget;
 		listbox->setLineWidth( 1 );
@@ -432,7 +432,7 @@ static void renderToolbarEntryBackground(TQPainter* paint,
 	//Do we have a parent toolbar to use?
 	if (parent)
 	{
-		//Calculate the toolbar tqgeometry.
+		//Calculate the toolbar geometry.
 		//The initial guess is the size of the parent widget
 		toolWidth  = parent->width();
 		toolHeight = parent->height();
@@ -476,7 +476,7 @@ static void renderToolbarWidgetBackground(TQPainter* painter, const TQWidget* wi
 
 	// Find the top-level toolbar of this widget, since it may be nested in other
 	// widgets that are on the toolbar.
-	TQWidget *parent = static_cast<TQWidget*>(widget->tqparentWidget());
+	TQWidget *parent = static_cast<TQWidget*>(widget->parentWidget());
 	int x_offset = widget->x(), y_offset = widget->y();
 	while (parent && parent->parent() && !qstrcmp( parent->name(), kdeToolbarWidget ) )
 	{
@@ -519,19 +519,19 @@ static void renderToolbarWidgetBackground(TQPainter* painter, const TQWidget* wi
 	if (painter)
 	{
 		Keramik::GradientPainter::renderGradient( painter, widget->rect(),
-			 widget->tqcolorGroup().button(), horiz_grad, false,
+			 widget->colorGroup().button(), horiz_grad, false,
 			 x_offset, y_offset, toolWidth, toolHeight);
 	}
 	else
 	{
 		TQPainter p( widget );
 		Keramik::GradientPainter::renderGradient( &p, widget->rect(),
-			 widget->tqcolorGroup().button(), horiz_grad, false,
+			 widget->colorGroup().button(), horiz_grad, false,
 			 x_offset, y_offset, toolWidth, toolHeight);
 	}
 }
 
-// This function draws primitive elements as well as their tqmasks.
+// This function draws primitive elements as well as their masks.
 void KeramikStyle::drawPrimitive( PrimitiveElement pe,
 									TQPainter *p,
 									const TQRect &r,
@@ -944,7 +944,7 @@ void KeramikStyle::drawPrimitive( PrimitiveElement pe,
 
 			//p->setPen( cg.shadow() );
 			//p->drawRect( r.x()+1, r.y()+1, r.width()-2, r.height()-2);
-			//p->fillRect( tqvisualRect( TQRect( x + 1, y + 1, 23, h - 2 ), r ), cg.background().dark( 105 ) );
+			//p->fillRect( visualRect( TQRect( x + 1, y + 1, 23, h - 2 ), r ), cg.background().dark( 105 ) );
 			//break;
 
 			// GENERAL PANELS
@@ -976,7 +976,7 @@ void KeramikStyle::drawPrimitive( PrimitiveElement pe,
 		case PE_WindowFrame:
 		{
 			bool sunken  = flags & Style_Sunken;
-			int lw = opt.isDefault() ? tqpixelMetric(PM_DefaultFrameWidth)
+			int lw = opt.isDefault() ? pixelMetric(PM_DefaultFrameWidth)
 				: opt.lineWidth();
 			if (lw == 2)
 			{
@@ -1014,7 +1014,7 @@ void KeramikStyle::drawPrimitive( PrimitiveElement pe,
 
 			int x2 = r.x()+r.width()-1;
 			int y2 = r.y()+r.height()-1;
-			int lw = opt.isDefault() ? tqpixelMetric(PM_DefaultFrameWidth)
+			int lw = opt.isDefault() ? pixelMetric(PM_DefaultFrameWidth)
 				: opt.lineWidth();
 			if (lw)
 			{
@@ -1034,7 +1034,7 @@ void KeramikStyle::drawPrimitive( PrimitiveElement pe,
 			int y  = r.y();
 			int x2 = r.x() + r.width()  - 1;
 			int y2 = r.y() + r.height() - 1;
-			int lw = opt.isDefault() ? tqpixelMetric(PM_DefaultFrameWidth)
+			int lw = opt.isDefault() ? pixelMetric(PM_DefaultFrameWidth)
 				: opt.lineWidth();
 
 			if (lw)
@@ -1092,7 +1092,7 @@ void KeramikStyle::drawPrimitive( PrimitiveElement pe,
 			TQWidget*  paintWidget = dynamic_cast<TQWidget*>(p->device());
 			TQToolBar* parent      = 0;
 			if (paintWidget)
-				parent = ::qt_cast<TQToolBar*>(paintWidget->tqparentWidget());
+				parent = ::qt_cast<TQToolBar*>(paintWidget->parentWidget());
 
 			renderToolbarEntryBackground(p, parent, r, cg, (flags & Style_Horizontal) );
 			if ( !(flags & Style_Horizontal) )
@@ -1140,8 +1140,8 @@ void KeramikStyle::drawPrimitive( PrimitiveElement pe,
 
 				p->save();
 				if ( flags & Style_Down )
-					p->translate( tqpixelMetric( PM_ButtonShiftHorizontal ),
-							tqpixelMetric( PM_ButtonShiftVertical ) );
+					p->translate( pixelMetric( PM_ButtonShiftHorizontal ),
+							pixelMetric( PM_ButtonShiftVertical ) );
 
 				if ( flags & Style_Enabled )
 				{
@@ -1305,16 +1305,16 @@ bool KeramikStyle::isFormWidget(const TQWidget* widget) const
 {
 	//Form widgets are in the KHTMLView, but that has 2 further inner levels
 	//of widgets - QClipperWidget, and outside of that, QViewportWidget
-	TQWidget* potentialClipPort = widget->tqparentWidget();
+	TQWidget* potentialClipPort = widget->parentWidget();
 	if ( !potentialClipPort || potentialClipPort->isTopLevel() )
 	return false;
 
-	TQWidget* potentialViewPort = potentialClipPort->tqparentWidget();
+	TQWidget* potentialViewPort = potentialClipPort->parentWidget();
 	if (!potentialViewPort || potentialViewPort->isTopLevel() ||
 			qstrcmp(potentialViewPort->name(), "qt_viewport") )
 		return false;
 
-	TQWidget* potentialKHTML  = potentialViewPort->tqparentWidget();
+	TQWidget* potentialKHTML  = potentialViewPort->parentWidget();
 	if (!potentialKHTML || potentialKHTML->isTopLevel() ||
 			qstrcmp(potentialKHTML->className(), "KHTMLView") )
 		return false;
@@ -1323,7 +1323,7 @@ bool KeramikStyle::isFormWidget(const TQWidget* widget) const
 	return true;
 }
 
-void KeramikStyle::tqdrawControl( ControlElement element,
+void KeramikStyle::drawControl( ControlElement element,
 								  TQPainter *p,
 								  const TQWidget *widget,
 								  const TQRect &r,
@@ -1381,15 +1381,15 @@ void KeramikStyle::tqdrawControl( ControlElement element,
 			// Shift button contents if pushed.
 			if ( active )
 			{
-				x += tqpixelMetric(PM_ButtonShiftHorizontal, widget);
-				y += tqpixelMetric(PM_ButtonShiftVertical, widget);
+				x += pixelMetric(PM_ButtonShiftHorizontal, widget);
+				y += pixelMetric(PM_ButtonShiftVertical, widget);
 				flags |= Style_Sunken;
 			}
 
 			// Does the button have a popup menu?
 			if ( button->isMenuButton() )
 			{
-				int dx = tqpixelMetric( PM_MenuButtonIndicator, widget );
+				int dx = pixelMetric( PM_MenuButtonIndicator, widget );
 				if ( button->iconSet() && !button->iconSet()->isNull()  &&
 					(dx + button->iconSet()->pixmap (TQIconSet::Small, TQIconSet::Normal, TQIconSet::Off ).width()) >= w )
 				{
@@ -1397,7 +1397,7 @@ void KeramikStyle::tqdrawControl( ControlElement element,
 				}
 				else
 				{
-					drawPrimitive( PE_ArrowDown, p, tqvisualRect( TQRect(x + w - dx - 8, y + 2, dx, h - 4), r ),
+					drawPrimitive( PE_ArrowDown, p, visualRect( TQRect(x + w - dx - 8, y + 2, dx, h - 4), r ),
 							   cg, flags, opt );
 					w -= dx;
 				}
@@ -1446,18 +1446,18 @@ void KeramikStyle::tqdrawControl( ControlElement element,
 				}
 
 				if (cornArrow) //Draw over the icon
-					drawPrimitive( PE_ArrowDown, p, tqvisualRect( TQRect(x + w - 6, x + h - 6, 7, 7), r ),
+					drawPrimitive( PE_ArrowDown, p, visualRect( TQRect(x + w - 6, x + h - 6, 7, 7), r ),
 							   cg, flags, opt );
 			}
 
 			// Make the label indicate if the button is a default button or not
-			drawItem( p, TQRect(x, y, w, h), AlignCenter | ShowPrefix, button->tqcolorGroup(),
+			drawItem( p, TQRect(x, y, w, h), AlignCenter | ShowPrefix, button->colorGroup(),
 						button->isEnabled(), button->pixmap(), button->text(), -1,
-						&button->tqcolorGroup().buttonText() );
+						&button->colorGroup().buttonText() );
 
 			if ( flags & Style_HasFocus )
 				drawPrimitive( PE_FocusRect, p,
-				               tqvisualRect( subRect( SR_PushButtonFocusRect, widget ), widget ),
+				               visualRect( subRect( SR_PushButtonFocusRect, widget ), widget ),
 				               cg, flags );
 			break;
 		}
@@ -1465,13 +1465,13 @@ void KeramikStyle::tqdrawControl( ControlElement element,
 		case CE_ToolButtonLabel:
 		{
 		    //const TQToolButton *toolbutton = static_cast<const TQToolButton * >(widget);
-			bool onToolbar = widget->tqparentWidget() && widget->tqparentWidget()->inherits( "QToolBar" );
+			bool onToolbar = widget->parentWidget() && widget->parentWidget()->inherits( "QToolBar" );
 			TQRect nr = r;
 
 			if (!onToolbar)
 			{
-				if (widget->tqparentWidget() &&
-				 !qstrcmp(widget->tqparentWidget()->name(),"qt_maxcontrols" ) )
+				if (widget->parentWidget() &&
+				 !qstrcmp(widget->parentWidget()->name(),"qt_maxcontrols" ) )
 				{
 					//Make sure we don't cut into the endline
 					if (!qstrcmp(widget->name(), "close"))
@@ -1486,7 +1486,7 @@ void KeramikStyle::tqdrawControl( ControlElement element,
 				//	nr.setWidth(r.width()-2); //Account for shadow
 			}
 
-			KStyle::tqdrawControl(element, p, widget, nr, cg, flags, opt);
+			KStyle::drawControl(element, p, widget, nr, cg, flags, opt);
 			break;
 		}
 
@@ -1494,8 +1494,8 @@ void KeramikStyle::tqdrawControl( ControlElement element,
 		{
 			const TQTabBar* tabBar = static_cast< const TQTabBar* >( widget );
 
-			bool bottom = tabBar->tqshape() == TQTabBar::RoundedBelow ||
-			              tabBar->tqshape() == TQTabBar::TriangularBelow;
+			bool bottom = tabBar->shape() == TQTabBar::RoundedBelow ||
+			              tabBar->shape() == TQTabBar::TriangularBelow;
 
 			if ( flags & Style_Selected )
 			{
@@ -1551,7 +1551,7 @@ void KeramikStyle::tqdrawControl( ControlElement element,
 										 tb->orientation() == Qt::Horizontal);
 			}
 			else
-				KStyle::tqdrawControl( CE_DockWindowEmptyArea, p, 
+				KStyle::drawControl( CE_DockWindowEmptyArea, p, 
 					widget, r, cg, flags, opt );
 			break;
 		}
@@ -1607,7 +1607,7 @@ void KeramikStyle::tqdrawControl( ControlElement element,
 			bool enabled    = mi->isEnabled();
 			bool checkable  = popupmenu->isCheckable();
 			bool active     = flags & Style_Active;
-			bool etchtext   = tqstyleHint( SH_EtchDisabledText );
+			bool etchtext   = styleHint( SH_EtchDisabledText );
 			bool reverse    = TQApplication::reverseLayout();
 			if ( checkable )
 				checkcol = QMAX( checkcol, 20 );
@@ -1641,7 +1641,7 @@ void KeramikStyle::tqdrawControl( ControlElement element,
 				break;
 			}
 
-			TQRect cr = tqvisualRect( TQRect( x + 2, y + 2, checkcol - 1, h - 4 ), r );
+			TQRect cr = visualRect( TQRect( x + 2, y + 2, checkcol - 1, h - 4 ), r );
 			// Do we have an icon?
 			if ( mi->iconSet() )
 			{
@@ -1724,7 +1724,7 @@ void KeramikStyle::tqdrawControl( ControlElement element,
 				TQString s = mi->text();
 				// Does the menu item have a text label?
 				if ( !s.isNull() ) {
-					int t = s.tqfind( '\t' );
+					int t = s.find( '\t' );
 					int m = itemVMargin;
 					int text_flags = AlignVCenter | ShowPrefix | DontClip | SingleLine;
 					text_flags |= reverse ? AlignRight : AlignLeft;
@@ -1787,8 +1787,8 @@ void KeramikStyle::tqdrawControl( ControlElement element,
 			// Does the menu item have a submenu?
 			if ( mi->popup() ) {
 				PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
-				int dim = tqpixelMetric(PM_MenuButtonIndicator) - itemFrame;
-				TQRect vr = tqvisualRect( TQRect( x + w - arrowHMargin - itemFrame - dim,
+				int dim = pixelMetric(PM_MenuButtonIndicator) - itemFrame;
+				TQRect vr = visualRect( TQRect( x + w - arrowHMargin - itemFrame - dim,
 							y + h / 2 - dim / 2, dim, dim), r );
 
 				// Draw an arrow at the far end of the menu item
@@ -1868,7 +1868,7 @@ void KeramikStyle::tqdrawControl( ControlElement element,
 						//Here, we can't simply shift, as the painter code calculates everything based
 						//on the left corner, so we need to draw the 2 portions ourselves.
 
-						//Start off by checking the tqgeometry of the end pixmap - it introduces a bit of an offset
+						//Start off by checking the geometry of the end pixmap - it introduces a bit of an offset
 						TQSize   endDim = loader.size(keramik_progressbar + 3); //3 = 3*1 + 0 = (1,0) = cl
 
 						//We might not have anything to animate at all, though, if the ender is the only thing to paint
@@ -1914,27 +1914,27 @@ void KeramikStyle::tqdrawControl( ControlElement element,
 
 
 		default:
-			KStyle::tqdrawControl(element, p, widget, r, cg, flags, opt);
+			KStyle::drawControl(element, p, widget, r, cg, flags, opt);
 	}
 }
 
-void KeramikStyle::tqdrawControlMask( ControlElement element,
+void KeramikStyle::drawControlMask( ControlElement element,
 								    TQPainter *p,
 								    const TQWidget *widget,
 								    const TQRect &r,
 								    const TQStyleOption& opt ) const
 {
 	p->fillRect(r, color1);
-	tqmaskMode = true;
-	tqdrawControl( element, p, widget, r, TQApplication::palette().active(), TQStyle::Style_Default, opt);
-	tqmaskMode = false;
+	maskMode = true;
+	drawControl( element, p, widget, r, TQApplication::palette().active(), TQStyle::Style_Default, opt);
+	maskMode = false;
 }
 
 bool KeramikStyle::isSizeConstrainedCombo(const TQComboBox* combo) const
 {
 	if (combo->width() >= 80)
 		return false;
-	int suggestedWidth = combo->tqsizeHint().width();
+	int suggestedWidth = combo->sizeHint().width();
 	
 	if (combo->width() - suggestedWidth < -5)
 		return true;
@@ -1942,7 +1942,7 @@ bool KeramikStyle::isSizeConstrainedCombo(const TQComboBox* combo) const
 	return false;
 }
 
-void KeramikStyle::tqdrawComplexControl( ComplexControl control,
+void KeramikStyle::drawComplexControl( ComplexControl control,
                                          TQPainter *p,
                                          const TQWidget *widget,
                                          const TQRect &r,
@@ -1996,8 +1996,8 @@ void KeramikStyle::tqdrawComplexControl( ComplexControl control,
 			//When in compact mode, we force the shadow-less bevel mode,
 			//but that also alters height and not just width.
 			//readjust height to fake the other metrics (plus clear 
-			//the other areas, as appropriate). The autotqmasker
-			//will take care of the overall tqshape.
+			//the other areas, as appropriate). The automasker
+			//will take care of the overall shape.
 			if ( compact )
 			{
 				forceSmallMode = true;
@@ -2019,7 +2019,7 @@ void KeramikStyle::tqdrawComplexControl( ComplexControl control,
 				toolbarBlendWidget = 0;
 			}
 
-			// don't draw the focus rect etc. on the tqmask
+			// don't draw the focus rect etc. on the mask
 			if ( cg.button() == color1 && cg.background() == color0 )
 				break;
 
@@ -2033,11 +2033,11 @@ void KeramikStyle::tqdrawComplexControl( ComplexControl control,
 				if (!compact)
 				{
 					ar.setWidth(ar.width()-13);
-					TQRect rr = tqvisualRect( TQRect( ar.x(), ar.y() + 4,
+					TQRect rr = visualRect( TQRect( ar.x(), ar.y() + 4,
 							loader.size(keramik_ripple ).width(), ar.height() - 8 ),
 							widget );
 
-					ar = tqvisualRect( TQRect( ar.x() + loader.size( keramik_ripple ).width() + 4, ar.y(), 
+					ar = visualRect( TQRect( ar.x() + loader.size( keramik_ripple ).width() + 4, ar.y(), 
 											11, ar.height() ), 
 									widget );
 
@@ -2054,7 +2054,7 @@ void KeramikStyle::tqdrawComplexControl( ComplexControl control,
 				else //Size-constrained combo -- loose the ripple.
 				{
 					ar.setWidth(ar.width() - 7);
-					ar = tqvisualRect( TQRect( ar.x(), ar.y(), 11, ar.height() ), widget);
+					ar = visualRect( TQRect( ar.x(), ar.y(), 11, ar.height() ), widget);
 					TQPointArray a;
 	
 					a.setPoints(QCOORDARRLEN(keramik_combo_arrow), keramik_combo_arrow);
@@ -2069,7 +2069,7 @@ void KeramikStyle::tqdrawComplexControl( ComplexControl control,
 			{
 				if ( cb->editable() )
 				{
-					TQRect er = tqvisualRect( querySubControlMetrics( CC_ComboBox, widget, SC_ComboBoxEditField ), widget );
+					TQRect er = visualRect( querySubControlMetrics( CC_ComboBox, widget, SC_ComboBoxEditField ), widget );
 					er.addCoords( -2, -2, 2, 2 );
 					p2->fillRect( er, cg.base() );
 					drawPrimitive( PE_PanelLineEdit, p2, er, cg );
@@ -2078,7 +2078,7 @@ void KeramikStyle::tqdrawComplexControl( ComplexControl control,
 				}
 				else if ( cb->hasFocus() )
 				{
-					TQRect re = TQStyle::tqvisualRect(subRect(SR_ComboBoxFocusRect, cb), widget);
+					TQRect re = TQStyle::visualRect(subRect(SR_ComboBoxFocusRect, cb), widget);
 					if ( compact )
 						re.addCoords( 3, 3, 0, -3 );
 					p2->fillRect( re, cg.brush( TQColorGroup::Highlight ) );
@@ -2113,7 +2113,7 @@ void KeramikStyle::tqdrawComplexControl( ComplexControl control,
 		case CC_SpinWidget:
 		{
 			const TQSpinWidget* sw = static_cast< const TQSpinWidget* >( widget );
-			TQRect br = tqvisualRect( querySubControlMetrics( CC_SpinWidget, widget, SC_SpinWidgetButtonField ), widget );
+			TQRect br = visualRect( querySubControlMetrics( CC_SpinWidget, widget, SC_SpinWidgetButtonField ), widget );
 			if ( controls & SC_SpinWidgetButtonField )
 			{
 				Keramik::SpinBoxPainter().draw( p, br, cg.button(), cg.background(), !sw->isEnabled() );
@@ -2135,9 +2135,9 @@ void KeramikStyle::tqdrawComplexControl( ComplexControl control,
 		case CC_ScrollBar:
 		{
 			const TQScrollBar* sb = static_cast< const TQScrollBar* >( widget );
-			if (highlightScrollBar && sb->tqparentWidget()) //Don't do the check if not highlighting anyway
+			if (highlightScrollBar && sb->parentWidget()) //Don't do the check if not highlighting anyway
 			{
-				if (sb->tqparentWidget()->tqcolorGroup().button() != sb->tqcolorGroup().button())
+				if (sb->parentWidget()->colorGroup().button() != sb->colorGroup().button())
 					customScrollMode = true;
 			}
 			bool horizontal = sb->orientation() == Horizontal;
@@ -2208,14 +2208,14 @@ void KeramikStyle::tqdrawComplexControl( ComplexControl control,
 		// -------------------------------------------------------------------
 		case CC_ToolButton: {
 			const TQToolButton *toolbutton = (const TQToolButton *) widget;
-			bool onToolbar = widget->tqparentWidget() && widget->tqparentWidget()->inherits( "QToolBar" );
+			bool onToolbar = widget->parentWidget() && widget->parentWidget()->inherits( "QToolBar" );
 			bool onExtender = !onToolbar &&
-				widget->tqparentWidget() && widget->tqparentWidget()->inherits( "QToolBarExtensionWidget") &&
-				widget->tqparentWidget()->tqparentWidget()->inherits( "QToolBar" );
+				widget->parentWidget() && widget->parentWidget()->inherits( "QToolBarExtensionWidget") &&
+				widget->parentWidget()->parentWidget()->inherits( "QToolBar" );
 
 			bool onControlButtons = false;
-			if (!onToolbar && !onExtender && widget->tqparentWidget() &&
-				 !qstrcmp(widget->tqparentWidget()->name(),"qt_maxcontrols" ) )
+			if (!onToolbar && !onExtender && widget->parentWidget() &&
+				 !qstrcmp(widget->parentWidget()->name(),"qt_maxcontrols" ) )
 			{
 				onControlButtons = true;
 				titleBarMode = Maximized;
@@ -2254,11 +2254,11 @@ void KeramikStyle::tqdrawComplexControl( ComplexControl control,
 				}
 
 				// Check whether to draw a background pixmap
-				else if ( toolbutton->tqparentWidget() &&
-						  toolbutton->tqparentWidget()->backgroundPixmap() &&
-						  !toolbutton->tqparentWidget()->backgroundPixmap()->isNull() )
+				else if ( toolbutton->parentWidget() &&
+						  toolbutton->parentWidget()->backgroundPixmap() &&
+						  !toolbutton->parentWidget()->backgroundPixmap()->isNull() )
 				{
-					TQPixmap pixmap = *(toolbutton->tqparentWidget()->backgroundPixmap());
+					TQPixmap pixmap = *(toolbutton->parentWidget()->backgroundPixmap());
 					p->drawTiledPixmap( r, pixmap, toolbutton->pos() );
 				}
 				else if (onToolbar)
@@ -2311,14 +2311,14 @@ void KeramikStyle::tqdrawComplexControl( ComplexControl control,
 		case CC_TitleBar:
 			titleBarMode = Regular; //Handle buttons on titlebar different from toolbuttons
 		default:
-			KStyle::tqdrawComplexControl( control, p, widget,
+			KStyle::drawComplexControl( control, p, widget,
 						r, cg, flags, controls, active, opt );
 
 			titleBarMode = None;
 	}
 }
 
-void KeramikStyle::tqdrawComplexControlMask( ComplexControl control,
+void KeramikStyle::drawComplexControlMask( ComplexControl control,
                                          TQPainter *p,
                                          const TQWidget *widget,
                                          const TQRect &r,
@@ -2326,11 +2326,11 @@ void KeramikStyle::tqdrawComplexControlMask( ComplexControl control,
 {
 	if (control == CC_ComboBox)
 	{
-		tqmaskMode = true;
-		tqdrawComplexControl(CC_ComboBox, p, widget, r,
+		maskMode = true;
+		drawComplexControl(CC_ComboBox, p, widget, r,
 				TQApplication::palette().active(), Style_Default,
 				SC_ComboBoxFrame,SC_None, opt);
-		tqmaskMode = false;
+		maskMode = false;
 
 	}
 	else
@@ -2338,7 +2338,7 @@ void KeramikStyle::tqdrawComplexControlMask( ComplexControl control,
 
 }
 
-int KeramikStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const
+int KeramikStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const
 {
 	switch(m)
 	{
@@ -2395,8 +2395,8 @@ int KeramikStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const
 			const TQTabBar* tb = ::qt_cast<const TQTabBar*>(widget);
 			if (tb)
 			{
-				if (tb->tqshape() == TQTabBar::RoundedBelow || 
-					tb->tqshape() == TQTabBar::TriangularBelow)
+				if (tb->shape() == TQTabBar::RoundedBelow || 
+					tb->shape() == TQTabBar::TriangularBelow)
 					return 0;
 			}
 			
@@ -2408,7 +2408,7 @@ int KeramikStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const
 			return titleBarH;
 
 		default:
-			return KStyle::tqpixelMetric(m, widget);
+			return KStyle::pixelMetric(m, widget);
 	}
 }
 
@@ -2426,8 +2426,8 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents,
 		{
 			const TQPushButton* btn = static_cast< const TQPushButton* >( widget );
 
-			int w = contentSize.width() + 2 * tqpixelMetric( PM_ButtonMargin, widget );
-			int h = contentSize.height() + 2 * tqpixelMetric( PM_ButtonMargin, widget );
+			int w = contentSize.width() + 2 * pixelMetric( PM_ButtonMargin, widget );
+			int h = contentSize.height() + 2 * pixelMetric( PM_ButtonMargin, widget );
 			if ( btn->text().isEmpty() && contentSize.width() < 32 ) return TQSize( w, h );
 
 
@@ -2440,7 +2440,7 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents,
 
 		case CT_ToolButton:
 		{
-			bool onToolbar = widget->tqparentWidget() && widget->tqparentWidget()->inherits( "QToolBar" );
+			bool onToolbar = widget->parentWidget() && widget->parentWidget()->inherits( "QToolBar" );
 			if (!onToolbar) //Behaves like a button, so scale appropriately to the border
 			{
 				int w = contentSize.width();
@@ -2473,8 +2473,8 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents,
 			int w = contentSize.width(), h = contentSize.height();
 
 			if ( mi->custom() ) {
-				w = mi->custom()->tqsizeHint().width();
-				h = mi->custom()->tqsizeHint().height();
+				w = mi->custom()->sizeHint().width();
+				h = mi->custom()->sizeHint().height();
 				if ( ! mi->custom()->fullSpan() )
 					h += 2*itemVMargin + 2*itemFrame;
 			}
@@ -2500,7 +2500,7 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents,
 								2 * itemFrame );
 			}
 
-			if ( ! mi->text().isNull() && mi->text().tqfind('\t') >= 0 )
+			if ( ! mi->text().isNull() && mi->text().find('\t') >= 0 )
 				w += itemHMargin + itemFrame*2 + 7;
 			else if ( mi->popup() )
 				w += 2 * arrowHMargin;
@@ -2584,7 +2584,7 @@ TQRect KeramikStyle::querySubControlMetrics( ComplexControl control,
 				{
 					//Note that the widget here == the combo, not the completion
 					//box, so we don't get any recursion
-					int suggestedWidth = widget->tqsizeHint().width(); 
+					int suggestedWidth = widget->sizeHint().width(); 
 					TQRect def = opt.rect();
 					def.addCoords( 4, -4, -6, 4 );
 					
@@ -2621,7 +2621,7 @@ TQRect KeramikStyle::querySubControlMetrics( ComplexControl control,
 			{
 				int range = sb->maxValue() - sb->minValue();
 				sliderlen = ( sb->pageStep() * maxlen ) / ( range + sb->pageStep() );
-				slidermin = tqpixelMetric( PM_ScrollBarSliderMin, sb );
+				slidermin = pixelMetric( PM_ScrollBarSliderMin, sb );
 				if ( sliderlen < slidermin ) sliderlen = slidermin;
 				if ( sliderlen > maxlen ) sliderlen = maxlen;
 			}
@@ -2664,9 +2664,9 @@ TQRect KeramikStyle::querySubControlMetrics( ComplexControl control,
 			bool horizontal = sl->orientation() == Horizontal;
 			TQSlider::TickSetting ticks = sl->tickmarks();
 			int pos = sl->sliderStart();
-			int size = tqpixelMetric( PM_SliderControlThickness, widget );
-			int handleSize = tqpixelMetric( PM_SliderThickness, widget );
-			int len = tqpixelMetric( PM_SliderLength, widget );
+			int size = pixelMetric( PM_SliderControlThickness, widget );
+			int handleSize = pixelMetric( PM_SliderThickness, widget );
+			int len = pixelMetric( PM_SliderLength, widget );
 
 			//Shrink the metrics if the widget is too small
 			//to fit our normal values for them.
@@ -2749,7 +2749,7 @@ bool KeramikStyle::eventFilter( TQObject* object, TQEvent* event )
 	{
 		TQWidget* button = static_cast<TQWidget*>(object);
 		hoverWidget = 0;
-		button->tqrepaint( false );
+		button->repaint( false );
 		return false;
 	}
 
@@ -2759,7 +2759,7 @@ bool KeramikStyle::eventFilter( TQObject* object, TQEvent* event )
 		if (event->type() == TQEvent::Enter && static_cast<TQWidget*>(object)->isEnabled() )
 		{
 			hoverWidget = static_cast<TQWidget*>(object);
-			hoverWidget->tqrepaint( false );
+			hoverWidget->repaint( false );
 		}
 		return false;
 	}
@@ -2787,7 +2787,7 @@ bool KeramikStyle::eventFilter( TQObject* object, TQEvent* event )
 		switch (event->type())
 		{
 #ifdef HAVE_X11_EXTENSIONS_SHAPE_H
-			//Combo dropdowns are tqshaped	
+			//Combo dropdowns are shaped	
 			case TQEvent::Resize:
 			{
 				TQListBox* listbox = static_cast<TQListBox*>(object);
@@ -2819,7 +2819,7 @@ bool KeramikStyle::eventFilter( TQObject* object, TQEvent* event )
 				TQPaintEvent* paint = (TQPaintEvent*) event;
 		
 		
-				if ( !listbox->contentsRect().tqcontains( paint->rect() ) )
+				if ( !listbox->contentsRect().contains( paint->rect() ) )
 				{
 					TQPainter p( listbox );
 					Keramik::RectTilePainter( keramik_combobox_list, false, false ).draw( &p, 0, 0, listbox->width(), listbox->height(),
@@ -2858,12 +2858,12 @@ bool KeramikStyle::eventFilter( TQObject* object, TQEvent* event )
 					TQMouseEvent* mev = static_cast<TQMouseEvent*>(event);
 					TQListBox*    box = static_cast<TQListBox*>   (object);
 					
-					TQWidget* parent = box->tqparentWidget();
+					TQWidget* parent = box->parentWidget();
 					if (!parent)
 						return false;
 					
 					TQPoint inParCoords = parent->mapFromGlobal(mev->globalPos());
-					if (parent->rect().tqcontains(inParCoords))
+					if (parent->rect().contains(inParCoords))
 						return true;
 				}
 				break;
@@ -2899,20 +2899,20 @@ bool KeramikStyle::eventFilter( TQObject* object, TQEvent* event )
 
 		if ( toolbar->orientation() == Qt::Horizontal )
 		{
-			Keramik::GradientPainter::renderGradient( &p, wr, widget->tqcolorGroup().button(),
+			Keramik::GradientPainter::renderGradient( &p, wr, widget->colorGroup().button(),
 													  true /*horizontal*/, false /*not a menu*/,
 													  0, widget->y(), wr.width(), tr.height());
 		}
 		else
 		{
-			Keramik::GradientPainter::renderGradient( &p, wr, widget->tqcolorGroup().button(),
+			Keramik::GradientPainter::renderGradient( &p, wr, widget->colorGroup().button(),
 													  false /*vertical*/, false /*not a menu*/,
 													  widget->x(), 0, tr.width(), wr.height());
 		}
 
 		
 		//Draw terminator line, too
-		p.setPen( toolbar->tqcolorGroup().mid() );
+		p.setPen( toolbar->colorGroup().mid() );
 		if ( toolbar->orientation() == Qt::Horizontal )
 			p.drawLine( wr.width()-1, 0, wr.width()-1, wr.height()-1 );
 		else
@@ -2932,4 +2932,4 @@ bool KeramikStyle::eventFilter( TQObject* object, TQEvent* event )
 }
 
 // vim: ts=4 sw=4 noet
-// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off;
+// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off;
diff --git a/kstyles/keramik/keramik.h b/kstyles/keramik/keramik.h
index 135a92751..03d97ee3a 100644
--- a/kstyles/keramik/keramik.h
+++ b/kstyles/keramik/keramik.h
@@ -70,7 +70,7 @@ public:
 	                    SFlags flags = Style_Default,
 	                    const TQStyleOption& = TQStyleOption::Default ) const;
 
-	void tqdrawControl( ControlElement element,
+	void drawControl( ControlElement element,
 	                  TQPainter* p,
 	                  const TQWidget* widget,
 	                  const TQRect& r,
@@ -78,13 +78,13 @@ public:
 	                  SFlags flags = Style_Default,
 	                  const TQStyleOption& opt = TQStyleOption::Default ) const;
 
-	void tqdrawControlMask( ControlElement element,
+	void drawControlMask( ControlElement element,
 	                      TQPainter* p,
 	                      const TQWidget* widget,
 	                      const TQRect& r,
 	                      const TQStyleOption& opt = TQStyleOption::Default ) const;
 
-	void tqdrawComplexControl( ComplexControl control,
+	void drawComplexControl( ComplexControl control,
 	                         TQPainter* p,
 	                         const TQWidget* widget,
 	                         const TQRect& r,
@@ -94,13 +94,13 @@ public:
 	                         SCFlags active = SC_None,
 	                         const TQStyleOption& = TQStyleOption::Default ) const;
 
-	void tqdrawComplexControlMask( ComplexControl control,
+	void drawComplexControlMask( ComplexControl control,
 	                             TQPainter* p,
 	                             const TQWidget* widget,
 	                             const TQRect& r,
 	                             const TQStyleOption& = TQStyleOption::Default ) const;
 
-	int tqpixelMetric( PixelMetric m, const TQWidget* widget = 0 ) const;
+	int pixelMetric( PixelMetric m, const TQWidget* widget = 0 ) const;
 
 	TQSize sizeFromContents( ContentsType contents,
 	                        const TQWidget* widget,
@@ -133,7 +133,7 @@ private:
 
 	//Rendering flags
 	mutable bool forceSmallMode;
-	mutable bool tqmaskMode;   //Ugly round trip flag to permit tqmasking with little code;
+	mutable bool maskMode;   //Ugly round trip flag to permit masking with little code;
 	mutable bool formMode;   //Set when rendering form widgets
 
 	mutable const TQWidget* toolbarBlendWidget;  //Ditto for blending with toolbars
@@ -166,15 +166,15 @@ private:
 		if (formMode)
 		{
 			//If we're a form widget, we blend on painting, and consider ourselves
-			//not to have a tqmask (so we don't get clipped to it)
-			if (tqmaskMode)
+			//not to have a mask (so we don't get clipped to it)
+			if (maskMode)
 				return Keramik::TilePainter::PaintTrivialMask;
 			else
 				return Keramik::TilePainter::PaintFullBlend;
 		}
 		else
 		{
-			if (tqmaskMode)
+			if (maskMode)
 				return Keramik::TilePainter::PaintMask;
 			else
 				return Keramik::TilePainter::PaintNormal;
@@ -183,7 +183,7 @@ private:
 
 	Keramik::TilePainter::PaintMode pmodeFullBlend() const
 	{
-		return tqmaskMode?Keramik::TilePainter::PaintMask : Keramik::TilePainter::PaintFullBlend;
+		return maskMode?Keramik::TilePainter::PaintMask : Keramik::TilePainter::PaintFullBlend;
 	}
 
 	TQWidget* hoverWidget;
@@ -204,4 +204,4 @@ private:
 #endif
 
 // vim: ts=4 sw=4 noet
-// kate: indent-width 4; tqreplace-tabs off; tab-width 4;
+// kate: indent-width 4; replace-tabs off; tab-width 4;
diff --git a/kstyles/keramik/pixmaploader.cpp b/kstyles/keramik/pixmaploader.cpp
index 3013c8277..01cdf5fc6 100644
--- a/kstyles/keramik/pixmaploader.cpp
+++ b/kstyles/keramik/pixmaploader.cpp
@@ -69,13 +69,13 @@ TQImage* PixmapLoader::getDisabled(int name, const TQColor& color, const TQColor
 
 
 	//OK, now, fill it in, using the color..
-	TQ_UINT32 r, g,b;
-	TQ_UINT32 i = tqGray(color.rgb());
+	Q_UINT32 r, g,b;
+	Q_UINT32 i = qGray(color.rgb());
 	r = (3*color.red()+i)>>2;
 	g = (3*color.green()+i)>>2;
 	b = (3*color.blue()+i)>>2;
 
-	TQ_UINT32 br = back.red(), bg = back.green(), bb = back.blue();
+	Q_UINT32 br = back.red(), bg = back.green(), bb = back.blue();
 
 
 	if (edata->haveAlpha)
@@ -83,21 +83,21 @@ TQImage* PixmapLoader::getDisabled(int name, const TQColor& color, const TQColor
 		if (blend)
 		{
 			img->setAlphaBuffer(false);
-			TQ_UINT32* write = reinterpret_cast< TQ_UINT32* >(img->bits() );
+			Q_UINT32* write = reinterpret_cast< Q_UINT32* >(img->bits() );
 			int size = img->width()*img->height() * 3;
 
 			for (int pos = 0; pos < size; pos+=3)
 			{
-				TQ_UINT32 scale  = edata->data[pos];
-				TQ_UINT32 add    = (edata->data[pos+1]*i+127)>>8;
-				TQ_UINT32 alpha = edata->data[pos+2];
-				TQ_UINT32 destAlpha = 256 - alpha;
+				Q_UINT32 scale  = edata->data[pos];
+				Q_UINT32 add    = (edata->data[pos+1]*i+127)>>8;
+				Q_UINT32 alpha = edata->data[pos+2];
+				Q_UINT32 destAlpha = 256 - alpha;
 
-				TQ_UINT32 rr = clamp[((r*scale+127)>>8) + add];
-				TQ_UINT32 rg = clamp[((g*scale+127)>>8) + add];
-				TQ_UINT32 rb = clamp[((b*scale+127)>>8) + add];
+				Q_UINT32 rr = clamp[((r*scale+127)>>8) + add];
+				Q_UINT32 rg = clamp[((g*scale+127)>>8) + add];
+				Q_UINT32 rb = clamp[((b*scale+127)>>8) + add];
 
-				*write =tqRgb(((rr*alpha+127)>>8) + ((br*destAlpha+127)>>8),
+				*write =qRgb(((rr*alpha+127)>>8) + ((br*destAlpha+127)>>8),
 									((rg*alpha+127)>>8) + ((bg*destAlpha+127)>>8),
 									((rb*alpha+127)>>8) + ((bb*destAlpha+127)>>8));
 
@@ -107,20 +107,20 @@ TQImage* PixmapLoader::getDisabled(int name, const TQColor& color, const TQColor
 		else
 		{
 			img->setAlphaBuffer(true);
-			TQ_UINT32* write = reinterpret_cast< TQ_UINT32* >(img->bits() );
+			Q_UINT32* write = reinterpret_cast< Q_UINT32* >(img->bits() );
 			int size = img->width()*img->height() * 3;
 
 			for (int pos = 0; pos < size; pos+=3)
 			{
-				TQ_UINT32 scale  = edata->data[pos];
-				TQ_UINT32 add    = (edata->data[pos+1]*i+127)>>8;
-				TQ_UINT32 alpha = edata->data[pos+2];
+				Q_UINT32 scale  = edata->data[pos];
+				Q_UINT32 add    = (edata->data[pos+1]*i+127)>>8;
+				Q_UINT32 alpha = edata->data[pos+2];
 
-				TQ_UINT32 rr = clamp[((r*scale+127)>>8) + add];
-				TQ_UINT32 rg = clamp[((g*scale+127)>>8) + add];
-				TQ_UINT32 rb = clamp[((b*scale+127)>>8) + add];
+				Q_UINT32 rr = clamp[((r*scale+127)>>8) + add];
+				Q_UINT32 rg = clamp[((g*scale+127)>>8) + add];
+				Q_UINT32 rb = clamp[((b*scale+127)>>8) + add];
 
-				*write =tqRgba(rr, rg, rb, alpha);
+				*write =qRgba(rr, rg, rb, alpha);
 
 				write++;
 			}
@@ -130,17 +130,17 @@ TQImage* PixmapLoader::getDisabled(int name, const TQColor& color, const TQColor
 	else
 	{
 		img->setAlphaBuffer(false);
-		TQ_UINT32* write = reinterpret_cast< TQ_UINT32* >(img->bits() );
+		Q_UINT32* write = reinterpret_cast< Q_UINT32* >(img->bits() );
 		int size = img->width()*img->height() * 2;
 
 		for (int pos = 0; pos < size; pos+=2)
 		{
-			TQ_UINT32 scale  = edata->data[pos];
-			TQ_UINT32 add    = (edata->data[pos+1]*i+127)>>8;
-			TQ_UINT32 rr = clamp[((r*scale+127)>>8) + add];
-			TQ_UINT32 rg = clamp[((g*scale+127)>>8) + add];
-			TQ_UINT32 rb = clamp[((b*scale+127)>>8) + add];
-			*write =tqRgb(rr, rg, rb);
+			Q_UINT32 scale  = edata->data[pos];
+			Q_UINT32 add    = (edata->data[pos+1]*i+127)>>8;
+			Q_UINT32 rr = clamp[((r*scale+127)>>8) + add];
+			Q_UINT32 rg = clamp[((g*scale+127)>>8) + add];
+			Q_UINT32 rb = clamp[((b*scale+127)>>8) + add];
+			*write =qRgb(rr, rg, rb);
 			write++;
 		}
 	}
@@ -158,14 +158,14 @@ TQImage* PixmapLoader::getColored(int name, const TQColor& color, const TQColor&
 	TQImage* img = new TQImage(edata->width, edata->height, 32);
 
 	//OK, now, fill it in, using the color..
-	TQ_UINT32 r, g,b;
+	Q_UINT32 r, g,b;
 	r = color.red() + 2;
 	g = color.green() + 2;
 	b = color.blue() + 2;
 
-//	int i = tqGray(color.rgb());
+//	int i = qGray(color.rgb());
 
-	TQ_UINT32 br = back.red(), bg = back.green(), bb = back.blue();
+	Q_UINT32 br = back.red(), bg = back.green(), bb = back.blue();
 
 	if (edata->haveAlpha)
 	{
@@ -173,23 +173,23 @@ TQImage* PixmapLoader::getColored(int name, const TQColor& color, const TQColor&
 		{
 			img->setAlphaBuffer(false);
 
-			TQ_UINT32* write = reinterpret_cast< TQ_UINT32* >(img->bits() );
+			Q_UINT32* write = reinterpret_cast< Q_UINT32* >(img->bits() );
 			int size = img->width()*img->height() * 3;
 			for (int pos = 0; pos < size; pos+=3)
 			{
-				TQ_UINT32 scale  = edata->data[pos];
-				TQ_UINT32 add    = edata->data[pos+1];
-				TQ_UINT32 alpha = edata->data[pos+2];
-				TQ_UINT32 destAlpha = 256 - alpha;
+				Q_UINT32 scale  = edata->data[pos];
+				Q_UINT32 add    = edata->data[pos+1];
+				Q_UINT32 alpha = edata->data[pos+2];
+				Q_UINT32 destAlpha = 256 - alpha;
 
 				if (scale != 0)
 					add = add*5/4;
 
-				TQ_UINT32 rr = clamp[((r*scale+127)>>8) + add];
-				TQ_UINT32 rg = clamp[((g*scale+127)>>8) + add];
-				TQ_UINT32 rb = clamp[((b*scale+127)>>8) + add];
+				Q_UINT32 rr = clamp[((r*scale+127)>>8) + add];
+				Q_UINT32 rg = clamp[((g*scale+127)>>8) + add];
+				Q_UINT32 rb = clamp[((b*scale+127)>>8) + add];
 
-				*write =tqRgb(((rr*alpha+127)>>8) + ((br*destAlpha+127)>>8),
+				*write =qRgb(((rr*alpha+127)>>8) + ((br*destAlpha+127)>>8),
 									((rg*alpha+127)>>8) + ((bg*destAlpha+127)>>8),
 									((rb*alpha+127)>>8) + ((bb*destAlpha+127)>>8));
 
@@ -200,22 +200,22 @@ TQImage* PixmapLoader::getColored(int name, const TQColor& color, const TQColor&
 		{
 			img->setAlphaBuffer(true);
 
-			TQ_UINT32* write = reinterpret_cast< TQ_UINT32* >(img->bits() );
+			Q_UINT32* write = reinterpret_cast< Q_UINT32* >(img->bits() );
 			int size = img->width()*img->height() * 3;
 
 			for (int pos = 0; pos < size; pos+=3)
 			{
-				TQ_UINT32 scale  = edata->data[pos];
-				TQ_UINT32 add    = edata->data[pos+1];
-				TQ_UINT32 alpha = edata->data[pos+2];
+				Q_UINT32 scale  = edata->data[pos];
+				Q_UINT32 add    = edata->data[pos+1];
+				Q_UINT32 alpha = edata->data[pos+2];
 				if (scale != 0)
 					add = add*5/4;
 
-				TQ_UINT32 rr = clamp[((r*scale+127)>>8) + add];
-				TQ_UINT32 rg = clamp[((g*scale+127)>>8) + add];
-				TQ_UINT32 rb = clamp[((b*scale+127)>>8) + add];
+				Q_UINT32 rr = clamp[((r*scale+127)>>8) + add];
+				Q_UINT32 rg = clamp[((g*scale+127)>>8) + add];
+				Q_UINT32 rb = clamp[((b*scale+127)>>8) + add];
 
-				*write =tqRgba(rr, rg, rb, alpha);
+				*write =qRgba(rr, rg, rb, alpha);
 				write++;
 			}
 		}
@@ -224,22 +224,22 @@ TQImage* PixmapLoader::getColored(int name, const TQColor& color, const TQColor&
 	{
 		img->setAlphaBuffer(false);
 
-		TQ_UINT32* write = reinterpret_cast< TQ_UINT32* >(img->bits() );
+		Q_UINT32* write = reinterpret_cast< Q_UINT32* >(img->bits() );
 		int size = img->width()*img->height() * 2;
 
 		for (int pos = 0; pos < size; pos+=2)
 		{
-			TQ_UINT32 scale  = edata->data[pos];
-			TQ_UINT32 add    = edata->data[pos+1];
+			Q_UINT32 scale  = edata->data[pos];
+			Q_UINT32 add    = edata->data[pos+1];
 			if (scale != 0)
 				add = add*5/4;
 
-			TQ_UINT32 rr = clamp[((r*scale+127)>>8) + add];
-			TQ_UINT32 rg = clamp[((g*scale+127)>>8) + add];
-			TQ_UINT32 rb = clamp[((b*scale+127)>>8) + add];
+			Q_UINT32 rr = clamp[((r*scale+127)>>8) + add];
+			Q_UINT32 rg = clamp[((g*scale+127)>>8) + add];
+			Q_UINT32 rb = clamp[((b*scale+127)>>8) + add];
 
 
-			*write =tqRgb(rr, rg, rb);
+			*write =qRgb(rr, rg, rb);
 			write++;
 		}
 	}
@@ -260,7 +260,7 @@ TQPixmap PixmapLoader::scale( int name, int width, int height, const TQColor& co
 
 	int key = entry.key();
 
-	if ((cacheEntry = m_pixmapCache.tqfind(key, true)))
+	if ((cacheEntry = m_pixmapCache.find(key, true)))
 	{
 		if (entry == *cacheEntry) //True match!
 			return *cacheEntry->m_pixmap;
@@ -422,12 +422,12 @@ void TilePainter::draw( TQPainter *p, int x, int y, int width, int height, const
 					}
 					else
 					{
-						const TQBitmap* tqmask  = scale( col, row, w, h, color,  bg, disabled, false ).tqmask();
-						if (tqmask)
+						const TQBitmap* mask  = scale( col, row, w, h, color,  bg, disabled, false ).mask();
+						if (mask)
 						{
 							p->setBackgroundColor(Qt::color0);
 							p->setPen(Qt::color1);
-							p->drawTiledPixmap( xpos, ypos, realW, realH, *tqmask);
+							p->drawTiledPixmap( xpos, ypos, realW, realH, *mask);
 						}
 						else
 							p->fillRect ( xpos, ypos, realW, realH, Qt::color1);
@@ -442,12 +442,12 @@ void TilePainter::draw( TQPainter *p, int x, int y, int width, int height, const
 					}
 					else
 					{
-						const TQBitmap* tqmask = tile( col, row, color, bg, disabled, false ).tqmask();
-						if (tqmask)
+						const TQBitmap* mask = tile( col, row, color, bg, disabled, false ).mask();
+						if (mask)
 						{
 							p->setBackgroundColor(Qt::color0);
 							p->setPen(Qt::color1);
-							p->drawTiledPixmap( xpos, ypos, realW, realH, *tqmask);
+							p->drawTiledPixmap( xpos, ypos, realW, realH, *mask);
 						}
 						else
 							p->fillRect ( xpos, ypos, realW, realH, Qt::color1);
@@ -626,4 +626,4 @@ int SpinBoxPainter::tileName( unsigned int column, unsigned int ) const
 }
 
 // vim: ts=4 sw=4 noet
-// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off;
+// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off;
diff --git a/kstyles/keramik/pixmaploader.h b/kstyles/keramik/pixmaploader.h
index 6b8440ec0..ab0bb4223 100644
--- a/kstyles/keramik/pixmaploader.h
+++ b/kstyles/keramik/pixmaploader.h
@@ -161,7 +161,7 @@ namespace Keramik
 
 		Note that the IDs and offsets are separated since we can reuse the same code in many
 		cases by splitting the widget identify from tile identity (as there are many
-		different widgets that have the same or similar tile tqlayout)
+		different widgets that have the same or similar tile layout)
 		*/
 		virtual int tileName( unsigned int, unsigned int ) const { return 0; }
 
@@ -364,4 +364,4 @@ namespace Keramik
 #endif
 
 // vim: ts=4 sw=4 noet
-// kate: indent-width 4; tqreplace-tabs off; tab-width 4;
+// kate: indent-width 4; replace-tabs off; tab-width 4;
diff --git a/kstyles/klegacy/klegacystyle.cpp b/kstyles/klegacy/klegacystyle.cpp
index 575edde01..0f998b2db 100644
--- a/kstyles/klegacy/klegacystyle.cpp
+++ b/kstyles/klegacy/klegacystyle.cpp
@@ -186,12 +186,12 @@ public:
 
 
 struct KLegacyImageDataKeyField {
-    TQ_INT8 function       : 8;
-    TQ_INT8 state          : 8;
-    TQ_INT8 shadow         : 4;
-    TQ_INT8 orientation    : 4;
-    TQ_INT8 arrowDirection : 4;
-    TQ_INT8 gapSide        : 4;
+    Q_INT8 function       : 8;
+    Q_INT8 state          : 8;
+    Q_INT8 shadow         : 4;
+    Q_INT8 orientation    : 4;
+    Q_INT8 arrowDirection : 4;
+    Q_INT8 gapSide        : 4;
 };
 
 
@@ -269,7 +269,7 @@ public:
 	: TQObject(parent, name)
     { d = 0; }
 
-    GtkObject *tqfind(TQRegExp &) const;
+    GtkObject *find(TQRegExp &) const;
 
     TQColor backColor(KLegacy::State);
     TQColor baseColor(KLegacy::State);
@@ -385,7 +385,7 @@ static TQPixmap *drawImage(TQImage *image, int width, int height,
 	}
 
 	// draw the image
-	bool tqmask = image->hasAlphaBuffer();
+	bool mask = image->hasAlphaBuffer();
 	TQBitmap bm(width, height);
 	bm.fill(Qt::color1);
 
@@ -406,7 +406,7 @@ static TQPixmap *drawImage(TQImage *image, int width, int height,
 		bitBlt(pixmap, x2[xx], y2[yy], &nimage[yy][xx],
 		       0, 0, w2[xx], h2[yy], Qt::CopyROP);
 
-		if (tqmask) {
+		if (mask) {
                     TQImage am = nimage[yy][xx].createAlphaMask();
 		    bitBlt(&bm, x2[xx], y2[yy], &am,
 			   0, 0, w2[xx], h2[yy], Qt::CopyROP);
@@ -414,7 +414,7 @@ static TQPixmap *drawImage(TQImage *image, int width, int height,
 	    }
 	}
 
-	if (tqmask)
+	if (mask)
 	    pixmap->setMask(bm);
     } else {
 	for (int y = 0; y < height; y += image->height())
@@ -422,12 +422,12 @@ static TQPixmap *drawImage(TQImage *image, int width, int height,
 		bitBlt(pixmap, x, y, image, 0, 0, -1, -1, Qt::CopyROP);
 
 	if (image->hasAlphaBuffer()) {
-	    TQImage tqmask = image->createAlphaMask();
+	    TQImage mask = image->createAlphaMask();
 
-	    if (! tqmask.isNull() && tqmask.depth() == 1) {
+	    if (! mask.isNull() && mask.depth() == 1) {
 		TQBitmap bm(width, height);
 		bm.fill(Qt::color1);
-		bm = tqmask;
+		bm = mask;
 		pixmap->setMask(bm);
 	    }
 	}
@@ -568,8 +568,8 @@ static GtkObject *initialize(TQPtrDict<GtkObject> &dict) {
 	new GtkObject( myGtkOptionMenu, "GtkCombo" );
 
 
-    GtkObject * myGtktqStatusbar =
-	new GtkObject( myGtkHBox, "GtktqStatusbar" );
+    GtkObject * myGtkStatusbar =
+	new GtkObject( myGtkHBox, "GtkStatusbar" );
     GtkObject * myGtkCList =
 	new GtkObject( myGtkContainer, "GtkCList" );
     GtkObject * myGtkCTree =
@@ -712,7 +712,7 @@ static GtkObject *initialize(TQPtrDict<GtkObject> &dict) {
     dict.insert(TQSlider::staticMetaObject(), myGtkScale);
     dict.insert(TQSpinBox::staticMetaObject(), myGtkSpinButton);
     dict.insert(TQSplitter::staticMetaObject(), myGtkPaned);
-    dict.insert(TQStatusBar::staticMetaObject(), myGtktqStatusbar);
+    dict.insert(TQStatusBar::staticMetaObject(), myGtkStatusbar);
     dict.insert(TQTabBar::staticMetaObject(), myGtkNotebook);
     dict.insert(TQTabDialog::staticMetaObject(), myGtkNotebook);
     dict.insert(TQTabWidget::staticMetaObject(), myGtkNotebook);
@@ -848,7 +848,7 @@ TQFont *GtkObject::font() {
 }
 
 
-GtkObject *GtkObject::tqfind(TQRegExp &r) const {
+GtkObject *GtkObject::find(TQRegExp &r) const {
     // if the regular expression matches the name of this widget, return
     if (r.match(name()) != -1) {
 	return (GtkObject *) this;
@@ -866,7 +866,7 @@ GtkObject *GtkObject::tqfind(TQRegExp &r) const {
     while ((o = ot.current()) != 0) {
 	++ot;
 
-	// this would be nice if tqmoc could parse this file :/
+	// this would be nice if moc could parse this file :/
 	//
 	// if (o->className() != "GtkObject") {
 	//     qDebug("object is not a GtkObject (className = '%s')",
@@ -876,10 +876,10 @@ GtkObject *GtkObject::tqfind(TQRegExp &r) const {
 
 	obj = (GtkObject *) o;
 
-	// use obj->tqfind(r) instead of r.match(obj->name()) so that this child's
+	// use obj->find(r) instead of r.match(obj->name()) so that this child's
 	// children will be searched as well... this allows us to search the entire
 	// object tree
-	if ((gobj = obj->tqfind(r)) != 0) {
+	if ((gobj = obj->find(r)) != 0) {
 	    // found something!
 	    return (GtkObject *) gobj;
 	}
@@ -909,7 +909,7 @@ TQPixmap *GtkObject::draw(KLegacyImageData *imagedata, int width, int height) {
 	imagedata->key.cachekey << "_" << (uint) imagedata->recolorable <<
 	(uint) imagedata->stretch << (uint) imagedata->overlayStretch;
 
-    TQPixmap *pixmap = TQPixmapCache::tqfind(pixmapKey);
+    TQPixmap *pixmap = TQPixmapCache::find(pixmapKey);
     if (pixmap) {
 	return pixmap;
     }
@@ -917,7 +917,7 @@ TQPixmap *GtkObject::draw(KLegacyImageData *imagedata, int width, int height) {
     TQPixmap *main = 0, *overlay = 0;
 
     if (! imagedata->file.isNull()) {
-	TQImage *image = imageCache->tqfind(imagedata->file);
+	TQImage *image = imageCache->find(imagedata->file);
 	bool found = true;
 
 	if (! image) {
@@ -938,7 +938,7 @@ TQPixmap *GtkObject::draw(KLegacyImageData *imagedata, int width, int height) {
     }
 
     if (! imagedata->overlayFile.isNull()) {
-	TQImage *image = imageCache->tqfind(imagedata->overlayFile);
+	TQImage *image = imageCache->find(imagedata->overlayFile);
 	bool found = true;
 
 	if (! image) {
@@ -989,24 +989,24 @@ TQPixmap *GtkObject::draw(KLegacyImageData *imagedata, int width, int height) {
     p.end();
 
     if (main) {
-	if (main->tqmask() && (! main->tqmask()->isNull())) {
+	if (main->mask() && (! main->mask()->isNull())) {
 	    TQBitmap bm(sz);
 	    TQPainter m(&bm);
 	    TQRect r(0, 0, width, height);
 
-	    m.drawTiledPixmap(r, *(main->tqmask()));
+	    m.drawTiledPixmap(r, *(main->mask()));
 	    m.end();
 
 	    pixmap->setMask(bm);
 	}
     } else if (overlay) {
-	if (overlay->tqmask() && (! overlay->tqmask()->isNull())) {
+	if (overlay->mask() && (! overlay->mask()->isNull())) {
 	    TQBitmap bm(sz);
 	    TQPainter m(&bm);
 	    TQRect r((sz.width() - overlay->width()) / 2,
 		    (sz.height() - overlay->height()) / 2,
 		    sz.width(), sz.height());
-	    m.drawTiledPixmap(r, *(overlay->tqmask()));
+	    m.drawTiledPixmap(r, *(overlay->mask()));
 	    m.end();
 
 	    pixmap->setMask(bm);
@@ -1149,14 +1149,14 @@ bool KLegacyStylePrivate::parseClass() {
 
     TQRegExp r(classname);
     r.setWildcard(true);
-    GtkObject *obj = gtktree->tqfind(r);
+    GtkObject *obj = gtktree->find(r);
 
     if (! obj) {
 	qWarning("unknown object '%s'", classname.latin1());
 	return false;
     }
 
-    KLegacyStyleData *styledata = styleDict.tqfind(stylename);
+    KLegacyStyleData *styledata = styleDict.find(stylename);
 
     if (! styledata) {
 	qWarning("no such style '%s' for class '%s' (%p)", stylename.latin1(),
@@ -1227,10 +1227,10 @@ bool KLegacyStylePrivate::parseImage(KLegacyStyleData *styledata) {
 	    TQString border =filestream.readLine();
 
 	    int lp, rp, tp, bp, l, r, t, b;
-	    lp = border.tqfind(',');
-	    rp = border.tqfind(',', lp + 1);
-	    tp = border.tqfind(',', rp + 1);
-	    bp = border.tqfind('}', tp + 1);
+	    lp = border.find(',');
+	    rp = border.find(',', lp + 1);
+	    tp = border.find(',', rp + 1);
+	    bp = border.find('}', tp + 1);
 
 	    l = border.left(lp).toUInt();
 	    r = border.mid(lp + 1, rp - lp - 1).toUInt();
@@ -1336,10 +1336,10 @@ bool KLegacyStylePrivate::parseImage(KLegacyStyleData *styledata) {
 	    TQString border = filestream.readLine();
 
 	    int lp, rp, tp, bp, l, r, t, b;
-	    lp = border.tqfind(',');
-	    rp = border.tqfind(',', lp + 1);
-	    tp = border.tqfind(',', rp + 1);
-	    bp = border.tqfind('}', tp + 1);
+	    lp = border.find(',');
+	    rp = border.find(',', lp + 1);
+	    tp = border.find(',', rp + 1);
+	    bp = border.find('}', tp + 1);
 
 	    l = border.left(lp).toUInt();
 	    r = border.mid(lp + 1, rp - lp - 1).toUInt();
@@ -1486,7 +1486,7 @@ bool KLegacyStylePrivate::parsePixmapPath() {
 
     next = next.mid(1, next.length() - 2);
 
-    int start = 0, end = next.tqfind(":");
+    int start = 0, end = next.find(":");
     while (end != -1) {
 	TQString path(next.mid(start, end - start));
 
@@ -1500,7 +1500,7 @@ bool KLegacyStylePrivate::parsePixmapPath() {
 	}
 
 	start = end + 1;
-	end = next.tqfind(":", start);
+	end = next.find(":", start);
     }
 
     // get the straggler
@@ -1543,7 +1543,7 @@ bool KLegacyStylePrivate::parseStyle() {
 
 	newstylename = newstylename.mid(1, newstylename.length() - 2);
 
-	KLegacyStyleData *styledata = styleDict.tqfind(stylename);
+	KLegacyStyleData *styledata = styleDict.find(stylename);
 
 	if (! styledata) return false;
 
@@ -1573,7 +1573,7 @@ bool KLegacyStylePrivate::parseStyle() {
 	}
 
 	if (next.left(5) == "base[") {
-	    int l = next.tqfind('['), r = next.tqfind(']'), state;
+	    int l = next.find('['), r = next.find(']'), state;
 
 	    if (l < 1 || r < 1 || r < l) continue;
 
@@ -1605,9 +1605,9 @@ bool KLegacyStylePrivate::parseStyle() {
 		int rp, gp, bp;
 		float ri, gi, bi;
 
-		rp = color.tqfind(',');
-		gp = color.tqfind(',', rp + 1);
-		bp = color.tqfind('}', gp + 1);
+		rp = color.find(',');
+		gp = color.find(',', rp + 1);
+		bp = color.find('}', gp + 1);
 
 		ri = color.left(rp).toFloat();
 		gi = color.mid(rp + 1, gp - rp - 1).toFloat();
@@ -1619,7 +1619,7 @@ bool KLegacyStylePrivate::parseStyle() {
 		styledata->base[state].setRgb(red, green, blue);
 	    }
 	} else if (next.left(3) == "bg[") {
-	    int l = next.tqfind('['), r = next.tqfind(']'), state;
+	    int l = next.find('['), r = next.find(']'), state;
 
 	    if (l < 1 || r < 1 || r < l) continue;
 
@@ -1651,9 +1651,9 @@ bool KLegacyStylePrivate::parseStyle() {
 		int rp, gp, bp;
 		float ri, gi, bi;
 
-		rp = color.tqfind(',');
-		gp = color.tqfind(',', rp + 1);
-		bp = color.tqfind('}', gp + 1);
+		rp = color.find(',');
+		gp = color.find(',', rp + 1);
+		bp = color.find('}', gp + 1);
 
 		ri = color.left(rp).toFloat();
 		gi = color.mid(rp + 1, gp - rp - 1).toFloat();
@@ -1668,7 +1668,7 @@ bool KLegacyStylePrivate::parseStyle() {
 	    if (! parseEngine(styledata))
 		fprintf(stderr, "engine parse error\n");
 	} else if (next.left(3) == "fg[") {
-	    int l = next.tqfind('['), r = next.tqfind(']'), state;
+	    int l = next.find('['), r = next.find(']'), state;
 
 	    if (l < 1 || r < 1 || r < l) continue;
 
@@ -1700,9 +1700,9 @@ bool KLegacyStylePrivate::parseStyle() {
 		int rp, gp, bp;
 		float ri, gi, bi;
 
-		rp = color.tqfind(',');
-		gp = color.tqfind(',', rp + 1);
-		bp = color.tqfind('}', gp + 1);
+		rp = color.find(',');
+		gp = color.find(',', rp + 1);
+		bp = color.find('}', gp + 1);
 
 		ri = color.left(rp).toFloat();
 		gi = color.mid(rp + 1, gp - rp - 1).toFloat();
@@ -1767,7 +1767,7 @@ void KLegacyStyle::polish(TQApplication *app) {
     priv->oldfont = app->font();
     priv->oldpalette = app->palette();
 
-    GtkObject *gobj = priv->gtkDict.tqfind(TQMainWindow::staticMetaObject());
+    GtkObject *gobj = priv->gtkDict.find(TQMainWindow::staticMetaObject());
 
     if (gobj) {
 	if (gobj->font()) {
@@ -1974,8 +1974,8 @@ void KLegacyStyle::polish(TQWidget *widget) {
 	widget->setBackgroundMode(TQWidget::PaletteBackground);
     }
 
-    GtkObject *gobj = gobj = priv->gtkDict.tqfind(((metaobject) ? metaobject :
-						 widget->tqmetaObject()));
+    GtkObject *gobj = gobj = priv->gtkDict.find(((metaobject) ? metaobject :
+						 widget->metaObject()));
 
     if (gobj) {
 	if (gobj->font() && (*gobj->font() != TQApplication::font()))
@@ -2115,7 +2115,7 @@ void KLegacyStyle::drawMenuBarItem(TQPainter *p, int x, int y, int w, int h, TQM
 				   TQColorGroup &g, bool enabled, bool active)
 {
     if (enabled && active) {
-	GtkObject *gobj = priv->gtkDict.tqfind(&menuitem_ptr);
+	GtkObject *gobj = priv->gtkDict.find(&menuitem_ptr);
 
 	if (gobj) {
 	    KLegacyImageDataKey key;
@@ -2147,7 +2147,7 @@ void KLegacyStyle::drawBevelButton(TQPainter *p, int x, int y, int w, int h,
 				const TQColorGroup & g, bool sunken,
 				const TQBrush *fill)
 {
-    GtkObject *gobj = priv->gtkDict.tqfind(TQButton::staticMetaObject());
+    GtkObject *gobj = priv->gtkDict.find(TQButton::staticMetaObject());
 
     if (! gobj) {
 	KStyle::drawBevelButton(p, x, y, w, h, g, sunken, fill);
@@ -2170,7 +2170,7 @@ void KLegacyStyle::drawBevelButton(TQPainter *p, int x, int y, int w, int h,
 
 
 void KLegacyStyle::drawPushButton(TQPushButton *btn, TQPainter *p) {
-    GtkObject *gobj = priv->gtkDict.tqfind(TQPushButton::staticMetaObject());
+    GtkObject *gobj = priv->gtkDict.find(TQPushButton::staticMetaObject());
 
     if (! gobj) {
 	KStyle::drawPushButton(btn, p);
@@ -2181,7 +2181,7 @@ void KLegacyStyle::drawPushButton(TQPushButton *btn, TQPainter *p) {
     key.cachekey = 0;
     key.data.function = KLegacy::Box;
 
-    TQColorGroup g = btn->tqcolorGroup();
+    TQColorGroup g = btn->colorGroup();
     TQBrush fill = g.brush(TQColorGroup::Button);
     int x1, y1, x2, y2;
     btn->rect().coords(&x1, &y1, &x2, &y2);
@@ -2237,7 +2237,7 @@ void KLegacyStyle::drawIndicator(TQPainter *p, int x, int y, int w, int h,
 			      const TQColorGroup &g, int state,
 			      bool down, bool enabled)
 {
-    GtkObject *gobj = priv->gtkDict.tqfind(TQCheckBox::staticMetaObject());
+    GtkObject *gobj = priv->gtkDict.find(TQCheckBox::staticMetaObject());
 
     if (! gobj) {
 	KStyle::drawIndicator(p, x, y, w, h, g, state, down, enabled);
@@ -2260,7 +2260,7 @@ void KLegacyStyle::drawIndicator(TQPainter *p, int x, int y, int w, int h,
 
 
 void KLegacyStyle::drawIndicatorMask(TQPainter *p, int x, int y, int w, int h, int state) {
-    GtkObject *gobj = priv->gtkDict.tqfind(TQCheckBox::staticMetaObject());
+    GtkObject *gobj = priv->gtkDict.find(TQCheckBox::staticMetaObject());
 
     if (! gobj) {
 	KStyle::drawIndicatorMask(p, x, y, w, h, state);
@@ -2275,15 +2275,15 @@ void KLegacyStyle::drawIndicatorMask(TQPainter *p, int x, int y, int w, int h, i
 
     TQPixmap *pix = gobj->draw(key, w, h, "checkbutton");
 
-    if (pix && pix->tqmask() && ! pix->tqmask()->isNull())
-	p->drawPixmap(x, y, *(pix->tqmask()));
+    if (pix && pix->mask() && ! pix->mask()->isNull())
+	p->drawPixmap(x, y, *(pix->mask()));
     else
 	KStyle::drawIndicatorMask(p, x, y, w, h, state);
 }
 
 
 TQSize KLegacyStyle::indicatorSize(void) const {
-    GtkObject *gobj = priv->gtkDict.tqfind(TQCheckBox::staticMetaObject());
+    GtkObject *gobj = priv->gtkDict.find(TQCheckBox::staticMetaObject());
 
     if (! gobj)	return KStyle::indicatorSize();
 
@@ -2303,7 +2303,7 @@ TQSize KLegacyStyle::indicatorSize(void) const {
     else
 	return KStyle::indicatorSize();
 
-    TQImage *image = imageCache->tqfind(filename);
+    TQImage *image = imageCache->find(filename);
     if (! image) {
         image = new TQImage(filename);
 
@@ -2320,7 +2320,7 @@ void KLegacyStyle::drawExclusiveIndicator(TQPainter *p, int x, int y, int w, int
 				      const TQColorGroup &g, bool on,
 				       bool down, bool enabled)
 {
-    GtkObject *gobj = priv->gtkDict.tqfind(TQRadioButton::staticMetaObject());
+    GtkObject *gobj = priv->gtkDict.find(TQRadioButton::staticMetaObject());
 
     if (! gobj) {
 	drawExclusiveIndicator(p, x, y, w, h, g, on, down, enabled);
@@ -2345,7 +2345,7 @@ void KLegacyStyle::drawExclusiveIndicator(TQPainter *p, int x, int y, int w, int
 void KLegacyStyle::drawExclusiveIndicatorMask(TQPainter *p, int x, int y, int w, int h,
 					   bool on)
 {
-    GtkObject *gobj = priv->gtkDict.tqfind(TQRadioButton::staticMetaObject());
+    GtkObject *gobj = priv->gtkDict.find(TQRadioButton::staticMetaObject());
 
     if (! gobj) {
 	KStyle::drawExclusiveIndicatorMask(p, x, y, w, h, on);
@@ -2360,15 +2360,15 @@ void KLegacyStyle::drawExclusiveIndicatorMask(TQPainter *p, int x, int y, int w,
 
     TQPixmap *pix = gobj->draw(key, w, h, "radiobutton");
 
-    if (pix && pix->tqmask() && ! pix->tqmask()->isNull())
-	p->drawPixmap(x, y, *(pix->tqmask()));
+    if (pix && pix->mask() && ! pix->mask()->isNull())
+	p->drawPixmap(x, y, *(pix->mask()));
     else
 	KStyle::drawExclusiveIndicatorMask(p, x, y, w, h, on);
 }
 
 
 TQSize KLegacyStyle::exclusiveIndicatorSize(void) const {
-    GtkObject *gobj = priv->gtkDict.tqfind(TQRadioButton::staticMetaObject());
+    GtkObject *gobj = priv->gtkDict.find(TQRadioButton::staticMetaObject());
 
     if (! gobj) {
 	return KStyle::indicatorSize();
@@ -2391,7 +2391,7 @@ TQSize KLegacyStyle::exclusiveIndicatorSize(void) const {
 	return KStyle::indicatorSize();
     }
 
-    TQImage *image = imageCache->tqfind(filename);
+    TQImage *image = imageCache->find(filename);
     if (! image) {
         image = new TQImage(filename);
 
@@ -2427,7 +2427,7 @@ void KLegacyStyle::drawPopupMenuItem(TQPainter *p, bool checkable, int maxpmw, i
     }
 
     if ( act && enabled ) {
-	GtkObject *gobj = priv->gtkDict.tqfind(&menuitem_ptr);
+	GtkObject *gobj = priv->gtkDict.find(&menuitem_ptr);
 
 	if (gobj) {
 	    KLegacyImageDataKey key;
@@ -2501,7 +2501,7 @@ void KLegacyStyle::drawPopupMenuItem(TQPainter *p, bool checkable, int maxpmw, i
 
     TQString s = mi->text();
     if ( !s.isNull() ) {			// draw text
-	int t = s.tqfind( '\t' );
+	int t = s.find( '\t' );
 	int m = 2;
 	const int text_flags = AlignVCenter|ShowPrefix | DontClip | SingleLine;
 	if ( t >= 0 ) {				// draw tab text
@@ -2531,7 +2531,7 @@ void KLegacyStyle::drawComboButton(TQPainter *p, int x, int y, int w, int h,
 				const TQColorGroup &g, bool sunken, bool editable,
 				bool enabled, const TQBrush *b)
 {
-    GtkObject *gobj = priv->gtkDict.tqfind(TQComboBox::staticMetaObject());
+    GtkObject *gobj = priv->gtkDict.find(TQComboBox::staticMetaObject());
 
     if (! gobj) {
 	KStyle::drawComboButton(p, x, y, w, h, g, sunken, editable, enabled, b);
@@ -2571,7 +2571,7 @@ void KLegacyStyle::drawComboButton(TQPainter *p, int x, int y, int w, int h,
 
 
 TQRect KLegacyStyle::comboButtonRect(int x, int y, int w, int h) {
-    GtkObject *gobj = priv->gtkDict.tqfind(TQComboBox::staticMetaObject());
+    GtkObject *gobj = priv->gtkDict.find(TQComboBox::staticMetaObject());
 
     if (! gobj) {
 	return KStyle::comboButtonRect(x, y, w, h);
@@ -2648,7 +2648,7 @@ void KLegacyStyle::drawScrollBarControls(TQPainter *p, const TQScrollBar *scroll
 {
     if (! scrollbar->isVisible()) return;
 
-    GtkObject *gobj = priv->gtkDict.tqfind(TQScrollBar::staticMetaObject());
+    GtkObject *gobj = priv->gtkDict.find(TQScrollBar::staticMetaObject());
 
     if (! gobj) {
 	KStyle::drawScrollBarControls(p, scrollbar, start, controls, active);
@@ -2696,7 +2696,7 @@ void KLegacyStyle::drawScrollBarControls(TQPainter *p, const TQScrollBar *scroll
     skey.data.function = KLegacy::Box;
     skey.data.orientation = scrollbar->orientation() + 1;
 
-    if ((active & Slider) || (priv->hovering && slider.tqcontains(priv->mousePos)))
+    if ((active & Slider) || (priv->hovering && slider.contains(priv->mousePos)))
 	skey.data.state = KLegacy::Prelight;
     else
 	skey.data.state = KLegacy::Normal;
@@ -2741,7 +2741,7 @@ void KLegacyStyle::drawScrollBarControls(TQPainter *p, const TQScrollBar *scroll
 		  (active & SubLine), x, y,
 		  buttonDim,
 		  buttonDim,
-		  scrollbar->tqcolorGroup(), true);
+		  scrollbar->colorGroup(), true);
 
 	if  (scrollbar->orientation() == Vertical)
 	    y = scrollbar->height() - buttonDim - defaultFrameWidth();
@@ -2753,7 +2753,7 @@ void KLegacyStyle::drawScrollBarControls(TQPainter *p, const TQScrollBar *scroll
 		  (active & AddLine), x, y,
 		  buttonDim,
 		  buttonDim,
-		  scrollbar->tqcolorGroup(), true);
+		  scrollbar->colorGroup(), true);
     }
     p->drawPixmap(0, 0, buf);
 }
@@ -2762,7 +2762,7 @@ void KLegacyStyle::drawScrollBarControls(TQPainter *p, const TQScrollBar *scroll
 void KLegacyStyle::drawSlider(TQPainter *p, int x, int y, int w, int h, const TQColorGroup &g,
 			   Orientation orientation, bool tickAbove, bool tickBelow)
 {
-    GtkObject *gobj = priv->gtkDict.tqfind(TQSlider::staticMetaObject());
+    GtkObject *gobj = priv->gtkDict.find(TQSlider::staticMetaObject());
 
     if (! gobj) {
 	KStyle::drawSlider(p, x, y, w, h, g, orientation, tickAbove, tickBelow);
@@ -2789,7 +2789,7 @@ void KLegacyStyle::drawSlider(TQPainter *p, int x, int y, int w, int h, const TQ
 void KLegacyStyle::drawSliderGroove(TQPainter *p, int x, int y, int w, int h,
 				const TQColorGroup &g, QCOORD c, Orientation o)
 {
-    GtkObject *gobj = priv->gtkDict.tqfind(TQSlider::staticMetaObject());
+    GtkObject *gobj = priv->gtkDict.find(TQSlider::staticMetaObject());
 
     if (! gobj) {
 	KStyle::drawSliderGroove(p, x, y, w, h, g, c, o);
@@ -2816,7 +2816,7 @@ void KLegacyStyle::drawArrow(TQPainter *p, ArrowType type, bool down,
 			 int x, int y, int w, int h,
 			 const TQColorGroup &g, bool enabled, const TQBrush *b)
 {
-    GtkObject *gobj = priv->gtkDict.tqfind(&arrow_ptr);
+    GtkObject *gobj = priv->gtkDict.find(&arrow_ptr);
 
     if (! gobj) {
 	KStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, b);
@@ -2831,7 +2831,7 @@ void KLegacyStyle::drawArrow(TQPainter *p, ArrowType type, bool down,
     key.data.arrowDirection = type + 1;
 
     if ((! down) && priv->hovering &&
-	TQRect(x, y, w, h).tqcontains(priv->mousePos)) {
+	TQRect(x, y, w, h).contains(priv->mousePos)) {
 	key.data.state = KLegacy::Prelight;
     }
 
@@ -2848,7 +2848,7 @@ void KLegacyStyle::drawMenuArrow(TQPainter *p, ArrowType type, bool down,
 			 int x, int y, int w, int h,
 			 const TQColorGroup &g, bool enabled, const TQBrush *b)
 {
-    GtkObject *gobj = priv->gtkDict.tqfind(&menuitem_ptr);
+    GtkObject *gobj = priv->gtkDict.find(&menuitem_ptr);
 
     if (! gobj) {
 	KStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, b);
@@ -2891,7 +2891,7 @@ void KLegacyStyle::drawPopupPanel(TQPainter *p, int x, int y, int w, int h,
 void KLegacyStyle::drawCheckMark(TQPainter *p, int x, int y, int w, int h,
 			      const TQColorGroup &g, bool activated, bool disabled)
 {
-    GtkObject *gobj = priv->gtkDict.tqfind(&checkmenuitem_ptr);
+    GtkObject *gobj = priv->gtkDict.find(&checkmenuitem_ptr);
 
     if (! gobj) {
 	KStyle::drawCheckMark(p, x, y, w, h, g, activated, disabled);
@@ -2942,7 +2942,7 @@ void KLegacyStyle::drawSplitter(TQPainter *p, int x, int y, int w, int h,
 
 void KLegacyStyle::drawTab(TQPainter *p, const TQTabBar *tabbar, TQTab *tab, bool selected)
 {
-    GtkObject *gobj = priv->gtkDict.tqfind(TQTabBar::staticMetaObject());
+    GtkObject *gobj = priv->gtkDict.find(TQTabBar::staticMetaObject());
 
     if (! gobj) {
 	KStyle::drawTab(p, tabbar, tab, selected);
@@ -2954,8 +2954,8 @@ void KLegacyStyle::drawTab(TQPainter *p, const TQTabBar *tabbar, TQTab *tab, boo
     key.data.function = KLegacy::Extension;
     key.data.state = (! selected) ? KLegacy::Active : KLegacy::Normal;
     key.data.shadow = KLegacy::Out;
-    key.data.gapSide = (tabbar->tqshape() == TQTabBar::RoundedAbove ||
-			tabbar->tqshape() == TQTabBar::TriangularAbove) ?
+    key.data.gapSide = (tabbar->shape() == TQTabBar::RoundedAbove ||
+			tabbar->shape() == TQTabBar::TriangularAbove) ?
 		       KLegacy::Bottom : KLegacy::Top;
 
     int ry = tab->r.top(), rh = tab->r.height();
@@ -2963,8 +2963,8 @@ void KLegacyStyle::drawTab(TQPainter *p, const TQTabBar *tabbar, TQTab *tab, boo
     if (! selected) {
 	rh -= 2;
 
-	if (tabbar->tqshape() == TQTabBar::RoundedAbove ||
-	    tabbar->tqshape() == TQTabBar::TriangularAbove)
+	if (tabbar->shape() == TQTabBar::RoundedAbove ||
+	    tabbar->shape() == TQTabBar::TriangularAbove)
 	    ry += 2;
     }
 
@@ -2981,7 +2981,7 @@ void KLegacyStyle::drawTab(TQPainter *p, const TQTabBar *tabbar, TQTab *tab, boo
 void KLegacyStyle::drawKBarHandle(TQPainter *p, int x, int y, int w, int h,
 				  const TQColorGroup &g, KToolBarPos type, TQBrush *fill)
 {
-    GtkObject *gobj = priv->gtkDict.tqfind(TQToolBar::staticMetaObject());
+    GtkObject *gobj = priv->gtkDict.find(TQToolBar::staticMetaObject());
 
     if (! gobj) {
 	KStyle::drawKBarHandle(p, x, y, w, h, g, type, fill);
@@ -3043,7 +3043,7 @@ void KLegacyStyle::drawKickerTaskButton(TQPainter *p, int x, int y, int w, int h
     static const TQString &modStr = KGlobal::staticQString(
         TQString::fromUtf8("[") + i18n("modified") + TQString::fromUtf8("]"));
 
-    int modStrPos = s.tqfind(modStr);
+    int modStrPos = s.find(modStr);
 
     if (modStrPos != -1) {
         s.remove(modStrPos, modStr.length()+1);
@@ -3082,7 +3082,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
 	    TQWidget *w = (TQWidget *) obj;
 
 	    if (w->inherits("QPopupMenu") && w->width() < 700) {
-		GtkObject *gobj = priv->gtkDict.tqfind(TQPopupMenu::staticMetaObject());
+		GtkObject *gobj = priv->gtkDict.find(TQPopupMenu::staticMetaObject());
 
 		if (gobj) {
 		    KLegacyImageDataKey key;
@@ -3139,7 +3139,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
 		    }
 		}
 	    } else if (w->isTopLevel() || w->inherits("QWorkspaceChild")) {
-		GtkObject *gobj = priv->gtkDict.tqfind(TQMainWindow::staticMetaObject());
+		GtkObject *gobj = priv->gtkDict.find(TQMainWindow::staticMetaObject());
 
 		if (gobj) {
 		    KLegacyImageDataKey key;
@@ -3152,7 +3152,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
 			w->setBackgroundPixmap(*p);
 		}
 	    } else if (w->inherits("QLineEdit")) {
-		GtkObject *gobj = priv->gtkDict.tqfind(TQLineEdit::staticMetaObject());
+		GtkObject *gobj = priv->gtkDict.find(TQLineEdit::staticMetaObject());
 
 		if (gobj) {
 		    KLegacyImageDataKey key;
@@ -3193,7 +3193,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
 		}
 	    } else if (w->inherits("QMenuBar") ||
 		       w->inherits("QToolBar")) {
-		GtkObject *gobj = priv->gtkDict.tqfind(TQMenuBar::staticMetaObject());
+		GtkObject *gobj = priv->gtkDict.find(TQMenuBar::staticMetaObject());
 
 		if (gobj) {
 		    KLegacyImageDataKey key;
@@ -3261,12 +3261,12 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
 		obj->inherits("QSlider") ||
 		obj->inherits("QScrollbar")) {
 		priv->lastWidget = (TQWidget *) obj;
-		priv->lastWidget->tqrepaint(false);
+		priv->lastWidget->repaint(false);
 	    } else if (obj->inherits("QRadioButton")) {
 		TQWidget *w = (TQWidget *) obj;
 
 		if (! w->isTopLevel() && w->isEnabled()) {
-		    GtkObject *gobj = priv->gtkDict.tqfind(TQRadioButton::staticMetaObject());
+		    GtkObject *gobj = priv->gtkDict.find(TQRadioButton::staticMetaObject());
 
 		    if (gobj) {
 			KLegacyImageDataKey key;
@@ -3294,7 +3294,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
 		TQWidget *w = (TQWidget *) obj;
 
 		if (! w->isTopLevel() && w->isEnabled()) {
-		    GtkObject *gobj = priv->gtkDict.tqfind(TQCheckBox::staticMetaObject());
+		    GtkObject *gobj = priv->gtkDict.find(TQCheckBox::staticMetaObject());
 
 		    if (gobj) {
 			KLegacyImageDataKey key;
@@ -3327,7 +3327,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
 	{
 	    if (obj == priv->lastWidget) {
 		priv->lastWidget = 0;
-		((TQWidget *) obj)->tqrepaint(false);
+		((TQWidget *) obj)->repaint(false);
 	    } else if (obj->inherits("QRadioButton") ||
 		       obj->inherits("QCheckBox")) {
 		TQWidget *w = (TQWidget *) obj;
@@ -3335,7 +3335,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
 		if (! w->isTopLevel()) {
 		    w->setBackgroundMode(TQWidget::X11ParentRelative);
 		    w->setBackgroundOrigin(TQWidget::WidgetOrigin);
-		    w->tqrepaint(true);
+		    w->repaint(true);
 		}
 	    }
 
@@ -3349,7 +3349,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
 	    if (obj->inherits("QScrollBar") &&
 		(! (me->state() & (LeftButton | MidButton | RightButton)))) {
 		priv->hovering = true;
-		((TQWidget *) obj)->tqrepaint(false);
+		((TQWidget *) obj)->repaint(false);
 		priv->hovering = false;
 	    }
 
diff --git a/kstyles/kthemestyle/kthemebase.cpp b/kstyles/kthemestyle/kthemebase.cpp
index f2b133d23..6b5c0961d 100644
--- a/kstyles/kthemestyle/kthemebase.cpp
+++ b/kstyles/kthemestyle/kthemebase.cpp
@@ -77,8 +77,8 @@ static TQColor readColorEntry( TQSettings* s, const char *pKey,
         else
         {
             bool bOK;
-            // tqfind first part (red)
-            int nIndex = aValue.tqfind( ',' );
+            // find first part (red)
+            int nIndex = aValue.find( ',' );
             if ( nIndex == -1 )
             {
                 // return a sensible default -- Bernd
@@ -89,9 +89,9 @@ static TQColor readColorEntry( TQSettings* s, const char *pKey,
 
             nRed = aValue.left( nIndex ).toInt( &bOK );
 
-            // tqfind second part (green)
+            // find second part (green)
             int nOldIndex = nIndex;
-            nIndex = aValue.tqfind( ',', nOldIndex + 1 );
+            nIndex = aValue.find( ',', nOldIndex + 1 );
 
             if ( nIndex == -1 )
             {
@@ -103,7 +103,7 @@ static TQColor readColorEntry( TQSettings* s, const char *pKey,
             nGreen = aValue.mid( nOldIndex + 1,
                                  nIndex - nOldIndex - 1 ).toInt( &bOK );
 
-            // tqfind third part (blue)
+            // find third part (blue)
             nBlue = aValue.right( aValue.length() - nIndex - 1 ).toInt( &bOK );
 
             aRetColor.setRgb( nRed, nGreen, nBlue );
@@ -176,7 +176,7 @@ public:
     */
     TQColor pixmapAveColor( const TQPixmap* p )
     {
-        if ( colorCache.tqcontains( p ) )
+        if ( colorCache.contains( p ) )
             return colorCache[ p ];
 
         TQImage to_ave = p->convertToImage();
@@ -209,7 +209,7 @@ public:
 
 
 
-// This is used to encode the keys. I used to use tqmasks but I think this
+// This is used to encode the keys. I used to use masks but I think this
 // bitfield is nicer :) I don't know why C++ coders don't use these more..
 // (mosfet)
 struct kthemeKeyData
@@ -222,7 +222,7 @@ unsigned int height :
     12;
 unsigned int border :
     1;
-unsigned int tqmask :
+unsigned int mask :
     1;
 };
 
@@ -236,8 +236,8 @@ void KThemeBase::generateBorderPix( int i )
     // separate pixmap into separate components
     if ( pbPixmaps[ i ] )
     {
-        // evidently I have to do tqmasks manually...
-        const TQBitmap * srcMask = pbPixmaps[ i ] ->tqmask();
+        // evidently I have to do masks manually...
+        const TQBitmap * srcMask = pbPixmaps[ i ] ->mask();
         TQBitmap destMask( pbWidth[ i ], pbWidth[ i ] );
         TQPixmap tmp( pbWidth[ i ], pbWidth[ i ] );
 
@@ -563,7 +563,7 @@ void KThemeBase::applyConfigFile( TQSettings& config )
 {
     TQStringList keys = config.entryList( configFileName );
 
-    if ( keys.tqcontains( "foreground" ) )
+    if ( keys.contains( "foreground" ) )
     {
         d->overrideForeground = true;
         d->overrideForegroundCol = readColorEntry( &config, ( configFileName + "foreground" ).latin1(), 0 );
@@ -571,7 +571,7 @@ void KThemeBase::applyConfigFile( TQSettings& config )
     else
         d->overrideForeground = false;
 
-    if ( keys.tqcontains( "background" ) )
+    if ( keys.contains( "background" ) )
     {
         d->overrideBackground = true;
         d->overrideBackgroundCol = readColorEntry( &config, ( configFileName + "background" ).latin1(), 0 );
@@ -581,7 +581,7 @@ void KThemeBase::applyConfigFile( TQSettings& config )
 
 
 
-    if ( keys.tqcontains( "selectForeground" ) )
+    if ( keys.contains( "selectForeground" ) )
     {
         d->overrideSelectForeground = true;
         d->overrideSelectForegroundCol = readColorEntry( &config, ( configFileName + "selectForeground" ).latin1(), 0 );
@@ -589,7 +589,7 @@ void KThemeBase::applyConfigFile( TQSettings& config )
     else
         d->overrideSelectForeground = false;
 
-    if ( keys.tqcontains( "selectBackground" ) )
+    if ( keys.contains( "selectBackground" ) )
     {
         d->overrideSelectBackground = true;
         d->overrideSelectBackgroundCol = readColorEntry( &config, ( configFileName + "selectBackground" ).latin1(), 0 );
@@ -597,7 +597,7 @@ void KThemeBase::applyConfigFile( TQSettings& config )
     else
         d->overrideSelectBackground = false;
 
-    if ( keys.tqcontains( "windowBackground" ) )
+    if ( keys.contains( "windowBackground" ) )
     {
         d->overrideWindowBackground = true;
         d->overrideWindowBackgroundCol = readColorEntry( &config, ( configFileName + "windowBackground" ).latin1(), 0 );
@@ -606,7 +606,7 @@ void KThemeBase::applyConfigFile( TQSettings& config )
         d->overrideWindowBackground = false;
 
 
-    if ( keys.tqcontains( "windowForeground" ) )
+    if ( keys.contains( "windowForeground" ) )
     {
         d->overrideWindowForeground = true;
         d->overrideWindowForegroundCol = readColorEntry( &config, ( configFileName + "windowForeground" ).latin1(), 0 );
@@ -801,51 +801,51 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const
     {
         pixmap = new KThemePixmap();
         pixmap->resize( w, h );
-        TQBitmap tqmask;
-        tqmask.resize( w, h );
-        tqmask.fill( color0 );
+        TQBitmap mask;
+        mask.resize( w, h );
+        mask.fill( color0 );
         TQPainter mPainter;
-        mPainter.begin( &tqmask );
+        mPainter.begin( &mask );
 
         TQPixmap *tmp = borderPixmap( widget ) ->border( KThemePixmap::TopLeft );
-        const TQBitmap *srcMask = tmp->tqmask();
+        const TQBitmap *srcMask = tmp->mask();
         int bdWidth = tmp->width();
 
         bitBlt( pixmap, 0, 0, tmp, 0, 0, bdWidth, bdWidth,
                 Qt::CopyROP, false );
         if ( srcMask )
-            bitBlt( &tqmask, 0, 0, srcMask, 0, 0, bdWidth, bdWidth,
+            bitBlt( &mask, 0, 0, srcMask, 0, 0, bdWidth, bdWidth,
                     Qt::CopyROP, false );
         else
             mPainter.fillRect( 0, 0, bdWidth, bdWidth, color1 );
 
 
         tmp = borderPixmap( widget ) ->border( KThemePixmap::TopRight );
-        srcMask = tmp->tqmask();
+        srcMask = tmp->mask();
         bitBlt( pixmap, w - bdWidth, 0, tmp, 0, 0, bdWidth,
                 bdWidth, Qt::CopyROP, false );
         if ( srcMask )
-            bitBlt( &tqmask, w - bdWidth, 0, srcMask, 0, 0, bdWidth,
+            bitBlt( &mask, w - bdWidth, 0, srcMask, 0, 0, bdWidth,
                     bdWidth, Qt::CopyROP, false );
         else
             mPainter.fillRect( w - bdWidth, 0, bdWidth, bdWidth, color1 );
 
         tmp = borderPixmap( widget ) ->border( KThemePixmap::BottomLeft );
-        srcMask = tmp->tqmask();
+        srcMask = tmp->mask();
         bitBlt( pixmap, 0, h - bdWidth, tmp, 0, 0, bdWidth,
                 bdWidth, Qt::CopyROP, false );
         if ( srcMask )
-            bitBlt( &tqmask, 0, h - bdWidth, srcMask, 0, 0, bdWidth,
+            bitBlt( &mask, 0, h - bdWidth, srcMask, 0, 0, bdWidth,
                     bdWidth, Qt::CopyROP, false );
         else
             mPainter.fillRect( 0, h - bdWidth, bdWidth, bdWidth, color1 );
 
         tmp = borderPixmap( widget ) ->border( KThemePixmap::BottomRight );
-        srcMask = tmp->tqmask();
+        srcMask = tmp->mask();
         bitBlt( pixmap, w - bdWidth, h - bdWidth, tmp, 0, 0,
                 bdWidth, bdWidth, Qt::CopyROP, false );
         if ( srcMask )
-            bitBlt( &tqmask, w - bdWidth, h - bdWidth, srcMask, 0, 0,
+            bitBlt( &mask, w - bdWidth, h - bdWidth, srcMask, 0, 0,
                     bdWidth, bdWidth, Qt::CopyROP, false );
         else
             mPainter.fillRect( w - bdWidth, h - bdWidth, bdWidth, bdWidth, color1 );
@@ -855,20 +855,20 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const
         if ( w - bdWidth * 2 > 0 )
         {
             tmp = borderPixmap( widget ) ->border( KThemePixmap::Top );
-            srcMask = tmp->tqmask();
+            srcMask = tmp->mask();
             p.drawTiledPixmap( bdWidth, 0, w - bdWidth * 2, bdWidth, *tmp );
             if ( srcMask )
-                bitBlt( &tqmask, bdWidth, 0, srcMask, 0, 0,
+                bitBlt( &mask, bdWidth, 0, srcMask, 0, 0,
                         w - bdWidth * 2, bdWidth, Qt::CopyROP, false );
             else
                 mPainter.fillRect( bdWidth, 0, w - bdWidth * 2, bdWidth, color1 );
 
             tmp = borderPixmap( widget ) ->border( KThemePixmap::Bottom );
-            srcMask = tmp->tqmask();
+            srcMask = tmp->mask();
             p.drawTiledPixmap( bdWidth, h - bdWidth, w - bdWidth * 2, bdWidth,
                                *tmp );
             if ( srcMask )
-                bitBlt( &tqmask, bdWidth, h - bdWidth, srcMask, 0, 0,
+                bitBlt( &mask, bdWidth, h - bdWidth, srcMask, 0, 0,
                         w - bdWidth * 2, bdWidth, Qt::CopyROP, false );
             else
                 mPainter.fillRect( bdWidth, h - bdWidth, w - bdWidth * 2, bdWidth,
@@ -877,30 +877,30 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const
         if ( h - bdWidth * 2 > 0 )
         {
             tmp = borderPixmap( widget ) ->border( KThemePixmap::Left );
-            srcMask = tmp->tqmask();
+            srcMask = tmp->mask();
             p.drawTiledPixmap( 0, bdWidth, bdWidth, h - bdWidth * 2, *tmp );
             if ( srcMask )
-                bitBlt( &tqmask, 0, bdWidth, srcMask, 0, 0,
+                bitBlt( &mask, 0, bdWidth, srcMask, 0, 0,
                         bdWidth, h - bdWidth * 2, Qt::CopyROP, false );
             else
                 mPainter.fillRect( 0, bdWidth, bdWidth, h - bdWidth * 2, color1 );
 
             tmp = borderPixmap( widget ) ->border( KThemePixmap::Right );
-            srcMask = tmp->tqmask();
+            srcMask = tmp->mask();
             p.drawTiledPixmap( w - bdWidth, bdWidth, bdWidth, h - bdWidth * 2,
                                *tmp );
             if ( srcMask )
-                bitBlt( &tqmask, w - bdWidth, bdWidth, srcMask, 0, 0,
+                bitBlt( &mask, w - bdWidth, bdWidth, srcMask, 0, 0,
                         bdWidth, h - bdWidth * 2, Qt::CopyROP, false );
             else
                 mPainter.fillRect( w - bdWidth, bdWidth, bdWidth, h - bdWidth * 2, color1 );
         }
         p.end();
         mPainter.end();
-        pixmap->setMask( tqmask );
+        pixmap->setMask( mask );
         cache->insert( pixmap, KThemeCache::FullScale, widget, true );
-        if ( !pixmap->tqmask() )
-            qWarning( "No tqmask for border pixmap!\n" );
+        if ( !pixmap->mask() )
+            qWarning( "No mask for border pixmap!\n" );
     }
     return ( pixmap );
 }
@@ -1269,22 +1269,22 @@ void KThemeBase::applyResourceGroup( TQSettings *config, int i )
     TQStringList keys = config->entryList( base );
 
     // Gradient low color or blend background
-    if ( keys.tqcontains( "GradientLow" ) )
+    if ( keys.contains( "GradientLow" ) )
         prop[ "GrLow" ] = readColorEntry( config, TQString( base + "GradientLow" ).latin1(),
                                           &TQApplication::palette().active().background() ).name();
 
     // Gradient high color
-    if ( keys.tqcontains( "GradientHigh" ) )
+    if ( keys.contains( "GradientHigh" ) )
         prop[ "GrHigh" ] = readColorEntry( config, TQString( base + "GradientHigh" ).latin1(),
                                            &TQApplication::palette().active().foreground() ).name();
 
     // Extended color attributes
-    if ( keys.tqcontains( "Foreground" ) || keys.tqcontains( "Background" ) )
+    if ( keys.contains( "Foreground" ) || keys.contains( "Background" ) )
     {
         TQColor fg, bg;
-        if ( keys.tqcontains( "Background" ) )
+        if ( keys.contains( "Background" ) )
             bg = readColorEntry( config, TQString( base + "Background" ).latin1(), &bg );
-        if ( keys.tqcontains( "Foreground" ) )
+        if ( keys.contains( "Foreground" ) )
             fg = readColorEntry( config, TQString( base + "Foreground" ).latin1(), &fg );
         prop[ "Foreground" ] = fg.name();
         prop[ "Background" ] = bg.name();
@@ -1318,7 +1318,7 @@ void KThemeBase::applyResourceGroup( TQSettings *config, int i )
         prop[ "Width" ] = TQString::number( config->readNumEntry( base + "Width", 10 ) );
     else if ( i == ComboBox || i == ComboBoxDown )
     {
-        if ( keys.tqcontains( "Round" ) )
+        if ( keys.contains( "Round" ) )
             prop[ "Round" ] = TQString::number( config->readBoolEntry( base + "Round", false ) );
         else
             prop[ "Round" ] = "5000"; // invalid, used w/multiple groups
@@ -1326,25 +1326,25 @@ void KThemeBase::applyResourceGroup( TQSettings *config, int i )
     }
     else if ( i == PushButton || i == PushButtonDown )
     {
-        if ( keys.tqcontains( "XShift" ) )
+        if ( keys.contains( "XShift" ) )
             prop[ "XShift" ] = TQString::number( config->readNumEntry( base + "XShift", 0 ) );
         else
             prop[ "XShift" ] = "5000";
-        if ( keys.tqcontains( "YShift" ) )
+        if ( keys.contains( "YShift" ) )
             prop[ "YShift" ] = TQString::number( config->readNumEntry( base + "YShift", 0 ) );
         else
             prop[ "YShift" ] = "5000";
-        if ( keys.tqcontains( "3DFocusRect" ) )
+        if ( keys.contains( "3DFocusRect" ) )
             prop[ "3DFRect" ] = TQString::number( config->
                                                  readBoolEntry(  base + "3DFocusRect", false ) );
         else
             prop[ "3DFRect" ] = "5000";
-        if ( keys.tqcontains( "3DFocusOffset" ) )
+        if ( keys.contains( "3DFocusOffset" ) )
             prop[ "3DFOffset" ] = TQString::number( config->
                                                    readBoolEntry(  base + "3DFocusOffset", 0 ) );
         else
             prop[ "3DFOffset" ] = "5000";
-        if ( keys.tqcontains( "Round" ) )
+        if ( keys.contains( "Round" ) )
             prop[ "Round" ] = TQString::number( config->readBoolEntry( base + "Round", false ) );
         else
             prop[ "Round" ] = "5000";
@@ -1411,7 +1411,7 @@ void KThemeBase::readResourceGroup( int i, TQString *pixnames, TQString *brdname
     // Blend intensity
     tmpStr = prop[ "Blend" ];
     if ( tmpStr.isEmpty() )
-        tmpStr = TQString::tqfromLatin1( "0.0" );
+        tmpStr = TQString::fromLatin1( "0.0" );
     blends[ i ] = tmpStr.toFloat();
 
     // Bevel contrast
@@ -1607,7 +1607,7 @@ TQPalette KThemeBase::overridePalette( const TQPalette& pal )
     {
         if ( isColor( Background ) )
         {
-            background = tqcolorGroup( pal.active(), Background )
+            background = colorGroup( pal.active(), Background )
                          ->background();
         }
         if ( isPixmap( Background ) )
@@ -1620,7 +1620,7 @@ TQPalette KThemeBase::overridePalette( const TQPalette& pal )
                             background.dark( lowlightVal ), background.dark( 120 ),
                             baseText, buttonText /*CHECKME: BrightText*/, base, background );
 
-        buttonText = tqcolorGroup( pre, PushButton ) ->foreground();
+        buttonText = colorGroup( pre, PushButton ) ->foreground();
     }
 
     TQColor disfg = foreground;
@@ -1752,7 +1752,7 @@ void KThemeCache::flushTimeout()
 }
 
 KThemePixmap* KThemeCache::pixmap( int w, int h, int widgetID, bool border,
-                                   bool tqmask )
+                                   bool mask )
 {
 
     kthemeKey key;
@@ -1761,9 +1761,9 @@ KThemePixmap* KThemeCache::pixmap( int w, int h, int widgetID, bool border,
     key.data.width = w;
     key.data.height = h;
     key.data.border = border;
-    key.data.tqmask = tqmask;
+    key.data.mask = mask;
 
-    KThemePixmap *pix = cache.tqfind( ( unsigned long ) key.cacheKey );
+    KThemePixmap *pix = cache.find( ( unsigned long ) key.cacheKey );
     if ( pix )
         pix->updateAccessed();
     return ( pix );
@@ -1777,8 +1777,8 @@ KThemePixmap* KThemeCache::horizontalPixmap( int w, int widgetID )
     key.data.width = w;
     key.data.height = 0;
     key.data.border = false;
-    key.data.tqmask = false;
-    KThemePixmap *pix = cache.tqfind( ( unsigned long ) key.cacheKey );
+    key.data.mask = false;
+    KThemePixmap *pix = cache.find( ( unsigned long ) key.cacheKey );
     if ( pix )
         pix->updateAccessed();
     return ( pix );
@@ -1792,15 +1792,15 @@ KThemePixmap* KThemeCache::verticalPixmap( int h, int widgetID )
     key.data.width = 0;
     key.data.height = h;
     key.data.border = false;
-    key.data.tqmask = false;
-    KThemePixmap *pix = cache.tqfind( ( unsigned long ) key.cacheKey );
+    key.data.mask = false;
+    KThemePixmap *pix = cache.find( ( unsigned long ) key.cacheKey );
     if ( pix )
         pix->updateAccessed();
     return ( pix );
 }
 
 bool KThemeCache::insert( KThemePixmap *pixmap, ScaleHint scale, int widgetID,
-                          bool border, bool tqmask )
+                          bool border, bool mask )
 {
     kthemeKey key;
     key.cacheKey = 0; // shut up, gcc
@@ -1810,9 +1810,9 @@ bool KThemeCache::insert( KThemePixmap *pixmap, ScaleHint scale, int widgetID,
     key.data.height = ( scale == FullScale || scale == VerticalScale ) ?
                       pixmap->height() : 0;
     key.data.border = border;
-    key.data.tqmask = tqmask;
+    key.data.mask = mask;
 
-    if ( cache.tqfind( ( unsigned long ) key.cacheKey, true ) != NULL )
+    if ( cache.find( ( unsigned long ) key.cacheKey, true ) != NULL )
     {
         return ( true ); // a pixmap of this scale is already in there
     }
diff --git a/kstyles/kthemestyle/kthemebase.h b/kstyles/kthemestyle/kthemebase.h
index dab801573..6da89cc3e 100644
--- a/kstyles/kthemestyle/kthemebase.h
+++ b/kstyles/kthemestyle/kthemebase.h
@@ -107,7 +107,7 @@ inline bool KThemePixmap::isOld()
  *
  * This class is mostly just inline methods that do bit operations on a key
  * composed of the widget ID, width and/or height, and then calls
- * TQIntCache::tqfind().
+ * TQIntCache::find().
  *
  * One other thing to note is that full, horizontal, and vertically scaled
  * pixmaps are not used interchangeably. For example, if you insert a fully
@@ -120,7 +120,7 @@ inline bool KThemePixmap::isOld()
  * @author Daniel M. Duley <mosfet@kde.org>
  *
  */
-class KThemeCache : public TQObject
+class KThemeCache : public QObject
 {
     Q_OBJECT
 public:
@@ -145,12 +145,12 @@ public:
      * @param widgetID The widget ID of the pixmap, usually from KThemeBase's
      * WidgetType enum.
      * @param border True if the pixmap has a border.
-     * @param tqmask True if the pixmap has a tqmask.
+     * @param mask True if the pixmap has a mask.
      *
      * @return True if the insert was successful, false otherwise.
      */
     bool insert( KThemePixmap *pixmap, ScaleHint scale, int widgetID,
-                 bool border = false, bool tqmask = false );
+                 bool border = false, bool mask = false );
     /**
      * Returns a fully scaled pixmap.
      *
@@ -158,13 +158,13 @@ public:
      * @param h The pixmap height to search for.
      * @param widgetID The widget ID to search for.
      * @param border True if the pixmap has a border.
-     * @param tqmask True if the pixmap has a tqmask.
+     * @param mask True if the pixmap has a mask.
      *
      * @return True if a pixmap matching the width, height, and widget ID of
      * the pixmap exists, NULL otherwise.
      */
     KThemePixmap* pixmap( int w, int h, int widgetID, bool border = false,
-                          bool tqmask = false );
+                          bool mask = false );
     /**
      * Returns a horizontally scaled pixmap.
      *
@@ -234,7 +234,7 @@ public:
      */
     enum ShadeStyle{Motif, Windows, Next, KDE};
     /**
-     * The default scrollbar button tqlayout. BottomLeft is like what Next
+     * The default scrollbar button layout. BottomLeft is like what Next
      * uses, BottomRight is like Platinum, and Opposite it like Windows and
      * Motif.
      */
@@ -300,12 +300,12 @@ public:
      * If a color group is set in the theme configuration
      * that is used, otherwise defaultColor is returned.
      *
-     * @param defaultGroup The tqcolorGroup to set if one is available.
+     * @param defaultGroup The colorGroup to set if one is available.
      *
      * @param widget The widget whose color group to retrieve.
      *
      */
-    const TQColorGroup* tqcolorGroup( const TQColorGroup &defaultGroup,
+    const TQColorGroup* colorGroup( const TQColorGroup &defaultGroup,
                                    WidgetType widget ) const;
 
     TQBrush pixmapBrush( const TQColorGroup &group, TQColorGroup::ColorRole role,
@@ -356,7 +356,7 @@ public:
      */
     int getSBExtent() const;
     /**
-     * The scrollbar button tqlayout.
+     * The scrollbar button layout.
      */
     SButton scrollBarLayout() const;
     /**
@@ -508,9 +508,9 @@ protected:
     /**
     These are included for fuuture extension purposes..
     */
-    virtual int tqpixelMetric ( PixelMetric metric, const TQWidget * widget = 0 ) const
+    virtual int pixelMetric ( PixelMetric metric, const TQWidget * widget = 0 ) const
     {
-        return KStyle::tqpixelMetric( metric, widget );
+        return KStyle::pixelMetric( metric, widget );
     }
 
     virtual void drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRect & r, const TQColorGroup & cg,
@@ -522,7 +522,7 @@ protected:
     }
 
 
-    virtual void tqdrawControl( ControlElement element,
+    virtual void drawControl( ControlElement element,
                               TQPainter *p,
                               const TQWidget *widget,
                               const TQRect &r,
@@ -530,21 +530,21 @@ protected:
                               SFlags how = Style_Default,
                               const TQStyleOption& opt = TQStyleOption::Default ) const
     {
-        KStyle::tqdrawControl( element, p, widget,
+        KStyle::drawControl( element, p, widget,
                              r, cg, how, opt );
     }
 
-    virtual void tqdrawControlMask( ControlElement element,
+    virtual void drawControlMask( ControlElement element,
                                   TQPainter *p,
                                   const TQWidget *widget,
                                   const TQRect &r,
                                   const TQStyleOption& opt = TQStyleOption::Default ) const
     {
-        KStyle::tqdrawControlMask( element, p, widget, r, opt );
+        KStyle::drawControlMask( element, p, widget, r, opt );
     }
 
 
-    virtual void tqdrawComplexControl( ComplexControl control,
+    virtual void drawComplexControl( ComplexControl control,
                                      TQPainter *p,
                                      const TQWidget* widget,
                                      const TQRect &r,
@@ -554,7 +554,7 @@ protected:
                                      SCFlags active = SC_None,
                                      const TQStyleOption& opt = TQStyleOption::Default ) const
     {
-        KStyle::tqdrawComplexControl( control, p, widget, r, cg, flags, controls, active, opt );
+        KStyle::drawComplexControl( control, p, widget, r, cg, flags, controls, active, opt );
     }
 
 
@@ -572,12 +572,12 @@ protected:
     }
 
 
-    virtual int tqstyleHint( StyleHint sh,
+    virtual int styleHint( StyleHint sh,
                            const TQWidget *widget = 0,
                            const TQStyleOption& opt = TQStyleOption::Default,
                            QStyleHintReturn* returnData = 0 ) const
     {
-        return KStyle::tqstyleHint( sh,
+        return KStyle::styleHint( sh,
                                   widget,
                                   opt,
                                   returnData );
@@ -731,7 +731,7 @@ inline TQBrush KThemeBase::pixmapBrush( const TQColorGroup &group,
         return ( group.color( role ) );
 }
 
-inline const TQColorGroup* KThemeBase::tqcolorGroup( const TQColorGroup &defaultGroup,
+inline const TQColorGroup* KThemeBase::colorGroup( const TQColorGroup &defaultGroup,
         WidgetType widget ) const
 {
     return ( ( colors[ widget ] ) ? colors[ widget ] : &defaultGroup );
diff --git a/kstyles/kthemestyle/kthemestyle.cpp b/kstyles/kthemestyle/kthemestyle.cpp
index 26764f72e..4927c67bc 100644
--- a/kstyles/kthemestyle/kthemestyle.cpp
+++ b/kstyles/kthemestyle/kthemestyle.cpp
@@ -119,7 +119,7 @@ public:
         //####### (Fixes exit crashes with qt-only apps that occur on Linux)
         //####### This should be rethought after 3.0,
         //####### as it relies on the implementation-specific behavior
-        //####### of the glibc libdl (tqfinding already loaded libraries based on the
+        //####### of the glibc libdl (finding already loaded libraries based on the
         //####### soname)
 #endif
     }
@@ -186,8 +186,8 @@ void kDrawWindowsArrow ( TQPainter *p, const TQStyle* style, TQStyle::PrimitiveE
     p->save();
     if ( down )
     {
-        p->translate( style->tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal ),
-                      style->tqpixelMetric( TQStyle::PM_ButtonShiftVertical ) );
+        p->translate( style->pixelMetric( TQStyle::PM_ButtonShiftHorizontal ),
+                      style->pixelMetric( TQStyle::PM_ButtonShiftVertical ) );
     }
 
     if ( enabled )
@@ -226,8 +226,8 @@ TQSize KThemeStyle::sizeFromContents( ContentsType contents,
                 const TQPushButton * button = ( const TQPushButton* ) widget;
                 int w = contentSize.width();
                 int h = contentSize.height();
-                int bm = tqpixelMetric( PM_ButtonMargin, widget );
-                int fw = tqpixelMetric( PM_DefaultFrameWidth, widget ) * 2;
+                int bm = pixelMetric( PM_ButtonMargin, widget );
+                int fw = pixelMetric( PM_DefaultFrameWidth, widget ) * 2;
 
                 w += bm + fw + 6; // ### Add 6 to make way for bold font.
                 h += bm + fw;
@@ -260,8 +260,8 @@ TQSize KThemeStyle::sizeFromContents( ContentsType contents,
 
                 if ( mi->custom() )
                 {
-                    w = mi->custom() ->tqsizeHint().width();
-                    h = mi->custom() ->tqsizeHint().height();
+                    w = mi->custom() ->sizeHint().width();
+                    h = mi->custom() ->sizeHint().height();
                     if ( ! mi->custom() ->fullSpan() )
                         h += 2 * itemVMargin + 2 * itemFrame;
                 }
@@ -286,7 +286,7 @@ TQSize KThemeStyle::sizeFromContents( ContentsType contents,
                                   2 * itemFrame );
                 }
 
-                if ( ! mi->text().isNull() && mi->text().tqfind( '\t' ) >= 0 )
+                if ( ! mi->text().isNull() && mi->text().find( '\t' ) >= 0 )
                     w += 12;
                 else if ( mi->popup() )
                     w += 2 * arrowHMargin;
@@ -320,8 +320,8 @@ TQRect KThemeStyle::subRect(SubRect sr, const TQWidget* widget) const
         {
             TQRect bounding = cb->rect();
 
-            int   cw = tqpixelMetric(PM_IndicatorWidth, widget);
-            int   ch = tqpixelMetric(PM_IndicatorHeight, widget);
+            int   cw = pixelMetric(PM_IndicatorWidth, widget);
+            int   ch = pixelMetric(PM_IndicatorHeight, widget);
 
             TQRect checkbox(bounding.x() + 2, bounding.y() + 2 + (bounding.height() - ch)/2,  cw - 4, ch - 4);
 
@@ -331,7 +331,7 @@ TQRect KThemeStyle::subRect(SubRect sr, const TQWidget* widget) const
     return KStyle::subRect(sr, widget);
 }
 
-int KThemeStyle::tqpixelMetric ( PixelMetric metric, const TQWidget * widget ) const
+int KThemeStyle::pixelMetric ( PixelMetric metric, const TQWidget * widget ) const
 {
     switch ( metric )
     {
@@ -361,26 +361,26 @@ int KThemeStyle::tqpixelMetric ( PixelMetric metric, const TQWidget * widget ) c
             if ( isPixmap( ExIndicatorOn ) )
                 return ( uncached( ExIndicatorOn ) ->size().width() );
             else
-                return KThemeBase::tqpixelMetric ( metric, widget );
+                return KThemeBase::pixelMetric ( metric, widget );
 
         case PM_ExclusiveIndicatorHeight:
             if ( isPixmap( ExIndicatorOn ) )
                 return ( uncached( ExIndicatorOn ) ->size().height() );
             else
-                return KThemeBase::tqpixelMetric ( metric, widget );
+                return KThemeBase::pixelMetric ( metric, widget );
 
 
         case PM_IndicatorWidth:
             if ( isPixmap( IndicatorOn ) )
                 return ( uncached( IndicatorOn ) ->size().width() );
             else
-                return KThemeBase::tqpixelMetric ( metric, widget );
+                return KThemeBase::pixelMetric ( metric, widget );
 
         case PM_IndicatorHeight:
             if ( isPixmap( IndicatorOn ) )
                 return ( uncached( IndicatorOn ) ->size().height() );
             else
-                return KThemeBase::tqpixelMetric ( metric, widget );
+                return KThemeBase::pixelMetric ( metric, widget );
 
         case PM_SliderLength:
             return ( sliderButtonLength() );
@@ -389,7 +389,7 @@ int KThemeStyle::tqpixelMetric ( PixelMetric metric, const TQWidget * widget ) c
             return ( splitWidth() );
 
         default:
-            return KThemeBase::tqpixelMetric ( metric, widget );
+            return KThemeBase::pixelMetric ( metric, widget );
     }
 }
 
@@ -470,7 +470,7 @@ bool KThemeStyle::eventFilter( TQObject* object, TQEvent* event )
         {
             TQWidget *w = static_cast<TQWidget*>(object);
             TQPoint pos(0, 0);
-            pos = w->mapTo(w->tqtopLevelWidget(), pos);
+            pos = w->mapTo(w->topLevelWidget(), pos);
             TQPixmap pix(uncached( Background )->size());
             TQPainter p;
             p.begin(&pix);
@@ -559,12 +559,12 @@ void KThemeStyle::polish( TQWidget *w )
             TQPalette newPal( w->palette() );
             if ( isColor( MenuItem ) )
             {
-                newPal.setActive( *tqcolorGroup( newPal.active(), MenuItem ) );
-                newPal.setDisabled( *tqcolorGroup( newPal.active(), MenuItem ) );
+                newPal.setActive( *colorGroup( newPal.active(), MenuItem ) );
+                newPal.setDisabled( *colorGroup( newPal.active(), MenuItem ) );
             }
             if ( isColor( MenuItemDown ) )
             {
-                newPal.setActive( *tqcolorGroup( newPal.active(), MenuItemDown ) );
+                newPal.setActive( *colorGroup( newPal.active(), MenuItemDown ) );
             }
             w->setPalette( newPal );
         }
@@ -578,11 +578,11 @@ void KThemeStyle::polish( TQWidget *w )
             TQPalette newPal( w->palette() );
             if ( isColor( IndicatorOff ) )
             {
-                newPal.setActive( *tqcolorGroup( newPal.active(), IndicatorOff ) );
-                newPal.setDisabled( *tqcolorGroup( newPal.active(), IndicatorOff ) );
+                newPal.setActive( *colorGroup( newPal.active(), IndicatorOff ) );
+                newPal.setDisabled( *colorGroup( newPal.active(), IndicatorOff ) );
             }
             if ( isColor( IndicatorOn ) )
-                newPal.setActive( *tqcolorGroup( newPal.active(), IndicatorOn ) );
+                newPal.setActive( *colorGroup( newPal.active(), IndicatorOn ) );
             w->setPalette( newPal );
         }
     }
@@ -593,12 +593,12 @@ void KThemeStyle::polish( TQWidget *w )
             TQPalette newPal( w->palette() );
             if ( isColor( ExIndicatorOff ) )
             {
-                newPal.setActive( *tqcolorGroup( newPal.active(), ExIndicatorOff ) );
-                newPal.setDisabled( *tqcolorGroup( newPal.active(),
+                newPal.setActive( *colorGroup( newPal.active(), ExIndicatorOff ) );
+                newPal.setDisabled( *colorGroup( newPal.active(),
                                                  ExIndicatorOff ) );
             }
             if ( isColor( ExIndicatorOn ) )
-                newPal.setActive( *tqcolorGroup( newPal.active(), ExIndicatorOn ) );
+                newPal.setActive( *colorGroup( newPal.active(), ExIndicatorOn ) );
             w->setPalette( newPal );
         }
     }
@@ -757,7 +757,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe
 
                     return ;
                 }
-                const TQColorGroup *cg = tqcolorGroup( g, widget );
+                const TQColorGroup *cg = colorGroup( g, widget );
                 // Standard arrow types
                 if ( arrowType() == MotifArrow )
                 {
@@ -791,8 +791,8 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe
                     p->save();
 
                     if ( flags & Style_Down )
-                        p->translate( tqpixelMetric( PM_ButtonShiftHorizontal ),
-                                      tqpixelMetric( PM_ButtonShiftVertical ) );
+                        p->translate( pixelMetric( PM_ButtonShiftHorizontal ),
+                                      pixelMetric( PM_ButtonShiftVertical ) );
 
                     if ( flags & Style_Enabled )
                     {
@@ -846,7 +846,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe
         case PE_ButtonBevel:
             {
                 WidgetType type = ( sunken || on || down ) ? BevelDown : Bevel;
-                drawBaseButton( p, x, y, w, h, *tqcolorGroup( g, type ), ( sunken || on || down ), false, type );
+                drawBaseButton( p, x, y, w, h, *colorGroup( g, type ), ( sunken || on || down ), false, type );
                 handled = true;
                 break;
             }
@@ -859,7 +859,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe
             }
         case PE_PanelDockWindow:
             {
-                drawBaseButton( p, x, y, w, h, *tqcolorGroup( g, ToolBar ), false, false,
+                drawBaseButton( p, x, y, w, h, *colorGroup( g, ToolBar ), false, false,
                                 ToolBar );
                 handled = true;
                 break;
@@ -895,11 +895,11 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe
             {
                 if ( isPixmap( ( flags & Style_On || flags & Style_Down ) ? ExIndicatorOn : ExIndicatorOff ) )
                 {
-                    const TQBitmap * tqmask = uncached( ( flags & Style_On || flags & Style_Down ) ? ExIndicatorOn : ExIndicatorOff ) ->tqmask();
-                    if ( tqmask )
+                    const TQBitmap * mask = uncached( ( flags & Style_On || flags & Style_Down ) ? ExIndicatorOn : ExIndicatorOff ) ->mask();
+                    if ( mask )
                     {
                         p->setPen( Qt::color1 );
-                        p->drawPixmap( x, y, *tqmask );
+                        p->drawPixmap( x, y, *mask );
                     }
                     else
                         p->fillRect( x, y, w, h, TQBrush( color1, SolidPattern ) );
@@ -912,12 +912,12 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe
             {
                 if ( isPixmap( ( flags & Style_On ) ? IndicatorOn : IndicatorOff ) )
                 {
-                    const TQBitmap * tqmask = uncached( ( flags & Style_On ) ? IndicatorOn :
-                                                     IndicatorOff ) ->tqmask();
-                    if ( tqmask )
+                    const TQBitmap * mask = uncached( ( flags & Style_On ) ? IndicatorOn :
+                                                     IndicatorOff ) ->mask();
+                    if ( mask )
                     {
                         p->setPen( Qt::color1 );
-                        p->drawPixmap( x, y, *tqmask );
+                        p->drawPixmap( x, y, *mask );
                     }
                     else
                         p->fillRect( x, y, w, h, TQBrush( color1, SolidPattern ) );
@@ -938,7 +938,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe
             }
         case PE_Splitter:
             {
-                drawBaseButton( p, x, y, w, h, *tqcolorGroup( g, Splitter ), false, false,
+                drawBaseButton( p, x, y, w, h, *colorGroup( g, Splitter ), false, false,
                                 Splitter );
                 handled = true;
                 break;
@@ -977,10 +977,10 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe
 
                 if ( !isPixmap( widget ) )
                 {
-                    p->fillRect( r, tqcolorGroup( g, widget ) ->brush( TQColorGroup::Background ) );
+                    p->fillRect( r, colorGroup( g, widget ) ->brush( TQColorGroup::Background ) );
                     // Do the borders and frame
                     drawShade( p, r.x(), r.y(), r.width(),
-                               r.height(), *tqcolorGroup( g, widget ), true, false,
+                               r.height(), *colorGroup( g, widget ), true, false,
                                highlightWidth( widget ), borderWidth( widget ), shade() );
                 }
                 else
@@ -991,7 +991,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe
                                         *scalePixmap( r.width(), r.height(),
                                                       widget ) );
                     drawShade( p, r.x(), r.y(), r.width(),
-                               r.height(), *tqcolorGroup( g, widget ), true, false,
+                               r.height(), *colorGroup( g, widget ), true, false,
                                highlightWidth( widget ), borderWidth( widget ), shade() );
                 }
 
@@ -1002,12 +1002,12 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe
             {
                 bool horizontal = ( flags & Style_Horizontal );
                 drawBaseButton( p, r.x(), r.y(), r.width(), r.height(),
-                                *tqcolorGroup( g, down ? ScrollButtonDown : ScrollButton ),
+                                *colorGroup( g, down ? ScrollButtonDown : ScrollButton ),
                                 down, false, down ? ScrollButtonDown : ScrollButton );
 
                 drawPrimitive( ( horizontal ) ? PE_ArrowRight : PE_ArrowDown, p ,
                                TQRect( r.x() + 3, r.y() + 3, r.width() - 6, r.height() - 6 ),
-                               *tqcolorGroup( g, down ? ScrollButtonDown : ScrollButton ),
+                               *colorGroup( g, down ? ScrollButtonDown : ScrollButton ),
                                flags );
 
                 handled = true;
@@ -1017,12 +1017,12 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe
             {
                 bool horizontal = ( flags & Style_Horizontal );
                 drawBaseButton( p, r.x(), r.y(), r.width(), r.height(),
-                                *tqcolorGroup( g, down ? ScrollButtonDown : ScrollButton ),
+                                *colorGroup( g, down ? ScrollButtonDown : ScrollButton ),
                                 down, false, down ? ScrollButtonDown : ScrollButton );
 
                 drawPrimitive( ( horizontal ) ? PE_ArrowLeft : PE_ArrowUp, p ,
                                TQRect( r.x() + 3, r.y() + 3, r.width() - 6, r.height() - 6 ),
-                               *tqcolorGroup( g, down ? ScrollButtonDown : ScrollButton ),
+                               *colorGroup( g, down ? ScrollButtonDown : ScrollButton ),
                                flags );
                 handled = true;
                 break;
@@ -1038,7 +1038,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe
                                 active ? HScrollBarSliderDown : HScrollBarSlider :
                                     active ? VScrollBarSliderDown : VScrollBarSlider;
                 drawBaseButton( p, r.x()+offsetH, r.y()+offsetV, r.width()-2*offsetH,
-                                r.height()-2*offsetV, *tqcolorGroup( g, widget ), active, false,
+                                r.height()-2*offsetV, *colorGroup( g, widget ), active, false,
                                 widget );
 
                 int spaceW = horizontal ? r.width() - decoWidth( widget ) - 4 :
@@ -1086,7 +1086,7 @@ TQPixmap* KThemeStyle::makeMenuBarCache(int w, int h) const
             return menuCache;
     }
 
-    const TQColorGroup *g = tqcolorGroup( TQApplication::palette().active(), MenuBar);
+    const TQColorGroup *g = colorGroup( TQApplication::palette().active(), MenuBar);
 
     menuCache = new TQPixmap ( w, h );
     TQPainter p(menuCache);
@@ -1096,7 +1096,7 @@ TQPixmap* KThemeStyle::makeMenuBarCache(int w, int h) const
 }
 
 
-void KThemeStyle::tqdrawControl( ControlElement element,
+void KThemeStyle::drawControl( ControlElement element,
                                TQPainter *p,
                                const TQWidget *widget,
                                const TQRect &r,
@@ -1115,9 +1115,9 @@ void KThemeStyle::tqdrawControl( ControlElement element,
             {
                 const TQPushButton * btn = ( const TQPushButton* ) widget;
                 bool sunken = btn->isOn() || btn->isDown();
-                int diw = tqpixelMetric( PM_ButtonDefaultIndicator, btn );
+                int diw = pixelMetric( PM_ButtonDefaultIndicator, btn );
                 drawBaseButton( p, diw, diw, w - 2 * diw, h - 2 * diw,
-                                *tqcolorGroup( btn->tqcolorGroup(), sunken ? PushButtonDown :
+                                *colorGroup( btn->colorGroup(), sunken ? PushButtonDown :
                                              PushButton ), sunken, roundButton(),
                                 sunken ? PushButtonDown : PushButton );
                 // TODO if diw, draw fancy default button indicator
@@ -1134,15 +1134,15 @@ void KThemeStyle::tqdrawControl( ControlElement element,
                 // Shift button contents if pushed.
                 if ( active )
                 {
-                    x += tqpixelMetric( PM_ButtonShiftHorizontal, widget );
-                    y += tqpixelMetric( PM_ButtonShiftVertical, widget );
+                    x += pixelMetric( PM_ButtonShiftHorizontal, widget );
+                    y += pixelMetric( PM_ButtonShiftVertical, widget );
                     how |= Style_Sunken;
                 }
 
                 // Does the button have a popup menu?
                 if ( button->isMenuButton() )
                 {
-                    int dx = tqpixelMetric( PM_MenuButtonIndicator, widget );
+                    int dx = pixelMetric( PM_MenuButtonIndicator, widget );
                     drawPrimitive( PE_ArrowDown, p, TQRect( x + w - dx - 2, y + 2, dx, h - 4 ),
                                    cg, how, opt );
                     w -= dx;
@@ -1177,49 +1177,49 @@ void KThemeStyle::tqdrawControl( ControlElement element,
                 if ( active || button->isDefault() && button->isEnabled() )
                 {
                     // Draw "fake" bold text  - this enables the font metrics to remain
-                    // the same as computed in TQPushButton::tqsizeHint(), but gives
+                    // the same as computed in TQPushButton::sizeHint(), but gives
                     // a reasonable bold effect.
                     int i;
 
                     // Text shadow
                     for ( i = 0; i < 2; i++ )
                         drawItem( p, TQRect( x + i + 1, y + 1, w, h ), AlignCenter | ShowPrefix,
-                                  button->tqcolorGroup(), button->isEnabled(), NULL,
+                                  button->colorGroup(), button->isEnabled(), NULL,
                                   button->text(), -1,
-                                  active ? &button->tqcolorGroup().dark() : &button->tqcolorGroup().mid() );
+                                  active ? &button->colorGroup().dark() : &button->colorGroup().mid() );
 
                     // Normal Text
                     for ( i = 0; i < 2; i++ )
                         drawItem( p, TQRect( x + i, y, w, h ), AlignCenter | ShowPrefix,
-                                  button->tqcolorGroup(), true, i == 0 ? button->pixmap() : NULL,
+                                  button->colorGroup(), true, i == 0 ? button->pixmap() : NULL,
                                   button->text(), -1,
-                                  active ? &button->tqcolorGroup().light() : &button->tqcolorGroup().buttonText() );
+                                  active ? &button->colorGroup().light() : &button->colorGroup().buttonText() );
                 }
                 else
                 {
                     if ( button->isEnabled() )
                     {
-                        drawItem( p, TQRect( x, y, w, h ), AlignCenter | ShowPrefix, button->tqcolorGroup(),
+                        drawItem( p, TQRect( x, y, w, h ), AlignCenter | ShowPrefix, button->colorGroup(),
                                   true, button->pixmap(), button->text(), -1,
-                                  active ? &button->tqcolorGroup().light() : &button->tqcolorGroup().buttonText() );
+                                  active ? &button->colorGroup().light() : &button->colorGroup().buttonText() );
                     }
                     else
                     {
                         //TODO: Handle reversed
-                        drawItem( p, TQRect( x + 1, y + 1, w, h ), AlignCenter | ShowPrefix, button->tqcolorGroup(),
+                        drawItem( p, TQRect( x + 1, y + 1, w, h ), AlignCenter | ShowPrefix, button->colorGroup(),
                                   true, button->pixmap(), button->text(), -1,
-                                  &button->tqcolorGroup().light() );
+                                  &button->colorGroup().light() );
 
-                        drawItem( p, TQRect( x, y, w, h ), AlignCenter | ShowPrefix, button->tqcolorGroup(),
+                        drawItem( p, TQRect( x, y, w, h ), AlignCenter | ShowPrefix, button->colorGroup(),
                                   true, button->pixmap(), button->text(), -1,
-                                  &button->tqcolorGroup().buttonText() );
+                                  &button->colorGroup().buttonText() );
                     }
                 }
 
                 // Draw a focus rect if the button has focus
                 if ( how & Style_HasFocus )
                     drawPrimitive( PE_FocusRect, p,
-                                   TQStyle::tqvisualRect( subRect( SR_PushButtonFocusRect, widget ), widget ),
+                                   TQStyle::visualRect( subRect( SR_PushButtonFocusRect, widget ), widget ),
                                    cg, how );
                 handled = true;
                 break;
@@ -1238,10 +1238,10 @@ void KThemeStyle::tqdrawControl( ControlElement element,
         case CE_TabBarTab:
             {
                 const TQTabBar* tb = ( const TQTabBar* ) widget;
-                TQTabBar::Shape tbs = tb->tqshape();
+                TQTabBar::Shape tbs = tb->shape();
                 bool selected = how & Style_Selected;
                 WidgetType widget = selected ? ActiveTab : InactiveTab;
-                const TQColorGroup *cg = tqcolorGroup( tb->tqcolorGroup(), widget );
+                const TQColorGroup *cg = colorGroup( tb->colorGroup(), widget );
                 int i;
                 int x2 = x + w - 1, y2 = y + h - 1;
                 int bWidth = borderWidth( widget );
@@ -1314,8 +1314,8 @@ void KThemeStyle::tqdrawControl( ControlElement element,
                     else
                         p->fillRect( x, y, x2 - x + 1, y2 - y + 1, cg->background() );
                 }
-                else if ( tb->tqshape() == TQTabBar::RoundedBelow ||
-                        tb->tqshape() == TQTabBar::TriangularBelow )
+                else if ( tb->shape() == TQTabBar::RoundedBelow ||
+                        tb->shape() == TQTabBar::TriangularBelow )
                 {
                     if ( widget == ActiveTab )
                         widget = RotActiveTab;
@@ -1397,7 +1397,7 @@ void KThemeStyle::tqdrawControl( ControlElement element,
                 TQRect pr = mb->rect();
                 bool active = how & Style_Active;
                 //bool focused = how & Style_HasFocus;
-                const TQColorGroup *g = tqcolorGroup( cg, active ? MenuBarItem : MenuBar );
+                const TQColorGroup *g = colorGroup( cg, active ? MenuBarItem : MenuBar );
                 TQColor btext = g->buttonText();
 
                 TQPixmap* cache = makeMenuBarCache(pr.width(), pr.height());
@@ -1439,10 +1439,10 @@ void KThemeStyle::tqdrawControl( ControlElement element,
                 bool enabled = (mi? mi->isEnabled():true);
                 bool checkable = popupmenu->isCheckable();
                 bool active = how & Style_Active;
-                bool etchtext = tqstyleHint( SH_EtchDisabledText, 0 );
+                bool etchtext = styleHint( SH_EtchDisabledText, 0 );
                 bool reverse = TQApplication::reverseLayout();
 
-                const TQColorGroup& cg_ours = *tqcolorGroup( cg, active ? MenuItemDown : MenuItem );
+                const TQColorGroup& cg_ours = *colorGroup( cg, active ? MenuItemDown : MenuItem );
                 //TQColor btext = cg_ours.buttonText();
 
 
@@ -1464,7 +1464,7 @@ void KThemeStyle::tqdrawControl( ControlElement element,
                     drawBaseButton( p, x, y, w, h, cg_ours, true, false, MenuItemDown );
                 else
                 {
-                    drawShade( p, x, y, w, h, *tqcolorGroup( cg_ours, MenuItem ), false, false,
+                    drawShade( p, x, y, w, h, *colorGroup( cg_ours, MenuItem ), false, false,
                                highlightWidth( MenuItem ), borderWidth( MenuItem ),
                                shade() );
                     int dw = decoWidth( MenuItem );
@@ -1474,7 +1474,7 @@ void KThemeStyle::tqdrawControl( ControlElement element,
                             x + dw, y + dw, w - dw * 2, h - dw * 2,
                             cg_ours.brush( TQColorGroup::Background ) );
                         //cg.brush( TQColorGroup::Background ));
-                        //tqcolorGroup( cg_ours, MenuItem ) ->brush( TQColorGroup::Background ) );
+                        //colorGroup( cg_ours, MenuItem ) ->brush( TQColorGroup::Background ) );
                     }
                     else
                     {
@@ -1492,7 +1492,7 @@ void KThemeStyle::tqdrawControl( ControlElement element,
                 if ( mi->iconSet() )
                 {
                     TQIconSet::Mode mode;
-                    TQRect cr = tqvisualRect( TQRect( x, y, checkcol, h ), r );
+                    TQRect cr = visualRect( TQRect( x, y, checkcol, h ), r );
 
                     // Select the correct icon from the iconset
                     if ( active )
@@ -1503,7 +1503,7 @@ void KThemeStyle::tqdrawControl( ControlElement element,
                     // Do we have an icon and are checked at the same time?
                     // Then draw a "pressed" background behind the icon
                     if ( checkable && mi->isChecked() )  //!active && -- ??
-                        drawBaseButton( p, cr.x(), cr.y(), cr.width(), cr.height(), *tqcolorGroup( cg_ours, BevelDown ), true, false, BevelDown );
+                        drawBaseButton( p, cr.x(), cr.y(), cr.width(), cr.height(), *colorGroup( cg_ours, BevelDown ), true, false, BevelDown );
 
                     // Draw the icon
                     TQPixmap pixmap = mi->iconSet() ->pixmap( TQIconSet::Small, mode );
@@ -1580,7 +1580,7 @@ void KThemeStyle::tqdrawControl( ControlElement element,
                     // Does the menu item have a text label?
                     if ( !s.isNull() )
                     {
-                        int t = s.tqfind( '\t' );
+                        int t = s.find( '\t' );
                         int m = itemVMargin;
                         int text_flags = AlignVCenter | ShowPrefix | DontClip | SingleLine;
                         text_flags |= reverse ? AlignRight : AlignLeft;
@@ -1643,7 +1643,7 @@ void KThemeStyle::tqdrawControl( ControlElement element,
                 {
                     PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
                     int dim = 10 -  itemFrame; //We're not very useful to inherit off, so just hardcode..
-                    TQRect vr = tqvisualRect( TQRect( x + w - arrowHMargin - itemFrame - dim,
+                    TQRect vr = visualRect( TQRect( x + w - arrowHMargin - itemFrame - dim,
                                                   y + h / 2 - dim / 2, dim, dim ), r );
 
                     // Draw an arrow at the far end of the menu item
@@ -1667,7 +1667,7 @@ void KThemeStyle::tqdrawControl( ControlElement element,
         case CE_ProgressBarGroove:
             {
                 TQBrush bg;
-                const TQColorGroup * cg2 = tqcolorGroup( cg, ProgressBg );
+                const TQColorGroup * cg2 = colorGroup( cg, ProgressBg );
                 qDrawWinPanel( p, r, *cg2, true );
                 bg.setColor( cg2->color( TQColorGroup::Background ) );
                 if ( isPixmap( ProgressBg ) )
@@ -1714,13 +1714,13 @@ void KThemeStyle::tqdrawControl( ControlElement element,
                         }
                                                                            
                         if ( !reverse )
-                                drawBaseButton( p, x + pstep, y, width, h, *tqcolorGroup( cg, ProgressBar ), false, false, ProgressBar );
+                                drawBaseButton( p, x + pstep, y, width, h, *colorGroup( cg, ProgressBar ), false, false, ProgressBar );
                         else
                         {
                                 //TODO:Optimize
                                 TQPixmap buf( width, h );
                                 TQPainter p2( &buf );
-                                drawBaseButton( &p2, 0, 0, width, h, *tqcolorGroup( cg, ProgressBar ), false, false, ProgressBar );
+                                drawBaseButton( &p2, 0, 0, width, h, *colorGroup( cg, ProgressBar ), false, false, ProgressBar );
                                 p2.end();
                                 TQPixmap mirroredPix = TQPixmap( buf.convertToImage().mirror( true, false ) );
                                 bitBlt( p->device(), x + w - width - pstep, y, &mirroredPix );
@@ -1735,12 +1735,12 @@ void KThemeStyle::tqdrawControl( ControlElement element,
     };
 
     if ( !handled )
-        KThemeBase::tqdrawControl( element,
+        KThemeBase::drawControl( element,
                                  p, widget, r, cg, how, opt );
 }
 
 
-void KThemeStyle::tqdrawControlMask( ControlElement element,
+void KThemeStyle::drawControlMask( ControlElement element,
                                    TQPainter *p,
                                    const TQWidget *widget,
                                    const TQRect &r,
@@ -1764,7 +1764,7 @@ void KThemeStyle::tqdrawControlMask( ControlElement element,
     };
 
     if ( !handled )
-        KThemeBase::tqdrawControlMask( element,
+        KThemeBase::drawControlMask( element,
                                      p, widget, r, opt );
 
 }
@@ -1791,12 +1791,12 @@ void KThemeStyle::drawKStylePrimitive( KStylePrimitive kpe,
                     bool horizontal = slider->orientation() == Horizontal;
                     if ( horizontal )
                     {
-                        drawBaseButton( p, x, y, w, h, *tqcolorGroup( cg, SliderGroove ), true,
+                        drawBaseButton( p, x, y, w, h, *colorGroup( cg, SliderGroove ), true,
                                         false, SliderGroove );
                     }
                     else
                     {
-                        drawBaseButton( p, x, y, w, h, *tqcolorGroup( cg, RotSliderGroove ), true,
+                        drawBaseButton( p, x, y, w, h, *colorGroup( cg, RotSliderGroove ), true,
                                         false, RotSliderGroove );
                     }
                 }
@@ -1853,8 +1853,8 @@ void KThemeStyle::drawKStylePrimitive( KStylePrimitive kpe,
                             TQWMatrix r270;
                             r270.rotate( 270 );
                             vsliderCache = new TQPixmap( uncached( Slider ) ->xForm( r270 ) );
-                            if ( uncached( Slider ) ->tqmask() )
-                                vsliderCache->setMask( uncached( Slider ) ->tqmask() ->xForm( r270 ) );
+                            if ( uncached( Slider ) ->mask() )
+                                vsliderCache->setMask( uncached( Slider ) ->mask() ->xForm( r270 ) );
                         }
                         bitBlt( p->device(), x + ( w - vsliderCache->width() ) / 2, y,
                                 vsliderCache );
@@ -1925,10 +1925,10 @@ void KThemeStyle::drawKStylePrimitive( KStylePrimitive kpe,
         case KPE_GeneralHandle:
             {
                 if ( w > h )
-                    drawBaseButton( p, x, y, w, h, *tqcolorGroup( cg, HBarHandle ), false, false,
+                    drawBaseButton( p, x, y, w, h, *colorGroup( cg, HBarHandle ), false, false,
                                     HBarHandle );
                 else
-                    drawBaseButton( p, x, y, w, h, *tqcolorGroup( cg, VBarHandle ), false, false,
+                    drawBaseButton( p, x, y, w, h, *colorGroup( cg, VBarHandle ), false, false,
                                     VBarHandle );
 
                 handled = true;
@@ -1950,7 +1950,7 @@ void KThemeStyle::drawKStylePrimitive( KStylePrimitive kpe,
 
 
 
-void KThemeStyle::tqdrawComplexControl ( ComplexControl control, TQPainter * p, const TQWidget * widget,
+void KThemeStyle::drawComplexControl ( ComplexControl control, TQPainter * p, const TQWidget * widget,
                                        const TQRect & r, const TQColorGroup & g, SFlags how ,
                                        SCFlags controls, SCFlags active,
                                        const TQStyleOption & opt ) const
@@ -1977,7 +1977,7 @@ void KThemeStyle::tqdrawComplexControl ( ComplexControl control, TQPainter * p,
                 {
                     WidgetType widget = ( down || on ) ? ToolButtonDown : ToolButton;
 
-                    drawBaseButton( p, button.x(), button.y(), button.width(), button.height(), *tqcolorGroup( g, widget ), down || on, false,
+                    drawBaseButton( p, button.x(), button.y(), button.width(), button.height(), *colorGroup( g, widget ), down || on, false,
                                     widget );
 
                     // int m = decoWidth( widget );
@@ -2013,7 +2013,7 @@ void KThemeStyle::tqdrawComplexControl ( ComplexControl control, TQPainter * p,
                     bool sunken = ( active == SC_ComboBoxArrow );
                     //No frame, edit box and button for now?
                     WidgetType widget = sunken ? ComboBoxDown : ComboBox;
-                    drawBaseButton( p, x, y, w, h, *tqcolorGroup( g, widget ), sunken,
+                    drawBaseButton( p, x, y, w, h, *colorGroup( g, widget ), sunken,
                                     roundComboBox(), widget );
 
                     controls ^= SC_ComboBoxFrame;
@@ -2022,7 +2022,7 @@ void KThemeStyle::tqdrawComplexControl ( ComplexControl control, TQPainter * p,
                 if ( controls & SC_ComboBoxArrow )
                 {
                     bool sunken = ( active == SC_ComboBoxArrow );
-                    TQRect ar = TQStyle::tqvisualRect(
+                    TQRect ar = TQStyle::visualRect(
                                    querySubControlMetrics( CC_ComboBox, widget, SC_ComboBoxArrow ),
                                    widget );
                     ar.rect( &x, &y, &w, &h );
@@ -2041,8 +2041,8 @@ void KThemeStyle::tqdrawComplexControl ( ComplexControl control, TQPainter * p,
                     else
                     {
 
-                        mtfstyle->drawPrimitive( PE_ArrowDown, p, TQRect( x, y, w, h ), *tqcolorGroup( g, widget ), sunken ? ( how | Style_Sunken ) : how, opt );
-                        qDrawShadeRect( p, x, y, w, h, *tqcolorGroup( g, widget ) ); //w-14, y+7+(h-15), 10, 3,
+                        mtfstyle->drawPrimitive( PE_ArrowDown, p, TQRect( x, y, w, h ), *colorGroup( g, widget ), sunken ? ( how | Style_Sunken ) : how, opt );
+                        qDrawShadeRect( p, x, y, w, h, *colorGroup( g, widget ) ); //w-14, y+7+(h-15), 10, 3,
                     }
                     controls ^= SC_ComboBoxArrow;
                 }
@@ -2115,7 +2115,7 @@ void KThemeStyle::tqdrawComplexControl ( ComplexControl control, TQPainter * p,
 
     if ( !handled )
     {
-        KThemeBase::tqdrawComplexControl ( control, p, widget,
+        KThemeBase::drawComplexControl ( control, p, widget,
                                          r, g, how ,
                                          controls, active,
                                          opt );
@@ -2184,7 +2184,7 @@ void KThemeStyle::drawBaseMask( TQPainter *p, int x, int y, int w, int h,
         p->fillRect( x, y, w, h, fillBrush );
 }
 
-int KThemeStyle::tqstyleHint( StyleHint sh, const TQWidget *w, const TQStyleOption &opt, QStyleHintReturn *shr ) const
+int KThemeStyle::styleHint( StyleHint sh, const TQWidget *w, const TQStyleOption &opt, QStyleHintReturn *shr ) const
 {
     switch ( sh )
     {
@@ -2206,7 +2206,7 @@ int KThemeStyle::tqstyleHint( StyleHint sh, const TQWidget *w, const TQStyleOpti
 	    return NoBackground;
 
         default:
-            return KThemeBase::tqstyleHint( sh, w, opt, shr );
+            return KThemeBase::styleHint( sh, w, opt, shr );
     };
 }
 
@@ -2381,4 +2381,4 @@ int KThemeStyle::popupMenuItemHeight( bool /*checkable*/, TQMenuItem *mi,
 }
 
 #include "kthemestyle.moc"
-// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent on;
+// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent on;
diff --git a/kstyles/kthemestyle/kthemestyle.h b/kstyles/kthemestyle/kthemestyle.h
index 37483a804..00d6256e7 100644
--- a/kstyles/kthemestyle/kthemestyle.h
+++ b/kstyles/kthemestyle/kthemestyle.h
@@ -79,13 +79,13 @@ public:
     KThemeStyle( const TQString& configDir, const TQString &configFile = TQString::null );
     ~KThemeStyle();
 
-    virtual int tqpixelMetric ( PixelMetric metric, const TQWidget * widget = 0 ) const;
+    virtual int pixelMetric ( PixelMetric metric, const TQWidget * widget = 0 ) const;
 
     virtual void drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRect & r, const TQColorGroup & cg,
                                  SFlags flags = Style_Default,
                                  const TQStyleOption& = TQStyleOption::Default ) const;
 
-    virtual void tqdrawControl( ControlElement element,
+    virtual void drawControl( ControlElement element,
                               TQPainter *p,
                               const TQWidget *widget,
                               const TQRect &r,
@@ -93,14 +93,14 @@ public:
                               SFlags how = Style_Default,
                               const TQStyleOption& = TQStyleOption::Default ) const;
 
-    virtual void tqdrawControlMask( ControlElement element,
+    virtual void drawControlMask( ControlElement element,
                                   TQPainter *p,
                                   const TQWidget *widget,
                                   const TQRect &r,
                                   const TQStyleOption& = TQStyleOption::Default ) const;
 
 
-    virtual void tqdrawComplexControl( ComplexControl control,
+    virtual void drawComplexControl( ComplexControl control,
                                      TQPainter *p,
                                      const TQWidget* widget,
                                      const TQRect &r,
@@ -119,7 +119,7 @@ public:
                                       const TQStyleOption& = TQStyleOption::Default ) const;
 
 
-    virtual int tqstyleHint( StyleHint sh,
+    virtual int styleHint( StyleHint sh,
                            const TQWidget *widget = 0,
                            const TQStyleOption& = TQStyleOption::Default,
                            QStyleHintReturn* returnData = 0 ) const;
@@ -165,7 +165,7 @@ public:
                                  const TQColorGroup &g, bool sunken = false,
                                  bool rounded = false, WidgetType type = Bevel ) const;
     /**
-     * Draw a tqmask with for widgets that may be rounded.
+     * Draw a mask with for widgets that may be rounded.
      *
      *Currently used
      * by pushbuttons and comboboxes.
@@ -192,7 +192,7 @@ public:
      * @param w The rectangle width.
      * @param h The rectangle height.
      * @param sunken Draws a sunken style if @p true.
-     * @param rounded Draws a rounded tqshape if @p true. Requires bWidth to be
+     * @param rounded Draws a rounded shape if @p true. Requires bWidth to be
      * at least 1.
      * @param hWidth The highlight width.
      * @param bWidth The border width.
diff --git a/kstyles/light/lightstyle-v2.cpp b/kstyles/light/lightstyle-v2.cpp
index 2647c7cfb..8f673a707 100644
--- a/kstyles/light/lightstyle-v2.cpp
+++ b/kstyles/light/lightstyle-v2.cpp
@@ -51,7 +51,7 @@ public:
 	if ( ! basestyle )
 	    basestyle = TQStyleFactory::create( TQStyleFactory::keys().first() );
 	if ( ! basestyle )
-	    qFatal( "LightStyle: couldn't tqfind a basestyle!" );
+	    qFatal( "LightStyle: couldn't find a basestyle!" );
     }
 
     ~LightStyleV2Private()
@@ -294,7 +294,7 @@ void LightStyleV2::drawPrimitive( PrimitiveElement pe,
 	    bool drawTitle = false;
 	    if ( p && p->device()->devType() == TQInternal::Widget ) {
 		TQWidget *w = (TQWidget *) p->device();
-		TQWidget *p = w->tqparentWidget();
+		TQWidget *p = w->parentWidget();
 		if (p->inherits("QDockWindow") && ! p->inherits("QToolBar")) {
 		    drawTitle = true;
 		    title = p->caption();
@@ -405,7 +405,7 @@ void LightStyleV2::drawPrimitive( PrimitiveElement pe,
     case PE_WindowFrame:
 	{
 	    int lw = data.isDefault() ?
-		     tqpixelMetric(PM_DefaultFrameWidth) : data.lineWidth();
+		     pixelMetric(PM_DefaultFrameWidth) : data.lineWidth();
 
 	    if ( ! ( flags & Style_Sunken ) )
 		flags |= Style_Raised;
@@ -419,7 +419,7 @@ void LightStyleV2::drawPrimitive( PrimitiveElement pe,
     case PE_PanelDockWindow:
 	{
 	    int lw = data.isDefault() ?
-		     tqpixelMetric(PM_DockWindowFrameWidth) : data.lineWidth();
+		     pixelMetric(PM_DockWindowFrameWidth) : data.lineWidth();
 
 	    if (lw == 2)
 		drawLightBevel(p, r, cg, flags | Style_Raised,
@@ -432,7 +432,7 @@ void LightStyleV2::drawPrimitive( PrimitiveElement pe,
     case PE_PanelMenuBar:
 	{
 	    int lw = data.isDefault() ?
-		     tqpixelMetric(PM_MenuBarFrameWidth) : data.lineWidth();
+		     pixelMetric(PM_MenuBarFrameWidth) : data.lineWidth();
 
 	    if (lw == 2)
 		drawLightBevel(p, r, cg, flags, &cg.brush(TQColorGroup::Button));
@@ -612,7 +612,7 @@ void LightStyleV2::drawPrimitive( PrimitiveElement pe,
     }
 }
 
-void LightStyleV2::tqdrawControl( ControlElement control,
+void LightStyleV2::drawControl( ControlElement control,
 			      TQPainter *p,
 			      const TQWidget *widget,
 			      const TQRect &r,
@@ -631,7 +631,7 @@ void LightStyleV2::tqdrawControl( ControlElement control,
 	    tr.addCoords(0, 0,  0, -1);
 	    fr.addCoords(2, 2, -2, -2);
 	    
-	    if ( tb->tqshape() == TQTabBar::RoundedBelow || tb->tqshape() == TQTabBar::TriangularBelow) {
+	    if ( tb->shape() == TQTabBar::RoundedBelow || tb->shape() == TQTabBar::TriangularBelow) {
 		tr = r; tr.addCoords(0, 1, 0, 0);
 		fr = r; fr.addCoords(2, 2,-2, -4);
 		below = true;
@@ -822,10 +822,10 @@ void LightStyleV2::tqdrawControl( ControlElement control,
 
 	    bool reverse = TQApplication::reverseLayout();
 	    if ( reverse ) {
-		cr = tqvisualRect( cr, r );
-		sr = tqvisualRect( sr, r );
-		tr = tqvisualRect( tr, r );
-		ir = tqvisualRect( ir, r );
+		cr = visualRect( cr, r );
+		sr = visualRect( sr, r );
+		tr = visualRect( tr, r );
+		ir = visualRect( ir, r );
 	    }
 
 	    if (mi->isChecked() &&
@@ -887,7 +887,7 @@ void LightStyleV2::tqdrawControl( ControlElement control,
 
 	    TQString text = mi->text();
 	    if (! text.isNull()) {
-		int t = text.tqfind('\t');
+		int t = text.find('\t');
 
 		// draw accelerator/tab-text
 		if (t >= 0) {
@@ -965,12 +965,12 @@ void LightStyleV2::tqdrawControl( ControlElement control,
 	break;
 
     default:
-	TQCommonStyle::tqdrawControl(control, p, widget, r, cg, flags, data);
+	TQCommonStyle::drawControl(control, p, widget, r, cg, flags, data);
 	break;
     }
 }
 
-void LightStyleV2::tqdrawControlMask( ControlElement control,
+void LightStyleV2::drawControlMask( ControlElement control,
 				  TQPainter *p,
 				  const TQWidget *widget,
 				  const TQRect &r,
@@ -982,7 +982,7 @@ void LightStyleV2::tqdrawControlMask( ControlElement control,
 	break;
 
     default:
-	TQCommonStyle::tqdrawControlMask(control, p, widget, r, data);
+	TQCommonStyle::drawControlMask(control, p, widget, r, data);
 	break;
     }
 }
@@ -997,7 +997,7 @@ TQRect LightStyleV2::subRect(SubRect subrect, const TQWidget *widget) const
  	    const TQPushButton *button = (const TQPushButton *) widget;
  	    int dbw1 = 0, dbw2 = 0;
  	    if (button->isDefault() || button->autoDefault()) {
- 		dbw1 = tqpixelMetric(PM_ButtonDefaultIndicator, widget);
+ 		dbw1 = pixelMetric(PM_ButtonDefaultIndicator, widget);
  		dbw2 = dbw1 * 2;
  	    }
 
@@ -1015,7 +1015,7 @@ TQRect LightStyleV2::subRect(SubRect subrect, const TQWidget *widget) const
     return rect;
 }
 
-void LightStyleV2::tqdrawComplexControl( ComplexControl control,
+void LightStyleV2::drawComplexControl( ComplexControl control,
 				     TQPainter* p,
 				     const TQWidget* widget,
 				     const TQRect& r,
@@ -1031,15 +1031,15 @@ void LightStyleV2::tqdrawComplexControl( ComplexControl control,
 	    const TQComboBox *combobox = (const TQComboBox *) widget;
 	    TQRect frame, arrow, field;
 	    frame =
-		TQStyle::tqvisualRect(querySubControlMetrics(CC_ComboBox, widget,
+		TQStyle::visualRect(querySubControlMetrics(CC_ComboBox, widget,
 							  SC_ComboBoxFrame, data),
 				   widget);
 	    arrow =
-		TQStyle::tqvisualRect(querySubControlMetrics(CC_ComboBox, widget,
+		TQStyle::visualRect(querySubControlMetrics(CC_ComboBox, widget,
 							  SC_ComboBoxArrow, data),
 				   widget);
 	    field =
-		TQStyle::tqvisualRect(querySubControlMetrics(CC_ComboBox, widget,
+		TQStyle::visualRect(querySubControlMetrics(CC_ComboBox, widget,
 							  SC_ComboBoxEditField, data),
 				   widget);
 
@@ -1067,7 +1067,7 @@ void LightStyleV2::tqdrawComplexControl( ComplexControl control,
 		    if (! combobox->editable()) {
 			p->fillRect( field, cg.brush( TQColorGroup::Highlight ) );
 			TQRect fr =
-			    TQStyle::tqvisualRect( subRect( SR_ComboBoxFocusRect, widget ),
+			    TQStyle::visualRect( subRect( SR_ComboBoxFocusRect, widget ),
 						widget );
 			drawPrimitive( PE_FocusRect, p, fr, cg,
 				       flags | Style_FocusAtBorder,
@@ -1281,19 +1281,19 @@ void LightStyleV2::tqdrawComplexControl( ComplexControl control,
 	    }
 
 	    if (controls & SC_SliderTickmarks)
-		TQCommonStyle::tqdrawComplexControl(control, p, widget, r, cg, flags,
+		TQCommonStyle::drawComplexControl(control, p, widget, r, cg, flags,
 						 SC_SliderTickmarks, active, data );
 	    break;
 	}
 
     case CC_ListView:
 	// use the base style for CC_ListView
-	singleton->basestyle->tqdrawComplexControl(control, p, widget, r, cg, flags,
+	singleton->basestyle->drawComplexControl(control, p, widget, r, cg, flags,
 						 controls, active, data);
 	break;
 
     default:
-	TQCommonStyle::tqdrawComplexControl(control, p, widget, r, cg, flags,
+	TQCommonStyle::drawComplexControl(control, p, widget, r, cg, flags,
 					 controls, active, data);
 	break;
     }
@@ -1311,7 +1311,7 @@ TQRect LightStyleV2::querySubControlMetrics( ComplexControl control,
 	{
 	    const TQScrollBar *scrollbar = (const TQScrollBar *) widget;
 	    int sliderstart = scrollbar->sliderStart();
-	    int sbextent = tqpixelMetric(PM_ScrollBarExtent, widget);
+	    int sbextent = pixelMetric(PM_ScrollBarExtent, widget);
 	    int maxlen = ((scrollbar->orientation() == Qt::Horizontal) ?
 			  scrollbar->width() : scrollbar->height()) - (sbextent * 3);
 	    int sliderlen;
@@ -1322,7 +1322,7 @@ TQRect LightStyleV2::querySubControlMetrics( ComplexControl control,
 		sliderlen = (scrollbar->pageStep() * maxlen) /
 			    (range + scrollbar->pageStep());
 
-		int slidermin = tqpixelMetric( PM_ScrollBarSliderMin, widget );
+		int slidermin = pixelMetric( PM_ScrollBarSliderMin, widget );
 		if ( sliderlen < slidermin || range > INT_MAX / 2 )
 		    sliderlen = slidermin;
 		if ( sliderlen > maxlen )
@@ -1409,7 +1409,7 @@ TQStyle::SubControl LightStyleV2::querySubControl( ComplexControl control,
     return ret;
 }
 
-int LightStyleV2::tqpixelMetric( PixelMetric metric,
+int LightStyleV2::pixelMetric( PixelMetric metric,
 			     const TQWidget *widget ) const
 {
     int ret;
@@ -1464,7 +1464,7 @@ int LightStyleV2::tqpixelMetric( PixelMetric metric,
 
     case PM_SliderLength:
     case PM_SliderControlThickness:
-	ret = singleton->basestyle->tqpixelMetric( metric, widget );
+	ret = singleton->basestyle->pixelMetric( metric, widget );
 	break;
 
     case PM_MaximumDragDistance:
@@ -1472,7 +1472,7 @@ int LightStyleV2::tqpixelMetric( PixelMetric metric,
 	break;
 
     default:
-	ret = TQCommonStyle::tqpixelMetric(metric, widget);
+	ret = TQCommonStyle::pixelMetric(metric, widget);
 	break;
     }
 
@@ -1525,8 +1525,8 @@ TQSize LightStyleV2::sizeFromContents( ContentsType contents,
 	    int w = contentsSize.width(), h = contentsSize.height();
 
 	    if (mi->custom()) {
-		w = mi->custom()->tqsizeHint().width();
-		h = mi->custom()->tqsizeHint().height();
+		w = mi->custom()->sizeHint().width();
+		h = mi->custom()->sizeHint().height();
 		if (! mi->custom()->fullSpan() && h < 22)
 		    h = 22;
 	    } else if(mi->widget()) {
@@ -1553,7 +1553,7 @@ TQSize LightStyleV2::sizeFromContents( ContentsType contents,
 	    maxpmw = QMAX(maxpmw, 16);
 	    w += (maxpmw * 2) + 8;
 
-	    if (! mi->text().isNull() && mi->text().tqfind('\t') >= 0)
+	    if (! mi->text().isNull() && mi->text().find('\t') >= 0)
 		w += 8;
 
 	    ret = TQSize(w, h);
@@ -1586,7 +1586,7 @@ TQSize LightStyleV2::sizeFromContents( ContentsType contents,
     return ret;
 }
 
-int LightStyleV2::tqstyleHint( StyleHint stylehint,
+int LightStyleV2::styleHint( StyleHint stylehint,
 			   const TQWidget *widget,
 			   const TQStyleOption &option,
 			   QStyleHintReturn* returnData ) const
@@ -1611,7 +1611,7 @@ int LightStyleV2::tqstyleHint( StyleHint stylehint,
 	break;
 
     default:
-	ret = TQCommonStyle::tqstyleHint(stylehint, widget, option, returnData);
+	ret = TQCommonStyle::styleHint(stylehint, widget, option, returnData);
 	break;
     }
 
diff --git a/kstyles/light/lightstyle-v2.h b/kstyles/light/lightstyle-v2.h
index 292984811..e5a3fffac 100644
--- a/kstyles/light/lightstyle-v2.h
+++ b/kstyles/light/lightstyle-v2.h
@@ -48,15 +48,15 @@ public:
 		       SFlags = Style_Default,
 		       const TQStyleOption & = TQStyleOption::Default ) const;
 
-    void tqdrawControl(ControlElement, TQPainter *, const TQWidget *, const TQRect &,
+    void drawControl(ControlElement, TQPainter *, const TQWidget *, const TQRect &,
 		     const TQColorGroup &, SFlags = Style_Default,
 		     const TQStyleOption & = TQStyleOption::Default ) const;
-    void tqdrawControlMask(ControlElement, TQPainter *, const TQWidget *, const TQRect &,
+    void drawControlMask(ControlElement, TQPainter *, const TQWidget *, const TQRect &,
 			 const TQStyleOption & = TQStyleOption::Default) const;
 
     TQRect subRect(SubRect, const TQWidget *) const;
 
-    void tqdrawComplexControl(ComplexControl, TQPainter *, const TQWidget *, const TQRect &,
+    void drawComplexControl(ComplexControl, TQPainter *, const TQWidget *, const TQRect &,
 			    const TQColorGroup &, SFlags = Style_Default,
 			    SCFlags = SC_All, SCFlags = SC_None,
 			    const TQStyleOption & = TQStyleOption::Default ) const;
@@ -67,12 +67,12 @@ public:
     SubControl querySubControl(ComplexControl, const TQWidget *, const TQPoint &,
 			       const TQStyleOption &data = TQStyleOption::Default ) const;
 
-    int tqpixelMetric(PixelMetric, const TQWidget * = 0 ) const;
+    int pixelMetric(PixelMetric, const TQWidget * = 0 ) const;
 
     TQSize sizeFromContents(ContentsType, const TQWidget *, const TQSize &,
 			   const TQStyleOption & = TQStyleOption::Default ) const;
 
-    int tqstyleHint(StyleHint, const TQWidget * = 0,
+    int styleHint(StyleHint, const TQWidget * = 0,
 		  const TQStyleOption & = TQStyleOption::Default,
 		  QStyleHintReturn * = 0 ) const;
 
diff --git a/kstyles/light/lightstyle-v3.cpp b/kstyles/light/lightstyle-v3.cpp
index 9f5bd77f8..5a902d7f5 100644
--- a/kstyles/light/lightstyle-v3.cpp
+++ b/kstyles/light/lightstyle-v3.cpp
@@ -51,7 +51,7 @@ LightStyleV3::LightStyleV3()
     if ( ! basestyle )
 	basestyle = TQStyleFactory::create( TQStyleFactory::keys().first() );
     if ( ! basestyle )
-	qFatal( "LightStyle: couldn't tqfind a basestyle!" );
+	qFatal( "LightStyle: couldn't find a basestyle!" );
 }
 
 LightStyleV3::~LightStyleV3()
@@ -277,7 +277,7 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe,
 		br.addCoords( 1, 1, -1, -1 );
 	    }
 	    drawLightBevel( p, br, cg, flags,
-			    tqpixelMetric( PM_DefaultFrameWidth ) + ( etch ? 1 : 0 ),
+			    pixelMetric( PM_DefaultFrameWidth ) + ( etch ? 1 : 0 ),
 			    etch, true, fill );
 	    break;
 	}
@@ -293,7 +293,7 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe,
 		fill = &cg.brush(TQColorGroup::Button);
 	} else
 	    fill = &cg.brush(TQColorGroup::Background);
-	drawLightBevel( p, r, cg, flags, tqpixelMetric( PM_DefaultFrameWidth ),
+	drawLightBevel( p, r, cg, flags, pixelMetric( PM_DefaultFrameWidth ),
 			false, true, fill );
 	break;
 
@@ -426,7 +426,7 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe,
 	    bool drawTitle = false;
 	    if ( p && p->device()->devType() == TQInternal::Widget ) {
 		TQWidget *w = (TQWidget *) p->device();
-		TQWidget *p = w->tqparentWidget();
+		TQWidget *p = w->parentWidget();
 		if (p->inherits("QDockWindow") && ! p->inherits("QToolBar")) {
 		    drawTitle = true;
 		    title = p->caption();
@@ -531,7 +531,7 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe,
 
     case PE_PanelPopup:
 	drawLightBevel( p, r, cg, flags,
-			( data.isDefault() ? tqpixelMetric(PM_DefaultFrameWidth) :
+			( data.isDefault() ? pixelMetric(PM_DefaultFrameWidth) :
 			  data.lineWidth() ), false, true );
 	break;
 
@@ -544,7 +544,7 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe,
 
 	    int cover = 0;
 	    int reallw = ( data.isDefault() ?
-			   tqpixelMetric( PM_DefaultFrameWidth ) : data.lineWidth() );
+			   pixelMetric( PM_DefaultFrameWidth ) : data.lineWidth() );
 	    cover = reallw - 1;
 
 	    if ( ! ( flags & Style_Sunken ) )
@@ -572,14 +572,14 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe,
 
     case PE_PanelDockWindow:
 	drawLightBevel( p, r, cg, flags, ( data.isDefault() ?
-					   tqpixelMetric(PM_DefaultFrameWidth) :
+					   pixelMetric(PM_DefaultFrameWidth) :
 					   data.lineWidth() ), false, false,
 			&cg.brush( TQColorGroup::Button ) );
 	break;
 
     case PE_PanelMenuBar:
 	drawLightBevel( p, r, cg, flags, ( data.isDefault() ?
-					   tqpixelMetric(PM_MenuBarFrameWidth) :
+					   pixelMetric(PM_MenuBarFrameWidth) :
 					   data.lineWidth() ), false, false,
 			&cg.brush( TQColorGroup::Button ) );
 	break;
@@ -803,7 +803,7 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe,
     }
 }
 
-void LightStyleV3::tqdrawControl( ControlElement control,
+void LightStyleV3::drawControl( ControlElement control,
 			      TQPainter *p,
 			      const TQWidget *widget,
 			      const TQRect &r,
@@ -817,7 +817,7 @@ void LightStyleV3::tqdrawControl( ControlElement control,
 	    const TQTabBar *tb = (const TQTabBar *) widget;
 	    TQRect br = r;
 
-	    if ( tb->tqshape() == TQTabBar::RoundedAbove ) {
+	    if ( tb->shape() == TQTabBar::RoundedAbove ) {
 		if ( ! ( flags & Style_Selected ) ) {
 		    p->setPen( cg.background() );
 		    p->drawLine( br.left(),  br.bottom(),
@@ -852,7 +852,7 @@ void LightStyleV3::tqdrawControl( ControlElement control,
 		else
 		    br.addCoords( 1, 1, -1, 0 );
 		p->fillRect( br, cg.background() );
-	    } else if ( tb->tqshape() == TQTabBar::RoundedBelow ) {
+	    } else if ( tb->shape() == TQTabBar::RoundedBelow ) {
 		if ( ! ( flags & Style_Selected ) ) {
 		    p->setPen( cg.background() );
 		    p->drawLine( br.left(),  br.top(),
@@ -892,7 +892,7 @@ void LightStyleV3::tqdrawControl( ControlElement control,
 
 		p->fillRect( br, cg.background() );
 	    } else
-		TQCommonStyle::tqdrawControl( control, p, widget, r, cg, flags, data );
+		TQCommonStyle::drawControl( control, p, widget, r, cg, flags, data );
 	    break;
 	}
 
@@ -945,10 +945,10 @@ void LightStyleV3::tqdrawControl( ControlElement control,
 
 	    bool reverse = TQApplication::reverseLayout();
 	    if ( reverse ) {
-		cr = tqvisualRect( cr, r );
-		sr = tqvisualRect( sr, r );
-		tr = tqvisualRect( tr, r );
-		ir = tqvisualRect( ir, r );
+		cr = visualRect( cr, r );
+		sr = visualRect( sr, r );
+		tr = visualRect( tr, r );
+		ir = visualRect( ir, r );
 	    }
 
 	    if (mi->isChecked() &&
@@ -1010,7 +1010,7 @@ void LightStyleV3::tqdrawControl( ControlElement control,
 
 	    TQString text = mi->text();
 	    if (! text.isNull()) {
-		int t = text.tqfind('\t');
+		int t = text.find('\t');
 
 		// draw accelerator/tab-text
 		if (t >= 0) {
@@ -1078,17 +1078,17 @@ void LightStyleV3::tqdrawControl( ControlElement control,
 	}
 
     case CE_ProgressBarGroove:
-	drawLightBevel( p, r, cg, Style_Sunken, tqpixelMetric( PM_DefaultFrameWidth ),
+	drawLightBevel( p, r, cg, Style_Sunken, pixelMetric( PM_DefaultFrameWidth ),
 			true, true, &cg.brush( TQColorGroup::Background ) );
 	break;
 
     default:
-	TQCommonStyle::tqdrawControl(control, p, widget, r, cg, flags, data);
+	TQCommonStyle::drawControl(control, p, widget, r, cg, flags, data);
 	break;
     }
 }
 
-void LightStyleV3::tqdrawControlMask( ControlElement control,
+void LightStyleV3::drawControlMask( ControlElement control,
 				  TQPainter *p,
 				  const TQWidget *widget,
 				  const TQRect &r,
@@ -1100,7 +1100,7 @@ void LightStyleV3::tqdrawControlMask( ControlElement control,
 	break;
 
     default:
-	TQCommonStyle::tqdrawControlMask(control, p, widget, r, data);
+	TQCommonStyle::drawControlMask(control, p, widget, r, data);
 	break;
     }
 }
@@ -1113,7 +1113,7 @@ TQRect LightStyleV3::subRect(SubRect subrect, const TQWidget *widget) const
     case SR_PushButtonFocusRect:
 	{
 	    rect = TQCommonStyle::subRect( SR_PushButtonContents, widget );
-	    int bm = tqpixelMetric( PM_ButtonMargin, widget ), hbm = bm / 2;
+	    int bm = pixelMetric( PM_ButtonMargin, widget ), hbm = bm / 2;
 	    rect.addCoords( hbm, hbm, -hbm, -hbm );
   	    break;
   	}
@@ -1150,7 +1150,7 @@ TQRect LightStyleV3::subRect(SubRect subrect, const TQWidget *widget) const
     return rect;
 }
 
-void LightStyleV3::tqdrawComplexControl( ComplexControl control,
+void LightStyleV3::drawComplexControl( ComplexControl control,
 				     TQPainter* p,
 				     const TQWidget* widget,
 				     const TQRect& r,
@@ -1166,15 +1166,15 @@ void LightStyleV3::tqdrawComplexControl( ComplexControl control,
 	    const TQComboBox *combobox = (const TQComboBox *) widget;
 	    TQRect frame, arrow, field;
 	    frame =
-		TQStyle::tqvisualRect(querySubControlMetrics(CC_ComboBox, widget,
+		TQStyle::visualRect(querySubControlMetrics(CC_ComboBox, widget,
 							  SC_ComboBoxFrame, data),
 				   widget);
 	    arrow =
-		TQStyle::tqvisualRect(querySubControlMetrics(CC_ComboBox, widget,
+		TQStyle::visualRect(querySubControlMetrics(CC_ComboBox, widget,
 							  SC_ComboBoxArrow, data),
 				   widget);
 	    field =
-		TQStyle::tqvisualRect(querySubControlMetrics(CC_ComboBox, widget,
+		TQStyle::visualRect(querySubControlMetrics(CC_ComboBox, widget,
 							  SC_ComboBoxEditField, data),
 				   widget);
 
@@ -1193,7 +1193,7 @@ void LightStyleV3::tqdrawComplexControl( ComplexControl control,
 		if (flags & Style_HasFocus) {
 		    if (! combobox->editable()) {
 			TQRect fr =
-			    TQStyle::tqvisualRect( subRect( SR_ComboBoxFocusRect, widget ),
+			    TQStyle::visualRect( subRect( SR_ComboBoxFocusRect, widget ),
 						widget );
 			p->fillRect( fr, cg.brush( TQColorGroup::Highlight ) );
 			drawPrimitive( PE_FocusRect, p, fr, cg,
@@ -1408,19 +1408,19 @@ void LightStyleV3::tqdrawComplexControl( ComplexControl control,
 	    }
 
 	    if (controls & SC_SliderTickmarks)
-		TQCommonStyle::tqdrawComplexControl(control, p, widget, r, cg, flags,
+		TQCommonStyle::drawComplexControl(control, p, widget, r, cg, flags,
 						 SC_SliderTickmarks, active, data );
 	    break;
 	}
 
     case CC_ListView:
 	// use the base style for CC_ListView
-	basestyle->tqdrawComplexControl(control, p, widget, r, cg, flags,
+	basestyle->drawComplexControl(control, p, widget, r, cg, flags,
 				      controls, active, data);
 	break;
 
     default:
-	TQCommonStyle::tqdrawComplexControl(control, p, widget, r, cg, flags,
+	TQCommonStyle::drawComplexControl(control, p, widget, r, cg, flags,
 				      controls, active, data);
 	break;
     }
@@ -1436,8 +1436,8 @@ TQRect LightStyleV3::querySubControlMetrics( ComplexControl control,
     switch (control) {
     case CC_ComboBox:
 	{
-	    int fw = tqpixelMetric( PM_DefaultFrameWidth, widget );
-	    int sb = tqpixelMetric( PM_ScrollBarExtent ); // width of the arrow
+	    int fw = pixelMetric( PM_DefaultFrameWidth, widget );
+	    int sb = pixelMetric( PM_ScrollBarExtent ); // width of the arrow
 
 	    switch ( sc ) {
 	    case SC_ComboBoxFrame:
@@ -1462,7 +1462,7 @@ TQRect LightStyleV3::querySubControlMetrics( ComplexControl control,
 	{
 	    const TQScrollBar *scrollbar = (const TQScrollBar *) widget;
 	    int sliderstart = scrollbar->sliderStart();
-	    int sbextent = tqpixelMetric(PM_ScrollBarExtent, widget);
+	    int sbextent = pixelMetric(PM_ScrollBarExtent, widget);
 	    int maxlen = ((scrollbar->orientation() == Qt::Horizontal) ?
 			  scrollbar->width() : scrollbar->height()) - (sbextent * 3);
 	    int sliderlen;
@@ -1473,7 +1473,7 @@ TQRect LightStyleV3::querySubControlMetrics( ComplexControl control,
 		sliderlen = (scrollbar->pageStep() * maxlen) /
 			    (range + scrollbar->pageStep());
 
-		int slidermin = tqpixelMetric( PM_ScrollBarSliderMin, widget );
+		int slidermin = pixelMetric( PM_ScrollBarSliderMin, widget );
 		if ( sliderlen < slidermin || range > INT_MAX / 2 )
 		    sliderlen = slidermin;
 		if ( sliderlen > maxlen )
@@ -1537,8 +1537,8 @@ TQRect LightStyleV3::querySubControlMetrics( ComplexControl control,
     case CC_Slider:
 	{
 	    const TQSlider *slider = (const TQSlider *) widget;
-	    int tickOffset = tqpixelMetric( PM_SliderTickmarkOffset, widget );
-	    int thickness = tqpixelMetric( PM_SliderControlThickness, widget );
+	    int tickOffset = pixelMetric( PM_SliderTickmarkOffset, widget );
+	    int thickness = pixelMetric( PM_SliderControlThickness, widget );
 
 	    switch ( sc ) {
 	    case SC_SliderGroove:
@@ -1551,7 +1551,7 @@ TQRect LightStyleV3::querySubControlMetrics( ComplexControl control,
 	    case SC_SliderHandle:
 		{
 		    int pos = slider->sliderStart();
-		    int len = tqpixelMetric( PM_SliderLength, widget );
+		    int len = pixelMetric( PM_SliderLength, widget );
 
 		    if ( slider->orientation() == Horizontal )
 			ret.setRect( pos + 2, tickOffset + 2, len - 4, thickness - 4 );
@@ -1593,7 +1593,7 @@ TQStyle::SubControl LightStyleV3::querySubControl( ComplexControl control,
     return ret;
 }
 
-int LightStyleV3::tqpixelMetric( PixelMetric metric,
+int LightStyleV3::pixelMetric( PixelMetric metric,
 			     const TQWidget *widget ) const
 {
     int ret;
@@ -1690,7 +1690,7 @@ int LightStyleV3::tqpixelMetric( PixelMetric metric,
 	break;
 
     default:
-	ret = TQCommonStyle::tqpixelMetric(metric, widget);
+	ret = TQCommonStyle::pixelMetric(metric, widget);
 	break;
     }
 
@@ -1707,8 +1707,8 @@ TQSize LightStyleV3::sizeFromContents( ContentsType contents,
     switch (contents) {
     case CT_ComboBox:
 	{
-	    int fw = tqpixelMetric( PM_DefaultFrameWidth, widget ) * 2;
-	    int sb = tqpixelMetric( PM_ScrollBarExtent ); // width of the arrow
+	    int fw = pixelMetric( PM_DefaultFrameWidth, widget ) * 2;
+	    int sb = pixelMetric( PM_ScrollBarExtent ); // width of the arrow
 	    int w = contentsSize.width();
 	    int h = contentsSize.height();
 
@@ -1728,7 +1728,7 @@ TQSize LightStyleV3::sizeFromContents( ContentsType contents,
 	    const TQPushButton *button = (const TQPushButton *) widget;
 	    ret = TQCommonStyle::sizeFromContents( contents, widget, contentsSize, data );
 	    int w = ret.width(), h = ret.height();
-	    int dbi = tqpixelMetric( PM_ButtonDefaultIndicator, widget ) * 2;
+	    int dbi = pixelMetric( PM_ButtonDefaultIndicator, widget ) * 2;
 	    int mw = 80 - dbi, mh = 25 - dbi;
 
 	    // only expand the button if we are displaying text...
@@ -1755,8 +1755,8 @@ TQSize LightStyleV3::sizeFromContents( ContentsType contents,
 	    int w = contentsSize.width(), h = contentsSize.height();
 
 	    if (mi->custom()) {
-		w = mi->custom()->tqsizeHint().width();
-		h = mi->custom()->tqsizeHint().height();
+		w = mi->custom()->sizeHint().width();
+		h = mi->custom()->sizeHint().height();
 		if (! mi->custom()->fullSpan() && h < 22)
 		    h = 22;
 	    } else if(mi->widget()) {
@@ -1783,7 +1783,7 @@ TQSize LightStyleV3::sizeFromContents( ContentsType contents,
 	    maxpmw = QMAX(maxpmw, 16);
 	    w += (maxpmw * 2) + 8;
 
-	    if (! mi->text().isNull() && mi->text().tqfind('\t') >= 0)
+	    if (! mi->text().isNull() && mi->text().find('\t') >= 0)
 		w += 8;
 
 	    ret = TQSize(w, h);
@@ -1817,7 +1817,7 @@ TQSize LightStyleV3::sizeFromContents( ContentsType contents,
     return ret;
 }
 
-int LightStyleV3::tqstyleHint( StyleHint stylehint,
+int LightStyleV3::styleHint( StyleHint stylehint,
 			   const TQWidget *widget,
 			   const TQStyleOption &option,
 			   QStyleHintReturn* returnData ) const
@@ -1846,7 +1846,7 @@ int LightStyleV3::tqstyleHint( StyleHint stylehint,
 	break;
 
     default:
-	ret = TQCommonStyle::tqstyleHint(stylehint, widget, option, returnData);
+	ret = TQCommonStyle::styleHint(stylehint, widget, option, returnData);
 	break;
     }
 
diff --git a/kstyles/light/lightstyle-v3.h b/kstyles/light/lightstyle-v3.h
index a97c57643..be8812b99 100644
--- a/kstyles/light/lightstyle-v3.h
+++ b/kstyles/light/lightstyle-v3.h
@@ -52,15 +52,15 @@ public:
 		       SFlags = Style_Default,
 		       const TQStyleOption & = TQStyleOption::Default ) const;
 
-    void tqdrawControl(ControlElement, TQPainter *, const TQWidget *, const TQRect &,
+    void drawControl(ControlElement, TQPainter *, const TQWidget *, const TQRect &,
 		     const TQColorGroup &, SFlags = Style_Default,
 		     const TQStyleOption & = TQStyleOption::Default ) const;
-    void tqdrawControlMask(ControlElement, TQPainter *, const TQWidget *, const TQRect &,
+    void drawControlMask(ControlElement, TQPainter *, const TQWidget *, const TQRect &,
 			 const TQStyleOption & = TQStyleOption::Default) const;
 
     TQRect subRect(SubRect, const TQWidget *) const;
 
-    void tqdrawComplexControl(ComplexControl, TQPainter *, const TQWidget *, const TQRect &,
+    void drawComplexControl(ComplexControl, TQPainter *, const TQWidget *, const TQRect &,
 			    const TQColorGroup &, SFlags = Style_Default,
 			    SCFlags = SC_All, SCFlags = SC_None,
 			    const TQStyleOption & = TQStyleOption::Default ) const;
@@ -71,12 +71,12 @@ public:
     SubControl querySubControl(ComplexControl, const TQWidget *, const TQPoint &,
 			       const TQStyleOption &data = TQStyleOption::Default ) const;
 
-    int tqpixelMetric(PixelMetric, const TQWidget * = 0 ) const;
+    int pixelMetric(PixelMetric, const TQWidget * = 0 ) const;
 
     TQSize sizeFromContents(ContentsType, const TQWidget *, const TQSize &,
 			   const TQStyleOption & = TQStyleOption::Default ) const;
 
-    int tqstyleHint(StyleHint, const TQWidget * = 0,
+    int styleHint(StyleHint, const TQWidget * = 0,
 		  const TQStyleOption & = TQStyleOption::Default,
 		  QStyleHintReturn * = 0 ) const;
 
diff --git a/kstyles/plastik/config/plastikconf.cpp b/kstyles/plastik/config/plastikconf.cpp
index 4ad31ef26..70d4f6cfa 100644
--- a/kstyles/plastik/config/plastikconf.cpp
+++ b/kstyles/plastik/config/plastikconf.cpp
@@ -49,7 +49,7 @@ extern "C"
 PlastikStyleConfig::PlastikStyleConfig(TQWidget* parent): TQWidget(parent)
 {
 	//Should have no margins here, the dialog provides them
-	TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 0, 0);
+	TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0);
 	KGlobal::locale()->insertCatalogue("kstyle_plastik_config");
 
 // 	scrollBarLines = new TQCheckBox(i18n("Scrollbar handle lines"), this);
@@ -62,33 +62,33 @@ PlastikStyleConfig::PlastikStyleConfig(TQWidget* parent): TQWidget(parent)
 
     customFocusHighlightColor = new TQCheckBox(i18n("Custom text input highlight color:"), this);
     TQHBox *hbox1 = new TQHBox(this);
-    hbox1->tqlayout()->addItem(new TQSpacerItem(20, 0, TQSizePolicy::Fixed, TQSizePolicy::Minimum) );
+    hbox1->layout()->addItem(new TQSpacerItem(20, 0, TQSizePolicy::Fixed, TQSizePolicy::Minimum) );
     focusHighlightColor = new KColorButton(hbox1);
 
     customOverHighlightColor = new TQCheckBox(i18n("Custom mouseover highlight color:"), this);
     TQHBox *hbox2 = new TQHBox(this);
-    hbox2->tqlayout()->addItem(new TQSpacerItem(20, 0, TQSizePolicy::Fixed, TQSizePolicy::Minimum) );
+    hbox2->layout()->addItem(new TQSpacerItem(20, 0, TQSizePolicy::Fixed, TQSizePolicy::Minimum) );
     overHighlightColor = new KColorButton(hbox2);
 
     customCheckMarkColor = new TQCheckBox(i18n("Custom checkmark color:"), this);
     TQHBox *hbox3 = new TQHBox(this);
-    hbox3->tqlayout()->addItem(new TQSpacerItem(20, 0, TQSizePolicy::Fixed, TQSizePolicy::Minimum) );
+    hbox3->layout()->addItem(new TQSpacerItem(20, 0, TQSizePolicy::Fixed, TQSizePolicy::Minimum) );
     checkMarkColor = new KColorButton(hbox3);
 
-// 	tqlayout->add(scrollBarLines);
-	tqlayout->add(animateProgressBar);
-	tqlayout->add(drawToolBarSeparator);
-	tqlayout->add(drawToolBarItemSeparator);
-// 	tqlayout->add(drawFocusRect);
-	tqlayout->add(drawTriangularExpander);
-	tqlayout->add(inputFocusHighlight);
-    tqlayout->add(customFocusHighlightColor);
-	tqlayout->add(hbox1);
-    tqlayout->add(customOverHighlightColor);
-    tqlayout->add(hbox2);
-	tqlayout->add(customCheckMarkColor);
-	tqlayout->add(hbox3);
-	tqlayout->addStretch(1);
+// 	layout->add(scrollBarLines);
+	layout->add(animateProgressBar);
+	layout->add(drawToolBarSeparator);
+	layout->add(drawToolBarItemSeparator);
+// 	layout->add(drawFocusRect);
+	layout->add(drawTriangularExpander);
+	layout->add(inputFocusHighlight);
+    layout->add(customFocusHighlightColor);
+	layout->add(hbox1);
+    layout->add(customOverHighlightColor);
+    layout->add(hbox2);
+	layout->add(customCheckMarkColor);
+	layout->add(hbox3);
+	layout->addStretch(1);
 
 	TQSettings s;
 // 	origScrollBarLines = s.readBoolEntry("/plastikstyle/Settings/scrollBarLines", false);
diff --git a/kstyles/plastik/misc.cpp b/kstyles/plastik/misc.cpp
index d1a52d61e..e1fc2df79 100644
--- a/kstyles/plastik/misc.cpp
+++ b/kstyles/plastik/misc.cpp
@@ -30,9 +30,9 @@ TQColor alphaBlendColors(const TQColor &bgColor, const TQColor &fgColor, const i
     if(alpha<0) alpha = 0;
     int inv_alpha = 255 - alpha;
 
-    TQColor result  = TQColor( tqRgb(tqRed(rgb_b)*inv_alpha/255 + tqRed(rgb)*alpha/255,
-                                  tqGreen(rgb_b)*inv_alpha/255 + tqGreen(rgb)*alpha/255,
-                                  tqBlue(rgb_b)*inv_alpha/255 + tqBlue(rgb)*alpha/255) );
+    TQColor result  = TQColor( qRgb(qRed(rgb_b)*inv_alpha/255 + qRed(rgb)*alpha/255,
+                                  qGreen(rgb_b)*inv_alpha/255 + qGreen(rgb)*alpha/255,
+                                  qBlue(rgb_b)*inv_alpha/255 + qBlue(rgb)*alpha/255) );
 
     return result;
 }
diff --git a/kstyles/plastik/plastik.cpp b/kstyles/plastik/plastik.cpp
index a148b953c..dd7954cc9 100644
--- a/kstyles/plastik/plastik.cpp
+++ b/kstyles/plastik/plastik.cpp
@@ -74,7 +74,7 @@
 
 // some bitmaps for the radio button so it's easier to handle the circle stuff...
 // 13x13
-static const unsigned char radiobutton_tqmask_bits[] = {
+static const unsigned char radiobutton_mask_bits[] = {
    0xf8, 0x03, 0xfc, 0x07, 0xfe, 0x0f, 0xff, 0x1f, 0xff, 0x1f, 0xff, 0x1f,
    0xff, 0x1f, 0xff, 0x1f, 0xff, 0x1f, 0xff, 0x1f, 0xfe, 0x0f, 0xfc, 0x07,
    0xf8, 0x03};
@@ -662,7 +662,7 @@ void PlastikStyle::renderPixel(TQPainter *p,
         int key = search.key();
 
         CacheEntry *cacheEntry;
-        if( (cacheEntry = pixmapCache->tqfind(key)) ) {
+        if( (cacheEntry = pixmapCache->find(key)) ) {
             if( search == *cacheEntry ) { // match! we can draw now...
                 if(cacheEntry->pixmap)
                     p->drawPixmap(pos, *(cacheEntry->pixmap) );
@@ -675,7 +675,7 @@ void PlastikStyle::renderPixel(TQPainter *p,
 
         TQImage aImg(1,1,32); // 1x1
         aImg.setAlphaBuffer(true);
-        aImg.setPixel(0,0,tqRgba(tqRed(rgb),tqGreen(rgb),tqBlue(rgb),alpha));
+        aImg.setPixel(0,0,qRgba(qRed(rgb),qGreen(rgb),qBlue(rgb),alpha));
         TQPixmap *result = new TQPixmap(aImg);
 
         p->drawPixmap(pos, *result);
@@ -696,9 +696,9 @@ void PlastikStyle::renderPixel(TQPainter *p,
         if(a<0) a = 0;
         int a_inv = 255 - a;
 
-        TQColor res  = TQColor( tqRgb(tqRed(rgb_b)*a_inv/255 + tqRed(rgb_a)*a/255,
-                              tqGreen(rgb_b)*a_inv/255 + tqGreen(rgb_a)*a/255,
-                              tqBlue(rgb_b)*a_inv/255 + tqBlue(rgb_a)*a/255) );
+        TQColor res  = TQColor( qRgb(qRed(rgb_b)*a_inv/255 + qRed(rgb_a)*a/255,
+                              qGreen(rgb_b)*a_inv/255 + qGreen(rgb_a)*a/255,
+                              qBlue(rgb_b)*a_inv/255 + qBlue(rgb_a)*a/255) );
         p->setPen(res);
         p->drawPoint(pos);
     } 
@@ -798,7 +798,7 @@ void PlastikStyle::renderGradient(TQPainter *painter,
     int key = search.key();
 
     CacheEntry *cacheEntry;
-    if( (cacheEntry = pixmapCache->tqfind(key)) ) {
+    if( (cacheEntry = pixmapCache->find(key)) ) {
         if( search == *cacheEntry ) { // match! we can draw now...
             if(cacheEntry->pixmap) {
                 painter->drawTiledPixmap(rect, *(cacheEntry->pixmap) );
@@ -1143,7 +1143,7 @@ void PlastikStyle::renderTab(TQPainter *p,
         // fake the panel border edge for tabs which are aligned left-most
         // (i.e. only if there is no widget in the corner of the tabwidget!)
         if(isFirst&&!reverseLayout&&!cornerWidget)
-        // normal tqlayout
+        // normal layout
         {
             if (!bottom) {
                 p->setPen(alphaBlendColors(g.background(), getColor(g,PanelContour), 50) );
@@ -1165,7 +1165,7 @@ void PlastikStyle::renderTab(TQPainter *p,
                 p->drawPoint(Rb.x()+1, Rb.bottom() );
             }
         } else if(isFirst&&reverseLayout&&!cornerWidget)
-        // reverse tqlayout
+        // reverse layout
         {
             if (!bottom) {
                 p->setPen(alphaBlendColors(g.background(), getColor(g,PanelContour), 50) );
@@ -1266,16 +1266,16 @@ void PlastikStyle::drawKStylePrimitive(KStylePrimitive kpe,
                     p->drawPoint(xcenter+5-4, ycenter+8);
 
 
-                    TQRegion tqmask(xcenter-4, ycenter-5, 9, 13);
-                    tqmask -= TQRegion(xcenter-4, ycenter+4, 1, 4);
-                    tqmask -= TQRegion(xcenter-3, ycenter+5, 1, 3);
-                    tqmask -= TQRegion(xcenter-2, ycenter+6, 1, 2);
-                    tqmask -= TQRegion(xcenter-1, ycenter+7, 1, 1);
-                    tqmask -= TQRegion(xcenter+1, ycenter+7, 1, 1);
-                    tqmask -= TQRegion(xcenter+2, ycenter+6, 1, 2);
-                    tqmask -= TQRegion(xcenter+3, ycenter+5, 1, 3);
-                    tqmask -= TQRegion(xcenter+4, ycenter+4, 1, 4);
-                    p->setClipRegion(tqmask);
+                    TQRegion mask(xcenter-4, ycenter-5, 9, 13);
+                    mask -= TQRegion(xcenter-4, ycenter+4, 1, 4);
+                    mask -= TQRegion(xcenter-3, ycenter+5, 1, 3);
+                    mask -= TQRegion(xcenter-2, ycenter+6, 1, 2);
+                    mask -= TQRegion(xcenter-1, ycenter+7, 1, 1);
+                    mask -= TQRegion(xcenter+1, ycenter+7, 1, 1);
+                    mask -= TQRegion(xcenter+2, ycenter+6, 1, 2);
+                    mask -= TQRegion(xcenter+3, ycenter+5, 1, 3);
+                    mask -= TQRegion(xcenter+4, ycenter+4, 1, 4);
+                    p->setClipRegion(mask);
                     uint surfaceFlags = Draw_Left|Draw_Right|Draw_Top|Round_UpperLeft|Round_UpperRight|Is_Horizontal;
                     if(!enabled)
                         surfaceFlags |= Is_Disabled;
@@ -1316,16 +1316,16 @@ void PlastikStyle::drawKStylePrimitive(KStylePrimitive kpe,
                     p->drawPoint(xcenter+8, ycenter-5+4);
                     p->drawPoint(xcenter+8, ycenter+5-4);
 
-                    TQRegion tqmask(xcenter-5, ycenter-4, 13, 9);
-                    tqmask -= TQRegion(xcenter+4, ycenter-4, 4, 1);
-                    tqmask -= TQRegion(xcenter+5, ycenter-3, 3, 1);
-                    tqmask -= TQRegion(xcenter+6, ycenter-2, 2, 1);
-                    tqmask -= TQRegion(xcenter+7, ycenter-1, 1, 1);
-                    tqmask -= TQRegion(xcenter+7, ycenter+1, 1, 1);
-                    tqmask -= TQRegion(xcenter+6, ycenter+2, 2, 1);
-                    tqmask -= TQRegion(xcenter+5, ycenter+3, 3, 1);
-                    tqmask -= TQRegion(xcenter+4, ycenter+4, 4, 1);
-                    p->setClipRegion(tqmask);
+                    TQRegion mask(xcenter-5, ycenter-4, 13, 9);
+                    mask -= TQRegion(xcenter+4, ycenter-4, 4, 1);
+                    mask -= TQRegion(xcenter+5, ycenter-3, 3, 1);
+                    mask -= TQRegion(xcenter+6, ycenter-2, 2, 1);
+                    mask -= TQRegion(xcenter+7, ycenter-1, 1, 1);
+                    mask -= TQRegion(xcenter+7, ycenter+1, 1, 1);
+                    mask -= TQRegion(xcenter+6, ycenter+2, 2, 1);
+                    mask -= TQRegion(xcenter+5, ycenter+3, 3, 1);
+                    mask -= TQRegion(xcenter+4, ycenter+4, 4, 1);
+                    p->setClipRegion(mask);
                     uint surfaceFlags = Draw_Left|Draw_Top|Draw_Bottom|Round_UpperLeft|Round_BottomLeft|
                                     Round_UpperRight|Is_Horizontal;
                     if(!enabled)
@@ -1515,7 +1515,7 @@ void PlastikStyle::drawPrimitive(PrimitiveElement pe,
         case PE_ButtonTool:
         case PE_ButtonDropDown:
         case PE_ButtonCommand: {
-            bool khtmlMode = opt.isDefault() ? false : khtmlWidgets.tqcontains(opt.widget());
+            bool khtmlMode = opt.isDefault() ? false : khtmlWidgets.contains(opt.widget());
             renderButton(p, r, cg, (on||down), mouseOver, true, enabled, khtmlMode );
             break;
         }
@@ -1732,7 +1732,7 @@ void PlastikStyle::drawPrimitive(PrimitiveElement pe,
             TQColor contentColor = enabled?cg.base():cg.background();
 
             TQBitmap bmp;
-            bmp = TQBitmap(13, 13, radiobutton_tqmask_bits, true);
+            bmp = TQBitmap(13, 13, radiobutton_mask_bits, true);
             // first the surface...
             uint surfaceFlags = Draw_Left|Draw_Right|Draw_Top|Draw_Bottom|Is_Horizontal;
             if(!enabled) {
@@ -1806,7 +1806,7 @@ void PlastikStyle::drawPrimitive(PrimitiveElement pe,
             p->fillRect(r, color0);
 
             TQBitmap bmp;
-            bmp = TQBitmap(13, 13, radiobutton_tqmask_bits, true);
+            bmp = TQBitmap(13, 13, radiobutton_mask_bits, true);
             bmp.setMask(bmp);
             p->setPen(color1);
             p->drawPixmap(x, y, bmp);
@@ -2094,11 +2094,11 @@ void PlastikStyle::drawPrimitive(PrimitiveElement pe,
                 }
             }
 
-            const TQWMatrix oldMatrix( p->tqworldMatrix() );
+            const TQWMatrix oldMatrix( p->worldMatrix() );
 
             if (flags & Style_Down) {
-                p->translate(tqpixelMetric(PM_ButtonShiftHorizontal),
-                                tqpixelMetric(PM_ButtonShiftVertical));
+                p->translate(pixelMetric(PM_ButtonShiftHorizontal),
+                                pixelMetric(PM_ButtonShiftVertical));
             }
 
             a.translate((r.x()+r.width()/2), (r.y()+r.height()/2));
@@ -2138,7 +2138,7 @@ void PlastikStyle::drawPrimitive(PrimitiveElement pe,
 }
 
 
-void PlastikStyle::tqdrawControl(ControlElement element,
+void PlastikStyle::drawControl(ControlElement element,
                               TQPainter *p,
                               const TQWidget *widget,
                               const TQRect &r,
@@ -2211,15 +2211,15 @@ void PlastikStyle::tqdrawControl(ControlElement element,
                               reverseLayout ? Draw_Left|Draw_Right|Draw_Top|Draw_Bottom|Round_UpperLeft|Round_BottomLeft
                               : Draw_Left|Draw_Right|Draw_Top|Draw_Bottom|Round_UpperRight|Round_BottomRight);
 
-                TQRegion tqmask(Rsurface);
+                TQRegion mask(Rsurface);
                 if(reverseLayout) {
-                    tqmask -= TQRegion(Rsurface.left(), Rsurface.top(), 1, 1);
-                    tqmask -= TQRegion(Rsurface.left(), Rsurface.bottom(), 1, 1);
+                    mask -= TQRegion(Rsurface.left(), Rsurface.top(), 1, 1);
+                    mask -= TQRegion(Rsurface.left(), Rsurface.bottom(), 1, 1);
                 } else {
-                    tqmask -= TQRegion(Rsurface.right(), Rsurface.top(), 1, 1);
-                    tqmask -= TQRegion(Rsurface.right(), Rsurface.bottom(), 1, 1);
+                    mask -= TQRegion(Rsurface.right(), Rsurface.top(), 1, 1);
+                    mask -= TQRegion(Rsurface.right(), Rsurface.bottom(), 1, 1);
                 }
-                p->setClipRegion(tqmask);
+                p->setClipRegion(mask);
                 int counter = 0;
                 TQPixmap surfaceTile(21, r.height()-2);
                 TQPainter surfacePainter(&surfaceTile);
@@ -2263,9 +2263,9 @@ void PlastikStyle::tqdrawControl(ControlElement element,
                 if (!_animateProgressBar) {
                     staticShift = (reverseLayout ? Rsurface.left() : Rsurface.right()) % 40 - 40;
                 } else {
-                    // tqfind the animation Offset for the current Widget
+                    // find the animation Offset for the current Widget
                     TQWidget* nonConstWidget = const_cast<TQWidget*>(widget);
-                    TQMapConstIterator<TQWidget*, int> iter = progAnimWidgets.tqfind(nonConstWidget);
+                    TQMapConstIterator<TQWidget*, int> iter = progAnimWidgets.find(nonConstWidget);
                     if (iter != progAnimWidgets.end())
                         animShift = iter.data();
                 }
@@ -2300,7 +2300,7 @@ void PlastikStyle::tqdrawControl(ControlElement element,
                 if(cw)
                     cornerWidget = true;
             }
-            TQTabBar::Shape tbs = tb->tqshape();
+            TQTabBar::Shape tbs = tb->shape();
             bool selected = false;
             if (flags & Style_Selected) selected = true;
             TabPosition pos;
@@ -2336,7 +2336,7 @@ void PlastikStyle::tqdrawControl(ControlElement element,
                     renderTab(p, r, cg, mouseOver, selected, true, pos, false, cornerWidget);
                     break;
                     default:
-                            KStyle::tqdrawControl(element, p, widget, r, cg, flags, opt);
+                            KStyle::drawControl(element, p, widget, r, cg, flags, opt);
             }
 
             break;
@@ -2379,15 +2379,15 @@ void PlastikStyle::tqdrawControl(ControlElement element,
             // Shift button contents if pushed.
             if ( active )
             {
-                x += tqpixelMetric(PM_ButtonShiftHorizontal, widget);
-                y += tqpixelMetric(PM_ButtonShiftVertical, widget);
+                x += pixelMetric(PM_ButtonShiftHorizontal, widget);
+                y += pixelMetric(PM_ButtonShiftVertical, widget);
                 flags |= Style_Sunken;
             }
 
             // Does the button have a popup menu?
             if ( button->isMenuButton() )
             {
-                int dx = tqpixelMetric( PM_MenuButtonIndicator, widget );
+                int dx = pixelMetric( PM_MenuButtonIndicator, widget );
                 if ( button->iconSet() && !button->iconSet()->isNull()  &&
                     (dx + button->iconSet()->pixmap (TQIconSet::Small, TQIconSet::Normal, TQIconSet::Off ).width()) >= w )
                 {
@@ -2396,7 +2396,7 @@ void PlastikStyle::tqdrawControl(ControlElement element,
                 else
                 {
 		    p->setPen(cg.buttonText());
-                    drawPrimitive( PE_ArrowDown, p, tqvisualRect( TQRect(x + w - dx - 8, y + 2, dx, h - 4), r ),
+                    drawPrimitive( PE_ArrowDown, p, visualRect( TQRect(x + w - dx - 8, y + 2, dx, h - 4), r ),
                                 cg, flags, opt );
                     w -= dx;
                 }
@@ -2422,7 +2422,7 @@ void PlastikStyle::tqdrawControl(ControlElement element,
                     p->drawPixmap( x + 4, y + h / 2 - pixmap.height() / 2, pixmap );
 
                 if (cornArrow) //Draw over the icon
-                    drawPrimitive( PE_ArrowDown, p, tqvisualRect( TQRect(x + w - 6, x + h - 6, 7, 7), r ),
+                    drawPrimitive( PE_ArrowDown, p, visualRect( TQRect(x + w - 6, x + h - 6, 7, 7), r ),
                                 cg, flags, opt );
 
 
@@ -2432,14 +2432,14 @@ void PlastikStyle::tqdrawControl(ControlElement element,
             }
 
             // Make the label indicate if the button is a default button or not
-            drawItem( p, TQRect(x, y, w, h), AlignCenter|ShowPrefix, button->tqcolorGroup(),
+            drawItem( p, TQRect(x, y, w, h), AlignCenter|ShowPrefix, button->colorGroup(),
                         button->isEnabled(), button->pixmap(), button->text(), -1,
-                        &button->tqcolorGroup().buttonText() );
+                        &button->colorGroup().buttonText() );
 
 
             if ( flags & Style_HasFocus )
                 drawPrimitive( PE_FocusRect, p,
-                                tqvisualRect( subRect( SR_PushButtonFocusRect, widget ), widget ),
+                                visualRect( subRect( SR_PushButtonFocusRect, widget ), widget ),
                                 cg, flags );
             break;
         }
@@ -2489,7 +2489,7 @@ void PlastikStyle::tqdrawControl(ControlElement element,
             bool enabled    = mi->isEnabled();
             bool checkable  = popupmenu->isCheckable();
             bool active     = flags & Style_Active;
-            bool etchtext   = tqstyleHint( SH_EtchDisabledText );
+            bool etchtext   = styleHint( SH_EtchDisabledText );
             bool reverse    = TQApplication::reverseLayout();
             if ( checkable )
                 checkcol = QMAX( checkcol, 20 );
@@ -2524,7 +2524,7 @@ void PlastikStyle::tqdrawControl(ControlElement element,
                 break;
             }
 
-            TQRect cr = tqvisualRect( TQRect( r.x() + 2, r.y() + 2, checkcol - 1, r.height() - 4 ), r );
+            TQRect cr = visualRect( TQRect( r.x() + 2, r.y() + 2, checkcol - 1, r.height() - 4 ), r );
             // Do we have an icon?
             if ( mi->iconSet() )
             {
@@ -2605,7 +2605,7 @@ void PlastikStyle::tqdrawControl(ControlElement element,
                 TQString s = mi->text();
                 // Does the menu item have a text label?
                 if ( !s.isNull() ) {
-                    int t = s.tqfind( '\t' );
+                    int t = s.find( '\t' );
                     int m = 2;
                     int text_flags = AlignVCenter | ShowPrefix | DontClip | SingleLine;
                     text_flags |= reverse ? AlignRight : AlignLeft;
@@ -2668,8 +2668,8 @@ void PlastikStyle::tqdrawControl(ControlElement element,
             // Does the menu item have a submenu?
             if ( mi->popup() ) {
                 PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
-                int dim = tqpixelMetric(PM_MenuButtonIndicator) - 1;
-                TQRect vr = tqvisualRect( TQRect( r.x() + r.width() - 5 - 1 - dim,
+                int dim = pixelMetric(PM_MenuButtonIndicator) - 1;
+                TQRect vr = visualRect( TQRect( r.x() + r.width() - 5 - 1 - dim,
                             r.y() + r.height() / 2 - dim / 2, dim, dim), r );
 
                 // Draw an arrow at the far end of the menu item
@@ -2705,11 +2705,11 @@ void PlastikStyle::tqdrawControl(ControlElement element,
             break;
 
         default:
-          KStyle::tqdrawControl(element, p, widget, r, cg, flags, opt);
+          KStyle::drawControl(element, p, widget, r, cg, flags, opt);
     }
 }
 
-void PlastikStyle::tqdrawControlMask(ControlElement element,
+void PlastikStyle::drawControlMask(ControlElement element,
                                   TQPainter *p,
                                   const TQWidget *w,
                                   const TQRect &r,
@@ -2724,12 +2724,12 @@ void PlastikStyle::tqdrawControlMask(ControlElement element,
         }
 
         default: {
-            KStyle::tqdrawControlMask (element, p, w, r, opt);
+            KStyle::drawControlMask (element, p, w, r, opt);
         }
     }
 }
 
-void PlastikStyle::tqdrawComplexControlMask(ComplexControl c,
+void PlastikStyle::drawComplexControlMask(ComplexControl c,
                                          TQPainter *p,
                                          const TQWidget *w,
                                          const TQRect &r,
@@ -2745,12 +2745,12 @@ void PlastikStyle::tqdrawComplexControlMask(ComplexControl c,
             break;
         }
         default: {
-            KStyle::tqdrawComplexControlMask (c, p, w, r, o);
+            KStyle::drawComplexControlMask (c, p, w, r, o);
         }
     }
 }
 
-void PlastikStyle::tqdrawComplexControl(ComplexControl control,
+void PlastikStyle::drawComplexControl(ComplexControl control,
                                      TQPainter *p,
                                      const TQWidget *widget,
                                      const TQRect &r,
@@ -2785,7 +2785,7 @@ void PlastikStyle::tqdrawComplexControl(ComplexControl control,
                                               :cg.background();
 
             uint contourFlags = 0;
-            if( khtmlWidgets.tqcontains(cb) )
+            if( khtmlWidgets.contains(cb) )
                 contourFlags |= Draw_AlphaBlend;
             
             if (_inputFocusHighlight && hasFocus && editable && enabled)
@@ -2951,10 +2951,10 @@ void PlastikStyle::tqdrawComplexControl(ComplexControl control,
             // If we're pressed, on, or raised...
                 if (bflags & (Style_Down | Style_On | Style_Raised) || widget==hoverWidget ) {
                     drawPrimitive(PE_ButtonTool, p, button, cg, bflags, opt);
-                } else if (tb->tqparentWidget() &&
-                            tb->tqparentWidget()->backgroundPixmap() &&
-                            !tb->tqparentWidget()->backgroundPixmap()->isNull()) {
-                    TQPixmap pixmap = *(tb->tqparentWidget()->backgroundPixmap());
+                } else if (tb->parentWidget() &&
+                            tb->parentWidget()->backgroundPixmap() &&
+                            !tb->parentWidget()->backgroundPixmap()->isNull()) {
+                    TQPixmap pixmap = *(tb->parentWidget()->backgroundPixmap());
                     p->drawTiledPixmap( r, pixmap, tb->pos() );
                 }
             }
@@ -3140,7 +3140,7 @@ void PlastikStyle::tqdrawComplexControl(ComplexControl control,
         }
 
         default:
-            KStyle::tqdrawComplexControl(control, p, widget,
+            KStyle::drawComplexControl(control, p, widget,
                                         r, cg, flags, controls,
                                         active, opt);
             break;
@@ -3245,15 +3245,15 @@ TQRect PlastikStyle::querySubControlMetrics(ComplexControl control,
     }
 }
 
-int PlastikStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const
+int PlastikStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const
 {
     switch(m) {
     // TABS
     // ----
         case PM_TabBarTabVSpace: {
             const TQTabBar * tb = (const TQTabBar *) widget;
-            if (tb->tqshape() == TQTabBar::RoundedAbove ||
-                tb->tqshape() == TQTabBar::RoundedBelow)
+            if (tb->shape() == TQTabBar::RoundedAbove ||
+                tb->shape() == TQTabBar::RoundedBelow)
                 return 12;
             else
                 return 4;
@@ -3342,7 +3342,7 @@ int PlastikStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const
         }
 
         default:
-            return KStyle::tqpixelMetric(m, widget);
+            return KStyle::pixelMetric(m, widget);
     }
 }
 
@@ -3364,8 +3364,8 @@ TQSize PlastikStyle::sizeFromContents(ContentsType t,
             bool checkable = popup->isCheckable();
 
             if (mi->custom()) {
-                w = mi->custom()->tqsizeHint().width();
-                h = mi->custom()->tqsizeHint().height();
+                w = mi->custom()->sizeHint().width();
+                h = mi->custom()->sizeHint().height();
                 if (!mi->custom()->fullSpan() )
                     h += 4;
             } else if (mi->widget()) {
@@ -3386,7 +3386,7 @@ TQSize PlastikStyle::sizeFromContents(ContentsType t,
                 }
             }
 
-            if (!mi->text().isNull() && (mi->text().tqfind('\t') >= 0)) {
+            if (!mi->text().isNull() && (mi->text().find('\t') >= 0)) {
                 w += itemHMargin + itemFrame*2 + 7;
             } else if (mi->popup()) {
                 w += 2 * arrowHMargin;
@@ -3411,8 +3411,8 @@ TQSize PlastikStyle::sizeFromContents(ContentsType t,
         {
             const TQPushButton* btn = static_cast<const TQPushButton*>(widget);
 
-            int w = s.width() + 2 * tqpixelMetric(PM_ButtonMargin, widget);
-            int h = s.height() + 2 * tqpixelMetric(PM_ButtonMargin, widget);
+            int w = s.width() + 2 * pixelMetric(PM_ButtonMargin, widget);
+            int h = s.height() + 2 * pixelMetric(PM_ButtonMargin, widget);
             if ( btn->text().isEmpty() && s.width() < 32 ) return TQSize(w, h);
 
             return TQSize( w+25, h+5 );
@@ -3433,7 +3433,7 @@ TQSize PlastikStyle::sizeFromContents(ContentsType t,
     return KStyle::sizeFromContents (t, widget, s, opt);
 }
 
-int PlastikStyle::tqstyleHint( StyleHint stylehint,
+int PlastikStyle::styleHint( StyleHint stylehint,
                                    const TQWidget *widget,
                                    const TQStyleOption &option,
                                    QStyleHintReturn* returnData ) const
@@ -3443,7 +3443,7 @@ int PlastikStyle::tqstyleHint( StyleHint stylehint,
             return 96; // Motif-like delay...
 
         default:
-            return KStyle::tqstyleHint(stylehint, widget, option, returnData);
+            return KStyle::styleHint(stylehint, widget, option, returnData);
     }
 }
 
@@ -3458,19 +3458,19 @@ bool PlastikStyle::eventFilter(TQObject *obj, TQEvent *ev)
     if ( ::qt_cast<TQLineEdit*>(obj) ) {
         TQWidget* widget = static_cast<TQWidget*>(obj);
 
-        if ( ::qt_cast<TQSpinWidget*>(widget->tqparentWidget()) )
+        if ( ::qt_cast<TQSpinWidget*>(widget->parentWidget()) )
         {
-            TQWidget* spinbox = widget->tqparentWidget();
+            TQWidget* spinbox = widget->parentWidget();
             if ((ev->type() == TQEvent::FocusIn) || (ev->type() == TQEvent::FocusOut))
             {
-                spinbox->tqrepaint(false);
+                spinbox->repaint(false);
             }
             return false;
         }
 
         if ((ev->type() == TQEvent::FocusIn) || (ev->type() == TQEvent::FocusOut))
         {
-            widget->tqrepaint(false);
+            widget->repaint(false);
         }
         return false;
     }
@@ -3484,13 +3484,13 @@ bool PlastikStyle::eventFilter(TQObject *obj, TQEvent *ev)
         {
             TQWidget* button = static_cast<TQWidget*>(obj);
             hoverWidget = button;
-            button->tqrepaint(false);
+            button->repaint(false);
         }
         else if ((ev->type() == TQEvent::Leave) && (obj == hoverWidget) )
         {
             TQWidget* button = static_cast<TQWidget*>(obj);
             hoverWidget = 0;
-            button->tqrepaint(false);
+            button->repaint(false);
         }
         return false;
     }
@@ -3500,7 +3500,7 @@ bool PlastikStyle::eventFilter(TQObject *obj, TQEvent *ev)
             TQWidget* tabbar = static_cast<TQWidget*>(obj);
             hoverWidget = tabbar;
             hoverTab = 0;
-            tabbar->tqrepaint(false);
+            tabbar->repaint(false);
         }
         else if (ev->type() == TQEvent::MouseMove)
         {
@@ -3508,18 +3508,18 @@ bool PlastikStyle::eventFilter(TQObject *obj, TQEvent *ev)
             TQMouseEvent *me = dynamic_cast<TQMouseEvent*>(ev);
 
             if (tabbar && me) {
-                // avoid unnecessary tqrepaints (which otherwise would occour on every
+                // avoid unnecessary repaints (which otherwise would occour on every
                 // MouseMove event causing high cpu load).
 
-                bool tqrepaint = true;
+                bool repaint = true;
 
                 TQTab *tab = tabbar->selectTab(me->pos() );
                 if (hoverTab == tab)
-                    tqrepaint = false;
+                    repaint = false;
                 hoverTab = tab;
 
-                if (tqrepaint)
-                    tabbar->tqrepaint(false);
+                if (repaint)
+                    tabbar->repaint(false);
             }
         }
         else if (ev->type() == TQEvent::Leave)
@@ -3527,7 +3527,7 @@ bool PlastikStyle::eventFilter(TQObject *obj, TQEvent *ev)
             TQWidget* tabbar = static_cast<TQWidget*>(obj);
             hoverWidget = 0;
             hoverTab = 0;
-            tabbar->tqrepaint(false);
+            tabbar->repaint(false);
         }
         return false;
     }
diff --git a/kstyles/plastik/plastik.h b/kstyles/plastik/plastik.h
index 7ddc6c183..9b38d764c 100644
--- a/kstyles/plastik/plastik.h
+++ b/kstyles/plastik/plastik.h
@@ -81,7 +81,7 @@ public:
                        SFlags flags = Style_Default,
                        const TQStyleOption &opt = TQStyleOption::Default ) const;
 
-    void tqdrawControl(ControlElement element,
+    void drawControl(ControlElement element,
                      TQPainter *p,
                      const TQWidget *widget,
                      const TQRect &r,
@@ -89,9 +89,9 @@ public:
                      SFlags flags = Style_Default,
                      const TQStyleOption& = TQStyleOption::Default ) const;
 
-    void tqdrawControlMask( ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQStyleOption &) const;
+    void drawControlMask( ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQStyleOption &) const;
 
-    void tqdrawComplexControl(ComplexControl control,
+    void drawComplexControl(ComplexControl control,
                             TQPainter *p,
                             const TQWidget *widget,
                             const TQRect &r,
@@ -101,7 +101,7 @@ public:
                             SCFlags active = SC_None,
                             const TQStyleOption& = TQStyleOption::Default ) const;
 
-    int tqpixelMetric(PixelMetric m,
+    int pixelMetric(PixelMetric m,
                     const TQWidget *widget = 0 ) const;
 
     TQRect subRect(SubRect r,
@@ -112,7 +112,7 @@ public:
                                  SubControl subcontrol,
                                  const TQStyleOption &opt = TQStyleOption::Default ) const;
 
-    void tqdrawComplexControlMask(TQStyle::ComplexControl c,
+    void drawComplexControlMask(TQStyle::ComplexControl c,
                                 TQPainter *p,
                                 const TQWidget *w,
                                 const TQRect &r,
@@ -123,7 +123,7 @@ public:
                            const TQSize &s,
                            const TQStyleOption &o) const;
 
-    int tqstyleHint(StyleHint, const TQWidget * = 0,
+    int styleHint(StyleHint, const TQWidget * = 0,
                   const TQStyleOption & = TQStyleOption::Default,
                   QStyleHintReturn * = 0 ) const;
 
@@ -326,7 +326,7 @@ private:
         {
             // create an int key from the properties which is used to refer to entries in the TQIntCache.
             // the result may not be 100% correct as we don't have so much space in one integer -- use
-            // == operator after tqfind to make sure we got the right one. :)
+            // == operator after find to make sure we got the right one. :)
             return horizontal ^ (type<<1) ^ (width<<5) ^ (height<<10) ^ (c1Rgb<<19) ^ (c2Rgb<<22);
         }
 
diff --git a/kstyles/utils/installtheme/main.cpp b/kstyles/utils/installtheme/main.cpp
index 10945d57f..5ddf8cd56 100644
--- a/kstyles/utils/installtheme/main.cpp
+++ b/kstyles/utils/installtheme/main.cpp
@@ -57,7 +57,7 @@ int main(int argc, char **argv)
         if (config.readEntry( "widgetStyle" ) == "basicstyle.la")
         {
             //OK, emit a style entry...
-            if (!themes.tqcontains(name)) //Only add first occurrence, i.e. user local one.
+            if (!themes.contains(name)) //Only add first occurrence, i.e. user local one.
                 themes[name] = file;
         }
     }
diff --git a/kstyles/web/webstyle.cpp b/kstyles/web/webstyle.cpp
index 167fc5070..f4ed7f931 100644
--- a/kstyles/web/webstyle.cpp
+++ b/kstyles/web/webstyle.cpp
@@ -92,7 +92,7 @@ scrollBarControlsMetrics
 
   int extent  = horizontal ? sb->height() : sb->width();
 
-  TQColorGroup g = sb->tqcolorGroup();
+  TQColorGroup g = sb->colorGroup();
 
   if (sliderStart > sliderMax)
     sliderStart = sliderMax;
@@ -303,12 +303,12 @@ WebStyle::eventFilter(TQObject * o, TQEvent * e)
   if (e->type() == TQEvent::Enter)
   {
     _highlightedButton = pb;
-    pb->tqrepaint(false);
+    pb->repaint(false);
   }
   else if (e->type() == TQEvent::Leave)
   {
     _highlightedButton = 0;
-    pb->tqrepaint(false);
+    pb->repaint(false);
   }
 
   return false;
@@ -371,14 +371,14 @@ WebStyle::drawPushButton(TQPushButton * b, TQPainter * p)
   bool sunken(b->isDown() || b->isOn());
   bool hl(_highlightedButton == b);
 
-  TQColor bg(b->tqcolorGroup().button());
+  TQColor bg(b->colorGroup().button());
 
   p->save();
-  p->fillRect(b->rect(), b->tqcolorGroup().brush(TQColorGroup::Background));
+  p->fillRect(b->rect(), b->colorGroup().brush(TQColorGroup::Background));
 
   if (b->isDefault())
   {
-    TQColor c(hl ? b->tqcolorGroup().highlight() : b->tqcolorGroup().mid());
+    TQColor c(hl ? b->colorGroup().highlight() : b->colorGroup().mid());
 
     p->setPen(contrastingForeground(c, bg));
 
@@ -391,26 +391,26 @@ WebStyle::drawPushButton(TQPushButton * b, TQPainter * p)
      4,
      b->width() - 8,
      b->height() - 8,
-     b->tqcolorGroup().brush(TQColorGroup::Button)
+     b->colorGroup().brush(TQColorGroup::Button)
     );
 
   if (b->isEnabled())
   {
     if (sunken)
     {
-      p->setPen(contrastingForeground(b->tqcolorGroup().light(), bg));
+      p->setPen(contrastingForeground(b->colorGroup().light(), bg));
     }
     else
     {
       if (hl)
-        p->setPen(contrastingForeground(b->tqcolorGroup().highlight(), bg));
+        p->setPen(contrastingForeground(b->colorGroup().highlight(), bg));
       else
-        p->setPen(contrastingForeground(b->tqcolorGroup().mid(), bg));
+        p->setPen(contrastingForeground(b->colorGroup().mid(), bg));
     }
   }
   else
   {
-    p->setPen(b->tqcolorGroup().button());
+    p->setPen(b->colorGroup().button());
   }
 
   drawFunkyRect(p, 3, 3, b->width() - 6, b->height() - 6, true);
@@ -459,7 +459,7 @@ WebStyle::drawScrollBarControls
      rSlider
     );
 
-  TQColorGroup g(sb->tqcolorGroup());
+  TQColorGroup g(sb->colorGroup());
 
   if (controls & AddLine && rAdd.isValid())
   {
@@ -583,7 +583,7 @@ WebStyle::scrollBarPointOver
  const TQPoint & point
 )
 {
-  if (!sb->rect().tqcontains(point))
+  if (!sb->rect().contains(point))
     return NoScroll;
 
   int sliderMin, sliderMax, sliderLength, buttonDim;
@@ -754,7 +754,7 @@ WebStyle::drawExclusiveIndicator
 
   p->setBrush(g.brush(TQColorGroup::Background));
 
-  // Avoid mistqshapen ellipses. Qt or X bug ? Who knows...
+  // Avoid misshapen ellipses. Qt or X bug ? Who knows...
 
   if (0 == w % 2)
     --w;
@@ -1450,14 +1450,14 @@ WebStyle::drawTab
 {
   TQRect r(tab->rect());
 
-  TQColorGroup g(tabBar->tqcolorGroup());
+  TQColorGroup g(tabBar->colorGroup());
 
   p->save();
 
   p->setPen(selected ? g.dark() : g.mid());
   p->fillRect(r, g.brush(TQColorGroup::Background));
 
-  switch (tabBar->tqshape())
+  switch (tabBar->shape())
   {
     case TQTabBar::RoundedAbove:
     case TQTabBar::TriangularAbove:
@@ -1603,7 +1603,7 @@ WebStyle::drawKickerTaskButton
   static TQString modStr =
     TQString::fromUtf8("[") + i18n("modified") + TQString::fromUtf8("]");
 
-  int modStrPos = s.tqfind(modStr);
+  int modStrPos = s.find(modStr);
 
   if (-1 != modStrPos)
   {
diff --git a/kunittest/module.h b/kunittest/module.h
index 4213ddcf0..7f4b24789 100644
--- a/kunittest/module.h
+++ b/kunittest/module.h
@@ -48,7 +48,7 @@ namespace KUnitTest
     * @code KUNITTEST_MODULE(kunittest_samplemodule,"TestSuite") @endcode
     */
     #define KUNITTEST_MODULE(library,suite)                                                 \
-    static const TQString s_kunittest_suite  = TQString::tqfromLatin1(suite);                   \
+    static const TQString s_kunittest_suite  = TQString::fromLatin1(suite);                   \
     class library##Module : public TQObject                                                  \
     {                                                                                       \
     public:                                                                                 \
@@ -93,7 +93,7 @@ namespace KUnitTest
         tester##ModuleAutoregister()                                                            \
         {                                                                                       \
             KUnitTest::Tester *test = new tester();                                             \
-            TQString name = s_kunittest_suite + TQString::tqfromLatin1("::") + TQString::fromLocal8Bit(#tester); \
+            TQString name = s_kunittest_suite + TQString::fromLatin1("::") + TQString::fromLocal8Bit(#tester); \
             test->setName(name.local8Bit());                                                    \
             kunittest_registerModuleTester(name.local8Bit(), test );                            \
         }                                                                                       \
diff --git a/kunittest/runner.cpp b/kunittest/runner.cpp
index f0eb5c4df..580d451b8 100644
--- a/kunittest/runner.cpp
+++ b/kunittest/runner.cpp
@@ -57,7 +57,7 @@ namespace KUnitTest
         TQDir dir(folder, "kunittest_*.la");
 
         // Add the folder to the "module" resource such that the KLibLoader can
-        // tqfind the modules in this folder.
+        // find the modules in this folder.
         KGlobal::dirs()->addResourceDir("module", folder);
         kdDebug() << "Looking in folder: " << dir.absPath() << endl;
 
@@ -203,7 +203,7 @@ namespace KUnitTest
 
     void Runner::runTest(const char *name)
     {
-        Tester *test = m_registry.tqfind(name);
+        Tester *test = m_registry.find(name);
         if ( test == 0L ) return;
 
         if ( s_debugCapturingEnabled )
diff --git a/kunittest/runner.h b/kunittest/runner.h
index 1e0c1ec72..1bd6a3d15 100644
--- a/kunittest/runner.h
+++ b/kunittest/runner.h
@@ -94,7 +94,7 @@ namespace KUnitTest
      *
      * @see KUNITTEST_REGISTER_TESTER
      */
-    class KUNITTEST_EXPORT Runner : public TQObject
+    class KUNITTEST_EXPORT Runner : public QObject
     {
         Q_OBJECT
     
diff --git a/kunittest/tester.cpp b/kunittest/tester.cpp
index 0ad956ba0..3faf3997e 100644
--- a/kunittest/tester.cpp
+++ b/kunittest/tester.cpp
@@ -48,9 +48,9 @@ namespace KUnitTest
     
     void SlotTester::allTests()
     {
-        TQStrList allSlots = tqmetaObject()->slotNames();
+        TQStrList allSlots = metaObject()->slotNames();
         
-        if ( allSlots.tqcontains("setUp()") > 0 ) invokeMember("setUp()");
+        if ( allSlots.contains("setUp()") > 0 ) invokeMember("setUp()");
 
         for ( char *sl = allSlots.first(); sl; sl = allSlots.next() ) 
         {
@@ -67,14 +67,14 @@ namespace KUnitTest
             }
         }
 
-        if ( allSlots.tqcontains("tearDown()") > 0 ) invokeMember("tearDown()");
+        if ( allSlots.contains("tearDown()") > 0 ) invokeMember("tearDown()");
     
         m_total->clear();        
     }
     
     TestResults *SlotTester::results(const char *sl) 
     {
-        if ( m_resultsList.tqfind(sl) == 0L ) m_resultsList.insert(sl, new TestResults());
+        if ( m_resultsList.find(sl) == 0L ) m_resultsList.insert(sl, new TestResults());
     
         return m_resultsList[sl]; 
     }
diff --git a/kunittest/tester.h b/kunittest/tester.h
index bc634fbfa..ff3a3d453 100644
--- a/kunittest/tester.h
+++ b/kunittest/tester.h
@@ -359,7 +359,7 @@ using namespace std;
  *
  * @code SKIP("Test skipped because of lack of foo support."); @endcode
  */
-#define SKIP( x ) skip( __FILE__, __LINE__, TQString::tqfromLatin1(#x))
+#define SKIP( x ) skip( __FILE__, __LINE__, TQString::fromLatin1(#x))
 
 /*!
  * A macro testing that @p expression throws an exception that is catched
@@ -512,14 +512,14 @@ namespace KUnitTest
     typedef TQAsciiDictIterator<TestResults> TestResultsListIteratorType;
 
     /*! The abstract Tester class forms the base class for all test cases. Users must
-     * implement the void Tester::allTests() method. This method tqcontains the actual test.
+     * implement the void Tester::allTests() method. This method contains the actual test.
      *
      * Use the CHECK(x,y), XFAIL(x,y) and SKIP(x) macros in the allTests() method
      * to perform the tests.
      *
      * @see CHECK, XFAIL, SKIP
      */
-    class KUNITTEST_EXPORT Tester : public TQObject
+    class KUNITTEST_EXPORT Tester : public QObject
     {
     public:
         Tester(const char *name = 0L)
diff --git a/kutils/groups.dox b/kutils/groups.dox
index 1b9866d03..95d926d73 100644
--- a/kutils/groups.dox
+++ b/kutils/groups.dox
@@ -7,9 +7,9 @@
 */
 
 /**
-@defgroup tqfindtqreplace Find and Replace classes
+@defgroup findreplace Find and Replace classes
 
-These classes implement a generic tqfind/tqreplace function, along with
+These classes implement a generic find/replace function, along with
 extensible dialogs.
 */
 
diff --git a/kutils/kcmodulecontainer.cpp b/kutils/kcmodulecontainer.cpp
index efbae01b2..e75ecc3cf 100644
--- a/kutils/kcmodulecontainer.cpp
+++ b/kutils/kcmodulecontainer.cpp
@@ -143,7 +143,7 @@ void KCModuleContainer::addModule( const TQString& module )
 	d->tabWidget->addTab( proxy, TQIconSet(KGlobal::iconLoader()->loadIcon(
 					proxy->moduleInfo().icon(), KIcon::Desktop)),
 			/* QT eats ampersands for dinner. But not this time. */
-			proxy->moduleInfo().moduleName().tqreplace( "&", "&&" ));
+			proxy->moduleInfo().moduleName().replace( "&", "&&" ));
 
 	d->tabWidget->setTabToolTip( proxy, proxy->moduleInfo().comment() );
 
diff --git a/kutils/kcmodulecontainer.h b/kutils/kcmodulecontainer.h
index 3e73e748f..7b8551b21 100644
--- a/kutils/kcmodulecontainer.h
+++ b/kutils/kcmodulecontainer.h
@@ -39,7 +39,7 @@ class KCModuleProxy;
  *
  * The KCModuleContainer class is a convenience class for organizing a multiple set
  * of KCModule. KCModuleContainer is a sub class of KCModule and builds an interface mainly
- * consisting of a tab widget where each tab tqcontains one of the modules specified via one of the
+ * consisting of a tab widget where each tab contains one of the modules specified via one of the
  * constructors. KCModuleContainer can handle modules which requires root permissions. What you
  * most likely want is the KCMODULECONTAINER macro. \n
  * Sometimes it is of interest to detect in runtime whether a module should be loaded or not. This
diff --git a/kutils/kcmoduleinfo.cpp b/kutils/kcmoduleinfo.cpp
index f2e65dc38..fe2545a39 100644
--- a/kutils/kcmoduleinfo.cpp
+++ b/kutils/kcmoduleinfo.cpp
@@ -128,7 +128,7 @@ void KCModuleInfo::init(KService::Ptr s)
     _service = s;
   else
   {
-    kdDebug(712) << "Could not tqfind the service." << endl;
+    kdDebug(712) << "Could not find the service." << endl;
     return;
   }
 
diff --git a/kutils/kcmoduleloader.cpp b/kutils/kcmoduleloader.cpp
index d01a0c5b3..de1843b7c 100644
--- a/kutils/kcmoduleloader.cpp
+++ b/kutils/kcmoduleloader.cpp
@@ -135,7 +135,7 @@ KCModule* KCModuleLoader::loadModule(const KCModuleInfo &mod, ErrorReporting rep
           .arg( mod.moduleName() ),
           i18n("<qt><p>The Lisa and lan:/ ioslave modules "
             "are not installed by default in Kubuntu, because they are obsolete "
-            "and tqreplaced by zeroconf.<br> If you still wish to use them, you "
+            "and replaced by zeroconf.<br> If you still wish to use them, you "
             "should install the lisa package from the Universe repository.</p></qt>"),
           parent );
     } else { 
diff --git a/kutils/kcmoduleproxy.cpp b/kutils/kcmoduleproxy.cpp
index 213ea16c4..9fd95f40f 100644
--- a/kutils/kcmoduleproxy.cpp
+++ b/kutils/kcmoduleproxy.cpp
@@ -311,7 +311,7 @@ void KCModuleProxy::runAsRoot()
 
 	TQPalette pal( red );
 	pal.setColor( TQColorGroup::Background, 
-		tqcolorGroup().background() );
+		colorGroup().background() );
 	d->embedFrame->setPalette( pal );
 	d->embedFrame->setLineWidth( 2 );
 	d->embedFrame->setMidLineWidth( 2 );
@@ -323,7 +323,7 @@ void KCModuleProxy::runAsRoot()
 
 	TQLabel *lblBusy = new TQLabel(i18n("<big>Loading...</big>"), d->embedWidget, "lblBusy" );
 	lblBusy->setTextFormat(RichText);
-	lblBusy->tqsetAlignment(AlignCenter);
+	lblBusy->setAlignment(AlignCenter);
 	lblBusy->setGeometry(0,0, d->kcm->width(), d->kcm->height());
 	lblBusy->show();
 
@@ -347,7 +347,7 @@ void KCModuleProxy::runAsRoot()
 
 		/* Remove all kdesu switches */
 		while( cmd.length() > 1 && cmd[ 0 ] == '-' )
-			cmd = cmd.remove( 0, cmd.tqfind( ' ' ) ).stripWhiteSpace();
+			cmd = cmd.remove( 0, cmd.find( ' ' ) ).stripWhiteSpace();
 	}
 
 	if (cmd.left(8) == "kcmshell")
@@ -416,7 +416,7 @@ void KCModuleProxy::rootExited()
 	/* Such that the "ordinary" module loads again */
 	d->rootMode = false;
 
-	d->topLayout->tqinvalidate();
+	d->topLayout->invalidate();
 
 	TQShowEvent ev;
 	showEvent( &ev ); 
diff --git a/kutils/kcmoduleproxy.h b/kutils/kcmoduleproxy.h
index 4323a1d78..d615edc1e 100644
--- a/kutils/kcmoduleproxy.h
+++ b/kutils/kcmoduleproxy.h
@@ -39,14 +39,14 @@ class KProcess;
  * @brief Encapsulates a KCModule for embedding.
  *
  * KCModuleProxy is a wrapper for KCModule intended for cases where
- * modules are to be displayed. It ensures tqlayout is consistent, handles
+ * modules are to be displayed. It ensures layout is consistent, handles
  * root/administrator modules and in general takes care of the details
  * needed for making a module available in an interface. A KCModuleProxy
  * can be treated as a TQWidget, without worrying about the details specific
  * for modules such as library loading. KCModuleProxy is not a sub class of KCModule
  * but its API closely resembles KCModule's.\n
  * Usually, an instance is created by passing one of the constructors a KService::Ptr,
- * KCModuleInfo or simply the name of the module and then added to the tqlayout as any
+ * KCModuleInfo or simply the name of the module and then added to the layout as any
  * other widget. \n
  * When the user have changed the module, changed( bool ) as well as changed ( KCModuleProxy * )
  * is emitted. KCModuleProxy does not take care of prompting for saving - if the object is deleted while
diff --git a/kutils/kcmultidialog.cpp b/kutils/kcmultidialog.cpp
index 73456da89..33f243529 100644
--- a/kutils/kcmultidialog.cpp
+++ b/kutils/kcmultidialog.cpp
@@ -148,7 +148,7 @@ void KCMultiDialog::apply()
             TQStringList * names = moduleParentComponents[ m ];
             kdDebug(710) << k_funcinfo << *names << " saved and added to the list" << endl;
             for( TQStringList::ConstIterator it = names->begin(); it != names->end(); ++it )
-                if( updatedModules.tqfind( *it ) == updatedModules.end() )
+                if( updatedModules.find( *it ) == updatedModules.end() )
                     updatedModules.append( *it );
         }
     }
@@ -275,7 +275,7 @@ void KCMultiDialog::addModule(const KCModuleInfo& moduleinfo,
         return;
     }
     KCModuleProxy * module;
-    if( m_orphanModules.tqcontains( moduleinfo.service() ) )
+    if( m_orphanModules.contains( moduleinfo.service() ) )
     {
         // the KCModule already exists - it was removed from the dialog in
         // removeAllModules
diff --git a/kutils/kcmultidialog.h b/kutils/kcmultidialog.h
index 97d978667..df1707a9a 100644
--- a/kutils/kcmultidialog.h
+++ b/kutils/kcmultidialog.h
@@ -72,8 +72,8 @@ public:
 
 
    /**
-     * Constructor for the predefined tqlayout mode where you specify the
-     * kind of tqlayout (face) and also add buttons. Note that the User1 button
+     * Constructor for the predefined layout mode where you specify the
+     * kind of layout (face) and also add buttons. Note that the User1 button
      * of KDialogBase is already used to provide a "Reset" button so only
      * two more buttons are available to users of KCMultiDialog. When clicked 
      * they trigger slotUser2() and slotUser3(). 
@@ -212,7 +212,7 @@ protected slots:
     /**
      * This slot is called when the user presses the "Help" Button.
      * It reads the DocPath field of the currently selected KControl
-     * module's .desktop file to tqfind the path to the documentation,
+     * module's .desktop file to find the path to the documentation,
      * which it then attempts to load.
      * 
      * You can reimplement this slot if needed.
diff --git a/kutils/kfind.cpp b/kutils/kfind.cpp
index da77e13ae..7b2da6899 100644
--- a/kutils/kfind.cpp
+++ b/kutils/kfind.cpp
@@ -48,7 +48,7 @@ KFindNextDialog::KFindNextDialog(const TQString &pattern, TQWidget *parent) :
         User1 | Close,
         User1,
         false,
-        KStdGuiItem::tqfind())
+        KStdGuiItem::find())
 {
     setMainWidget( new TQLabel( i18n("<qt>Find next occurrence of '<b>%1</b>'?</qt>").arg(pattern), this ) );
 }
@@ -58,7 +58,7 @@ KFindNextDialog::KFindNextDialog(const TQString &pattern, TQWidget *parent) :
 struct KFind::Private
 {
     Private() :
-      tqfindDialog(0),
+      findDialog(0),
       patternChanged(false),
       matchedPattern(""),
       incrementalPath(29, true),
@@ -103,7 +103,7 @@ struct KFind::Private
         bool    dirty;
     };
 
-    TQGuardedPtr<TQWidget>  tqfindDialog;
+    TQGuardedPtr<TQWidget>  findDialog;
     bool                  patternChanged;
     TQString               matchedPattern;
     TQDict<Match>          incrementalPath;
@@ -123,11 +123,11 @@ KFind::KFind( const TQString &pattern, long options, TQWidget *parent )
     init( pattern );
 }
 
-KFind::KFind( const TQString &pattern, long options, TQWidget *parent, TQWidget *tqfindDialog )
+KFind::KFind( const TQString &pattern, long options, TQWidget *parent, TQWidget *findDialog )
     : TQObject( parent )
 {
     d = new KFind::Private;
-    d->tqfindDialog = tqfindDialog;
+    d->findDialog = findDialog;
     m_options = options;
     init( pattern );
 }
@@ -158,11 +158,11 @@ bool KFind::needData() const
     // always true when m_text is empty.
     if (m_options & KFindDialog::FindBackwards)
         // m_index==-1 and m_lastResult==Match means we haven't answered nomatch yet
-        // This is important in the "tqreplace with a prompt" case.
+        // This is important in the "replace with a prompt" case.
         return ( m_index < 0 && m_lastResult != Match );
     else
         // "index over length" test removed: we want to get a nomatch before we set data again
-        // This is important in the "tqreplace with a prompt" case.
+        // This is important in the "replace with a prompt" case.
         return m_index == INDEX_NOMATCH;
 }
 
@@ -173,7 +173,7 @@ void KFind::setData( const TQString& data, int startPos )
 
 void KFind::setData( int id, const TQString& data, int startPos )
 {
-    // cache the data for incremental tqfind
+    // cache the data for incremental find
     if ( m_options & KFindDialog::FindIncremental )
     {
         if ( id != -1 )
@@ -207,18 +207,18 @@ void KFind::setData( int id, const TQString& data, int startPos )
     }
 }
 
-KDialogBase* KFind::tqfindNextDialog( bool create )
+KDialogBase* KFind::findNextDialog( bool create )
 {
     if ( !m_dialog && create )
     {
-        m_dialog = new KFindNextDialog( m_pattern, tqparentWidget() );
+        m_dialog = new KFindNextDialog( m_pattern, parentWidget() );
         connect( m_dialog, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( slotFindNext() ) );
         connect( m_dialog, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDialogClosed() ) );
     }
     return m_dialog;
 }
 
-KFind::Result KFind::tqfind()
+KFind::Result KFind::find()
 {
     Q_ASSERT( m_index != INDEX_NOMATCH || d->patternChanged );
 
@@ -227,7 +227,7 @@ KFind::Result KFind::tqfind()
         // Move on before looking for the next match, _if_ we just found a match
         if (m_options & KFindDialog::FindBackwards) {
             m_index--;
-            if ( m_index == -1 ) // don't call KFind::tqfind with -1, it has a special meaning
+            if ( m_index == -1 ) // don't call KFind::find with -1, it has a special meaning
             {
                 m_lastResult = NoMatch;
                 return NoMatch;
@@ -250,7 +250,7 @@ KFind::Result KFind::tqfind()
             {
                 bool clean = true;
 
-                // tqfind the first result backwards on the path that isn't dirty
+                // find the first result backwards on the path that isn't dirty
                 while ( d->data[match->dataId]->dirty == true &&
                         !m_pattern.isEmpty() )
                 {
@@ -330,14 +330,14 @@ KFind::Result KFind::tqfind()
     do
     {
         // if we have multiple data blocks in our cache, walk through these
-        // blocks till we either searched all blocks or we tqfind a match
+        // blocks till we either searched all blocks or we find a match
         do
         {
             // Find the next candidate match.
             if ( m_options & KFindDialog::RegularExpression )
-                m_index = KFind::tqfind(m_text, *m_regExp, m_index, m_options, &m_matchedLength);
+                m_index = KFind::find(m_text, *m_regExp, m_index, m_options, &m_matchedLength);
             else
-                m_index = KFind::tqfind(m_text, m_pattern, m_index, m_options, &m_matchedLength);
+                m_index = KFind::find(m_text, m_pattern, m_index, m_options, &m_matchedLength);
 
             if ( m_options & KFindDialog::FindIncremental )
                 d->data[d->currentId]->dirty = false;
@@ -368,7 +368,7 @@ KFind::Result KFind::tqfind()
                         delete d->emptyMatch;
                         d->emptyMatch = new Private::Match( d->currentId, m_index, m_matchedLength );
                     } else
-                        d->incrementalPath.tqreplace(m_pattern, new Private::Match(d->currentId, m_index, m_matchedLength));
+                        d->incrementalPath.replace(m_pattern, new Private::Match(d->currentId, m_index, m_matchedLength));
 
                     if ( m_pattern.length() < d->matchedPattern.length() )
                     {
@@ -388,7 +388,7 @@ KFind::Result KFind::tqfind()
                         emit highlight(m_text, m_index, m_matchedLength);
 
                     if ( !m_dialogClosed )
-                        tqfindNextDialog(true)->show();
+                        findNextDialog(true)->show();
 
 #ifdef DEBUG_FIND
                     kdDebug() << k_funcinfo << "Match. Next m_index=" << m_index << endl;
@@ -451,14 +451,14 @@ void KFind::startNewIncrementalSearch()
 }
 
 // static
-int KFind::tqfind(const TQString &text, const TQString &pattern, int index, long options, int *matchedLength)
+int KFind::find(const TQString &text, const TQString &pattern, int index, long options, int *matchedLength)
 {
     // Handle regular expressions in the appropriate way.
     if (options & KFindDialog::RegularExpression)
     {
         TQRegExp regExp(pattern, options & KFindDialog::CaseSensitive);
 
-        return tqfind(text, regExp, index, options, matchedLength);
+        return find(text, regExp, index, options, matchedLength);
     }
 
     bool caseSensitive = (options & KFindDialog::CaseSensitive);
@@ -470,8 +470,8 @@ int KFind::tqfind(const TQString &text, const TQString &pattern, int index, long
             // Backward search, until the beginning of the line...
             while (index >= 0)
             {
-                // ...tqfind the next match.
-                index = text.tqfindRev(pattern, index, caseSensitive);
+                // ...find the next match.
+                index = text.findRev(pattern, index, caseSensitive);
                 if (index == -1)
                     break;
 
@@ -487,8 +487,8 @@ int KFind::tqfind(const TQString &text, const TQString &pattern, int index, long
             // Forward search, until the end of the line...
             while (index < (int)text.length())
             {
-                // ...tqfind the next match.
-                index = text.tqfind(pattern, index, caseSensitive);
+                // ...find the next match.
+                index = text.find(pattern, index, caseSensitive);
                 if (index == -1)
                     break;
 
@@ -507,11 +507,11 @@ int KFind::tqfind(const TQString &text, const TQString &pattern, int index, long
         // Non-whole-word search.
         if (options & KFindDialog::FindBackwards)
         {
-            index = text.tqfindRev(pattern, index, caseSensitive);
+            index = text.findRev(pattern, index, caseSensitive);
         }
         else
         {
-            index = text.tqfind(pattern, index, caseSensitive);
+            index = text.find(pattern, index, caseSensitive);
         }
         if (index != -1)
         {
@@ -522,7 +522,7 @@ int KFind::tqfind(const TQString &text, const TQString &pattern, int index, long
 }
 
 // static
-int KFind::tqfind(const TQString &text, const TQRegExp &pattern, int index, long options, int *matchedLength)
+int KFind::find(const TQString &text, const TQRegExp &pattern, int index, long options, int *matchedLength)
 {
     if (options & KFindDialog::WholeWordsOnly)
     {
@@ -531,8 +531,8 @@ int KFind::tqfind(const TQString &text, const TQRegExp &pattern, int index, long
             // Backward search, until the beginning of the line...
             while (index >= 0)
             {
-                // ...tqfind the next match.
-                index = text.tqfindRev(pattern, index);
+                // ...find the next match.
+                index = text.findRev(pattern, index);
                 if (index == -1)
                     break;
 
@@ -550,8 +550,8 @@ int KFind::tqfind(const TQString &text, const TQRegExp &pattern, int index, long
             // Forward search, until the end of the line...
             while (index < (int)text.length())
             {
-                // ...tqfind the next match.
-                index = text.tqfind(pattern, index);
+                // ...find the next match.
+                index = text.find(pattern, index);
                 if (index == -1)
                     break;
 
@@ -572,11 +572,11 @@ int KFind::tqfind(const TQString &text, const TQRegExp &pattern, int index, long
         // Non-whole-word search.
         if (options & KFindDialog::FindBackwards)
         {
-            index = text.tqfindRev(pattern, index);
+            index = text.findRev(pattern, index);
         }
         else
         {
-            index = text.tqfind(pattern, index);
+            index = text.find(pattern, index);
         }
         if (index != -1)
         {
@@ -607,7 +607,7 @@ bool KFind::isWholeWords(const TQString &text, int starts, int matchedLength)
 
 void KFind::slotFindNext()
 {
-    emit tqfindNext();
+    emit findNext();
 }
 
 void KFind::slotDialogClosed()
@@ -628,7 +628,7 @@ void KFind::displayFinalDialog() const
 
 bool KFind::shouldRestart( bool forceAsking, bool showNumMatches ) const
 {
-    // Only ask if we did a "tqfind from cursor", otherwise it's pointless.
+    // Only ask if we did a "find from cursor", otherwise it's pointless.
     // Well, unless the user can modify the document during a search operation,
     // hence the force boolean.
     if ( !forceAsking && (m_options & KFindDialog::FromCursor) == 0 )
@@ -701,10 +701,10 @@ void KFind::setPattern( const TQString& pattern )
 
 TQWidget* KFind::dialogsParent() const
 {
-    // If the tqfind dialog is still up, it should get the focus when closing a message box
-    // Otherwise, maybe the "tqfind next?" dialog is up
+    // If the find dialog is still up, it should get the focus when closing a message box
+    // Otherwise, maybe the "find next?" dialog is up
     // Otherwise, the "view" is the parent.
-    return d->tqfindDialog ? (TQWidget*)d->tqfindDialog : ( m_dialog ? m_dialog : tqparentWidget() );
+    return d->findDialog ? (TQWidget*)d->findDialog : ( m_dialog ? m_dialog : parentWidget() );
 }
 
 #include "kfind.moc"
diff --git a/kutils/kfind.h b/kutils/kfind.h
index 089d261c3..502708dd1 100644
--- a/kutils/kfind.h
+++ b/kutils/kfind.h
@@ -26,8 +26,8 @@
 
 /**
  * @ingroup main
- * @ingroup tqfindtqreplace
- * @brief A generic implementation of the "tqfind" function.
+ * @ingroup findreplace
+ * @brief A generic implementation of the "find" function.
  *
  * @author S.R.Haque <srhaque@iee.org>, David Faure <faure@kde.org>,
  *         Arend van Beelen jr. <arend@auton.nl>
@@ -40,25 +40,25 @@
  *
  * \b Example:
  *
- * To use the class to implement a complete tqfind feature:
+ * To use the class to implement a complete find feature:
  *
- * In the slot connected to the tqfind action, after using KFindDialog:
+ * In the slot connected to the find action, after using KFindDialog:
  * \code
  *
- *  // This creates a tqfind-next-prompt dialog if needed.
- *  m_tqfind = new KFind(pattern, options, this);
+ *  // This creates a find-next-prompt dialog if needed.
+ *  m_find = new KFind(pattern, options, this);
  *
  *  // Connect highlight signal to code which handles highlighting
  *  // of found text.
- *  connect( m_tqfind, TQT_SIGNAL( highlight( const TQString &, int, int ) ),
+ *  connect( m_find, TQT_SIGNAL( highlight( const TQString &, int, int ) ),
  *          this, TQT_SLOT( slotHighlight( const TQString &, int, int ) ) );
- *  // Connect tqfindNext signal - called when pressing the button in the dialog
- *  connect( m_tqfind, TQT_SIGNAL( tqfindNext() ),
+ *  // Connect findNext signal - called when pressing the button in the dialog
+ *  connect( m_find, TQT_SIGNAL( findNext() ),
  *          this, TQT_SLOT( slotFindNext() ) );
  * \endcode
  *
- * If you are using a non-modal tqfind dialog (the recommended new way
- * in KDE-3.2), you should call right away m_tqfind->closeFindNextDialog().
+ * If you are using a non-modal find dialog (the recommended new way
+ * in KDE-3.2), you should call right away m_find->closeFindNextDialog().
  *
  *  Then initialize the variables determining the "current position"
  *  (to the cursor, if the option FromCursor is set,
@@ -73,11 +73,11 @@
  *  {
  *      KFind::Result res = KFind::NoMatch;
  *      while ( res == KFind::NoMatch && <position not at end> ) {
- *          if ( m_tqfind->needData() )
- *              m_tqfind->setData( <current text fragment> );
+ *          if ( m_find->needData() )
+ *              m_find->setData( <current text fragment> );
  *
  *          // Let KFind inspect the text fragment, and display a dialog if a match is found
- *          res = m_tqfind->tqfind();
+ *          res = m_find->find();
  *
  *          if ( res == KFind::NoMatch ) {
  *              <Move to the next text fragment, honoring the FindBackwards setting for the direction>
@@ -85,13 +85,13 @@
  *      }
  *
  *      if ( res == KFind::NoMatch ) // i.e. at end
- *          <Call either  m_tqfind->displayFinalDialog(); delete m_tqfind; m_tqfind = 0L;
- *           or           if ( m_tqfind->shouldRestart() ) { reinit (w/o FromCursor) and call slotFindNext(); }
- *                        else { m_tqfind->closeFindNextDialog(); }>
+ *          <Call either  m_find->displayFinalDialog(); delete m_find; m_find = 0L;
+ *           or           if ( m_find->shouldRestart() ) { reinit (w/o FromCursor) and call slotFindNext(); }
+ *                        else { m_find->closeFindNextDialog(); }>
  *  }
  * \endcode
  *
- *  Don't forget to delete m_tqfind in the destructor of your class,
+ *  Don't forget to delete m_find in the destructor of your class,
  *  unless you gave it a parent widget on construction.
  *
  *  This implementation allows to have a "Find Next" action, which resumes the
@@ -101,7 +101,7 @@
  *  FindBackwards and call slotFindNext() - and reset the value afterwards.
  */
 class KUTILS_EXPORT KFind :
-    public TQObject
+    public QObject
 {
     Q_OBJECT
 
@@ -111,7 +111,7 @@ public:
      * Only use this constructor if you don't use KFindDialog, or if
      * you use it as a modal dialog.
      * @param pattern The pattern to look for.
-     * @param options Options for the tqfind dialog. @see KFindDialog.
+     * @param options Options for the find dialog. @see KFindDialog.
      * @param parent The parent widget.
      */
     KFind(const TQString &pattern, long options, TQWidget *parent);
@@ -120,13 +120,13 @@ public:
      * This is the recommended constructor if you also use KFindDialog (non-modal).
      * You should pass the pointer to it here, so that when a message box
      * appears it has the right parent. Don't worry about deletion, KFind
-     * will notice if the tqfind dialog is closed.
+     * will notice if the find dialog is closed.
      * @param pattern The pattern to look for.
-     * @param options Options for the tqfind dialog. @see KFindDialog.
+     * @param options Options for the find dialog. @see KFindDialog.
      * @param parent The parent widget.
-     * @param tqfindDialog A pointer to the KFindDialog object.
+     * @param findDialog A pointer to the KFindDialog object.
      */
-    KFind(const TQString &pattern, long options, TQWidget *parent, TQWidget* tqfindDialog);
+    KFind(const TQString &pattern, long options, TQWidget *parent, TQWidget* findDialog);
 
     /**
      * Destructor.
@@ -134,7 +134,7 @@ public:
     virtual ~KFind();
 
     /**
-     * Result enum. Holds information if the tqfind was successful.
+     * Result enum. Holds information if the find was successful.
      */
     enum Result {
         NoMatch,  ///< No match was found.
@@ -150,24 +150,24 @@ public:
     bool needData() const;
 
     /**
-     * Call this when needData returns @c true, before calling tqfind().
+     * Call this when needData returns @c true, before calling find().
      * @param data the text fragment (line)
      * @param startPos if set, the index at which the search should start.
      * This is only necessary for the very first call to setData usually,
-     * for the 'tqfind in selection' feature. A value of -1 (the default value)
+     * for the 'find in selection' feature. A value of -1 (the default value)
      * means "process all the data", i.e. either 0 or data.length()-1 depending
      * on FindBackwards.
      */
     void setData( const TQString& data, int startPos = -1 );
 
     /**
-     * Call this when needData returns @c true, before calling tqfind(). The use of
+     * Call this when needData returns @c true, before calling find(). The use of
      * ID's is especially useful if you're using the FindIncremental option.
      * @param id the id of the text fragment
      * @param data the text fragment (line)
      * @param startPos if set, the index at which the search should start.
      * This is only necessary for the very first call to setData usually,
-     * for the 'tqfind in selection' feature. A value of -1 (the default value)
+     * for the 'find in selection' feature. A value of -1 (the default value)
      * means "process all the data", i.e. either 0 or data.length()-1 depending
      * on FindBackwards.
      *
@@ -177,17 +177,17 @@ public:
 
     /**
      * Walk the text fragment (e.g. text-processor line, kspread cell) looking for matches.
-     * For each match, emits the highlight() signal and displays the tqfind-again dialog
+     * For each match, emits the highlight() signal and displays the find-again dialog
      * proceeding.
      * @return Whether or not there has been a match.
      */
-    Result tqfind();
+    Result find();
 
     /**
      * Return the current options.
      *
      * Warning: this is usually the same value as the one passed to the constructor,
-     * but options might change _during_ the tqreplace operation:
+     * but options might change _during_ the replace operation:
      * e.g. the "All" button resets the PromptOnReplace flag.
      *
      * @return The current options. @see KFindDialog.
@@ -233,7 +233,7 @@ public:
     /**
      * Virtual method, which allows applications to add extra checks for
      * validating a candidate match. It's only necessary to reimplement this
-     * if the tqfind dialog extension has been used to provide additional
+     * if the find dialog extension has been used to provide additional
      * criterias.
      *
      * @param text  The current text fragment
@@ -251,7 +251,7 @@ public:
      * search. In that case it makes sense to restart the search again.
      *
      * @param showNumMatches set to @c true if the dialog should show the number of
-     * matches. Set to @c false if the application provides a "tqfind previous" action,
+     * matches. Set to @c false if the application provides a "find previous" action,
      * in which case the match count will be erroneous when hitting the end,
      * and we could even be hitting the beginning of the document (so not all
      * matches have even been seen).
@@ -274,7 +274,7 @@ public:
      * @param matchedlength The length of the string that was matched
      * @return The index at which a match was found, or -1 if no match was found.
      */
-    static int tqfind( const TQString &text, const TQString &pattern, int index, long options, int *matchedlength );
+    static int find( const TQString &text, const TQString &pattern, int index, long options, int *matchedlength );
 
     /**
      * Search the given regular expression, and returns whether a match was found. If one is,
@@ -289,7 +289,7 @@ public:
      * @param matchedlength The length of the string that was matched
      * @return The index at which a match was found, or -1 if no match was found.
      */
-    static int tqfind( const TQString &text, const TQRegExp &pattern, int index, long options, int *matchedlength );
+    static int find( const TQString &text, const TQRegExp &pattern, int index, long options, int *matchedlength );
 
     /**
      * Displays the final dialog saying "no match was found", if that was the case.
@@ -298,22 +298,22 @@ public:
     virtual void displayFinalDialog() const;
 
     /**
-     * Return (or create) the dialog that shows the "tqfind next?" prompt.
+     * Return (or create) the dialog that shows the "find next?" prompt.
      * Usually you don't need to call this.
      * One case where it can be useful, is when the user selects the "Find"
-     * menu item while a tqfind operation is under way. In that case, the
+     * menu item while a find operation is under way. In that case, the
      * program may want to call setActiveWindow() on that dialog.
-     * @return The tqfind next dialog.
+     * @return The find next dialog.
      */
-    KDialogBase* tqfindNextDialog( bool create = false );
+    KDialogBase* findNextDialog( bool create = false );
 
     /**
-     * Close the "tqfind next?" dialog. The application should do this when
+     * Close the "find next?" dialog. The application should do this when
      * the last match was hit. If the application deletes the KFind, then
-     * "tqfind previous" won't be possible anymore.
+     * "find previous" won't be possible anymore.
      *
      * IMPORTANT: you should also call this if you are using a non-modal
-     * tqfind dialog, to tell KFind not to pop up its own dialog.
+     * find dialog, to tell KFind not to pop up its own dialog.
      */
     void closeFindNextDialog();
 
@@ -329,7 +329,7 @@ public:
 signals:
 
     /**
-     * Connect to this signal to implement highlighting of found text during the tqfind
+     * Connect to this signal to implement highlighting of found text during the find
      * operation.
      *
      * If you've set data with setData(id, text), use the signal highlight(id,
@@ -347,7 +347,7 @@ signals:
     void highlight(const TQString &text, int matchingIndex, int matchedLength);
 
     /**
-     * Connect to this signal to implement highlighting of found text during the tqfind
+     * Connect to this signal to implement highlighting of found text during the find
      * operation.
      *
      * Use this signal if you've set your data with setData(id, text), otherwise
@@ -367,28 +367,28 @@ signals:
     void highlight(int id, int matchingIndex, int matchedLength);
 
     // ## TODO docu
-    // tqfindprevious will also emit tqfindNext, after temporarily switching the value
+    // findprevious will also emit findNext, after temporarily switching the value
     // of FindBackwards
-    void tqfindNext();
+    void findNext();
 
     /**
      * Emitted when the options have changed.
-     * This can happen e.g. with "Replace All", or if our 'tqfind next' dialog
-     * gets a "tqfind previous" one day.
+     * This can happen e.g. with "Replace All", or if our 'find next' dialog
+     * gets a "find previous" one day.
      */
     void optionsChanged();
 
     /**
-     * Emitted when the 'tqfind next' dialog is being closed.
+     * Emitted when the 'find next' dialog is being closed.
      * Some apps might want to remove the highlighted text when this happens.
-     * Apps without support for "Find Next" can also do m_tqfind->deleteLater()
-     * to terminate the tqfind operation.
+     * Apps without support for "Find Next" can also do m_find->deleteLater()
+     * to terminate the find operation.
      */
     void dialogClosed();
 
 protected:
 
-    TQWidget* tqparentWidget() const { return (TQWidget *)parent(); }
+    TQWidget* parentWidget() const { return (TQWidget *)parent(); }
     TQWidget* dialogsParent() const;
 
 protected slots:
diff --git a/kutils/kfinddialog.cpp b/kutils/kfinddialog.cpp
index ee60d569e..7cc6dff46 100644
--- a/kutils/kfinddialog.cpp
+++ b/kutils/kfinddialog.cpp
@@ -47,36 +47,36 @@ public:
     bool m_regexpDialogQueryDone;
     long m_enabled; // uses Options to define which search options are enabled
     bool m_initialShowDone;
-    TQStringList tqfindStrings;
+    TQStringList findStrings;
     TQString pattern;
 };
 
-KFindDialog::KFindDialog(TQWidget *parent, const char *name, long options, const TQStringList &tqfindStrings, bool hasSelection) :
+KFindDialog::KFindDialog(TQWidget *parent, const char *name, long options, const TQStringList &findStrings, bool hasSelection) :
     KDialogBase(parent, name, true, i18n("Find Text"), Ok | Cancel, Ok),
-    m_tqfindExtension (0),
-    m_tqreplaceExtension (0)
+    m_findExtension (0),
+    m_replaceExtension (0)
 {
     d = new KFindDialogPrivate;
-    init(false, tqfindStrings, hasSelection);
+    init(false, findStrings, hasSelection);
     setOptions(options);
     setButtonCancel( KStdGuiItem::close() );
 }
 
-KFindDialog::KFindDialog(bool modal, TQWidget *parent, const char *name, long options, const TQStringList &tqfindStrings, bool hasSelection) :
+KFindDialog::KFindDialog(bool modal, TQWidget *parent, const char *name, long options, const TQStringList &findStrings, bool hasSelection) :
     KDialogBase(parent, name, modal, i18n("Find Text"), Ok | Cancel, Ok),
-    m_tqfindExtension (0),
-    m_tqreplaceExtension (0)
+    m_findExtension (0),
+    m_replaceExtension (0)
 {
     d = new KFindDialogPrivate;
-    init(false, tqfindStrings, hasSelection);
+    init(false, findStrings, hasSelection);
     setOptions(options);
     setButtonCancel( KStdGuiItem::close() );
 }
 
 KFindDialog::KFindDialog(TQWidget *parent, const char *name, bool /*forReplace*/) :
     KDialogBase(parent, name, true, i18n("Replace Text"), Ok | Cancel, Ok),
-    m_tqfindExtension (0),
-    m_tqreplaceExtension (0)
+    m_findExtension (0),
+    m_replaceExtension (0)
 {
     d = new KFindDialogPrivate;
     setButtonCancel( KStdGuiItem::close() );
@@ -87,23 +87,23 @@ KFindDialog::~KFindDialog()
     delete d;
 }
 
-TQWidget *KFindDialog::tqfindExtension()
+TQWidget *KFindDialog::findExtension()
 {
-    if (!m_tqfindExtension)
+    if (!m_findExtension)
     {
-      m_tqfindExtension = new TQWidget(m_tqfindGrp);
-      m_tqfindLayout->addMultiCellWidget(m_tqfindExtension, 3, 3, 0, 1);
+      m_findExtension = new TQWidget(m_findGrp);
+      m_findLayout->addMultiCellWidget(m_findExtension, 3, 3, 0, 1);
     }
 
-    return m_tqfindExtension;
+    return m_findExtension;
 }
 
-TQStringList KFindDialog::tqfindHistory() const
+TQStringList KFindDialog::findHistory() const
 {
-    return m_tqfind->historyItems();
+    return m_find->historyItems();
 }
 
-void KFindDialog::init(bool forReplace, const TQStringList &tqfindStrings, bool hasSelection)
+void KFindDialog::init(bool forReplace, const TQStringList &findStrings, bool hasSelection)
 {
     TQVBoxLayout *topLayout;
     TQGridLayout *optionsLayout;
@@ -116,73 +116,73 @@ void KFindDialog::init(bool forReplace, const TQStringList &tqfindStrings, bool
     topLayout->setSpacing( KDialog::spacingHint() );
     topLayout->setMargin( 0 );
 
-    m_tqfindGrp = new TQGroupBox(0, Qt::Vertical, i18n("Find"), page);
-    m_tqfindGrp->tqlayout()->setSpacing( KDialog::spacingHint() );
-   // m_tqfindGrp->tqlayout()->setMargin( KDialog::marginHint() );
-    m_tqfindLayout = new TQGridLayout(m_tqfindGrp->tqlayout());
-    m_tqfindLayout->setSpacing( KDialog::spacingHint() );
-   // m_tqfindLayout->setMargin( KDialog::marginHint() );
-
-    m_tqfindLabel = new TQLabel(i18n("&Text to tqfind:"), m_tqfindGrp);
-    m_tqfind = new KHistoryCombo(true, m_tqfindGrp);
-    m_tqfind->setMaxCount(10);
-    m_tqfind->setDuplicatesEnabled(false);
-    m_regExp = new TQCheckBox(i18n("Regular e&xpression"), m_tqfindGrp);
-    m_regExpItem = new TQPushButton(i18n("&Edit..."), m_tqfindGrp);
+    m_findGrp = new TQGroupBox(0, Qt::Vertical, i18n("Find"), page);
+    m_findGrp->layout()->setSpacing( KDialog::spacingHint() );
+   // m_findGrp->layout()->setMargin( KDialog::marginHint() );
+    m_findLayout = new TQGridLayout(m_findGrp->layout());
+    m_findLayout->setSpacing( KDialog::spacingHint() );
+   // m_findLayout->setMargin( KDialog::marginHint() );
+
+    m_findLabel = new TQLabel(i18n("&Text to find:"), m_findGrp);
+    m_find = new KHistoryCombo(true, m_findGrp);
+    m_find->setMaxCount(10);
+    m_find->setDuplicatesEnabled(false);
+    m_regExp = new TQCheckBox(i18n("Regular e&xpression"), m_findGrp);
+    m_regExpItem = new TQPushButton(i18n("&Edit..."), m_findGrp);
     m_regExpItem->setEnabled(false);
 
-    m_tqfindLayout->addWidget(m_tqfindLabel, 0, 0);
-    m_tqfindLayout->addMultiCellWidget(m_tqfind, 1, 1, 0, 1);
-    m_tqfindLayout->addWidget(m_regExp, 2, 0);
-    m_tqfindLayout->addWidget(m_regExpItem, 2, 1);
-    topLayout->addWidget(m_tqfindGrp);
-
-    m_tqreplaceGrp = new TQGroupBox(0, Qt::Vertical, i18n("Replace With"), page);
-    m_tqreplaceGrp->tqlayout()->setSpacing( KDialog::spacingHint() );
-  //  m_tqreplaceGrp->tqlayout()->setMargin( KDialog::marginHint() );
-    m_tqreplaceLayout = new TQGridLayout(m_tqreplaceGrp->tqlayout());
-    m_tqreplaceLayout->setSpacing( KDialog::spacingHint() );
-//    m_tqreplaceLayout->setMargin( KDialog::marginHint() );
-
-    m_tqreplaceLabel = new TQLabel(i18n("Replace&ment text:"), m_tqreplaceGrp);
-    m_tqreplace = new KHistoryCombo(true, m_tqreplaceGrp);
-    m_tqreplace->setMaxCount(10);
-    m_tqreplace->setDuplicatesEnabled(false);
-    m_backRef = new TQCheckBox(i18n("Use p&laceholders"), m_tqreplaceGrp);
-    m_backRefItem = new TQPushButton(i18n("Insert Place&holder"), m_tqreplaceGrp);
+    m_findLayout->addWidget(m_findLabel, 0, 0);
+    m_findLayout->addMultiCellWidget(m_find, 1, 1, 0, 1);
+    m_findLayout->addWidget(m_regExp, 2, 0);
+    m_findLayout->addWidget(m_regExpItem, 2, 1);
+    topLayout->addWidget(m_findGrp);
+
+    m_replaceGrp = new TQGroupBox(0, Qt::Vertical, i18n("Replace With"), page);
+    m_replaceGrp->layout()->setSpacing( KDialog::spacingHint() );
+  //  m_replaceGrp->layout()->setMargin( KDialog::marginHint() );
+    m_replaceLayout = new TQGridLayout(m_replaceGrp->layout());
+    m_replaceLayout->setSpacing( KDialog::spacingHint() );
+//    m_replaceLayout->setMargin( KDialog::marginHint() );
+
+    m_replaceLabel = new TQLabel(i18n("Replace&ment text:"), m_replaceGrp);
+    m_replace = new KHistoryCombo(true, m_replaceGrp);
+    m_replace->setMaxCount(10);
+    m_replace->setDuplicatesEnabled(false);
+    m_backRef = new TQCheckBox(i18n("Use p&laceholders"), m_replaceGrp);
+    m_backRefItem = new TQPushButton(i18n("Insert Place&holder"), m_replaceGrp);
     m_backRefItem->setEnabled(false);
 
-    m_tqreplaceLayout->addWidget(m_tqreplaceLabel, 0, 0);
-    m_tqreplaceLayout->addMultiCellWidget(m_tqreplace, 1, 1, 0, 1);
-    m_tqreplaceLayout->addWidget(m_backRef, 2, 0);
-    m_tqreplaceLayout->addWidget(m_backRefItem, 2, 1);
-    topLayout->addWidget(m_tqreplaceGrp);
+    m_replaceLayout->addWidget(m_replaceLabel, 0, 0);
+    m_replaceLayout->addMultiCellWidget(m_replace, 1, 1, 0, 1);
+    m_replaceLayout->addWidget(m_backRef, 2, 0);
+    m_replaceLayout->addWidget(m_backRefItem, 2, 1);
+    topLayout->addWidget(m_replaceGrp);
 
     m_optionGrp = new TQGroupBox(0, Qt::Vertical, i18n("Options"), page);
-    m_optionGrp->tqlayout()->setSpacing(KDialog::spacingHint());
-  //  m_optionGrp->tqlayout()->setMargin(KDialog::marginHint());
-    optionsLayout = new TQGridLayout(m_optionGrp->tqlayout());
+    m_optionGrp->layout()->setSpacing(KDialog::spacingHint());
+  //  m_optionGrp->layout()->setMargin(KDialog::marginHint());
+    optionsLayout = new TQGridLayout(m_optionGrp->layout());
     optionsLayout->setSpacing( KDialog::spacingHint() );
    // optionsLayout->setMargin( KDialog::marginHint() );
 
     m_caseSensitive = new TQCheckBox(i18n("C&ase sensitive"), m_optionGrp);
     m_wholeWordsOnly = new TQCheckBox(i18n("&Whole words only"), m_optionGrp);
     m_fromCursor = new TQCheckBox(i18n("From c&ursor"), m_optionGrp);
-    m_tqfindBackwards = new TQCheckBox(i18n("Find &backwards"), m_optionGrp);
+    m_findBackwards = new TQCheckBox(i18n("Find &backwards"), m_optionGrp);
     m_selectedText = new TQCheckBox(i18n("&Selected text"), m_optionGrp);
     setHasSelection( hasSelection );
-    // If we have a selection, we make 'tqfind in selection' default
+    // If we have a selection, we make 'find in selection' default
     // and if we don't, then the option has to be unchecked, obviously.
     m_selectedText->setChecked( hasSelection );
     slotSelectedTextToggled( hasSelection );
 
-    m_promptOnReplace = new TQCheckBox(i18n("&Prompt on tqreplace"), m_optionGrp);
+    m_promptOnReplace = new TQCheckBox(i18n("&Prompt on replace"), m_optionGrp);
     m_promptOnReplace->setChecked( true );
 
     optionsLayout->addWidget(m_caseSensitive, 0, 0);
     optionsLayout->addWidget(m_wholeWordsOnly, 1, 0);
     optionsLayout->addWidget(m_fromCursor, 2, 0);
-    optionsLayout->addWidget(m_tqfindBackwards, 0, 1);
+    optionsLayout->addWidget(m_findBackwards, 0, 1);
     optionsLayout->addWidget(m_selectedText, 1, 1);
     optionsLayout->addWidget(m_promptOnReplace, 2, 1);
     topLayout->addWidget(m_optionGrp);
@@ -198,66 +198,66 @@ void KFindDialog::init(bool forReplace, const TQStringList &tqfindStrings, bool
     connect(m_regExpItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(showPatterns()));
     connect(m_backRefItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(showPlaceholders()));
 
-    connect(m_tqfind, TQT_SIGNAL(textChanged ( const TQString & )),this, TQT_SLOT(textSearchChanged( const TQString & )));
+    connect(m_find, TQT_SIGNAL(textChanged ( const TQString & )),this, TQT_SLOT(textSearchChanged( const TQString & )));
 
     // tab order
-    setTabOrder(m_tqfind, m_regExp);
+    setTabOrder(m_find, m_regExp);
     setTabOrder(m_regExp, m_regExpItem);
-    setTabOrder(m_regExpItem, m_tqreplace);
-    setTabOrder(m_tqreplace, m_backRef);
+    setTabOrder(m_regExpItem, m_replace);
+    setTabOrder(m_replace, m_backRef);
     setTabOrder(m_backRef, m_backRefItem);
     setTabOrder(m_backRefItem, m_caseSensitive);
     setTabOrder(m_caseSensitive, m_wholeWordsOnly);
     setTabOrder(m_wholeWordsOnly, m_fromCursor);
-    setTabOrder(m_fromCursor, m_tqfindBackwards);
-    setTabOrder(m_tqfindBackwards, m_selectedText);
+    setTabOrder(m_fromCursor, m_findBackwards);
+    setTabOrder(m_findBackwards, m_selectedText);
     setTabOrder(m_selectedText, m_promptOnReplace);
 
     // buddies
-    m_tqfindLabel->setBuddy(m_tqfind);
-    m_tqreplaceLabel->setBuddy(m_tqreplace);
+    m_findLabel->setBuddy(m_find);
+    m_replaceLabel->setBuddy(m_replace);
 
     if (!forReplace)
     {
         m_promptOnReplace->hide();
-        m_tqreplaceGrp->hide();
+        m_replaceGrp->hide();
     }
 
-    d->tqfindStrings = tqfindStrings;
-    m_tqfind->setFocus();
+    d->findStrings = findStrings;
+    m_find->setFocus();
     enableButtonOK( !pattern().isEmpty() );
     if (forReplace)
     {
       setButtonOK(KGuiItem( i18n("&Replace"), TQString::null,
-                    i18n("Start tqreplace"),
+                    i18n("Start replace"),
                     i18n("<qt>If you press the <b>Replace</b> button, the text you entered "
                          "above is searched for within the document and any occurrence is "
-                         "tqreplaced with the tqreplacement text.</qt>")));
+                         "replaced with the replacement text.</qt>")));
     }
     else
     {
-      setButtonOK(KGuiItem( i18n("&Find"), "tqfind",
+      setButtonOK(KGuiItem( i18n("&Find"), "find",
                     i18n("Start searching"),
                     i18n("<qt>If you press the <b>Find</b> button, the text you entered "
                          "above is searched for within the document.</qt>")));
     }
 
     // QWhatsthis texts
-    TQWhatsThis::add ( m_tqfind, i18n(
+    TQWhatsThis::add ( m_find, i18n(
             "Enter a pattern to search for, or select a previous pattern from "
             "the list.") );
     TQWhatsThis::add ( m_regExp, i18n(
             "If enabled, search for a regular expression.") );
     TQWhatsThis::add ( m_regExpItem, i18n(
             "Click here to edit your regular expression using a graphical editor.") );
-    TQWhatsThis::add ( m_tqreplace, i18n(
-            "Enter a tqreplacement string, or select a previous one from the list.") );
+    TQWhatsThis::add ( m_replace, i18n(
+            "Enter a replacement string, or select a previous one from the list.") );
     TQWhatsThis::add( m_backRef, i18n(
             "<qt>If enabled, any occurrence of <code><b>\\N</b></code>, where "
-            "<code><b>N</b></code> is a integer number, will be tqreplaced with "
+            "<code><b>N</b></code> is a integer number, will be replaced with "
             "the corresponding capture (\"parenthesized substring\") from the "
             "pattern.<p>To include (a literal <code><b>\\N</b></code> in your "
-            "tqreplacement, put an extra backslash in front of it, like "
+            "replacement, put an extra backslash in front of it, like "
             "<code><b>\\\\N</b></code>.</qt>") );
     TQWhatsThis::add ( m_backRefItem, i18n(
             "Click for a menu of available captures.") );
@@ -270,7 +270,7 @@ void KFindDialog::init(bool forReplace, const TQStringList &tqfindStrings, bool
     TQWhatsThis::add ( m_caseSensitive, i18n(
             "Perform a case sensitive search: entering the pattern "
             "'Joe' will not match 'joe' or 'JOE', only 'Joe'.") );
-    TQWhatsThis::add ( m_tqfindBackwards, i18n(
+    TQWhatsThis::add ( m_findBackwards, i18n(
             "Search backwards.") );
     TQWhatsThis::add ( m_promptOnReplace, i18n(
             "Ask before replacing each match found.") );
@@ -287,12 +287,12 @@ void KFindDialog::showEvent( TQShowEvent *e )
     {
         d->m_initialShowDone = true; // only once
         kdDebug() << "showEvent\n";
-        if (!d->tqfindStrings.isEmpty())
-            setFindHistory(d->tqfindStrings);
-        d->tqfindStrings = TQStringList();
+        if (!d->findStrings.isEmpty())
+            setFindHistory(d->findStrings);
+        d->findStrings = TQStringList();
         if (!d->pattern.isEmpty()) {
-            m_tqfind->lineEdit()->setText( d->pattern );
-            m_tqfind->lineEdit()->selectAll();
+            m_find->lineEdit()->setText( d->pattern );
+            m_find->lineEdit()->selectAll();
             d->pattern = TQString::null;
         }
     }
@@ -309,7 +309,7 @@ long KFindDialog::options() const
         options |= WholeWordsOnly;
     if (m_fromCursor->isChecked())
         options |= FromCursor;
-    if (m_tqfindBackwards->isChecked())
+    if (m_findBackwards->isChecked())
         options |= FindBackwards;
     if (m_selectedText->isChecked())
         options |= SelectedText;
@@ -320,13 +320,13 @@ long KFindDialog::options() const
 
 TQString KFindDialog::pattern() const
 {
-    return m_tqfind->currentText();
+    return m_find->currentText();
 }
 
 void KFindDialog::setPattern (const TQString &pattern)
 {
-    m_tqfind->lineEdit()->setText( pattern );
-    m_tqfind->lineEdit()->selectAll();
+    m_find->lineEdit()->setText( pattern );
+    m_find->lineEdit()->selectAll();
     d->pattern = pattern;
     kdDebug() << "setPattern " << pattern<<endl;
 }
@@ -335,12 +335,12 @@ void KFindDialog::setFindHistory(const TQStringList &strings)
 {
     if (strings.count() > 0)
     {
-        m_tqfind->setHistoryItems(strings, true);
-        m_tqfind->lineEdit()->setText( strings.first() );
-        m_tqfind->lineEdit()->selectAll();
+        m_find->setHistoryItems(strings, true);
+        m_find->lineEdit()->setText( strings.first() );
+        m_find->lineEdit()->selectAll();
     }
     else
-        m_tqfind->clearHistory();
+        m_find->clearHistory();
 }
 
 void KFindDialog::setHasSelection(bool hasSelection)
@@ -376,8 +376,8 @@ void KFindDialog::setSupportsBackwardsFind( bool supports )
     // ########## Shouldn't this hide the checkbox instead?
     if (supports) d->m_enabled |= FindBackwards;
     else d->m_enabled &= ~FindBackwards;
-    m_tqfindBackwards->setEnabled( supports );
-    m_tqfindBackwards->setChecked( supports && (options() & FindBackwards) );
+    m_findBackwards->setEnabled( supports );
+    m_findBackwards->setChecked( supports && (options() & FindBackwards) );
 }
 
 void KFindDialog::setSupportsCaseSensitiveFind( bool supports )
@@ -412,7 +412,7 @@ void KFindDialog::setOptions(long options)
     m_caseSensitive->setChecked((d->m_enabled & CaseSensitive) && (options & CaseSensitive));
     m_wholeWordsOnly->setChecked((d->m_enabled & WholeWordsOnly) && (options & WholeWordsOnly));
     m_fromCursor->setChecked((d->m_enabled & FromCursor) && (options & FromCursor));
-    m_tqfindBackwards->setChecked((d->m_enabled & FindBackwards) && (options & FindBackwards));
+    m_findBackwards->setChecked((d->m_enabled & FindBackwards) && (options & FindBackwards));
     m_selectedText->setChecked((d->m_enabled & SelectedText) && (options & SelectedText));
     m_regExp->setChecked((d->m_enabled & RegularExpression) && (options & RegularExpression));
 }
@@ -476,7 +476,7 @@ void KFindDialog::showPatterns()
         i = m_patterns->exec(m_regExpItem->mapToGlobal(m_regExpItem->rect().bottomLeft()));
         if (i != -1)
         {
-            TQLineEdit *editor = m_tqfind->lineEdit();
+            TQLineEdit *editor = m_find->lineEdit();
 
             editor->insert(items[i].regExp);
             editor->setCursorPosition(editor->cursorPosition() + items[i].cursorAdjustment);
@@ -485,7 +485,7 @@ void KFindDialog::showPatterns()
 }
 
 // Create a popup menu with a list of backreference terms, to help the user
-// compose a regular expression tqreplacement pattern.
+// compose a regular expression replacement pattern.
 void KFindDialog::showPlaceholders()
 {
     // Populate the popup menu.
@@ -499,7 +499,7 @@ void KFindDialog::showPlaceholders()
     int i = m_placeholders->exec(m_backRefItem->mapToGlobal(m_backRefItem->rect().bottomLeft()));
     if (i != -1)
     {
-        TQLineEdit *editor = m_tqreplace->lineEdit();
+        TQLineEdit *editor = m_replace->lineEdit();
         editor->insert( TQString("\\%1").arg( i ) );
     }
 }
@@ -517,7 +517,7 @@ void KFindDialog::slotPlaceholdersAboutToShow()
 
 void KFindDialog::slotOk()
 {
-    // Nothing to tqfind?
+    // Nothing to find?
     if (pattern().isEmpty())
     {
         KMessageBox::error(this, i18n("You must enter some text to search for."));
@@ -535,10 +535,10 @@ void KFindDialog::slotOk()
             return;
         }
     }
-    m_tqfind->addToHistory(pattern());
+    m_find->addToHistory(pattern());
     emit okClicked();
     if ( testWFlags( WShowModal ) )
         accept();
 }
-// kate: space-indent on; indent-width 4; tqreplace-tabs on;
+// kate: space-indent on; indent-width 4; replace-tabs on;
 #include "kfinddialog.moc"
diff --git a/kutils/kfinddialog.h b/kutils/kfinddialog.h
index 25f8da8d4..fcf870836 100644
--- a/kutils/kfinddialog.h
+++ b/kutils/kfinddialog.h
@@ -32,20 +32,20 @@ class TQCheckBox;
 
 /**
  * @ingroup main
- * @ingroup tqfindtqreplace
- * @brief A generic "tqfind" dialog.
+ * @ingroup findreplace
+ * @brief A generic "find" dialog.
  *
  * @author S.R.Haque <srhaque@iee.org>
  *
  * \b Detail:
  *
  * This widget inherits from KDialogBase and implements
- * the following additional functionalities:  a tqfind string
+ * the following additional functionalities:  a find string
  * object and an area for a user-defined widget to extend the dialog.
  *
  * \b Example:
  *
- * To use the basic modal tqfind dialog, and then run the search:
+ * To use the basic modal find dialog, and then run the search:
  *
  * \code
  *  KFindDialog dlg(....)
@@ -55,20 +55,20 @@ class TQCheckBox;
  *  // proceed with KFind from here
  * \endcode
  *
- * To create a non-modal tqfind dialog:
+ * To create a non-modal find dialog:
  * \code
- *   if ( m_tqfindDia )
- *     KWin::setActiveWindow( m_tqfindDia->winId() );
+ *   if ( m_findDia )
+ *     KWin::setActiveWindow( m_findDia->winId() );
  *   else
  *   {
- *     m_tqfindDia = new KFindDialog(false,...);
- *     connect( m_tqfindDia, TQT_SIGNAL(okClicked()), this, TQT_SLOT(tqfindTextNext()) );
+ *     m_findDia = new KFindDialog(false,...);
+ *     connect( m_findDia, TQT_SIGNAL(okClicked()), this, TQT_SLOT(findTextNext()) );
  *   }
  * \endcode
- * Don't forget to delete and reset m_tqfindDia when closed.
+ * Don't forget to delete and reset m_findDia when closed.
  * (But do NOT delete your KFind object at that point, it's needed for "Find Next")
  *
- * To use your own extensions: see tqfindExtension().
+ * To use your own extensions: see findExtension().
  *
  */
 class KUTILS_EXPORT KFindDialog:
@@ -99,31 +99,31 @@ public:
     };
 
     /**
-     * Construct a modal tqfind dialog
+     * Construct a modal find dialog
      *
      * @param parent The parent object of this widget.
      * @param name The name of this widget.
      * @param options A bitfield of the Options to be checked.
-     * @param tqfindStrings The tqfind history, see tqfindHistory()
+     * @param findStrings The find history, see findHistory()
      * @param hasSelection Whether a selection exists
      */
     KFindDialog( TQWidget *parent = 0, const char *name = 0, long options = 0,
-                 const TQStringList &tqfindStrings = TQStringList(), bool hasSelection = false );
+                 const TQStringList &findStrings = TQStringList(), bool hasSelection = false );
     // KDE4: fix ambiguity with private constructor
-    // Maybe remove options (there's setOptions) and tqfindStrings (setFindHistory) and hasSelection (setHasSelection)
+    // Maybe remove options (there's setOptions) and findStrings (setFindHistory) and hasSelection (setHasSelection)
 
     /**
-     * Construct a non-modal tqfind dialog
+     * Construct a non-modal find dialog
      *
      * @param modal set to @c false to get a non-modal dialog
      * @param parent The parent object of this widget.
      * @param name The name of this widget.
      * @param options A bitfield of the Options to be checked.
-     * @param tqfindStrings The tqfind history, see tqfindHistory()
+     * @param findStrings The find history, see findHistory()
      * @param hasSelection Whether a selection exists
      */
     KFindDialog( bool modal, TQWidget *parent = 0, const char *name = 0, long options = 0,
-                 const TQStringList &tqfindStrings = TQStringList(), bool hasSelection = false );
+                 const TQStringList &findStrings = TQStringList(), bool hasSelection = false );
     // KDE4: consider simplifying
 
     /**
@@ -133,21 +133,21 @@ public:
 
     /**
      * Provide the list of @p strings to be displayed as the history
-     * of tqfind strings. @p strings might get truncated if it is
+     * of find strings. @p strings might get truncated if it is
      * too long.
      *
-     * @param history The tqfind history.
-     * @see tqfindHistory
+     * @param history The find history.
+     * @see findHistory
      */
     void setFindHistory( const TQStringList &history );
 
     /**
      * Returns the list of history items.
      *
-     * @return The tqfind history.
+     * @return The find history.
      * @see setFindHistory
      */
-    TQStringList tqfindHistory() const;
+    TQStringList findHistory() const;
 
     /**
      * Enable/disable the 'search in selection' option, depending
@@ -170,7 +170,7 @@ public:
      * Enable/disable the 'Find backwards' option, depending
      * on whether the application supports it.
      *
-     * @param supports @c true if the application supports backwards tqfind
+     * @param supports @c true if the application supports backwards find
      * This is assumed to be the case by default.
      * @since 3.4
      */
@@ -180,7 +180,7 @@ public:
      * Enable/disable the 'Case sensitive' option, depending
      * on whether the application supports it.
      *
-     * @param supports @c true if the application supports case sensitive tqfind
+     * @param supports @c true if the application supports case sensitive find
      * This is assumed to be the case by default.
      * @since 3.4
      */
@@ -190,7 +190,7 @@ public:
      * Enable/disable the 'Whole words only' option, depending
      * on whether the application supports it.
      *
-     * @param supports @c true if the application supports whole words only tqfind
+     * @param supports @c true if the application supports whole words only find
      * This is assumed to be the case by default.
      * @since 3.4
      */
@@ -200,7 +200,7 @@ public:
      * Enable/disable the 'Regular expression' option, depending
      * on whether the application supports it.
      *
-     * @param supports @c true if the application supports regular expression tqfind
+     * @param supports @c true if the application supports regular expression find
      * This is assumed to be the case by default.
      * @since 3.4
      */
@@ -224,13 +224,13 @@ public:
     long options() const;
 
     /**
-     * Returns the pattern to tqfind.
+     * Returns the pattern to find.
      * @return The search text.
      */
     TQString pattern() const;
 
     /**
-     * Sets the pattern to tqfind.
+     * Sets the pattern to find.
      * @param pattern The new search pattern.
      */
     void setPattern ( const TQString &pattern );
@@ -242,7 +242,7 @@ public:
      * widgets for the pattern string.
      * @return An extensible TQWidget.
      */
-    TQWidget *tqfindExtension();
+    TQWidget *findExtension();
 
 protected slots:
 
@@ -264,44 +264,44 @@ private slots:
 
 private:
 
-    TQGroupBox *m_tqfindGrp;
-    TQLabel *m_tqfindLabel;
-    KHistoryCombo *m_tqfind;
+    TQGroupBox *m_findGrp;
+    TQLabel *m_findLabel;
+    KHistoryCombo *m_find;
     TQCheckBox *m_regExp;
     TQPushButton *m_regExpItem;
-    TQGridLayout *m_tqfindLayout;
-    TQWidget *m_tqfindExtension;
+    TQGridLayout *m_findLayout;
+    TQWidget *m_findExtension;
 
     TQGroupBox *m_optionGrp;
     TQCheckBox *m_wholeWordsOnly;
     TQCheckBox *m_fromCursor;
     TQCheckBox *m_selectedText;
     TQCheckBox *m_caseSensitive;
-    TQCheckBox *m_tqfindBackwards;
+    TQCheckBox *m_findBackwards;
 
     TQPopupMenu *m_patterns;
 
-    // Our dirty little secret is that we also implement the "tqreplace" dialog. But we
+    // Our dirty little secret is that we also implement the "replace" dialog. But we
     // keep that fact hidden from all but our friends.
 
     friend class KReplaceDialog;
 
     /**
-     * Construct a tqfind dialog with a parent object and a name. This version of the
+     * Construct a find dialog with a parent object and a name. This version of the
      * constructor is for use by friends only!
      *
-     * @param forReplace Is this a tqreplace dialog?
+     * @param forReplace Is this a replace dialog?
      */
     KFindDialog( TQWidget *parent, const char *name, bool forReplace );
-    void init( bool forReplace, const TQStringList &tqfindStrings, bool hasSelection );
+    void init( bool forReplace, const TQStringList &findStrings, bool hasSelection );
 
-    TQGroupBox *m_tqreplaceGrp;
-    TQLabel *m_tqreplaceLabel;
-    KHistoryCombo *m_tqreplace;
+    TQGroupBox *m_replaceGrp;
+    TQLabel *m_replaceLabel;
+    KHistoryCombo *m_replace;
     TQCheckBox* m_backRef;
     TQPushButton* m_backRefItem;
-    TQGridLayout *m_tqreplaceLayout;
-    TQWidget *m_tqreplaceExtension;
+    TQGridLayout *m_replaceLayout;
+    TQWidget *m_replaceExtension;
 
     TQCheckBox* m_promptOnReplace;
 
diff --git a/kutils/kmultitabbar.cpp b/kutils/kmultitabbar.cpp
index 22fd31d73..a9b648736 100644
--- a/kutils/kmultitabbar.cpp
+++ b/kutils/kmultitabbar.cpp
@@ -110,7 +110,7 @@ void KMultiTabBarInternal::setStyle(enum KMultiTabBar::KMultiTabBarStyle style)
 		mainLayout->setAutoAdd(true);
 
 	}
-        viewport()->tqrepaint();
+        viewport()->repaint();
 }
 
 void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clipy, int clipw, int cliph )
@@ -120,9 +120,9 @@ void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clip
 	if (m_position==KMultiTabBar::Right)
 	{
 
-                paint->setPen(tqcolorGroup().shadow());
+                paint->setPen(colorGroup().shadow());
                 paint->drawLine(0,0,0,viewport()->height());
-                paint->setPen(tqcolorGroup().background().dark(120));
+                paint->setPen(colorGroup().background().dark(120));
                 paint->drawLine(1,0,1,viewport()->height());
 
 
@@ -130,28 +130,28 @@ void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clip
 	else
 	if (m_position==KMultiTabBar::Left)
 	{
-                paint->setPen(tqcolorGroup().light());
+                paint->setPen(colorGroup().light());
 		paint->drawLine(23,0,23,viewport()->height());
                 paint->drawLine(22,0,22,viewport()->height());
 
-                paint->setPen(tqcolorGroup().shadow());
+                paint->setPen(colorGroup().shadow());
                 paint->drawLine(0,0,0,viewport()->height());
 	}
 	else
 	if (m_position==KMultiTabBar::Bottom)
 	{
-		paint->setPen(tqcolorGroup().shadow());
+		paint->setPen(colorGroup().shadow());
 		paint->drawLine(0,0,viewport()->width(),0);
-                paint->setPen(tqcolorGroup().background().dark(120));
+                paint->setPen(colorGroup().background().dark(120));
                 paint->drawLine(0,1,viewport()->width(),1);
 	}
 	else
 	{
-	        paint->setPen(tqcolorGroup().light());
+	        paint->setPen(colorGroup().light());
 		paint->drawLine(0,23,viewport()->width(),23);
                 paint->drawLine(0,22,viewport()->width(),22);
 
-/*                paint->setPen(tqcolorGroup().shadow());
+/*                paint->setPen(colorGroup().shadow());
                 paint->drawLine(0,0,0,viewport()->height());*/
 
 	}
@@ -188,8 +188,8 @@ void KMultiTabBarInternal::mousePressEvent(TQMouseEvent *ev)
 
 void KMultiTabBarInternal::resizeEvent(TQResizeEvent *ev) {
 /*	kdDebug()<<"KMultiTabBarInternal::resizeEvent"<<endl;
-	kdDebug()<<"KMultiTabBarInternal::resizeEvent - box tqgeometry"<<box->tqgeometry()<<endl;
-	kdDebug()<<"KMultiTabBarInternal::resizeEvent - tqgeometry"<<tqgeometry()<<endl;*/
+	kdDebug()<<"KMultiTabBarInternal::resizeEvent - box geometry"<<box->geometry()<<endl;
+	kdDebug()<<"KMultiTabBarInternal::resizeEvent - geometry"<<geometry()<<endl;*/
 	if (ev) TQScrollView::resizeEvent(ev);
 
 	if ( (m_style==KMultiTabBar::KDEV3) ||
@@ -378,7 +378,7 @@ void KMultiTabBarInternal::setPosition(enum KMultiTabBar::KMultiTabBarPosition p
 	m_position=pos;
 	for (uint i=0;i<m_tabs.count();i++)
 		m_tabs.at(i)->setTabsPosition(m_position);
-	viewport()->tqrepaint();
+	viewport()->repaint();
 }
 
 KMultiTabBarButton::KMultiTabBarButton(const TQPixmap& pic,const TQString& text, TQPopupMenu *popup,
@@ -434,29 +434,29 @@ void KMultiTabBarButton::slotClicked()
 void KMultiTabBarButton::setPosition(KMultiTabBar::KMultiTabBarPosition pos)
 {
 	m_position=pos;
-	tqrepaint();
+	repaint();
 }
 
 void KMultiTabBarButton::setStyle(KMultiTabBar::KMultiTabBarStyle style)
 {
 	m_style=style;
-	tqrepaint();
+	repaint();
 }
 
 void KMultiTabBarButton::hideEvent( TQHideEvent* he) {
 	TQPushButton::hideEvent(he);
-	KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(tqparentWidget());
+	KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(parentWidget());
 	if (tb) tb->updateSeparator();
 }
 
 void KMultiTabBarButton::showEvent( TQShowEvent* he) {
 	TQPushButton::showEvent(he);
-	KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(tqparentWidget());
+	KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(parentWidget());
 	if (tb) tb->updateSeparator();
 }
 
 
-TQSize KMultiTabBarButton::tqsizeHint() const
+TQSize KMultiTabBarButton::sizeHint() const
 {
     constPolish();
 
@@ -472,7 +472,7 @@ TQSize KMultiTabBarButton::tqsizeHint() const
     }
 #endif
     if ( isMenuButton() )
-        w += style().tqpixelMetric(TQStyle::PM_MenuButtonIndicator, this);
+        w += style().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
 
     if ( pixmap() ) {
         TQPixmap *pm = (TQPixmap *)pixmap();
@@ -482,7 +482,7 @@ TQSize KMultiTabBarButton::tqsizeHint() const
         TQString s( text() );
         bool empty = s.isEmpty();
         if ( empty )
-            s = TQString::tqfromLatin1("XXXX");
+            s = TQString::fromLatin1("XXXX");
         TQFontMetrics fm = fontMetrics();
         TQSize sz = fm.size( ShowPrefix, s );
         if(!empty || !w)
@@ -525,7 +525,7 @@ void KMultiTabBarTab::setTabsPosition(KMultiTabBar::KMultiTabBarPosition pos)
 	}
 
 	setPosition(pos);
-//	tqrepaint();
+//	repaint();
 }
 
 void KMultiTabBarTab::setIcon(const TQString& icon)
@@ -577,12 +577,12 @@ void KMultiTabBarTab::updateState()
 		if ((m_position==KMultiTabBar::Right || m_position==KMultiTabBar::Left)) {
 			setFixedWidth(24);
 			if ((m_style==KMultiTabBar::KDEV3)  || (m_style==KMultiTabBar::KDEV3ICON) || (isOn())) {
-				setFixedHeight(KMultiTabBarButton::tqsizeHint().width());
+				setFixedHeight(KMultiTabBarButton::sizeHint().width());
 			} else setFixedHeight(36);
 		} else {
 			setFixedHeight(24);
 			if ((m_style==KMultiTabBar::KDEV3)  || (m_style==KMultiTabBar::KDEV3ICON) || (isOn())) {
-				setFixedWidth(KMultiTabBarButton::tqsizeHint().width());
+				setFixedWidth(KMultiTabBarButton::sizeHint().width());
 			} else setFixedWidth(36);
 		}
 	} else {
@@ -633,7 +633,7 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
 	const int height = 24;
 	if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (isOn())) {
 		 if ((m_position==KMultiTabBar::Left) || (m_position==KMultiTabBar::Right))
-			sh=TQSize(this->height(),this->width());//KMultiTabBarButton::tqsizeHint();
+			sh=TQSize(this->height(),this->width());//KMultiTabBarButton::sizeHint();
 			else sh=TQSize(this->width(),this->height());
 	}
 	else
@@ -650,8 +650,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
 
 	if (isOn()) st|=TQStyle::Style_On;
 
-	style().tqdrawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), tqcolorGroup(),st);
-	style().tqdrawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), tqcolorGroup(),st);
+	style().drawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
+	style().drawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
 
 	switch (m_position) {
 		case KMultiTabBar::Left:
@@ -667,8 +667,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
 			paint->drawPixmap(0,0,pixmap);
 			break;
 	}
-//	style().tqdrawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()),
-//		tqcolorGroup(),TQStyle::Style_Enabled);
+//	style().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()),
+//		colorGroup(),TQStyle::Style_Enabled);
 
 
 }
@@ -678,58 +678,58 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
         TQPixmap pixmap;
 	if ( iconSet())
         	pixmap = iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal );
-	paint->fillRect(0, 0, 24, 24, tqcolorGroup().background());
+	paint->fillRect(0, 0, 24, 24, colorGroup().background());
 
 	if (!isOn())
 	{
 
 		if (m_position==KMultiTabBar::Right)
 		{
-			paint->fillRect(0,0,21,21,TQBrush(tqcolorGroup().background()));
+			paint->fillRect(0,0,21,21,TQBrush(colorGroup().background()));
 
-			paint->setPen(tqcolorGroup().background().dark(150));
+			paint->setPen(colorGroup().background().dark(150));
 			paint->drawLine(0,22,23,22);
 
 			paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
 
-			paint->setPen(tqcolorGroup().shadow());
+			paint->setPen(colorGroup().shadow());
 			paint->drawLine(0,0,0,23);
-			paint->setPen(tqcolorGroup().background().dark(120));
+			paint->setPen(colorGroup().background().dark(120));
 			paint->drawLine(1,0,1,23);
 
 		}
 		else
 		if ((m_position==KMultiTabBar::Bottom) || (m_position==KMultiTabBar::Top))
 		{
-                        paint->fillRect(0,1,23,22,TQBrush(tqcolorGroup().background()));
+                        paint->fillRect(0,1,23,22,TQBrush(colorGroup().background()));
 
                         paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
 
-                        paint->setPen(tqcolorGroup().background().dark(120));
+                        paint->setPen(colorGroup().background().dark(120));
                         paint->drawLine(23,0,23,23);
 
 
-                        paint->setPen(tqcolorGroup().light());
+                        paint->setPen(colorGroup().light());
                         paint->drawLine(0,22,23,22);
                         paint->drawLine(0,23,23,23);
-                	paint->setPen(tqcolorGroup().shadow());
+                	paint->setPen(colorGroup().shadow());
                 	paint->drawLine(0,0,23,0);
-                        paint->setPen(tqcolorGroup().background().dark(120));
+                        paint->setPen(colorGroup().background().dark(120));
                         paint->drawLine(0,1,23,1);
 
 		}
 		else
 		{
-			paint->setPen(tqcolorGroup().background().dark(120));
+			paint->setPen(colorGroup().background().dark(120));
 			paint->drawLine(0,23,23,23);
-			paint->fillRect(0,0,23,21,TQBrush(tqcolorGroup().background()));
+			paint->fillRect(0,0,23,21,TQBrush(colorGroup().background()));
 			paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
 
-			paint->setPen(tqcolorGroup().light());
+			paint->setPen(colorGroup().light());
 			paint->drawLine(23,0,23,23);
 			paint->drawLine(22,0,22,23);
 
-			paint->setPen(tqcolorGroup().shadow());
+			paint->setPen(colorGroup().shadow());
 			paint->drawLine(0,0,0,23);
 
 		}
@@ -740,12 +740,12 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
 	{
 		if (m_position==KMultiTabBar::Right)
 		{
-			paint->setPen(tqcolorGroup().shadow());
+			paint->setPen(colorGroup().shadow());
 			paint->drawLine(0,height()-1,23,height()-1);
 			paint->drawLine(0,height()-2,23,height()-2);
 			paint->drawLine(23,0,23,height()-1);
 			paint->drawLine(22,0,22,height()-1);
-			paint->fillRect(0,0,21,height()-3,TQBrush(tqcolorGroup().light()));
+			paint->fillRect(0,0,21,height()-3,TQBrush(colorGroup().light()));
 			paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
 
 			if (m_showActiveTabText)
@@ -755,9 +755,9 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
 				TQPixmap tpixmap(height()-25-3, width()-2);
 				TQPainter painter(&tpixmap);
 
-				painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(tqcolorGroup().light()));
+				painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(colorGroup().light()));
 
-				painter.setPen(tqcolorGroup().text());
+				painter.setPen(colorGroup().text());
 				painter.drawText(0,+width()/2+TQFontMetrics(TQFont()).height()/2,m_text);
 
 				paint->rotate(90);
@@ -769,25 +769,25 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
 		else
 		if (m_position==KMultiTabBar::Top)
 		{
-			paint->fillRect(0,0,width()-1,23,TQBrush(tqcolorGroup().light()));
+			paint->fillRect(0,0,width()-1,23,TQBrush(colorGroup().light()));
 			paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
 			if (m_showActiveTabText)
 			{
-				paint->setPen(tqcolorGroup().text());
+				paint->setPen(colorGroup().text());
 				paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text);
 			}
 		}
 		else
 		if (m_position==KMultiTabBar::Bottom)
 		{
-			paint->setPen(tqcolorGroup().shadow());
+			paint->setPen(colorGroup().shadow());
 			paint->drawLine(0,23,width()-1,23);
 			paint->drawLine(0,22,width()-1,22);
-			paint->fillRect(0,0,width()-1,21,TQBrush(tqcolorGroup().light()));
+			paint->fillRect(0,0,width()-1,21,TQBrush(colorGroup().light()));
 			paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
 			if (m_showActiveTabText)
 			{
-				paint->setPen(tqcolorGroup().text());
+				paint->setPen(colorGroup().text());
 				paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text);
 			}
 
@@ -796,10 +796,10 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
 		{
 
 
-			paint->setPen(tqcolorGroup().shadow());
+			paint->setPen(colorGroup().shadow());
 			paint->drawLine(0,height()-1,23,height()-1);
 			paint->drawLine(0,height()-2,23,height()-2);
-			paint->fillRect(0,0,23,height()-3,TQBrush(tqcolorGroup().light()));
+			paint->fillRect(0,0,23,height()-3,TQBrush(colorGroup().light()));
 			paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
 			if (m_showActiveTabText)
 			{
@@ -809,9 +809,9 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
                                 TQPixmap tpixmap(height()-25-3, width()-2);
                                 TQPainter painter(&tpixmap);
 
-                                painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(tqcolorGroup().light()));
+                                painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(colorGroup().light()));
 
-                                painter.setPen(tqcolorGroup().text());
+                                painter.setPen(colorGroup().text());
                                 painter.drawText(tpixmap.width()-TQFontMetrics(TQFont()).width(m_text),+width()/2+TQFontMetrics(TQFont()).height()/2,m_text);
 
                                 paint->rotate(-90);
@@ -838,13 +838,13 @@ KMultiTabBar::KMultiTabBar(KMultiTabBarMode bm, TQWidget *parent,const char *nam
 	if (bm==Vertical)
 	{
 		m_l=new TQVBoxLayout(this);
-		tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding, true);
+		setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding, true);
 //		setFixedWidth(24);
 	}
 	else
 	{
 		m_l=new TQHBoxLayout(this);
-		tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, true);
+		setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, true);
 //		setFixedHeight(24);
 	}
 	m_l->setMargin(0);
@@ -989,7 +989,7 @@ void KMultiTabBar::fontChange(const TQFont& /* oldFont */)
 {
 	for (uint i=0;i<tabs()->count();i++)
 		tabs()->at(i)->resize();
-	tqrepaint();
+	repaint();
 }
 
 TQPtrList<KMultiTabBarTab>* KMultiTabBar::tabs() {return m_internal->tabs();}
diff --git a/kutils/kmultitabbar.h b/kutils/kmultitabbar.h
index 90506c203..f4ae54b9b 100644
--- a/kutils/kmultitabbar.h
+++ b/kutils/kmultitabbar.h
@@ -239,7 +239,7 @@ public slots:
          */
 	void setText(const TQString &);
 
-	TQSize tqsizeHint() const;
+	TQSize sizeHint() const;
 
 protected:
 	KMultiTabBar::KMultiTabBarPosition m_position;
diff --git a/kutils/kpluginselector.cpp b/kutils/kpluginselector.cpp
index c5145e16d..1a64d05e9 100644
--- a/kutils/kpluginselector.cpp
+++ b/kutils/kpluginselector.cpp
@@ -101,7 +101,7 @@ KPluginListViewToolTip::KPluginListViewToolTip( TQWidget *parent, KListView *lv
 
 void KPluginListViewToolTip::maybeTip( const TQPoint &pos )
 {
-    if ( !tqparentWidget() || !m_listView )
+    if ( !parentWidget() || !m_listView )
         return;
 
     KPluginInfoLVI *item = dynamic_cast<KPluginInfoLVI *>( m_listView->itemAt( pos ) );
@@ -115,8 +115,8 @@ void KPluginListViewToolTip::maybeTip( const TQPoint &pos )
         "<tr><td><b>License:</b></td><td>%4</td></tr></table></qt>" ).arg( item->pluginInfo()->comment(),
         item->pluginInfo()->author(), item->pluginInfo()->version(), item->pluginInfo()->license() );
 
-    //kdDebug( 702 ) << k_funcinfo << "Adding tooltip: tqitemRect: " << tqitemRect << ", tooltip:  " << toolTip << endl;
-    tip( m_listView->tqitemRect( item ), toolTip );
+    //kdDebug( 702 ) << k_funcinfo << "Adding tooltip: itemRect: " << itemRect << ", tooltip:  " << toolTip << endl;
+    tip( m_listView->itemRect( item ), toolTip );
 }
 
 struct KPluginSelectionWidget::KPluginSelectionWidgetPrivate
@@ -192,7 +192,7 @@ void KPluginSelectionWidget::init( const TQValueList<KPluginInfo*> & plugininfos
             TQT_SLOT( executed( TQListViewItem * ) ) );
     connect( listview, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this,
             TQT_SLOT( executed( TQListViewItem * ) ) );
-    listview->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred );
+    listview->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred );
     listview->setAcceptDrops( false );
     listview->setFullWidth( true );
     listview->setSelectionModeExt( KListView::Single );
@@ -246,7 +246,7 @@ TQWidget * KPluginSelectionWidget::insertKCM( TQWidget * parent,
     {
         //FIXME: not very verbose
         TQLabel * label = new TQLabel( i18n( "Error" ), parent );
-        label->tqsetAlignment( Qt::AlignCenter );
+        label->setAlignment( Qt::AlignCenter );
 
         return label;
     }
@@ -332,7 +332,7 @@ void KPluginSelectionWidget::updateConfigPage( KPluginInfo * plugininfo,
         d->kps->configPage( 1 );
     else
     {
-        if( !d->widgetIDs.tqcontains( plugininfo->pluginName() ) )
+        if( !d->widgetIDs.contains( plugininfo->pluginName() ) )
             // if no widget exists for the plugin create it
             embeddPluginKCMs( plugininfo, checked );
         else
@@ -464,7 +464,7 @@ void KPluginSelectionWidget::save()
                 names->append( TQString::null );
             for( TQStringList::ConstIterator nameit = names->begin();
                     nameit != names->end(); ++nameit )
-                if( updatedModules.tqfind( *nameit ) == updatedModules.end() )
+                if( updatedModules.find( *nameit ) == updatedModules.end() )
                     updatedModules.append( *nameit );
         }
     for( TQStringList::ConstIterator it = updatedModules.begin(); it != updatedModules.end(); ++it )
@@ -536,7 +536,7 @@ KPluginSelector::KPluginSelector( TQWidget * parent, const char * name )
     TQLabel * label = new TQLabel( i18n( "(This plugin is not configurable)" ),
             d->widgetstack );
     ( new TQVBoxLayout( label, 0, KDialog::spacingHint() ) )->setAutoAdd( true );
-    label->tqsetAlignment( Qt::AlignCenter );
+    label->setAlignment( Qt::AlignCenter );
     label->setMinimumSize( 200, 200 );
 
     d->widgetstack->addWidget( label, 1 );
diff --git a/kutils/kpluginselector.h b/kutils/kpluginselector.h
index a39d440a6..0c2f1e55d 100644
--- a/kutils/kpluginselector.h
+++ b/kutils/kpluginselector.h
@@ -144,7 +144,7 @@ class KUTILS_EXPORT KPluginSelector : public QWidget
 
         /**
          * Set whether the area for showing the KCMs of the plugins should be
-         * hidden if the plugin doesn't have a KCM or whether the tqlayout should
+         * hidden if the plugin doesn't have a KCM or whether the layout should
          * rather stay static and only an message should be shown.
          *
          * By default the config page is not hidden.
diff --git a/kutils/kpluginselector_p.h b/kutils/kpluginselector_p.h
index dca783ae6..1333b2dc4 100644
--- a/kutils/kpluginselector_p.h
+++ b/kutils/kpluginselector_p.h
@@ -108,7 +108,7 @@ class KPluginSelectionWidget : public QWidget
     protected:
         /**
          * Reimplement in your subclass if you have special needs: The standard
-         * implementation looks at the KPluginInfo objects to tqfind the
+         * implementation looks at the KPluginInfo objects to find the
          * needed information. But if, for some reason, your program doesn't
          * work with that here's your chance to get it working.
          *
diff --git a/kutils/kreplace.cpp b/kutils/kreplace.cpp
index 856d330d5..f825e93cc 100644
--- a/kutils/kreplace.cpp
+++ b/kutils/kreplace.cpp
@@ -35,7 +35,7 @@ class KReplaceNextDialog : public KDialogBase
 {
 public:
     KReplaceNextDialog( TQWidget *parent );
-    void setLabel( const TQString& pattern, const TQString& tqreplacement );
+    void setLabel( const TQString& pattern, const TQString& replacement );
 private:
     TQLabel* m_mainLabel;
 };
@@ -50,28 +50,28 @@ KReplaceNextDialog::KReplaceNextDialog(TQWidget *parent) :
 {
     m_mainLabel = new TQLabel( this );
     setMainWidget( m_mainLabel );
-    resize(tqminimumSize());
+    resize(minimumSize());
 }
 
-void KReplaceNextDialog::setLabel( const TQString& pattern, const TQString& tqreplacement )
+void KReplaceNextDialog::setLabel( const TQString& pattern, const TQString& replacement )
 {
-    m_mainLabel->setText( i18n("Replace '%1' with '%2'?").arg(pattern).arg(tqreplacement) );
+    m_mainLabel->setText( i18n("Replace '%1' with '%2'?").arg(pattern).arg(replacement) );
 }
 
 ////
 
-KReplace::KReplace(const TQString &pattern, const TQString &tqreplacement, long options, TQWidget *parent) :
+KReplace::KReplace(const TQString &pattern, const TQString &replacement, long options, TQWidget *parent) :
     KFind( pattern, options, parent )
 {
-    m_tqreplacements = 0;
-    m_tqreplacement = tqreplacement;
+    m_replacements = 0;
+    m_replacement = replacement;
 }
 
-KReplace::KReplace(const TQString &pattern, const TQString &tqreplacement, long options, TQWidget *parent, TQWidget *dlg) :
+KReplace::KReplace(const TQString &pattern, const TQString &replacement, long options, TQWidget *parent, TQWidget *dlg) :
     KFind( pattern, options, parent, dlg )
 {
-    m_tqreplacements = 0;
-    m_tqreplacement = tqreplacement;
+    m_replacements = 0;
+    m_replacement = replacement;
 }
 
 KReplace::~KReplace()
@@ -79,7 +79,7 @@ KReplace::~KReplace()
     // KFind::~KFind will delete m_dialog
 }
 
-KDialogBase* KReplace::tqreplaceNextDialog( bool create )
+KDialogBase* KReplace::replaceNextDialog( bool create )
 {
     if ( m_dialog || create )
         return dialog();
@@ -90,7 +90,7 @@ KReplaceNextDialog* KReplace::dialog()
 {
     if ( !m_dialog )
     {
-        m_dialog = new KReplaceNextDialog( tqparentWidget() );
+        m_dialog = new KReplaceNextDialog( parentWidget() );
         connect( m_dialog, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( slotReplaceAll() ) );
         connect( m_dialog, TQT_SIGNAL( user2Clicked() ), this, TQT_SLOT( slotSkip() ) );
         connect( m_dialog, TQT_SIGNAL( user3Clicked() ), this, TQT_SLOT( slotReplace() ) );
@@ -101,13 +101,13 @@ KReplaceNextDialog* KReplace::dialog()
 
 void KReplace::displayFinalDialog() const
 {
-    if ( !m_tqreplacements )
-        KMessageBox::information(tqparentWidget(), i18n("No text was tqreplaced."));
+    if ( !m_replacements )
+        KMessageBox::information(parentWidget(), i18n("No text was replaced."));
     else
-        KMessageBox::information(tqparentWidget(), i18n("1 tqreplacement done.", "%n tqreplacements done.", m_tqreplacements ) );
+        KMessageBox::information(parentWidget(), i18n("1 replacement done.", "%n replacements done.", m_replacements ) );
 }
 
-KFind::Result KReplace::tqreplace()
+KFind::Result KReplace::replace()
 {
 #ifdef DEBUG_REPLACE
     kdDebug() << k_funcinfo << "m_index=" << m_index << endl;
@@ -125,11 +125,11 @@ KFind::Result KReplace::tqreplace()
 #endif
         // Find the next match.
         if ( m_options & KReplaceDialog::RegularExpression )
-            m_index = KFind::tqfind(m_text, *m_regExp, m_index, m_options, &m_matchedLength);
+            m_index = KFind::find(m_text, *m_regExp, m_index, m_options, &m_matchedLength);
         else
-            m_index = KFind::tqfind(m_text, m_pattern, m_index, m_options, &m_matchedLength);
+            m_index = KFind::find(m_text, m_pattern, m_index, m_options, &m_matchedLength);
 #ifdef DEBUG_REPLACE
-        kdDebug() << k_funcinfo << "KFind::tqfind returned m_index=" << m_index << endl;
+        kdDebug() << k_funcinfo << "KFind::find returned m_index=" << m_index << endl;
 #endif
         if ( m_index != -1 )
         {
@@ -141,10 +141,10 @@ KFind::Result KReplace::tqreplace()
 #ifdef DEBUG_REPLACE
                     kdDebug() << k_funcinfo << "PromptOnReplace" << endl;
 #endif
-                    // Display accurate initial string and tqreplacement string, they can vary
+                    // Display accurate initial string and replacement string, they can vary
                     TQString matchedText = m_text.mid( m_index, m_matchedLength );
                     TQString rep = matchedText;
-                    KReplace::tqreplace(rep, m_tqreplacement, 0, m_options, m_matchedLength);
+                    KReplace::replace(rep, m_replacement, 0, m_options, m_matchedLength);
                     dialog()->setLabel( matchedText, rep );
                     dialog()->show();
 
@@ -177,46 +177,46 @@ KFind::Result KReplace::tqreplace()
     return NoMatch;
 }
 
-int KReplace::tqreplace(TQString &text, const TQString &pattern, const TQString &tqreplacement, int index, long options, int *tqreplacedLength)
+int KReplace::replace(TQString &text, const TQString &pattern, const TQString &replacement, int index, long options, int *replacedLength)
 {
     int matchedLength;
 
-    index = KFind::tqfind(text, pattern, index, options, &matchedLength);
+    index = KFind::find(text, pattern, index, options, &matchedLength);
     if (index != -1)
     {
-        *tqreplacedLength = tqreplace(text, tqreplacement, index, options, matchedLength);
+        *replacedLength = replace(text, replacement, index, options, matchedLength);
         if (options & KReplaceDialog::FindBackwards)
             index--;
         else
-            index += *tqreplacedLength;
+            index += *replacedLength;
     }
     return index;
 }
 
-int KReplace::tqreplace(TQString &text, const TQRegExp &pattern, const TQString &tqreplacement, int index, long options, int *tqreplacedLength)
+int KReplace::replace(TQString &text, const TQRegExp &pattern, const TQString &replacement, int index, long options, int *replacedLength)
 {
     int matchedLength;
 
-    index = KFind::tqfind(text, pattern, index, options, &matchedLength);
+    index = KFind::find(text, pattern, index, options, &matchedLength);
     if (index != -1)
     {
-        *tqreplacedLength = tqreplace(text, tqreplacement, index, options, matchedLength);
+        *replacedLength = replace(text, replacement, index, options, matchedLength);
         if (options & KReplaceDialog::FindBackwards)
             index--;
         else
-            index += *tqreplacedLength;
+            index += *replacedLength;
     }
     return index;
 }
 
-int KReplace::tqreplace(TQString &text, const TQString &tqreplacement, int index, long options, int length)
+int KReplace::replace(TQString &text, const TQString &replacement, int index, long options, int length)
 {
-    TQString rep = tqreplacement;
-    // Backreferences: tqreplace \0 with the right portion of 'text'
+    TQString rep = replacement;
+    // Backreferences: replace \0 with the right portion of 'text'
     if ( options & KReplaceDialog::BackReference )
-        rep.tqreplace( "\\0", text.mid( index, length ) );
-    // Then tqreplace rep into the text
-    text.tqreplace(index, length, rep);
+        rep.replace( "\\0", text.mid( index, length ) );
+    // Then replace rep into the text
+    text.replace(index, length, rep);
     return rep.length();
 }
 
@@ -225,7 +225,7 @@ void KReplace::slotReplaceAll()
     doReplace();
     m_options &= ~KReplaceDialog::PromptOnReplace;
     emit optionsChanged();
-    emit tqfindNext();
+    emit findNext();
 }
 
 void KReplace::slotSkip()
@@ -238,7 +238,7 @@ void KReplace::slotSkip()
         delete m_dialog; // hide it again
         m_dialog = 0L;
     } else
-        emit tqfindNext();
+        emit findNext();
 }
 
 void KReplace::slotReplace()
@@ -248,24 +248,24 @@ void KReplace::slotReplace()
         delete m_dialog; // hide it again
         m_dialog = 0L;
     } else
-        emit tqfindNext();
+        emit findNext();
 }
 
 void KReplace::doReplace()
 {
-    int tqreplacedLength = KReplace::tqreplace(m_text, m_tqreplacement, m_index, m_options, m_matchedLength);
+    int replacedLength = KReplace::replace(m_text, m_replacement, m_index, m_options, m_matchedLength);
 
-    // Tell the world about the tqreplacement we made, in case someone wants to
+    // Tell the world about the replacement we made, in case someone wants to
     // highlight it.
-    emit tqreplace(m_text, m_index, tqreplacedLength, m_matchedLength);
+    emit replace(m_text, m_index, replacedLength, m_matchedLength);
 #ifdef DEBUG_REPLACE
-    kdDebug() << k_funcinfo << "after tqreplace() signal: m_index=" << m_index << " tqreplacedLength=" << tqreplacedLength << endl;
+    kdDebug() << k_funcinfo << "after replace() signal: m_index=" << m_index << " replacedLength=" << replacedLength << endl;
 #endif
-    m_tqreplacements++;
+    m_replacements++;
     if (m_options & KReplaceDialog::FindBackwards)
         m_index--;
     else {
-        m_index += tqreplacedLength;
+        m_index += replacedLength;
         // when replacing the empty pattern, move on. See also kjs/regexp.cpp for how this should be done for regexps.
         if ( m_pattern.isEmpty() )
             ++m_index;
@@ -278,13 +278,13 @@ void KReplace::doReplace()
 void KReplace::resetCounts()
 {
     KFind::resetCounts();
-    m_tqreplacements = 0;
+    m_replacements = 0;
 }
 
 bool KReplace::shouldRestart( bool forceAsking, bool showNumMatches ) const
 {
-    // Only ask if we did a "tqfind from cursor", otherwise it's pointless.
-    // ... Or if the prompt-on-tqreplace option was set.
+    // Only ask if we did a "find from cursor", otherwise it's pointless.
+    // ... Or if the prompt-on-replace option was set.
     // Well, unless the user can modify the document during a search operation,
     // hence the force boolean.
     if ( !forceAsking && (m_options & KFindDialog::FromCursor) == 0
@@ -296,10 +296,10 @@ bool KReplace::shouldRestart( bool forceAsking, bool showNumMatches ) const
     TQString message;
     if ( showNumMatches )
     {
-        if ( !m_tqreplacements )
-            message = i18n("No text was tqreplaced.");
+        if ( !m_replacements )
+            message = i18n("No text was replaced.");
         else
-            message = i18n("1 tqreplacement done.", "%n tqreplacements done.", m_tqreplacements );
+            message = i18n("1 replacement done.", "%n replacements done.", m_replacements );
     }
     else
     {
@@ -316,7 +316,7 @@ bool KReplace::shouldRestart( bool forceAsking, bool showNumMatches ) const
         i18n("Do you want to restart search from the end?")
         : i18n("Do you want to restart search at the beginning?");
 
-    int ret = KMessageBox::questionYesNo( tqparentWidget(), message, TQString::null, i18n("Restart"), i18n("Stop") );
+    int ret = KMessageBox::questionYesNo( parentWidget(), message, TQString::null, i18n("Restart"), i18n("Stop") );
     return( ret == KMessageBox::Yes );
 }
 
diff --git a/kutils/kreplace.h b/kutils/kreplace.h
index 3a44589b8..ea385189b 100644
--- a/kutils/kreplace.h
+++ b/kutils/kreplace.h
@@ -27,8 +27,8 @@ class KReplaceNextDialog;
 
 /**
  * @ingroup main
- * @ingroup tqfindtqreplace
- * @brief A generic implementation of the "tqreplace" function.
+ * @ingroup findreplace
+ * @brief A generic implementation of the "replace" function.
  *
  * @author S.R.Haque <srhaque@iee.org>, David Faure <faure@kde.org>
  *
@@ -40,23 +40,23 @@ class KReplaceNextDialog;
  *
  * \b Example:
  *
- * To use the class to implement a complete tqreplace feature:
+ * To use the class to implement a complete replace feature:
  *
- * In the slot connect to the tqreplace action, after using KReplaceDialog:
+ * In the slot connect to the replace action, after using KReplaceDialog:
  * \code
  *
- *  // This creates a tqreplace-on-prompt dialog if needed.
- *  m_tqreplace = new KReplace(pattern, tqreplacement, options, this);
+ *  // This creates a replace-on-prompt dialog if needed.
+ *  m_replace = new KReplace(pattern, replacement, options, this);
  *
  *  // Connect signals to code which handles highlighting
- *  // of found text, and on-the-fly tqreplacement.
- *  connect( m_tqreplace, TQT_SIGNAL( highlight( const TQString &, int, int ) ),
+ *  // of found text, and on-the-fly replacement.
+ *  connect( m_replace, TQT_SIGNAL( highlight( const TQString &, int, int ) ),
  *          this, TQT_SLOT( slotHighlight( const TQString &, int, int ) ) );
- *  // Connect tqfindNext signal - called when pressing the button in the dialog
- *  connect( m_tqreplace, TQT_SIGNAL( tqfindNext() ),
+ *  // Connect findNext signal - called when pressing the button in the dialog
+ *  connect( m_replace, TQT_SIGNAL( findNext() ),
  *          this, TQT_SLOT( slotReplaceNext() ) );
- *  // Connect tqreplace signal - called when doing a tqreplacement
- *  connect( m_tqreplace, TQT_SIGNAL( tqreplace(const TQString &, int, int, int) ),
+ *  // Connect replace signal - called when doing a replacement
+ *  connect( m_replace, TQT_SIGNAL( replace(const TQString &, int, int, int) ),
  *          this, TQT_SLOT( slotReplace(const TQString &, int, int, int) ) );
  * \endcode
  *  Then initialize the variables determining the "current position"
@@ -72,11 +72,11 @@ class KReplaceNextDialog;
  *  {
  *      KFind::Result res = KFind::NoMatch;
  *      while ( res == KFind::NoMatch && <position not at end> ) {
- *          if ( m_tqreplace->needData() )
- *              m_tqreplace->setData( <current text fragment> );
+ *          if ( m_replace->needData() )
+ *              m_replace->setData( <current text fragment> );
  *
  *          // Let KReplace inspect the text fragment, and display a dialog if a match is found
- *          res = m_tqreplace->tqreplace();
+ *          res = m_replace->replace();
  *
  *          if ( res == KFind::NoMatch ) {
  *              <Move to the next text fragment, honoring the FindBackwards setting for the direction>
@@ -84,13 +84,13 @@ class KReplaceNextDialog;
  *      }
  *
  *      if ( res == KFind::NoMatch ) // i.e. at end
- *          <Call either  m_tqreplace->displayFinalDialog(); delete m_tqreplace; m_tqreplace = 0L;
- *           or           if ( m_tqreplace->shouldRestart() ) { reinit (w/o FromCursor) and call slotReplaceNext(); }
- *                        else { m_tqreplace->closeReplaceNextDialog(); }>
+ *          <Call either  m_replace->displayFinalDialog(); delete m_replace; m_replace = 0L;
+ *           or           if ( m_replace->shouldRestart() ) { reinit (w/o FromCursor) and call slotReplaceNext(); }
+ *                        else { m_replace->closeReplaceNextDialog(); }>
  *  }
  * \endcode
  *
- *  Don't forget delete m_tqfind in the destructor of your class,
+ *  Don't forget delete m_find in the destructor of your class,
  *  unless you gave it a parent widget on construction.
  *
  */
@@ -105,23 +105,23 @@ public:
      * Only use this constructor if you don't use KFindDialog, or if
      * you use it as a modal dialog.
      * @param pattern The pattern to look for.
-     * @param tqreplacement The tqreplacement string.
-     * @param options Options for the tqfind dialog. @see KFindDialog and KReplaceDialog.
+     * @param replacement The replacement string.
+     * @param options Options for the find dialog. @see KFindDialog and KReplaceDialog.
      * @param parent The parent widget.
      */
-    KReplace(const TQString &pattern, const TQString &tqreplacement, long options, TQWidget *parent = 0);
+    KReplace(const TQString &pattern, const TQString &replacement, long options, TQWidget *parent = 0);
     /**
      * This is the recommended constructor if you also use KReplaceDialog (non-modal).
      * You should pass the pointer to it here, so that when a message box
      * appears it has the right parent. Don't worry about deletion, KReplace
-     * will notice if the tqfind dialog is closed.
+     * will notice if the find dialog is closed.
      * @param pattern The pattern to look for.
-     * @param tqreplacement The tqreplacement string.
-     * @param options Options for the tqfind dialog. @see KFindDialog and KReplaceDialog.
+     * @param replacement The replacement string.
+     * @param options Options for the find dialog. @see KFindDialog and KReplaceDialog.
      * @param parent The parent widget.
-     * @param tqreplaceDialog A pointer to the KReplaceDialog object.
+     * @param replaceDialog A pointer to the KReplaceDialog object.
      */
-    KReplace(const TQString &pattern, const TQString &tqreplacement, long options, TQWidget *parent, TQWidget* tqreplaceDialog);
+    KReplace(const TQString &pattern, const TQString &replacement, long options, TQWidget *parent, TQWidget* replaceDialog);
 
     /**
      * Destructor.
@@ -129,13 +129,13 @@ public:
     virtual ~KReplace();
 
     /**
-     * Return the number of tqreplacements made (i.e. the number of times
-     * the tqreplace signal was emitted).
-     * Can be used in a dialog box to tell the user how many tqreplacements were made.
+     * Return the number of replacements made (i.e. the number of times
+     * the replace signal was emitted).
+     * Can be used in a dialog box to tell the user how many replacements were made.
      * The final dialog does so already, unless you used setDisplayFinalDialog(false).
-     * @return The number of tqreplacements.
+     * @return The number of replacements.
      */
-    int numReplacements() const { return m_tqreplacements; }
+    int numReplacements() const { return m_replacements; }
 
     /**
      * Call this to reset the numMatches & numReplacements counts.
@@ -146,76 +146,76 @@ public:
 
     /**
      * Walk the text fragment (e.g. kwrite line, kspread cell) looking for matches.
-     * For each match, if prompt-on-tqreplace is specified, emits the highlight() signal
-     * and displays the prompt-for-tqreplace dialog before doing the tqreplace.
+     * For each match, if prompt-on-replace is specified, emits the highlight() signal
+     * and displays the prompt-for-replace dialog before doing the replace.
      * @return Whether or not there has been a match.
      */
-    Result tqreplace();
+    Result replace();
 
     /**
-     * Return (or create) the dialog that shows the "tqfind next?" prompt.
+     * Return (or create) the dialog that shows the "find next?" prompt.
      * Usually you don't need to call this.
      * One case where it can be useful, is when the user selects the "Find"
-     * menu item while a tqfind operation is under way. In that case, the
+     * menu item while a find operation is under way. In that case, the
      * program may want to call setActiveWindow() on that dialog.
-     * @return The tqreplace next dialog.
+     * @return The replace next dialog.
      */
-    KDialogBase* tqreplaceNextDialog( bool create = false );
+    KDialogBase* replaceNextDialog( bool create = false );
 
     /**
-     * Close the "tqreplace next?" dialog. The application should do this when
+     * Close the "replace next?" dialog. The application should do this when
      * the last match was hit. If the application deletes the KReplace, then
-     * "tqfind previous" won't be possible anymore.
+     * "find previous" won't be possible anymore.
      */
     void closeReplaceNextDialog();
 
     /**
-     * Searches the given string, tqreplaces with the given tqreplacement string,
+     * Searches the given string, replaces with the given replacement string,
      * and returns whether a match was found. If one is,
-     * the tqreplacement string length is also returned.
+     * the replacement string length is also returned.
      *
      * A performance optimised version of the function is provided for use
      * with regular expressions.
      *
      * @param text The string to search.
      * @param pattern The pattern to look for.
-     * @param tqreplacement The tqreplacement string to insert into the text.
+     * @param replacement The replacement string to insert into the text.
      * @param index The starting index into the string.
      * @param options The options to use.
-     * @param tqreplacedLength Output parameter, tqcontains the length of the tqreplaced string.
-     * Not always the same as tqreplacement.length(), when backreferences are used.
+     * @param replacedLength Output parameter, contains the length of the replaced string.
+     * Not always the same as replacement.length(), when backreferences are used.
      * @return The index at which a match was found, or -1 if no match was found.
      */
-    static int tqreplace( TQString &text, const TQString &pattern, const TQString &tqreplacement, int index, long options, int *tqreplacedLength );
+    static int replace( TQString &text, const TQString &pattern, const TQString &replacement, int index, long options, int *replacedLength );
 
     /**
-     * Searches the given regular expression, tqreplaces with the given tqreplacement string,
+     * Searches the given regular expression, replaces with the given replacement string,
      * and returns whether a match was found. If one is,
-     * the tqreplacement string length is also returned.
+     * the replacement string length is also returned.
      *
      * Another version of the function is provided for use with strings.
      *
      * @param text The string to search.
      * @param pattern The regular expression pattern to look for.
-     * @param tqreplacement The tqreplacement string to insert into the text.
+     * @param replacement The replacement string to insert into the text.
      * @param index The starting index into the string.
      * @param options The options to use.
-     * @param tqreplacedLength Output parameter, tqcontains the length of the tqreplaced string.
-     * Not always the same as tqreplacement.length(), when backreferences are used.
+     * @param replacedLength Output parameter, contains the length of the replaced string.
+     * Not always the same as replacement.length(), when backreferences are used.
      * @return The index at which a match was found, or -1 if no match was found.
      */
-    static int tqreplace( TQString &text, const TQRegExp &pattern, const TQString &tqreplacement, int index, long options, int *tqreplacedLength );
+    static int replace( TQString &text, const TQRegExp &pattern, const TQString &replacement, int index, long options, int *replacedLength );
 
     /**
      * Returns @c true if we should restart the search from scratch.
-     * Can ask the user, or return @c false (if we already searched/tqreplaced the
+     * Can ask the user, or return @c false (if we already searched/replaced the
      * whole document without the PromptOnReplace option).
      *
      * @param forceAsking set to @c true if the user modified the document during the
      * search. In that case it makes sense to restart the search again.
      *
      * @param showNumMatches set to @c true if the dialog should show the number of
-     * matches. Set to @c false if the application provides a "tqfind previous" action,
+     * matches. Set to @c false if the application provides a "find previous" action,
      * in which case the match count will be erroneous when hitting the end,
      * and we could even be hitting the beginning of the document (so not all
      * matches have even been seen).
@@ -225,7 +225,7 @@ public:
     virtual bool shouldRestart( bool forceAsking = false, bool showNumMatches = true ) const;
 
     /**
-     * Displays the final dialog telling the user how many tqreplacements were made.
+     * Displays the final dialog telling the user how many replacements were made.
      * Call either this or shouldRestart().
      */
     virtual void displayFinalDialog() const;
@@ -233,20 +233,20 @@ public:
 signals:
 
     /**
-     * Connect to this slot to implement updating of tqreplaced text during the tqreplace
+     * Connect to this slot to implement updating of replaced text during the replace
      * operation.
      *
-     * Extra care must be taken to properly implement the "no prompt-on-tqreplace" case.
+     * Extra care must be taken to properly implement the "no prompt-on-replace" case.
      * For instance highlight isn't emitted in that case (some code might rely on it),
-     * and for performance reasons one should tqrepaint after tqreplace() ONLY if
-     * prompt-on-tqreplace was selected.
+     * and for performance reasons one should repaint after replace() ONLY if
+     * prompt-on-replace was selected.
      *
-     * @param text The text, in which the tqreplacement has already been done.
-     * @param tqreplacementIndex Starting index of the matched substring
-     * @param tqreplacedLength Length of the tqreplacement string
+     * @param text The text, in which the replacement has already been done.
+     * @param replacementIndex Starting index of the matched substring
+     * @param replacedLength Length of the replacement string
      * @param matchedLength Length of the matched string
      */
-    void tqreplace(const TQString &text, int tqreplacementIndex, int tqreplacedLength, int matchedLength);
+    void replace(const TQString &text, int replacementIndex, int replacedLength, int matchedLength);
 
 protected slots:
 
@@ -257,10 +257,10 @@ protected slots:
 private:
     KReplaceNextDialog* dialog();
     void doReplace();
-    static int tqreplace( TQString &text, const TQString &tqreplacement, int index, long options, int length );
+    static int replace( TQString &text, const TQString &replacement, int index, long options, int length );
 
-    TQString m_tqreplacement;
-    unsigned m_tqreplacements;
+    TQString m_replacement;
+    unsigned m_replacements;
 
     // Binary compatible extensibility.
     class KReplacePrivate;
diff --git a/kutils/kreplacedialog.cpp b/kutils/kreplacedialog.cpp
index deef5b529..88c006b4d 100644
--- a/kutils/kreplacedialog.cpp
+++ b/kutils/kreplacedialog.cpp
@@ -32,22 +32,22 @@
 
 /**
  * we need to insert the strings after the dialog is set
- * up, otherwise TQComboBox will deliver an aweful big tqsizeHint
- * for long tqreplacement texts.
+ * up, otherwise TQComboBox will deliver an aweful big sizeHint
+ * for long replacement texts.
  */
 class KReplaceDialog::KReplaceDialogPrivate {
   public:
     KReplaceDialogPrivate() : m_initialShowDone(false) {}
-    TQStringList tqreplaceStrings;
+    TQStringList replaceStrings;
     bool m_initialShowDone;
 };
 
-KReplaceDialog::KReplaceDialog(TQWidget *parent, const char *name, long options, const TQStringList &tqfindStrings, const TQStringList &tqreplaceStrings, bool hasSelection) :
+KReplaceDialog::KReplaceDialog(TQWidget *parent, const char *name, long options, const TQStringList &findStrings, const TQStringList &replaceStrings, bool hasSelection) :
     KFindDialog(parent, name, true)
 {
     d = new KReplaceDialogPrivate;
-    d->tqreplaceStrings = tqreplaceStrings;
-    init(true, tqfindStrings, hasSelection);
+    d->replaceStrings = replaceStrings;
+    init(true, findStrings, hasSelection);
     setOptions(options);
 }
 
@@ -62,10 +62,10 @@ void KReplaceDialog::showEvent( TQShowEvent *e )
     {
         d->m_initialShowDone = true; // only once
 
-        if (!d->tqreplaceStrings.isEmpty())
+        if (!d->replaceStrings.isEmpty())
         {
-          setReplacementHistory(d->tqreplaceStrings);
-          m_tqreplace->lineEdit()->setText( d->tqreplaceStrings[0] );
+          setReplacementHistory(d->replaceStrings);
+          m_replace->lineEdit()->setText( d->replaceStrings[0] );
         }
     }
 
@@ -84,27 +84,27 @@ long KReplaceDialog::options() const
     return options;
 }
 
-TQWidget *KReplaceDialog::tqreplaceExtension()
+TQWidget *KReplaceDialog::replaceExtension()
 {
-    if (!m_tqreplaceExtension)
+    if (!m_replaceExtension)
     {
-      m_tqreplaceExtension = new TQWidget(m_tqreplaceGrp);
-      m_tqreplaceLayout->addMultiCellWidget(m_tqreplaceExtension, 3, 3, 0, 1);
+      m_replaceExtension = new TQWidget(m_replaceGrp);
+      m_replaceLayout->addMultiCellWidget(m_replaceExtension, 3, 3, 0, 1);
     }
 
-    return m_tqreplaceExtension;
+    return m_replaceExtension;
 }
 
-TQString KReplaceDialog::tqreplacement() const
+TQString KReplaceDialog::replacement() const
 {
-    return m_tqreplace->currentText();
+    return m_replace->currentText();
 }
 
-TQStringList KReplaceDialog::tqreplacementHistory() const
+TQStringList KReplaceDialog::replacementHistory() const
 {
-    TQStringList lst = m_tqreplace->historyItems();
+    TQStringList lst = m_replace->historyItems();
     // historyItems() doesn't tell us about the case of replacing with an empty string
-    if ( m_tqreplace->lineEdit()->text().isEmpty() )
+    if ( m_replace->lineEdit()->text().isEmpty() )
         lst.prepend( TQString::null );
     return lst;
 }
@@ -119,9 +119,9 @@ void KReplaceDialog::setOptions(long options)
 void KReplaceDialog::setReplacementHistory(const TQStringList &strings)
 {
     if (strings.count() > 0)
-        m_tqreplace->setHistoryItems(strings, true);
+        m_replace->setHistoryItems(strings, true);
     else
-        m_tqreplace->clearHistory();
+        m_replace->clearHistory();
 }
 
 void KReplaceDialog::slotOk()
@@ -133,13 +133,13 @@ void KReplaceDialog::slotOk()
         int caps = r.numCaptures();
         TQRegExp check(TQString("((?:\\\\)+)(\\d+)"));
         int p = 0;
-        TQString rep = tqreplacement();
+        TQString rep = replacement();
         while ( (p = check.search( rep, p ) ) > -1 )
         {
             if ( check.cap(1).length()%2 && check.cap(2).toInt() > caps )
             {
                 KMessageBox::information( this, i18n(
-                        "Your tqreplacement string is referencing a capture greater than '\\%1', ").arg( caps ) +
+                        "Your replacement string is referencing a capture greater than '\\%1', ").arg( caps ) +
                     ( caps ?
                         i18n("but your pattern only defines 1 capture.",
                              "but your pattern only defines %n captures.", caps ) :
@@ -153,8 +153,8 @@ void KReplaceDialog::slotOk()
     }
 
     KFindDialog::slotOk();
-    m_tqreplace->addToHistory(tqreplacement());
+    m_replace->addToHistory(replacement());
 }
 
-// kate: space-indent on; indent-width 4; tqreplace-tabs on;
+// kate: space-indent on; indent-width 4; replace-tabs on;
 #include "kreplacedialog.moc"
diff --git a/kutils/kreplacedialog.h b/kutils/kreplacedialog.h
index e4c59e333..409666dbd 100644
--- a/kutils/kreplacedialog.h
+++ b/kutils/kreplacedialog.h
@@ -33,20 +33,20 @@ class TQRect;
 
 /**
  * @ingroup main
- * @ingroup tqfindtqreplace
- * @short A generic "tqreplace" dialog.
+ * @ingroup findreplace
+ * @short A generic "replace" dialog.
  *
  * @author S.R.Haque <srhaque@iee.org>
  *
  * \b Detail:
  *
  * This widget inherits from KFindDialog and implements
- * the following additional functionalities:  a tqreplacement string
+ * the following additional functionalities:  a replacement string
  * object and an area for a user-defined widget to extend the dialog.
  *
  * \b Example:
  *
- * To use the basic tqreplace dialog:
+ * To use the basic replace dialog:
  *
  * \code
  * \endcode
@@ -68,25 +68,25 @@ public:
      */
     enum Options
     {
-        PromptOnReplace = 256,  ///< Should the user be prompted before the tqreplace operation?
+        PromptOnReplace = 256,  ///< Should the user be prompted before the replace operation?
         BackReference = 512
     };
 
     /**
-     * Construct a tqreplace dialog.read-only or rather select-only combo box with a
+     * Construct a replace dialog.read-only or rather select-only combo box with a
      * parent object and a name.
      *
      * @param parent The parent object of this widget
      * @param name The name of this widget
      * @param options A bitfield of the Options to be enabled.
-     * @param tqfindStrings A TQStringList to insert in the combo box of text to tqfind
-     * @param tqreplaceStrings A TQStringList to insert in the combo box of text to
-     *        tqreplace with
+     * @param findStrings A TQStringList to insert in the combo box of text to find
+     * @param replaceStrings A TQStringList to insert in the combo box of text to
+     *        replace with
      * @param hasSelection Whether a selection exists
      */
     KReplaceDialog( TQWidget *parent = 0, const char *name = 0, long options = 0,
-		    const TQStringList &tqfindStrings = TQStringList(),
-		    const TQStringList &tqreplaceStrings = TQStringList(),
+		    const TQStringList &findStrings = TQStringList(),
+		    const TQStringList &replaceStrings = TQStringList(),
 		    bool hasSelection = true );
 
     /**
@@ -96,21 +96,21 @@ public:
 
     /**
      * Provide the list of @p strings to be displayed as the history
-     * of tqreplacement strings. @p strings might get truncated if it is
+     * of replacement strings. @p strings might get truncated if it is
      * too long.
      *
-     * @param history The tqreplacement history.
-     * @see tqreplacementHistory
+     * @param history The replacement history.
+     * @see replacementHistory
      */
     void setReplacementHistory( const TQStringList &history );
 
     /**
      * Returns the list of history items.
      *
-     * @return The tqreplacement history.
+     * @return The replacement history.
      * @see setReplacementHistory
      */
-    TQStringList tqreplacementHistory() const;
+    TQStringList replacementHistory() const;
 
     /**
      * Set the options which are enabled.
@@ -130,19 +130,19 @@ public:
     long options() const;
 
     /**
-     * Returns the tqreplacement string.
-     * @return The tqreplacement string.
+     * Returns the replacement string.
+     * @return The replacement string.
      */
-    TQString tqreplacement() const;
+    TQString replacement() const;
 
     /**
      * Returns an empty widget which the user may fill with additional UI
      * elements as required. The widget occupies the width of the dialog,
      * and is positioned immediately the regular expression support widgets
-     * for the tqreplacement string.
+     * for the replacement string.
      * @return An extensible TQWidget.
      */
-    TQWidget *tqreplaceExtension();
+    TQWidget *replaceExtension();
 
 protected slots:
 
diff --git a/kutils/ksettings/README.dox b/kutils/ksettings/README.dox
index 4f9803efc..0660324c1 100644
--- a/kutils/ksettings/README.dox
+++ b/kutils/ksettings/README.dox
@@ -35,7 +35,7 @@ KSettings::Dialog:
 m_dlg = new KSettings::Dialog( QStringList::split( ';', "component1;component2" ) );
 \endcode
 
-The KSettings::Dialog object will be destructed automatically by the TQObject
+The KSettings::Dialog object will be destructed automatically by the QObject
 mechanisms.
 
 
@@ -85,7 +85,7 @@ object for every registered instance name: \ref KSettings::Dispatcher::configFor
 <hr>
 <h3>3. The .desktop file for the page</h3>
 
-The .desktop file holds all the information for the dialog to tqfind the page and
+The .desktop file holds all the information for the dialog to find the page and
 insert it at the right place (with the right icon, name and comment).
 
 An example file:
@@ -123,7 +123,7 @@ Some explanation for those keys:
   is used by the first two \ref KSettings::Dialog constructors. The Dialog will
   use all modules that set X-KDE-ParentApp to
   KGlobal::instance()->instanceName(). It
-  should be pretty easy to tqfind out what name that is: look at the first
+  should be pretty easy to find out what name that is: look at the first
   argument to the KAboutData ctor.
 - X-KDE-ParentComponents is a list of the components (plugin/KPart/whatever)
   this config page belongs to. Normally there is only one component.
@@ -146,7 +146,7 @@ Some explanation for those keys:
 
 
 <hr>
-<h3>4. The .setdlg file for hierarchical (TreeList) page tqlayouts</h3>
+<h3>4. The .setdlg file for hierarchical (TreeList) page layouts</h3>
 
 If your config dialog should show a tree of pages in the config dialog you need
 to define that hierarchy with a .setdlg file.
@@ -155,7 +155,7 @@ The file should be installed in apps/&lt;appname&gt;/&lt;appname&gt;.setdlg. If
 plugins need to merge in they will install their file to
 apps/&lt;appname&gt;/ksettingsdialog/&lt;pluginname&gt;.setdlg.
 
-A .setdlg file tqcontains one or more blocks like the following:
+A .setdlg file contains one or more blocks like the following:
 
 \verbatim
 [id]
diff --git a/kutils/ksettings/componentsdialog.cpp b/kutils/ksettings/componentsdialog.cpp
index 04d6649fe..cb3695e05 100644
--- a/kutils/ksettings/componentsdialog.cpp
+++ b/kutils/ksettings/componentsdialog.cpp
@@ -59,9 +59,9 @@ ComponentsDialog::ComponentsDialog( TQWidget * parent, const char * name )
     d->iconwidget = new TQLabel( d->infowidget );
     ( void )new KSeparator( d->infowidget );
     d->commentwidget = new TQLabel( d->infowidget );
-    d->commentwidget->tqsetAlignment( Qt::WordBreak );
+    d->commentwidget->setAlignment( Qt::WordBreak );
     d->descriptionwidget = new TQLabel( d->infowidget );
-    d->descriptionwidget->tqsetAlignment( Qt::WordBreak );
+    d->descriptionwidget->setAlignment( Qt::WordBreak );
 
     d->listview->addColumn( TQString::null );
     d->listview->header()->hide();
diff --git a/kutils/ksettings/dialog.cpp b/kutils/ksettings/dialog.cpp
index f6913f194..35ad153ef 100644
--- a/kutils/ksettings/dialog.cpp
+++ b/kutils/ksettings/dialog.cpp
@@ -108,7 +108,7 @@ class PageNode
 					if( **i < **j )
 					{
 						finished = false;
-						tqSwap( *i, *j );
+						qSwap( *i, *j );
 						lastswapped = j;
 					}
 					--i;
@@ -484,12 +484,12 @@ bool Dialog::isPluginForKCMEnabled( KCModuleInfo * moduleinfo ) const
 			pcit != parentComponents.end(); ++pcit )
 	{
 		// if the parentComponent is not registered ignore it
-		if( d->registeredComponents.tqfind( *pcit ) ==
+		if( d->registeredComponents.find( *pcit ) ==
 				d->registeredComponents.end() )
 			continue;
 
 		// we check if the parent component is a plugin
-		if( ! d->plugininfomap.tqcontains( *pcit ) )
+		if( ! d->plugininfomap.contains( *pcit ) )
 		{
 			// if not the KCModule must be enabled
 			enabled = true;
diff --git a/kutils/ksettings/dialog.h b/kutils/ksettings/dialog.h
index 13f348287..c83caeeff 100644
--- a/kutils/ksettings/dialog.h
+++ b/kutils/ksettings/dialog.h
@@ -70,7 +70,7 @@ namespace KSettings
  * @author Matthias Kretz <kretz@kde.org>
  * @since 3.2
  */
-class KUTILS_EXPORT Dialog : public TQObject
+class KUTILS_EXPORT Dialog : public QObject
 {
     friend class PageNode;
     Q_OBJECT
diff --git a/kutils/ksettings/dispatcher.cpp b/kutils/ksettings/dispatcher.cpp
index b3a92f600..7f20c1bc3 100644
--- a/kutils/ksettings/dispatcher.cpp
+++ b/kutils/ksettings/dispatcher.cpp
@@ -67,7 +67,7 @@ void Dispatcher::registerInstance( KInstance * instance, TQObject * recv, const
     kdDebug( 701 ) << k_funcinfo << instanceName << endl;
     m_instanceName[ recv ] = instanceName;
     TQSignal * sig;
-    if( m_instanceInfo.tqcontains( instanceName ) )
+    if( m_instanceInfo.contains( instanceName ) )
     {
         sig = m_instanceInfo[ instanceName ].signal;
     }
@@ -86,7 +86,7 @@ void Dispatcher::registerInstance( KInstance * instance, TQObject * recv, const
 KConfig * Dispatcher::configForInstanceName( const TQCString & instanceName )
 {
     kdDebug( 701 ) << k_funcinfo << endl;
-    if( m_instanceInfo.tqcontains( instanceName ) )
+    if( m_instanceInfo.contains( instanceName ) )
     {
         KInstance * inst = m_instanceInfo[ instanceName ].instance;
         if( inst )
@@ -111,7 +111,7 @@ void Dispatcher::reparseConfiguration( const TQCString & instanceName )
 {
     kdDebug( 701 ) << k_funcinfo << instanceName << endl;
     // check if the instanceName is valid:
-    if( ! m_instanceInfo.tqcontains( instanceName ) )
+    if( ! m_instanceInfo.contains( instanceName ) )
         return;
     // first we reparse the config of the instance so that the KConfig object
     // will be up to date
diff --git a/kutils/ksettings/dispatcher.h b/kutils/ksettings/dispatcher.h
index 8bbe79fca..55e30412e 100644
--- a/kutils/ksettings/dispatcher.h
+++ b/kutils/ksettings/dispatcher.h
@@ -48,7 +48,7 @@ namespace KSettings
  * @author Matthias Kretz <kretz@kde.org>
  * @since 3.2
  */
-class KUTILS_EXPORT Dispatcher : public TQObject
+class KUTILS_EXPORT Dispatcher : public QObject
 {
     friend class KStaticDeleter<Dispatcher>;
 
diff --git a/kutils/tests/Makefile.am b/kutils/tests/Makefile.am
index 747b2af2d..3bde7a9a2 100644
--- a/kutils/tests/Makefile.am
+++ b/kutils/tests/Makefile.am
@@ -1,16 +1,16 @@
 INCLUDES = $(all_includes)
 
-check_PROGRAMS = ktqfindtest ktqreplacetest
+check_PROGRAMS = kfindtest kreplacetest
 
-TESTS = ktqfindtest ktqreplacetest
+TESTS = kfindtest kreplacetest
 
-ktqfindtest_SOURCES = ktqfindtest.cpp
-ktqfindtest_LDADD = ../libkutils.la
-ktqfindtest_LDFLAGS = $(all_libraries)
+kfindtest_SOURCES = kfindtest.cpp
+kfindtest_LDADD = ../libkutils.la
+kfindtest_LDFLAGS = $(all_libraries)
 
-ktqreplacetest_SOURCES = ktqreplacetest.cpp
-ktqreplacetest_LDADD = ../libkutils.la
-ktqreplacetest_LDFLAGS = $(all_libraries)
+kreplacetest_SOURCES = kreplacetest.cpp
+kreplacetest_LDADD = ../libkutils.la
+kreplacetest_LDFLAGS = $(all_libraries)
 
 METASOURCES = AUTO
 
diff --git a/kutils/tests/kfindtest.cpp b/kutils/tests/kfindtest.cpp
index 5db237a89..1652eb625 100644
--- a/kutils/tests/kfindtest.cpp
+++ b/kutils/tests/kfindtest.cpp
@@ -17,9 +17,9 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "../ktqfind.h"
-#include "../ktqfinddialog.h"
-#include "ktqfindtest.h"
+#include "../kfind.h"
+#include "../kfinddialog.h"
+#include "kfindtest.h"
 
 #include <kapplication.h>
 #include <kcmdlineargs.h>
@@ -47,21 +47,21 @@ static bool check(TQString txt, TQString a, TQString b) // from kurltest
 void KFindTest::changeText(uint line, const TQString &text)
 {
 	Q_ASSERT(line < m_text.count());
-	Q_ASSERT(m_tqfind != 0);
+	Q_ASSERT(m_find != 0);
 
 	m_line = line;
 	m_text[line] = text;
-	m_tqfind->setData(line, text);
+	m_find->setData(line, text);
 }
 
-void KFindTest::tqfind(const TQString &pattern, long options)
+void KFindTest::find(const TQString &pattern, long options)
 {
-	delete m_tqfind;
-	m_tqfind = new KFind(pattern, options, 0);
+	delete m_find;
+	m_find = new KFind(pattern, options, 0);
 
-	connect(m_tqfind, TQT_SIGNAL(highlight(const TQString &, int, int)),
+	connect(m_find, TQT_SIGNAL(highlight(const TQString &, int, int)),
 	                TQT_SLOT(slotHighlight(const TQString &, int, int)));
-	connect(m_tqfind, TQT_SIGNAL(highlight(int, int, int)),
+	connect(m_find, TQT_SIGNAL(highlight(int, int, int)),
 	                TQT_SLOT(slotHighlight(int, int, int)));
 
 	m_line = 0;
@@ -69,23 +69,23 @@ void KFindTest::tqfind(const TQString &pattern, long options)
 	do
 	{
 		if(options & KFindDialog::FindIncremental)
-			m_tqfind->setData(m_line, m_text[m_line]);
+			m_find->setData(m_line, m_text[m_line]);
 		else
-			m_tqfind->setData(m_text[m_line]);
+			m_find->setData(m_text[m_line]);
 
 		m_line++;
 
-		result = m_tqfind->tqfind();
+		result = m_find->find();
 	} while(result == KFind::NoMatch && m_line < m_text.count());
 }
 
-void KFindTest::tqfindNext(const TQString &pattern)
+void KFindTest::findNext(const TQString &pattern)
 {
-	Q_ASSERT(m_tqfind != 0);
+	Q_ASSERT(m_find != 0);
 
 	if(!pattern.isNull())
 	{
-		m_tqfind->setPattern(pattern);
+		m_find->setPattern(pattern);
 	}
 
 	KFind::Result result = KFind::NoMatch;
@@ -93,20 +93,20 @@ void KFindTest::tqfindNext(const TQString &pattern)
 	{
 		//kdDebug() << "m_line: " << m_line << endl;
 
-		result = m_tqfind->tqfind();
+		result = m_find->find();
 
 		if(result == KFind::NoMatch && m_line < m_text.count())
 		{
 			//kdDebug() << "incrementing m_line..." << endl;
-			if(m_tqfind->options() & KFindDialog::FindIncremental)
-				m_tqfind->setData(m_line, m_text[m_line]);
+			if(m_find->options() & KFindDialog::FindIncremental)
+				m_find->setData(m_line, m_text[m_line]);
 			else
-				m_tqfind->setData(m_text[m_line]);
+				m_find->setData(m_text[m_line]);
 
 			m_line++;
 		}
 	} while(result == KFind::NoMatch && m_line < m_text.count());
-	//kdDebug() << "tqfind next completed" << m_line << endl;
+	//kdDebug() << "find next completed" << m_line << endl;
 }
 
 void KFindTest::slotHighlight(const TQString &text, int index, int matchedLength)
@@ -123,7 +123,7 @@ void KFindTest::slotHighlight(int id, int index, int matchedLength)
 
 int main(int argc, char **argv)
 {
-	KCmdLineArgs::init(argc, argv, "ktqfindtest", "KFindTest", 0, 0, false);
+	KCmdLineArgs::init(argc, argv, "kfindtest", "KFindTest", 0, 0, false);
 	KApplication app;
 
 	TQString text = "This file is part of the KDE project.\n"
@@ -183,13 +183,13 @@ int main(int argc, char **argv)
 
 	kdDebug() << "Plain static search..." << endl;
 
-	// first we do a simple text searching the text and doing a few tqfind nexts
-	test->tqfind("This", 0);
-	test->tqfindNext();
-	test->tqfindNext();
-	test->tqfindNext();
-	test->tqfindNext();
-	test->tqfindNext();
+	// first we do a simple text searching the text and doing a few find nexts
+	test->find("This", 0);
+	test->findNext();
+	test->findNext();
+	test->findNext();
+	test->findNext();
+	test->findNext();
 
 	check("result", test->hits().join(""), output1);
 	test->clearHits();
@@ -198,20 +198,20 @@ int main(int argc, char **argv)
 	kdDebug() << "FindIncremental with static contents..." << endl;
 
 	// now we'll do some searches using FindIncremental
-	test->tqfind("", KFindDialog::FindIncremental);
-	test->tqfindNext("i");
-	test->tqfindNext("is");
-	test->tqfindNext("ist");
-	test->tqfindNext();
-	test->tqfindNext("istri");
-	test->tqfindNext("istr");
-	test->tqfindNext("ist");
-	test->tqfindNext("is");
-	test->tqfindNext("W");
-	test->tqfindNext("WA");
-	test->tqfindNext("WARRANTY");
-	test->tqfindNext("Free");
-	test->tqfindNext("Software Foundation");
+	test->find("", KFindDialog::FindIncremental);
+	test->findNext("i");
+	test->findNext("is");
+	test->findNext("ist");
+	test->findNext();
+	test->findNext("istri");
+	test->findNext("istr");
+	test->findNext("ist");
+	test->findNext("is");
+	test->findNext("W");
+	test->findNext("WA");
+	test->findNext("WARRANTY");
+	test->findNext("Free");
+	test->findNext("Software Foundation");
 
 	check("result", test->hits().join(""), output2);
 	test->clearHits();
@@ -220,25 +220,25 @@ int main(int argc, char **argv)
 	kdDebug() << "FindIncremental with dynamic contents..." << endl;
 
 	// now do that again but with pages that change between searches
-	test->tqfind("", KFindDialog::FindIncremental);
-	test->tqfindNext("i");
-	test->tqfindNext("is");
-	test->tqfindNext("ist");
-	test->tqfindNext("istr");
-	test->tqfindNext();
+	test->find("", KFindDialog::FindIncremental);
+	test->findNext("i");
+	test->findNext("is");
+	test->findNext("ist");
+	test->findNext("istr");
+	test->findNext();
 	test->changeText(1, "The second line now looks a whole lot different.");
-	test->tqfindNext("istri");
-	test->tqfindNext("istr");
-	test->tqfindNext("ist");
-	test->tqfindNext("is");
-	test->tqfindNext("i");
-	test->tqfindNext("W");
-	test->tqfindNext("WA");
-	test->tqfindNext("WARRANTY");
+	test->findNext("istri");
+	test->findNext("istr");
+	test->findNext("ist");
+	test->findNext("is");
+	test->findNext("i");
+	test->findNext("W");
+	test->findNext("WA");
+	test->findNext("WARRANTY");
 	test->changeText(6, "    but WITHOUT ANY xxxx; without even the implied warranty of");
-	test->tqfindNext("WARRAN");
-	test->tqfindNext("Free");
-	test->tqfindNext("Software Foundation");
+	test->findNext("WARRAN");
+	test->findNext("Free");
+	test->findNext("Software Foundation");
 
 	check("result", test->hits().join(""), output3);
 	test->clearHits();
@@ -249,4 +249,4 @@ int main(int argc, char **argv)
 	return 0;
 }
 
-#include "ktqfindtest.moc"
+#include "kfindtest.moc"
diff --git a/kutils/tests/kfindtest.h b/kutils/tests/kfindtest.h
index 254215217..b3be84a8b 100644
--- a/kutils/tests/kfindtest.h
+++ b/kutils/tests/kfindtest.h
@@ -25,20 +25,20 @@
 
 class KFind;
 
-class KFindTest : public TQObject
+class KFindTest : public QObject
 {
 	Q_OBJECT
 
 	public:
 		KFindTest(const TQStringList &text) :
 		  TQObject(0),
-		  m_tqfind(0),
+		  m_find(0),
 		  m_text(text),
 		  m_line(0)
 		{}
 
-		void tqfind(const TQString &pattern, long options = 0);
-		void tqfindNext(const TQString &pattern = TQString::null);
+		void find(const TQString &pattern, long options = 0);
+		void findNext(const TQString &pattern = TQString::null);
 
 		void changeText(uint line, const TQString &text);
 
@@ -50,7 +50,7 @@ class KFindTest : public TQObject
 		void slotHighlight(int id, int index, int matchedLengthlength);
 
 	private:
-		KFind                 *m_tqfind;
+		KFind                 *m_find;
 		TQStringList            m_text;
 		uint                   m_line;
 		TQStringList            m_hits;
diff --git a/kutils/tests/kreplacetest.cpp b/kutils/tests/kreplacetest.cpp
index e12474b43..a810b7706 100644
--- a/kutils/tests/kreplacetest.cpp
+++ b/kutils/tests/kreplacetest.cpp
@@ -23,44 +23,44 @@
 #include <kapplication.h>
 #include <tqeventloop.h>
 #include <kpushbutton.h>
-#include "../ktqreplace.h"
-#include "../ktqreplacedialog.h"
+#include "../kreplace.h"
+#include "../kreplacedialog.h"
 
-#include "ktqreplacetest.h"
+#include "kreplacetest.h"
 #include <kdebug.h>
 #include <stdlib.h>
 
-void KReplaceTest::tqreplace( const TQString &pattern, const TQString &tqreplacement, long options )
+void KReplaceTest::replace( const TQString &pattern, const TQString &replacement, long options )
 {
     m_needEventLoop = false;
-    // This creates a tqreplace-next-prompt dialog if needed.
-    m_tqreplace = new KReplace(pattern, tqreplacement, options);
+    // This creates a replace-next-prompt dialog if needed.
+    m_replace = new KReplace(pattern, replacement, options);
 
     // Connect highlight signal to code which handles highlighting
     // of found text.
-    connect(m_tqreplace, TQT_SIGNAL( highlight( const TQString &, int, int ) ),
+    connect(m_replace, TQT_SIGNAL( highlight( const TQString &, int, int ) ),
             this, TQT_SLOT( slotHighlight( const TQString &, int, int ) ) );
-    // Connect tqfindNext signal - called when pressing the button in the dialog
-    connect(m_tqreplace, TQT_SIGNAL( tqfindNext() ),
+    // Connect findNext signal - called when pressing the button in the dialog
+    connect(m_replace, TQT_SIGNAL( findNext() ),
             this, TQT_SLOT( slotReplaceNext() ) );
-    // Connect tqreplace signal - called when doing a tqreplacement
-    connect(m_tqreplace, TQT_SIGNAL( tqreplace(const TQString &, int, int, int) ),
+    // Connect replace signal - called when doing a replacement
+    connect(m_replace, TQT_SIGNAL( replace(const TQString &, int, int, int) ),
             this, TQT_SLOT( slotReplace(const TQString &, int, int, int) ) );
 
     // Go to initial position
     if ( (options & KReplaceDialog::FromCursor) == 0 )
     {
-        if ( m_tqreplace->options() & KFindDialog::FindBackwards )
+        if ( m_replace->options() & KFindDialog::FindBackwards )
             m_currentPos = m_text.fromLast();
         else
             m_currentPos = m_text.begin();
     }
 
-    // Launch first tqreplacement
+    // Launch first replacement
     slotReplaceNext();
 
     if ( m_needEventLoop )
-        tqApp->eventLoop()->enterLoop();
+        qApp->eventLoop()->enterLoop();
 }
 
 void KReplaceTest::slotHighlight( const TQString &str, int matchingIndex, int matchedLength )
@@ -72,17 +72,17 @@ void KReplaceTest::slotHighlight( const TQString &str, int matchingIndex, int ma
     // animateClick triggers a timer, hence the enterloop/exitloop
     // Calling slotReplace directly would lead to infinite loop anyway (Match never returned,
     // so slotReplaceNext never returns)
-    if ( m_tqreplace->options() & KReplaceDialog::PromptOnReplace ) {
-        m_tqreplace->tqreplaceNextDialog( false )->actionButton( (KDialogBase::ButtonCode)m_button )->animateClick();
+    if ( m_replace->options() & KReplaceDialog::PromptOnReplace ) {
+        m_replace->replaceNextDialog( false )->actionButton( (KDialogBase::ButtonCode)m_button )->animateClick();
         m_needEventLoop = true;
     }
 }
 
 
-void KReplaceTest::slotReplace(const TQString &text, int tqreplacementIndex, int tqreplacedLength, int matchedLength)
+void KReplaceTest::slotReplace(const TQString &text, int replacementIndex, int replacedLength, int matchedLength)
 {
-    kdDebug() << "slotReplace index=" << tqreplacementIndex << " tqreplacedLength=" << tqreplacedLength << " matchedLength=" << matchedLength << " text=" << text.left( 50 ) << endl;
-    *m_currentPos = text; // KReplace hacked the tqreplacement into 'text' in already.
+    kdDebug() << "slotReplace index=" << replacementIndex << " replacedLength=" << replacedLength << " matchedLength=" << matchedLength << " text=" << text.left( 50 ) << endl;
+    *m_currentPos = text; // KReplace hacked the replacement into 'text' in already.
 }
 
 void KReplaceTest::slotReplaceNext()
@@ -90,14 +90,14 @@ void KReplaceTest::slotReplaceNext()
     //kdDebug() << k_funcinfo << endl;
     KFind::Result res = KFind::NoMatch;
     while ( res == KFind::NoMatch && m_currentPos != m_text.end() ) {
-        if ( m_tqreplace->needData() )
-            m_tqreplace->setData( *m_currentPos );
+        if ( m_replace->needData() )
+            m_replace->setData( *m_currentPos );
 
         // Let KReplace inspect the text fragment, and display a dialog if a match is found
-        res = m_tqreplace->tqreplace();
+        res = m_replace->replace();
 
         if ( res == KFind::NoMatch ) {
-            if ( m_tqreplace->options() & KFindDialog::FindBackwards )
+            if ( m_replace->options() & KFindDialog::FindBackwards )
                 m_currentPos--;
             else
                 m_currentPos++;
@@ -106,8 +106,8 @@ void KReplaceTest::slotReplaceNext()
 
 #if 0 // commented out so that this test doesn't require interaction
     if ( res == KFind::NoMatch ) // i.e. at end
-        if ( m_tqreplace->shouldRestart() ) {
-            if ( m_tqreplace->options() & KFindDialog::FindBackwards )
+        if ( m_replace->shouldRestart() ) {
+            if ( m_replace->options() & KFindDialog::FindBackwards )
                 m_currentPos = m_text.fromLast();
             else
                 m_currentPos = m_text.begin();
@@ -115,7 +115,7 @@ void KReplaceTest::slotReplaceNext()
         }
 #endif
     if ( res == KFind::NoMatch && m_needEventLoop )
-        tqApp->eventLoop()->exitLoop();
+        qApp->eventLoop()->exitLoop();
 }
 
 void KReplaceTest::print()
@@ -126,16 +126,16 @@ void KReplaceTest::print()
 }
 
 /* button is the button that we emulate pressing, when options includes PromptOnReplace.
-   Valid possibilities are User1 (tqreplace all) and User3 (tqreplace) */
+   Valid possibilities are User1 (replace all) and User3 (replace) */
 static void testReplaceSimple( int options, int button = 0 )
 {
     kdDebug() << "testReplaceSimple: " << options << endl;
     KReplaceTest test( TQString( "hellohello" ), button );
-    test.tqreplace( "hello", "HELLO", options );
+    test.replace( "hello", "HELLO", options );
     TQStringList textLines = test.textLines();
     assert( textLines.count() == 1 );
     if ( textLines[ 0 ] != "HELLOHELLO" ) {
-        kdError() << "ASSERT FAILED: tqreplaced text is '" << textLines[ 0 ] << "' instead of 'HELLOHELLO'" << endl;
+        kdError() << "ASSERT FAILED: replaced text is '" << textLines[ 0 ] << "' instead of 'HELLOHELLO'" << endl;
         exit(1);
     }
 }
@@ -146,11 +146,11 @@ static void testReplaceBlank( int options, int button = 0 )
 {
     kdDebug() << "testReplaceBlank: " << options << endl;
     KReplaceTest test( TQString( "aaaaaa" ), button );
-    test.tqreplace( "a", "", options );
+    test.replace( "a", "", options );
     TQStringList textLines = test.textLines();
     assert( textLines.count() == 1 );
     if ( !textLines[ 0 ].isEmpty() ) {
-        kdError() << "ASSERT FAILED: tqreplaced text is '" << textLines[ 0 ] << "' instead of ''" << endl;
+        kdError() << "ASSERT FAILED: replaced text is '" << textLines[ 0 ] << "' instead of ''" << endl;
         exit(1);
     }
 }
@@ -161,11 +161,11 @@ static void testReplaceBlankSearch( int options, int button = 0 )
 {
     kdDebug() << "testReplaceBlankSearch: " << options << endl;
     KReplaceTest test( TQString( "bbbb" ), button );
-    test.tqreplace( "", "foo", options );
+    test.replace( "", "foo", options );
     TQStringList textLines = test.textLines();
     assert( textLines.count() == 1 );
     if ( textLines[ 0 ] != "foobfoobfoobfoobfoo" ) {
-        kdError() << "ASSERT FAILED: tqreplaced text is '" << textLines[ 0 ] << "' instead of 'foobfoobfoobfoobfoo'" << endl;
+        kdError() << "ASSERT FAILED: replaced text is '" << textLines[ 0 ] << "' instead of 'foobfoobfoobfoobfoo'" << endl;
         exit(1);
     }
 }
@@ -173,13 +173,13 @@ static void testReplaceBlankSearch( int options, int button = 0 )
 static void testReplaceLonger( int options, int button = 0 )
 {
     kdDebug() << "testReplaceLonger: " << options << endl;
-    // Standard test of a tqreplacement string longer than the matched string
+    // Standard test of a replacement string longer than the matched string
     KReplaceTest test( TQString( "aaaa" ), button );
-    test.tqreplace( "a", "bb", options );
+    test.replace( "a", "bb", options );
     TQStringList textLines = test.textLines();
     assert( textLines.count() == 1 );
     if ( textLines[ 0 ] != "bbbbbbbb" ) {
-        kdError() << "ASSERT FAILED: tqreplaced text is '" << textLines[ 0 ] << "' instead of 'bbbbbbbb'" << endl;
+        kdError() << "ASSERT FAILED: replaced text is '" << textLines[ 0 ] << "' instead of 'bbbbbbbb'" << endl;
         exit(1);
     }
 }
@@ -187,13 +187,13 @@ static void testReplaceLonger( int options, int button = 0 )
 static void testReplaceLongerInclude( int options, int button = 0 )
 {
     kdDebug() << "testReplaceLongerInclude: " << options << endl;
-    // Similar test, where the tqreplacement string includes the search string
+    // Similar test, where the replacement string includes the search string
     KReplaceTest test( TQString( "a foo b" ), button );
-    test.tqreplace( "foo", "foobar", options );
+    test.replace( "foo", "foobar", options );
     TQStringList textLines = test.textLines();
     assert( textLines.count() == 1 );
     if ( textLines[ 0 ] != "a foobar b" ) {
-        kdError() << "ASSERT FAILED: tqreplaced text is '" << textLines[ 0 ] << "' instead of 'a foobar b'" << endl;
+        kdError() << "ASSERT FAILED: replaced text is '" << textLines[ 0 ] << "' instead of 'a foobar b'" << endl;
         exit(1);
     }
 }
@@ -201,13 +201,13 @@ static void testReplaceLongerInclude( int options, int button = 0 )
 static void testReplaceLongerInclude2( int options, int button = 0 )
 {
     kdDebug() << "testReplaceLongerInclude2: " << options << endl;
-    // Similar test, but with more chances of matches inside the tqreplacement string
+    // Similar test, but with more chances of matches inside the replacement string
     KReplaceTest test( TQString( "aaaa" ), button );
-    test.tqreplace( "a", "aa", options );
+    test.replace( "a", "aa", options );
     TQStringList textLines = test.textLines();
     assert( textLines.count() == 1 );
     if ( textLines[ 0 ] != "aaaaaaaa" ) {
-        kdError() << "ASSERT FAILED: tqreplaced text is '" << textLines[ 0 ] << "' instead of 'aaaaaaaa'" << endl;
+        kdError() << "ASSERT FAILED: replaced text is '" << textLines[ 0 ] << "' instead of 'aaaaaaaa'" << endl;
         exit(1);
     }
 }
@@ -217,99 +217,99 @@ static void testReplaceBackRef( int options, int button = 0 )
 {
     kdDebug() << "testReplaceBackRef: " << options << endl;
     KReplaceTest test( TQString( "abc def" ), button );
-    test.tqreplace( "abc", "(\\0)", options );
+    test.replace( "abc", "(\\0)", options );
     TQStringList textLines = test.textLines();
     assert( textLines.count() == 1 );
     TQString expected = options & KReplaceDialog::BackReference ? "(abc) def" : "(\\0) def";
     if ( textLines[ 0 ] != expected ) {
-        kdError() << "ASSERT FAILED: tqreplaced text is '" << textLines[ 0 ] << "' instead of '"<< expected << "'" << endl;
+        kdError() << "ASSERT FAILED: replaced text is '" << textLines[ 0 ] << "' instead of '"<< expected << "'" << endl;
         exit(1);
     }
 }
 
-static void testReplacementHistory( const TQStringList& tqfindHistory, const TQStringList& tqreplaceHistory )
+static void testReplacementHistory( const TQStringList& findHistory, const TQStringList& replaceHistory )
 {
-    KReplaceDialog dlg( 0, 0, 0, tqfindHistory, tqreplaceHistory );
+    KReplaceDialog dlg( 0, 0, 0, findHistory, replaceHistory );
     dlg.show();
-    kdDebug() << "testReplacementHistory:" << dlg.tqreplacementHistory() << endl;
-    assert( dlg.tqreplacementHistory() == tqreplaceHistory );
+    kdDebug() << "testReplacementHistory:" << dlg.replacementHistory() << endl;
+    assert( dlg.replacementHistory() == replaceHistory );
 }
 
 static void testReplacementHistory()
 {
-    TQStringList tqfindHistory;
-    TQStringList tqreplaceHistory;
-    tqfindHistory << "foo" << "bar";
-    tqreplaceHistory << "FOO" << "BAR";
-    testReplacementHistory( tqfindHistory, tqreplaceHistory );
-
-    tqfindHistory.clear();
-    tqreplaceHistory.clear();
-    tqfindHistory << "foo" << "bar";
-    tqreplaceHistory << TQString::null << "baz"; // #130831
-    testReplacementHistory( tqfindHistory, tqreplaceHistory );
+    TQStringList findHistory;
+    TQStringList replaceHistory;
+    findHistory << "foo" << "bar";
+    replaceHistory << "FOO" << "BAR";
+    testReplacementHistory( findHistory, replaceHistory );
+
+    findHistory.clear();
+    replaceHistory.clear();
+    findHistory << "foo" << "bar";
+    replaceHistory << TQString::null << "baz"; // #130831
+    testReplacementHistory( findHistory, replaceHistory );
 }
 
 int main( int argc, char **argv )
 {
-    KCmdLineArgs::init(argc, argv, "ktqreplacetest", 0, 0);
+    KCmdLineArgs::init(argc, argv, "kreplacetest", 0, 0);
     KApplication app;
 
     testReplacementHistory(); // #130831
 
     testReplaceBlank( 0 );
-    testReplaceBlank( KReplaceDialog::PromptOnReplace, KDialogBase::User3 ); // tqreplace
-    testReplaceBlank( KReplaceDialog::PromptOnReplace, KDialogBase::User1 ); // tqreplace all
+    testReplaceBlank( KReplaceDialog::PromptOnReplace, KDialogBase::User3 ); // replace
+    testReplaceBlank( KReplaceDialog::PromptOnReplace, KDialogBase::User1 ); // replace all
     testReplaceBlank( KReplaceDialog::FindBackwards, 0 );
-    testReplaceBlank( KReplaceDialog::FindBackwards | KReplaceDialog::PromptOnReplace, KDialogBase::User3 ); // tqreplace
-    testReplaceBlank( KReplaceDialog::FindBackwards | KReplaceDialog::PromptOnReplace, KDialogBase::User1 ); // tqreplace all
+    testReplaceBlank( KReplaceDialog::FindBackwards | KReplaceDialog::PromptOnReplace, KDialogBase::User3 ); // replace
+    testReplaceBlank( KReplaceDialog::FindBackwards | KReplaceDialog::PromptOnReplace, KDialogBase::User1 ); // replace all
 
     testReplaceBlankSearch( 0 );
-    testReplaceBlankSearch( KReplaceDialog::PromptOnReplace, KDialogBase::User3 ); // tqreplace
-    testReplaceBlankSearch( KReplaceDialog::PromptOnReplace, KDialogBase::User1 ); // tqreplace all
+    testReplaceBlankSearch( KReplaceDialog::PromptOnReplace, KDialogBase::User3 ); // replace
+    testReplaceBlankSearch( KReplaceDialog::PromptOnReplace, KDialogBase::User1 ); // replace all
     testReplaceBlankSearch( KReplaceDialog::FindBackwards, 0 );
-    testReplaceBlankSearch( KReplaceDialog::FindBackwards | KReplaceDialog::PromptOnReplace, KDialogBase::User3 ); // tqreplace
-    testReplaceBlankSearch( KReplaceDialog::FindBackwards | KReplaceDialog::PromptOnReplace, KDialogBase::User1 ); // tqreplace all
+    testReplaceBlankSearch( KReplaceDialog::FindBackwards | KReplaceDialog::PromptOnReplace, KDialogBase::User3 ); // replace
+    testReplaceBlankSearch( KReplaceDialog::FindBackwards | KReplaceDialog::PromptOnReplace, KDialogBase::User1 ); // replace all
 
     testReplaceSimple( 0 );
-    testReplaceSimple( KReplaceDialog::PromptOnReplace, KDialogBase::User3 ); // tqreplace
-    testReplaceSimple( KReplaceDialog::PromptOnReplace, KDialogBase::User1 ); // tqreplace all
+    testReplaceSimple( KReplaceDialog::PromptOnReplace, KDialogBase::User3 ); // replace
+    testReplaceSimple( KReplaceDialog::PromptOnReplace, KDialogBase::User1 ); // replace all
     testReplaceSimple( KReplaceDialog::FindBackwards, 0 );
-    testReplaceSimple( KReplaceDialog::FindBackwards | KReplaceDialog::PromptOnReplace, KDialogBase::User3 ); // tqreplace
-    testReplaceSimple( KReplaceDialog::FindBackwards | KReplaceDialog::PromptOnReplace, KDialogBase::User1 ); // tqreplace all
+    testReplaceSimple( KReplaceDialog::FindBackwards | KReplaceDialog::PromptOnReplace, KDialogBase::User3 ); // replace
+    testReplaceSimple( KReplaceDialog::FindBackwards | KReplaceDialog::PromptOnReplace, KDialogBase::User1 ); // replace all
 
     testReplaceLonger( 0 );
-    testReplaceLonger( KReplaceDialog::PromptOnReplace, KDialogBase::User3 ); // tqreplace
-    testReplaceLonger( KReplaceDialog::PromptOnReplace, KDialogBase::User1 ); // tqreplace all
+    testReplaceLonger( KReplaceDialog::PromptOnReplace, KDialogBase::User3 ); // replace
+    testReplaceLonger( KReplaceDialog::PromptOnReplace, KDialogBase::User1 ); // replace all
     testReplaceLonger( KReplaceDialog::FindBackwards, 0 );
-    testReplaceLonger( KReplaceDialog::FindBackwards | KReplaceDialog::PromptOnReplace, KDialogBase::User3 ); // tqreplace
-    testReplaceLonger( KReplaceDialog::FindBackwards | KReplaceDialog::PromptOnReplace, KDialogBase::User1 ); // tqreplace all
+    testReplaceLonger( KReplaceDialog::FindBackwards | KReplaceDialog::PromptOnReplace, KDialogBase::User3 ); // replace
+    testReplaceLonger( KReplaceDialog::FindBackwards | KReplaceDialog::PromptOnReplace, KDialogBase::User1 ); // replace all
 
     testReplaceLongerInclude( 0 );
-    testReplaceLongerInclude( KReplaceDialog::PromptOnReplace, KDialogBase::User3 ); // tqreplace
-    testReplaceLongerInclude( KReplaceDialog::PromptOnReplace, KDialogBase::User1 ); // tqreplace all
+    testReplaceLongerInclude( KReplaceDialog::PromptOnReplace, KDialogBase::User3 ); // replace
+    testReplaceLongerInclude( KReplaceDialog::PromptOnReplace, KDialogBase::User1 ); // replace all
     testReplaceLongerInclude( KReplaceDialog::FindBackwards, 0 );
-    testReplaceLongerInclude( KReplaceDialog::FindBackwards | KReplaceDialog::PromptOnReplace, KDialogBase::User3 ); // tqreplace
-    testReplaceLongerInclude( KReplaceDialog::FindBackwards | KReplaceDialog::PromptOnReplace, KDialogBase::User1 ); // tqreplace all
+    testReplaceLongerInclude( KReplaceDialog::FindBackwards | KReplaceDialog::PromptOnReplace, KDialogBase::User3 ); // replace
+    testReplaceLongerInclude( KReplaceDialog::FindBackwards | KReplaceDialog::PromptOnReplace, KDialogBase::User1 ); // replace all
 
     testReplaceLongerInclude2( 0 );
-    testReplaceLongerInclude2( KReplaceDialog::PromptOnReplace, KDialogBase::User3 ); // tqreplace
-    testReplaceLongerInclude2( KReplaceDialog::PromptOnReplace, KDialogBase::User1 ); // tqreplace all
+    testReplaceLongerInclude2( KReplaceDialog::PromptOnReplace, KDialogBase::User3 ); // replace
+    testReplaceLongerInclude2( KReplaceDialog::PromptOnReplace, KDialogBase::User1 ); // replace all
     testReplaceLongerInclude2( KReplaceDialog::FindBackwards, 0 );
-    testReplaceLongerInclude2( KReplaceDialog::FindBackwards | KReplaceDialog::PromptOnReplace, KDialogBase::User3 ); // tqreplace
-    testReplaceLongerInclude2( KReplaceDialog::FindBackwards | KReplaceDialog::PromptOnReplace, KDialogBase::User1 ); // tqreplace all
+    testReplaceLongerInclude2( KReplaceDialog::FindBackwards | KReplaceDialog::PromptOnReplace, KDialogBase::User3 ); // replace
+    testReplaceLongerInclude2( KReplaceDialog::FindBackwards | KReplaceDialog::PromptOnReplace, KDialogBase::User1 ); // replace all
 
     testReplaceBackRef( 0 );
-    testReplaceBackRef( KReplaceDialog::PromptOnReplace, KDialogBase::User3 ); // tqreplace
-    testReplaceBackRef( KReplaceDialog::PromptOnReplace, KDialogBase::User1 ); // tqreplace all
+    testReplaceBackRef( KReplaceDialog::PromptOnReplace, KDialogBase::User3 ); // replace
+    testReplaceBackRef( KReplaceDialog::PromptOnReplace, KDialogBase::User1 ); // replace all
     testReplaceBackRef( KReplaceDialog::FindBackwards, 0 );
-    testReplaceBackRef( KReplaceDialog::FindBackwards | KReplaceDialog::PromptOnReplace, KDialogBase::User3 ); // tqreplace
-    testReplaceBackRef( KReplaceDialog::FindBackwards | KReplaceDialog::PromptOnReplace, KDialogBase::User1 ); // tqreplace all
-    testReplaceBackRef( KReplaceDialog::BackReference | KReplaceDialog::PromptOnReplace, KDialogBase::User3 ); // tqreplace
-    testReplaceBackRef( KReplaceDialog::BackReference | KReplaceDialog::PromptOnReplace, KDialogBase::User1 ); // tqreplace all
+    testReplaceBackRef( KReplaceDialog::FindBackwards | KReplaceDialog::PromptOnReplace, KDialogBase::User3 ); // replace
+    testReplaceBackRef( KReplaceDialog::FindBackwards | KReplaceDialog::PromptOnReplace, KDialogBase::User1 ); // replace all
+    testReplaceBackRef( KReplaceDialog::BackReference | KReplaceDialog::PromptOnReplace, KDialogBase::User3 ); // replace
+    testReplaceBackRef( KReplaceDialog::BackReference | KReplaceDialog::PromptOnReplace, KDialogBase::User1 ); // replace all
     testReplaceBackRef( KReplaceDialog::BackReference | KReplaceDialog::FindBackwards, 0 );
-    testReplaceBackRef( KReplaceDialog::BackReference | KReplaceDialog::FindBackwards | KReplaceDialog::PromptOnReplace, KDialogBase::User3 ); // tqreplace
-    testReplaceBackRef( KReplaceDialog::BackReference | KReplaceDialog::FindBackwards | KReplaceDialog::PromptOnReplace, KDialogBase::User1 ); // tqreplace all
+    testReplaceBackRef( KReplaceDialog::BackReference | KReplaceDialog::FindBackwards | KReplaceDialog::PromptOnReplace, KDialogBase::User3 ); // replace
+    testReplaceBackRef( KReplaceDialog::BackReference | KReplaceDialog::FindBackwards | KReplaceDialog::PromptOnReplace, KDialogBase::User1 ); // replace all
 
     TQString text = "This file is part of the KDE project.\n"
                    "This library is free software; you can redistribute it and/or\n"
@@ -331,12 +331,12 @@ int main( int argc, char **argv )
                    "free";
     KReplaceTest test( TQStringList::split( '\n', text, true ), 0 );
 
-    test.tqreplace( "GNU", "KDE", 0 );
-    test.tqreplace( "free", "*free*", 0 );
-    test.tqreplace( "This", "THIS*", KFindDialog::FindBackwards );
+    test.replace( "GNU", "KDE", 0 );
+    test.replace( "free", "*free*", 0 );
+    test.replace( "This", "THIS*", KFindDialog::FindBackwards );
 
     test.print();
     //return app.exec();
     return 0;
 }
-#include "ktqreplacetest.moc"
+#include "kreplacetest.moc"
diff --git a/kutils/tests/kreplacetest.h b/kutils/tests/kreplacetest.h
index 4a4252849..ff85ca34b 100644
--- a/kutils/tests/kreplacetest.h
+++ b/kutils/tests/kreplacetest.h
@@ -25,26 +25,26 @@
 
 class KReplace;
 
-class KReplaceTest : public TQObject
+class KReplaceTest : public QObject
 {
     Q_OBJECT
 public:
     KReplaceTest( const TQStringList& text, int button )
-        : TQObject( 0L ), m_text( text ), m_tqreplace( 0 ), m_button( button ) {}
+        : TQObject( 0L ), m_text( text ), m_replace( 0 ), m_button( button ) {}
 
-    void tqreplace( const TQString &pattern, const TQString &tqreplacement, long options );
+    void replace( const TQString &pattern, const TQString &replacement, long options );
     void print();
     const TQStringList& textLines() const { return m_text; }
 
 public slots:
     void slotHighlight( const TQString &, int, int );
     void slotReplaceNext();
-    void slotReplace(const TQString &text, int tqreplacementIndex, int tqreplacedLength, int matchedLength);
+    void slotReplace(const TQString &text, int replacementIndex, int replacedLength, int matchedLength);
 
 private:
     TQStringList::Iterator m_currentPos;
     TQStringList m_text;
-    KReplace* m_tqreplace;
+    KReplace* m_replace;
     bool m_needEventLoop;
     int m_button;
 };
diff --git a/kwallet/backend/kwalletbackend.cc b/kwallet/backend/kwalletbackend.cc
index 75233d38c..c208c4d69 100644
--- a/kwallet/backend/kwalletbackend.cc
+++ b/kwallet/backend/kwalletbackend.cc
@@ -336,7 +336,7 @@ int Backend::open(const TQByteArray& password) {
 	_hashes.clear();
 	// Read in the hashes
 	TQDataStream hds(&db);
-	TQ_UINT32 n;
+	Q_UINT32 n;
 	hds >> n;
 	if (n > 0xffff) { // sanity check
 		return -43;
@@ -346,7 +346,7 @@ int Backend::open(const TQByteArray& password) {
 		KMD5::Digest d, d2; // judgment day
 		MD5Digest ba;
 		TQMap<MD5Digest,TQValueList<MD5Digest> >::iterator it;
-		TQ_UINT32 fsz;
+		Q_UINT32 fsz;
 		if (hds.atEnd()) return -43;
 		hds.readRawBytes(reinterpret_cast<char *>(d), 16);
 		hds >> fsz;
@@ -443,7 +443,7 @@ int Backend::open(const TQByteArray& password) {
 
 	while (!eStream.atEnd()) {
 		TQString folder;
-		TQ_UINT32 n;
+		Q_UINT32 n;
 
 		eStream >> folder;
 		eStream >> n;
@@ -456,7 +456,7 @@ int Backend::open(const TQByteArray& password) {
 			KWallet::Wallet::EntryType et = KWallet::Wallet::Unknown;
 			Entry *e = new Entry;
 			eStream >> key;
-			TQ_INT32 x = 0; // necessary to read properly
+			Q_INT32 x = 0; // necessary to read properly
 			eStream >> x;
 			et = static_cast<KWallet::Wallet::EntryType>(x);
 
@@ -511,7 +511,7 @@ int Backend::sync(const TQByteArray& password) {
 	TQByteArray hashes;
 	TQDataStream hashStream(hashes, IO_WriteOnly);
 	KMD5 md5;
-	hashStream << static_cast<TQ_UINT32>(_entries.count());
+	hashStream << static_cast<Q_UINT32>(_entries.count());
 
 	// Holds decrypted data prior to encryption
 	TQByteArray decrypted;
@@ -524,16 +524,16 @@ int Backend::sync(const TQByteArray& password) {
 	TQDataStream dStream(decrypted, IO_WriteOnly);
 	for (FolderMap::ConstIterator i = _entries.begin(); i != _entries.end(); ++i) {
 		dStream << i.key();
-		dStream << static_cast<TQ_UINT32>(i.data().count());
+		dStream << static_cast<Q_UINT32>(i.data().count());
 
 		md5.reset();
 		md5.update(i.key().utf8());
 		hashStream.writeRawBytes(reinterpret_cast<const char*>(&(md5.rawDigest()[0])), 16);
-		hashStream << static_cast<TQ_UINT32>(i.data().count());
+		hashStream << static_cast<Q_UINT32>(i.data().count());
 
 		for (EntryMap::ConstIterator j = i.data().begin(); j != i.data().end(); ++j) {
 			dStream << j.key();
-			dStream << static_cast<TQ_INT32>(j.data()->type());
+			dStream << static_cast<Q_INT32>(j.data()->type());
 			dStream << j.data()->value();
 
 			md5.reset();
@@ -693,7 +693,7 @@ TQPtrList<Entry> Backend::readEntryList(const TQString& key) {
 
 
 bool Backend::createFolder(const TQString& f) {
-	if (_entries.tqcontains(f)) {
+	if (_entries.contains(f)) {
 		return false;
 	}
 
@@ -709,8 +709,8 @@ return true;
 
 int Backend::renameEntry(const TQString& oldName, const TQString& newName) {
 EntryMap& emap = _entries[_folder];
-EntryMap::Iterator oi = emap.tqfind(oldName);
-EntryMap::Iterator ni = emap.tqfind(newName);
+EntryMap::Iterator oi = emap.find(oldName);
+EntryMap::Iterator ni = emap.find(newName);
 
 	if (oi != emap.end() && ni == emap.end()) {
 		Entry *e = oi.data();
@@ -720,7 +720,7 @@ EntryMap::Iterator ni = emap.tqfind(newName);
 		KMD5 folderMd5;
 		folderMd5.update(_folder.utf8());
 
-		HashMap::iterator i = _hashes.tqfind(MD5Digest(folderMd5.rawDigest()));
+		HashMap::iterator i = _hashes.find(MD5Digest(folderMd5.rawDigest()));
 		if (i != _hashes.end()) {
 			KMD5 oldMd5, newMd5;
 			oldMd5.update(oldName.utf8());
@@ -747,7 +747,7 @@ void Backend::writeEntry(Entry *e) {
 	KMD5 folderMd5;
 	folderMd5.update(_folder.utf8());
 
-	HashMap::iterator i = _hashes.tqfind(MD5Digest(folderMd5.rawDigest()));
+	HashMap::iterator i = _hashes.find(MD5Digest(folderMd5.rawDigest()));
 	if (i != _hashes.end()) {
 		KMD5 md5;
 		md5.update(e->key().utf8());
@@ -757,7 +757,7 @@ void Backend::writeEntry(Entry *e) {
 
 
 bool Backend::hasEntry(const TQString& key) const {
-	return _entries.tqcontains(_folder) && _entries[_folder].tqcontains(key);
+	return _entries.contains(_folder) && _entries[_folder].contains(key);
 }
 
 
@@ -766,8 +766,8 @@ bool Backend::removeEntry(const TQString& key) {
 		return false;
 	}
 
-	FolderMap::Iterator fi = _entries.tqfind(_folder);
-	EntryMap::Iterator ei = fi.data().tqfind(key);
+	FolderMap::Iterator fi = _entries.find(_folder);
+	EntryMap::Iterator ei = fi.data().find(key);
 
 	if (fi != _entries.end() && ei != fi.data().end()) {
 		delete ei.data();
@@ -775,7 +775,7 @@ bool Backend::removeEntry(const TQString& key) {
 		KMD5 folderMd5;
 		folderMd5.update(_folder.utf8());
 
-		HashMap::iterator i = _hashes.tqfind(MD5Digest(folderMd5.rawDigest()));
+		HashMap::iterator i = _hashes.find(MD5Digest(folderMd5.rawDigest()));
 		if (i != _hashes.end()) {
 			KMD5 md5;
 			md5.update(key.utf8());
@@ -793,7 +793,7 @@ bool Backend::removeFolder(const TQString& f) {
 		return false;
 	}
 
-	FolderMap::Iterator fi = _entries.tqfind(f);
+	FolderMap::Iterator fi = _entries.find(f);
 
 	if (fi != _entries.end()) {
 		if (_folder == f) {
@@ -819,18 +819,18 @@ return false;
 bool Backend::folderDoesNotExist(const TQString& folder) const {
 	KMD5 md5;
 	md5.update(folder.utf8());
-	return !_hashes.tqcontains(MD5Digest(md5.rawDigest()));
+	return !_hashes.contains(MD5Digest(md5.rawDigest()));
 }
 
 
 bool Backend::entryDoesNotExist(const TQString& folder, const TQString& entry) const {
 	KMD5 md5;
 	md5.update(folder.utf8());
-	HashMap::const_iterator i = _hashes.tqfind(MD5Digest(md5.rawDigest()));
+	HashMap::const_iterator i = _hashes.find(MD5Digest(md5.rawDigest()));
 	if (i != _hashes.end()) {
 		md5.reset();
 		md5.update(entry.utf8());
-		return !i.data().tqcontains(MD5Digest(md5.rawDigest()));
+		return !i.data().contains(MD5Digest(md5.rawDigest()));
 	}
 	return true;
 }
diff --git a/kwallet/backend/kwalletbackend.h b/kwallet/backend/kwalletbackend.h
index a2f654ec6..9d46d25c9 100644
--- a/kwallet/backend/kwalletbackend.h
+++ b/kwallet/backend/kwalletbackend.h
@@ -72,7 +72,7 @@ class KDE_EXPORT Backend {
 		const TQString& folder() const { return _folder; }
 
 		// Does it have this folder?
-		bool hasFolder(const TQString& f) const { return _entries.tqcontains(f); }
+		bool hasFolder(const TQString& f) const { return _entries.contains(f); }
 
 		// Look up an entry.  Returns null if it doesn't exist.
 		Entry *readEntry(const TQString& key);
diff --git a/kwallet/client/kwallet.cc b/kwallet/client/kwallet.cc
index 4e4d2dd8e..0575050e5 100644
--- a/kwallet/client/kwallet.cc
+++ b/kwallet/client/kwallet.cc
@@ -179,7 +179,7 @@ Wallet *Wallet::openWallet(const TQString& name, WId w, OpenType ot) {
 	}
 
         // avoid deadlock if the app has some popup open (#65978/#71048)
-        while( TQWidget* widget = tqApp->activePopupWidget())
+        while( TQWidget* widget = qApp->activePopupWidget())
             widget->close();
 
 	bool isPath = ot == Path;
diff --git a/kwallet/client/kwallet.h b/kwallet/client/kwallet.h
index 4a2bc69ea..b7b3bce31 100644
--- a/kwallet/client/kwallet.h
+++ b/kwallet/client/kwallet.h
@@ -384,7 +384,7 @@ class KIO_EXPORT Wallet : public TQObject, public DCOPObject {
 		/**
 		 *  Determine if the current folder has they entry @p key.
 		 *  @param key The key to search for.
-		 *  @return Returns true if the folder tqcontains @p key.
+		 *  @return Returns true if the folder contains @p key.
 		 */
 		virtual bool hasEntry(const TQString& key);
 
diff --git a/kwallet/tests/kwalletasync.cpp b/kwallet/tests/kwalletasync.cpp
index 072fb55f8..6e5c22998 100644
--- a/kwallet/tests/kwalletasync.cpp
+++ b/kwallet/tests/kwalletasync.cpp
@@ -26,8 +26,8 @@ void openWallet()
 
 	_out << "About to start 30 second event loop" << endl;
 
-	TQTimer::singleShot( 30000, tqApp, TQT_SLOT( quit() ) );
-	int ret = tqApp->exec();
+	TQTimer::singleShot( 30000, qApp, TQT_SLOT( quit() ) );
+	int ret = qApp->exec();
 
 	if ( ret == 0 )
 		_out << "Timed out!" << endl;
@@ -38,7 +38,7 @@ void openWallet()
 void WalletReceiver::walletOpened( bool got )
 {
 	_out << "Got async wallet: " << got << endl;
-	tqApp->exit( 1 );
+	qApp->exit( 1 );
 }
 
 int main( int argc, char *argv[] )
diff --git a/kwallet/tests/kwalletboth.cpp b/kwallet/tests/kwalletboth.cpp
index 75d303419..f79f38567 100644
--- a/kwallet/tests/kwalletboth.cpp
+++ b/kwallet/tests/kwalletboth.cpp
@@ -31,8 +31,8 @@ void openWallet()
 	_out << "Got sync wallet: " << (wallet != 0) << endl;
 	_out << "About to start 30 second event loop" << endl;
 
-	TQTimer::singleShot( 30000, tqApp, TQT_SLOT( quit() ) );
-	int ret = tqApp->exec();
+	TQTimer::singleShot( 30000, qApp, TQT_SLOT( quit() ) );
+	int ret = qApp->exec();
 
 
 	if ( ret == 0 )
@@ -60,7 +60,7 @@ void openWallet()
 void WalletReceiver::walletOpened( bool got )
 {
 	_out << "Got async wallet: " << got << endl;
-	tqApp->exit( 1 );
+	qApp->exit( 1 );
 }
 
 int main( int argc, char *argv[] )
diff --git a/kwallet/tests/kwallettest.h b/kwallet/tests/kwallettest.h
index c062760a4..448cdb785 100644
--- a/kwallet/tests/kwallettest.h
+++ b/kwallet/tests/kwallettest.h
@@ -5,7 +5,7 @@
 
 namespace KWallet { class Wallet; }
 
-class WalletReceiver : public TQObject
+class WalletReceiver : public QObject
 {
 	Q_OBJECT
 public slots:
diff --git a/libkmid/deviceman.cc b/libkmid/deviceman.cc
index 07a0af9b2..c8030f44e 100644
--- a/libkmid/deviceman.cc
+++ b/libkmid/deviceman.cc
@@ -119,7 +119,7 @@ DeviceManager::DeviceManager(int def)
     TQString mapurl(config->readPathEntry("mapFilename"));
     if ((config->readBoolEntry("useMidiMapper", false))&&(!mapurl.isEmpty()))
     {
-      mapper_tmp = new MidiMapper( mapurl.mid(mapurl.tqfind(":")+1 ).local8Bit() );
+      mapper_tmp = new MidiMapper( mapurl.mid(mapurl.find(":")+1 ).local8Bit() );
     }
     else
       mapper_tmp = 0L;
diff --git a/libkmid/midistat.cc b/libkmid/midistat.cc
index 9a45c2472..29d1436c8 100644
--- a/libkmid/midistat.cc
+++ b/libkmid/midistat.cc
@@ -1,6 +1,6 @@
 /**************************************************************************
 
-    midistat.cc	- class MiditqStatus, change it internally and then send it. 
+    midistat.cc	- class MidiStatus, change it internally and then send it. 
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
     LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html            
@@ -33,7 +33,7 @@
 
 extern int MT32toGM[128];
 
-MiditqStatus::MiditqStatus()
+MidiStatus::MidiStatus()
 {
   int i;
   tempo=1000000;
@@ -51,29 +51,29 @@ MiditqStatus::MiditqStatus()
   }
 }
 
-MiditqStatus::~MiditqStatus()
+MidiStatus::~MidiStatus()
 {
 }
 
 //    void noteOn	( uchar chn, uchar note, uchar vel );
 //    void noteOff	( uchar chn, uchar note, uchar vel );
 
-void MiditqStatus::chnPatchChange	( uchar chn, uchar patch )
+void MidiStatus::chnPatchChange	( uchar chn, uchar patch )
 {
   chn_patch[chn]=patch;
 }
 
-void MiditqStatus::chnPressure	( uchar chn, uchar vel )
+void MidiStatus::chnPressure	( uchar chn, uchar vel )
 {
   chn_pressure[chn]=vel;
 }
 
-void MiditqStatus::chnPitchBender	( uchar chn, uchar lsb,  uchar msb )
+void MidiStatus::chnPitchBender	( uchar chn, uchar lsb,  uchar msb )
 {
   chn_bender[chn]=((int)msb<<8|lsb);
 }
 
-void MiditqStatus::chnController	( uchar chn, uchar ctl , uchar v )
+void MidiStatus::chnController	( uchar chn, uchar ctl , uchar v )
 {
   if (ctl==7) chn_lastisvolumeev[chn]=1;
   else if (ctl==11) chn_lastisvolumeev[chn]=0;
@@ -81,12 +81,12 @@ void MiditqStatus::chnController	( uchar chn, uchar ctl , uchar v )
   chn_controller[chn][ctl]=v;
 }
 
-void MiditqStatus::tmrSetTempo(int v)
+void MidiStatus::tmrSetTempo(int v)
 {
   tempo=v;
 }
 
-void MiditqStatus::sendData(DeviceManager *midi,int gm)
+void MidiStatus::sendData(DeviceManager *midi,int gm)
 {
   for (int chn=0;chn<16;chn++)
   {
diff --git a/libkmid/midistat.h b/libkmid/midistat.h
index 27dd45d87..17dda1269 100644
--- a/libkmid/midistat.h
+++ b/libkmid/midistat.h
@@ -37,11 +37,11 @@
  * @version 0.9.5 17/01/2000
  * @author Antonio Larrosa Jimenez <larrosa@kde.org>
  */
-class MiditqStatus
+class MidiStatus
 {
   private:
-    class MiditqStatusPrivate;
-    MiditqStatusPrivate *d;
+    class MidiStatusPrivate;
+    MidiStatusPrivate *d;
 
     ulong tempo;
 
@@ -56,12 +56,12 @@ class MiditqStatus
     /**
      * Constructor.
      */
-    MiditqStatus();
+    MidiStatus();
 
     /**
      * Destructor.
      */ 
-    ~MiditqStatus();
+    ~MidiStatus();
 
 
     //    void noteOn	( uchar chn, uchar note, uchar vel );
diff --git a/libkmid/player.cc b/libkmid/player.cc
index d6ac22004..a68a9b147 100644
--- a/libkmid/player.cc
+++ b/libkmid/player.cc
@@ -575,7 +575,7 @@ void MidiPlayer::play(bool calloutput,void output(void))
   double absTimeAtChangeTempo=0;
   double absTime=0;
   double diffTime=0;
-  MiditqStatus *midistat;
+  MidiStatus *midistat;
   //ulong mspass;
   double prevms=0;
   int j;
@@ -592,7 +592,7 @@ void MidiPlayer::play(bool calloutput,void output(void))
     midi->sync(1);
     midi->tmrStop();
     midi->closeDev();
-    midistat = new MiditqStatus();
+    midistat = new MidiStatus();
     setPos(ctl->gotomsec,midistat);
     minTime=ctl->gotomsec;
     prevms=(ulong)minTime;
@@ -792,7 +792,7 @@ void MidiPlayer::play(bool calloutput,void output(void))
 }
 
 
-void MidiPlayer::setPos(ulong gotomsec,MiditqStatus *midistat)
+void MidiPlayer::setPos(ulong gotomsec,MidiStatus *midistat)
 {
   int trk,minTrk;
   ulong tempo=(ulong)(500000 * ctl->ratioTempo);
diff --git a/libkmid/player.h b/libkmid/player.h
index cb21a9674..6a9210292 100644
--- a/libkmid/player.h
+++ b/libkmid/player.h
@@ -379,11 +379,11 @@ class KMID_EXPORT MidiPlayer
    * @param gotomsec the number of milliseconds to go to . A subsequent call to
    * play() will start playing the song from that moment, instead of the
    * beginning.
-   * @param midistat a MiditqStatus object that will contain the status in
+   * @param midistat a MidiStatus object that will contain the status in
    * which the MIDI device would be if it would have arrived to this situation by
    * a normal playing of the song.
    */
-  void setPos(ulong gotomsec, class MiditqStatus *midistat);
+  void setPos(ulong gotomsec, class MidiStatus *midistat);
 
   /**
    * Changes the speed at which a song is played. The song's tempo is multiplied
diff --git a/libkscreensaver/kscreensaver.cpp b/libkscreensaver/kscreensaver.cpp
index 8683d3fb1..a35b2545d 100644
--- a/libkscreensaver/kscreensaver.cpp
+++ b/libkscreensaver/kscreensaver.cpp
@@ -48,7 +48,7 @@ KScreenSaver::KScreenSaver( WId id ) : TQWidget()
     unsigned int h = 0;
 
     d = new KScreenSaverPrivate;
-    d->owner = tqfind( id );
+    d->owner = find( id );
     if ( d->owner )
 	installEventFilter( this );
 
diff --git a/libkscreensaver/kscreensaver.h b/libkscreensaver/kscreensaver.h
index 0a1f23342..fd2068359 100644
--- a/libkscreensaver/kscreensaver.h
+++ b/libkscreensaver/kscreensaver.h
@@ -91,7 +91,7 @@ private:
 * @short Blanks a widget using various effects.
 * @author Martin R. Jones <mjones@kde.org>
 */
-class KBlankEffect : public TQObject
+class KBlankEffect : public QObject
 {
 	Q_OBJECT
 public:
diff --git a/libkscreensaver/kscreensaver_vroot.h b/libkscreensaver/kscreensaver_vroot.h
index 2cf369797..aae76f9d9 100644
--- a/libkscreensaver/kscreensaver_vroot.h
+++ b/libkscreensaver/kscreensaver_vroot.h
@@ -45,11 +45,11 @@
  * X clients as xphoon, xfroot, xloadimage, and xaqua.
  * It also works with the core clients xprop, xwininfo, xwd, and editres
  * (and is necessary to get those clients working under tvtwm).
- * It does NOT work with xsetroot; get the xsetroot tqreplacement included in
+ * It does NOT work with xsetroot; get the xsetroot replacement included in
  * the tvtwm distribution instead.
  *
  * Andreas Stolcke <stolcke@ICSI.Berkeley.EDU>, 9/7/90
- * - tqreplaced all NULL's with properly cast 0's, 5/6/91
+ * - replaced all NULL's with properly cast 0's, 5/6/91
  * - free children list (suggested by Mark Martin <mmm@cetia.fr>), 5/16/91
  * - include X11/Xlib.h and support RootWindowOfScreen, too 9/17/91
  */
diff --git a/licenses/GPL_V2 b/licenses/GPL_V2
index 14f9fa7d7..21b9363e1 100644
--- a/licenses/GPL_V2
+++ b/licenses/GPL_V2
@@ -59,7 +59,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"
@@ -96,7 +96,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.
 
@@ -154,7 +154,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
diff --git a/licenses/LGPL_V2 b/licenses/LGPL_V2
index 6113583d2..a96b5730d 100644
--- a/licenses/LGPL_V2
+++ b/licenses/LGPL_V2
@@ -94,7 +94,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
@@ -104,7 +104,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".
@@ -123,7 +123,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.
 
@@ -225,7 +225,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
@@ -233,7 +233,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.
 
@@ -245,7 +245,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
@@ -324,7 +324,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
diff --git a/mimetypes/application/chm.desktop b/mimetypes/application/chm.desktop
index 67a6996c8..8ddbb0fec 100644
--- a/mimetypes/application/chm.desktop
+++ b/mimetypes/application/chm.desktop
@@ -7,7 +7,7 @@ Comment[br]=Teul skoazell HTML
 Comment[bs]=HTML Help dokument
 Comment[ca]=Document d'ajuda HTML
 Comment[cs]=Dokument HTML nápovědy
-Comment[csb]=Dokùment pòtqmocë HTML
+Comment[csb]=Dokùment pòmocë HTML
 Comment[da]=HTML-hjælpedokument
 Comment[de]=HTML-Hilfe-Dokument
 Comment[el]=Έγγ�αφο Βοήθειας HTML
@@ -42,13 +42,13 @@ Comment[ne]=HTML मद�दत कागजात
 Comment[nl]=HTML Help-document
 Comment[nn]=HTML-hjelpedokument
 Comment[pa]=HTML ਸਹਾਇਤਾ ਦਸਤਾਵੇਜ਼
-Comment[pl]=Dokument potqmocy HTML
+Comment[pl]=Dokument pomocy HTML
 Comment[pt]=Documento de Ajuda em HTML
 Comment[pt_BR]=Documento de Ajuda HTML
 Comment[ro]=Document de ajutor HTML
 Comment[ru]=Документ �правки в формате HTML
 Comment[se]=HTML-veahkkedokumeanta
-Comment[sk]=HTML potqmocník
+Comment[sk]=HTML pomocník
 Comment[sl]=Dokument HTML s pomo�jo
 Comment[sr]=HTML документ помоћи
 Comment[sr@Latn]=HTML dokument pomoći
diff --git a/mimetypes/application/pgp-encrypted.desktop b/mimetypes/application/pgp-encrypted.desktop
index 46c2eeb4e..e06f573f3 100644
--- a/mimetypes/application/pgp-encrypted.desktop
+++ b/mimetypes/application/pgp-encrypted.desktop
@@ -12,7 +12,7 @@ Comment[bg]=Шифрована заглавна чаÑ�Ñ‚ PGP/MIME на Ñ�ъобÑ
 Comment[bn]=পি.জি.পি/মাইম দ�বারা �নক�রিপ�ট করা বার�তা হেডার
 Comment[bs]=PGP/MIME kodirano zaglavlje poruke
 Comment[ca]=Capçalera d'un missatge xifrat PGP/MIME
-Comment[cs]=Hlavi�ka zprávy šifrované potqmocí PGP/MIME
+Comment[cs]=Hlavi�ka zprávy šifrované pomocí PGP/MIME
 Comment[csb]=Nagłówk zaszifrowónegò wiadła PGP/MIME
 Comment[cy]=Pennawd Neges Amgriptio PGP/MIME
 Comment[da]=PGP/MIME-hoveddel for krypteret brev
diff --git a/mimetypes/application/pgp.desktop b/mimetypes/application/pgp.desktop
index c53f28fe1..5d38e7573 100644
--- a/mimetypes/application/pgp.desktop
+++ b/mimetypes/application/pgp.desktop
@@ -50,7 +50,7 @@ Comment[ne]=PGP गà¥�पà¥�तिकरण गरिà¤�को वा हसà¥�à
 Comment[nl]=PGP-versleuteld of -ondertekend bericht
 Comment[nn]=PGP-kryptert eller -signert melding
 Comment[pa]=PGP ਇੰਕ�ਰਿਪਟਡ ਜਾਂ ਦਸਤਖਤੀ ਸ�ਨੇਹਾ
-Comment[pl]=Wiadomość zaszyfrowana lub podpisana za potqmocą PGP
+Comment[pl]=Wiadomość zaszyfrowana lub podpisana za pomocą PGP
 Comment[pt]=Mensagem Assinada ou Cifrada com PGP
 Comment[pt_BR]=Mensagem criptografada com PGP ou Mensagem Assinada
 Comment[ro]=Mesaj criptat sau semnat PGP
diff --git a/mimetypes/application/x-bittorrent.desktop b/mimetypes/application/x-bittorrent.desktop
index 01be6938a..4c166a114 100644
--- a/mimetypes/application/x-bittorrent.desktop
+++ b/mimetypes/application/x-bittorrent.desktop
@@ -48,7 +48,7 @@ Comment[ne]=बिटटोरेन�ट डाउनलोड
 Comment[nl]=BitTorrent-download
 Comment[nn]=BitTorrent-nedlasting
 Comment[pa]=BitTorrent ਡਾਊਨਲੋਡ
-Comment[pl]=Plik pobierany za potqmocÄ… BitTorrent
+Comment[pl]=Plik pobierany za pomocÄ… BitTorrent
 Comment[pt]=Transferência do BitTorrent
 Comment[pt_BR]=Lista de Download do BitTorrent
 Comment[ro]=Transfer de fiÅŸiere BitTorrent
diff --git a/mimetypes/application/x-bz2dvi.desktop b/mimetypes/application/x-bz2dvi.desktop
index 9306f1ad6..a7cd351c0 100644
--- a/mimetypes/application/x-bz2dvi.desktop
+++ b/mimetypes/application/x-bz2dvi.desktop
@@ -44,14 +44,14 @@ Comment[ne]=Bzip2 सङ�क�चित DVI फाइल
 Comment[nl]=Met bzip2 gecomprimeerd DVI-bestand
 Comment[nn]=Bzip2-komprimert DVI-fil
 Comment[pa]=Bzip2 ਨਪੀੜੀ DVI ਫਾਇਲ
-Comment[pl]=Plik DVI skompresowany za potqmocÄ… Bzip2
+Comment[pl]=Plik DVI skompresowany za pomocÄ… Bzip2
 Comment[pt]=Ficheiro DVI Comprimido com BZip2
 Comment[pt_BR]=Arquivo DVI compactado com o Bzip2
 Comment[ro]=FiÅŸier DVI comprimat cu Bzip2
 Comment[ru]=Сжатый bzip2 файл DVI
 Comment[rw]=Bzip2 Compressed DVI Idosiye
 Comment[se]=Bzip2-�oahkkáibáhkkejuvvon DVI-fiila
-Comment[sk]=Komprimovaný súbor DVI potqmocou bzip2
+Comment[sk]=Komprimovaný súbor DVI pomocou bzip2
 Comment[sl]=Datoteka DVI, stisnjena s bzip2
 Comment[sr]=Bzip2 компре�овани DVI фајл
 Comment[sr@Latn]=Bzip2 kompresovani DVI fajl
diff --git a/mimetypes/application/x-gzdvi.desktop b/mimetypes/application/x-gzdvi.desktop
index e668a1923..3b492a8d7 100644
--- a/mimetypes/application/x-gzdvi.desktop
+++ b/mimetypes/application/x-gzdvi.desktop
@@ -44,14 +44,14 @@ Comment[ne]=Gzip सङ�क�चित DVI फाइल
 Comment[nl]=Met gzip gecomprimeerd DVI-bestand
 Comment[nn]=Gzip-komprimert DVI-fil
 Comment[pa]=Gzip ਨਪੀੜੀ DVI ਫਾਇਲ
-Comment[pl]=Plik DVI skompresowany za potqmocÄ… Gzip
+Comment[pl]=Plik DVI skompresowany za pomocÄ… Gzip
 Comment[pt]=Ficheiro DVI Comprimido com GZip
 Comment[pt_BR]=Arquivo DVI compactado com o Gzip
 Comment[ro]=FiÅŸier DVI comprimat cu Gzip
 Comment[ru]=Сжатый gzip файл DVI
 Comment[rw]=Idosiye DVI Yegeranyijwe Gzipu
 Comment[se]=Gzip-�oahkkáibáhkkejuvvon DVI-fiila
-Comment[sk]=Komprimovaný súbor DVI potqmocou gzip
+Comment[sk]=Komprimovaný súbor DVI pomocou gzip
 Comment[sl]=Datoteka DVI, stisnjena s gzip-om
 Comment[sr]=Gzip компре�овани DVI фајл
 Comment[sr@Latn]=Gzip kompresovani DVI fajl
diff --git a/mimetypes/application/x-mimearchive.desktop b/mimetypes/application/x-mimearchive.desktop
index 23316caf1..86a9d46ae 100644
--- a/mimetypes/application/x-mimearchive.desktop
+++ b/mimetypes/application/x-mimearchive.desktop
@@ -43,7 +43,7 @@ Comment[ne]=माइम इनक�याप�स�लेट गरि�क
 Comment[nl]=Mime-ingekapseld webarchief
 Comment[nn]=Mime-omslutta nettarkiv
 Comment[pa]=Mime ਇੰਕੈਪਸੂਲੇਟਿਡ ਵੈੱਬ ਪ�ਰਾਲੇਖ
-Comment[pl]=Archiwum strony WWW opakowane za potqmocÄ… MIME
+Comment[pl]=Archiwum strony WWW opakowane za pomocÄ… MIME
 Comment[pt]=Pacote Web Encapsulado em MIME
 Comment[pt_BR]=Arquivo Web Encapsulado
 Comment[ro]=Arhivă web MIME comprimată
diff --git a/mimetypes/application/x-ogg.desktop b/mimetypes/application/x-ogg.desktop
index b1cc96663..e96d9af3c 100644
--- a/mimetypes/application/x-ogg.desktop
+++ b/mimetypes/application/x-ogg.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-# Note: this mimetype is deprecated. application/ogg tqreplaces it.
+# Note: this mimetype is deprecated. application/ogg replaces it.
 # The old mimetype (application/x-ogg) is only provided for compatibility reasons.
 # application/ogg "inherits" from it, so that apps associated with x-ogg can open ogg files.
 Type=MimeType
diff --git a/mimetypes/iconcheck.sh b/mimetypes/iconcheck.sh
index 634292179..6b74dd359 100644
--- a/mimetypes/iconcheck.sh
+++ b/mimetypes/iconcheck.sh
@@ -16,7 +16,7 @@ for i in */*top ; do
       if [ $verbose = 1 ]; then
         echo $i
       fi
-      if ! tqfind ../pics | grep $grepopt "mime\-$icon\.png" ; then
+      if ! find ../pics | grep $grepopt "mime\-$icon\.png" ; then
        if [ $verbose = 0 ]; then
          echo -n "$i : "
        fi
diff --git a/mimetypes/multipart/x-mixed-replace.desktop b/mimetypes/multipart/x-mixed-replace.desktop
index 4c37c3c03..853657338 100644
--- a/mimetypes/multipart/x-mixed-replace.desktop
+++ b/mimetypes/multipart/x-mixed-replace.desktop
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Type=MimeType
-MimeType=multipart/x-mixed-tqreplace
+MimeType=multipart/x-mixed-replace
 Patterns=
 Comment=Stream of Data (Server Push)
 Comment[af]=Stroom van Data (Bediener Stoot)
 Comment[ar]=سلسلة من البيانات (د�ع من الخادم)
-Comment[az]=Data Yatımı (Verici Tərətqfindən)
+Comment[az]=Data Yatımı (Verici Tərəfindən)
 Comment[be]=Плынь данн�ў (Server Push)
 Comment[bg]=Поток от данни (Server Push)
 Comment[bs]=Protok podataka (stream - server push)
diff --git a/mimetypes/text/x-c++hdr.desktop b/mimetypes/text/x-c++hdr.desktop
index ee480602f..19a3af1da 100644
--- a/mimetypes/text/x-c++hdr.desktop
+++ b/mimetypes/text/x-c++hdr.desktop
@@ -15,7 +15,7 @@ Comment[cy]=Ffeil Pennawd C++
 Comment[da]=C++-headerfil
 Comment[de]=C++-Headerdatei
 Comment[el]=Α�χείο κεφαλίδας C++
-Comment[eo]=C++-ditqfindosiero
+Comment[eo]=C++-difindosiero
 Comment[es]=Archivo de cabecera C++
 Comment[et]=C++ päis
 Comment[eu]=C++ goiburuko fitxategia
diff --git a/mimetypes/text/x-moc.desktop b/mimetypes/text/x-moc.desktop
index 773bcc4fd..3d06ce8f4 100644
--- a/mimetypes/text/x-moc.desktop
+++ b/mimetypes/text/x-moc.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-MimeType=text/x-tqmoc
+MimeType=text/x-moc
 Comment=Qt Meta Object File
 Comment[af]=Qt Meta Voorwerp Lêer
 Comment[az]=Qt Meta Cism Faylı
@@ -8,7 +8,7 @@ Comment[bg]=Метаобектен файл на Qt
 Comment[bn]=কিউটি মেটা অবজেক�ট ফাইল
 Comment[br]=Restr Qt Meta Object
 Comment[bs]=Qt Meta objektna datoteka
-Comment[ca]=Fitxer meta objecte Qt (tqmoc)
+Comment[ca]=Fitxer meta objecte Qt (moc)
 Comment[cs]=Meta-objektový soubor Qt
 Comment[csb]=Metaòbiekt Qt
 Comment[cy]=Ffeil Meta-wrthrych Qt
@@ -48,12 +48,12 @@ Comment[ne]=Qt मेटा वस�त� फाइल
 Comment[nl]=Qt-Meta-Object-bestand
 Comment[nn]=Qt-metaobjektfil
 Comment[nso]=Faele ya Sediriswa sa Meta wa Qt
-Comment[oc]=FiquièR meta objecte Qt (tqmoc)
+Comment[oc]=FiquièR meta objecte Qt (moc)
 Comment[pa]=Qt ਮੇਟਾ ਆਬਜੈਕਟ ਫਾਇਲ
 Comment[pl]=Metaobiekt Qt
 Comment[pt]=Meta-objecto Qt
 Comment[pt_BR]=Meta-Objeto Qt
-Comment[ro]=FiÅŸier TQMOC Qt
+Comment[ro]=FiÅŸier MOC Qt
 Comment[ru]=Файл-метаобъект Qt
 Comment[rw]=Idosiye Ibikoresho Bidasanzwe Qt
 Comment[se]=Qt-metaobjeaktafiila
@@ -81,7 +81,7 @@ Comment[zh_TW]=Qt Meta 目標文件
 Comment[zu]=Ifayela Lento ye-Meta lwe-Qt
 Type=MimeType
 Patterns=*.moc;
-Icon=source_tqmoc
+Icon=source_moc
 X-KDE-IsAlso=text/plain
 
 [Property::X-KDE-text]
diff --git a/networkstatus/clientiface.h b/networkstatus/clientiface.h
index d42708ae6..9fcef57a3 100644
--- a/networkstatus/clientiface.h
+++ b/networkstatus/clientiface.h
@@ -35,14 +35,14 @@ k_dcop:
 	/**
 	 * Get the status of the connection to the given host.
 	 * @param host 
-	 * @return a NetworktqStatus::EnumtqStatus representing the state of the connection to the given host
+	 * @return a NetworkStatus::EnumStatus representing the state of the connection to the given host
 	 */
 	virtual int status( const TQString & host) = 0;
 	/**
 	 * Request a connection to the named host, registering the application's usage of this connection
 	 * @param host The hostname the client wants to connect to.
 	 * @param userInitiated Indicates whether the connection is a direct result of a user action or is a background task.  Used by the daemon to decide whether to create an on-demand connection.
-	 * @return An NetworktqStatus::EnumRequestResult indicating whether the request was accepted
+	 * @return An NetworkStatus::EnumRequestResult indicating whether the request was accepted
 	 */
 	virtual int request( const TQString &  host, bool userInitiated ) = 0;
 	/**
diff --git a/networkstatus/clientifaceimpl.cpp b/networkstatus/clientifaceimpl.cpp
index e03850715..f20957e73 100644
--- a/networkstatus/clientifaceimpl.cpp
+++ b/networkstatus/clientifaceimpl.cpp
@@ -21,7 +21,7 @@
 
 #include "clientifaceimpl.h"
 
-ClientIfaceImpl::ClientIfaceImpl( NetworktqStatusModule * module ) : m_module ( module )
+ClientIfaceImpl::ClientIfaceImpl( NetworkStatusModule * module ) : m_module ( module )
 {
 }
 
diff --git a/networkstatus/clientifaceimpl.h b/networkstatus/clientifaceimpl.h
index 067d8be43..bdc99a19f 100644
--- a/networkstatus/clientifaceimpl.h
+++ b/networkstatus/clientifaceimpl.h
@@ -30,14 +30,14 @@
 class ClientIfaceImpl : virtual public ClientIface
 {
 public:
-	ClientIfaceImpl( NetworktqStatusModule * module );
+	ClientIfaceImpl( NetworkStatusModule * module );
 	int status( TQString host );
 	int request( TQString host, bool userInitiated );
 	void relinquish( TQString host );
 	bool reportFailure( TQString host );
 /*	TQString statusAsString();*/
 private:
-	NetworktqStatusModule * m_module;
+	NetworkStatusModule * m_module;
 };
 
 #endif
diff --git a/networkstatus/connectionmanager.cpp b/networkstatus/connectionmanager.cpp
index 818df2730..a28c6a124 100644
--- a/networkstatus/connectionmanager.cpp
+++ b/networkstatus/connectionmanager.cpp
@@ -46,7 +46,7 @@ ConnectionManager::ConnectionManager( TQObject * parent, const char * name ) : D
 	
 	d->m_stub = new ClientIface_stub( kapp->dcopClient(), "kded", "networkstatus" );
 	
-	connectDCOPSignal( "kded", "networkstatus", "statusChange(TQString,int)", "slottqStatusChanged(TQString,int)", false );
+	connectDCOPSignal( "kded", "networkstatus", "statusChange(TQString,int)", "slotStatusChanged(TQString,int)", false );
 	d->m_userInitiatedOnly = false;
 	initialise();
 }
@@ -65,13 +65,13 @@ void ConnectionManager::initialise()
 {
 	// determine initial state and set the state object accordingly.
 	d->m_state = Offline;
-	updatetqStatus();
+	updateStatus();
 }
 
-void ConnectionManager::updatetqStatus()
+void ConnectionManager::updateStatus()
 {
-	/*NetworktqStatus::EnumtqStatus daemontqStatus = (NetworktqStatus::EnumtqStatus)d->m_stub->status( TQString::null );
-	switch ( daemontqStatus )
+	/*NetworkStatus::EnumStatus daemonStatus = (NetworkStatus::EnumStatus)d->m_stub->status( TQString::null );
+	switch ( daemonStatus )
 	{
 		case Offline:
 		case OfflineFailed:
@@ -98,30 +98,30 @@ ConnectionManager::~ConnectionManager()
 	delete d;
 }
 
-NetworktqStatus::EnumtqStatus ConnectionManager::status( const TQString & host )
+NetworkStatus::EnumStatus ConnectionManager::status( const TQString & host )
 {
 	if ( d->m_state == Inactive )
-		return NetworktqStatus::NoNetworks;
+		return NetworkStatus::NoNetworks;
 	else
-		return NetworktqStatus::Offline;
+		return NetworkStatus::Offline;
 }
-NetworktqStatus::EnumRequestResult ConnectionManager::requestConnection( TQWidget * mainWidget, const TQString & host, bool userInitiated )
+NetworkStatus::EnumRequestResult ConnectionManager::requestConnection( TQWidget * mainWidget, const TQString & host, bool userInitiated )
 {
-	NetworktqStatus::EnumRequestResult result;
+	NetworkStatus::EnumRequestResult result;
 	// if offline and the user has previously indicated they didn't want any new connections, suppress it
 	if ( d->m_state == Offline && !userInitiated && d->m_userInitiatedOnly )
-		result = NetworktqStatus::UserRefused;
+		result = NetworkStatus::UserRefused;
 	// if offline, ask the user whether this connection should be allowed
 	if ( d->m_state == Offline )
 	{
 		if ( askToConnect( mainWidget ) )
-			result = (NetworktqStatus::EnumRequestResult)d->m_stub->request( host, userInitiated );
+			result = (NetworkStatus::EnumRequestResult)d->m_stub->request( host, userInitiated );
 		else
-			result = NetworktqStatus::UserRefused;
+			result = NetworkStatus::UserRefused;
 	}
 	// otherwise, just ask for the connection
 	else
-		result = (NetworktqStatus::EnumRequestResult)d->m_stub->request( host, userInitiated );
+		result = (NetworkStatus::EnumRequestResult)d->m_stub->request( host, userInitiated );
 	
 	return result;
 }
@@ -131,26 +131,26 @@ void ConnectionManager::relinquishConnection( const TQString & host )
 	d->m_stub->relinquish( host );
 }
 
-void ConnectionManager::slottqStatusChanged( TQString host, int status )
+void ConnectionManager::slotStatusChanged( TQString host, int status )
 {
-	updatetqStatus();
+	updateStatus();
 	// reset user initiated only flag if we are now online
 	if ( d->m_state == Online )
 		d->m_userInitiatedOnly = false;
 
-	emit statusChanged( host, (NetworktqStatus::EnumtqStatus)status );
+	emit statusChanged( host, (NetworkStatus::EnumStatus)status );
 }
 
 bool ConnectionManager::askToConnect( TQWidget * mainWidget )
 {
 	i18n( "A network connection was disconnected.  The application is now in offline mode.  Do you want the application to resume network operations when the network is available again?" );
 	i18n( "This application is currently in offline mode.  Do you want to connect?" );
-	i18n( "Message shown when a network connection failed.  The placeholder tqcontains the concrete description of the operation eg 'while performing this operation", "A network connection failed %1.  Do you want to place the application in offline mode?" );
+	i18n( "Message shown when a network connection failed.  The placeholder contains the concrete description of the operation eg 'while performing this operation", "A network connection failed %1.  Do you want to place the application in offline mode?" );
 	return ( KMessageBox::questionYesNo( mainWidget,
 			 i18n("This application is currently in offline mode.  Do you want to connect in order to carry out this operation?"),
 																		i18n("Leave Offline Mode?"),
 																		i18n("Connect"), i18n("Do Not Connect"),
-																		TQString::tqfromLatin1("OfflineModeAlwaysGoOnline") ) == KMessageBox::Yes );
+																		TQString::fromLatin1("OfflineModeAlwaysGoOnline") ) == KMessageBox::Yes );
 }
 
 #include "connectionmanager.moc"
diff --git a/networkstatus/connectionmanager.h b/networkstatus/connectionmanager.h
index d88f8d2a7..00ca4e35c 100644
--- a/networkstatus/connectionmanager.h
+++ b/networkstatus/connectionmanager.h
@@ -30,23 +30,23 @@ class ConnectionManager : public TQObject, virtual public DCOPObject
 		static ConnectionManager* self();
 		enum State { Inactive, Online, Offline, Pending };
 		virtual ~ConnectionManager();
-		NetworktqStatus::EnumtqStatus status( const TQString & host );
+		NetworkStatus::EnumStatus status( const TQString & host );
 			// check if a hostname is available.  Ask user if offline.  Request host
-		NetworktqStatus::EnumRequestResult requestConnection( TQWidget* mainWidget, const TQString & host, bool userInitiated );
+		NetworkStatus::EnumRequestResult requestConnection( TQWidget* mainWidget, const TQString & host, bool userInitiated );
 			// method to relinquish a connection
 		void relinquishConnection( const TQString & host );
 	signals:
 		// signal that the network for a hostname is up/down
-		void statusChanged( const TQString & host, NetworktqStatus::EnumtqStatus status );
+		void statusChanged( const TQString & host, NetworkStatus::EnumStatus status );
 	protected:
 		// sets up internal state
 		void initialise();
 		// reread the desktop status from the daemon and update internal state
-		void updatetqStatus();
+		void updateStatus();
 			// ask if the user would like to reconnect
 		bool askToConnect( TQWidget * mainWidget );
 	k_dcop:
-			void slottqStatusChanged( TQString host, int status );
+			void slotStatusChanged( TQString host, int status );
 	private:
 		ConnectionManager( TQObject *parent, const char * name );
 		ConnectionManagerPrivate *d;
diff --git a/networkstatus/network.cpp b/networkstatus/network.cpp
index 6d34950c1..fcb4a6f51 100644
--- a/networkstatus/network.cpp
+++ b/networkstatus/network.cpp
@@ -23,29 +23,29 @@
 
 #include "network.h"
 
-Network::Network( const TQString name, NetworktqStatus::Properties properties )
+Network::Network( const TQString name, NetworkStatus::Properties properties )
 	: m_name( name )
 {
 	kdDebug() << k_funcinfo << "constructing network '" << name << "', status: " << properties.status << endl;
 	m_status = properties.status;
-	m_nettqmasks = properties.nettqmasks;
+	m_netmasks = properties.netmasks;
 	m_internet = properties.internet;
 	m_service = properties.service;
 	m_onDemandPolicy = properties.onDemandPolicy;
 }
 
-NetworktqStatus::EnumtqStatus Network::reachabilityFor( const TQString & host )
+NetworkStatus::EnumStatus Network::reachabilityFor( const TQString & host )
 {
 	// initially assume all networks are internet
 	// TODO: compute reachability properly
 	Q_UNUSED( host );
 	if ( true /*nss.properties.internet && notPrivateNetwork( host )*/ )
 	{
-		NetworktqStatus::EnumtqStatus status;
-		if ( m_status == NetworktqStatus::Establishing || m_status == NetworktqStatus::Online )
-			status = NetworktqStatus::Online;
-		else if ( m_status == NetworktqStatus::ShuttingDown || m_status == NetworktqStatus::Offline )
-			status = NetworktqStatus::Offline;
+		NetworkStatus::EnumStatus status;
+		if ( m_status == NetworkStatus::Establishing || m_status == NetworkStatus::Online )
+			status = NetworkStatus::Online;
+		else if ( m_status == NetworkStatus::ShuttingDown || m_status == NetworkStatus::Offline )
+			status = NetworkStatus::Offline;
 		else
 			status = m_status;
 		
@@ -82,7 +82,7 @@ void Network::unregisterUsage( const TQCString appId, const TQString host )
 	}
 }
 
-void Network::setStatus( NetworktqStatus::EnumtqStatus status )
+void Network::setStatus( NetworkStatus::EnumStatus status )
 {
 	m_status = status;
 }
diff --git a/networkstatus/network.h b/networkstatus/network.h
index 819c4d80d..dcd2cd339 100644
--- a/networkstatus/network.h
+++ b/networkstatus/network.h
@@ -37,30 +37,30 @@ typedef TQValueList< NetworkUsageStruct > NetworkUsageList;
 class Network
 {
 public:
-	Network( const TQString name, NetworktqStatus::Properties properties );
+	Network( const TQString name, NetworkStatus::Properties properties );
 	Network( const Network & other );
-	NetworktqStatus::EnumtqStatus reachabilityFor( const TQString & host );
+	NetworkStatus::EnumStatus reachabilityFor( const TQString & host );
 	void registerUsage( const TQCString appId, const TQString host );
 	void unregisterUsage( const TQCString appId, const TQString host );
-	void setStatus( NetworktqStatus::EnumtqStatus status );
+	void setStatus( NetworkStatus::EnumStatus status );
 
 	void removeAllUsage();
 
-	NetworktqStatus::EnumtqStatus status() { return m_status; }
+	NetworkStatus::EnumStatus status() { return m_status; }
 	TQString name() { return m_name; }
 	bool internet() { return m_internet; }
-	TQStringList nettqmasks() { return m_nettqmasks; }
+	TQStringList netmasks() { return m_netmasks; }
 	TQCString service() { return m_service; }
-	NetworktqStatus::EnumOnDemandPolicy onDemandPolicy() { return m_onDemandPolicy; }
+	NetworkStatus::EnumOnDemandPolicy onDemandPolicy() { return m_onDemandPolicy; }
 	NetworkUsageList usage() { return m_usage; }
 	
 private:
-	NetworktqStatus::EnumtqStatus m_status;
+	NetworkStatus::EnumStatus m_status;
 	TQString m_name;
 	bool m_internet;
-	TQStringList m_nettqmasks;
+	TQStringList m_netmasks;
 	TQCString m_service;
-	NetworktqStatus::EnumOnDemandPolicy m_onDemandPolicy;
+	NetworkStatus::EnumOnDemandPolicy m_onDemandPolicy;
 	NetworkUsageList m_usage;
 };
 
diff --git a/networkstatus/networkstatus.cpp b/networkstatus/networkstatus.cpp
index 0cd620e92..21e34d978 100644
--- a/networkstatus/networkstatus.cpp
+++ b/networkstatus/networkstatus.cpp
@@ -49,7 +49,7 @@
 extern "C" {
 	KDE_EXPORT KDEDModule* create_networkstatus( const TQCString& obj )
 	{
-		return new NetworktqStatusModule( obj );
+		return new NetworkStatusModule( obj );
 	}
 }
 
@@ -58,7 +58,7 @@ extern "C" {
 //typedef TQDict< Network > NetworkList;
 typedef TQValueList< Network * > NetworkList;
 
-class NetworktqStatusModule::Private
+class NetworkStatusModule::Private
 {
 public:
 	NetworkList networks;
@@ -68,7 +68,7 @@ public:
 
 // CTORS/DTORS
 
-NetworktqStatusModule::NetworktqStatusModule( const TQCString & obj ) : KDEDModule( obj )
+NetworkStatusModule::NetworkStatusModule( const TQCString & obj ) : KDEDModule( obj )
 {
 	d = new Private;
 /*	d->clientIface = new ClientIfaceImpl( this );
@@ -77,7 +77,7 @@ NetworktqStatusModule::NetworktqStatusModule( const TQCString & obj ) : KDEDModu
 	connect( kapp->dcopClient(), TQT_SIGNAL( applicationRegistered( const TQCString& ) ) , this, TQT_SLOT( registeredToDCOP( const TQCString& ) ) );
 }
 
-NetworktqStatusModule::~NetworktqStatusModule()
+NetworkStatusModule::~NetworkStatusModule()
 {
 /*	delete d->clientIface;
 	delete d->serviceIface;*/
@@ -86,9 +86,9 @@ NetworktqStatusModule::~NetworktqStatusModule()
 
 // CLIENT INTERFACE
 
-TQStringList NetworktqStatusModule::networks()
+TQStringList NetworkStatusModule::networks()
 {
-	kdDebug() << k_funcinfo << " tqcontains " << d->networks.count() << " networks" << endl;
+	kdDebug() << k_funcinfo << " contains " << d->networks.count() << " networks" << endl;
 	TQStringList networks;
 	NetworkList::iterator end = d->networks.end();
 	NetworkList::iterator it = d->networks.begin();
@@ -97,15 +97,15 @@ TQStringList NetworktqStatusModule::networks()
 	return networks;
 }
 
-int NetworktqStatusModule::status( const TQString & host )
+int NetworkStatusModule::status( const TQString & host )
 {
 	if ( host == "127.0.0.1" || host == "localhost" )
-		return NetworktqStatus::Online;
+		return NetworkStatus::Online;
 	Network * p = networkForHost( host );
 	if ( !p )
 	{
 		//kdDebug() << k_funcinfo << " no networks have status for host '" << host << "'" << endl;
-		return (int)NetworktqStatus::NoNetworks;
+		return (int)NetworkStatus::NoNetworks;
 	}
 	else
 	{	
@@ -114,65 +114,65 @@ int NetworktqStatusModule::status( const TQString & host )
 	}
 }
 
-int NetworktqStatusModule::request( const TQString & host, bool userInitiated )
+int NetworkStatusModule::request( const TQString & host, bool userInitiated )
 {
 	// identify most suitable network for host
 	Network * p = networkForHost( host );
 	if ( !p )
-		return NetworktqStatus::Unavailable;
+		return NetworkStatus::Unavailable;
 	
-	NetworktqStatus::EnumtqStatus status = p->status();
+	NetworkStatus::EnumStatus status = p->status();
 	TQCString appId = kapp->dcopClient()->senderId();
-	if ( status == NetworktqStatus::Online )
+	if ( status == NetworkStatus::Online )
 	{
 		p->registerUsage( appId, host );
-		return NetworktqStatus::Connected;
+		return NetworkStatus::Connected;
 	}
 	// if online
 	//   register usage
 	//   return Available
-	else if ( status == NetworktqStatus::Establishing )
+	else if ( status == NetworkStatus::Establishing )
 	{
 		p->registerUsage( appId, host );
-		return NetworktqStatus::RequestAccepted;
+		return NetworkStatus::RequestAccepted;
 	}
 	// if establishing
 	//   register usage
 	//   return Accepted
-	else if ( status == NetworktqStatus::Offline || status == NetworktqStatus::ShuttingDown )
+	else if ( status == NetworkStatus::Offline || status == NetworkStatus::ShuttingDown )
 	{
 		// TODO: check on demand policy
 		
 		p->registerUsage( appId, host );
-		return NetworktqStatus::RequestAccepted;
+		return NetworkStatus::RequestAccepted;
 	}
 	// if offline or ShuttingDown
 	//   check ODP::
 	//   always or Permanent: register, return accepted
 	//   user: check userInitiated, register, return Accepted or UserRefused
 	//   never: return UserRefused
-	else if ( status == NetworktqStatus::OfflineFailed )
+	else if ( status == NetworkStatus::OfflineFailed )
 	{
 		// TODO: check user's preference for dealing with failed networks
 		p->registerUsage( appId, host );
-		return NetworktqStatus::RequestAccepted;
+		return NetworkStatus::RequestAccepted;
 	}
 	// if OfflineFailed
 	//   check user's preference
-	else if ( status == NetworktqStatus::OfflineDisconnected )
+	else if ( status == NetworkStatus::OfflineDisconnected )
 	{
-		return NetworktqStatus::Unavailable;
+		return NetworkStatus::Unavailable;
 	}
 	else
-		return NetworktqStatus::Unavailable;
+		return NetworkStatus::Unavailable;
 	// if OfflineDisconnected or NoNetworks
 	//   return Unavailable
 }
 
-void NetworktqStatusModule::relinquish( const TQString & host )
+void NetworkStatusModule::relinquish( const TQString & host )
 {
 	TQCString appId = kapp->dcopClient()->senderId();
-	// tqfind network currently used by app for host...
+	// find network currently used by app for host...
 	NetworkList::iterator end = d->networks.end();
 	NetworkList::iterator it = d->networks.begin();
 	for ( ; it != end; ++it )
@@ -195,9 +195,9 @@ void NetworktqStatusModule::relinquish( const TQString & host )
 	}
 }
 
-bool NetworktqStatusModule::reportFailure( const TQString & host )
+bool NetworkStatusModule::reportFailure( const TQString & host )
 {
-	// tqfind network for host
+	// find network for host
 	// check IP record.  remove IP usage record.  if other IP exists, return true.
 	Q_UNUSED( host );
 	kdDebug() << k_funcinfo << "NOT IMPLEMENTED" << endl;
@@ -208,7 +208,7 @@ bool NetworktqStatusModule::reportFailure( const TQString & host )
 /*
  * Determine the network to use for the supplied host
  */
-Network * NetworktqStatusModule::networkForHost( const TQString & host ) const
+Network * NetworkStatusModule::networkForHost( const TQString & host ) const
 {
 	// return a null pointer if no networks are registered
 	if ( d->networks.isEmpty() )
@@ -228,11 +228,11 @@ Network * NetworktqStatusModule::networkForHost( const TQString & host ) const
 }
 
 
-void NetworktqStatusModule::registeredToDCOP( const TQCString & appId )
+void NetworkStatusModule::registeredToDCOP( const TQCString & appId )
 {
 }
 
-void NetworktqStatusModule::unregisteredFromDCOP( const TQCString & appId )
+void NetworkStatusModule::unregisteredFromDCOP( const TQCString & appId )
 {
 	// unregister any networks owned by a service that has just unregistered
 	NetworkList::iterator it = d->networks.begin();
@@ -249,10 +249,10 @@ void NetworktqStatusModule::unregisteredFromDCOP( const TQCString & appId )
 }
 
 // SERVICE INTERFACE //
-void NetworktqStatusModule::setNetworktqStatus( const TQString & networkName, int st )
+void NetworkStatusModule::setNetworkStatus( const TQString & networkName, int st )
 {
 	kdDebug() << k_funcinfo << endl;
-	NetworktqStatus::EnumtqStatus status = (NetworktqStatus::EnumtqStatus)st;
+	NetworkStatus::EnumStatus status = (NetworkStatus::EnumStatus)st;
 	Network * net = 0;
 	NetworkList::iterator it = d->networks.begin();
 	NetworkList::iterator end = d->networks.end();
@@ -279,7 +279,7 @@ void NetworktqStatusModule::setNetworktqStatus( const TQString & networkName, in
 		for ( NetworkUsageList::iterator it = usage.begin(); it != end; ++it )
 		{
 			// only notify once per host
-			if ( !notified.tqcontains( (*it).host ) )
+			if ( !notified.contains( (*it).host ) )
 			{
 				kdDebug() << "notifying statusChange of " << networkName << " to " << (int)status << 
 						" because " << (*it).appId << " is using " << (*it).host << endl;
@@ -289,14 +289,14 @@ void NetworktqStatusModule::setNetworktqStatus( const TQString & networkName, in
 		}
 
 		// if we are now anything but Establishing or Online, reset the usage records for that network
-		if ( !( net->status() == NetworktqStatus::Establishing || net->status() == NetworktqStatus::Establishing ) )
+		if ( !( net->status() == NetworkStatus::Establishing || net->status() == NetworkStatus::Establishing ) )
 			net->removeAllUsage();
 	}
 	else
 		kdDebug() << k_funcinfo << "No network found by this name" << endl;
 }
 
-void NetworktqStatusModule::registerNetwork( const TQString & networkName, const NetworktqStatus::Properties properties )
+void NetworkStatusModule::registerNetwork( const TQString & networkName, const NetworkStatus::Properties properties )
 {
 	kdDebug() << k_funcinfo << "registering '" << networkName << "', with status " << properties.status << endl;
 	// TODO: check for re-registration, checking appid matches
@@ -304,13 +304,13 @@ void NetworktqStatusModule::registerNetwork( const TQString & networkName, const
 	d->networks.append( new Network( networkName, properties ) );
 }
 
-void NetworktqStatusModule::unregisterNetwork( const TQString & networkName )
+void NetworkStatusModule::unregisterNetwork( const TQString & networkName )
 {
 	// TODO: check appid
 	//d->networks.remove( networkName );
 }
 
-void NetworktqStatusModule::requestShutdown( const TQString & networkName )
+void NetworkStatusModule::requestShutdown( const TQString & networkName )
 {
 	Q_UNUSED( networkName );
 	kdDebug() << k_funcinfo << "NOT IMPLEMENTED" << endl;
diff --git a/networkstatus/networkstatus.desktop b/networkstatus/networkstatus.desktop
index 5fe452433..4d66b8c51 100644
--- a/networkstatus/networkstatus.desktop
+++ b/networkstatus/networkstatus.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=Network tqStatus Daemon
+Name=Network Status Daemon
 Name[af]=Netwerk status bediener
 Name[ar]=مراقب القرص و التن�يذ لحالة الشبكة
 Name[bg]=Демон за �ъ�то�ние на мрежата
@@ -27,14 +27,14 @@ Name[ko]=네트워� �태 �몬
 Name[lt]=Tinklo statuso tarnyba
 Name[mk]=Даемон за мрежен �тату�
 Name[ms]=Daemon Berstatus Rangkaian
-Name[nb]=tqStatusnisse for nettverket
+Name[nb]=Statusnisse for nettverket
 Name[nds]=Nettwarkstatus-Dämoon
 Name[ne]=सञ�जाल स�थिति डेइमन
 Name[nl]=Netwerkstatusdaemon
-Name[nn]=tqStatusnisse for nettverket
+Name[nn]=Statusnisse for nettverket
 Name[pl]=Usługa stanu sieci
 Name[pt]=Servidor de Estado de Rede
-Name[pt_BR]=Daemon de tqStatus da Rede
+Name[pt_BR]=Daemon de Status da Rede
 Name[ru]=Служба �о�то�ни� �ети
 Name[sk]=Daemon stavu siete
 Name[sl]=Demon za omrežno stanje
@@ -52,7 +52,7 @@ Comment[bg]=Следене на �ъ�то�нието на мрежата и п
 Comment[ca]=Controla l'estat de les interfícies de xarxa i proporciona notificacions a les aplicacions que usen la xarxa.
 Comment[cs]=Zjiš'tuje stav síťových rozhraní a upozorňuje v případě přístupu aplikací k síti.
 Comment[da]=Sporer status af netværksgrænseflade og sørger for meddelelser til programmer der bruger netværket.
-Comment[de]=Überprüft den Netzwerk-tqStatus und benachrichtigt anfragende Anwendungen
+Comment[de]=Überprüft den Netzwerk-Status und benachrichtigt anfragende Anwendungen
 Comment[el]=Πα�ακολουθεί την κατάσταση του δικτ�ου και πα�έχει ειδοποιήσεις σε εφα�μογές που χ�ησιμοποιο�ν το δίκτυο.
 Comment[es]=Sigue la pista de las interfaces de red y proporciona notificaciones a las aplicaciones que están usando la red.
 Comment[et]=Jälgib võrguliideste olekut ja annab sellest võrgu vahendusel rakendustele teada.
diff --git a/networkstatus/networkstatus.h b/networkstatus/networkstatus.h
index 78de9cdcd..710afd79a 100644
--- a/networkstatus/networkstatus.h
+++ b/networkstatus/networkstatus.h
@@ -30,15 +30,15 @@
 #include "network.h"
 #include "serviceiface.h"
 
-struct NetworktqStatusStruct;
+struct NetworkStatusStruct;
 
-class NetworktqStatusModule : virtual public KDEDModule/*, public ClientIface, ServiceIface*/ // <-spot the multiple inheritance pb
+class NetworkStatusModule : virtual public KDEDModule/*, public ClientIface, ServiceIface*/ // <-spot the multiple inheritance pb
 {
 Q_OBJECT
 K_DCOP
 public:
-	NetworktqStatusModule( const TQCString & obj );
-	~NetworktqStatusModule();
+	NetworkStatusModule( const TQCString & obj );
+	~NetworkStatusModule();
 k_dcop:
 	// Client interface
 	TQStringList networks();
@@ -48,8 +48,8 @@ k_dcop:
 	bool reportFailure( const TQString & host );
 // 	TQString statusAsString();
 	// Service interface
-	void setNetworktqStatus( const TQString & networkName, int status );
-	void registerNetwork( const TQString & networkName, NetworktqStatus::Properties properties );
+	void setNetworkStatus( const TQString & networkName, int status );
+	void registerNetwork( const TQString & networkName, NetworkStatus::Properties properties );
 	void unregisterNetwork( const TQString & networkName );
 	void requestShutdown( const TQString & networkName );
 k_dcop_signals:
diff --git a/networkstatus/networkstatuscommon.cpp b/networkstatus/networkstatuscommon.cpp
index 3d73e5934..574862929 100644
--- a/networkstatus/networkstatuscommon.cpp
+++ b/networkstatus/networkstatuscommon.cpp
@@ -22,32 +22,32 @@
 #include "networkstatuscommon.h"
 #include <kdebug.h>
 
-TQDataStream & operator<< ( TQDataStream & s, const NetworktqStatus::Properties p )
+TQDataStream & operator<< ( TQDataStream & s, const NetworkStatus::Properties p )
 {
 	kdDebug() << k_funcinfo << "status is: " << (int)p.status << endl;
 	s << (int)p.status;
 	s << (int)p.onDemandPolicy;
 	s << p.service;
 	s << ( p.internet ? 1 : 0 );
-	s << p.nettqmasks;
+	s << p.netmasks;
 	return s;
 }
 
-TQDataStream & operator>> ( TQDataStream & s, NetworktqStatus::Properties &p )
+TQDataStream & operator>> ( TQDataStream & s, NetworkStatus::Properties &p )
 {
 	int status, onDemandPolicy, internet;
 	s >> status;
 	kdDebug() << k_funcinfo << "status is: " << status << endl;
-	p.status = ( NetworktqStatus::EnumtqStatus )status;
+	p.status = ( NetworkStatus::EnumStatus )status;
 	s >> onDemandPolicy;
-	p.onDemandPolicy = ( NetworktqStatus::EnumOnDemandPolicy )onDemandPolicy;
+	p.onDemandPolicy = ( NetworkStatus::EnumOnDemandPolicy )onDemandPolicy;
 	s >> p.service;
 	s >> internet;
 	if ( internet )
 		p.internet = true;
 	else
 		p.internet = false;
-	s >> p.nettqmasks;
+	s >> p.netmasks;
 	kdDebug() << k_funcinfo << "enum converted status is: " << p.status << endl;
 	return s;
 }
diff --git a/networkstatus/networkstatuscommon.h b/networkstatus/networkstatuscommon.h
index 1b3a858e7..63c388c3f 100644
--- a/networkstatus/networkstatuscommon.h
+++ b/networkstatus/networkstatuscommon.h
@@ -24,31 +24,31 @@
 
 #include <tqstringlist.h>
 
-namespace NetworktqStatus
+namespace NetworkStatus
 {
-	enum EnumtqStatus { NoNetworks = 1, Unreachable, OfflineDisconnected,  OfflineFailed, ShuttingDown, Offline, Establishing, Online };
+	enum EnumStatus { NoNetworks = 1, Unreachable, OfflineDisconnected,  OfflineFailed, ShuttingDown, Offline, Establishing, Online };
 	enum EnumRequestResult { RequestAccepted = 1, Connected, UserRefused, Unavailable };
 	enum EnumOnDemandPolicy { All, User, None, Permanent };
 	struct Properties
 	{
 		TQString name;
 		// status of the network
-		EnumtqStatus status;
+		EnumStatus status;
 		// policy for on-demand usage as defined by the service
 		EnumOnDemandPolicy onDemandPolicy;
 		// identifier for the service
 		TQCString service;
 		// indicate that the connection is to 'the internet' - similar to default gateway in routing
 		bool internet;
-		// list of nettqmasks that the network connects to - overridden by above internet
-		TQStringList nettqmasks;
+		// list of netmasks that the network connects to - overridden by above internet
+		TQStringList netmasks;
 		// for future expansion consider
 		// EnumChargingModel - FlatRate, TimeCharge, VolumeCharged
-		// EnumLinktqStatus - for WLANs - VPOOR, POOR, AVERAGE, GOOD, EXCELLENT
+		// EnumLinkStatus - for WLANs - VPOOR, POOR, AVERAGE, GOOD, EXCELLENT
 	};
 }
 
-TQDataStream & operator>> ( TQDataStream & s, NetworktqStatus::Properties &p );
-TQDataStream & operator<< ( TQDataStream & s, const NetworktqStatus::Properties p );
+TQDataStream & operator>> ( TQDataStream & s, NetworkStatus::Properties &p );
+TQDataStream & operator<< ( TQDataStream & s, const NetworkStatus::Properties p );
 
 #endif
diff --git a/networkstatus/networkstatusiface.h b/networkstatus/networkstatusiface.h
index 22929dd4d..c35a22db5 100644
--- a/networkstatus/networkstatusiface.h
+++ b/networkstatus/networkstatusiface.h
@@ -28,7 +28,7 @@
 
 #include "networkstatuscommon.h"
 
-class NetworktqStatusIface : virtual public DCOPObject
+class NetworkStatusIface : virtual public DCOPObject
 {
 K_DCOP
 k_dcop:
@@ -36,8 +36,8 @@ k_dcop:
 	virtual TQStringList networks() = 0;
 	virtual int status() = 0;
 	// Service interface
-	virtual void setNetworktqStatus( const TQString & networkName, int status ) = 0;
-	virtual void registerNetwork( NetworktqStatus::Properties properties ) = 0;
+	virtual void setNetworkStatus( const TQString & networkName, int status ) = 0;
+	virtual void registerNetwork( NetworkStatus::Properties properties ) = 0;
 	virtual void unregisterNetwork( const TQString & networkName ) = 0 ;
 k_dcop_signals:
 	/**
diff --git a/networkstatus/networkstatusindicator.cpp b/networkstatus/networkstatusindicator.cpp
index 76888cfde..957d6f739 100644
--- a/networkstatus/networkstatusindicator.cpp
+++ b/networkstatus/networkstatusindicator.cpp
@@ -29,8 +29,8 @@
 
 #include "networkstatusindicator.h"
 
-StatusBarNetworktqStatusIndicator::StatusBarNetworktqStatusIndicator(
-    TQWidget * parent, const char * name ) : TQHBox( parent, name )/*, d( new StatusBarNetworktqStatusIndicatorPrivate )*/
+StatusBarNetworkStatusIndicator::StatusBarNetworkStatusIndicator(
+    TQWidget * parent, const char * name ) : TQHBox( parent, name )/*, d( new StatusBarNetworkStatusIndicatorPrivate )*/
 {
   setMargin( 2 );
   setSpacing( 1 );
@@ -38,28 +38,28 @@ StatusBarNetworktqStatusIndicator::StatusBarNetworktqStatusIndicator(
   label->setPixmap( SmallIcon("connect_no") );
   TQToolTip::add( label, i18n( "The desktop is offline" ) );
 
-  connect( ConnectionManager::self(), TQT_SIGNAL( statusChanged( const TQString &, NetworktqStatus::EnumtqStatus ) ),
-      TQT_SLOT( networktqStatusChanged( const TQString &, NetworktqStatus::EnumtqStatus) ) );
+  connect( ConnectionManager::self(), TQT_SIGNAL( statusChanged( const TQString &, NetworkStatus::EnumStatus ) ),
+      TQT_SLOT( networkStatusChanged( const TQString &, NetworkStatus::EnumStatus) ) );
 
 }
 
-void StatusBarNetworktqStatusIndicator::init()
+void StatusBarNetworkStatusIndicator::init()
 {
-  networktqStatusChanged( ConnectionManager::self()->status(TQString("")));
+  networkStatusChanged( ConnectionManager::self()->status(TQString("")));
 }
 
-StatusBarNetworktqStatusIndicator::~StatusBarNetworktqStatusIndicator()
+StatusBarNetworkStatusIndicator::~StatusBarNetworkStatusIndicator()
 {
 }
 
-void StatusBarNetworktqStatusIndicator::networktqStatusChanged( const TQString & host, NetworktqStatus::EnumtqStatus status )
+void StatusBarNetworkStatusIndicator::networkStatusChanged( const TQString & host, NetworkStatus::EnumStatus status )
 {
-  networktqStatusChanged(status);
+  networkStatusChanged(status);
 }
 
-void StatusBarNetworktqStatusIndicator::networktqStatusChanged( NetworktqStatus::EnumtqStatus status )
+void StatusBarNetworkStatusIndicator::networkStatusChanged( NetworkStatus::EnumStatus status )
 {
-  if ( status == NetworktqStatus::Online || status == NetworktqStatus::NoNetworks ) {
+  if ( status == NetworkStatus::Online || status == NetworkStatus::NoNetworks ) {
     hide();
   } else {
     show();
diff --git a/networkstatus/networkstatusindicator.h b/networkstatus/networkstatusindicator.h
index 3c223e313..f1cfa966a 100644
--- a/networkstatus/networkstatusindicator.h
+++ b/networkstatus/networkstatusindicator.h
@@ -27,16 +27,16 @@
 #include <kdemacros.h>
 #include <networkstatuscommon.h>
 
-class StatusBarNetworktqStatusIndicator : public TQHBox
+class StatusBarNetworkStatusIndicator : public TQHBox
 {
 Q_OBJECT
 public:
-  StatusBarNetworktqStatusIndicator( TQWidget * parent, const char * name );
-  virtual ~StatusBarNetworktqStatusIndicator();
+  StatusBarNetworkStatusIndicator( TQWidget * parent, const char * name );
+  virtual ~StatusBarNetworkStatusIndicator();
   void init();
 protected slots:
-  void networktqStatusChanged( const TQString & host, NetworktqStatus::EnumtqStatus status );
-  void networktqStatusChanged( NetworktqStatus::EnumtqStatus status );
+  void networkStatusChanged( const TQString & host, NetworkStatus::EnumStatus status );
+  void networkStatusChanged( NetworkStatus::EnumStatus status );
 };
 
 #endif
diff --git a/networkstatus/provideriface.h b/networkstatus/provideriface.h
index ae03b8ece..93f23103d 100644
--- a/networkstatus/provideriface.h
+++ b/networkstatus/provideriface.h
@@ -27,11 +27,11 @@ class ProviderIface : virtual public DCOPObject
 {
 K_DCOP
 k_dcop:
-	/** @return NetworktqStatus::EnumOnlinetqStatus */
+	/** @return NetworkStatus::EnumOnlineStatus */
 	virtual int status( const TQString & network ) = 0;
-	/** @return NetworktqStatus::EnumRequestResult */
+	/** @return NetworkStatus::EnumRequestResult */
 	virtual int establish( const TQString & network ) = 0;
-	/** @return NetworktqStatus::EnumRequestResult */
+	/** @return NetworkStatus::EnumRequestResult */
 	virtual int shutdown( const TQString & network ) = 0;
 	/** fake a failure - go directly to failed */
 	virtual void simulateFailure() = 0;
diff --git a/networkstatus/serviceiface.h b/networkstatus/serviceiface.h
index f84883255..1e6b423ff 100644
--- a/networkstatus/serviceiface.h
+++ b/networkstatus/serviceiface.h
@@ -31,10 +31,10 @@ class ServiceIface : virtual public DCOPObject
 K_DCOP
 k_dcop:
 	/** Change the status for the given network */
-	virtual void setNetworktqStatus( const TQString & networkName, int status ) = 0;
+	virtual void setNetworkStatus( const TQString & networkName, int status ) = 0;
 	/** Register or update the properties for a network 
 	NB Check that people don't use this to change status */
-	virtual void registerNetwork( const TQString & networkName, NetworktqStatus::Properties properties ) = 0;
+	virtual void registerNetwork( const TQString & networkName, NetworkStatus::Properties properties ) = 0;
 	/**
 	 * Indicate that this service is no longer administering the named network
 	 * TODO: Work out the implications to clients of unregistering a network 
diff --git a/networkstatus/serviceifaceimpl.cpp b/networkstatus/serviceifaceimpl.cpp
index 18a2d760e..cf5c0df99 100644
--- a/networkstatus/serviceifaceimpl.cpp
+++ b/networkstatus/serviceifaceimpl.cpp
@@ -21,16 +21,16 @@
 
 #include "serviceifaceimpl.h"
 
-ServiceIfaceImpl::ServiceIfaceImpl( NetworktqStatusModule * module ) : m_module ( module )
+ServiceIfaceImpl::ServiceIfaceImpl( NetworkStatusModule * module ) : m_module ( module )
 {
 }
 
 void ServiceIfaceImpl::setStatus( TQString networkName, int status )
 {
-	m_module->setStatus( networkName, (NetworktqStatus::EnumtqStatus)status );
+	m_module->setStatus( networkName, (NetworkStatus::EnumStatus)status );
 }
 
-void ServiceIfaceImpl::registerNetwork( TQString networkName, NetworktqStatus::Properties properties )
+void ServiceIfaceImpl::registerNetwork( TQString networkName, NetworkStatus::Properties properties )
 {
 	m_module->registerNetwork( networkName, properties );
 }
diff --git a/networkstatus/serviceifaceimpl.h b/networkstatus/serviceifaceimpl.h
index 0f5538f97..6ffba3609 100644
--- a/networkstatus/serviceifaceimpl.h
+++ b/networkstatus/serviceifaceimpl.h
@@ -31,13 +31,13 @@
 class ServiceIfaceImpl : virtual public ServiceIface
 {
 public:
-	ServiceIfaceImpl( NetworktqStatusModule * module );
+	ServiceIfaceImpl( NetworkStatusModule * module );
 	void setStatus( TQString networkName, int status );
-	void registerNetwork( TQString networkName, NetworktqStatus::Properties properties );
+	void registerNetwork( TQString networkName, NetworkStatus::Properties properties );
 	void unregisterNetwork( TQString networkName );
 	void requestShutdown( TQString networkName );
 private:
-	NetworktqStatusModule * m_module;
+	NetworkStatusModule * m_module;
 };
 
 #endif
diff --git a/networkstatus/testservice.cpp b/networkstatus/testservice.cpp
index d74f35ba4..46b19109f 100644
--- a/networkstatus/testservice.cpp
+++ b/networkstatus/testservice.cpp
@@ -31,11 +31,11 @@ TestService::TestService() : TQObject(), DCOPObject("ProviderIface")
 {
 	kapp->dcopClient()->registerAs("testservice" );
 	m_service = new ServiceIface_stub( "kded", "networkstatus" );
-	m_status = NetworktqStatus::Offline;
-	NetworktqStatus::Properties nsp;
+	m_status = NetworkStatus::Offline;
+	NetworkStatus::Properties nsp;
 	nsp.internet = true;
 	nsp.name = "test_net";
-	nsp.onDemandPolicy = NetworktqStatus::All;
+	nsp.onDemandPolicy = NetworkStatus::All;
 	nsp.service = kapp->dcopClient()->appId();
 	nsp.status = m_status;
 	m_service->registerNetwork( "test_net", nsp );
@@ -55,39 +55,39 @@ int TestService::status( const TQString & network )
 int TestService::establish( const TQString & network )
 {
 	Q_UNUSED( network );
-	m_status = NetworktqStatus::Establishing;
-	m_service->setNetworktqStatus( "test_net", (int)m_status );
-	m_nexttqStatus = NetworktqStatus::Online;
-	TQTimer::singleShot( 5000, this, TQT_SLOT( slottqStatusChange() ) );
-	return (int)NetworktqStatus::RequestAccepted;
+	m_status = NetworkStatus::Establishing;
+	m_service->setNetworkStatus( "test_net", (int)m_status );
+	m_nextStatus = NetworkStatus::Online;
+	TQTimer::singleShot( 5000, this, TQT_SLOT( slotStatusChange() ) );
+	return (int)NetworkStatus::RequestAccepted;
 }
 
 int TestService::shutdown( const TQString & network )
 {
 	Q_UNUSED( network );
-	m_status = NetworktqStatus::ShuttingDown;
-	m_service->setNetworktqStatus( "test_net", (int)m_status );
-	m_nexttqStatus = NetworktqStatus::Offline;
-	TQTimer::singleShot( 5000, this, TQT_SLOT( slottqStatusChange() ) );
-	return (int)NetworktqStatus::RequestAccepted;
+	m_status = NetworkStatus::ShuttingDown;
+	m_service->setNetworkStatus( "test_net", (int)m_status );
+	m_nextStatus = NetworkStatus::Offline;
+	TQTimer::singleShot( 5000, this, TQT_SLOT( slotStatusChange() ) );
+	return (int)NetworkStatus::RequestAccepted;
 }
 
 void TestService::simulateFailure()
 {
-	m_status = NetworktqStatus::OfflineFailed;
-	m_service->setNetworktqStatus( "test_net", (int)m_status );
+	m_status = NetworkStatus::OfflineFailed;
+	m_service->setNetworkStatus( "test_net", (int)m_status );
 }
 
 void TestService::simulateDisconnect()
 {
-	m_status = NetworktqStatus::OfflineDisconnected;
-	m_service->setNetworktqStatus( "test_net", (int)m_status );
+	m_status = NetworkStatus::OfflineDisconnected;
+	m_service->setNetworkStatus( "test_net", (int)m_status );
 }
 
-void TestService::slottqStatusChange()
+void TestService::slotStatusChange()
 {
-	m_status = m_nexttqStatus;
-	m_service->setNetworktqStatus( "test_net", (int)m_status );
+	m_status = m_nextStatus;
+	m_service->setNetworkStatus( "test_net", (int)m_status );
 }
 
 int main( int argc, char** argv )
diff --git a/networkstatus/testservice.h b/networkstatus/testservice.h
index f448f5068..65febdca9 100644
--- a/networkstatus/testservice.h
+++ b/networkstatus/testservice.h
@@ -39,11 +39,11 @@ public:
 	void simulateFailure();
 	void simulateDisconnect();
 protected slots:
-	void slottqStatusChange();
+	void slotStatusChange();
 private:
 	ServiceIface_stub * m_service;
-	NetworktqStatus::EnumtqStatus m_status;
-	NetworktqStatus::EnumtqStatus m_nexttqStatus;
+	NetworkStatus::EnumStatus m_status;
+	NetworkStatus::EnumStatus m_nextStatus;
 };
 
 #endif
diff --git a/pics/LICENSE.crystalsvg b/pics/LICENSE.crystalsvg
index f5a97500a..6b6a87086 100644
--- a/pics/LICENSE.crystalsvg
+++ b/pics/LICENSE.crystalsvg
@@ -1,6 +1,6 @@
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 This copyright and license notice covers all CrystalSVG images.
-Note the license notice tqcontains an add-on.
+Note the license notice contains an add-on.
 ********************************************************************************
 KDE Crystal theme icons.
 Copyright (C) 2002 and following years KDE Artists
diff --git a/pics/crystalsvg/cr32-mime-gf.png b/pics/crystalsvg/cr32-mime-gf.png
index 6a8a8f2bc..41ddff69e 100644
--- a/pics/crystalsvg/cr32-mime-gf.png
+++ b/pics/crystalsvg/cr32-mime-gf.png
diff --git a/qt-messages.pot b/qt-messages.pot
index 477f8ec2c..e486002c8 100644
--- a/qt-messages.pot
+++ b/qt-messages.pot
@@ -205,7 +205,7 @@ msgid ""
 "_: QT_LAYOUT_DIRECTION\n"
 "Translate this string to the string 'LTR' in left-to-right languages or to "
 "'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper "
-"widget tqlayout."
+"widget layout."
 msgstr ""
 
 #: kernel/qfontdatabase.cpp:1956
diff --git a/win/3rdparty/README.3rdparty b/win/3rdparty/README.3rdparty
index e2f84cf05..5b5066896 100644
--- a/win/3rdparty/README.3rdparty
+++ b/win/3rdparty/README.3rdparty
@@ -11,5 +11,5 @@ Optionally you can also get binaries and copy include files to above
 directories.
 
 You can give up with touching zlib diectory at all if your Qt library
-tqcontains zlib.
+contains zlib.
 
diff --git a/win/asm/socket.h b/win/asm/socket.h
index 56483b4af..3cf450044 100644
--- a/win/asm/socket.h
+++ b/win/asm/socket.h
@@ -44,7 +44,7 @@
 #define SIOCGIFFLAGS    _IOW('s', 101, struct ifreq) /* Get if flags */
 #define SIOCGIFADDR     _IOW('s', 102, struct ifreq) /* Get if addr */
 #define SIOCGIFBRDADDR  _IOW('s', 103, struct ifreq) /* Get if broadcastaddr */
-#define SIOCGIFNETMASK  _IOW('s', 104, struct ifreq) /* Get if nettqmask */
+#define SIOCGIFNETMASK  _IOW('s', 104, struct ifreq) /* Get if netmask */
 #define SIOCGIFHWADDR   _IOW('s', 105, struct ifreq) /* Get hw addr */
 #define SIOCGIFMETRIC   _IOW('s', 106, struct ifreq) /* get metric */
 #define SIOCGIFMTU      _IOW('s', 107, struct ifreq) /* get MTU size */
diff --git a/win/bootstrap.cpp b/win/bootstrap.cpp
index 846d58cbd..9f24f315c 100644
--- a/win/bootstrap.cpp
+++ b/win/bootstrap.cpp
@@ -35,9 +35,9 @@ QEventLoopEx* qeventloopex = 0;
  Additional algorithm for win9x (including Millenium), where are problems with 
  easy setting environment variables:
 
- - try to tqfind HOME env. variable
- - if not found, try to tqfind USERPROFILE env. variable
- - if not found, try to tqfind both HOMEDRIVE and HOMEPATH env. variables
+ - try to find HOME env. variable
+ - if not found, try to find USERPROFILE env. variable
+ - if not found, try to find both HOMEDRIVE and HOMEPATH env. variables
  - if not found, try in the Windows Registry:
    - try get 'Software\KDE' value from HKEY_CURRENT_USER section of Windows Registry
    - if not found, try to get from 
diff --git a/win/common.pro b/win/common.pro
index e7066abb3..669d22d62 100644
--- a/win/common.pro
+++ b/win/common.pro
@@ -12,7 +12,7 @@ exists( custom_defs.pro ) {
 }
 
 # common version info for all libs:
-!tqcontains( CONFIG, kde3lib ) {
+!contains( CONFIG, kde3lib ) {
 	VER_MAJ = $(KDE_VER_MAJ)
 	VER_MIN = $(KDE_VER_MIN)
 	VER_PAT = $(KDE_VER_PAT)
@@ -27,19 +27,19 @@ isEmpty( KW_CONFIG ) {
 }
 
 # release switch has priority over debug
-tqcontains(KW_CONFIG,release) {
+contains(KW_CONFIG,release) {
   CONFIG -= debug
   CONFIG += release
 }
-tqcontains(KW_CONFIG,debug) {
+contains(KW_CONFIG,debug) {
   CONFIG += debug
   CONFIG -= release
 }
-tqcontains(KW_CONFIG,windows) {
+contains(KW_CONFIG,windows) {
   CONFIG += windows
   CONFIG -= console
 }
-tqcontains(KW_CONFIG,console) {
+contains(KW_CONFIG,console) {
   CONFIG -= windows
   CONFIG += console
 }
@@ -55,17 +55,17 @@ KDELIBDESTDIR = $$KDEBINDESTDIR\bin #shared with all binaries
 
 # dlls suffixes for given target
 isEmpty( KDEBUG ) {
-  tqcontains(CONFIG,debug) {
+  contains(CONFIG,debug) {
 		KDEBUG=_d
 		KDELIBDEBUG=_d
 		KDELIBDEBUGLIB=_d.lib
   }
-  !tqcontains(CONFIG,debug) {
+  !contains(CONFIG,debug) {
 		KDEBUG=_
-		tqcontains(CONFIG,kde3lib) {
+		contains(CONFIG,kde3lib) {
 			KDELIBDEBUG=
 		}
-		!tqcontains(CONFIG,kde3lib) {
+		!contains(CONFIG,kde3lib) {
 			KDELIBDEBUG=_
 		}
 		KDELIBDEBUGLIB=.lib
@@ -73,21 +73,21 @@ isEmpty( KDEBUG ) {
 }
 KDELIB_SUFFIX=$$KDEBUG$(KDE_VER).lib
 
-tqcontains( TEMPLATE, app ) {
+contains( TEMPLATE, app ) {
   # default dest dir for "app"
-#  tqcontains(CONFIG,debug) {
+#  contains(CONFIG,debug) {
     DESTDIR = $$KDEBINDESTDIR\bin
 #  }
-#  !tqcontains(CONFIG,debug) {
+#  !contains(CONFIG,debug) {
 #    DESTDIR = $$KDEBINDESTDIR\release-bin
 #  }
-	!tqcontains(CONFIG,nokdecore) {
+	!contains(CONFIG,nokdecore) {
 			LIBS += $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX
 	}
-	!tqcontains(CONFIG,nokdeui) {
+	!contains(CONFIG,nokdeui) {
 			LIBS += $$KDELIBDESTDIR/kdeui$$KDELIB_SUFFIX
 	}
-	!tqcontains(CONFIG,nokdefx) {
+	!contains(CONFIG,nokdefx) {
 			LIBS += $$KDELIBDESTDIR/kdefx$$KDELIB_SUFFIX
 	}
 }
@@ -95,25 +95,25 @@ tqcontains( TEMPLATE, app ) {
 isEmpty( TEMPLATE ) {
   TEMPLATE = lib
 }
-tqcontains( TEMPLATE, lib ) {
+contains( TEMPLATE, lib ) {
 	CONFIG	+= dll
 
 	# indicate that we building a library
 	QMAKE_CXXFLAGS += -DKDE_MAKE_LIB=1
 
 	# lib/kde3 dest dir (for modules)
-	tqcontains( CONFIG, kde3lib ) {
+	contains( CONFIG, kde3lib ) {
 	  DESTDIR = $$KDEBINDESTDIR/lib/kde3
 	  TARGET_EXT = .dll #- no ver. in filename
 	}
-	!tqcontains( CONFIG, kde3lib ) {
+	!contains( CONFIG, kde3lib ) {
 	  DESTDIR = $$KDELIBDESTDIR
 	}
-	tqcontains( CONFIG, kstyle ) {
+	contains( CONFIG, kstyle ) {
 	  DESTDIR = $$KDEBINDESTDIR/lib/kde3/plugins/styles
 	  CONFIG += plugin
 	}
-#  !tqcontains(CONFIG,debug) {
+#  !contains(CONFIG,debug) {
 #    DESTDIR = $$KDEBINDESTDIR\release-lib
 #  }
 
@@ -124,19 +124,19 @@ tqcontains( TEMPLATE, lib ) {
 }
 
 # win32 dependent lib
-!tqcontains( DEFINES, MAKE_KDEWIN32_LIB ) {
+!contains( DEFINES, MAKE_KDEWIN32_LIB ) {
   LIBS += $$KDELIBDESTDIR/kdewin32$$KDELIB_SUFFIX
 }
 
 # libltdl:
-!tqcontains( DEFINES, MAKE_LTDL_LIB ) {
-  !tqcontains( DEFINES, MAKE_KDEWIN32_LIB ) {
+!contains( DEFINES, MAKE_LTDL_LIB ) {
+  !contains( DEFINES, MAKE_KDEWIN32_LIB ) {
     LIBS += $$KDELIBDESTDIR/ltdl$$KDELIB_SUFFIX
     DEFINES += LIBLTDL_DLL_IMPORT
   }
 }
 
-!tqcontains( DEFINES, QT_DLL) {
+!contains( DEFINES, QT_DLL) {
   DEFINES += QT_DLL
 }
 
@@ -161,13 +161,13 @@ QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_EXCEPTIONS_ON # /GX for msvc
 
 # catch Release-Build Errors in Debug Build
 #DISABLED for msvc.net
-#tqcontains( CONFIG, debug ) {
-#	tqcontains( KW_CONFIG, debug ) {
+#contains( CONFIG, debug ) {
+#	contains( KW_CONFIG, debug ) {
 #		QMAKE_CXXFLAGS += /GZ
 #	}
 #}
 
-# create an output file whether or not LINK tqfinds an undefined symbol
+# create an output file whether or not LINK finds an undefined symbol
 # (warning 4006 will be raised instead of error):
 QMAKE_LFLAGS += /FORCE:MULTIPLE
 
@@ -175,24 +175,24 @@ QMAKE_LFLAGS += /FORCE:MULTIPLE
 # a .cpp or .cxx extension, thus .cc files are compiled properly with msvc
 QMAKE_CXXFLAGS += /TP
 
-INCLUDEPATH	+= tqmoc $(KDELIBS)/win $(KDELIBS)
+INCLUDEPATH	+= moc $(KDELIBS)/win $(KDELIBS)
 
-tqcontains(KW_CONFIG,release) {
+contains(KW_CONFIG,release) {
 OBJECTS_DIR = obj_rel
 }
-!tqcontains(KW_CONFIG,release) {
+!contains(KW_CONFIG,release) {
 OBJECTS_DIR = obj
 }
 
-TQMOC_DIR = tqmoc
+MOC_DIR = moc
 
 # enable this to temporary add debug info!
 # CONFIG += debug
 # CONFIG -= release
 
-!tqcontains(CONFIG,debug) {
+!contains(CONFIG,debug) {
 QMAKE_LFLAGS += /NODEFAULTLIB:MSVCRTD /NODEFAULTLIB:MSVCR71D /NODEFAULTLIB:MSVCP71D
 }
-tqcontains(CONFIG,debug) {
+contains(CONFIG,debug) {
 QMAKE_LFLAGS += /NODEFAULTLIB:MSVCRT /NODEFAULTLIB:MSVCR71 /NODEFAULTLIB:MSVCP71 /NODEFAULTLIB:libc
 }
diff --git a/win/dirent.h b/win/dirent.h
index f897c5ad1..2a4edf4c8 100644
--- a/win/dirent.h
+++ b/win/dirent.h
@@ -52,10 +52,10 @@ struct dirent {
 
 /* typedef DIR - not the same as Unix */
 typedef struct {
-    long handle;                /* _tqfindfirst/_tqfindnext handle */
+    long handle;                /* _findfirst/_findnext handle */
     short offset;                /* offset into directory */
     short finished;             /* 1 if there are not more files */
-    struct _tqfinddata_t fileinfo;  /* from _tqfindfirst/_tqfindnext */
+    struct _finddata_t fileinfo;  /* from _findfirst/_findnext */
     char *dir;                  /* the dir we are reading */
     struct dirent dent;         /* the dirent to return */
 } DIR;
diff --git a/win/in.h b/win/in.h
index 936a4b3a5..6a8114586 100644
--- a/win/in.h
+++ b/win/in.h
@@ -121,7 +121,7 @@ struct sockaddr_in
 /*
  * Definitions of the bits in an Internet address integer.
  * On subnets, host and network parts are found according
- * to the subnet tqmask, not these tqmasks.
+ * to the subnet mask, not these masks.
  */
 #define	IN_CLASSA(a)		((((long int) (a)) & 0x80000000) == 0)
 #define	IN_CLASSA_NET		0xff000000
diff --git a/win/kdelibs_global_win.h b/win/kdelibs_global_win.h
index c8882d9d3..dfb3432e8 100644
--- a/win/kdelibs_global_win.h
+++ b/win/kdelibs_global_win.h
@@ -141,7 +141,7 @@ typedef int mode_t;
 /* warning C4150: deletion of pointer to incomplete type 'type'; no destructor called
 
 The delete operator was called to delete the given type, which was 
-declared but not defined. The compiler was unable to tqfind any destructors for the given type.
+declared but not defined. The compiler was unable to find any destructors for the given type.
 */
 #pragma warning( disable: 4150 )
 
diff --git a/win/pro_files/README.pro_files b/win/pro_files/README.pro_files
index ba0a915f0..2192750f3 100644
--- a/win/pro_files/README.pro_files
+++ b/win/pro_files/README.pro_files
@@ -3,7 +3,7 @@ kdelibs/win32 .pro files
 (c) 2003-2005, Jaroslaw Staniek
 
 Add this directory to your PATH.
-Cygwin or (other bash tqreplacement) required.
+Cygwin or (other bash replacement) required.
 
 Please copy .pro files to destination kdelibs/ 
 subdirectores using update_kdelibs_pro_files scipt.
diff --git a/win/pro_files/dcop/KDE-ICE/KDE-ICE.pro b/win/pro_files/dcop/KDE-ICE/KDE-ICE.pro
index 6057fe6c1..d74a769a8 100644
--- a/win/pro_files/dcop/KDE-ICE/KDE-ICE.pro
+++ b/win/pro_files/dcop/KDE-ICE/KDE-ICE.pro
@@ -6,7 +6,7 @@ DEFINES += ICE_t TRANS_SERVER TRANS_CLIENT SOCKCONN TCPCONN ANSICPP
 
 TARGET = kdeice$$KDEBUG$(KDE_VER)
 
-system( bash ktqmoc )
+system( bash kmoc )
 
 DEF_FILE = kde-ice.def
 
diff --git a/win/pro_files/dcop/client/client.pro b/win/pro_files/dcop/client/client.pro
index 44ae9ff67..4df64db5b 100644
--- a/win/pro_files/dcop/client/client.pro
+++ b/win/pro_files/dcop/client/client.pro
@@ -9,9 +9,9 @@ DEFINES += KDECORE_EXPORT=
 
 TARGET		= dcopclient
 
-#system( bash ktqmoc .. )
+#system( bash kmoc .. )
 
-#INCLUDEPATH += .. ../tqmoc
+#INCLUDEPATH += .. ../moc
 
 LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX
 
diff --git a/win/pro_files/dcop/client/dcop/dcop.pro b/win/pro_files/dcop/client/dcop/dcop.pro
index bafeb4fb6..99911eedb 100644
--- a/win/pro_files/dcop/client/dcop/dcop.pro
+++ b/win/pro_files/dcop/client/dcop/dcop.pro
@@ -9,9 +9,9 @@ DEFINES += KDECORE_EXPORT=
 
 TARGET		= dcop
 
-#system( bash ktqmoc .. )
+#system( bash kmoc .. )
 
-#INCLUDEPATH += .. ../tqmoc
+#INCLUDEPATH += .. ../moc
 
 LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX
 
diff --git a/win/pro_files/dcop/client/dcopfind/dcopfind.pro b/win/pro_files/dcop/client/dcopfind/dcopfind.pro
index 3239526f0..315dcf5a2 100644
--- a/win/pro_files/dcop/client/dcopfind/dcopfind.pro
+++ b/win/pro_files/dcop/client/dcopfind/dcopfind.pro
@@ -7,12 +7,12 @@ include( $(KDELIBS)/win/common.pro )
 
 DEFINES += KDECORE_EXPORT=
 
-TARGET		= dcoptqfind
+TARGET		= dcopfind
 
-#system( bash ktqmoc .. )
+#system( bash kmoc .. )
 
-#INCLUDEPATH += .. ../tqmoc
+#INCLUDEPATH += .. ../moc
 
 LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX
 
-SOURCES	+= ../dcoptqfind.cpp
+SOURCES	+= ../dcopfind.cpp
diff --git a/win/pro_files/dcop/client/dcopref/dcopref.pro b/win/pro_files/dcop/client/dcopref/dcopref.pro
index babd68f90..13370884c 100644
--- a/win/pro_files/dcop/client/dcopref/dcopref.pro
+++ b/win/pro_files/dcop/client/dcopref/dcopref.pro
@@ -9,9 +9,9 @@ DEFINES += KDECORE_EXPORT=
 
 TARGET		= dcopref
 
-#system( bash ktqmoc .. )
+#system( bash kmoc .. )
 
-#INCLUDEPATH += .. ../tqmoc
+#INCLUDEPATH += .. ../moc
 
 LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX
 
diff --git a/win/pro_files/dcop/dcop.pro b/win/pro_files/dcop/dcop.pro
index 885d3cc90..7758cbb7b 100644
--- a/win/pro_files/dcop/dcop.pro
+++ b/win/pro_files/dcop/dcop.pro
@@ -7,7 +7,7 @@ DEFINES += MAKE_DCOP_LIB
 
 TARGET		= dcop$$KDEBUG
 
-system( bash ktqmoc )
+system( bash kmoc )
 
 LIBS += $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX
 
diff --git a/win/pro_files/dcop/dcopserver/dcopserver.pro b/win/pro_files/dcop/dcopserver/dcopserver.pro
index a16c3ae4e..46c7b31e9 100644
--- a/win/pro_files/dcop/dcopserver/dcopserver.pro
+++ b/win/pro_files/dcop/dcopserver/dcopserver.pro
@@ -9,9 +9,9 @@ DEFINES += MAKE_DCOP_LIB
 
 TARGET		= dcopserver
 
-system( bash ktqmoc .. )
+system( bash kmoc .. )
 
-INCLUDEPATH += .. ../tqmoc
+INCLUDEPATH += .. ../moc
 
 LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX
 
diff --git a/win/pro_files/dcop/dcopserver_shutdown/dcopserver_shutdown.pro b/win/pro_files/dcop/dcopserver_shutdown/dcopserver_shutdown.pro
index 423e69ac9..c08d3c192 100644
--- a/win/pro_files/dcop/dcopserver_shutdown/dcopserver_shutdown.pro
+++ b/win/pro_files/dcop/dcopserver_shutdown/dcopserver_shutdown.pro
@@ -8,9 +8,9 @@ DEFINES += MAKE_DCOP_LIB
 
 TARGET		= dcopserver_shutdown
 
-system( bash ktqmoc .. )
+system( bash kmoc .. )
 
-INCLUDEPATH += .. ../tqmoc
+INCLUDEPATH += .. ../moc
 
 LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX
 
diff --git a/win/pro_files/dcop/testdcop/testdcop.pro b/win/pro_files/dcop/testdcop/testdcop.pro
index 55fbb8369..9876e2815 100644
--- a/win/pro_files/dcop/testdcop/testdcop.pro
+++ b/win/pro_files/dcop/testdcop/testdcop.pro
@@ -5,9 +5,9 @@ include( $(KDELIBS)/win/common.pro )
 TARGET = testdcop
 DESTDIR = .
 
-system( bash ktqmoc .. )
+system( bash kmoc .. )
 
-INCLUDEPATH += ../tqmoc
+INCLUDEPATH += ../moc
 
 LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX
 
diff --git a/win/pro_files/dcop/tests/dcop_test.pro b/win/pro_files/dcop/tests/dcop_test.pro
index 9a06150cc..4b390dd1d 100644
--- a/win/pro_files/dcop/tests/dcop_test.pro
+++ b/win/pro_files/dcop/tests/dcop_test.pro
@@ -5,10 +5,10 @@ include( $(KDELIBS)/win/common.pro )
 TARGET = dcop_test
 DESTDIR = .
 
-system( bash ktqmoc )
+system( bash kmoc )
 system( bash kdcopidl )
 
-INCLUDEPATH += .. ../tqmoc
+INCLUDEPATH += .. ../moc
 
 LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX
 
diff --git a/win/pro_files/dcop/tests/driver.pro b/win/pro_files/dcop/tests/driver.pro
index a82c8f3f1..215a8596e 100644
--- a/win/pro_files/dcop/tests/driver.pro
+++ b/win/pro_files/dcop/tests/driver.pro
@@ -5,10 +5,10 @@ include( $(KDELIBS)/win/common.pro )
 TARGET = driver
 DESTDIR = .
 
-system( bash ktqmoc )
+system( bash kmoc )
 system( bash kdcopidl )
 
-INCLUDEPATH += .. ../tqmoc
+INCLUDEPATH += .. ../moc
 
 LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX
 
diff --git a/win/pro_files/dcop/tests/tests.pro b/win/pro_files/dcop/tests/tests.pro
index 1799041ed..fd5d7cab5 100644
--- a/win/pro_files/dcop/tests/tests.pro
+++ b/win/pro_files/dcop/tests/tests.pro
@@ -7,9 +7,9 @@ DEFINES += MAKE_DCOP_LIB
 
 TARGET		= testdcop
 
-system( bash ktqmoc .. )
+system( bash kmoc .. )
 
-INCLUDEPATH += .. ../tqmoc
+INCLUDEPATH += .. ../moc
 
 LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX
 
diff --git a/win/pro_files/interfaces/ktexteditor/ktexteditor.pro b/win/pro_files/interfaces/ktexteditor/ktexteditor.pro
index c7d9891dd..45678e6ff 100644
--- a/win/pro_files/interfaces/ktexteditor/ktexteditor.pro
+++ b/win/pro_files/interfaces/ktexteditor/ktexteditor.pro
@@ -14,7 +14,7 @@ INCLUDEPATH += $(KDELIBS)/interfaces $(KDELIBS)/interfaces/ktexteditor \
 
 TARGET		= ktexteditor$$KDEBUG
 
-system( bash ktqmoc )
+system( bash kmoc )
 system( bash kdcopidl )
 
 SOURCES = \
diff --git a/win/pro_files/kabc/kabc.pro b/win/pro_files/kabc/kabc.pro
index 0070c1c96..d7826b319 100644
--- a/win/pro_files/kabc/kabc.pro
+++ b/win/pro_files/kabc/kabc.pro
@@ -11,7 +11,7 @@ LIBS += $$KDELIBDESTDIR\kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\kdeui$$KDELIB_SUF
 INCLUDEPATH += $(KDELIBS)/kabc/vcard/include $(KDELIBS)/kabc/vcard/include/generated \
 	$(KDELIBS)/kabc/vcardparser
 
-system( bash ktqmoc )
+system( bash kmoc )
 system( bash kdcopidl )
 system( cd scripts && perl.exe makeaddressee )
 
diff --git a/win/pro_files/kabc/vcard/vcard.pro b/win/pro_files/kabc/vcard/vcard.pro
index 22709c549..7ccf215bc 100644
--- a/win/pro_files/kabc/vcard/vcard.pro
+++ b/win/pro_files/kabc/vcard/vcard.pro
@@ -10,7 +10,7 @@ LIBS += $$KDELIBDESTDIR\kdecore$$KDELIB_SUFFIX
 INCLUDEPATH += $(KDELIBS)/kabc/vcard/include $(KDELIBS)/kabc/vcard/include/generated \
 	$(KDELIBS)/kabc/vcardparser
 
-system( bash ktqmoc )
+system( bash kmoc )
 system( bash kdcopidl )
 
 TARGET		= kvcard$$KDEBUG
diff --git a/win/pro_files/kate/interfaces/interfaces.pro b/win/pro_files/kate/interfaces/interfaces.pro
index 78750e008..e327fed37 100644
--- a/win/pro_files/kate/interfaces/interfaces.pro
+++ b/win/pro_files/kate/interfaces/interfaces.pro
@@ -13,7 +13,7 @@ LIBS += $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeui$$KDELIB_SUF
 
 INCLUDEPATH += $(KDELIBS)/interfaces
 
-system( bash ktqmoc )
+system( bash kmoc )
 
 SOURCES = \
 katecmd.cpp \
diff --git a/win/pro_files/kate/part/part.pro b/win/pro_files/kate/part/part.pro
index b1f8fb64d..82a9aa046 100644
--- a/win/pro_files/kate/part/part.pro
+++ b/win/pro_files/kate/part/part.pro
@@ -17,7 +17,7 @@ LIBS += $$KDELIBDESTDIR/katepartinterfaces$$KDELIB_SUFFIX \
 INCLUDEPATH += $(KDELIBS)/interfaces $(KDELIBS)/interfaces/kregexpeditor \
 	$(KDELIBS)/kutils $(KDELIBS)/kdeprint
 
-system( bash ktqmoc )
+system( bash kmoc )
 system( bash kdcopidl )
 
 SOURCES = \
diff --git a/win/pro_files/kdecore/kconfig_compiler/kconfig_compiler.pro b/win/pro_files/kdecore/kconfig_compiler/kconfig_compiler.pro
index fe0a85fd5..5b8272185 100644
--- a/win/pro_files/kdecore/kconfig_compiler/kconfig_compiler.pro
+++ b/win/pro_files/kdecore/kconfig_compiler/kconfig_compiler.pro
@@ -9,7 +9,7 @@ win32 {
 #CONFIG += windows
 }
 
-#system( bash ktqmoc )
+#system( bash kmoc )
 
 SOURCES = kconfig_compiler.cpp
 
diff --git a/win/pro_files/kdecore/kdecore.pro b/win/pro_files/kdecore/kdecore.pro
index 58093bb64..183835a43 100644
--- a/win/pro_files/kdecore/kdecore.pro
+++ b/win/pro_files/kdecore/kdecore.pro
@@ -14,7 +14,7 @@ TARGET		= kdecore$$KDEBUG
 
 INCLUDEPATH += $(KDELIBS)/libltdl $(KDELIBS)/kdecore/network
 
-system( bash ktqmoc )
+system( bash kmoc )
 system( bash kdcopidl )
 
 SOURCES += \
diff --git a/win/pro_files/kded/kded.pro b/win/pro_files/kded/kded.pro
index 2c97c420a..05f2455cc 100644
--- a/win/pro_files/kded/kded.pro
+++ b/win/pro_files/kded/kded.pro
@@ -9,13 +9,13 @@ LIBS+=$(KDELIBS)/win/resources/kbuildsycoca.res
 
 INCLUDEPATH += $(KDELIBS)/kded
 
-system( bash ktqmoc )
+system( bash kmoc )
 
-!tqcontains(CONFIG,GUI) {
-	!tqcontains(KW_CONFIG,release) {
+!contains(CONFIG,GUI) {
+	!contains(KW_CONFIG,release) {
 		TARGET = kbuildsycoca_d
 	}
-	tqcontains(KW_CONFIG,release) {
+	contains(KW_CONFIG,release) {
 		TARGET = kbuildsycoca
 	}
 }
diff --git a/win/pro_files/kded/kded_rel.pro b/win/pro_files/kded/kded_rel.pro
index 7c37884b7..a878305ba 100644
--- a/win/pro_files/kded/kded_rel.pro
+++ b/win/pro_files/kded/kded_rel.pro
@@ -2,7 +2,7 @@
 
 QMAKE_CXXFLAGS += -DKBUILDSYCOCA_GUI
 
-!tqcontains(KW_CONFIG,release) {
+!contains(KW_CONFIG,release) {
 	KW_CONFIG = debug windows
 	KDEBUG=_d
 }
diff --git a/win/pro_files/kdefx/kdefx.pro b/win/pro_files/kdefx/kdefx.pro
index 7d84f2b3a..6c9ba4a22 100644
--- a/win/pro_files/kdefx/kdefx.pro
+++ b/win/pro_files/kdefx/kdefx.pro
@@ -8,7 +8,7 @@ DEFINES += MAKE_KDEFX_LIB
 
 TARGET		= kdefx$$KDEBUG
 
-system( bash ktqmoc )
+system( bash kmoc )
 
 SOURCES = \
 kimageeffect.cpp \
diff --git a/win/pro_files/kdefx/kdefx_rel.pro b/win/pro_files/kdefx/kdefx_rel.pro
index 0062498bd..177836f03 100644
--- a/win/pro_files/kdefx/kdefx_rel.pro
+++ b/win/pro_files/kdefx/kdefx_rel.pro
@@ -10,7 +10,7 @@ include( $(KDELIBS)/win/common.pro )
 # needed to export library classes:
 DEFINES += MAKE_KDEFX_LIB
 
-system( tqmoc kstyle.h -o tqmoc/kstyle.moc )
+system( moc kstyle.h -o moc/kstyle.moc )
 
 LIBS -= "$(KDEDIR)\lib\kdewin32_$(KDE_VER).lib" "$(KDEDIR)\lib\ltdl_$(KDE_VER).lib"
 
diff --git a/win/pro_files/kdeui/kdeui.pro b/win/pro_files/kdeui/kdeui.pro
index 3d4b259a5..13404b3a8 100644
--- a/win/pro_files/kdeui/kdeui.pro
+++ b/win/pro_files/kdeui/kdeui.pro
@@ -9,7 +9,7 @@ DEFINES += MAKE_KDEUI_LIB
 LIBS += $$KDELIBDESTDIR\kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\kdefx$$KDELIB_SUFFIX \
 	$$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX 
 
-system( bash ktqmoc )
+system( bash kmoc )
 system( bash kdcopidl )
 
 TARGET		= kdeui$$KDEBUG
diff --git a/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro b/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro
index 51ece483a..8bf29bf90 100644
--- a/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro
+++ b/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro
@@ -17,9 +17,9 @@ LIBS +=  $$KDELIBDESTDIR/kdefx$$KDELIB_SUFFIX \
   $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX
 
 # icon
-LIBS+=$(KDELIBS)/win/resources/ktqfind.res
+LIBS+=$(KDELIBS)/win/resources/kfind.res
 
-system( bash ktqmoc )
+system( bash kmoc )
 
 SOURCES = \
 kfiletreeviewtest.cpp
diff --git a/win/pro_files/kio/kio.pro b/win/pro_files/kio/kio.pro
index e41f7a0bd..9e3144856 100644
--- a/win/pro_files/kio/kio.pro
+++ b/win/pro_files/kio/kio.pro
@@ -9,17 +9,17 @@ DEFINES += MAKE_KIO_LIB
 LIBS += $$KDELIBDESTDIR\kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\kdeui$$KDELIB_SUFFIX \
 	$$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\kdewin32$$KDELIB_SUFFIX
 
-system( bash ktqmoc kio kfile misc bookmarks kssl )
+system( bash kmoc kio kfile misc bookmarks kssl )
 
 TARGET = kio$$KDEBUG
 
 INCLUDEPATH += $(KDELIBS)/kdecore/network $(KDELIBS)/kio/kio $(KDELIBS)/kio/misc $(KDELIBS)/kio/bookmarks \
   $(KDELIBS)/kio/kssl \
   $(KDELIBS)/libltdl $(KDELIBS)/interfaces \
-  $(KDELIBS)/kio/kio/tqmoc $(KDELIBS)/kio/misc/tqmoc $(KDELIBS)/kio/kfile/tqmoc \
-  $(KDELIBS)/kio/misc/tqmoc \
-  $(KDELIBS)/kio/bookmarks/tqmoc \
-  $(KDELIBS)/kio/kssl/tqmoc $(KDELIBS)/kwallet/client 
+  $(KDELIBS)/kio/kio/moc $(KDELIBS)/kio/misc/moc $(KDELIBS)/kio/kfile/moc \
+  $(KDELIBS)/kio/misc/moc \
+  $(KDELIBS)/kio/bookmarks/moc \
+  $(KDELIBS)/kio/kssl/moc $(KDELIBS)/kwallet/client 
 
 system( cd kio && dcopidl kdirnotify.h > kdirnotify.kidl && dcopidl2cpp --no-stub kdirnotify.kidl )
 system( cd kio && dcopidl observer.h > observer.kidl && dcopidl2cpp observer.kidl )
diff --git a/win/pro_files/kmdi/kmdi.pro b/win/pro_files/kmdi/kmdi.pro
index 73b680565..1f425b465 100644
--- a/win/pro_files/kmdi/kmdi.pro
+++ b/win/pro_files/kmdi/kmdi.pro
@@ -13,7 +13,7 @@ LIBS += $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeui$$KDELIB_SUF
 
 INCLUDEPATH += res $(KDELIBS)/kutils $(KDELIBS)/kdeui
 
-system( bash ktqmoc )
+system( bash kmoc )
 
 SOURCES = \
 kmdichildarea.cpp \
diff --git a/win/pro_files/kmdi/test/test.pro b/win/pro_files/kmdi/test/test.pro
index 8f19d2c8a..85216ebb0 100644
--- a/win/pro_files/kmdi/test/test.pro
+++ b/win/pro_files/kmdi/test/test.pro
@@ -9,7 +9,7 @@ CONFIG -= windows
 CONFIG += debug
 CONFIG += console
 
-unix:DEFINES   = NO_INCLUDE_TQMOCFILES QT_NO_COMPAT
+unix:DEFINES   = NO_INCLUDE_MOCFILES QT_NO_COMPAT
 unix:LIBS       += -lkmdi -L$(KDEDIR)/lib -lkdecore -lkdeui -lDCOP -lkparts
 unix:INCLUDEPATH     += . .. $(KDEDIR)/include
 
diff --git a/win/pro_files/kparts/kparts.pro b/win/pro_files/kparts/kparts.pro
index 809eeee31..19b68a16b 100644
--- a/win/pro_files/kparts/kparts.pro
+++ b/win/pro_files/kparts/kparts.pro
@@ -13,7 +13,7 @@ LIBS += $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeui$$KDELIB_SUF
 
 INCLUDEPATH += $(KDELIBS)/kio/kfile
 
-system( bash ktqmoc )
+system( bash kmoc )
 
 SOURCES = \
 browserextension.cpp \
diff --git a/win/pro_files/kresources/kresources.pro b/win/pro_files/kresources/kresources.pro
index 0d4525319..d729b82ed 100644
--- a/win/pro_files/kresources/kresources.pro
+++ b/win/pro_files/kresources/kresources.pro
@@ -11,7 +11,7 @@ INCLUDEPATH	+= $(KDELIBS)/ab
 LIBS += $$KDELIBDESTDIR\kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\kdeui$$KDELIB_SUFFIX \
 	$$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\kio$$KDELIB_SUFFIX 
 
-system( bash ktqmoc )
+system( bash kmoc )
 system( bash kdcopidl )
 
 TARGET = kresources$$KDEBUG
diff --git a/win/pro_files/kstyles/activeheart/widget-engine/widget-engine.pro b/win/pro_files/kstyles/activeheart/widget-engine/widget-engine.pro
index 1d7aea90e..9245377cc 100644
--- a/win/pro_files/kstyles/activeheart/widget-engine/widget-engine.pro
+++ b/win/pro_files/kstyles/activeheart/widget-engine/widget-engine.pro
@@ -1,6 +1,6 @@
 include( ../../common.pro )
 
-system( bash ktqmoc )
+system( bash kmoc )
 system( qmake genembed.pro -o Makefile.genembed )
 system( nmake /f Makefile.genembed clean )
 system( nmake /f Makefile.genembed )
diff --git a/win/pro_files/kstyles/dotNET/dotnet/dotnet.pro b/win/pro_files/kstyles/dotNET/dotnet/dotnet.pro
index 69a42f1cb..d9ca9d8c3 100644
--- a/win/pro_files/kstyles/dotNET/dotnet/dotnet.pro
+++ b/win/pro_files/kstyles/dotNET/dotnet/dotnet.pro
@@ -5,6 +5,6 @@ TARGET		= dotnet$$KDEBUG
 SOURCES = \
 dotnet.cpp
 
-system( tqmoc dotnet.h -o tqmoc/dotnet.moc )
+system( moc dotnet.h -o moc/dotnet.moc )
 
 
diff --git a/win/pro_files/kstyles/highcolor/highcolor.pro b/win/pro_files/kstyles/highcolor/highcolor.pro
index 1f6b78563..57bfca812 100644
--- a/win/pro_files/kstyles/highcolor/highcolor.pro
+++ b/win/pro_files/kstyles/highcolor/highcolor.pro
@@ -2,7 +2,7 @@ include( ../common.pro )
 
 TARGET		= highcolor$$KDEBUG
 
-system( bash ktqmoc )
+system( bash kmoc )
 
 SOURCES = \
 highcolor.cpp
diff --git a/win/pro_files/kstyles/keramik/keramik.pro b/win/pro_files/kstyles/keramik/keramik.pro
index 378bed9cc..42094301c 100644
--- a/win/pro_files/kstyles/keramik/keramik.pro
+++ b/win/pro_files/kstyles/keramik/keramik.pro
@@ -2,7 +2,7 @@ include( ../common.pro )
 
 TARGET		= keramik$$KDEBUG
 
-system( bash ktqmoc )
+system( bash kmoc )
 
 SOURCES = \
 colorutil.cpp \
diff --git a/win/pro_files/kstyles/klegacy/klegacy.pro b/win/pro_files/kstyles/klegacy/klegacy.pro
index 0694312ce..1f280202c 100644
--- a/win/pro_files/kstyles/klegacy/klegacy.pro
+++ b/win/pro_files/kstyles/klegacy/klegacy.pro
@@ -2,7 +2,7 @@ include( ../common.pro )
 
 TARGET		= klegacy$$KDEBUG
 
-system( bash ktqmoc )
+system( bash kmoc )
 
 SOURCES = \
 klegacystyle.cpp
diff --git a/win/pro_files/kstyles/kthemestyle/themestyle.pro b/win/pro_files/kstyles/kthemestyle/themestyle.pro
index 606791e3d..773030b6b 100644
--- a/win/pro_files/kstyles/kthemestyle/themestyle.pro
+++ b/win/pro_files/kstyles/kthemestyle/themestyle.pro
@@ -9,7 +9,7 @@ kthemestyle.cpp \
 kthemebase.cpp \
 kstyledirs.cpp
 
-system( tqmoc kthemestyle.h -o tqmoc/kthemestyle.moc )
-system( tqmoc kthemebase.h -o tqmoc/kthemebase.moc )
+system( moc kthemestyle.h -o moc/kthemestyle.moc )
+system( moc kthemebase.h -o moc/kthemebase.moc )
 
 
diff --git a/win/pro_files/kstyles/light/light.pro b/win/pro_files/kstyles/light/light.pro
index ef5ec7781..025158c3a 100644
--- a/win/pro_files/kstyles/light/light.pro
+++ b/win/pro_files/kstyles/light/light.pro
@@ -2,7 +2,7 @@ include( ../common.pro )
 
 TARGET		= light$$KDEBUG
 
-system( bash ktqmoc )
+system( bash kmoc )
 
 SOURCES = \
 light.cpp \
diff --git a/win/pro_files/kstyles/plastik/plastik.pro b/win/pro_files/kstyles/plastik/plastik.pro
index 9c8ba7570..51937369c 100644
--- a/win/pro_files/kstyles/plastik/plastik.pro
+++ b/win/pro_files/kstyles/plastik/plastik.pro
@@ -2,7 +2,7 @@ include( ../common.pro )
 
 TARGET = plastik$$KDEBUG
 
-system( bash ktqmoc )
+system( bash kmoc )
 
 SOURCES = \
 plastik.cpp \
diff --git a/win/pro_files/kstyles/slickerstyle/slicker/slicker.pro b/win/pro_files/kstyles/slickerstyle/slicker/slicker.pro
index 574269bd5..0f7bab178 100644
--- a/win/pro_files/kstyles/slickerstyle/slicker/slicker.pro
+++ b/win/pro_files/kstyles/slickerstyle/slicker/slicker.pro
@@ -2,7 +2,7 @@ include( ../../common.pro )
 
 TARGET		= slicker$$KDEBUG
 
-system( bash ktqmoc )
+system( bash kmoc )
 
 SOURCES = \
 slicker.cpp
\ No newline at end of file
diff --git a/win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro b/win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro
index f4ebff204..37e637ed7 100644
--- a/win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro
+++ b/win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro
@@ -13,10 +13,10 @@ win32 {
 DESTDIR=.
 
 
-tqcontains( KW_CONFIG, release ) {
+contains( KW_CONFIG, release ) {
 TARGET		= genembed_rel
 }
-!tqcontains( KW_CONFIG, release ) {
+!contains( KW_CONFIG, release ) {
 TARGET		= genembed
 }
 
diff --git a/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro b/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro
index f45373c78..66346be7d 100644
--- a/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro
+++ b/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro
@@ -4,8 +4,8 @@
 TEMPLATE	= lib
 
 unix { 
-	INCLUDEPATH += tqmoc
-	#force tqfinding libraries in current dir (for installer, etc):
+	INCLUDEPATH += moc
+	#force finding libraries in current dir (for installer, etc):
 	QMAKE_LFLAGS += -Wl,-rpath,.
 	DEFINES += KDEFX_EXPORT=
 }
@@ -42,8 +42,8 @@ SOURCES += \
 ../../../kdefx/kpixmapeffect.cpp \
 ../../../kdefx/kpixmap.cpp
 
-system( tqmoc thinkeramik.h -o tqmoc/thinkeramik.moc )
-system( tqmoc ../../../kdefx/kstyle.h -o tqmoc/kstyle.moc )
+system( moc thinkeramik.h -o moc/thinkeramik.moc )
+system( moc ../../../kdefx/kstyle.h -o moc/kstyle.moc )
 
 
 system( bash ./genemb.sh )
diff --git a/win/pro_files/kstyles/thinkeramik/widget-engine/widget-engine.pro b/win/pro_files/kstyles/thinkeramik/widget-engine/widget-engine.pro
index 20c289549..41181415f 100644
--- a/win/pro_files/kstyles/thinkeramik/widget-engine/widget-engine.pro
+++ b/win/pro_files/kstyles/thinkeramik/widget-engine/widget-engine.pro
@@ -3,12 +3,12 @@ include( ../../common.pro )
 TARGET		= thinkeramik$$KDEBUG
 
 unix { 
-	INCLUDEPATH += tqmoc
-	#force tqfinding libraries in current dir (for installer, etc):
+	INCLUDEPATH += moc
+	#force finding libraries in current dir (for installer, etc):
 	QMAKE_LFLAGS += -Wl,-rpath,.
 }
 
-system( bash ktqmoc )
+system( bash kmoc )
 
 SOURCES = \
 colorutil.cpp \
@@ -16,11 +16,11 @@ gradients.cpp \
 thinkeramik.cpp \
 pixmaploader.cpp
 
-tqcontains( KW_CONFIG, release ) {
+contains( KW_CONFIG, release ) {
 	system( bash ./genemb.sh _rel )
 }
 
-!tqcontains( KW_CONFIG, release ) {
+!contains( KW_CONFIG, release ) {
 	system( bash ./genemb.sh )
 }
 
diff --git a/win/pro_files/kutils/kutils.pro b/win/pro_files/kutils/kutils.pro
index b2eae16be..5f07d4673 100644
--- a/win/pro_files/kutils/kutils.pro
+++ b/win/pro_files/kutils/kutils.pro
@@ -13,14 +13,14 @@ LIBS += $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeui$$KDELIB_SUF
 
 INCLUDEPATH += $(KDELIBS)/interfaces/kregexpeditor
 
-system( bash ktqmoc )
+system( bash kmoc )
 
 SOURCES = \
-ktqfind.cpp \
-ktqfinddialog.cpp \
+kfind.cpp \
+kfinddialog.cpp \
 kmultitabbar.cpp \
 kplugininfo.cpp \
-ktqreplace.cpp \
-ktqreplacedialog.cpp
+kreplace.cpp \
+kreplacedialog.cpp
 
 HEADERS		=
diff --git a/win/qeventloopex.cpp b/win/qeventloopex.cpp
index 9db6bd133..da5eba60c 100644
--- a/win/qeventloopex.cpp
+++ b/win/qeventloopex.cpp
@@ -263,7 +263,7 @@ void QEventLoopEx::unregisterSocketNotifier( TQSocketNotifier *notifier )
 		SetEvent(d->m_evPendingListEmpty);
 	list->remove(); // remove notifier found above
 
-	if ( d->sn_highest == sockfd ) {// tqfind highest fd
+	if ( d->sn_highest == sockfd ) {// find highest fd
 		d->sn_highest = -1;
 		for ( int i=0; i<3; i++ ) {
 			if ( d->sn_vec[i].list && ! d->sn_vec[i].list->isEmpty() )
@@ -433,7 +433,7 @@ void QEventLoopEx::run()
 			if (WSAGetLastError() == WSAENOTSOCK) {
 
 				
-				// it seems a socket notifier has a bad fd... tqfind out
+				// it seems a socket notifier has a bad fd... find out
 				// which one it is and disable it
 				fd_set fdset;
 				struct timeval zerotm;
diff --git a/win/readdir.c b/win/readdir.c
index 0bd9d6ca2..501e777b0 100644
--- a/win/readdir.c
+++ b/win/readdir.c
@@ -94,7 +94,7 @@ KDEWIN32_EXPORT DIR * opendir(const char *dir)
     dp->finished = 0;
     dp->dir = strdup(dir);
 
-    if ((handle = _tqfindfirst(filespec, &(dp->fileinfo))) < 0) {
+    if ((handle = _findfirst(filespec, &(dp->fileinfo))) < 0) {
         if (errno == ENOENT)
             dp->finished = 1;
         else
@@ -112,7 +112,7 @@ KDEWIN32_EXPORT struct dirent * readdir(DIR *dp)
     if (!dp || dp->finished) return NULL;
 
     if (dp->offset != 0) {
-        if (_tqfindnext(dp->handle, &(dp->fileinfo)) < 0) {
+        if (_findnext(dp->handle, &(dp->fileinfo)) < 0) {
             dp->finished = 1;
             return NULL;
         }
@@ -137,7 +137,7 @@ KDEWIN32_EXPORT struct dirent* readdir_r(DIR *dirp, struct dirent *entry, struct
 KDEWIN32_EXPORT int closedir(DIR *dp)
 {
     if (!dp) return 0;
-    _tqfindclose(dp->handle);
+    _findclose(dp->handle);
     if (dp->dir) free(dp->dir);
     if (dp) free(dp);
 
diff --git a/win/readdir.h b/win/readdir.h
index 82d18d2f5..d2330844c 100644
--- a/win/readdir.h
+++ b/win/readdir.h
@@ -88,10 +88,10 @@ struct dirent {
 
 /* typedef DIR - not the same as Unix */
 typedef struct {
-    long handle;                /* _tqfindfirst/_tqfindnext handle */
+    long handle;                /* _findfirst/_findnext handle */
     short offset;                /* offset into directory */
     short finished;             /* 1 if there are not more files */
-    struct _tqfinddata_t fileinfo;  /* from _tqfindfirst/_tqfindnext */
+    struct _finddata_t fileinfo;  /* from _findfirst/_findnext */
     char *dir;                  /* the dir we are reading */
     struct dirent dent;         /* the dirent to return */
 } DIR;
diff --git a/win/syslog.c b/win/syslog.c
index 01280cf3f..f2a754298 100644
--- a/win/syslog.c
+++ b/win/syslog.c
@@ -29,7 +29,7 @@ KDEWIN32_EXPORT void openlog (const char *ident , int option , int facility)
 	/*! @todo */
 }
 
-KDEWIN32_EXPORT int setlogtqmask (int priority)
+KDEWIN32_EXPORT int setlogmask (int priority)
 {
 	/*! @todo */
 	return 0;
diff --git a/win/syslog.h b/win/syslog.h
index 6b2157517..d5d7ea27a 100644
--- a/win/syslog.h
+++ b/win/syslog.h
@@ -89,7 +89,7 @@ extern "C" {
 
 KDEWIN32_EXPORT void closelog (void);
 KDEWIN32_EXPORT void openlog (const char *ident , int option , int facility);
-KDEWIN32_EXPORT int setlogtqmask (int priority);
+KDEWIN32_EXPORT int setlogmask (int priority);
 KDEWIN32_EXPORT void syslog (int priority, const char * format, ...);
 
 #ifdef __cplusplus
diff --git a/win/tools/README.tools b/win/tools/README.tools
index eebc2f7e0..35b3a5264 100644
--- a/win/tools/README.tools
+++ b/win/tools/README.tools
@@ -3,4 +3,4 @@ kdelibs/win32 build tools
 (c) 2003-2005, Jaroslaw Staniek
 
 Add this directory to your PATH.
-Cygwin (or other bash tqreplacement) required.
+Cygwin (or other bash replacement) required.
diff --git a/win/tools/collect_kdelibs_pro_files b/win/tools/collect_kdelibs_pro_files
index 01ec3c427..ea2466ef2 100755
--- a/win/tools/collect_kdelibs_pro_files
+++ b/win/tools/collect_kdelibs_pro_files
@@ -11,7 +11,7 @@ mkdir -p $dest
 
 cd "$KDELIBS"
 
-for pro in `tqfind . -name \*.pro | grep -v "\/\.\|^\.\/win/"` kded/makeall.sh kded/makeall_rel.sh ; do
+for pro in `find . -name \*.pro | grep -v "\/\.\|^\.\/win/"` kded/makeall.sh kded/makeall_rel.sh ; do
 	dir=`dirname "$pro"`
 	mkdir -p "$dest/$dir"
 	if [ "$pro" -nt "$dest/$pro" ] ; then
diff --git a/win/tools/kdcopidl b/win/tools/kdcopidl
index 406b35cfc..f695659d7 100755
--- a/win/tools/kdcopidl
+++ b/win/tools/kdcopidl
@@ -9,7 +9,7 @@ else
  dir="."
 fi
 
-tqfind $dir -maxdepth 1 -name \*.h | while read ; do 
+find $dir -maxdepth 1 -name \*.h | while read ; do 
 	grep K_DCOP $REPLY > /dev/null || continue
 	name=`echo $REPLY | sed -e "s/\\.h//"`
 	if [ $name".kidl" -ot $REPLY -o ! -f $name".kidl" -o ! -f $name"_skel.cpp" -o ! -f $name"_stub.cpp" ] ; then
diff --git a/win/tools/kmoc b/win/tools/kmoc
index 8f08c9b7d..2fef8ea60 100755
--- a/win/tools/kmoc
+++ b/win/tools/kmoc
@@ -1,19 +1,19 @@
 #!/bin/bash
 
 # Creates KDE-compatible .moc files out of .h files in current directory
-# .moc files are saved to tqmoc/ subdirectory.
-# Any additional arguments are directories - ktqmoc will be called for each of them.
+# .moc files are saved to moc/ subdirectory.
+# Any additional arguments are directories - kmoc will be called for each of them.
 
-mkdir -p tqmoc
-tqfind . -maxdepth 1 -name \*.h | while read ; do 
+mkdir -p moc
+find . -maxdepth 1 -name \*.h | while read ; do 
 	grep Q_OBJECT $REPLY > /dev/null || continue
-	tqmoc=tqmoc/`echo $REPLY | sed -e "s/\\.h/\\.moc/;s/\\.\\///"`
-	if [ $tqmoc -ot $REPLY ] ; then echo tqmocing $REPLY... ; tqmoc $REPLY -o $tqmoc ; fi
+	moc=moc/`echo $REPLY | sed -e "s/\\.h/\\.moc/;s/\\.\\///"`
+	if [ $moc -ot $REPLY ] ; then echo mocing $REPLY... ; moc $REPLY -o $moc ; fi
 done
 
 pwd=`pwd`
 while [ $# -gt 0 ] ; do
-	cd $pwd/$1 && ktqmoc
+	cd $pwd/$1 && kmoc
 	cd $pwd
 	shift
 done
diff --git a/win/tools/update_kdelibs_pro_files b/win/tools/update_kdelibs_pro_files
index f0d09981d..15f745cf8 100755
--- a/win/tools/update_kdelibs_pro_files
+++ b/win/tools/update_kdelibs_pro_files
@@ -12,7 +12,7 @@ dest=../..
 
 cd "$KDELIBS/$src"
 
-for pro in `tqfind . -name \*.pro -o -name \*.sh` ; do
+for pro in `find . -name \*.pro -o -name \*.sh` ; do
 	dir=`dirname "$pro"`
 	if [ ! -d "$KDELIBS/$dir" ] ; then
 		echo "no \$KDELIBS/$dir directory: creating it"
diff --git a/win/win.pro b/win/win.pro
index 6f426a181..d61d2c053 100644
--- a/win/win.pro
+++ b/win/win.pro
@@ -8,17 +8,17 @@ TARGET		= kdewin32$$KDEBUG
 QMAKE_CXXFLAGS += /FI$(KDELIBS)/kdecore/kdelibs_export.h
 QMAKE_CFLAGS += /FI$(KDELIBS)/kdecore/kdelibs_export.h
 
-system( tqmoc qeventloopex.h -o tqmoc/qeventloopex.moc )
+system( moc qeventloopex.h -o moc/qeventloopex.moc )
 
 WIN9x {
 	DEFINES += KDEWIN32_9x
 
 	DESTDIR = $$KDELIBDESTDIR/win9x
 
-	tqcontains(KW_CONFIG,release) {
+	contains(KW_CONFIG,release) {
 		OBJECTS_DIR = 9x/obj_rel
 	}
-	!tqcontains(KW_CONFIG,release) {
+	!contains(KW_CONFIG,release) {
 		OBJECTS_DIR = 9x/obj
 	}
 }
diff --git a/win/win32_utils2.cpp b/win/win32_utils2.cpp
index 767fa92f2..2e46d2acb 100644
--- a/win/win32_utils2.cpp
+++ b/win/win32_utils2.cpp
@@ -98,7 +98,7 @@ TQString convertKFileDialogFilterToQFileDialogFilter(const TQString& filter)
 	// escaped '/' characters.
 
 	TQString copy (kde_filters);
-	for (pos = 0; (pos = copy.tqfind("\\/", pos)) != -1; ++pos)
+	for (pos = 0; (pos = copy.find("\\/", pos)) != -1; ++pos)
 		copy.remove(pos, 1);
 
 	//<js>
@@ -112,7 +112,7 @@ TQString convertKFileDialogFilterToQFileDialogFilter(const TQString& filter)
 		current = *it;
 		TQString new_f;//filter part
 		TQString new_name;//filter name part
-		int p = (*it).tqfind('|');
+		int p = (*it).find('|');
 		if (p!=-1) {
 			new_f = current.left(p);
 			new_name = current.mid(p+1);
@@ -122,8 +122,8 @@ TQString convertKFileDialogFilterToQFileDialogFilter(const TQString& filter)
 			new_name = current; //nothing better
 		}
 		//remove (.....) from name
-		p=new_name.tqfind('(');
-		int p2 = new_name.tqfindRev(')');
+		p=new_name.find('(');
+		int p2 = new_name.findRev(')');
 		TQString new_name1, new_name2;
 		if (p!=-1)
 			new_name1 = new_name.left(p);
@@ -131,8 +131,8 @@ TQString convertKFileDialogFilterToQFileDialogFilter(const TQString& filter)
 			new_name2 = new_name.mid(p2+1);
 		if (!new_name1.isEmpty() || !new_name2.isEmpty())
 			new_name = new_name1.stripWhiteSpace() + " " + new_name2.stripWhiteSpace();
-		new_name.tqreplace('(',"");
-		new_name.tqreplace(')',"");
+		new_name.replace('(',"");
+		new_name.replace(')',"");
 		new_name = new_name.stripWhiteSpace();
 
 		// make filters unique: remove uppercase extensions (case doesn't matter on win32, BTW)