r23488 by jghali - Rename PageItems's EmProfile, IProfile and IRender to something more understandable

scribus-commit scribus-commit at lists.scribus.net
Sun Mar 8 16:41:10 UTC 2020


Author: jghali
Date: Sun Mar  8 16:41:10 2020
New Revision: 23488

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23488
Log:
Rename PageItems's EmProfile, IProfile and IRender to something more understandable 

Modified:
    trunk/Scribus/scribus/canvasmode_imageimport.cpp
    trunk/Scribus/scribus/pageitem.cpp
    trunk/Scribus/scribus/pageitem.h
    trunk/Scribus/scribus/pageitem_imageframe.cpp
    trunk/Scribus/scribus/pdflib_core.cpp
    trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp
    trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.h
    trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
    trunk/Scribus/scribus/pslib.cpp
    trunk/Scribus/scribus/scimage.cpp
    trunk/Scribus/scribus/scpageoutput.cpp
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/scribusdoc.cpp
    trunk/Scribus/scribus/ui/effectsdialog.cpp
    trunk/Scribus/scribus/ui/propertiespalette_image.cpp

Modified: trunk/Scribus/scribus/canvasmode_imageimport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23488&path=/trunk/Scribus/scribus/canvasmode_imageimport.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_imageimport.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_imageimport.cpp	Sun Mar  8 16:41:10 2020
@@ -228,11 +228,11 @@
 void CanvasMode_ImageImport::setImage(PageItem *currItem)
 {
 	QString fileName = m_imageList.takeFirst();
-	currItem->EmProfile = "";
+	currItem->EmbeddedProfile.clear();
 	currItem->pixm.imgInfo.isRequest = false;
 	currItem->UseEmbedded = true;
-	currItem->IProfile = m_doc->cmsSettings().DefaultImageRGBProfile;
-	currItem->IRender = m_doc->cmsSettings().DefaultIntentImages;
+	currItem->ImageProfile = m_doc->cmsSettings().DefaultImageRGBProfile;
+	currItem->ImageIntent = m_doc->cmsSettings().DefaultIntentImages;
 	qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
 	m_doc->loadPict(fileName, currItem, false, true);
 	// Call to showScaleAndOffset() is now very likely unnecessary

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23488&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp	(original)
+++ trunk/Scribus/scribus/pageitem.cpp	Sun Mar  8 16:41:10 2020
@@ -164,10 +164,10 @@
 	Pfile(other.Pfile),
 	Pfile2(other.Pfile2),
 	Pfile3(other.Pfile3),
-	IProfile(other.IProfile),
+	ImageProfile(other.ImageProfile),
 	UseEmbedded(other.UseEmbedded),
-	EmProfile(other.EmProfile),
-	IRender(other.IRender),
+	EmbeddedProfile(other.EmbeddedProfile),
+	ImageIntent(other.ImageIntent),
 	OverrideCompressionMethod(other.OverrideCompressionMethod),
 	CompressionMethodIndex(other.CompressionMethodIndex),
 	OverrideCompressionQuality(other.OverrideCompressionQuality),
@@ -645,8 +645,8 @@
 	Sizing = false;
 //	toPixmap = false;
 	UseEmbedded = true;
-	IRender = Intent_Relative_Colorimetric;
-	EmProfile = "";
+	ImageIntent = Intent_Relative_Colorimetric;
+	EmbeddedProfile.clear();
 	groupItemList.clear();
 	groupWidth = 1.0;
 	groupHeight = 1.0;
@@ -9367,7 +9367,7 @@
 		gsRes = PrefsManager::instance().gsResolution();
 	bool dummy;
 
-	CMSettings cms(m_Doc, IProfile, IRender);
+	CMSettings cms(m_Doc, ImageProfile, ImageIntent);
 	cms.setUseEmbeddedProfile(UseEmbedded);
 	cms.allowSoftProofing(true);
 
@@ -9460,14 +9460,14 @@
 		effectsInUse.clear();
 		imgcache.delModifier("effectsInUse");
 	}
-	UseEmbedded=pixm.imgInfo.isEmbedded;
+	UseEmbedded = pixm.imgInfo.isEmbedded;
 	if (pixm.imgInfo.isEmbedded)
 	{
-		IProfile = "Embedded " + pixm.imgInfo.profileName;
-		EmProfile = "Embedded " + pixm.imgInfo.profileName;
-	}
-	else
-		IProfile = pixm.imgInfo.profileName;
+		ImageProfile = "Embedded " + pixm.imgInfo.profileName;
+		EmbeddedProfile = "Embedded " + pixm.imgInfo.profileName;
+	}
+	else
+		ImageProfile = pixm.imgInfo.profileName;
 
 	adjustPictScale();
 

Modified: trunk/Scribus/scribus/pageitem.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23488&path=/trunk/Scribus/scribus/pageitem.h
==============================================================================
--- trunk/Scribus/scribus/pageitem.h	(original)
+++ trunk/Scribus/scribus/pageitem.h	Sun Mar  8 16:41:10 2020
@@ -446,8 +446,8 @@
 
 	bool useEmbeddedImageProfile() const { return UseEmbedded; }
 	void setUseEmbeddedImageProfile(bool val) { UseEmbedded = val; }
-	QString embeddedImageProfile() const { return EmProfile; }
-	void setEmbeddedImageProfile(const QString& val) { EmProfile = val; }
+	QString embeddedImageProfile() const { return EmbeddedProfile; }
+	void setEmbeddedImageProfile(const QString& val) { EmbeddedProfile = val; }
 	bool drawFrame() { return ((m_itemType == TextFrame && !m_sampleItem) || (m_itemType == ImageFrame) || (m_itemType == PathText)); }
 	QString externalFile() const { return Pfile; }
 	void setExternalFile(const QString& filename, const QString& baseDir = QString());
