summaryrefslogtreecommitdiffstats
path: root/juk
diff options
context:
space:
mode:
Diffstat (limited to 'juk')
-rw-r--r--juk/collectionlist.cpp6
-rw-r--r--juk/collectionlist.h6
-rw-r--r--juk/coverinfo.cpp4
-rw-r--r--juk/covermanager.cpp12
-rw-r--r--juk/covermanager.h2
-rw-r--r--juk/directorylist.cpp2
-rw-r--r--juk/filehandleproperties.h2
-rw-r--r--juk/filerenamer.cpp4
-rw-r--r--juk/filerenamer.h2
-rw-r--r--juk/ktrm.cpp6
-rw-r--r--juk/playlist.cpp6
-rw-r--r--juk/playlist.h2
-rw-r--r--juk/playlistbox.cpp2
-rw-r--r--juk/playlistcollection.cpp10
-rw-r--r--juk/playlistitem.cpp6
-rw-r--r--juk/playlistsearch.cpp6
-rw-r--r--juk/playlistsplitter.cpp2
-rw-r--r--juk/searchplaylist.cpp2
-rw-r--r--juk/sortedstringlist.cpp8
-rw-r--r--juk/sortedstringlist.h4
-rw-r--r--juk/stringhash.h4
-rw-r--r--juk/stringshare.cpp2
-rw-r--r--juk/systemtray.cpp4
-rw-r--r--juk/tag.cpp4
-rw-r--r--juk/tageditor.cpp20
-rw-r--r--juk/tagguesser.cpp20
-rw-r--r--juk/viewmode.cpp6
27 files changed, 77 insertions, 77 deletions
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<coverKey> 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 &image;
if(column == playlist()->leftColumn() &&
- m_playingItems.tqcontains(const_cast<PlaylistItem *>(this)))
+ m_playingItems.contains(const_cast<PlaylistItem *>(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<T>::insert(T value)
}
template <class T>
-bool Hash<T>::tqcontains(T value) const
+bool Hash<T>::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();
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-02 22:26:38 +0000