Fixed typo in variable name.

[mutilities/MUtilities.git] / src / Taskbar7_Win32.cpp

diff --git a/src/Taskbar7_Win32.cpp b/src/Taskbar7_Win32.cpp
index 205ed55..2e63f11 100644 (file)
--- a/src/Taskbar7_Win32.cpp
+++ b/src/Taskbar7_Win32.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
-// LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2015 LoRd_MuldeR <MuldeR2@GMX.de>
+// MuldeR's Utilities for Qt
+// Copyright (C) 2004-2018 LoRd_MuldeR <MuldeR2@GMX.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -25,9 +25,15 @@
 #include <MUtils/OSSupport.h>
 #include <MUtils/Exception.h>
 
+//Internal
+#include "Utils_Win32.h"
+
 //Qt
 #include <QWidget>
 #include <QIcon>
+#if QT_VERSION > QT_VERSION_CHECK(5,0,0)
+#include <QtWinExtras>
+#endif
 
 //Windows includes
 #define NOMINMAX
@@ -45,7 +51,7 @@
        { \
                return false; \
        } \
-       if(!(p->initialized || initialize())) \
+       if(!(MUTILS_BOOLIFY(p->initialized) || initialize())) \
        { \
                qWarning("Taskbar initialization failed!"); \
                return false; \
@@ -67,13 +73,11 @@ namespace MUtils
                Taskbar7_Private(void)
                {
                        taskbarList = NULL;
-                       supported   = false;
-                       initialized = false;
                }
 
                ITaskbarList3 *taskbarList;
-               volatile bool supported;
-               volatile bool initialized;
+               QAtomicInt supported;
+               QAtomicInt initialized;
        };
 }
 
@@ -90,9 +94,16 @@ MUtils::Taskbar7::Taskbar7(QWidget *const window)
        {
                MUTILS_THROW("Taskbar7: Window pointer must not be NULL!");
        }
-       if(!(p->supported = (OS::os_version() >= OS::Version::WINDOWS_WIN70)))
+       if (!p->supported)
        {
-               qWarning("Taskbar7: Taskbar progress not supported on this platform.");
+               if (OS::os_version() >= OS::Version::WINDOWS_WIN70)
+               {
+                       p->supported.ref();
+               }
+               else
+               {
+                       qWarning("Taskbar7: Taskbar progress not supported on this platform.");
+               }
        }
 }
 
@@ -153,15 +164,15 @@ bool MUtils::Taskbar7::setOverlayIcon(const QIcon *const icon, const QString &in
        HRESULT result = HRESULT(-1);
        if(icon)
        {
-               if(const HICON hIcon = icon->pixmap(16,16).toWinHICON())
+               if(const HICON hIcon = (HICON)MUtils::Win32Utils::qicon_to_hicon(icon, 16, 16))
                {
-                       result = p->taskbarList->SetOverlayIcon(m_window->winId(), hIcon, MUTILS_WCHR(info));
+                       result = p->taskbarList->SetOverlayIcon(reinterpret_cast<HWND>(m_window->winId()), hIcon, MUTILS_WCHR(info));
                        DestroyIcon(hIcon);
                }
        }
        else
        {
-               result = p->taskbarList->SetOverlayIcon(m_window->winId(), NULL, MUTILS_WCHR(info));
+               result = p->taskbarList->SetOverlayIcon(reinterpret_cast<HWND>(m_window->winId()), NULL, MUTILS_WCHR(info));
        }
        return SUCCEEDED(result);
 }
@@ -184,7 +195,7 @@ bool MUtils::Taskbar7::initialize(void)
                p->taskbarList = ptbl;
        }
 
-       while(!p->initialized)
+       if(!p->initialized)
        {
                bool okay = false;
                for(int i = 0; i < 8; i++)
@@ -201,7 +212,7 @@ bool MUtils::Taskbar7::initialize(void)
                        qWarning("ITaskbarList3::HrInit() has failed!");
                        return false;
                }
-               p->initialized = true;
+               p->initialized.ref(); /*success*/
        }
 
        return true;