aboutsummaryrefslogtreecommitdiffstats
path: root/src/winextras
diff options
context:
space:
mode:
Diffstat (limited to 'src/winextras')
-rw-r--r--src/winextras/qwineventfilter.cpp12
-rw-r--r--src/winextras/qwineventfilter_p.h6
-rw-r--r--src/winextras/qwinfunctions.cpp30
-rw-r--r--src/winextras/qwinfunctions.h12
-rw-r--r--src/winextras/qwinfunctions_p.h2
-rw-r--r--src/winextras/qwinjumplist.cpp62
-rw-r--r--src/winextras/qwinjumplistcategory.cpp18
-rw-r--r--src/winextras/qwinjumplistitem.cpp2
-rw-r--r--src/winextras/qwintaskbarbutton.cpp20
-rw-r--r--src/winextras/qwintaskbarbutton.h2
-rw-r--r--src/winextras/qwintaskbarbutton_p.h4
-rw-r--r--src/winextras/qwinthumbnailtoolbar.cpp25
-rw-r--r--src/winextras/qwinthumbnailtoolbar_p.h20
-rw-r--r--src/winextras/winextras.pro2
14 files changed, 113 insertions, 104 deletions
diff --git a/src/winextras/qwineventfilter.cpp b/src/winextras/qwineventfilter.cpp
index be9add4..4b88f54 100644
--- a/src/winextras/qwineventfilter.cpp
+++ b/src/winextras/qwineventfilter.cpp
@@ -51,7 +51,7 @@
# define WM_DWMCOMPOSITIONCHANGED 0x031E
#endif
-QWinEventFilter *QWinEventFilter::instance = 0;
+QWinEventFilter *QWinEventFilter::instance = nullptr;
QWinEventFilter::QWinEventFilter() :
tbButtonCreatedMsgId(RegisterWindowMessageW(L"TaskbarButtonCreated"))
@@ -60,16 +60,20 @@ QWinEventFilter::QWinEventFilter() :
QWinEventFilter::~QWinEventFilter()
{
- instance = 0;
+ instance = nullptr;
}
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+bool QWinEventFilter::nativeEventFilter(const QByteArray &, void *message, qintptr *result)
+#else
bool QWinEventFilter::nativeEventFilter(const QByteArray &, void *message, long *result)
+#endif
{
MSG *msg = static_cast<MSG *>(message);
bool filterOut = false;
- QEvent *event = 0;
- QWindow *window = 0;
+ QEvent *event = nullptr;
+ QWindow *window = nullptr;
switch (msg->message) {
case WM_DWMCOLORIZATIONCOLORCHANGED :
event = new QWinColorizationChangeEvent(QRgb(msg->wParam), msg->lParam);
diff --git a/src/winextras/qwineventfilter_p.h b/src/winextras/qwineventfilter_p.h
index 12b9d58..ad37177 100644
--- a/src/winextras/qwineventfilter_p.h
+++ b/src/winextras/qwineventfilter_p.h
@@ -64,7 +64,11 @@ class Q_WINEXTRAS_EXPORT QWinEventFilter : public QAbstractNativeEventFilter
public:
QWinEventFilter();
~QWinEventFilter();
- virtual bool nativeEventFilter(const QByteArray &eventType, void *message, long *result);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override;
+#else
+ bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override;
+#endif
static void setup();
diff --git a/src/winextras/qwinfunctions.cpp b/src/winextras/qwinfunctions.cpp
index 82fd25b..b237a50 100644
--- a/src/winextras/qwinfunctions.cpp
+++ b/src/winextras/qwinfunctions.cpp
@@ -209,9 +209,9 @@ HRGN QtWin::toHRGN(const QRegion &region)
{
const int size = region.rectCount();
if (size == 0)
- return 0;
+ return nullptr;
- HRGN resultRgn = 0;
+ HRGN resultRgn = nullptr;
const auto rects = region.begin();
resultRgn = qt_RectToHRGN(rects[0]);
for (int i = 1; i < size; i++) {
@@ -231,17 +231,17 @@ HRGN QtWin::toHRGN(const QRegion &region)
*/
QRegion QtWin::fromHRGN(HRGN hrgn)
{
- DWORD regionDataSize = GetRegionData(hrgn, 0, NULL);
+ DWORD regionDataSize = GetRegionData(hrgn, 0, nullptr);
if (regionDataSize == 0)
return QRegion();
- LPRGNDATA regionData = reinterpret_cast<LPRGNDATA>(malloc(regionDataSize));
+ auto regionData = reinterpret_cast<LPRGNDATA>(malloc(regionDataSize));
if (!regionData)
return QRegion();
QRegion region;
if (GetRegionData(hrgn, regionDataSize, regionData) == regionDataSize) {
- LPRECT pRect = reinterpret_cast<LPRECT>(regionData->Buffer);
+ auto 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,
@@ -1623,7 +1623,7 @@ QtWin::WindowFlip3DPolicy QtWin::windowFlip3DPolicy(QWindow *window)
{
Q_ASSERT_X(window, Q_FUNC_INFO, "window is null");
- const DWORD value =
+ const auto value =
QtDwmApiDll::windowAttribute<DWORD>(reinterpret_cast<HWND>(window->winId()),
DWMWA_FLIP3D_POLICY, DWORD(DWMFLIP3D_DEFAULT));
QtWin::WindowFlip3DPolicy policy = QtWin::FlipDefault;
@@ -1738,10 +1738,10 @@ void QtWin::enableBlurBehindWindow(QWindow *window, const QRegion &region)
{
Q_ASSERT_X(window, Q_FUNC_INFO, "window is null");
- DWM_BLURBEHIND dwmbb = {0, 0, 0, 0};
+ DWM_BLURBEHIND dwmbb = {0, 0, nullptr, 0};
dwmbb.dwFlags = DWM_BB_ENABLE;
dwmbb.fEnable = TRUE;
- HRGN rgn = 0;
+ HRGN rgn = nullptr;
if (!region.isNull()) {
rgn = toHRGN(region);
if (rgn) {
@@ -1788,7 +1788,7 @@ void QtWin::enableBlurBehindWindow(QWindow *window)
void QtWin::disableBlurBehindWindow(QWindow *window)
{
Q_ASSERT_X(window, Q_FUNC_INFO, "window is null");
- DWM_BLURBEHIND dwmbb = {0, 0, 0, 0};
+ DWM_BLURBEHIND dwmbb = {0, 0, nullptr, 0};
dwmbb.dwFlags = DWM_BB_ENABLE;
DwmEnableBlurBehindWindow(reinterpret_cast<HWND>(window->winId()), &dwmbb);
}
@@ -1859,12 +1859,12 @@ void QtWin::setCurrentProcessExplicitAppUserModelID(const QString &id)
*/
ITaskbarList3 *qt_createITaskbarList3()
{
- ITaskbarList3 *pTbList = 0;
- HRESULT result = CoCreateInstance(CLSID_TaskbarList, 0, CLSCTX_INPROC_SERVER, qIID_ITaskbarList3, reinterpret_cast<void **>(&pTbList));
+ ITaskbarList3 *pTbList = nullptr;
+ HRESULT result = CoCreateInstance(CLSID_TaskbarList, nullptr, CLSCTX_INPROC_SERVER, qIID_ITaskbarList3, reinterpret_cast<void **>(&pTbList));
if (SUCCEEDED(result)) {
if (FAILED(pTbList->HrInit())) {
pTbList->Release();
- pTbList = 0;
+ pTbList = nullptr;
}
}
return pTbList;
@@ -1875,12 +1875,12 @@ ITaskbarList3 *qt_createITaskbarList3()
*/
ITaskbarList2 *qt_createITaskbarList2()
{
- ITaskbarList3 *pTbList = 0;
- HRESULT result = CoCreateInstance(CLSID_TaskbarList, 0, CLSCTX_INPROC_SERVER, qIID_ITaskbarList2, reinterpret_cast<void **>(&pTbList));
+ ITaskbarList3 *pTbList = nullptr;
+ HRESULT result = CoCreateInstance(CLSID_TaskbarList, nullptr, CLSCTX_INPROC_SERVER, qIID_ITaskbarList2, reinterpret_cast<void **>(&pTbList));
if (SUCCEEDED(result)) {
if (FAILED(pTbList->HrInit())) {
pTbList->Release();
- pTbList = 0;
+ pTbList = nullptr;
}
}
return pTbList;
diff --git a/src/winextras/qwinfunctions.h b/src/winextras/qwinfunctions.h
index fe461d1..ef2aece 100644
--- a/src/winextras/qwinfunctions.h
+++ b/src/winextras/qwinfunctions.h
@@ -131,10 +131,8 @@ namespace QtWin
inline bool isWindowExcludedFromPeek(QWidget *window)
{
- if (!window->windowHandle())
- return false;
- else
- return isWindowExcludedFromPeek(window->windowHandle());
+ auto handle = window->windowHandle();
+ return handle && isWindowExcludedFromPeek(handle);
}
inline void setWindowDisallowPeek(QWidget *window, bool disallow)
@@ -145,10 +143,8 @@ namespace QtWin
inline bool isWindowPeekDisallowed(QWidget *window)
{
- if (!window->windowHandle())
- return false;
- else
- return isWindowPeekDisallowed(window->windowHandle());
+ auto handle = window->windowHandle();
+ return handle && isWindowPeekDisallowed(handle);
}
inline void setWindowFlip3DPolicy(QWidget *window, WindowFlip3DPolicy policy)
diff --git a/src/winextras/qwinfunctions_p.h b/src/winextras/qwinfunctions_p.h
index 03dff5e..0ee73cb 100644
--- a/src/winextras/qwinfunctions_p.h
+++ b/src/winextras/qwinfunctions_p.h
@@ -83,7 +83,7 @@ inline void qt_qstringToNullTerminated(const QString &src, wchar_t *dst)
inline wchar_t *qt_qstringToNullTerminated(const QString &src)
{
- wchar_t *buffer = new wchar_t[src.length() + 1];
+ auto *buffer = new wchar_t[src.length() + 1];
qt_qstringToNullTerminated(src, buffer);
return buffer;
}
diff --git a/src/winextras/qwinjumplist.cpp b/src/winextras/qwinjumplist.cpp
index ca1b20a..55c99f4 100644
--- a/src/winextras/qwinjumplist.cpp
+++ b/src/winextras/qwinjumplist.cpp
@@ -159,11 +159,11 @@ void QWinJumpListPrivate::_q_rebuild()
void QWinJumpListPrivate::destroy()
{
delete recent;
- recent = 0;
+ recent = nullptr;
delete frequent;
- frequent = 0;
+ frequent = nullptr;
delete tasks;
- tasks = 0;
+ tasks = nullptr;
qDeleteAll(categories);
categories.clear();
invalidate();
@@ -179,7 +179,7 @@ bool QWinJumpListPrivate::beginList()
}
if (SUCCEEDED(hresult)) {
UINT maxSlots = 0;
- IUnknown *array = 0;
+ IUnknown *array = nullptr;
hresult = pDestList->BeginList(&maxSlots, qIID_IUnknown, reinterpret_cast<void **>(&array));
if (array)
array->Release();
@@ -234,15 +234,15 @@ QList<QWinJumpListItem *> QWinJumpListPrivate::fromComCollection(IObjectArray *a
UINT count = 0;
array->GetCount(&count);
for (UINT i = 0; i < count; ++i) {
- IUnknown *collectionItem = 0;
+ IUnknown *collectionItem = nullptr;
HRESULT hresult = array->GetAt(i, qIID_IUnknown, reinterpret_cast<void **>(&collectionItem));
if (FAILED(hresult)) {
QWinJumpListPrivate::warning("GetAt", hresult);
continue;
}
- IShellItem2 *shellItem = 0;
- IShellLinkW *shellLink = 0;
- QWinJumpListItem *jumplistItem = 0;
+ IShellItem2 *shellItem = nullptr;
+ IShellLinkW *shellLink = nullptr;
+ QWinJumpListItem *jumplistItem = nullptr;
if (SUCCEEDED(collectionItem->QueryInterface(qIID_IShellItem2, reinterpret_cast<void **>(&shellItem)))) {
jumplistItem = fromIShellItem(shellItem);
shellItem->Release();
@@ -262,12 +262,12 @@ QList<QWinJumpListItem *> QWinJumpListPrivate::fromComCollection(IObjectArray *a
IObjectCollection *QWinJumpListPrivate::toComCollection(const QList<QWinJumpListItem *> &list)
{
if (list.isEmpty())
- return 0;
- IObjectCollection *collection = 0;
- HRESULT hresult = CoCreateInstance(qCLSID_EnumerableObjectCollection, 0, CLSCTX_INPROC_SERVER, qIID_IObjectCollection, reinterpret_cast<void **>(&collection));
+ return nullptr;
+ IObjectCollection *collection = nullptr;
+ HRESULT hresult = CoCreateInstance(qCLSID_EnumerableObjectCollection, nullptr, CLSCTX_INPROC_SERVER, qIID_IObjectCollection, reinterpret_cast<void **>(&collection));
if (FAILED(hresult)) {
QWinJumpListPrivate::warning("QWinJumpList: failed to instantiate IObjectCollection", hresult);
- return 0;
+ return nullptr;
}
for (QWinJumpListItem *item : list) {
IUnknown *iitem = toICustomDestinationListItem(item);
@@ -281,7 +281,7 @@ IObjectCollection *QWinJumpListPrivate::toComCollection(const QList<QWinJumpList
QWinJumpListItem *QWinJumpListPrivate::fromIShellLink(IShellLinkW *link)
{
- QWinJumpListItem *item = new QWinJumpListItem(QWinJumpListItem::Link);
+ auto *item = new QWinJumpListItem(QWinJumpListItem::Link);
IPropertyStore *linkProps;
link->QueryInterface(qIID_IPropertyStore, reinterpret_cast<void **>(&linkProps));
@@ -309,7 +309,7 @@ QWinJumpListItem *QWinJumpListPrivate::fromIShellLink(IShellLinkW *link)
QWinJumpListItem *QWinJumpListPrivate::fromIShellItem(IShellItem2 *shellitem)
{
- QWinJumpListItem *item = new QWinJumpListItem(QWinJumpListItem::Destination);
+ auto *item = new QWinJumpListItem(QWinJumpListItem::Destination);
wchar_t *strPtr;
shellitem->GetDisplayName(SIGDN_FILESYSPATH, &strPtr);
item->setFilePath(QDir::fromNativeSeparators(QString::fromWCharArray(strPtr)));
@@ -327,17 +327,17 @@ IUnknown *QWinJumpListPrivate::toICustomDestinationListItem(const QWinJumpListIt
case QWinJumpListItem::Separator :
return makeSeparatorShellItem();
default:
- return 0;
+ return nullptr;
}
}
IShellLinkW *QWinJumpListPrivate::toIShellLink(const QWinJumpListItem *item)
{
- IShellLinkW *link = 0;
- HRESULT hresult = CoCreateInstance(CLSID_ShellLink, 0, CLSCTX_INPROC_SERVER, qIID_IShellLinkW, reinterpret_cast<void **>(&link));
+ IShellLinkW *link = nullptr;
+ HRESULT hresult = CoCreateInstance(CLSID_ShellLink, nullptr, CLSCTX_INPROC_SERVER, qIID_IShellLinkW, reinterpret_cast<void **>(&link));
if (FAILED(hresult)) {
QWinJumpListPrivate::warning("QWinJumpList: failed to instantiate IShellLinkW", hresult);
- return 0;
+ return nullptr;
}
const QString args = createArguments(item->arguments());
@@ -348,7 +348,7 @@ IShellLinkW *QWinJumpListPrivate::toIShellLink(const QWinJumpListItem *item)
qMax(item->description().size(),
qMax(item->title().size(),
qMax(item->filePath().size(), iconPathSize))))) + 1;
- wchar_t *buffer = new wchar_t[bufferSize];
+ auto *buffer = new wchar_t[bufferSize];
if (!item->description().isEmpty()) {
qt_qstringToNullTerminated(item->description(), buffer);
@@ -380,7 +380,7 @@ IShellLinkW *QWinJumpListPrivate::toIShellLink(const QWinJumpListItem *item)
hresult = link->QueryInterface(qIID_IPropertyStore, reinterpret_cast<void **>(&properties));
if (FAILED(hresult)) {
link->Release();
- return 0;
+ return nullptr;
}
qt_qstringToNullTerminated(item->title(), buffer);
@@ -396,24 +396,24 @@ IShellLinkW *QWinJumpListPrivate::toIShellLink(const QWinJumpListItem *item)
IShellItem2 *QWinJumpListPrivate::toIShellItem(const QWinJumpListItem *item)
{
- IShellItem2 *shellitem = 0;
+ IShellItem2 *shellitem = nullptr;
QScopedArrayPointer<wchar_t> buffer(qt_qstringToNullTerminated(item->filePath()));
- SHCreateItemFromParsingName(buffer.data(), 0, qIID_IShellItem2, reinterpret_cast<void **>(&shellitem));
+ SHCreateItemFromParsingName(buffer.data(), nullptr, qIID_IShellItem2, reinterpret_cast<void **>(&shellitem));
return shellitem;
}
IShellLinkW *QWinJumpListPrivate::makeSeparatorShellItem()
{
IShellLinkW *separator;
- HRESULT res = CoCreateInstance(CLSID_ShellLink, 0, CLSCTX_INPROC_SERVER, qIID_IShellLinkW, reinterpret_cast<void **>(&separator));
+ HRESULT res = CoCreateInstance(CLSID_ShellLink, nullptr, CLSCTX_INPROC_SERVER, qIID_IShellLinkW, reinterpret_cast<void **>(&separator));
if (FAILED(res))
- return 0;
+ return nullptr;
IPropertyStore *properties;
res = separator->QueryInterface(qIID_IPropertyStore, reinterpret_cast<void **>(&properties));
if (FAILED(res)) {
separator->Release();
- return 0;
+ return nullptr;
}
PROPVARIANT isSeparator;
@@ -434,7 +434,7 @@ QWinJumpList::QWinJumpList(QObject *parent) :
{
Q_D(QWinJumpList);
d->q_ptr = this;
- HRESULT hresult = CoCreateInstance(qCLSID_DestinationList, 0, CLSCTX_INPROC_SERVER, qIID_ICustomDestinationList, reinterpret_cast<void **>(&d_ptr->pDestList));
+ HRESULT hresult = CoCreateInstance(qCLSID_DestinationList, nullptr, CLSCTX_INPROC_SERVER, qIID_ICustomDestinationList, reinterpret_cast<void **>(&d_ptr->pDestList));
if (FAILED(hresult))
QWinJumpListPrivate::warning("CoCreateInstance", hresult);
d->invalidate();
@@ -450,7 +450,7 @@ QWinJumpList::~QWinJumpList()
d->_q_rebuild();
if (d->pDestList) {
d->pDestList->Release();
- d->pDestList = 0;
+ d->pDestList = nullptr;
}
d->destroy();
}
@@ -496,7 +496,7 @@ QWinJumpListCategory *QWinJumpList::recent() const
{
Q_D(const QWinJumpList);
if (!d->recent) {
- QWinJumpList *that = const_cast<QWinJumpList *>(this);
+ auto *that = const_cast<QWinJumpList *>(this);
that->d_func()->recent = QWinJumpListCategoryPrivate::create(QWinJumpListCategory::Recent, that);
}
return d->recent;
@@ -509,7 +509,7 @@ QWinJumpListCategory *QWinJumpList::frequent() const
{
Q_D(const QWinJumpList);
if (!d->frequent) {
- QWinJumpList *that = const_cast<QWinJumpList *>(this);
+ auto *that = const_cast<QWinJumpList *>(this);
that->d_func()->frequent = QWinJumpListCategoryPrivate::create(QWinJumpListCategory::Frequent, that);
}
return d->frequent;
@@ -522,7 +522,7 @@ QWinJumpListCategory *QWinJumpList::tasks() const
{
Q_D(const QWinJumpList);
if (!d->tasks) {
- QWinJumpList *that = const_cast<QWinJumpList *>(this);
+ auto *that = const_cast<QWinJumpList *>(this);
that->d_func()->tasks = QWinJumpListCategoryPrivate::create(QWinJumpListCategory::Tasks, that);
}
return d->tasks;
@@ -558,7 +558,7 @@ void QWinJumpList::addCategory(QWinJumpListCategory *category)
*/
QWinJumpListCategory *QWinJumpList::addCategory(const QString &title, const QList<QWinJumpListItem *> items)
{
- QWinJumpListCategory *category = new QWinJumpListCategory(title);
+ auto *category = new QWinJumpListCategory(title);
for (QWinJumpListItem *item : items)
category->addItem(item);
addCategory(category);
diff --git a/src/winextras/qwinjumplistcategory.cpp b/src/winextras/qwinjumplistcategory.cpp
index 721a78c..a29c37e 100644
--- a/src/winextras/qwinjumplistcategory.cpp
+++ b/src/winextras/qwinjumplistcategory.cpp
@@ -104,8 +104,8 @@ void QWinJumpListCategoryPrivate::invalidate()
void QWinJumpListCategoryPrivate::loadRecents()
{
Q_ASSERT(jumpList);
- IApplicationDocumentLists *pDocList = 0;
- HRESULT hresult = CoCreateInstance(qCLSID_ApplicationDocumentLists, 0, CLSCTX_INPROC_SERVER, qIID_IApplicationDocumentLists, reinterpret_cast<void **>(&pDocList));
+ IApplicationDocumentLists *pDocList = nullptr;
+ HRESULT hresult = CoCreateInstance(qCLSID_ApplicationDocumentLists, nullptr, CLSCTX_INPROC_SERVER, qIID_IApplicationDocumentLists, reinterpret_cast<void **>(&pDocList));
if (SUCCEEDED(hresult)) {
if (!jumpList->identifier().isEmpty()) {
wchar_t *id = qt_qstringToNullTerminated(jumpList->identifier());
@@ -113,7 +113,7 @@ void QWinJumpListCategoryPrivate::loadRecents()
delete[] id;
}
if (SUCCEEDED(hresult)) {
- IObjectArray *array = 0;
+ IObjectArray *array = nullptr;
hresult = pDocList->GetList(type == QWinJumpListCategory::Recent ? ADLT_RECENT : ADLT_FREQUENT,
0, qIID_IObjectArray, reinterpret_cast<void **>(&array));
if (SUCCEEDED(hresult)) {
@@ -130,7 +130,7 @@ void QWinJumpListCategoryPrivate::loadRecents()
void QWinJumpListCategoryPrivate::addRecent(QWinJumpListItem *item)
{
Q_ASSERT(item->type() == QWinJumpListItem::Link);
- wchar_t *id = 0;
+ wchar_t *id = nullptr;
if (jumpList && !jumpList->identifier().isEmpty())
id = qt_qstringToNullTerminated(jumpList->identifier());
@@ -146,8 +146,8 @@ void QWinJumpListCategoryPrivate::addRecent(QWinJumpListItem *item)
void QWinJumpListCategoryPrivate::clearRecents()
{
- IApplicationDestinations *pDest = 0;
- HRESULT hresult = CoCreateInstance(qCLSID_ApplicationDestinations, 0, CLSCTX_INPROC_SERVER, qIID_IApplicationDestinations, reinterpret_cast<void **>(&pDest));
+ IApplicationDestinations *pDest = nullptr;
+ HRESULT hresult = CoCreateInstance(qCLSID_ApplicationDestinations, nullptr, CLSCTX_INPROC_SERVER, qIID_IApplicationDestinations, reinterpret_cast<void **>(&pDest));
if (SUCCEEDED(hresult)) {
const QString identifier = jumpList ? jumpList->identifier() : QString();
if (!identifier.isEmpty()) {
@@ -294,7 +294,7 @@ void QWinJumpListCategory::addItem(QWinJumpListItem *item)
*/
QWinJumpListItem *QWinJumpListCategory::addDestination(const QString &filePath)
{
- QWinJumpListItem *item = new QWinJumpListItem(QWinJumpListItem::Destination);
+ auto *item = new QWinJumpListItem(QWinJumpListItem::Destination);
item->setFilePath(filePath);
addItem(item);
return item;
@@ -317,7 +317,7 @@ QWinJumpListItem *QWinJumpListCategory::addLink(const QString &title, const QStr
*/
QWinJumpListItem *QWinJumpListCategory::addLink(const QIcon &icon, const QString &title, const QString &executablePath, const QStringList &arguments)
{
- QWinJumpListItem *item = new QWinJumpListItem(QWinJumpListItem::Link);
+ auto *item = new QWinJumpListItem(QWinJumpListItem::Link);
item->setFilePath(executablePath);
item->setTitle(title);
item->setArguments(arguments);
@@ -333,7 +333,7 @@ QWinJumpListItem *QWinJumpListCategory::addLink(const QIcon &icon, const QString
*/
QWinJumpListItem *QWinJumpListCategory::addSeparator()
{
- QWinJumpListItem *item = new QWinJumpListItem(QWinJumpListItem::Separator);
+ auto *item = new QWinJumpListItem(QWinJumpListItem::Separator);
addItem(item);
return item;
}
diff --git a/src/winextras/qwinjumplistitem.cpp b/src/winextras/qwinjumplistitem.cpp
index 6c183ec..ee117bc 100644
--- a/src/winextras/qwinjumplistitem.cpp
+++ b/src/winextras/qwinjumplistitem.cpp
@@ -80,7 +80,7 @@ QWinJumpListItem::QWinJumpListItem(QWinJumpListItem::Type type) :
d_ptr(new QWinJumpListItemPrivate)
{
d_ptr->type = type;
- d_ptr->category = 0;
+ d_ptr->category = nullptr;
}
/*!
diff --git a/src/winextras/qwintaskbarbutton.cpp b/src/winextras/qwintaskbarbutton.cpp
index a1475d3..9df4c30 100644
--- a/src/winextras/qwintaskbarbutton.cpp
+++ b/src/winextras/qwintaskbarbutton.cpp
@@ -100,16 +100,16 @@ static TBPFLAG nativeProgressState(QWinTaskbarProgress *progress)
return TBPF_NORMAL;
}
-QWinTaskbarButtonPrivate::QWinTaskbarButtonPrivate() : progressBar(0), pTbList(0), window(0)
+QWinTaskbarButtonPrivate::QWinTaskbarButtonPrivate()
{
- HRESULT hresult = CoCreateInstance(CLSID_TaskbarList, 0, CLSCTX_INPROC_SERVER, qIID_ITaskbarList4, reinterpret_cast<void **>(&pTbList));
+ HRESULT hresult = CoCreateInstance(CLSID_TaskbarList, nullptr, CLSCTX_INPROC_SERVER, qIID_ITaskbarList4, reinterpret_cast<void **>(&pTbList));
if (FAILED(hresult)) {
- pTbList = 0;
+ pTbList = nullptr;
const QString err = QtWin::errorStringFromHresult(hresult);
qWarning("QWinTaskbarButton: qIID_ITaskbarList4 was not created: %#010x, %s.", unsigned(hresult), qPrintable(err));
} else if (FAILED(pTbList->HrInit())) {
pTbList->Release();
- pTbList = 0;
+ pTbList = nullptr;
const QString err = QtWin::errorStringFromHresult(hresult);
qWarning("QWinTaskbarButton: qIID_ITaskbarList4 was not initialized: %#010x, %s.", unsigned(hresult), qPrintable(err));
}
@@ -136,8 +136,8 @@ void QWinTaskbarButtonPrivate::updateOverlayIcon()
if (!pTbList || !window)
return;
- wchar_t *descrPtr = 0;
- HICON hicon = 0;
+ wchar_t *descrPtr = nullptr;
+ HICON hicon = nullptr;
if (!overlayAccessibleDescription.isEmpty())
descrPtr = qt_qstringToNullTerminated(overlayAccessibleDescription);
if (!overlayIcon.isNull())
@@ -146,9 +146,9 @@ void QWinTaskbarButtonPrivate::updateOverlayIcon()
if (hicon)
pTbList->SetOverlayIcon(handle(), hicon, descrPtr);
else if (!hicon && !overlayIcon.isNull())
- pTbList->SetOverlayIcon(handle(), static_cast<HICON>(LoadImage(0, IDI_APPLICATION, IMAGE_ICON, SM_CXSMICON, SM_CYSMICON, LR_SHARED)), descrPtr);
+ pTbList->SetOverlayIcon(handle(), static_cast<HICON>(LoadImage(nullptr, IDI_APPLICATION, IMAGE_ICON, SM_CXSMICON, SM_CYSMICON, LR_SHARED)), descrPtr);
else
- pTbList->SetOverlayIcon(handle(), NULL, descrPtr);
+ pTbList->SetOverlayIcon(handle(), nullptr, descrPtr);
if (hicon)
DestroyIcon(hicon);
@@ -269,8 +269,8 @@ QWinTaskbarProgress *QWinTaskbarButton::progress() const
{
Q_D(const QWinTaskbarButton);
if (!d->progressBar) {
- QWinTaskbarButton *that = const_cast<QWinTaskbarButton *>(this);
- QWinTaskbarProgress *pbar = new QWinTaskbarProgress(that);
+ auto *that = const_cast<QWinTaskbarButton *>(this);
+ auto *pbar = new QWinTaskbarProgress(that);
connect(pbar, SIGNAL(destroyed()), this, SLOT(_q_updateProgress()));
connect(pbar, SIGNAL(valueChanged(int)), this, SLOT(_q_updateProgress()));
connect(pbar, SIGNAL(minimumChanged(int)), this, SLOT(_q_updateProgress()));
diff --git a/src/winextras/qwintaskbarbutton.h b/src/winextras/qwintaskbarbutton.h
index dc4d469..627beee 100644
--- a/src/winextras/qwintaskbarbutton.h
+++ b/src/winextras/qwintaskbarbutton.h
@@ -70,7 +70,7 @@ public:
QWinTaskbarProgress *progress() const;
- bool eventFilter(QObject *, QEvent *);
+ bool eventFilter(QObject *, QEvent *) override;
public Q_SLOTS:
void setOverlayIcon(const QIcon &icon);
diff --git a/src/winextras/qwintaskbarbutton_p.h b/src/winextras/qwintaskbarbutton_p.h
index ceafe47..e5445b2 100644
--- a/src/winextras/qwintaskbarbutton_p.h
+++ b/src/winextras/qwintaskbarbutton_p.h
@@ -80,8 +80,8 @@ public:
void _q_updateProgress();
- ITaskbarList4 *pTbList;
- QWindow *window;
+ ITaskbarList4 *pTbList = nullptr;
+ QWindow *window = nullptr;
};
QT_END_NAMESPACE
diff --git a/src/winextras/qwinthumbnailtoolbar.cpp b/src/winextras/qwinthumbnailtoolbar.cpp
index 3aa39b6..fc8d76e 100644
--- a/src/winextras/qwinthumbnailtoolbar.cpp
+++ b/src/winextras/qwinthumbnailtoolbar.cpp
@@ -185,7 +185,7 @@ void QWinThumbnailToolBar::removeButton(QWinThumbnailToolButton *button)
{
Q_D(QWinThumbnailToolBar);
if (button && d->buttonList.contains(button)) {
- button->d_func()->toolbar = 0;
+ button->d_func()->toolbar = nullptr;
disconnect(button, &QWinThumbnailToolButton::changed,
d, &QWinThumbnailToolBarPrivate::_q_scheduleUpdate);
@@ -259,7 +259,7 @@ void QWinThumbnailToolBarPrivate::IconicPixmapCache::deleteBitmap()
if (m_bitmap) {
DeleteObject(m_bitmap);
m_size = QSize();
- m_bitmap = 0;
+ m_bitmap = nullptr;
}
}
@@ -275,7 +275,7 @@ bool QWinThumbnailToolBarPrivate::IconicPixmapCache::setPixmap(const QPixmap &pi
HBITMAP QWinThumbnailToolBarPrivate::IconicPixmapCache::bitmap(const QSize &maxSize)
{
if (m_pixmap.isNull())
- return 0;
+ return nullptr;
if (m_bitmap && m_size.width() <= maxSize.width() && m_size.height() <= maxSize.height())
return m_bitmap;
deleteBitmap();
@@ -421,13 +421,13 @@ void QWinThumbnailToolBar::clear()
static inline ITaskbarList4 *createTaskbarList()
{
- ITaskbarList4 *result = 0;
- HRESULT hresult = CoCreateInstance(CLSID_TaskbarList, 0, CLSCTX_INPROC_SERVER, qIID_ITaskbarList4, reinterpret_cast<void **>(&result));
+ ITaskbarList4 *result = nullptr;
+ HRESULT hresult = CoCreateInstance(CLSID_TaskbarList, nullptr, CLSCTX_INPROC_SERVER, qIID_ITaskbarList4, reinterpret_cast<void **>(&result));
if (FAILED(hresult)) {
const QString err = QtWin::errorStringFromHresult(hresult);
qWarning("QWinThumbnailToolBar: qIID_ITaskbarList4 was not created: %#010x, %s.",
unsigned(hresult), qPrintable(err));
- return 0;
+ return nullptr;
}
hresult = result->HrInit();
if (FAILED(hresult)) {
@@ -435,14 +435,13 @@ static inline ITaskbarList4 *createTaskbarList()
const QString err = QtWin::errorStringFromHresult(hresult);
qWarning("QWinThumbnailToolBar: qIID_ITaskbarList4 was not initialized: %#010x, %s.",
unsigned(hresult), qPrintable(err));
- return 0;
+ return nullptr;
}
return result;
}
QWinThumbnailToolBarPrivate::QWinThumbnailToolBarPrivate() :
- QObject(0), updateScheduled(false), window(0), pTbList(createTaskbarList()), q_ptr(0),
- withinIconicThumbnailRequest(false), withinIconicLivePreviewRequest(false)
+ QObject(nullptr), pTbList(createTaskbarList())
{
buttonList.reserve(windowsLimitedThumbbarSize);
QCoreApplication::instance()->installNativeEventFilter(this);
@@ -462,7 +461,7 @@ inline bool QWinThumbnailToolBarPrivate::hasHandle() const
inline HWND QWinThumbnailToolBarPrivate::handle() const
{
- return hasHandle() ? reinterpret_cast<HWND>(window->winId()) : HWND(0);
+ return hasHandle() ? reinterpret_cast<HWND>(window->winId()) : nullptr;
}
void QWinThumbnailToolBarPrivate::initToolbar()
@@ -504,7 +503,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 = static_cast<HICON>(LoadImage(0, IDI_APPLICATION, IMAGE_ICON, SM_CXSMICON, SM_CYSMICON, LR_SHARED));
+ buttons[i].hIcon = static_cast<HICON>(LoadImage(nullptr, IDI_APPLICATION, IMAGE_ICON, SM_CXSMICON, SM_CYSMICON, LR_SHARED));
else
createdIcons << buttons[i].hIcon;
}
@@ -543,7 +542,11 @@ bool QWinThumbnailToolBarPrivate::eventFilter(QObject *object, QEvent *event)
return QObject::eventFilter(object, event);
}
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+bool QWinThumbnailToolBarPrivate::nativeEventFilter(const QByteArray &, void *message, qintptr *result)
+#else
bool QWinThumbnailToolBarPrivate::nativeEventFilter(const QByteArray &, void *message, long *result)
+#endif
{
const MSG *msg = static_cast<const MSG *>(message);
if (handle() != msg->hwnd)
diff --git a/src/winextras/qwinthumbnailtoolbar_p.h b/src/winextras/qwinthumbnailtoolbar_p.h
index 38d210b..c3180f3 100644
--- a/src/winextras/qwinthumbnailtoolbar_p.h
+++ b/src/winextras/qwinthumbnailtoolbar_p.h
@@ -69,7 +69,7 @@ public:
class IconicPixmapCache
{
public:
- IconicPixmapCache() : m_bitmap(0) {}
+ IconicPixmapCache() = default;
~IconicPixmapCache() { deleteBitmap(); }
operator bool() const { return !m_pixmap.isNull(); }
@@ -84,7 +84,7 @@ public:
QPixmap m_pixmap;
QSize m_size;
- HBITMAP m_bitmap;
+ HBITMAP m_bitmap = nullptr;
};
QWinThumbnailToolBarPrivate();
@@ -95,16 +95,20 @@ public:
void _q_scheduleUpdate();
bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE;
- virtual bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) Q_DECL_OVERRIDE;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override;
+#else
+ bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override;
+#endif
static void initButtons(THUMBBUTTON *buttons);
static int makeNativeButtonFlags(const QWinThumbnailToolButton *button);
static int makeButtonMask(const QWinThumbnailToolButton *button);
static QString msgComFailed(const char *function, HRESULT hresult);
- bool updateScheduled;
+ bool updateScheduled = false;
QList<QWinThumbnailToolButton *> buttonList;
- QWindow *window;
+ QWindow *window = nullptr;
ITaskbarList4 * const pTbList;
IconicPixmapCache iconicThumbnail;
@@ -117,10 +121,10 @@ private:
void updateIconicThumbnail(const MSG *message);
void updateIconicLivePreview(const MSG *message);
- QWinThumbnailToolBar *q_ptr;
+ QWinThumbnailToolBar *q_ptr = nullptr;
Q_DECLARE_PUBLIC(QWinThumbnailToolBar)
- bool withinIconicThumbnailRequest;
- bool withinIconicLivePreviewRequest;
+ bool withinIconicThumbnailRequest = false;
+ bool withinIconicLivePreviewRequest = false;
};
QT_END_NAMESPACE
diff --git a/src/winextras/winextras.pro b/src/winextras/winextras.pro
index 705c48c..8f582a5 100644
--- a/src/winextras/winextras.pro
+++ b/src/winextras/winextras.pro
@@ -2,8 +2,6 @@ TARGET = QtWinExtras
QT += gui-private core-private
-DEFINES += QT_NO_FOREACH
-
SOURCES += \
qwinfunctions.cpp \
qwintaskbarbutton.cpp \
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 03:35:51 +0000