diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
commit | 1c93fca14d9ce37499bcfdf994c660186a0b6f17 (patch) | |
tree | f2defe163a805a9e34a2142dfde4cdb5e49241e7 /kmailcvt | |
parent | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (diff) | |
download | tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.tar.gz tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.zip |
Enable kdepim compilation under Qt4
This will likely break Qt3 compilation temporarily, which is an unintended side effect.
A third and final kdepim commit will repair Qt3 compilation shortly.
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmailcvt')
-rw-r--r-- | kmailcvt/filter_evolution.cxx | 6 | ||||
-rw-r--r-- | kmailcvt/filter_evolution_v2.cxx | 6 | ||||
-rw-r--r-- | kmailcvt/filter_kmail_maildir.cxx | 10 | ||||
-rw-r--r-- | kmailcvt/filter_lnotes.cxx | 6 | ||||
-rw-r--r-- | kmailcvt/filter_mailapp.cxx | 8 | ||||
-rw-r--r-- | kmailcvt/filter_mbox.cxx | 8 | ||||
-rw-r--r-- | kmailcvt/filter_oe.cxx | 12 | ||||
-rw-r--r-- | kmailcvt/filter_opera.cxx | 6 | ||||
-rw-r--r-- | kmailcvt/filter_outlook.cxx | 4 | ||||
-rw-r--r-- | kmailcvt/filter_plain.cxx | 6 | ||||
-rw-r--r-- | kmailcvt/filter_pmail.cxx | 16 | ||||
-rw-r--r-- | kmailcvt/filter_sylpheed.cxx | 8 | ||||
-rw-r--r-- | kmailcvt/filter_thebat.cxx | 10 | ||||
-rw-r--r-- | kmailcvt/filter_thunderbird.cxx | 8 | ||||
-rw-r--r-- | kmailcvt/filters.cxx | 12 | ||||
-rw-r--r-- | kmailcvt/kselfilterpage.cpp | 2 |
16 files changed, 64 insertions, 64 deletions
diff --git a/kmailcvt/filter_evolution.cxx b/kmailcvt/filter_evolution.cxx index f1d9eaff1..e2d0ff50e 100644 --- a/kmailcvt/filter_evolution.cxx +++ b/kmailcvt/filter_evolution.cxx @@ -73,7 +73,7 @@ void FilterEvolution::import(FilterInfo *info) info->setOverall((int) ((float) currentDir / numSubDirs * 100)); } } - info->addLog( i18n("Finished importing emails from %1").arg( mailDir )); + info->addLog( i18n("Finished importing emails from %1").tqarg( mailDir )); info->setCurrent(100); info->setOverall(100); } @@ -121,7 +121,7 @@ void FilterEvolution::importMBox(FilterInfo *info, const TQString& mboxName, con bool first_msg = true; TQString tmp_from = mboxName; if (!mbox.open(IO_ReadOnly)) { - info->alert(i18n("Unable to open %1, skipping").arg(mboxName)); + info->alert(i18n("Unable to open %1, skipping").tqarg(mboxName)); } else { TQFileInfo filenameInfo(mboxName); @@ -142,7 +142,7 @@ void FilterEvolution::importMBox(FilterInfo *info, const TQString& mboxName, con } else info->setTo(targetDir); - info->addLog(i18n("Importing emails from %1...").arg(tmp_from)); + info->addLog(i18n("Importing emails from %1...").tqarg(tmp_from)); TQByteArray input(MAX_LINE); long l = 0; diff --git a/kmailcvt/filter_evolution_v2.cxx b/kmailcvt/filter_evolution_v2.cxx index b8842e961..55a4817e9 100644 --- a/kmailcvt/filter_evolution_v2.cxx +++ b/kmailcvt/filter_evolution_v2.cxx @@ -87,7 +87,7 @@ void FilterEvolution_v2::import(FilterInfo *info) /** import last but not least all archives from the root-dir */ importDirContents(info, true, mailDir, TQString(), TQString()); - info->addLog( i18n("Finished importing emails from %1").arg( mailDir )); + info->addLog( i18n("Finished importing emails from %1").tqarg( mailDir )); if(count_duplicates > 0) { info->addLog( i18n("1 duplicate message not imported", "%n duplicate messages not imported", count_duplicates)); } @@ -121,7 +121,7 @@ void FilterEvolution_v2::importDirContents(FilterInfo *info, bool root, if (temp_mailfile.endsWith(".cmeta") || temp_mailfile.endsWith(".ev-summary") || temp_mailfile.endsWith(".ev-summary-meta") || temp_mailfile.endsWith(".ibex.index") || temp_mailfile.endsWith(".ibex.index.data") ) {} else { - info->addLog( i18n("Start import file %1...").arg( temp_mailfile ) ); + info->addLog( i18n("Start import file %1...").tqarg( temp_mailfile ) ); if (!root) importMBox(info, (dirName + "/" + temp_mailfile) , KMailRootDir, KMailSubDir); else @@ -157,7 +157,7 @@ void FilterEvolution_v2::importMBox(FilterInfo *info, const TQString& mboxName, TQFile mbox(mboxName); bool first_msg = true; if (!mbox.open(IO_ReadOnly)) { - info->alert(i18n("Unable to open %1, skipping").arg(mboxName)); + info->alert(i18n("Unable to open %1, skipping").tqarg(mboxName)); } else { TQFileInfo filenameInfo(mboxName); diff --git a/kmailcvt/filter_kmail_maildir.cxx b/kmailcvt/filter_kmail_maildir.cxx index 081a2fda3..4648c04b0 100644 --- a/kmailcvt/filter_kmail_maildir.cxx +++ b/kmailcvt/filter_kmail_maildir.cxx @@ -80,7 +80,7 @@ void FilterKMail_maildir::import( FilterInfo *info ) } } - info->addLog( i18n("Finished importing emails from %1").arg( mailDir )); + info->addLog( i18n("Finished importing emails from %1").tqarg( mailDir )); if (count_duplicates > 0) { info->addLog( i18n("1 duplicate message not imported", "%n duplicate messages not imported", count_duplicates)); } @@ -125,7 +125,7 @@ TQString FilterKMail_maildir::getMessageFlags( FilterInfo *info, const TQString& TQFile mailfile( fileName ); if (! mailfile.open( IO_ReadOnly ) ) { - info->alert( i18n("Unable to open %1, skipping").arg( fileName ) ); + info->alert( i18n("Unable to open %1, skipping").tqarg( fileName ) ); return status_flag; } else { @@ -193,7 +193,7 @@ void FilterKMail_maildir::importFiles( FilterInfo *info, const TQString& dirName if(_path.endsWith("cur")) _path.remove(_path.length() - 4 , 4); TQString _info = _path; - info->addLog(i18n("Import folder %1...").arg(_info.remove(0,12))); + info->addLog(i18n("Import folder %1...").tqarg(_info.remove(0,12))); info->setFrom(_info); info->setTo(_path); generatedPath = true; @@ -203,12 +203,12 @@ void FilterKMail_maildir::importFiles( FilterInfo *info, const TQString& dirName if(info->removeDupMsg) { if(! addMessage( info, _path, dir.filePath(*mailFile), msg_flag )) { - info->addLog( i18n("Could not import %1").arg( *mailFile ) ); + info->addLog( i18n("Could not import %1").tqarg( *mailFile ) ); } info->setCurrent((int) ((float) currentFile / numFiles * 100)); } else { if(! addMessage_fastImport( info, _path, dir.filePath(*mailFile), msg_flag )) { - info->addLog( i18n("Could not import %1").arg( *mailFile ) ); + info->addLog( i18n("Could not import %1").tqarg( *mailFile ) ); } info->setCurrent((int) ((float) currentFile / numFiles * 100)); } diff --git a/kmailcvt/filter_lnotes.cxx b/kmailcvt/filter_lnotes.cxx index c14d32adf..0fcb345ea 100644 --- a/kmailcvt/filter_lnotes.cxx +++ b/kmailcvt/filter_lnotes.cxx @@ -61,7 +61,7 @@ void FilterLNotes::import(FilterInfo *info) { for ( TQStringList::Iterator filename = filenames.begin(); filename != filenames.end(); ++filename ) { ++currentFile; - info->addLog( i18n("Importing emails from %1").arg(*filename) ); + info->addLog( i18n("Importing emails from %1").tqarg(*filename) ); ImportLNotes( *filename ); inf->setOverall( 100 * currentFile / totalFiles ); if ( info->shouldTerminate() ) @@ -85,7 +85,7 @@ void FilterLNotes::ImportLNotes(const TQString& file) { TQFile f(file); if (! f.open( IO_ReadOnly ) ) { - inf->alert( i18n("Unable to open %1, skipping").arg( file ) ); + inf->alert( i18n("Unable to open %1, skipping").tqarg( file ) ); } else { int ch = 0; @@ -106,7 +106,7 @@ void FilterLNotes::ImportLNotes(const TQString& file) { // open temp output file tempfile = new KTempFile; state = 1; - inf->setCurrent(i18n("Message %1").arg(n++)); + inf->setCurrent(i18n("Message %1").tqarg(n++)); if ( inf->shouldTerminate() ) return; // fall through diff --git a/kmailcvt/filter_mailapp.cxx b/kmailcvt/filter_mailapp.cxx index f1c3bc727..d50f28c8a 100644 --- a/kmailcvt/filter_mailapp.cxx +++ b/kmailcvt/filter_mailapp.cxx @@ -59,7 +59,7 @@ void FilterMailApp::import(FilterInfo *info) if ( info->shouldTerminate() ) break; TQFile mbox( *filename ); if (! mbox.open( IO_ReadOnly ) ) { - info->alert( i18n("Unable to open %1, skipping").arg( *filename ) ); + info->alert( i18n("Unable to open %1, skipping").tqarg( *filename ) ); } else { TQFileInfo filenameInfo( *filename ); kdDebug() << "importing filename " << *filename << endl; @@ -67,7 +67,7 @@ void FilterMailApp::import(FilterInfo *info) TQString folderName(name[name.count() - 2]); info->setCurrent(0); - info->addLog( i18n("Importing emails from %1...").arg( *filename ) ); + info->addLog( i18n("Importing emails from %1...").tqarg( *filename ) ); info->setFrom( *filename ); info->setTo( folderName ); @@ -123,10 +123,10 @@ void FilterMailApp::import(FilterInfo *info) if ( info->shouldTerminate() ) break; } - info->addLog( i18n("Finished importing emails from %1").arg( *filename ) ); + info->addLog( i18n("Finished importing emails from %1").tqarg( *filename ) ); if (count_duplicates > 0) { info->addLog( i18n("1 duplicate message not imported to folder %1 in KMail", - "%n duplicate messages not imported to folder %1 in KMail", count_duplicates).arg(folderName)); + "%n duplicate messages not imported to folder %1 in KMail", count_duplicates).tqarg(folderName)); } count_duplicates = 0; mbox.close(); diff --git a/kmailcvt/filter_mbox.cxx b/kmailcvt/filter_mbox.cxx index 0a7b08ff1..f456b1084 100644 --- a/kmailcvt/filter_mbox.cxx +++ b/kmailcvt/filter_mbox.cxx @@ -51,13 +51,13 @@ void FilterMBox::import(FilterInfo *info) for ( TQStringList::Iterator filename = filenames.begin(); filename != filenames.end(); ++filename, ++currentFile) { TQFile mbox( *filename ); if (! mbox.open( IO_ReadOnly ) ) { - info->alert( i18n("Unable to open %1, skipping").arg( *filename ) ); + info->alert( i18n("Unable to open %1, skipping").tqarg( *filename ) ); } else { TQFileInfo filenameInfo( *filename ); TQString folderName( "MBOX-" + filenameInfo.baseName(TRUE) ); info->setCurrent(0); - info->addLog( i18n("Importing emails from %1...").arg( *filename ) ); + info->addLog( i18n("Importing emails from %1...").tqarg( *filename ) ); info->setFrom( *filename ); info->setTo( folderName ); @@ -129,11 +129,11 @@ void FilterMBox::import(FilterInfo *info) if ( info->shouldTerminate() ) break; } - info->addLog( i18n("Finished importing emails from %1").arg( *filename )); + info->addLog( i18n("Finished importing emails from %1").tqarg( *filename )); if (count_duplicates > 0) { info->addLog( i18n("1 duplicate message not imported to folder %1 in KMail", "%n duplicate messages not imported to folder %1 in KMail", - count_duplicates).arg(folderName)); + count_duplicates).tqarg(folderName)); } if (info->shouldTerminate()) info->addLog( i18n("Finished import, canceled by user.")); count_duplicates = 0; diff --git a/kmailcvt/filter_oe.cxx b/kmailcvt/filter_oe.cxx index fb9d552a3..40f3da26d 100644 --- a/kmailcvt/filter_oe.cxx +++ b/kmailcvt/filter_oe.cxx @@ -64,7 +64,7 @@ void FilterOE::import(FilterInfo *info) TQDir dir (mailDir); TQStringList files = dir.entryList("*.[dDmM][bB][xX]", TQDir::Files, TQDir::Name); if (files.isEmpty()) { - info->alert(i18n("No Outlook Express mailboxes found in directory %1.").arg(mailDir)); + info->alert(i18n("No Outlook Express mailboxes found in directory %1.").tqarg(mailDir)); return; } @@ -116,7 +116,7 @@ void FilterOE::importMailBox( FilterInfo *info, const TQString& fileName) info->setFrom(mailfileinfo.fileName()); if (!mailfile.open(IO_ReadOnly)) { - info->addLog(i18n("Unable to open mailbox %1").arg(fileName)); + info->addLog(i18n("Unable to open mailbox %1").tqarg(fileName)); return; } TQDataStream mailbox(&mailfile); @@ -127,7 +127,7 @@ void FilterOE::importMailBox( FilterInfo *info, const TQString& fileName) mailbox >> sig_block1 >> sig_block2; if (sig_block1 == OE4_SIG_1 && sig_block2 == OE4_SIG_2) { folderName = "OE-Import/" + mailfileinfo.baseName(TRUE); - info->addLog(i18n("Importing OE4 Mailbox %1").arg( "../" + _nameOfFile)); + info->addLog(i18n("Importing OE4 Mailbox %1").tqarg( "../" + _nameOfFile)); info->setTo(folderName); mbxImport(info, mailbox); return; @@ -141,13 +141,13 @@ void FilterOE::importMailBox( FilterInfo *info, const TQString& fileName) TQString _tmpFolder = getFolderName(_nameOfFile); if(!_tmpFolder.isEmpty()) folderName = "OE-Import/" + _tmpFolder; } - info->addLog(i18n("Importing OE5+ Mailbox %1").arg( "../" + _nameOfFile)); + info->addLog(i18n("Importing OE5+ Mailbox %1").tqarg( "../" + _nameOfFile)); info->setTo(folderName); dbxImport(info, mailbox); return; } else if (sig_block2 == OE5_FOLDER_SIG_2) { if(!parsedFolder) { - info->addLog(i18n("Importing OE5+ Folder file %1").arg( "../" + _nameOfFile)); + info->addLog(i18n("Importing OE5+ Folder file %1").tqarg( "../" + _nameOfFile)); currentIsFolderFile = true; dbxImport(info, mailbox); currentIsFolderFile = false; @@ -156,7 +156,7 @@ void FilterOE::importMailBox( FilterInfo *info, const TQString& fileName) } } } - // info->addLog(i18n("File %1 does not seem to be an Outlook Express mailbox").arg("../" + _nameOfFile)); + // info->addLog(i18n("File %1 does not seem to be an Outlook Express mailbox").tqarg("../" + _nameOfFile)); } /* ------------------- MBX support ------------------- */ diff --git a/kmailcvt/filter_opera.cxx b/kmailcvt/filter_opera.cxx index d584263d5..b0f362474 100644 --- a/kmailcvt/filter_opera.cxx +++ b/kmailcvt/filter_opera.cxx @@ -84,9 +84,9 @@ void FilterOpera::import(FilterInfo *info) info->setCurrent(0); TQFile operaArchiv( importDir.filePath(*mailFile) ); if (! operaArchiv.open( IO_ReadOnly ) ) { - info->alert( i18n("Unable to open %1, skipping").arg( *mailFile ) ); + info->alert( i18n("Unable to open %1, skipping").tqarg( *mailFile ) ); } else { - info->addLog( i18n("Importing emails from %1...").arg( *mailFile ) ); + info->addLog( i18n("Importing emails from %1...").tqarg( *mailFile ) ); TQFileInfo filenameInfo( importDir.filePath(*mailFile) ); TQString folderName( "OPERA-" + importDir.dirName() ); @@ -138,7 +138,7 @@ void FilterOpera::import(FilterInfo *info) if ( info->shouldTerminate() ) break; } - info->addLog( i18n("Finished importing emails from %1").arg( *mailFile )); + info->addLog( i18n("Finished importing emails from %1").tqarg( *mailFile )); if (count_duplicates > 0) { info->addLog( i18n("1 duplicate message not imported", "%n duplicate messages not imported", count_duplicates)); } diff --git a/kmailcvt/filter_outlook.cxx b/kmailcvt/filter_outlook.cxx index bbb32de79..f222d88c7 100644 --- a/kmailcvt/filter_outlook.cxx +++ b/kmailcvt/filter_outlook.cxx @@ -54,8 +54,8 @@ void FilterOutlook::import(FilterInfo *info) TQDir importDir (outlookDir); TQStringList files = importDir.entryList("*.[pP][sS][tT]", TQDir::Files, TQDir::Name); for ( TQStringList::Iterator pstFile = files.begin(); pstFile != files.end(); ++pstFile) { - info->addLog( i18n("Importing emails from %1...").arg( *pstFile ) ); + info->addLog( i18n("Importing emails from %1...").tqarg( *pstFile ) ); info->addLog( i18n("1 duplicate message not imported", "%n duplicate messages not imported", count_duplicates)); - info->alert( i18n("Unable to open %1, skipping").arg( *pstFile ) ); + info->alert( i18n("Unable to open %1, skipping").tqarg( *pstFile ) ); } } diff --git a/kmailcvt/filter_plain.cxx b/kmailcvt/filter_plain.cxx index 45cdbf88f..2b3a3e823 100644 --- a/kmailcvt/filter_plain.cxx +++ b/kmailcvt/filter_plain.cxx @@ -64,11 +64,11 @@ void FilterPlain::import(FilterInfo *info) */ if(info->removeDupMsg) { if(! addMessage( info, "PLAIN-" + dir.dirName(), dir.filePath(*mailFile) )) { - info->addLog( i18n("Could not import %1").arg( *mailFile ) ); + info->addLog( i18n("Could not import %1").tqarg( *mailFile ) ); } } else { if( ! addMessage_fastImport( info, "PLAIN-" + dir.dirName(), dir.filePath(*mailFile) )) { - info->addLog( i18n("Could not import %1").arg( *mailFile ) ); + info->addLog( i18n("Could not import %1").tqarg( *mailFile ) ); } } @@ -77,7 +77,7 @@ void FilterPlain::import(FilterInfo *info) if ( info->shouldTerminate() ) break; } - info->addLog( i18n("Finished importing emails from %1").arg( mailDir )); + info->addLog( i18n("Finished importing emails from %1").tqarg( mailDir )); if (count_duplicates > 0) { info->addLog( i18n("1 duplicate message not imported", "%n duplicate messages not imported", count_duplicates)); } diff --git a/kmailcvt/filter_pmail.cxx b/kmailcvt/filter_pmail.cxx index f0386d902..bc412f345 100644 --- a/kmailcvt/filter_pmail.cxx +++ b/kmailcvt/filter_pmail.cxx @@ -76,7 +76,7 @@ void FilterPMail::import(FilterInfo *info) info->addLog(i18n("Importing 'UNIX' mail folders ('.mbx')...")); processFiles("*.[mM][bB][xX]", &FilterPMail::importUnixMailFolder); - info->addLog( i18n("Finished importing emails from %1").arg( chosenDir )); + info->addLog( i18n("Finished importing emails from %1").tqarg( chosenDir )); info->setCurrent(100); info->setOverall(100); } @@ -162,7 +162,7 @@ void FilterPMail::importMailFolder(const TQString& file) long l = 0; TQFile f(file); if (!f.open(IO_ReadOnly)) { - inf->alert(i18n("Unable to open %1, skipping").arg(file)); + inf->alert(i18n("Unable to open %1, skipping").tqarg(file)); } else { // Get folder name l = f.readBlock((char *) &pmm_head, sizeof(pmm_head)); @@ -172,7 +172,7 @@ void FilterPMail::importMailFolder(const TQString& file) else folder.append(pmm_head.folder); inf->setTo(folder); - inf->addLog(i18n("Importing %1").arg("../" + TQString(pmm_head.folder))); + inf->addLog(i18n("Importing %1").tqarg("../" + TQString(pmm_head.folder))); TQByteArray input(MAX_LINE); bool first_msg = true; @@ -232,7 +232,7 @@ void FilterPMail::importUnixMailFolder(const TQString& file) s.tqreplace( TQRegExp("MBX$"), "PMG"); f.setName(s); if (! f.open( IO_ReadOnly ) ) { - inf->alert( i18n("Unable to open %1, skipping").arg( s ) ); + inf->alert( i18n("Unable to open %1, skipping").tqarg( s ) ); return; } else { f.readBlock((char *) &pmg_head, sizeof(pmg_head)); @@ -250,9 +250,9 @@ void FilterPMail::importUnixMailFolder(const TQString& file) /** Read in the mbox */ f.setName(file); if (! f.open( IO_ReadOnly ) ) { - inf->alert( i18n("Unable to open %1, skipping").arg( s ) ); + inf->alert( i18n("Unable to open %1, skipping").tqarg( s ) ); } else { - inf->addLog(i18n("Importing %1").arg("../" + TQString(pmg_head.folder))); + inf->addLog(i18n("Importing %1").tqarg("../" + TQString(pmg_head.folder))); l = f.readLine( line.data(),MAX_LINE); // read the first line which is unneeded while ( ! f.atEnd() ) { KTempFile tempfile; @@ -276,7 +276,7 @@ void FilterPMail::importUnixMailFolder(const TQString& file) tempfile.unlink(); n++; - inf->setCurrent(i18n("Message %1").arg(n)); + inf->setCurrent(i18n("Message %1").tqarg(n)); inf->setCurrent( (int) ( ( (float) f.at() / f.size() ) * 100 ) ); } } @@ -291,7 +291,7 @@ bool FilterPMail::parseFolderMatrix() TQFile hierarch(chosenDir + "/hierarch.pm"); if (! hierarch.open( IO_ReadOnly ) ) { - inf->alert( i18n("Unable to open %1, skipping").arg( chosenDir + "hierarch.pm" ) ); + inf->alert( i18n("Unable to open %1, skipping").tqarg( chosenDir + "hierarch.pm" ) ); return false; } else { TQStringList tmpList; diff --git a/kmailcvt/filter_sylpheed.cxx b/kmailcvt/filter_sylpheed.cxx index 9d6b219ae..47c134b47 100644 --- a/kmailcvt/filter_sylpheed.cxx +++ b/kmailcvt/filter_sylpheed.cxx @@ -75,7 +75,7 @@ void FilterSylpheed::import( FilterInfo *info ) } } - info->addLog( i18n("Finished importing emails from %1").arg( mailDir )); + info->addLog( i18n("Finished importing emails from %1").tqarg( mailDir )); if (count_duplicates > 0) { info->addLog( i18n("1 duplicate message not imported", "%n duplicate messages not imported", count_duplicates)); } @@ -137,7 +137,7 @@ void FilterSylpheed::importFiles( FilterInfo *info, const TQString& dirName) _tmp = _tmp.remove(_tmp.length() - _mfile.length() -1, _mfile.length()+1); _path += _tmp.remove( mailDir ,TRUE); TQString _info = _path; - info->addLog(i18n("Import folder %1...").arg(_info.remove(0,15))); + info->addLog(i18n("Import folder %1...").tqarg(_info.remove(0,15))); info->setFrom(_info); info->setTo(_path); @@ -150,12 +150,12 @@ void FilterSylpheed::importFiles( FilterInfo *info, const TQString& dirName) if(info->removeDupMsg) { if(! addMessage( info, _path, dir.filePath(*mailFile), flags )) { - info->addLog( i18n("Could not import %1").arg( *mailFile ) ); + info->addLog( i18n("Could not import %1").tqarg( *mailFile ) ); } info->setCurrent((int) ((float) currentFile / numFiles * 100)); } else { if(! addMessage_fastImport( info, _path, dir.filePath(*mailFile), flags )) { - info->addLog( i18n("Could not import %1").arg( *mailFile ) ); + info->addLog( i18n("Could not import %1").tqarg( *mailFile ) ); } info->setCurrent((int) ((float) currentFile / numFiles * 100)); } diff --git a/kmailcvt/filter_thebat.cxx b/kmailcvt/filter_thebat.cxx index b2e737dad..1ec747789 100644 --- a/kmailcvt/filter_thebat.cxx +++ b/kmailcvt/filter_thebat.cxx @@ -81,7 +81,7 @@ void FilterTheBat::import( FilterInfo *info ) } } - info->addLog( i18n("Finished importing emails from %1").arg( mailDir )); + info->addLog( i18n("Finished importing emails from %1").tqarg( mailDir )); if (count_duplicates > 0) { info->addLog( i18n("1 duplicate message not imported", "%n duplicate messages not imported", count_duplicates)); } @@ -148,7 +148,7 @@ void FilterTheBat::importFiles( FilterInfo *info, const TQString& FileName) TQValueList<long> offsets; if (!tbb.open(IO_ReadOnly)) { - info->alert(i18n("Unable to open %1, skipping").arg(FileName)); + info->alert(i18n("Unable to open %1, skipping").tqarg(FileName)); } else { // BUILD the index of messages : // We need this really ugly way, because read with tbb.readLine() @@ -171,7 +171,7 @@ void FilterTheBat::importFiles( FilterInfo *info, const TQString& FileName) iFound = _tmp.tqcontains(regexp); if(!iFound) { - iFound = _tmp.findRev("!"); + iFound = _tmp.tqfindRev("!"); if (iFound >= 0 && ((l-iFound) < 5) ) { int _i = tbb.at(); tbb.at((_i - iFound)); @@ -182,7 +182,7 @@ void FilterTheBat::importFiles( FilterInfo *info, const TQString& FileName) offsets.append(endOfEmail); } } - // info->addLog(i18n("--COUNTED: %1").arg(count)); + // info->addLog(i18n("--COUNTED: %1").tqarg(count)); // IMPORT the messages: if(!offsets.empty() || (offsets.empty() && (tbb.size() > 3128))) { @@ -196,7 +196,7 @@ void FilterTheBat::importFiles( FilterInfo *info, const TQString& FileName) _tmp = _tmp.remove(_tmp.length() - 13, 13); _path += _tmp.remove( mailDir ,TRUE); TQString _info = _path; - info->addLog(i18n("Import folder %1...").arg(_info.remove(0,14))); + info->addLog(i18n("Import folder %1...").tqarg(_info.remove(0,14))); info->setTo(_path); info->setFrom("../" + _info + "/messages.tbb"); diff --git a/kmailcvt/filter_thunderbird.cxx b/kmailcvt/filter_thunderbird.cxx index a058e28d3..e0c4060eb 100644 --- a/kmailcvt/filter_thunderbird.cxx +++ b/kmailcvt/filter_thunderbird.cxx @@ -91,12 +91,12 @@ void FilterThunderbird::import(FilterInfo *info) TQString temp_mailfile = *mailFile; if (temp_mailfile.endsWith(".msf") || temp_mailfile.endsWith("msgFilterRules.dat")) {} else { - info->addLog( i18n("Start import file %1...").arg( temp_mailfile ) ); + info->addLog( i18n("Start import file %1...").tqarg( temp_mailfile ) ); importMBox(info, mailDir + temp_mailfile , temp_mailfile, TQString()); } } - info->addLog( i18n("Finished importing emails from %1").arg( mailDir )); + info->addLog( i18n("Finished importing emails from %1").tqarg( mailDir )); if(count_duplicates > 0) { info->addLog( i18n("1 duplicate message not imported", "%n duplicate messages not imported", count_duplicates)); } @@ -126,7 +126,7 @@ void FilterThunderbird::importDirContents(FilterInfo *info, const TQString& dirN TQString temp_mailfile = *mailFile; if (temp_mailfile.endsWith(".msf") || temp_mailfile.endsWith("msgFilterRules.dat")) {} else { - info->addLog( i18n("Start import file %1...").arg( temp_mailfile ) ); + info->addLog( i18n("Start import file %1...").tqarg( temp_mailfile ) ); importMBox(info, (dirName + "/" + temp_mailfile) , KMailRootDir, KMailSubDir); } } @@ -158,7 +158,7 @@ void FilterThunderbird::importMBox(FilterInfo *info, const TQString& mboxName, c TQFile mbox(mboxName); bool first_msg = true; if (!mbox.open(IO_ReadOnly)) { - info->alert(i18n("Unable to open %1, skipping").arg(mboxName)); + info->alert(i18n("Unable to open %1, skipping").tqarg(mboxName)); } else { TQFileInfo filenameInfo(mboxName); diff --git a/kmailcvt/filters.cxx b/kmailcvt/filters.cxx index 02f83097a..aaaaa6da8 100644 --- a/kmailcvt/filters.cxx +++ b/kmailcvt/filters.cxx @@ -150,16 +150,16 @@ bool Filter::addMessage( FilterInfo* info, const TQString& folderName, switch ( int( reply ) ) { case -1: - info->alert( i18n( "Cannot make folder %1 in KMail" ).arg( folderName ) ); + info->alert( i18n( "Cannot make folder %1 in KMail" ).tqarg( folderName ) ); return false; case -2: - info->alert( i18n( "Cannot add message to folder %1 in KMail" ).arg( folderName ) ); + info->alert( i18n( "Cannot add message to folder %1 in KMail" ).tqarg( folderName ) ); return false; case -4: count_duplicates++; return false; case 0: - info->alert( i18n( "Error while adding message to folder %1 in KMail" ).arg( folderName ) ); + info->alert( i18n( "Error while adding message to folder %1 in KMail" ).tqarg( folderName ) ); return false; } return true; @@ -185,13 +185,13 @@ bool Filter::addMessage_fastImport( FilterInfo* info, const TQString& folderName switch ( int( reply ) ) { case -1: - info->alert( i18n( "Cannot make folder %1 in KMail" ).arg( folderName ) ); + info->alert( i18n( "Cannot make folder %1 in KMail" ).tqarg( folderName ) ); return false; case -2: - info->alert( i18n( "Cannot add message to folder %1 in KMail" ).arg( folderName ) ); + info->alert( i18n( "Cannot add message to folder %1 in KMail" ).tqarg( folderName ) ); return false; case 0: - info->alert( i18n( "Error while adding message to folder %1 in KMail" ).arg( folderName ) ); + info->alert( i18n( "Error while adding message to folder %1 in KMail" ).tqarg( folderName ) ); return false; } return true; diff --git a/kmailcvt/kselfilterpage.cpp b/kmailcvt/kselfilterpage.cpp index e8a7ce32d..daac374fe 100644 --- a/kmailcvt/kselfilterpage.cpp +++ b/kmailcvt/kselfilterpage.cpp @@ -75,7 +75,7 @@ void KSelFilterPage::filterSelected(int i) TQString info = mFilterList.at(i)->info(); TQString author = mFilterList.at(i)->author(); if(!author.isEmpty()) - info += i18n("<p><i>Written by %1.</i></p>").arg(author); + info += i18n("<p><i>Written by %1.</i></p>").tqarg(author); mDesc->setText(info); } |