Merge from V6_main_20120808 08Aug12

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

diff --git a/src/SMESHGUI/SMESHGUI_XmlHandler.h b/src/SMESHGUI/SMESHGUI_XmlHandler.h
index 09db4421922a37e5fc6bd8debaaecb310dc2f35f..813938ddfaba187eb777ad7030d645b66d4d867e 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_XmlHandler.h
+++ b/src/SMESHGUI/SMESHGUI_XmlHandler.h
@@ -1,24 +1,25 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  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.
+// 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.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// 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.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // SMESH SMESHGUI : reading of xml file with list of available hypotheses and algorithms
 // File   : SMESHGUI_XmlHandler.h
 // Author : Julia DOROVSKIKH, Open CASCADE S.A.S.
@@ -34,6 +35,9 @@
 #include <QMap>
 #include <QList>
 
+//GUI includes
+#include <QtxMap.h>
+
 class HypothesisData;
 class HypothesesSet;
 
@@ -45,7 +49,7 @@ public:
 
   bool     startDocument();
   bool     startElement( const QString&, const QString&, 
-                        const QString&, const QXmlAttributes& );
+                         const QString&, const QXmlAttributes& );
   bool     endElement( const QString&, const QString&, const QString& );
   bool     characters( const QString& ); 
 
@@ -54,8 +58,8 @@ public:
   bool     fatalError( const QXmlParseException& );
 
 public:
-  QMap<QString, HypothesisData*>         myHypothesesMap;
-  QMap<QString, HypothesisData*>         myAlgorithmsMap;
+  IMap<QString, HypothesisData*>         myHypothesesMap;
+  IMap<QString, HypothesisData*>         myAlgorithmsMap;
 
   QList<HypothesesSet*>                  myListOfHypothesesSets;