[rkward-cvs] [rkward] rkward: Fix EBN issues

[Yuri Chornoivan]

Git commit 1885b2e04128a54951cf6e44517eb5db3452277d by Yuri Chornoivan.
Committed on 21/12/2014 at 09:13.
Pushed by yurchor into branch 'master'.

Fix EBN issues

M  +1    -1    rkward/plugin/rkpluginspinbox.cpp
M  +1    -1    rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp

http://commits.kde.org/rkward/1885b2e04128a54951cf6e44517eb5db3452277d

diff --git a/rkward/plugin/rkpluginspinbox.cpp b/rkward/plugin/rkpluginspinbox.cpp
index a0e6294..dda53d7 100644
--- a/rkward/plugin/rkpluginspinbox.cpp
+++ b/rkward/plugin/rkpluginspinbox.cpp
@@ -50,7 +50,7 @@ RKPluginSpinBox::RKPluginSpinBox (const QDomElement &element, RKComponent *paren
 	if (!intmode) {
 		double min = xml->getDoubleAttribute (element, "min", -FLT_MAX, DL_INFO);
 		double max = xml->getDoubleAttribute (element, "max", FLT_MAX, DL_INFO);
-		double initial = xml->getDoubleAttribute (element, "initial", qMin (max, qMax (min, 0.0)), DL_INFO);
+		double initial = xml->getDoubleAttribute (element, "initial", qMin (max, qMax (min, qreal(0.0))), DL_INFO);
 		int default_precision = xml->getIntAttribute (element, "default_precision", 2, DL_INFO);
 		int max_precision = xml->getIntAttribute (element, "max_precision", 8, DL_INFO);
 
diff --git a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp
index e98002d..831c71f 100644
--- a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp
+++ b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp
@@ -105,7 +105,7 @@ static QPen readSimplePen (QDataStream &instream) {
 	instream >> lwd >> lty;
 	if (!col.isValid () || (lty == -1L)) return QPen (Qt::NoPen);
 
-	lwd = qMax (1.0, lwd);	// minimum 1 px as in X11 device
+	lwd = qMax (qreal(1.0), lwd);	// minimum 1 px as in X11 device
 	QPen ret;
 	if (lty != 0) {	// solid
 		QVector<qreal> dashes;