diff options
author | Darrell Anderson <[email protected]> | 2012-06-18 00:09:52 -0500 |
---|---|---|
committer | Darrell Anderson <[email protected]> | 2012-06-18 00:09:52 -0500 |
commit | d1096751ddb25cdef23919c17389fc268c31edaf (patch) | |
tree | b910be3588cb706defc00c31aefa850bb2312784 /src/kernel/qcursor.cpp | |
parent | af8fdcf1ca7bdbda6f0c1afecd8c2d8ffa23bebb (diff) | |
parent | 6dec101d43dcbd4195c47d54bd388db1a8d7230e (diff) | |
download | tqt3-d1096751ddb25cdef23919c17389fc268c31edaf.tar.gz tqt3-d1096751ddb25cdef23919c17389fc268c31edaf.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/kernel/qcursor.cpp')
-rw-r--r-- | src/kernel/qcursor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/kernel/qcursor.cpp b/src/kernel/qcursor.cpp index 2a4cfd18d..ecb21333f 100644 --- a/src/kernel/qcursor.cpp +++ b/src/kernel/qcursor.cpp @@ -159,7 +159,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQCursor &c ) { - s << (Q_INT16)c.shape(); // write shape id to stream + s << (TQ_INT16)c.shape(); // write shape id to stream if ( c.shape() == TQt::BitmapCursor ) { // bitmap cursor #if !defined(QT_NO_IMAGEIO) s << *c.bitmap() << *c.mask(); @@ -180,7 +180,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQCursor &c ) TQDataStream &operator>>( TQDataStream &s, TQCursor &c ) { - Q_INT16 shape; + TQ_INT16 shape; s >> shape; // read shape id from stream if ( shape == TQt::BitmapCursor ) { // read bitmap cursor #if !defined(QT_NO_IMAGEIO) |