diff options
author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-01-19 14:27:12 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-01-19 14:55:43 +0000 |
commit | 7167af382ff3ada668462ad6e7df7b6643609fc5 (patch) | |
tree | 4e3739dc5b8c32d5423274e8afa79bfb396ef400 /src/winextras/qwinthumbnailtoolbar.cpp | |
parent | c49209f274ca5b487eb4f94400cec5d5567dec60 (diff) |
Fix some CLANG warnings.
Remove C-style casts and fix integer conversion issues.
Change-Id: I26e969e9108eb6f68c029ad5c507b95d95cd4d26
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/winextras/qwinthumbnailtoolbar.cpp')
-rw-r--r-- | src/winextras/qwinthumbnailtoolbar.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
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)); } |