@@ -460,10 +460,10 @@
 	QString fileIconRollover() const { return Pfile3; }
 	void setFileIconRollover(const QString& filename, const QString& baseDir = QString());
 
-	int  cmsRenderingIntent() const { return IRender; }
-	void setCmsRenderingIntent(eRenderIntent val) { IRender = val; }
-	QString cmsProfile() const { return IProfile; }
-	void setCmsProfile(const QString& val) { IProfile = val; }
+	int  cmsRenderingIntent() const { return ImageIntent; }
+	void setCmsRenderingIntent(eRenderIntent val) { ImageIntent = val; }
+	QString cmsProfile() const { return ImageProfile; }
+	void setCmsProfile(const QString& val) { ImageProfile = val; }
 	void setOverrideCompressionMethod(bool val) { OverrideCompressionMethod = val; }
 	void setCompressionMethodIndex(int val) { CompressionMethodIndex = val; }
 	void setOverrideCompressionQuality(bool val) { OverrideCompressionQuality = val; }
@@ -1345,10 +1345,10 @@
 	QString Pfile; ///< Dateiname des Bildes
 	QString Pfile2;
 	QString Pfile3;
-	QString IProfile;
+	QString ImageProfile;
 	bool UseEmbedded;
-	QString EmProfile;
-	eRenderIntent IRender;
+	QString EmbeddedProfile;
+	eRenderIntent ImageIntent;
 	bool OverrideCompressionMethod;
 	int CompressionMethodIndex;
 	bool OverrideCompressionQuality;

Modified: trunk/Scribus/scribus/pageitem_imageframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23488&path=/trunk/Scribus/scribus/pageitem_imageframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_imageframe.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_imageframe.cpp	Sun Mar  8 16:41:10 2020
@@ -233,7 +233,7 @@
 	}
 	effectsInUse.clear();
 	imageIsAvailable = false;
-	Pfile = "";
+	Pfile.clear();
 	pixm = ScImage();
 
 	m_imageXScale = 1;
@@ -244,7 +244,8 @@
 	m_imageYOffset = 0;
 	setImageFlippedH(false);
 	setImageFlippedV(false);
-	EmProfile = "";
+	EmbeddedProfile.clear();
+	UseEmbedded = true; // Otherwise embedded profile will never be used when reloading image
 	ScaleType = m_Doc->prefsData().itemToolPrefs.imageScaleType;;
 	AspectRatio = m_Doc->prefsData().itemToolPrefs.imageAspectRatio;
 	setFillTransparency(0.0);

Modified: trunk/Scribus/scribus/pdflib_core.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23488&path=/trunk/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.cpp	(original)
+++ trunk/Scribus/scribus/pdflib_core.cpp	Sun Mar  8 16:41:10 2020
@@ -2832,7 +2832,7 @@
 							PutPage(SetImagePathAndClip(ite));
 						if ((ite->imageIsAvailable) && (!ite->Pfile.isEmpty()))
 						{
-							if (!PDF_Image(ite, ite->Pfile, ite->imageXScale(), ite->imageYScale(), ite->imageXOffset(), -ite->imageYOffset(), false, ite->IProfile, ite->UseEmbedded, ite->IRender, &tmpOut))
+							if (!PDF_Image(ite, ite->Pfile, ite->imageXScale(), ite->imageYScale(), ite->imageXOffset(), -ite->imageYOffset(), false, ite->ImageProfile, ite->UseEmbedded, ite->ImageIntent, &tmpOut))
 								return false;
 							PutPage(tmpOut);
 						}
@@ -4572,7 +4572,7 @@
 				tmp += SetImagePathAndClip(ite);
 			if ((ite->imageIsAvailable) && (!ite->Pfile.isEmpty()))
 			{
-				if (!PDF_Image(ite, ite->Pfile, ite->imageXScale(), ite->imageYScale(), ite->imageXOffset(), -ite->imageYOffset(), false, ite->IProfile, ite->UseEmbedded, ite->IRender, &tmpOut))
+				if (!PDF_Image(ite, ite->Pfile, ite->imageXScale(), ite->imageYScale(), ite->imageXOffset(), -ite->imageYOffset(), false, ite->ImageProfile, ite->UseEmbedded, ite->ImageIntent, &tmpOut))
 					return false;
 				tmp += tmpOut;
 			}

Modified: trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23488&path=/trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp	Sun Mar  8 16:41:10 2020
@@ -1060,7 +1060,7 @@
 			ob6.setAttribute("clip-path", "url(#" + ob2.attribute("id") + ")");
 		QDomElement ob3 = m_domDoc.createElement("image");
 		ScImage img;
-		CMSettings cms(m_Doc, item->IProfile, item->IRender);
+		CMSettings cms(m_Doc, item->ImageProfile, item->ImageIntent);
 		cms.setUseEmbeddedProfile(item->UseEmbedded);
 		cms.allowSoftProofing(true);
 		img.loadPicture(item->Pfile, item->pixm.imgInfo.actualPageNumber, cms, ScImage::RGBData, 72);

Modified: trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23488&path=/trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp	Sun Mar  8 16:41:10 2020
@@ -712,7 +712,7 @@
 		QDomElement obf = p_docu.createElement("Path.Fill");
 		QDomElement gr = p_docu.createElement("ImageBrush");
 		ScImage img;
-		CMSettings cms(m_Doc, Item->IProfile, Item->IRender);
+		CMSettings cms(m_Doc, Item->ImageProfile, Item->ImageIntent);
 		cms.setUseEmbeddedProfile(Item->UseEmbedded);
 		cms.allowSoftProofing(true);
 		img.loadPicture(Item->Pfile, Item->pixm.imgInfo.actualPageNumber, cms, ScImage::RGBData, 96);

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23488&path=/trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp	Sun Mar  8 16:41:10 2020
@@ -215,9 +215,9 @@
 		currItem->setImageXYOffset(Buffer->LocalX, Buffer->LocalY);
 		currItem->setImageRotation(Buffer->LocalRot);
 		currItem->Pfile = Buffer->Pfile;
