diff options
Diffstat (limited to 'noatun/modules')
24 files changed, 106 insertions, 106 deletions
diff --git a/noatun/modules/htmlexport/htmlexport.cpp b/noatun/modules/htmlexport/htmlexport.cpp index d8a04537..14c1dc20 100644 --- a/noatun/modules/htmlexport/htmlexport.cpp +++ b/noatun/modules/htmlexport/htmlexport.cpp @@ -136,9 +136,9 @@ TQString HTMLExport::htmlEscape(const TQString &source) { // Escape characters that need to be escaped TQString temp = source; - temp.tqreplace( TQRegExp("&"), "&" ); - temp.tqreplace( TQRegExp("<"), "<" ); - temp.tqreplace( TQRegExp(">"), ">" ); + temp.replace( TQRegExp("&"), "&" ); + temp.replace( TQRegExp("<"), "<" ); + temp.replace( TQRegExp(">"), ">" ); return temp; } diff --git a/noatun/modules/infrared/irprefs.cpp b/noatun/modules/infrared/irprefs.cpp index 52cae0ea..eb9a6fd3 100644 --- a/noatun/modules/infrared/irprefs.cpp +++ b/noatun/modules/infrared/irprefs.cpp @@ -152,7 +152,7 @@ void IRPrefs::reopen() for (TQStringList::ConstIterator btn = buttons.begin(); btn != buttons.end(); ++btn) { TQString key = *it + "::" + *btn; - if (s_commands.tqcontains(key)) + if (s_commands.contains(key)) new CommandItem(remote, *btn, s_commands[key].action, s_commands[key].interval); else new CommandItem(remote, *btn, None, 0); diff --git a/noatun/modules/infrared/lirc.cpp b/noatun/modules/infrared/lirc.cpp index 731bb5c1..57d98c9b 100644 --- a/noatun/modules/infrared/lirc.cpp +++ b/noatun/modules/infrared/lirc.cpp @@ -124,7 +124,7 @@ void Lirc::slotRead() { // <code> <repeat> <button name> <remote control name> line.remove(0, 17); // strip code - int pos = line.tqfind(' '); + int pos = line.find(' '); if (pos < 0) return; bool ok; @@ -133,7 +133,7 @@ void Lirc::slotRead() return; line.remove(0, pos + 1); - pos = line.tqfind(' '); + pos = line.find(' '); if (pos < 0) return; TQString btn = line.left(pos); diff --git a/noatun/modules/kaiman/SKIN-SPECS b/noatun/modules/kaiman/SKIN-SPECS index 5d30b733..0612242c 100644 --- a/noatun/modules/kaiman/SKIN-SPECS +++ b/noatun/modules/kaiman/SKIN-SPECS @@ -37,7 +37,7 @@ if the play button was 30 by 20, the resulting image file would be Note that images for buttons and numbers contain the items horizontally, the images for items contain the items vertically, the image for a font -tqcontains 3 rows of 32 items, and the slider contains the background and +contains 3 rows of 32 items, and the slider contains the background and handle horizontally or vertically (depending if a slider is horizontal or verticle, respectivley). @@ -125,7 +125,7 @@ Title/Album/Artist/Genre: filename length [extended] x y extended (optional, absence defaults to FALSE) - When TRUE, the image tqcontains 3 additional lines for internation + When TRUE, the image contains 3 additional lines for internation characters. The result is 6 lines of 32 characters each. ========================== diff --git a/noatun/modules/kaiman/pref.cpp b/noatun/modules/kaiman/pref.cpp index a318dbb6..87e1a5e2 100644 --- a/noatun/modules/kaiman/pref.cpp +++ b/noatun/modules/kaiman/pref.cpp @@ -76,7 +76,7 @@ void KaimanPrefDlg::reopen() KConfig *config=KGlobal::config(); config->setGroup("Kaiman"); TQString skin = config->readEntry( "SkinResource", Kaiman::DEFAULT_SKIN ); - TQListBoxItem *item = _skinList->tqfindItem( skin ); + TQListBoxItem *item = _skinList->findItem( skin ); if ( item ) _skinList->setCurrentItem( item ); else @@ -86,7 +86,7 @@ void KaimanPrefDlg::reopen() void KaimanPrefDlg::setSkin( TQString skin ) { - _skinList->setCurrentItem( _skinList->tqfindItem( skin ) ); + _skinList->setCurrentItem( _skinList->findItem( skin ) ); } diff --git a/noatun/modules/kaiman/style.cpp b/noatun/modules/kaiman/style.cpp index 4e568b5d..4f9b5315 100644 --- a/noatun/modules/kaiman/style.cpp +++ b/noatun/modules/kaiman/style.cpp @@ -1332,7 +1332,7 @@ TQString KaimanStyle::getToken(TQString &val_s_string, char val_c_separator) TQString l_s_token; // Find the first occurrence of the separator - l_i_pos = val_s_string.tqfind(val_c_separator, 0, false); + l_i_pos = val_s_string.find(val_c_separator, 0, false); if ( l_i_pos == -1 ) { // No sparator! Then the whole string is the token l_s_token = val_s_string; @@ -1413,7 +1413,7 @@ bool KaimanStyle::eventFilter( TQObject *o, TQEvent *e ) for ( TQWidget *s = i_sliders.first(); s!=0; s=i_sliders.next() ) { TQRect sliderRect( s->pos(), s->size() ); - if ( sliderRect.tqcontains(mousePos) ) slider = s; + if ( sliderRect.contains(mousePos) ) slider = s; } /* the slider the mouse events instead of the visible widget */ @@ -1445,11 +1445,11 @@ bool KaimanStyle::loadPixmaps() l_kse_elem->loadPixmaps(l_s_tmpName); } - l_kse_elem = this->tqfind("Background"); + l_kse_elem = this->find("Background"); if ( l_kse_elem != 0 ) { l_pixmap_Background = l_kse_elem->pixmaps[0]; } - l_kse_elem = this->tqfind("Mask"); + l_kse_elem = this->find("Mask"); if ( l_kse_elem != 0 ) { l_pixmap_Mask = l_kse_elem->pixmaps[0]; } @@ -1492,7 +1492,7 @@ TQBitmap* KaimanStyle::Mask() return &i_bitmap_Mask; } -KaimanStyleElement* KaimanStyle::tqfind(const char *val_s_elemName) +KaimanStyleElement* KaimanStyle::find(const char *val_s_elemName) { for (uint i=0; i< I_styleElem.count(); i++) { if ( I_styleElem[i]->element == TQString(val_s_elemName)) { diff --git a/noatun/modules/kaiman/style.h b/noatun/modules/kaiman/style.h index 6dd1fd3e..03ba4f2d 100644 --- a/noatun/modules/kaiman/style.h +++ b/noatun/modules/kaiman/style.h @@ -321,7 +321,7 @@ public: enum { ParsingError=1, FileNotFound }; /// Finds a style element, according to it's name. Returns 0 when element is not available. - KaimanStyleElement* tqfind(const char* val_s_elemName); + KaimanStyleElement* find(const char* val_s_elemName); /// Tries to load the given style and returns success (true) or failure (false) bool loadStyle(const TQString &styleName, const TQString &descFile="skindata" ); diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp index 4c3d4e28..47e8a8b7 100644 --- a/noatun/modules/kaiman/userinterface.cpp +++ b/noatun/modules/kaiman/userinterface.cpp @@ -164,7 +164,7 @@ bool Kaiman::loadStyle( const TQString &style, const TQString &desc ) _style->Mask()->handle(), ShapeSet ); } - KaimanStyleElement* item = _style->tqfind("Background"); + KaimanStyleElement* item = _style->find("Background"); setBackgroundMode(TQWidget::NoBackground); if ( item!=0 ) { @@ -173,53 +173,53 @@ bool Kaiman::loadStyle( const TQString &style, const TQString &desc ) setFixedSize( item->width(), item->height()); } - item = _style->tqfind("Playlist_Button"); + item = _style->find("Playlist_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(toggleListView()) ); - item = _style->tqfind("Play_Button"); + item = _style->find("Play_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause()) ); - item = _style->tqfind("Pause_Button"); + item = _style->find("Pause_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause()) ); - item = _style->tqfind("Stop_Button"); + item = _style->find("Stop_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(stop()) ); - item = _style->tqfind("Next_Button"); + item = _style->find("Next_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward()) ); - item = _style->tqfind("Prev_Button"); + item = _style->find("Prev_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(back()) ); - item = _style->tqfind("Exit_Button"); + item = _style->find("Exit_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(close()) ); - item = _style->tqfind("Mixer_Button"); + item = _style->find("Mixer_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(execMixer()) ); - item = _style->tqfind("Iconify_Button"); + item = _style->find("Iconify_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMinimized()) ); - item = _style->tqfind("Alt_Skin_Button"); + item = _style->find("Alt_Skin_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleSkin()) ); - item = _style->tqfind("Repeat_Button"); + item = _style->find("Repeat_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleLoop()) ); - item = _style->tqfind("Shuffle_Button"); + item = _style->find("Shuffle_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleShuffle()) ); - item = _style->tqfind("Config_Button"); + item = _style->find("Config_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp, TQT_SLOT(preferences()) ); - item = _style->tqfind("Volume_Up_Button"); + item = _style->find("Volume_Up_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this,TQT_SLOT(volumeUp())); - item = _style->tqfind("Volume_Down_Button"); + item = _style->find("Volume_Down_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this,TQT_SLOT(volumeDown())); KaimanStyleSlider* slider = - static_cast<KaimanStyleSlider*>(_style->tqfind("Position_Slider")); + static_cast<KaimanStyleSlider*>(_style->find("Position_Slider")); if( slider!=0 ) { connect( slider, TQT_SIGNAL(newValueDrag(int)), this, TQT_SLOT(seekStart(int)) ); @@ -228,18 +228,18 @@ bool Kaiman::loadStyle( const TQString &style, const TQString &desc ) slider->setValue( 0, 0, 1000 ); } - slider = static_cast<KaimanStyleSlider*>(_style->tqfind("Volume_Slider")); + slider = static_cast<KaimanStyleSlider*>(_style->find("Volume_Slider")); if ( slider!=0 ) { connect(slider, TQT_SIGNAL(newValue(int)), this, TQT_SLOT(setVolume(int))); slider->setValue( napp->player()->volume(), 0, 100 ); } - KaimanStyleValue* volItem = static_cast<KaimanStyleValue*>(_style->tqfind("Volume_Item")); + KaimanStyleValue* volItem = static_cast<KaimanStyleValue*>(_style->find("Volume_Item")); if ( volItem ) volItem->setValue( napp->player()->volume(), 0, 100 ); - KaimanStyleText* titleItem = static_cast<KaimanStyleText*>(_style->tqfind("Title")); + KaimanStyleText* titleItem = static_cast<KaimanStyleText*>(_style->find("Title")); if ( titleItem ) titleItem->startAnimation( 300 ); @@ -291,23 +291,23 @@ void Kaiman::seekDrag( int value ) if ( !_style ) return; KaimanStyleValue* posItem = - static_cast<KaimanStyleValue*>(_style->tqfind("Position_Item")); + static_cast<KaimanStyleValue*>(_style->find("Position_Item")); if ( posItem ) posItem->setValue( value, 0, length ); KaimanStyleSlider* posSlider = - static_cast<KaimanStyleSlider*>(_style->tqfind("Position_Slider")); + static_cast<KaimanStyleSlider*>(_style->find("Position_Slider")); if ( posSlider ) posSlider->setValue( value, 0, length ); // update time KaimanStyleNumber* numItem = - static_cast<KaimanStyleNumber*>(_style->tqfind("Minute_Number")); + static_cast<KaimanStyleNumber*>(_style->find("Minute_Number")); if ( numItem ) numItem->setValue( value/60%60 ); - numItem = static_cast<KaimanStyleNumber*>(_style->tqfind("Second_Number")); + numItem = static_cast<KaimanStyleNumber*>(_style->find("Second_Number")); if ( numItem ) numItem->setValue( value % 60 ); } @@ -384,8 +384,8 @@ void Kaiman::timeout() return; // update volume - KaimanStyleSlider* l_elem_volslider = static_cast<KaimanStyleSlider*>(_style->tqfind("Volume_Slider")); - KaimanStyleValue* l_elem_volitem = static_cast<KaimanStyleValue*>(_style->tqfind("Volume_Item")); + KaimanStyleSlider* l_elem_volslider = static_cast<KaimanStyleSlider*>(_style->find("Volume_Slider")); + KaimanStyleValue* l_elem_volitem = static_cast<KaimanStyleValue*>(_style->find("Volume_Item")); if ( l_elem_volslider!=0 ) l_elem_volslider->setValue( napp->player()->volume(), 0, 100 ); if ( l_elem_volitem!=0 ) @@ -399,20 +399,20 @@ void Kaiman::timeout() sec = 0; KaimanStyleValue* posItem = - static_cast<KaimanStyleValue*>(_style->tqfind("Position_Item")); + static_cast<KaimanStyleValue*>(_style->find("Position_Item")); if ( posItem ) posItem->setValue( sec, 0, napp->player()->getLength()/1000 ); KaimanStyleSlider* posSlider = - static_cast<KaimanStyleSlider*>(_style->tqfind("Position_Slider")); + static_cast<KaimanStyleSlider*>(_style->find("Position_Slider")); if ( posSlider ) posSlider->setValue( sec, 0, napp->player()->getLength()/1000 ); // update time KaimanStyleNumber* numItem = - static_cast<KaimanStyleNumber*>(_style->tqfind("Minute_Number")); + static_cast<KaimanStyleNumber*>(_style->find("Minute_Number")); if ( numItem ) numItem->setValue( sec/60%60 ); - numItem = static_cast<KaimanStyleNumber*>(_style->tqfind("Second_Number")); + numItem = static_cast<KaimanStyleNumber*>(_style->find("Second_Number")); if ( numItem ) numItem->setValue( sec%60 ); } @@ -420,14 +420,14 @@ void Kaiman::timeout() const PlaylistItem &item = napp->playlist()->current(); KaimanStyleNumber* numItem = 0; - numItem = static_cast<KaimanStyleNumber*>(_style->tqfind("In_Rate_Number")); + numItem = static_cast<KaimanStyleNumber*>(_style->find("In_Rate_Number")); if ( numItem ) numItem->setValue(item.property("bitrate").toInt()); TQString hzString = item.property("samplerate"); hzString.truncate(2); - numItem = static_cast<KaimanStyleNumber*>(_style->tqfind("In_Hz_Number")); + numItem = static_cast<KaimanStyleNumber*>(_style->find("In_Hz_Number")); if ( numItem ) numItem->setValue(hzString.toInt()); } @@ -438,11 +438,11 @@ void Kaiman::updateMode() if ( !_style ) return; KaimanStyleButton* pause = - static_cast<KaimanStyleButton*>(_style->tqfind("Pause_Button")); + static_cast<KaimanStyleButton*>(_style->find("Pause_Button")); KaimanStyleButton* play = - static_cast<KaimanStyleButton*>(_style->tqfind("Play_Button")); + static_cast<KaimanStyleButton*>(_style->find("Play_Button")); KaimanStyleState* status = - static_cast<KaimanStyleState*>(_style->tqfind("Status_Item")); + static_cast<KaimanStyleState*>(_style->find("Status_Item")); if (napp->player()->isStopped() ) { @@ -469,7 +469,7 @@ void Kaiman::loopTypeChange( int ) { if ( !_style ) return; - KaimanStyleState* rep = static_cast<KaimanStyleState*>(_style->tqfind("Repeat_Item")); + KaimanStyleState* rep = static_cast<KaimanStyleState*>(_style->find("Repeat_Item")); if ( rep ) rep->setValue( napp->player()->loopStyle() ); } @@ -486,19 +486,19 @@ void Kaiman::newSongLen( int, int ) // update time KaimanStyleNumber* numItem = - static_cast<KaimanStyleNumber*>(_style->tqfind("Minute_Total_Number")); + static_cast<KaimanStyleNumber*>(_style->find("Minute_Total_Number")); if ( numItem ) numItem->setValue( len/60%60 ); - numItem = static_cast<KaimanStyleNumber*>(_style->tqfind("Second_Total_Number")); + numItem = static_cast<KaimanStyleNumber*>(_style->find("Second_Total_Number")); if ( numItem ) numItem->setValue( len%60 ); - numItem = static_cast<KaimanStyleNumber*>(_style->tqfind("Song_Minute_Number")); + numItem = static_cast<KaimanStyleNumber*>(_style->find("Song_Minute_Number")); if ( numItem ) numItem->setValue( len/60%60 ); - numItem = static_cast<KaimanStyleNumber*>(_style->tqfind("Second_Minute_Number")); + numItem = static_cast<KaimanStyleNumber*>(_style->find("Second_Minute_Number")); if ( numItem ) numItem->setValue( len%60 ); @@ -510,7 +510,7 @@ void Kaiman::newSong() { if ( !_style ) return; - KaimanStyleText* titleItem = static_cast<KaimanStyleText*>(_style->tqfind("Title")); + KaimanStyleText* titleItem = static_cast<KaimanStyleText*>(_style->find("Title")); if ( titleItem ) { TQString title = i18n("Noatun"); 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<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; } 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<TQStringList> 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; diff --git a/noatun/modules/marquis/marquis.cpp b/noatun/modules/marquis/marquis.cpp index 0a55e8c8..54f8b4ab 100644 --- a/noatun/modules/marquis/marquis.cpp +++ b/noatun/modules/marquis/marquis.cpp @@ -122,7 +122,7 @@ void Marquis::saveSessionConfig(KConfig *c) TQValueList<NoatunLibraryInfo> loaded = napp->libraryLoader()->loaded(); for( TQValueList<NoatunLibraryInfo>::Iterator i = loaded.begin(); i != loaded.end(); ++i) { - if(!specList.tqcontains((*i).specfile) + if(!specList.contains((*i).specfile) && napp->libraryLoader()->isLoaded((*i).specfile) && (*i).specfile != "marquis.plugin") { diff --git a/noatun/modules/simple/propertiesdialog.ui.h b/noatun/modules/simple/propertiesdialog.ui.h index bf106f24..3b7f6834 100644 --- a/noatun/modules/simple/propertiesdialog.ui.h +++ b/noatun/modules/simple/propertiesdialog.ui.h @@ -21,14 +21,14 @@ void PropertiesDialog::setPlayObject( PlaylistItem pi, Arts::PlayObject po ) descriptionLabel->setText( po.description().c_str() ); // Determine capabilities - if (!(item = (TQCheckListItem *)capsList->tqfindItem( "capSeek", 0 ))) + if (!(item = (TQCheckListItem *)capsList->findItem( "capSeek", 0 ))) { item = new TQCheckListItem( capsList, "capSeek", TQCheckListItem::CheckBox ); } item->setOn( (ncaps & Arts::capSeek) ); - if (!(item = (TQCheckListItem *)capsList->tqfindItem( "capPause", 0 ))) + if (!(item = (TQCheckListItem *)capsList->findItem( "capPause", 0 ))) { item = new TQCheckListItem( capsList, "capPause", TQCheckListItem::CheckBox ); diff --git a/noatun/modules/splitplaylist/find.cpp b/noatun/modules/splitplaylist/find.cpp index 99eaa8ed..6584f040 100644 --- a/noatun/modules/splitplaylist/find.cpp +++ b/noatun/modules/splitplaylist/find.cpp @@ -5,7 +5,7 @@ #include <tqcheckbox.h> #include <klocale.h> -Finder::Finder(TQWidget *tqparent) : KDialogBase(tqparent, 0, false, i18n("Find"), Close | User1, User1, false, KGuiItem(i18n("&Find"),"tqfind")) +Finder::Finder(TQWidget *tqparent) : KDialogBase(tqparent, 0, false, i18n("Find"), Close | User1, User1, false, KGuiItem(i18n("&Find"),"find")) { TQWidget *mainWidget = new TQWidget(this); mainWidget->setMinimumWidth(320); diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp index f1874f3a..97ccca20 100644 --- a/noatun/modules/splitplaylist/view.cpp +++ b/noatun/modules/splitplaylist/view.cpp @@ -288,7 +288,7 @@ void SafeListViewItem::stateChange(bool s) TQPtrList<TQListViewItem> list=SPL->view->listView()->selectedItems(); // but not if I'm not selected - if (list.tqcontainsRef(this)) + if (list.containsRef(this)) for (TQListViewItem *i=list.first(); i != 0; i=list.next()) static_cast<TQCheckListItem*>(i)->setOn(s); else @@ -647,7 +647,7 @@ View::View(SplitPlaylist *) mDelete=new KAction(i18n("Delete"), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(deleteSelected()), actionCollection(), "delete"); mClose=KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); - mFind=KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(tqfind()), actionCollection()); + mFind=KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(find()), actionCollection()); (void) KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolBars()), actionCollection()); mOpenNew=KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(openNew()), actionCollection()); @@ -666,7 +666,7 @@ View::View(SplitPlaylist *) list->setFocus(); } -void View::tqfind() +void View::find() { mFinder->show(); connect(mFinder, TQT_SIGNAL(search(Finder*)), TQT_SLOT(findIt(Finder*))); @@ -675,15 +675,15 @@ void View::tqfind() static bool testWord(TQListViewItem *i, const TQString &finder) { PlaylistItemData *item=static_cast<SafeListViewItem*>(i); - if (item->title().tqfind(finder, 0, false) >=0) + if (item->title().find(finder, 0, false) >=0) return true; - if (item->file().tqfind(finder, 0, false) >=0) + if (item->file().find(finder, 0, false) >=0) return true; - if (item->url().path().tqfind(finder.local8Bit().data(), 0, false) >=0) + if (item->url().path().find(finder.local8Bit().data(), 0, false) >=0) return true; - if (item->lengthString().tqfind(finder, 0, false) >=0) + if (item->lengthString().find(finder, 0, false) >=0) return true; - if (item->mimetype().tqfind(finder.local8Bit().data(), 0, false) >=0) + if (item->mimetype().find(finder.local8Bit().data(), 0, false) >=0) return true; return false; } @@ -691,15 +691,15 @@ static bool testWord(TQListViewItem *i, const TQString &finder) static bool testWord(TQListViewItem *i, const TQRegExp &finder) { PlaylistItemData *item=static_cast<SafeListViewItem*>(i); - if (item->title().tqfind(finder) >=0) + if (item->title().find(finder) >=0) return true; - if (item->file().tqfind(finder) >=0) + if (item->file().find(finder) >=0) return true; - if (item->url().path().tqfind(finder) >=0) + if (item->url().path().find(finder) >=0) return true; - if (item->lengthString().tqfind(finder) >=0) + if (item->lengthString().find(finder) >=0) return true; - if (item->mimetype().tqfind(finder) >=0) + if (item->mimetype().find(finder) >=0) return true; return false; } diff --git a/noatun/modules/splitplaylist/view.h b/noatun/modules/splitplaylist/view.h index 293276ca..c8b71e93 100644 --- a/noatun/modules/splitplaylist/view.h +++ b/noatun/modules/splitplaylist/view.h @@ -127,7 +127,7 @@ public slots: void openNew(); void setSorting(bool on, int column = 0); void setNoSorting() { setSorting(false); } - void headerClicked(int column);void tqfind(); + void headerClicked(int column);void find(); void findIt(Finder *); diff --git a/noatun/modules/winskin/waButton.cpp b/noatun/modules/winskin/waButton.cpp index 4946d548..8dfa7bfb 100644 --- a/noatun/modules/winskin/waButton.cpp +++ b/noatun/modules/winskin/waButton.cpp @@ -68,7 +68,7 @@ void WaButton::mouseReleaseEvent(TQMouseEvent* e) { else { pressed = false; - if (TQT_TQRECT_OBJECT(this->rect()).tqcontains(e->pos())){ + if (TQT_TQRECT_OBJECT(this->rect()).contains(e->pos())){ if (_togglable) { _toggled = !_toggled; emit(toggleEvent(_toggled)); diff --git a/noatun/modules/winskin/waSkinManager.cpp b/noatun/modules/winskin/waSkinManager.cpp index de7a4d0f..08804885 100644 --- a/noatun/modules/winskin/waSkinManager.cpp +++ b/noatun/modules/winskin/waSkinManager.cpp @@ -82,7 +82,7 @@ bool WaSkinManager::installSkin(TQString _url) { return false; TQString base_path; - base_path = location + "/" + TQFileInfo(url.path()).baseName().tqreplace(TQRegExp("_"), " "); + base_path = location + "/" + TQFileInfo(url.path()).baseName().replace(TQRegExp("_"), " "); KIO::Job *job = KIO::copy("zip:" + url.path(), base_path); connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SIGNAL(updateSkinList())); diff --git a/noatun/modules/winskin/waSkinModel.cpp b/noatun/modules/winskin/waSkinModel.cpp index b2cdb0c2..e7562c04 100644 --- a/noatun/modules/winskin/waSkinModel.cpp +++ b/noatun/modules/winskin/waSkinModel.cpp @@ -419,37 +419,37 @@ void WaSkinModel::resetSkinModel() { TQChar WaSkinModel::deaccent(TQChar input) { - if (TQString("Á").tqcontains(input)) + if (TQString("Á").contains(input)) return 'A'; - if (TQString("ÉË").tqcontains(input)) + if (TQString("ÉË").contains(input)) return 'E'; - if (TQString("ÍÎ").tqcontains(input)) + if (TQString("ÍÎ").contains(input)) return 'I'; - if (TQString("ÔÓ").tqcontains(input)) + if (TQString("ÔÓ").contains(input)) return 'O'; - if (TQString("ÚÜ").tqcontains(input)) + if (TQString("ÚÜ").contains(input)) return 'U'; if (input == 'Ý') return 'Y'; - if (TQString("áâ").tqcontains(input)) + if (TQString("áâ").contains(input)) return 'a'; - if (TQString("éë").tqcontains(input)) + if (TQString("éë").contains(input)) return 'e'; - if (TQString("îí").tqcontains(input)) + if (TQString("îí").contains(input)) return 'i'; - if (TQString("ôó").tqcontains(input)) + if (TQString("ôó").contains(input)) return 'o'; - if (TQString("úü").tqcontains(input)) + if (TQString("úü").contains(input)) return 'u'; return input; diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp index 0f2067de..06573c7f 100644 --- a/noatun/modules/winskin/winSkinConfig.cpp +++ b/noatun/modules/winskin/winSkinConfig.cpp @@ -111,7 +111,7 @@ void WinSkinConfig::reopen() { TQString orig_skin = mWaSkinManager->currentSkin(); // Where is that skin in our big-list-o-skins? - TQListBoxItem *item = skin_list->tqfindItem(orig_skin); + TQListBoxItem *item = skin_list->findItem(orig_skin); if (item) { // Aha, found it... make it the currently selected skin |