diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-02-21 10:41:54 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-02-26 07:13:18 +0000 |
| commit | 499ec43937e926e4f2fa57a9baa455fcb3862262 (patch) | |
| tree | 206c90d47387f8322b68f5e3db613189397e1af3 /src/imports/folderlistmodel | |
| parent | 53d1e9ed21d25e65a2f13606af479838f5f21fe7 (diff) | |
use nullptr consistently (clang-tidy)
From now on we prefer nullptr instead of 0 to clarify cases where
we are assigning or testing a pointer rather than a numeric zero.
Also, replaced cases where 0 was passed as Qt::KeyboardModifiers
with Qt::NoModifier (clang-tidy replaced them with nullptr, which
waas wrong, so it was just as well to make the tests more readable
rather than to revert those lines).
Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/imports/folderlistmodel')
| -rw-r--r-- | src/imports/folderlistmodel/fileinfothread.cpp | 2 | ||||
| -rw-r--r-- | src/imports/folderlistmodel/plugin.cpp | 2 | ||||
| -rw-r--r-- | src/imports/folderlistmodel/qquickfolderlistmodel.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/folderlistmodel/fileinfothread.cpp b/src/imports/folderlistmodel/fileinfothread.cpp index 4ef8d02810..5b44ed012f 100644 --- a/src/imports/folderlistmodel/fileinfothread.cpp +++ b/src/imports/folderlistmodel/fileinfothread.cpp @@ -47,7 +47,7 @@ FileInfoThread::FileInfoThread(QObject *parent) : QThread(parent), abort(false), #if QT_CONFIG(filesystemwatcher) - watcher(0), + watcher(nullptr), #endif sortFlags(QDir::Name), needUpdate(true), diff --git a/src/imports/folderlistmodel/plugin.cpp b/src/imports/folderlistmodel/plugin.cpp index e90c8724e0..5e8b41401f 100644 --- a/src/imports/folderlistmodel/plugin.cpp +++ b/src/imports/folderlistmodel/plugin.cpp @@ -58,7 +58,7 @@ class QmlFolderListModelPlugin : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: - QmlFolderListModelPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } + QmlFolderListModelPlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { initResources(); } void registerTypes(const char *uri) override { Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt.labs.folderlistmodel")); diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp index b3c1de6cc9..32c709830a 100644 --- a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp +++ b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp @@ -114,7 +114,7 @@ void QQuickFolderListModelPrivate::updateSorting() { Q_Q(QQuickFolderListModel); - QDir::SortFlags flags = 0; + QDir::SortFlags flags = nullptr; switch (sortField) { case QQuickFolderListModel::Unsorted: |