Remove additional unneeded tq method conversions

7 files changed, 31 insertions, 31 deletions

diff --git a/khtml/html/html_documentimpl.cpp b/khtml/html/html_documentimpl.cpp
index bbfbc86f5..c0bef4434 100644
--- a/khtml/html/html_documentimpl.cpp
+++ b/khtml/html/html_documentimpl.cpp
@@ -226,7 +226,7 @@ void HTMLDocumentImpl::slotHistoryChanged()
         return;
 
     recalcStyle( Force );
-    m_render->tqrepaint();
+    m_render->repaint();
 }
 
 HTMLMapElementImpl* HTMLDocumentImpl::getMap(const DOMString& _url)
diff --git a/khtml/html/html_elementimpl.cpp b/khtml/html/html_elementimpl.cpp
index 736b5a3b9..89b3587cc 100644
--- a/khtml/html/html_elementimpl.cpp
+++ b/khtml/html/html_elementimpl.cpp
@@ -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 b77dff16c..a45902cd9 100644
--- a/khtml/html/html_formimpl.cpp
+++ b/khtml/html/html_formimpl.cpp
@@ -2761,7 +2761,7 @@ static TQString expandLF(const TQString& s)
     unsigned pos2 = 0;
     for(unsigned pos = 0; pos < len; pos++)
     {
-       TQChar c = s.tqat(pos);
+       TQChar c = s.at(pos);
        switch(c.tqunicode())
        {
          case '\n':
diff --git a/khtml/html/html_imageimpl.cpp b/khtml/html/html_imageimpl.cpp
index 9ced3bf1b..c1f7ac987 100644
--- a/khtml/html/html_imageimpl.cpp
+++ b/khtml/html/html_imageimpl.cpp
@@ -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;
@@ -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 d5e812029..58804bff5 100644
--- a/khtml/html/html_miscimpl.cpp
+++ b/khtml/html/html_miscimpl.cpp
@@ -328,14 +328,14 @@ NodeImpl *HTMLFormCollectionImpl::item( unsigned long index ) const
     TQPtrList<HTMLGenericFormElementImpl>& l = static_cast<HTMLFormElementImpl*>( m_refNode )->formElements;
     for (unsigned i = strt; i < l.count(); i++)
     {
-        if (l.tqat( i )->isEnumeratable())
+        if (l.at( i )->isEnumeratable())
         {
             if (dist == 0)
             {
                 //Found it!
                 m_cache->position      = index;
                 m_cache->current.index = i;
-                return l.tqat( i );
+                return l.at( i );
             }
             else
                 --dist;
@@ -349,7 +349,7 @@ unsigned long HTMLFormCollectionImpl::calcLength(NodeImpl *start) const
     unsigned length = 0;
     TQPtrList<HTMLGenericFormElementImpl> l = static_cast<HTMLFormElementImpl*>( start )->formElements;
     for ( unsigned i = 0; i < l.count(); i++ )
-        if ( l.tqat( i )->isEnumeratable() )
+        if ( l.at( i )->isEnumeratable() )
             ++length;
     return length;
 }
@@ -369,7 +369,7 @@ NodeImpl *HTMLFormCollectionImpl::nextNamedItem( const DOMString &name ) const
     //Go through the list, trying to find the appropriate named form element.
     for ( ; currentNamePos < l.count(); ++currentNamePos )
     {
-        HTMLGenericFormElementImpl* el = l.tqat(currentNamePos);
+        HTMLGenericFormElementImpl* el = l.at(currentNamePos);
         if (el->isEnumeratable() &&
              ((el->getAttribute(ATTR_ID)   == name) ||
               (el->getAttribute(ATTR_NAME) == name)))
@@ -387,7 +387,7 @@ NodeImpl *HTMLFormCollectionImpl::nextNamedItem( const DOMString &name ) const
     TQPtrList<HTMLImageElementImpl>& il = static_cast<HTMLFormElementImpl*>( m_refNode )->imgElements;
     for ( ; currentNameImgPos < il.count(); ++currentNameImgPos )
     {
-        HTMLImageElementImpl* el = il.tqat(currentNameImgPos);
+        HTMLImageElementImpl* el = il.at(currentNameImgPos);
         if ((el->getAttribute(ATTR_ID)   == name) ||
             (el->getAttribute(ATTR_NAME) == name))
         {