-		currItem->IProfile = Buffer->IProfile;
-		currItem->EmProfile = Buffer->EmProfile;
-		currItem->IRender = Buffer->IRender;
+		currItem->ImageProfile = Buffer->ImageProfile;
+		currItem->ImageIntent = Buffer->ImageIntent;
+		currItem->EmbeddedProfile = Buffer->EmbeddedProfile;
 		currItem->UseEmbedded = Buffer->UseEmbedded;
 		if (!currItem->Pfile.isEmpty())
 			m_Doc->loadPict(currItem->Pfile, currItem);
@@ -249,9 +249,9 @@
 			currItem->Pfile = Buffer->Pfile;
 			currItem->Pfile2 = Buffer->Pfile2;
 			currItem->Pfile3 = Buffer->Pfile3;
-			currItem->IProfile = Buffer->IProfile;
-			currItem->EmProfile = Buffer->EmProfile;
-			currItem->IRender = Buffer->IRender;
+			currItem->ImageProfile = Buffer->ImageProfile;
+			currItem->ImageIntent = Buffer->ImageIntent;
+			currItem->EmbeddedProfile = Buffer->EmbeddedProfile;
 			currItem->UseEmbedded = Buffer->UseEmbedded;
 			m_Doc->loadPict(currItem->Pfile, currItem);
 			currItem->setImageXYScale(Buffer->LocalScX, Buffer->LocalScY);
@@ -398,9 +398,9 @@
 		currItem->setImageXYOffset(Buffer->LocalX, Buffer->LocalY);
 		currItem->setImageRotation(Buffer->LocalRot);
 		currItem->Pfile = Buffer->Pfile;
-		currItem->IProfile = Buffer->IProfile;
-		currItem->EmProfile = Buffer->EmProfile;
-		currItem->IRender = Buffer->IRender;
+		currItem->ImageProfile = Buffer->ImageProfile;
+		currItem->ImageIntent = Buffer->ImageIntent;
+		currItem->EmbeddedProfile = Buffer->EmbeddedProfile;
 		currItem->UseEmbedded = Buffer->UseEmbedded;
 		if (!currItem->Pfile.isEmpty())
 			m_Doc->loadPict(currItem->Pfile, currItem);
@@ -423,9 +423,9 @@
 		currItem->setImageXYOffset(Buffer->LocalX, Buffer->LocalY);
 		currItem->setImageRotation(Buffer->LocalRot);
 		currItem->Pfile = Buffer->Pfile;
-		currItem->IProfile = Buffer->IProfile;
-		currItem->EmProfile = Buffer->EmProfile;
-		currItem->IRender = Buffer->IRender;
+		currItem->ImageProfile = Buffer->ImageProfile;
+		currItem->ImageIntent = Buffer->ImageIntent;
+		currItem->EmbeddedProfile = Buffer->EmbeddedProfile;
 		currItem->UseEmbedded = Buffer->UseEmbedded;
 		if (!currItem->Pfile.isEmpty())
 			m_Doc->loadPict(currItem->Pfile, currItem);
@@ -1604,9 +1604,9 @@
 	OB->Pfile  = Relative2Path(obj->attribute("PFILE" ,""), baseDir);
 	OB->Pfile2 = Relative2Path(obj->attribute("PFILE2",""), baseDir);
 	OB->Pfile3 = Relative2Path(obj->attribute("PFILE3",""), baseDir);
-	OB->IProfile = obj->attribute("PRFILE","");
-	OB->EmProfile= obj->attribute("EPROF","");
-	OB->IRender  = (eRenderIntent) obj->attribute("IRENDER", "1").toInt();
+	OB->ImageProfile = obj->attribute("PRFILE","");
+	OB->ImageIntent  = (eRenderIntent) obj->attribute("IRENDER", "1").toInt();
+	OB->EmbeddedProfile = obj->attribute("EPROF","");
 	OB->UseEmbedded = obj->attribute("EMBEDDED", "1").toInt();
 	OB->Locked = static_cast<bool>(obj->attribute("LOCK", "0").toInt());
 	OB->LockRes = static_cast<bool>(obj->attribute("LOCKR", "0").toInt());

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23488&path=/trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.h
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.h	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.h	Sun Mar  8 16:41:10 2020
@@ -201,9 +201,9 @@
 			QString Pfile;
 			QString Pfile2;
 			QString Pfile3;
-			QString IProfile;
-			QString EmProfile;
-			eRenderIntent IRender;
+			QString ImageProfile;
+			QString EmbeddedProfile;
+			eRenderIntent ImageIntent;
 			bool UseEmbedded;
 			bool OverrideCompressionMethod;
 			int CompressionMethodIndex;

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23488&path=/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp	Sun Mar  8 16:41:10 2020
@@ -2628,9 +2628,9 @@
 			else
 				currItem->Pfile = Relative2Path(attrs.valueAsString("PFILE"), baseDir);
 		}
-		currItem->IProfile    = attrs.valueAsString("PRFILE", "");
-		currItem->EmProfile   = attrs.valueAsString("EPROF" , "");
-		currItem->IRender     = (eRenderIntent) attrs.valueAsInt("IRENDER", 1);
+		currItem->ImageProfile    = attrs.valueAsString("PRFILE", "");
+		currItem->ImageIntent     = (eRenderIntent) attrs.valueAsInt("IRENDER", 1);
+		currItem->EmbeddedProfile = attrs.valueAsString("EPROF" , "");
 		currItem->UseEmbedded = attrs.valueAsInt("EMBEDDED", 1);
 		currItem->pixm.imgInfo.lowResType = attrs.valueAsInt("ImageRes", 1);
 		currItem->pixm.imgInfo.actualPageNumber = attrs.valueAsInt("Pagenumber", 0);
