summaryrefslogtreecommitdiffstats
path: root/src/kernel/qdragobject.cpp
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-12-19 14:03:14 -0600
committerDarrell Anderson <humanreadable@yahoo.com>2012-12-19 14:03:14 -0600
commitf8224f3a623495e4e1dbf852554d7601a6b7c4c4 (patch)
treed5583114ba48669960c9f7d68927687ea652a0b8 /src/kernel/qdragobject.cpp
parent25240579092616b09d28705ac84e13e49b744707 (diff)
parente8cbbedf46da493d2c206444a7e18e5777402905 (diff)
downloadtqt-f8224f3a623495e4e1dbf852554d7601a6b7c4c4.tar.gz
tqt-f8224f3a623495e4e1dbf852554d7601a6b7c4c4.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/kernel/qdragobject.cpp')
-rw-r--r--src/kernel/qdragobject.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/kernel/qdragobject.cpp b/src/kernel/qdragobject.cpp
index 191b1c098..428000a36 100644
--- a/src/kernel/qdragobject.cpp
+++ b/src/kernel/qdragobject.cpp
@@ -1749,9 +1749,9 @@ TQColorDrag::TQColorDrag( TQWidget *dragsource, const char *name )
void TQColorDrag::setColor( const TQColor &col )
{
- short r = (col.red() << 8) | col.red();
- short g = (col.green() << 8) | col.green();
- short b = (col.blue() << 8) | col.blue();
+ unsigned short r = (col.red() << 8) | col.red();
+ unsigned short g = (col.green() << 8) | col.green();
+ unsigned short b = (col.blue() << 8) | col.blue();
// make sure we transmit data in network order
r = htons(r);