From ee48c0b8d527633e954557791af76810a011ed52 Mon Sep 17 00:00:00 2001 From: Uwe Date: Wed, 2 Mar 2022 02:51:01 +0100 Subject: [PATCH] [PD] Gui: remove unused includes - also some sorting --- src/Mod/PartDesign/Gui/EnumFlags.h | 2 - .../PartDesign/Gui/TaskBooleanParameters.h | 2 +- .../PartDesign/Gui/TaskDressUpParameters.h | 2 +- .../PartDesign/Gui/TaskFeatureParameters.h | 184 +++++++++--------- src/Mod/PartDesign/Gui/TaskHelixParameters.h | 2 - .../Gui/TaskPolarPatternParameters.h | 2 - 6 files changed, 94 insertions(+), 100 deletions(-) diff --git a/src/Mod/PartDesign/Gui/EnumFlags.h b/src/Mod/PartDesign/Gui/EnumFlags.h index 8415e3e8d6..1370b15316 100644 --- a/src/Mod/PartDesign/Gui/EnumFlags.h +++ b/src/Mod/PartDesign/Gui/EnumFlags.h @@ -24,8 +24,6 @@ #ifndef PARTDESIGNGUI_ENUMFLAGS_H #define PARTDESIGNGUI_ENUMFLAGS_H -#include - namespace PartDesignGui { // https://wiggling-bits.net/using-enum-classes-as-type-safe-bitmasks/ diff --git a/src/Mod/PartDesign/Gui/TaskBooleanParameters.h b/src/Mod/PartDesign/Gui/TaskBooleanParameters.h index 6f9739ce55..3c4a99337e 100644 --- a/src/Mod/PartDesign/Gui/TaskBooleanParameters.h +++ b/src/Mod/PartDesign/Gui/TaskBooleanParameters.h @@ -25,9 +25,9 @@ #ifndef GUI_TASKVIEW_TaskBooleanParameters_H #define GUI_TASKVIEW_TaskBooleanParameters_H -#include #include #include +#include #include "ViewProviderBoolean.h" diff --git a/src/Mod/PartDesign/Gui/TaskDressUpParameters.h b/src/Mod/PartDesign/Gui/TaskDressUpParameters.h index b29479f7a2..86188f56d1 100644 --- a/src/Mod/PartDesign/Gui/TaskDressUpParameters.h +++ b/src/Mod/PartDesign/Gui/TaskDressUpParameters.h @@ -25,8 +25,8 @@ #ifndef GUI_TASKVIEW_TaskDressUpParameters_H #define GUI_TASKVIEW_TaskDressUpParameters_H -#include #include +#include #include "TaskFeatureParameters.h" #include "ViewProviderDressUp.h" diff --git a/src/Mod/PartDesign/Gui/TaskFeatureParameters.h b/src/Mod/PartDesign/Gui/TaskFeatureParameters.h index dcc51f0f0f..144211c7ef 100644 --- a/src/Mod/PartDesign/Gui/TaskFeatureParameters.h +++ b/src/Mod/PartDesign/Gui/TaskFeatureParameters.h @@ -1,92 +1,92 @@ -/*************************************************************************** - * Copyright (C) 2015 Alexander Golubev (Fat-Zer) * - * * - * This file is part of the FreeCAD CAx development system. * - * * - * This library is free software; you can redistribute it and/or * - * modify it under the terms of the GNU Library General Public * - * License as published by the Free Software Foundation; either * - * version 2 of the License, or (at your option) any later version. * - * * - * This library is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU Library General Public License for more details. * - * * - * You should have received a copy of the GNU Library General Public * - * License along with this library; see the file COPYING.LIB. If not, * - * write to the Free Software Foundation, Inc., 59 Temple Place, * - * Suite 330, Boston, MA 02111-1307, USA * - * * - ***************************************************************************/ - -#ifndef TASKFEATUREPARAMETERS_H_NAHKE2YZ -#define TASKFEATUREPARAMETERS_H_NAHKE2YZ - - -#include -#include -#include - -#include "ViewProvider.h" - -namespace PartDesignGui { - -/// Convenience class to collect common methods for all SketchBased features -class TaskFeatureParameters : public Gui::TaskView::TaskBox, - public Gui::DocumentObserver -{ - Q_OBJECT - -public: - TaskFeatureParameters(PartDesignGui::ViewProvider* vp, QWidget *parent, - const std::string& pixmapname, const QString& parname); - virtual ~TaskFeatureParameters() {} - - /// save field history - virtual void saveHistory(void) {} - /// apply changes made in the parameters input to the model via commands - virtual void apply() {} - - void recomputeFeature(); - -protected Q_SLOTS: - // TODO Add update view to all dialogs (2015-12-05, Fat-Zer) - void onUpdateView(bool on); - -private: - /** Notifies when the object is about to be removed. */ - virtual void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj); - -protected: - PartDesignGui::ViewProvider *vp; - /// Lock updateUI(), applying changes to the underlying feature and calling recomputeFeature() - bool blockUpdate; -}; - -/// A common base for sketch based, dressup and other solid parameters dialogs -class TaskDlgFeatureParameters : public Gui::TaskView::TaskDialog -{ - Q_OBJECT - -public: - TaskDlgFeatureParameters(PartDesignGui::ViewProvider *vp); - virtual ~TaskDlgFeatureParameters(); - -public: - /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); - /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); - - /// Returns the view provider dialog is runed for - PartDesignGui::ViewProvider *viewProvider() const { return vp; } - -protected: - PartDesignGui::ViewProvider *vp; -}; - -} //namespace PartDesignGui - - -#endif /* end of include guard: TASKFEATUREPARAMETERS_H_NAHKE2YZ */ +/*************************************************************************** + * Copyright (C) 2015 Alexander Golubev (Fat-Zer) * + * * + * This file is part of the FreeCAD CAx development system. * + * * + * This library is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Library General Public * + * License as published by the Free Software Foundation; either * + * version 2 of the License, or (at your option) any later version. * + * * + * This library is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU Library General Public License for more details. * + * * + * You should have received a copy of the GNU Library General Public * + * License along with this library; see the file COPYING.LIB. If not, * + * write to the Free Software Foundation, Inc., 59 Temple Place, * + * Suite 330, Boston, MA 02111-1307, USA * + * * + ***************************************************************************/ + +#ifndef TASKFEATUREPARAMETERS_H_NAHKE2YZ +#define TASKFEATUREPARAMETERS_H_NAHKE2YZ + + +#include +#include +#include + +#include "ViewProvider.h" + +namespace PartDesignGui { + +/// Convenience class to collect common methods for all SketchBased features +class TaskFeatureParameters : public Gui::TaskView::TaskBox, + public Gui::DocumentObserver +{ + Q_OBJECT + +public: + TaskFeatureParameters(PartDesignGui::ViewProvider* vp, QWidget *parent, + const std::string& pixmapname, const QString& parname); + virtual ~TaskFeatureParameters() {} + + /// save field history + virtual void saveHistory(void) {} + /// apply changes made in the parameters input to the model via commands + virtual void apply() {} + + void recomputeFeature(); + +protected Q_SLOTS: + // TODO Add update view to all dialogs (2015-12-05, Fat-Zer) + void onUpdateView(bool on); + +private: + /** Notifies when the object is about to be removed. */ + virtual void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj); + +protected: + PartDesignGui::ViewProvider *vp; + /// Lock updateUI(), applying changes to the underlying feature and calling recomputeFeature() + bool blockUpdate; +}; + +/// A common base for sketch based, dressup and other solid parameters dialogs +class TaskDlgFeatureParameters : public Gui::TaskView::TaskDialog +{ + Q_OBJECT + +public: + TaskDlgFeatureParameters(PartDesignGui::ViewProvider *vp); + virtual ~TaskDlgFeatureParameters(); + +public: + /// is called by the framework if the dialog is accepted (Ok) + virtual bool accept(); + /// is called by the framework if the dialog is rejected (Cancel) + virtual bool reject(); + + /// Returns the view provider dialog is runed for + PartDesignGui::ViewProvider *viewProvider() const { return vp; } + +protected: + PartDesignGui::ViewProvider *vp; +}; + +} //namespace PartDesignGui + + +#endif /* end of include guard: TASKFEATUREPARAMETERS_H_NAHKE2YZ */ diff --git a/src/Mod/PartDesign/Gui/TaskHelixParameters.h b/src/Mod/PartDesign/Gui/TaskHelixParameters.h index b7c5c1dbd2..77d012f544 100644 --- a/src/Mod/PartDesign/Gui/TaskHelixParameters.h +++ b/src/Mod/PartDesign/Gui/TaskHelixParameters.h @@ -24,9 +24,7 @@ #ifndef GUI_TASKVIEW_TaskHelixParameters_H #define GUI_TASKVIEW_TaskHelixParameters_H -#include #include -#include #include "TaskSketchBasedParameters.h" #include "ViewProviderHelix.h" diff --git a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h index e3388d770f..120a397e6f 100644 --- a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h +++ b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h @@ -24,9 +24,7 @@ #ifndef GUI_TASKVIEW_TaskPolarPatternParameters_H #define GUI_TASKVIEW_TaskPolarPatternParameters_H -#include #include -#include #include "TaskTransformedParameters.h" #include "ViewProviderPolarPattern.h"