rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kde-style-qtcurve@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 files changed, 91 insertions, 91 deletions

diff --git a/common/config_file.c b/common/config_file.c
index 98948ab..a144ae6 100644
--- a/common/config_file.c
+++ b/common/config_file.c
@@ -600,7 +600,7 @@ static bool makeDir(const TQString& dir, int mode)
 #if 0x039999 >= 0x040000
         int pos = target.indexOf('/', i);
 #else
-        int pos = target.tqfind('/', i);
+        int pos = target.find('/', i);
 #endif
         base += target.mid(i - 1, pos - i + 1);
         TQByteArray baseEncoded = TQFile::encodeName(base);
@@ -892,7 +892,7 @@ class TQtCConfig
     TQtCConfig(const TQString &filename);
 
     bool            ok() const { return values.count()>0; }
-    bool            hasKey(const TQString &key) { return values.tqcontains(key); }
+    bool            hasKey(const TQString &key) { return values.contains(key); }
     const TQString & readEntry(const TQString &key, const TQString &def=TQString());
 
     private:
@@ -919,7 +919,7 @@ TQtCConfig::TQtCConfig(const TQString &filename)
 #if 0x039999 >= 0x040000
             int pos=line.indexOf('=');
 #else
-            int pos=line.tqfind('=');
+            int pos=line.find('=');
 #endif
             if(-1!=pos)
                 values[line.left(pos)]=line.mid(pos+1);
@@ -930,7 +930,7 @@ TQtCConfig::TQtCConfig(const TQString &filename)
 
 inline const TQString & TQtCConfig::readEntry(const TQString &key, const TQString &def)
 {
-    return values.tqcontains(key) ? values[key] : def;
+    return values.contains(key) ? values[key] : def;
 }
 
 inline TQString readStringEntry(TQtCConfig &cfg, const TQString &key)
