From 4c9fb846bc476e1ac18daeb879cc28fe1f5edfed Mon Sep 17 00:00:00 2001 From: jriegel Date: Mon, 5 Dec 2011 21:48:47 +0000 Subject: [PATCH] + rename MainPart to Body git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5223 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d --- src/Mod/PartDesign/App/AppPartDesign.cpp | 4 ++-- .../App/{FeatureMainPart.cpp => Body.cpp} | 11 +++++------ .../App/{FeatureMainPart.h => Body.h} | 18 ++++++++++-------- src/Mod/PartDesign/App/CMakeLists.txt | 4 ++-- src/Mod/PartDesign/App/Makefile.am | 4 ++-- 5 files changed, 21 insertions(+), 20 deletions(-) rename src/Mod/PartDesign/App/{FeatureMainPart.cpp => Body.cpp} (86%) rename src/Mod/PartDesign/App/{FeatureMainPart.h => Body.h} (85%) diff --git a/src/Mod/PartDesign/App/AppPartDesign.cpp b/src/Mod/PartDesign/App/AppPartDesign.cpp index 86dda17e6..debb60f26 100644 --- a/src/Mod/PartDesign/App/AppPartDesign.cpp +++ b/src/Mod/PartDesign/App/AppPartDesign.cpp @@ -34,7 +34,7 @@ #include "FeatureFillet.h" #include "FeatureSketchBased.h" #include "FeatureRevolution.h" -#include "FeatureMainPart.h" +#include "Body.h" #include "FeatureDressUp.h" #include "FeatureChamfer.h" #include "FeatureFace.h" @@ -77,7 +77,7 @@ void PartDesignExport initPartDesign() PartDesign::Additive ::init(); PartDesign::PatternRectangular ::init(); PartDesign::Hole ::init(); - PartDesign::MainPart ::init(); + PartDesign::Body ::init(); PartDesign::Pad ::init(); PartDesign::Pocket ::init(); PartDesign::Fillet ::init(); diff --git a/src/Mod/PartDesign/App/FeatureMainPart.cpp b/src/Mod/PartDesign/App/Body.cpp similarity index 86% rename from src/Mod/PartDesign/App/FeatureMainPart.cpp rename to src/Mod/PartDesign/App/Body.cpp index d31fc51e1..5f82a6ad1 100644 --- a/src/Mod/PartDesign/App/FeatureMainPart.cpp +++ b/src/Mod/PartDesign/App/Body.cpp @@ -26,9 +26,8 @@ #endif #include -#include -#include "FeatureMainPart.h" +#include "Body.h" using namespace PartDesign; @@ -36,14 +35,14 @@ using namespace PartDesign; namespace PartDesign { -PROPERTY_SOURCE(PartDesign::MainPart, Part::Feature) +PROPERTY_SOURCE(PartDesign::Body, Part::Feature) -MainPart::MainPart() +Body::Body() { ADD_PROPERTY(Model,(0)); } -short MainPart::mustExecute() const +short Body::mustExecute() const { //if (Sketch.isTouched() || // Length.isTouched()) @@ -51,7 +50,7 @@ short MainPart::mustExecute() const return 0; } -App::DocumentObjectExecReturn *MainPart::execute(void) +App::DocumentObjectExecReturn *Body::execute(void) { return App::DocumentObject::StdReturn; diff --git a/src/Mod/PartDesign/App/FeatureMainPart.h b/src/Mod/PartDesign/App/Body.h similarity index 85% rename from src/Mod/PartDesign/App/FeatureMainPart.h rename to src/Mod/PartDesign/App/Body.h index b1aee7e7c..681d71b2f 100644 --- a/src/Mod/PartDesign/App/FeatureMainPart.h +++ b/src/Mod/PartDesign/App/Body.h @@ -21,23 +21,25 @@ ***************************************************************************/ -#ifndef PARTDESIGN_MainPart_H -#define PARTDESIGN_MainPart_H +#ifndef PARTDESIGN_Body_H +#define PARTDESIGN_Body_H #include -#include "Feature.h" +#include + namespace PartDesign { -class MainPart : public PartDesign::Feature +class Body : public Part::Feature { - PROPERTY_HEADER(PartDesign::MainPart); + PROPERTY_HEADER(PartDesign::Body); public: - MainPart(); + Body(); App::PropertyLinkList Model; + App::PropertyLink Tip; /** @name methods override feature */ //@{ @@ -46,7 +48,7 @@ public: short mustExecute() const; /// returns the type name of the view provider //const char* getViewProviderName(void) const { - // return "PartDesignGui::ViewProviderMainPart"; + // return "PartDesignGui::ViewProviderBody"; //} //@} }; @@ -54,4 +56,4 @@ public: } //namespace PartDesign -#endif // PART_MainPart_H +#endif // PART_Body_H diff --git a/src/Mod/PartDesign/App/CMakeLists.txt b/src/Mod/PartDesign/App/CMakeLists.txt index 4bd642006..200020926 100644 --- a/src/Mod/PartDesign/App/CMakeLists.txt +++ b/src/Mod/PartDesign/App/CMakeLists.txt @@ -24,8 +24,8 @@ SET(Features_SRCS Feature.h FeaturePatternRectangular.h FeaturePatternRectangular.cpp - FeatureMainPart.cpp - FeatureMainPart.h + Body.cpp + Body.h ) SOURCE_GROUP("Features" FILES ${Features_SRCS}) diff --git a/src/Mod/PartDesign/App/Makefile.am b/src/Mod/PartDesign/App/Makefile.am index f5345b4e5..54d59e3bd 100644 --- a/src/Mod/PartDesign/App/Makefile.am +++ b/src/Mod/PartDesign/App/Makefile.am @@ -17,8 +17,8 @@ libPartDesign_la_SOURCES=\ FeatureChamfer.h \ FeatureDressUp.cpp \ FeatureDressUp.h \ - FeatureMainPart.cpp \ - FeatureMainPart.h \ + Body.cpp \ + Body.h \ FeatureSketchBased.cpp \ FeatureSketchBased.h \ FeatureRevolution.cpp \