From 7ef01c0f34d9c6732d258154bcd3ba5a88280db9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: rename the following methods: tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- noatun/modules/kjofol-skin/kjbutton.cpp | 2 +- noatun/modules/kjofol-skin/kjloader.cpp | 20 ++++++++++---------- noatun/modules/kjofol-skin/kjloader.h | 2 +- noatun/modules/kjofol-skin/kjprefs.cpp | 4 ++-- noatun/modules/kjofol-skin/kjtextdisplay.cpp | 2 +- noatun/modules/kjofol-skin/parser.cpp | 4 ++-- noatun/modules/kjofol-skin/parser.h | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) (limited to 'noatun/modules/kjofol-skin') diff --git a/noatun/modules/kjofol-skin/kjbutton.cpp b/noatun/modules/kjofol-skin/kjbutton.cpp index 7dbd9d99..6777c518 100644 --- a/noatun/modules/kjofol-skin/kjbutton.cpp +++ b/noatun/modules/kjofol-skin/kjbutton.cpp @@ -53,7 +53,7 @@ KJButton::KJButton(const TQStringList &i, KJLoader *tqparent) bool gotBack = false; // in case any of these keys is duplicated for(TQStringList::Iterator it = temp.begin(); it != temp.end(); ++it) { - if((*it).tqcontains("bmp")) + if((*it).contains("bmp")) { TQString pressedTmp = backgroundPressed((*it)); if(!pressedTmp.isEmpty()) diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp index fca8b6bb..6c433e74 100644 --- a/noatun/modules/kjofol-skin/kjloader.cpp +++ b/noatun/modules/kjofol-skin/kjloader.cpp @@ -163,7 +163,7 @@ TQPtrList KJLoader::widgetsAt(const TQPoint &pt) const { TQPtrList things; for ( TQPtrListIterator i(subwidgets); i.current(); ++i ) - if ( (*i)->rect().tqcontains(pt) ) + if ( (*i)->rect().contains(pt) ) things.append((*i)); return things; @@ -173,7 +173,7 @@ void KJLoader::removeChild(KJWidget *c) { if ( mClickedIn == c ) mClickedIn = 0; - if (subwidgets.tqfindRef(c) != -1) + if (subwidgets.findRef(c) != -1) subwidgets.take(); } @@ -219,7 +219,7 @@ void KJLoader::loadSkin(const TQString &file) if ( exist("dockmodercfile") ) { // set path to dockmode rc-file (its not always skinname.dck) - mCurrentDockModeSkin = file.left(file.tqfindRev("/")+1) + (item("dockmodercfile")[1]); + mCurrentDockModeSkin = file.left(file.findRev("/")+1) + (item("dockmodercfile")[1]); mDockPosition = item("dockmodeposition")[1].toInt(); mDockPositionX = item("dockmodepositionxy")[1].toInt(); mDockPositionY = item("dockmodepositionxy")[2].toInt(); @@ -228,7 +228,7 @@ void KJLoader::loadSkin(const TQString &file) mCurrentDockModeSkin=""; if ( exist("winshademodercfile") ) - mCurrentWinshadeModeSkin = file.left(file.tqfindRev("/")+1) + (item("winshademodercfile")[1]); + mCurrentWinshadeModeSkin = file.left(file.findRev("/")+1) + (item("winshademodercfile")[1]); else // no WinshadeMode mCurrentWinshadeModeSkin=""; } @@ -377,7 +377,7 @@ void KJLoader::loadSkin(const TQString &file) for (TQDictIterator i(*this); i.current(); ++i) { TQString d=i.currentKey(); - if(d.tqcontains("button") && + if(d.contains("button") && !d.startsWith("playlistwindow") && // don't add buttons that belong to the playlistwindow d != "pitchcontrolbutton" && // both already handled above as they aren't buttons but sliders d != "volumecontrolbutton" && @@ -728,11 +728,11 @@ void KJLoader::mouseMoveEvent(TQMouseEvent *e) // TQWidget::mouseMoveEvent(e); // not on background but on a widget: pass event to subwidget - if ( !moving && mClickedIn && subwidgets.tqfindRef(mClickedIn) != -1 ) + if ( !moving && mClickedIn && subwidgets.findRef(mClickedIn) != -1 ) { mClickedIn->mouseMove ( e->pos()-mClickedIn->rect().topLeft(), - mClickedIn->rect().tqcontains(mapFromGlobal(TQCursor::pos())) ); + mClickedIn->rect().contains(mapFromGlobal(TQCursor::pos())) ); } } @@ -749,7 +749,7 @@ void KJLoader::mousePressEvent(TQMouseEvent *e) mMousePoint = mapFromGlobal(TQCursor::pos()); // try to find a KJWidget that is here for (KJWidget* i=subwidgets.first(); i!=0; i=subwidgets.next()) - if (i->rect().tqcontains(mMousePoint)) + if (i->rect().contains(mMousePoint)) { if (i->mousePress(mMousePoint-i->rect().topLeft())) { @@ -769,11 +769,11 @@ void KJLoader::mouseReleaseEvent(TQMouseEvent */*e*/) // TQWidget::mouseReleaseEvent(e); - if (!moving && mClickedIn && subwidgets.tqfindRef(mClickedIn)!=-1) + if (!moving && mClickedIn && subwidgets.findRef(mClickedIn)!=-1) { mClickedIn->mouseRelease(mapFromGlobal(TQCursor::pos())- mClickedIn->rect().topLeft(), - mClickedIn->rect().tqcontains( + mClickedIn->rect().contains( mapFromGlobal(TQCursor::pos()))); mClickedIn=0; } diff --git a/noatun/modules/kjofol-skin/kjloader.h b/noatun/modules/kjofol-skin/kjloader.h index 94ab729a..117545b2 100644 --- a/noatun/modules/kjofol-skin/kjloader.h +++ b/noatun/modules/kjofol-skin/kjloader.h @@ -44,7 +44,7 @@ public: public: void minimize(); KHelpMenu *helpMenu() const { return mHelpMenu; } - TQStringList &item(const TQString &key) { return *Parser::tqfind(key); } + TQStringList &item(const TQString &key) { return *Parser::find(key); } // returns path to currently loaded configfile // can be either a newly loaded one or one of the three below diff --git a/noatun/modules/kjofol-skin/kjprefs.cpp b/noatun/modules/kjofol-skin/kjprefs.cpp index b8e6e4bf..9e3727b6 100644 --- a/noatun/modules/kjofol-skin/kjprefs.cpp +++ b/noatun/modules/kjofol-skin/kjprefs.cpp @@ -151,7 +151,7 @@ void KJPrefs::reopen() // reload config and set stuff in dialog skins.sort(); TQString loaded = cfg->readEntry("SkinResource", locate("data", "noatun/skins/kjofol/kjofol/kjofol.rc") ); - loaded = loaded.mid(loaded.tqfindRev("/")+1); // remove path + loaded = loaded.mid(loaded.findRev("/")+1); // remove path loaded = loaded.left( loaded.length() - 3 ); // remove ".rc" mSkinselectorWidget->mSkins->clear(); @@ -454,7 +454,7 @@ void KJPrefs::installNewSkin( void ) { // skindir is named like the archive without extension (FIXME: extension is not stripped from name) - int dotPos = srcFile.fileName().tqfindRev('.'); + int dotPos = srcFile.fileName().findRev('.'); if ( dotPos > 0 ) // found a dot -> (hopefully) strip the extension { dst.addPath( srcFile.fileName().left(dotPos) ); diff --git a/noatun/modules/kjofol-skin/kjtextdisplay.cpp b/noatun/modules/kjofol-skin/kjtextdisplay.cpp index 14590b24..ab583a24 100644 --- a/noatun/modules/kjofol-skin/kjtextdisplay.cpp +++ b/noatun/modules/kjofol-skin/kjtextdisplay.cpp @@ -167,7 +167,7 @@ void KJFilename::timeUpdate(int) mLastTitle = title; TQCString timestring = napp->player()->lengthString().local8Bit(); - timestring = timestring.mid(timestring.tqfind('/')+1); + timestring = timestring.mid(timestring.find('/')+1); prepareString ( title + " (" + timestring + ") "); } diff --git a/noatun/modules/kjofol-skin/parser.cpp b/noatun/modules/kjofol-skin/parser.cpp index 7b6be03a..b17e943a 100644 --- a/noatun/modules/kjofol-skin/parser.cpp +++ b/noatun/modules/kjofol-skin/parser.cpp @@ -82,7 +82,7 @@ Parser::ImagePixmap* Parser::getPair(const TQString &filenameOld) const // is it in there? ImagePixmap *pair; { - pair=mImageCache.tqfind(filenameOld); + pair=mImageCache.find(filenameOld); if (pair) return pair; } @@ -128,5 +128,5 @@ Parser::ImagePixmap* Parser::getPair(const TQString &filenameOld) const bool Parser::exist(const TQString &i) const { - return (bool)tqfind(i); + return (bool)find(i); } diff --git a/noatun/modules/kjofol-skin/parser.h b/noatun/modules/kjofol-skin/parser.h index 5c838726..3f691253 100644 --- a/noatun/modules/kjofol-skin/parser.h +++ b/noatun/modules/kjofol-skin/parser.h @@ -36,7 +36,7 @@ class Parser : public TQDict bool exist(const TQString &i) const; public: - TQStringList& operator[](const TQString &l) { return *tqfind(l);} + TQStringList& operator[](const TQString &l) { return *find(l);} private: ImagePixmap *getPair(const TQString &i) const; -- cgit v1.2.1