kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[TD] remove unused headers (#8155)

Browse Source 
* [TD] remove unused headers

- also some sorting
- also improve readability by not using an abbreviation (we consistently don't abbreviate class names)
This commit is contained in:
Uwe
2023-01-09 14:55:22 +01:00
committed by GitHub
parent 3a8fcb53ec
commit f8db7e9187
36 changed files with 139 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/TechDraw/Gui/AppTechDrawGui.cpp
View File

@@ -45,25 +45,25 @@
#include "ViewProviderCosmeticExtension.h"
#include "ViewProviderDimension.h"
#include "ViewProviderDrawingView.h"
#include "ViewProviderDrawingViewExtension.h"
#include "ViewProviderGeomHatch.h"
#include "ViewProviderHatch.h"
#include "ViewProviderImage.h"
#include "ViewProviderLeader.h"
#include "ViewProviderPage.h"
#include "ViewProviderPageExtension.h"
#include "ViewProviderProjGroup.h"
#include "ViewProviderProjGroupItem.h"
#include "ViewProviderRichAnno.h"
#include "ViewProviderSpreadsheet.h"
#include "ViewProviderSymbol.h"
#include "ViewProviderTemplate.h"
#include "ViewProviderTemplateExtension.h"
#include "ViewProviderTile.h"
#include "ViewProviderViewClip.h"
#include "ViewProviderViewPart.h"
#include "ViewProviderViewSection.h"
#include "ViewProviderWeld.h"
#include "ViewProviderPageExtension.h"
#include "ViewProviderDrawingViewExtension.h"
#include "ViewProviderTemplateExtension.h"
#include "Workbench.h"

19
src/Mod/TechDraw/Gui/CommandCreateDims.cpp
View File

@@ -23,16 +23,15 @@
#include "PreCompiled.h"
#ifndef _PreComp_
#include <QApplication>
#include <QMessageBox>
#include <sstream>
#include <cstdlib>
#include <exception>
# include <string>
# include <vector>
# include <QApplication>
# include <QMessageBox>
#endif //#ifndef _PreComp_
#include <App/Document.h>
#include <App/DocumentObject.h>
#include <Base/Exception.h>
#include <Base/Console.h>
#include <Gui/Action.h>
#include <Gui/Application.h>
@@ -43,7 +42,6 @@
#include <Gui/MainWindow.h>
#include <Gui/Selection.h>
#include <Gui/SelectionObject.h>
#include <Mod/TechDraw/App/DrawDimHelper.h>
#include <Mod/TechDraw/App/DrawPage.h>
#include <Mod/TechDraw/App/DrawUtil.h>
@@ -53,10 +51,11 @@
#include <Mod/TechDraw/App/LandmarkDimension.h>
#include <Mod/TechDraw/App/Preferences.h>
#include "DrawGuiUtil.h"
#include "TaskLinkDim.h"
#include "TaskDimRepair.h"
#include "DimensionValidators.h"
#include "DrawGuiUtil.h"
#include "TaskDimRepair.h"
#include "TaskLinkDim.h"
using namespace TechDrawGui;
using namespace TechDraw;

9
src/Mod/TechDraw/Gui/DimensionValidators.cpp
View File

@@ -28,15 +28,10 @@
#endif //#ifndef _PreComp_
#include <App/DocumentObject.h>
#include <Base/Exception.h>
#include <Base/Console.h>
#include <Gui/Selection.h>
#include <Mod/TechDraw/App/Geometry.h>
#include <Mod/TechDraw/App/DrawUtil.h>
#include <Mod/TechDraw/App/DrawViewPart.h>
#include <Mod/TechDraw/App/ShapeExtractor.h>
#include <Mod/TechDraw/App/ShapeExtractor.h>
#include "DimensionValidators.h"
@@ -185,7 +180,6 @@ DimensionGeometryType TechDraw::validateDimSelection3d(
std::vector<int> minimumCounts, //how many of each geometry are needed for a good dimension
std::vector<DimensionGeometryType> acceptableDimensionGeometrys)//isVertical, isHorizontal, ...
{
// Base::Console().Message("DV::validateDimSelection3d() - references: %d\n", references.size());
StringVector subNames;
for (auto& ref : references) {
if (!ref.getSubName().empty()) {
@@ -226,7 +220,6 @@ DimensionGeometryType TechDraw::validateDimSelection3d(
bool TechDraw::validateSubnameList(StringVector subNames,
GeometrySet acceptableGeometrySet)
{
// Base::Console().Message("DV::validateSubNameList()\n");
for (auto& sub : subNames) {
std::string geometryType = DrawUtil::getGeomTypeFromName(sub);
if (acceptableGeometrySet.count(geometryType) == 0) {
@@ -241,7 +234,6 @@ bool TechDraw::validateSubnameList(StringVector subNames,
bool TechDraw::checkGeometryOccurences(StringVector subNames,
GeomCountMap keyedMinimumCounts)
{
// Base::Console().Message("DV::checkGeometryOccurences() - subNames: %d\n", subNames.size());
//how many of each geometry descriptor are input
GeomCountMap foundCounts;
for (auto& sub : subNames) {
@@ -618,7 +610,6 @@ DimensionGeometryType TechDraw::isValidVertexes(ReferenceVector refs)
//! verify that the vertex references can make a dimension
DimensionGeometryType TechDraw::isValidVertexes3d(DrawViewPart *dvp, ReferenceVector refs)
{
// Base::Console().Message("DV::isValidVertexes3d() - refs: %d\n", refs.size());
(void) dvp;
if (refs.size() == 2) {
//2 vertices can only make a distance dimension

5
src/Mod/TechDraw/Gui/DlgStringListEditor.cpp
View File

@@ -22,16 +22,15 @@
#include "PreCompiled.h"
#ifndef _PreComp_
#include <QList>
#include <QListWidgetItem>
# include <QListWidgetItem>
#endif
#include <Base/Console.h>// for FC_LOG_LEVEL_INIT
#include <Base/Tools.h>
#include "DlgStringListEditor.h"
#include "ui_DlgStringListEditor.h"
using namespace TechDrawGui;
/* TRANSLATOR Gui::DlgStringListEditor */

2
src/Mod/TechDraw/Gui/DlgStringListEditor.h
View File

@@ -19,6 +19,7 @@
* Suite 330, Boston, MA 02111-1307, USA *
* *
****************************************************************************/
#ifndef GUI_DLGEDITABLETEXT_H
#define GUI_DLGEDITABLETEXT_H
@@ -26,6 +27,7 @@
#include <QDialog>
class QListWidgetItem;
namespace TechDrawGui {

14
src/Mod/TechDraw/Gui/QGILeaderLine.cpp
View File

@@ -22,13 +22,13 @@
#include "PreCompiled.h"
#ifndef _PreComp_
#include <cmath>
# include <cmath>
#include <QGraphicsScene>
#include <QGraphicsSceneMouseEvent>
#include <QPainter>
#include <QPainterPath>
#include <QVector2D>
# include <QGraphicsScene>
# include <QGraphicsSceneMouseEvent>
# include <QPainter>
# include <QPainterPath>
# include <QVector2D>
#endif
#include <Base/Console.h>
@@ -37,10 +37,10 @@
#include <Mod/TechDraw/App/DrawUtil.h>
#include <Mod/TechDraw/App/LineGroup.h>
#include "QGILeaderLine.h"
#include "PreferencesGui.h"
#include "QGEPath.h"
#include "QGIArrow.h"
#include "QGILeaderLine.h"
#include "QGIPrimPath.h"
#include "Rez.h"
#include "ViewProviderLeader.h"

4
src/Mod/TechDraw/Gui/QGISVGTemplate.cpp
View File

@@ -21,7 +21,6 @@
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <QDomDocument>
# include <QFile>
@@ -42,13 +41,14 @@
#include <Mod/TechDraw/App/DrawUtil.h>
#include <Mod/TechDraw/App/QDomNodeModel.h>
#include "PreferencesGui.h"
#include "QGISVGTemplate.h"
#include "PreferencesGui.h"
#include "QGSPage.h"
#include "Rez.h"
#include "TemplateTextField.h"
#include "ZVALUE.h"
using namespace TechDrawGui;
using namespace TechDraw;

18
src/Mod/TechDraw/Gui/QGIViewBalloon.cpp
View File

@@ -23,15 +23,15 @@
#include "PreCompiled.h"
#ifndef _PreComp_
#include <cmath>
#include <string>
# include <cmath>
# include <string>
#include <QGraphicsScene>
#include <QGraphicsSceneMouseEvent>
#include <QPaintDevice>
#include <QPainter>
#include <QPainterPath>
#include <QSvgGenerator>
# include <QGraphicsScene>
# include <QGraphicsSceneMouseEvent>
# include <QPaintDevice>
# include <QPainter>
# include <QPainterPath>
# include <QSvgGenerator>
#endif
#include <App/Application.h>
@@ -46,10 +46,10 @@
#include <Mod/TechDraw/App/DrawViewPart.h>
#include <Mod/TechDraw/App/Geometry.h>
#include "QGIViewBalloon.h"
#include "PreferencesGui.h"
#include "QGIArrow.h"
#include "QGIDimLines.h"
#include "QGIViewBalloon.h"
#include "Rez.h"
#include "ViewProviderBalloon.h"
#include "ViewProviderViewPart.h"

20
src/Mod/TechDraw/Gui/QGIViewDimension.cpp
View File

@@ -23,37 +23,35 @@
#include "PreCompiled.h"
#ifdef FC_OS_WIN32
#define _USE_MATH_DEFINES//re Windows & M_PI issues
# define _USE_MATH_DEFINES //resolves Windows & M_PI issues
#endif
#ifndef _PreComp_
#include <cmath>
# include <cmath>
#include <QGraphicsScene>
#include <QGraphicsSceneMouseEvent>
#include <QPaintDevice>
#include <QPainter>
#include <QPainterPath>
#include <QSvgGenerator>
# include <QGraphicsScene>
# include <QGraphicsSceneMouseEvent>
# include <QPaintDevice>
# include <QPainter>
# include <QPainterPath>
# include <QSvgGenerator>
#endif
#include <App/Application.h>
#include <Base/Console.h>
#include <Base/Parameter.h>
#include <Base/UnitsApi.h>
#include <Gui/Command.h>
#include <Mod/TechDraw/App/DrawUtil.h>
#include <Mod/TechDraw/App/DrawViewDimension.h>
#include <Mod/TechDraw/App/DrawViewPart.h>
#include <Mod/TechDraw/App/Geometry.h>
#include "QGIViewDimension.h"
#include "PreferencesGui.h"
#include "QGIArrow.h"
#include "QGIDimLines.h"
#include "QGIVertex.h"
#include "QGIViewDimension.h"
#include "ViewProviderDimension.h"
#include "ZVALUE.h"

3
src/Mod/TechDraw/Gui/QGIViewSymbol.cpp
View File

@@ -27,7 +27,6 @@
# include <sstream>
# include <QGraphicsColorizeEffect>
# include <QGraphicsEffect>
# include <QGraphicsItem>
# include <QRectF>
#endif
@@ -37,10 +36,10 @@
#include <Mod/TechDraw/App/DrawViewDraft.h>
#include <Mod/TechDraw/App/DrawViewSymbol.h>
#include "QGIViewSymbol.h"
#include "PreferencesGui.h"
#include "QGCustomSvg.h"
#include "QGDisplayArea.h"
#include "QGIViewSymbol.h"
#include "Rez.h"

22
src/Mod/TechDraw/Gui/TaskDimRepair.cpp
View File

@@ -22,32 +22,25 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <cmath>
# include <string>
# include <vector>
# include <QMessageBox>
# include <QTableWidgetItem>
#endif // #ifndef _PreComp_
#include <App/Application.h>
#include <App/Document.h>
#include <App/DocumentObject.h>
#include <Base/Console.h>
#include <Base/Tools.h>
#include <Base/Vector3D.h>
#include <Gui/Application.h>
#include <Gui/BitmapFactory.h>
#include <Gui/Command.h>
#include <Gui/Document.h>
#include <Gui/MainWindow.h>
#include <Gui/Selection.h>
#include <Gui/ViewProvider.h>
#include <Mod/TechDraw/App/DrawView.h>
#include <Mod/TechDraw/App/DrawViewPart.h>
#include <Mod/TechDraw/App/DrawUtil.h>
#include "DimensionValidators.h"
#include "ui_TaskDimRepair.h"
#include "TaskDimRepair.h"
#include "ui_TaskDimRepair.h"
#include "DimensionValidators.h"
using namespace Gui;
@@ -126,7 +119,6 @@ void TaskDimRepair::saveDimState()
//restore the start conditions
void TaskDimRepair::restoreDimState()
{
// Base::Console().Message("TDR::restoreDimState()\n");
if (m_dim) {
m_dim->setReferences2d(m_saveRefs2d);
m_dim->setReferences3d(m_saveRefs3d);
@@ -137,7 +129,6 @@ void TaskDimRepair::restoreDimState()
//use the current selection to replace the references in dim
void TaskDimRepair::slotUseSelection()
{
// Base::Console().Message("TDR::slotUseSelection()\n");
const std::vector<App::DocumentObject*> dimObjects = Gui::Selection().getObjectsOfType(TechDraw::DrawViewDimension::getClassTypeId());
if (dimObjects.empty()) {
//selection does not include a dimension, so we need to add our dimension to keep the
@@ -200,7 +191,6 @@ void TaskDimRepair::slotUseSelection()
void TaskDimRepair::updateUi()
{
// Base::Console().Message("TDR::updateUi()\n");
std::string objName = m_dim->getViewPart()->getNameInDocument();
std::string objLabel = m_dim->getViewPart()->Label.getValue();
ui->leObject2d->setText(Base::Tools::fromStdString(objName + " / " + objLabel));
@@ -216,7 +206,6 @@ void TaskDimRepair::updateUi()
void TaskDimRepair::loadTableWidget(QTableWidget* tw, ReferenceVector refs)
{
// Base::Console().Message("TDR::loadTableWidget() - refs: %d\n", refs.size());
tw->clearContents();
tw->setRowCount(refs.size() + 1);
size_t iRow = 0;
@@ -257,7 +246,6 @@ void TaskDimRepair::fillList(QListWidget* lwItems, std::vector<std::string> labe
}
void TaskDimRepair::replaceReferences()
{
// Base::Console().Message("TDR::replaceReferences() - refs2d: %d refs3d %d\n", m_references2d.size(), m_references3d.size());
if (!m_dim) {
return;
}
@@ -271,7 +259,6 @@ void TaskDimRepair::replaceReferences()
bool TaskDimRepair::accept()
{
// Base::Console().Message("TDR::accept()\n");
Gui::Command::doCommand(Gui::Command::Gui, "Gui.ActiveDocument.resetEdit()");
replaceReferences();
m_dim->Type.setValue(m_dimType);
@@ -281,7 +268,6 @@ bool TaskDimRepair::accept()
bool TaskDimRepair::reject()
{
// Base::Console().Message("TDR::reject()\n");
restoreDimState();
Gui::Command::doCommand(Gui::Command::Gui, "Gui.ActiveDocument.resetEdit()");
return false;

7
src/Mod/TechDraw/Gui/TaskDimRepair.h
View File

@@ -23,14 +23,13 @@
#ifndef TECHDRAW_TASKDIMREPAIR_H
#define TECHDRAW_TASKDIMREPAIR_H
#include <Mod/TechDraw/TechDrawGlobal.h>
#include <QListWidget>
#include <QTableWidget>
#include <Gui/TaskView/TaskDialog.h>
#include <Gui/TaskView/TaskView.h>
#include <Mod/TechDraw/TechDrawGlobal.h>
#include <Mod/TechDraw/App/DrawViewDimension.h>
#include <Mod/TechDraw/App/DimensionReferences.h>
#include <Mod/TechDraw/Gui/ui_TaskDimRepair.h>
class Ui_TaskDimRepair;

5
src/Mod/TechDraw/Gui/ViewProviderDimension.h
View File

@@ -24,14 +24,13 @@
#ifndef DRAWINGGUI_VIEWPROVIDERDIMENSION_H
#define DRAWINGGUI_VIEWPROVIDERDIMENSION_H
#include <Mod/TechDraw/TechDrawGlobal.h>
#include <App/PropertyUnits.h>
#include <Mod/TechDraw/TechDrawGlobal.h>
#include <Mod/TechDraw/App/DrawViewDimension.h>
#include "ViewProviderDrawingView.h"
namespace TechDrawGui {
class TechDrawGuiExport ViewProviderDimension : public ViewProviderDrawingView

8
src/Mod/TechDraw/Gui/ViewProviderDrawingViewExtension.cpp
View File

@@ -21,16 +21,8 @@
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <QMessageBox>
#endif
#include <App/Document.h>
#include <App/DocumentObject.h>
#include <Base/Console.h>
#include <Base/Tools.h>
#include <Mod/TechDraw/App/DrawPage.h>
#include <Mod/TechDraw/App/DrawTemplate.h>
#include "ViewProviderDrawingViewExtension.h"
#include "ViewProviderDrawingView.h"

1
src/Mod/TechDraw/Gui/ViewProviderDrawingViewExtension.h
View File

@@ -24,7 +24,6 @@
#define TECHDRAWGUI_VIEWPROVIDERDRAWINGVIEWEXTENSION_H
#include <Gui/ViewProviderExtension.h>
#include <Gui/ViewProviderExtensionPy.h>
#include <Gui/ViewProviderExtensionPython.h>
#include <Mod/TechDraw/TechDrawGlobal.h>

4
src/Mod/TechDraw/Gui/ViewProviderPage.cpp
View File

@@ -53,12 +53,12 @@
#include <Mod/TechDraw/App/DrawViewDimension.h>
#include <Mod/TechDraw/App/DrawWeldSymbol.h>
#include "ViewProviderPage.h"
#include "MDIViewPage.h"
#include "PreferencesGui.h"
#include "QGITemplate.h"
#include "QGSPage.h"
#include "QGVPage.h"
#include "ViewProviderPage.h"
#include "ViewProviderPageExtension.h"
#include "ViewProviderTemplate.h"
@@ -451,7 +451,6 @@ void ViewProviderPage::setFrameState(bool state) { ShowFrames.setValue(state); }
void ViewProviderPage::toggleFrameState()
{
// Base::Console().Message("VPP::toggleFrameState()\n");
if (m_graphicsScene) {
setFrameState(!getFrameState());
m_graphicsScene->refreshViews();
@@ -461,7 +460,6 @@ void ViewProviderPage::toggleFrameState()
void ViewProviderPage::setTemplateMarkers(bool state)
{
// Base::Console().Message("VPP::setTemplateMarkers(%d)\n", state);
App::DocumentObject* templateFeat = nullptr;
templateFeat = getDrawPage()->Template.getValue();
Gui::Document* guiDoc = Gui::Application::Instance->getDocument(templateFeat->getDocument());

6
src/Mod/TechDraw/Gui/ViewProviderPage.h
View File

@@ -24,16 +24,18 @@
#ifndef DRAWINGGUI_VIEWPROVIDERPAGE_H
#define DRAWINGGUI_VIEWPROVIDERPAGE_H
#include <Mod/TechDraw/TechDrawGlobal.h>
#include <QObject>
#include <QPointer>
#include <boost_signals2.hpp>
#include <App/PropertyUnits.h>
#include <Gui/ViewProviderDocumentObject.h>
#include <Mod/TechDraw/TechDrawGlobal.h>
#include <ViewProviderPageExtension.h>
namespace TechDraw
{
class DrawPage;

6
src/Mod/TechDraw/Gui/ViewProviderPageExtension.cpp
View File

@@ -21,14 +21,8 @@
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <QMessageBox>
#endif
#include <App/Document.h>
#include <App/DocumentObject.h>
#include <Base/Console.h>
#include <Base/Tools.h>
#include <Mod/TechDraw/App/DrawPage.h>
#include <Mod/TechDraw/App/DrawProjGroupItem.h>
#include <Mod/TechDraw/App/DrawTemplate.h>

1
src/Mod/TechDraw/Gui/ViewProviderPageExtension.h
View File

@@ -24,7 +24,6 @@
#define TECHDRAWGUI_VIEWPROVIDERPAGEEXTENSION_H
#include <Gui/ViewProviderExtension.h>
#include <Gui/ViewProviderExtensionPy.h>
#include <Gui/ViewProviderExtensionPython.h>
#include <Mod/TechDraw/TechDrawGlobal.h>

9
src/Mod/TechDraw/Gui/ViewProviderTemplateExtension.cpp
View File

@@ -21,19 +21,10 @@
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <QMessageBox>
#endif
#include <App/Document.h>
#include <App/DocumentObject.h>
#include <Base/Console.h>
#include <Base/Tools.h>
#include <Mod/TechDraw/App/DrawPage.h>
#include <Mod/TechDraw/App/DrawTemplate.h>
#include "ViewProviderTemplateExtension.h"
#include "ViewProviderPage.h"
#include "ViewProviderTemplate.h"

1
src/Mod/TechDraw/Gui/ViewProviderTemplateExtension.h
View File

@@ -24,7 +24,6 @@
#define TECHDRAWGUI_VIEWPROVIDERTEMPLATEEXTENSION_H
#include <Gui/ViewProviderExtension.h>
#include <Gui/ViewProviderExtensionPy.h>
#include <Gui/ViewProviderExtensionPython.h>
#include <Mod/TechDraw/TechDrawGlobal.h>