1 files changed, 14 insertions, 14 deletions

diff --git a/src/gui/kdeext/klearlook.cpp b/src/gui/kdeext/klearlook.cpp
index c1e7cfc..ca595e1 100644
--- a/src/gui/kdeext/klearlook.cpp
+++ b/src/gui/kdeext/klearlook.cpp
@@ -722,7 +722,7 @@ bool KlearlookStyle::eventFilter( TQObject *object, TQEvent *event ) {
                 hoverWidget = ( TQWidget * ) object;
                 if ( hoverWidget && hoverWidget->isEnabled() ) {
                     if ( redrawHoverWidget() ) {
-                        hoverWidget->tqrepaint( false );
+                        hoverWidget->repaint( false );
                         if ( APP_KICKER == themedApp )
                             hover = HOVER_NONE;
                     }
@@ -736,13 +736,13 @@ bool KlearlookStyle::eventFilter( TQObject *object, TQEvent *event ) {
                 oldCursor.setX( -1 );
                 oldCursor.setY( -1 );
                 hoverWidget = NULL;
-                ( ( TQWidget * ) object ) ->tqrepaint( false );
+                ( ( TQWidget * ) object ) ->repaint( false );
             }
             break;
         case TQEvent::MouseMove:
             if ( hoverWidget && object->isWidgetType() ) {
                 if ( redrawHoverWidget() ) {
-                    hoverWidget->tqrepaint( false );
+                    hoverWidget->repaint( false );
                     if ( APP_KICKER == themedApp )
                         hover = HOVER_NONE;
                 }
@@ -2225,7 +2225,7 @@ void KlearlookStyle::drawControl(
                     fr( r );
                     int offset = rounded ? 2 : 0;
 
-                    switch ( tb->tqshape() ) {
+                    switch ( tb->shape() ) {
                         case TQTabBar::TriangularAbove:
                         case TQTabBar::RoundedAbove:
                             if ( flags & Style_Selected ) {
@@ -2380,7 +2380,7 @@ void KlearlookStyle::drawControl(
                 } else {
                     TQRect br( r );
 
-                    switch ( tb->tqshape() ) {
+                    switch ( tb->shape() ) {
                         case TQTabBar::TriangularAbove:
                         case TQTabBar::RoundedAbove:
                             if ( flags & Style_Selected ) {
@@ -2465,10 +2465,10 @@ void KlearlookStyle::drawControl(
                 TQRect tr = r;
 
                 if ( t->identifier() == tb->currentTab() ) {
-                    if ( TQTabBar::RoundedAbove == tb->tqshape() || TQTabBar::TriangularAbove == tb->tqshape() )
+                    if ( TQTabBar::RoundedAbove == tb->shape() || TQTabBar::TriangularAbove == tb->shape() )
                         tr.setBottom( tr.bottom() - pixelMetric( TQStyle::PM_TabBarTabShiftVertical, tb ) );
                 } else
-                    if ( TQTabBar::RoundedBelow == tb->tqshape() || TQTabBar::TriangularBelow == tb->tqshape() )
+                    if ( TQTabBar::RoundedBelow == tb->shape() || TQTabBar::TriangularBelow == tb->shape() )
                         tr.setTop( tr.top() + pixelMetric( TQStyle::PM_TabBarTabShiftVertical, tb ) );
 
                 drawItem( p, tr, AlignCenter | ShowPrefix, cg, flags & Style_Enabled, 0, t->text() );
@@ -2922,9 +2922,9 @@ void KlearlookStyle::drawControl(
                     p->fillRect( checkbox->rect(), cg.background().light( TQTC_HIGHLIGHT_FACTOR ) );
                     p->setClipping( false );
                 }
-                int tqalignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
+                int alignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
 
-                drawItem( p, r, tqalignment | AlignVCenter | ShowPrefix, cg,
+                drawItem( p, r, alignment | AlignVCenter | ShowPrefix, cg,
                     flags & Style_Enabled, checkbox->pixmap(), checkbox->text() );
 
                 if ( checkbox->hasFocus() )
@@ -2956,9 +2956,9 @@ void KlearlookStyle::drawControl(
                     p->setClipping( false );
                 }
 
-                int tqalignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
+                int alignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
 
-                drawItem( p, r, tqalignment | AlignVCenter | ShowPrefix, cg,
+                drawItem( p, r, alignment | AlignVCenter | ShowPrefix, cg,
                     flags & Style_Enabled, radiobutton->pixmap(), radiobutton->text() );
 
                 if ( radiobutton->hasFocus() )
@@ -3408,7 +3408,7 @@ int KlearlookStyle::pixelMetric( PixelMetric metric, const TQWidget *widget ) co
         case PM_TabBarTabShiftVertical: {
                 const TQTabBar *tb = ::tqqt_cast<const TQTabBar *>( widget );
 
-                return TQTabBar::RoundedAbove == tb->tqshape() || TQTabBar::TriangularAbove == tb->tqshape()
+                return TQTabBar::RoundedAbove == tb->shape() || TQTabBar::TriangularAbove == tb->shape()
                        ? 1
                        : -1;
             }
@@ -3417,8 +3417,8 @@ int KlearlookStyle::pixelMetric( PixelMetric metric, const TQWidget *widget ) co
 
         case PM_TabBarTabVSpace: {
                 const TQTabBar * tb = ( const TQTabBar * ) widget;
-                if ( tb->tqshape() == TQTabBar::RoundedAbove ||
-                        tb->tqshape() == TQTabBar::RoundedBelow )
+                if ( tb->shape() == TQTabBar::RoundedAbove ||
+                        tb->shape() == TQTabBar::RoundedBelow )
                     return 12;
                 else
                     return 4;