From 712966ff50aa991d1633cf58fbde82c148d5ad2f Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 13 Sep 2017 18:57:38 +0200 Subject: [PATCH] rename method from remObject to removeObject to be more readable --- src/App/Document.cpp | 8 ++++---- src/App/Document.h | 4 ++-- src/App/DocumentPyImp.cpp | 2 +- src/App/GroupExtension.cpp | 4 ++-- src/App/Origin.cpp | 2 +- src/App/OriginGroupExtension.cpp | 2 +- src/App/Transactions.cpp | 2 +- src/Mod/Drawing/Gui/TaskOrthoViews.cpp | 2 +- src/Mod/Fem/Gui/TaskFemConstraint.cpp | 2 +- src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp | 2 +- src/Mod/Sandbox/App/DocumentProtector.cpp | 2 +- src/Mod/TechDraw/App/DrawProjGroup.cpp | 2 +- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/App/Document.cpp b/src/App/Document.cpp index 2562dc67cd..4e731263d4 100644 --- a/src/App/Document.cpp +++ b/src/App/Document.cpp @@ -2589,7 +2589,7 @@ void Document::_addObject(DocumentObject* pcObject, const char* pObjectName) } /// Remove an object out of the document -void Document::remObject(const char* sName) +void Document::removeObject(const char* sName) { std::map::iterator pos = d->objectMap.find(sName); @@ -2669,9 +2669,9 @@ void Document::remObject(const char* sName) } /// Remove an object out of the document (internal) -void Document::_remObject(DocumentObject* pcObject) +void Document::_removeObject(DocumentObject* pcObject) { - // TODO Refactoring: share code with Document::remObject() (2015-09-01, Fat-Zer) + // TODO Refactoring: share code with Document::removeObject() (2015-09-01, Fat-Zer) _checkTransaction(pcObject); std::map::iterator pos = d->objectMap.find(pcObject->getNameInDocument()); @@ -2833,7 +2833,7 @@ DocumentObject* Document::moveObject(DocumentObject* obj, bool recursive) // all object of the other document that refer to this object must be nullified that->breakDependency(obj, false); std::string objname = getUniqueObjectName(obj->getNameInDocument()); - that->_remObject(obj); + that->_removeObject(obj); this->_addObject(obj, objname.c_str()); obj->setDocument(this); diff --git a/src/App/Document.h b/src/App/Document.h index 5c2197c217..02e37316f5 100644 --- a/src/App/Document.h +++ b/src/App/Document.h @@ -192,7 +192,7 @@ public: */ std::vectoraddObjects(const char* sType, const std::vector& objectNames, bool isNew=true); /// Remove a feature out of the document - void remObject(const char* sName); + void removeObject(const char* sName); /** Add an existing feature with sName (ASCII) to this document and set it active. * Unicode names are set through the Label property. * This is an overloaded function of the function above and can be used to create @@ -353,7 +353,7 @@ protected: /// Construction Document(void); - void _remObject(DocumentObject* pcObject); + void _removeObject(DocumentObject* pcObject); void _addObject(DocumentObject* pcObject, const char* pObjectName); /// checks if a valid transaction is open void _checkTransaction(DocumentObject* pcObject); diff --git a/src/App/DocumentPyImp.cpp b/src/App/DocumentPyImp.cpp index 506c31cfc0..bfcbf04b71 100644 --- a/src/App/DocumentPyImp.cpp +++ b/src/App/DocumentPyImp.cpp @@ -279,7 +279,7 @@ PyObject* DocumentPy::removeObject(PyObject *args) DocumentObject *pcFtr = getDocumentPtr()->getObject(sName); if(pcFtr) { - getDocumentPtr()->remObject( sName ); + getDocumentPtr()->removeObject( sName ); Py_Return; } else { std::stringstream str; diff --git a/src/App/GroupExtension.cpp b/src/App/GroupExtension.cpp index 9401320333..ec9b56edec 100644 --- a/src/App/GroupExtension.cpp +++ b/src/App/GroupExtension.cpp @@ -53,7 +53,7 @@ DocumentObject* GroupExtension::addObject(const char* sType, const char* pObject { DocumentObject* obj = getExtendedObject()->getDocument()->addObject(sType, pObjectName); if(!allowObject(obj)) { - getExtendedObject()->getDocument()->remObject(obj->getNameInDocument()); + getExtendedObject()->getDocument()->removeObject(obj->getNameInDocument()); return nullptr; } if (obj) addObject(obj); @@ -160,7 +160,7 @@ void GroupExtension::removeObjectFromDocument(DocumentObject* obj) grp->removeObjectsFromDocument(); } - getExtendedObject()->getDocument()->remObject(obj->getNameInDocument()); + getExtendedObject()->getDocument()->removeObject(obj->getNameInDocument()); } DocumentObject *GroupExtension::getObject(const char *Name) const diff --git a/src/App/Origin.cpp b/src/App/Origin.cpp index 892a5e453e..b626987180 100644 --- a/src/App/Origin.cpp +++ b/src/App/Origin.cpp @@ -175,7 +175,7 @@ void Origin::unsetupObject () { const auto &objsLnk = OriginFeatures.getValues (); if ( std::find(objsLnk.begin(), objsLnk.end(), obj) != objsLnk.end()) { if ( ! obj->isRemoving() ) { - obj->getDocument()->remObject (obj->getNameInDocument()); + obj->getDocument()->removeObject (obj->getNameInDocument()); } } } diff --git a/src/App/OriginGroupExtension.cpp b/src/App/OriginGroupExtension.cpp index 31e3de33df..b746067a1e 100644 --- a/src/App/OriginGroupExtension.cpp +++ b/src/App/OriginGroupExtension.cpp @@ -120,7 +120,7 @@ void OriginGroupExtension::onExtendedSetupObject () { void OriginGroupExtension::onExtendedUnsetupObject () { App::DocumentObject *origin = Origin.getValue (); if (origin && !origin->isRemoving ()) { - origin->getDocument ()->remObject (origin->getNameInDocument()); + origin->getDocument ()->removeObject (origin->getNameInDocument()); } GeoFeatureGroupExtension::onExtendedUnsetupObject (); diff --git a/src/App/Transactions.cpp b/src/App/Transactions.cpp index f25d517531..64dc4fd2c7 100644 --- a/src/App/Transactions.cpp +++ b/src/App/Transactions.cpp @@ -349,7 +349,7 @@ void TransactionDocumentObject::applyDel(Document &Doc, TransactionalObject *pcO link->_removeBackLink(obj); // simply filling in the saved object - Doc._remObject(obj); + Doc._removeObject(obj); } } diff --git a/src/Mod/Drawing/Gui/TaskOrthoViews.cpp b/src/Mod/Drawing/Gui/TaskOrthoViews.cpp index 64dc5efcea..24cc53c8b3 100644 --- a/src/Mod/Drawing/Gui/TaskOrthoViews.cpp +++ b/src/Mod/Drawing/Gui/TaskOrthoViews.cpp @@ -184,7 +184,7 @@ void orthoview::set_data(int r_x, int r_y) void orthoview::deleteme() { - parent_doc->remObject(myname.c_str()); + parent_doc->removeObject(myname.c_str()); } void orthoview::setPos(float px, float py) diff --git a/src/Mod/Fem/Gui/TaskFemConstraint.cpp b/src/Mod/Fem/Gui/TaskFemConstraint.cpp index b7f9a96e57..fdd1b32286 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraint.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraint.cpp @@ -170,7 +170,7 @@ void TaskFemConstraint::onButtonWizCancel() { Fem::Constraint* pcConstraint = static_cast(ConstraintView->getObject()); if (pcConstraint != NULL) - pcConstraint->getDocument()->remObject(pcConstraint->getNameInDocument()); + pcConstraint->getDocument()->removeObject(pcConstraint->getNameInDocument()); onButtonWizOk(); } diff --git a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp index a5ad0ad127..c5f56eb576 100644 --- a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp @@ -209,7 +209,7 @@ void TaskMultiTransformParameters::onTransformDelete() std::vector transformFeatures = pcMultiTransform->Transformations.getValues(); App::DocumentObject* feature = transformFeatures[row]; - pcMultiTransform->getDocument()->remObject(feature->getNameInDocument()); + pcMultiTransform->getDocument()->removeObject(feature->getNameInDocument()); closeSubTask(); transformFeatures.erase(transformFeatures.begin() + row); diff --git a/src/Mod/Sandbox/App/DocumentProtector.cpp b/src/Mod/Sandbox/App/DocumentProtector.cpp index 1ec2c055f4..d1ba0f11c7 100644 --- a/src/Mod/Sandbox/App/DocumentProtector.cpp +++ b/src/Mod/Sandbox/App/DocumentProtector.cpp @@ -95,7 +95,7 @@ public: } void execute() { - doc->remObject(this->name.c_str()); + doc->removeObject(this->name.c_str()); } protected: diff --git a/src/Mod/TechDraw/App/DrawProjGroup.cpp b/src/Mod/TechDraw/App/DrawProjGroup.cpp index c9720de89c..7b076331f1 100644 --- a/src/Mod/TechDraw/App/DrawProjGroup.cpp +++ b/src/Mod/TechDraw/App/DrawProjGroup.cpp @@ -424,7 +424,7 @@ int DrawProjGroup::removeProjection(const char *viewProjType) if( projPtr ) { if ( strcmp(viewProjType, projPtr->Type.getValueAsString()) == 0 ) { removeView(projPtr); // Remove from collection - getDocument()->remObject( it->getNameInDocument() ); // Remove from the document + getDocument()->removeObject( it->getNameInDocument() ); // Remove from the document moveToCentre(); return Views.getValues().size(); }