summaryrefslogtreecommitdiffstats
path: root/libkcddb
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
commit7ef01c0f34d9c6732d258154bcd3ba5a88280db9 (patch)
tree48ff13dab43883d19ecf2272b8ba72a013d5bc57 /libkcddb
parentc05ca496a526b3fc192dbfafe0955e5824b22e08 (diff)
downloadtdemultimedia-7ef01c0f34d9c6732d258154bcd3ba5a88280db9.tar.gz
tdemultimedia-7ef01c0f34d9c6732d258154bcd3ba5a88280db9.zip
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
Diffstat (limited to 'libkcddb')
-rw-r--r--libkcddb/categories.cpp4
-rw-r--r--libkcddb/cdinfo.cpp14
-rw-r--r--libkcddb/cdinfodialogbase.ui.h4
-rw-r--r--libkcddb/genres.cpp4
-rw-r--r--libkcddb/kcmcddb/kcmcddb.cpp4
-rw-r--r--libkcddb/submit.cpp2
6 files changed, 16 insertions, 16 deletions
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;