2 files changed, 24 insertions, 24 deletions

diff --git a/src/gui/kdeext/KStartupLogo.cpp b/src/gui/kdeext/KStartupLogo.cpp
index e3edd9d..689c657 100644
--- a/src/gui/kdeext/KStartupLogo.cpp
+++ b/src/gui/kdeext/KStartupLogo.cpp
@@ -90,7 +90,7 @@ void KStartupLogo::paintEvent(TQPaintEvent*)
     paint.setBrush(TQt::white);
 
     //TQString version(VERSION);
-    //int sepIdx = version.tqfind("-");
+    //int sepIdx = version.find("-");
     TQString versionLabel(VERSION);
     //TQString("R%1 v%2").tqarg(version.left(sepIdx)).tqarg(version.mid(sepIdx + 1));
     int versionWidth = metrics.width(versionLabel);
diff --git a/src/gui/kdeext/klearlook.cpp b/src/gui/kdeext/klearlook.cpp
index cdf8904..17d37ad 100644
--- a/src/gui/kdeext/klearlook.cpp
+++ b/src/gui/kdeext/klearlook.cpp
@@ -135,14 +135,14 @@ static bool kickerIsTrans() {
             line = stream.readLine();
 
             if ( inGen ) {
-                if ( 0 == line.tqfind( "Transparent=" ) )    // Found it!
+                if ( 0 == line.find( "Transparent=" ) )    // Found it!
                 {
-                    if ( -1 != line.tqfind( "true" ) )
+                    if ( -1 != line.find( "true" ) )
                         trans = true;
                     stop = true;
                 } else if ( line[ 0 ] == TQChar( '[' ) )     // Then wasn't in General section...
                     stop = true;
-            } else if ( 0 == line.tqfind( "[General]" ) )
+            } else if ( 0 == line.find( "[General]" ) )
                 inGen = true;
         }
         cfgFile.close();
