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

This reverts commit 13281e2856a2ef43bbab78c5528470309c23aa77.

7 files changed, 74 insertions, 74 deletions

diff --git a/khtml/ecma/kjs_binding.cpp b/khtml/ecma/kjs_binding.cpp
index 125401cae..4fa87e2ce 100644
--- a/khtml/ecma/kjs_binding.cpp
+++ b/khtml/ecma/kjs_binding.cpp
@@ -261,7 +261,7 @@ UString::UString(const TQString &d)
 {
   unsigned int len = d.length();
   UChar *dat = new UChar[len];
-  memcpy(dat, d.unicode(), len * sizeof(UChar));
+  memcpy(dat, d.tqunicode(), 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.unicode(), len * sizeof(UChar));
+  memcpy(dat, d.tqunicode(), len * sizeof(UChar));
   rep = UString::Rep::create(dat, len);
 }
 
diff --git a/khtml/ecma/kjs_debugwin.cpp b/khtml/ecma/kjs_debugwin.cpp
index c6fac2ab2..b3c2a41b1 100644
--- a/khtml/ecma/kjs_debugwin.cpp
+++ b/khtml/ecma/kjs_debugwin.cpp
@@ -25,9 +25,9 @@
 
 #include <assert.h>
 #include <stdlib.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqlistbox.h>
 #include <tqmultilineedit.h>
 #include <tqapplication.h>
@@ -107,7 +107,7 @@ void SourceDisplay::setSource(SourceFile *sourceFile)
   }
 
   TQString code = sourceFile->getCode();
-  const TQChar *chars = code.unicode();
+  const TQChar *chars = code.tqunicode();
   uint len = code.length();
   TQChar newLine('\n');
   TQChar cr('\r');
@@ -182,7 +182,7 @@ void SourceDisplay::showEvent(TQShowEvent *)
 void SourceDisplay::drawContents(TQPainter *p, int clipx, int clipy, int clipw, int cliph)
 {
   if (!m_sourceFile) {
-    p->fillRect(clipx,clipy,clipw,cliph,palette().active().base());
+    p->fillRect(clipx,clipy,clipw,cliph,tqpalette().active().base());
     return;
   }
 
@@ -207,26 +207,26 @@ void SourceDisplay::drawContents(TQPainter *p, int clipx, int clipy, int clipw,
     TQString linenoStr = TQString().sprintf("%d",lineno+1);
 
 
-    p->fillRect(0,height*lineno,linenoWidth,height,palette().active().mid());
+    p->fillRect(0,height*lineno,linenoWidth,height,tqpalette().active().mid());
 
-    p->setPen(palette().active().text());
+    p->setPen(tqpalette().active().text());
     p->drawText(0,height*lineno,linenoWidth,height,Qt::AlignRight,linenoStr);
 
     TQColor bgColor;
     TQColor textColor;
 
     if (lineno == m_currentLine) {
-      bgColor = palette().active().highlight();
-      textColor = palette().active().highlightedText();
+      bgColor = tqpalette().active().highlight();
+      textColor = tqpalette().active().highlightedText();
     }
     else if (m_debugWin->haveBreakpoint(m_sourceFile,lineno+1,lineno+1)) {
-      bgColor = palette().active().text();
-      textColor = palette().active().base();
+      bgColor = tqpalette().active().text();
+      textColor = tqpalette().active().base();
       p->drawPixmap(2,height*lineno+height/2-m_breakpointIcon.height()/2,m_breakpointIcon);
     }
     else {
-      bgColor = palette().active().base();
-      textColor = palette().active().text();
+      bgColor = tqpalette().active().base();
+      textColor = tqpalette().active().text();
     }
 
     p->fillRect(linenoWidth,height*lineno,right-linenoWidth,height,bgColor);
@@ -236,10 +236,10 @@ void SourceDisplay::drawContents(TQPainter *p, int clipx, int clipy, int clipw,
   }
 
   int remainingTop = height*(lastLine+1);
-  p->fillRect(0,remainingTop,linenoWidth,bottom-remainingTop,palette().active().mid());
+  p->fillRect(0,remainingTop,linenoWidth,bottom-remainingTop,tqpalette().active().mid());
 
   p->fillRect(linenoWidth,remainingTop,
-	      right-linenoWidth,bottom-remainingTop,palette().active().base());
+	      right-linenoWidth,bottom-remainingTop,tqpalette().active().base());
 }
 
 //-------------------------------------------------------------------------
