r20915 by jghali -

scribus-commit scribus-commit at lists.scribus.net
Sat Feb 6 23:48:03 UTC 2016


Author: jghali
Date: Sat Feb  6 23:48:03 2016
New Revision: 20915

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20915
Log:
coverity #1350760: uninitialized pointer field

Modified:
    trunk/Scribus/scribus/ui/markvariabletext.cpp
    trunk/Scribus/scribus/ui/markvariabletext.h

Modified: trunk/Scribus/scribus/ui/markvariabletext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20915&path=/trunk/Scribus/scribus/ui/markvariabletext.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/markvariabletext.cpp	(original)
+++ trunk/Scribus/scribus/ui/markvariabletext.cpp	Sat Feb  6 23:48:03 2016
@@ -2,7 +2,7 @@
 #include "marks.h"
 #include <QComboBox>
 
-MarkVariableText::MarkVariableText(const QList<Mark*>& marks, QWidget *parent) : MarkInsert(marks, parent)
+MarkVariableText::MarkVariableText(const QList<Mark*>& marks, QWidget *parent) : MarkInsert(marks, parent), m_mark(0)
 {
 	//for editing mark entry in text - user can change mark pointer inserted into text or create new mark entry
 	setupUi(this);
@@ -22,7 +22,7 @@
 	setWindowTitle(tr("Mark with Variable Text"));
 }
 
-MarkVariableText::MarkVariableText(const Mark* mark, QWidget *parent) : MarkInsert(mark, parent), mrk(mark)
+MarkVariableText::MarkVariableText(const Mark* mark, QWidget *parent) : MarkInsert(mark, parent), m_mark(mark)
 {
 	//for editing by marks Manager - user can change label and variable text
 	setupUi(this);
@@ -56,7 +56,7 @@
 	label = ((QLineEdit*) labelEditWidget)->text();
 	if (label == tr("New Mark"))
 		label = "VariableMark";
-	return const_cast<Mark*> (mrk);
+	return const_cast<Mark*> (m_mark);
 }
 
 void MarkVariableText::setValues(QString label, QString text)

Modified: trunk/Scribus/scribus/ui/markvariabletext.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20915&path=/trunk/Scribus/scribus/ui/markvariabletext.h
==============================================================================
--- trunk/Scribus/scribus/ui/markvariabletext.h	(original)
+++ trunk/Scribus/scribus/ui/markvariabletext.h	Sat Feb  6 23:48:03 2016
@@ -24,7 +24,7 @@
 
 private:
 	QWidget* labelEditWidget;
-	const Mark* mrk;
+	const Mark* m_mark;
 };
 
 #endif // MARKVARIABLETEXT_H




More information about the scribus-commit mailing list