@@ -2896,9 +2896,9 @@
 			currItem->Pfile  = Relative2Path(attrs.valueAsString("PFILE" , ""), baseDir);
 			currItem->Pfile2 = Relative2Path(attrs.valueAsString("PFILE2", ""), baseDir);
 			currItem->Pfile3 = Relative2Path(attrs.valueAsString("PFILE3", ""), baseDir);
-			currItem->IProfile    = attrs.valueAsString("PRFILE", "");
-			currItem->EmProfile   = attrs.valueAsString("EPROF", "");
-			currItem->IRender     = (eRenderIntent) attrs.valueAsInt("IRENDER" , 1);
+			currItem->ImageProfile    = attrs.valueAsString("PRFILE", "");
+			currItem->ImageIntent     = (eRenderIntent) attrs.valueAsInt("IRENDER" , 1);
+			currItem->EmbeddedProfile = attrs.valueAsString("EPROF", "");
 			currItem->UseEmbedded = attrs.valueAsInt("EMBEDDED", 1);
 			doc->loadPict(currItem->Pfile, currItem);
 			currItem->setImageXYScale(scx, scy);

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23488&path=/trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp	Sun Mar  8 16:41:10 2020
@@ -1529,9 +1529,9 @@
 		currItem->setImageXYOffset(offsX, offsY);
 		currItem->setImageRotation(rot);
 		currItem->Pfile     = Relative2Path(obj->attribute("PFILE"), baseDir);
-		currItem->IProfile  = obj->attribute("PRFILE","");
-		currItem->EmProfile = obj->attribute("EPROF","");
-		currItem->IRender   = (eRenderIntent) obj->attribute("IRENDER", "1").toInt();
+		currItem->ImageProfile = obj->attribute("PRFILE","");
+		currItem->ImageIntent  = (eRenderIntent) obj->attribute("IRENDER", "1").toInt();
+		currItem->EmbeddedProfile = obj->attribute("EPROF","");
 		currItem->UseEmbedded = obj->attribute("EMBEDDED", "1").toInt();
 		currItem->pixm.imgInfo.lowResType = obj->attribute("ImageRes", "1").toInt();
 		node = obj->firstChild();
@@ -1549,9 +1549,9 @@
 		}
 		if (!currItem->Pfile.isEmpty())
 			doc->loadPict(currItem->Pfile, currItem, false);
-		currItem->IProfile  = obj->attribute("PRFILE","");
-		currItem->EmProfile = obj->attribute("EPROF","");
-		currItem->IRender   = (eRenderIntent) obj->attribute("IRENDER", "1").toInt();
+		currItem->ImageProfile    = obj->attribute("PRFILE","");
+		currItem->ImageIntent     = (eRenderIntent) obj->attribute("IRENDER", "1").toInt();
+		currItem->EmbeddedProfile = obj->attribute("EPROF","");
 		currItem->UseEmbedded = obj->attribute("EMBEDDED", "1").toInt();
 		currItem->setImageXYScale(scx, scy);
 		clPath = obj->attribute("ImageClip", "");
@@ -1825,9 +1825,9 @@
 			currItem->Pfile  = Relative2Path(obj->attribute("PFILE" ,""), baseDir);
 			currItem->Pfile2 = Relative2Path(obj->attribute("PFILE2",""), baseDir);
 			currItem->Pfile3 = Relative2Path(obj->attribute("PFILE3",""), baseDir);
-			currItem->IProfile  = obj->attribute("PRFILE","");
-			currItem->EmProfile = obj->attribute("EPROF","");
-			currItem->IRender   = (eRenderIntent) obj->attribute("IRENDER", "1").toInt();
+			currItem->ImageProfile    = obj->attribute("PRFILE","");
+			currItem->ImageIntent     = (eRenderIntent) obj->attribute("IRENDER", "1").toInt();
+			currItem->EmbeddedProfile = obj->attribute("EPROF","");
 			currItem->UseEmbedded = obj->attribute("EMBEDDED", "1").toInt();
 			doc->loadPict(currItem->Pfile, currItem);
 			currItem->setImageXYScale(scx, scy);

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23488&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp	Sun Mar  8 16:41:10 2020
@@ -4999,9 +4999,9 @@
 			}
 #endif
 		}
-		currItem->IProfile    = attrs.valueAsString("PRFILE", "");
-		currItem->EmProfile   = attrs.valueAsString("EPROF" , "");
-		currItem->IRender     = (eRenderIntent) attrs.valueAsInt("IRENDER", 1);
+		currItem->ImageProfile    = attrs.valueAsString("PRFILE", "");
+		currItem->ImageIntent     = (eRenderIntent) attrs.valueAsInt("IRENDER", 1);
+		currItem->EmbeddedProfile = attrs.valueAsString("EPROF" , "");
 		currItem->UseEmbedded = attrs.valueAsInt("EMBEDDED", 1);
 		currItem->pixm.imgInfo.lowResType = attrs.valueAsInt("ImageRes", 1);
 		currItem->pixm.imgInfo.actualPageNumber = attrs.valueAsInt("Pagenumber", 0);
@@ -5333,9 +5333,9 @@
 			currItem->Pfile  = Relative2Path(attrs.valueAsString("PFILE" , ""), baseDir);
 			currItem->Pfile2 = Relative2Path(attrs.valueAsString("PFILE2", ""), baseDir);
 			currItem->Pfile3 = Relative2Path(attrs.valueAsString("PFILE3", ""), baseDir);
