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/qrect.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/qrect.cpp')
| -rw-r--r-- | src/kernel/qrect.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/kernel/qrect.cpp b/src/kernel/qrect.cpp index 3a8bd2fb6..2ca88a4c2 100644 --- a/src/kernel/qrect.cpp +++ b/src/kernel/qrect.cpp @@ -926,11 +926,11 @@ bool operator!=( const TQRect &r1, const TQRect &r2 ) TQDataStream &operator<<( TQDataStream &s, const TQRect &r ) { if ( s.version() == 1 ) - s << (Q_INT16)r.left() << (Q_INT16)r.top() - << (Q_INT16)r.right() << (Q_INT16)r.bottom(); + s << (TQ_INT16)r.left() << (TQ_INT16)r.top() + << (TQ_INT16)r.right() << (TQ_INT16)r.bottom(); else - s << (Q_INT32)r.left() << (Q_INT32)r.top() - << (Q_INT32)r.right() << (Q_INT32)r.bottom(); + s << (TQ_INT32)r.left() << (TQ_INT32)r.top() + << (TQ_INT32)r.right() << (TQ_INT32)r.bottom(); return s; } @@ -946,12 +946,12 @@ TQDataStream &operator<<( TQDataStream &s, const TQRect &r ) TQDataStream &operator>>( TQDataStream &s, TQRect &r ) { if ( s.version() == 1 ) { - Q_INT16 x1, y1, x2, y2; + TQ_INT16 x1, y1, x2, y2; s >> x1; s >> y1; s >> x2; s >> y2; r.setCoords( x1, y1, x2, y2 ); } else { - Q_INT32 x1, y1, x2, y2; + TQ_INT32 x1, y1, x2, y2; s >> x1; s >> y1; s >> x2; s >> y2; r.setCoords( x1, y1, x2, y2 ); } |