From 0a29d74a5e875ad2e0229ed2c8e48344f87a45e0 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Sun, 6 Mar 2016 12:20:49 +0100 Subject: Make public headers compile with -Wzero-as-null-pointer-constant ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Change-Id: I7e007ee907c479320a885af329745563c080467d Task-number: QTBUG-45291 Reviewed-by: Lars Knoll --- src/scripttools/debugging/qscriptenginedebugger.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/scripttools/debugging/qscriptenginedebugger.h') 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; -- cgit v1.2.1 From f5e16ab0e1e153ec86f0d8651571e176ac6caa7c Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Sun, 6 Mar 2016 12:21:30 +0100 Subject: Make more ctors explicit Added explicit where it was missing. This is not a source- incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. One is even a protected ctor. Change-Id: I114b26332ba0e2752f5d02ebcd6090fc2b562b40 Reviewed-by: Lars Knoll --- src/scripttools/debugging/qscriptenginedebugger.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/scripttools/debugging/qscriptenginedebugger.h') diff --git a/src/scripttools/debugging/qscriptenginedebugger.h b/src/scripttools/debugging/qscriptenginedebugger.h index 7fd5c77..a56a833 100644 --- a/src/scripttools/debugging/qscriptenginedebugger.h +++ b/src/scripttools/debugging/qscriptenginedebugger.h @@ -89,7 +89,7 @@ public: SuspendedState }; - QScriptEngineDebugger(QObject *parent = Q_NULLPTR); + explicit QScriptEngineDebugger(QObject *parent = Q_NULLPTR); ~QScriptEngineDebugger(); void attachTo(QScriptEngine *engine); -- cgit v1.2.1