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/qwinjumplistcategory.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/qwinjumplistcategory.cpp')
| -rw-r--r-- | src/winextras/qwinjumplistcategory.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/winextras/qwinjumplistcategory.cpp b/src/winextras/qwinjumplistcategory.cpp index 25b10a2..4ca815e 100644 --- a/src/winextras/qwinjumplistcategory.cpp +++ b/src/winextras/qwinjumplistcategory.cpp @@ -46,6 +46,7 @@ #include "qwinfunctions_p.h" #include "qwinjumplist_p.h" #include "winshobjidl_p.h" +#include "windowsguidsdefs_p.h" #include <shlobj.h> @@ -98,7 +99,7 @@ void QWinJumpListCategoryPrivate::loadRecents() { Q_ASSERT(jumpList); IApplicationDocumentLists *pDocList = 0; - HRESULT hresult = CoCreateInstance(CLSID_ApplicationDocumentLists, 0, CLSCTX_INPROC_SERVER, IID_IApplicationDocumentLists, reinterpret_cast<void **>(&pDocList)); + HRESULT hresult = CoCreateInstance(qCLSID_ApplicationDocumentLists, 0, CLSCTX_INPROC_SERVER, qIID_IApplicationDocumentLists, reinterpret_cast<void **>(&pDocList)); if (SUCCEEDED(hresult)) { if (!jumpList->identifier().isEmpty()) { wchar_t *id = qt_qstringToNullTerminated(jumpList->identifier()); @@ -108,7 +109,7 @@ void QWinJumpListCategoryPrivate::loadRecents() if (SUCCEEDED(hresult)) { IObjectArray *array = 0; hresult = pDocList->GetList(type == QWinJumpListCategory::Recent ? ADLT_RECENT : ADLT_FREQUENT, - 0, IID_IObjectArray, reinterpret_cast<void **>(&array)); + 0, qIID_IObjectArray, reinterpret_cast<void **>(&array)); if (SUCCEEDED(hresult)) { items = QWinJumpListPrivate::fromComCollection(array); array->Release(); @@ -139,7 +140,7 @@ void QWinJumpListCategoryPrivate::addRecent(QWinJumpListItem *item) void QWinJumpListCategoryPrivate::clearRecents() { IApplicationDestinations *pDest = 0; - HRESULT hresult = CoCreateInstance(CLSID_ApplicationDestinations, 0, CLSCTX_INPROC_SERVER, IID_IApplicationDestinations, reinterpret_cast<void **>(&pDest)); + HRESULT hresult = CoCreateInstance(qCLSID_ApplicationDestinations, 0, CLSCTX_INPROC_SERVER, qIID_IApplicationDestinations, reinterpret_cast<void **>(&pDest)); if (SUCCEEDED(hresult)) { const QString identifier = jumpList ? jumpList->identifier() : QString(); if (!identifier.isEmpty()) { |