use canonical path for location dir

git-svn-id: http://svn.osgeo.org/qgis/trunk@3300 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
rabla 2005-05-03 09:46:42 +00:00
parent 20e477fb60
commit 98676479f8

View File

@ -845,10 +845,11 @@ void QgsGrassModuleInput::updateQgisLayers()
QString mapset = split.last(); QString mapset = split.last();
split.pop_back(); // mapset split.pop_back(); // mapset
QString loc = sep + split.join ( QChar(sep) ); QDir locDir ( sep + split.join ( QChar(sep) ) ) ;
QString loc = locDir.canonicalPath();
QString curloc = QDir::cleanDirPath ( QgsGrass::getDefaultGisdbase() + sep QDir curlocDir ( QgsGrass::getDefaultGisdbase() + sep + QgsGrass::getDefaultLocation() );
+ QgsGrass::getDefaultLocation() ); QString curloc = curlocDir.canonicalPath();
if ( loc != curloc ) continue; if ( loc != curloc ) continue;
@ -891,10 +892,11 @@ void QgsGrassModuleInput::updateQgisLayers()
QString mapset = split.last(); QString mapset = split.last();
split.pop_back(); // mapset split.pop_back(); // mapset
QString loc = sep + split.join ( QChar(sep) ); QDir locDir ( sep + split.join ( QChar(sep) ) ) ;
QString loc = locDir.canonicalPath();
QString curloc = QDir::cleanDirPath ( QgsGrass::getDefaultGisdbase() + sep QDir curlocDir ( QgsGrass::getDefaultGisdbase() + sep + QgsGrass::getDefaultLocation() );
+ QgsGrass::getDefaultLocation() ); QString curloc = curlocDir.canonicalPath();
if ( loc != curloc ) continue; if ( loc != curloc ) continue;