mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2025-12-17 12:40:35 +01:00
Fix crash
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5011 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
@@ -18,6 +18,5 @@
|
||||
#include "abstractelementpropertieseditorwidget.h"
|
||||
|
||||
AbstractElementPropertiesEditorWidget::AbstractElementPropertiesEditorWidget(QWidget *parent) :
|
||||
PropertiesEditorWidget(parent),
|
||||
m_element (nullptr)
|
||||
PropertiesEditorWidget(parent)
|
||||
{}
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
#define ABSTRACTELEMENTPROPERTIESEDITORWIDGET_H
|
||||
|
||||
#include "PropertiesEditor/propertieseditorwidget.h"
|
||||
#include "QPointer"
|
||||
|
||||
class Element;
|
||||
|
||||
@@ -34,7 +35,7 @@ class AbstractElementPropertiesEditorWidget : public PropertiesEditorWidget
|
||||
virtual void setElement(Element *element) =0;
|
||||
|
||||
protected:
|
||||
Element *m_element;
|
||||
QPointer <Element> m_element;
|
||||
|
||||
|
||||
};
|
||||
|
||||
@@ -33,7 +33,6 @@
|
||||
MasterPropertiesWidget::MasterPropertiesWidget(Element *elmt, QWidget *parent) :
|
||||
AbstractElementPropertiesEditorWidget(parent),
|
||||
ui(new Ui::MasterPropertiesWidget),
|
||||
m_showed_element (nullptr),
|
||||
m_project(nullptr)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
@@ -99,7 +98,8 @@ MasterPropertiesWidget::~MasterPropertiesWidget()
|
||||
if (m_showed_element)
|
||||
m_showed_element->setHighlighted(false);
|
||||
|
||||
m_element->setHighlighted(false);
|
||||
if(m_element)
|
||||
m_element->setHighlighted(false);
|
||||
|
||||
delete ui;
|
||||
}
|
||||
|
||||
@@ -71,7 +71,7 @@ class MasterPropertiesWidget : public AbstractElementPropertiesEditorWidget
|
||||
Ui::MasterPropertiesWidget *ui;
|
||||
QHash <QTreeWidgetItem *, Element *> m_qtwi_hash;
|
||||
QTreeWidgetItem *m_qtwi_at_context_menu = nullptr;
|
||||
Element *m_showed_element;
|
||||
QPointer <Element> m_showed_element;
|
||||
QETProject *m_project;
|
||||
QMenu *m_context_menu;
|
||||
QAction *m_link_action,
|
||||
|
||||
Reference in New Issue
Block a user