kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

improve whitespaces

Browse Source
This commit is contained in:
wmayer
2018-10-18 23:31:55 +02:00
parent 1e6818b6fb
commit 3a6afac8b2
4 changed files with 87 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/App/DynamicProperty.cpp
View File

@@ -56,7 +56,7 @@ void DynamicProperty::getPropertyList(std::vector<Property*> &List) const
static_cast<App::ExtensionContainer*>(this->pc)->ExtensionContainer::getPropertyList(List);
else
this->pc->PropertyContainer::getPropertyList(List);
for (std::map<std::string,PropData>::const_iterator it = props.begin(); it != props.end(); ++it)
List.push_back(it->second.property);
}
@@ -68,7 +68,7 @@ void DynamicProperty::getPropertyMap(std::map<std::string,Property*> &Map) const
static_cast<App::ExtensionContainer*>(this->pc)->ExtensionContainer::getPropertyMap(Map);
else
this->pc->PropertyContainer::getPropertyMap(Map);
for (std::map<std::string,PropData>::const_iterator it = props.begin(); it != props.end(); ++it)
Map[it->first] = it->second.property;
}
@@ -78,10 +78,10 @@ Property *DynamicProperty::getPropertyByName(const char* name) const
std::map<std::string,PropData>::const_iterator it = props.find(name);
if (it != props.end())
return it->second.property;
if(this->pc->isDerivedFrom(App::ExtensionContainer::getClassTypeId()))
if (this->pc->isDerivedFrom(App::ExtensionContainer::getClassTypeId()))
return static_cast<App::ExtensionContainer*>(this->pc)->ExtensionContainer::getPropertyByName(name);
return this->pc->PropertyContainer::getPropertyByName(name);
}
@@ -126,10 +126,10 @@ const char* DynamicProperty::getPropertyName(const Property* prop) const
if (it->second.property == prop)
return it->first.c_str();
}
if(this->pc->isDerivedFrom(App::ExtensionContainer::getClassTypeId()))
if (this->pc->isDerivedFrom(App::ExtensionContainer::getClassTypeId()))
return static_cast<App::ExtensionContainer*>(this->pc)->ExtensionContainer::getPropertyName(prop);
return this->pc->PropertyContainer::getPropertyName(prop);
}
@@ -156,10 +156,10 @@ short DynamicProperty::getPropertyType(const Property* prop) const
return attr;
}
}
if(this->pc->isDerivedFrom(App::ExtensionContainer::getClassTypeId()))
if (this->pc->isDerivedFrom(App::ExtensionContainer::getClassTypeId()))
return static_cast<App::ExtensionContainer*>(this->pc)->ExtensionContainer::getPropertyType(prop);
return this->pc->PropertyContainer::getPropertyType(prop);
}
@@ -174,10 +174,10 @@ short DynamicProperty::getPropertyType(const char *name) const
attr |= Prop_ReadOnly;
return attr;
}
if(this->pc->isDerivedFrom(App::ExtensionContainer::getClassTypeId()))
if (this->pc->isDerivedFrom(App::ExtensionContainer::getClassTypeId()))
return static_cast<App::ExtensionContainer*>(this->pc)->ExtensionContainer::getPropertyType(name);
return this->pc->PropertyContainer::getPropertyType(name);
}
@@ -187,10 +187,10 @@ const char* DynamicProperty::getPropertyGroup(const Property* prop) const
if (it->second.property == prop)
return it->second.group.c_str();
}
if(this->pc->isDerivedFrom(App::ExtensionContainer::getClassTypeId()))
if (this->pc->isDerivedFrom(App::ExtensionContainer::getClassTypeId()))
return static_cast<App::ExtensionContainer*>(this->pc)->ExtensionContainer::getPropertyGroup(prop);
return this->pc->PropertyContainer::getPropertyGroup(prop);
}
@@ -199,10 +199,10 @@ const char* DynamicProperty::getPropertyGroup(const char *name) const
std::map<std::string,PropData>::const_iterator it = props.find(name);
if (it != props.end())
return it->second.group.c_str();
if(this->pc->isDerivedFrom(App::ExtensionContainer::getClassTypeId()))
if (this->pc->isDerivedFrom(App::ExtensionContainer::getClassTypeId()))
return static_cast<App::ExtensionContainer*>(this->pc)->ExtensionContainer::getPropertyGroup(name);
return this->pc->PropertyContainer::getPropertyGroup(name);
}
@@ -212,10 +212,10 @@ const char* DynamicProperty::getPropertyDocumentation(const Property* prop) cons
if (it->second.property == prop)
return it->second.doc.c_str();
}
if(this->pc->isDerivedFrom(App::ExtensionContainer::getClassTypeId()))
if (this->pc->isDerivedFrom(App::ExtensionContainer::getClassTypeId()))
return static_cast<App::ExtensionContainer*>(this->pc)->ExtensionContainer::getPropertyDocumentation(prop);
return this->pc->PropertyContainer::getPropertyDocumentation(prop);
}
@@ -224,10 +224,10 @@ const char* DynamicProperty::getPropertyDocumentation(const char *name) const
std::map<std::string,PropData>::const_iterator it = props.find(name);
if (it != props.end())
return it->second.doc.c_str();
if(this->pc->isDerivedFrom(App::ExtensionContainer::getClassTypeId()))
if (this->pc->isDerivedFrom(App::ExtensionContainer::getClassTypeId()))
return static_cast<App::ExtensionContainer*>(this->pc)->ExtensionContainer::getPropertyDocumentation(name);
return this->pc->PropertyContainer::getPropertyDocumentation(name);
}
@@ -308,9 +308,9 @@ void DynamicProperty::Save (Base::Writer &writer) const
{
//extensions must be saved first, as they need to be read and initialised before properties (as
//they have their own properties which they need to handle on restore)
if(this->pc->isDerivedFrom(App::ExtensionContainer::getClassTypeId()))
if (this->pc->isDerivedFrom(App::ExtensionContainer::getClassTypeId()))
static_cast<App::ExtensionContainer*>(this->pc)->saveExtensions(writer);
std::map<std::string,Property*> Map;
getPropertyMap(Map);
@@ -370,9 +370,9 @@ void DynamicProperty::Save (Base::Writer &writer) const
void DynamicProperty::Restore(Base::XMLReader &reader)
{
//first all extensions must be initialised so that they can handle their properties
if(this->pc->isDerivedFrom(App::ExtensionContainer::getClassTypeId()))
if (this->pc->isDerivedFrom(App::ExtensionContainer::getClassTypeId()))
static_cast<App::ExtensionContainer*>(this->pc)->restoreExtensions(reader);
reader.readElement("Properties");
int Cnt = reader.getAttributeAsInteger("Count");

2
src/App/GeoFeature.cpp
View File

@@ -59,7 +59,7 @@ void GeoFeature::transformPlacement(const Base::Placement &transform)
Base::Placement GeoFeature::globalPlacement() const
{
auto* group = GeoFeatureGroupExtension::getGroupOfObject(this);
if(group) {
if (group) {
auto ext = group->getExtensionByType<GeoFeatureGroupExtension>();
return ext->globalGroupPlacement() * Placement.getValue();
}

108
src/Gui/ViewProvider.cpp
View File

@@ -337,10 +337,10 @@ std::vector<std::string> ViewProvider::getDisplayMaskModes() const
void ViewProvider::setDisplayMode(const char* ModeName)
{
_sCurrentMode = ModeName;
//infom the exteensions
auto vector = getExtensionsDerivedFromType<Gui::ViewProviderExtension>();
for(Gui::ViewProviderExtension* ext : vector)
for (Gui::ViewProviderExtension* ext : vector)
ext->extensionSetDisplayMode(ModeName);
}
@@ -353,7 +353,7 @@ vector<std::string> ViewProvider::getDisplayModes(void) const {
std::vector< std::string > modes;
auto vector = getExtensionsDerivedFromType<Gui::ViewProviderExtension>();
for(Gui::ViewProviderExtension* ext : vector) {
for (Gui::ViewProviderExtension* ext : vector) {
auto extModes = ext->extensionGetDisplayModes();
modes.insert( modes.end(), extModes.begin(), extModes.end() );
}
@@ -371,17 +371,17 @@ void ViewProvider::hide(void)
//tell extensions that we hide
auto vector = getExtensionsDerivedFromType<Gui::ViewProviderExtension>();
for(Gui::ViewProviderExtension* ext : vector)
for (Gui::ViewProviderExtension* ext : vector)
ext->extensionHide();
}
void ViewProvider::show(void)
{
setModeSwitch();
//tell extensions that we show
auto vector = getExtensionsDerivedFromType<Gui::ViewProviderExtension>();
for(Gui::ViewProviderExtension* ext : vector)
for (Gui::ViewProviderExtension* ext : vector)
ext->extensionShow();
}
@@ -625,10 +625,11 @@ bool ViewProvider::mouseButtonPressed(int button, bool pressed,
return false;
}
bool ViewProvider::onDelete(const vector< string >& subNames) {
bool ViewProvider::onDelete(const vector< string >& subNames)
{
bool del = true;
auto vector = getExtensionsDerivedFromType<Gui::ViewProviderExtension>();
for(Gui::ViewProviderExtension* ext : vector)
for (Gui::ViewProviderExtension* ext : vector)
del &= ext->extensionOnDelete(subNames);
return del;
@@ -639,33 +640,33 @@ bool ViewProvider::canDelete(App::DocumentObject*) const
return false;
}
bool ViewProvider::canDragObject(App::DocumentObject* obj) const {
bool ViewProvider::canDragObject(App::DocumentObject* obj) const
{
auto vector = getExtensionsDerivedFromType<Gui::ViewProviderExtension>();
for(Gui::ViewProviderExtension* ext : vector) {
if(ext->extensionCanDragObject(obj))
for (Gui::ViewProviderExtension* ext : vector) {
if (ext->extensionCanDragObject(obj))
return true;
}
return false;
}
bool ViewProvider::canDragObjects() const {
bool ViewProvider::canDragObjects() const
{
auto vector = getExtensionsDerivedFromType<Gui::ViewProviderExtension>();
for(Gui::ViewProviderExtension* ext : vector) {
if(ext->extensionCanDragObjects())
for (Gui::ViewProviderExtension* ext : vector) {
if (ext->extensionCanDragObjects())
return true;
}
return false;
}
void ViewProvider::dragObject(App::DocumentObject* obj) {
void ViewProvider::dragObject(App::DocumentObject* obj)
{
auto vector = getExtensionsDerivedFromType<Gui::ViewProviderExtension>();
for(Gui::ViewProviderExtension* ext : vector) {
if(ext->extensionCanDragObject(obj)) {
for (Gui::ViewProviderExtension* ext : vector) {
if (ext->extensionCanDragObject(obj)) {
ext->extensionDragObject(obj);
return;
}
@@ -674,18 +675,17 @@ void ViewProvider::dragObject(App::DocumentObject* obj) {
throw Base::RuntimeError("ViewProvider::dragObject: no extension for dragging given object available.");
}
bool ViewProvider::canDropObject(App::DocumentObject* obj) const {
bool ViewProvider::canDropObject(App::DocumentObject* obj) const
{
auto vector = getExtensionsDerivedFromType<Gui::ViewProviderExtension>();
#if FC_DEBUG
Base::Console().Log("Check extensions for drop\n");
#endif
for(Gui::ViewProviderExtension* ext : vector){
for (Gui::ViewProviderExtension* ext : vector){
#if FC_DEBUG
Base::Console().Log("Check extensions %s\n", ext->name().c_str());
#endif
if(ext->extensionCanDropObject(obj))
if (ext->extensionCanDropObject(obj))
return true;
}
@@ -702,11 +702,11 @@ bool ViewProvider::canDropObjects() const {
return false;
}
void ViewProvider::dropObject(App::DocumentObject* obj) {
void ViewProvider::dropObject(App::DocumentObject* obj)
{
auto vector = getExtensionsDerivedFromType<Gui::ViewProviderExtension>();
for(Gui::ViewProviderExtension* ext : vector) {
if(ext->extensionCanDropObject(obj)) {
for (Gui::ViewProviderExtension* ext : vector) {
if (ext->extensionCanDropObject(obj)) {
ext->extensionDropObject(obj);
return;
}
@@ -715,72 +715,72 @@ void ViewProvider::dropObject(App::DocumentObject* obj) {
throw Base::RuntimeError("ViewProvider::dropObject: no extension for dropping given object available.");
}
void ViewProvider::Restore(Base::XMLReader& reader) {
void ViewProvider::Restore(Base::XMLReader& reader)
{
setStatus(Gui::isRestoring, true);
TransactionalObject::Restore(reader);
setStatus(Gui::isRestoring, false);
}
void ViewProvider::updateData(const App::Property* prop) {
void ViewProvider::updateData(const App::Property* prop)
{
auto vector = getExtensionsDerivedFromType<Gui::ViewProviderExtension>();
for(Gui::ViewProviderExtension* ext : vector)
for (Gui::ViewProviderExtension* ext : vector)
ext->extensionUpdateData(prop);
}
SoSeparator* ViewProvider::getBackRoot(void) const {
SoSeparator* ViewProvider::getBackRoot(void) const
{
auto vector = getExtensionsDerivedFromType<Gui::ViewProviderExtension>();
for(Gui::ViewProviderExtension* ext : vector) {
for (Gui::ViewProviderExtension* ext : vector) {
auto* node = ext->extensionGetBackRoot();
if(node)
if (node)
return node;
}
return nullptr;
}
SoGroup* ViewProvider::getChildRoot(void) const {
SoGroup* ViewProvider::getChildRoot(void) const
{
auto vector = getExtensionsDerivedFromType<Gui::ViewProviderExtension>();
for(Gui::ViewProviderExtension* ext : vector) {
for (Gui::ViewProviderExtension* ext : vector) {
auto* node = ext->extensionGetChildRoot();
if(node)
if (node)
return node;
}
return nullptr;
}
SoSeparator* ViewProvider::getFrontRoot(void) const {
SoSeparator* ViewProvider::getFrontRoot(void) const
{
auto vector = getExtensionsDerivedFromType<Gui::ViewProviderExtension>();
for(Gui::ViewProviderExtension* ext : vector) {
for (Gui::ViewProviderExtension* ext : vector) {
auto* node = ext->extensionGetFrontRoot();
if(node)
if (node)
return node;
}
return nullptr;
}
std::vector< App::DocumentObject* > ViewProvider::claimChildren(void) const {
std::vector< App::DocumentObject* > ViewProvider::claimChildren(void) const
{
std::vector< App::DocumentObject* > vec;
auto vector = getExtensionsDerivedFromType<Gui::ViewProviderExtension>();
for(Gui::ViewProviderExtension* ext : vector) {
for (Gui::ViewProviderExtension* ext : vector) {
std::vector< App::DocumentObject* > nvec = ext->extensionClaimChildren();
if(!nvec.empty())
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* > ViewProvider::claimChildren3D(void) const
{
std::vector< App::DocumentObject* > vec;
auto vector = getExtensionsDerivedFromType<Gui::ViewProviderExtension>();
for(Gui::ViewProviderExtension* ext : vector) {
for (Gui::ViewProviderExtension* ext : vector) {
std::vector< App::DocumentObject* > nvec = ext->extensionClaimChildren3D();
if(!nvec.empty())
if (!nvec.empty())
vec.insert(std::end(vec), std::begin(nvec), std::end(nvec));
}
return vec;

4
src/Gui/ViewProviderDocumentObject.cpp
View File

@@ -197,10 +197,10 @@ void ViewProviderDocumentObject::attach(App::DocumentObject *pcObj)
const char* defmode = this->getDefaultDisplayMode();
if (defmode)
DisplayMode.setValue(defmode);
//attach the extensions
auto vector = getExtensionsDerivedFromType<Gui::ViewProviderExtension>();
for(Gui::ViewProviderExtension* ext : vector)
for (Gui::ViewProviderExtension* ext : vector)
ext->extensionAttach(pcObj);
}