r23654 by jghali - Revert changes brought by r23652 in PaletteLoader_CxF: given recent discussions on Qt dev ML, QList may end up staying in Qt6 and QVector be deprecated

scribus-commit scribus-commit at lists.scribus.net
Sun Apr 26 00:29:38 UTC 2020


Author: jghali
Date: Sun Apr 26 00:29:37 2020
New Revision: 23654

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23654
Log:
Revert changes brought by r23652 in PaletteLoader_CxF: given recent discussions on Qt dev ML, QList may end up staying in Qt6 and QVector be deprecated

Modified:
    trunk/Scribus/scribus/palettes/paletteloader_cxf.cpp

Modified: trunk/Scribus/scribus/palettes/paletteloader_cxf.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23654&path=/trunk/Scribus/scribus/palettes/paletteloader_cxf.cpp
==============================================================================
--- trunk/Scribus/scribus/palettes/paletteloader_cxf.cpp	(original)
+++ trunk/Scribus/scribus/palettes/paletteloader_cxf.cpp	Sun Apr 26 00:29:37 2020
@@ -6,7 +6,6 @@
 */
 
 #include <QScopedPointer>
-#include <QVector>
 
 #include "lcms2.h"
 #include "paletteloader_cxf.h"
@@ -95,7 +94,7 @@
 		colorspaces = cxfImportDia->priorities();
 	}
 
-	QVector<PaletteLoader_CxF::ColorImportFunction> importFunctions;
+	QList<PaletteLoader_CxF::ColorImportFunction> importFunctions;
 	for (int i = 0; i < colorspaces.count(); ++i)
 	{
 		eColorSpaceType colorspace = colorspaces.at(i);




More information about the scribus-commit mailing list