r23521 by craig - Random code cleanup

scribus-commit scribus-commit at lists.scribus.net
Fri Mar 20 23:50:47 UTC 2020


Author: craig
Date: Fri Mar 20 23:50:47 2020
New Revision: 23521

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23521
Log:
Random code cleanup

Modified:
    trunk/Scribus/scribus/scribuswin.cpp
    trunk/Scribus/scribus/scribuswin.h
    trunk/Scribus/scribus/ui/smcolorcombo.cpp
    trunk/Scribus/scribus/ui/smcolorcombo.h

Modified: trunk/Scribus/scribus/scribuswin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23521&path=/trunk/Scribus/scribus/scribuswin.cpp
==============================================================================
--- trunk/Scribus/scribus/scribuswin.cpp	(original)
+++ trunk/Scribus/scribus/scribuswin.cpp	Fri Mar 20 23:50:47 2020
@@ -35,11 +35,7 @@
 
 
 ScribusWin::ScribusWin(QWidget* parent, ScribusDoc* doc) :
-	QMainWindow(parent),
-	m_subWindow(nullptr),
-	m_ScMW(nullptr),
-	m_View(nullptr),
-	m_winIndex(0)
+	QMainWindow(parent)
 {
 	setWindowIcon(IconManager::instance().loadIcon("AppIcon2.png"));
 	setAttribute(Qt::WA_DeleteOnClose);

Modified: trunk/Scribus/scribus/scribuswin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23521&path=/trunk/Scribus/scribus/scribuswin.h
==============================================================================
--- trunk/Scribus/scribus/scribuswin.h	(original)
+++ trunk/Scribus/scribus/scribuswin.h	Fri Mar 20 23:50:47 2020
@@ -54,11 +54,11 @@
 	void setSubWin(QMdiSubWindow *win) { m_subWindow = win; }
 
 protected:
-	QMdiSubWindow *m_subWindow;
-	ScribusDoc *m_Doc;
-	ScribusMainWindow *m_ScMW;
-	ScribusView *m_View;
-	int m_winIndex;
+	QMdiSubWindow *m_subWindow {nullptr};
+	ScribusDoc *m_Doc {nullptr};
+	ScribusMainWindow *m_ScMW {nullptr};
+	ScribusView *m_View {nullptr};
+	int m_winIndex {0};
 
 };
 

Modified: trunk/Scribus/scribus/ui/smcolorcombo.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23521&path=/trunk/Scribus/scribus/ui/smcolorcombo.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smcolorcombo.cpp	(original)
+++ trunk/Scribus/scribus/ui/smcolorcombo.cpp	Fri Mar 20 23:50:47 2020
@@ -10,19 +10,13 @@
 
 
 SMColorCombo::SMColorCombo(QWidget *parent)
-: ColorCombo(parent),
-  m_hasParent(false),
-  m_useParentValue(false),
-  m_pItem(0)
+: ColorCombo(parent)
 {
 	
 }
 
 SMColorCombo::SMColorCombo(bool rw, QWidget* parent)
-: ColorCombo(rw, parent),
-  m_hasParent(false),
-  m_useParentValue(false),
-  m_pItem(0)
+: ColorCombo(rw, parent)
 {
 	
 }

Modified: trunk/Scribus/scribus/ui/smcolorcombo.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23521&path=/trunk/Scribus/scribus/ui/smcolorcombo.h
==============================================================================
--- trunk/Scribus/scribus/ui/smcolorcombo.h	(original)
+++ trunk/Scribus/scribus/ui/smcolorcombo.h	Fri Mar 20 23:50:47 2020
@@ -30,9 +30,9 @@
 	bool useParentValue();
 
 private:
-	bool   m_hasParent;
-	bool   m_useParentValue;
-	int    m_pItem;
+	bool m_hasParent {false};
+	bool m_useParentValue {false};
+	int m_pItem {0};
 	QString m_pText;
 	void setFont(bool wantBold);
 




More information about the scribus-commit mailing list