Unicode support: correct handling of unicode on GUI level

[modules/gui.git] / src / SALOME_PYQT / SALOME_PYQT_GUILight / SALOME_PYQT_DataModelLight.cxx

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.cxx
index d08b550b8f0dc0b31b3a43f49ff915b8c0e460f5..5163fcc14e09f13b3db113f233b7addb4bfa6d82 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -70,7 +70,7 @@ bool SALOME_PYQT_DataModelLight::open( const QString& theURL, CAM_Study* study,
 
   setModified( false );
   
-  return aModule->load(theListOfFiles);
+  return aModule->load(theListOfFiles, theURL);
   
 }
 
@@ -91,11 +91,11 @@ bool SALOME_PYQT_DataModelLight::save( QStringList& theListOfFiles)
     return false;
   
 
-  std::string aTmpDir = study->GetTmpDir(myStudyURL.toLatin1().constData(), isMultiFile );
+  std::string aTmpDir = study->GetTmpDir(myStudyURL.toUtf8().constData(), isMultiFile );
 
   theListOfFiles.append(QString(aTmpDir.c_str()));
   int listSize = theListOfFiles.size();
-  aModule->save(theListOfFiles);
+  aModule->save(theListOfFiles, myStudyURL);
 
   setModified( false );
 
@@ -141,7 +141,7 @@ bool SALOME_PYQT_DataModelLight::dumpPython( const QString& theURL,
   if(!aModule || !study)
     return false;
   
-  std::string aTmpDir = study->GetTmpDir( theURL.toLatin1().constData(), isMultiFile );
+  std::string aTmpDir = study->GetTmpDir( theURL.toUtf8().constData(), isMultiFile );
 
   theListOfFiles.append( QString( aTmpDir.c_str() ) );
   int oldSize = theListOfFiles.size();