Remove additional unneeded tq method conversions

7 files changed, 59 insertions, 59 deletions

diff --git a/ktnef/gui/ktnefmain.cpp b/ktnef/gui/ktnefmain.cpp
index df9dfa67d..ccb1bb54f 100644
--- a/ktnef/gui/ktnefmain.cpp
+++ b/ktnef/gui/ktnefmain.cpp
@@ -230,7 +230,7 @@ void KTNEFMain::extractAllFiles()
 		for (;it.current();++it)
 			if (!parser_->extractFileTo(it.current()->name(), dir))
 			{
-				TQString	msg = i18n( "Unable to extract file \"%1\"" ).tqarg( it.current()->name() );
+				TQString	msg = i18n( "Unable to extract file \"%1\"" ).arg( it.current()->name() );
 				TQMessageBox::critical(this,i18n("Error"),msg,TQMessageBox::Ok|TQMessageBox::Default,0);
 				return;
 			}
@@ -301,7 +301,7 @@ void KTNEFMain::extractTo(const TQString& dirname)
 	for (;it.current();++it)
 		if (!parser_->extractFileTo(it.current()->name(), dir))
 		{
-			TQString	msg = i18n("Unable to extract file \"%1\"").tqarg( it.current()->name() );
+			TQString	msg = i18n("Unable to extract file \"%1\"").arg( it.current()->name() );
 			TQMessageBox::critical(this,i18n("Error"),msg,TQMessageBox::Ok|TQMessageBox::Default,0);
 			return;
 		}
diff --git a/ktnef/gui/qwmf.cpp b/ktnef/gui/qwmf.cpp
index 7e5193be2..bc31584c1 100644
--- a/ktnef/gui/qwmf.cpp
+++ b/ktnef/gui/qwmf.cpp
@@ -762,7 +762,7 @@ void TQWinMetaFile::extTextOut( long num, short* parm )
         mPainter.translate( -parm[ 1 ], -parm[ 0 ] );
     }
 
-    // tqalignment
+    // alignment
     if ( mTextAlign & 0x06 )
         x -= ( width / 2 );
     if ( mTextAlign & 0x08 )
@@ -939,10 +939,10 @@ void TQWinMetaFile::createBrushIndirect( long, short* parm )
       Qt::FDiagPattern,   /* hatched */
       Qt::Dense4Pattern,  /* should be custom bitmap pattern */
       Qt::HorPattern,     /* should be BS_INDEXED (?) */
-      Qt::VerPattern,     /* should be tqdevice-independent bitmap */
-      Qt::Dense6Pattern,  /* should be tqdevice-independent packed-bitmap */
+      Qt::VerPattern,     /* should be device-independent bitmap */
+      Qt::Dense6Pattern,  /* should be device-independent packed-bitmap */
       Qt::Dense2Pattern,  /* should be BS_PATTERN8x8 */
-      Qt::Dense3Pattern   /* should be tqdevice-independent BS_DIBPATTERN8x8 */
+      Qt::Dense3Pattern   /* should be device-independent BS_DIBPATTERN8x8 */
     };
     Qt::BrushStyle style;
     short arg;
@@ -994,7 +994,7 @@ void TQWinMetaFile::createPenIndirect( long, short* parm )
     handle->pen.setCapStyle( Qt::RoundCap );
 
     //int width = 0;
-    // TODO : width of pen proportional to tqdevice context width
+    // TODO : width of pen proportional to device context width
     // DOESN'T WORK
 /*
     TQRect devRec;
diff --git a/ktnef/gui/qwmf.h b/ktnef/gui/qwmf.h
index 2ac861d77..e61eeabaf 100644
--- a/ktnef/gui/qwmf.h
+++ b/ktnef/gui/qwmf.h
@@ -60,7 +60,7 @@ public:
     virtual bool load( TQBuffer &buffer );
 
     /**
-     * Paint metafile to given paint-tqdevice using absolute or relative coordinate.
+     * Paint metafile to given paint-device using absolute or relative coordinate.
      * abosute coord. reset the world transfomation Matrix
      * relative coord. use the existing world transfomation Matrix
      * Returns true on success.
@@ -124,9 +124,9 @@ public: // should be protected but cannot
     void setPixel( long num, short* parms );
     // Set raster operation mode
     void setRop( long num, short* parms );
-    /* save tqdevice context */
+    /* save device context */
     void saveDC( long num, short* parms );
-    /* restore tqdevice context */
+    /* restore device context */
     void restoreDC( long num, short* parms );
     /*  clipping region is the intersection of this region and the original region */
     void intersectClipRect( long num, short* parms );
