summaryrefslogtreecommitdiffstats
path: root/kioslave
diff options
context:
space:
mode:
Diffstat (limited to 'kioslave')
-rw-r--r--kioslave/audiocd/audiocd.cpp30
-rw-r--r--kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp6
-rw-r--r--kioslave/audiocd/plugins/audiocdencoder.cpp4
-rw-r--r--kioslave/audiocd/plugins/lame/encoderlame.cpp2
4 files changed, 21 insertions, 21 deletions
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<AudioCDEnco
{
TQString fileName = *it2;
kdDebug() << fileName << endl;
- if (foundEncoders.tqcontains(fileName)) {
+ if (foundEncoders.contains(fileName)) {
kdDebug(7117) << "Warning, encoder has been found twice!" << endl;
continue;
}
foundEncoders.append(fileName);
- fileName = fileName.mid(0, fileName.tqfind('.'));
+ fileName = fileName.mid(0, fileName.find('.'));
void *function = loadPlugin(fileName);
if(function){
void (*functionPointer)(KIO::SlaveBase *, TQPtrList<AudioCDEncoder> &) = (void (*)(KIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &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);
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-27 22:47:40 +0000