summaryrefslogtreecommitdiffstats
path: root/kmailcvt
diff options
context:
space:
mode:
Diffstat (limited to 'kmailcvt')
-rw-r--r--kmailcvt/filter_evolution.cxx6
-rw-r--r--kmailcvt/filter_evolution_v2.cxx10
-rw-r--r--kmailcvt/filter_pmail.cxx4
-rw-r--r--kmailcvt/filter_thebat.cxx6
-rw-r--r--kmailcvt/filter_thunderbird.cxx10
5 files changed, 18 insertions, 18 deletions
diff --git a/kmailcvt/filter_evolution.cxx b/kmailcvt/filter_evolution.cxx
index e2d0ff50e..417dd8e58 100644
--- a/kmailcvt/filter_evolution.cxx
+++ b/kmailcvt/filter_evolution.cxx
@@ -128,14 +128,14 @@ void FilterEvolution::importMBox(FilterInfo *info, const TQString& mboxName, con
info->setCurrent(0);
if( mboxName.length() > 20 ) {
TQString tmp_info = mboxName;
- tmp_info = tmp_info.tqreplace( mailDir, ".." );
- if (tmp_info.tqcontains("subfolders/"))
+ tmp_info = tmp_info.replace( mailDir, ".." );
+ if (tmp_info.contains("subfolders/"))
tmp_info.remove("subfolders/");
info->setFrom( tmp_info );
tmp_from = tmp_info;
} else
info->setFrom(mboxName);
- if(targetDir.tqcontains("subfolders/")) {
+ if(targetDir.contains("subfolders/")) {
TQString tmp_info = targetDir;
tmp_info.remove("subfolders/");
info->setTo(tmp_info);
diff --git a/kmailcvt/filter_evolution_v2.cxx b/kmailcvt/filter_evolution_v2.cxx
index 55a4817e9..29b636b90 100644
--- a/kmailcvt/filter_evolution_v2.cxx
+++ b/kmailcvt/filter_evolution_v2.cxx
@@ -164,13 +164,13 @@ void FilterEvolution_v2::importMBox(FilterInfo *info, const TQString& mboxName,
info->setCurrent(0);
if( mboxName.length() > 20 ) {
TQString tmp_info = mboxName;
- tmp_info = tmp_info.tqreplace( mailDir, "../" );
- if (tmp_info.tqcontains(".sbd"))
+ tmp_info = tmp_info.replace( mailDir, "../" );
+ if (tmp_info.contains(".sbd"))
tmp_info.remove(".sbd");
info->setFrom( tmp_info );
} else
info->setFrom(mboxName);
- if(targetDir.tqcontains(".sbd")) {
+ if(targetDir.contains(".sbd")) {
TQString tmp_info = targetDir;
tmp_info.remove(".sbd");
info->setTo(tmp_info);
@@ -206,12 +206,12 @@ void FilterEvolution_v2::importMBox(FilterInfo *info, const TQString& mboxName,
TQString destFolder;
TQString _targetDir = targetDir;
if(!targetDir.isNull()) {
- if(_targetDir.tqcontains(".sbd"))
+ if(_targetDir.contains(".sbd"))
_targetDir.remove(".sbd");
destFolder += "Evolution-Import/" + _targetDir + "/" + filenameInfo.baseName(TRUE); // mboxName;
} else {
destFolder = "Evolution-Import/" + rootDir;
- if(destFolder.tqcontains(".sbd"))
+ if(destFolder.contains(".sbd"))
destFolder.remove(".sbd");
}
diff --git a/kmailcvt/filter_pmail.cxx b/kmailcvt/filter_pmail.cxx
index bc412f345..52c5c7fc6 100644
--- a/kmailcvt/filter_pmail.cxx
+++ b/kmailcvt/filter_pmail.cxx
@@ -228,8 +228,8 @@ void FilterPMail::importUnixMailFolder(const TQString& file)
int n = 0, l = 0;
/** Get the folder name */
- s.tqreplace( TQRegExp("mbx$"), "pmg");
- s.tqreplace( TQRegExp("MBX$"), "PMG");
+ s.replace( TQRegExp("mbx$"), "pmg");
+ s.replace( TQRegExp("MBX$"), "PMG");
f.setName(s);
if (! f.open( IO_ReadOnly ) ) {
inf->alert( i18n("Unable to open %1, skipping").tqarg( s ) );
diff --git a/kmailcvt/filter_thebat.cxx b/kmailcvt/filter_thebat.cxx
index 1ec747789..2ea7dc580 100644
--- a/kmailcvt/filter_thebat.cxx
+++ b/kmailcvt/filter_thebat.cxx
@@ -169,16 +169,16 @@ void FilterTheBat::importFiles( FilterInfo *info, const TQString& FileName)
if (tbb.atEnd())
break;
- iFound = _tmp.tqcontains(regexp);
+ iFound = _tmp.contains(regexp);
if(!iFound) {
- iFound = _tmp.tqfindRev("!");
+ iFound = _tmp.findRev("!");
if (iFound >= 0 && ((l-iFound) < 5) ) {
int _i = tbb.at();
tbb.at((_i - iFound));
}
} else {
++count;
- endOfEmail = (tbb.at() - l + _tmp.tqfind(regexp));
+ endOfEmail = (tbb.at() - l + _tmp.find(regexp));
offsets.append(endOfEmail);
}
}
diff --git a/kmailcvt/filter_thunderbird.cxx b/kmailcvt/filter_thunderbird.cxx
index e0c4060eb..301d29d0e 100644
--- a/kmailcvt/filter_thunderbird.cxx
+++ b/kmailcvt/filter_thunderbird.cxx
@@ -165,13 +165,13 @@ void FilterThunderbird::importMBox(FilterInfo *info, const TQString& mboxName, c
info->setCurrent(0);
if( mboxName.length() > 20 ) {
TQString tmp_info = mboxName;
- tmp_info = tmp_info.tqreplace( mailDir, "../" );
- if (tmp_info.tqcontains(".sbd"))
+ tmp_info = tmp_info.replace( mailDir, "../" );
+ if (tmp_info.contains(".sbd"))
tmp_info.remove(".sbd");
info->setFrom( tmp_info );
} else
info->setFrom(mboxName);
- if(targetDir.tqcontains(".sbd")) {
+ if(targetDir.contains(".sbd")) {
TQString tmp_info = targetDir;
tmp_info.remove(".sbd");
info->setTo(tmp_info);
@@ -207,12 +207,12 @@ void FilterThunderbird::importMBox(FilterInfo *info, const TQString& mboxName, c
TQString destFolder;
TQString _targetDir = targetDir;
if(!targetDir.isNull()) {
- if(_targetDir.tqcontains(".sbd"))
+ if(_targetDir.contains(".sbd"))
_targetDir.remove(".sbd");
destFolder += "Thunderbird-Import/" + _targetDir + "/" + filenameInfo.baseName(TRUE);// mboxName;
} else {
destFolder = "Thunderbird-Import/" + rootDir;
- if(destFolder.tqcontains(".sbd"))
+ if(destFolder.contains(".sbd"))
destFolder.remove(".sbd");
}