diff options
| -rw-r--r-- | src/script/api/qscriptengine.h | 6 | ||||
| -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, 8 insertions, 8 deletions
diff --git a/src/script/api/qscriptengine.h b/src/script/api/qscriptengine.h index f7f8411..c9c0f7d 100644 --- a/src/script/api/qscriptengine.h +++ b/src/script/api/qscriptengine.h @@ -184,10 +184,10 @@ public: #ifndef QT_NO_QOBJECT QScriptValue newQObject(QObject *object, ValueOwnership ownership = QtOwnership, - const QObjectWrapOptions &options = 0); + const QObjectWrapOptions &options = QObjectWrapOptions()); QScriptValue newQObject(const QScriptValue &scriptObject, QObject *qtObject, ValueOwnership ownership = QtOwnership, - const QObjectWrapOptions &options = 0); + const QObjectWrapOptions &options = QObjectWrapOptions()); QScriptValue newQMetaObject(const QMetaObject *metaObject, const QScriptValue &ctor = QScriptValue()); @@ -264,7 +264,7 @@ protected: QScriptEngine(QScriptEnginePrivate &dd); #else - QScriptEngine(QScriptEnginePrivate &dd, QObject *parent = 0); + QScriptEngine(QScriptEnginePrivate &dd, QObject *parent = Q_NULLPTR); #endif private: diff --git a/src/script/api/qscriptextensionplugin.h b/src/script/api/qscriptextensionplugin.h index a31487a..8fd1618 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 = 0); + explicit QScriptExtensionPlugin(QObject *parent = Q_NULLPTR); ~QScriptExtensionPlugin(); virtual QStringList keys() const = 0; diff --git a/src/script/api/qscriptstring.h b/src/script/api/qscriptstring.h index c4047f2..eed4a1e 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 = 0) const; + quint32 toArrayIndex(bool *ok = Q_NULLPTR) const; QString toString() const; operator QString() const; diff --git a/src/scripttools/debugging/qscriptenginedebugger.h b/src/scripttools/debugging/qscriptenginedebugger.h index 0286072..7fd5c77 100644 --- a/src/scripttools/debugging/qscriptenginedebugger.h +++ b/src/scripttools/debugging/qscriptenginedebugger.h @@ -89,7 +89,7 @@ public: SuspendedState }; - QScriptEngineDebugger(QObject *parent = 0); + QScriptEngineDebugger(QObject *parent = Q_NULLPTR); ~QScriptEngineDebugger(); void attachTo(QScriptEngine *engine); @@ -101,8 +101,8 @@ public: #ifndef QT_NO_MAINWINDOW QMainWindow *standardWindow() const; #endif - QToolBar *createStandardToolBar(QWidget *parent = 0); - QMenu *createStandardMenu(QWidget *parent = 0); + QToolBar *createStandardToolBar(QWidget *parent = Q_NULLPTR); + QMenu *createStandardMenu(QWidget *parent = Q_NULLPTR); QWidget *widget(DebuggerWidget widget) const; QAction *action(DebuggerAction action) const; |