Issue #83: some methods rename

diff --git a/src/Model/Model_Data.cpp b/src/Model/Model_Data.cpp
index b384b49d77846c29b47a856eeca3280fe9cc5bac..2530dd5671b15cf28790b67d5daf82d9da0ecf3f 100644 (file)
--- a/src/Model/Model_Data.cpp
+++ b/src/Model/Model_Data.cpp
@@ -89,7 +89,7 @@ void Model_Data::addAttribute(const std::string& theID, const std::string theAtt
   }
 }
 
-boost::shared_ptr<ModelAPI_AttributeDocRef> Model_Data::docRef(const std::string& theID)
+boost::shared_ptr<ModelAPI_AttributeDocRef> Model_Data::document(const std::string& theID)
 {
   std::map<std::string, boost::shared_ptr<ModelAPI_Attribute> >::iterator aFound = myAttrs.find(theID);
   if (aFound == myAttrs.end()) {

diff --git a/src/Model/Model_Data.h b/src/Model/Model_Data.h
index f6a82a09906f80e170dfbf503302a240478dc431..94490d4aa6e3542842df307cb3b33d05de60a123 100644 (file)
--- a/src/Model/Model_Data.h
+++ b/src/Model/Model_Data.h
@@ -63,7 +63,7 @@ class Model_Data : public ModelAPI_Data
   /// Defines the name of the feature visible by the user in the object browser
   MODEL_EXPORT virtual void setName(const std::string& theName);
   /// Returns the attribute that references to another document
-  MODEL_EXPORT virtual boost::shared_ptr<ModelAPI_AttributeDocRef> docRef(const std::string& theID);
+  MODEL_EXPORT virtual boost::shared_ptr<ModelAPI_AttributeDocRef> document(const std::string& theID);
   /// Returns the attribute that contains real value with double precision
   MODEL_EXPORT virtual boost::shared_ptr<ModelAPI_AttributeDouble> real(const std::string& theID);
   /// Returns the attribute that contains integer value

diff --git a/src/Model/Model_ResultPart.cpp b/src/Model/Model_ResultPart.cpp
index 6767ffee65d7e056b2edb51297941cc6963cd9f0..98319c4749f33fc524bba9e5ee00662d21a87043 100644 (file)
--- a/src/Model/Model_ResultPart.cpp
+++ b/src/Model/Model_ResultPart.cpp
@@ -9,7 +9,7 @@
 
 boost::shared_ptr<ModelAPI_Document> Model_ResultPart::partDoc()
 {
-  return data()->docRef("PartDocument")->value();
+  return data()->document("PartDocument")->value();
 }
 
 boost::shared_ptr<ModelAPI_Feature> Model_ResultPart::owner()
@@ -31,7 +31,7 @@ void Model_ResultPart::setData(boost::shared_ptr<ModelAPI_Data> theData)
 
 void Model_ResultPart::activate()
 {
-  boost::shared_ptr<ModelAPI_AttributeDocRef> aDocRef = data()->docRef(DOC_REF());
+  boost::shared_ptr<ModelAPI_AttributeDocRef> aDocRef = data()->document(DOC_REF());
   
   if (!aDocRef->value()) {  // create (or open) a document if it is not yet created
     boost::shared_ptr<ModelAPI_Document> aDoc = document()->subDocument(data()->name());

diff --git a/src/ModelAPI/ModelAPI_Data.h b/src/ModelAPI/ModelAPI_Data.h
index 2daf2302b7e52dbe9f01a6db68d5857b646e9566..36838a6efc05f471da4ea4549886bd04cb719ee0 100644 (file)
--- a/src/ModelAPI/ModelAPI_Data.h
+++ b/src/ModelAPI/ModelAPI_Data.h
@@ -39,7 +39,7 @@ class MODELAPI_EXPORT ModelAPI_Data
   virtual void setName(const std::string& theName) = 0;
 
   /// Returns the attribute that references to another document
-  virtual boost::shared_ptr<ModelAPI_AttributeDocRef> docRef(const std::string& theID) = 0;
+  virtual boost::shared_ptr<ModelAPI_AttributeDocRef> document(const std::string& theID) = 0;
   /// Returns the attribute that contains real value with double precision
   virtual boost::shared_ptr<ModelAPI_AttributeDouble> real(const std::string& theID) = 0;
   /// Returns the attribute that contains integer value

diff --git a/src/PartSetPlugin/PartSetPlugin_Duplicate.cpp b/src/PartSetPlugin/PartSetPlugin_Duplicate.cpp
index b8919426b1f77c567129fdc3c7f980a6a4a11c2c..a2f006fa42880133ca20e36835d2a5f534517cf3 100644 (file)
--- a/src/PartSetPlugin/PartSetPlugin_Duplicate.cpp
+++ b/src/PartSetPlugin/PartSetPlugin_Duplicate.cpp
@@ -26,14 +26,14 @@ void PartSetPlugin_Duplicate::initAttributes()
   for (int a = aRoot->size(getGroup()) - 1; a >= 0; a--) {
     aSource = boost::dynamic_pointer_cast<ModelAPI_ResultPart>(aRoot->object(getGroup(), a));
     if (aSource && aSource->data()
-        && aSource->data()->docRef(ModelAPI_ResultPart::DOC_REF())->value()
+        && aSource->data()->document(ModelAPI_ResultPart::DOC_REF())->value()
             == aPManager->activeDocument())
       break;
     aSource.reset();
   }
   if (aSource) {
     boost::shared_ptr<ModelAPI_Document> aCopy = aPManager->copy(
-        aSource->data()->docRef(ModelAPI_ResultPart::DOC_REF())->value(), data()->name());
+        aSource->data()->document(ModelAPI_ResultPart::DOC_REF())->value(), data()->name());
     data()->refattr(ORIGIN_REF())->setObject(aSource);
   }
 }

diff --git a/src/PartSetPlugin/PartSetPlugin_Remove.cpp b/src/PartSetPlugin/PartSetPlugin_Remove.cpp
index f764ddc485f5137f81f64dab577f40a589edef97..5494949d8337448b660da84d563b46943b42ff1a 100644 (file)
--- a/src/PartSetPlugin/PartSetPlugin_Remove.cpp
+++ b/src/PartSetPlugin/PartSetPlugin_Remove.cpp
@@ -19,12 +19,12 @@ void PartSetPlugin_Remove::execute()
     ResultPartPtr aPart = boost::dynamic_pointer_cast<ModelAPI_ResultPart>(
         aRoot->object(ModelAPI_ResultPart::group(), a));
     if (aPart
-        && aPart->data()->docRef(ModelAPI_ResultPart::DOC_REF())->value()
+        && aPart->data()->document(ModelAPI_ResultPart::DOC_REF())->value()
             == aPManager->activeDocument()) {
       FeaturePtr aFeature = aRoot->feature(aPart);
       if (aFeature) {
         // do remove
-        aPart->data()->docRef(ModelAPI_ResultPart::DOC_REF())->value()->close();
+        aPart->data()->document(ModelAPI_ResultPart::DOC_REF())->value()->close();
         aRoot->removeFeature(aFeature);
       }
     }