diff -up kst-2.0.6/src/libkstapp/arrowitem.cpp.fix-qreal-vs-double-for-arm kst-2.0.6/src/libkstapp/arrowitem.cpp
--- kst-2.0.6/src/libkstapp/arrowitem.cpp.fix-qreal-vs-double-for-arm 2012-07-22 08:24:59.000000000 -0500
+++ kst-2.0.6/src/libkstapp/arrowitem.cpp 2013-03-19 09:55:52.156800203 -0500
@@ -65,7 +65,7 @@ void ArrowItem::paint(QPainter *painter)
double sina = sin(theta);
double cosa = cos(theta);
double yin = sqrt(3.0) * deltax;
- double x1, y1, x2, y2;
+ qreal x1, y1, x2, y2;
QMatrix m(cosa, sina, -sina, cosa, 0.0, 0.0);
m.map( deltax, yin, &x1, &y1);
@@ -86,7 +86,7 @@ void ArrowItem::paint(QPainter *painter)
double sina = sin(theta);
double cosa = cos(theta);
double yin = sqrt(3.0) * deltax;
- double x1, y1, x2, y2;
+ qreal x1, y1, x2, y2;
QMatrix m(cosa, sina, -sina, cosa, 0.0, 0.0);
m.map( deltax, yin, &x1, &y1);
diff -up kst-2.0.6/src/libkstapp/mainwindow.cpp.fix-qreal-vs-double-for-arm kst-2.0.6/src/libkstapp/mainwindow.cpp
--- kst-2.0.6/src/libkstapp/mainwindow.cpp.fix-qreal-vs-double-for-arm 2012-07-22 08:24:59.000000000 -0500
+++ kst-2.0.6/src/libkstapp/mainwindow.cpp 2013-03-19 09:55:52.156800203 -0500
@@ -673,7 +673,7 @@ void MainWindow::savePrinterDefaults(QPr
_dialogDefaults->setValue("print/landscape", printer->orientation() == QPrinter::Landscape);
_dialogDefaults->setValue("print/paperSize", int(printer->paperSize()));
- double left, top, right, bottom;
+ qreal left, top, right, bottom;
printer->getPageMargins(&left, &top, &right, &bottom, QPrinter::Millimeter);
_dialogDefaults->setValue("print/topLeftMargin", QPointF(left, top));
_dialogDefaults->setValue("print/bottomRightMargin", QPointF(right, bottom));
diff -up kst-2.0.6/src/libkstapp/plotaxis.cpp.fix-qreal-vs-double-for-arm kst-2.0.6/src/libkstapp/plotaxis.cpp
--- kst-2.0.6/src/libkstapp/plotaxis.cpp.fix-qreal-vs-double-for-arm 2012-07-22 08:24:59.000000000 -0500
+++ kst-2.0.6/src/libkstapp/plotaxis.cpp 2013-03-19 09:55:52.157800190 -0500
@@ -772,8 +772,8 @@ bool PlotAxis::isLinearTickMode() {
}
void PlotAxis::updateInterpretTicks(MajorTickMode tickMode) {
- double min;
- double max;
+ qreal min;
+ qreal max;
if (_orientation == Qt::Horizontal) {
min = plotItem()->projectionRect().left();
@@ -788,9 +788,9 @@ void PlotAxis::updateInterpretTicks(Majo
double max_jd = convertTimeValueToJD(max);
double range_jd = fabs(max_jd - min_jd);
double base_jd;
- double range_u;
- double tickspacing_u;
- double tickspacing;
+ qreal range_u;
+ qreal tickspacing_u;
+ qreal tickspacing;
QString units;
double minimum_units = tickMode;
diff -up kst-2.0.6/src/libkstapp/plotitem.cpp.fix-qreal-vs-double-for-arm kst-2.0.6/src/libkstapp/plotitem.cpp
--- kst-2.0.6/src/libkstapp/plotitem.cpp.fix-qreal-vs-double-for-arm 2012-07-22 08:24:59.000000000 -0500
+++ kst-2.0.6/src/libkstapp/plotitem.cpp 2013-03-19 09:55:52.158800178 -0500
@@ -975,7 +975,7 @@ void PlotItem::paintPlot(QPainter *paint
}
if (isUseAxisScale()) {
QFont font(painter->font());
- qreal pointSize = qMax((font.pointSizeF() * _numberAxisLabelScaleFactor), ApplicationSettings::self()->minimumFontSize());
+ qreal pointSize = qMax((font.pointSizeF() * _numberAxisLabelScaleFactor), (qreal)(ApplicationSettings::self()->minimumFontSize()));
font.setPointSizeF(pointSize);
painter->setFont(font);
@@ -2699,7 +2699,7 @@ void PlotItem::computedRelationalMax(qre
if (relation->ignoreAutoScale())
continue;
- qreal min, max;
+ double min, max;
relation->yRange(projectionRect().left(),
projectionRect().right(),
&min, &max);
@@ -2707,11 +2707,11 @@ void PlotItem::computedRelationalMax(qre
//If the axis is in log mode, the lower extent will be the
//minimum value larger than zero.
if (yAxis()->axisLog())
- minimum = minimum <= 0.0 ? min : qMin(min, minimum);
+ minimum = minimum <= 0.0 ? min : qMin((qreal)min, minimum);
else
- minimum = qMin(min, minimum);
+ minimum = qMin((qreal)min, minimum);
- maximum = qMax(max, maximum);
+ maximum = qMax((qreal)max, maximum);
}
}
}
diff -up kst-2.0.6/src/libkstapp/plotrenderitem.cpp.fix-qreal-vs-double-for-arm kst-2.0.6/src/libkstapp/plotrenderitem.cpp
--- kst-2.0.6/src/libkstapp/plotrenderitem.cpp.fix-qreal-vs-double-for-arm 2012-07-22 08:24:59.000000000 -0500
+++ kst-2.0.6/src/libkstapp/plotrenderitem.cpp 2013-03-19 09:55:52.159800165 -0500
@@ -712,9 +712,9 @@ void PlotRenderItem::highlightNearestDat
bool bFoundImage = false;
qreal distance, minDistance = 1.0E300;
- qreal x, y;
+ double x, y;
QPointF matchedPoint;
- qreal imageZ;
+ double imageZ;
qreal dxPerPix = double(projectionRect().width())/double(rect().width());
foreach(RelationPtr relation, relationList()) {
diff -up kst-2.0.6/src/libkstapp/viewitem.cpp.fix-qreal-vs-double-for-arm kst-2.0.6/src/libkstapp/viewitem.cpp
--- kst-2.0.6/src/libkstapp/viewitem.cpp.fix-qreal-vs-double-for-arm 2012-07-22 08:24:59.000000000 -0500
+++ kst-2.0.6/src/libkstapp/viewitem.cpp 2013-03-19 09:55:52.159800165 -0500
@@ -1087,8 +1087,8 @@ void ViewItem::creationPolygonChanged(Vi
if (event == View::MouseMove) {
const QPolygonF poly = mapFromScene(view()->creationPolygon(View::MouseMove));
- double x0 = qMin(0.0, poly.last().x());
- double y0 = qMin(0.0, poly.last().y());
+ double x0 = qMin((qreal)0.0, poly.last().x());
+ double y0 = qMin((qreal)0.0, poly.last().y());
QRectF newRect(x0, y0, fabs(poly.last().x()), fabs(poly.last().y()));
setViewRect(newRect);
return;
@@ -1096,14 +1096,14 @@ void ViewItem::creationPolygonChanged(Vi
if (event == View::MouseRelease) {
const QPolygonF poly = mapFromScene(view()->creationPolygon(View::MouseRelease));
- double x0 = qMin(0.0, poly.last().x());
- double y0 = qMin(0.0, poly.last().y());
+ double x0 = qMin((qreal)0.0, poly.last().x());
+ double y0 = qMin((qreal)0.0, poly.last().y());
QRectF newRect(x0, y0, fabs(poly.last().x()), fabs(poly.last().y()));
if (!newRect.isValid()) {
newRect = newRect.normalized();
- newRect.setWidth(qMax(3.0, newRect.width()));
- newRect.setHeight(qMax(3.0, newRect.height()));
+ newRect.setWidth(qMax((qreal)3.0, newRect.width()));
+ newRect.setHeight(qMax((qreal)3.0, newRect.height()));
setPos(pos() + newRect.topLeft());
newRect.moveTopLeft(QPointF(0, 0));
@@ -1262,7 +1262,7 @@ void ViewItem::startDragging(QWidget *wi
qreal x2 = x1+x3;
qreal dx;
- dx = qMin(0.0, x1);
+ dx = qMin((qreal)0.0, x1);
dx = qMin(x2,dx);
dx = qMin(x3,dx);
@@ -1271,7 +1271,7 @@ void ViewItem::startDragging(QWidget *wi
qreal y2 = y1+y3;
qreal dy;
- dy = qMin(0.0, y1);
+ dy = qMin((qreal)0.0, y1);
dy = qMin(y2,dy);
dy = qMin(y3,dy);
diff -up kst-2.0.6/src/libkstmath/image.cpp.fix-qreal-vs-double-for-arm kst-2.0.6/src/libkstmath/image.cpp
--- kst-2.0.6/src/libkstmath/image.cpp.fix-qreal-vs-double-for-arm 2012-07-22 08:24:59.000000000 -0500
+++ kst-2.0.6/src/libkstmath/image.cpp 2013-03-19 11:39:08.055340812 -0500
@@ -780,7 +780,7 @@ void Image::paintLegendSymbol(QPainter *
QRect bound(QPoint(0,0),size);
if (hasColorMap() && (_pal.colorCount()>0)) {
- double spacing;
+ qreal spacing;
int minor_ticks;
computeMajorTickSpacing(&spacing, &minor_ticks, TicksCoarse, upperThreshold() - lowerThreshold());
diff -up kst-2.0.6/src/libkstmath/plottickcalculator.cpp.fix-qreal-vs-double-for-arm kst-2.0.6/src/libkstmath/plottickcalculator.cpp
--- kst-2.0.6/src/libkstmath/plottickcalculator.cpp.fix-qreal-vs-double-for-arm 2012-07-22 08:24:59.000000000 -0500
+++ kst-2.0.6/src/libkstmath/plottickcalculator.cpp 2013-03-19 12:17:16.231734670 -0500
@@ -26,7 +26,7 @@ namespace Kst {
* on the axis (but at least 2). The value of M is set by the requested
* MajorTickMode.
*/
-void computeMajorTickSpacing(double *major_spacing, int *minor_count, MajorTickMode majorTickCount, double R) {
+void computeMajorTickSpacing(qreal *major_spacing, int *minor_count, MajorTickMode majorTickCount, qreal R) {
qreal M = majorTickCount;
qreal B = floor(log10(R/M));
@@ -63,7 +63,7 @@ void computeMajorTickSpacing(double *maj
}
// compute the major ticks for hours (base = 24) or min/sec (base = 60)
-void computeMajorTickSpacing(double *major_spacing, int *minor_count, MajorTickMode majorTickCount, double R, timeUnits time_units) {
+void computeMajorTickSpacing(qreal *major_spacing, int *minor_count, MajorTickMode majorTickCount, qreal R, timeUnits time_units) {
double base60list[] = {1.0,2.0,5.0,10.0,20.0,30.0,60.0};
int minorlist_minutes[] = { 6, 4, 5, 5, 4, 6, 4};
int minorlist_seconds[] = { 5, 4, 5, 5, 4, 6, 6};
diff -up kst-2.0.6/src/libkstmath/plottickcalculator.h.fix-qreal-vs-double-for-arm kst-2.0.6/src/libkstmath/plottickcalculator.h
--- kst-2.0.6/src/libkstmath/plottickcalculator.h.fix-qreal-vs-double-for-arm 2012-07-22 08:24:59.000000000 -0500
+++ kst-2.0.6/src/libkstmath/plottickcalculator.h 2013-03-19 09:55:52.160800153 -0500
@@ -27,8 +27,8 @@ enum MajorTickMode {
enum timeUnits {Hour, Minute, Second};
-KSTMATH_EXPORT void computeMajorTickSpacing(double *major_spacing, int *minor_count, MajorTickMode majorTickCount, double range);
-KSTMATH_EXPORT void computeMajorTickSpacing(double *major_spacing, int *minor_count, MajorTickMode majorTickCount, double range, timeUnits time_units);
+KSTMATH_EXPORT void computeMajorTickSpacing(qreal *major_spacing, int *minor_count, MajorTickMode majorTickCount, qreal range);
+KSTMATH_EXPORT void computeMajorTickSpacing(qreal *major_spacing, int *minor_count, MajorTickMode majorTickCount, qreal range, timeUnits time_units);
}
