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/qsize.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/qsize.cpp')
| -rw-r--r-- | src/kernel/qsize.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/kernel/qsize.cpp b/src/kernel/qsize.cpp index d871aa74d..2fbe1f4e8 100644 --- a/src/kernel/qsize.cpp +++ b/src/kernel/qsize.cpp @@ -401,9 +401,9 @@ void TQSize::warningDivByZero() TQDataStream &operator<<( TQDataStream &s, const TQSize &sz ) { if ( s.version() == 1 ) - s << (Q_INT16)sz.width() << (Q_INT16)sz.height(); + s << (TQ_INT16)sz.width() << (TQ_INT16)sz.height(); else - s << (Q_INT32)sz.width() << (Q_INT32)sz.height(); + s << (TQ_INT32)sz.width() << (TQ_INT32)sz.height(); return s; } @@ -418,12 +418,12 @@ TQDataStream &operator<<( TQDataStream &s, const TQSize &sz ) TQDataStream &operator>>( TQDataStream &s, TQSize &sz ) { if ( s.version() == 1 ) { - Q_INT16 w, h; + TQ_INT16 w, h; s >> w; sz.rwidth() = w; s >> h; sz.rheight() = h; } else { - Q_INT32 w, h; + TQ_INT32 w, h; s >> w; sz.rwidth() = w; s >> h; sz.rheight() = h; } |