From 527a61afacabd0e0c83fd4f9a85404fc2513a988 Mon Sep 17 00:00:00 2001
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Mon, 22 Apr 2013 22:04:42 +0300
Subject: Explicitly cast some shorts to ushorts.

This should fix some C++11 build errors, as clang was warning that r, g and
b were being narrowed from short to ushort.

Change-Id: I15333063bfdff3503d00e8baac18adcc343dba4b
Reviewed-by: David Faure (KDE) <faure@kde.org>
---
 src/qt3support/other/q3dragobject.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/qt3support')

diff --git a/src/qt3support/other/q3dragobject.cpp b/src/qt3support/other/q3dragobject.cpp
index e089af1621..addfa6f637 100644
--- a/src/qt3support/other/q3dragobject.cpp
+++ b/src/qt3support/other/q3dragobject.cpp
@@ -1505,7 +1505,9 @@ void Q3ColorDrag::setColor(const QColor &col)
     b = htons(b);
 
     ushort rgba[4] = {
-        r, g, b,
+        static_cast<ushort>(r),
+        static_cast<ushort>(g),
+        static_cast<ushort>(b),
         0xffff // Alpha not supported yet.
     };
     QByteArray data;
-- 
cgit v1.2.3