fix windows build (pow called with an integer) and comma cosmetics

jef-n · jef-n · commit a264a27dfb54 · 2015-02-08T13:15:42.000+01:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -2748,7 +2748,7 @@ void QgisApp::addLayerDefinition()
   openLayerDefinition( path );
 }
 
-QString QgisApp::crsAndFormatAdjustedLayerUri( const QString &uri , const QStringList &supportedCrs, const QStringList &supportedFormats ) const
+QString QgisApp::crsAndFormatAdjustedLayerUri( const QString &uri, const QStringList &supportedCrs, const QStringList &supportedFormats ) const
 {
   QString newuri = uri;
 
diff --git a/src/app/qgsadvanceddigitizingcanvasitem.cpp b/src/app/qgsadvanceddigitizingcanvasitem.cpp
@@ -20,7 +20,7 @@
 #include "qgsmapcanvas.h"
 
 
-QgsAdvancedDigitizingCanvasItem::QgsAdvancedDigitizingCanvasItem( QgsMapCanvas* canvas , QgsAdvancedDigitizingDockWidget* cadDockWidget )
+QgsAdvancedDigitizingCanvasItem::QgsAdvancedDigitizingCanvasItem( QgsMapCanvas* canvas, QgsAdvancedDigitizingDockWidget* cadDockWidget )
     : QgsMapCanvasItem( canvas )
     , mLockedPen( QPen( QColor( 100, 100, 255, 255 ), .7, Qt::DashLine ) )
     , mConstruction1Pen( QPen( QColor( 100, 255, 100, 150 ), .7, Qt::DashLine ) )
diff --git a/src/app/qgsadvanceddigitizingdockwidget.cpp b/src/app/qgsadvanceddigitizingdockwidget.cpp
@@ -46,7 +46,7 @@ bool QgsAdvancedDigitizingDockWidget::lineCircleIntersection( const QgsPoint& ce
   const double dr = sqrt( pow( dx, 2 ) + pow( dy, 2 ) );
   const double d = x1 * y2 - x2 * y1;
 
-  const double disc = pow( radius , 2 ) * pow( dr, 2 ) - pow( d, 2 );
+  const double disc = pow( radius, 2 ) * pow( dr, 2 ) - pow( d, 2 );
 
   if ( disc < 0 )
   {
diff --git a/src/app/qgsmapmouseevent.cpp b/src/app/qgsmapmouseevent.cpp
@@ -21,7 +21,7 @@
 #include "qgisapp.h"
 #include "qgssnappingutils.h"
 
-QgsMapMouseEvent::QgsMapMouseEvent( QgsMapToolAdvancedDigitizing* mapTool, QMouseEvent* event , SnappingMode mode )
+QgsMapMouseEvent::QgsMapMouseEvent( QgsMapToolAdvancedDigitizing* mapTool, QMouseEvent* event, SnappingMode mode )
     :  QMouseEvent( event->type(), event->pos(), event->globalPos(), event->button(), event->buttons(), event->modifiers() )
     , mMapPoint( mapTool->canvas()->mapSettings().mapToPixel().toMapCoordinates( event->pos() ) )
     , mMapTool( mapTool )
diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp
@@ -172,7 +172,7 @@ QgsDataItem::QgsDataItem( QgsDataItem::Type type, QgsDataItem* parent, QString n
 
 QgsDataItem::~QgsDataItem()
 {
-  QgsDebugMsgLevel( QString( "mName = %1 mPath = %2 mChildren.size() = %3" ).arg( mName ).arg( mPath ).arg( mChildren.size() ) , 2 );
+  QgsDebugMsgLevel( QString( "mName = %1 mPath = %2 mChildren.size() = %3" ).arg( mName ).arg( mPath ).arg( mChildren.size() ), 2 );
   foreach ( QgsDataItem *child, mChildren )
   {
     if ( !child ) // should not happen
diff --git a/src/gui/editorwidgets/qgsdoublespinbox.cpp b/src/gui/editorwidgets/qgsdoublespinbox.cpp
@@ -79,7 +79,7 @@ void QgsDoubleSpinBox::clear()
   setValue( clearValue() );
 }
 
-void QgsDoubleSpinBox::setClearValue( double customValue , QString specialValueText )
+void QgsDoubleSpinBox::setClearValue( double customValue, QString specialValueText )
 {
   mClearValueMode = CustomValue;
   mCustomClearValue = customValue;
diff --git a/src/gui/qgscolorwidgets.cpp b/src/gui/qgscolorwidgets.cpp
@@ -769,7 +769,7 @@ void QgsColorBox::paintEvent( QPaintEvent *event )
   painter.setPen( Qt::NoPen );
 
   painter.drawRect( xPos - 1, mMargin, 3, height() - 2 * mMargin - 1 );
-  painter.drawRect( mMargin, yPos - 1 , width() - 2 * mMargin - 1, 3 );
+  painter.drawRect( mMargin, yPos - 1, width() - 2 * mMargin - 1, 3 );
   painter.setPen( Qt::black );
   painter.drawLine( xPos, mMargin, xPos, height() - mMargin - 1 );
   painter.drawLine( mMargin, yPos, width() - mMargin - 1, yPos );
diff --git a/src/gui/qgsmaplayeractionregistry.cpp b/src/gui/qgsmaplayeractionregistry.cpp
@@ -26,7 +26,7 @@ QgsMapLayerAction::QgsMapLayerAction( QString name, QObject* parent, Targets tar
 }
 
 /**Creates a map layer action which can run only on a specific layer*/
-QgsMapLayerAction::QgsMapLayerAction( QString name, QObject* parent, QgsMapLayer* layer , Targets targets, QIcon icon )
+QgsMapLayerAction::QgsMapLayerAction( QString name, QObject* parent, QgsMapLayer* layer, Targets targets, QIcon icon )
     : QAction( icon, name, parent )
     , mSingleLayer( true )
     , mActionLayer( layer )
diff --git a/src/providers/postgres/qgspostgresconn.cpp b/src/providers/postgres/qgspostgresconn.cpp
@@ -133,7 +133,7 @@ QMap<QString, QgsPostgresConn *> QgsPostgresConn::sConnectionsRO;
 QMap<QString, QgsPostgresConn *> QgsPostgresConn::sConnectionsRW;
 const int QgsPostgresConn::sGeomTypeSelectLimit = 100;
 
-QgsPostgresConn *QgsPostgresConn::connectDb( QString conninfo, bool readonly, bool shared , bool transaction )
+QgsPostgresConn *QgsPostgresConn::connectDb( QString conninfo, bool readonly, bool shared, bool transaction )
 {
   QMap<QString, QgsPostgresConn *> &connections =
     readonly ? QgsPostgresConn::sConnectionsRO : QgsPostgresConn::sConnectionsRW;
@@ -164,7 +164,7 @@ QgsPostgresConn *QgsPostgresConn::connectDb( QString conninfo, bool readonly, bo
   return conn;
 }
 
-QgsPostgresConn::QgsPostgresConn( QString conninfo, bool readOnly, bool shared , bool transaction )
+QgsPostgresConn::QgsPostgresConn( QString conninfo, bool readOnly, bool shared, bool transaction )
     : mRef( 1 )
     , mOpenCursors( 0 )
     , mConnInfo( conninfo )
diff --git a/src/providers/postgres/qgspostgrestransaction.cpp b/src/providers/postgres/qgspostgrestransaction.cpp
@@ -26,7 +26,7 @@ QgsPostgresTransaction::QgsPostgresTransaction( const QString &connString )
 
 }
 
-bool QgsPostgresTransaction::beginTransaction( QString &error , int statementTimeout )
+bool QgsPostgresTransaction::beginTransaction( QString &error, int statementTimeout )
 {
   mConn = QgsPostgresConn::connectDb( mConnString, false /*readonly*/, false /*shared*/, true /*transaction*/ );
 
diff --git a/src/providers/wcs/qgswcsdataitems.cpp b/src/providers/wcs/qgswcsdataitems.cpp
@@ -24,7 +24,7 @@
 #include <QFileInfo>
 #include <QSettings>
 
-QgsWCSConnectionItem::QgsWCSConnectionItem( QgsDataItem* parent, QString name, QString path , QString uri )
+QgsWCSConnectionItem::QgsWCSConnectionItem( QgsDataItem* parent, QString name, QString path, QString uri )
     : QgsDataCollectionItem( parent, name, path )
     , mUri( uri )
 {
diff --git a/src/providers/wfs/qgswfsdataitems.cpp b/src/providers/wfs/qgswfsdataitems.cpp
@@ -38,7 +38,7 @@ QgsWFSLayerItem::~QgsWFSLayerItem()
 
 ////
 
-QgsWFSConnectionItem::QgsWFSConnectionItem( QgsDataItem* parent, QString name, QString path , QString uri )
+QgsWFSConnectionItem::QgsWFSConnectionItem( QgsDataItem* parent, QString name, QString path, QString uri )
     : QgsDataCollectionItem( parent, name, path )
     , mUri( uri )
     , mCapabilities( NULL )
diff --git a/src/server/qgis_map_serv.cpp b/src/server/qgis_map_serv.cpp
@@ -429,7 +429,7 @@ int main( int argc, char * argv[] )
         }
         else
         {
-          QgsWMSServer wmsServer( configFilePath, parameterMap, p, theRequestHandler.data() , theMapRenderer.data(), &capabilitiesCache );
+          QgsWMSServer wmsServer( configFilePath, parameterMap, p, theRequestHandler.data(), theMapRenderer.data(), &capabilitiesCache );
           wmsServer.executeRequest();
         }
       }
diff --git a/tests/src/core/testqgsclipper.cpp b/tests/src/core/testqgsclipper.cpp
@@ -55,11 +55,11 @@ void TestQgsClipper::basic()
   QgsClipper::trimPolygon( polygon, clipRect );
 
   // Check nothing sticks out.
-  QVERIFY( checkBoundingBox( polygon , clipRect ) );
+  QVERIFY( checkBoundingBox( polygon, clipRect ) );
   // Check that it didn't clip too much
   QgsRectangle clipRectInner( clipRect );
   clipRectInner.scale( 0.999 );
-  QVERIFY( ! checkBoundingBox( polygon , clipRectInner ) );
+  QVERIFY( ! checkBoundingBox( polygon, clipRectInner ) );
 
   // A more complex example
   polygon.clear();
@@ -71,11 +71,11 @@ void TestQgsClipper::basic()
   // We should have 5 vertices now?
   QCOMPARE( polygon.size(), 5 );
   // Check nothing sticks out.
-  QVERIFY( checkBoundingBox( polygon , clipRect ) );
+  QVERIFY( checkBoundingBox( polygon, clipRect ) );
   // Check that it didn't clip too much
   clipRectInner = clipRect;
   clipRectInner.scale( 0.999 );
-  QVERIFY( ! checkBoundingBox( polygon , clipRectInner ) );
+  QVERIFY( ! checkBoundingBox( polygon, clipRectInner ) );
 };
 
 bool TestQgsClipper::checkBoundingBox( QPolygonF polygon, QgsRectangle clipRect )
diff --git a/tests/src/core/testqgsexpression.cpp b/tests/src/core/testqgsexpression.cpp
@@ -1071,7 +1071,7 @@ class TestQgsExpression: public QObject
       QgsExpression e( string );
       QVERIFY( !e.hasParserError() );
       qDebug() << e.expression();
-      QCOMPARE( e.expression() , QgsExpression( e.expression() ).expression() );
+      QCOMPARE( e.expression(), QgsExpression( e.expression() ).expression() );
     }
 
     void quote_string()
diff --git a/tests/src/core/testqgsgeometry.cpp b/tests/src/core/testqgsgeometry.cpp
@@ -505,7 +505,7 @@ void TestQgsGeometry::bufferCheck()
   dumpPolygon( myPolygon );
   QVERIFY( renderCheck( "geometry_bufferCheck", "Checking buffer(10,10) of B", 10 ) );
 }
-bool TestQgsGeometry::renderCheck( QString theTestName, QString theComment , int mismatchCount )
+bool TestQgsGeometry::renderCheck( QString theTestName, QString theComment, int mismatchCount )
 {
   mReport += "<h2>" + theTestName + "</h2>\n";
   mReport += "<h3>" + theComment + "</h3>\n";
diff --git a/tests/src/core/testqgsimageoperation.cpp b/tests/src/core/testqgsimageoperation.cpp
@@ -85,7 +85,7 @@ class TestQgsImageOperation : public QObject
     QString mReport;
     QString mSampleImage;
 
-    bool imageCheck( QString testName , QImage &image, int mismatchCount );
+    bool imageCheck( QString testName, QImage &image, int mismatchCount );
 };
 
 void TestQgsImageOperation::initTestCase()
diff --git a/tests/src/core/testqgsmapsettings.cpp b/tests/src/core/testqgsmapsettings.cpp
@@ -38,7 +38,7 @@ QString TestQgsMapSettings::toString( const QPolygonF& p, int dec ) const
 {
   QString s;
   const char *sep = "";
-  double r = pow( 10, dec );
+  double r = pow( 10.0, dec );
   for ( int i = 0; i < p.size(); ++i )
   {
     s += QString( "%1%2 %3" ).arg( sep )
diff --git a/tests/src/core/testqgspointlocator.cpp b/tests/src/core/testqgspointlocator.cpp
@@ -244,13 +244,13 @@ class TestQgsPointLocator : public QObject
     void testExtent()
     {
       QgsRectangle bbox1( 10, 10, 11, 11 ); // out of layer's bounds
-      QgsPointLocator loc1( mVL, 0 , &bbox1 );
+      QgsPointLocator loc1( mVL, 0, &bbox1 );
 
       QgsPointLocator::Match m1 = loc1.nearestVertex( QgsPoint( 2, 2 ), 999 );
       QVERIFY( !m1.isValid() );
 
       QgsRectangle bbox2( 0, 0, 1, 1 ); // in layer's bounds
-      QgsPointLocator loc2( mVL, 0 , &bbox2 );
+      QgsPointLocator loc2( mVL, 0, &bbox2 );
 
       QgsPointLocator::Match m2 = loc2.nearestVertex( QgsPoint( 2, 2 ), 999 );
       QVERIFY( m2.isValid() );

Original file line number	Diff line number	Diff line change
`@@ -2748,7 +2748,7 @@ void QgisApp::addLayerDefinition()`
`2748`	`2748`	`openLayerDefinition( path );`
`2749`	`2749`	`}`
`2750`	`2750`
`2751`		`-QString QgisApp::crsAndFormatAdjustedLayerUri( const QString &uri , const QStringList &supportedCrs, const QStringList &supportedFormats ) const`
	`2751`	`+QString QgisApp::crsAndFormatAdjustedLayerUri( const QString &uri, const QStringList &supportedCrs, const QStringList &supportedFormats ) const`
`2752`	`2752`	`{`
`2753`	`2753`	`QString newuri = uri;`
`2754`	`2754`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ bool QgsAdvancedDigitizingDockWidget::lineCircleIntersection( const QgsPoint& ce`
`46`	`46`	`const double dr = sqrt( pow( dx, 2 ) + pow( dy, 2 ) );`
`47`	`47`	`const double d = x1 * y2 - x2 * y1;`
`48`	`48`
`49`		`- const double disc = pow( radius , 2 ) * pow( dr, 2 ) - pow( d, 2 );`
	`49`	`+ const double disc = pow( radius, 2 ) * pow( dr, 2 ) - pow( d, 2 );`
`50`	`50`
`51`	`51`	`if ( disc < 0 )`
`52`	`52`	`{`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ QgsDataItem::QgsDataItem( QgsDataItem::Type type, QgsDataItem* parent, QString n`
`172`	`172`
`173`	`173`	`QgsDataItem::~QgsDataItem()`
`174`	`174`	`{`
`175`		`- QgsDebugMsgLevel( QString( "mName = %1 mPath = %2 mChildren.size() = %3" ).arg( mName ).arg( mPath ).arg( mChildren.size() ) , 2 );`
	`175`	`+ QgsDebugMsgLevel( QString( "mName = %1 mPath = %2 mChildren.size() = %3" ).arg( mName ).arg( mPath ).arg( mChildren.size() ), 2 );`
`176`	`176`	`foreach ( QgsDataItem *child, mChildren )`
`177`	`177`	`{`
`178`	`178`	`if ( !child ) // should not happen`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ void QgsDoubleSpinBox::clear()`
`79`	`79`	`setValue( clearValue() );`
`80`	`80`	`}`
`81`	`81`
`82`		`-void QgsDoubleSpinBox::setClearValue( double customValue , QString specialValueText )`
	`82`	`+void QgsDoubleSpinBox::setClearValue( double customValue, QString specialValueText )`
`83`	`83`	`{`
`84`	`84`	`mClearValueMode = CustomValue;`
`85`	`85`	`mCustomClearValue = customValue;`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ QgsMapLayerAction::QgsMapLayerAction( QString name, QObject* parent, Targets tar`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`/*Creates a map layer action which can run only on a specific layer/`
`29`		`-QgsMapLayerAction::QgsMapLayerAction( QString name, QObject* parent, QgsMapLayer* layer , Targets targets, QIcon icon )`
	`29`	`+QgsMapLayerAction::QgsMapLayerAction( QString name, QObject* parent, QgsMapLayer* layer, Targets targets, QIcon icon )`
`30`	`30`	`: QAction( icon, name, parent )`
`31`	`31`	`, mSingleLayer( true )`
`32`	`32`	`, mActionLayer( layer )`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ QgsPostgresTransaction::QgsPostgresTransaction( const QString &connString )`
`26`	`26`
`27`	`27`	`}`
`28`	`28`
`29`		`-bool QgsPostgresTransaction::beginTransaction( QString &error , int statementTimeout )`
	`29`	`+bool QgsPostgresTransaction::beginTransaction( QString &error, int statementTimeout )`
`30`	`30`	`{`
`31`	`31`	`mConn = QgsPostgresConn::connectDb( mConnString, false /readonly/, false /shared/, true /transaction/ );`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`#include <QFileInfo>`
`25`	`25`	`#include <QSettings>`
`26`	`26`
`27`		`-QgsWCSConnectionItem::QgsWCSConnectionItem( QgsDataItem* parent, QString name, QString path , QString uri )`
	`27`	`+QgsWCSConnectionItem::QgsWCSConnectionItem( QgsDataItem* parent, QString name, QString path, QString uri )`
`28`	`28`	`: QgsDataCollectionItem( parent, name, path )`
`29`	`29`	`, mUri( uri )`
`30`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -429,7 +429,7 @@ int main( int argc, char * argv[] )`
`429`	`429`	`}`
`430`	`430`	`else`
`431`	`431`	`{`
`432`		`- QgsWMSServer wmsServer( configFilePath, parameterMap, p, theRequestHandler.data() , theMapRenderer.data(), &capabilitiesCache );`
	`432`	`+ QgsWMSServer wmsServer( configFilePath, parameterMap, p, theRequestHandler.data(), theMapRenderer.data(), &capabilitiesCache );`
`433`	`433`	`wmsServer.executeRequest();`
`434`	`434`	`}`
`435`	`435`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1071,7 +1071,7 @@ class TestQgsExpression: public QObject`
`1071`	`1071`	`QgsExpression e( string );`
`1072`	`1072`	`QVERIFY( !e.hasParserError() );`
`1073`	`1073`	`qDebug() << e.expression();`
`1074`		`- QCOMPARE( e.expression() , QgsExpression( e.expression() ).expression() );`
	`1074`	`+ QCOMPARE( e.expression(), QgsExpression( e.expression() ).expression() );`
`1075`	`1075`	`}`
`1076`	`1076`
`1077`	`1077`	`void quote_string()`
Original file line number	Diff line number	Diff line change
`@@ -505,7 +505,7 @@ void TestQgsGeometry::bufferCheck()`
`505`	`505`	`dumpPolygon( myPolygon );`
`506`	`506`	`QVERIFY( renderCheck( "geometry_bufferCheck", "Checking buffer(10,10) of B", 10 ) );`
`507`	`507`	`}`
`508`		`-bool TestQgsGeometry::renderCheck( QString theTestName, QString theComment , int mismatchCount )`
	`508`	`+bool TestQgsGeometry::renderCheck( QString theTestName, QString theComment, int mismatchCount )`
`509`	`509`	`{`
`510`	`510`	`mReport += "<h2>" + theTestName + "</h2>\n";`
`511`	`511`	`mReport += "<h3>" + theComment + "</h3>\n";`