25 lines
1.3 KiB
Diff
25 lines
1.3 KiB
Diff
|
diff -up scribus-1.3.6/scribus/plugins/barcodegenerator/barcodegenerator.h.qstring scribus-1.3.6/scribus/plugins/barcodegenerator/barcodegenerator.h
|
||
|
|
--- scribus-1.3.6/scribus/plugins/barcodegenerator/barcodegenerator.h.qstring 2010-03-30 15:38:04.000000000 +0200
|
||
|
|
+++ scribus-1.3.6/scribus/plugins/barcodegenerator/barcodegenerator.h 2010-03-30 15:39:46.000000000 +0200
|
||
|
|
@@ -100,7 +100,7 @@ class BarcodeGenerator : public QDialog
|
||
|
|
\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::null, int dpi = 72);
|
||
|
|
/*! \brief Create color preview.
|
||
|
|
Used for Color box feedback.
|
||
|
|
\param l A pointer to the sample QLabel
|
||
|
|
diff -up scribus-1.3.6/scribus/scribusdoc.cpp.qstring scribus-1.3.6/scribus/scribusdoc.cpp
|
||
|
|
--- scribus-1.3.6/scribus/scribusdoc.cpp.qstring 2010-03-31 11:41:08.000000000 +0200
|
||
|
|
+++ scribus-1.3.6/scribus/scribusdoc.cpp 2010-03-31 11:40:45.000000000 +0200
|
||
|
|
@@ -189,7 +189,7 @@ ScribusDoc::ScribusDoc() : UndoObject( t
|
||
|
|
pageSets(prefsData.pageSets),
|
||
|
|
PageSp(1), PageSpa(0),
|
||
|
|
currentPageLayout(0),
|
||
|
|
- PageOri(0), m_pageSize(0),
|
||
|
|
+ PageOri(0), m_pageSize(QString::null),
|
||
|
|
FirstPnum(1),
|
||
|
|
useRaster(false),
|
||
|
|
PageColors(this, true),
|