Merge branch V7_6_BR

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0866aa355721b2737cdc44dacc8bbea2a1f13b8..fa52f24e51d52e8e613697bfc3ca1311c56c9f29 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,7 @@ SET(${PROJECT_NAME_UC}_MINOR_VERSION 6)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
-SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
+SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
 
 # Find KERNEL (optional)
 # ==============

diff --git a/src/hmi/commandsProc.cxx b/src/hmi/commandsProc.cxx
index 000f9ed595f3019e266d8f2bc0f6a6af95f0de65..72af807d1f7ffe1b850dbcabb27908ad9baf5208 100644 (file)
--- a/src/hmi/commandsProc.cxx
+++ b/src/hmi/commandsProc.cxx
@@ -242,7 +242,7 @@ bool CommandAddNodeFromCatalog::localExecute()
       ComposedNode* father =dynamic_cast<ComposedNode*> (node);
       if (father && nodeToClone)
         {
-          son = nodeToClone->cloneWithoutCompAndContDeepCpy(0);
+          son = nodeToClone->clone(0);
           son->setName(_name);
           service = dynamic_cast<ServiceNode*>(son);
         }
@@ -574,7 +574,7 @@ bool CommandPutInComposedNode::localExecute()
          //create a ComposedNode (type _type) with name _newParent
          YACS::ENGINE::Catalog *catalog = YACS::ENGINE::getSALOMERuntime()->getBuiltinCatalog();
          Node* nodeToClone = catalog->_composednodeMap[_type];
-         composednode = nodeToClone->cloneWithoutCompAndContDeepCpy(0);
+         composednode = nodeToClone->clone(0);
          composednode->setName(_newParent);
          //add the new composednode as child of oldfather
          oldFather->edAddChild(composednode);
@@ -709,7 +709,7 @@ bool CommandCopyNode::localExecute()
         if (!loop->edGetDirectDescendants().empty())
           throw YACS::Exception("Already a node in a new parent of Loop type");
       //_clone = node->cloneWithoutCompAndContDeepCpy(newFather);
-      _clone = node->cloneWithoutCompAndContDeepCpy(0);
+      _clone = node->clone(0);
       if (!_clone)
         throw YACS::Exception("Node cannot be cloned");
       int nodeSuffix = -1;

diff --git a/src/hmi/guiObservers.cxx b/src/hmi/guiObservers.cxx
index cb36a1cb48b81baac68465f449e6e05e908c1d21..786d8f4d0125759517a2903cbdacd4e77a37c35f 100644 (file)
--- a/src/hmi/guiObservers.cxx
+++ b/src/hmi/guiObservers.cxx
@@ -622,7 +622,7 @@ void SubjectNode::registerUndoDestroy()
   Bloc *undoBloc = new Bloc(blocName.str());
   undoProc->edAddChild(undoBloc);
   ComposedNode *newFather = undoBloc;
-  Node *clone = _node->cloneWithoutCompAndContDeepCpy(0);
+  Node *clone = _node->clone(0);
   newFather->edAddChild(clone);
 
   // --- register a CommandCopyNode from undoProc