r24879 by craig - Qt6 build fix: if not windows, add in size_t based functions for

scribus-commit scribus-commit at lists.scribus.net
Mon Jan 31 21:41:39 UTC 2022


Author: craig
Date: Mon Jan 31 21:41:38 2022
New Revision: 24879

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24879
Log:
Qt6 build fix: if not windows, add in size_t based functions for
conversions for QByteArray

Modified:
    trunk/Scribus/scribus/pdfwriter.cpp
    trunk/Scribus/scribus/pdfwriter.h
    trunk/Scribus/scribus/scxmlstreamwriter.h

Modified: trunk/Scribus/scribus/pdfwriter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24879&path=/trunk/Scribus/scribus/pdfwriter.cpp
==============================================================================
--- trunk/Scribus/scribus/pdfwriter.cpp	(original)
+++ trunk/Scribus/scribus/pdfwriter.cpp	Mon Jan 31 21:41:38 2022
@@ -328,7 +328,13 @@
 	{
 		return QByteArray::number(v);
 	}
-	
+
+#ifndef Q_OS_WIN
+	QByteArray toPdf(size_t v)
+	{
+		return QByteArray::number(v);
+	}
+#endif
 	QByteArray toPdf(double v)
 	{
 		return QByteArray::number(v, 'f');

Modified: trunk/Scribus/scribus/pdfwriter.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24879&path=/trunk/Scribus/scribus/pdfwriter.h
==============================================================================
--- trunk/Scribus/scribus/pdfwriter.h	(original)
+++ trunk/Scribus/scribus/pdfwriter.h	Mon Jan 31 21:41:38 2022
@@ -69,16 +69,23 @@
 	 Cf. PDF32000-2008, 7.3.3
 	 */
 	QByteArray toPdf(uint v);
-	
+
 	/**
 	 Cf. PDF32000-2008, 7.3.3
 	 */
 	QByteArray toPdf(qlonglong v);
-	
+
 	/**
 	 Cf. PDF32000-2008, 7.3.3
 	 */
 	QByteArray toPdf(qulonglong v);
+	
+	/**
+	 Cf. PDF32000-2008, 7.3.3
+	 */
+#ifndef Q_OS_WIN
+	QByteArray toPdf(size_t v);
+#endif
 	
 	/**
 	 Cf. PDF32000-2008, 7.3.3

Modified: trunk/Scribus/scribus/scxmlstreamwriter.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24879&path=/trunk/Scribus/scribus/scxmlstreamwriter.h
==============================================================================
--- trunk/Scribus/scribus/scxmlstreamwriter.h	(original)
+++ trunk/Scribus/scribus/scxmlstreamwriter.h	Mon Jan 31 21:41:38 2022
@@ -27,6 +27,9 @@
 	void writeAttribute(const QString & name, int64_t value)    { QXmlStreamWriter::writeAttribute(name, QString::number(value)); }
 	void writeAttribute(const QString & name, uint value)   { QXmlStreamWriter::writeAttribute(name, QString::number(value)); }
 	void writeAttribute(const QString & name, uint64_t value)   { QXmlStreamWriter::writeAttribute(name, QString::number(value)); }
+#ifndef Q_OS_WIN
+	void writeAttribute(const QString & name, size_t value)   { QXmlStreamWriter::writeAttribute(name, QString::number(value)); }
+#endif
 	void writeAttribute(const QString & name, double value) { QXmlStreamWriter::writeAttribute(name, QString::number(value, 'g', 15)); }
 };
 




More information about the scribus-commit mailing list