From 60d32ee475570de0024af49083701c3cdfdf79ce Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 26 Jan 2022 17:46:02 +0100 Subject: [PATCH] Test: modernize C++11 * remove redundant void-arg * use nullptr --- src/Mod/Test/Gui/AppTestGui.cpp | 4 ++-- src/Mod/Test/Gui/UnitTestImp.cpp | 8 ++++---- src/Mod/Test/Gui/UnitTestImp.h | 2 +- src/Mod/Test/Gui/UnitTestPy.cpp | 14 +++++++------- src/Mod/Test/Gui/UnitTestPy.h | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Mod/Test/Gui/AppTestGui.cpp b/src/Mod/Test/Gui/AppTestGui.cpp index f8c90e45f6..e81d680399 100644 --- a/src/Mod/Test/Gui/AppTestGui.cpp +++ b/src/Mod/Test/Gui/AppTestGui.cpp @@ -57,7 +57,7 @@ private: } Py::Object setTest(const Py::Tuple& args) { - char *pstr=0; + char *pstr=nullptr; if (!PyArg_ParseTuple(args.ptr(), "|s", &pstr)) throw Py::Exception(); @@ -70,7 +70,7 @@ private: } Py::Object addTest(const Py::Tuple& args) { - char *pstr=0; + char *pstr=nullptr; if (!PyArg_ParseTuple(args.ptr(), "|s", &pstr)) throw Py::Exception(); diff --git a/src/Mod/Test/Gui/UnitTestImp.cpp b/src/Mod/Test/Gui/UnitTestImp.cpp index a70f8602d7..2d0220c1a0 100644 --- a/src/Mod/Test/Gui/UnitTestImp.cpp +++ b/src/Mod/Test/Gui/UnitTestImp.cpp @@ -40,7 +40,7 @@ using namespace TestGui; /* TRANSLATOR TestGui::UnitTestDialog */ -UnitTestDialog* UnitTestDialog::_instance=0; +UnitTestDialog* UnitTestDialog::_instance=nullptr; /** * Creates and returns the one and only instance of this dialog. @@ -58,9 +58,9 @@ UnitTestDialog* UnitTestDialog::instance() */ void UnitTestDialog::destruct () { - if (_instance != 0) { + if (_instance != nullptr) { UnitTestDialog *pTmp = _instance; - _instance = 0; + _instance = nullptr; delete pTmp; } } @@ -70,7 +70,7 @@ void UnitTestDialog::destruct () */ bool UnitTestDialog::hasInstance() { - return _instance != 0; + return _instance != nullptr; } /** diff --git a/src/Mod/Test/Gui/UnitTestImp.h b/src/Mod/Test/Gui/UnitTestImp.h index b8c56d2b4f..fcd6e6c7f9 100644 --- a/src/Mod/Test/Gui/UnitTestImp.h +++ b/src/Mod/Test/Gui/UnitTestImp.h @@ -60,7 +60,7 @@ public: static bool hasInstance(); protected: - UnitTestDialog(QWidget* parent = 0, Qt::WindowFlags f = Qt::WindowFlags()); + UnitTestDialog(QWidget* parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags()); ~UnitTestDialog(); void setProgressColor(const QColor& col); diff --git a/src/Mod/Test/Gui/UnitTestPy.cpp b/src/Mod/Test/Gui/UnitTestPy.cpp index 7165ed6de2..81d7750667 100644 --- a/src/Mod/Test/Gui/UnitTestPy.cpp +++ b/src/Mod/Test/Gui/UnitTestPy.cpp @@ -96,8 +96,8 @@ Py::Object UnitTestDialogPy::clearErrorList(const Py::Tuple& args) Py::Object UnitTestDialogPy::insertError(const Py::Tuple& args) { - char *failure=0; - char *details=0; + char *failure=nullptr; + char *details=nullptr; if (!PyArg_ParseTuple(args.ptr(), "ss", &failure,&details)) throw Py::Exception(); @@ -108,7 +108,7 @@ Py::Object UnitTestDialogPy::insertError(const Py::Tuple& args) Py::Object UnitTestDialogPy::setUnitTest(const Py::Tuple& args) { - char *pstr=0; + char *pstr=nullptr; if (!PyArg_ParseTuple(args.ptr(), "s", &pstr)) throw Py::Exception(); @@ -125,7 +125,7 @@ Py::Object UnitTestDialogPy::getUnitTest(const Py::Tuple& args) Py::Object UnitTestDialogPy::setStatusText(const Py::Tuple& args) { - char *pstr=0; + char *pstr=nullptr; if (!PyArg_ParseTuple(args.ptr(), "s", &pstr)) throw Py::Exception(); @@ -136,7 +136,7 @@ Py::Object UnitTestDialogPy::setStatusText(const Py::Tuple& args) Py::Object UnitTestDialogPy::setProgressFrac(const Py::Tuple& args) { float fraction; - char* pColor=0; + char* pColor=nullptr; if (!PyArg_ParseTuple(args.ptr(), "f|s",&fraction, &pColor)) throw Py::Exception(); @@ -149,8 +149,8 @@ Py::Object UnitTestDialogPy::setProgressFrac(const Py::Tuple& args) Py::Object UnitTestDialogPy::errorDialog(const Py::Tuple& args) { - char *title=0; - char *message=0; + char *title=nullptr; + char *message=nullptr; if (!PyArg_ParseTuple(args.ptr(), "ss", &title, &message)) throw Py::Exception(); UnitTestDialog::instance()->showErrorDialog(title,message); diff --git a/src/Mod/Test/Gui/UnitTestPy.h b/src/Mod/Test/Gui/UnitTestPy.h index 9b41112f0b..b3b5ab7df8 100644 --- a/src/Mod/Test/Gui/UnitTestPy.h +++ b/src/Mod/Test/Gui/UnitTestPy.h @@ -35,7 +35,7 @@ class UnitTestDialog; class UnitTestDialogPy : public Py::PythonExtension { public: - static void init_type(void); // announce properties and methods + static void init_type(); // announce properties and methods UnitTestDialogPy(); ~UnitTestDialogPy();