From 1ac09bccc3ba01e1c48a7f6ff475942e0cd0dec5 Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 22 Aug 2023 11:29:02 +0200 Subject: [PATCH] Sheet: modernize C++: use equals default --- src/Mod/Spreadsheet/App/AppSpreadsheet.cpp | 2 -- src/Mod/Spreadsheet/App/Cell.cpp | 4 +--- src/Mod/Spreadsheet/App/PropertyColumnWidths.cpp | 4 +--- src/Mod/Spreadsheet/App/PropertyRowHeights.cpp | 4 +--- src/Mod/Spreadsheet/App/Sheet.h | 4 ++-- src/Mod/Spreadsheet/App/SheetObserver.h | 2 +- src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp | 2 -- src/Mod/Spreadsheet/Gui/DlgSettingsImp.cpp | 5 +---- src/Mod/Spreadsheet/Gui/SheetTableView.cpp | 5 +---- src/Mod/Spreadsheet/Gui/SpreadsheetView.cpp | 4 +--- src/Mod/Spreadsheet/Gui/Workbench.cpp | 4 +--- 11 files changed, 10 insertions(+), 30 deletions(-) diff --git a/src/Mod/Spreadsheet/App/AppSpreadsheet.cpp b/src/Mod/Spreadsheet/App/AppSpreadsheet.cpp index a9bb40cebb..8b1ac253ed 100644 --- a/src/Mod/Spreadsheet/App/AppSpreadsheet.cpp +++ b/src/Mod/Spreadsheet/App/AppSpreadsheet.cpp @@ -39,8 +39,6 @@ public: initialize("This module is the Spreadsheet module."); // register with Python } - ~Module() override {} - private: }; diff --git a/src/Mod/Spreadsheet/App/Cell.cpp b/src/Mod/Spreadsheet/App/Cell.cpp index a94bab0c7f..298250fac6 100644 --- a/src/Mod/Spreadsheet/App/Cell.cpp +++ b/src/Mod/Spreadsheet/App/Cell.cpp @@ -166,9 +166,7 @@ Cell &Cell::operator =(const Cell &rhs) * */ -Cell::~Cell() -{ -} +Cell::~Cell() = default; /** * Set the expression tree to \a expr. diff --git a/src/Mod/Spreadsheet/App/PropertyColumnWidths.cpp b/src/Mod/Spreadsheet/App/PropertyColumnWidths.cpp index 0005a4503e..8f155e076d 100644 --- a/src/Mod/Spreadsheet/App/PropertyColumnWidths.cpp +++ b/src/Mod/Spreadsheet/App/PropertyColumnWidths.cpp @@ -38,9 +38,7 @@ const int PropertyColumnWidths::defaultHeaderWidth = 50; TYPESYSTEM_SOURCE(Spreadsheet::PropertyColumnWidths , App::Property) -PropertyColumnWidths::PropertyColumnWidths() -{ -} +PropertyColumnWidths::PropertyColumnWidths() = default; PropertyColumnWidths::PropertyColumnWidths(const PropertyColumnWidths &other) : Property(), std::map(other) diff --git a/src/Mod/Spreadsheet/App/PropertyRowHeights.cpp b/src/Mod/Spreadsheet/App/PropertyRowHeights.cpp index 21edc621fb..a07836dd70 100644 --- a/src/Mod/Spreadsheet/App/PropertyRowHeights.cpp +++ b/src/Mod/Spreadsheet/App/PropertyRowHeights.cpp @@ -37,9 +37,7 @@ const int PropertyRowHeights::defaultHeight = 30; TYPESYSTEM_SOURCE(Spreadsheet::PropertyRowHeights , App::Property) -PropertyRowHeights::PropertyRowHeights() -{ -} +PropertyRowHeights::PropertyRowHeights() = default; PropertyRowHeights::PropertyRowHeights(const PropertyRowHeights &other) : Property(), std::map(other) diff --git a/src/Mod/Spreadsheet/App/Sheet.h b/src/Mod/Spreadsheet/App/Sheet.h index ba3cd3a9b5..8c7388d169 100644 --- a/src/Mod/Spreadsheet/App/Sheet.h +++ b/src/Mod/Spreadsheet/App/Sheet.h @@ -58,8 +58,8 @@ class SpreadsheetExport PropertySpreadsheetQuantity : public App::PropertyQuanti { TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertySpreadsheetQuantity(){} - ~PropertySpreadsheetQuantity() override{} + PropertySpreadsheetQuantity() = default; + ~PropertySpreadsheetQuantity() override = default; Property *Copy() const override; void Paste(const Property &from) override; diff --git a/src/Mod/Spreadsheet/App/SheetObserver.h b/src/Mod/Spreadsheet/App/SheetObserver.h index 0a6f7a1547..39139135d8 100644 --- a/src/Mod/Spreadsheet/App/SheetObserver.h +++ b/src/Mod/Spreadsheet/App/SheetObserver.h @@ -33,7 +33,7 @@ class PropertySheet; class SheetObserver : public App::DocumentObserver { public: SheetObserver(App::Document* document, PropertySheet *_sheet); - ~SheetObserver() override { } + ~SheetObserver() override = default; void slotCreatedObject(const App::DocumentObject& Obj) override; void slotDeletedObject(const App::DocumentObject& Obj) override; void slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop) override; diff --git a/src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp b/src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp index aa644f70de..2702032b9d 100644 --- a/src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp +++ b/src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp @@ -63,8 +63,6 @@ namespace SpreadsheetGui { initialize("This module is the SpreadsheetGui module."); // register with Python } - ~Module() override {} - private: Py::Object open(const Py::Tuple& args) { diff --git a/src/Mod/Spreadsheet/Gui/DlgSettingsImp.cpp b/src/Mod/Spreadsheet/Gui/DlgSettingsImp.cpp index 1e15ce0184..cc17195f63 100644 --- a/src/Mod/Spreadsheet/Gui/DlgSettingsImp.cpp +++ b/src/Mod/Spreadsheet/Gui/DlgSettingsImp.cpp @@ -43,10 +43,7 @@ DlgSettingsImp::DlgSettingsImp( QWidget* parent ) /** * Destroys the object and frees any allocated resources */ -DlgSettingsImp::~DlgSettingsImp() -{ - // no need to delete child widgets, Qt does it all for us -} +DlgSettingsImp::~DlgSettingsImp() = default; void DlgSettingsImp::saveSettings() { diff --git a/src/Mod/Spreadsheet/Gui/SheetTableView.cpp b/src/Mod/Spreadsheet/Gui/SheetTableView.cpp index a2a5af5361..46e9ead2d4 100644 --- a/src/Mod/Spreadsheet/Gui/SheetTableView.cpp +++ b/src/Mod/Spreadsheet/Gui/SheetTableView.cpp @@ -459,10 +459,7 @@ void SheetTableView::removeColumns() Gui::Command::doCommand(Gui::Command::Doc, "App.ActiveDocument.recompute()"); } -SheetTableView::~SheetTableView() -{ - -} +SheetTableView::~SheetTableView() = default; void SheetTableView::updateCellSpan() { diff --git a/src/Mod/Spreadsheet/Gui/SpreadsheetView.cpp b/src/Mod/Spreadsheet/Gui/SpreadsheetView.cpp index c670d3c6bb..c4586c4602 100644 --- a/src/Mod/Spreadsheet/Gui/SpreadsheetView.cpp +++ b/src/Mod/Spreadsheet/Gui/SpreadsheetView.cpp @@ -550,9 +550,7 @@ SheetViewPy::SheetViewPy(SheetView *mdi) { } -SheetViewPy::~SheetViewPy() -{ -} +SheetViewPy::~SheetViewPy() = default; Py::Object SheetViewPy::repr() { diff --git a/src/Mod/Spreadsheet/Gui/Workbench.cpp b/src/Mod/Spreadsheet/Gui/Workbench.cpp index 5fff90c4ae..e079d99956 100644 --- a/src/Mod/Spreadsheet/Gui/Workbench.cpp +++ b/src/Mod/Spreadsheet/Gui/Workbench.cpp @@ -63,9 +63,7 @@ Workbench::Workbench() { } -Workbench::~Workbench() -{ -} +Workbench::~Workbench() = default; void Workbench::activated() {