Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 13281e2856a2ef43bbab78c5528470309c23aa77.

9 files changed, 19 insertions, 19 deletions

diff --git a/khtml/misc/arena.cpp b/khtml/misc/arena.cpp
index 5efcaf98d..58d531384 100644
--- a/khtml/misc/arena.cpp
+++ b/khtml/misc/arena.cpp
@@ -143,7 +143,7 @@ void* ArenaAllocate(ArenaPool *pool, unsigned int nb)
     assert((nb & pool->mask) == 0);
 #endif
 
-    nb = (uword)ARENA_ALIGN(pool, nb); /* force alignment */
+    nb = (uword)ARENA_ALIGN(pool, nb); /* force tqalignment */
 
     /* 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->mask;  /* header and alignment slop */
+        sz += sizeof *a + pool->mask;  /* header and tqalignment slop */
         pool->cumul += sz;
 #ifdef DEBUG_ARENA_MALLOC
         i++;
diff --git a/khtml/misc/decoder.cpp b/khtml/misc/decoder.cpp
index 34689cae1..f227f4014 100644
--- a/khtml/misc/decoder.cpp
+++ b/khtml/misc/decoder.cpp
@@ -37,7 +37,7 @@ using namespace khtml;
 #include "htmlhashes.h"
 
 #include <tqregexp.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include <kglobal.h>
 #include <kcharsets.h>
diff --git a/khtml/misc/htmlattrs.c b/khtml/misc/htmlattrs.c
index 779792e71..6f420e3b3 100644
--- a/khtml/misc/htmlattrs.c
+++ b/khtml/misc/htmlattrs.c
@@ -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("shape")];
+    char spool_attr_str45[sizeof("tqshape")];
     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",
-    "shape",
+    "tqshape",
     "charset",
     "charoff",
     "lang",
diff --git a/khtml/misc/khtmllayout.h b/khtml/misc/khtmllayout.h
index 1049d10c4..b0c8dc613 100644
--- a/khtml/misc/khtmllayout.h
+++ b/khtml/misc/khtmllayout.h
@@ -33,7 +33,7 @@ namespace khtml
 
     const int UNDEFINED = -1;
 
-    // alignment
+    // tqalignment
     enum VAlign { VNone=0, Bottom, VCenter, Top, Baseline };
     enum HAlign { HDefault, Left, HCenter, Right, HNone = 0 };
 
diff --git a/khtml/misc/knsplugininstaller.cpp b/khtml/misc/knsplugininstaller.cpp
index aa3c93cb4..09de5a149 100644
--- a/khtml/misc/knsplugininstaller.cpp
+++ b/khtml/misc/knsplugininstaller.cpp
@@ -36,10 +36,10 @@
 #include <tqiodevice.h>
 #include <tqfile.h>
 #include <tqlabel.h>
-#include <layout.h> 
+#include <tqlayout.h> 
 #include <tqmap.h>
 #include <tqstringlist.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <sys/utsname.h>
 
diff --git a/khtml/misc/loader.cpp b/khtml/misc/loader.cpp
index 82a87dab9..de7d5aea2 100644
--- a/khtml/misc/loader.cpp
+++ b/khtml/misc/loader.cpp
@@ -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::fromLatin1( accept );
+    TQString ah = TQString::tqfromLatin1( 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::fromLatin1("*/*") );
+    setAccept( TQString::tqfromLatin1("*/*") );
     // load the file
     Cache::loader()->load(dl, this, false);
     m_loading = true;
@@ -397,7 +397,7 @@ public:
 
     void sendTo(TQDataSink* sink, int n)
     {
-        sink->receive((const uchar*)&buffer.at(pos), n);
+        sink->receive((const uchar*)&buffer.tqat(pos), n);
 
         pos += n;
 
@@ -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->disconnecStatus( this, TQT_SLOT( movieStatus( int ) ));
+        m->disconnectqStatus( this, TQT_SLOT( movieStatus( int ) ));
         m->disconnectResize( this, TQT_SLOT( movieResize( const TQSize& ) ) );
         TQTimer::singleShot(0, this, TQT_SLOT( deleteMovie()));
         imgSource = 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->connecStatus( this, TQT_SLOT( movieStatus(int)));
+            m->connectqStatus( this, TQT_SLOT( movieStatus(int)));
             m->connectResize( this, TQT_SLOT( movieResize( const TQSize& ) ) );
         }
     }
@@ -1167,7 +1167,7 @@ void Loader::servePendingRequests()
             {
                 job->addMetaData( "cross-domain", part->toplevelURL().url() );
                 if (part->widget())
-                    job->setWindow (part->widget()->topLevelWidget());
+                    job->setWindow (part->widget()->tqtopLevelWidget());
             }
         }
 
diff --git a/khtml/misc/loader.h b/khtml/misc/loader.h
index 3baed31ce..e950f1767 100644
--- a/khtml/misc/loader.h
+++ b/khtml/misc/loader.h
@@ -45,7 +45,7 @@
 #include <tqpixmap.h>
 #include <tqbuffer.h>
 #include <tqstringlist.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqtimer.h>
 
 #include <kurl.h>
diff --git a/khtml/misc/multimap.h b/khtml/misc/multimap.h
index 125e8e07d..8f60dcf02 100644
--- a/khtml/misc/multimap.h
+++ b/khtml/misc/multimap.h
@@ -70,7 +70,7 @@ private:
 static inline unsigned int stupidHash(void* ptr)
 {
     unsigned long val = (unsigned long)ptr;
-    // remove alignment and multiply by a prime unlikely to be a factor of size
+    // remove tqalignment and multiply by a prime unlikely to be a factor of size
     val = (val >> 4) * 1237;
     return val;
 }
diff --git a/khtml/misc/stringit.h b/khtml/misc/stringit.h
index 789f22af8..d56a78397 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.unicode(); l = str.length(); lines = 0; }
+	{ s = str.tqunicode(); 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.unicode()) {}
+    TokenizerSubstring(const TQString &str) : m_string(str), m_length(str.length()), m_current(m_length == 0 ? 0 : str.tqunicode()) {}
     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.unicode() == m_current) {
+        if (m_string.tqunicode() == m_current) {
             if (str.isEmpty())
                 str = m_string;
             else