diff options
Diffstat (limited to 'noatun/library/playlist.cpp')
| -rw-r--r-- | noatun/library/playlist.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/noatun/library/playlist.cpp b/noatun/library/playlist.cpp index 7cc28337..a86be118 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 find("(?:(?:\\\\\\\\))*\\$\\((.*)"); + TQRegExp tqfind("(?:(?:\\\\\\\\))*\\$\\((.*)"); int start=0; while (start != -1) { - start = find.search(format, start); + start = tqfind.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.replace(start-1, len/2+1, ""); - start=start-1+len/2+find.cap(1).length()+3; + format.tqreplace(start-1, len/2+1, ""); + start=start-1+len/2+tqfind.cap(1).length()+3; continue; } @@ -96,12 +96,12 @@ TQString PlaylistItemData::title() const uint len=counter.cap(1).length(); // and half them - format.replace(start, len/2, ""); + format.tqreplace(start, len/2, ""); start=start+len/2; } // "sth"foo"sth" - TQString cont(find.cap(1)); + TQString cont(tqfind.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.replace('\n', ' '); + propval.tqreplace('\n', ' '); } if (propval.length()) { propval = prefix+propval+suffix; - format.replace(start, i+2, propval); + format.tqreplace(start, i+2, propval); start += propval.length(); } else { - format.replace(start, i+2, ""); + format.tqreplace(start, i+2, ""); } } return format; @@ -278,7 +278,7 @@ bool PlaylistItemData::operator != (const PlaylistItemData &d) const -Playlist::Playlist(TQObject *parent, const char *name) : TQObject(parent, name) +Playlist::Playlist(TQObject *tqparent, const char *name) : TQObject(tqparent, name) { napp->player()->connect(this, TQT_SIGNAL(playCurrent()), TQT_SLOT(playCurrent())); napp->player()->connect(this, TQT_SIGNAL(listHidden()), TQT_SIGNAL(playlistHidden())); @@ -356,7 +356,7 @@ TQValueList<PlaylistItem> Playlist::select( } else { - if ((*val).find(v, 0, caseSensitive)!=-1) + if ((*val).tqfind(v, 0, caseSensitive)!=-1) { list.append(i); limit--; |