 scribus/plugins/fileloader/scribus150format/scribus150format.cpp | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------
 1 file changed, 54 insertions(+), 54 deletions(-)

diff --git a/scribus/plugins/fileloader/scribus150format/scribus150format.cpp b/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
index f54d6a7b8..42198bd23 100644
--- a/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
+++ b/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
@@ -320,7 +320,7 @@ bool Scribus150Format::loadElements(const QString& data, const QString& fileDir,
 		QXmlStreamReader::TokenType tType = reader.readNext();
 		if (tType != QXmlStreamReader::StartElement)
 			continue;
-		QStringView tagName = reader.name();
+		QString tagName = reader.name().toString();
 		attrs = reader.scAttributes();
 
 		if (firstElement)
@@ -846,7 +846,7 @@ bool Scribus150Format::loadStory(const QByteArray& data, StoryText& story, PageI
 		QXmlStreamReader::TokenType tType = reader.readNext();
 		if (tType != QXmlStreamReader::StartElement)
 			continue;
-		QStringView tagName = reader.name();
+		QString tagName = reader.name().toString();
 		attrs = reader.scAttributes();
 
 		if (firstElement)
@@ -1072,7 +1072,7 @@ bool Scribus150Format::loadPalette(const QString & fileName)
 		QXmlStreamReader::TokenType tType = reader.readNext();
 		if (tType != QXmlStreamReader::StartElement)
 			continue;
-		QStringView tagName = reader.name();
+		QString tagName = reader.name().toString();
 		attrs = reader.scAttributes();
 
 		if (m_mwProgressBar != nullptr)
@@ -1662,7 +1662,7 @@ bool Scribus150Format::loadFile(const QString & fileName, const FileFormat & /*
 		QXmlStreamReader::TokenType tType = reader.readNext();
 		if (tType != QXmlStreamReader::StartElement)
 			continue;
-		QStringView tagName = reader.name();
+		QString tagName = reader.name().toString();
 		attrs = reader.scAttributes();
 
 		if (m_mwProgressBar != nullptr)
@@ -2706,7 +2706,7 @@ bool Scribus150Format::readPageSets(ScribusDoc* doc, ScXmlStreamReader& reader)
 	while (!reader.atEnd() && !reader.hasError())
 	{
 		reader.readNext();
-		QStringView tagName = reader.name();
+		QString tagName = reader.name().toString();
 		if (reader.isStartElement())
 			attrs = reader.attributes();
 		if (reader.isEndElement() && tagName == QLatin1String("PageSets"))
@@ -2832,7 +2832,7 @@ bool Scribus150Format::readGradient(ScribusDoc *doc, VGradient &gra, ScXmlStream
 	gra = VGradient(VGradient::linear);
 	gra.clearStops();
 	ScXmlStreamAttributes rattrs = reader.scAttributes();
-	QStringView tagName = reader.name();
+	QString tagName = reader.name().toString();
 	while (!reader.atEnd() && !reader.hasError())
 	{
 		ScXmlStreamReader::TokenType tType = reader.readNext();
@@ -3208,7 +3208,7 @@ void Scribus150Format::readParagraphStyle(ScribusDoc *doc, ScXmlStreamReader& re
 	//	newStyle.tabValues().clear();
 	QList<ParagraphStyle::TabRecord> tbs;
 	newStyle.resetTabValues();
-	QStringView thisTagName = reader.name();
+	QString thisTagName = reader.name().toString();
 	while (!reader.atEnd() && !reader.hasError())
 	{
 		reader.readNext();
@@ -3251,7 +3251,7 @@ void Scribus150Format::readTableStyle(ScribusDoc *doc, ScXmlStreamReader& reader
 		newStyle.setFillColor(attrs.valueAsString("FillColor"));
 	if (attrs.hasAttribute("FillShade"))
 		newStyle.setFillShade(attrs.valueAsDouble("FillShade"));
-	QStringView tagName = reader.name();
+	QString tagName = reader.name().toString();
 	while (!reader.atEnd() && !reader.hasError())
 	{
 		reader.readNext();
@@ -3260,7 +3260,7 @@ void Scribus150Format::readTableStyle(ScribusDoc *doc, ScXmlStreamReader& reader
 		if (reader.name() == QLatin1String("TableBorderLeft"))
 		{
 			TableBorder border;
-			QStringView tagName = reader.name();
+			QString tagName = reader.name().toString();
 			while (!reader.atEnd() && !reader.hasError())
 			{
 				reader.readNext();
@@ -3281,7 +3281,7 @@ void Scribus150Format::readTableStyle(ScribusDoc *doc, ScXmlStreamReader& reader
 		else if (reader.name() == QLatin1String("TableBorderRight"))
 		{
 			TableBorder border;
-			QStringView tagName = reader.name();
+			QString tagName = reader.name().toString();
 			while (!reader.atEnd() && !reader.hasError())
 			{
 				reader.readNext();
@@ -3302,7 +3302,7 @@ void Scribus150Format::readTableStyle(ScribusDoc *doc, ScXmlStreamReader& reader
 		else if (reader.name() == QLatin1String("TableBorderTop"))
 		{
 			TableBorder border;
-			QStringView tagName = reader.name();
+			QString tagName = reader.name().toString();
 			while (!reader.atEnd() && !reader.hasError())
 			{
 				reader.readNext();
@@ -3323,7 +3323,7 @@ void Scribus150Format::readTableStyle(ScribusDoc *doc, ScXmlStreamReader& reader
 		else if (reader.name() == QLatin1String("TableBorderBottom"))
 		{
 			TableBorder border;
-			QStringView tagName = reader.name();
+			QString tagName = reader.name().toString();
 			while (!reader.atEnd() && !reader.hasError())
 			{
 				reader.readNext();
@@ -3372,7 +3372,7 @@ void Scribus150Format::readCellStyle(ScribusDoc *doc, ScXmlStreamReader& reader,
 	if (attrs.hasAttribute("BottomPadding"))
 		newStyle.setBottomPadding(attrs.valueAsDouble("BottomPadding", 0.0));
 
-	QStringView tagName = reader.name();
+	QString tagName = reader.name().toString();
 	while (!reader.atEnd() && !reader.hasError())
 	{
 		reader.readNext();
@@ -3381,7 +3381,7 @@ void Scribus150Format::readCellStyle(ScribusDoc *doc, ScXmlStreamReader& reader,
 		if (reader.name() == QLatin1String("TableBorderLeft"))
 		{
 			TableBorder border;
-			QStringView tagName = reader.name();
+			QString tagName = reader.name().toString();
 			while (!reader.atEnd() && !reader.hasError())
 			{
 				reader.readNext();
@@ -3402,7 +3402,7 @@ void Scribus150Format::readCellStyle(ScribusDoc *doc, ScXmlStreamReader& reader,
 		else if (reader.name() == QLatin1String("TableBorderRight"))
 		{
 			TableBorder border;
-			QStringView tagName = reader.name();
+			QString tagName = reader.name().toString();
 			while (!reader.atEnd() && !reader.hasError())
 			{
 				reader.readNext();
@@ -3423,7 +3423,7 @@ void Scribus150Format::readCellStyle(ScribusDoc *doc, ScXmlStreamReader& reader,
 		else if (reader.name() == QLatin1String("TableBorderTop"))
 		{
 			TableBorder border;
-			QStringView tagName = reader.name();
+			QString tagName = reader.name().toString();
 			while (!reader.atEnd() && !reader.hasError())
 			{
 				reader.readNext();
@@ -3444,7 +3444,7 @@ void Scribus150Format::readCellStyle(ScribusDoc *doc, ScXmlStreamReader& reader,
 		else if (reader.name() == QLatin1String("TableBorderBottom"))
 		{
 			TableBorder border;
-			QStringView tagName = reader.name();
+			QString tagName = reader.name().toString();
 			while (!reader.atEnd() && !reader.hasError())
 			{
 				reader.readNext();
@@ -3506,7 +3506,7 @@ bool Scribus150Format::readMultiline(multiLine& ml, ScXmlStreamReader& reader)
 {
 	ml = multiLine();
 	ScXmlStreamAttributes rattrs = reader.scAttributes();
-	QStringView tagName = reader.name();
+	QString tagName = reader.name().toString();
 	while (!reader.atEnd() && !reader.hasError())
 	{
 		ScXmlStreamReader::TokenType tType = reader.readNext();
@@ -3615,7 +3615,7 @@ bool Scribus150Format::readPDFOptions(ScribusDoc* doc, ScXmlStreamReader& reader
 	doc->pdfOptions().PageLayout    = attrs.valueAsInt("PageLayout", 0);
 	doc->pdfOptions().openAction    = attrs.valueAsString("openAction", "");
 
-	QStringView tagName = reader.name();
+	QString tagName = reader.name().toString();
 	while (!reader.atEnd() && !reader.hasError())
 	{
 		reader.readNext();
@@ -3623,7 +3623,7 @@ bool Scribus150Format::readPDFOptions(ScribusDoc* doc, ScXmlStreamReader& reader
 			break;
 		if (!reader.isStartElement())
 			continue;
-		QStringView tName = reader.name();
+		QString tName = reader.name().toString();
 		attrs = reader.scAttributes();
 		if (tName == QLatin1String("LPI"))
 		{
@@ -3705,11 +3705,11 @@ bool Scribus150Format::readPrinterOptions(ScribusDoc* doc, ScXmlStreamReader& re
 	doc->Print_Options.printerCommand = attrs.valueAsString("printerCommand");
 	doc->Print_Options.copies = 1;
 
-	QStringView tagName = reader.name();
+	QString tagName = reader.name().toString();
 	while (!reader.atEnd() && !reader.hasError())
 	{
 		ScXmlStreamReader::TokenType tType = reader.readNext();
-		QStringView tName = reader.name();
+		QString tName = reader.name().toString();
 		if (tType == ScXmlStreamReader::StartElement && tName == QLatin1String("Separation"))
 			doc->Print_Options.allSeparations.append(reader.attributes().value("Name").toString());
 		if (tType == ScXmlStreamReader::EndElement && tName == tagName)
@@ -3720,7 +3720,7 @@ bool Scribus150Format::readPrinterOptions(ScribusDoc* doc, ScXmlStreamReader& re
 
 bool Scribus150Format::readDocItemAttributes(ScribusDoc *doc, ScXmlStreamReader& reader)
 {
-	QStringView tagName = reader.name();
+	QString tagName = reader.name().toString();
 	doc->clearItemAttributes();
 	while (!reader.atEnd() && !reader.hasError())
 	{
@@ -3746,7 +3746,7 @@ bool Scribus150Format::readDocItemAttributes(ScribusDoc *doc, ScXmlStreamReader&
 
 bool Scribus150Format::readTableOfContents(ScribusDoc* doc, ScXmlStreamReader& reader)
 {
-	QStringView tagName = reader.name();
+	QString tagName = reader.name().toString();
 	m_Doc->clearTocSetups();
 	while (!reader.atEnd() && !reader.hasError())
 	{
@@ -3777,7 +3777,7 @@ bool Scribus150Format::readTableOfContents(ScribusDoc* doc, ScXmlStreamReader& r
 
 bool Scribus150Format::readNotesStyles(ScribusDoc* doc, ScXmlStreamReader& reader)
 {
-	QStringView tagName = reader.name();
+	QString tagName = reader.name().toString();
 	while (!reader.atEnd() && !reader.hasError())
 	{
 		reader.readNext();
@@ -3848,7 +3848,7 @@ bool Scribus150Format::readNotesStyles(ScribusDoc* doc, ScXmlStreamReader& reade
 bool Scribus150Format::readNotesFrames(ScXmlStreamReader& reader)
 {
 	notesFramesData.clear();
-	QStringView tagName = reader.name();
+	QString tagName = reader.name().toString();
 	while (!reader.atEnd() && !reader.hasError())
 	{
 		reader.readNext();
@@ -3880,7 +3880,7 @@ bool Scribus150Format::readNotesFrames(ScXmlStreamReader& reader)
 bool Scribus150Format::readNotes(ScribusDoc* doc, ScXmlStreamReader& reader)
 {
 	//read notes
-	QStringView tagName = reader.name();
+	QString tagName = reader.name().toString();
 	while (!reader.atEnd() && !reader.hasError())
 	{
 		reader.readNext();
@@ -3902,7 +3902,7 @@ bool Scribus150Format::readNotes(ScribusDoc* doc, ScXmlStreamReader& reader)
 
 bool Scribus150Format::readMarks(ScribusDoc* doc, ScXmlStreamReader& reader)
 {
-	QStringView tagName = reader.name();
+	QString tagName = reader.name().toString();
 	while (!reader.atEnd() && !reader.hasError())
 	{
 		reader.readNext();
@@ -3954,7 +3954,7 @@ bool Scribus150Format::readMarks(ScribusDoc* doc, ScXmlStreamReader& reader)
 
 bool Scribus150Format::readSections(ScribusDoc* doc, ScXmlStreamReader& reader)
 {
-	QStringView tagName = reader.name();
+	QString tagName = reader.name().toString();
 	while (!reader.atEnd() && !reader.hasError())
 	{
 		reader.readNext();
@@ -4013,7 +4013,7 @@ bool Scribus150Format::readHyphen(ScribusDoc *doc, ScXmlStreamReader& reader)
 	if (!doc->docHyphenator)
 		doc->createHyphenator();
 
-	QStringView tagName = reader.name();
+	QString tagName = reader.name().toString();
 	while (!reader.atEnd() && !reader.hasError())
 	{
 		reader.readNext();
@@ -4038,7 +4038,7 @@ bool Scribus150Format::readHyphen(ScribusDoc *doc, ScXmlStreamReader& reader)
 
 bool Scribus150Format::readPage(ScribusDoc* doc, ScXmlStreamReader& reader)
 {
-	QStringView tagName = reader.name();
+	QString tagName = reader.name().toString();
 
 	ScXmlStreamAttributes attrs = reader.scAttributes();
 	int     pageNum  = attrs.valueAsInt("NUM");
@@ -4123,7 +4123,7 @@ bool Scribus150Format::readPage(ScribusDoc* doc, ScXmlStreamReader& reader)
 
 bool Scribus150Format::readObject(ScribusDoc* doc, ScXmlStreamReader& reader, const ReadObjectParams& readObjectParams, ItemInfo& info)
 {
-	QStringView tagName = reader.name();
+	QString tagName = reader.name().toString();
 	ScXmlStreamAttributes attrs = reader.scAttributes();
 
 	bool savedMasterPageMode = doc->masterPageMode();
@@ -4230,7 +4230,7 @@ bool Scribus150Format::readObject(ScribusDoc* doc, ScXmlStreamReader& reader, co
 			break;
 		if (tType != ScXmlStreamReader::StartElement)
 			continue;
-		QStringView tName = reader.name();
+		QString tName = reader.name().toString();
 		ScXmlStreamAttributes tAtt = reader.scAttributes();
 		if (tName == QLatin1String("CSTOP"))
 		{
@@ -4699,7 +4699,7 @@ bool Scribus150Format::readPattern(ScribusDoc* doc, ScXmlStreamReader& reader, c
 	m_Doc->setMasterPageMode(false);
 	int itemCount1 = m_Doc->Items->count();
 
-	QStringView tagName = reader.name();
+	QString tagName = reader.name().toString();
 	while (!reader.atEnd() && !reader.hasError())
 	{
 		reader.readNext();
@@ -4918,7 +4918,7 @@ bool Scribus150Format::readPattern(ScribusDoc* doc, ScXmlStreamReader& reader, c
 
 bool Scribus150Format::readStoryText(ScribusDoc *doc, ScXmlStreamReader& reader, StoryText& story, PageItem* item)
 {
-	QStringView tagName = reader.name();
+	QString tagName = reader.name().toString();
 	ScXmlStreamAttributes attrs = reader.scAttributes();
 
 	LastStyles * lastStyle = new LastStyles();
@@ -4929,7 +4929,7 @@ bool Scribus150Format::readStoryText(ScribusDoc *doc, ScXmlStreamReader& reader,
 			break;
 		if (tType != ScXmlStreamReader::StartElement)
 			continue;
-		QStringView tName = reader.name();
+		QString tName = reader.name().toString();
 		ScXmlStreamAttributes tAtt = reader.scAttributes();
 
 		if (tName == QLatin1String("DefaultStyle"))
@@ -5201,7 +5201,7 @@ bool Scribus150Format::readItemText(StoryText& story, ScXmlStreamAttributes& att
 
 bool Scribus150Format::readPageItemAttributes(PageItem* item, ScXmlStreamReader& reader)
 {
-	QStringView tagName = reader.name();
+	QString tagName = reader.name().toString();
 	ObjAttrVector pageItemAttributes;
 	while (!reader.atEnd() && !reader.hasError())
 	{
@@ -6138,7 +6138,7 @@ bool Scribus150Format::readItemTableData(PageItem_Table* item, ScXmlStreamReader
 	if ((fColor != CommonStrings::None) && (!fColor.isEmpty()))
 		item->setFillColor(fColor);
 	item->setFillShade(attrs.valueAsInt("FillShade", 100));
-	QStringView tagName = reader.name();
+	QString tagName = reader.name().toString();
 	LastStyles lastStyle;
 	doc->dontResize = true;
 	while (!reader.atEnd() && !reader.hasError())
@@ -6156,7 +6156,7 @@ bool Scribus150Format::readItemTableData(PageItem_Table* item, ScXmlStreamReader
 		else if (reader.name() == QLatin1String("TableBorderLeft"))
 		{
 			TableBorder border;
-			QStringView tagName = reader.name();
+			QString tagName = reader.name().toString();
 			while (!reader.atEnd() && !reader.hasError())
 			{
 				reader.readNext();
@@ -6177,7 +6177,7 @@ bool Scribus150Format::readItemTableData(PageItem_Table* item, ScXmlStreamReader
 		else if (reader.name() == QLatin1String("TableBorderRight"))
 		{
 			TableBorder border;
-			QStringView tagName = reader.name();
+			QString tagName = reader.name().toString();
 			while (!reader.atEnd() && !reader.hasError())
 			{
 				reader.readNext();
@@ -6198,7 +6198,7 @@ bool Scribus150Format::readItemTableData(PageItem_Table* item, ScXmlStreamReader
 		else if (reader.name() == QLatin1String("TableBorderTop"))
 		{
 			TableBorder border;
-			QStringView tagName = reader.name();
+			QString tagName = reader.name().toString();
 			while (!reader.atEnd() && !reader.hasError())
 			{
 				reader.readNext();
@@ -6219,7 +6219,7 @@ bool Scribus150Format::readItemTableData(PageItem_Table* item, ScXmlStreamReader
 		else if (reader.name() == QLatin1String("TableBorderBottom"))
 		{
 			TableBorder border;
-			QStringView tagName = reader.name();
+			QString tagName = reader.name().toString();
 			while (!reader.atEnd() && !reader.hasError())
 			{
 				reader.readNext();
@@ -6250,7 +6250,7 @@ bool Scribus150Format::readItemTableData(PageItem_Table* item, ScXmlStreamReader
 
 bool Scribus150Format::readItemTableCell(PageItem_Table* item, ScXmlStreamReader& reader, ScribusDoc *doc)
 {
-	QStringView tagName = reader.name();
+	QString tagName = reader.name().toString();
 	ScXmlStreamAttributes tAtt = reader.scAttributes();
 	
 	int row = tAtt.valueAsInt("Row", -1);
@@ -6301,7 +6301,7 @@ bool Scribus150Format::readItemTableCell(PageItem_Table* item, ScXmlStreamReader
 		if (reader.name() == QLatin1String("TableBorderLeft"))
 		{
 			TableBorder border;
-			QStringView tagName = reader.name();
+			QString tagName = reader.name().toString();
 			while (!reader.atEnd() && !reader.hasError())
 			{
 				reader.readNext();
@@ -6322,7 +6322,7 @@ bool Scribus150Format::readItemTableCell(PageItem_Table* item, ScXmlStreamReader
 		else if (reader.name() == QLatin1String("TableBorderRight"))
 		{
 			TableBorder border;
-			QStringView tagName = reader.name();
+			QString tagName = reader.name().toString();
 			while (!reader.atEnd() && !reader.hasError())
 			{
 				reader.readNext();
@@ -6343,7 +6343,7 @@ bool Scribus150Format::readItemTableCell(PageItem_Table* item, ScXmlStreamReader
 		else if (reader.name() == QLatin1String("TableBorderTop"))
 		{
 			TableBorder border;
-			QStringView tagName = reader.name();
+			QString tagName = reader.name().toString();
 			while (!reader.atEnd() && !reader.hasError())
 			{
 				reader.readNext();
@@ -6364,7 +6364,7 @@ bool Scribus150Format::readItemTableCell(PageItem_Table* item, ScXmlStreamReader
 		else if (reader.name() == QLatin1String("TableBorderBottom"))
 		{
 			TableBorder border;
-			QStringView tagName = reader.name();
+			QString tagName = reader.name().toString();
 			while (!reader.atEnd() && !reader.hasError())
 			{
 				reader.readNext();
@@ -6399,7 +6399,7 @@ bool Scribus150Format::readItemTableCell(PageItem_Table* item, ScXmlStreamReader
 bool Scribus150Format::readLatexInfo(PageItem_LatexFrame* latexitem, ScXmlStreamReader& reader)
 {
 	ScXmlStreamAttributes attrs = reader.scAttributes();
-	QStringView tagName = reader.name();
+	QString tagName = reader.name().toString();
 
 	latexitem->setConfigFile(attrs.valueAsString("ConfigFile"), true);
 	latexitem->setDpi(attrs.valueAsInt("DPI"));
@@ -6520,7 +6520,7 @@ bool Scribus150Format::loadPage(const QString & fileName, int pageNumber, bool M
 		QXmlStreamReader::TokenType tType = reader.readNext();
 		if (tType != QXmlStreamReader::StartElement)
 			continue;
-		QStringView tagName = reader.name();
+		QString tagName = reader.name().toString();
 		attrs = reader.scAttributes();
 
 		if (firstElement)
@@ -7244,7 +7244,7 @@ bool Scribus150Format::readStyles(const QString& fileName, ScribusDoc* doc, Styl
 		QXmlStreamReader::TokenType tType = reader.readNext();
 		if (tType != QXmlStreamReader::StartElement)
 			continue;
-		QStringView tagName = reader.name();
+		QString tagName = reader.name().toString();
 		if (firstElement)
 		{
 			if (tagName != QLatin1String("SCRIBUSUTF8NEW"))
@@ -7284,7 +7284,7 @@ bool Scribus150Format::readCharStyles(const QString& fileName, ScribusDoc* doc,
 		QXmlStreamReader::TokenType tType = reader.readNext();
 		if (tType != QXmlStreamReader::StartElement)
 			continue;
-		QStringView tagName = reader.name();
+		QString tagName = reader.name().toString();
 		if (firstElement)
 		{
 			if (tagName != QLatin1String("SCRIBUSUTF8NEW"))
@@ -7322,7 +7322,7 @@ bool Scribus150Format::readLineStyles(const QString& fileName, QHash<QString,mul
 		QXmlStreamReader::TokenType tType = reader.readNext();
 		if (tType != QXmlStreamReader::StartElement)
 			continue;
-		QStringView tagName = reader.name();
+		QString tagName = reader.name().toString();
 		if (firstElement)
 		{
 			if (tagName != QLatin1String("SCRIBUSUTF8NEW"))
@@ -7372,7 +7372,7 @@ bool Scribus150Format::readColors(const QString& fileName, ColorList & colors)
 		QXmlStreamReader::TokenType tType = reader.readNext();
 		if (tType != QXmlStreamReader::StartElement)
 			continue;
-		QStringView tagName = reader.name();
+		QString tagName = reader.name().toString();
 		if (firstElement)
 		{
 			if (tagName != QLatin1String("SCRIBUSUTF8NEW"))
@@ -7419,7 +7419,7 @@ bool Scribus150Format::readPageCount(const QString& fileName, int *num1, int *nu
 		QXmlStreamReader::TokenType tType = reader.readNext();
 		if (tType != QXmlStreamReader::StartElement)
 			continue;
-		QStringView tagName = reader.name();
+		QString tagName = reader.name().toString();
 		if (firstElement)
 		{
 			if (tagName != QLatin1String("SCRIBUSUTF8NEW"))