@@ -548,7 +548,7 @@ void KJSDebugWin::slotToggleBreakpoint(int lineno)
   if (m_sourceSel->currentItem() < 0)
     return;
 
-  SourceFile *sourceFile = m_sourceSelFiles.at(m_sourceSel->currentItem());
+  SourceFile *sourceFile = m_sourceSelFiles.tqat(m_sourceSel->currentItem());
 
   // Find the source fragment containing the selected line (if any)
   int sourceId = -1;
@@ -592,14 +592,14 @@ void KJSDebugWin::slotSourceSelected(int sourceSelIndex)
   // A source file has been selected from the drop-down list - display the file
   if (sourceSelIndex < 0 || sourceSelIndex >= (int)m_sourceSel->count())
     return;
-  SourceFile *sourceFile = m_sourceSelFiles.at(sourceSelIndex);
+  SourceFile *sourceFile = m_sourceSelFiles.tqat(sourceSelIndex);
   displaySourceFile(sourceFile,true);
 
   // If the currently selected context is in the current source file, then hilight
   // the line it's on.
   if (m_contextList->currentItem() >= 0) {
     Context ctx = m_execs[m_contextList->currentItem()]->context();
-    if (m_sourceFragments[ctx.sourceId()]->sourceFile == m_sourceSelFiles.at(sourceSelIndex))
+    if (m_sourceFragments[ctx.sourceId()]->sourceFile == m_sourceSelFiles.tqat(sourceSelIndex))
       setSourceLine(ctx.sourceId(),ctx.curStmtFirstLine());
   }
 }