@@ -136,7 +136,7 @@ public: // should be protected but cannot
     /****************** Text *******************/
     /* set text color */
     void setTextColor( long num, short* parms );
-    /* set text tqalignment */
+    /* set text alignment */
     void setTextAlign( long num, short* parms );
     /* draw text */
     void textOut( long num, short* parms );
diff --git a/ktnef/gui/wmfstruct.h b/ktnef/gui/wmfstruct.h
index 5e50f022e..33a4a67c2 100644
--- a/ktnef/gui/wmfstruct.h
+++ b/ktnef/gui/wmfstruct.h
@@ -43,7 +43,7 @@ struct WmfEnhMetaHeader
     DWORD   iType;              // Record type EMR_HEADER
     DWORD   nSize;              // Record size in bytes.  This may be greater
     // than the sizeof( ENHMETAHEADER ).
-    RECTL   rclBounds;          // Inclusive-inclusive bounds in tqdevice units
+    RECTL   rclBounds;          // Inclusive-inclusive bounds in device units
     RECTL   rclFrame;           // Inclusive-inclusive Picture Frame of metafile
     // in .01 mm units
     DWORD   dSignature;         // Signature.  Must be ENHMETA_SIGNATURE.
@@ -58,8 +58,8 @@ struct WmfEnhMetaHeader
     DWORD   offDescription;     // Offset to the metafile description record.
     // This is 0 if there is no description string
     DWORD   nPalEntries;        // Number of entries in the metafile palette.
-    SIZEL   szlDevice;          // Size of the reference tqdevice in pels
-    SIZEL   szlMillimeters;     // Size of the reference tqdevice in millimeters
+    SIZEL   szlDevice;          // Size of the reference device in pels
+    SIZEL   szlMillimeters;     // Size of the reference device in millimeters
 };
 #define ENHMETA_SIGNATURE       0x464D4520
 
diff --git a/ktnef/ktnef/ktnefparser.h b/ktnef/ktnef/ktnefparser.h
index 92c44dc22..fc93391cf 100644
--- a/ktnef/ktnef/ktnefparser.h
+++ b/ktnef/ktnef/ktnefparser.h
@@ -34,7 +34,7 @@ public:
 	~KTNEFParser();
 
 	bool openFile(const TQString& filename);
-	bool openDevice( TQIODevice *tqdevice );
+	bool openDevice( TQIODevice *device );
 	bool extractFile(const TQString& filename);
 	bool extractFileTo(const TQString& filename, const TQString& dirname);
 	bool extractAll();
diff --git a/ktnef/lib/ktnefparser.cpp b/ktnef/lib/ktnefparser.cpp
index a05e05721..3edd7b6ad 100644
--- a/ktnef/lib/ktnefparser.cpp
+++ b/ktnef/lib/ktnefparser.cpp
@@ -70,7 +70,7 @@ public:
 		defaultdir_ = "/tmp/";
 		current_ = 0;
 		deleteDevice_ = false;
-		tqdevice_ = 0;
+		device_ = 0;
 		message_ = new KTNEFMessage;
 	}
 	~ParserPrivate()
@@ -79,7 +79,7 @@ public:
 	}
 
 	TQDataStream              stream_;
-	TQIODevice                *tqdevice_;
+	TQIODevice                *device_;
 	bool                     deleteDevice_;
 	TQString                  defaultdir_;
 	KTNEFAttach              *current_;
@@ -105,8 +105,8 @@ KTNEFMessage* KTNEFParser::message() const
 void KTNEFParser::deleteDevice()
 {
 	if ( d->deleteDevice_ )
-		delete d->tqdevice_;
-	d->tqdevice_ = 0;
+		delete d->device_;
+	d->device_ = 0;
 	d->deleteDevice_ = false;
 }
 
@@ -124,7 +124,7 @@ bool KTNEFParser::decodeMessage()
 	// read data length
 	d->stream_ >> i2;
 	// offset after reading the value
