Rename old tq methods that no longer need a unique name

1 files changed, 34 insertions, 34 deletions

diff --git a/style/lipstik.cpp b/style/lipstik.cpp
index b7ff52d..2ffae54 100644
--- a/style/lipstik.cpp
+++ b/style/lipstik.cpp
@@ -965,13 +965,13 @@ void LipstikStyle::renderPanel(TQPainter *p,
             p->setPen(g.mid());
             p->drawConvexPolygon(TQPointArray(4, corners));
             p->setPen(g.mid());
-            p->tqdrawPolyline(TQPointArray(4, corners), 0, 3);
+            p->drawPolyline(TQPointArray(4, corners), 0, 3);
         } else {
             const TQCOORD corners[] = { x, y2, x, y, x2, y, x2, y2 };
             p->setPen(g.background().dark());
             p->drawPolygon(TQPointArray(4, corners));
             p->setPen(g.background().light());
-            p->tqdrawPolyline(TQPointArray(4, corners), 0, 3);
+            p->drawPolyline(TQPointArray(4, corners), 0, 3);
         }
     } else {
         renderContour(p, r, g.background(), getColor(g, PanelContour) );
@@ -2407,11 +2407,11 @@ void LipstikStyle::tqdrawPrimitive(PrimitiveElement pe,
                 }
             }
 
-            const TQWMatrix oldMatrix( p->tqworldMatrix() );
+            const TQWMatrix oldMatrix( p->worldMatrix() );
 
             if (flags & Style_Down) {
-                p->translate(tqpixelMetric(PM_ButtonShiftHorizontal),
-                                tqpixelMetric(PM_ButtonShiftVertical));
+                p->translate(pixelMetric(PM_ButtonShiftHorizontal),
+                                pixelMetric(PM_ButtonShiftVertical));
             }
 
             a.translate((r.x()+r.width()/2), (r.y()+r.height()/2));
@@ -2452,7 +2452,7 @@ void LipstikStyle::tqdrawPrimitive(PrimitiveElement pe,
 }
 
 
