From 811f63219c05712e7774120ae38e0d37679d5fa9 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Tue, 7 Mar 2017 11:36:29 +0100
Subject: [PATCH]  #1292 Fixed CppCheck Issues in AppFwk : Use QPointer

---
 .../cafCommand/cafCmdExecCommandManager.h     |  5 ++++-
 .../cafPdmUiListViewEditor.cpp                | 20 +++++++++++--------
 .../cafUserInterface/cafPdmUiListViewEditor.h |  7 ++-----
 .../cafUserInterface/cafPdmUiPropertyView.h   |  8 +++++---
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/Fwk/AppFwk/cafCommand/cafCmdExecCommandManager.h b/Fwk/AppFwk/cafCommand/cafCmdExecCommandManager.h
index 9fce62c55d..f093c1afff 100644
--- a/Fwk/AppFwk/cafCommand/cafCmdExecCommandManager.h
+++ b/Fwk/AppFwk/cafCommand/cafCmdExecCommandManager.h
@@ -36,6 +36,9 @@
 
 
 #pragma once
+
+#include <QPointer>
+
 #include <vector>
 
 class QUndoStack;
@@ -85,7 +88,7 @@ private:
     friend class CmdExecCommandSystemDeactivator;
 
 private:
-    QUndoStack* m_undoStack;
+    QPointer<QUndoStack> m_undoStack;
 
     CmdUiCommandSystemImpl* m_commandFeatureInterface;
 };
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiListViewEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiListViewEditor.cpp
index 1779f8dff4..60ed526567 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiListViewEditor.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiListViewEditor.cpp
@@ -46,6 +46,8 @@
 #include <QTableView>
 #include <QWidget>
 
+#include <assert.h>
+
 
 
 namespace caf
@@ -208,7 +210,7 @@ void caf::UiListViewModelPdm::setPdmData(PdmObjectCollection* objectGroup, const
 /// 
 //--------------------------------------------------------------------------------------------------
 PdmUiListViewEditor::PdmUiListViewEditor()
-    : m_layout(nullptr),
+    : 
     m_tableView(nullptr),
     m_tableModelPdm(nullptr)
 {
@@ -227,19 +229,21 @@ PdmUiListViewEditor::~PdmUiListViewEditor()
 //--------------------------------------------------------------------------------------------------
 QWidget* PdmUiListViewEditor::createWidget(QWidget* parent)
 {
-    m_mainWidget = new QWidget(parent);
-    m_layout     = new QVBoxLayout();
-    m_mainWidget->setLayout(m_layout);
+    assert(parent);
 
-    m_tableModelPdm = new UiListViewModelPdm(m_mainWidget);
+    QWidget* mainWidget = new QWidget(parent);
+    QVBoxLayout* layout = new QVBoxLayout();
+    mainWidget->setLayout(layout);
 
-    m_tableView = new QTableView(m_mainWidget);
+    m_tableModelPdm = new UiListViewModelPdm(mainWidget);
+
+    m_tableView = new QTableView(mainWidget);
     m_tableView->setShowGrid(false);
     m_tableView->setModel(m_tableModelPdm);
 
-    m_layout->addWidget(m_tableView);
+    layout->addWidget(m_tableView);
 
-    return m_mainWidget;
+    return mainWidget;
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiListViewEditor.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiListViewEditor.h
index 38fbcbb7f7..662100cf00 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiListViewEditor.h
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiListViewEditor.h
@@ -114,11 +114,8 @@ protected:
     virtual void        configureAndUpdateUi(const QString& uiConfigName);
 
 private:
-    QPointer<QWidget>   m_mainWidget;
-    QLayout*            m_layout;
-
-    QTableView*         m_tableView;
-    UiListViewModelPdm* m_tableModelPdm;
+    QPointer<QTableView>    m_tableView;
+    UiListViewModelPdm*     m_tableModelPdm;
 };
 
 
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiPropertyView.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiPropertyView.h
index 0c9d77a7ac..f56d1c4a72 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiPropertyView.h
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiPropertyView.h
@@ -39,6 +39,7 @@
 
 #include <QString>
 #include <QWidget>
+#include <QPointer>
 
 class QVBoxLayout;
 
@@ -64,14 +65,15 @@ public:
 
     virtual QSize               sizeHint() const override;
 
-    public slots:
+public slots:
     void                        showProperties(caf::PdmObjectHandle* object); // Signal/Slot system needs caf:: prefix in some cases
 
 private:
     PdmUiObjectEditorHandle*    m_currentObjectView; 
     QString                     m_uiConfigName;
-    QVBoxLayout*                m_placeHolderLayout;
-    QWidget*                    m_placeholder;
+    
+    QPointer<QVBoxLayout>       m_placeHolderLayout;
+    QPointer<QWidget>           m_placeholder;
 };