Fix some CLANG warnings.

Remove C-style casts and fix integer conversion issues.

Change-Id: I26e969e9108eb6f68c029ad5c507b95d95cd4d26
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

5 files changed, 23 insertions, 18 deletions

diff --git a/src/winextras/qwineventfilter.cpp b/src/winextras/qwineventfilter.cpp
index 1515777..6749b22 100644
--- a/src/winextras/qwineventfilter.cpp
+++ b/src/winextras/qwineventfilter.cpp
@@ -66,7 +66,7 @@ bool QWinEventFilter::nativeEventFilter(const QByteArray &, void *message, long
     QWindow *window = 0;
     switch (msg->message) {
     case WM_DWMCOLORIZATIONCOLORCHANGED :
-        event = new QWinColorizationChangeEvent(msg->wParam, msg->lParam);
+        event = new QWinColorizationChangeEvent(QRgb(msg->wParam), msg->lParam);
         break;
     case WM_DWMCOMPOSITIONCHANGED :
         event = new QWinCompositionChangeEvent(QtWin::isCompositionEnabled());
diff --git a/src/winextras/qwinfunctions.cpp b/src/winextras/qwinfunctions.cpp
index 47be02c..eee58c1 100644
--- a/src/winextras/qwinfunctions.cpp
+++ b/src/winextras/qwinfunctions.cpp
@@ -191,13 +191,13 @@ QRegion QtWin::fromHRGN(HRGN hrgn)
     if (regionDataSize == 0)
         return QRegion();
 
-    LPRGNDATA regionData = (LPRGNDATA)malloc(regionDataSize);
+    LPRGNDATA regionData = reinterpret_cast<LPRGNDATA>(malloc(regionDataSize));
     if (!regionData)
         return QRegion();
 
     QRegion region;
     if (GetRegionData(hrgn, regionDataSize, regionData) == regionDataSize) {
-        LPRECT pRect = (LPRECT)regionData->Buffer;
+        LPRECT pRect = reinterpret_cast<LPRECT>(regionData->Buffer);
         for (DWORD i = 0; i < regionData->rdh.nCount; ++i)
             region += QRect(pRect[i].left, pRect[i].top,
                             pRect[i].right - pRect[i].left,
@@ -215,11 +215,11 @@ static inline QString errorMessageFromComError(const _com_error &comError)
 {
      TCHAR *message = Q_NULLPTR;
      FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-                   NULL, comError.Error(), MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT),
+                   NULL, DWORD(comError.Error()), MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT),
                    reinterpret_cast<LPWSTR>(&message), 0, NULL);
      if (message) {
          const QString result = QString::fromWCharArray(message).trimmed();
-         LocalFree((HLOCAL)message);
+         LocalFree(message);
          return result;
      }
      if (const WORD wCode = comError.WCode())
diff --git a/src/winextras/qwinjumplist.cpp b/src/winextras/qwinjumplist.cpp
index 9caebdc..5c3e48c 100644
--- a/src/winextras/qwinjumplist.cpp
+++ b/src/winextras/qwinjumplist.cpp
@@ -100,7 +100,7 @@ QWinJumpListPrivate::QWinJumpListPrivate() :
 void QWinJumpListPrivate::warning(const char *function, HRESULT hresult)
 {
     const QString err = QtWin::errorStringFromHresult(hresult);
-    qWarning("QWinJumpList: %s() failed: %#010x, %s.", function, (unsigned)hresult, qPrintable(err));
+    qWarning("QWinJumpList: %s() failed: %#010x, %s.", function, unsigned(hresult), qPrintable(err));
 }
 
 QString QWinJumpListPrivate::iconsDirPath()
@@ -325,8 +325,13 @@ IShellLinkW *QWinJumpListPrivate::toIShellLink(const QWinJumpListItem *item)
     }
 
     const QString args = createArguments(item->arguments());
-    const int iconPathSize = QWinJumpListPrivate::iconsDirPath().size() + sizeof(void *)*2 + 4; // path + ptr-name-in-hex + .ico
-    const int bufferSize = qMax(args.size(), qMax(item->workingDirectory().size(), qMax(item->description().size(), qMax(item->title().size(), qMax(item->filePath().size(), iconPathSize))))) + 1;
+    const int iconPathSize = QWinJumpListPrivate::iconsDirPath().size()
+        + int(sizeof(void *)) * 2 + 4; // path + ptr-name-in-hex + .ico
+    const int bufferSize = qMax(args.size(),
+                                qMax(item->workingDirectory().size(),
+                                     qMax(item->description().size(),
+                                          qMax(item->title().size(),
+                                               qMax(item->filePath().size(), iconPathSize))))) + 1;
     wchar_t *buffer = new wchar_t[bufferSize];
 
     if (!item->description().isEmpty()) {
diff --git a/src/winextras/qwintaskbarbutton.cpp b/src/winextras/qwintaskbarbutton.cpp
index 3bf0035..bbb380a 100644
--- a/src/winextras/qwintaskbarbutton.cpp
+++ b/src/winextras/qwintaskbarbutton.cpp
@@ -100,12 +100,12 @@ QWinTaskbarButtonPrivate::QWinTaskbarButtonPrivate() : progressBar(0), pTbList(0
     if (FAILED(hresult)) {
         pTbList = 0;
         const QString err = QtWin::errorStringFromHresult(hresult);
-        qWarning("QWinTaskbarButton: qIID_ITaskbarList4 was not created: %#010x, %s.", (unsigned)hresult, qPrintable(err));
+        qWarning("QWinTaskbarButton: qIID_ITaskbarList4 was not created: %#010x, %s.", unsigned(hresult), qPrintable(err));
     } else if (FAILED(pTbList->HrInit())) {
         pTbList->Release();
         pTbList = 0;
         const QString err = QtWin::errorStringFromHresult(hresult);
-        qWarning("QWinTaskbarButton: qIID_ITaskbarList4 was not initialized: %#010x, %s.", (unsigned)hresult, qPrintable(err));
+        qWarning("QWinTaskbarButton: qIID_ITaskbarList4 was not initialized: %#010x, %s.", unsigned(hresult), qPrintable(err));
     }
 }
 
@@ -140,7 +140,7 @@ void QWinTaskbarButtonPrivate::updateOverlayIcon()
     if (hicon)
         pTbList->SetOverlayIcon(handle(), hicon, descrPtr);
     else if (!hicon && !overlayIcon.isNull())
-        pTbList->SetOverlayIcon(handle(), (HICON)LoadImage(0, IDI_APPLICATION, IMAGE_ICON, SM_CXSMICON, SM_CYSMICON, LR_SHARED), descrPtr);
+        pTbList->SetOverlayIcon(handle(), static_cast<HICON>(LoadImage(0, IDI_APPLICATION, IMAGE_ICON, SM_CXSMICON, SM_CYSMICON, LR_SHARED)), descrPtr);
     else
         pTbList->SetOverlayIcon(handle(), NULL, descrPtr);
 
@@ -160,8 +160,8 @@ void QWinTaskbarButtonPrivate::_q_updateProgress()
         const int max = progressBar->maximum();
         const int range = max - min;
         if (range > 0) {
-            const int value = 100.0 * (progressBar->value() - min) / range;
-            pTbList->SetProgressValue(handle(), value, 100);
+            const int value = 100 * (progressBar->value() - min) / range;
+            pTbList->SetProgressValue(handle(), ULONGLONG(value), 100);
         }
     }
     pTbList->SetProgressState(handle(), nativeProgressState(progressBar));
diff --git a/src/winextras/qwinthumbnailtoolbar.cpp b/src/winextras/qwinthumbnailtoolbar.cpp
index a0118f7..0c34f2b 100644
--- a/src/winextras/qwinthumbnailtoolbar.cpp
+++ b/src/winextras/qwinthumbnailtoolbar.cpp
@@ -424,7 +424,7 @@ static inline ITaskbarList4 *createTaskbarList()
     if (FAILED(hresult)) {
         const QString err = QtWin::errorStringFromHresult(hresult);
         qWarning("QWinThumbnailToolBar: qIID_ITaskbarList4 was not created: %#010x, %s.",
-                 (unsigned)hresult, qPrintable(err));
+                 unsigned(hresult), qPrintable(err));
         return 0;
     }
     hresult = result->HrInit();
