summaryrefslogtreecommitdiffstats
path: root/noatun-plugins
diff options
context:
space:
mode:
Diffstat (limited to 'noatun-plugins')
-rw-r--r--noatun-plugins/dub/dub/dub.cpp6
-rw-r--r--noatun-plugins/dub/dub/dub.h2
-rw-r--r--noatun-plugins/dub/dub/dubplaylistitem.cpp6
-rw-r--r--noatun-plugins/ffrs/ffrs.cpp4
-rw-r--r--noatun-plugins/luckytag/parsedmp3filename.cpp28
-rw-r--r--noatun-plugins/lyrics/lyrics.cpp8
-rw-r--r--noatun-plugins/nexscope/gui.cpp2
-rw-r--r--noatun-plugins/noatunmadness/madness.cpp2
-rw-r--r--noatun-plugins/oblique/base.cpp10
-rw-r--r--noatun-plugins/oblique/base.h4
-rw-r--r--noatun-plugins/oblique/cmodule.cpp8
-rw-r--r--noatun-plugins/oblique/kdatacollection.cpp4
-rw-r--r--noatun-plugins/oblique/oblique.cpp2
-rw-r--r--noatun-plugins/oblique/query.cpp10
-rw-r--r--noatun-plugins/oblique/selector.cpp4
-rw-r--r--noatun-plugins/oblique/tree.cpp26
-rw-r--r--noatun-plugins/oblique/tree.h6
-rw-r--r--noatun-plugins/tippercanoe/synaescope.cpp2
18 files changed, 67 insertions, 67 deletions
diff --git a/noatun-plugins/dub/dub/dub.cpp b/noatun-plugins/dub/dub/dub.cpp
index e6b6c81..046ba17 100644
--- a/noatun-plugins/dub/dub/dub.cpp
+++ b/noatun-plugins/dub/dub/dub.cpp
@@ -174,7 +174,7 @@ KFileItem* Dub::Linear_Seq::last(TQPtrList<KFileItem> & items)
return lastFile;
}
-bool Dub::Linear_Seq::tqfind(TQPtrList<KFileItem> & items, KFileItem* a_file)
+bool Dub::Linear_Seq::find(TQPtrList<KFileItem> & items, KFileItem* a_file)
{
// find file
for (KFileItem *file=items.first(); file; file=items.next() )
@@ -192,7 +192,7 @@ KFileItem* Dub::Linear_Seq::next(TQPtrList<KFileItem> & items,
assert(active_file);
bool found = false;
if (*active_file) {
- if (tqfind(items, *active_file)) {
+ if (find(items, *active_file)) {
KFileItem* next = items.next();
for (; next && !next->isFile(); next = items.next()) ; // find next file
if (next && next->isFile())
@@ -219,7 +219,7 @@ KFileItem* Dub::Linear_Seq::prev(TQPtrList<KFileItem> & items,
bool found = false;
if (*active_file) {
// locate current item
- if (tqfind(items, *active_file)) {
+ if (find(items, *active_file)) {
KFileItem* prev = items.prev();
for (; prev && !prev->isFile(); prev = items.prev()) ; // find prev file
if (prev && prev->isFile()) {
diff --git a/noatun-plugins/dub/dub/dub.h b/noatun-plugins/dub/dub/dub.h
index a114248..40c8fdc 100644
--- a/noatun-plugins/dub/dub/dub.h
+++ b/noatun-plugins/dub/dub/dub.h
@@ -111,7 +111,7 @@ private:
KFileItem* last(TQPtrList<KFileItem> & items);
KFileItem* next(TQPtrList<KFileItem> & items, KFileItem** active_file);
KFileItem* prev(TQPtrList<KFileItem> & items, KFileItem** active_file);
- bool tqfind(TQPtrList<KFileItem> & items, KFileItem* a_file);
+ bool find(TQPtrList<KFileItem> & items, KFileItem* a_file);
};
// sequencer that traverses current directory in view order
diff --git a/noatun-plugins/dub/dub/dubplaylistitem.cpp b/noatun-plugins/dub/dub/dubplaylistitem.cpp
index db7a2f2..62d2e5c 100644
--- a/noatun-plugins/dub/dub/dubplaylistitem.cpp
+++ b/noatun-plugins/dub/dub/dubplaylistitem.cpp
@@ -40,8 +40,8 @@ DubPlaylistItem::~DubPlaylistItem(){
TQString DubPlaylistItem::property(const TQString &key, const TQString &def) const {
// kdDebug(90010) << "property " << key << endl;
if (isProperty(key)) {
- kdDebug(90010) << key << " -> " << property_map.tqfind(key).data() << endl;
- return property_map.tqfind(key).data();
+ kdDebug(90010) << key << " -> " << property_map.find(key).data() << endl;
+ return property_map.find(key).data();
}
else
return def;
@@ -69,7 +69,7 @@ TQStringList DubPlaylistItem::properties() const {
bool DubPlaylistItem::isProperty(const TQString &key) const {
// kdDebug(90010) << "is property? " << key << endl;
- return (property_map.tqfind(key) != property_map.end());
+ return (property_map.find(key) != property_map.end());
}
KURL DubPlaylistItem::url() const {
diff --git a/noatun-plugins/ffrs/ffrs.cpp b/noatun-plugins/ffrs/ffrs.cpp
index 73f2685..7e92f48 100644
--- a/noatun-plugins/ffrs/ffrs.cpp
+++ b/noatun-plugins/ffrs/ffrs.cpp
@@ -52,8 +52,8 @@ View::View(int width, int height, int block, int unblock, TQColor front, TQColor
// make sure we're on the desktop
if (
- !desktop.tqcontains(rect().topLeft())
- || !desktop.tqcontains(rect().bottomRight())
+ !desktop.contains(rect().topLeft())
+ || !desktop.contains(rect().bottomRight())
)
{
move(at);
diff --git a/noatun-plugins/luckytag/parsedmp3filename.cpp b/noatun-plugins/luckytag/parsedmp3filename.cpp
index 11694bc..1c75958 100644
--- a/noatun-plugins/luckytag/parsedmp3filename.cpp
+++ b/noatun-plugins/luckytag/parsedmp3filename.cpp
@@ -31,22 +31,22 @@ ParsedMP3FileName::ParsedMP3FileName(const TQString &path)
TQString fileName = url.fileName(false);
m_directories = TQStringList::split("/", url.directory());
- if (fileName.startsWith("(") && fileName.tqcontains(")"))
+ if (fileName.startsWith("(") && fileName.contains(")"))
{
- m_artist = fileName.mid(1, fileName.tqfind(")") - 1);
- m_title = fileName.right(fileName.length() - fileName.tqfind(")") - 1);
+ m_artist = fileName.mid(1, fileName.find(")") - 1);
+ m_title = fileName.right(fileName.length() - fileName.find(")") - 1);
validateArtist();
}
- else if (fileName.startsWith("[") && fileName.tqcontains("]"))
+ else if (fileName.startsWith("[") && fileName.contains("]"))
{
- m_artist = fileName.mid(1, fileName.tqfind("]") - 1);
- m_title = fileName.right(fileName.length() - fileName.tqfind("]") - 1);
+ m_artist = fileName.mid(1, fileName.find("]") - 1);
+ m_title = fileName.right(fileName.length() - fileName.find("]") - 1);
validateArtist();
}
- else if (fileName.tqcontains("-"))
+ else if (fileName.contains("-"))
{
- m_artist = fileName.left(fileName.tqfind("-") - 1);
- m_title = fileName.right(fileName.length() - fileName.tqfind("-") - 1);
+ m_artist = fileName.left(fileName.find("-") - 1);
+ m_title = fileName.right(fileName.length() - fileName.find("-") - 1);
validateArtist();
}
else
@@ -56,10 +56,10 @@ ParsedMP3FileName::ParsedMP3FileName(const TQString &path)
m_artist = m_directories[m_directories.count() - 2];
}
- if (m_title.tqcontains("(") && m_title.tqfind(")", m_title.tqfind("(")))
+ if (m_title.contains("(") && m_title.find(")", m_title.find("(")))
{
- unsigned int start = m_title.tqfind("(");
- unsigned int end = m_title.tqfind(")");
+ unsigned int start = m_title.find("(");
+ unsigned int end = m_title.find(")");
m_comment = m_title.mid(start + 1, end - start - 1);
m_title.truncate(start);
}
@@ -86,10 +86,10 @@ TQString ParsedMP3FileName::beautifyString(const TQString &s)
temp[0] = temp[0].upper();
- unsigned int numSpaces = temp.tqcontains(" ");
+ unsigned int numSpaces = temp.contains(" ");
unsigned int spacePos = 0;
while (numSpaces > 0) {
- spacePos = temp.tqfind(" ", spacePos == 0? 0 : spacePos + 1);
+ spacePos = temp.find(" ", spacePos == 0? 0 : spacePos + 1);
temp[spacePos + 1] = temp[spacePos + 1].upper();
numSpaces--;
}
diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp
index f0c9ebd..91e49c1 100644
--- a/noatun-plugins/lyrics/lyrics.cpp
+++ b/noatun-plugins/lyrics/lyrics.cpp
@@ -32,7 +32,7 @@ Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false)
//(void)KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(print()), actionCollection());
//(void)KStdAction::printPreview(TQT_TQOBJECT(this), TQT_SLOT(printPreview()), actionCollection());
//(void)KStdAction::mail(TQT_TQOBJECT(this), TQT_SLOT(mail()), actionCollection());
- //(void)KStdAction::tqfind(TQT_TQOBJECT(this), TQT_SLOT(tqfind()), actionCollection());
+ //(void)KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(find()), actionCollection());
follow_act = new KToggleAction(i18n("&Follow Noatun Playlist"), "goto", 0, actionCollection(), "follow");
KStdAction::redisplay(TQT_TQOBJECT(this), TQT_SLOT(viewLyrics()), actionCollection());
attach_act = new KToggleAction(i18n("&Link URL to File"), "attach", KShortcut("CTRL+ALT+A"), actionCollection(), "attach_url");
@@ -192,7 +192,7 @@ void Lyrics::viewLyrics(int index)
int pos = props_regexp.search(url);
while (pos >= 0) {
TQString property = props_regexp.cap(1);
- url.tqreplace(pos, props_regexp.matchedLength(), napp->player()->current().property(property));
+ url.replace(pos, props_regexp.matchedLength(), napp->player()->current().property(property));
pos = props_regexp.search(url);
}
TQString title(napp->player()->current().property("title"));
@@ -213,7 +213,7 @@ void Lyrics::viewLyrics(int index)
if (napp->player()->current().property("Lyrics::URL").isEmpty()) {
/* Use the query one */
_url = url;
- _url.setQuery(_url.query().tqreplace(TQRegExp("%20"), "+"));
+ _url.setQuery(_url.query().replace(TQRegExp("%20"), "+"));
kdDebug(90020) << "I'm using the query url" << endl;
attach_act->setChecked(false);
site_act->setEnabled(true);
@@ -221,7 +221,7 @@ void Lyrics::viewLyrics(int index)
htmlpart->write( i18n( "<hr><p><strong>Searching at %1</strong><br><small>(<a href=\"%3\">%2</a></small>)</p>" ).tqarg( name ).tqarg( _url.prettyURL() ).tqarg( _url.url() ) );
} else {
_url = napp->player()->current().property("Lyrics::URL");
- _url.setQuery(_url.query().tqreplace(TQRegExp("%20"), "+"));
+ _url.setQuery(_url.query().replace(TQRegExp("%20"), "+"));
kdDebug(90020) << "I'm using the stored url" << endl;
attach_act->setChecked(true);
site_act->setEnabled(false);
diff --git a/noatun-plugins/nexscope/gui.cpp b/noatun-plugins/nexscope/gui.cpp
index d483a22..ae6952b 100644
--- a/noatun-plugins/nexscope/gui.cpp
+++ b/noatun-plugins/nexscope/gui.cpp
@@ -35,7 +35,7 @@ public:
afterRenderer=after->mRenderer;
list->lock();
- int pos=list->renderers().tqfindRef(afterRenderer);
+ int pos=list->renderers().findRef(afterRenderer);
if (pos==-1) pos=list->renderers().count();
list->renderers().insert((uint)pos, mRenderer=nex->renderer(creator->text(0)));
diff --git a/noatun-plugins/noatunmadness/madness.cpp b/noatun-plugins/noatunmadness/madness.cpp
index 81fa2c4..7027029 100644
--- a/noatun-plugins/noatunmadness/madness.cpp
+++ b/noatun-plugins/noatunmadness/madness.cpp
@@ -55,7 +55,7 @@ void Madness::update()
for (; it != mWindowList.end(); ++it)
{
TQRect area=KWin::info(*it).frameGeometry;
- if (!mOriginalPositions.tqcontains(*it))
+ if (!mOriginalPositions.contains(*it))
mOriginalPositions.insert(*it, area.topLeft());
}
}
diff --git a/noatun-plugins/oblique/base.cpp b/noatun-plugins/oblique/base.cpp
index 6288f20..3cb5633 100644
--- a/noatun-plugins/oblique/base.cpp
+++ b/noatun-plugins/oblique/base.cpp
@@ -133,7 +133,7 @@ File Base::add(const TQString &file)
return File();
}
-File Base::tqfind(FileId id)
+File Base::find(FileId id)
{
if (id == 0) return File();
@@ -155,7 +155,7 @@ void Base::clear()
{
for (FileId id = high(); id >= 1; id--)
{
- File f = tqfind(id);
+ File f = find(id);
if (f)
f.remove();
}
@@ -171,7 +171,7 @@ File Base::first(FileId first)
{
if (first > high()) return File();
- while (!tqfind(first))
+ while (!find(first))
{
++first;
if (first > high())
@@ -183,8 +183,8 @@ File Base::first(FileId first)
TQString Base::property(FileId id, const TQString &property) const
{
loadIntoCache(id);
- if (!d->cachedProperties.tqcontains(property)) return TQString();
- TQMap<TQString,TQString>::Iterator i = d->cachedProperties.tqfind(property);
+ if (!d->cachedProperties.contains(property)) return TQString();
+ TQMap<TQString,TQString>::Iterator i = d->cachedProperties.find(property);
return i.data();
}
diff --git a/noatun-plugins/oblique/base.h b/noatun-plugins/oblique/base.h
index 948ec78..4652343 100644
--- a/noatun-plugins/oblique/base.h
+++ b/noatun-plugins/oblique/base.h
@@ -32,7 +32,7 @@ public:
File add(const TQString &file);
- File tqfind(FileId id);
+ File find(FileId id);
void clear();
@@ -96,7 +96,7 @@ private: // friends for Slice
private:
/**
- * load the xml that lives at the head of the db and tqcontains
+ * load the xml that lives at the head of the db and contains
* potentially lots of structured data
**/
void loadMetaXML(const TQString &xml);
diff --git a/noatun-plugins/oblique/cmodule.cpp b/noatun-plugins/oblique/cmodule.cpp
index 5df19b0..d97c21f 100644
--- a/noatun-plugins/oblique/cmodule.cpp
+++ b/noatun-plugins/oblique/cmodule.cpp
@@ -272,7 +272,7 @@ void SchemaConfig::save()
TQString SchemaConfig::nameToFilename(const TQString &_name)
{
TQString name = _name;
- name = name.tqreplace(TQRegExp("[^a-zA-Z0-9]"), "_");
+ name = name.replace(TQRegExp("[^a-zA-Z0-9]"), "_");
return name;
}
@@ -288,7 +288,7 @@ void SchemaConfig::newSchema()
TQString filename = nameToFilename(str);
- if (mQueries.tqcontains(nameToFilename(filename))) return;
+ if (mQueries.contains(nameToFilename(filename))) return;
QueryItem queryitem;
queryitem.query = Query();
@@ -312,7 +312,7 @@ void SchemaConfig::copySchema()
TQString filename = nameToFilename(str);
- if (mQueries.tqcontains(nameToFilename(filename))) return;
+ if (mQueries.contains(nameToFilename(filename))) return;
QueryItem queryitem;
queryitem.query = currentQuery()->query;
@@ -621,7 +621,7 @@ void SliceConfig::addSibling()
void SliceConfig::removeSelf()
{
SliceListItem *r = currentItem();
- if (mAddedItems.tqcontains(r))
+ if (mAddedItems.contains(r))
{
mAddedItems.remove(r);
}
diff --git a/noatun-plugins/oblique/kdatacollection.cpp b/noatun-plugins/oblique/kdatacollection.cpp
index fc92093..aacb765 100644
--- a/noatun-plugins/oblique/kdatacollection.cpp
+++ b/noatun-plugins/oblique/kdatacollection.cpp
@@ -85,7 +85,7 @@ TQStringList KDataCollection::names() const
{
TQFileInfo fi(*i);
TQString name = fi.fileName();
- if (!n.tqcontains(name))
+ if (!n.contains(name))
{
total.append(name);
}
@@ -108,7 +108,7 @@ void KDataCollection::remove(const TQString &name)
}
TQStringList n = g.readListEntry(mEntry);
- if (n.tqcontains(name)) return;
+ if (n.contains(name)) return;
n.append(name);
g.writeEntry(mEntry, n);
}
diff --git a/noatun-plugins/oblique/oblique.cpp b/noatun-plugins/oblique/oblique.cpp
index e297e2b..234833a 100644
--- a/noatun-plugins/oblique/oblique.cpp
+++ b/noatun-plugins/oblique/oblique.cpp
@@ -215,7 +215,7 @@ void Loader::loadItemsDeferred()
return;
}
- File f = mBase->tqfind(mDeferredLoaderAt);
+ File f = mBase->find(mDeferredLoaderAt);
if (f)
{
diff --git a/noatun-plugins/oblique/query.cpp b/noatun-plugins/oblique/query.cpp
index 0727ca6..dd73d66 100644
--- a/noatun-plugins/oblique/query.cpp
+++ b/noatun-plugins/oblique/query.cpp
@@ -171,7 +171,7 @@ TQString QueryGroup::presentation(const File &file) const
uint len=counter.cap(1).length()-1;
// and half them, and remove one more
- format.tqreplace(start-1, len/2+1, "");
+ format.replace(start-1, len/2+1, "");
start=start-1+len/2+find.cap(1).length()+3;
continue;
}
@@ -186,7 +186,7 @@ TQString QueryGroup::presentation(const File &file) const
uint len=counter.cap(1).length();
// and half them
- format.tqreplace(start, len/2, "");
+ format.replace(start, len/2, "");
start=start+len/2;
}
@@ -250,12 +250,12 @@ TQString QueryGroup::presentation(const File &file) const
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;
@@ -383,7 +383,7 @@ void Query::save(const TQString &name, const TQString &filename)
// scourge elimination
TQString data = doc.toString();
TQString old = data;
- while (data.tqreplace(TQRegExp("([\n\r]+)(\t*) "), "\\1\\2\t") != old)
+ while (data.replace(TQRegExp("([\n\r]+)(\t*) "), "\\1\\2\t") != old)
{
old = data;
}
diff --git a/noatun-plugins/oblique/selector.cpp b/noatun-plugins/oblique/selector.cpp
index 004cf91..f28c333 100644
--- a/noatun-plugins/oblique/selector.cpp
+++ b/noatun-plugins/oblique/selector.cpp
@@ -129,7 +129,7 @@ Item *SequentialSelector::current()
void SequentialSelector::setCurrent(const Item &item)
{
- TreeItem *current = mTree->tqfind(item.itemFile());
+ TreeItem *current = mTree->find(item.itemFile());
setCurrent(current);
}
@@ -210,7 +210,7 @@ Item *RandomSelector::current()
void RandomSelector::setCurrent(const Item &item)
{
- setCurrent(mTree->tqfind(item.itemFile()), 0);
+ setCurrent(mTree->find(item.itemFile()), 0);
}
void RandomSelector::setCurrent(TreeItem *item, TreeItem *previous)
diff --git a/noatun-plugins/oblique/tree.cpp b/noatun-plugins/oblique/tree.cpp
index a8aaf67..fdf210e 100644
--- a/noatun-plugins/oblique/tree.cpp
+++ b/noatun-plugins/oblique/tree.cpp
@@ -258,14 +258,14 @@ TQString TreeItem::presentation() const
return text(0);
}
-TreeItem *TreeItem::tqfind(File item)
+TreeItem *TreeItem::find(File item)
{
TreeItem *i = firstChild();
while (i)
{
if (i->file() == item) return i;
- TreeItem *found = i->tqfind(item);
+ TreeItem *found = i->find(item);
if (found and found->playable()) return found;
i = i->nextSibling();
}
@@ -352,7 +352,7 @@ bool TreeItem::hideIfNoMatch(const TQString &match)
{
if (match.length())
{
- if (!text(0).tqcontains(match, false))
+ if (!text(0).contains(match, false))
{
setHidden(true);
return false;
@@ -367,7 +367,7 @@ bool TreeItem::hideIfNoMatch(const TQString &match)
if (match.length())
{
- visible = text(0).tqcontains(match, false);
+ visible = text(0).contains(match, false);
}
if (visible)
@@ -535,7 +535,7 @@ void Tree::dropped(TQPtrList<TQListViewItem> &items, TQPtrList<TQListViewItem> &
TreeItem *Tree::firstChild()
{ return static_cast<TreeItem*>(KListView::firstChild()); }
-TreeItem *Tree::tqfind(File item)
+TreeItem *Tree::find(File item)
{
TreeItem *i = firstChild();
@@ -543,7 +543,7 @@ TreeItem *Tree::tqfind(File item)
{
if (i->file() == item) return i;
- TreeItem *found = i->tqfind(item);
+ TreeItem *found = i->find(item);
if (found) return found;
i = i->nextSibling();
@@ -551,19 +551,19 @@ TreeItem *Tree::tqfind(File item)
return i;
}
-void Tree::insert(TreeItem *tqreplace, File file)
+void Tree::insert(TreeItem *replace, File file)
{
- TreeItem *created = collate(tqreplace, file);
- if (mCurrent == tqreplace)
+ TreeItem *created = collate(replace, file);
+ if (mCurrent == replace)
{
mCurrent = created;
repaintItem(created);
- if (isSelected(tqreplace))
+ if (isSelected(replace))
setSelected(created, true);
}
- if (created != tqreplace)
+ if (created != replace)
{
- delete tqreplace;
+ delete replace;
}
}
@@ -592,7 +592,7 @@ void Tree::checkRemove(Slice *slice, File f)
void Tree::update(File file)
{
- if (TreeItem *item = tqfind(file))
+ if (TreeItem *item = find(file))
{
insert(item, file);
}
diff --git a/noatun-plugins/oblique/tree.h b/noatun-plugins/oblique/tree.h
index af14f95..bdc557d 100644
--- a/noatun-plugins/oblique/tree.h
+++ b/noatun-plugins/oblique/tree.h
@@ -45,7 +45,7 @@ public:
void setOpen(bool o);
- TreeItem *tqfind(File item);
+ TreeItem *find(File item);
bool playable() const;
@@ -107,7 +107,7 @@ public:
Tree(Oblique *oblique, TQWidget *tqparent=0);
~Tree();
TreeItem *firstChild();
- TreeItem *tqfind(File item);
+ TreeItem *find(File item);
TreeItem *current() { return mCurrent; }
Query *query() { return &mQuery; }
Oblique *oblique() { return mOblique; }
@@ -133,7 +133,7 @@ protected:
void movableDropEvent(TQListViewItem* tqparent, TQListViewItem* afterme);
public slots:
- void insert(TreeItem *tqreplace, File file);
+ void insert(TreeItem *replace, File file);
void insert(File file);
void remove(File file);
void update(File file);
diff --git a/noatun-plugins/tippercanoe/synaescope.cpp b/noatun-plugins/tippercanoe/synaescope.cpp
index 4a617ee..b33b71d 100644
--- a/noatun-plugins/tippercanoe/synaescope.cpp
+++ b/noatun-plugins/tippercanoe/synaescope.cpp
@@ -82,7 +82,7 @@ void SynaeScope::scopeEvent(float *left, float *right, int size)
void SynaeScope::read(KProcess *, char *buf, int)
{
TQString num = TQString::tqfromLatin1(buf);
- num = num.left(num.tqfind(TQRegExp("\\s")));
+ num = num.left(num.find(TQRegExp("\\s")));
id = num.toInt();
embed->embed(id);
}