@@ -614,7 +614,7 @@ void KJSDebugWin::slotEval()
   if (m_execStates.isEmpty()) {
     if (m_sourceSel->currentItem() < 0)
       return;
-    SourceFile *sourceFile = m_sourceSelFiles.at(m_sourceSel->currentItem());
+    SourceFile *sourceFile = m_sourceSelFiles.tqat(m_sourceSel->currentItem());
     if (!sourceFile->interpreter)
       return;
     exec = sourceFile->interpreter->globalExec();
@@ -690,7 +690,7 @@ bool KJSDebugWin::eventFilter(TQObject *o, TQEvent *e)
 
 void KJSDebugWin::disableOtherWindows()
 {
-  TQWidgetList *widgets = TQApplication::allWidgets();
+  TQWidgetList *widgets = TQApplication::tqallWidgets();
   TQWidgetListIt it(*widgets);
   for (; it.current(); ++it)
     it.current()->installEventFilter(this);
@@ -698,7 +698,7 @@ void KJSDebugWin::disableOtherWindows()
 
 void KJSDebugWin::enableOtherWindows()
 {
-  TQWidgetList *widgets = TQApplication::allWidgets();
+  TQWidgetList *widgets = TQApplication::tqallWidgets();
   TQWidgetListIt it(*widgets);
   for (; it.current(); ++it)
     it.current()->removeEventFilter(this);
@@ -744,7 +744,7 @@ bool KJSDebugWin::sourceParsed(KJS::ExecState *exec, int sourceId,
     if (!sourceFile->interpreter)
       sourceFile->interpreter = exec->interpreter();
     for (index = 0; index < m_sourceSel->count(); index++) {
-      if (m_sourceSelFiles.at(index) == sourceFile)
+      if (m_sourceSelFiles.tqat(index) == sourceFile)
 	break;
     }
     assert(index < m_sourceSel->count());
@@ -782,7 +782,7 @@ bool KJSDebugWin::sourceUnused(KJS::ExecState *exec, int sourceId)
     SourceFile *sourceFile = fragment->sourceFile;
     if (sourceFile->hasOneRef()) {
       for (int i = 0; i < m_sourceSel->count(); i++) {
-	if (m_sourceSelFiles.at(i) == sourceFile) {
+	if (m_sourceSelFiles.tqat(i) == sourceFile) {
 	  m_sourceSel->removeItem(i);
 	  m_sourceSelFiles.remove(i);
 	  break;
@@ -861,7 +861,7 @@ bool KJSDebugWin::exception(ExecState *exec, const Value &value, bool inTryCatch
 
   if (dontShowAgain) {
     KConfig *config = kapp->config();
-    KConfigGroupSaver saver(config,TQString::fromLatin1("Java/JavaScript Settings"));
+    KConfigGroupSaver saver(config,TQString::tqfromLatin1("Java/JavaScript Settings"));
     config->writeEntry("ReportJavaScriptErrors",TQVariant(false,0));
     config->sync();
     TQByteArray data;
@@ -930,7 +930,7 @@ void KJSDebugWin::setSourceLine(int sourceId, int lineno)
   SourceFile *sourceFile = source->sourceFile;
   if (m_curSourceFile != source->sourceFile) {
       for (int i = 0; i < m_sourceSel->count(); i++)
-	if (m_sourceSelFiles.at(i) == sourceFile)
+	if (m_sourceSelFiles.tqat(i) == sourceFile)
 	  m_sourceSel->setCurrentItem(i);
       displaySourceFile(sourceFile,false);
   }
diff --git a/khtml/ecma/kjs_html.cpp b/khtml/ecma/kjs_html.cpp
index 57762ffd3..3fdc35bb2 100644
--- a/khtml/ecma/kjs_html.cpp
+++ b/khtml/ecma/kjs_html.cpp
@@ -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
-  shape		KJS::HTMLElement::AnchorShape		DontDelete
+  tqshape		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
-  shape		KJS::HTMLElement::AreaShape		DontDelete
+  tqshape		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.shape());
+    case AnchorShape:           return String(anchor.tqshape());
     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.shape());
+    case AreaShape:           return String(area.tqshape());
     case AreaTabIndex:        return Number(area.tabIndex());
     case AreaTarget:          return String(area.target());
     }
diff --git a/khtml/ecma/kjs_navigator.cpp b/khtml/ecma/kjs_navigator.cpp
index 32f836ba7..637b6a8e1 100644
--- a/khtml/ecma/kjs_navigator.cpp
+++ b/khtml/ecma/kjs_navigator.cpp
@@ -188,14 +188,14 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const
     return String("Mozilla");
   case AppName:
     // 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)
+    if (userAgent.find(TQString::tqfromLatin1("Mozilla")) >= 0 &&
+        userAgent.find(TQString::tqfromLatin1("compatible")) == -1)
     {
       //kdDebug() << "appName -> Mozilla" << endl;
       return String("Netscape");
     }
-    if (userAgent.find(TQString::fromLatin1("Microsoft")) >= 0 ||
-        userAgent.find(TQString::fromLatin1("MSIE")) >= 0)
+    if (userAgent.find(TQString::tqfromLatin1("Microsoft")) >= 0 ||
+        userAgent.find(TQString::tqfromLatin1("MSIE")) >= 0)
     {
       //kdDebug() << "appName -> IE" << endl;
       return String("Microsoft Internet Explorer");
@@ -207,14 +207,14 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const
     return String(userAgent.mid(userAgent.find('/') + 1));
   case Product:
     // We are pretending to be Mozilla or Safari
-    if (userAgent.find(TQString::fromLatin1("Mozilla")) >= 0 &&
-        userAgent.find(TQString::fromLatin1("compatible")) == -1)
+    if (userAgent.find(TQString::tqfromLatin1("Mozilla")) >= 0 &&
+        userAgent.find(TQString::tqfromLatin1("compatible")) == -1)
     {
         return String("Gecko");
     }
     // When spoofing as IE, we use Undefined().
-    if (userAgent.find(TQString::fromLatin1("Microsoft")) >= 0 ||
-        userAgent.find(TQString::fromLatin1("MSIE")) >= 0)
+    if (userAgent.find(TQString::tqfromLatin1("Microsoft")) >= 0 ||
+        userAgent.find(TQString::tqfromLatin1("MSIE")) >= 0)
     {
         return Undefined();
     }
@@ -223,7 +223,7 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const
   case ProductSub:
     {
       int ix = userAgent.find("Gecko");
-      if (ix >= 0 && userAgent.length() >= (uint)ix+14 && userAgent.unicode()[ix+5] == TQChar('/') &&
+      if (ix >= 0 && userAgent.length() >= (uint)ix+14 && userAgent.tqunicode()[ix+5] == TQChar('/') &&
           userAgent.find(TQRegExp("\\d{8}"), ix+6) == ix+6)
       {
           // We have Gecko/<productSub> in the UA string
@@ -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.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"));
+    if ( (userAgent.find(TQString::tqfromLatin1("Win"),0,false)>=0) )
+      return String(TQString::tqfromLatin1("Win32"));
+    else if ( (userAgent.find(TQString::tqfromLatin1("Macintosh"),0,false)>=0) ||
+              (userAgent.find(TQString::tqfromLatin1("Mac_PowerPC"),0,false)>=0) )
+      return String(TQString::tqfromLatin1("MacPPC"));
     else
     {
         struct utsname name;
         int ret = uname(&name);
         if ( ret >= 0 )
-            return String(TQString(TQString::fromLatin1("%1 %1 X11").arg(name.sysname).arg(name.machine)));
+            return String(TQString(TQString::tqfromLatin1("%1 %1 X11").arg(name.sysname).arg(name.machine)));
         else // can't happen
-            return String(TQString(TQString::fromLatin1("Unix X11")));
+            return String(TQString(TQString::tqfromLatin1("Unix X11")));
     }
   case CpuClass:
   {
@@ -394,7 +394,7 @@ Value Plugins::get(ExecState *exec, const Identifier &propertyName) const
     bool ok;
     unsigned int i = propertyName.toULong(&ok);
     if( ok && i<plugins->count() )
-      return Value( new Plugin( exec, plugins->at(i) ) );
+      return Value( new Plugin( exec, plugins->tqat(i) ) );
 
     // plugin[name]
     Value val = pluginByName( exec, propertyName.qstring() );
@@ -439,7 +439,7 @@ Value PluginsFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
       bool ok;
       unsigned int i = args[0].toString(exec).toArrayIndex(&ok);
       if( ok && i<base->plugins->count() )
-        return Value( new Plugin( exec, base->plugins->at(i) ) );
+        return Value( new Plugin( exec, base->plugins->tqat(i) ) );
       return Undefined();
     }
     case Plugins_NamedItem:
@@ -479,7 +479,7 @@ Value MimeTypes::get(ExecState *exec, const Identifier &propertyName) const
     bool ok;
     unsigned int i = propertyName.toULong(&ok);
     if( ok && i<mimes->count() )
-      return Value( new MimeType( exec, mimes->at(i) ) );
+      return Value( new MimeType( exec, mimes->tqat(i) ) );
 
     // mimeTypes[name]
     Value val = mimeTypeByName( exec, propertyName.qstring() );
@@ -522,7 +522,7 @@ Value MimeTypesFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
       bool ok;
       unsigned int i = args[0].toString(exec).toArrayIndex(&ok);
       if( ok && i<base->mimes->count() )
-        return Value( new MimeType( exec, base->mimes->at(i) ) );
+        return Value( new MimeType( exec, base->mimes->tqat(i) ) );
       return Undefined();
     }
     case MimeTypes_NamedItem:
@@ -562,8 +562,8 @@ Value Plugin::get(ExecState *exec, const Identifier &propertyName) const
   //kdDebug(6070) << "Plugin::get plugin[" << i << "]" << endl;
   if( ok && i<m_info->mimes.count() )
   {
-    //kdDebug(6070) << "returning mimetype " << m_info->mimes.at(i)->type << endl;
-    return Value(new MimeType(exec, m_info->mimes.at(i)));
+    //kdDebug(6070) << "returning mimetype " << m_info->mimes.tqat(i)->type << endl;
+    return Value(new MimeType(exec, m_info->mimes.tqat(i)));
   }
 
   // plugin["name"]
@@ -609,7 +609,7 @@ Value PluginFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
     bool ok;
     unsigned int i = args[0].toString(exec).toArrayIndex(&ok);
     if( ok && i< plugin->pluginInfo()->mimes.count() )
-      return Value( new MimeType( exec, plugin->pluginInfo()->mimes.at(i) ) );
+      return Value( new MimeType( exec, plugin->pluginInfo()->mimes.tqat(i) ) );
     return Undefined();
   }
   case Plugin_NamedItem:
diff --git a/khtml/ecma/kjs_proxy.cpp b/khtml/ecma/kjs_proxy.cpp
index ca26c5a0b..2469ac681 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.find(TQString::fromLatin1("Microsoft")) >= 0 ||
-      userAgent.find(TQString::fromLatin1("MSIE")) >= 0)
+  if (userAgent.find(TQString::tqfromLatin1("Microsoft")) >= 0 ||
+      userAgent.find(TQString::tqfromLatin1("MSIE")) >= 0)
   {
     m_script->setCompatMode(Interpreter::IECompat);
 #ifdef KJS_VERBOSE
@@ -353,9 +353,9 @@ void KJSProxyImpl::applyUserAgent()
   }
   else
     // 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)
+    if (userAgent.find(TQString::tqfromLatin1("Mozilla")) >= 0 &&
+        userAgent.find(TQString::tqfromLatin1("compatible")) == -1 &&
+        userAgent.find(TQString::tqfromLatin1("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 47d5ac810..bed6b83c6 100644
--- a/khtml/ecma/kjs_window.cpp
+++ b/khtml/ecma/kjs_window.cpp
@@ -31,7 +31,7 @@
 #include "html/html_documentimpl.h"
 #include "rendering/render_frames.h"
 
-#include <stylesheet.h>
+#include <tqstylesheet.h>
 #include <tqtimer.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqapplication.h>
@@ -864,7 +864,7 @@ 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()->topLevelWidget()->winId());
+      KWin::WindowInfo inf = KWin::windowInfo(part->widget()->tqtopLevelWidget()->winId());
       return Number(entry->value == OuterHeight ?
                     inf.geometry().height() : inf.geometry().width());
 #else
@@ -1013,7 +1013,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const
     TQPtrList<KParts::ReadOnlyPart> frames = part->frames();
     unsigned int len = frames.count();
     if (i < len) {
-      KParts::ReadOnlyPart* frame = frames.at(i);
+      KParts::ReadOnlyPart* frame = frames.tqat(i);
       if (frame)
         return Window::retrieve(frame);
     }
@@ -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.find(TQString::fromLatin1("javascript:"), 0, false) != 0 )
+            dstUrl.find(TQString::tqfromLatin1("javascript:"), 0, false) != 0 )
         part->scheduleRedirection(-1,
                                   dstUrl,
                                   lockHistory);
@@ -1622,7 +1622,7 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString
         if (pos >= 0) {
           key = s.left(pos).stripWhiteSpace().lower();
           val = s.mid(pos + 1).stripWhiteSpace().lower();
-          TQRect screen = KGlobalSettings::desktopGeometry(widget->topLevelWidget());
+          TQRect screen = KGlobalSettings::desktopGeometry(widget->tqtopLevelWidget());
 
           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->tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2;
+            winargs.height = (int)val.toFloat() + 2*tqApp->tqstyle().tqpixelMetric( 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->tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2;
+            winargs.width = (int)val.toFloat() + 2*tqApp->tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2;
             if (winargs.width > screen.width())    // should actually check workspace
               winargs.width = screen.width();
             if (winargs.width < 100)
@@ -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->topLevelWidget()->raise();
-      KWin::deIconifyWindow( widget->topLevelWidget()->winId() );
+      widget->tqtopLevelWidget()->raise();
+      KWin::deIconifyWindow( widget->tqtopLevelWidget()->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->topLevelWidget();
+        TQWidget * tl = widget->tqtopLevelWidget();
         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->topLevelWidget();
+        TQWidget * tl = widget->tqtopLevelWidget();
         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->topLevelWidget();
+      TQWidget * tl = widget->tqtopLevelWidget();
       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->topLevelWidget();
+      TQWidget * tl = widget->tqtopLevelWidget();
       window->resizeTo( tl, args[0].toInt32(exec), args[1].toInt32(exec) );
     }
     return Undefined();
@@ -2412,7 +2412,7 @@ Value FrameArray::get(ExecState *exec, const Identifier &p) const
     bool ok;
     unsigned int i = p.toArrayIndex(&ok);
     if (ok && i < len)
-      frame = frames.at(i);
+      frame = frames.tqat(i);
   }
 
   // we are potentially fetching a reference to a another Window object here.
@@ -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::fromLatin1("") );
+      return String( url.port() ? TQString::number((int)url.port()) : TQString::tqfromLatin1("") );
     case Protocol:
       return String( url.protocol()+":" );
     case Search:
diff --git a/khtml/ecma/xmlhttprequest.cpp b/khtml/ecma/xmlhttprequest.cpp
index 08ba07519..7b88477f0 100644
--- a/khtml/ecma/xmlhttprequest.cpp
+++ b/khtml/ecma/xmlhttprequest.cpp
@@ -487,7 +487,7 @@ 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::fromLatin1(BANNED_HTTP_HEADERS));
+                                  TQString::tqfromLatin1(BANNED_HTTP_HEADERS));
 
   if (bannedHeaders.contains(name))
     return;   // Denied