@@ -432,7 +432,7 @@ static inline ITaskbarList4 *createTaskbarList()
         result->Release();
         const QString err = QtWin::errorStringFromHresult(hresult);
         qWarning("QWinThumbnailToolBar: qIID_ITaskbarList4 was not initialized: %#010x, %s.",
-                 (unsigned)hresult, qPrintable(err));
+                 unsigned(hresult), qPrintable(err));
         return 0;
     }
     return result;
@@ -507,7 +507,7 @@ void QWinThumbnailToolBarPrivate::_q_updateToolbar()
         if (!button->icon().isNull()) {;
             buttons[i].hIcon = QtWin::toHICON(button->icon().pixmap(GetSystemMetrics(SM_CXSMICON)));
             if (!buttons[i].hIcon)
-                buttons[i].hIcon = (HICON)LoadImage(0, IDI_APPLICATION, IMAGE_ICON, SM_CXSMICON, SM_CYSMICON, LR_SHARED);
+                buttons[i].hIcon = static_cast<HICON>(LoadImage(0, IDI_APPLICATION, IMAGE_ICON, SM_CXSMICON, SM_CYSMICON, LR_SHARED));
             else
                 createdIcons << buttons[i].hIcon;
         }
@@ -581,7 +581,7 @@ void QWinThumbnailToolBarPrivate::initButtons(THUMBBUTTON *buttons)
 {
     for (int i = 0; i < windowsLimitedThumbbarSize; i++) {
         memset(&buttons[i], 0, sizeof buttons[i]);
-        buttons[i].iId = i;
+        buttons[i].iId = UINT(i);
         buttons[i].dwFlags = THBF_HIDDEN;
         buttons[i].dwMask  = THB_FLAGS;
     }
@@ -620,7 +620,7 @@ QString QWinThumbnailToolBarPrivate::msgComFailed(const char *function, HRESULT
 {
     return QString::fromLatin1("QWinThumbnailToolBar: %1() failed: #%2: %3")
             .arg(QLatin1String(function))
-            .arg((unsigned)hresult, 10, 16, QLatin1Char('0'))
+            .arg(unsigned(hresult), 10, 16, QLatin1Char('0'))
             .arg(QtWin::errorStringFromHresult(hresult));
 }