summaryrefslogtreecommitdiffstats
path: root/kmailcvt/filter_oe.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'kmailcvt/filter_oe.cxx')
-rw-r--r--kmailcvt/filter_oe.cxx62
1 files changed, 31 insertions, 31 deletions
diff --git a/kmailcvt/filter_oe.cxx b/kmailcvt/filter_oe.cxx
index bc5d16fd..a87ee39a 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];
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-18 06:11:35 +0000