r23179 by jghali - Fix initialization order warning

scribus-commit scribus-commit at lists.scribus.net
Wed Sep 4 15:09:30 UTC 2019


Author: jghali
Date: Wed Sep  4 15:09:30 2019
New Revision: 23179

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23179
Log:
Fix initialization order warning

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

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23179&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp	(original)
+++ trunk/Scribus/scribus/scribusdoc.cpp	Wed Sep  4 15:09:30 2019
@@ -207,12 +207,12 @@
 	m_undoManager(UndoManager::instance()),
 	m_automaticTextFrames(false),
 	m_guardedObject(this),
+	m_documentFileName( tr("Document") + "-"),
 	minCanvasCoordinate(FPoint(0, 0)),
 	m_Selection(new Selection(this, true)),
 	PageSp(1), PageSpa(0),
 	FirstPnum(1),
 	PageColors(this, true),
-	m_documentFileName( tr("Document")+"-"),
 	AllFonts(&m_appPrefsData.fontPrefs.AvailFonts),
 	colorEngine(ScCore->defaultEngine),
 	autoSaveTimer(new QTimer(this)),
@@ -246,12 +246,12 @@
 	m_docUnitRatio(unitGetRatioFromIndex(m_appPrefsData.docSetupPrefs.docUnitIndex)),
 	m_automaticTextFrames(pagesSetup.autoTextFrames),
 	m_guardedObject(this),
+	m_documentFileName(docName),
 	minCanvasCoordinate(FPoint(0, 0)),
 	m_Selection(new Selection(this, true)),
 	PageSp(pagesSetup.columnCount), PageSpa(pagesSetup.columnDistance),
 	FirstPnum(pagesSetup.firstPageNumber),
 	PageColors(this, true),
-	m_documentFileName(docName),
 	AllFonts(&m_appPrefsData.fontPrefs.AvailFonts),
 	colorEngine(ScCore->defaultEngine),
 	autoSaveTimer(new QTimer(this)),

Modified: trunk/Scribus/scribus/scribusdoc.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23179&path=/trunk/Scribus/scribus/scribusdoc.h
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.h	(original)
+++ trunk/Scribus/scribus/scribusdoc.h	Wed Sep  4 15:09:30 2019
@@ -1860,7 +1860,7 @@
 	void ImportData();
 	void ResetFormFields();
 	QString documentFileName() const;
-	void setDocumentFileName(const QString& m_documentFileName);
+	void setDocumentFileName(const QString& documentFileName);
 };
 
 Q_DECLARE_METATYPE(ScribusDoc*);




More information about the scribus-commit mailing list