Modifications to avoid compilation errors about convertion of std::string

to QString.

diff --git a/src/SalomeApp/SalomeApp_Study.cxx b/src/SalomeApp/SalomeApp_Study.cxx
index 3d693f3742b3f7480dfc72359334c905b3f300dc..d1b6e2647e1800020fee19e1260f9144d0c19653 100644 (file)
--- a/src/SalomeApp/SalomeApp_Study.cxx
+++ b/src/SalomeApp/SalomeApp_Study.cxx
@@ -704,7 +704,7 @@ QString SalomeApp_Study::getNameOfSavePoint(int savePoint)
 {
   _PTR(AttributeParameter) AP = studyDS()->GetCommonParameters(getVisualComponentName(), savePoint);
   _PTR(IParameters) ip = ClientFactory::getIParameters(AP);
-  return ip->getProperty("AP_SAVEPOINT_NAME");
+  return ip->getProperty("AP_SAVEPOINT_NAME").c_str();
 }
 
 /*!

diff --git a/src/Session/Session_ServerCheck.cxx b/src/Session/Session_ServerCheck.cxx
index ac4c59c1befacfe5464e2c1a1ccd9c0fd0ec96c0..3d758ae8c4c0506c32a74789fda341c6db0a1735 100644 (file)
--- a/src/Session/Session_ServerCheck.cxx
+++ b/src/Session/Session_ServerCheck.cxx
@@ -362,7 +362,7 @@ void Session_ServerCheck::run()
        SALOME_NamingService &NS = *SINGLETON_<SALOME_NamingService>::Instance();
        ASSERT( SINGLETON_<SALOME_NamingService>::IsAlreadyExisting() );
        NS.init_orb( orb );
-       QString containerName = QString( "/Containers/%1/FactoryServer" ).arg( GetHostname() );
+       QString containerName = QString( "/Containers/%1/FactoryServer" ).arg( GetHostname().c_str() );
        CORBA::Object_var obj = NS.Resolve( containerName.latin1() );
        Engines::Container_var FScontainer = Engines::Container::_narrow( obj );
        if ( !CORBA::is_nil( FScontainer ) ) {
@@ -413,7 +413,7 @@ void Session_ServerCheck::run()
        SALOME_NamingService &NS = *SINGLETON_<SALOME_NamingService>::Instance();
        ASSERT( SINGLETON_<SALOME_NamingService>::IsAlreadyExisting() );
        NS.init_orb( orb );
-       QString containerName = QString( "/Containers/%1/FactoryServerPy" ).arg( GetHostname() );
+       QString containerName = QString( "/Containers/%1/FactoryServerPy" ).arg( GetHostname().c_str() );
        CORBA::Object_var obj = NS.Resolve( containerName.latin1() );
        Engines::Container_var FSPcontainer = Engines::Container::_narrow( obj );
        if ( !CORBA::is_nil( FSPcontainer ) ) {
@@ -464,7 +464,7 @@ void Session_ServerCheck::run()
        SALOME_NamingService &NS = *SINGLETON_<SALOME_NamingService>::Instance();
        ASSERT( SINGLETON_<SALOME_NamingService>::IsAlreadyExisting() );
        NS.init_orb( orb );
-       QString containerName = QString( "/Containers/%1/SuperVisionContainer" ).arg( GetHostname() );
+       QString containerName = QString( "/Containers/%1/SuperVisionContainer" ).arg( GetHostname().c_str() );
        CORBA::Object_var obj = NS.Resolve( containerName.latin1() );
        Engines::Container_var SVcontainer = Engines::Container::_narrow( obj );
        if ( !CORBA::is_nil( SVcontainer ) ) {