fix windows build

qgis · Aug 7, 2012 · 2795529 · 2795529
1 parent b6c7804
commit 2795529
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 15 deletions.
diff --git a/src/providers/grass/qgsgrassrasterprovider.cpp b/src/providers/grass/qgsgrassrasterprovider.cpp
@@ -273,7 +273,9 @@ double  QgsGrassRasterProvider::noDataValue() const
   else
   {
     if ( mGrassDataType != FCELL_TYPE )
+    {
       QgsDebugMsg( "unexpected data type" );
+    }
 
     // limit: 3.40282347e+38
     nul = -1e+30;

diff --git a/src/providers/wcs/CMakeLists.txt b/src/providers/wcs/CMakeLists.txt
@@ -6,8 +6,8 @@ SET (WCS_SRCS
   qgswcssourceselect.cpp 
   qgswcsdataitems.cpp 
 )
+
 SET (WCS_MOC_HDRS  
-  ../gdal/qgsgdalproviderbase.h 
   qgswcsprovider.h 
   qgswcscapabilities.h 
   qgswcssourceselect.h 

diff --git a/src/providers/wcs/qgswcsdataitems.cpp b/src/providers/wcs/qgswcsdataitems.cpp
@@ -261,8 +261,8 @@ QWidget * QgsWCSRootItem::paramWidget()
   QgsWCSSourceSelect *select = new QgsWCSSourceSelect( 0, 0, true, true );
   connect( select, SIGNAL( connectionsChanged() ), this, SLOT( connectionsChanged() ) );
   return select;
-  return 0;
 }
+
 void QgsWCSRootItem::connectionsChanged()
 {
   refresh();

diff --git a/src/providers/wfs/CMakeLists.txt b/src/providers/wfs/CMakeLists.txt
@@ -12,19 +12,13 @@ SET(WFS_SRCS
 )
 
 SET (WFS_MOC_HDRS
-     qgswfsdata.h
-     qgswfscapabilities.h
-     qgswfsdataitems.h
-     qgswfsprovider.h
-     qgswfssourceselect.h
+  qgswfsdata.h
+  qgswfscapabilities.h
+  qgswfsdataitems.h
+  qgswfsprovider.h
+  qgswfssourceselect.h
 )
 
-#IF(NOT MSVC)
-#  IF (PEDANTIC)
-#    MESSAGE("providers/wfs : -Werror removed for qgswfsprovider.cpp for now - please get rid of any compiler warnings!")
-#  ENDIF (PEDANTIC)
-#  SET_SOURCE_FILES_PROPERTIES(qgswfsprovider.cpp PROPERTIES COMPILE_FLAGS -Wno-error )
-#ENDIF (NOT MSVC)
 ########################################################
 # Build
 

diff --git a/tests/src/providers/testqgswcsprovider.cpp b/tests/src/providers/testqgswcsprovider.cpp
@@ -298,7 +298,7 @@ double TestQgsWcsProvider::tolerance( double val, int places )
 {
   // float precission is about 7 decimal digits, double about 16
   // default places = 6
-  return 1. * pow( 10, round( log10( qAbs( val ) ) - places ) );
+  return 1. * qPow( 10, qRound( log10( qAbs( val ) ) - places ) );
 }
 
 QString TestQgsWcsProvider::compareHead()
@@ -316,7 +316,7 @@ void TestQgsWcsProvider::compare( QString theParamName, int wcsVal, int gdalVal,
 bool TestQgsWcsProvider::compare( double wcsVal, double gdalVal, double theTolerance )
 {
   // values may be nan
-  return ( std::isnan( wcsVal ) && std::isnan( gdalVal ) ) || ( qAbs( wcsVal - gdalVal ) <= theTolerance );
+  return ( qIsNaN( wcsVal ) && qIsNaN( gdalVal ) ) || ( qAbs( wcsVal - gdalVal ) <= theTolerance );
 }
 
 void TestQgsWcsProvider::compare( QString theParamName, double wcsVal, double gdalVal, QString &theReport, bool &theOk, double theTolerance )