summaryrefslogtreecommitdiffstats
path: root/lib/kwmf
diff options
context:
space:
mode:
Diffstat (limited to 'lib/kwmf')
-rw-r--r--lib/kwmf/kowmfpaint.cpp4
-rw-r--r--lib/kwmf/kowmfpaint.h2
-rw-r--r--lib/kwmf/kowmfread.h2
-rw-r--r--lib/kwmf/kowmfreadprivate.cpp16
-rw-r--r--lib/kwmf/kowmfstruct.h40
-rw-r--r--lib/kwmf/kowmfwrite.cpp4
-rw-r--r--lib/kwmf/kowmfwrite.h2
-rw-r--r--lib/kwmf/kwmf.cpp22
-rw-r--r--lib/kwmf/qwmf.cpp54
9 files changed, 73 insertions, 73 deletions
diff --git a/lib/kwmf/kowmfpaint.cpp b/lib/kwmf/kowmfpaint.cpp
index 43067273..e13170e9 100644
--- a/lib/kwmf/kowmfpaint.cpp
+++ b/lib/kwmf/kowmfpaint.cpp
@@ -124,7 +124,7 @@ void KoWmfPaint::setBackgroundColor( const TQColor &c ) {
}
-void KoWmfPaint::setBackgroundMode( Qt::BGMode mode ) {
+void KoWmfPaint::setBackgroundMode( TQt::BGMode mode ) {
mPainter.setBackgroundMode( mode );
}
@@ -267,7 +267,7 @@ void KoWmfPaint::drawPolyPolygon( TQPtrList<TQPointArray>& listPa, bool winding
mPainter.setClipRegion( region, TQPainter::CoordPainter );
// fill polygons
- if ( brush != Qt::NoBrush ) {
+ if ( brush != TQt::NoBrush ) {
mPainter.fillRect( region.boundingRect(), brush );
}
diff --git a/lib/kwmf/kowmfpaint.h b/lib/kwmf/kowmfpaint.h
index 7fb9356d..58b27b18 100644
--- a/lib/kwmf/kowmfpaint.h
+++ b/lib/kwmf/kowmfpaint.h
@@ -71,7 +71,7 @@ private:
// Drawing attributes/modes
void setBackgroundColor( const TQColor& c );
- void setBackgroundMode( Qt::BGMode mode );
+ void setBackgroundMode( TQt::BGMode mode );
void setRasterOp( TQt::RasterOp op );
/**
diff --git a/lib/kwmf/kowmfread.h b/lib/kwmf/kowmfread.h
index ff8fa9be..ca1183b1 100644
--- a/lib/kwmf/kowmfread.h
+++ b/lib/kwmf/kowmfread.h
@@ -106,7 +106,7 @@ public:
// Drawing attributes/modes
virtual void setBackgroundColor( const TQColor & ) = 0;
- virtual void setBackgroundMode( Qt::BGMode ) = 0;
+ virtual void setBackgroundMode( TQt::BGMode ) = 0;
virtual void setRasterOp( TQt::RasterOp ) = 0;
// Change logical Coordinate
diff --git a/lib/kwmf/kowmfreadprivate.cpp b/lib/kwmf/kowmfreadprivate.cpp
index f812b766..01ba4df4 100644
--- a/lib/kwmf/kowmfreadprivate.cpp
+++ b/lib/kwmf/kowmfreadprivate.cpp
@@ -574,9 +574,9 @@ void KoWmfReadPrivate::setBkMode( TQ_UINT32, TQDataStream& stream )
stream >> bkMode;
if ( bkMode == 1 )
- mReadWmf->setBackgroundMode( Qt::TransparentMode );
+ mReadWmf->setBackgroundMode( TQt::TransparentMode );
else
- mReadWmf->setBackgroundMode( Qt::OpaqueMode );
+ mReadWmf->setBackgroundMode( TQt::OpaqueMode );
}
@@ -867,7 +867,7 @@ void KoWmfReadPrivate::createEmptyObject()
void KoWmfReadPrivate::createBrushIndirect( TQ_UINT32, TQDataStream& stream )
{
- Qt::BrushStyle style;
+ TQt::BrushStyle style;
TQ_UINT16 sty, arg2;
TQ_UINT32 color;
KoWmfBrushHandle* handle = new KoWmfBrushHandle;
@@ -881,7 +881,7 @@ void KoWmfReadPrivate::createBrushIndirect( TQ_UINT32, TQDataStream& stream )
else
{
kdDebug() << "KoWmfReadPrivate::createBrushIndirect: invalid hatched brush " << arg2 << endl;
- style = Qt::SolidPattern;
+ style = TQt::SolidPattern;
}
}
else {
@@ -889,7 +889,7 @@ void KoWmfReadPrivate::createBrushIndirect( TQ_UINT32, TQDataStream& stream )
style = koWmfStyleBrush[ sty ];
else {
kdDebug() << "KoWmfReadPrivate::createBrushIndirect: invalid brush " << sty << endl;
- style = Qt::SolidPattern;
+ style = TQt::SolidPattern;
}
}
handle->brush.setStyle( style );
@@ -901,7 +901,7 @@ void KoWmfReadPrivate::createBrushIndirect( TQ_UINT32, TQDataStream& stream )
void KoWmfReadPrivate::createPenIndirect( TQ_UINT32, TQDataStream& stream )
{
// TODO: userStyle and alternateStyle
- Qt::PenStyle penStyle;
+ TQt::PenStyle penStyle;
TQ_UINT32 color;
TQ_UINT16 style, width, arg;
@@ -914,12 +914,12 @@ void KoWmfReadPrivate::createPenIndirect( TQ_UINT32, TQDataStream& stream )
penStyle=koWmfStylePen[ style ];
else {
kdDebug() << "KoWmfReadPrivate::createPenIndirect: invalid pen " << style << endl;
- penStyle = Qt::SolidLine;
+ penStyle = TQt::SolidLine;
}
handle->pen.setStyle( penStyle );
handle->pen.setColor( qtColor( color ) );
- handle->pen.setCapStyle( Qt::RoundCap );
+ handle->pen.setCapStyle( TQt::RoundCap );
handle->pen.setWidth( width );
}
}
diff --git a/lib/kwmf/kowmfstruct.h b/lib/kwmf/kowmfstruct.h
index 84281f4e..5bd50b32 100644
--- a/lib/kwmf/kowmfstruct.h
+++ b/lib/kwmf/kowmfstruct.h
@@ -117,31 +117,31 @@ struct WmfEnhMetaRecord
TQt::CopyROP, TQt::OrNotROP, TQt::OrROP, TQt::SetROP
};
- static const Qt::BrushStyle koWmfHatchedStyleBrush[] =
+ static const TQt::BrushStyle koWmfHatchedStyleBrush[] =
{
- Qt::HorPattern,
- Qt::VerPattern,
- Qt::FDiagPattern,
- Qt::BDiagPattern,
- Qt::CrossPattern,
- Qt::DiagCrossPattern
+ TQt::HorPattern,
+ TQt::VerPattern,
+ TQt::FDiagPattern,
+ TQt::BDiagPattern,
+ TQt::CrossPattern,
+ TQt::DiagCrossPattern
};
- static const Qt::BrushStyle koWmfStyleBrush[] =
- { Qt::SolidPattern,
- Qt::NoBrush,
- Qt::FDiagPattern, /* hatched */
- Qt::Dense4Pattern, /* should be custom bitmap pattern */
- Qt::HorPattern, /* should be BS_INDEXED (?) */
- 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 device-independent BS_DIBPATTERN8x8 */
+ static const TQt::BrushStyle koWmfStyleBrush[] =
+ { TQt::SolidPattern,
+ TQt::NoBrush,
+ TQt::FDiagPattern, /* hatched */
+ TQt::Dense4Pattern, /* should be custom bitmap pattern */
+ TQt::HorPattern, /* should be BS_INDEXED (?) */
+ TQt::VerPattern, /* should be device-independent bitmap */
+ TQt::Dense6Pattern, /* should be device-independent packed-bitmap */
+ TQt::Dense2Pattern, /* should be BS_PATTERN8x8 */
+ TQt::Dense3Pattern /* should be device-independent BS_DIBPATTERN8x8 */
};
- static const Qt::PenStyle koWmfStylePen[] =
- { Qt::SolidLine, Qt::DashLine, Qt::DotLine, Qt::DashDotLine, Qt::DashDotDotLine,
- Qt::NoPen, Qt::SolidLine };
+ static const TQt::PenStyle koWmfStylePen[] =
+ { TQt::SolidLine, TQt::DashLine, TQt::DotLine, TQt::DashDotLine, TQt::DashDotDotLine,
+ TQt::NoPen, TQt::SolidLine };
#endif
diff --git a/lib/kwmf/kowmfwrite.cpp b/lib/kwmf/kowmfwrite.cpp
index 22a0d131..23bb7024 100644
--- a/lib/kwmf/kowmfwrite.cpp
+++ b/lib/kwmf/kowmfwrite.cpp
@@ -193,9 +193,9 @@ void KoWmfWrite::setBackgroundColor( const TQColor &c ) {
}
-void KoWmfWrite::setBackgroundMode( Qt::BGMode mode ) {
+void KoWmfWrite::setBackgroundMode( TQt::BGMode mode ) {
d->mSt << (TQ_UINT32)4 << (TQ_UINT16)0x0102;
- if ( mode == Qt::TransparentMode )
+ if ( mode == TQt::TransparentMode )
d->mSt << (TQ_UINT16)1;
else
d->mSt << (TQ_UINT16)0;
diff --git a/lib/kwmf/kowmfwrite.h b/lib/kwmf/kowmfwrite.h
index bc3e1411..fda0540f 100644
--- a/lib/kwmf/kowmfwrite.h
+++ b/lib/kwmf/kowmfwrite.h
@@ -82,7 +82,7 @@ public:
// Drawing attributes/modes
void setBackgroundColor( const TQColor& r );
- void setBackgroundMode( Qt::BGMode );
+ void setBackgroundMode( TQt::BGMode );
void setRasterOp( TQt::RasterOp );
// Change logical Coordinate
diff --git a/lib/kwmf/kwmf.cpp b/lib/kwmf/kwmf.cpp
index 06092a82..d79596ce 100644
--- a/lib/kwmf/kwmf.cpp
+++ b/lib/kwmf/kwmf.cpp
@@ -706,17 +706,17 @@ void KWmf::opPenCreateIndirect(
U32 /*words*/,
TQDataStream &operands)
{
- static Qt::PenStyle styleTab[] =
- {
- Qt::SolidLine,
- Qt::DashLine,
- Qt::DotLine,
- Qt::DashDotLine,
- Qt::DashDotDotLine,
- Qt::NoPen,
- Qt::SolidLine, // PS_INSIDEFRAME
- Qt::SolidLine, // PS_USERSTYLE
- Qt::SolidLine // PS_ALTERNATE
+ static TQt::PenStyle styleTab[] =
+ {
+ TQt::SolidLine,
+ TQt::DashLine,
+ TQt::DotLine,
+ TQt::DashDotLine,
+ TQt::DashDotDotLine,
+ TQt::NoPen,
+ TQt::SolidLine, // PS_INSIDEFRAME
+ TQt::SolidLine, // PS_USERSTYLE
+ TQt::SolidLine // PS_ALTERNATE
};
WinObjPenHandle *handle = handleCreatePen();
S16 arg;
diff --git a/lib/kwmf/qwmf.cpp b/lib/kwmf/qwmf.cpp
index 8b6572ae..415c63dd 100644
--- a/lib/kwmf/qwmf.cpp
+++ b/lib/kwmf/qwmf.cpp
@@ -622,8 +622,8 @@ void QWinMetaFile::setBkColor( long, short* parm )
//-----------------------------------------------------------------------------
void QWinMetaFile::setBkMode( long, short* parm )
{
- if ( parm[ 0 ]==1 ) mPainter.setBackgroundMode( Qt::TransparentMode );
- else mPainter.setBackgroundMode( Qt::OpaqueMode );
+ if ( parm[ 0 ]==1 ) mPainter.setBackgroundMode( TQt::TransparentMode );
+ else mPainter.setBackgroundMode( TQt::OpaqueMode );
}
@@ -927,26 +927,26 @@ void QWinMetaFile::createEmptyObject( long, short* )
//-----------------------------------------------------------------------------
void QWinMetaFile::createBrushIndirect( long, short* parm )
{
- static Qt::BrushStyle hatchedStyleTab[] =
+ static TQt::BrushStyle hatchedStyleTab[] =
{
- Qt::HorPattern,
- Qt::FDiagPattern,
- Qt::BDiagPattern,
- Qt::CrossPattern,
- Qt::DiagCrossPattern
+ TQt::HorPattern,
+ TQt::FDiagPattern,
+ TQt::BDiagPattern,
+ TQt::CrossPattern,
+ TQt::DiagCrossPattern
};
- 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 device-independent bitmap */
- Qt::Dense6Pattern, /* should be device-independent packed-bitmap */
- Qt::Dense2Pattern, /* should be BS_PATTERN8x8 */
- Qt::Dense3Pattern /* should be device-independent BS_DIBPATTERN8x8 */
+ 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 device-independent bitmap */
+ TQt::Dense6Pattern, /* should be device-independent packed-bitmap */
+ TQt::Dense2Pattern, /* should be BS_PATTERN8x8 */
+ TQt::Dense3Pattern /* should be device-independent BS_DIBPATTERN8x8 */
};
- Qt::BrushStyle style;
+ TQt::BrushStyle style;
short arg;
WinObjBrushHandle* handle = new WinObjBrushHandle;
addHandle( handle );
@@ -959,7 +959,7 @@ void QWinMetaFile::createBrushIndirect( long, short* parm )
else
{
kdDebug() << "QWinMetaFile::createBrushIndirect: invalid hatched brush " << arg << endl;
- style = Qt::SolidPattern;
+ style = TQt::SolidPattern;
}
}
else if ( arg>=0 && arg<9 )
@@ -967,7 +967,7 @@ void QWinMetaFile::createBrushIndirect( long, short* parm )
else
{
kdDebug() << "QWinMetaFile::createBrushIndirect: invalid brush " << arg << endl;
- style = Qt::SolidPattern;
+ style = TQt::SolidPattern;
}
handle->brush.setStyle( style );
handle->brush.setColor( color( parm+1 ) );
@@ -977,10 +977,10 @@ void QWinMetaFile::createBrushIndirect( long, short* parm )
//-----------------------------------------------------------------------------
void QWinMetaFile::createPenIndirect( long, short* parm )
{
- static Qt::PenStyle styleTab[] =
- { Qt::SolidLine, Qt::DashLine, Qt::DotLine, Qt::DashDotLine, Qt::DashDotDotLine,
- Qt::NoPen, Qt::SolidLine };
- Qt::PenStyle style;
+ static TQt::PenStyle styleTab[] =
+ { TQt::SolidLine, TQt::DashLine, TQt::DotLine, TQt::DashDotLine, TQt::DashDotDotLine,
+ TQt::NoPen, TQt::SolidLine };
+ TQt::PenStyle style;
WinObjPenHandle* handle = new WinObjPenHandle;
addHandle( handle );
@@ -988,12 +988,12 @@ void QWinMetaFile::createPenIndirect( long, short* parm )
else
{
kdDebug() << "QWinMetaFile::createPenIndirect: invalid pen " << parm[ 0 ] << endl;
- style = Qt::SolidLine;
+ style = TQt::SolidLine;
}
handle->pen.setStyle( style );
handle->pen.setColor( color( parm+3 ) );
- handle->pen.setCapStyle( Qt::RoundCap );
+ handle->pen.setCapStyle( TQt::RoundCap );
//int width = 0;
// TODO : width of pen proportional to device context width
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-16 22:17:33 +0000