1 files changed, 11 insertions, 11 deletions
diff --git a/lib/kofficeui/KoTabBar.cpp b/lib/kofficeui/KoTabBar.cpp
index e33ce12c..02c34f2d 100644
--- a/lib/kofficeui/KoTabBar.cpp
+++ b/lib/kofficeui/KoTabBar.cpp
@@ -37,7 +37,7 @@
 // TODO
 // improvement possibilities
 // - use offscreen buffer to reduce flicker even more
-// - keep track of tabs, only (re)tqlayout when necessary
+// - keep track of tabs, only (re)layout when necessary
 // - paint all tabs to buffer, show only by shifting
 // - customizable button pixmaps
 // - use TQStyle to paint the tabs & buttons (is it good/possible?)
@@ -57,7 +57,7 @@ public:
     // read-only: no mouse drag, double-click, right-click
     bool readOnly;
     
-    // if true, tqlayout is from right to left
+    // if true, layout is from right to left
     bool reverseLayout;
 
     // list of all tabs, in order of appearance
@@ -273,20 +273,20 @@ void KoTabBarPrivate::drawTab( TQPainter& painter, TQRect& rect, const TQString&
     painter.save();
 
     // fill it first  
-    TQBrush bg = tabbar->tqcolorGroup().background();
-    if( active ) bg = TQBrush(tabbar->tqcolorGroup().base());
+    TQBrush bg = tabbar->colorGroup().background();
+    if( active ) bg = TQBrush(tabbar->colorGroup().base());
     painter.setBrush( bg );
     painter.setPen( TQPen( TQt::NoPen ) );
     painter.drawPolygon( polygon );
 
     // draw the lines
-    painter.setPen( tabbar->tqcolorGroup().dark() );
+    painter.setPen( tabbar->colorGroup().dark() );
     if( !active )
       painter.drawLine( rect.x()-25, rect.y(), rect.right()+25, rect.top() );
     // TQt4: painter.setRenderHint( TQPainter::Antialiasing );
     painter.drawPolyline( polygon );
 
-    painter.setPen( tabbar->tqcolorGroup().buttonText() );
+    painter.setPen( tabbar->colorGroup().buttonText() );
     TQFont f = painter.font();
     if( active ) f.setBold( true );
     painter.setFont( f );
@@ -660,10 +660,10 @@ void KoTabBar::paintEvent( TQPaintEvent* )
 
     TQPainter painter;
     TQPixmap pm( size() );
-    pm.fill( tqcolorGroup().background() );
-    painter.tqbegin( TQT_TQPAINTDEVICE(&pm), this );
+    pm.fill( colorGroup().background() );
+    painter.begin( TQT_TQPAINTDEVICE(&pm), this );
 
-    painter.setPen( tqcolorGroup().dark() );
+    painter.setPen( colorGroup().dark() );
     painter.drawLine( 0, 0, width(), 0 );
 
     if( !d->reverseLayout )
@@ -722,9 +722,9 @@ void KoTabBar::resizeEvent( TQResizeEvent* )
     update();
 }
 
-TQSize KoTabBar::tqsizeHint() const
+TQSize KoTabBar::sizeHint() const
 {
-    return TQSize( 40, tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent, this ) );
+    return TQSize( 40, tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent, this ) );
 }
 
 void KoTabBar::renameTab( const TQString& old_name, const TQString& new_name )