-			currItem->IProfile    = attrs.valueAsString("PRFILE", "");
-			currItem->EmProfile   = attrs.valueAsString("EPROF", "");
-			currItem->IRender     = (eRenderIntent) attrs.valueAsInt("IRENDER" , 1);
+			currItem->ImageProfile    = attrs.valueAsString("PRFILE", "");
+			currItem->ImageIntent     = (eRenderIntent) attrs.valueAsInt("IRENDER" , 1);
+			currItem->EmbeddedProfile = attrs.valueAsString("EPROF", "");
 			currItem->UseEmbedded = attrs.valueAsInt("EMBEDDED", 1);
 			doc->loadPict(currItem->Pfile, currItem);
 			currItem->setImageXYScale(imageXScale, imageYScale);

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23488&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp	Sun Mar  8 16:41:10 2020
@@ -2688,12 +2688,12 @@
 		docu.writeAttribute("PFILE2",Path2Relative(item->Pfile2, baseDir));
 	if (!item->Pfile3.isEmpty())
 		docu.writeAttribute("PFILE3",Path2Relative(item->Pfile3, baseDir));
-	if (!item->IProfile.isEmpty())
-		docu.writeAttribute("PRFILE", item->IProfile);
-	if (!item->EmProfile.isEmpty())
-		docu.writeAttribute("EPROF", item->EmProfile);
-	if (item->IRender != 1)
-		docu.writeAttribute("IRENDER", item->IRender);
+	if (!item->ImageProfile.isEmpty())
+		docu.writeAttribute("PRFILE", item->ImageProfile);
+	if (item->ImageIntent != 1)
+		docu.writeAttribute("IRENDER", item->ImageIntent);
+	if (!item->EmbeddedProfile.isEmpty())
+		docu.writeAttribute("EPROF", item->EmbeddedProfile);
 	if (!item->UseEmbedded)
 		docu.writeAttribute("EMBEDDED", 0);
 	if (item->asImageFrame())

Modified: trunk/Scribus/scribus/pslib.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23488&path=/trunk/Scribus/scribus/pslib.cpp
==============================================================================
--- trunk/Scribus/scribus/pslib.cpp	(original)
+++ trunk/Scribus/scribus/pslib.cpp	Sun Mar  8 16:41:10 2020
@@ -635,7 +635,7 @@
 			PageItem* item = pa.items.at(em);
 			if ((item->asImageFrame()) && (item->imageIsAvailable) && (!item->Pfile.isEmpty()) && (item->printEnabled()) && (!sep) && (farb))
 			{
-				if (!PS_ImageData(item, item->Pfile, item->itemName(), item->IProfile, item->UseEmbedded))
+				if (!PS_ImageData(item, item->Pfile, item->itemName(), item->ImageProfile, item->UseEmbedded))
 					return false;
 			}
 		}
@@ -1167,7 +1167,7 @@
 	image.imgInfo.layerInfo.clear();
 	image.imgInfo.RequestProps = item->pixm.imgInfo.RequestProps;
 	image.imgInfo.isRequest = item->pixm.imgInfo.isRequest;
-	CMSettings cms(item->doc(), Prof, item->IRender);
+	CMSettings cms(item->doc(), Prof, item->ImageIntent);
 	cms.allowColorManagement(true);
 	cms.setUseEmbeddedProfile(UseEmbedded);
 	if (!image.loadPicture(fn, item->pixm.imgInfo.actualPageNumber, cms, ScImage::CMYKData, 300, &dummy))
@@ -1262,7 +1262,7 @@
 	image.imgInfo.layerInfo.clear();
 	image.imgInfo.RequestProps = item->pixm.imgInfo.RequestProps;
 	image.imgInfo.isRequest = item->pixm.imgInfo.isRequest;
-	CMSettings cms(item->doc(), Prof, item->IRender);
+	CMSettings cms(item->doc(), Prof, item->ImageIntent);
 	cms.allowColorManagement(true);
 	cms.setUseEmbeddedProfile(UseEmbedded);
 	int resolution = 300;
@@ -1678,7 +1678,7 @@
 							continue;
 						if ((optimization == OptimizeSize) && it->asImageFrame() && it->imageIsAvailable && (!it->Pfile.isEmpty()) && it->printEnabled() && (!sep) && farb)
 						{
-							errorOccured = !PS_ImageData(it, it->Pfile, it->itemName(), it->IProfile, it->UseEmbedded);
+							errorOccured = !PS_ImageData(it, it->Pfile, it->itemName(), it->ImageProfile, it->UseEmbedded);
 							if (errorOccured) break;
 						}
 						PS_TemplateStart(QString("mp_obj_%1_%2").arg(ap).arg(qHash(it)));
@@ -1859,9 +1859,9 @@
 			bool imageOk = false;
 			PS_translate(0, -item->BBoxH*item->imageYScale());
 			if ((optimization == OptimizeSize) && (((!page->pageNameEmpty()) && !sep && farb) || useTemplate))
-				imageOk = PS_image(item, item->imageXOffset(), -item->imageYOffset(), item->Pfile, item->imageXScale(), item->imageYScale(), item->IProfile, item->UseEmbedded, item->itemName());
+				imageOk = PS_image(item, item->imageXOffset(), -item->imageYOffset(), item->Pfile, item->imageXScale(), item->imageYScale(), item->ImageProfile, item->UseEmbedded, item->itemName());
 			else
-				imageOk = PS_image(item, item->imageXOffset(), -item->imageYOffset(), item->Pfile, item->imageXScale(), item->imageYScale(), item->IProfile, item->UseEmbedded);
+				imageOk = PS_image(item, item->imageXOffset(), -item->imageYOffset(), item->Pfile, item->imageXScale(), item->imageYScale(), item->ImageProfile, item->UseEmbedded);
 			if (!imageOk) return false;
 		}
 		PS_restore();

