diff options
| author | Kevin Funk <kfunk@kde.org> | 2017-09-24 23:55:01 +0200 |
|---|---|---|
| committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-27 08:05:53 +0000 |
| commit | 1e2914d4537eb5acaede9b81d6edac12e99e4b1f (patch) | |
| tree | 08c755d33311dc245f23da93ff3a7df471f30405 | |
| parent | c9274edfeda72a3809bd17edec91f05c094bcca1 (diff) | |
| download | qtscript-1e2914d4537eb5acaede9b81d6edac12e99e4b1f.tar.gz | |
Replace Q_NULLPTR with nullptr
Change-Id: I9b2a6ce4a0278520fd95042a1b2736cc5a0d4be6
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| -rw-r--r-- | src/script/api/qscriptengine.h | 2 | ||||
| -rw-r--r-- | src/script/api/qscriptextensionplugin.h | 2 | ||||
| -rw-r--r-- | src/script/api/qscriptstring.h | 2 | ||||
| -rw-r--r-- | src/scripttools/debugging/qscriptenginedebugger.h | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/script/api/qscriptengine.h b/src/script/api/qscriptengine.h index 80a2869..c7bda46 100644 --- a/src/script/api/qscriptengine.h +++ b/src/script/api/qscriptengine.h @@ -264,7 +264,7 @@ protected: QScriptEngine(QScriptEnginePrivate &dd); #else - explicit QScriptEngine(QScriptEnginePrivate &dd, QObject *parent = Q_NULLPTR); + explicit QScriptEngine(QScriptEnginePrivate &dd, QObject *parent = nullptr); #endif private: diff --git a/src/script/api/qscriptextensionplugin.h b/src/script/api/qscriptextensionplugin.h index 8fd1618..f2e4bb8 100644 --- a/src/script/api/qscriptextensionplugin.h +++ b/src/script/api/qscriptextensionplugin.h @@ -39,7 +39,7 @@ class Q_SCRIPT_EXPORT QScriptExtensionPlugin : public QObject, Q_OBJECT Q_INTERFACES(QScriptExtensionInterface:QFactoryInterface) public: - explicit QScriptExtensionPlugin(QObject *parent = Q_NULLPTR); + explicit QScriptExtensionPlugin(QObject *parent = nullptr); ~QScriptExtensionPlugin(); virtual QStringList keys() const = 0; diff --git a/src/script/api/qscriptstring.h b/src/script/api/qscriptstring.h index eed4a1e..c538581 100644 --- a/src/script/api/qscriptstring.h +++ b/src/script/api/qscriptstring.h @@ -47,7 +47,7 @@ public: bool operator==(const QScriptString &other) const; bool operator!=(const QScriptString &other) const; - quint32 toArrayIndex(bool *ok = Q_NULLPTR) const; + quint32 toArrayIndex(bool *ok = nullptr) const; QString toString() const; operator QString() const; diff --git a/src/scripttools/debugging/qscriptenginedebugger.h b/src/scripttools/debugging/qscriptenginedebugger.h index a56a833..a20aba9 100644 --- a/src/scripttools/debugging/qscriptenginedebugger.h +++ b/src/scripttools/debugging/qscriptenginedebugger.h @@ -89,7 +89,7 @@ public: SuspendedState }; - explicit QScriptEngineDebugger(QObject *parent = Q_NULLPTR); + explicit QScriptEngineDebugger(QObject *parent = nullptr); ~QScriptEngineDebugger(); void attachTo(QScriptEngine *engine); @@ -101,8 +101,8 @@ public: #ifndef QT_NO_MAINWINDOW QMainWindow *standardWindow() const; #endif - QToolBar *createStandardToolBar(QWidget *parent = Q_NULLPTR); - QMenu *createStandardMenu(QWidget *parent = Q_NULLPTR); + QToolBar *createStandardToolBar(QWidget *parent = nullptr); + QMenu *createStandardMenu(QWidget *parent = nullptr); QWidget *widget(DebuggerWidget widget) const; QAction *action(DebuggerAction action) const; |