fix windows build

qgis · Mar 1, 2013 · 19183dd · 19183dd
1 parent cde4c85
commit 19183dd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/analysis/openstreetmap/qgsosmdatabase.cpp b/src/analysis/openstreetmap/qgsosmdatabase.cpp
@@ -318,6 +318,7 @@ bool QgsOSMDatabase::exportSpatiaLite( ExportType type, const QString& tableName
 
   int retX = sqlite3_exec( mDatabase, "BEGIN", NULL, NULL, 0 );
   Q_ASSERT( retX == SQLITE_OK );
+  Q_UNUSED( retX );
 
   if ( type == Polyline || type == Polygon )
     exportSpatiaLiteWays( type == Polygon, tableName, tagKeys );
@@ -328,6 +329,7 @@ bool QgsOSMDatabase::exportSpatiaLite( ExportType type, const QString& tableName
 
   int retY = sqlite3_exec( mDatabase, "COMMIT", NULL, NULL, 0 );
   Q_ASSERT( retY == SQLITE_OK );
+  Q_UNUSED( retY );
 
   if ( !createSpatialIndex( tableName ) )
     return false;

diff --git a/src/analysis/openstreetmap/qgsosmimport.cpp b/src/analysis/openstreetmap/qgsosmimport.cpp
@@ -69,6 +69,7 @@ bool QgsOSMXmlImport::import()
 
   int retX = sqlite3_exec( mDatabase, "BEGIN", NULL, NULL, 0 );
   Q_ASSERT( retX == SQLITE_OK );
+  Q_UNUSED( retX );
 
   // start parsing
 
@@ -92,6 +93,7 @@ bool QgsOSMXmlImport::import()
 
   int retY = sqlite3_exec( mDatabase, "COMMIT", NULL, NULL, 0 );
   Q_ASSERT( retY == SQLITE_OK );
+  Q_UNUSED( retY );
 
   createIndexes();
 
@@ -301,8 +303,8 @@ void QgsOSMXmlImport::readNode( QXmlStreamReader& xml )
 void QgsOSMXmlImport::readTag( bool way, QgsOSMId id, QXmlStreamReader& xml )
 {
   QXmlStreamAttributes attrs = xml.attributes();
-  QByteArray k = attrs.value( "k" ).toUtf8();
-  QByteArray v = attrs.value( "v" ).toUtf8();
+  QByteArray k = attrs.value( "k" ).toString().toUtf8();
+  QByteArray v = attrs.value( "v" ).toString().toUtf8();
   xml.skipCurrentElement();
 
   sqlite3_stmt* stmtInsertTag = way ? mStmtInsertWayTag : mStmtInsertNodeTag;

diff --git a/src/app/openstreetmap/qgsosmdownloaddialog.cpp b/src/app/openstreetmap/qgsosmdownloaddialog.cpp
@@ -32,10 +32,10 @@ QgsOSMDownloadDialog::QgsOSMDownloadDialog( QWidget* parent )
 {
   setupUi( this );
 
-  editXMin->setValidator( new QDoubleValidator( -180, 180, 6 ) );
-  editXMax->setValidator( new QDoubleValidator( -180, 180, 6 ) );
-  editYMin->setValidator( new QDoubleValidator( -90, 90, 6 ) );
-  editYMax->setValidator( new QDoubleValidator( -90, 90, 6 ) );
+  editXMin->setValidator( new QDoubleValidator( -180.0, 180.0, 6, this ) );
+  editXMax->setValidator( new QDoubleValidator( -180.0, 180.0, 6, this ) );
+  editYMin->setValidator( new QDoubleValidator( -90.0, 90.0, 6, this ) );
+  editYMax->setValidator( new QDoubleValidator( -90.0, 90.0, 6, this ) );
 
   populateLayers();
   onExtentCanvas();