diff options
Diffstat (limited to 'kmailcvt/filter_oe.cxx')
| -rw-r--r-- | kmailcvt/filter_oe.cxx | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/kmailcvt/filter_oe.cxx b/kmailcvt/filter_oe.cxx index bde399b6..c60eced6 100644 --- a/kmailcvt/filter_oe.cxx +++ b/kmailcvt/filter_oe.cxx @@ -123,7 +123,7 @@ void FilterOE::importMailBox( FilterInfo *info, const TQString& fileName) mailbox.setByteOrder(TQDataStream::LittleEndian); // Parse magic - Q_UINT32 sig_block1, sig_block2; + TQ_UINT32 sig_block1, sig_block2; mailbox >> sig_block1 >> sig_block2; if (sig_block1 == OE4_SIG_1 && sig_block2 == OE4_SIG_2) { folderName = "OE-Import/" + mailfileinfo.baseName(TRUE); @@ -132,7 +132,7 @@ void FilterOE::importMailBox( FilterInfo *info, const TQString& fileName) mbxImport(info, mailbox); return; } else { - Q_UINT32 sig_block3, sig_block4; + TQ_UINT32 sig_block3, sig_block4; mailbox >> sig_block3 >> sig_block4; if (sig_block1 == OE5_SIG_1 && sig_block3 == OE5_SIG_3 && sig_block4 == OE5_SIG_4) { if (sig_block2 == OE5_EMAIL_SIG_2) { @@ -163,7 +163,7 @@ void FilterOE::importMailBox( FilterInfo *info, const TQString& fileName) void FilterOE::mbxImport( FilterInfo *info, TQDataStream& ds) { - Q_UINT32 msgCount, lastMsgNum, fileSize; + TQ_UINT32 msgCount, lastMsgNum, fileSize; // Read the header ds >> msgCount >> lastMsgNum >> fileSize; @@ -172,11 +172,11 @@ void FilterOE::mbxImport( FilterInfo *info, TQDataStream& ds) if (msgCount == 0) return; // Don't import empty mailbox - Q_UINT32 msgMagic; + TQ_UINT32 msgMagic; ds >> msgMagic; // Read first magic while (!ds.atEnd()) { - Q_UINT32 msgNumber, msgSize, msgTextSize; + TQ_UINT32 msgNumber, msgSize, msgTextSize; KTempFile tmp; tmp.dataStream()->setByteOrder(TQDataStream::LittleEndian); @@ -211,7 +211,7 @@ void FilterOE::mbxImport( FilterInfo *info, TQDataStream& ds) void FilterOE::dbxImport( FilterInfo *info, TQDataStream& ds) { // Get item count & offset of index - Q_UINT32 itemCount, indexPtr; + TQ_UINT32 itemCount, indexPtr; ds.device()->at(0xc4); ds >> itemCount; ds.device()->at(0xe4); @@ -231,9 +231,9 @@ void FilterOE::dbxReadIndex( FilterInfo *info, TQDataStream& ds, int filePos) { if(info->shouldTerminate()) return; - Q_UINT32 self, unknown, nextIndexPtr, parent, indexCount; - Q_UINT8 unknown2, ptrCount; - Q_UINT16 unknown3; + TQ_UINT32 self, unknown, nextIndexPtr, parent, indexCount; + TQ_UINT8 unknown2, ptrCount; + TQ_UINT16 unknown3; int wasAt = ds.device()->at(); ds.device()->at(filePos); @@ -244,7 +244,7 @@ void FilterOE::dbxReadIndex( FilterInfo *info, TQDataStream& ds, int filePos) kdDebug() << "This index has " << (int) ptrCount << " data pointers" << endl; for (int count = 0; count < ptrCount; count++) { if(info->shouldTerminate()) return; - Q_UINT32 dataIndexPtr, anotherIndexPtr, anotherIndexCount; // _dbx_indexstruct + TQ_UINT32 dataIndexPtr, anotherIndexPtr, anotherIndexCount; // _dbx_indexstruct ds >> dataIndexPtr >> anotherIndexPtr >> anotherIndexCount; if (anotherIndexCount > 0) { @@ -265,9 +265,9 @@ void FilterOE::dbxReadIndex( FilterInfo *info, TQDataStream& ds, int filePos) void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos) { - Q_UINT32 curOffset, blockSize; - Q_UINT16 unknown; - Q_UINT8 count, unknown2; + TQ_UINT32 curOffset, blockSize; + TQ_UINT16 unknown; + TQ_UINT8 count, unknown2; int wasAt = ds.device()->at(); TQString folderEntry[4]; @@ -279,8 +279,8 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos for (int c = 0; c < count; c++) { if(info->shouldTerminate()) return; - Q_UINT8 type; // _dbx_email_pointerstruct - Q_UINT32 value; // Actually 24 bit + TQ_UINT8 type; // _dbx_email_pointerstruct + TQ_UINT32 value; // Actually 24 bit ds >> type >> value; value &= 0xffffff; @@ -294,7 +294,7 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos } else if( type == 0x04) { int currentFilePos = ds.device()->at(); ds.device()->at(filePos + 12 + value + (count*4) ); - Q_UINT32 newOFF; + TQ_UINT32 newOFF; ds >> newOFF; kdDebug() << "**** Offset of emaildata (0x04) " << newOFF << endl; ds.device()->at(currentFilePos); @@ -330,9 +330,9 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos void FilterOE::dbxReadEmail( FilterInfo *info, TQDataStream& ds, int filePos) { if(info->shouldTerminate()) return; - Q_UINT32 self, nextAddressOffset, nextAddress=0; - Q_UINT16 blockSize; - Q_UINT8 intCount, unknown; + TQ_UINT32 self, nextAddressOffset, nextAddress=0; + TQ_UINT16 blockSize; + TQ_UINT8 intCount, unknown; KTempFile tmp; bool _break = false; int wasAt = ds.device()->at(); @@ -404,7 +404,7 @@ TQString FilterOE::getFolderName(TQString filename) TQString _tmpFileName = tmp[1]; _tmpFileName = _tmpFileName.lower(); if(_tmpFileName == search) { - folder.prepend( tmp[0] + TQString::fromLatin1("/") ); + folder.prepend( tmp[0] + TQString::tqfromLatin1("/") ); search = tmp[3]; foundFilename = true; } @@ -416,7 +416,7 @@ TQString FilterOE::getFolderName(TQString filename) found = true; break; } else { - folder.prepend( tmp[0] + TQString::fromLatin1("/") ); + folder.prepend( tmp[0] + TQString::tqfromLatin1("/") ); search = tmp[3]; } } |