[QGIS Commit] r12343 - trunk/qgis/src/plugins/gps_importer

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-12-06 16:30:51 -0500 (Sun, 06 Dec 2009)
New Revision: 12343

Modified:
   trunk/qgis/src/plugins/gps_importer/qgsbabelformat.cpp
   trunk/qgis/src/plugins/gps_importer/qgsgpsdevice.cpp
   trunk/qgis/src/plugins/gps_importer/qgsgpsplugin.cpp
Log:
fix #2202

Modified: trunk/qgis/src/plugins/gps_importer/qgsbabelformat.cpp
===================================================================
--- trunk/qgis/src/plugins/gps_importer/qgsbabelformat.cpp	2009-12-06 18:30:39 UTC (rev 12342)
+++ trunk/qgis/src/plugins/gps_importer/qgsbabelformat.cpp	2009-12-06 21:30:51 UTC (rev 12343)
@@ -147,9 +147,9 @@
     else if ( *iter == "%type" )
       copy.append( featuretype );
     else if ( *iter == "%in" )
-      copy.append( input );
+      copy.append( QString("\"%1\"").arg( input ) );
     else if ( *iter == "%out" )
-      copy.append( output );
+      copy.append( QString("\"%1\"").arg( output ) );
     else
       copy.append( *iter );
   }
@@ -171,9 +171,9 @@
     else if ( *iter == "%type" )
       copy.append( featuretype );
     else if ( *iter == "%in" )
-      copy.append( input );
+      copy.append( QString("\"%1\"").arg( input ) );
     else if ( *iter == "%out" )
-      copy.append( output );
+      copy.append( QString("\"%1\"").arg( output ) );
     else
       copy.append( *iter );
   }

Modified: trunk/qgis/src/plugins/gps_importer/qgsgpsdevice.cpp
===================================================================
--- trunk/qgis/src/plugins/gps_importer/qgsgpsdevice.cpp	2009-12-06 18:30:39 UTC (rev 12342)
+++ trunk/qgis/src/plugins/gps_importer/qgsgpsdevice.cpp	2009-12-06 21:30:51 UTC (rev 12343)
@@ -58,9 +58,9 @@
     else if ( *iter == "%type" )
       copy.append( type );
     else if ( *iter == "%in" )
-      copy.append( in );
+      copy.append( QString( "\"%1\"").arg( in ) );
     else if ( *iter == "%out" )
-      copy.append( out );
+      copy.append( QString( "\"%1\"").arg( out ) );
     else
       copy.append( *iter );
   }
@@ -90,9 +90,9 @@
     else if ( *iter == "%type" )
       copy.append( type );
     else if ( *iter == "%in" )
-      copy.append( in );
+      copy.append( QString("\"%1\"").arg( in ) );
     else if ( *iter == "%out" )
-      copy.append( out );
+      copy.append( QString("\"%1\"").arg( out ) );
     else
       copy.append( *iter );
   }

Modified: trunk/qgis/src/plugins/gps_importer/qgsgpsplugin.cpp
===================================================================
--- trunk/qgis/src/plugins/gps_importer/qgsgpsplugin.cpp	2009-12-06 18:30:39 UTC (rev 12342)
+++ trunk/qgis/src/plugins/gps_importer/qgsgpsplugin.cpp	2009-12-06 21:30:51 UTC (rev 12343)
@@ -329,8 +329,8 @@
 
   // try to start the gpsbabel process
   QStringList babelArgs;
-  babelArgs << mBabelPath << "-i" << "gpx" << "-f" << inputFileName
-  << convertStrings << "-o" << "gpx" << "-F" << outputFileName;
+  babelArgs << mBabelPath << "-i" << "gpx" << "-f" << QString("\"%1\"").arg( inputFileName )
+  << convertStrings << "-o" << "gpx" << "-F" << QString("\"%1\"").arg( outputFileName );
   QgsDebugMsg( QString( "Conversion command: " ) + babelArgs.join( "|" ) );
 
   QProcess babelProcess;