-void LipstikStyle::tqdrawControl(ControlElement element,
+void LipstikStyle::drawControl(ControlElement element,
                               TQPainter *p,
                               const TQWidget *widget,
                               const TQRect &r,
@@ -2650,7 +2650,7 @@ void LipstikStyle::tqdrawControl(ControlElement element,
                     renderTab(p, r, cg, mouseOver, selected, true, pos, false, cornerWidget);
                     break;
                     default:
-                            KStyle::tqdrawControl(element, p, widget, r, cg, flags, opt);
+                            KStyle::drawControl(element, p, widget, r, cg, flags, opt);
             }
 
             break;
@@ -2693,15 +2693,15 @@ void LipstikStyle::tqdrawControl(ControlElement element,
             // Shift button contents if pushed.
             if ( active )
             {
-                x += tqpixelMetric(PM_ButtonShiftHorizontal, widget);
-                y += tqpixelMetric(PM_ButtonShiftVertical, widget);
+                x += pixelMetric(PM_ButtonShiftHorizontal, widget);
+                y += pixelMetric(PM_ButtonShiftVertical, widget);
                 flags |= Style_Sunken;
             }
 
             // Does the button have a popup menu?
             if ( button->isMenuButton() )
             {
-                int dx = tqpixelMetric( PM_MenuButtonIndicator, widget );
+                int dx = pixelMetric( PM_MenuButtonIndicator, widget );
                 if ( button->iconSet() && !button->iconSet()->isNull()  &&
                     (dx + button->iconSet()->pixmap (TQIconSet::Small, TQIconSet::Normal, TQIconSet::Off ).width()) >= w )
                 {
@@ -2710,7 +2710,7 @@ void LipstikStyle::tqdrawControl(ControlElement element,
                 else
                 {
 		    p->setPen(cg.buttonText());
-                    tqdrawPrimitive( PE_ArrowDown, p, tqvisualRect( TQRect(x + w - dx - 8, y + 2, dx, h - 4), r ),
+                    tqdrawPrimitive( PE_ArrowDown, p, visualRect( TQRect(x + w - dx - 8, y + 2, dx, h - 4), r ),
                                 cg, flags, opt );
                     w -= dx;
                 }
@@ -2736,7 +2736,7 @@ void LipstikStyle::tqdrawControl(ControlElement element,
                     p->drawPixmap( x + 4, y + h / 2 - pixmap.height() / 2, pixmap );
 
                 if (cornArrow) //Draw over the icon
-                    tqdrawPrimitive( PE_ArrowDown, p, tqvisualRect( TQRect(x + w - 6, x + h - 6, 7, 7), r ),
+                    tqdrawPrimitive( PE_ArrowDown, p, visualRect( TQRect(x + w - 6, x + h - 6, 7, 7), r ),
                                 cg, flags, opt );
 
 
@@ -2746,14 +2746,14 @@ void LipstikStyle::tqdrawControl(ControlElement element,
             }
 
             // Make the label indicate if the button is a default button or not
-            drawItem( p, TQRect(x, y, w, h), AlignCenter|ShowPrefix, button->tqcolorGroup(),
+            drawItem( p, TQRect(x, y, w, h), AlignCenter|ShowPrefix, button->colorGroup(),
                         button->isEnabled(), button->pixmap(), button->text(), -1,
-                        &button->tqcolorGroup().buttonText() );
+                        &button->colorGroup().buttonText() );
 
 
             if ( flags & Style_HasFocus )
                 tqdrawPrimitive( PE_FocusRect, p,
-                                tqvisualRect( subRect( SR_PushButtonFocusRect, widget ), widget ),
+                                visualRect( subRect( SR_PushButtonFocusRect, widget ), widget ),
                                 cg, flags );
             break;
         }
@@ -2837,7 +2837,7 @@ void LipstikStyle::tqdrawControl(ControlElement element,
             bool enabled    = mi->isEnabled();
             bool checkable  = popupmenu->isCheckable();
             bool active     = flags & Style_Active;
-            bool etchtext   = tqstyleHint( SH_EtchDisabledText );
+            bool etchtext   = styleHint( SH_EtchDisabledText );
             bool reverse    = TQApplication::reverseLayout();
 
             if ( checkable )
@@ -2924,7 +2924,7 @@ void LipstikStyle::tqdrawControl(ControlElement element,
                 break;
             }
 
-            TQRect cr = tqvisualRect( TQRect( r.x() + 2, r.y() + 2, checkcol - 1, r.height() - 4 ), r );
+            TQRect cr = visualRect( TQRect( r.x() + 2, r.y() + 2, checkcol - 1, r.height() - 4 ), r );
 
             // Do we have an icon?
             if ( mi->iconSet() ) {
@@ -3077,8 +3077,8 @@ void LipstikStyle::tqdrawControl(ControlElement element,
             // Does the menu item have a submenu?
             if ( mi->popup() ) {
                 PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
-                int dim = tqpixelMetric(PM_MenuButtonIndicator) - 1;
-                TQRect vr = tqvisualRect( TQRect( r.x() + r.width() - 5 - 1 - dim,
+                int dim = pixelMetric(PM_MenuButtonIndicator) - 1;
+                TQRect vr = visualRect( TQRect( r.x() + r.width() - 5 - 1 - dim,
                             r.y() + r.height() / 2 - dim / 2, dim, dim), r );
 
                 // Draw an arrow at the far end of the menu item
@@ -3124,11 +3124,11 @@ void LipstikStyle::tqdrawControl(ControlElement element,
             break;
 
         default:
-          KStyle::tqdrawControl(element, p, widget, r, cg, flags, opt);
+          KStyle::drawControl(element, p, widget, r, cg, flags, opt);
     }
 }
 
-void LipstikStyle::tqdrawControlMask(ControlElement element,
+void LipstikStyle::drawControlMask(ControlElement element,
                                   TQPainter *p,
                                   const TQWidget *w,
                                   const TQRect &r,
@@ -3143,12 +3143,12 @@ void LipstikStyle::tqdrawControlMask(ControlElement element,
         }
 
         default: {
-            KStyle::tqdrawControlMask (element, p, w, r, opt);
+            KStyle::drawControlMask (element, p, w, r, opt);
         }
     }
 }
 
-void LipstikStyle::tqdrawComplexControlMask(ComplexControl c,
+void LipstikStyle::drawComplexControlMask(ComplexControl c,
                                          TQPainter *p,
                                          const TQWidget *w,
                                          const TQRect &r,
@@ -3164,12 +3164,12 @@ void LipstikStyle::tqdrawComplexControlMask(ComplexControl c,
             break;
         }
         default: {
-            KStyle::tqdrawComplexControlMask (c, p, w, r, o);
+            KStyle::drawComplexControlMask (c, p, w, r, o);
         }
     }
 }
 
-void LipstikStyle::tqdrawComplexControl(ComplexControl control,
+void LipstikStyle::drawComplexControl(ComplexControl control,
                                      TQPainter *p,
                                      const TQWidget *widget,
                                      const TQRect &r,
@@ -3596,7 +3596,7 @@ void LipstikStyle::tqdrawComplexControl(ComplexControl control,
         }
 
         default:
-            KStyle::tqdrawComplexControl(control, p, widget,
+            KStyle::drawComplexControl(control, p, widget,
                                         r, cg, flags, controls,
                                         active, opt);
             break;
@@ -3701,7 +3701,7 @@ TQRect LipstikStyle::querySubControlMetrics(ComplexControl control,
     }
 }
 
-int LipstikStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const
+int LipstikStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const
 {
     switch(m) {
     // TABS
@@ -3813,7 +3813,7 @@ int LipstikStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const
         }
 
         default:
-            return KStyle::tqpixelMetric(m, widget);
+            return KStyle::pixelMetric(m, widget);
     }
 }
 
@@ -3835,8 +3835,8 @@ TQSize LipstikStyle::tqsizeFromContents(ContentsType t,
             bool checkable = popup->isCheckable();
 
             if (mi->custom()) {
-                w = mi->custom()->tqsizeHint().width();
-                h = mi->custom()->tqsizeHint().height();
+                w = mi->custom()->sizeHint().width();
+                h = mi->custom()->sizeHint().height();
                 if (!mi->custom()->fullSpan() )
                     h += 4;
             } else if (mi->widget()) {
@@ -3882,8 +3882,8 @@ TQSize LipstikStyle::tqsizeFromContents(ContentsType t,
         {
             const TQPushButton* btn = static_cast<const TQPushButton*>(widget);
 
-            int w = s.width() + 2 * tqpixelMetric(PM_ButtonMargin, widget);
-            int h = s.height() + 2 * tqpixelMetric(PM_ButtonMargin, widget);
+            int w = s.width() + 2 * pixelMetric(PM_ButtonMargin, widget);
+            int h = s.height() + 2 * pixelMetric(PM_ButtonMargin, widget);
             if ( btn->text().isEmpty() && s.width() < 32 ) return TQSize(w, h);
 
             return TQSize( w+25, h+5 );
@@ -3904,7 +3904,7 @@ TQSize LipstikStyle::tqsizeFromContents(ContentsType t,
     return KStyle::tqsizeFromContents (t, widget, s, opt);
 }
 
-int LipstikStyle::tqstyleHint( StyleHint stylehint,
+int LipstikStyle::styleHint( StyleHint stylehint,
                                    const TQWidget *widget,
                                    const TQStyleOption &option,
                                    TQStyleHintReturn* returnData ) const
@@ -3914,7 +3914,7 @@ int LipstikStyle::tqstyleHint( StyleHint stylehint,
             return 96; // Motif-like delay...
 
         default:
-            return KStyle::tqstyleHint(stylehint, widget, option, returnData);
+            return KStyle::styleHint(stylehint, widget, option, returnData);
     }
 }