-	off = d->tqdevice_->at() + i2;
+	off = d->device_->at() + i2;
 	switch ( tag )
 	{
 		case attAIDOWNER:
@@ -158,11 +158,11 @@ bool KTNEFParser::decodeMessage()
 			kdDebug() << "Message MAPI Properties" << " (length=" << i2 << ")" << endl;
 			{
 				int nProps = d->message_->properties().count();
-				i2 += d->tqdevice_->at();
+				i2 += d->device_->at();
 				readMAPIProperties( d->message_->properties(), 0 );
-				d->tqdevice_->at( i2 );
+				d->device_->at( i2 );
 				kdDebug() << "Properties: " << d->message_->properties().count() << endl;
-				value = TQString( "< %1 properties >" ).tqarg( d->message_->properties().count() - nProps );
+				value = TQString( "< %1 properties >" ).arg( d->message_->properties().count() - nProps );
 			}
 			break;
 		case attTNEFVERSION:
@@ -171,7 +171,7 @@ bool KTNEFParser::decodeMessage()
 			break;
 		case attFROM:
 			d->message_->addProperty( 0x0024, MAPI_TYPE_STRING8, readTNEFAddress( d->stream_ ) );
-			d->tqdevice_->at( d->tqdevice_->at() - i2 );
+			d->device_->at( d->device_->at() - i2 );
 			value = readTNEFData( d->stream_, i2 );
 			kdDebug() << "Message From" << " (length=" << i2 << ")" << endl;
 			break;
@@ -212,7 +212,7 @@ bool KTNEFParser::decodeMessage()
 					recipTable << formatRecipient( props );
 				}
 				d->message_->addProperty( 0x0E12, MAPI_TYPE_STRING8, recipTable );
-				d->tqdevice_->at( d->tqdevice_->at() - i2 );
+				d->device_->at( d->device_->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->tqdevice_->at() != off && !d->tqdevice_->at( off ) )
+	if ( d->device_->at() != off && !d->device_->at( off ) )
 		return false;
 	// get checksum
 	d->stream_ >> u;
 	// add TNEF attribute
 	d->message_->addAttribute( tag, type, value, true );
-	//kdDebug() << "stream: " << d->tqdevice_->at() << endl;
+	//kdDebug() << "stream: " << d->device_->at() << endl;
 	return true;
 }
 
@@ -273,15 +273,15 @@ bool KTNEFParser::decodeAttachment()
 		   break;
 	   case attATTACHDATA:
 		   d->current_->setSize( i );
-		   d->current_->setOffset( d->tqdevice_->at() );
-		   d->tqdevice_->at( d->tqdevice_->at() + i );
-		   value = TQString( "< size=%1 >" ).tqarg( i );
+		   d->current_->setOffset( d->device_->at() );
+		   d->device_->at( d->device_->at() + i );
+		   value = TQString( "< size=%1 >" ).arg( i );
 		   kdDebug() << "Attachment Data: size=" << i << endl;
 		   break;
 	   case attATTACHMENT:	// try to get attachment info
-		   i += d->tqdevice_->at();
+		   i += d->device_->at();
 		   readMAPIProperties( d->current_->properties(), d->current_ );
-		   d->tqdevice_->at( i );
+		   d->device_->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();
@@ -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 >" ).tqarg( d->current_->properties().count() );
+		   value = TQString( "< %1 properties >" ).arg( d->current_->properties().count() );
 		   break;
 	   case attATTACHMODDATE:
 		   value = readTNEFDate( d->stream_ );
@@ -304,8 +304,8 @@ bool KTNEFParser::decodeAttachment()
 		   break;
 	   case attATTACHMETAFILE:
 		   kdDebug() << "Attachment Metafile: size=" << i << endl;
-		   //value = TQString( "< size=%1 >" ).tqarg( i );
-		   //d->tqdevice_->at( d->tqdevice_->at()+i );
+		   //value = TQString( "< size=%1 >" ).arg( i );
+		   //d->device_->at( d->device_->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->tqdevice_->at() << endl;
+	//kdDebug() << "stream: " << d->device_->at() << endl;
 
 	return true;
 }
@@ -339,19 +339,19 @@ bool KTNEFParser::parseDevice()
 		d->current_ = 0;
 	}
 
-	if ( !d->tqdevice_->open( IO_ReadOnly ) ) {
-	  kdDebug() << "Couldn't open tqdevice" << endl;
+	if ( !d->device_->open( IO_ReadOnly ) ) {
+	  kdDebug() << "Couldn't open device" << endl;
 		return false;
 	}
 
-	d->stream_.setDevice( d->tqdevice_ );
+	d->stream_.setDevice( d->device_ );
 	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->tqdevice_->at() << endl;
+		//kdDebug() << "stream: " << d->device_->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->tqdevice_->at() << endl;
+				kdDebug() << "Unknown Level: " << c << ", at offset " << d->device_->at() << endl;
 				goto end;
 			}
 		}
@@ -381,7 +381,7 @@ bool KTNEFParser::parseDevice()
 	else
 	{
 	  kdDebug() << "This is not a TNEF file" << endl;
-end:	d->tqdevice_->close();
+end:	d->device_->close();
 		return false;
 	}
 }
