Join modifications from branch BR_DEBUG_3_2_0b1

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_XmlHandler.h

diff --git a/src/SMESHGUI/SMESHGUI_XmlHandler.h b/src/SMESHGUI/SMESHGUI_XmlHandler.h
index 363d9830c80b2d43ee842cf879b561464081d9db..79ad43b38fb6d0e1fd5f5e9924f9cdbeb368e0e1 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_XmlHandler.h
+++ b/src/SMESHGUI/SMESHGUI_XmlHandler.h
@@ -16,7 +16,7 @@
 //  License along with this library; if not, write to the Free Software 
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 // 
-//  See http://www.salome-platform.org or email : webmaster.salome@opencascade.org
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -25,10 +25,14 @@
 //  Module : SMESH
 //  $Header$
 
-#include "SMESHGUI.h"
+#ifndef SMESHGUI_XmlHandler_HeaderFile
+#define SMESHGUI_XmlHandler_HeaderFile
+
+#include "SMESHGUI_Hypotheses.h"
 
 #include <qxml.h>
 #include <map>
+#include <list>
 
 class SMESHGUI_XmlHandler : public QXmlDefaultHandler
 {
@@ -47,8 +51,10 @@ class SMESHGUI_XmlHandler : public QXmlDefaultHandler
   bool fatalError   (const QXmlParseException& exception);
 
  public:
-  map<string, HypothesisData*> myHypothesesMap;
-  map<string, HypothesisData*> myAlgorithmsMap;
+  std::map<std::string, HypothesisData*> myHypothesesMap;
+  std::map<std::string, HypothesisData*> myAlgorithmsMap;
+
+  std::list<HypothesesSet*> myListOfHypothesesSets;
 
  private:
   QString myErrorProt;
@@ -56,3 +62,6 @@ class SMESHGUI_XmlHandler : public QXmlDefaultHandler
   QString myServerLib;
   QString myClientLib;
 };
+
+
+#endif