Modified: trunk/Scribus/scribus/scimage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23488&path=/trunk/Scribus/scribus/scimage.cpp
==============================================================================
--- trunk/Scribus/scribus/scimage.cpp	(original)
+++ trunk/Scribus/scribus/scimage.cpp	Sun Mar  8 16:41:10 2020
@@ -2430,11 +2430,11 @@
 		eColorFormat outputProfFormat = Format_YMCK_8;
 		eColorSpaceType inputProfColorSpace  = inputProf.colorSpace();
 		eColorSpaceType outputProfColorSpace = printerProf.colorSpace();
-		if ( inputProfColorSpace == ColorSpace_Gray)
+		if (inputProfColorSpace == ColorSpace_Gray)
 			inputProfFormat  = Format_GRAY_8; // Grayscale is still a bit tricky
-		if ( outputProfColorSpace == ColorSpace_Rgb )
+		if (outputProfColorSpace == ColorSpace_Rgb)
 			outputProfFormat = Format_BGRA_8;
-		else if ( outputProfColorSpace == ColorSpace_Cmyk )
+		else if (outputProfColorSpace == ColorSpace_Cmyk)
 			outputProfFormat = Format_YMCK_8;
 		ScColorSpace inputCSpace  = engine.createColorSpace(inputProf, inputProfFormat);
 		ScColorSpace screenCSpace = engine.createColorSpace(screenProf, Format_BGRA_8);
@@ -2540,7 +2540,7 @@
 			{
 				uchar* ptr = scanLine(i);
 				ptr2 = pDataLoader->useRawImage() ? pDataLoader->r_image.scanLine(i) : nullptr;
-				if ( inputProfFormat == Format_GRAY_8 && (outputProfColorSpace != ColorSpace_Cmyk) )
+				if ((inputProfFormat == Format_GRAY_8) && (outputProfColorSpace != ColorSpace_Cmyk))
 				{
 					unsigned char* ucs = ptr2 ? (ptr2 + 1) : (ptr + 1);
 					unsigned char* uc = new unsigned char[width()];
@@ -2552,7 +2552,7 @@
 					xform.apply(uc, ptr, width());
 					delete[] uc;
 				}
-				else if (inputProfFormat == Format_GRAY_8 && (outputProfColorSpace == ColorSpace_Cmyk))
+				else if ((inputProfFormat == Format_GRAY_8) && (outputProfColorSpace == ColorSpace_Cmyk))
 				{
 					unsigned char  value;
 					unsigned char* ucs = ptr2 ? ptr2 : ptr;

Modified: trunk/Scribus/scribus/scpageoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23488&path=/trunk/Scribus/scribus/scpageoutput.cpp
==============================================================================
--- trunk/Scribus/scribus/scpageoutput.cpp	(original)
+++ trunk/Scribus/scribus/scpageoutput.cpp	Sun Mar  8 16:41:10 2020
@@ -770,7 +770,7 @@
 					useCmyk = true;
 				QFileInfo fInfo(item->Pfile);
 				QString ext = fInfo.suffix();
-				CMSettings cmsSettings(item->doc(), item->IProfile, item->IRender);
+				CMSettings cmsSettings(item->doc(), item->ImageProfile, item->ImageIntent);
 				cmsSettings.allowColorManagement(m_useProfiles);
 				cmsSettings.setUseEmbeddedProfile(item->UseEmbedded);
 				scImg.imgInfo.valid = false;

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23488&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp	(original)
+++ trunk/Scribus/scribus/scribus.cpp	Sun Mar  8 16:41:10 2020
@@ -4027,11 +4027,11 @@
 		return;
 	}
 
-	currItem->EmProfile = "";
+	currItem->EmbeddedProfile.clear();
 	currItem->pixm.imgInfo.isRequest = false;
 	currItem->UseEmbedded = true;
-	currItem->IProfile = doc->cmsSettings().DefaultImageRGBProfile;
-	currItem->IRender = doc->cmsSettings().DefaultIntentImages;
+	currItem->ImageProfile = doc->cmsSettings().DefaultImageRGBProfile;
+	currItem->ImageIntent = doc->cmsSettings().DefaultIntentImages;
 	qApp->setOverrideCursor( QCursor(Qt::WaitCursor) );
 	qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
 	
@@ -8854,9 +8854,9 @@
 	contentsBuffer.ItemX   = imageItem->xPos();
 	contentsBuffer.ItemY   = imageItem->yPos();
 	contentsBuffer.effects = imageItem->effectsInUse;
-	contentsBuffer.inputProfile = imageItem->IProfile;
+	contentsBuffer.inputProfile = imageItem->ImageProfile;
 	contentsBuffer.useEmbedded  = imageItem->UseEmbedded;
-	contentsBuffer.renderingIntent = imageItem->IRender;
+	contentsBuffer.renderingIntent = imageItem->ImageIntent;
 }
 
 void ScribusMainWindow::slotEditPasteContents(int absolute)
@@ -8880,25 +8880,24 @@
 	if (i != QMessageBox::Yes)
 		return;
 
-	imageItem->EmProfile = "";
+	imageItem->EmbeddedProfile.clear();
 	imageItem->pixm.imgInfo.isRequest = false;
-	imageItem->IProfile = doc->cmsSettings().DefaultImageRGBProfile;
-	imageItem->IRender  = doc->cmsSettings().DefaultIntentImages;
+	imageItem->ImageProfile = doc->cmsSettings().DefaultImageRGBProfile;
+	imageItem->ImageIntent  = doc->cmsSettings().DefaultIntentImages;
 	imageItem->effectsInUse = contentsBuffer.effects;
 	qApp->setOverrideCursor( QCursor(Qt::WaitCursor) );
 	qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
 	doc->loadPict(contentsBuffer.contentsFileName, imageItem);
 	imageItem->setImageXYScale(contentsBuffer.LocalScX, contentsBuffer.LocalScY);
-	if (absolute==0)
+	if (absolute == 0)
 		imageItem->setImageXYOffset(contentsBuffer.LocalX, contentsBuffer.LocalY);
 	else
