diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-09-06 10:52:07 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-10 08:44:27 +0200 |
| commit | 5f4df5a39be121ca60cac2b06cf94bead76d74d9 (patch) | |
| tree | 4c179b708902bce3aa6a7d0074524c0435a41f8d /src/winextras/qwinthumbnailtoolbar.cpp | |
| parent | a3e3da4356f30c333a74bf152429195b3ee8f030 (diff) | |
Rename namespace QtWinExtras to QtWin.
As discussed on mailing list.
Change-Id: I7ef41d758730998e365d9e616118c4a7c811eebf
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/winextras/qwinthumbnailtoolbar.cpp')
| -rw-r--r-- | src/winextras/qwinthumbnailtoolbar.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/winextras/qwinthumbnailtoolbar.cpp b/src/winextras/qwinthumbnailtoolbar.cpp index ebb1ed8..06c5861 100644 --- a/src/winextras/qwinthumbnailtoolbar.cpp +++ b/src/winextras/qwinthumbnailtoolbar.cpp @@ -195,7 +195,7 @@ static inline ITaskbarList4 *createTaskbarList() ITaskbarList4 *result = 0; HRESULT hresult = CoCreateInstance(CLSID_TaskbarList, 0, CLSCTX_INPROC_SERVER, IID_ITaskbarList4, reinterpret_cast<void **>(&result)); if (FAILED(hresult)) { - const QString err = QtWinExtras::errorStringFromHresult(hresult); + const QString err = QtWin::errorStringFromHresult(hresult); qWarning("QWinThumbnailToolBar: IID_ITaskbarList4 was not created: %#010x, %s.", (unsigned)hresult, qPrintable(err)); return 0; @@ -203,7 +203,7 @@ static inline ITaskbarList4 *createTaskbarList() hresult = result->HrInit(); if (FAILED(hresult)) { result->Release(); - const QString err = QtWinExtras::errorStringFromHresult(hresult); + const QString err = QtWin::errorStringFromHresult(hresult); qWarning("QWinThumbnailToolBar: IID_ITaskbarList4 was not initialized: %#010x, %s.", (unsigned)hresult, qPrintable(err)); return 0; @@ -261,7 +261,7 @@ void QWinThumbnailToolBarPrivate::_q_updateToolbar() buttons[i].dwFlags = makeNativeButtonFlags(button); buttons[i].dwMask = makeButtonMask(button); if (!button->icon().isNull()) {; - buttons[i].hIcon = QtWinExtras::toHICON(button->icon().pixmap(GetSystemMetrics(SM_CXSMICON))); + 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); } @@ -359,7 +359,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(QtWinExtras::errorStringFromHresult(hresult)); + .arg(QtWin::errorStringFromHresult(hresult)); } QT_END_NAMESPACE |