From ab364c944037975e4be9f400c9a8f4fe8f8f14f9 Mon Sep 17 00:00:00 2001
From: Thoronador <thoronador@users.sourceforge.net>
Date: Sat, 11 Oct 2014 00:50:32 +0200
Subject: [PATCH] fix some more uninitialized class member fields

---
 apps/opencs/view/render/pagedworldspacewidget.cpp | 3 ++-
 apps/opencs/view/render/scenewidget.cpp           | 8 +++++---
 apps/opencs/view/render/worldspacewidget.cpp      | 2 +-
 apps/opencs/view/settings/settingwindow.cpp       | 4 ++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index a66a1bb7e..aa74d4c91 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -148,7 +148,8 @@ std::string CSVRender::PagedWorldspaceWidget::getStartupInstruction()
 }
 
 CSVRender::PagedWorldspaceWidget::PagedWorldspaceWidget (QWidget* parent, CSMDoc::Document& document)
-: WorldspaceWidget (document, parent), mDocument (document), mWorldspace ("std::default")
+: WorldspaceWidget (document, parent), mDocument (document), mWorldspace ("std::default"),
+  mControlElements(NULL)
 {
     QAbstractItemModel *cells =
         document.getData().getTableModel (CSMWorld::UniversalId::Type_Cells);
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index 5ddb5e084..53599c3cb 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -22,10 +22,12 @@ namespace CSVRender
 {
     SceneWidget::SceneWidget(QWidget *parent)
         : QWidget(parent)
-        , mWindow(NULL)
         , mCamera(NULL)
-        , mSceneMgr(NULL), mNavigation (0), mLighting (0), mUpdate (false)
-        , mKeyForward (false), mKeyBackward (false), mKeyLeft (false), mKeyRight (false)
+        , mSceneMgr(NULL)
+        , mWindow(NULL)
+        , mViewport(NULL)
+        , mNavigation (0), mLighting (0), mUpdate (false), mKeyForward (false)
+        , mKeyBackward (false), mKeyLeft (false), mKeyRight (false)
         , mKeyRollLeft (false), mKeyRollRight (false)
         , mFast (false), mDragging (false), mMod1 (false)
         , mFastFactor (4)
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index fa304dd82..75ea4f46e 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -19,7 +19,7 @@
 #include "elements.hpp"
 
 CSVRender::WorldspaceWidget::WorldspaceWidget (CSMDoc::Document& document, QWidget* parent)
-: SceneWidget (parent), mDocument(document), mRun (0)
+: SceneWidget (parent), mDocument(document), mSceneElements(0), mRun(0)
 {
     setAcceptDrops(true);
 
diff --git a/apps/opencs/view/settings/settingwindow.cpp b/apps/opencs/view/settings/settingwindow.cpp
index 590b6f7a5..4570a96db 100644
--- a/apps/opencs/view/settings/settingwindow.cpp
+++ b/apps/opencs/view/settings/settingwindow.cpp
@@ -9,7 +9,7 @@
 #include "view.hpp"
 
 CSVSettings::SettingWindow::SettingWindow(QWidget *parent)
-    : QMainWindow(parent)
+    : QMainWindow(parent), mModel(NULL)
 {}
 
 void CSVSettings::SettingWindow::createPages()
@@ -84,7 +84,7 @@ void CSVSettings::SettingWindow::createConnections
 
 void CSVSettings::SettingWindow::setViewValues()
 {
-    //iterate each page and view, setting their definintions
+    //iterate each page and view, setting their definitions
     //if they exist in the model
     foreach (const Page *page, mPages)
     {