-		imageItem->setImageXYOffset(
-		((contentsBuffer.ItemX-imageItem->xPos()) / contentsBuffer.LocalScX)+contentsBuffer.LocalX,
-		((contentsBuffer.ItemY-imageItem->yPos()) / contentsBuffer.LocalScY)+contentsBuffer.LocalY);
+		imageItem->setImageXYOffset(((contentsBuffer.ItemX - imageItem->xPos()) / contentsBuffer.LocalScX) + contentsBuffer.LocalX,
+		                            ((contentsBuffer.ItemY - imageItem->yPos()) / contentsBuffer.LocalScY) + contentsBuffer.LocalY);
 	imageItem->setImageRotation(contentsBuffer.LocalRot);
-	imageItem->IProfile=contentsBuffer.inputProfile;
-	imageItem->UseEmbedded=contentsBuffer.useEmbedded;
-	imageItem->IRender=contentsBuffer.renderingIntent;
+	imageItem->ImageProfile = contentsBuffer.inputProfile;
+	imageItem->ImageIntent = contentsBuffer.renderingIntent;
+	imageItem->UseEmbedded = contentsBuffer.useEmbedded;
 	qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
 	view->DrawNew();
 	propertiesPalette->updateColorList();

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23488&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp	(original)
+++ trunk/Scribus/scribus/scribusdoc.cpp	Sun Mar  8 16:41:10 2020
@@ -4448,9 +4448,9 @@
 			for (int ii = 0; ii < allItems.count(); ii++)
 			{
 				it = allItems.at(ii);
-				if (it->IProfile.isEmpty() || profileNames.contains(it->IProfile))
+				if (it->ImageProfile.isEmpty() || profileNames.contains(it->ImageProfile))
 					continue;
-				profileNames.append(it->IProfile);
+				profileNames.append(it->ImageProfile);
 			}
 			allItems.clear();
 		}
@@ -4466,9 +4466,9 @@
 		for (int ii = 0; ii < allItems.count(); ii++)
 		{
 			it = allItems.at(ii);
-			if (it->IProfile.isEmpty() || profileNames.contains(it->IProfile))
+			if (it->ImageProfile.isEmpty() || profileNames.contains(it->ImageProfile))
 				continue;
-			profileNames.append(it->IProfile);
+			profileNames.append(it->ImageProfile);
 		}
 		allItems.clear();
 	}
