r18110 by jghali - #11395: 1.4.2 doesn't compile on linux without CUPS

scribus-commit scribus-commit at lists.scribus.net
Wed Jan 23 22:01:38 UTC 2013


Author: jghali
Date: Wed Jan 23 22:01:37 2013
New Revision: 18110

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18110
Log:
#11395: 1.4.2 doesn't compile on linux without CUPS

Modified:
    trunk/Scribus/scribus/util_printer.cpp

Modified: trunk/Scribus/scribus/util_printer.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18110&path=/trunk/Scribus/scribus/util_printer.cpp
==============================================================================
--- trunk/Scribus/scribus/util_printer.cpp (original)
+++ trunk/Scribus/scribus/util_printer.cpp Wed Jan 23 22:01:37 2013
@@ -54,11 +54,11 @@
 	if ( printerInfos) free(printerInfos);
 #else
 	QString tmp;
-	QString Pcap;
 	QStringList wt;
-	if (loadText("/etc/printcap", &Pcap))
-	{
-		QDataStream ts(&Pcap, QIODevice::ReadOnly);
+	QByteArray printCap;
+	if (loadRawText("/etc/printcap", printCap))
+	{
+		QDataStream ts(&printCap, QIODevice::ReadOnly);
 		while(!ts.atEnd())
 		{
 			tmp = readLinefromDataStream(ts);




More information about the scribus-commit mailing list