General code cleanup and coverity fixes - mostly fixes uninitialized members

2 files changed, 8 insertions, 10 deletions

diff --git a/src/modules/options/OptionsWidgetContainer.cpp b/src/modules/options/OptionsWidgetContainer.cpp
index 2fa75fb7d..6ff3e5e31 100644
--- a/src/modules/options/OptionsWidgetContainer.cpp
+++ b/src/modules/options/OptionsWidgetContainer.cpp
@@ -48,8 +48,6 @@ OptionsWidgetContainer::OptionsWidgetContainer(QWidget * par, bool bModal)
 
 	setObjectName("container");
 
-	m_pOptionsWidget = nullptr;
-
 	if(bModal)
 		setWindowModality(par ? Qt::WindowModal : Qt::ApplicationModal);
 }
diff --git a/src/modules/options/OptionsWidgetContainer.h b/src/modules/options/OptionsWidgetContainer.h
index 5f26c2f5d..17328c12d 100644
--- a/src/modules/options/OptionsWidgetContainer.h
+++ b/src/modules/options/OptionsWidgetContainer.h
@@ -28,8 +28,8 @@
 
 #include <QDialog>
 
-class QPushButton;
 class QGridLayout;
+class QPushButton;
 
 class OptionsWidgetContainer : public QDialog
 {
@@ -39,9 +39,9 @@ public:
 	~OptionsWidgetContainer();
 
 protected:
-	KviOptionsWidget * m_pOptionsWidget;
-	QPushButton * m_pCancel;
-	QGridLayout * m_pLayout;
+	KviOptionsWidget * m_pOptionsWidget = nullptr;
+	QPushButton * m_pCancel = nullptr;
+	QGridLayout * m_pLayout = nullptr;
 
 public:
 	void setup(KviOptionsWidget * w);
@@ -49,10 +49,10 @@ public:
 	void setNextToLeft(QWidget * pWidget);
 
 protected:
-	virtual void closeEvent(QCloseEvent * e);
-	virtual void showEvent(QShowEvent * e);
-	virtual void childEvent(QChildEvent * e);
-	virtual void reject();
+	void closeEvent(QCloseEvent * e) override;
+	void showEvent(QShowEvent * e) override;
+	void childEvent(QChildEvent * e) override;
+	void reject() override;
 protected slots:
 	void okClicked();
 	void cancelClicked();