summaryrefslogtreecommitdiffstats
path: root/ktnef/gui/qwmf.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ktnef/gui/qwmf.cpp')
-rw-r--r--ktnef/gui/qwmf.cpp62
1 files changed, 31 insertions, 31 deletions
diff --git a/ktnef/gui/qwmf.cpp b/ktnef/gui/qwmf.cpp
index 8f8cd4d28..d60d661d3 100644
--- a/ktnef/gui/qwmf.cpp
+++ b/ktnef/gui/qwmf.cpp
@@ -136,13 +136,13 @@ bool TQWinMetaFile::load( const TQString &filename )
if ( !file.exists() )
{
- kdDebug() << "File " << TQFile::encodeName(filename) << " does not exist" << endl;
+ kdDebug() << TQString("File ") << TQString(TQFile::encodeName(filename)) << TQString(" does not exist") << endl;
return false;
}
if ( !file.open( IO_ReadOnly ) )
{
- kdDebug() << "Cannot open file " << TQFile::encodeName(filename) << endl;
+ kdDebug() << TQString("Cannot open file ") << TQString(TQFile::encodeName(filename)) << endl;
return false;
}
@@ -348,7 +348,7 @@ bool TQWinMetaFile::paint( const TQPaintDevice* aTarget, bool absolute )
mWinding = false;
mAbsoluteCoord = absolute;
- mPainter.begin( aTarget );
+ mPainter.begin( TQT_TQPAINTDEVICE(const_cast<TQPaintDevice*>(aTarget)) );
if ( TQWMF_DEBUG ) {
kdDebug() << "Bounding box : " << mBBox.left()
<< " " << mBBox.top() << " " << mBBox.right() << " " << mBBox.bottom() << endl;
@@ -482,7 +482,7 @@ void TQWinMetaFile::polygon( long, short* parm )
TQPointArray* pa;
pa = pointArray( parm[ 0 ], &parm[ 1 ] );
- mPainter.drawPolygon( *pa, mWinding );
+ mPainter.tqdrawPolygon( *pa, mWinding );
}
@@ -620,8 +620,8 @@ void TQWinMetaFile::setBkColor( long, short* parm )
//-----------------------------------------------------------------------------
void TQWinMetaFile::setBkMode( long, short* parm )
{
- if ( parm[ 0 ]==1 ) mPainter.setBackgroundMode( TQt::TransparentMode );
- else mPainter.setBackgroundMode( TQt::OpaqueMode );
+ if ( parm[ 0 ]==1 ) mPainter.setBackgroundMode( Qt::TransparentMode );
+ else mPainter.setBackgroundMode( Qt::OpaqueMode );
}
@@ -925,26 +925,26 @@ void TQWinMetaFile::createEmptyObject( long, short* )
//-----------------------------------------------------------------------------
void TQWinMetaFile::createBrushIndirect( long, short* parm )
{
- static TQt::BrushStyle hatchedStyleTab[] =
+ static Qt::BrushStyle hatchedStyleTab[] =
{
- TQt::HorPattern,
- TQt::FDiagPattern,
- TQt::BDiagPattern,
- TQt::CrossPattern,
- TQt::DiagCrossPattern
+ Qt::HorPattern,
+ Qt::FDiagPattern,
+ Qt::BDiagPattern,
+ Qt::CrossPattern,
+ Qt::DiagCrossPattern
};
- static TQt::BrushStyle styleTab[] =
- { TQt::SolidPattern,
- TQt::NoBrush,
- TQt::FDiagPattern, /* hatched */
- TQt::Dense4Pattern, /* should be custom bitmap pattern */
- TQt::HorPattern, /* should be BS_INDEXED (?) */
- TQt::VerPattern, /* should be tqdevice-independent bitmap */
- TQt::Dense6Pattern, /* should be tqdevice-independent packed-bitmap */
- TQt::Dense2Pattern, /* should be BS_PATTERN8x8 */
- TQt::Dense3Pattern /* should be tqdevice-independent BS_DIBPATTERN8x8 */
+ static Qt::BrushStyle styleTab[] =
+ { Qt::SolidPattern,
+ Qt::NoBrush,
+ 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::Dense2Pattern, /* should be BS_PATTERN8x8 */
+ Qt::Dense3Pattern /* should be tqdevice-independent BS_DIBPATTERN8x8 */
};
- TQt::BrushStyle style;
+ Qt::BrushStyle style;
short arg;
WinObjBrushHandle* handle = new WinObjBrushHandle;
addHandle( handle );
@@ -957,7 +957,7 @@ void TQWinMetaFile::createBrushIndirect( long, short* parm )
else
{
kdDebug() << "TQWinMetaFile::createBrushIndirect: invalid hatched brush " << arg << endl;
- style = TQt::SolidPattern;
+ style = Qt::SolidPattern;
}
}
else if ( arg>=0 && arg<9 )
@@ -965,7 +965,7 @@ void TQWinMetaFile::createBrushIndirect( long, short* parm )
else
{
kdDebug() << "TQWinMetaFile::createBrushIndirect: invalid brush " << arg << endl;
- style = TQt::SolidPattern;
+ style = Qt::SolidPattern;
}
handle->brush.setStyle( style );
handle->brush.setColor( color( parm+1 ) );
@@ -975,10 +975,10 @@ void TQWinMetaFile::createBrushIndirect( long, short* parm )
//-----------------------------------------------------------------------------
void TQWinMetaFile::createPenIndirect( long, short* parm )
{
- static TQt::PenStyle styleTab[] =
- { TQt::SolidLine, TQt::DashLine, TQt::DotLine, TQt::DashDotLine, TQt::DashDotDotLine,
- TQt::NoPen, TQt::SolidLine };
- TQt::PenStyle style;
+ static Qt::PenStyle styleTab[] =
+ { Qt::SolidLine, Qt::DashLine, Qt::DotLine, Qt::DashDotLine, Qt::DashDotDotLine,
+ Qt::NoPen, Qt::SolidLine };
+ Qt::PenStyle style;
WinObjPenHandle* handle = new WinObjPenHandle;
addHandle( handle );
@@ -986,12 +986,12 @@ void TQWinMetaFile::createPenIndirect( long, short* parm )
else
{
kdDebug() << "TQWinMetaFile::createPenIndirect: invalid pen " << parm[ 0 ] << endl;
- style = TQt::SolidLine;
+ style = Qt::SolidLine;
}
handle->pen.setStyle( style );
handle->pen.setColor( color( parm+3 ) );
- handle->pen.setCapStyle( TQt::RoundCap );
+ handle->pen.setCapStyle( Qt::RoundCap );
//int width = 0;
// TODO : width of pen proportional to tqdevice context width