diff --git a/src/Mod/TechDraw/Gui/ViewProviderDrawingViewExtension.cpp b/src/Mod/TechDraw/Gui/ViewProviderDrawingViewExtension.cpp index 77c6720c89..169e7ebb99 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDrawingViewExtension.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderDrawingViewExtension.cpp @@ -23,7 +23,7 @@ #include "PreCompiled.h" #ifndef _PreComp_ -# include +#include #endif #include @@ -34,8 +34,8 @@ #include #include -#include "ViewProviderDrawingViewExtension.h" #include "ViewProviderDrawingView.h" +#include "ViewProviderDrawingViewExtension.h" #include "ViewProviderPage.h" using namespace TechDrawGui; @@ -47,41 +47,40 @@ ViewProviderDrawingViewExtension::ViewProviderDrawingViewExtension() initExtensionType(ViewProviderDrawingViewExtension::getExtensionClassTypeId()); } -ViewProviderDrawingViewExtension::~ViewProviderDrawingViewExtension() -{ -} +ViewProviderDrawingViewExtension::~ViewProviderDrawingViewExtension() {} -bool ViewProviderDrawingViewExtension::extensionCanDragObjects() const { - return true; -} +bool ViewProviderDrawingViewExtension::extensionCanDragObjects() const { return true; } //we don't support dragging children of Views (Dimensions, Balloons, Hatches, etc) now, but we don't want another //extension to drag our children and cause problems -bool ViewProviderDrawingViewExtension::extensionCanDragObject(App::DocumentObject* docObj) const { +bool ViewProviderDrawingViewExtension::extensionCanDragObject(App::DocumentObject* docObj) const +{ (void)docObj; return true; } //the default drag will remove the object from the document until it is dropped and re-added, so we claim //to do the dragging. -void ViewProviderDrawingViewExtension::extensionDragObject(App::DocumentObject* obj) { - (void)obj; -} +void ViewProviderDrawingViewExtension::extensionDragObject(App::DocumentObject* obj) { (void)obj; } //we don't support dropping of new children of Views (Dimensions, Balloons, Hatches, etc) now, but we don't want another //extension to try to drop on us and cause problems -bool ViewProviderDrawingViewExtension::extensionCanDropObjects() const { - return true; +bool ViewProviderDrawingViewExtension::extensionCanDropObjects() const { return true; } + +//let the page have any drops we receive +bool ViewProviderDrawingViewExtension::extensionCanDropObject(App::DocumentObject* obj) const +{ + return getViewProviderDrawingView() + ->getViewProviderPage() + ->getVPPExtension() + ->extensionCanDropObject(obj); } //let the page have any drops we receive -bool ViewProviderDrawingViewExtension::extensionCanDropObject(App::DocumentObject* obj) const { - return getViewProviderDrawingView()->getViewProviderPage()->getVPPExtension()->extensionCanDropObject(obj); -} - -//let the page have any drops we receive -void ViewProviderDrawingViewExtension::extensionDropObject(App::DocumentObject* obj) { - getViewProviderDrawingView()->getViewProviderPage()->getVPPExtension()->extensionDropObject(obj); +void ViewProviderDrawingViewExtension::extensionDropObject(App::DocumentObject* obj) +{ + getViewProviderDrawingView()->getViewProviderPage()->getVPPExtension()->extensionDropObject( + obj); } const ViewProviderDrawingView* ViewProviderDrawingViewExtension::getViewProviderDrawingView() const @@ -89,7 +88,7 @@ const ViewProviderDrawingView* ViewProviderDrawingViewExtension::getViewProvider return dynamic_cast(getExtendedViewProvider()); } -const char* ViewProviderDrawingViewExtension::whoAmI() const +const char* ViewProviderDrawingViewExtension::whoAmI() const { auto parent = getViewProviderDrawingView(); if (parent) { @@ -98,11 +97,12 @@ const char* ViewProviderDrawingViewExtension::whoAmI() const return nullptr; } -namespace Gui { -EXTENSION_PROPERTY_SOURCE_TEMPLATE(ViewProviderDrawingViewExtensionPython, ViewProviderDrawingViewExtension) +namespace Gui +{ +EXTENSION_PROPERTY_SOURCE_TEMPLATE(TechDrawGui::ViewProviderDrawingViewExtensionPython, + TechDrawGui::ViewProviderDrawingViewExtension) // explicit template instantiation -template class GuiExport ViewProviderExtensionPythonT; -} - - +template class TechDrawGuiExport + ViewProviderExtensionPythonT; +}// namespace Gui diff --git a/src/Mod/TechDraw/Gui/ViewProviderDrawingViewExtension.h b/src/Mod/TechDraw/Gui/ViewProviderDrawingViewExtension.h index ff307f98b6..b79dfaa235 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDrawingViewExtension.h +++ b/src/Mod/TechDraw/Gui/ViewProviderDrawingViewExtension.h @@ -23,16 +23,16 @@ #ifndef TECHDRAWGUI_VIEWPROVIDERDRAWINGVIEWEXTENSION_H #define TECHDRAWGUI_VIEWPROVIDERDRAWINGVIEWEXTENSION_H -#include #include #include #include +#include namespace TechDrawGui { class ViewProviderDrawingView; -class TechDrawGuiExport ViewProviderDrawingViewExtension : public Gui::ViewProviderExtension +class TechDrawGuiExport ViewProviderDrawingViewExtension: public Gui::ViewProviderExtension { EXTENSION_PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderDrawingViewExtension); @@ -54,10 +54,9 @@ public: private: }; -using ViewProviderDrawingViewExtensionPython = Gui::ViewProviderExtensionPythonT; - -} //namespace Gui - -#endif // TECHDRAWGUI_VIEWPROVIDERDRAWINGVIEWEXTENSION_H +using ViewProviderDrawingViewExtensionPython = + Gui::ViewProviderExtensionPythonT; +}// namespace TechDrawGui +#endif// TECHDRAWGUI_VIEWPROVIDERDRAWINGVIEWEXTENSION_H diff --git a/src/Mod/TechDraw/Gui/ViewProviderPageExtension.cpp b/src/Mod/TechDraw/Gui/ViewProviderPageExtension.cpp index 01c56329ec..69a5fa20f0 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderPageExtension.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderPageExtension.cpp @@ -23,7 +23,7 @@ #include "PreCompiled.h" #ifndef _PreComp_ -# include +#include #endif #include @@ -32,11 +32,11 @@ #include #include -#include #include +#include -#include "ViewProviderPageExtension.h" #include "ViewProviderPage.h" +#include "ViewProviderPageExtension.h" using namespace TechDrawGui; @@ -47,36 +47,30 @@ ViewProviderPageExtension::ViewProviderPageExtension() initExtensionType(ViewProviderPageExtension::getExtensionClassTypeId()); } -ViewProviderPageExtension::~ViewProviderPageExtension() -{ -} +ViewProviderPageExtension::~ViewProviderPageExtension() {} -bool ViewProviderPageExtension::extensionCanDragObjects() const { - return true; -} +bool ViewProviderPageExtension::extensionCanDragObjects() const { return true; } //we don't want another extension to drag our objects, so we say that we can handle this object -bool ViewProviderPageExtension::extensionCanDragObject(App::DocumentObject* docObj) const { - (void) docObj; +bool ViewProviderPageExtension::extensionCanDragObject(App::DocumentObject* docObj) const +{ + (void)docObj; return true; } //we don't take any action on drags. everything is handling in drop -void ViewProviderPageExtension::extensionDragObject(App::DocumentObject* obj) { - (void) obj; -} +void ViewProviderPageExtension::extensionDragObject(App::DocumentObject* obj) { (void)obj; } //we handle our own drops -bool ViewProviderPageExtension::extensionCanDropObjects() const { - return true; -} +bool ViewProviderPageExtension::extensionCanDropObjects() const { return true; } -bool ViewProviderPageExtension::extensionCanDropObject(App::DocumentObject* obj) const { +bool ViewProviderPageExtension::extensionCanDropObject(App::DocumentObject* obj) const +{ //only DrawView objects can live on pages (except special case Template) - if ( obj->isDerivedFrom(TechDraw::DrawView::getClassTypeId()) ) { + if (obj->isDerivedFrom(TechDraw::DrawView::getClassTypeId())) { return true; } - if ( obj->isDerivedFrom(TechDraw::DrawTemplate::getClassTypeId()) ) { + if (obj->isDerivedFrom(TechDraw::DrawTemplate::getClassTypeId())) { //don't let another extension try to drop templates return true; } @@ -84,8 +78,9 @@ bool ViewProviderPageExtension::extensionCanDropObject(App::DocumentObject* obj) return false; } -void ViewProviderPageExtension::extensionDropObject(App::DocumentObject* obj) { - if ( obj->isDerivedFrom(TechDraw::DrawView::getClassTypeId()) ) { +void ViewProviderPageExtension::extensionDropObject(App::DocumentObject* obj) +{ + if (obj->isDerivedFrom(TechDraw::DrawView::getClassTypeId())) { dropObject(obj); return; } @@ -98,7 +93,7 @@ void ViewProviderPageExtension::dropObject(App::DocumentObject* docObj) //DPGI can not be dropped onto the Page as it belongs to DPG, not Page return; } - if (docObj->isDerivedFrom(TechDraw::DrawView::getClassTypeId()) ) { + if (docObj->isDerivedFrom(TechDraw::DrawView::getClassTypeId())) { auto dv = static_cast(docObj); if (dv->findParentPage()) { dv->findParentPage()->removeView(dv); @@ -116,7 +111,7 @@ const ViewProviderPage* ViewProviderPageExtension::getViewProviderPage() const } -const char* ViewProviderPageExtension::whoAmI() const +const char* ViewProviderPageExtension::whoAmI() const { auto parent = getViewProviderPage(); if (parent) { @@ -125,10 +120,12 @@ const char* ViewProviderPageExtension::whoAmI() const return nullptr; } -namespace Gui { -EXTENSION_PROPERTY_SOURCE_TEMPLATE(ViewProviderPageExtensionPython, ViewProviderPageExtension) +namespace Gui +{ +EXTENSION_PROPERTY_SOURCE_TEMPLATE(TechDrawGui::ViewProviderPageExtensionPython, + TechDrawGui::ViewProviderPageExtension) // explicit template instantiation -template class GuiExport ViewProviderExtensionPythonT; -} - +template class TechDrawGuiExport + ViewProviderExtensionPythonT; +}// namespace Gui diff --git a/src/Mod/TechDraw/Gui/ViewProviderPageExtension.h b/src/Mod/TechDraw/Gui/ViewProviderPageExtension.h index 1739dcd9df..dd48d298c2 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderPageExtension.h +++ b/src/Mod/TechDraw/Gui/ViewProviderPageExtension.h @@ -23,16 +23,16 @@ #ifndef TECHDRAWGUI_VIEWPROVIDERPAGEEXTENSION_H #define TECHDRAWGUI_VIEWPROVIDERPAGEEXTENSION_H -#include #include #include #include +#include namespace TechDrawGui { class ViewProviderPage; -class TechDrawGuiExport ViewProviderPageExtension : public Gui::ViewProviderExtension +class TechDrawGuiExport ViewProviderPageExtension: public Gui::ViewProviderExtension { EXTENSION_PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderPageExtension); @@ -56,9 +56,9 @@ public: private: }; -using ViewProviderPageExtensionPython = Gui::ViewProviderExtensionPythonT; +using ViewProviderPageExtensionPython = + Gui::ViewProviderExtensionPythonT; -} //namespace Gui - -#endif // TECHDRAWGUI_VIEWPROVIDERPAGEEXTENSION_H +}// namespace TechDrawGui +#endif// TECHDRAWGUI_VIEWPROVIDERPAGEEXTENSION_H diff --git a/src/Mod/TechDraw/Gui/ViewProviderTemplateExtension.cpp b/src/Mod/TechDraw/Gui/ViewProviderTemplateExtension.cpp index ee1563d9cd..8e0733841d 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderTemplateExtension.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderTemplateExtension.cpp @@ -23,7 +23,7 @@ #include "PreCompiled.h" #ifndef _PreComp_ -# include +#include #endif #include @@ -34,9 +34,9 @@ #include #include -#include "ViewProviderTemplateExtension.h" -#include "ViewProviderTemplate.h" #include "ViewProviderPage.h" +#include "ViewProviderTemplate.h" +#include "ViewProviderTemplateExtension.h" using namespace TechDrawGui; @@ -47,31 +47,27 @@ ViewProviderTemplateExtension::ViewProviderTemplateExtension() initExtensionType(ViewProviderTemplateExtension::getExtensionClassTypeId()); } -ViewProviderTemplateExtension::~ViewProviderTemplateExtension() -{ -} +ViewProviderTemplateExtension::~ViewProviderTemplateExtension() {} //there are no child objects to drag currently, so we will say we handle any dragging rather than letting some //other extension trying to drag and causing problems. -bool ViewProviderTemplateExtension::extensionCanDragObjects() const { - return true; -} +bool ViewProviderTemplateExtension::extensionCanDragObjects() const { return true; } //there are no child objects to drag currently, so we will say we handle any dragging -bool ViewProviderTemplateExtension::extensionCanDragObject(App::DocumentObject* docObj) const { - (void) docObj; +bool ViewProviderTemplateExtension::extensionCanDragObject(App::DocumentObject* docObj) const +{ + (void)docObj; return true; } //templates do not accept drops, so rather that let some other extension try to drop into a template, we will //claim that we can handle drops -bool ViewProviderTemplateExtension::extensionCanDropObjects() const { - return true; -} +bool ViewProviderTemplateExtension::extensionCanDropObjects() const { return true; } //templates do not accept drops, so rather that let some other extension try to drop into a template, we will //claim that we can handle drops -bool ViewProviderTemplateExtension::extensionCanDropObject(App::DocumentObject* docObj) const { +bool ViewProviderTemplateExtension::extensionCanDropObject(App::DocumentObject* docObj) const +{ (void)docObj; return true; } @@ -81,7 +77,7 @@ const ViewProviderTemplate* ViewProviderTemplateExtension::getViewProviderTempla return dynamic_cast(getExtendedViewProvider()); } -const char* ViewProviderTemplateExtension::whoAmI() const +const char* ViewProviderTemplateExtension::whoAmI() const { auto parent = getViewProviderTemplate(); if (parent) { @@ -90,12 +86,12 @@ const char* ViewProviderTemplateExtension::whoAmI() const return nullptr; } -namespace Gui { -EXTENSION_PROPERTY_SOURCE_TEMPLATE(ViewProviderTemplateExtensionPython, ViewProviderTemplateExtension) +namespace Gui +{ +EXTENSION_PROPERTY_SOURCE_TEMPLATE(TechDrawGui::ViewProviderTemplateExtensionPython, + TechDrawGui::ViewProviderTemplateExtension) // explicit template instantiation -template class GuiExport ViewProviderExtensionPythonT; -} - - - +template class TechDrawGuiExport + ViewProviderExtensionPythonT; +}// namespace Gui diff --git a/src/Mod/TechDraw/Gui/ViewProviderTemplateExtension.h b/src/Mod/TechDraw/Gui/ViewProviderTemplateExtension.h index c302208e48..c204e7c9dd 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderTemplateExtension.h +++ b/src/Mod/TechDraw/Gui/ViewProviderTemplateExtension.h @@ -23,16 +23,16 @@ #ifndef TECHDRAWGUI_VIEWPROVIDERTEMPLATEEXTENSION_H #define TECHDRAWGUI_VIEWPROVIDERTEMPLATEEXTENSION_H -#include #include #include #include +#include namespace TechDrawGui { class ViewProviderTemplate; -class TechDrawGuiExport ViewProviderTemplateExtension : public Gui::ViewProviderExtension +class TechDrawGuiExport ViewProviderTemplateExtension: public Gui::ViewProviderExtension { EXTENSION_PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderTemplateExtension); @@ -52,11 +52,9 @@ public: private: }; -using ViewProviderTemplateExtensionPython = Gui::ViewProviderExtensionPythonT; - -} //namespace Gui - -#endif // TECHDRAWGUI_VIEWPROVIDERTEMPLATEEXTENSION_H - +using ViewProviderTemplateExtensionPython = + Gui::ViewProviderExtensionPythonT; +}// namespace TechDrawGui +#endif// TECHDRAWGUI_VIEWPROVIDERTEMPLATEEXTENSION_H