r24875 by craig - Qt6 build fix
scribus-commit
scribus-commit at lists.scribus.net
Mon Jan 31 19:59:52 UTC 2022
Author: craig
Date: Mon Jan 31 19:59:52 2022
New Revision: 24875
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24875
Log:
Qt6 build fix
Modified:
trunk/Scribus/scribus/pdflib_core.cpp
trunk/Scribus/scribus/plugins/import/ai/importai.cpp
Modified: trunk/Scribus/scribus/pdflib_core.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24875&path=/trunk/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.cpp (original)
+++ trunk/Scribus/scribus/pdflib_core.cpp Mon Jan 31 19:59:52 2022
@@ -3286,8 +3286,8 @@
int pIndex = doc.MasterPages.indexOf((ScPage* const) pag) + 1;
QByteArray name = QByteArray("master_page_obj_%1_%2")
- .replace("%1", Pdf::toPdf(pIndex))
- .replace("%2", Pdf::toPdf(qHash(ite)));
+ .replace("%1", Pdf::toPdf(pIndex))
+ .replace("%2", Pdf::toPdf(qHash(ite)));
pageData.XObjects[name] = templateObject;
}
if (Options.exportsLayers())
@@ -3848,8 +3848,8 @@
continue;
QByteArray name = QByteArray("/master_page_obj_%1_%2")
- .replace("%1", Pdf::toPdf(mPageIndex))
- .replace("%2", Pdf::toPdf(qHash(ite)));
+ .replace("%1", Pdf::toPdf(mPageIndex))
+ .replace("%2", Pdf::toPdf(qHash(ite)));
if (!ite->isTextContainer())
{
if (((layer.transparency != 1) || (layer.blendMode != 0)) && Options.supportsTransparency())
Modified: trunk/Scribus/scribus/plugins/import/ai/importai.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24875&path=/trunk/Scribus/scribus/plugins/import/ai/importai.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ai/importai.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/ai/importai.cpp Mon Jan 31 19:59:52 2022
@@ -1360,7 +1360,7 @@
{
if (data.contains("~>"))
{
- dataString += data.midRef(1);
+ dataString += data.sliced(1);
dataMode = false;
QByteArray fData;
decodeA85(fData, dataString);
@@ -1419,7 +1419,7 @@
currentSpecialPath.svgInit();
}
else
- dataString += data.midRef(1);
+ dataString += data.sliced(1);
return;
}
getCommands(data, da);
More information about the scribus-commit
mailing list