Rename old tq methods that no longer need a unique name

1 files changed, 17 insertions, 17 deletions

diff --git a/lib/kofficeui/KoRuler.cpp b/lib/kofficeui/KoRuler.cpp
index 212becd7..cc8f5189 100644
--- a/lib/kofficeui/KoRuler.cpp
+++ b/lib/kofficeui/KoRuler.cpp
@@ -209,12 +209,12 @@ void KoRuler::drawHorizontal( TQPainter *_painter )
 
     // Use a double-buffer pixmap
     TQPainter p( &buffer );
-    p.fillRect( 0, 0, width(), height(), TQBrush( tqcolorGroup().brush( TQColorGroup::Background ) ) );
+    p.fillRect( 0, 0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) );
 
     int totalw = tqRound( zoomIt(d->tqlayout.ptWidth) );
     TQString str;
 
-    p.setBrush( tqcolorGroup().brush( TQColorGroup::Base ) );
+    p.setBrush( colorGroup().brush( TQColorGroup::Base ) );
 
     // Draw white rect
     TQRect r;
@@ -279,13 +279,13 @@ void KoRuler::drawHorizontal( TQPainter *_painter )
     // Draw ending bar (at page width)
     //int constant=zoomIt(1);
     //p.drawLine( totalw - diffx + constant, 1, totalw - diffx + constant, height() - 1 );
-    //p.setPen( tqcolorGroup().color( TQColorGroup::Base ) );
+    //p.setPen( colorGroup().color( TQColorGroup::Base ) );
     //p.drawLine( totalw - diffx, 1, totalw - diffx, height() - 1 );
 
     // Draw starting bar (at 0)
-    //p.setPen( tqcolorGroup().color( TQColorGroup::Text ) );
+    //p.setPen( colorGroup().color( TQColorGroup::Text ) );
     //p.drawLine( -diffx, 1, -diffx, height() - 1 );
-    //p.setPen( tqcolorGroup().color( TQColorGroup::Base ) );
+    //p.setPen( colorGroup().color( TQColorGroup::Base ) );
     //p.drawLine( -diffx - constant, 1, -diffx - constant, height() - 1 );
 
     // Draw the indents triangles
@@ -307,7 +307,7 @@ void KoRuler::drawHorizontal( TQPainter *_painter )
 
     // Show the mouse position
     if ( d->action == A_NONE && showMPos ) {
-        p.setPen( tqcolorGroup().color( TQColorGroup::Text ) );
+        p.setPen( colorGroup().color( TQColorGroup::Text ) );
         p.drawLine( mposX, 1, mposX, height() - 1 );
     }
     hasToDelete = false;
@@ -325,7 +325,7 @@ void KoRuler::drawTabs( TQPainter &_painter )
 {
     int ptPos = 0;
 
-    _painter.setPen( TQPen( tqcolorGroup().color( TQColorGroup::Text ), 2, SolidLine ) );
+    _painter.setPen( TQPen( colorGroup().color( TQColorGroup::Text ), 2, SolidLine ) );
     // Check if we're in a mousemove event, removing a tab.
     // In that case, we'll have to skip drawing that one.
     bool willRemove = d->mousePressed && willRemoveTab( d->oldMy ) && d->currTab.type != T_INVALID;
@@ -356,7 +356,7 @@ void KoRuler::drawTabs( TQPainter &_painter )
             _painter.drawLine( ptPos + 4, height() - 4, ptPos + 20 - 4, height() - 4 );
             _painter.drawLine( ptPos + 20 / 2, 4, ptPos + 20 / 2, height() - 4 );
             _painter.fillRect( ptPos + 20 / 2 + 2, height() - 9, 3, 3,
-                               tqcolorGroup().color( TQColorGroup::Text ) );
+                               colorGroup().color( TQColorGroup::Text ) );
         } break;
         default: break;
         }
@@ -371,7 +371,7 @@ void KoRuler::drawVertical( TQPainter *_painter )
     resize( TQMAX( fm.height() + 4, 20 ), height() );
 
     TQPainter p( &buffer );
-    p.fillRect( 0, 0, width(), height(), TQBrush( tqcolorGroup().brush( TQColorGroup::Background ) ) );
+    p.fillRect( 0, 0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) );
 
     int totalh = tqRound( zoomIt(d->tqlayout.ptHeight) );
     // Clip rect - this gives basically always a rect like (2,2,width-2,height-2)
@@ -382,7 +382,7 @@ void KoRuler::drawVertical( TQPainter *_painter )
     if ( paintRect.intersects( rulerRect ) )  {
         TQString str;
 
-        p.setBrush( tqcolorGroup().brush( TQColorGroup::Base ) );
+        p.setBrush( colorGroup().brush( TQColorGroup::Base ) );
 
         // Draw white rect
         TQRect r;
@@ -454,19 +454,19 @@ void KoRuler::drawVertical( TQPainter *_painter )
 
         // Draw ending bar (at page height)
         //p.drawLine( 1, totalh - diffy + 1, width() - 1, totalh - diffy + 1 );
-        //p.setPen( tqcolorGroup().color( TQColorGroup::Base ) );
+        //p.setPen( colorGroup().color( TQColorGroup::Base ) );
         //p.drawLine( 1, totalh - diffy, width() - 1, totalh - diffy );
 
         // Draw starting bar (at 0)
-        //p.setPen( tqcolorGroup().color( TQColorGroup::Text ) );
+        //p.setPen( colorGroup().color( TQColorGroup::Text ) );
         //p.drawLine( 1, -diffy, width() - 1, -diffy );
-        //p.setPen( tqcolorGroup().color( TQColorGroup::Base ) );
+        //p.setPen( colorGroup().color( TQColorGroup::Base ) );
         //p.drawLine( 1, -diffy - 1, width() - 1, -diffy - 1 );
     }
 
     // Show the mouse position
     if ( d->action == A_NONE && showMPos ) {
-        p.setPen( tqcolorGroup().color( TQColorGroup::Text ) );
+        p.setPen( colorGroup().color( TQColorGroup::Text ) );
         p.drawLine( 1, mposY, width() - 1, mposY );
     }
     hasToDelete = false;
@@ -1176,7 +1176,7 @@ void KoRuler::slotMenuActivated( int i )
     }
 }
 
-TQSize KoRuler::tqminimumSizeHint() const
+TQSize KoRuler::minimumSizeHint() const
 {
     TQSize size;
     TQFont font = KGlobalSettings::toolBarFont();
@@ -1188,9 +1188,9 @@ TQSize KoRuler::tqminimumSizeHint() const
     return size;
 }
 
-TQSize KoRuler::tqsizeHint() const
+TQSize KoRuler::sizeHint() const
 {
-    return tqminimumSizeHint();
+    return minimumSizeHint();
 }
 
 void KoRuler::setPageLayout( const KoPageLayout& _layout )