r20838 by jghali -

scribus-commit scribus-commit at lists.scribus.net
Sun Jan 31 01:15:14 UTC 2016


Author: jghali
Date: Sun Jan 31 01:15:13 2016
New Revision: 20838

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

Modified:
    trunk/Scribus/scribus/scraction.cpp

Modified: trunk/Scribus/scribus/scraction.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20838&path=/trunk/Scribus/scribus/scraction.cpp
==============================================================================
--- trunk/Scribus/scribus/scraction.cpp	(original)
+++ trunk/Scribus/scribus/scraction.cpp	Sun Jan 31 01:15:13 2016
@@ -42,9 +42,9 @@
 	setShortcut(accel);
 	initScrAction();
 	setData(d);
-	m_actionType=aType;
-
-	if (m_actionType!=Normal)
+
+	m_actionType = aType;
+	if (m_actionType != Normal)
 		connect (this, SIGNAL(triggered()), this, SLOT(triggeredToTriggeredData()));
 }
 
@@ -54,9 +54,9 @@
 	initScrAction();
 	icon().addPixmap(icon22, QIcon::Normal, QIcon::On);
 
-	m_actionType=aType;
+	m_actionType = aType;
 	setData(d);
-	if (m_actionType!=Normal)
+	if (m_actionType != Normal)
 		connect (this, SIGNAL(triggered()), this, SLOT(triggeredToTriggeredData()));
 }
 
@@ -75,7 +75,7 @@
 	setShortcut(accel);
 	initScrAction();
 	icon().addPixmap(QPixmap(), QIcon::Normal, QIcon::On);
-	m_actionType=UnicodeChar;
+	m_actionType = UnicodeChar;
 	setData(d);
 	connect (this, SIGNAL(triggered()), this, SLOT(triggeredToTriggeredData()));
 }
@@ -83,11 +83,12 @@
 
 void ScrAction::initScrAction()
 {
-	m_actionType=ScrAction::Normal;
-	m_menuIndex=-1;
-	m_savedKeySequence=QKeySequence("");
-	m_shortcutSaved=false;
-	m_fakeToggle=false;
+	m_actionType = ScrAction::Normal;
+	m_menuIndex = -1;
+	m_popupMenuAddedTo = NULL;
+	m_savedKeySequence = QKeySequence("");
+	m_shortcutSaved = false;
+	m_fakeToggle = false;
 }
 
 ScrAction::~ScrAction()




More information about the scribus-commit mailing list