From 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:50:21 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- kmailcvt/filter_evolution.cxx | 6 ++-- kmailcvt/filter_evolution_v2.cxx | 6 ++-- kmailcvt/filter_kmail_maildir.cxx | 12 ++++---- kmailcvt/filter_lnotes.cxx | 6 ++-- kmailcvt/filter_mailapp.cxx | 8 ++--- kmailcvt/filter_mbox.cxx | 8 ++--- kmailcvt/filter_oe.cxx | 62 +++++++++++++++++++-------------------- kmailcvt/filter_opera.cxx | 8 ++--- kmailcvt/filter_outlook.cxx | 4 +-- kmailcvt/filter_plain.cxx | 6 ++-- kmailcvt/filter_pmail.cxx | 16 +++++----- kmailcvt/filter_sylpheed.cxx | 10 +++---- kmailcvt/filter_thebat.cxx | 8 ++--- kmailcvt/filter_thunderbird.cxx | 8 ++--- kmailcvt/filters.cxx | 14 ++++----- kmailcvt/kimportpagedlg.ui | 12 ++++---- kmailcvt/kselfilterpage.cpp | 4 +-- kmailcvt/kselfilterpagedlg.ui | 8 ++--- 18 files changed, 103 insertions(+), 103 deletions(-) (limited to 'kmailcvt') diff --git a/kmailcvt/filter_evolution.cxx b/kmailcvt/filter_evolution.cxx index 713a1bf70..900b134bd 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").tqarg( mailDir )); + info->addLog( i18n("Finished importing emails from %1").arg( 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").tqarg(mboxName)); + info->alert(i18n("Unable to open %1, skipping").arg(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...").tqarg(tmp_from)); + info->addLog(i18n("Importing emails from %1...").arg(tmp_from)); TQByteArray input(MAX_LINE); long l = 0; diff --git a/kmailcvt/filter_evolution_v2.cxx b/kmailcvt/filter_evolution_v2.cxx index e80d7a84a..d60953195 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").tqarg( mailDir )); + info->addLog( i18n("Finished importing emails from %1").arg( 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...").tqarg( temp_mailfile ) ); + info->addLog( i18n("Start import file %1...").arg( 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").tqarg(mboxName)); + info->alert(i18n("Unable to open %1, skipping").arg(mboxName)); } else { TQFileInfo filenameInfo(mboxName); diff --git a/kmailcvt/filter_kmail_maildir.cxx b/kmailcvt/filter_kmail_maildir.cxx index e1529b893..2a1961567 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").tqarg( mailDir )); + info->addLog( i18n("Finished importing emails from %1").arg( mailDir )); if (count_duplicates > 0) { info->addLog( i18n("1 duplicate message not imported", "%n duplicate messages not imported", count_duplicates)); } @@ -115,7 +115,7 @@ void FilterKMail_maildir::importDirContents( FilterInfo *info, const TQString& d /** - * Extract the X-tqStatus flag from a mailfile + * Extract the X-Status flag from a mailfile * @param info Information storage for the operation. * @param fileName The full path to the file to import */ @@ -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").tqarg( fileName ) ); + info->alert( i18n("Unable to open %1, skipping").arg( 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...").tqarg(_info.remove(0,12))); + info->addLog(i18n("Import folder %1...").arg(_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").tqarg( *mailFile ) ); + info->addLog( i18n("Could not import %1").arg( *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").tqarg( *mailFile ) ); + info->addLog( i18n("Could not import %1").arg( *mailFile ) ); } info->setCurrent((int) ((float) currentFile / numFiles * 100)); } diff --git a/kmailcvt/filter_lnotes.cxx b/kmailcvt/filter_lnotes.cxx index 648f361d4..4bd3c423f 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").tqarg(*filename) ); + info->addLog( i18n("Importing emails from %1").arg(*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").tqarg( file ) ); + inf->alert( i18n("Unable to open %1, skipping").arg( 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").tqarg(n++)); + inf->setCurrent(i18n("Message %1").arg(n++)); if ( inf->shouldTerminate() ) return; // fall through diff --git a/kmailcvt/filter_mailapp.cxx b/kmailcvt/filter_mailapp.cxx index ebc34fd60..a93519770 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").tqarg( *filename ) ); + info->alert( i18n("Unable to open %1, skipping").arg( *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...").tqarg( *filename ) ); + info->addLog( i18n("Importing emails from %1...").arg( *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").tqarg( *filename ) ); + info->addLog( i18n("Finished importing emails from %1").arg( *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).tqarg(folderName)); + "%n duplicate messages not imported to folder %1 in KMail", count_duplicates).arg(folderName)); } count_duplicates = 0; mbox.close(); diff --git a/kmailcvt/filter_mbox.cxx b/kmailcvt/filter_mbox.cxx index d60c06273..76b376683 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").tqarg( *filename ) ); + info->alert( i18n("Unable to open %1, skipping").arg( *filename ) ); } else { TQFileInfo filenameInfo( *filename ); TQString folderName( "MBOX-" + filenameInfo.baseName(TRUE) ); info->setCurrent(0); - info->addLog( i18n("Importing emails from %1...").tqarg( *filename ) ); + info->addLog( i18n("Importing emails from %1...").arg( *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").tqarg( *filename )); + info->addLog( i18n("Finished importing emails from %1").arg( *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).tqarg(folderName)); + count_duplicates).arg(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 bc5d16fdf..a87ee39af 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.").tqarg(mailDir)); + info->alert(i18n("No Outlook Express mailboxes found in directory %1.").arg(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").tqarg(fileName)); + info->addLog(i18n("Unable to open mailbox %1").arg(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").tqarg( "../" + _nameOfFile)); + info->addLog(i18n("Importing OE4 Mailbox %1").arg( "../" + _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").tqarg( "../" + _nameOfFile)); + info->addLog(i18n("Importing OE5+ Mailbox %1").arg( "../" + _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").tqarg( "../" + _nameOfFile)); + info->addLog(i18n("Importing OE5+ Folder file %1").arg( "../" + _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").tqarg("../" + _nameOfFile)); + // info->addLog(i18n("File %1 does not seem to be an Outlook Express mailbox").arg("../" + _nameOfFile)); } /* ------------------- MBX support ------------------- */ @@ -167,7 +167,7 @@ void FilterOE::mbxImport( FilterInfo *info, TQDataStream& ds) // Read the header ds >> msgCount >> lastMsgNum >> fileSize; - ds.tqdevice()->at( ds.tqdevice()->at() + 64 ); // Skip 0's + ds.device()->at( ds.device()->at() + 64 ); // Skip 0's kdDebug() << "This mailbox has " << msgCount << " messages" << endl; if (msgCount == 0) return; // Don't import empty mailbox @@ -212,9 +212,9 @@ void FilterOE::dbxImport( FilterInfo *info, TQDataStream& ds) { // Get item count & offset of index TQ_UINT32 itemCount, indexPtr; - ds.tqdevice()->at(0xc4); + ds.device()->at(0xc4); ds >> itemCount; - ds.tqdevice()->at(0xe4); + ds.device()->at(0xe4); ds >> indexPtr; kdDebug() << "Item count is " << itemCount << ", Index at " << indexPtr << endl; @@ -223,7 +223,7 @@ void FilterOE::dbxImport( FilterInfo *info, TQDataStream& ds) totalEmails = itemCount; currentEmail = 0; // Parse the indexes - ds.tqdevice()->at(indexPtr); + ds.device()->at(indexPtr); dbxReadIndex(info, ds, indexPtr); } @@ -234,8 +234,8 @@ void FilterOE::dbxReadIndex( FilterInfo *info, TQDataStream& ds, int filePos) TQ_UINT32 self, unknown, nextIndexPtr, parent, indexCount; TQ_UINT8 unknown2, ptrCount; TQ_UINT16 unknown3; - int wasAt = ds.tqdevice()->at(); - ds.tqdevice()->at(filePos); + int wasAt = ds.device()->at(); + ds.device()->at(filePos); kdDebug() << "Reading index of file " << folderName << endl; @@ -260,7 +260,7 @@ void FilterOE::dbxReadIndex( FilterInfo *info, TQDataStream& ds, int filePos) dbxReadIndex(info, ds, nextIndexPtr); } - ds.tqdevice()->at(wasAt); // Restore file position to same as when function called + ds.device()->at(wasAt); // Restore file position to same as when function called } void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos) @@ -268,11 +268,11 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos TQ_UINT32 curOffset, blockSize; TQ_UINT16 unknown; TQ_UINT8 count, unknown2; - int wasAt = ds.tqdevice()->at(); + int wasAt = ds.device()->at(); TQString folderEntry[4]; - ds.tqdevice()->at(filePos); + ds.device()->at(filePos); ds >> curOffset >> blockSize >> unknown >> count >> unknown2; // _dbx_email_headerstruct kdDebug() << "Data block has " << (int) count << " elements" << endl; @@ -284,7 +284,7 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos ds >> type >> value; value &= 0xffffff; - ds.tqdevice()->at(ds.tqdevice()->at() - 1); // We only wanted 3 bytes + ds.device()->at(ds.device()->at() - 1); // We only wanted 3 bytes if(!currentIsFolderFile) { if (type == 0x84) { // It's an email! @@ -292,12 +292,12 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos dbxReadEmail(info, ds, value); ++count0x84; } else if( type == 0x04) { - int currentFilePos = ds.tqdevice()->at(); - ds.tqdevice()->at(filePos + 12 + value + (count*4) ); + int currentFilePos = ds.device()->at(); + ds.device()->at(filePos + 12 + value + (count*4) ); TQ_UINT32 newOFF; ds >> newOFF; kdDebug() << "**** Offset of emaildata (0x04) " << newOFF << endl; - ds.tqdevice()->at(currentFilePos); + ds.device()->at(currentFilePos); dbxReadEmail(info, ds, newOFF); ++count0x04; } @@ -324,7 +324,7 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos if(currentIsFolderFile) { folderStructure.append(folderEntry); } - ds.tqdevice()->at(wasAt); // Restore file position to same as when function called + ds.device()->at(wasAt); // Restore file position to same as when function called } void FilterOE::dbxReadEmail( FilterInfo *info, TQDataStream& ds, int filePos) @@ -335,8 +335,8 @@ void FilterOE::dbxReadEmail( FilterInfo *info, TQDataStream& ds, int filePos) TQ_UINT8 intCount, unknown; KTempFile tmp; bool _break = false; - int wasAt = ds.tqdevice()->at(); - ds.tqdevice()->at(filePos); + int wasAt = ds.device()->at(); + ds.device()->at(filePos); do { ds >> self >> nextAddressOffset >> blockSize >> intCount >> unknown >> nextAddress; // _dbx_block_hdrstruct @@ -348,7 +348,7 @@ void FilterOE::dbxReadEmail( FilterInfo *info, TQDataStream& ds, int filePos) _break = true; break; } - ds.tqdevice()->at(nextAddress); + ds.device()->at(nextAddress); } while (nextAddress != 0); tmp.close(); @@ -361,7 +361,7 @@ void FilterOE::dbxReadEmail( FilterInfo *info, TQDataStream& ds, int filePos) currentEmail++; int currentPercentage = (int) ( ( (float) currentEmail / totalEmails ) * 100 ); info->setCurrent(currentPercentage); - ds.tqdevice()->at(wasAt); + ds.device()->at(wasAt); } tmp.unlink(); } @@ -371,18 +371,18 @@ TQString FilterOE::parseFolderString( TQDataStream& ds, int filePos ) { char tmp; TQString returnString; - int wasAt = ds.tqdevice()->at(); - ds.tqdevice()->at(filePos); + int wasAt = ds.device()->at(); + ds.device()->at(filePos); // read while != 0x00 - while( !ds.tqdevice()->atEnd() ) { - tmp = ds.tqdevice()->getch(); + while( !ds.device()->atEnd() ) { + tmp = ds.device()->getch(); if( tmp != 0x00) { returnString += tmp; } else break; } - ds.tqdevice()->at(wasAt); + ds.device()->at(wasAt); return returnString; } @@ -404,7 +404,7 @@ TQString FilterOE::getFolderName(TQString filename) TQString _tmpFileName = tmp[1]; _tmpFileName = _tmpFileName.lower(); if(_tmpFileName == search) { - folder.prepend( tmp[0] + TQString::tqfromLatin1("/") ); + folder.prepend( tmp[0] + TQString::fromLatin1("/") ); search = tmp[3]; foundFilename = true; } @@ -416,7 +416,7 @@ TQString FilterOE::getFolderName(TQString filename) found = true; break; } else { - folder.prepend( tmp[0] + TQString::tqfromLatin1("/") ); + folder.prepend( tmp[0] + TQString::fromLatin1("/") ); search = tmp[3]; } } diff --git a/kmailcvt/filter_opera.cxx b/kmailcvt/filter_opera.cxx index 37e19aa1e..65e2eae4b 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").tqarg( *mailFile ) ); + info->alert( i18n("Unable to open %1, skipping").arg( *mailFile ) ); } else { - info->addLog( i18n("Importing emails from %1...").tqarg( *mailFile ) ); + info->addLog( i18n("Importing emails from %1...").arg( *mailFile ) ); TQFileInfo filenameInfo( importDir.filePath(*mailFile) ); TQString folderName( "OPERA-" + importDir.dirName() ); @@ -114,7 +114,7 @@ void FilterOpera::import(FilterInfo *info) tmp.file()->writeBlock( input, l ); while ( ! operaArchiv.atEnd() && (l = operaArchiv.readLine(input.data(),MAX_LINE)) && ((seperate = input.data()).left(5) != "From ")) { - /** remove in KMail unneeded Flags from Opera (for example: X-Opera-tqStatus)*/ + /** remove in KMail unneeded Flags from Opera (for example: X-Opera-Status)*/ if(seperate.left(8) != "X-Opera-") tmp.file()->writeBlock( input, l ); } @@ -138,7 +138,7 @@ void FilterOpera::import(FilterInfo *info) if ( info->shouldTerminate() ) break; } - info->addLog( i18n("Finished importing emails from %1").tqarg( *mailFile )); + info->addLog( i18n("Finished importing emails from %1").arg( *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 7d6a9b8c4..a5a9f407c 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...").tqarg( *pstFile ) ); + info->addLog( i18n("Importing emails from %1...").arg( *pstFile ) ); info->addLog( i18n("1 duplicate message not imported", "%n duplicate messages not imported", count_duplicates)); - info->alert( i18n("Unable to open %1, skipping").tqarg( *pstFile ) ); + info->alert( i18n("Unable to open %1, skipping").arg( *pstFile ) ); } } diff --git a/kmailcvt/filter_plain.cxx b/kmailcvt/filter_plain.cxx index a0dbad135..04abea3d3 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").tqarg( *mailFile ) ); + info->addLog( i18n("Could not import %1").arg( *mailFile ) ); } } else { if( ! addMessage_fastImport( info, "PLAIN-" + dir.dirName(), dir.filePath(*mailFile) )) { - info->addLog( i18n("Could not import %1").tqarg( *mailFile ) ); + info->addLog( i18n("Could not import %1").arg( *mailFile ) ); } } @@ -77,7 +77,7 @@ void FilterPlain::import(FilterInfo *info) if ( info->shouldTerminate() ) break; } - info->addLog( i18n("Finished importing emails from %1").tqarg( mailDir )); + info->addLog( i18n("Finished importing emails from %1").arg( 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 982d713a9..699e3adb3 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").tqarg( chosenDir )); + info->addLog( i18n("Finished importing emails from %1").arg( 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").tqarg(file)); + inf->alert(i18n("Unable to open %1, skipping").arg(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").tqarg("../" + TQString(pmm_head.folder))); + inf->addLog(i18n("Importing %1").arg("../" + TQString(pmm_head.folder))); TQByteArray input(MAX_LINE); bool first_msg = true; @@ -232,7 +232,7 @@ void FilterPMail::importUnixMailFolder(const TQString& file) s.replace( TQRegExp("MBX$"), "PMG"); f.setName(s); if (! f.open( IO_ReadOnly ) ) { - inf->alert( i18n("Unable to open %1, skipping").tqarg( s ) ); + inf->alert( i18n("Unable to open %1, skipping").arg( 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").tqarg( s ) ); + inf->alert( i18n("Unable to open %1, skipping").arg( s ) ); } else { - inf->addLog(i18n("Importing %1").tqarg("../" + TQString(pmg_head.folder))); + inf->addLog(i18n("Importing %1").arg("../" + 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").tqarg(n)); + inf->setCurrent(i18n("Message %1").arg(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").tqarg( chosenDir + "hierarch.pm" ) ); + inf->alert( i18n("Unable to open %1, skipping").arg( chosenDir + "hierarch.pm" ) ); return false; } else { TQStringList tmpList; diff --git a/kmailcvt/filter_sylpheed.cxx b/kmailcvt/filter_sylpheed.cxx index 47c134b47..2174c681f 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").tqarg( mailDir )); + info->addLog( i18n("Finished importing emails from %1").arg( 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...").tqarg(_info.remove(0,15))); + info->addLog(i18n("Import folder %1...").arg(_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").tqarg( *mailFile ) ); + info->addLog( i18n("Could not import %1").arg( *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").tqarg( *mailFile ) ); + info->addLog( i18n("Could not import %1").arg( *mailFile ) ); } info->setCurrent((int) ((float) currentFile / numFiles * 100)); } @@ -167,7 +167,7 @@ void FilterSylpheed::importFiles( FilterInfo *info, const TQString& dirName) void FilterSylpheed::readMarkFile( FilterInfo *info, const TQString &path, TQDict &dict ) { /* Each sylpheed mail directory contains a .sylpheed_mark file which - * contains all the flags for each messages. The tqlayout of this file + * contains all the flags for each messages. The layout of this file * is documented in the source code of sylpheed: in procmsg.h for * the flag bits, and procmsg.c. * diff --git a/kmailcvt/filter_thebat.cxx b/kmailcvt/filter_thebat.cxx index 04dcdb127..52cd98589 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").tqarg( mailDir )); + info->addLog( i18n("Finished importing emails from %1").arg( 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 offsets; if (!tbb.open(IO_ReadOnly)) { - info->alert(i18n("Unable to open %1, skipping").tqarg(FileName)); + info->alert(i18n("Unable to open %1, skipping").arg(FileName)); } else { // BUILD the index of messages : // We need this really ugly way, because read with tbb.readLine() @@ -182,7 +182,7 @@ void FilterTheBat::importFiles( FilterInfo *info, const TQString& FileName) offsets.append(endOfEmail); } } - // info->addLog(i18n("--COUNTED: %1").tqarg(count)); + // info->addLog(i18n("--COUNTED: %1").arg(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...").tqarg(_info.remove(0,14))); + info->addLog(i18n("Import folder %1...").arg(_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 301d29d0e..ea739dac1 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...").tqarg( temp_mailfile ) ); + info->addLog( i18n("Start import file %1...").arg( temp_mailfile ) ); importMBox(info, mailDir + temp_mailfile , temp_mailfile, TQString()); } } - info->addLog( i18n("Finished importing emails from %1").tqarg( mailDir )); + info->addLog( i18n("Finished importing emails from %1").arg( 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...").tqarg( temp_mailfile ) ); + info->addLog( i18n("Start import file %1...").arg( 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").tqarg(mboxName)); + info->alert(i18n("Unable to open %1, skipping").arg(mboxName)); } else { TQFileInfo filenameInfo(mboxName); diff --git a/kmailcvt/filters.cxx b/kmailcvt/filters.cxx index 8feae7fd0..a406f1c3f 100644 --- a/kmailcvt/filters.cxx +++ b/kmailcvt/filters.cxx @@ -49,7 +49,7 @@ FilterInfo::~FilterInfo() void FilterInfo::seStatusMsg( const TQString& status ) { - m_dlg->_textqStatus->setText( status ); + m_dlg->_texStatus->setText( status ); } void FilterInfo::setFrom( const TQString& from ) @@ -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" ).tqarg( folderName ) ); + info->alert( i18n( "Cannot make folder %1 in KMail" ).arg( folderName ) ); return false; case -2: - info->alert( i18n( "Cannot add message to folder %1 in KMail" ).tqarg( folderName ) ); + info->alert( i18n( "Cannot add message to folder %1 in KMail" ).arg( folderName ) ); return false; case -4: count_duplicates++; return false; case 0: - info->alert( i18n( "Error while adding message to folder %1 in KMail" ).tqarg( folderName ) ); + info->alert( i18n( "Error while adding message to folder %1 in KMail" ).arg( 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" ).tqarg( folderName ) ); + info->alert( i18n( "Cannot make folder %1 in KMail" ).arg( folderName ) ); return false; case -2: - info->alert( i18n( "Cannot add message to folder %1 in KMail" ).tqarg( folderName ) ); + info->alert( i18n( "Cannot add message to folder %1 in KMail" ).arg( folderName ) ); return false; case 0: - info->alert( i18n( "Error while adding message to folder %1 in KMail" ).tqarg( folderName ) ); + info->alert( i18n( "Error while adding message to folder %1 in KMail" ).arg( folderName ) ); return false; } return true; diff --git a/kmailcvt/kimportpagedlg.ui b/kmailcvt/kimportpagedlg.ui index cdb9eaa7b..0a1e7da4f 100644 --- a/kmailcvt/kimportpagedlg.ui +++ b/kmailcvt/kimportpagedlg.ui @@ -28,7 +28,7 @@ 0 - + 170 430 @@ -60,7 +60,7 @@ Fixed - + 10 10 @@ -69,7 +69,7 @@ - tqlayout16 + layout16 @@ -77,7 +77,7 @@ - tqlayout90 + layout90 @@ -109,12 +109,12 @@ - _textqStatus + _texStatus Importing in progress... - + AlignTop diff --git a/kmailcvt/kselfilterpage.cpp b/kmailcvt/kselfilterpage.cpp index a562219a3..cc02bbfc0 100644 --- a/kmailcvt/kselfilterpage.cpp +++ b/kmailcvt/kselfilterpage.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include -#include +#include #include #include #include "filters.hxx" @@ -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("

Written by %1.

").tqarg(author); + info += i18n("

Written by %1.

").arg(author); mDesc->setText(info); } diff --git a/kmailcvt/kselfilterpagedlg.ui b/kmailcvt/kselfilterpagedlg.ui index de52967ef..f8237504b 100644 --- a/kmailcvt/kselfilterpagedlg.ui +++ b/kmailcvt/kselfilterpagedlg.ui @@ -28,7 +28,7 @@ 0 - + 170 430 @@ -60,7 +60,7 @@ Fixed - + 10 10 @@ -69,7 +69,7 @@ - tqlayout19 + layout19 @@ -96,7 +96,7 @@ This program will help you import your email from your previous email program in RichText - + WordBreak|AlignTop|AlignLeft -- cgit v1.2.1