3 files changed, 7 insertions, 7 deletions
diff --git a/kstyles/kthemestyle/kthemebase.cpp b/kstyles/kthemestyle/kthemebase.cpp
index f6da05a41..193d9c6d7 100644
--- a/kstyles/kthemestyle/kthemebase.cpp
+++ b/kstyles/kthemestyle/kthemebase.cpp
@@ -70,7 +70,7 @@ static TQColor readColorEntry( TQSettings* s, const char *pKey,
     TQString aValue = s->readEntry( pKey );
     if ( !aValue.isEmpty() )
     {
-        if ( aValue.tqat( 0 ) == '#' )
+        if ( aValue.at( 0 ) == '#' )
         {
             aRetColor.setNamedColor( aValue );
         }
diff --git a/kstyles/kthemestyle/kthemestyle.cpp b/kstyles/kthemestyle/kthemestyle.cpp
index d34d6cd18..aaa3c0530 100644
--- a/kstyles/kthemestyle/kthemestyle.cpp
+++ b/kstyles/kthemestyle/kthemestyle.cpp
@@ -650,7 +650,7 @@ void KThemeStyle::drawBaseButton( TQPainter *p, int x, int y, int w, int h,
     if ( gradientHint( type ) == GrReverseBevel )
     {
         int i;
-        bitBlt( p->tqdevice(), x, y, TQT_TQPAINTDEVICE(scalePixmap( w, h, type )), 0, 0, w, h,
+        bitBlt( p->device(), x, y, TQT_TQPAINTDEVICE(scalePixmap( w, h, type )), 0, 0, w, h,
                 TQt::CopyROP, true );
         p->setPen( g.text() );
         for ( i = 0; i < borderWidth( type ); ++i, ++x, ++y, w -= 2, h -= 2 )
@@ -690,7 +690,7 @@ void KThemeStyle::drawBaseButton( TQPainter *p, int x, int y, int w, int h,
         }
         if ( borderPixmap( type ) )
         {
-            bitBlt( p->tqdevice(), x, y, TQT_TQPAINTDEVICE(scaleBorder( w, h, type )), 0, 0, w, h,
+            bitBlt( p->device(), x, y, TQT_TQPAINTDEVICE(scaleBorder( w, h, type )), 0, 0, w, h,
                     TQt::CopyROP, false );
         }
         else
@@ -1239,7 +1239,7 @@ void KThemeStyle::drawControl( ControlElement element,
         case CE_TabBarTab:
             {
                 const TQTabBar* tb = ( const TQTabBar* ) widget;
-                TQTabBar::Shape tbs = tb->tqshape();
+                TQTabBar::Shape tbs = tb->shape();
                 bool selected = how & Style_Selected;
                 WidgetType widget = selected ? ActiveTab : InactiveTab;
                 const TQColorGroup *cg = colorGroup( tb->colorGroup(), widget );
@@ -1315,8 +1315,8 @@ void KThemeStyle::drawControl( ControlElement element,
                     else
                         p->fillRect( x, y, x2 - x + 1, y2 - y + 1, cg->background() );
                 }
-                else if ( tb->tqshape() == TQTabBar::RoundedBelow ||
-                        tb->tqshape() == TQTabBar::TriangularBelow )
+                else if ( tb->shape() == TQTabBar::RoundedBelow ||
+                        tb->shape() == TQTabBar::TriangularBelow )
                 {
                     if ( widget == ActiveTab )
                         widget = RotActiveTab;
diff --git a/kstyles/kthemestyle/kthemestyle.h b/kstyles/kthemestyle/kthemestyle.h
index 0b7a220f1..6c2c0e332 100644
--- a/kstyles/kthemestyle/kthemestyle.h
+++ b/kstyles/kthemestyle/kthemestyle.h
@@ -192,7 +192,7 @@ public:
      * @param w The rectangle width.
      * @param h The rectangle height.
      * @param sunken Draws a sunken style if @p true.
-     * @param rounded Draws a rounded tqshape if @p true. Requires bWidth to be
+     * @param rounded Draws a rounded shape if @p true. Requires bWidth to be
      * at least 1.
      * @param hWidth The highlight width.
      * @param bWidth The border width.