]> SALOME platform Git repositories - modules/gui.git/commitdiff
Salome HOME
Further UTF-8 rollback (see issue #22825)
authorRenaud Barate <renaud.barate@edf.fr>
Thu, 2 Apr 2015 15:42:48 +0000 (17:42 +0200)
committerRenaud Barate <renaud.barate@edf.fr>
Thu, 2 Apr 2015 15:42:48 +0000 (17:42 +0200)
src/PyConsole/PyConsole_Request.cxx
src/SalomeApp/SalomeApp_DataObject.cxx

index f370defcf4b259fe361b5cd81e8330bf12614e24..5c67b8bbbf624c12562492409076dcbd8706a388 100644 (file)
@@ -49,7 +49,7 @@ void ExecCommand::execute()
 {
   if ( myCommand != "" )
   {
-    int ret = getInterp()->run( myCommand.toUtf8().data() );
+    int ret = getInterp()->run( myCommand.toLatin1().data() );
     if ( ret < 0 )
       myState = PyInterp_Event::ES_ERROR;
     else if ( ret > 0 )
index 56481a556251abb75ab3b169369c7b0579c32e4f..055848b85d66e1db16cc28458eece1e5ec468971 100644 (file)
@@ -606,7 +606,7 @@ QString SalomeApp_DataObject::value( const _PTR(SObject)& obj ) const
   {
     _PTR(AttributeComment) comm = attr;
     std::string str = comm->Value();
-    val = QString::fromUtf8( str.c_str() );
+    val = fromUtf8( str );
   }
 
   return val;