diff --git a/src/Mod/Draft/App/AppDraftUtilsPy.cpp b/src/Mod/Draft/App/AppDraftUtilsPy.cpp index 2d2bb79a20..fcb07767f7 100644 --- a/src/Mod/Draft/App/AppDraftUtilsPy.cpp +++ b/src/Mod/Draft/App/AppDraftUtilsPy.cpp @@ -42,8 +42,6 @@ public: initialize("The DraftUtils module contains utility functions for the Draft module."); // register with Python } - ~Module() override {} - private: Py::Object readDXF(const Py::Tuple& /*args*/) { diff --git a/src/Mod/Start/App/AppStart.cpp b/src/Mod/Start/App/AppStart.cpp index 8ed3eb8181..c3933938cc 100644 --- a/src/Mod/Start/App/AppStart.cpp +++ b/src/Mod/Start/App/AppStart.cpp @@ -36,8 +36,6 @@ public: initialize("This module is the Start module."); // register with Python } - ~Module() override {} - private: }; diff --git a/src/Mod/Start/Gui/AppStartGui.cpp b/src/Mod/Start/Gui/AppStartGui.cpp index 198142a2f1..72a89dfcfd 100644 --- a/src/Mod/Start/Gui/AppStartGui.cpp +++ b/src/Mod/Start/Gui/AppStartGui.cpp @@ -53,8 +53,6 @@ public: initialize("This module is the StartGui module."); // register with Python } - ~Module() override {} - private: }; diff --git a/src/Mod/Start/Gui/DlgStartPreferencesImp.cpp b/src/Mod/Start/Gui/DlgStartPreferencesImp.cpp index 5396507e82..67b13bb85d 100644 --- a/src/Mod/Start/Gui/DlgStartPreferencesImp.cpp +++ b/src/Mod/Start/Gui/DlgStartPreferencesImp.cpp @@ -80,10 +80,7 @@ DlgStartPreferencesImp::DlgStartPreferencesImp( QWidget* parent ) /** * Destroys the object and frees any allocated resources */ -DlgStartPreferencesImp::~DlgStartPreferencesImp() -{ - // no need to delete child widgets, Qt does it all for us -} +DlgStartPreferencesImp::~DlgStartPreferencesImp() = default; void DlgStartPreferencesImp::saveSettings() { diff --git a/src/Mod/Start/Gui/Workbench.cpp b/src/Mod/Start/Gui/Workbench.cpp index 085266cb94..6b42e1ac09 100644 --- a/src/Mod/Start/Gui/Workbench.cpp +++ b/src/Mod/Start/Gui/Workbench.cpp @@ -42,13 +42,9 @@ using namespace StartGui; TYPESYSTEM_SOURCE(StartGui::Workbench, Gui::StdWorkbench) -StartGui::Workbench::Workbench() -{ -} +StartGui::Workbench::Workbench() = default; -StartGui::Workbench::~Workbench() -{ -} +StartGui::Workbench::~Workbench() = default; void StartGui::Workbench::activated() { diff --git a/src/Mod/Test/Gui/AppTestGui.cpp b/src/Mod/Test/Gui/AppTestGui.cpp index 5b69652b79..0efb300140 100644 --- a/src/Mod/Test/Gui/AppTestGui.cpp +++ b/src/Mod/Test/Gui/AppTestGui.cpp @@ -137,8 +137,6 @@ public: initialize("This module is the QtUnitGui module"); // register with Python } - ~Module() override {} - private: Py::Object new_UnitTest(const Py::Tuple& args) { diff --git a/src/Mod/Test/Gui/UnitTestImp.cpp b/src/Mod/Test/Gui/UnitTestImp.cpp index 95bf6d077d..6916dd17cf 100644 --- a/src/Mod/Test/Gui/UnitTestImp.cpp +++ b/src/Mod/Test/Gui/UnitTestImp.cpp @@ -96,9 +96,7 @@ UnitTestDialog::UnitTestDialog(QWidget* parent, Qt::WindowFlags f) /** * Destroys the object and frees any allocated resources */ -UnitTestDialog::~UnitTestDialog() -{ -} +UnitTestDialog::~UnitTestDialog() = default; void UnitTestDialog::setupConnections() { diff --git a/src/Mod/Test/Gui/UnitTestPy.cpp b/src/Mod/Test/Gui/UnitTestPy.cpp index 2fc55515dc..6736cca7e6 100644 --- a/src/Mod/Test/Gui/UnitTestPy.cpp +++ b/src/Mod/Test/Gui/UnitTestPy.cpp @@ -60,13 +60,9 @@ void UnitTestDialogPy::init_type() add_varargs_method("clearUnitTests",&UnitTestDialogPy::clearUnitTests,"clearUnitTests"); } -UnitTestDialogPy::UnitTestDialogPy() -{ -} +UnitTestDialogPy::UnitTestDialogPy() = default; -UnitTestDialogPy::~UnitTestDialogPy() -{ -} +UnitTestDialogPy::~UnitTestDialogPy() = default; Py::Object UnitTestDialogPy::repr() { diff --git a/src/Mod/Web/App/AppWeb.cpp b/src/Mod/Web/App/AppWeb.cpp index b9e1afb94e..0a3c0e1cee 100644 --- a/src/Mod/Web/App/AppWeb.cpp +++ b/src/Mod/Web/App/AppWeb.cpp @@ -79,8 +79,6 @@ public: initialize("This module is the Web module."); // register with Python } - ~Module() override {} - private: Py::Object startServer(const Py::Tuple& args) { diff --git a/src/Mod/Web/App/Server.cpp b/src/Mod/Web/App/Server.cpp index 50e93c2130..3d77315f46 100644 --- a/src/Mod/Web/App/Server.cpp +++ b/src/Mod/Web/App/Server.cpp @@ -51,13 +51,9 @@ void Firewall::setInstance(Firewall* inst) } } -Firewall::Firewall() -{ -} +Firewall::Firewall() = default; -Firewall::~Firewall() -{ -} +Firewall::~Firewall() = default; bool Firewall::filter(const QByteArray&) const { @@ -69,9 +65,7 @@ FirewallPython::FirewallPython(const Py::Object& o) { } -FirewallPython::~FirewallPython() -{ -} +FirewallPython::~FirewallPython() = default; bool FirewallPython::filter(const QByteArray& msg) const { @@ -96,9 +90,7 @@ ServerEvent::ServerEvent(QTcpSocket* sock, const QByteArray& msg) { } -ServerEvent::~ServerEvent() -{ -} +ServerEvent::~ServerEvent() = default; QTcpSocket* ServerEvent::socket() const { diff --git a/src/Mod/Web/Gui/AppWebGui.cpp b/src/Mod/Web/Gui/AppWebGui.cpp index 7090c30242..74dea776ef 100644 --- a/src/Mod/Web/Gui/AppWebGui.cpp +++ b/src/Mod/Web/Gui/AppWebGui.cpp @@ -78,8 +78,6 @@ public: initialize("This module is the WebGui module."); // register with Python } - ~Module() override {} - private: Py::Object openBrowser(const Py::Tuple& args) { diff --git a/src/Mod/Web/Gui/BrowserView.cpp b/src/Mod/Web/Gui/BrowserView.cpp index 4d99db8565..54b135a6b2 100644 --- a/src/Mod/Web/Gui/BrowserView.cpp +++ b/src/Mod/Web/Gui/BrowserView.cpp @@ -126,9 +126,8 @@ UrlWidget::UrlWidget(BrowserView *view) : setText(QLatin1String("https://")); hide(); } -UrlWidget::~UrlWidget() -{ -} + +UrlWidget::~UrlWidget() = default; void UrlWidget::keyPressEvent(QKeyEvent *keyEvt) { @@ -201,9 +200,7 @@ BrowserViewPy::BrowserViewPy(BrowserView* view) : base(view) { } -BrowserViewPy::~BrowserViewPy() -{ -} +BrowserViewPy::~BrowserViewPy() = default; BrowserView* BrowserViewPy::getBrowserViewPtr() { diff --git a/src/Mod/Web/Gui/Workbench.cpp b/src/Mod/Web/Gui/Workbench.cpp index 1ab97c99c4..b3a55086c2 100644 --- a/src/Mod/Web/Gui/Workbench.cpp +++ b/src/Mod/Web/Gui/Workbench.cpp @@ -39,13 +39,9 @@ using namespace WebGui; /// @namespace WebGui @class Workbench TYPESYSTEM_SOURCE(WebGui::Workbench, Gui::StdWorkbench) -Workbench::Workbench() -{ -} +Workbench::Workbench() = default; -Workbench::~Workbench() -{ -} +Workbench::~Workbench() = default; void Workbench::setupContextMenu(const char* recipient,Gui::MenuItem* item) const {