r17301 by craig - Complete qreal conversion for modetoolbar and avoid strange cast

[scribus-commit]

Author: craig
Date: Tue Feb 14 22:57:05 2012
New Revision: 17301

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17301
Log:
Complete qreal conversion for modetoolbar and avoid strange cast

Modified:
    branches/Version14x/Scribus/scribus/ui/modetoolbar.cpp
    branches/Version14x/Scribus/scribus/ui/modetoolbar.h

Modified: branches/Version14x/Scribus/scribus/ui/modetoolbar.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17301&path=/branches/Version14x/Scribus/scribus/ui/modetoolbar.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/ui/modetoolbar.cpp (original)
+++ branches/Version14x/Scribus/scribus/ui/modetoolbar.cpp Tue Feb 14 22:57:05 2012
@@ -40,7 +40,7 @@
 {
 	SubMode = 0;
 	ValCount = 32;
-	static double AutoShapes0[] = {0.0, 0.0, 0.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0,
+	static qreal AutoShapes0[] = {0.0, 0.0, 0.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0,
 									100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 0.0, 100.0, 0.0, 100.0,
 									0.0, 100.0, 0.0, 100.0, 0.0, 0.0, 0.0, 0.0};
 	ShapeVals = AutoShapes0;
@@ -101,7 +101,7 @@
 //	insertShapeButtonMenu->hide();
 	SubMode = s;
 	ValCount = c;
-	ShapeVals = (double*)vals;
+	ShapeVals = vals;
 	m_ScMW->scrActions["toolsInsertShape"]->setChecked(false);
 	m_ScMW->scrActions["toolsInsertShape"]->setChecked(true);
 }

Modified: branches/Version14x/Scribus/scribus/ui/modetoolbar.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17301&path=/branches/Version14x/Scribus/scribus/ui/modetoolbar.h
==============================================================================
--- branches/Version14x/Scribus/scribus/ui/modetoolbar.h (original)
+++ branches/Version14x/Scribus/scribus/ui/modetoolbar.h Tue Feb 14 22:57:05 2012
@@ -51,7 +51,7 @@
 
 	int SubMode;
 	int ValCount;
-	double *ShapeVals;
+	qreal *ShapeVals;
 	
 	virtual void changeEvent(QEvent *e);