General code cleanup and coverity fixes - mostly fixes uninitialized members

2 files changed, 6 insertions, 8 deletions

diff --git a/src/modules/objects/KvsObject_window.cpp b/src/modules/objects/KvsObject_window.cpp
index 28ccbd7a8..5bd8b428a 100644
--- a/src/modules/objects/KvsObject_window.cpp
+++ b/src/modules/objects/KvsObject_window.cpp
@@ -34,8 +34,6 @@
 KviKvsScriptWindowWindow::KviKvsScriptWindowWindow(const QString & szName)
     : KviWindow(KviWindow::ScriptObject, szName)
 {
-	m_pCentralWidget = nullptr;
-	m_pIcon = nullptr;
 }
 
 KviKvsScriptWindowWindow::~KviKvsScriptWindowWindow()
diff --git a/src/modules/objects/KvsObject_window.h b/src/modules/objects/KvsObject_window.h
index 172db20de..c70bbc59d 100644
--- a/src/modules/objects/KvsObject_window.h
+++ b/src/modules/objects/KvsObject_window.h
@@ -36,12 +36,12 @@ public:
 	~KviKvsScriptWindowWindow();
 
 protected:
-	KvsObject_widget * m_pCentralWidgetObject;
-	QWidget * m_pCentralWidget;
-	QPixmap * m_pIcon;
+	KvsObject_widget * m_pCentralWidgetObject = nullptr;
+	QWidget * m_pCentralWidget = nullptr;
+	QPixmap * m_pIcon = nullptr;
 
 public:
-	virtual QPixmap * myIconPtr();
+	QPixmap * myIconPtr() override;
 	void setIcon(QPixmap * pPixmap) { m_pIcon = pPixmap; };
 	void setCentralWidget(KvsObject_widget * o, QWidget * w);
 	void setWindowTitleString(const QString & s)
@@ -49,7 +49,7 @@ public:
 		setFixedCaption(s);
 		fillCaptionBuffers();
 	};
-	virtual void resizeEvent(QResizeEvent * e);
+	void resizeEvent(QResizeEvent * e) override;
 protected slots:
 	void centralWidgetObjectDestroyed();
 	void centralWidgetDestroyed();
@@ -60,7 +60,7 @@ class KvsObject_window : public KvsObject_widget
 public:
 	KVSO_DECLARE_OBJECT(KvsObject_window)
 public:
-	QWidget * widget() { return (QWidget *)object(); };
+	QWidget * widget() { return (QWidget *)object(); }
 
 protected:
 	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);