From 716a5de8870d7c02bb4d0aed72f30291b17b763a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:59:01 -0600 Subject: Remove additional unneeded tq method conversions --- ktnef/gui/ktnefmain.cpp | 4 ++-- ktnef/gui/qwmf.cpp | 10 +++++----- ktnef/gui/qwmf.h | 8 ++++---- ktnef/gui/wmfstruct.h | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'ktnef/gui') 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 -- cgit v1.2.1