4 files changed, 14 insertions, 14 deletions

diff --git a/khtml/ecma/kjs_binding.cpp b/khtml/ecma/kjs_binding.cpp
index 4fa87e2ce..125401cae 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.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_debugwin.cpp b/khtml/ecma/kjs_debugwin.cpp
index 7a083c28e..f7ba774f8 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');
@@ -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,tqpalette().active().base());
+    p->fillRect(clipx,clipy,clipw,cliph,palette().active().base());
     return;
   }
 
@@ -207,9 +207,9 @@ 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,tqpalette().active().mid());
+    p->fillRect(0,height*lineno,linenoWidth,height,palette().active().mid());
 
-    p->setPen(tqpalette().active().text());
+    p->setPen(palette().active().text());
     p->drawText(0,height*lineno,linenoWidth,height,Qt::AlignRight,linenoStr);
 
     TQColor bgColor;
@@ -220,13 +220,13 @@ void SourceDisplay::drawContents(TQPainter *p, int clipx, int clipy, int clipw,
       textColor = tqpalette().active().highlightedText();
     }
     else if (m_debugWin->haveBreakpoint(m_sourceFile,lineno+1,lineno+1)) {
-      bgColor = tqpalette().active().text();
-      textColor = tqpalette().active().base();
+      bgColor = palette().active().text();
+      textColor = palette().active().base();
       p->drawPixmap(2,height*lineno+height/2-m_breakpointIcon.height()/2,m_breakpointIcon);
     }
     else {
-      bgColor = tqpalette().active().base();
-      textColor = tqpalette().active().text();
+      bgColor = palette().active().base();
+      textColor = palette().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,tqpalette().active().mid());
+  p->fillRect(0,remainingTop,linenoWidth,bottom-remainingTop,palette().active().mid());
 
   p->fillRect(linenoWidth,remainingTop,
-	      right-linenoWidth,bottom-remainingTop,tqpalette().active().base());
+	      right-linenoWidth,bottom-remainingTop,palette().active().base());
 }
 
 //-------------------------------------------------------------------------
diff --git a/khtml/ecma/kjs_navigator.cpp b/khtml/ecma/kjs_navigator.cpp
index 183c99078..32f836ba7 100644
--- a/khtml/ecma/kjs_navigator.cpp
+++ b/khtml/ecma/kjs_navigator.cpp
@@ -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.tqunicode()[ix+5] == TQChar('/') &&
+      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
diff --git a/khtml/ecma/kjs_window.cpp b/khtml/ecma/kjs_window.cpp
index 1f26fe7b8..d21f60554 100644
--- a/khtml/ecma/kjs_window.cpp
+++ b/khtml/ecma/kjs_window.cpp
@@ -1639,7 +1639,7 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString
             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->style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2;
             if (winargs.width > screen.width())    // should actually check workspace
               winargs.width = screen.width();
             if (winargs.width < 100)