@@ -2718,7 +2718,7 @@ void KlearlookStyle::tqdrawControl(
                 TQString text = mi->text();
 
                 if ( !text.isNull() ) {
-                    int t = text.tqfind( '\t' );
+                    int t = text.find( '\t' );
 
                     // draw accelerator/tab-text
                     if ( t >= 0 ) {
@@ -3522,7 +3522,7 @@ TQSize KlearlookStyle::tqsizeFromContents( ContentsType t,
                     }
                 }
 
-                if ( !mi->text().isNull() && ( mi->text().tqfind( '\t' ) >= 0 ) ) {
+                if ( !mi->text().isNull() && ( mi->text().find( '\t' ) >= 0 ) ) {
                     w += itemHMargin + itemFrame * 2 + 7;
                 } else if ( mi->popup() ) {
                     w += 2 * arrowHMargin;
@@ -3898,9 +3898,9 @@ bool KlearlookStyle::redrawHoverWidget() {
             tqvisualRect( subRect( SR_RadioButtonFocusRect, rb ), rb ).width() +
             tqpixelMetric( PM_ExclusiveIndicatorWidth ) + 4, hoverWidget->height() );
 
-        hover = rect.tqcontains( cursor ) ? HOVER_RADIO : HOVER_NONE;
-        return ( HOVER_NONE != hover && !rect.tqcontains( oldCursor ) ) ||
-               ( HOVER_NONE == hover && rect.tqcontains( oldCursor ) );
+        hover = rect.contains( cursor ) ? HOVER_RADIO : HOVER_NONE;
+        return ( HOVER_NONE != hover && !rect.contains( oldCursor ) ) ||
+               ( HOVER_NONE == hover && rect.contains( oldCursor ) );
     } else {
         TQCheckBox *cb = dynamic_cast<TQCheckBox *>( hoverWidget );
 
@@ -3909,9 +3909,9 @@ bool KlearlookStyle::redrawHoverWidget() {
                 tqvisualRect( subRect( SR_CheckBoxFocusRect, cb ), cb ).width() +
                         tqpixelMetric( PM_IndicatorWidth ) + 4, hoverWidget->height() );
 
-            hover = rect.tqcontains( cursor ) ? HOVER_CHECK : HOVER_NONE;
-            return ( HOVER_NONE != hover && !rect.tqcontains( oldCursor ) ) ||
-                   ( HOVER_NONE == hover && rect.tqcontains( oldCursor ) );
+            hover = rect.contains( cursor ) ? HOVER_CHECK : HOVER_NONE;
+            return ( HOVER_NONE != hover && !rect.contains( oldCursor ) ) ||
+                   ( HOVER_NONE == hover && rect.contains( oldCursor ) );
         } else {
             TQScrollBar *sb = dynamic_cast<TQScrollBar *>( hoverWidget );
 
@@ -3928,21 +3928,21 @@ bool KlearlookStyle::redrawHoverWidget() {
                 slider.moveLeft( slider.x() + widgetZero.x() );
                 slider.moveTop( slider.y() + widgetZero.y() );
 
-                if ( slider.tqcontains( cursor ) )
+                if ( slider.contains( cursor ) )
                     hover = HOVER_SB_SLIDER;
-                else if ( subline.tqcontains( cursor ) )
+                else if ( subline.contains( cursor ) )
                     hover = HOVER_SB_SUB;
-                else if ( addline.tqcontains( cursor ) )
+                else if ( addline.contains( cursor ) )
                     hover = HOVER_SB_ADD;
                 else
                     hover = HOVER_NONE;
 
-                return ( HOVER_SB_SLIDER == hover && !slider.tqcontains( oldCursor ) ) ||
-                       ( HOVER_SB_SLIDER != hover && slider.tqcontains( oldCursor ) ) ||
-                       ( HOVER_SB_SUB == hover && !subline.tqcontains( oldCursor ) ) ||
-                       ( HOVER_SB_SUB != hover && subline.tqcontains( oldCursor ) ) ||
-                       ( HOVER_SB_ADD == hover && !addline.tqcontains( oldCursor ) ) ||
-                       ( HOVER_SB_ADD != hover && addline.tqcontains( oldCursor ) );
+                return ( HOVER_SB_SLIDER == hover && !slider.contains( oldCursor ) ) ||
+                       ( HOVER_SB_SLIDER != hover && slider.contains( oldCursor ) ) ||
+                       ( HOVER_SB_SUB == hover && !subline.contains( oldCursor ) ) ||
+                       ( HOVER_SB_SUB != hover && subline.contains( oldCursor ) ) ||
+                       ( HOVER_SB_ADD == hover && !addline.contains( oldCursor ) ) ||
+                       ( HOVER_SB_ADD != hover && addline.contains( oldCursor ) );
             } else {
 #if KDE_VERSION >= 0x30400
                 TQToolButton *tb = dynamic_cast<TQToolButton *>( hoverWidget );
@@ -3968,7 +3968,7 @@ bool KlearlookStyle::redrawHoverWidget() {
                         int s = 0;
                         bool redraw = false;
 
-                        hover = rect.tqcontains( cursor ) ? HOVER_HEADER : HOVER_NONE;
+                        hover = rect.contains( cursor ) ? HOVER_HEADER : HOVER_NONE;
                         hoverSect = TQTC_NO_SECT;
 
                         for ( s = 0; s < hd->count() && ( TQTC_NO_SECT == hoverSect || !redraw ); ++s ) {
@@ -3977,13 +3977,13 @@ bool KlearlookStyle::redrawHoverWidget() {
                             r.moveLeft( r.x() + widgetZero.x() );
                             r.moveTop( r.y() + widgetZero.y() );
 
-                            bool hasNew = r.tqcontains( cursor );
+                            bool hasNew = r.contains( cursor );
 
                             if ( hasNew )
                                 hoverSect = s;
 
                             if ( !redraw ) {
-                                bool hasOld = r.tqcontains( oldCursor );
+                                bool hasOld = r.contains( oldCursor );
 
                                 if ( ( hasNew && !hasOld ) || ( !hasNew && hasOld ) )
                                     redraw = true;