r23618 by jghali - Fix some GCC initialization order warnings

[scribus-commit]

Author: jghali
Date: Thu Apr 16 13:21:29 2020
New Revision: 23618

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23618
Log:
Fix some GCC initialization order warnings

Modified:
    trunk/Scribus/scribus/pageitem.cpp
    trunk/Scribus/scribus/pageitem.h

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23618&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp	(original)
+++ trunk/Scribus/scribus/pageitem.cpp	Thu Apr 16 13:21:29 2020
@@ -138,10 +138,6 @@
 	snapToPatchGrid(other.snapToPatchGrid),
 	m_columns(other.m_columns),
 	m_columnGap(other.m_columnGap),
-	m_startArrowIndex(other.m_startArrowIndex),
-	m_endArrowIndex(other.m_endArrowIndex),
-	m_startArrowScale(other.m_startArrowScale),
-	m_endArrowScale(other.m_endArrowScale),
 	PLineArt(other.PLineArt),
 	PLineEnd(other.PLineEnd),
 	PLineJoin(other.PLineJoin),
@@ -200,16 +196,6 @@
 	fill_gradient(other.fill_gradient),
 	fillRule(other.fillRule),
 	doOverprint(other.doOverprint),
-	m_hasSoftShadow(other.m_hasSoftShadow),
-	m_softShadowColor(other.m_softShadowColor),
-	m_softShadowShade(other.m_softShadowShade),
-	m_softShadowBlurRadius(other.m_softShadowBlurRadius),
-	m_softShadowXOffset(other.m_softShadowXOffset),
-	m_softShadowYOffset(other.m_softShadowYOffset),
-	m_softShadowOpacity(other.m_softShadowOpacity),
-	m_softShadowBlendMode(other.m_softShadowBlendMode),
-	m_softShadowErasedByObject(other.m_softShadowErasedByObject),
-	m_softShadowHasObjectTransparency(other.m_softShadowHasObjectTransparency),
 	m_leftLink(other.m_leftLink),
 	m_rightLink(other.m_rightLink),
 	m_topLink(other.m_topLink),
@@ -299,6 +285,8 @@
 	hatchUseBackground(other.hatchUseBackground),
 	hatchBackground(other.hatchBackground),
 	hatchForeground(other.hatchForeground),
+	hatchBackgroundQ(other.hatchBackgroundQ),
+	hatchForegroundQ(other.hatchForegroundQ),
 	// protected
 	undoManager(other.undoManager),
 	BackBox(nullptr),  // otherwise other.BackBox->NextBox would be inconsistent
@@ -358,8 +346,20 @@
 	m_imageRotation(other.m_imageRotation),
 	m_firstLineOffset(other.m_firstLineOffset),
 	m_groupClips(other.m_groupClips),
-	hatchBackgroundQ(other.hatchBackgroundQ),
-	hatchForegroundQ(other.hatchForegroundQ)
+	m_startArrowIndex(other.m_startArrowIndex),
+	m_endArrowIndex(other.m_endArrowIndex),
+	m_startArrowScale(other.m_startArrowScale),
+	m_endArrowScale(other.m_endArrowScale),
+	m_hasSoftShadow(other.m_hasSoftShadow),
+	m_softShadowColor(other.m_softShadowColor),
+	m_softShadowShade(other.m_softShadowShade),
+	m_softShadowBlurRadius(other.m_softShadowBlurRadius),
+	m_softShadowXOffset(other.m_softShadowXOffset),
+	m_softShadowYOffset(other.m_softShadowYOffset),
+	m_softShadowOpacity(other.m_softShadowOpacity),
+	m_softShadowBlendMode(other.m_softShadowBlendMode),
+	m_softShadowErasedByObject(other.m_softShadowErasedByObject),
+	m_softShadowHasObjectTransparency(other.m_softShadowHasObjectTransparency)
 {
 	QString tmp;
 	m_imageVisible = m_Doc->guidesPrefs().showPic;

Modified: trunk/Scribus/scribus/pageitem.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23618&path=/trunk/Scribus/scribus/pageitem.h
==============================================================================
--- trunk/Scribus/scribus/pageitem.h	(original)
+++ trunk/Scribus/scribus/pageitem.h	Thu Apr 16 13:21:29 2020
@@ -1517,6 +1517,8 @@
 	bool hatchUseBackground;
 	QString hatchBackground;
 	QString hatchForeground;
+	QColor  hatchBackgroundQ;
+	QColor  hatchForegroundQ;
 
 	// End public variables
 
@@ -1875,8 +1877,6 @@
 	double m_imageRotation; ///< Image rotation in frame
 	FirstLineOffsetPolicy m_firstLineOffset;
 	bool   m_groupClips;
-	QColor hatchBackgroundQ;
-	QColor hatchForegroundQ;
 
 	int m_startArrowIndex;
 	int m_endArrowIndex;