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

Fix rebase errors

Browse Source
This commit is contained in:
Stefan Tröger 2016-09-22 20:03:45 +02:00 committed by wmayer
parent 790413fdce
commit a79b48bbcc
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Gui/ViewProvider.cpp
View File

@ -656,3 +656,27 @@ SoSeparator* ViewProvider::getFrontRoot(void) const {
}
return nullptr;
}
std::vector< App::DocumentObject* > ViewProvider::claimChildren(void) const {
std::vector< App::DocumentObject* > vec;
auto vector = getExtensionsDerivedFromType<Gui::ViewProviderExtension>();
for(Gui::ViewProviderExtension* ext : vector) {
std::vector< App::DocumentObject* > nvec = ext->extensionClaimChildren();
if(!nvec.empty())
vec.insert(std::end(vec), std::begin(nvec), std::end(nvec));
}
return vec;
}
std::vector< App::DocumentObject* > ViewProvider::claimChildren3D(void) const {
std::vector< App::DocumentObject* > vec;
auto vector = getExtensionsDerivedFromType<Gui::ViewProviderExtension>();
for(Gui::ViewProviderExtension* ext : vector) {
std::vector< App::DocumentObject* > nvec = ext->extensionClaimChildren3D();
if(!nvec.empty())
vec.insert(std::end(vec), std::begin(nvec), std::end(nvec));
}
return vec;
}

5
src/Gui/ViewProvider.h
View File

@ -139,10 +139,7 @@ public:
* @param subNames list of selected subelements
* @return true if the deletion is approoved by the view provider.
*/
virtual bool onDelete(const std::vector<std::string> &subNames) {
(void)subNames;
return true;
}
virtual bool onDelete(const std::vector<std::string> &subNames);
//@}

2
src/Gui/ViewProviderDocumentObjectGroup.cpp
View File

@ -65,8 +65,6 @@ ViewProviderDocumentObjectGroup::~ViewProviderDocumentObjectGroup()
{
}
#else
Q_UNUSED(prop);
std::vector<std::string> ViewProviderDocumentObjectGroup::getDisplayModes(void) const
{
// empty