Porting SMESH module to Qt 4

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

diff --git a/src/SMESHGUI/SMESHGUI_XmlHandler.cxx b/src/SMESHGUI/SMESHGUI_XmlHandler.cxx
index 2fa20059d26c859fecce1bb08d953b199e3a5f65..a0859ceefa660fd6fb1c7ec28a9e0e08674e6012 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_XmlHandler.cxx
+++ b/src/SMESHGUI/SMESHGUI_XmlHandler.cxx
@@ -1,47 +1,38 @@
-//  SMESH SMESHGUI : reading of xml file with list of available hypotheses and algorithms
-//  Copyright (C) 2003  CEA
+// SMESH SMESHGUI : reading of xml file with list of available hypotheses and algorithms
 //
-//  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.
+// Copyright (C) 2003  CEA
 //
-
-//  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 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. 
 //
-//  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
+// 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. 
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// 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
 //
+// File   : SMESHGUI_XmlHandler.cxx
+// Author : Julia DOROVSKIKH, Open CASCADE S.A.S.
 //
-//  File   : SMESHGUI_XmlHandler.cxx
-//  Author : Julia DOROVSKIKH
-//  Module : SMESH
-//  $Header$
 
-#define  INCLUDE_MENUITEM_DEF 
-
-// QT Include
-#include <qfileinfo.h>
-#include <qstringlist.h>
+// SMESH includes
+#include "SMESHGUI_XmlHandler.h"
 
 #include "SMESHGUI.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Desktop.h"
-
-#include "SMESHGUI_XmlHandler.h"
 #include "SMESHGUI_Hypotheses.h"
-#include "SMESHGUI_Utils.h"
 
-#include "utilities.h"
+// SALOME GUI includes
+#include "SUIT_ResourceMgr.h"
 
-using namespace std;
+// SALOME KERNEL includes
+#include <utilities.h>
 
 /*!
   Constructor
@@ -65,7 +56,7 @@ SMESHGUI_XmlHandler::~SMESHGUI_XmlHandler()
 bool SMESHGUI_XmlHandler::startDocument()
 {
   myErrorProt = "";
-  return TRUE;
+  return true;
 }
 
 /*!
@@ -109,7 +100,7 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&,
       QString aResName = atts.value("resources");
       if (aResName != "")
       {
-        MESSAGE("Loading Resources " << aResName);
+        MESSAGE("Loading Resources " << aResName.toLatin1().data());
         SUIT_ResourceMgr* resMgr = SMESHGUI::resourceMgr();
         resMgr->loadTranslator("resources",aResName+"_msg_en.qm");
        resMgr->loadTranslator("resources",aResName+"_images.qm");
@@ -137,10 +128,10 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&,
       
       QString aDimStr = atts.value("dim");
       aDimStr = aDimStr.remove( ' ' );
-      QStringList aDimList = QStringList::split( ',', aDimStr );
+      QStringList aDimList = aDimStr.split( ',', QString::SkipEmptyParts );
       QStringList::iterator anIter;
       bool isOk;
-      QValueList<int> aDim;
+      QList<int> aDim;
       for ( anIter = aDimList.begin(); anIter != aDimList.end(); ++anIter )
       {
         int aVal = (*anIter).toInt( &isOk );
@@ -156,7 +147,7 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&,
         QString aStr = atts.value( name[i] );
         if ( !aStr.isEmpty() ) {
           aStr.remove( ' ' );
-          attr[ i ] = QStringList::split( ',', aStr );
+          attr[ i ] = aStr.split( ',', QString::SkipEmptyParts );
         }
       }
       
@@ -167,11 +158,11 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&,
 
       if (qName == "algorithm")
       {
-        myAlgorithmsMap[(char*)aHypAlType.latin1()] = aHypData;
+        myAlgorithmsMap[aHypAlType.toLatin1().data()] = aHypData;
       }
       else
       {
-        myHypothesesMap[(char*)aHypAlType.latin1()] = aHypData;
+        myHypothesesMap[aHypAlType.toLatin1().data()] = aHypData;
       }
     }
   }
@@ -190,16 +181,16 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&,
         QString aHypos = isHypo ? atts.value("hypos") : atts.value("algos");
         aHypos = aHypos.remove( ' ' );
         QStringList* aHypoList = isHypo ? & aHypoSet->HypoList : & aHypoSet->AlgoList;
-        *aHypoList = QStringList::split( ',', aHypos );
+        *aHypoList = aHypos.split( ',', QString::SkipEmptyParts );
       }
     }
   }
   else
   {
     // error
-    return FALSE;
+    return false;
   }
-  return TRUE;
+  return true;
 }
 
 
@@ -208,7 +199,7 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&,
 */
 bool SMESHGUI_XmlHandler::endElement (const QString&, const QString&, const QString&)
 {
-  return TRUE;
+  return true;
 }
 
 
@@ -218,10 +209,10 @@ bool SMESHGUI_XmlHandler::endElement (const QString&, const QString&, const QStr
 bool SMESHGUI_XmlHandler::characters (const QString& ch)
 {
   // we are not interested in whitespaces
-  QString ch_simplified = ch.simplifyWhiteSpace();
+  QString ch_simplified = ch.simplified();
   if ( ch_simplified.isEmpty() )
-    return TRUE;
-  return TRUE;
+    return true;
+  return true;
 }