OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1292 Fixed CppCheck Issues in AppFwk : Use QPointer

Browse Source
This commit is contained in:
Magne Sjaastad 2017-03-07 11:36:29 +01:00
parent b365834923
commit 811f63219c
4 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Fwk/AppFwk/cafCommand/cafCmdExecCommandManager.h
View File

@ -36,6 +36,9 @@
#pragma once #pragma once
#include <QPointer>
#include <vector> #include <vector>
class QUndoStack; class QUndoStack;
@ -85,7 +88,7 @@ private:
friend class CmdExecCommandSystemDeactivator; friend class CmdExecCommandSystemDeactivator;
private: private:
QUndoStack* m_undoStack; QPointer<QUndoStack> m_undoStack;
CmdUiCommandSystemImpl* m_commandFeatureInterface; CmdUiCommandSystemImpl* m_commandFeatureInterface;
}; };

20
Fwk/AppFwk/cafUserInterface/cafPdmUiListViewEditor.cpp
View File

@ -46,6 +46,8 @@
#include <QTableView> #include <QTableView>
#include <QWidget> #include <QWidget>
#include <assert.h>
namespace caf namespace caf
@ -208,7 +210,7 @@ void caf::UiListViewModelPdm::setPdmData(PdmObjectCollection* objectGroup, const
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
PdmUiListViewEditor::PdmUiListViewEditor() PdmUiListViewEditor::PdmUiListViewEditor()
: m_layout(nullptr), :
m_tableView(nullptr), m_tableView(nullptr),
m_tableModelPdm(nullptr) m_tableModelPdm(nullptr)
{ {
@ -227,19 +229,21 @@ PdmUiListViewEditor::~PdmUiListViewEditor()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QWidget* PdmUiListViewEditor::createWidget(QWidget* parent) QWidget* PdmUiListViewEditor::createWidget(QWidget* parent)
{ {
m_mainWidget = new QWidget(parent); assert(parent);
m_layout = new QVBoxLayout();
m_mainWidget->setLayout(m_layout);
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->setShowGrid(false);
m_tableView->setModel(m_tableModelPdm); m_tableView->setModel(m_tableModelPdm);
m_layout->addWidget(m_tableView); layout->addWidget(m_tableView);
return m_mainWidget; return mainWidget;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

7
Fwk/AppFwk/cafUserInterface/cafPdmUiListViewEditor.h
View File

@ -114,11 +114,8 @@ protected:
virtual void configureAndUpdateUi(const QString& uiConfigName); virtual void configureAndUpdateUi(const QString& uiConfigName);
private: private:
QPointer<QWidget> m_mainWidget; QPointer<QTableView> m_tableView;
QLayout* m_layout; UiListViewModelPdm* m_tableModelPdm;
QTableView* m_tableView;
UiListViewModelPdm* m_tableModelPdm;
}; };

8
Fwk/AppFwk/cafUserInterface/cafPdmUiPropertyView.h
View File

@ -39,6 +39,7 @@
#include <QString> #include <QString>
#include <QWidget> #include <QWidget>
#include <QPointer>
class QVBoxLayout; class QVBoxLayout;
@ -64,14 +65,15 @@ public:
virtual QSize sizeHint() const override; virtual QSize sizeHint() const override;
public slots: public slots:
void showProperties(caf::PdmObjectHandle* object); // Signal/Slot system needs caf:: prefix in some cases void showProperties(caf::PdmObjectHandle* object); // Signal/Slot system needs caf:: prefix in some cases
private: private:
PdmUiObjectEditorHandle* m_currentObjectView; PdmUiObjectEditorHandle* m_currentObjectView;
QString m_uiConfigName; QString m_uiConfigName;
QVBoxLayout* m_placeHolderLayout;
QWidget* m_placeholder; QPointer<QVBoxLayout> m_placeHolderLayout;
QPointer<QWidget> m_placeholder;
}; };