From a70dadf7703bf5425d7f4e12fb03afa2de883d08 Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 26 Mar 2024 13:13:56 +0100 Subject: [PATCH] RE: use of TaskDialog::addTaskBox --- src/Mod/ReverseEngineering/Gui/FitBSplineSurface.cpp | 7 +------ src/Mod/ReverseEngineering/Gui/FitBSplineSurface.h | 1 - src/Mod/ReverseEngineering/Gui/Poisson.cpp | 7 +------ src/Mod/ReverseEngineering/Gui/Poisson.h | 1 - src/Mod/ReverseEngineering/Gui/Segmentation.cpp | 4 +--- src/Mod/ReverseEngineering/Gui/Segmentation.h | 1 - src/Mod/ReverseEngineering/Gui/SegmentationManual.cpp | 4 +--- src/Mod/ReverseEngineering/Gui/SegmentationManual.h | 1 - 8 files changed, 4 insertions(+), 22 deletions(-) diff --git a/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.cpp b/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.cpp index 37a9b3ffed..481011d1de 100644 --- a/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.cpp +++ b/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.cpp @@ -256,12 +256,7 @@ void FitBSplineSurfaceWidget::changeEvent(QEvent* e) TaskFitBSplineSurface::TaskFitBSplineSurface(const App::DocumentObjectT& obj) { widget = new FitBSplineSurfaceWidget(obj); - taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/FitSurface"), - widget->windowTitle(), - true, - nullptr); - taskbox->groupLayout()->addWidget(widget); - Content.push_back(taskbox); + addTaskBox(Gui::BitmapFactory().pixmap("actions/FitSurface"), widget); } void TaskFitBSplineSurface::open() diff --git a/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.h b/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.h index 48e8900768..19f6ccbe3c 100644 --- a/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.h +++ b/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.h @@ -71,7 +71,6 @@ public: private: FitBSplineSurfaceWidget* widget; - Gui::TaskView::TaskBox* taskbox; }; } // namespace ReenGui diff --git a/src/Mod/ReverseEngineering/Gui/Poisson.cpp b/src/Mod/ReverseEngineering/Gui/Poisson.cpp index b845bd6dad..9076415bc5 100644 --- a/src/Mod/ReverseEngineering/Gui/Poisson.cpp +++ b/src/Mod/ReverseEngineering/Gui/Poisson.cpp @@ -108,12 +108,7 @@ void PoissonWidget::changeEvent(QEvent* e) TaskPoisson::TaskPoisson(const App::DocumentObjectT& obj) { widget = new PoissonWidget(obj); - taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/FitSurface"), - widget->windowTitle(), - true, - nullptr); - taskbox->groupLayout()->addWidget(widget); - Content.push_back(taskbox); + addTaskBox(Gui::BitmapFactory().pixmap("actions/FitSurface"), widget); } TaskPoisson::~TaskPoisson() = default; diff --git a/src/Mod/ReverseEngineering/Gui/Poisson.h b/src/Mod/ReverseEngineering/Gui/Poisson.h index 2ff6472dda..4d6c75eb2e 100644 --- a/src/Mod/ReverseEngineering/Gui/Poisson.h +++ b/src/Mod/ReverseEngineering/Gui/Poisson.h @@ -67,7 +67,6 @@ public: private: PoissonWidget* widget; - Gui::TaskView::TaskBox* taskbox; }; } // namespace ReenGui diff --git a/src/Mod/ReverseEngineering/Gui/Segmentation.cpp b/src/Mod/ReverseEngineering/Gui/Segmentation.cpp index b28b6230fb..a2046d3aae 100644 --- a/src/Mod/ReverseEngineering/Gui/Segmentation.cpp +++ b/src/Mod/ReverseEngineering/Gui/Segmentation.cpp @@ -272,9 +272,7 @@ void Segmentation::changeEvent(QEvent* e) TaskSegmentation::TaskSegmentation(Mesh::Feature* mesh) { widget = new Segmentation(mesh); - taskbox = new Gui::TaskView::TaskBox(QPixmap(), widget->windowTitle(), false, nullptr); - taskbox->groupLayout()->addWidget(widget); - Content.push_back(taskbox); + addTaskBox(widget, false); } bool TaskSegmentation::accept() diff --git a/src/Mod/ReverseEngineering/Gui/Segmentation.h b/src/Mod/ReverseEngineering/Gui/Segmentation.h index 988282b823..ab43ceb5ab 100644 --- a/src/Mod/ReverseEngineering/Gui/Segmentation.h +++ b/src/Mod/ReverseEngineering/Gui/Segmentation.h @@ -78,7 +78,6 @@ public: private: Segmentation* widget; - Gui::TaskView::TaskBox* taskbox; }; } // namespace ReverseEngineeringGui diff --git a/src/Mod/ReverseEngineering/Gui/SegmentationManual.cpp b/src/Mod/ReverseEngineering/Gui/SegmentationManual.cpp index 9e949f73de..9915c9484d 100644 --- a/src/Mod/ReverseEngineering/Gui/SegmentationManual.cpp +++ b/src/Mod/ReverseEngineering/Gui/SegmentationManual.cpp @@ -343,9 +343,7 @@ void SegmentationManual::reject() TaskSegmentationManual::TaskSegmentationManual() { widget = new SegmentationManual(); - taskbox = new Gui::TaskView::TaskBox(QPixmap(), widget->windowTitle(), false, nullptr); - taskbox->groupLayout()->addWidget(widget); - Content.push_back(taskbox); + addTaskBox(widget, false); } void TaskSegmentationManual::modifyStandardButtons(QDialogButtonBox* box) diff --git a/src/Mod/ReverseEngineering/Gui/SegmentationManual.h b/src/Mod/ReverseEngineering/Gui/SegmentationManual.h index dee9bc47c9..f45e1710cc 100644 --- a/src/Mod/ReverseEngineering/Gui/SegmentationManual.h +++ b/src/Mod/ReverseEngineering/Gui/SegmentationManual.h @@ -102,7 +102,6 @@ public: private: SegmentationManual* widget; - Gui::TaskView::TaskBox* taskbox; }; } // namespace ReverseEngineeringGui