suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix typos & whitespaces

Browse Source
This commit is contained in:
wmayer 2016-12-21 11:19:54 +01:00
parent 7fd367a396
commit 1a20ead8da
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Gui/ViewProvider.cpp
View File

@ -397,8 +397,7 @@ void ViewProvider::setModeSwitch()
{ {
if (viewOverrideMode == -1) if (viewOverrideMode == -1)
pcModeSwitch->whichChild = _iActualMode; pcModeSwitch->whichChild = _iActualMode;
else else if (viewOverrideMode < pcModeSwitch->getNumChildren())
if (viewOverrideMode < pcModeSwitch->getNumChildren())
pcModeSwitch->whichChild = viewOverrideMode; pcModeSwitch->whichChild = viewOverrideMode;
} }
@ -547,9 +546,10 @@ bool ViewProvider::onDelete(const vector< string >& subNames) {
bool ViewProvider::canDragObject(App::DocumentObject* obj) const { bool ViewProvider::canDragObject(App::DocumentObject* obj) const {
auto vector = getExtensionsDerivedFromType<Gui::ViewProviderExtension>(); auto vector = getExtensionsDerivedFromType<Gui::ViewProviderExtension>();
for(Gui::ViewProviderExtension* ext : vector) for(Gui::ViewProviderExtension* ext : vector) {
if(ext->extensionCanDragObject(obj)) if(ext->extensionCanDragObject(obj))
return true; return true;
}
return false; return false;
} }
@ -557,9 +557,10 @@ bool ViewProvider::canDragObject(App::DocumentObject* obj) const {
bool ViewProvider::canDragObjects() const { bool ViewProvider::canDragObjects() const {
auto vector = getExtensionsDerivedFromType<Gui::ViewProviderExtension>(); auto vector = getExtensionsDerivedFromType<Gui::ViewProviderExtension>();
for(Gui::ViewProviderExtension* ext : vector) for(Gui::ViewProviderExtension* ext : vector) {
if(ext->extensionCanDragObjects()) if(ext->extensionCanDragObjects())
return true; return true;
}
return false; return false;
} }
@ -574,7 +575,7 @@ void ViewProvider::dragObject(App::DocumentObject* obj) {
} }
} }
throw Base::Exception("ViewProvider::dragObject: no extension for draging given object available."); throw Base::Exception("ViewProvider::dragObject: no extension for dragging given object available.");
} }
@ -615,7 +616,7 @@ void ViewProvider::dropObject(App::DocumentObject* obj) {
} }
} }
throw Base::Exception("ViewProvider::dropObject: no extension for droping given object available."); throw Base::Exception("ViewProvider::dropObject: no extension for dropping given object available.");
} }
void ViewProvider::Restore(Base::XMLReader& reader) { void ViewProvider::Restore(Base::XMLReader& reader) {

8
src/Gui/ViewProviderGroupExtension.cpp
View File

@ -46,7 +46,6 @@ EXTENSION_PROPERTY_SOURCE(Gui::ViewProviderGroupExtension, Gui::ViewProviderExte
ViewProviderGroupExtension::ViewProviderGroupExtension() : visible(false) ViewProviderGroupExtension::ViewProviderGroupExtension() : visible(false)
{ {
initExtension(ViewProviderGroupExtension::getExtensionClassTypeId()); initExtension(ViewProviderGroupExtension::getExtensionClassTypeId());
} }
ViewProviderGroupExtension::~ViewProviderGroupExtension() ViewProviderGroupExtension::~ViewProviderGroupExtension()
@ -77,7 +76,9 @@ bool ViewProviderGroupExtension::extensionCanDropObjects() const {
bool ViewProviderGroupExtension::extensionCanDropObject(App::DocumentObject* obj) const { bool ViewProviderGroupExtension::extensionCanDropObject(App::DocumentObject* obj) const {
Base::Console().Message("Check ViewProviderGroupExtension"); #ifdef FC_DEBUG
Base::Console().Log("Check ViewProviderGroupExtension");
#endif
auto* group = getExtendedViewProvider()->getObject()->getExtensionByType<App::GroupExtension>(); auto* group = getExtendedViewProvider()->getObject()->getExtensionByType<App::GroupExtension>();
@ -86,9 +87,10 @@ bool ViewProviderGroupExtension::extensionCanDropObject(App::DocumentObject* obj
return false; return false;
//group into group? //group into group?
if (obj->hasExtension(App::GroupExtension::getExtensionClassTypeId())) if (obj->hasExtension(App::GroupExtension::getExtensionClassTypeId())) {
if (group->isChildOf(obj->getExtensionByType<App::GroupExtension>())) if (group->isChildOf(obj->getExtensionByType<App::GroupExtension>()))
return false; return false;
}
//We need to find the correct App extension to ask if this is a supported type, there should only be one //We need to find the correct App extension to ask if this is a supported type, there should only be one
if (group->allowObject(obj)) if (group->allowObject(obj))