From df48d1668b12c69f33141990df33c562b169c786 Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 13 Apr 2016 15:57:49 +0200 Subject: [PATCH] + remove 'using namespace Attacher' inside header file --- src/Mod/Part/App/AttachableObject.h | 8 +++----- src/Mod/Part/App/Part2DObject.cpp | 2 +- src/Mod/PartDesign/App/DatumCS.cpp | 1 + src/Mod/PartDesign/App/DatumPoint.cpp | 1 + src/Mod/PartDesign/Gui/Command.cpp | 1 + src/Mod/PartDesign/Gui/TaskFeaturePick.cpp | 1 + src/Mod/PartDesign/Gui/Utils.cpp | 1 + src/Mod/Sketcher/Gui/Command.cpp | 1 + 8 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/Mod/Part/App/AttachableObject.h b/src/Mod/Part/App/AttachableObject.h index 192b7b6d4..6ff41eccb 100644 --- a/src/Mod/Part/App/AttachableObject.h +++ b/src/Mod/Part/App/AttachableObject.h @@ -42,8 +42,6 @@ #include -using namespace Attacher; - namespace Part { @@ -69,8 +67,8 @@ public: * destroyed, or when a new attacher is set. The default attacher is AttachEngine3D. * @param attacher. AttachableObject takes ownership and will delete it eventually. */ - virtual void setAttacher(AttachEngine* attacher); - AttachEngine &attacher(void) const {return *_attacher;} + virtual void setAttacher(Attacher::AttachEngine* attacher); + Attacher::AttachEngine &attacher(void) const {return *_attacher;} /// if the 2DObject lies on the Face of an other object this links to it App::PropertyLinkSubList Support; @@ -101,7 +99,7 @@ public: void updateAttacherVals(); private: - AttachEngine* _attacher; + Attacher::AttachEngine* _attacher; }; diff --git a/src/Mod/Part/App/Part2DObject.cpp b/src/Mod/Part/App/Part2DObject.cpp index a578cf271..41b46b575 100644 --- a/src/Mod/Part/App/Part2DObject.cpp +++ b/src/Mod/Part/App/Part2DObject.cpp @@ -66,7 +66,7 @@ PROPERTY_SOURCE(Part::Part2DObject, Part::AttachableObject) Part2DObject::Part2DObject() { - this->setAttacher(new AttachEngine3D); + this->setAttacher(new Attacher::AttachEngine3D); } diff --git a/src/Mod/PartDesign/App/DatumCS.cpp b/src/Mod/PartDesign/App/DatumCS.cpp index 59abfdaea..734aba6fd 100644 --- a/src/Mod/PartDesign/App/DatumCS.cpp +++ b/src/Mod/PartDesign/App/DatumCS.cpp @@ -31,6 +31,7 @@ #include "DatumCS.h" using namespace PartDesign; +using namespace Attacher; // ============================================================================ diff --git a/src/Mod/PartDesign/App/DatumPoint.cpp b/src/Mod/PartDesign/App/DatumPoint.cpp index ac6a34cc7..6c7e68d8c 100644 --- a/src/Mod/PartDesign/App/DatumPoint.cpp +++ b/src/Mod/PartDesign/App/DatumPoint.cpp @@ -72,6 +72,7 @@ #endif using namespace PartDesign; +using namespace Attacher; // ============================================================================ diff --git a/src/Mod/PartDesign/Gui/Command.cpp b/src/Mod/PartDesign/Gui/Command.cpp index 9b5096786..a9d1b46c3 100644 --- a/src/Mod/PartDesign/Gui/Command.cpp +++ b/src/Mod/PartDesign/Gui/Command.cpp @@ -66,6 +66,7 @@ #include "ui_DlgReference.h" using namespace std; +using namespace Attacher; //=========================================================================== diff --git a/src/Mod/PartDesign/Gui/TaskFeaturePick.cpp b/src/Mod/PartDesign/Gui/TaskFeaturePick.cpp index b7c7a7ab1..822204855 100644 --- a/src/Mod/PartDesign/Gui/TaskFeaturePick.cpp +++ b/src/Mod/PartDesign/Gui/TaskFeaturePick.cpp @@ -53,6 +53,7 @@ #include using namespace PartDesignGui; +using namespace Attacher; // TODO Do ve should snap here to App:Part or GeoFeatureGroup/DocumentObjectGroup ? (2015-09-04, Fat-Zer) const QString TaskFeaturePick::getFeatureStatusString(const featureStatus st) diff --git a/src/Mod/PartDesign/Gui/Utils.cpp b/src/Mod/PartDesign/Gui/Utils.cpp index 37972e077..9959517f6 100644 --- a/src/Mod/PartDesign/Gui/Utils.cpp +++ b/src/Mod/PartDesign/Gui/Utils.cpp @@ -50,6 +50,7 @@ //=========================================================================== // Helper for Body //=========================================================================== +using namespace Attacher; namespace PartDesignGui { diff --git a/src/Mod/Sketcher/Gui/Command.cpp b/src/Mod/Sketcher/Gui/Command.cpp index 8c9ce5d89..0ebaaaf4f 100644 --- a/src/Mod/Sketcher/Gui/Command.cpp +++ b/src/Mod/Sketcher/Gui/Command.cpp @@ -56,6 +56,7 @@ using namespace std; using namespace SketcherGui; using namespace Part; +using namespace Attacher; namespace SketcherGui {