@@ -396,9 +396,9 @@ bool KTNEFParser::extractFile(const TQString& filename)
 bool KTNEFParser::extractAttachmentTo(KTNEFAttach *att, const TQString& dirname)
 {
 	TQString	filename = dirname + "/" + att->name();
-	if (!d->tqdevice_->isOpen())
+	if (!d->device_->isOpen())
 		return false;
-	if (!d->tqdevice_->at(att->offset()))
+	if (!d->device_->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->tqdevice_->readBlock(buf,TQMIN(sz,len));
+		n = d->device_->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->tqdevice_ = TQT_TQIODEVICE(new TQFile( filename ));
+	d->device_ = TQT_TQIODEVICE(new TQFile( filename ));
 	d->deleteDevice_ = true;
 	return parseDevice();
 }
 
-bool KTNEFParser::openDevice( TQIODevice *tqdevice )
+bool KTNEFParser::openDevice( TQIODevice *device )
 {
 	deleteDevice();
-	d->tqdevice_ = tqdevice;
+	d->device_ = device;
 	return parseDevice();
 }
 
@@ -482,12 +482,12 @@ void KTNEFParser::checkCurrent( int key )
                                         if (!mimetype) return; // FIXME
 					if ( mimetype->name() == "application/octet-stream" && d->current_->size() > 0 )
 					{
-						int oldOffset = d->tqdevice_->at();
+						int oldOffset = d->device_->at();
 						TQByteArray buffer( TQMIN( 32, d->current_->size() ) );
-						d->tqdevice_->at( d->current_->offset() );
-						d->tqdevice_->readBlock( buffer.data(), buffer.size() );
+						d->device_->at( d->current_->offset() );
+						d->device_->readBlock( buffer.data(), buffer.size() );
 						mimetype = KMimeType::findByContent( buffer );
-						d->tqdevice_->at( oldOffset );
+						d->device_->at( oldOffset );
 					}
 					d->current_->setMimeTag( mimetype->name() );
 				}
@@ -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->tqdevice_->at( d->tqdevice_->at()-len );
+					d->device_->at( d->device_->at()-len );
 					TQ_UINT32 interface_ID;
 					d->stream_ >> interface_ID;
 					if ( interface_ID == MAPI_IID_IMessage )
 					{
 						// embedded TNEF file
 						attach->unsetDataParser();
-						attach->setOffset( d->tqdevice_->at()+12 );
+						attach->setOffset( d->device_->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->tqdevice_->at( d->tqdevice_->at() + ( len-4 ) );
+					d->device_->at( d->device_->at() + ( len-4 ) );
 					break;
 				}
 				else if ( mapi.type == MAPI_TYPE_BINARY && attach && attach->offset() < 0 )
@@ -813,8 +813,8 @@ bool KTNEFParser::readMAPIProperties( TQMap<int,KTNEFProperty*>& props, KTNEFAtt
 					int len = mapi.value.toByteArray().size();
 					ALIGN( len, 4 )
 					attach->setSize( len );
-					attach->setOffset( d->tqdevice_->at() - len );
-					attach->addAttribute( attATTACHDATA, atpBYTE, TQString( "< size=%1 >" ).tqarg( len ), false );
+					attach->setOffset( d->device_->at() - len );
+					attach->addAttribute( attATTACHDATA, atpBYTE, TQString( "< size=%1 >" ).arg( 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]" ).tqarg( mapi.name.value.toString() );
+						mapiname = TQString( " [name = %1]" ).arg( mapi.name.value.toString() );
 				}
 				switch ( mapi.type & 0x0FFF )
 				{
@@ -860,7 +860,7 @@ bool KTNEFParser::readMAPIProperties( TQMap<int,KTNEFProperty*>& props, KTNEFAtt
 			p = new KTNEFProperty( key, ( mapi.type & 0x0FFF ), mapi.value, mapi.name.value );
 			props[ p->key() ] = p;
 		}
-		//kdDebug() << "stream: " << d->tqdevice_->at() << endl;
+		//kdDebug() << "stream: " << d->device_->at() << endl;
 	}
 
 	if ( foundAttachment && attach )
diff --git a/ktnef/tests/mapi_attach_data_obj.tnef b/ktnef/tests/mapi_attach_data_obj.tnef
index 66f7890c3..d1de851a9 100644
--- a/ktnef/tests/mapi_attach_data_obj.tnef
+++ b/ktnef/tests/mapi_attach_data_obj.tnef