From 8786663f34380b5f581b0b76f79a8c97b6ec562f Mon Sep 17 00:00:00 2001 From: Renaud Barate Date: Thu, 2 Apr 2015 17:42:48 +0200 Subject: [PATCH] Further UTF-8 rollback (see issue #22825) --- src/PyConsole/PyConsole_Request.cxx | 2 +- src/SalomeApp/SalomeApp_DataObject.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PyConsole/PyConsole_Request.cxx b/src/PyConsole/PyConsole_Request.cxx index f370defcf..5c67b8bbb 100644 --- a/src/PyConsole/PyConsole_Request.cxx +++ b/src/PyConsole/PyConsole_Request.cxx @@ -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 ) diff --git a/src/SalomeApp/SalomeApp_DataObject.cxx b/src/SalomeApp/SalomeApp_DataObject.cxx index 56481a556..055848b85 100644 --- a/src/SalomeApp/SalomeApp_DataObject.cxx +++ b/src/SalomeApp/SalomeApp_DataObject.cxx @@ -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; -- 2.39.2