diff options
Diffstat (limited to 'noatun/modules/kjofol-skin/kjloader.cpp')
| -rw-r--r-- | noatun/modules/kjofol-skin/kjloader.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
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<KJWidget> KJLoader::widgetsAt(const TQPoint &pt) const { TQPtrList<KJWidget> things; for ( TQPtrListIterator<KJWidget> 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<TQStringList> 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; } |