From 77bcd7e50fdb69ec0afdab9a843355c6f22aa0e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Althaus?= Date: Sat, 17 Feb 2024 13:05:01 +0100 Subject: [PATCH] Refactor: remove unused functions --- .../Gui/TaskLinearPatternParameters.h | 1 - .../PartDesign/Gui/TaskMirroredParameters.h | 1 - .../Gui/TaskMultiTransformParameters.cpp | 22 ------------------- .../Gui/TaskMultiTransformParameters.h | 1 - .../Gui/TaskPolarPatternParameters.h | 1 - .../PartDesign/Gui/TaskScaledParameters.cpp | 4 ---- src/Mod/PartDesign/Gui/TaskScaledParameters.h | 2 -- .../Gui/TaskTransformedParameters.cpp | 6 ----- .../Gui/TaskTransformedParameters.h | 2 -- 9 files changed, 40 deletions(-) diff --git a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h index f870edf64a..91b24f2cea 100644 --- a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h +++ b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h @@ -97,7 +97,6 @@ class TaskDlgLinearPatternParameters : public TaskDlgTransformedParameters public: explicit TaskDlgLinearPatternParameters(ViewProviderLinearPattern *LinearPatternView); - ~TaskDlgLinearPatternParameters() override = default; }; } //namespace PartDesignGui diff --git a/src/Mod/PartDesign/Gui/TaskMirroredParameters.h b/src/Mod/PartDesign/Gui/TaskMirroredParameters.h index 51b920050e..ac63ead9cc 100644 --- a/src/Mod/PartDesign/Gui/TaskMirroredParameters.h +++ b/src/Mod/PartDesign/Gui/TaskMirroredParameters.h @@ -82,7 +82,6 @@ class TaskDlgMirroredParameters : public TaskDlgTransformedParameters public: explicit TaskDlgMirroredParameters(ViewProviderMirrored *MirroredView); - ~TaskDlgMirroredParameters() override = default; public: /// is called by the framework if the dialog is accepted (Ok) diff --git a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp index 12f467e465..75ab3f23ab 100644 --- a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp @@ -504,26 +504,4 @@ bool TaskDlgMultiTransformParameters::accept() return TaskDlgFeatureParameters::accept (); } -// FIXME: It seems all roll back is finely handled by abortCommand() in parent classes. On the other -// hand manual removal of objects may lead to segfault in dialog distructer of subtransformation -// due to TaskMultiTransformParameters::getSubFeature() returns already destroid object. So check -// that everything is fine and delete the method. (2015-07-31, Fat-Zer) -//bool TaskDlgMultiTransformParameters::reject() -//{ -// // Get objects before view is invalidated -// // For the same reason we can't delegate showing the originals to TaskDlgTransformedParameters::reject() -// PartDesign::MultiTransform* pcMultiTransform = static_cast(vp->getObject()); -// std::vector transformFeatures = pcMultiTransform->Transformations.getValues(); -// -// // Delete the transformation features - must happen before abortCommand()! -// for (std::vector::const_iterator it = transformFeatures.begin(); it != transformFeatures.end(); ++it) -// { -// if ((*it) != NULL) -// Gui::Command::doCommand( -// Gui::Command::Doc,"App.ActiveDocument.removeObject(\"%s\")", (*it)->getNameInDocument()); -// } -// -// return TaskDlgTransformedParameters::reject(); -//} - #include "moc_TaskMultiTransformParameters.cpp" diff --git a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h index 37bab1dc51..c8f8ec5c01 100644 --- a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h +++ b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h @@ -107,7 +107,6 @@ class TaskDlgMultiTransformParameters : public TaskDlgTransformedParameters public: explicit TaskDlgMultiTransformParameters(ViewProviderMultiTransform *MultiTransformView); - ~TaskDlgMultiTransformParameters() override = default; public: /// is called by the framework if the dialog is accepted (Ok) diff --git a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h index 18a5c213bc..7fec756d8f 100644 --- a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h +++ b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h @@ -97,7 +97,6 @@ class TaskDlgPolarPatternParameters : public TaskDlgTransformedParameters public: explicit TaskDlgPolarPatternParameters(ViewProviderPolarPattern *PolarPatternView); - ~TaskDlgPolarPatternParameters() override = default; }; } //namespace PartDesignGui diff --git a/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp b/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp index b791c98b70..19922ad3b6 100644 --- a/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp @@ -141,10 +141,6 @@ unsigned TaskScaledParameters::getOccurrences() const return ui->spinOccurrences->value(); } -TaskScaledParameters::~TaskScaledParameters() -{ -} - void TaskScaledParameters::apply() { std::string name = TransformedView->getObject()->getNameInDocument(); diff --git a/src/Mod/PartDesign/Gui/TaskScaledParameters.h b/src/Mod/PartDesign/Gui/TaskScaledParameters.h index e663ff8cfa..8b4e342b6f 100644 --- a/src/Mod/PartDesign/Gui/TaskScaledParameters.h +++ b/src/Mod/PartDesign/Gui/TaskScaledParameters.h @@ -50,7 +50,6 @@ public: explicit TaskScaledParameters(ViewProviderTransformed *TransformedView, QWidget *parent = nullptr); /// Constructor for task with parent task (MultiTransform mode) TaskScaledParameters(TaskMultiTransformParameters *parentTask, QWidget* parameterWidget); - ~TaskScaledParameters() override; void apply() override; @@ -80,7 +79,6 @@ class TaskDlgScaledParameters : public TaskDlgTransformedParameters public: explicit TaskDlgScaledParameters(ViewProviderScaled *ScaledView); - ~TaskDlgScaledParameters() override = default; public: /// is called by the framework if the dialog is accepted (Ok) diff --git a/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp b/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp index a68c19f7de..9d2f4ea0d4 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp @@ -159,11 +159,6 @@ void TaskTransformedParameters::clearButtons() } } -bool TaskTransformedParameters::isViewUpdated() const -{ - return (blockUpdate == false); -} - int TaskTransformedParameters::getUpdateViewTimeout() const { return 500; @@ -560,7 +555,6 @@ bool TaskDlgTransformedParameters::accept() { parameter->exitSelectionMode(); - // Continue (usually in virtual method accept()) return TaskDlgFeatureParameters::accept (); } diff --git a/src/Mod/PartDesign/Gui/TaskTransformedParameters.h b/src/Mod/PartDesign/Gui/TaskTransformedParameters.h index d8c995f199..302dd85303 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedParameters.h +++ b/src/Mod/PartDesign/Gui/TaskTransformedParameters.h @@ -205,7 +205,6 @@ protected: void addReferenceSelectionGate(AllowSelectionFlags); - bool isViewUpdated() const; int getUpdateViewTimeout() const; void checkVisibility(); @@ -259,7 +258,6 @@ class TaskDlgTransformedParameters : public PartDesignGui::TaskDlgFeatureParamet public: explicit TaskDlgTransformedParameters(ViewProviderTransformed *TransformedView); - ~TaskDlgTransformedParameters() override = default; ViewProviderTransformed* getTransformedView() const { return static_cast(vp); }