Commit ee74a4c8 authored by J-P Nurmi's avatar J-P Nurmi Committed by The Qt Project
Browse files

QWinTaskbarButton: minor tweaks


Make the constructor's parent argument optional, and do not
pass a pointer to a half constructed object to the private
implementation.

Change-Id: I48df98f8d55ec49fd8f155b14167038055712cfc
Reviewed-by: default avatarJake Petroules <jake.petroules@petroules.com>
Reviewed-by: default avatarCaroline Chao <caroline.chao@digia.com>
Reviewed-by: default avatarJan Arve Sæther <jan-arve.saether@digia.com>
Showing with 7 additions and 5 deletions
...@@ -88,8 +88,10 @@ QT_BEGIN_NAMESPACE ...@@ -88,8 +88,10 @@ QT_BEGIN_NAMESPACE
Constructs a QWinTaskbarButton with the parent object \a parent. Constructs a QWinTaskbarButton with the parent object \a parent.
*/ */
QWinTaskbarButton::QWinTaskbarButton(QObject *parent) : QWinTaskbarButton::QWinTaskbarButton(QObject *parent) :
QObject(parent), d_ptr(new QWinTaskbarButtonPrivate(this)) QObject(parent), d_ptr(new QWinTaskbarButtonPrivate)
{ {
Q_D(QWinTaskbarButton);
d->q_ptr = this;
QWinEventFilter::setup(); QWinEventFilter::setup();
} }
...@@ -294,9 +296,9 @@ void QWinTaskbarButton::resetProgress() ...@@ -294,9 +296,9 @@ void QWinTaskbarButton::resetProgress()
QWinTaskbarButtonPrivate::QWinTaskbarButtonPrivate(QWinTaskbarButton *parent) : QWinTaskbarButtonPrivate::QWinTaskbarButtonPrivate() :
progressMinimum(0), progressMaximum(100), progressValue(0), progressState(QWinTaskbarButton::NoProgressState), progressMinimum(0), progressMaximum(100), progressValue(0), progressState(QWinTaskbarButton::NoProgressState),
updateNeeded(false), pTbList(0), window(0), q_ptr(parent) updateNeeded(false), pTbList(0), window(0), q_ptr(0)
{ {
HRESULT hresult = CoCreateInstance(CLSID_TaskbarList, 0, CLSCTX_INPROC_SERVER, IID_ITaskbarList4, reinterpret_cast<void **>(&pTbList)); HRESULT hresult = CoCreateInstance(CLSID_TaskbarList, 0, CLSCTX_INPROC_SERVER, IID_ITaskbarList4, reinterpret_cast<void **>(&pTbList));
if (FAILED(hresult)) { if (FAILED(hresult)) {
......
...@@ -71,7 +71,7 @@ public: ...@@ -71,7 +71,7 @@ public:
Q_ENUMS(ProgressState) Q_ENUMS(ProgressState)
explicit QWinTaskbarButton(QObject *parent); explicit QWinTaskbarButton(QObject *parent = 0);
~QWinTaskbarButton(); ~QWinTaskbarButton();
void setWindow(QWindow *window); void setWindow(QWindow *window);
......
...@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE ...@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
class QWinTaskbarButtonPrivate class QWinTaskbarButtonPrivate
{ {
public: public:
explicit QWinTaskbarButtonPrivate(QWinTaskbarButton *parent); QWinTaskbarButtonPrivate();
~QWinTaskbarButtonPrivate(); ~QWinTaskbarButtonPrivate();
int progressMinimum; int progressMinimum;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment