diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-18 00:09:52 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-18 00:09:52 -0500 |
| commit | d1096751ddb25cdef23919c17389fc268c31edaf (patch) | |
| tree | b910be3588cb706defc00c31aefa850bb2312784 /src/kernel/qpainter.cpp | |
| parent | af8fdcf1ca7bdbda6f0c1afecd8c2d8ffa23bebb (diff) | |
| parent | 6dec101d43dcbd4195c47d54bd388db1a8d7230e (diff) | |
| download | tqt-d1096751ddb25cdef23919c17389fc268c31edaf.tar.gz tqt-d1096751ddb25cdef23919c17389fc268c31edaf.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/kernel/qpainter.cpp')
| -rw-r--r-- | src/kernel/qpainter.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/kernel/qpainter.cpp b/src/kernel/qpainter.cpp index e3841b4d4..0dad68364 100644 --- a/src/kernel/qpainter.cpp +++ b/src/kernel/qpainter.cpp @@ -3538,10 +3538,10 @@ TQDataStream &operator<<( TQDataStream &s, const TQPen &p ) { // ### width() should not be restricted to 8-bit values if ( s.version() < 3 ) - return s << (Q_UINT8)p.style() << (Q_UINT8)p.width() << p.color(); + return s << (TQ_UINT8)p.style() << (TQ_UINT8)p.width() << p.color(); else - return s << (Q_UINT8)( p.style() | p.capStyle() | p.joinStyle() ) - << (Q_UINT8)p.width() << p.color(); + return s << (TQ_UINT8)( p.style() | p.capStyle() | p.joinStyle() ) + << (TQ_UINT8)p.width() << p.color(); } /*! @@ -3555,7 +3555,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQPen &p ) TQDataStream &operator>>( TQDataStream &s, TQPen &p ) { - Q_UINT8 style, width; + TQ_UINT8 style, width; TQColor color; s >> style; s >> width; @@ -3927,7 +3927,7 @@ bool TQBrush::operator==( const TQBrush &b ) const TQDataStream &operator<<( TQDataStream &s, const TQBrush &b ) { - s << (Q_UINT8)b.style() << b.color(); + s << (TQ_UINT8)b.style() << b.color(); if ( b.style() == TQt::CustomPattern ) #ifndef QT_NO_IMAGEIO s << *b.pixmap(); @@ -3948,7 +3948,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQBrush &b ) TQDataStream &operator>>( TQDataStream &s, TQBrush &b ) { - Q_UINT8 style; + TQ_UINT8 style; TQColor color; s >> style; s >> color; |