fix qreal vs double issues

mbernasocchi · mhugent · commit dba353c2c865 · 2013-03-12T17:42:51.000+01:00
diff --git a/src/core/composer/qgscomposerlegend.cpp b/src/core/composer/qgscomposerlegend.cpp
@@ -96,7 +96,7 @@ QSizeF QgsComposerLegend::paintAndDetermineSize( QPainter* painter )
 
   setColumns( atomList );
 
-  double maxColumnWidth = 0;
+  qreal maxColumnWidth = 0;
   if ( mEqualColumnWidth )
   {
     foreach ( Atom atom, atomList )
@@ -112,7 +112,7 @@ QSizeF QgsComposerLegend::paintAndDetermineSize( QPainter* painter )
   QPointF point( mBoxSpace, columnTop );
   bool firstInColumn = true;
   double columnMaxHeight = 0;
-  double columnWidth = 0;
+  qreal columnWidth = 0;
   int column = 0;
   foreach ( Atom atom, atomList )
   {
@@ -212,8 +212,8 @@ QSizeF QgsComposerLegend::drawTitle( QPainter* painter, QPointF point, Qt::Align
   for ( QStringList::Iterator titlePart = lines.begin(); titlePart != lines.end(); ++titlePart )
   {
     // it does not draw the last world if rectangle width is exactly text width
-    double width = textWidthMillimeters( mTitleFont, *titlePart ) + 1;
-    double height = fontAscentMillimeters( mTitleFont ) + fontDescentMillimeters( mTitleFont );
+    qreal width = textWidthMillimeters( mTitleFont, *titlePart ) + 1;
+    qreal height = fontAscentMillimeters( mTitleFont ) + fontDescentMillimeters( mTitleFont );
 
     double left = halignment == Qt::AlignLeft ?  point.x() : point.x() - width / 2;
 
@@ -249,7 +249,7 @@ QSizeF QgsComposerLegend::drawGroupItemTitle( QgsComposerGroupItem* groupItem, Q
   {
     y += fontAscentMillimeters( mGroupFont );
     if ( painter ) drawText( painter, point.x(), y, *groupPart, mGroupFont );
-    double width = textWidthMillimeters( mGroupFont, *groupPart );
+    qreal width = textWidthMillimeters( mGroupFont, *groupPart );
     size.rwidth() = qMax( width, size.width() );
     if ( groupPart != lines.end() )
     {
@@ -277,7 +277,7 @@ QSizeF QgsComposerLegend::drawLayerItemTitle( QgsComposerLayerItem* layerItem, Q
   {
     y += fontAscentMillimeters( mLayerFont );
     if ( painter ) drawText( painter, point.x(), y, *layerItemPart , mLayerFont );
-    double width = textWidthMillimeters( mLayerFont, *layerItemPart );
+    qreal width = textWidthMillimeters( mLayerFont, *layerItemPart );
     size.rwidth() = qMax( width, size.width() );
     if ( layerItemPart != lines.end() )
     {
@@ -401,7 +401,7 @@ QgsComposerLegend::Nucleon QgsComposerLegend::drawSymbolItem( QgsComposerLegendI
   for ( QStringList::Iterator itemPart = lines.begin(); itemPart != lines.end(); ++itemPart )
   {
     if ( painter ) drawText( painter, labelX, labelY, *itemPart , mItemFont );
-    labelSize.rwidth() = qMax( textWidthMillimeters( mItemFont,  *itemPart ), labelSize.width() );
+    labelSize.rwidth() = qMax( textWidthMillimeters( mItemFont,  *itemPart ), double(labelSize.width()) );
     if ( itemPart != lines.end() )
     {
       labelY += mlineSpacing + textHeight;
@@ -1012,7 +1012,7 @@ void QgsComposerLegend::setColumns( QList<Atom>& atomList )
   // Divide atoms to columns
   double totalHeight = 0;
   bool first = true;
-  double maxAtomHeight = 0;
+  qreal maxAtomHeight = 0;
   foreach ( Atom atom, atomList )
   {
     if ( !first )
@@ -1073,7 +1073,7 @@ void QgsComposerLegend::setColumns( QList<Atom>& atomList )
   }
 
   // Alling labels of symbols for each layr/column to the same labelXOffset
-  QMap<QString, double> maxSymbolWidth;
+  QMap<QString, qreal> maxSymbolWidth;
   for ( int i = 0; i < atomList.size(); i++ )
   {
     for ( int j = 0; j < atomList[i].nucleons.size(); j++ )
diff --git a/src/core/composer/qgscomposerlegend.h b/src/core/composer/qgscomposerlegend.h
@@ -147,7 +147,7 @@ class CORE_EXPORT QgsComposerLegend : public QgsComposerItem
     QColor mFontColor;
 
     /**Space between item box and contents*/
-    double mBoxSpace;
+    qreal mBoxSpace;
     /**Space between columns*/
     double mColumnSpace;
     /**Vertical space between group entries*/
diff --git a/src/core/qgscoordinatetransform.cpp b/src/core/qgscoordinatetransform.cpp
@@ -323,9 +323,16 @@ void QgsCoordinateTransform::transformPolygon( QPolygonF& poly, TransformDirecti
 {
   //create x, y arrays
   int nVertices = poly.size();
-  QVector<qreal> x( nVertices );
-  QVector<qreal> y( nVertices );
-  QVector<qreal> z( nVertices );
+
+#ifdef ANDROID
+QVector<double> x( nVertices );
+QVector<double> y( nVertices );
+QVector<double> z( nVertices );
+#else
+QVector<qreal> x( nVertices );
+QVector<qreal> y( nVertices );
+QVector<qreal> z( nVertices );
+#endif
 
   for ( int i = 0; i < nVertices; ++i )
   {

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ QSizeF QgsComposerLegend::paintAndDetermineSize( QPainter* painter )`
`96`	`96`
`97`	`97`	`setColumns( atomList );`
`98`	`98`
`99`		`- double maxColumnWidth = 0;`
	`99`	`+ qreal maxColumnWidth = 0;`
`100`	`100`	`if ( mEqualColumnWidth )`
`101`	`101`	`{`
`102`	`102`	`foreach ( Atom atom, atomList )`
`@@ -112,7 +112,7 @@ QSizeF QgsComposerLegend::paintAndDetermineSize( QPainter* painter )`
`112`	`112`	`QPointF point( mBoxSpace, columnTop );`
`113`	`113`	`bool firstInColumn = true;`
`114`	`114`	`double columnMaxHeight = 0;`
`115`		`- double columnWidth = 0;`
	`115`	`+ qreal columnWidth = 0;`
`116`	`116`	`int column = 0;`
`117`	`117`	`foreach ( Atom atom, atomList )`
`118`	`118`	`{`
`@@ -212,8 +212,8 @@ QSizeF QgsComposerLegend::drawTitle( QPainter* painter, QPointF point, Qt::Align`
`212`	`212`	`for ( QStringList::Iterator titlePart = lines.begin(); titlePart != lines.end(); ++titlePart )`
`213`	`213`	`{`
`214`	`214`	`// it does not draw the last world if rectangle width is exactly text width`
`215`		`- double width = textWidthMillimeters( mTitleFont, *titlePart ) + 1;`
`216`		`- double height = fontAscentMillimeters( mTitleFont ) + fontDescentMillimeters( mTitleFont );`
	`215`	`+ qreal width = textWidthMillimeters( mTitleFont, *titlePart ) + 1;`
	`216`	`+ qreal height = fontAscentMillimeters( mTitleFont ) + fontDescentMillimeters( mTitleFont );`
`217`	`217`
`218`	`218`	`double left = halignment == Qt::AlignLeft ? point.x() : point.x() - width / 2;`
`219`	`219`
`@@ -249,7 +249,7 @@ QSizeF QgsComposerLegend::drawGroupItemTitle( QgsComposerGroupItem* groupItem, Q`
`249`	`249`	`{`
`250`	`250`	`y += fontAscentMillimeters( mGroupFont );`
`251`	`251`	`if ( painter ) drawText( painter, point.x(), y, *groupPart, mGroupFont );`
`252`		`- double width = textWidthMillimeters( mGroupFont, *groupPart );`
	`252`	`+ qreal width = textWidthMillimeters( mGroupFont, *groupPart );`
`253`	`253`	`size.rwidth() = qMax( width, size.width() );`
`254`	`254`	`if ( groupPart != lines.end() )`
`255`	`255`	`{`
`@@ -277,7 +277,7 @@ QSizeF QgsComposerLegend::drawLayerItemTitle( QgsComposerLayerItem* layerItem, Q`
`277`	`277`	`{`
`278`	`278`	`y += fontAscentMillimeters( mLayerFont );`
`279`	`279`	`if ( painter ) drawText( painter, point.x(), y, *layerItemPart , mLayerFont );`
`280`		`- double width = textWidthMillimeters( mLayerFont, *layerItemPart );`
	`280`	`+ qreal width = textWidthMillimeters( mLayerFont, *layerItemPart );`
`281`	`281`	`size.rwidth() = qMax( width, size.width() );`
`282`	`282`	`if ( layerItemPart != lines.end() )`
`283`	`283`	`{`
`@@ -401,7 +401,7 @@ QgsComposerLegend::Nucleon QgsComposerLegend::drawSymbolItem( QgsComposerLegendI`
`401`	`401`	`for ( QStringList::Iterator itemPart = lines.begin(); itemPart != lines.end(); ++itemPart )`
`402`	`402`	`{`
`403`	`403`	`if ( painter ) drawText( painter, labelX, labelY, *itemPart , mItemFont );`
`404`		`- labelSize.rwidth() = qMax( textWidthMillimeters( mItemFont, *itemPart ), labelSize.width() );`
	`404`	`+ labelSize.rwidth() = qMax( textWidthMillimeters( mItemFont, *itemPart ), double(labelSize.width()) );`
`405`	`405`	`if ( itemPart != lines.end() )`
`406`	`406`	`{`
`407`	`407`	`labelY += mlineSpacing + textHeight;`
`@@ -1012,7 +1012,7 @@ void QgsComposerLegend::setColumns( QList<Atom>& atomList )`
`1012`	`1012`	`// Divide atoms to columns`
`1013`	`1013`	`double totalHeight = 0;`
`1014`	`1014`	`bool first = true;`
`1015`		`- double maxAtomHeight = 0;`
	`1015`	`+ qreal maxAtomHeight = 0;`
`1016`	`1016`	`foreach ( Atom atom, atomList )`
`1017`	`1017`	`{`
`1018`	`1018`	`if ( !first )`
`@@ -1073,7 +1073,7 @@ void QgsComposerLegend::setColumns( QList<Atom>& atomList )`
`1073`	`1073`	`}`
`1074`	`1074`
`1075`	`1075`	`// Alling labels of symbols for each layr/column to the same labelXOffset`
`1076`		`- QMap<QString, double> maxSymbolWidth;`
	`1076`	`+ QMap<QString, qreal> maxSymbolWidth;`
`1077`	`1077`	`for ( int i = 0; i < atomList.size(); i++ )`
`1078`	`1078`	`{`
`1079`	`1079`	`for ( int j = 0; j < atomList[i].nucleons.size(); j++ )`