From: stv <stv@opencascade.com>
Date: Wed, 14 Dec 2011 09:26:24 +0000 (+0000)
Subject: QDir::convertSepartors() added for loaded file paths (import and transalator loading).
X-Git-Tag: TRIPOLI_320
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=daf37ca63fc0b43686c58d04a4ac4357892effee;p=modules%2Fgui.git

QDir::convertSepartors() added for loaded file paths (import and transalator loading).
---

diff --git a/src/Qtx/QtxResourceMgr.cxx b/src/Qtx/QtxResourceMgr.cxx
index 13b8938ea..6014f34d0 100644
--- a/src/Qtx/QtxResourceMgr.cxx
+++ b/src/Qtx/QtxResourceMgr.cxx
@@ -393,7 +393,7 @@ QPixmap QtxResourceMgr::Resources::loadPixmap( const QString& sect, const QStrin
 QTranslator* QtxResourceMgr::Resources::loadTranslator( const QString& sect, const QString& prefix, const QString& name ) const
 {
   QTranslator* trans = new QtxTranslator( 0 );
-  QString fname = fileName( sect, prefix, name );
+  QString fname = QDir::convertSeparators( fileName( sect, prefix, name ) );
   if ( !trans->load( Qtx::file( fname, false ), Qtx::dir( fname ) ) )
   {
     delete trans;
@@ -585,7 +585,7 @@ bool QtxResourceMgr::IniFormat::load( const QString& fname, QMap<QString, Sectio
     }
     else if ( section == "import" )
     {
-      QString impFile = Qtx::makeEnvVarSubst( data, Qtx::Always );
+      QString impFile = QDir::convertSeparators( Qtx::makeEnvVarSubst( data, Qtx::Always ) );
       QFileInfo impFInfo( impFile );
       if ( impFInfo.isRelative() )
 	      impFInfo.setFile( aFinfo.absoluteDir(), impFile );
@@ -819,7 +819,7 @@ bool QtxResourceMgr::XmlFormat::load( const QString& fname, QMap<QString, Sectio
       }
       else if ( sectElem.tagName() == importTag() && sectElem.hasAttribute( nameAttribute() ) )
       {
-         QString impFile = Qtx::makeEnvVarSubst( sectElem.attribute( nameAttribute() ), Qtx::Always );
+         QString impFile = QDir::convertSeparators( Qtx::makeEnvVarSubst( sectElem.attribute( nameAttribute() ), Qtx::Always ) );
 	      QFileInfo impFInfo( impFile );
 	      if ( impFInfo.isRelative() )
 	         impFInfo.setFile( aFinfo.absoluteDir(), impFile );