r24844 by jghali - More fixes for Qt6

scribus-commit scribus-commit at lists.scribus.net
Sat Jan 29 23:16:58 UTC 2022


Author: jghali
Date: Sat Jan 29 23:16:58 2022
New Revision: 24844

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24844
Log:
More fixes for Qt6

Modified:
    trunk/Scribus/scribus/scribus.cpp

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24844&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp	(original)
+++ trunk/Scribus/scribus/scribus.cpp	Sat Jan 29 23:16:58 2022
@@ -28,6 +28,7 @@
 #include <QColor>
 #include <QColorDialog>
 #include <QCursor>
+#include <QDomDocument>
 #include <QDrag>
 #include <QDragEnterEvent>
 #include <QDropEvent>
@@ -8064,19 +8065,19 @@
 	QDomDocument docu("scridoc");
 	docu.setContent(objectString);
 	QDomElement elem = docu.documentElement();
-	QDomNode DOC = elem.firstChild();
+	QDomNode domNode = elem.firstChild();
 	bool first = true;
-	DOC = elem.firstChild();
-	while (!DOC.isNull())
-	{
-		QDomElement pg = DOC.toElement();
+	domNode = elem.firstChild();
+	while (!domNode.isNull())
+	{
+		QDomElement pg = domNode.toElement();
 		if (pg.tagName() == "ITEM")
 		{
 			if (first)
 				pg.setAttribute("ANNAME", doc->m_Selection->itemAt(0)->itemName());
 			first = false;
 		}
-		DOC = DOC.nextSibling();
+		domNode = domNode.nextSibling();
 	}
 	objectString = docu.toString();
 	scrapbookPalette->objFromMainMenu(objectString, scID);




More information about the scribus-commit mailing list