r14950 by fschmid - Fixed Bug #8983: "QStrings initialized with 0 instead of QString::null"

[scribus-commit]

Revision: 14950
Author: fschmid
Date: 2010-03-31T20:07:05.223203Z
Commit message: Fixed Bug #8983: "QStrings initialized with 0 instead of QString::null"

Changeset: 
M  /branches/Version135/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.cpp
M  /branches/Version135/Scribus/scribus/scribusdoc.cpp
M  /branches/Version135/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.h

Diffs:
Index: scribus/scribusdoc.cpp
===================================================================
--- scribus/scribusdoc.cpp	(revision 14949)
+++ scribus/scribusdoc.cpp	(revision 14950)
@@ -189,7 +189,7 @@
 	pageSets(prefsData.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/plugins/barcodegenerator/barcodegenerator.cpp
===================================================================
--- scribus/plugins/barcodegenerator/barcodegenerator.cpp	(revision 14949)
+++ scribus/plugins/barcodegenerator/barcodegenerator.cpp	(revision 14950)
@@ -292,7 +292,7 @@
 
 bool BarcodeGenerator::paintBarcode(QString fileName, int dpi)
 {
-	if (fileName == QString::null)
+	if (fileName.isEmpty())
 		fileName = tmpFile;
 	QString opts("barcolor=%1 showbackground backgroundcolor=%2 textcolor=%3");
 	opts = opts.arg(lnColor.name().replace('#', "")) \
Index: scribus/plugins/barcodegenerator/barcodegenerator.h
===================================================================
--- scribus/plugins/barcodegenerator/barcodegenerator.h	(revision 14949)
+++ scribus/plugins/barcodegenerator/barcodegenerator.h	(revision 14950)
@@ -100,7 +100,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 = QString(), int dpi = 72);
 		/*! \brief Create color preview.
 		Used for Color box feedback.
 		\param l A pointer to the sample QLabel