diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-11-08 10:47:09 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-08 13:49:53 +0100 |
| commit | 7317f4440a9af01feac7758afff8f98e9150dd62 (patch) | |
| tree | a2b6101c2b9996e753dd1b8d489607958b9e5284 /src/winextras/qwinthumbnailtoolbar.cpp | |
| parent | b6ca71cfb9889a784d3d9ee998974e89faf60bec (diff) | |
Prefix the various CLSID/IID symbols by 'q'.
Avoid clashes with the various MinGW libraries.
Task-number: QTBUG-34638
Change-Id: I1fe0e1b79b52f887522c1c19a15bbdcb256fd917
Reviewed-by: Ivan Vizir <define-true-false@yandex.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src/winextras/qwinthumbnailtoolbar.cpp')
| -rw-r--r-- | src/winextras/qwinthumbnailtoolbar.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/winextras/qwinthumbnailtoolbar.cpp b/src/winextras/qwinthumbnailtoolbar.cpp index cc85b9c..c1f0f2c 100644 --- a/src/winextras/qwinthumbnailtoolbar.cpp +++ b/src/winextras/qwinthumbnailtoolbar.cpp @@ -44,6 +44,7 @@ #include "qwinthumbnailtoolbar_p.h" #include "qwinthumbnailtoolbutton.h" #include "qwinthumbnailtoolbutton_p.h" +#include "windowsguidsdefs_p.h" #include <QWindow> #include <QCoreApplication> @@ -215,10 +216,10 @@ void QWinThumbnailToolBar::clear() static inline ITaskbarList4 *createTaskbarList() { ITaskbarList4 *result = 0; - HRESULT hresult = CoCreateInstance(CLSID_TaskbarList, 0, CLSCTX_INPROC_SERVER, IID_ITaskbarList4, reinterpret_cast<void **>(&result)); + HRESULT hresult = CoCreateInstance(CLSID_TaskbarList, 0, CLSCTX_INPROC_SERVER, qIID_ITaskbarList4, reinterpret_cast<void **>(&result)); if (FAILED(hresult)) { const QString err = QtWin::errorStringFromHresult(hresult); - qWarning("QWinThumbnailToolBar: IID_ITaskbarList4 was not created: %#010x, %s.", + qWarning("QWinThumbnailToolBar: qIID_ITaskbarList4 was not created: %#010x, %s.", (unsigned)hresult, qPrintable(err)); return 0; } @@ -226,7 +227,7 @@ static inline ITaskbarList4 *createTaskbarList() if (FAILED(hresult)) { result->Release(); const QString err = QtWin::errorStringFromHresult(hresult); - qWarning("QWinThumbnailToolBar: IID_ITaskbarList4 was not initialized: %#010x, %s.", + qWarning("QWinThumbnailToolBar: qIID_ITaskbarList4 was not initialized: %#010x, %s.", (unsigned)hresult, qPrintable(err)); return 0; } |