@@ -5441,11 +5441,11 @@
 				if (QFile::exists(iafData.source))
 				{
 					PrefsManager::instance().prefsFile->getContext("dirs")->set("images", iafData.source.left(iafData.source.lastIndexOf("/")));
-					currItem->EmProfile = "";
+					currItem->EmbeddedProfile.clear();
 					currItem->pixm.imgInfo.isRequest = false;
 					currItem->UseEmbedded = true;
-					currItem->IProfile = m_docPrefsData.colorPrefs.DCMSset.DefaultImageRGBProfile;
-					currItem->IRender = m_docPrefsData.colorPrefs.DCMSset.DefaultIntentImages;
+					currItem->ImageProfile = m_docPrefsData.colorPrefs.DCMSset.DefaultImageRGBProfile;
+					currItem->ImageIntent = m_docPrefsData.colorPrefs.DCMSset.DefaultIntentImages;
 					qApp->setOverrideCursor( QCursor(Qt::WaitCursor) );
 					qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
 					loadPict(iafData.source, currItem, false, true);
@@ -5504,8 +5504,8 @@
 			newItem->setImageXYScale(m_docPrefsData.itemToolPrefs.imageScaleX, m_docPrefsData.itemToolPrefs.imageScaleY);
 			newItem->ScaleType = m_docPrefsData.itemToolPrefs.imageScaleType;
 			newItem->AspectRatio = m_docPrefsData.itemToolPrefs.imageAspectRatio;
-			newItem->IProfile = m_docPrefsData.colorPrefs.DCMSset.DefaultImageRGBProfile;
-			newItem->IRender = m_docPrefsData.colorPrefs.DCMSset.DefaultIntentImages;
+			newItem->ImageProfile = m_docPrefsData.colorPrefs.DCMSset.DefaultImageRGBProfile;
+			newItem->ImageIntent = m_docPrefsData.colorPrefs.DCMSset.DefaultIntentImages;
 			newItem->setFillShade(m_docPrefsData.itemToolPrefs.imageFillColorShade);
 			newItem->setLineShade(m_docPrefsData.itemToolPrefs.imageStrokeColorShade);
 			break;
@@ -7295,13 +7295,13 @@
 			{
 				if (it->pixm.imgInfo.colorspace == ColorSpaceCMYK)
 				{
-					if (!PrCMYK->contains(it->IProfile))
-						it->IProfile = m_docPrefsData.colorPrefs.DCMSset.DefaultImageCMYKProfile;
+					if (!PrCMYK->contains(it->ImageProfile))
+						it->ImageProfile = m_docPrefsData.colorPrefs.DCMSset.DefaultImageCMYKProfile;
 				}
 				else
 				{
-					if (!Pr->contains(it->IProfile))
-						it->IProfile = m_docPrefsData.colorPrefs.DCMSset.DefaultImageRGBProfile;
+					if (!Pr->contains(it->ImageProfile))
+						it->ImageProfile = m_docPrefsData.colorPrefs.DCMSset.DefaultImageRGBProfile;
 				}
 				loadPict(it->Pfile, it, true);
 			}
@@ -7341,13 +7341,13 @@
 			{
 				if (it->pixm.imgInfo.colorspace == ColorSpaceCMYK)
 				{
-					if (!PrCMYK->contains(it->IProfile))
-						it->IProfile = m_docPrefsData.colorPrefs.DCMSset.DefaultImageCMYKProfile;
+					if (!PrCMYK->contains(it->ImageProfile))
+						it->ImageProfile = m_docPrefsData.colorPrefs.DCMSset.DefaultImageCMYKProfile;
 				}
 				else
 				{
-					if (!Pr->contains(it->IProfile))
-						it->IProfile = m_docPrefsData.colorPrefs.DCMSset.DefaultImageRGBProfile;
+					if (!Pr->contains(it->ImageProfile))
+						it->ImageProfile = m_docPrefsData.colorPrefs.DCMSset.DefaultImageRGBProfile;
 				}
 				loadPict(it->Pfile, it, true);
 			}
@@ -16029,7 +16029,7 @@
 		PageItem *currItem = itemSelection->itemAt(i);
 		if (currItem && currItem->itemType() == PageItem::ImageFrame)
 		{
-			currItem->IProfile = profileName;
+			currItem->ImageProfile = profileName;
 			currItem->UseEmbedded = profileName.startsWith("Embedded");
 			loadPict(currItem->Pfile, currItem, true);
 			currItem->update();
@@ -16053,7 +16053,7 @@
 		PageItem *currItem = itemSelection->itemAt(i);
 		if (currItem && currItem->itemType() == PageItem::ImageFrame)
 		{
-			currItem->IRender = (eRenderIntent) intentIndex;
+			currItem->ImageIntent = (eRenderIntent) intentIndex;
 			loadPict(currItem->Pfile, currItem, true);
 			currItem->update();
 		}

Modified: trunk/Scribus/scribus/ui/effectsdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23488&path=/trunk/Scribus/scribus/ui/effectsdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/effectsdialog.cpp	(original)
+++ trunk/Scribus/scribus/ui/effectsdialog.cpp	Sun Mar  8 16:41:10 2020
@@ -52,7 +52,7 @@
 //	CMSettings cms(docc, "", Intent_Perceptual);
 //	cms.allowColorManagement(false);
 	bool mode = false;
-	CMSettings cms(m_doc, m_item->IProfile, m_item->IRender);
+	CMSettings cms(m_doc, m_item->ImageProfile, m_item->ImageIntent);
 	cms.setUseEmbeddedProfile(m_item->UseEmbedded);
 	cms.allowSoftProofing(true);
 	m_image.loadPicture(m_item->Pfile, m_item->pixm.imgInfo.actualPageNumber, cms, ScImage::RGBData, 72, &mode);

Modified: trunk/Scribus/scribus/ui/propertiespalette_image.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23488&path=/trunk/Scribus/scribus/ui/propertiespalette_image.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_image.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_image.cpp	Sun Mar  8 16:41:10 2020
@@ -271,47 +271,45 @@
 		{
 			if (m_item->pixm.imgInfo.colorspace == ColorSpaceCMYK)
 			{
-				ProfilesL::Iterator itP;
 				ProfilesL::Iterator itPend = ScCore->InputProfilesCMYK.end();
-				for (itP = ScCore->InputProfilesCMYK.begin(); itP != itPend; ++itP)
+				for (auto itP = ScCore->InputProfilesCMYK.begin(); itP != itPend; ++itP)
 				{
 					inputProfiles->addItem(itP.key());
-					if (itP.key() == m_item->IProfile)
-						inputProfiles->setCurrentIndex(inputProfiles->count()-1);
+					if (itP.key() == m_item->ImageProfile)
+						inputProfiles->setCurrentIndex(inputProfiles->count() - 1);
 				}
-				if (!ScCore->InputProfilesCMYK.contains(m_item->IProfile))
+				if (!ScCore->InputProfilesCMYK.contains(m_item->ImageProfile))
 				{
-					inputProfiles->addItem(m_item->IProfile);
-					inputProfiles->setCurrentIndex(inputProfiles->count()-1);
+					inputProfiles->addItem(m_item->ImageProfile);
+					inputProfiles->setCurrentIndex(inputProfiles->count() - 1);
 				}
 				else
 				{
-					if (!m_item->EmProfile.isEmpty())
-						inputProfiles->addItem(m_item->EmProfile);
+					if (!m_item->EmbeddedProfile.isEmpty())
+						inputProfiles->addItem(m_item->EmbeddedProfile);
 				}
 			}
 			else
 			{
-				ProfilesL::Iterator itP;
-				ProfilesL::Iterator itPend=ScCore->InputProfiles.end();
-				for (itP = ScCore->InputProfiles.begin(); itP != itPend; ++itP)
+				ProfilesL::Iterator itPend = ScCore->InputProfiles.end();
+				for (auto itP = ScCore->InputProfiles.begin(); itP != itPend; ++itP)
 				{
 					inputProfiles->addItem(itP.key());
-					if (itP.key() == m_item->IProfile)
-						inputProfiles->setCurrentIndex(inputProfiles->count()-1);
+					if (itP.key() == m_item->ImageProfile)
+						inputProfiles->setCurrentIndex(inputProfiles->count() - 1);
 				}
-				if (!ScCore->InputProfiles.contains(m_item->IProfile))
+				if (!ScCore->InputProfiles.contains(m_item->ImageProfile))
 				{
-					inputProfiles->addItem(m_item->IProfile);
-					inputProfiles->setCurrentIndex(inputProfiles->count()-1);
+					inputProfiles->addItem(m_item->ImageProfile);
+					inputProfiles->setCurrentIndex(inputProfiles->count() - 1);
 				}
 				else
 				{
-					if (!m_item->EmProfile.isEmpty())
-						inputProfiles->addItem(m_item->EmProfile);
+					if (!m_item->EmbeddedProfile.isEmpty())
+						inputProfiles->addItem(m_item->EmbeddedProfile);
 				}
 			}
-			renderIntent->setCurrentIndex(m_item->IRender);
+			renderIntent->setCurrentIndex(m_item->ImageIntent);
 		}
 
 		inputProfiles->blockSignals(false);




More information about the scribus-commit mailing list