Addition of autolocker class to avoid deadlocks on throw.

[modules/yacs.git] / src / genericgui / GuiEditor.hxx

diff --git a/src/genericgui/GuiEditor.hxx b/src/genericgui/GuiEditor.hxx
index 0c92b8ae6aeba3683339c42fec821a18ffe50f5c..627993b8165654a90e38244f9c0fa1de2b55a1cc 100644 (file)
--- a/src/genericgui/GuiEditor.hxx
+++ b/src/genericgui/GuiEditor.hxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2006-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2006-2014  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -35,6 +35,7 @@ namespace YACS
   namespace HMI
   {
     class Subject;
+    class SubjectNode;
     class SubjectElementaryNode;
     class SubjectComposedNode;
     class SubjectDataPort;
@@ -50,7 +51,7 @@ namespace YACS
                                  SubjectComposedNode *cnode,
                                  bool createNewComponentInstance);
       void AddTypeFromCatalog(const ItemMimeData* myData);
-      void CreateNode(std::string typeNode);
+      SubjectNode* CreateNode(std::string typeNode);
       void CreateBloc();
       void CreateForLoop();
       void CreateForEachLoop(std::string type );
@@ -79,6 +80,8 @@ namespace YACS
       void CopySubject();
       void PasteSubject();
       void PutSubjectInBloc();
+      std::string PutGraphInBloc();
+      void PutGraphInNode(std::string typeNode);
       void shrinkExpand();
       void rebuildLinks();
       void arrangeNodes(bool isRecursive);
@@ -88,7 +91,7 @@ namespace YACS
       QString asciiFilter(const QString & name);
 
     protected:
-      void _createNode(YACS::ENGINE::Catalog* catalog,
+      SubjectNode* _createNode(YACS::ENGINE::Catalog* catalog,
                        SubjectComposedNode *cnode,
                        std::string service,
                        std::string compoName,