diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-07 13:05:48 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-07 23:02:47 +0200 |
commit | 564b59d903683b14c75b72a3e93367717f201def (patch) | |
tree | 03ffe749d83dce84429a7db484bf92795047036f /src/plugins/platforms/ios/optional/nsphotolibrarysupport | |
parent | b5fc1e4e2643e73d3b44c483d159529f8deb8af1 (diff) |
Another round of replacing 0 with nullptr
This time based on grepping to also include documentation, tests and
examples previously missed by the automatic tool.
Change-Id: Ied1703f4bcc470fbc275f759ed5b7c588a5c4e9f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/plugins/platforms/ios/optional/nsphotolibrarysupport')
-rw-r--r-- | src/plugins/platforms/ios/optional/nsphotolibrarysupport/plugin.mm | 2 | ||||
-rw-r--r-- | src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/plugin.mm b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/plugin.mm index 8b372b8749..2a3d8c603e 100644 --- a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/plugin.mm +++ b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/plugin.mm @@ -52,7 +52,7 @@ class QIosOptionalPlugin_NSPhotoLibrary : public QObject, QIosOptionalPluginInte Q_INTERFACES(QIosOptionalPluginInterface) public: - explicit QIosOptionalPlugin_NSPhotoLibrary(QObject* = 0) {}; + explicit QIosOptionalPlugin_NSPhotoLibrary(QObject * = nullptr) {}; ~QIosOptionalPlugin_NSPhotoLibrary() {} UIViewController* createImagePickerController(QIOSFileDialog *fileDialog) const override diff --git a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm index c5244a51ad..01524a00e8 100644 --- a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm +++ b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm @@ -54,7 +54,7 @@ static QThreadStorage<QString> g_iteratorCurrentUrl; static QThreadStorage<QPointer<QIOSAssetData> > g_assetDataCache; static const int kBufferSize = 10; -static ALAsset *kNoAsset = 0; +static ALAsset *kNoAsset = nullptr; static bool ensureAuthorizationDialogNotBlocked() { @@ -366,7 +366,7 @@ bool QIOSFileEngineAssetsLibrary::close() // Delete later, so that we can reuse the asset if a QFile is // opened with the same path during the same event loop cycle. m_data->deleteLater(); - m_data = 0; + m_data = nullptr; } return true; } @@ -410,7 +410,7 @@ qint64 QIOSFileEngineAssetsLibrary::read(char *data, qint64 maxlen) if (!bytesRead) return 0; - NSError *error = 0; + NSError *error = nullptr; [[asset defaultRepresentation] getBytes:(uint8_t *)data fromOffset:m_offset length:bytesRead error:&error]; if (error) { |