r21564 by jghali - fix some build warnings

scribus-commit scribus-commit at lists.scribus.net
Sat Dec 3 20:24:06 UTC 2016


Author: jghali
Date: Sat Dec  3 20:24:06 2016
New Revision: 21564

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21564
Log:
fix some build warnings

Modified:
    trunk/Scribus/scribus/fonts/ftface.cpp
    trunk/Scribus/scribus/text/glyphcluster.cpp

Modified: trunk/Scribus/scribus/fonts/ftface.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21564&path=/trunk/Scribus/scribus/fonts/ftface.cpp
==============================================================================
--- trunk/Scribus/scribus/fonts/ftface.cpp	(original)
+++ trunk/Scribus/scribus/fonts/ftface.cpp	Sat Dec  3 20:24:06 2016
@@ -42,7 +42,7 @@
 
 FtFace::FtFace(QString fam, QString sty, QString vari, QString scname, 
 			   QString psname, QString path, int face, QStringList features)
-: ScFaceData(), m_face(NULL), m_isItalic(false), m_isBold(false)
+: ScFaceData(), m_face(NULL), m_isBold(false), m_isItalic(false)
 {
 	family = fam;
 	style = sty;

Modified: trunk/Scribus/scribus/text/glyphcluster.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21564&path=/trunk/Scribus/scribus/text/glyphcluster.cpp
==============================================================================
--- trunk/Scribus/scribus/text/glyphcluster.cpp	(original)
+++ trunk/Scribus/scribus/text/glyphcluster.cpp	Sat Dec  3 20:24:06 2016
@@ -1,7 +1,10 @@
 #include "glyphcluster.h"
 
 GlyphCluster::GlyphCluster(const CharStyle* style, LayoutFlags flags, int first, int last, const InlineFrame& o, int i, QString str)
-	: m_style(style)
+	: extraWidth(0.0)
+	, xoffset(0.0)
+	, yoffset(0.0)
+	, m_style(style)
 	, m_flags(flags)
 	, m_object(o)
 	, m_firstChar(first)
@@ -9,9 +12,6 @@
 	, m_visualIndex(i)
 	, m_scaleH(1.0)
 	, m_scaleV(1.0)
-	, extraWidth(0.0)
-	, xoffset(0.0)
-	, yoffset(0.0)
 	, m_str(str)
 {}
 




More information about the scribus-commit mailing list