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/qcolor.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/qcolor.cpp')
| -rw-r--r-- | src/kernel/qcolor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/kernel/qcolor.cpp b/src/kernel/qcolor.cpp index eb345bfd7..af11e67a7 100644 --- a/src/kernel/qcolor.cpp +++ b/src/kernel/qcolor.cpp @@ -930,7 +930,7 @@ uint TQColor::pixel() const TQDataStream &operator<<( TQDataStream &s, const TQColor &c ) { - Q_UINT32 p = (Q_UINT32)c.rgb(); + TQ_UINT32 p = (TQ_UINT32)c.rgb(); if ( s.version() == 1 ) // Swap red and blue p = ((p << 16) & 0xff0000) | ((p >> 16) & 0xff) | (p & 0xff00ff00); return s << p; @@ -945,7 +945,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQColor &c ) TQDataStream &operator>>( TQDataStream &s, TQColor &c ) { - Q_UINT32 p; + TQ_UINT32 p; s >> p; if ( s.version() == 1 ) // Swap red and blue p = ((p << 16) & 0xff0000) | ((p >> 16) & 0xff) | (p & 0xff00ff00); |