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

2 files changed, 8 insertions, 8 deletions

diff --git a/ktnef/lib/ktnefmessage.cpp b/ktnef/lib/ktnefmessage.cpp
index 8a8bf0655..202f080a1 100644
--- a/ktnef/lib/ktnefmessage.cpp
+++ b/ktnef/lib/ktnefmessage.cpp
@@ -76,7 +76,7 @@ TQString KTNEFMessage::rtfString()
 		TQByteArray rtf;
 		TQBuffer input( prop.asByteArray() ), output( rtf );
 		if ( input.open( IO_ReadOnly ) && output.open( IO_WriteOnly ) )
-			lzfu_decompress( &input, &output );
+			lzfu_decompress( &TQT_TQIODEVICE_OBJECT(input), &TQT_TQIODEVICE_OBJECT(output) );
 		return TQString( rtf );
 	}
 }
diff --git a/ktnef/lib/ktnefparser.cpp b/ktnef/lib/ktnefparser.cpp
index cd0063466..41bb2b687 100644
--- a/ktnef/lib/ktnefparser.cpp
+++ b/ktnef/lib/ktnefparser.cpp
@@ -162,7 +162,7 @@ bool KTNEFParser::decodeMessage()
 				readMAPIProperties( d->message_->properties(), 0 );
 				d->tqdevice_->at( i2 );
 				kdDebug() << "Properties: " << d->message_->properties().count() << endl;
-				value = TQString( "< %1 properties >" ).arg( d->message_->properties().count() - nProps );
+				value = TQString( "< %1 properties >" ).tqarg( d->message_->properties().count() - nProps );
 			}
 			break;
 		case attTNEFVERSION:
@@ -275,7 +275,7 @@ bool KTNEFParser::decodeAttachment()
 		   d->current_->setSize( i );
 		   d->current_->setOffset( d->tqdevice_->at() );
 		   d->tqdevice_->at( d->tqdevice_->at() + i );
-		   value = TQString( "< size=%1 >" ).arg( i );
+		   value = TQString( "< size=%1 >" ).tqarg( i );
 		   kdDebug() << "Attachment Data: size=" << i << endl;
 		   break;
 	   case attATTACHMENT:	// try to get attachment info
@@ -292,7 +292,7 @@ bool KTNEFParser::decodeAttachment()
 		   if ( !str.isEmpty() )
 			   d->current_->setMimeTag( str );
 		   d->current_->setExtension( d->current_->property( MAPI_TAG_EXTENSION ).toString() );
-		   value = TQString( "< %1 properties >" ).arg( d->current_->properties().count() );
+		   value = TQString( "< %1 properties >" ).tqarg( d->current_->properties().count() );
 		   break;
 	   case attATTACHMODDATE:
 		   value = readTNEFDate( d->stream_ );
@@ -304,7 +304,7 @@ bool KTNEFParser::decodeAttachment()
 		   break;
 	   case attATTACHMETAFILE:
 		   kdDebug() << "Attachment Metafile: size=" << i << endl;
-		   //value = TQString( "< size=%1 >" ).arg( i );
+		   //value = TQString( "< size=%1 >" ).tqarg( i );
 		   //d->tqdevice_->at( d->tqdevice_->at()+i );
 		   value = readTNEFData( d->stream_, i );
 		   break;
@@ -447,7 +447,7 @@ bool KTNEFParser::openFile(const TQString& filename)
 	deleteDevice();
 	delete d->message_;
 	d->message_ = new KTNEFMessage();
-	d->tqdevice_ = new TQFile( filename );
+	d->tqdevice_ = TQT_TQIODEVICE(new TQFile( filename ));
 	d->deleteDevice_ = true;
 	return parseDevice();
 }
@@ -814,7 +814,7 @@ bool KTNEFParser::readMAPIProperties( TQMap<int,KTNEFProperty*>& props, KTNEFAtt
 					ALIGN( len, 4 )
 					attach->setSize( len );
 					attach->setOffset( d->tqdevice_->at() - len );
-					attach->addAttribute( attATTACHDATA, atpBYTE, TQString( "< size=%1 >" ).arg( len ), false );
+					attach->addAttribute( attATTACHDATA, atpBYTE, TQString( "< size=%1 >" ).tqarg( len ), false );
 				}
 			}
 			kdDebug().form( "MAPI data: size=%d\n", mapi.value.toByteArray().size() );
@@ -827,7 +827,7 @@ bool KTNEFParser::readMAPIProperties( TQMap<int,KTNEFProperty*>& props, KTNEFAtt
 					if ( mapi.name.type == 0 )
 						mapiname = TQString().sprintf( " [name = 0x%04x]", mapi.name.value.toUInt() );
 					else
-						mapiname = TQString( " [name = %1]" ).arg( mapi.name.value.toString() );
+						mapiname = TQString( " [name = %1]" ).tqarg( mapi.name.value.toString() );
 				}
 				switch ( mapi.type & 0x0FFF )
 				{