diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp index 1fdaaa1d8963..183f17620bda 100644 --- a/src/core/qgsapplication.cpp +++ b/src/core/qgsapplication.cpp @@ -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( "//" ); diff --git a/src/core/qgsapplication.h b/src/core/qgsapplication.h index 4246fbc3ad8d..84baaf2c5f7f 100644 --- a/src/core/qgsapplication.h +++ b/src/core/qgsapplication.h @@ -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;