diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2013-09-11 12:44:41 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-11 12:56:06 +0200 |
| commit | 0c657048b9215274df10f5cf779c39260f203ce8 (patch) | |
| tree | 1ef28c3c905807913edf0b4e6ae4ccc11d98c805 /src | |
| parent | b4c0ff2d9ef181ae0564764c75118ca974ebbc00 (diff) | |
QWinTaskbarButton: use qt_qstringToNullTerminated()
Change-Id: I45afc2906fac85b1db074f37040a1c81fb7379c5
Reviewed-by: Ivan Vizir <define-true-false@yandex.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/winextras/qwintaskbarbutton.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/winextras/qwintaskbarbutton.cpp b/src/winextras/qwintaskbarbutton.cpp index 3f49f14..4ba73ee 100644 --- a/src/winextras/qwintaskbarbutton.cpp +++ b/src/winextras/qwintaskbarbutton.cpp @@ -43,6 +43,7 @@ #include "qwintaskbarbutton_p.h" #include "qwintaskbarprogress.h" #include "qwinfunctions.h" +#include "qwinfunctions_p.h" #include "qwineventfilter_p.h" #include "qwinevent.h" #include "winshobjidl_p.h" @@ -118,10 +119,8 @@ void QWinTaskbarButtonPrivate::updateOverlayIcon() wchar_t *descrPtr = 0; HICON hicon = 0; - if (!overlayAccessibleDescription.isEmpty()) { - descrPtr = new wchar_t[overlayAccessibleDescription.length() + 1]; - descrPtr[overlayAccessibleDescription.toWCharArray(descrPtr)] = 0; - } + if (!overlayAccessibleDescription.isEmpty()) + descrPtr = qt_qstringToNullTerminated(overlayAccessibleDescription); if (!overlayIcon.isNull()) hicon = QtWin::toHICON(overlayIcon.pixmap(iconSize())); |