diff options
| author | Kevin Funk <kevin.funk@kdab.com> | 2017-09-18 11:49:52 +0200 |
|---|---|---|
| committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-19 11:53:55 +0000 |
| commit | 58c14c4a7edcecdd9d58b682a9360c83e2274ec5 (patch) | |
| tree | 7f600686e4dd92681bec09ac745a9dcd4425844b /src/plugins/platforms/windows/accessible | |
| parent | 47c92fbb0b588b443cead18a5aad5a2b5ad9e4d7 (diff) | |
Replace Q_NULLPTR with nullptr where possible
Remaining uses of Q_NULLPTR are in:
src/corelib/global/qcompilerdetection.h
(definition and documentation of Q_NULLPTR)
tests/manual/qcursor/qcursorhighdpi/main.cpp
(a test executable compilable both under Qt4 and Qt5)
Change-Id: If6b074d91486e9b784138f4514f5c6d072acda9a
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/plugins/platforms/windows/accessible')
| -rw-r--r-- | src/plugins/platforms/windows/accessible/iaccessible2.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/platforms/windows/accessible/iaccessible2.cpp b/src/plugins/platforms/windows/accessible/iaccessible2.cpp index 9239facb0c..3e60f45dd7 100644 --- a/src/plugins/platforms/windows/accessible/iaccessible2.cpp +++ b/src/plugins/platforms/windows/accessible/iaccessible2.cpp @@ -925,7 +925,7 @@ HRESULT STDMETHODCALLTYPE QWindowsIA2Accessible::get_selectedColumns(long **sele const QList<int> selectedIndices = tableIface->selectedColumns(); const int count = selectedIndices.count(); *nColumns = count; - *selectedColumns = Q_NULLPTR; + *selectedColumns = nullptr; if (count) { *selectedColumns = coTaskMemAllocArray<long>(count); std::copy(selectedIndices.constBegin(), selectedIndices.constEnd(), @@ -948,7 +948,7 @@ HRESULT STDMETHODCALLTYPE QWindowsIA2Accessible::get_selectedRows(long **selecte const QList<int> selectedIndices = tableIface->selectedRows(); const int count = selectedIndices.count(); *nRows = count; - *selectedRows = Q_NULLPTR; + *selectedRows = nullptr; if (count) { *selectedRows = coTaskMemAllocArray<long>(count); std::copy(selectedIndices.constBegin(), selectedIndices.constEnd(), @@ -1617,7 +1617,7 @@ HRESULT QWindowsIA2Accessible::wrapListOfCells(const QList<QAccessibleInterface* const int count = inputCells.count(); // Server allocates array *nCellCount = count; - *outputAccessibles = Q_NULLPTR; + *outputAccessibles = nullptr; if (count) { *outputAccessibles = coTaskMemAllocArray<IUnknown *>(count); std::transform(inputCells.constBegin(), inputCells.constEnd(), |