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 --- arts/builder/drawutils.cpp | 2 +- arts/builder/menumaker.cpp | 4 +- arts/builder/module.cpp | 4 +- arts/builder/propertypanel.cpp | 2 +- arts/builder/qttableview.cpp | 6 +- arts/builder/structureport.cpp | 2 +- arts/midi/audiosync_impl.cc | 2 +- arts/midi/audiosync_impl.h | 2 +- arts/midi/midisyncgroup_impl.cc | 4 +- arts/modules/effects/freeverb/revmodel.cpp | 2 +- arts/modules/effects/freeverb/revmodel.hpp | 2 +- arts/modules/effects/synth_freeverb_impl.cc | 2 +- arts/tools/environmentview.cpp | 2 +- arts/tools/midiinstdlg.cpp | 2 +- juk/collectionlist.cpp | 6 +- juk/collectionlist.h | 6 +- juk/coverinfo.cpp | 4 +- juk/covermanager.cpp | 12 ++-- juk/covermanager.h | 2 +- juk/directorylist.cpp | 2 +- juk/filehandleproperties.h | 2 +- juk/filerenamer.cpp | 4 +- juk/filerenamer.h | 2 +- juk/ktrm.cpp | 6 +- juk/playlist.cpp | 6 +- juk/playlist.h | 2 +- juk/playlistbox.cpp | 2 +- juk/playlistcollection.cpp | 10 +-- juk/playlistitem.cpp | 6 +- juk/playlistsearch.cpp | 6 +- juk/playlistsplitter.cpp | 2 +- juk/searchplaylist.cpp | 2 +- juk/sortedstringlist.cpp | 8 +-- juk/sortedstringlist.h | 4 +- juk/stringhash.h | 4 +- juk/stringshare.cpp | 2 +- juk/systemtray.cpp | 4 +- juk/tag.cpp | 4 +- juk/tageditor.cpp | 20 +++--- juk/tagguesser.cpp | 20 +++--- juk/viewmode.cpp | 6 +- kaudiocreator/encoder.cpp | 12 ++-- kaudiocreator/encoderconfigimp.cpp | 4 +- kaudiocreator/general.ui.h | 2 +- kaudiocreator/job.cpp | 16 ++--- kaudiocreator/kaudiocreator.kcfg | 2 +- kaudiocreator/ripper.cpp | 2 +- kaudiocreator/tracksimp.cpp | 12 ++-- kaudiocreator/wizard.ui.h | 2 +- kfile-plugins/mpeg/kfile_mpeg.cpp | 2 +- kioslave/audiocd/audiocd.cpp | 30 ++++---- kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp | 6 +- kioslave/audiocd/plugins/audiocdencoder.cpp | 4 +- kioslave/audiocd/plugins/lame/encoderlame.cpp | 2 +- kmid/kmidclient.cpp | 2 +- kmid/midicfgdlg.cpp | 2 +- kmix/dialogselectmaster.cpp | 2 +- kmix/dialogviewconfiguration.cpp | 2 +- kmix/kmixapplet.cpp | 2 +- kmix/kmixerwidget.cpp | 2 +- kmix/mixdevice.cpp | 2 +- kmix/mixer.cpp | 4 +- kmix/mixer.h | 2 +- kmix/mixer_alsa9.cpp | 18 ++--- kmix/mixer_oss4.cpp | 12 ++-- kmix/mixertoolbox.cpp | 10 +-- kmix/viewapplet.cpp | 2 +- krec/krecconfig_fileswidget.cpp | 18 ++--- krec/krecconfigure.cpp | 16 ++--- krec/krecfile.cpp | 8 +-- krec/krecfilewidgets.cpp | 4 +- krec/krecglobal.cpp | 4 +- krec/krecord.cpp | 2 +- kscd/kscd.cpp | 4 +- kscd/libwm/database.c | 2 +- kscd/libwm/plat_linux.c | 2 +- libkcddb/categories.cpp | 4 +- libkcddb/cdinfo.cpp | 14 ++-- libkcddb/cdinfodialogbase.ui.h | 4 +- libkcddb/genres.cpp | 4 +- libkcddb/kcmcddb/kcmcddb.cpp | 4 +- libkcddb/submit.cpp | 2 +- mpeglib/COPYING | 2 +- mpeglib/README | 2 +- mpeglib/example/yaf/yafcore/buffer.cpp | 2 +- mpeglib/example/yaf/yafcore/buffer.h | 2 +- mpeglib/example/yaf/yafcore/lineStack.cpp | 4 +- mpeglib/example/yaf/yafcore/parser.cpp | 2 +- mpeglib/lib/frame/README | 4 +- mpeglib/lib/splay/dxHead.h | 2 +- mpeglib/lib/util/dynBuffer.cpp | 2 +- mpeglib/lib/util/dynBuffer.h | 2 +- mpeglib_artsplug/doemacs | 2 +- mpg123_artsplugin/dxhead.h | 2 +- noatun/library/app.cpp | 2 +- noatun/library/cmodule.cpp | 2 +- noatun/library/downloader.cpp | 2 +- noatun/library/effects.cpp | 2 +- noatun/library/mimetypetree.cpp | 2 +- noatun/library/noatunarts/Session_impl.cpp | 4 +- .../library/noatunarts/StereoEffectStack_impl.cpp | 2 +- noatun/library/noatunstdaction.cpp | 4 +- noatun/library/playlist.cpp | 20 +++--- noatun/library/playlistsaver.cpp | 14 ++-- noatun/library/plugin.cpp | 2 +- noatun/library/pluginloader.cpp | 18 ++--- noatun/library/pluginmodule.cpp | 12 ++-- noatun/library/titleproxy.cpp | 10 +-- noatun/library/vequalizer.cpp | 4 +- noatun/modules/htmlexport/htmlexport.cpp | 6 +- noatun/modules/infrared/irprefs.cpp | 2 +- noatun/modules/infrared/lirc.cpp | 4 +- noatun/modules/kaiman/SKIN-SPECS | 4 +- noatun/modules/kaiman/pref.cpp | 4 +- noatun/modules/kaiman/style.cpp | 10 +-- noatun/modules/kaiman/style.h | 2 +- noatun/modules/kaiman/userinterface.cpp | 82 +++++++++++----------- 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 +- noatun/modules/marquis/marquis.cpp | 2 +- noatun/modules/simple/propertiesdialog.ui.h | 4 +- noatun/modules/splitplaylist/find.cpp | 2 +- noatun/modules/splitplaylist/view.cpp | 26 +++---- noatun/modules/splitplaylist/view.h | 2 +- noatun/modules/winskin/waButton.cpp | 2 +- noatun/modules/winskin/waSkinManager.cpp | 2 +- noatun/modules/winskin/waSkinModel.cpp | 20 +++--- noatun/modules/winskin/winSkinConfig.cpp | 2 +- noatun/noatun20update.cpp | 18 ++--- 134 files changed, 400 insertions(+), 400 deletions(-) diff --git a/arts/builder/drawutils.cpp b/arts/builder/drawutils.cpp index 74dac440..c2c0ef3f 100644 --- a/arts/builder/drawutils.cpp +++ b/arts/builder/drawutils.cpp @@ -26,7 +26,7 @@ TQString DrawUtils::cropText(TQPainter *p, TQString text, int maxlen, int& textw TQString label = text; while(p->fontMetrics().width(label) > maxlen && label.length() > 0) { - int i = label.tqfind('_'); + int i = label.find('_'); if(i != -1) label = label.mid(i+1); diff --git a/arts/builder/menumaker.cpp b/arts/builder/menumaker.cpp index dd08589d..38f28ace 100644 --- a/arts/builder/menumaker.cpp +++ b/arts/builder/menumaker.cpp @@ -148,7 +148,7 @@ TQString MenuMaker::basename(const TQString& name) { TQString result = ""; - int i = name.tqfindRev('/'); + int i = name.findRev('/'); if(i != -1) result = name.left(i); @@ -159,7 +159,7 @@ TQString MenuMaker::basename(const TQString& name) TQString MenuMaker::catname(const TQString& name) { - int i = name.tqfindRev('/'); + int i = name.findRev('/'); if(i >= 0) return name.mid(i+1); diff --git a/arts/builder/module.cpp b/arts/builder/module.cpp index 7d9581bf..099f01e7 100644 --- a/arts/builder/module.cpp +++ b/arts/builder/module.cpp @@ -128,7 +128,7 @@ void Module::initModule() _pixmap = new TQPixmap(iconloader.loadIcon(iconname, KIcon::User)); if(!_pixmap->height()) { - iconname.tqreplace( iconname.length() - 4, 3, "png" ); + iconname.replace( iconname.length() - 4, 3, "png" ); delete _pixmap; _pixmap = new TQPixmap(iconloader.loadIcon(iconname, KIcon::User)); if( !_pixmap->height() ) @@ -413,7 +413,7 @@ ModulePort *Module::portAt(int segment, int x, int y) if(port) { TQPoint clickpoint(x, y); - if(port->clickrect.tqcontains(clickpoint)) return port; + if(port->clickrect.contains(clickpoint)) return port; } } return 0; diff --git a/arts/builder/propertypanel.cpp b/arts/builder/propertypanel.cpp index 8e543a5f..ed3df208 100644 --- a/arts/builder/propertypanel.cpp +++ b/arts/builder/propertypanel.cpp @@ -156,7 +156,7 @@ void PropertyPanel::setSelectedPort( ModulePort *port ) // select port in combobox - bah, should be easier ;-) portCombo->setCurrentItem( portCombo->listBox()->index( - portCombo->listBox()->tqfindItem( port->description + " (" ) ) ); + portCombo->listBox()->findItem( port->description + " (" ) ) ); } else { diff --git a/arts/builder/qttableview.cpp b/arts/builder/qttableview.cpp index 41c4eb43..bfb5539c 100644 --- a/arts/builder/qttableview.cpp +++ b/arts/builder/qttableview.cpp @@ -1280,7 +1280,7 @@ void QtTableView::paintEvent( TQPaintEvent *e ) TQPainter paint( this ); - if ( !contentsRect().tqcontains( updateR, TRUE ) ) {// update frame ? + if ( !contentsRect().contains( updateR, TRUE ) ) {// update frame ? drawFrame( &paint ); if ( updateR.left() < frameWidth() ) //### updateR.setLeft( frameWidth() ); @@ -1343,7 +1343,7 @@ void QtTableView::paintEvent( TQPaintEvent *e ) matrix.translate( xPos, yPos ); paint.setWorldMatrix( matrix ); if ( testTableFlags(Tbl_clipCellPainting) || - frameWidth() > 0 && !winR.tqcontains( cellR ) ) { //##arnt + frameWidth() > 0 && !winR.contains( cellR ) ) { //##arnt paint.setClipRect( cellUR ); paintCell( &paint, row, col ); paint.setClipping( FALSE ); @@ -1355,7 +1355,7 @@ void QtTableView::paintEvent( TQPaintEvent *e ) #else paint.translate( xPos, yPos ); if ( testTableFlags(Tbl_clipCellPainting) || - frameWidth() > 0 && !winR.tqcontains( cellR ) ) { //##arnt + frameWidth() > 0 && !winR.contains( cellR ) ) { //##arnt paint.setClipRect( cellUR ); paintCell( &paint, row, col ); paint.setClipping( FALSE ); diff --git a/arts/builder/structureport.cpp b/arts/builder/structureport.cpp index 55c15211..e61fa2a9 100644 --- a/arts/builder/structureport.cpp +++ b/arts/builder/structureport.cpp @@ -224,7 +224,7 @@ ModulePort *StructurePort::portAt(int segment, int x, int y) assert(segment == 0); TQPoint clickpoint(x,y); - if(_port->clickrect.tqcontains(clickpoint)) return _port; + if(_port->clickrect.contains(clickpoint)) return _port; return 0; } diff --git a/arts/midi/audiosync_impl.cc b/arts/midi/audiosync_impl.cc index a75992c6..20f089df 100644 --- a/arts/midi/audiosync_impl.cc +++ b/arts/midi/audiosync_impl.cc @@ -188,7 +188,7 @@ void AudioSync_impl::synchronizeTo(const TimeStamp& time) #endif } -AudioSync_impl *AudioSync_impl::tqfind(AudioSync audioSync) +AudioSync_impl *AudioSync_impl::find(AudioSync audioSync) { list::iterator i; diff --git a/arts/midi/audiosync_impl.h b/arts/midi/audiosync_impl.h index dde1aed0..302c93cb 100644 --- a/arts/midi/audiosync_impl.h +++ b/arts/midi/audiosync_impl.h @@ -67,7 +67,7 @@ public: void updateTime(); // interface to MidiSyncGroup - static AudioSync_impl *tqfind(AudioSync audioSync); + static AudioSync_impl *find(AudioSync audioSync); void synchronizeTo(const TimeStamp& time); void setSyncGroup(MidiSyncGroup_impl *syncGroup); diff --git a/arts/midi/midisyncgroup_impl.cc b/arts/midi/midisyncgroup_impl.cc index f446899f..5d5305dd 100644 --- a/arts/midi/midisyncgroup_impl.cc +++ b/arts/midi/midisyncgroup_impl.cc @@ -68,7 +68,7 @@ void MidiSyncGroup_impl::removeClient(MidiClient client) void MidiSyncGroup_impl::addAudioSync(AudioSync audioSync) { - AudioSync_impl *impl = AudioSync_impl::tqfind(audioSync); + AudioSync_impl *impl = AudioSync_impl::find(audioSync); impl->setSyncGroup(this); audioSyncs.push_back(impl); @@ -77,7 +77,7 @@ void MidiSyncGroup_impl::addAudioSync(AudioSync audioSync) void MidiSyncGroup_impl::removeAudioSync(AudioSync audioSync) { - AudioSync_impl *impl = AudioSync_impl::tqfind(audioSync); + AudioSync_impl *impl = AudioSync_impl::find(audioSync); impl->setSyncGroup(0); audioSyncs.remove(impl); } diff --git a/arts/modules/effects/freeverb/revmodel.cpp b/arts/modules/effects/freeverb/revmodel.cpp index feacaf64..23a766cc 100644 --- a/arts/modules/effects/freeverb/revmodel.cpp +++ b/arts/modules/effects/freeverb/revmodel.cpp @@ -73,7 +73,7 @@ void revmodel::mute() } } -void revmodel::processtqreplace(float *inputL, float *inputR, float *outputL, float *outputR, long numsamples, int skip) +void revmodel::processreplace(float *inputL, float *inputR, float *outputL, float *outputR, long numsamples, int skip) { float outL,outR,input; diff --git a/arts/modules/effects/freeverb/revmodel.hpp b/arts/modules/effects/freeverb/revmodel.hpp index 8fb37cd6..ca6c89a0 100644 --- a/arts/modules/effects/freeverb/revmodel.hpp +++ b/arts/modules/effects/freeverb/revmodel.hpp @@ -17,7 +17,7 @@ public: revmodel(); void mute(); void processmix(float *inputL, float *inputR, float *outputL, float *outputR, long numsamples, int skip); - void processtqreplace(float *inputL, float *inputR, float *outputL, float *outputR, long numsamples, int skip); + void processreplace(float *inputL, float *inputR, float *outputL, float *outputR, long numsamples, int skip); void setroomsize(float value); float getroomsize(); void setdamp(float value); diff --git a/arts/modules/effects/synth_freeverb_impl.cc b/arts/modules/effects/synth_freeverb_impl.cc index e6cb1b07..a1f35d06 100644 --- a/arts/modules/effects/synth_freeverb_impl.cc +++ b/arts/modules/effects/synth_freeverb_impl.cc @@ -57,7 +57,7 @@ public: void calculateBlock(unsigned long samples) { - model->processtqreplace(inleft, inright, outleft, outright, samples,1); + model->processreplace(inleft, inright, outleft, outright, samples,1); // don't add the original signal - that's what the "dry" argument is for //for(unsigned long i = 0;i < samples; i++) //{ diff --git a/arts/tools/environmentview.cpp b/arts/tools/environmentview.cpp index acbb2083..0ba42a7f 100644 --- a/arts/tools/environmentview.cpp +++ b/arts/tools/environmentview.cpp @@ -68,7 +68,7 @@ EnvironmentView::EnvironmentView( Container container, TQWidget* tqparent, const TQVBoxLayout* _layout = new TQVBoxLayout( this ); _layout->setAutoAdd( true ); defaultEnvFileName = DEFAULT_ENV_FILENAME; - defaultEnvFileName.tqreplace('~', TQDir::homeDirPath()); + defaultEnvFileName.replace('~', TQDir::homeDirPath()); listBox = new KListBox(this); update(); connect(listBox,TQT_SIGNAL(executed(TQListBoxItem*)), diff --git a/arts/tools/midiinstdlg.cpp b/arts/tools/midiinstdlg.cpp index 87cc2ea3..339cafa6 100644 --- a/arts/tools/midiinstdlg.cpp +++ b/arts/tools/midiinstdlg.cpp @@ -98,7 +98,7 @@ MidiInstDlg::MidiInstDlg(TQWidget *tqparent) TQString prefix = TQString::tqfromLatin1("instrument_"); if (modname.length() > 5) modname.truncate(modname.length()-5); // kill .arts extension - if ( (modname.startsWith(prefix)) && (!modname.tqcontains("_GUI")) ) + if ( (modname.startsWith(prefix)) && (!modname.contains("_GUI")) ) box->insertItem(modname.mid(prefix.length())); //kdDebug() << "inserted instrument: " << modname.mid(prefix.length()) << endl; } diff --git a/juk/collectionlist.cpp b/juk/collectionlist.cpp index 2f005009..2816f85e 100644 --- a/juk/collectionlist.cpp +++ b/juk/collectionlist.cpp @@ -90,7 +90,7 @@ PlaylistItem *CollectionList::createItem(const FileHandle &file, TQListViewItem // It's probably possible to optimize the line below away, but, well, right // now it's more important to not load duplicate items. - if(m_itemsDict.tqfind(file.absFilePath())) + if(m_itemsDict.find(file.absFilePath())) return 0; PlaylistItem *item = new CollectionListItem(file); @@ -286,7 +286,7 @@ TQString CollectionList::addStringToDict(const TQString &value, unsigned column) if(column > m_columnTags.count() || value.stripWhiteSpace().isEmpty()) return TQString(); - int *refCountPtr = m_columnTags[column]->tqfind(value); + int *refCountPtr = m_columnTags[column]->find(value); if(refCountPtr) ++(*refCountPtr); else { @@ -336,7 +336,7 @@ void CollectionList::removeStringFromDict(const TQString &value, unsigned column if(column > m_columnTags.count() || value.isEmpty()) return; - int *refCountPtr = m_columnTags[column]->tqfind(value); + int *refCountPtr = m_columnTags[column]->find(value); if(refCountPtr) { --(*refCountPtr); if(*refCountPtr == 0) { diff --git a/juk/collectionlist.h b/juk/collectionlist.h index 82fa9c12..e26a8c3a 100644 --- a/juk/collectionlist.h +++ b/juk/collectionlist.h @@ -81,7 +81,7 @@ public: */ TQStringList uniqueSet(UniqueSetType t) const; - CollectionListItem *lookup(const TQString &file) { return m_itemsDict.tqfind(file); } + CollectionListItem *lookup(const TQString &file) { return m_itemsDict.find(file); } virtual PlaylistItem *createItem(const FileHandle &file, TQListViewItem * = 0, @@ -116,7 +116,7 @@ protected: // These methods are used by CollectionListItem, which is a friend class. - void addToDict(const TQString &file, CollectionListItem *item) { m_itemsDict.tqreplace(file, item); } + void addToDict(const TQString &file, CollectionListItem *item) { m_itemsDict.replace(file, item); } void removeFromDict(const TQString &file) { m_itemsDict.remove(file); } // These methods are also used by CollectionListItem, to manage the @@ -128,7 +128,7 @@ protected: void addWatched(const TQString &file) { m_dirWatch->addFile(file); } void removeWatched(const TQString &file) { m_dirWatch->removeFile(file); } - virtual bool hasItem(const TQString &file) const { return m_itemsDict.tqfind(file); } + virtual bool hasItem(const TQString &file) const { return m_itemsDict.find(file); } signals: void signalCollectionChanged(); diff --git a/juk/coverinfo.cpp b/juk/coverinfo.cpp index ec926213..2ae531bc 100644 --- a/juk/coverinfo.cpp +++ b/juk/coverinfo.cpp @@ -227,7 +227,7 @@ TQString CoverInfo::coverLocation(CoverSize size) const TQString fileName(TQFile::encodeName(m_file.tag()->artist() + " - " + m_file.tag()->album())); TQRegExp maskedFileNameChars("[ /?:\"]"); - fileName.tqreplace(maskedFileNameChars, "_"); + fileName.replace(maskedFileNameChars, "_"); fileName.append(".png"); TQString dataDir = KGlobal::dirs()->saveLocation("appdata"); @@ -267,7 +267,7 @@ bool CoverInfo::convertOldStyleCover() const applyCoverToWholeAlbum(); - // If we convert we need to remove the old cover otherwise we'll tqfind + // If we convert we need to remove the old cover otherwise we'll find // it later if the user un-sets the new cover. if(!TQFile::remove(oldLocation)) kdError(65432) << "Unable to remove converted cover at " << oldLocation << endl; diff --git a/juk/covermanager.cpp b/juk/covermanager.cpp index 811f904f..7cd3d014 100644 --- a/juk/covermanager.cpp +++ b/juk/covermanager.cpp @@ -223,7 +223,7 @@ void CoverManagerPrivate::loadCovers() // don't do so again. Possible due to a coding error during 3.5 // development. - if(!tracks.tqfind(path)) { + if(!tracks.find(path)) { ++covers[(coverKey) id]->refCount; // Another track using this. tracks.insert(path, new coverKey(id)); } @@ -242,7 +242,7 @@ coverKey CoverManagerPrivate::nextId() const // Start from 1... coverKey key = 1; - while(covers.tqcontains(key)) + while(covers.contains(key)) ++key; return key; @@ -426,7 +426,7 @@ coverKey CoverManager::addCover(const TQString &path, const TQString &artist, co bool CoverManager::hasCover(coverKey id) { - return data()->covers.tqcontains(id); + return data()->covers.contains(id); } bool CoverManager::removeCover(coverKey id) @@ -504,7 +504,7 @@ TQValueList CoverManager::keys() void CoverManager::setIdForTrack(const TQString &path, coverKey id) { - coverKey *oldId = data()->tracks.tqfind(path); + coverKey *oldId = data()->tracks.find(path); if(oldId && (id == *oldId)) return; // We're already done. @@ -526,7 +526,7 @@ void CoverManager::setIdForTrack(const TQString &path, coverKey id) coverKey CoverManager::idForTrack(const TQString &path) { - coverKey *coverPtr = data()->tracks.tqfind(path); + coverKey *coverPtr = data()->tracks.find(path); if(!coverPtr) return NoMatch; @@ -536,7 +536,7 @@ coverKey CoverManager::idForTrack(const TQString &path) CoverDataPtr CoverManager::coverInfo(coverKey id) { - if(data()->covers.tqcontains(id)) + if(data()->covers.contains(id)) return data()->covers[id]; return CoverDataPtr(0); diff --git a/juk/covermanager.h b/juk/covermanager.h index a984f01e..b5c5d6e7 100644 --- a/juk/covermanager.h +++ b/juk/covermanager.h @@ -191,7 +191,7 @@ public: * Replaces the cover art for the cover identified by @p id with @p large. * Any other metadata such as artist and album is unchanged. * - * @param id The id of the cover to tqreplace. + * @param id The id of the cover to replace. * @param large The full size cover art for the new cover. */ static bool replaceCover(coverKey id, const TQPixmap &large); diff --git a/juk/directorylist.cpp b/juk/directorylist.cpp index 23532370..85de9134 100644 --- a/juk/directorylist.cpp +++ b/juk/directorylist.cpp @@ -78,7 +78,7 @@ DirectoryList::Result DirectoryList::exec() void DirectoryList::slotAddDirectory() { TQString dir = KFileDialog::getExistingDirectory(); - if(!dir.isEmpty() && m_dirList.tqfind(dir) == m_dirList.end()) { + if(!dir.isEmpty() && m_dirList.find(dir) == m_dirList.end()) { m_dirList.append(dir); new KListViewItem(m_base->directoryListView, dir); m_result.addedDirs.append(dir); diff --git a/juk/filehandleproperties.h b/juk/filehandleproperties.h index a930ad87..91d95750 100644 --- a/juk/filehandleproperties.h +++ b/juk/filehandleproperties.h @@ -75,7 +75,7 @@ namespace FileHandleProperties static TQString property(const FileHandle &file, const TQCString &key) { - return propertyMap.tqcontains(key) ? propertyMap[key]->value(file) : TQString(); + return propertyMap.contains(key) ? propertyMap[key]->value(file) : TQString(); } static TQStringList properties() diff --git a/juk/filerenamer.cpp b/juk/filerenamer.cpp index 2155d11c..cf3866b0 100644 --- a/juk/filerenamer.cpp +++ b/juk/filerenamer.cpp @@ -939,7 +939,7 @@ void FileRenamer::setFolderIcon(const KURL &dst, const PlaylistItem *item) path.append("/" + (*it)); kdDebug() << "Checking path: " << path << endl; - if((*it).tqfind(item->file().tag()->album()) != -1 && + if((*it).find(item->file().tag()->album()) != -1 && !TQFile::exists(path + "/.directory")) { // Seems to be a match, let's set the folder icon for the current @@ -1011,7 +1011,7 @@ TQString FileRenamer::fileName(const CategoryReaderInterface &interface) // The user can use the folder separator checkbox to add folders, so don't allow // slashes that slip in to accidentally create new folders. Should we filter this // back out when showing it in the GUI? - value.tqreplace('/', "%2f"); + value.replace('/', "%2f"); if(!pastLast && interface.hasFolderSeparator(i)) value.append(dirSeparator); diff --git a/juk/filerenamer.h b/juk/filerenamer.h index fe3a2a7c..06d8be0f 100644 --- a/juk/filerenamer.h +++ b/juk/filerenamer.h @@ -384,7 +384,7 @@ private: /** * This function returns the identifier of the row in the m_rows index that - * tqcontains \p category and matches \p categoryNum. + * contains \p category and matches \p categoryNum. * * @param category the category to find. * @return the identifier of the category, or MAX_CATEGORIES if it couldn't diff --git a/juk/ktrm.cpp b/juk/ktrm.cpp index 72519b96..3838d8bc 100644 --- a/juk/ktrm.cpp +++ b/juk/ktrm.cpp @@ -69,7 +69,7 @@ public: { int id; - if(!m_fileMap.tqcontains(lookup->file())) { + if(!m_fileMap.contains(lookup->file())) { #if HAVE_MUSICBRAINZ >= 4 id = tp_AddFile(m_pimp, TQFile::encodeName(lookup->file()), 0); #else @@ -95,9 +95,9 @@ public: bool lookupMapContains(int fileId) const { m_lookupMapMutex.lock(); - bool tqcontains = m_lookupMap.tqcontains(fileId); + bool contains = m_lookupMap.contains(fileId); m_lookupMapMutex.unlock(); - return tqcontains; + return contains; } KTRMLookup *lookup(int fileId) const diff --git a/juk/playlist.cpp b/juk/playlist.cpp index 51cb5095..267ec8e8 100644 --- a/juk/playlist.cpp +++ b/juk/playlist.cpp @@ -922,7 +922,7 @@ void Playlist::slotWeightDirty(int column) return; } - if(m_weightDirty.tqfind(column) == m_weightDirty.end()) + if(m_weightDirty.find(column) == m_weightDirty.end()) m_weightDirty.append(column); } @@ -1382,7 +1382,7 @@ void Playlist::refreshAlbums(const PlaylistItemList &items, coverKey id) TQString artist = (*it)->file().tag()->artist(); TQString album = (*it)->file().tag()->album(); - if(albums.tqfind(tqMakePair(artist, album)) == albums.end()) + if(albums.find(tqMakePair(artist, album)) == albums.end()) albums.append(tqMakePair(artist, album)); (*it)->file().coverInfo()->setCoverId(id); @@ -1636,7 +1636,7 @@ void Playlist::slotPopulateBackMenu() const void Playlist::slotPlayFromBackMenu(int number) const { - if(!m_backMenuItems.tqcontains(number)) + if(!m_backMenuItems.contains(number)) return; TrackSequenceManager::instance()->setNextItem(m_backMenuItems[number]); diff --git a/juk/playlist.h b/juk/playlist.h index d9273834..ba1363a1 100644 --- a/juk/playlist.h +++ b/juk/playlist.h @@ -435,7 +435,7 @@ protected: virtual void insertItem(TQListViewItem *item); virtual void takeItem(TQListViewItem *item); - virtual bool hasItem(const TQString &file) const { return m_members.tqcontains(file); } + virtual bool hasItem(const TQString &file) const { return m_members.contains(file); } void addColumn(const TQString &label); diff --git a/juk/playlistbox.cpp b/juk/playlistbox.cpp index 69a5ec8d..abef8e74 100644 --- a/juk/playlistbox.cpp +++ b/juk/playlistbox.cpp @@ -171,7 +171,7 @@ void PlaylistBox::raise(Playlist *playlist) if(!playlist) return; - Item *i = m_playlistDict.tqfind(playlist); + Item *i = m_playlistDict.find(playlist); if(i) { clearSelection(); diff --git a/juk/playlistcollection.cpp b/juk/playlistcollection.cpp index 6a248b39..95ac971a 100644 --- a/juk/playlistcollection.cpp +++ b/juk/playlistcollection.cpp @@ -509,7 +509,7 @@ void PlaylistCollection::createFolderPlaylist() if(folder.isEmpty()) return; - TQString name = uniquePlaylistName(folder.mid(folder.tqfindRev('/') + 1)); + TQString name = uniquePlaylistName(folder.mid(folder.findRev('/') + 1)); name = playlistNameDialog(i18n("Create Folder Playlist"), name); if(!name.isNull()) @@ -681,7 +681,7 @@ bool PlaylistCollection::importPlaylists() const bool PlaylistCollection::containsPlaylistFile(const TQString &file) const { - return m_playlistFiles.tqcontains(file); + return m_playlistFiles.contains(file); } bool PlaylistCollection::showMoreActive() const @@ -740,7 +740,7 @@ TQString PlaylistCollection::uniquePlaylistName(const TQString &suggest) const if(suggest.isEmpty()) return uniquePlaylistName(); - if(!m_playlistNames.tqcontains(suggest)) + if(!m_playlistNames.contains(suggest)) return suggest; TQString base = suggest; @@ -749,7 +749,7 @@ TQString PlaylistCollection::uniquePlaylistName(const TQString &suggest) const int count = 1; TQString s = TQString("%1 (%2)").tqarg(base).tqarg(count); - while(m_playlistNames.tqcontains(s)) { + while(m_playlistNames.contains(s)) { count++; s = TQString("%1 (%2)").tqarg(base).tqarg(count); } @@ -845,7 +845,7 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection) menu->insert(createAction(i18n("&Empty Playlist..."), TQT_SLOT(slotCreatePlaylist()), "newPlaylist", "window_new", "CTRL+n")); menu->insert(createAction(i18n("&Search Playlist..."), TQT_SLOT(slotCreateSearchPlaylist()), - "newSearchPlaylist", "tqfind", "CTRL+f")); + "newSearchPlaylist", "find", "CTRL+f")); menu->insert(createAction(i18n("Playlist From &Folder..."), TQT_SLOT(slotCreateFolderPlaylist()), "newDirectoryPlaylist", "fileopen", "CTRL+d")); diff --git a/juk/playlistitem.cpp b/juk/playlistitem.cpp index 951fdb41..b29d338c 100644 --- a/juk/playlistitem.cpp +++ b/juk/playlistitem.cpp @@ -53,7 +53,7 @@ PlaylistItem::~PlaylistItem() m_collectionItem->removeChildItem(this); - if(m_playingItems.tqfind(this) != m_playingItems.end()) { + if(m_playingItems.find(this) != m_playingItems.end()) { m_playingItems.remove(this); if(m_playingItems.isEmpty()) playlist()->setPlaying(0); @@ -94,7 +94,7 @@ const TQPixmap *PlaylistItem::pixmap(int column) const return ℑ if(column == playlist()->leftColumn() && - m_playingItems.tqcontains(const_cast(this))) + m_playingItems.contains(const_cast(this))) return &playing; return KListViewItem::pixmap(column); @@ -269,7 +269,7 @@ PlaylistItem::PlaylistItem(CollectionList *tqparent) : void PlaylistItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align) { - if(!m_playingItems.tqcontains(this)) + if(!m_playingItems.contains(this)) return KListViewItem::paintCell(p, cg, column, width, align); TQColorGroup tqcolorGroup = cg; diff --git a/juk/playlistsearch.cpp b/juk/playlistsearch.cpp index f0eb7a29..b5f8517a 100644 --- a/juk/playlistsearch.cpp +++ b/juk/playlistsearch.cpp @@ -197,7 +197,7 @@ bool PlaylistSearch::Component::matches(PlaylistItem *item) const for(ColumnList::Iterator it = m_columns.begin(); it != m_columns.end(); ++it) { if(m_re) { - if(item->text(*it).tqfind(m_queryRe) > -1) + if(item->text(*it).find(m_queryRe) > -1) return true; else break; @@ -205,7 +205,7 @@ bool PlaylistSearch::Component::matches(PlaylistItem *item) const switch(m_mode) { case Contains: - if(item->text(*it).tqfind(m_query, 0, m_caseSensitive) > -1) + if(item->text(*it).find(m_query, 0, m_caseSensitive) > -1) return true; break; case Exact: @@ -221,7 +221,7 @@ bool PlaylistSearch::Component::matches(PlaylistItem *item) const case ContainsWord: { TQString s = item->text(*it); - int i = s.tqfind(m_query, 0, m_caseSensitive); + int i = s.find(m_query, 0, m_caseSensitive); if(i >= 0) { diff --git a/juk/playlistsplitter.cpp b/juk/playlistsplitter.cpp index 8731c30f..5fa2b72b 100644 --- a/juk/playlistsplitter.cpp +++ b/juk/playlistsplitter.cpp @@ -118,7 +118,7 @@ Playlist *PlaylistSplitter::visiblePlaylist() const void PlaylistSplitter::setupActions() { KToggleAction *showSearch = - new KToggleAction(i18n("Show &Search Bar"), "filetqfind", 0, ActionCollection::actions(), "showSearch"); + new KToggleAction(i18n("Show &Search Bar"), "filefind", 0, ActionCollection::actions(), "showSearch"); showSearch->setCheckedState(i18n("Hide &Search Bar")); new KAction(i18n("Edit Track Search"), "edit_clear", "F6", TQT_TQOBJECT(this), TQT_SLOT(setFocus()), ActionCollection::actions(), "editTrackSearch"); diff --git a/juk/searchplaylist.cpp b/juk/searchplaylist.cpp index da4f54ce..ba1be917 100644 --- a/juk/searchplaylist.cpp +++ b/juk/searchplaylist.cpp @@ -30,7 +30,7 @@ SearchPlaylist::SearchPlaylist(PlaylistCollection *collection, const TQString &name, bool setupPlaylist, bool synchronizePlaying) : - DynamicPlaylist(search.playlists(), collection, name, "tqfind", + DynamicPlaylist(search.playlists(), collection, name, "find", setupPlaylist, synchronizePlaying), m_search(search) { diff --git a/juk/sortedstringlist.cpp b/juk/sortedstringlist.cpp index 904c5f01..b952067b 100644 --- a/juk/sortedstringlist.cpp +++ b/juk/sortedstringlist.cpp @@ -44,9 +44,9 @@ bool SortedStringList::insert(const TQString &value) return BSTInsert(value); } -bool SortedStringList::tqcontains(const TQString &value) const +bool SortedStringList::contains(const TQString &value) const { - return tqfind(value); + return find(value); } SortedStringList::Node *SortedStringList::treeMinimum(Node *n) const @@ -73,7 +73,7 @@ SortedStringList::Node *SortedStringList::treeSuccessor(Node *n) const bool SortedStringList::remove(const TQString &value) { - Node *n = tqfind(value); + Node *n = find(value); if(!n) return false; @@ -122,7 +122,7 @@ TQStringList SortedStringList::values() const // private methods //////////////////////////////////////////////////////////////////////////////// -SortedStringList::Node *SortedStringList::tqfind(const TQString &value) const +SortedStringList::Node *SortedStringList::find(const TQString &value) const { Node *n = m_root; while(n && value != n->key) { diff --git a/juk/sortedstringlist.h b/juk/sortedstringlist.h index 1ef94a2b..01386262 100644 --- a/juk/sortedstringlist.h +++ b/juk/sortedstringlist.h @@ -29,7 +29,7 @@ public: * or false otherwise. */ bool insert(const TQString &value); - bool tqcontains(const TQString &value) const; + bool contains(const TQString &value) const; bool remove(const TQString &value); /** @@ -42,7 +42,7 @@ public: private: class Node; - Node *tqfind(const TQString &value) const; + Node *find(const TQString &value) const; /** * The insertion implementation. Returns true if the item was already * present in the list. diff --git a/juk/stringhash.h b/juk/stringhash.h index 11ac3d7b..bf866958 100644 --- a/juk/stringhash.h +++ b/juk/stringhash.h @@ -42,7 +42,7 @@ public: /** * Returns true if the set contains the item \a value. */ - bool tqcontains(T value) const; + bool contains(T value) const; /** * Removes an item. Returns true if the item was present and false if not. @@ -227,7 +227,7 @@ bool Hash::insert(T value) } template -bool Hash::tqcontains(T value) const +bool Hash::contains(T value) const { int h = hash(value); Node *i = m_table[h]; diff --git a/juk/stringshare.cpp b/juk/stringshare.cpp index 8cb07068..195fd64f 100644 --- a/juk/stringshare.cpp +++ b/juk/stringshare.cpp @@ -21,7 +21,7 @@ StringShare::Data* StringShare::s_data = 0; /** * We store the strings in two simple direct-mapped (i.e. no collision handling, - * just tqreplace) hashes, which contain strings or null objects. This costs only + * just replace) hashes, which contain strings or null objects. This costs only * 4 bytes per slot on 32-bit archs, so with the default constant size we only * really use 40K or so. * diff --git a/juk/systemtray.cpp b/juk/systemtray.cpp index 16b1da6d..8a9a9c32 100644 --- a/juk/systemtray.cpp +++ b/juk/systemtray.cpp @@ -577,7 +577,7 @@ void SystemTray::mousePressEvent(TQMouseEvent *e) KSystemTray::mousePressEvent(e); break; case Qt::MidButton: - if(!TQT_TQRECT_OBJECT(rect()).tqcontains(e->pos())) + if(!TQT_TQRECT_OBJECT(rect()).contains(e->pos())) return; if(action("pause")->isEnabled()) action("pause")->activate(); @@ -589,7 +589,7 @@ void SystemTray::mousePressEvent(TQMouseEvent *e) /* * This function copies the entirety of src into dest, starting in - * dest at x and y. This function exists because I was unable to tqfind + * dest at x and y. This function exists because I was unable to find * a function like it in either TQImage or kdefx */ diff --git a/juk/tag.cpp b/juk/tag.cpp index a9d37297..27f0a91c 100644 --- a/juk/tag.cpp +++ b/juk/tag.cpp @@ -245,8 +245,8 @@ void Tag::setup(TagLib::File *file) m_lengthString = TQString::number(minutes) + (seconds >= 10 ? ":" : ":0") + TQString::number(seconds); if(m_title.isEmpty()) { - int i = m_fileName.tqfindRev('/'); - int j = m_fileName.tqfindRev('.'); + int i = m_fileName.findRev('/'); + int j = m_fileName.findRev('.'); m_title = i > 0 ? m_fileName.mid(i + 1, j - i - 1) : m_fileName; } diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp index 9ae3e057..f02f11ab 100644 --- a/juk/tageditor.cpp +++ b/juk/tageditor.cpp @@ -59,7 +59,7 @@ public: virtual State validate(TQString &s, int &) const { - if(s.tqfind('/') != -1) + if(s.find('/') != -1) return Invalid; return Acceptable; } @@ -234,8 +234,8 @@ void TagEditor::slotRefresh() m_bitrateBox->setText(TQString::number(tag->bitrate())); m_lengthBox->setText(tag->lengthString()); - if(m_genreList.tqfindIndex(tag->genre()) >= 0) - m_genreBox->setCurrentItem(m_genreList.tqfindIndex(tag->genre()) + 1); + if(m_genreList.findIndex(tag->genre()) >= 0) + m_genreBox->setCurrentItem(m_genreList.findIndex(tag->genre()) + 1); else { m_genreBox->setCurrentItem(0); m_genreBox->setEditText(tag->genre()); @@ -287,43 +287,43 @@ void TagEditor::slotRefresh() if(tag) { if(m_artistNameBox->currentText() != tag->artist() && - m_enableBoxes.tqcontains(m_artistNameBox)) + m_enableBoxes.contains(m_artistNameBox)) { m_artistNameBox->lineEdit()->clear(); m_enableBoxes[m_artistNameBox]->setChecked(false); } if(m_trackNameBox->text() != tag->title() && - m_enableBoxes.tqcontains(m_trackNameBox)) + m_enableBoxes.contains(m_trackNameBox)) { m_trackNameBox->clear(); m_enableBoxes[m_trackNameBox]->setChecked(false); } if(m_albumNameBox->currentText() != tag->album() && - m_enableBoxes.tqcontains(m_albumNameBox)) + m_enableBoxes.contains(m_albumNameBox)) { m_albumNameBox->lineEdit()->clear(); m_enableBoxes[m_albumNameBox]->setChecked(false); } if(m_genreBox->currentText() != tag->genre() && - m_enableBoxes.tqcontains(m_genreBox)) + m_enableBoxes.contains(m_genreBox)) { m_genreBox->lineEdit()->clear(); m_enableBoxes[m_genreBox]->setChecked(false); } if(m_trackSpin->value() != tag->track() && - m_enableBoxes.tqcontains(m_trackSpin)) + m_enableBoxes.contains(m_trackSpin)) { m_trackSpin->setValue(0); m_enableBoxes[m_trackSpin]->setChecked(false); } if(m_yearSpin->value() != tag->year() && - m_enableBoxes.tqcontains(m_yearSpin)) + m_enableBoxes.contains(m_yearSpin)) { m_yearSpin->setValue(0); m_enableBoxes[m_yearSpin]->setChecked(false); } if(m_commentBox->text() != tag->comment() && - m_enableBoxes.tqcontains(m_commentBox)) + m_enableBoxes.contains(m_commentBox)) { m_commentBox->clear(); m_enableBoxes[m_commentBox]->setChecked(false); diff --git a/juk/tagguesser.cpp b/juk/tagguesser.cpp index a93b5996..bc195995 100644 --- a/juk/tagguesser.cpp +++ b/juk/tagguesser.cpp @@ -23,7 +23,7 @@ FileNameScheme::FileNameScheme(const TQString &s) m_commentField(-1) { int fieldNumber = 1; - int i = s.tqfind('%'); + int i = s.find('%'); while (i > -1) { switch (s[ i + 1 ]) { case 't': m_titleField = fieldNumber++; @@ -39,7 +39,7 @@ FileNameScheme::FileNameScheme(const TQString &s) default: break; } - i = s.tqfind('%', i + 1); + i = s.find('%', i + 1); } m_regExp.setPattern(composeRegExp(s)); } @@ -50,7 +50,7 @@ bool FileNameScheme::matches(const TQString &fileName) const * does not work as a separator. */ TQString stripped = fileName; - stripped.truncate(stripped.tqfindRev('.')); + stripped.truncate(stripped.findRev('.')); return m_regExp.exactMatch(stripped); } @@ -103,7 +103,7 @@ TQString FileNameScheme::composeRegExp(const TQString &s) const TQString regExp = TQRegExp::escape(s.simplifyWhiteSpace()); regExp = ".*" + regExp; - regExp.tqreplace(' ', "\\s+"); + regExp.replace(' ', "\\s+"); regExp = KMacroExpander::expandMacros(regExp, substitutions); regExp += "[^/]*$"; return regExp; @@ -187,11 +187,11 @@ void TagGuesser::guess(const TQString &absFileName) for (; it != end; ++it) { const FileNameScheme schema(*it); if(schema.matches(absFileName)) { - m_title = capitalizeWords(schema.title().tqreplace('_', " ")).stripWhiteSpace(); - m_artist = capitalizeWords(schema.artist().tqreplace('_', " ")).stripWhiteSpace(); - m_album = capitalizeWords(schema.album().tqreplace('_', " ")).stripWhiteSpace(); + m_title = capitalizeWords(schema.title().replace('_', " ")).stripWhiteSpace(); + m_artist = capitalizeWords(schema.artist().replace('_', " ")).stripWhiteSpace(); + m_album = capitalizeWords(schema.album().replace('_', " ")).stripWhiteSpace(); m_track = schema.track().stripWhiteSpace(); - m_comment = schema.comment().tqreplace('_', " ").stripWhiteSpace(); + m_comment = schema.comment().replace('_', " ").stripWhiteSpace(); break; } } @@ -206,10 +206,10 @@ TQString TagGuesser::capitalizeWords(const TQString &s) result[ 0 ] = result[ 0 ].upper(); const TQRegExp wordRegExp("\\s\\w"); - int i = result.tqfind( wordRegExp ); + int i = result.find( wordRegExp ); while ( i > -1 ) { result[ i + 1 ] = result[ i + 1 ].upper(); - i = result.tqfind( wordRegExp, ++i ); + i = result.find( wordRegExp, ++i ); } return result; diff --git a/juk/viewmode.cpp b/juk/viewmode.cpp index 785f765b..b95d8cbc 100644 --- a/juk/viewmode.cpp +++ b/juk/viewmode.cpp @@ -195,7 +195,7 @@ TQStringList ViewMode::lines(const PlaylistBox::Item *item, fm.width(line.mid(0, textLength).stripWhiteSpace()) + item->listView()->itemMargin() * 2 > width) { - int i = line.tqfindRev(TQRegExp( "\\W"), textLength - 1); + int i = line.findRev(TQRegExp( "\\W"), textLength - 1); if(i > 0) textLength = i; else @@ -313,7 +313,7 @@ void TreeViewMode::removeItem(const TQString &item, unsigned column) return; } - if(!m_treeViewItems.tqfind(itemKey)) + if(!m_treeViewItems.find(itemKey)) return; TreeViewItemPlaylist *itemPlaylist = m_treeViewItems[itemKey]; @@ -363,7 +363,7 @@ void TreeViewMode::addItems(const TQStringList &items, unsigned column) item = *it; itemKey = searchCategory + item; - if(m_treeViewItems.tqfind(itemKey)) + if(m_treeViewItems.find(itemKey)) continue; components.clear(); diff --git a/kaudiocreator/encoder.cpp b/kaudiocreator/encoder.cpp index a0567fbf..97ab366a 100644 --- a/kaudiocreator/encoder.cpp +++ b/kaudiocreator/encoder.cpp @@ -160,7 +160,7 @@ void Encoder::tendToNewJobs() { EncoderPrefs* prefs = loadEncoder(job->encoder); TQString desiredFile = Prefs::fileFormat(); - desiredFile.tqreplace( TQRegExp("~"), TQDir::homeDirPath() ); + desiredFile.replace( TQRegExp("~"), TQDir::homeDirPath() ); { TQMap map; map.insert("extension", prefs->extension()); @@ -185,7 +185,7 @@ void Encoder::tendToNewJobs() { } } - int lastSlash = desiredFile.tqfindRev('/',-1); + int lastSlash = desiredFile.findRev('/',-1); if ( lastSlash == -1 || !(KStandardDirs::makeDir( desiredFile.mid(0,lastSlash), 0775)) ) { KMessageBox::sorry(0, i18n("Cannot place file, unable to make directories."), i18n("Encoding Failed")); @@ -225,7 +225,7 @@ void Encoder::tendToNewJobs() { } /** - * We have received some output from a thread. See if it tqcontains %. + * We have received some output from a thread. See if it contains %. * @param proc the process that has new output. * @param buffer the output from the process * @param buflen the length of the buffer. @@ -235,7 +235,7 @@ void Encoder::receivedThreadOutput(KProcess *process, char *buffer, int length ) kdDebug(60002) << buffer << endl; // Make sure we have a job to send an update too. - if(jobs.tqfind((KShellProcess*)process) == jobs.end()){ + if(jobs.find((KShellProcess*)process) == jobs.end()){ kdDebug(60002) << "Encoder::receivedThreadOutput Job doesn't exists. Line: " << __LINE__ << endl; return; } @@ -247,13 +247,13 @@ void Encoder::receivedThreadOutput(KProcess *process, char *buffer, int length ) // Make sure the output string has a % symble in it. TQString output = TQString(buffer).mid(0,length); - if ( output.tqfind('%') == -1 && reportCount < 5 ) { + if ( output.find('%') == -1 && reportCount < 5 ) { kdDebug(60002) << "No \'%%\' in output. Report as bug w/encoder options if progressbar doesn't fill." << endl; reportCount++; return; } //qDebug(TQString("Pre cropped: %1").tqarg(output).latin1()); - output = output.mid(output.tqfind('%')-loadEncoder(job->encoder)->percentLength(),2); + output = output.mid(output.find('%')-loadEncoder(job->encoder)->percentLength(),2); //qDebug(TQString("Post cropped: %1").tqarg(output).latin1()); bool conversionSuccessfull = false; int percent = output.toInt(&conversionSuccessfull); diff --git a/kaudiocreator/encoderconfigimp.cpp b/kaudiocreator/encoderconfigimp.cpp index 4455781c..a2fb31e2 100644 --- a/kaudiocreator/encoderconfigimp.cpp +++ b/kaudiocreator/encoderconfigimp.cpp @@ -242,7 +242,7 @@ void EncoderConfigImp::updateEncoder(const char *dialogName){ if(newName == encoderName) return; - TQListBoxItem *item = kcfg_currentEncoder->tqfindItem(encoderName); + TQListBoxItem *item = kcfg_currentEncoder->findItem(encoderName); if(!item) return; kcfg_currentEncoder->changeItem(newName, kcfg_currentEncoder->index(item)); @@ -260,7 +260,7 @@ EncoderPrefs *EncoderPrefs::prefs(const TQString &groupName) m_prefs = new TQDict(); m_prefs->setAutoDelete(true); } - EncoderPrefs *encPrefs = m_prefs->tqfind(groupName); + EncoderPrefs *encPrefs = m_prefs->find(groupName); if (encPrefs) return encPrefs; diff --git a/kaudiocreator/general.ui.h b/kaudiocreator/general.ui.h index 98c00de3..a980b3af 100644 --- a/kaudiocreator/general.ui.h +++ b/kaudiocreator/general.ui.h @@ -14,6 +14,6 @@ void General::updateExample() { TQString text = example->text(); - text.tqreplace( TQRegExp(kcfg_replaceInput->text()), kcfg_replaceOutput->text() ); + text.replace( TQRegExp(kcfg_replaceInput->text()), kcfg_replaceOutput->text() ); exampleOutput->setText(text); } diff --git a/kaudiocreator/job.cpp b/kaudiocreator/job.cpp index c4950377..740aeb5e 100644 --- a/kaudiocreator/job.cpp +++ b/kaudiocreator/job.cpp @@ -21,7 +21,7 @@ #include /** - * A helper function to tqreplace %X with the stuff in the album. + * A helper function to replace %X with the stuff in the album. * if quote is true then put "" around the %X */ TQString Job::replaceSpecialChars(const TQString &string, bool quote, TQMap _map){ @@ -45,14 +45,14 @@ TQString Job::replaceSpecialChars(const TQString &string, bool quote, TQMap - + diff --git a/kaudiocreator/ripper.cpp b/kaudiocreator/ripper.cpp index 7a308a9f..dcc391ca 100644 --- a/kaudiocreator/ripper.cpp +++ b/kaudiocreator/ripper.cpp @@ -201,7 +201,7 @@ void Ripper::copyJobResult(KIO::Job *copyjob){ KIO::FileCopyJob *copyJob = dynamic_cast (copyjob); KNotifyClient::event("track ripped"); - if(jobs.tqfind(copyjob) == jobs.end()) + if(jobs.find(copyjob) == jobs.end()) return; Job *newJob = jobs[copyjob]; jobs.remove(copyjob); diff --git a/kaudiocreator/tracksimp.cpp b/kaudiocreator/tracksimp.cpp index 02668821..146a4c89 100644 --- a/kaudiocreator/tracksimp.cpp +++ b/kaudiocreator/tracksimp.cpp @@ -84,7 +84,7 @@ TracksImp::~TracksImp() { list.append(deviceCombo->currentText()); for ( int i=0; icount();i++ ) { TQString text = deviceCombo->text(i); - if( list.tqfind(text) == list.end()) + if( list.find(text) == list.end()) list.append(text); if( list.count() == 5) break; @@ -104,13 +104,13 @@ void TracksImp::loadSettings() { TQStringList prefsList = Prefs::device(); TQStringList::Iterator it; for ( it = prefsList.begin(); it != prefsList.end(); ++it ) { - if( list.tqfind( *it ) == list.end()) + if( list.find( *it ) == list.end()) list.append(*it); } // Get current list, no dups for ( int i=0; icount();i++ ) { TQString text = deviceCombo->text(i); - if( list.tqfind(text) == list.end()) + if( list.find(text) == list.end()) list.append(text); } @@ -277,7 +277,7 @@ void TracksImp::lookupCDDBDone(CDDB::Result result ) { } // Some sanity provisions to ensure that the number of records matches what - // the CD actually tqcontains. + // the CD actually contains. while (info.trackInfoList.count() < cddbInfo.trackInfoList.count()) { info.trackInfoList.append(KCDDB::TrackInfo()); @@ -496,7 +496,7 @@ void TracksImp::newAlbum() bool isSampler = true; for( unsigned i = 0; i < t.count(); i++ ) { - if (t[i].title.tqfind(" / ") == -1) + if (t[i].title.find(" / ") == -1) { isSampler = false; break; @@ -512,7 +512,7 @@ void TracksImp::newAlbum() if( isSampler ) { // Support for multiple artists stripping. - int delimiter = t[i].title.tqfind(" / "); + int delimiter = t[i].title.find(" / "); Q_ASSERT( delimiter != -1 ); trackArtist = t[i].title.left(delimiter); title = t[i].title.mid(delimiter + 3); diff --git a/kaudiocreator/wizard.ui.h b/kaudiocreator/wizard.ui.h index 294d36dc..7c22638e 100644 --- a/kaudiocreator/wizard.ui.h +++ b/kaudiocreator/wizard.ui.h @@ -90,7 +90,7 @@ void fileWizard::commentPressed() void fileWizard::fileFormatTextChanged(const TQString& text) { TQString string = text; - string.tqreplace(TQRegExp("~"), "/home/foo"); + string.replace(TQRegExp("~"), "/home/foo"); Job job; job.genre = "Rock"; job.group = "J Rocker"; diff --git a/kfile-plugins/mpeg/kfile_mpeg.cpp b/kfile-plugins/mpeg/kfile_mpeg.cpp index a94ce15a..71f5f7fa 100644 --- a/kfile-plugins/mpeg/kfile_mpeg.cpp +++ b/kfile-plugins/mpeg/kfile_mpeg.cpp @@ -329,7 +329,7 @@ bool KMpegPlugin::read_mpeg() skimmed++; searched++; if (video_len > 0) video_len--; - // Use a fast state machine to tqfind 00 00 01 sync code + // Use a fast state machine to find 00 00 01 sync code switch (state) { case 0: if (byte == 0) diff --git a/kioslave/audiocd/audiocd.cpp b/kioslave/audiocd/audiocd.cpp index 43f61d21..5c2068b5 100644 --- a/kioslave/audiocd/audiocd.cpp +++ b/kioslave/audiocd/audiocd.cpp @@ -149,7 +149,7 @@ public: TQString fileNameTemplate; // URL settable TQString albumTemplate; // URL settable TQString rsearch; - TQString rtqreplace; + TQString rreplace; // Current strings for this CD and or cddb selection TQStringList templateTitles; @@ -189,7 +189,7 @@ AudioCDEncoder *AudioCDProtocol::encoderFromExtension(const TQString& extension) AudioCDEncoder *AudioCDProtocol::determineEncoder(const TQString & filename) { int len = filename.length(); - int pos = filename.tqfindRev('.'); + int pos = filename.findRev('.'); return encoderFromExtension(filename.right(len - pos)); } @@ -326,7 +326,7 @@ struct cdrom_drive * AudioCDProtocol::initRequest(const KURL & url) TQString name(d->fname); // Remove extension - int dot = name.tqfindRev('.'); + int dot = name.findRev('.'); if (dot >= 0) name.truncate(dot); @@ -365,7 +365,7 @@ struct cdrom_drive * AudioCDProtocol::initRequest(const KURL & url) d->req_track = -1; // Are we in the directory that lists "full CD" files? - d->req_allTracks = (dname.tqcontains(d->s_fullCD)); + d->req_allTracks = (dname.contains(d->s_fullCD)); kdDebug(7117) << "dir=" << dname << " file=" << d->fname << " req_track=" << d->req_track << " which_dir=" << d->which_dir << " full CD?=" << d->req_allTracks << endl; @@ -397,7 +397,7 @@ void AudioCDProtocol::get(const KURL & url) if (!drive) return; - if( d->fname.tqcontains(i18n(CDDB_INFORMATION))){ + if( d->fname.contains(i18n(CDDB_INFORMATION))){ uint choice = 1; if(d->fname != TQString("%1.txt").tqarg(i18n(CDDB_INFORMATION))){ choice= d->fname.section('_',1,1).section('.',0,0).toInt(); @@ -417,7 +417,7 @@ void AudioCDProtocol::get(const KURL & url) } count++; } - if(!found && d->fname.tqcontains(i18n(CDDB_INFORMATION)+":")){ + if(!found && d->fname.contains(i18n(CDDB_INFORMATION)+":")){ mimeType("text/html"); //data(TQCString( d->fname.latin1() )); // send an empty TQByteArray to signal end of data. @@ -504,7 +504,7 @@ void AudioCDProtocol::stat(const KURL & url) UDSAtom atom; atom.m_uds = KIO::UDS_NAME; - atom.m_str = url.fileName().tqreplace('/', TQFL1("%2F")); + atom.m_str = url.fileName().replace('/', TQFL1("%2F")); kdDebug(7117) << k_funcinfo << atom.m_str << endl; entry.append(atom); @@ -953,7 +953,7 @@ void AudioCDProtocol::parseURLArgs(const KURL & url) { TQString token(*it); - int equalsPos(token.tqfind('=')); + int equalsPos(token.find('=')); if (-1 == equalsPos) continue; @@ -1016,7 +1016,7 @@ void AudioCDProtocol::loadSettings() d->fileNameTemplate = config->readEntry("file_name_template", "%{albumartist} - %{number} - %{title}"); d->albumTemplate = config->readEntry("album_template", "%{albumartist} - %{albumtitle}"); d->rsearch = config->readEntry("regexp_search"); - d->rtqreplace = config->readEntry("regexp_tqreplace"); + d->rreplace = config->readEntry("regexp_replace"); // if the regular expressions are enclosed in qoutes. remove them // otherwise it is not possible to search for a space " ", since an empty (only spaces) value is not // supported by KConfig, so the space has to be qouted, but then here the regexp searches really for " " @@ -1026,9 +1026,9 @@ void AudioCDProtocol::loadSettings() { d->rsearch=d->rsearch.mid(1, d->rsearch.length()-2); } - if (qoutedString.exactMatch(d->rtqreplace)) + if (qoutedString.exactMatch(d->rreplace)) { - d->rtqreplace=d->rtqreplace.mid(1, d->rtqreplace.length()-2); + d->rreplace=d->rreplace.mid(1, d->rreplace.length()-2); } // Tell the encoders to load their settings @@ -1080,8 +1080,8 @@ void AudioCDProtocol::generateTemplateTitles() macros["genre"] = info.genre; macros["year"] = TQString::number(info.year); - TQString title = KMacroExpander::expandMacros(d->fileNameTemplate, macros, '%').tqreplace('/', TQFL1("%2F")); - title.tqreplace( TQRegExp(d->rsearch), d->rtqreplace ); + TQString title = KMacroExpander::expandMacros(d->fileNameTemplate, macros, '%').replace('/', TQFL1("%2F")); + title.replace( TQRegExp(d->rsearch), d->rreplace ); d->templateTitles.append(title); } @@ -1090,8 +1090,8 @@ void AudioCDProtocol::generateTemplateTitles() macros["albumtitle"] = info.title; macros["genre"] = info.genre; macros["year"] = TQString::number(info.year); - d->templateAlbumName = KMacroExpander::expandMacros(d->albumTemplate, macros, '%').tqreplace('/', TQFL1("%2F")); - d->templateAlbumName.tqreplace( TQRegExp(d->rsearch), d->rtqreplace ); + d->templateAlbumName = KMacroExpander::expandMacros(d->albumTemplate, macros, '%').replace('/', TQFL1("%2F")); + d->templateAlbumName.replace( TQRegExp(d->rsearch), d->rreplace ); } /** diff --git a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp index 166aa126..e922d6fd 100644 --- a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp +++ b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp @@ -123,7 +123,7 @@ void KAudiocdModule::updateExample() TQString deqoutedReplaceInput=removeQoutes(kcfg_replaceInput->text()); TQString deqoutedReplaceOutput=removeQoutes(kcfg_replaceOutput->text()); - text.tqreplace( TQRegExp(deqoutedReplaceInput), deqoutedReplaceOutput ); + text.replace( TQRegExp(deqoutedReplaceInput), deqoutedReplaceOutput ); exampleOutput->setText(text); } @@ -165,7 +165,7 @@ void KAudiocdModule::save() { replaceOutput=TQString("\"")+replaceOutput+TQString("\""); } config->writeEntry("regexp_search", replaceInput); - config->writeEntry("regexp_tqreplace", replaceOutput); + config->writeEntry("regexp_replace", replaceOutput); } KConfigDialogManager *widget; @@ -204,7 +204,7 @@ void KAudiocdModule::load(bool useDefaults) { fileNameLineEdit->setText(config->readEntry("file_name_template", "%{albumartist} - %{number} - %{title}")); albumNameLineEdit->setText(config->readEntry("album_name_template", "%{albumartist} - %{albumtitle}")); kcfg_replaceInput->setText(config->readEntry("regexp_search")); - kcfg_replaceOutput->setText(config->readEntry("regexp_tqreplace")); + kcfg_replaceOutput->setText(config->readEntry("regexp_replace")); example->setText(config->readEntry("example", i18n("Cool artist - example audio file.wav"))); } diff --git a/kioslave/audiocd/plugins/audiocdencoder.cpp b/kioslave/audiocd/plugins/audiocdencoder.cpp index 200534a4..6dfbec18 100644 --- a/kioslave/audiocd/plugins/audiocdencoder.cpp +++ b/kioslave/audiocd/plugins/audiocdencoder.cpp @@ -78,12 +78,12 @@ void AudioCDEncoder::findAllPlugins(KIO::SlaveBase *slave, TQPtrList &) = (void (*)(KIO::SlaveBase *slave, TQPtrList &encoders)) function; diff --git a/kioslave/audiocd/plugins/lame/encoderlame.cpp b/kioslave/audiocd/plugins/lame/encoderlame.cpp index 6154145b..f44218a0 100644 --- a/kioslave/audiocd/plugins/lame/encoderlame.cpp +++ b/kioslave/audiocd/plugins/lame/encoderlame.cpp @@ -350,7 +350,7 @@ void EncoderLame::fillSongInfo( KCDDB::CDInfo info, int track, const TQString &c trackInfo.append(TQString("%1").tqarg(track+1)); const TQString genre = info.get( "genre" ).toString(); - if ( d->genreList.tqfind( genre ) != d->genreList.end() ) + if ( d->genreList.find( genre ) != d->genreList.end() ) { trackInfo.append("--tg"); trackInfo.append(genre); diff --git a/kmid/kmidclient.cpp b/kmid/kmidclient.cpp index 88854444..a0088266 100644 --- a/kmid/kmidclient.cpp +++ b/kmid/kmidclient.cpp @@ -147,7 +147,7 @@ kmidClient::kmidClient(TQWidget *tqparent, KActionCollection *ac, const char *na TQString samplefile = KGlobal::dirs()->findAllResources("appdata", "fm/*.o3").last(); - samplefile.truncate(samplefile.tqfindRev('/')); + samplefile.truncate(samplefile.findRev('/')); FMOut::setFMPatchesDirectory(TQFile::encodeName(samplefile)); m_kMid.pctlsmID=shmget(IPC_PRIVATE,sizeof(PlayerController),0666 | IPC_CREAT ); diff --git a/kmid/midicfgdlg.cpp b/kmid/midicfgdlg.cpp index 0be88c72..7c26c295 100644 --- a/kmid/midicfgdlg.cpp +++ b/kmid/midicfgdlg.cpp @@ -105,7 +105,7 @@ void MidiConfigDialog::deviceselected(int idx) void MidiConfigDialog::browseMap() { TQString path = KGlobal::dirs()->findAllResources("appdata", "maps/*.map").last(); - path.truncate(path.tqfindRev('/')); + path.truncate(path.findRev('/')); KURL url = KFileDialog::getOpenURL(path,"*.map",this); diff --git a/kmix/dialogselectmaster.cpp b/kmix/dialogselectmaster.cpp index d206429e..b70c2b6c 100644 --- a/kmix/dialogselectmaster.cpp +++ b/kmix/dialogselectmaster.cpp @@ -153,7 +153,7 @@ void DialogSelectMaster::createPage(Mixer* mixer) if ( ! md->isEnum() && ! md->isSwitch() ) { //kdDebug(67100) << "DialogSelectMaster::createPage() mset append qrb" << endl; TQString mdName = md->name(); - mdName.tqreplace('&', "&&"); // Quoting the '&' needed, to prevent TQRadioButton creating an accelerator + mdName.replace('&', "&&"); // Quoting the '&' needed, to prevent TQRadioButton creating an accelerator TQRadioButton* qrb = new TQRadioButton( mdName, m_vboxForScrollView); m_buttonGroupForScrollView->insert(qrb); //(qrb, md->num()); //_qEnabledCB.append(qrb); diff --git a/kmix/dialogviewconfiguration.cpp b/kmix/dialogviewconfiguration.cpp index 948df8fe..28cf3c3f 100644 --- a/kmix/dialogviewconfiguration.cpp +++ b/kmix/dialogviewconfiguration.cpp @@ -50,7 +50,7 @@ DialogViewConfiguration::DialogViewConfiguration( TQWidget*, ViewBase& view) if ( qw->inherits("MixDeviceWidget") ) { MixDeviceWidget *mdw = static_cast(qw); TQString mdName = mdw->mixDevice()->name(); - mdName.tqreplace('&', "&&"); // Quoting the '&' needed, to prevent TQCheckBox creating an accelerator + mdName.replace('&', "&&"); // Quoting the '&' needed, to prevent TQCheckBox creating an accelerator TQCheckBox* cb = new TQCheckBox( mdName, plainPage() ); _qEnabledCB.append(cb); cb->setChecked( !mdw->isDisabled() ); //mdw->isVisible() ); diff --git a/kmix/kmixapplet.cpp b/kmix/kmixapplet.cpp index 51676a57..5e37841e 100644 --- a/kmix/kmixapplet.cpp +++ b/kmix/kmixapplet.cpp @@ -325,7 +325,7 @@ void KMixApplet::selectMixer() lst, 1, FALSE, &ok, this ); if ( ok ) { - Mixer *mixer = Mixer::mixers().at( lst.tqfindIndex( res ) ); + Mixer *mixer = Mixer::mixers().at( lst.findIndex( res ) ); if (!mixer) KMessageBox::sorry( this, i18n("Invalid mixer entered.") ); else diff --git a/kmix/kmixerwidget.cpp b/kmix/kmixerwidget.cpp index b6491015..b283d830 100644 --- a/kmix/kmixerwidget.cpp +++ b/kmix/kmixerwidget.cpp @@ -49,7 +49,7 @@ /** This widget is embedded in the KMix Main window. Each Hardware Mixer is visualized by one KMixerWidget. - KMixerWidget tqcontains + KMixerWidget contains (a) a headline where you can change Mixer's (if you got more than one Mixer) (b) a Tab with 2-4 Tabs (containing View's with sliders, switches and other GUI elements visualizing the Mixer) (c) A balancing slider diff --git a/kmix/mixdevice.cpp b/kmix/mixdevice.cpp index d647488f..b29c485f 100644 --- a/kmix/mixdevice.cpp +++ b/kmix/mixdevice.cpp @@ -123,7 +123,7 @@ TQString& MixDevice::getPK() { void MixDevice::setPK(TQString &PK) { _pk = PK; // The key is used in the config file. It should not contain spaces - _pk.tqreplace(' ', '_'); + _pk.replace(' ', '_'); } /** diff --git a/kmix/mixer.cpp b/kmix/mixer.cpp index 67960a53..0e7c36fc 100644 --- a/kmix/mixer.cpp +++ b/kmix/mixer.cpp @@ -474,7 +474,7 @@ void Mixer::setRecordSource( int devnum, bool on ) MixDevice* Mixer::masterDevice() { - return tqfind( _masterDevicePK ); + return find( _masterDevicePK ); } void Mixer::setMasterDevice(TQString &devPK) @@ -483,7 +483,7 @@ void Mixer::setMasterDevice(TQString &devPK) } -MixDevice* Mixer::tqfind(TQString& devPK) +MixDevice* Mixer::find(TQString& devPK) { MixDevice* md = 0; for( md = _mixerBackend->m_mixDevices.first(); md != 0; md = _mixerBackend->m_mixDevices.next() ) { diff --git a/kmix/mixer.h b/kmix/mixer.h index 0b6d25c2..15e85e1b 100644 --- a/kmix/mixer.h +++ b/kmix/mixer.h @@ -55,7 +55,7 @@ class Mixer : public TQObject, virtual public MixerIface static int numDrivers(); - MixDevice* tqfind(TQString& devPK); + MixDevice* find(TQString& devPK); void volumeSave( KConfig *config ); void volumeLoad( KConfig *config ); diff --git a/kmix/mixer_alsa9.cpp b/kmix/mixer_alsa9.cpp index 4037f342..dc4935c4 100644 --- a/kmix/mixer_alsa9.cpp +++ b/kmix/mixer_alsa9.cpp @@ -77,7 +77,7 @@ Mixer_ALSA::identify( snd_mixer_selem_id_t *sid ) if ( name == "Master Mono" ) return MixDevice::VOLUME; if ( name == "PC Speaker" ) return MixDevice::VOLUME; if ( name == "Music" || name == "Synth" || name == "FM" ) return MixDevice::MIDI; - if ( name.tqfind( "Headphone", 0, false ) != -1 ) return MixDevice::HEADPHONE; + if ( name.find( "Headphone", 0, false ) != -1 ) return MixDevice::HEADPHONE; if ( name == "Bass" ) return MixDevice::BASS; if ( name == "Treble" ) return MixDevice::TREBLE; if ( name == "CD" ) return MixDevice::CD; @@ -85,14 +85,14 @@ Mixer_ALSA::identify( snd_mixer_selem_id_t *sid ) if ( name == "PCM" || name == "Wave" ) return MixDevice::AUDIO; if ( name == "Surround" ) return MixDevice::SURROUND_BACK; if ( name == "Center" ) return MixDevice::SURROUND_CENTERFRONT; - if ( name.tqfind( "ac97", 0, false ) != -1 ) return MixDevice::AC97; - if ( name.tqfind( "coaxial", 0, false ) != -1 ) return MixDevice::DIGITAL; - if ( name.tqfind( "optical", 0, false ) != -1 ) return MixDevice::DIGITAL; - if ( name.tqfind( "IEC958", 0, false ) != -1 ) return MixDevice::DIGITAL; - if ( name.tqfind( "Mic" ) != -1 ) return MixDevice::MICROPHONE; - if ( name.tqfind( "LFE" ) != -1 ) return MixDevice::SURROUND_LFE; - if ( name.tqfind( "Monitor" ) != -1 ) return MixDevice::RECMONITOR; - if ( name.tqfind( "3D", 0, false ) != -1 ) return MixDevice::SURROUND; // Should be probably some own icon + if ( name.find( "ac97", 0, false ) != -1 ) return MixDevice::AC97; + if ( name.find( "coaxial", 0, false ) != -1 ) return MixDevice::DIGITAL; + if ( name.find( "optical", 0, false ) != -1 ) return MixDevice::DIGITAL; + if ( name.find( "IEC958", 0, false ) != -1 ) return MixDevice::DIGITAL; + if ( name.find( "Mic" ) != -1 ) return MixDevice::MICROPHONE; + if ( name.find( "LFE" ) != -1 ) return MixDevice::SURROUND_LFE; + if ( name.find( "Monitor" ) != -1 ) return MixDevice::RECMONITOR; + if ( name.find( "3D", 0, false ) != -1 ) return MixDevice::SURROUND; // Should be probably some own icon return MixDevice::EXTERNAL; } diff --git a/kmix/mixer_oss4.cpp b/kmix/mixer_oss4.cpp index 8543915b..01b167aa 100644 --- a/kmix/mixer_oss4.cpp +++ b/kmix/mixer_oss4.cpp @@ -120,7 +120,7 @@ MixDevice::ChannelType Mixer_OSS4::classifyAndRename(TQString &name, int flags) } else if ( (*it).startsWith ( "pcm" ) ) { - (*it).tqreplace ( "pcm","PCM" ); + (*it).replace ( "pcm","PCM" ); cType = MixDevice::AUDIO; } else if ( *it == "src" ) @@ -138,7 +138,7 @@ MixDevice::ChannelType Mixer_OSS4::classifyAndRename(TQString &name, int flags) } if ( (*it).startsWith("vmix") ) { - (*it).tqreplace("vmix","Virtual Mixer"); + (*it).replace("vmix","Virtual Mixer"); cType = MixDevice::VOLUME; } else if ( (*it).endsWith("vol") ) @@ -227,8 +227,8 @@ int Mixer_OSS4::open() TQString name = ext.extname; //skip vmix volume controls and mute controls - if ( (name.tqfind("vmix") > -1 && name.tqfind( "pcm") > -1) || - name.tqfind("mute") > -1 + if ( (name.find("vmix") > -1 && name.find( "pcm") > -1) || + name.find("mute") > -1 #ifdef MIXT_MUTE || (ext.type == MIXT_MUTE) #endif @@ -238,12 +238,12 @@ int Mixer_OSS4::open() } //fix for old legacy names, according to Hannu's suggestions - if ( name.tqcontains('_') ) + if ( name.contains('_') ) { name = name.section('_',1,1).lower(); } - if ( ext.flags & MIXF_RECVOL || ext.flags & MIXF_MONVOL || name.tqfind(".in") > -1 ) + if ( ext.flags & MIXF_RECVOL || ext.flags & MIXF_MONVOL || name.find(".in") > -1 ) { isCapture = true; } diff --git a/kmix/mixertoolbox.cpp b/kmix/mixertoolbox.cpp index c4953221..051f0c53 100644 --- a/kmix/mixertoolbox.cpp +++ b/kmix/mixertoolbox.cpp @@ -146,16 +146,16 @@ void MixerToolBox::initMixer(TQPtrList &mixers, bool multiDriverMode, TQS * %3, the mixer number, is a number: it does not contain colons. */ TQString mixerName = mixer->mixerName(); - mixerName.tqreplace(":","_"); + mixerName.replace(":","_"); TQString primaryKeyOfMixer = TQString("%1::%2:%3") .tqarg(driverName) .tqarg(mixerName) .tqarg(mixerNums[mixer->mixerName()]); // The following 3 replaces are for not messing up the config file - primaryKeyOfMixer.tqreplace("]","_"); - primaryKeyOfMixer.tqreplace("[","_"); // not strictly neccesary, but lets play safe - primaryKeyOfMixer.tqreplace(" ","_"); - primaryKeyOfMixer.tqreplace("=","_"); + primaryKeyOfMixer.replace("]","_"); + primaryKeyOfMixer.replace("[","_"); // not strictly neccesary, but lets play safe + primaryKeyOfMixer.replace(" ","_"); + primaryKeyOfMixer.replace("=","_"); mixer->setID(primaryKeyOfMixer); diff --git a/kmix/viewapplet.cpp b/kmix/viewapplet.cpp index b26a7374..6be7860d 100644 --- a/kmix/viewapplet.cpp +++ b/kmix/viewapplet.cpp @@ -230,7 +230,7 @@ void ViewApplet::refreshVolumeLevels() { void ViewApplet::configurationUpdate() { updateGeometry(); //_layoutMDW->activate(); - constructionFinished(); // tqcontains "_layoutMDW->activate();" + constructionFinished(); // contains "_layoutMDW->activate();" emit appletContentChanged(); kdDebug(67100) << "ViewApplet::configurationUpdate()" << endl; // the following "emit" is only here to be picked up by KMixApplet, because it has to diff --git a/krec/krecconfig_fileswidget.cpp b/krec/krecconfig_fileswidget.cpp index 36e4521b..206eda1b 100644 --- a/krec/krecconfig_fileswidget.cpp +++ b/krec/krecconfig_fileswidget.cpp @@ -119,12 +119,12 @@ void KRecConfigFilesWidget::defaults() { } void KRecConfigFilesWidget::ratechanged( int index ) { - if ( _ratebox->tqfind( index ) == _rateother ) _rateotherbox->setEnabled( true ); + if ( _ratebox->find( index ) == _rateother ) _rateotherbox->setEnabled( true ); else _rateotherbox->setEnabled( false ); - if ( _ratebox->tqfind( index ) == _rate48 ) _samplingRate = 48000; - if ( _ratebox->tqfind( index ) == _rate44 ) _samplingRate = 44100; - if ( _ratebox->tqfind( index ) == _rate22 ) _samplingRate = 22050; - if ( _ratebox->tqfind( index ) == _rate11 ) _samplingRate = 11025; + if ( _ratebox->find( index ) == _rate48 ) _samplingRate = 48000; + if ( _ratebox->find( index ) == _rate44 ) _samplingRate = 44100; + if ( _ratebox->find( index ) == _rate22 ) _samplingRate = 22050; + if ( _ratebox->find( index ) == _rate11 ) _samplingRate = 11025; emit sRateChanged( _samplingRate ); } void KRecConfigFilesWidget::rateotherchanged( const TQString& text ) { @@ -132,13 +132,13 @@ void KRecConfigFilesWidget::rateotherchanged( const TQString& text ) { emit sRateChanged( _samplingRate ); } void KRecConfigFilesWidget::channelschanged( int index ) { - if ( _channelsbox->tqfind( index ) == _channels2 ) _channels = 2; - if ( _channelsbox->tqfind( index ) == _channels1 ) _channels = 1; + if ( _channelsbox->find( index ) == _channels2 ) _channels = 2; + if ( _channelsbox->find( index ) == _channels1 ) _channels = 1; emit sChannelsChanged( _channels ); } void KRecConfigFilesWidget::bitschanged( int index ) { - if ( _bitsbox->tqfind( index ) == _bits16 ) _bits = 16; - if ( _bitsbox->tqfind( index ) == _bits8 ) _bits = 8; + if ( _bitsbox->find( index ) == _bits16 ) _bits = 16; + if ( _bitsbox->find( index ) == _bits8 ) _bits = 8; emit sBitsChanged( _bits ); } diff --git a/krec/krecconfigure.cpp b/krec/krecconfigure.cpp index 65cb7497..5201c28d 100644 --- a/krec/krecconfigure.cpp +++ b/krec/krecconfigure.cpp @@ -151,17 +151,17 @@ void KRecConfigGeneral::defaults() { void KRecConfigGeneral::displaychanged( int index ) { int verbose = _displaymode / 100; - if ( _displaybox->tqfind( index ) == _display0 ) _displaymode = 0 + verbose * 100; - if ( _displaybox->tqfind( index ) == _display1 ) _displaymode = 1 + verbose * 100; - if ( _displaybox->tqfind( index ) == _display2 ) _displaymode = 2 + verbose * 100; - if ( _displaybox->tqfind( index ) == _display3 ) _displaymode = 3 + verbose * 100; + if ( _displaybox->find( index ) == _display0 ) _displaymode = 0 + verbose * 100; + if ( _displaybox->find( index ) == _display1 ) _displaymode = 1 + verbose * 100; + if ( _displaybox->find( index ) == _display2 ) _displaymode = 2 + verbose * 100; + if ( _displaybox->find( index ) == _display3 ) _displaymode = 3 + verbose * 100; emit changed( true ); } void KRecConfigGeneral::framebasechanged( int index ) { - if ( _framebasebox->tqfind( index ) == _framebase30 ) _framebase = 30; - if ( _framebasebox->tqfind( index ) == _framebase25 ) _framebase = 25; - if ( _framebasebox->tqfind( index ) == _framebase75 ) _framebase = 75; - if ( _framebasebox->tqfind( index ) == _framebaseother ) { + if ( _framebasebox->find( index ) == _framebase30 ) _framebase = 30; + if ( _framebasebox->find( index ) == _framebase25 ) _framebase = 25; + if ( _framebasebox->find( index ) == _framebase75 ) _framebase = 75; + if ( _framebasebox->find( index ) == _framebaseother ) { _framebaseotherbox->setEnabled( true ); _framebase = _framebaseotherline->text().toInt(); kdDebug(60005) << k_funcinfo << "Framebase=" << _framebase << endl; diff --git a/krec/krecfile.cpp b/krec/krecfile.cpp index 9004b211..29d4640b 100644 --- a/krec/krecfile.cpp +++ b/krec/krecfile.cpp @@ -76,7 +76,7 @@ KRecFile::KRecFile( const TQString &filename, TQObject* p, const char* n ) KTar *tar = new KTar( _filename, "application/x-gzip" ); tar->open( IO_ReadOnly ); - int i=0; while ( _filename.tqfind( '/', i ) != -1 ) i++; // Find last '/' + int i=0; while ( _filename.find( '/', i ) != -1 ) i++; // Find last '/' TQString basename = _filename.right( _filename.length()-i ); basename = basename.left( basename.length()-5 ); @@ -155,7 +155,7 @@ void KRecFile::save( const TQString &fname ) { KTar *tar = new KTar( tmpname, "application/x-gzip" ); tar->open( IO_WriteOnly ); - int i=0; while ( fname.tqfind( '/', i ) != -1 ) i++; // Find last '/' + int i=0; while ( fname.find( '/', i ) != -1 ) i++; // Find last '/' TQString basename = fname.right( fname.length()-i ); if ( basename.endsWith( ".krec" ) ) basename = basename.left( basename.length()-5 ); @@ -263,7 +263,7 @@ void KRecFile::newBuffer( KRecBuffer* buffer ) { connect( buffer, TQT_SIGNAL( deleteSelf( KRecBuffer* ) ), this, TQT_SLOT( deleteBuffer( KRecBuffer* ) ) ); _buffers.append( buffer ); newSize( buffer, buffer->size() ); - _currentBuffer = _buffers.tqfindIndex( buffer ); + _currentBuffer = _buffers.findIndex( buffer ); emit sNewBuffer( buffer ); _saved = false; } @@ -295,7 +295,7 @@ KRecBuffer* KRecFile::getTopBuffer_buffer( int pos ) { return out; } int KRecFile::getTopBuffer_int( int pos ) { - return _buffers.tqfindIndex( getTopBuffer_buffer( pos ) ); + return _buffers.findIndex( getTopBuffer_buffer( pos ) ); } diff --git a/krec/krecfilewidgets.cpp b/krec/krecfilewidgets.cpp index 075a2151..cbcaba81 100644 --- a/krec/krecfilewidgets.cpp +++ b/krec/krecfilewidgets.cpp @@ -232,12 +232,12 @@ void KRecBufferWidget::paintEvent( TQPaintEvent* ) { void KRecBufferWidget::mousePressEvent( TQMouseEvent* qme ) { kdDebug( 60005 ) << k_funcinfo << endl; - if ( _main_region->tqcontains( qme->pos() ) || _title_region->tqcontains( qme->pos() ) ) + if ( _main_region->contains( qme->pos() ) || _title_region->contains( qme->pos() ) ) if ( qme->button() == Qt::RightButton ) emit popupMenu( this, qme->globalPos() ); } void KRecBufferWidget::mouseDoubleClickEvent( TQMouseEvent* qme ) { - if ( _title_region->tqcontains( qme->pos() ) ) + if ( _title_region->contains( qme->pos() ) ) _buffer->setActive( !_buffer->active() ); } diff --git a/krec/krecglobal.cpp b/krec/krecglobal.cpp index e3d8c71b..58822f50 100644 --- a/krec/krecglobal.cpp +++ b/krec/krecglobal.cpp @@ -58,7 +58,7 @@ void KRecGlobal::message( const TQString &text ) { if ( _statusbar ) _statusbar- bool KRecGlobal::registerExport( KRecExportItem* item ) { //kdDebug( 60005 ) << k_funcinfo << "About to register ExportItem for \"" << item->exportFormat() << "\" extensions:\"" << item->extensions() << "\"" << endl; - if ( !the()->_exports->tqfind( item->exportFormat() ) ) { + if ( !the()->_exports->find( item->exportFormat() ) ) { the()->_exports->insert( item->exportFormat(), item ); the()->_exportformats << item->exportFormat(); } @@ -66,7 +66,7 @@ bool KRecGlobal::registerExport( KRecExportItem* item ) { } KRecExportItem* KRecGlobal::getExportItem( const TQString &exportFormat ) { - KRecExportItem *tmp = _exports->tqfind( exportFormat ); + KRecExportItem *tmp = _exports->find( exportFormat ); return tmp->newItem(); } diff --git a/krec/krecord.cpp b/krec/krecord.cpp index 2ff21e34..26f312be 100644 --- a/krec/krecord.cpp +++ b/krec/krecord.cpp @@ -156,7 +156,7 @@ void KRecPrivate::exportFile() { if ( _currentFile ) { TQString filename = KFileDialog::getSaveFileName( "", KRecGlobal::the()->exportFormatEndings(), _impl, "Export File As" ); if ( !filename.isNull() ) { - int lastdot = filename.tqfind( '.', -5 ); + int lastdot = filename.find( '.', -5 ); TQString ending = filename.right( filename.length()-lastdot-1 ); _exportitem = KRecGlobal::the()->getExportItemForEnding( ending ); if ( _exportitem ) { diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp index ef944999..7c8af4b1 100644 --- a/kscd/kscd.cpp +++ b/kscd/kscd.cpp @@ -881,7 +881,7 @@ void KSCD::make_random_list() { do { selected = 1 + (int) randSequence.getLong(m_cd->tracks()); - rejected = (random_list.tqfind(selected) != random_list.end()); + rejected = (random_list.find(selected) != random_list.end()); } while(rejected == true); random_list.append(selected); } @@ -1245,7 +1245,7 @@ void KSCD::lookupCDDBDone(CDDB::Result result) void KSCD::setCDInfo(KCDDB::CDInfo info) { // Some sanity provisions to ensure that the number of records matches what - // the CD actually tqcontains. + // the CD actually contains. while (info.trackInfoList.count() < cddbInfo.trackInfoList.count()) { info.trackInfoList.append(KCDDB::TrackInfo()); diff --git a/kscd/libwm/database.c b/kscd/libwm/database.c index 617905eb..62d66a32 100644 --- a/kscd/libwm/database.c +++ b/kscd/libwm/database.c @@ -192,7 +192,7 @@ nomem: #ifndef NDEBUG fprintf(stderr, "WorkMan was run without a home directory, probably by a system daemon.\n"); - fprintf(stderr, "It doesn't know where to tqfind "); + fprintf(stderr, "It doesn't know where to find "); if (no_rc) { fprintf(stderr, "your personal preferences file "); diff --git a/kscd/libwm/plat_linux.c b/kscd/libwm/plat_linux.c index 1d473ce2..8852ba16 100644 --- a/kscd/libwm/plat_linux.c +++ b/kscd/libwm/plat_linux.c @@ -43,7 +43,7 @@ #if 0 /* this breaks the build on ia64 and s390 for example. sys/types.h is already included and should provide __u64. - please tell where we really need this and let's try to tqfind + please tell where we really need this and let's try to find a working #if case for everyone ... adrian@suse.de */ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,50)) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,21) && LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) #undef __GNUC__ diff --git a/libkcddb/categories.cpp b/libkcddb/categories.cpp index 97ec6acf..5b86a5f5 100644 --- a/libkcddb/categories.cpp +++ b/libkcddb/categories.cpp @@ -25,7 +25,7 @@ KCDDB::Categories::Categories() const TQString KCDDB::Categories::cddb2i18n(const TQString &category) const { - int index = m_cddb.tqfindIndex(category.stripWhiteSpace()); + int index = m_cddb.findIndex(category.stripWhiteSpace()); if (index != -1) { return m_i18n[index]; @@ -38,7 +38,7 @@ const TQString KCDDB::Categories::cddb2i18n(const TQString &category) const const TQString KCDDB::Categories::i18n2cddb(const TQString &category) const { - int index = m_i18n.tqfindIndex(category.stripWhiteSpace()); + int index = m_i18n.findIndex(category.stripWhiteSpace()); if (index != -1) { return m_cddb[index]; diff --git a/libkcddb/cdinfo.cpp b/libkcddb/cdinfo.cpp index eee89d87..b140f103 100644 --- a/libkcddb/cdinfo.cpp +++ b/libkcddb/cdinfo.cpp @@ -177,7 +177,7 @@ namespace KCDDB } } - int slashPos = dtitle.tqfind('/'); + int slashPos = dtitle.find('/'); if (-1 == slashPos) { @@ -274,9 +274,9 @@ namespace KCDDB CDInfo::escape( const TQString& value ) { TQString s = value; - s.tqreplace( "\\", "\\\\" ); - s.tqreplace( "\n", "\\n" ); - s.tqreplace( "\t", "\\t" ); + s.replace( "\\", "\\\\" ); + s.replace( "\n", "\\n" ); + s.replace( "\t", "\\t" ); return s; } @@ -286,9 +286,9 @@ namespace KCDDB { TQString s = value; - s.tqreplace( "\\n", "\n" ); - s.tqreplace( "\\t", "\t" ); - s.tqreplace( "\\\\", "\\" ); + s.replace( "\\n", "\n" ); + s.replace( "\\t", "\t" ); + s.replace( "\\\\", "\\" ); return s; } diff --git a/libkcddb/cdinfodialogbase.ui.h b/libkcddb/cdinfodialogbase.ui.h index 35447aaa..24eaa6df 100644 --- a/libkcddb/cdinfodialogbase.ui.h +++ b/libkcddb/cdinfodialogbase.ui.h @@ -83,7 +83,7 @@ void CDInfoDialogBase::setInfo( const KCDDB::CDInfo &info, KCDDB::TrackOffsetLis item->setText(TRACK_NUMBER, TQString().sprintf("%02d", i + 1)); item->setText(TRACK_TIME, framesTime(trackStartFrames[i + ((i + 1 < tracks) ? 1 : 2)] - trackStartFrames[i])); TQString title = info.trackInfoList[i].title; - int separator = title.tqfind(SEPARATOR); + int separator = title.find(SEPARATOR); if (info.artist != "Various" || separator == -1 || !m_multiple->isChecked() ) { item->setText(TRACK_ARTIST, ""); @@ -179,7 +179,7 @@ void CDInfoDialogBase::slotMultipleArtists( bool hasMultipleArtist) for (TQListViewItem *item = m_trackList->firstChild(); item; item=item->nextSibling()) { TQString title = item->text(TRACK_TITLE); - int separator = title.tqfind(SEPARATOR); + int separator = title.find(SEPARATOR); if (separator != -1) { // Artists probably entered already diff --git a/libkcddb/genres.cpp b/libkcddb/genres.cpp index ac1b86ad..423e80fc 100644 --- a/libkcddb/genres.cpp +++ b/libkcddb/genres.cpp @@ -97,7 +97,7 @@ KCDDB::Genres::Genres() const TQString KCDDB::Genres::cddb2i18n(const TQString &genre) const { TQString userDefinedGenre = genre.stripWhiteSpace(); - int index = m_cddb.tqfindIndex(userDefinedGenre); + int index = m_cddb.findIndex(userDefinedGenre); if (index != -1) { return m_i18n[index]; @@ -111,7 +111,7 @@ const TQString KCDDB::Genres::cddb2i18n(const TQString &genre) const const TQString KCDDB::Genres::i18n2cddb(const TQString &genre) const { TQString userDefinedGenre = genre.stripWhiteSpace(); - int index = m_i18n.tqfindIndex(userDefinedGenre); + int index = m_i18n.findIndex(userDefinedGenre); if (index != -1) { return m_cddb[index]; diff --git a/libkcddb/kcmcddb/kcmcddb.cpp b/libkcddb/kcmcddb/kcmcddb.cpp index fa10bc4a..5694749a 100644 --- a/libkcddb/kcmcddb/kcmcddb.cpp +++ b/libkcddb/kcmcddb/kcmcddb.cpp @@ -84,8 +84,8 @@ CDDBModule::checkSettings() const config.readConfig(); if (config.smtpHostname().isEmpty() || config.emailAddress().isEmpty() - || !config.emailAddress().tqcontains("@") || - (!config.replyTo().isEmpty() && !config.replyTo().tqcontains("@"))) + || !config.emailAddress().contains("@") || + (!config.replyTo().isEmpty() && !config.replyTo().contains("@"))) { if (config.submitTransport() == KCDDB::Submit::SMTP) diff --git a/libkcddb/submit.cpp b/libkcddb/submit.cpp index 8742469d..3f099c23 100644 --- a/libkcddb/submit.cpp +++ b/libkcddb/submit.cpp @@ -91,7 +91,7 @@ namespace KCDDB << "data" << "folk" << "jazz" << "misc" << "newage" << "reggae" << "rock" << "soundtrack"; - if (validCategories.tqcontains(c)) + if (validCategories.contains(c)) return true; else return false; diff --git a/mpeglib/COPYING b/mpeglib/COPYING index 982eea7f..b7047e29 100644 --- a/mpeglib/COPYING +++ b/mpeglib/COPYING @@ -122,7 +122,7 @@ included without limitation in the term "modification".) "Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means -all the source code for all modules it tqcontains, plus any associated +all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. diff --git a/mpeglib/README b/mpeglib/README index a2e7893a..6e72c9b8 100644 --- a/mpeglib/README +++ b/mpeglib/README @@ -8,7 +8,7 @@ PORTS MPEG I library. =============== -This library tqcontains: +This library contains: * mpeg I audio player (layer I,II,III (mp3)) * mpeg I video player diff --git a/mpeglib/example/yaf/yafcore/buffer.cpp b/mpeglib/example/yaf/yafcore/buffer.cpp index 3f3d6158..3c58f0ee 100644 --- a/mpeglib/example/yaf/yafcore/buffer.cpp +++ b/mpeglib/example/yaf/yafcore/buffer.cpp @@ -122,7 +122,7 @@ void Buffer::grow(int size) { } -int Buffer::tqfind(char zeichen) { +int Buffer::find(char zeichen) { int i; int nlen=len(); for(i=0;itqfind('\n'); + nPos=stack->find('\n'); if (nPos == -1) return false; return true; @@ -45,7 +45,7 @@ void LineStack::nextLine(Buffer* nextLine) { char* data=stack->getData(); int nSize=stack->getSize(); - nPos=stack->tqfind('\n'); + nPos=stack->find('\n'); if (nPos == -1) { nextLine->clear(); return; diff --git a/mpeglib/example/yaf/yafcore/parser.cpp b/mpeglib/example/yaf/yafcore/parser.cpp index f9e8fdaa..21b27c6b 100644 --- a/mpeglib/example/yaf/yafcore/parser.cpp +++ b/mpeglib/example/yaf/yafcore/parser.cpp @@ -101,7 +101,7 @@ void Parser::parse(char* strStart,int* nCommand){ int Parser::isOK(){ - // a Commandline ist valid when it tqcontains : + // a Commandline ist valid when it contains : // * 2 * (identifer/value) // * first identifier ist "Command" diff --git a/mpeglib/lib/frame/README b/mpeglib/lib/frame/README index e54bd918..9e21059f 100644 --- a/mpeglib/lib/frame/README +++ b/mpeglib/lib/frame/README @@ -27,7 +27,7 @@ IOFrameQueues ============= IOFrameQueues deal with the problem, that you first start -with an empty FrameQueue (this is a FrameQueue which tqcontains +with an empty FrameQueue (this is a FrameQueue which contains prealloceated data, but the data is empty (eg:all pcm samples zero) Only after converting an "empty" Frame by a decoder (mp3decoder) the frame if "full" (== Frame with data) @@ -58,7 +58,7 @@ A IOFrameQueue, which allows converting "dataFrames back to continous stream". What is this? Lets say an application wants only 20 byte from a dataFrame which -tqcontains 3KB of data? +contains 3KB of data? There must be some mechanism to read less or more data from the queue. And the data should be written to a continus memory segment. diff --git a/mpeglib/lib/splay/dxHead.h b/mpeglib/lib/splay/dxHead.h index 0bfc0bac..da0f2eff 100644 --- a/mpeglib/lib/splay/dxHead.h +++ b/mpeglib/lib/splay/dxHead.h @@ -10,7 +10,7 @@ Copyright 1998 Xing Technology Corp. -----------------------------------------------------------*/ // A Xing header may be present in the ancillary // data field of the first frame of an mp3 bitstream -// The Xing header (optionally) tqcontains +// The Xing header (optionally) contains // frames total number of audio frames in the bitstream // bytes total number of bytes in the bitstream // toc table of contents diff --git a/mpeglib/lib/util/dynBuffer.cpp b/mpeglib/lib/util/dynBuffer.cpp index c1eb2a9d..c93d5381 100644 --- a/mpeglib/lib/util/dynBuffer.cpp +++ b/mpeglib/lib/util/dynBuffer.cpp @@ -132,7 +132,7 @@ void DynBuffer::grow(int size) { } -int DynBuffer::tqfind(char zeichen) { +int DynBuffer::find(char zeichen) { int i; int nlen=len(); for(i=0;i flist.txt` +A=`find . | grep -v tqmoc > flist.txt` A=`grep "\.cpp$" flist.txt >cpp.txt` A=`grep "\.h$" flist.txt >h.txt` A=`grep "\.c$" flist.txt >c.txt` diff --git a/mpg123_artsplugin/dxhead.h b/mpg123_artsplugin/dxhead.h index c84b15c9..16a6a0fc 100644 --- a/mpg123_artsplugin/dxhead.h +++ b/mpg123_artsplugin/dxhead.h @@ -10,7 +10,7 @@ Copyright 1998 Xing Technology Corp. -----------------------------------------------------------*/ /* A Xing header may be present in the ancillary * data field of the first frame of an mp3 bitstream - * The Xing header (optionally) tqcontains + * The Xing header (optionally) contains * frames total number of audio frames in the bitstream * bytes total number of bytes in the bitstream * toc table of contents diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp index aaa4b9e6..9f28ec0f 100644 --- a/noatun/library/app.cpp +++ b/noatun/library/app.cpp @@ -450,7 +450,7 @@ TQString NoatunApp::mimeTypes() continue; const char *m = (*istr).c_str(); - if ((KServiceType::serviceType(m)) && !mimeTypes.tqcontains(m)) + if ((KServiceType::serviceType(m)) && !mimeTypes.contains(m)) { mimeTypes += m; mimeTypes += ' '; diff --git a/noatun/library/cmodule.cpp b/noatun/library/cmodule.cpp index 5163ef8b..185c98bc 100644 --- a/noatun/library/cmodule.cpp +++ b/noatun/library/cmodule.cpp @@ -83,7 +83,7 @@ General::General(TQObject *tqparent) NoatunApp::DontPlay ); - if (TQButton* b = mPlayOnStartup->tqfind(napp->startupPlayMode())) + if (TQButton* b = mPlayOnStartup->find(napp->startupPlayMode())) { b->toggle(); } diff --git a/noatun/library/downloader.cpp b/noatun/library/downloader.cpp index d607ca6d..efb456ac 100644 --- a/noatun/library/downloader.cpp +++ b/noatun/library/downloader.cpp @@ -105,7 +105,7 @@ static TQString nonExistantFile(const TQString &file) { i++; f=file; - f.insert(f.tqfindRev('.'), '_'+TQString::number(i)); + f.insert(f.findRev('.'), '_'+TQString::number(i)); } return f; } diff --git a/noatun/library/effects.cpp b/noatun/library/effects.cpp index 33a3b8ad..cc64331d 100644 --- a/noatun/library/effects.cpp +++ b/noatun/library/effects.cpp @@ -102,7 +102,7 @@ TQString Effect::title() const TQString Effect::clean(const TQCString &name) { - int pos=name.tqfindRev("::"); + int pos=name.findRev("::"); if (pos>0) return name.right(name.length()-pos-2); return name; diff --git a/noatun/library/mimetypetree.cpp b/noatun/library/mimetypetree.cpp index a63b49f6..8dba7fc6 100644 --- a/noatun/library/mimetypetree.cpp +++ b/noatun/library/mimetypetree.cpp @@ -17,7 +17,7 @@ MimeTypeTree::MimeTypeTree(TQWidget *tqparent) for (; i != list.end(); ++i) { TQString mimetype = (*i)->name(); - int slash = mimetype.tqfind("/"); + int slash = mimetype.find("/"); TQString major = mimetype.left(slash); // hide all and inode majors diff --git a/noatun/library/noatunarts/Session_impl.cpp b/noatun/library/noatunarts/Session_impl.cpp index edec216a..63912801 100644 --- a/noatun/library/noatunarts/Session_impl.cpp +++ b/noatun/library/noatunarts/Session_impl.cpp @@ -10,7 +10,7 @@ static bool compareArtsObjects(const Noatun::Listener &left, const Noatun::Liste return left._isEqual(right); } -list::iterator tqfind(list &v, const Noatun::Listener &is, +list::iterator find(list &v, const Noatun::Listener &is, bool (*compare)(const Noatun::Listener& left, const Noatun::Listener& right)) { for (list::iterator i=v.begin(); i!=v.end(); ++i) @@ -55,7 +55,7 @@ public: void removeListener(Noatun::Listener listener) { list::iterator i= - tqfind(listeners, listener, &compareArtsObjects); + find(listeners, listener, &compareArtsObjects); if (i!=listeners.end()) listeners.erase(i); } diff --git a/noatun/library/noatunarts/StereoEffectStack_impl.cpp b/noatun/library/noatunarts/StereoEffectStack_impl.cpp index 107f06e9..684d9694 100644 --- a/noatun/library/noatunarts/StereoEffectStack_impl.cpp +++ b/noatun/library/noatunarts/StereoEffectStack_impl.cpp @@ -85,7 +85,7 @@ class StereoEffectStack_impl : public StereoEffectStack_skel, public StdSynthMod list::iterator i = fx.begin(); bool found=false; - // seek through until we tqfind 'after' + // seek through until we find 'after' while(i != fx.end()) if((*i)->id == after) { diff --git a/noatun/library/noatunstdaction.cpp b/noatun/library/noatunstdaction.cpp index 72c67d1c..851b846b 100644 --- a/noatun/library/noatunstdaction.cpp +++ b/noatun/library/noatunstdaction.cpp @@ -133,14 +133,14 @@ void VisActionMenu::fillPopup() { id = popupMenu()->insertItem((*i).name); mSpecMap[id] = (*i).specfile; - popupMenu()->setItemChecked(id, loaded.tqcontains(*i)); + popupMenu()->setItemChecked(id, loaded.contains(*i)); } } } void VisActionMenu::toggleVisPlugin(int id) { - if(!mSpecMap.tqcontains(id)) + if(!mSpecMap.contains(id)) return; TQString specfile = mSpecMap[id]; diff --git a/noatun/library/playlist.cpp b/noatun/library/playlist.cpp index a86be118..33e5c1f0 100644 --- a/noatun/library/playlist.cpp +++ b/noatun/library/playlist.cpp @@ -62,12 +62,12 @@ TQString PlaylistItemData::title() const // "$(property)" TQString format=napp->titleFormat(); - TQRegExp tqfind("(?:(?:\\\\\\\\))*\\$\\((.*)"); + TQRegExp find("(?:(?:\\\\\\\\))*\\$\\((.*)"); int start=0; while (start != -1) { - start = tqfind.search(format, start); + start = find.search(format, start); if (start == -1) break; // test if there's an odd amount of backslashes @@ -81,8 +81,8 @@ TQString PlaylistItemData::title() const uint len=counter.cap(1).length()-1; // and half them, and remove one more - format.tqreplace(start-1, len/2+1, ""); - start=start-1+len/2+tqfind.cap(1).length()+3; + format.replace(start-1, len/2+1, ""); + start=start-1+len/2+find.cap(1).length()+3; continue; } @@ -96,12 +96,12 @@ TQString PlaylistItemData::title() const uint len=counter.cap(1).length(); // and half them - format.tqreplace(start, len/2, ""); + format.replace(start, len/2, ""); start=start+len/2; } // "sth"foo"sth" - TQString cont(tqfind.cap(1)); + TQString cont(find.cap(1)); TQString prefix,suffix,propname; unsigned int i=0; if (cont[i] == '"') @@ -150,18 +150,18 @@ TQString PlaylistItemData::title() const { // comments can contain newlines // these are not wanted in a formatted title - propval.tqreplace('\n', ' '); + propval.replace('\n', ' '); } if (propval.length()) { propval = prefix+propval+suffix; - format.tqreplace(start, i+2, propval); + format.replace(start, i+2, propval); start += propval.length(); } else { - format.tqreplace(start, i+2, ""); + format.replace(start, i+2, ""); } } return format; @@ -356,7 +356,7 @@ TQValueList Playlist::select( } else { - if ((*val).tqfind(v, 0, caseSensitive)!=-1) + if ((*val).find(v, 0, caseSensitive)!=-1) { list.append(i); limit--; diff --git a/noatun/library/playlistsaver.cpp b/noatun/library/playlistsaver.cpp index 15fcad58..f5bd09bd 100644 --- a/noatun/library/playlistsaver.cpp +++ b/noatun/library/playlistsaver.cpp @@ -291,7 +291,7 @@ public: if(a.qName(i).lower()=="href") { TQString filename=a.value(i); - if (filename.tqfind(TQRegExp("^[a-zA-Z0-9]+:/"))==0) + if (filename.find(TQRegExp("^[a-zA-Z0-9]+:/"))==0) { KURL url(filename); KMimeType::Ptr mimetype = KMimeType::findByURL(url); @@ -316,7 +316,7 @@ public: { KURL u1; // we have to deal with a relative path - if (filename.tqfind('/')) + if (filename.find('/')) { u1.setPath(mAbsPath); //FIXME: how to get the path in this place? u1.setFileName(filename); @@ -541,7 +541,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/) if (filename.isEmpty()) continue; - if (filename.tqfind(TQRegExp("^[a-zA-Z0-9]+:/"))==0) + if (filename.find(TQRegExp("^[a-zA-Z0-9]+:/"))==0) { //kdDebug(66666) << k_funcinfo << "url filename = " << filename << endl; @@ -569,7 +569,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/) { KURL u1; // we have to deal with a relative path - if (filename.tqfind('/')) + if (filename.find('/')) { u1.setPath(file.path(0)); u1.setFileName(filename); @@ -587,7 +587,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/) { extinf.remove(0,8); // remove "#EXTINF:" //kdDebug(66666) << "EXTM3U extinf = '" << extinf << "'" << endl; - int timeTitleSep = extinf.tqfind(',', 0); + int timeTitleSep = extinf.find(',', 0); int length = (extinf.left(timeTitleSep)).toInt(); if (length>0) @@ -596,7 +596,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/) TQString displayTitle=extinf.mid(timeTitleSep+1); if (!displayTitle.isEmpty()) { - int artistTitleSep = displayTitle.tqfind(" - ",0); + int artistTitleSep = displayTitle.find(" - ",0); if (artistTitleSep == -1) // no "artist - title" like format, just set it as title { prop["title"] = displayTitle; @@ -718,7 +718,7 @@ bool PlaylistSaver::loadPLS(const KURL &file, int /*opt*/) // some stupid Windows lusers like to be case insensitive TQStringList groups = list.groupList().grep(TQRegExp("^playlist$", false)); /* - if (!groups.count()) // didn't tqfind "[playlist]", it's not a .pls file + if (!groups.count()) // didn't find "[playlist]", it's not a .pls file return false; */ diff --git a/noatun/library/plugin.cpp b/noatun/library/plugin.cpp index 36c1a2cf..033ccace 100644 --- a/noatun/library/plugin.cpp +++ b/noatun/library/plugin.cpp @@ -187,7 +187,7 @@ int Visualization::noatunPid() { if ((*i).left(6) != "noatun") continue; - int pid=(*i).mid((*i).tqfind('-')+1).toInt(); + int pid=(*i).mid((*i).find('-')+1).toInt(); return pid; } return -1; diff --git a/noatun/library/pluginloader.cpp b/noatun/library/pluginloader.cpp index 032761a0..0897e76d 100644 --- a/noatun/library/pluginloader.cpp +++ b/noatun/library/pluginloader.cpp @@ -81,7 +81,7 @@ bool LibraryLoader::loadAll(const TQStringList &modules) for(TQStringList::ConstIterator i=modules.begin(); i!=modules.end(); ++i) { NoatunLibraryInfo info=getInfo(*i); - if (!info.type.tqcontains("sm")) + if (!info.type.contains("sm")) continue; loadSO(*i); } @@ -90,7 +90,7 @@ bool LibraryLoader::loadAll(const TQStringList &modules) for(TQStringList::ConstIterator i=modules.begin(); i!=modules.end(); ++i) { NoatunLibraryInfo info=getInfo(*i); - if (!info.type.tqcontains("playlist")) + if (!info.type.contains("playlist")) continue; loadSO(*i); } @@ -106,7 +106,7 @@ bool LibraryLoader::loadAll(const TQStringList &modules) for(TQStringList::ConstIterator i=modules.begin(); i!=modules.end(); ++i) { NoatunLibraryInfo info=getInfo(*i); - if (!info.type.tqcontains("userinterface")) + if (!info.type.contains("userinterface")) continue; loadSO(*i); } @@ -121,9 +121,9 @@ bool LibraryLoader::loadAll(const TQStringList &modules) for(TQStringList::ConstIterator i=modules.begin(); i!=modules.end(); ++i) { NoatunLibraryInfo info=getInfo(*i); - if((!info.type.tqcontains("playlist")) - && (!info.type.tqcontains("userinterface")) - && (!info.type.tqcontains("sm"))) + if((!info.type.contains("playlist")) + && (!info.type.contains("userinterface")) + && (!info.type.contains("sm"))) { loadSO(*i); } @@ -139,7 +139,7 @@ NoatunLibraryInfo LibraryLoader::getInfo(const TQString &spec) const if (!TQFile::exists(specPath)) return info; KSimpleConfig file(specPath); - if (spec.tqfind('/')>=0) + if (spec.find('/')>=0) info.specfile=KURL(spec).fileName(); else info.specfile=spec; @@ -197,7 +197,7 @@ bool LibraryLoader::loadSO(const TQString &spec) plugInStart=(Plugin* (*)()) create; listitem->plugin=plugInStart(); - if (info.type.tqcontains("playlist")) + if (info.type.contains("playlist")) { //kdDebug(66666) << k_funcinfo << "Assigning mPlaylist to " << info.name << endl; mPlaylist=listitem->plugin->playlist(); @@ -329,7 +329,7 @@ TQValueList LibraryLoader::loadedByType(const TQString &type) if (isLoaded(i.currentKey())) { NoatunLibraryInfo info = getInfo(i.currentKey()); - if (info.type.tqcontains(type)) + if (info.type.contains(type)) items.append(info); } } diff --git a/noatun/library/pluginmodule.cpp b/noatun/library/pluginmodule.cpp index 0cd47d6d..fb57f39b 100644 --- a/noatun/library/pluginmodule.cpp +++ b/noatun/library/pluginmodule.cpp @@ -230,7 +230,7 @@ void Plugins::reopen() if(tqparent) { - PluginListItem *item = new PluginListItem(exclusive, loaded.tqcontains(*i), *i, tqparent); + PluginListItem *item = new PluginListItem(exclusive, loaded.contains(*i), *i, tqparent); item->setText(0, (*i).name); item->setText(1, (*i).comment); item->setText(2, (*i).author); @@ -257,9 +257,9 @@ void Plugins::addPlugin(const NoatunLibraryInfo &info) if(item) item->setOn(true); } - if(mDeleted.tqcontains(info.specfile)) + if(mDeleted.contains(info.specfile)) mDeleted.remove(info.specfile); - else if(!mAdded.tqcontains(info.specfile)) + else if(!mAdded.contains(info.specfile)) mAdded.append(info.specfile); } @@ -291,9 +291,9 @@ void Plugins::removePlugin(const NoatunLibraryInfo &info) } } - if (mAdded.tqcontains(info.specfile)) + if (mAdded.contains(info.specfile)) mAdded.remove(info.specfile); - else if(!mDeleted.tqcontains(info.specfile)) + else if(!mDeleted.contains(info.specfile)) mDeleted.append(info.specfile); } @@ -382,7 +382,7 @@ void Plugins::save() TQValueList loaded = loader.loaded(); for(TQValueList::Iterator i = loaded.begin(); i != loaded.end(); ++i) { - if(!specList.tqcontains((*i).specfile) && loader.isLoaded((*i).specfile)) + if(!specList.contains((*i).specfile) && loader.isLoaded((*i).specfile)) specList += (*i).specfile; } diff --git a/noatun/library/titleproxy.cpp b/noatun/library/titleproxy.cpp index bda84b18..c04fcbd4 100644 --- a/noatun/library/titleproxy.cpp +++ b/noatun/library/titleproxy.cpp @@ -258,11 +258,11 @@ bool Proxy::processHeader( TQ_LONG &index, TQ_LONG bytesRead ) // Handle redirection TQString loc( "Location: " ); - int index = m_headerStr.tqfind( loc ); + int index = m_headerStr.find( loc ); if ( index >= 0 ) { int start = index + loc.length(); - int end = m_headerStr.tqfind( "\n", index ); + int end = m_headerStr.find( "\n", index ); m_url = m_headerStr.mid( start, end - start - 1 ); kdDebug(66666) << k_funcinfo << @@ -360,15 +360,15 @@ void Proxy::error() TQString Proxy::extractStr( const TQString &str, const TQString &key ) { - int index = str.tqfind( key, 0, true ); + int index = str.find( key, 0, true ); if ( index == -1 ) { return TQString(); } else { - index = str.tqfind( "'", index ) + 1; - int indexEnd = str.tqfind( "'", index ); + index = str.find( "'", index ) + 1; + int indexEnd = str.find( "'", index ); return str.mid( index, indexEnd - index ); } } diff --git a/noatun/library/vequalizer.cpp b/noatun/library/vequalizer.cpp index a61e3eec..b8506e6f 100644 --- a/noatun/library/vequalizer.cpp +++ b/noatun/library/vequalizer.cpp @@ -764,7 +764,7 @@ VPreset VEqualizer::presetByFile(const TQString &file) KConfig *conf=KGlobal::config(); conf->setGroup("Equalizer"); TQStringList list=kapp->config()->readListEntry("presets"); - if (list.tqcontains(file)) + if (list.contains(file)) return VPreset(file); return VPreset(); } @@ -920,7 +920,7 @@ void VPreset::remove() emit EQ->removed(*this); - if (file().tqfind(kapp->dirs()->localkdedir())==0) + if (file().find(kapp->dirs()->localkdedir())==0) { TQFile f(file()); f.remove(); 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() { //