From 4447ea58d1cf9241a64a0b84b070c8cc08317964 Mon Sep 17 00:00:00 2001
From: jef <jef@c8812cc2-4d05-0410-92ff-de0c093fc19c>
Date: Mon, 1 Nov 2010 12:31:53 +0000
Subject: [PATCH] fix build error on windows

git-svn-id: http://svn.osgeo.org/qgis/trunk@14479 c8812cc2-4d05-0410-92ff-de0c093fc19c
---
 src/core/qgsapplication.cpp | 12 ++++++------
 src/core/qgsapplication.h   |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
index 1fdaaa1d896..183f17620bd 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 4246fbc3ad8..84baaf2c5f7 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;