[Marble-commits] KDE/kdeedu/marble

[Dennis Nienhüser]

SVN commit 1185585 by nienhueser:

Portability fixes (win32). Patches by Volker Lanz, thanks. I don't have msvc around, please test.

 M  +5 -0      CMakeLists.txt  
 M  +3 -3      src/lib/routing/instructions/WaypointParser.cpp  


--- trunk/KDE/kdeedu/marble/CMakeLists.txt #1185584:1185585
@@ -196,6 +196,11 @@
   # add a flag to be able to distinguish between qt 
   # and kde mode in the sources
   add_definitions(-DQTONLY)
+
+  # Use M_PI under Windows
+  if( WIN32 )
+    add_definitions( -D_USE_MATH_DEFINES )
+  endif( WIN32 )
 endif (QTONLY)
 
 #############################################################
--- trunk/KDE/kdeedu/marble/src/lib/routing/instructions/WaypointParser.cpp #1185584:1185585
@@ -70,14 +70,14 @@
                 qreal lon = readField<qreal>( Longitude, entries );
                 qreal lat = readField<qreal>( Latitude, entries );
                 RoutingPoint point( lon, lat );
-                QString junctionTypeRaw = readField<QString>( JunctionType, entries );
+                QString junctionTypeRaw = readField<QString>( JunctionType, entries, QString() );
                 RoutingWaypoint::JunctionType junctionType = RoutingWaypoint::Other;
                 if ( m_junctionTypeMapping.contains( junctionTypeRaw ) ) {
                   junctionType = m_junctionTypeMapping[junctionTypeRaw];
                 }
-                QString roadType = readField<QString>( RoadType, entries );
+                QString roadType = readField<QString>( RoadType, entries, QString() );
                 int secondsRemaining = readField<int>( TotalSecondsRemaining, entries, -1 );
-                QString roadName = readField<QString>( RoadName, entries );
+                QString roadName = readField<QString>( RoadName, entries, QString() );
 
                 // Road names may contain the field separator
                 for (int i = 2 + m_fieldIndices[RoadName]; i<entries.size(); ++i)