@@ -3225,7 +3225,7 @@ bool static writeConfig(KConfig *cfg, const Options &opts, const Options &def, b
 #endif
             for(unsigned int i=0; i<opts.titlebarButtonColors.size(); ++i)
             {
-                TBCols::const_iterator c(opts.titlebarButtonColors.tqfind((ETitleBarButtons)i));
+                TBCols::const_iterator c(opts.titlebarButtonColors.find((ETitleBarButtons)i));
 
                 if(c!=opts.titlebarButtonColors.end())
                 {
@@ -3270,7 +3270,7 @@ bool static writeConfig(KConfig *cfg, const Options &opts, const Options &def, b
 
         for(int i=APPEARANCE_CUSTOM1; i<(APPEARANCE_CUSTOM1+NUM_CUSTOM_GRAD); ++i)
         {
-            GradientCont::const_iterator cg(opts.customGradient.tqfind((EAppearance)i));
+            GradientCont::const_iterator cg(opts.customGradient.find((EAppearance)i));
             TQString                      gradKey;
 
             gradKey.sprintf("customgradient%d", (i-APPEARANCE_CUSTOM1)+1);
@@ -3281,7 +3281,7 @@ bool static writeConfig(KConfig *cfg, const Options &opts, const Options &def, b
             {
                 GradientCont::const_iterator d;
 
-                if(exportingStyle || (d=def.customGradient.tqfind((EAppearance)i))==def.customGradient.end() || !((*d)==(*cg)))
+                if(exportingStyle || (d=def.customGradient.find((EAppearance)i))==def.customGradient.end() || !((*d)==(*cg)))
                 {
                     TQString     gradVal;
 #if 0x039999 >= 0x040000
diff --git a/common/config_file.c-orig b/common/config_file.c-orig
index 499c345..772e4e7 100644
--- a/common/config_file.c-orig
+++ b/common/config_file.c-orig
@@ -427,7 +427,7 @@ TQtCConfig::TQtCConfig(const TQString &filename)
 #if [[[TQT_VERSION IS DEPRECATED]]] >= 0x040000
             int pos=line.indexOf('=');
 #else
-            int pos=line.tqfind('=');
+            int pos=line.find('=');
 #endif
             if(-1!=pos)
                 values[line.left(pos)]=line.mid(pos+1);
@@ -438,7 +438,7 @@ TQtCConfig::TQtCConfig(const TQString &filename)
 
 inline const TQString & TQtCConfig::readEntry(const char *key, const TQString &def)
 {
-    return values.tqcontains(key) ? values[key] : def;
+    return values.contains(key) ? values[key] : def;
 }
 
 inline TQString readStringEntry(TQtCConfig &cfg, const char *key)
diff --git a/style/pixmaps.h b/style/pixmaps.h
index 9e82bdd..69ddf20 100644
--- a/style/pixmaps.h
+++ b/style/pixmaps.h
@@ -238,7 +238,7 @@ static struct Embed {
 static const TQByteArray& qembed_findData( const char* name )
 {
     static TQDict<TQByteArray> dict;
-    TQByteArray* ba = dict.tqfind( name );
+    TQByteArray* ba = dict.find( name );
     if ( !ba ) {
 	for ( int i = 0; embed_vec[i].data; i++ ) {
 	    if ( strcmp(embed_vec[i].name, name) == 0 ) {
diff --git a/style/qtc_kstyle.cpp b/style/qtc_kstyle.cpp
index 675d65b..4d479a9 100644
--- a/style/qtc_kstyle.cpp
+++ b/style/qtc_kstyle.cpp
@@ -1712,6 +1712,6 @@ void TQtCKStyle::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 // vim: set noet ts=4 sw=4:
-// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off;
+// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off;
 
 #include "qtc_kstyle.moc"
diff --git a/style/qtcurve.cpp b/style/qtcurve.cpp
index 8745118..75c5e91 100644
--- a/style/qtcurve.cpp
+++ b/style/qtcurve.cpp
@@ -269,7 +269,7 @@ static TQString kdeHome(bool kde3=false)
 
             while(fgets(line, sizeof line, fpipe))
             {
-                kdeHome[kde3 ? 0 : 1]=TQString(TQFile::decodeName(line)).tqreplace("\n", "");
+                kdeHome[kde3 ? 0 : 1]=TQString(TQFile::decodeName(line)).replace("\n", "");
                 break;
             }
             pclose(fpipe);
@@ -307,9 +307,9 @@ static void getStyles(const TQString &dir, const char *sub, TQStringList &styles
 
         for(; it!=end; ++it)
         {
-            TQString style((*it).left((*it).tqfindRev(THEME_SUFFIX)));
+            TQString style((*it).left((*it).findRev(THEME_SUFFIX)));
 
-            if(!styles.tqcontains(style))
+            if(!styles.contains(style))
                 styles.append(style);
         }
     }
@@ -364,7 +364,7 @@ class TQtCurveStylePlugin : public TQStylePlugin
         return "qtcurve"==s.lower()
                     ? new TQtCurveStyle
 #ifdef TQTC_STYLE_SUPPORT
-                    : 0==s.tqfind(THEME_PREFIX)
+                    : 0==s.find(THEME_PREFIX)
                         ? new TQtCurveStyle(s)
 #endif
                         : 0;
@@ -415,16 +415,16 @@ static bool kickerIsTrans()
 
             if(inGen)
             {
-                if(0==line.tqfind("Transparent=", false))  // Found it!
+                if(0==line.find("Transparent=", false))  // Found it!
                 {
-                    if(-1!=line.tqfind("true", false))
+                    if(-1!=line.find("true", false))
                         trans=true;
                     stop=true;
                 }
                 else if(line[0]==TQChar('['))   // Then wasn't in General section...
                     stop=true;
             }
-            else if(0==line.tqfind("[General]", false))
+            else if(0==line.find("[General]", false))
                 inGen=true;
         }
         cfgFile.close();
@@ -540,11 +540,11 @@ static bool readKdeGlobals()
             TQString line(in.readLine());
             if(inPal)
             {
-                if(0==line.tqfind("DecorationFocus=", false))
+                if(0==line.find("DecorationFocus=", false))
                     setRgb(&kdeSettings.focus, TQStringList::split(",", line.mid(16)));
-                else if(0==line.tqfind("DecorationHover=", false))
+                else if(0==line.find("DecorationHover=", false))
                     setRgb(&kdeSettings.hover, TQStringList::split(",", line.mid(16)));
-                else if (-1!=line.tqfind('['))
+                else if (-1!=line.find('['))
                 {
                     donePal=true;
                     inPal=false;
@@ -552,20 +552,20 @@ static bool readKdeGlobals()
             }
             else if(inInactive)
             {
-                if(0==line.tqfind("ChangeSelectionColor=", false))
-                    changeSelectionColor=line.tqfind("=true");
-                else if(0==line.tqfind("Enable=", false))
-                    inactiveEnabled=line.tqfind("=true");
-                else if (-1!=line.tqfind('['))
+                if(0==line.find("ChangeSelectionColor=", false))
+                    changeSelectionColor=line.find("=true");
+                else if(0==line.find("Enable=", false))
+                    inactiveEnabled=line.find("=true");
+                else if (-1!=line.find('['))
                 {
                     doneInactive=true;
                     inInactive=false;
                 }
             }
             if(!inPal && !inInactive)
-                if(!useTQt3 && 0==line.tqfind("[Colors:Button]", false))
+                if(!useTQt3 && 0==line.find("[Colors:Button]", false))
                     inPal=true;
-                else if(!useTQt3 && 0==line.tqfind("[ColorEffects:Inactive]", false))
+                else if(!useTQt3 && 0==line.find("[ColorEffects:Inactive]", false))
                     inInactive=true;
         }
         f.close();
@@ -1143,7 +1143,7 @@ static TQString getFile(const TQString &f)
 {
     TQString d(f);
 
-    int slashPos(d.tqfindRev('/'));
+    int slashPos(d.findRev('/'));
 
     if(slashPos!=-1)
         d.remove(0, slashPos+1);
@@ -1234,10 +1234,10 @@ void TQtCurveStyle::polish(TQApplication *app)
         setSbType();
     }
 
-    if(SHADE_NONE!=opts.menuStripe && opts.noMenuStripeApps.tqcontains(appName))
+    if(SHADE_NONE!=opts.menuStripe && opts.noMenuStripeApps.contains(appName))
         opts.menuStripe=SHADE_NONE;
 #ifdef TQTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT
-    if(opts.fixParentlessDialogs && (opts.noDlgFixApps.tqcontains(appName) || opts.noDlgFixApps.tqcontains("kde")))
+    if(opts.fixParentlessDialogs && (opts.noDlgFixApps.contains(appName) || opts.noDlgFixApps.contains("kde")))
         opts.fixParentlessDialogs=false;
 #endif
 }
@@ -1783,11 +1783,11 @@ void TQtCurveStyle::polish(TQWidget *widget)
 
         // Remove horrible "Open - KDialog" titles...
         if( cap.length() &&
-            ( (APP_KPRINTER==itsThemedApp && (-1!=(index=cap.tqfind(" - KPrinter"))) &&
+            ( (APP_KPRINTER==itsThemedApp && (-1!=(index=cap.find(" - KPrinter"))) &&
                (index+11)==(int)cap.length()) ||
-              (APP_KDIALOG==itsThemedApp && (-1!=(index=cap.tqfind(" - KDialog"))) &&
+              (APP_KDIALOG==itsThemedApp && (-1!=(index=cap.find(" - KDialog"))) &&
                (index+10)==(int)cap.length()) ||
-              (APP_KDIALOGD==itsThemedApp && (-1!=(index=cap.tqfind(" - KDialog Daemon"))) &&
+              (APP_KDIALOGD==itsThemedApp && (-1!=(index=cap.find(" - KDialog Daemon"))) &&
                (index+17)==(int)cap.length())) )
             widget->TQWidget::setCaption(cap.left(index));
     }
@@ -4993,7 +4993,7 @@ void TQtCurveStyle::tqdrawControl(ControlElement control, TQPainter *p, const TQ
 
             if(!text.isNull())
             {
-                int t(text.tqfind('\t'));
+                int t(text.find('\t'));
 
                 // draw accelerator/tab-text
                 if(t>=0)
@@ -6919,7 +6919,7 @@ TQSize TQtCurveStyle::tqsizeFromContents(ContentsType contents, const TQWidget *
             maxpmw=TQMAX(maxpmw, constMenuPixmapWidth);
             w += (maxpmw * 2) + 8;
 
-            if (! mi->text().isNull() && mi->text().tqfind('\t') >= 0)
+            if (! mi->text().isNull() && mi->text().find('\t') >= 0)
                 w += 8;
 
             return TQSize(w, h);
@@ -7080,7 +7080,7 @@ void TQtCurveStyle::drawItem(TQPainter *p, const TQRect &r, int flags, const TQC
             {
                 TQString k;
                 k.sprintf("$qt-drawitem-%x", pm.serialNumber());
-                TQPixmap *tqmask = TQPixmapCache::tqfind(k);
+                TQPixmap *tqmask = TQPixmapCache::find(k);
                 bool del=false;
                 if (!tqmask)
                 {
@@ -7189,7 +7189,7 @@ void TQtCurveStyle::drawProgress(TQPainter *p, const TQRect &rx, const TQColorGr
         {
             // find the animation Offset for the current Widget
             TQWidget                          *nonConstWidget(const_cast<TQWidget*>(widget));
-            TQMapConstIterator<TQWidget*, int> it(itsProgAnimWidgets.tqfind(nonConstWidget));
+            TQMapConstIterator<TQWidget*, int> it(itsProgAnimWidgets.find(nonConstWidget));
 
             if (it!=itsProgAnimWidgets.end())
                 animShift += it.data();
@@ -7281,7 +7281,7 @@ void TQtCurveStyle::drawBevelGradient(const TQColor &base, TQPainter *p, const T
                       horiz ? origRect.height() : PIXMAP_DIMENSION);
         TQString     key(createKey(horiz ? r.height() : r.width(), base.rgb(), horiz, app,
                                   tab && sel && opts.colorSelTab ? CACHE_COL_SEL_TAB : CACHE_STD));
-        TQPixmap     *pix(itsPixmapCache.tqfind(key));
+        TQPixmap     *pix(itsPixmapCache.find(key));
         bool        inCache(true);
 
         if(!pix)
@@ -7958,7 +7958,7 @@ const TQColor * TQtCurveStyle::getMdiColors(const TQColorGroup &cg, bool active)
 
                     if(inPal)
                     {
-                        if(!itsActiveMdiColors && 0==line.tqfind("activeBackground=#", false))
+                        if(!itsActiveMdiColors && 0==line.find("activeBackground=#", false))
                         {
                             TQColor col;
 
@@ -7970,7 +7970,7 @@ const TQColor * TQtCurveStyle::getMdiColors(const TQColorGroup &cg, bool active)
                                 shadeColors(col, itsActiveMdiColors);
                             }
                         }
-                        else if(!itsMdiColors && 0==line.tqfind("inactiveBackground=#", false))
+                        else if(!itsMdiColors && 0==line.find("inactiveBackground=#", false))
                         {
                             TQColor col;
 
@@ -7981,14 +7981,14 @@ const TQColor * TQtCurveStyle::getMdiColors(const TQColorGroup &cg, bool active)
                                 shadeColors(col, itsMdiColors);
                             }
                         }
-                        else if(0==line.tqfind("activeForeground=#", false))
+                        else if(0==line.find("activeForeground=#", false))
                             setRgb(&itsActiveMdiTextColor, line.mid(17).latin1());
-                        else if(0==line.tqfind("inactiveForeground=#", false))
+                        else if(0==line.find("inactiveForeground=#", false))
                             setRgb(&itsMdiTextColor, line.mid(19).latin1());
-                        else if (-1!=line.tqfind('['))
+                        else if (-1!=line.find('['))
                             break;
                     }
-                    else if(0==line.tqfind("[KWinPalette]", false))
+                    else if(0==line.find("[KWinPalette]", false))
                         inPal=true;
                 }
                 f.close();
@@ -8009,7 +8009,7 @@ const TQColor * TQtCurveStyle::getMdiColors(const TQColorGroup &cg, bool active)
 
                     if(inPal)
                     {
-                        if(!itsActiveMdiColors && 0==line.tqfind("activeBackground=", false))
+                        if(!itsActiveMdiColors && 0==line.find("activeBackground=", false))
                         {
                             TQColor col;
 
@@ -8021,7 +8021,7 @@ const TQColor * TQtCurveStyle::getMdiColors(const TQColorGroup &cg, bool active)
                                 shadeColors(col, itsActiveMdiColors);
                             }
                         }
-                        else if(!itsMdiColors && 0==line.tqfind("inactiveBackground=", false))
+                        else if(!itsMdiColors && 0==line.find("inactiveBackground=", false))
                         {
                             TQColor col;
 
@@ -8032,14 +8032,14 @@ const TQColor * TQtCurveStyle::getMdiColors(const TQColorGroup &cg, bool active)
                                 shadeColors(col, itsMdiColors);
                             }
                         }
-                        else if(0==line.tqfind("activeForeground=", false))
+                        else if(0==line.find("activeForeground=", false))
                             setRgb(&itsActiveMdiTextColor, TQStringList::split(",", line.mid(17)));
-                        else if(0==line.tqfind("inactiveForeground=", false))
+                        else if(0==line.find("inactiveForeground=", false))
                             setRgb(&itsMdiTextColor, TQStringList::split(",", line.mid(19)));
-                        else if (-1!=line.tqfind('['))
+                        else if (-1!=line.find('['))
                             break;
                     }
-                    else if(0==line.tqfind("[WM]", false))
+                    else if(0==line.find("[WM]", false))
                         inPal=true;
                 }
                 f.close();
@@ -8088,20 +8088,20 @@ void TQtCurveStyle::readMdiPositions() const
 
                 if(inStyle)
                 {
-                    if(0==line.tqfind("ButtonsOnLeft=", false))
+                    if(0==line.find("ButtonsOnLeft=", false))
                     {
                         itsMdiButtons[0].clear();
                         parseWindowLine(line.mid(14), itsMdiButtons[0]);
                     }
-                    else if(0==line.tqfind("ButtonsOnRight=", false))
+                    else if(0==line.find("ButtonsOnRight=", false))
                     {
                         itsMdiButtons[1].clear();
                         parseWindowLine(line.mid(15), itsMdiButtons[1]);
                     }
-                    else if (-1!=line.tqfind('['))
+                    else if (-1!=line.find('['))
                         break;
                 }
-                else if(0==line.tqfind("[Style]", false))
+                else if(0==line.find("[Style]", false))
                     inStyle=true;
             }
             f.close();
@@ -8118,14 +8118,14 @@ void TQtCurveStyle::readMdiPositions() const
                 int minPos=itsMdiButtons[1].findIndex(SC_TitleBarMinButton);
                 maxPos=itsMdiButtons[1].findIndex(SC_TitleBarMaxButton);
 
-                itsMdiButtons[1].insert(itsMdiButtons[1].tqfind(minPos<maxPos ? (minPos==-1 ? 0 : minPos)
+                itsMdiButtons[1].insert(itsMdiButtons[1].find(minPos<maxPos ? (minPos==-1 ? 0 : minPos)
                                                                             : (maxPos==-1 ? 0 : maxPos)), SC_TitleBarShadeButton);
             }
             else // Add to left button
             {
                 int minPos=itsMdiButtons[0].findIndex(SC_TitleBarMinButton);
 
-                itsMdiButtons[1].insert(itsMdiButtons[1].tqfind(minPos>maxPos ? (minPos==-1 ? 0 : minPos)
+                itsMdiButtons[1].insert(itsMdiButtons[1].find(minPos>maxPos ? (minPos==-1 ? 0 : minPos)
                                                                             : (maxPos==-1 ? 0 : maxPos)), SC_TitleBarShadeButton);
             }
         }
@@ -8152,9 +8152,9 @@ bool TQtCurveStyle::redrawHoverWidget(const TQPoint &pos)
                    tqvisualRect(subRect(SR_RadioButtonFocusRect, rb), rb).width()+
                    tqpixelMetric(PM_ExclusiveIndicatorWidth)+4, itsHoverWidget->height());
 
-        itsHover=rect.tqcontains(pos) ? HOVER_RADIO : HOVER_NONE;
-        return (HOVER_NONE!=itsHover && !rect.tqcontains(itsOldPos)) ||
-               (HOVER_NONE==itsHover && rect.tqcontains(itsOldPos));
+        itsHover=rect.contains(pos) ? HOVER_RADIO : HOVER_NONE;
+        return (HOVER_NONE!=itsHover && !rect.contains(itsOldPos)) ||
+               (HOVER_NONE==itsHover && rect.contains(itsOldPos));
     }
     else
     {
@@ -8166,8 +8166,8 @@ bool TQtCurveStyle::redrawHoverWidget(const TQPoint &pos)
                        tqvisualRect(subRect(SR_CheckBoxFocusRect, cb), cb).width()+
                        tqpixelMetric(PM_IndicatorWidth)+4, itsHoverWidget->height());
 
-            itsHover=rect.tqcontains(pos) ? HOVER_CHECK : HOVER_NONE;
-            return (HOVER_NONE!=itsHover && !rect.tqcontains(itsOldPos)) || (HOVER_NONE==itsHover && rect.tqcontains(itsOldPos));
+            itsHover=rect.contains(pos) ? HOVER_CHECK : HOVER_NONE;
+            return (HOVER_NONE!=itsHover && !rect.contains(itsOldPos)) || (HOVER_NONE==itsHover && rect.contains(itsOldPos));
         }
         else
         {
@@ -8191,28 +8191,28 @@ bool TQtCurveStyle::redrawHoverWidget(const TQPoint &pos)
                 else
                     subline2.moveBy(0, -addline.height());
 
-                if(slider.tqcontains(pos))
+                if(slider.contains(pos))
                     itsHover=HOVER_SB_SLIDER;
-                else if(subline.tqcontains(pos))
+                else if(subline.contains(pos))
                     itsHover=HOVER_SB_SUB;
-                else if(addline.tqcontains(pos))
+                else if(addline.contains(pos))
                     itsHover=HOVER_SB_ADD;
-                else if(subline2.tqcontains(pos))
+                else if(subline2.contains(pos))
                     itsHover=HOVER_SB_SUB2;
                 else
                     itsHover=HOVER_NONE;
 
-                return (HOVER_SB_SLIDER==itsHover && !slider.tqcontains(itsOldPos)) ||
-                       (HOVER_SB_SLIDER!=itsHover && slider.tqcontains(itsOldPos)) ||
-                       (HOVER_SB_SUB==itsHover && !subline.tqcontains(itsOldPos)) ||
-                       (HOVER_SB_SUB!=itsHover && subline.tqcontains(itsOldPos)) ||
+                return (HOVER_SB_SLIDER==itsHover && !slider.contains(itsOldPos)) ||
+                       (HOVER_SB_SLIDER!=itsHover && slider.contains(itsOldPos)) ||
+                       (HOVER_SB_SUB==itsHover && !subline.contains(itsOldPos)) ||
+                       (HOVER_SB_SUB!=itsHover && subline.contains(itsOldPos)) ||
 
                        (useThreeButtonScrollBar &&
-                            (HOVER_SB_SUB2==itsHover && !subline2.tqcontains(itsOldPos)) ||
-                            (HOVER_SB_SUB2!=itsHover && subline2.tqcontains(itsOldPos)))  ||
+                            (HOVER_SB_SUB2==itsHover && !subline2.contains(itsOldPos)) ||
+                            (HOVER_SB_SUB2!=itsHover && subline2.contains(itsOldPos)))  ||
 
-                       (HOVER_SB_ADD==itsHover && !addline.tqcontains(itsOldPos)) ||
-                       (HOVER_SB_ADD!=itsHover && addline.tqcontains(itsOldPos));
+                       (HOVER_SB_ADD==itsHover && !addline.contains(itsOldPos)) ||
+                       (HOVER_SB_ADD!=itsHover && addline.contains(itsOldPos));
             }
             else
             {
@@ -8239,20 +8239,20 @@ bool TQtCurveStyle::redrawHoverWidget(const TQPoint &pos)
                         int  s(0);
                         bool redraw(false);
 
-                        itsHover=rect.tqcontains(pos) ? HOVER_HEADER : HOVER_NONE;
+                        itsHover=rect.contains(pos) ? HOVER_HEADER : HOVER_NONE;
                         itsHoverSect=NO_SECT;
 
                         for(s=0; s<hd->count() && (NO_SECT==itsHoverSect || !redraw); ++s)
                         {
                             TQRect r(hd->sectionRect(s));
-                            bool  hasNew(r.tqcontains(pos));
+                            bool  hasNew(r.contains(pos));
 
                             if(hasNew)
                                 itsHoverSect=s;
 
                             if(!redraw)
                             {
-                                bool hasOld(r.tqcontains(itsOldPos));
+                                bool hasOld(r.contains(itsOldPos));
 
                                 if((hasNew && !hasOld) || (!hasNew && hasOld))
                                     redraw=true;
@@ -8271,17 +8271,17 @@ bool TQtCurveStyle::redrawHoverWidget(const TQPoint &pos)
                                   down(querySubControlMetrics(CC_SpinWidget, itsHoverWidget,
                                                               SC_SpinWidgetDown));
 
-                            if(up.tqcontains(pos))
+                            if(up.contains(pos))
                                 itsHover=HOVER_SW_UP;
-                            else if(down.tqcontains(pos))
+                            else if(down.contains(pos))
                                 itsHover=HOVER_SW_DOWN;
                             else
                                 itsHover=HOVER_SW_ENTRY;
 
-                            return (HOVER_SW_UP==itsHover && !up.tqcontains(itsOldPos)) ||
-                                   (HOVER_SW_UP!=itsHover && up.tqcontains(itsOldPos)) ||
-                                   (HOVER_SW_DOWN==itsHover && !down.tqcontains(itsOldPos)) ||
-                                   (HOVER_SW_DOWN!=itsHover && down.tqcontains(itsOldPos)) ||
+                            return (HOVER_SW_UP==itsHover && !up.contains(itsOldPos)) ||
+                                   (HOVER_SW_UP!=itsHover && up.contains(itsOldPos)) ||
+                                   (HOVER_SW_DOWN==itsHover && !down.contains(itsOldPos)) ||
+                                   (HOVER_SW_DOWN!=itsHover && down.contains(itsOldPos)) ||
                                    (HOVER_SW_ENTRY==itsHover);
                         }
                         else
@@ -8315,7 +8315,7 @@ bool TQtCurveStyle::redrawHoverWidget(const TQPoint &pos)
                                         arrow=(querySubControlMetrics(CC_ComboBox, itsHoverWidget,
                                                                       SC_ComboBoxArrow));
 
-                                        if(arrow.tqcontains(pos))
+                                        if(arrow.contains(pos))
                                             itsHover=HOVER_CB_ARROW;
                                         else
                                         {
@@ -8326,15 +8326,15 @@ bool TQtCurveStyle::redrawHoverWidget(const TQPoint &pos)
                                                 r.addCoords(0, 0, -6, 0);
                                             if(DO_EFFECT && opts.etchEntry)
                                                 r.addCoords(1, 0, -1, 0);
-                                            if(r.tqcontains(pos))
+                                            if(r.contains(pos))
                                                 itsHover=HOVER_CB_ENTRY;
                                             else
                                                 itsHover=HOVER_NONE;
                                         }
                                     }
 
-                                   return (HOVER_CB_ARROW==itsHover && !arrow.tqcontains(itsOldPos)) ||
-                                          (HOVER_CB_ARROW!=itsHover && arrow.tqcontains(itsOldPos)) ||
+                                   return (HOVER_CB_ARROW==itsHover && !arrow.contains(itsOldPos)) ||
+                                          (HOVER_CB_ARROW!=itsHover && arrow.contains(itsOldPos)) ||
                                           (HOVER_CB_ENTRY==itsHover);
                                 }
                                 else
@@ -8435,7 +8435,7 @@ TQPixmap * TQtCurveStyle::getPixelPixmap(const TQColor col) const
     TQRgb    rgb(col.rgb());
     TQString key(createKey(rgb));
 
-    TQPixmap *pix=itsPixmapCache.tqfind(key);
+    TQPixmap *pix=itsPixmapCache.find(key);
 
     if(!pix)
     {
@@ -8457,7 +8457,7 @@ TQPixmap * TQtCurveStyle::createStripePixmap(const TQColor &col, bool forWindow)
     TQRgb    rgb(col.rgb());
     TQString key(createKey(rgb, forWindow ? 'S' : 's'));
 
-    TQPixmap *pix=itsPixmapCache.tqfind(key);
+    TQPixmap *pix=itsPixmapCache.find(key);
 
     if(!pix)
     {
@@ -8518,7 +8518,7 @@ TQPixmap * TQtCurveStyle::getPixmap(const TQColor col, EPixmap p, double shade)
 {
     TQRgb    rgb(col.rgb());
     TQString key(createKey(rgb, p));
-    TQPixmap *pix=itsPixmapCache.tqfind(key);
+    TQPixmap *pix=itsPixmapCache.find(key);
 
     if(!pix)
     {
diff --git a/style/qtcurve.h b/style/qtcurve.h
index 930a67a..63db16f 100644
--- a/style/qtcurve.h
+++ b/style/qtcurve.h
@@ -240,7 +240,7 @@ class TQtCurveStyle : public BASE_STYLE
     TQPixmap *      getPixmap(const TQColor col, EPixmap pix, double shade=1.0) const;
     TQPixmap *      createStripePixmap(const TQColor &col, bool forWindow) const;
     void           setSbType();
-    bool           isFormWidget(const TQWidget *w) const { return itsKhtmlWidgets.tqcontains(w); }
+    bool           isFormWidget(const TQWidget *w) const { return itsKhtmlWidgets.contains(w); }
     void           resetHover();
     bool           isWindowDragWidget(TQObject *o, const TQPoint &pos=TQPoint());