fix windows build

jef-n · jef-n · commit 3d44a1e6e247 · 2016-05-15T23:56:53.000+02:00
diff --git a/src/core/qgsvectorfilewriter.h b/src/core/qgsvectorfilewriter.h
@@ -160,7 +160,7 @@ class CORE_EXPORT QgsVectorFileWriter
     /** Interface to convert raw field values to their user-friendly value.
      * @note Added in QGIS 2.16
      */
-    class FieldValueConverter
+    class CORE_EXPORT FieldValueConverter
     {
       public:
         /** Constructor */
diff --git a/src/plugins/georeferencer/qgsmapcoordsdialog.h b/src/plugins/georeferencer/qgsmapcoordsdialog.h
@@ -32,6 +32,7 @@ class QgsGeorefMapToolEmitPoint : public QgsMapTool
   public:
     explicit QgsGeorefMapToolEmitPoint( QgsMapCanvas *canvas )
         : QgsMapTool( canvas )
+        , mSnappingMarker( nullptr )
     {
     }
 
@@ -90,8 +91,9 @@ class QgsGeorefMapToolEmitPoint : public QgsMapTool
   private:
     struct MappedPoint
     {
+      MappedPoint() : snapped( false ) {}
       QgsPoint point;
-      bool snapped = false;
+      bool snapped;
     };
 
     MappedPoint mapPoint( QMouseEvent *e )
@@ -106,7 +108,7 @@ class QgsGeorefMapToolEmitPoint : public QgsMapTool
       return ret;
     }
 
-    QgsVertexMarker* mSnappingMarker = nullptr;
+    QgsVertexMarker* mSnappingMarker;
 };
 
 class QgsMapCoordsDialog : public QDialog, private Ui::QgsMapCoordsDialogBase
diff --git a/src/providers/ogr/qgsogrdataitems.cpp b/src/providers/ogr/qgsogrdataitems.cpp
@@ -372,7 +372,7 @@ QGISEXTERN QgsDataItem * dataItem( QString thePath, QgsDataItem* parentItem )
     return nullptr;
   }
 
-  QgsDebugMsgLevel( QString( "OGR Driver : %1 " ).arg( OGR_Dr_GetName( hDriver ) ), 2 );
+  QgsDebugMsgLevel( QString( "OGR Driver : %1" ).arg( OGR_Dr_GetName( hDriver ) ), 2 );
 
   int numLayers = OGR_DS_GetLayerCount( hDataSource );
 

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ class CORE_EXPORT QgsVectorFileWriter`
`160`	`160`	`/** Interface to convert raw field values to their user-friendly value.`
`161`	`161`	`* @note Added in QGIS 2.16`
`162`	`162`	`*/`
`163`		`- class FieldValueConverter`
	`163`	`+ class CORE_EXPORT FieldValueConverter`
`164`	`164`	`{`
`165`	`165`	`public:`
`166`	`166`	`/** Constructor */`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ class QgsGeorefMapToolEmitPoint : public QgsMapTool`
`32`	`32`	`public:`
`33`	`33`	`explicit QgsGeorefMapToolEmitPoint( QgsMapCanvas *canvas )`
`34`	`34`	`: QgsMapTool( canvas )`
	`35`	`+ , mSnappingMarker( nullptr )`
`35`	`36`	`{`
`36`	`37`	`}`
`37`	`38`
`@@ -90,8 +91,9 @@ class QgsGeorefMapToolEmitPoint : public QgsMapTool`
`90`	`91`	`private:`
`91`	`92`	`struct MappedPoint`
`92`	`93`	`{`
	`94`	`+ MappedPoint() : snapped( false ) {}`
`93`	`95`	`QgsPoint point;`
`94`		`- bool snapped = false;`
	`96`	`+ bool snapped;`
`95`	`97`	`};`
`96`	`98`
`97`	`99`	`MappedPoint mapPoint( QMouseEvent *e )`
`@@ -106,7 +108,7 @@ class QgsGeorefMapToolEmitPoint : public QgsMapTool`
`106`	`108`	`return ret;`
`107`	`109`	`}`
`108`	`110`
`109`		`- QgsVertexMarker* mSnappingMarker = nullptr;`
	`111`	`+ QgsVertexMarker* mSnappingMarker;`
`110`	`112`	`};`
`111`	`113`
`112`	`114`	`class QgsMapCoordsDialog : public QDialog, private Ui::QgsMapCoordsDialogBase`
Original file line number	Diff line number	Diff line change
`@@ -372,7 +372,7 @@ QGISEXTERN QgsDataItem * dataItem( QString thePath, QgsDataItem* parentItem )`
`372`	`372`	`return nullptr;`
`373`	`373`	`}`
`374`	`374`
`375`		`- QgsDebugMsgLevel( QString( "OGR Driver : %1 " ).arg( OGR_Dr_GetName( hDriver ) ), 2 );`
	`375`	`+ QgsDebugMsgLevel( QString( "OGR Driver : %1" ).arg( OGR_Dr_GetName( hDriver ) ), 2 );`
`376`	`376`
`377`	`377`	`int numLayers = OGR_DS_GetLayerCount( hDataSource );`
`378`	`378`