r14875 by fschmid - Compile fixes for compiling with Qt-4.7.0-tp

[scribus-commit]

Revision: 14875
Author: fschmid
Date: 2010-03-13T19:37:27.056353Z
Commit message: Compile fixes for compiling with Qt-4.7.0-tp

Changeset: 
M  /trunk/Scribus/scribus/scribusdoc.cpp
M  /trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.h
M  /trunk/Scribus/scribus/scxmlstreamreader.cpp

Diffs:
Index: scribus/scribusdoc.cpp
===================================================================
--- scribus/scribusdoc.cpp	(revision 14874)
+++ scribus/scribusdoc.cpp	(revision 14875)
@@ -196,7 +196,7 @@
 	pageSets(appPrefsData.pageSets),
 	PageSp(1), PageSpa(0),
 	currentPageLayout(0),
-	PageOri(0), m_pageSize(0),
+	PageOri(0), m_pageSize(),
 	FirstPnum(1),
 	useRaster(false),
 	PageColors(this, true),
Index: scribus/scxmlstreamreader.cpp
===================================================================
--- scribus/scxmlstreamreader.cpp	(revision 14874)
+++ scribus/scxmlstreamreader.cpp	(revision 14875)
@@ -116,7 +116,6 @@
 	QStringRef att = value(QLatin1String(attrName));
 	if (!att.isEmpty())
 	{
-		bool success = false;
 		QString strVal = QString::fromRawData(att.constData(), att.length());
 		retValue = ScCLocale::toDoubleC(strVal, def);
 	}
@@ -129,7 +128,6 @@
 	QStringRef att = value(attrName);
 	if (!att.isEmpty())
 	{
-		bool success = false;
 		QString strVal = QString::fromRawData(att.constData(), att.length());
 		retValue = ScCLocale::toDoubleC(strVal, def);
 	}
Index: scribus/plugins/barcodegenerator/barcodegenerator.h
===================================================================
--- scribus/plugins/barcodegenerator/barcodegenerator.h	(revision 14874)
+++ scribus/plugins/barcodegenerator/barcodegenerator.h	(revision 14875)
@@ -104,7 +104,7 @@
 		\param dpi optional DPI value. Default is 72 for preview.
 		\retval bool true on success.
 		*/
-		bool paintBarcode(QString fileName = 0, int dpi = 72);
+		bool paintBarcode(QString fileName = "", int dpi = 72);
 		/*! \brief Create color preview.
 		Used for Color box feedback.
 		\param l A pointer to the sample QLabel