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

19 files changed, 98 insertions, 98 deletions

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