r20331 by craig - Barcode Generator update from Terry: Store and show barcode entry errors to the user

[scribus-commit]

Author: craig
Date: Sun Aug 16 12:35:19 2015
New Revision: 20331

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20331
Log:
Barcode Generator update from Terry: Store and show barcode entry errors to the user

Modified:
    trunk/Scribus/scribus/util_ghostscript.cpp
    trunk/Scribus/scribus/util_ghostscript.h

Modified: trunk/Scribus/scribus/util_ghostscript.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20331&path=/trunk/Scribus/scribus/util_ghostscript.cpp
==============================================================================
--- trunk/Scribus/scribus/util_ghostscript.cpp (original)
+++ trunk/Scribus/scribus/util_ghostscript.cpp Sun Aug 16 12:35:19 2015
@@ -59,7 +59,7 @@
 using namespace std;
 
 
-int callGS(const QStringList& args_in, const QString device)
+int callGS(const QStringList& args_in, const QString device, const QString fileStdErr, const QString fileStdOut)
 {
 	QString cmd;
  	QStringList args;
@@ -97,7 +97,7 @@
 	args.append("-c");
 	args.append("showpage");
 //	qDebug(args.join(" ").toLatin1());
-	return System( getShortPathName(prefsManager->ghostscriptExecutable()), args );
+	return System( getShortPathName(prefsManager->ghostscriptExecutable()), args, fileStdErr, fileStdOut );
 }
 
 int callGS(const QString& args_in, const QString device)

Modified: trunk/Scribus/scribus/util_ghostscript.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20331&path=/trunk/Scribus/scribus/util_ghostscript.h
==============================================================================
--- trunk/Scribus/scribus/util_ghostscript.h (original)
+++ trunk/Scribus/scribus/util_ghostscript.h Sun Aug 16 12:35:19 2015
@@ -38,7 +38,7 @@
    * @param args_in Custom arguments to GhostScript
    * @param device GS device to use (defaults to an image device if omitted)
  */
-int     SCRIBUS_API callGS(const QStringList& args_in, const QString device="");
+int     SCRIBUS_API callGS(const QStringList& args_in, const QString device="", const QString fileStdErr = "", const QString fileStdOut = "");
 int     SCRIBUS_API callGS(const QString& args_in, const QString device="");
 int     SCRIBUS_API convertPS2PS(QString in, QString out, const QStringList& opts, int level);
 int     SCRIBUS_API convertPS2PDF(QString in, QString out, const QStringList& opts);