Skip to content
Permalink
Browse files

fix build error on windows

git-svn-id: http://svn.osgeo.org/qgis/trunk@14479 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef
jef committed Nov 1, 2010
1 parent 5ec236c commit 4447ea58d1cf9241a64a0b84b070c8cc08317964
Showing with 8 additions and 8 deletions.
  1. +6 −6 src/core/qgsapplication.cpp
  2. +2 −2 src/core/qgsapplication.h
@@ -483,7 +483,7 @@ void QgsApplication::registerOgrDrivers()
}
}

QString QgsApplication::absolutePathToRelativePath( const QString& apath, const QString& targetPath )
QString QgsApplication::absolutePathToRelativePath( QString aPath, QString targetPath )
{
#if defined( Q_OS_WIN )
const Qt::CaseSensitivity cs = Qt::CaseInsensitive;
@@ -506,7 +506,7 @@ QString QgsApplication::absolutePathToRelativePath( const QString& apath, const
#endif

QStringList targetElems = targetPath.split( "/", QString::SkipEmptyParts );
QStringList aPathElems = apath.split( "/", QString::SkipEmptyParts );
QStringList aPathElems = aPath.split( "/", QString::SkipEmptyParts );

targetElems.removeAll( "." );
aPathElems.removeAll( "." );
@@ -524,8 +524,8 @@ QString QgsApplication::absolutePathToRelativePath( const QString& apath, const

if ( n == 0 )
{
// no common parts; might not even by a file
return apath;
// no common parts; might not even be a file
return aPath;
}

if ( targetElems.size() > 0 )
@@ -546,7 +546,7 @@ QString QgsApplication::absolutePathToRelativePath( const QString& apath, const
return aPathElems.join( "/" );
}

QString QgsApplication::relativePathToAbsolutePath( const QString& rpath, const QString& targetPath )
QString QgsApplication::relativePathToAbsolutePath( QString rpath, QString targetPath )
{
// relative path should always start with ./ or ../
if ( !rpath.startsWith( "./" ) && !rpath.startsWith( "../" ) )
@@ -555,7 +555,7 @@ QString QgsApplication::relativePathToAbsolutePath( const QString& rpath, const
}

#if defined(Q_OS_WIN)
rPath.replace( "\\", "/" );
rpath.replace( "\\", "/" );
targetPath.replace( "\\", "/" );

bool uncPath = targetPath.startsWith( "//" );
@@ -194,10 +194,10 @@ class CORE_EXPORT QgsApplication: public QApplication

/**Converts absolute path to path relative to target
@note: this method was added in version 1.6*/
static QString absolutePathToRelativePath( const QString& apath, const QString& targetPath );
static QString absolutePathToRelativePath( QString apath, QString targetPath );
/**Converts path relative to target to an absolute path
@note: this method was added in version 1.6*/
static QString relativePathToAbsolutePath( const QString& rpath, const QString& targetPath );
static QString relativePathToAbsolutePath( QString rpath, QString targetPath );

private:
static QString mPrefixPath;

0 comments on commit 4447ea5

Please sign in to comment.
You can’t perform that action at this time.