diff options
Diffstat (limited to 'ktnef/lib/ktnefparser.cpp')
-rw-r--r-- | ktnef/lib/ktnefparser.cpp | 94 |
1 files changed, 47 insertions, 47 deletions
diff --git a/ktnef/lib/ktnefparser.cpp b/ktnef/lib/ktnefparser.cpp index a73a1d547..cd0063466 100644 --- a/ktnef/lib/ktnefparser.cpp +++ b/ktnef/lib/ktnefparser.cpp @@ -70,7 +70,7 @@ public: defaultdir_ = "/tmp/"; current_ = 0; deleteDevice_ = false; - device_ = 0; + tqdevice_ = 0; message_ = new KTNEFMessage; } ~ParserPrivate() @@ -79,7 +79,7 @@ public: } TQDataStream stream_; - TQIODevice *device_; + TQIODevice *tqdevice_; bool deleteDevice_; TQString defaultdir_; KTNEFAttach *current_; @@ -105,8 +105,8 @@ KTNEFMessage* KTNEFParser::message() const void KTNEFParser::deleteDevice() { if ( d->deleteDevice_ ) - delete d->device_; - d->device_ = 0; + delete d->tqdevice_; + d->tqdevice_ = 0; d->deleteDevice_ = false; } @@ -124,7 +124,7 @@ bool KTNEFParser::decodeMessage() // read data length d->stream_ >> i2; // offset after reading the value - off = d->device_->at() + i2; + off = d->tqdevice_->at() + i2; switch ( tag ) { case attAIDOWNER: @@ -158,9 +158,9 @@ bool KTNEFParser::decodeMessage() kdDebug() << "Message MAPI Properties" << " (length=" << i2 << ")" << endl; { int nProps = d->message_->properties().count(); - i2 += d->device_->at(); + i2 += d->tqdevice_->at(); readMAPIProperties( d->message_->properties(), 0 ); - d->device_->at( i2 ); + d->tqdevice_->at( i2 ); kdDebug() << "Properties: " << d->message_->properties().count() << endl; value = TQString( "< %1 properties >" ).arg( d->message_->properties().count() - nProps ); } @@ -171,7 +171,7 @@ bool KTNEFParser::decodeMessage() break; case attFROM: d->message_->addProperty( 0x0024, MAPI_TYPE_STRING8, readTNEFAddress( d->stream_ ) ); - d->device_->at( d->device_->at() - i2 ); + d->tqdevice_->at( d->tqdevice_->at() - i2 ); value = readTNEFData( d->stream_, i2 ); kdDebug() << "Message From" << " (length=" << i2 << ")" << endl; break; @@ -198,7 +198,7 @@ bool KTNEFParser::decodeMessage() d->message_->addProperty( 0x0E07, MAPI_TYPE_ULONG, flag ); value = c; } - kdDebug() << "Message Status" << " (length=" << i2 << ")" << endl; + kdDebug() << "Message tqStatus" << " (length=" << i2 << ")" << endl; break; case attRECIPTABLE: { @@ -212,7 +212,7 @@ bool KTNEFParser::decodeMessage() recipTable << formatRecipient( props ); } d->message_->addProperty( 0x0E12, MAPI_TYPE_STRING8, recipTable ); - d->device_->at( d->device_->at() - i2 ); + d->tqdevice_->at( d->tqdevice_->at() - i2 ); value = readTNEFData( d->stream_, i2 ); } kdDebug() << "Message Recipient Table" << " (length=" << i2 << ")" << endl; @@ -242,13 +242,13 @@ bool KTNEFParser::decodeMessage() break; } // skip data - if ( d->device_->at() != off && !d->device_->at( off ) ) + if ( d->tqdevice_->at() != off && !d->tqdevice_->at( off ) ) return false; // get checksum d->stream_ >> u; // add TNEF attribute d->message_->addAttribute( tag, type, value, true ); - //kdDebug() << "stream: " << d->device_->at() << endl; + //kdDebug() << "stream: " << d->tqdevice_->at() << endl; return true; } @@ -273,15 +273,15 @@ bool KTNEFParser::decodeAttachment() break; case attATTACHDATA: d->current_->setSize( i ); - d->current_->setOffset( d->device_->at() ); - d->device_->at( d->device_->at() + i ); + d->current_->setOffset( d->tqdevice_->at() ); + d->tqdevice_->at( d->tqdevice_->at() + i ); value = TQString( "< size=%1 >" ).arg( i ); kdDebug() << "Attachment Data: size=" << i << endl; break; case attATTACHMENT: // try to get attachment info - i += d->device_->at(); + i += d->tqdevice_->at(); readMAPIProperties( d->current_->properties(), d->current_ ); - d->device_->at( i ); + d->tqdevice_->at( i ); d->current_->setIndex( d->current_->property( MAPI_TAG_INDEX ).toUInt() ); d->current_->setDisplaySize( d->current_->property( MAPI_TAG_SIZE ).toUInt() ); str = d->current_->property( MAPI_TAG_DISPLAYNAME ).toString(); @@ -305,7 +305,7 @@ bool KTNEFParser::decodeAttachment() case attATTACHMETAFILE: kdDebug() << "Attachment Metafile: size=" << i << endl; //value = TQString( "< size=%1 >" ).arg( i ); - //d->device_->at( d->device_->at()+i ); + //d->tqdevice_->at( d->tqdevice_->at()+i ); value = readTNEFData( d->stream_, i ); break; default: @@ -316,7 +316,7 @@ bool KTNEFParser::decodeAttachment() d->stream_ >> u; // u <- checksum // add TNEF attribute d->current_->addAttribute( tag, type, value, true ); - //kdDebug() << "stream: " << d->device_->at() << endl; + //kdDebug() << "stream: " << d->tqdevice_->at() << endl; return true; } @@ -339,19 +339,19 @@ bool KTNEFParser::parseDevice() d->current_ = 0; } - if ( !d->device_->open( IO_ReadOnly ) ) { - kdDebug() << "Couldn't open device" << endl; + if ( !d->tqdevice_->open( IO_ReadOnly ) ) { + kdDebug() << "Couldn't open tqdevice" << endl; return false; } - d->stream_.setDevice( d->device_ ); + d->stream_.setDevice( d->tqdevice_ ); d->stream_.setByteOrder( TQDataStream::LittleEndian ); d->stream_ >> i; if (i == TNEF_SIGNATURE) { d->stream_ >> u; kdDebug().form( "Attachment cross reference key: 0x%04x\n",u ); - //kdDebug() << "stream: " << d->device_->at() << endl; + //kdDebug() << "stream: " << d->tqdevice_->at() << endl; while (!d->stream_.eof()) { d->stream_ >> c; @@ -364,7 +364,7 @@ bool KTNEFParser::parseDevice() if (!decodeAttachment()) goto end; break; default: - kdDebug() << "Unknown Level: " << c << ", at offset " << d->device_->at() << endl; + kdDebug() << "Unknown Level: " << c << ", at offset " << d->tqdevice_->at() << endl; goto end; } } @@ -381,7 +381,7 @@ bool KTNEFParser::parseDevice() else { kdDebug() << "This is not a TNEF file" << endl; -end: d->device_->close(); +end: d->tqdevice_->close(); return false; } } @@ -395,10 +395,10 @@ bool KTNEFParser::extractFile(const TQString& filename) bool KTNEFParser::extractAttachmentTo(KTNEFAttach *att, const TQString& dirname) { - QString filename = dirname + "/" + att->name(); - if (!d->device_->isOpen()) + TQString filename = dirname + "/" + att->name(); + if (!d->tqdevice_->isOpen()) return false; - if (!d->device_->at(att->offset())) + if (!d->tqdevice_->at(att->offset())) return false; KSaveFile saveFile( filename ); TQFile *outfile = saveFile.file(); @@ -411,7 +411,7 @@ bool KTNEFParser::extractAttachmentTo(KTNEFAttach *att, const TQString& dirname) bool ok(true); while (ok && len > 0) { - n = d->device_->readBlock(buf,QMIN(sz,len)); + n = d->tqdevice_->readBlock(buf,TQMIN(sz,len)); if (n < 0) ok = false; else @@ -447,15 +447,15 @@ bool KTNEFParser::openFile(const TQString& filename) deleteDevice(); delete d->message_; d->message_ = new KTNEFMessage(); - d->device_ = new TQFile( filename ); + d->tqdevice_ = new TQFile( filename ); d->deleteDevice_ = true; return parseDevice(); } -bool KTNEFParser::openDevice( TQIODevice *device ) +bool KTNEFParser::openDevice( TQIODevice *tqdevice ) { deleteDevice(); - d->device_ = device; + d->tqdevice_ = tqdevice; return parseDevice(); } @@ -478,16 +478,16 @@ void KTNEFParser::checkCurrent( int key ) // and/or content (using at most 32 bytes) KMimeType::Ptr mimetype; if ( !d->current_->fileName().isEmpty() ) - mimetype = KMimeType::tqfindByPath( d->current_->fileName(), 0, true ); + mimetype = KMimeType::findByPath( d->current_->fileName(), 0, true ); if (!mimetype) return; // FIXME if ( mimetype->name() == "application/octet-stream" && d->current_->size() > 0 ) { - int oldOffset = d->device_->at(); - TQByteArray buffer( QMIN( 32, d->current_->size() ) ); - d->device_->at( d->current_->offset() ); - d->device_->readBlock( buffer.data(), buffer.size() ); - mimetype = KMimeType::tqfindByContent( buffer ); - d->device_->at( oldOffset ); + int oldOffset = d->tqdevice_->at(); + TQByteArray buffer( TQMIN( 32, d->current_->size() ) ); + d->tqdevice_->at( d->current_->offset() ); + d->tqdevice_->readBlock( buffer.data(), buffer.size() ); + mimetype = KMimeType::findByContent( buffer ); + d->tqdevice_->at( oldOffset ); } d->current_->setMimeTag( mimetype->name() ); } @@ -554,11 +554,11 @@ TQString formatRecipient( const TQMap<int,KTNEFProperty*>& props ) { TQString s, dn, addr, t; TQMap<int,KTNEFProperty*>::ConstIterator it; - if ( ( it = props.find( 0x3001 ) ) != props.end() ) + if ( ( it = props.tqfind( 0x3001 ) ) != props.end() ) dn = ( *it )->valueString(); - if ( ( it = props.find( 0x3003 ) ) != props.end() ) + if ( ( it = props.tqfind( 0x3003 ) ) != props.end() ) addr = ( *it )->valueString(); - if ( ( it = props.find( 0x0C15 ) ) != props.end() ) + if ( ( it = props.tqfind( 0x0C15 ) ) != props.end() ) switch ( ( *it )->value().toInt() ) { case 0: t = "From:"; break; @@ -791,20 +791,20 @@ bool KTNEFParser::readMAPIProperties( TQMap<int,KTNEFProperty*>& props, KTNEFAtt TQByteArray data = mapi.value.toByteArray(); int len = data.size(); ALIGN( len, 4 ); - d->device_->at( d->device_->at()-len ); + d->tqdevice_->at( d->tqdevice_->at()-len ); TQ_UINT32 interface_ID; d->stream_ >> interface_ID; if ( interface_ID == MAPI_IID_IMessage ) { // embedded TNEF file attach->unsetDataParser(); - attach->setOffset( d->device_->at()+12 ); + attach->setOffset( d->tqdevice_->at()+12 ); attach->setSize( data.size()-16 ); attach->setMimeTag( "application/ms-tnef" ); attach->setDisplayName( "Embedded Message" ); kdDebug() << "MAPI Embedded Message: size=" << data.size() << endl; } - d->device_->at( d->device_->at() + ( len-4 ) ); + d->tqdevice_->at( d->tqdevice_->at() + ( len-4 ) ); break; } else if ( mapi.type == MAPI_TYPE_BINARY && attach && attach->offset() < 0 ) @@ -813,7 +813,7 @@ bool KTNEFParser::readMAPIProperties( TQMap<int,KTNEFProperty*>& props, KTNEFAtt int len = mapi.value.toByteArray().size(); ALIGN( len, 4 ) attach->setSize( len ); - attach->setOffset( d->device_->at() - len ); + attach->setOffset( d->tqdevice_->at() - len ); attach->addAttribute( attATTACHDATA, atpBYTE, TQString( "< size=%1 >" ).arg( len ), false ); } } @@ -855,12 +855,12 @@ bool KTNEFParser::readMAPIProperties( TQMap<int,KTNEFProperty*>& props, KTNEFAtt break; } // do not remove potential existing similar entry - if ( ( it = props.find( key ) ) == props.end() ) + if ( ( it = props.tqfind( key ) ) == props.end() ) { p = new KTNEFProperty( key, ( mapi.type & 0x0FFF ), mapi.value, mapi.name.value ); props[ p->key() ] = p; } - //kdDebug() << "stream: " << d->device_->at() << endl; + //kdDebug() << "stream: " << d->tqdevice_->at() << endl; } if ( foundAttachment && attach ) |