From b300c2a83a49f84f8b0a18759e1f287167ea6a33 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 25 Apr 2017 14:39:08 +0300 Subject: [PATCH] Fix bug with property browser. Coverity Scan gave bad advise. --HG-- branch : release --- src/app/valentina/core/vformulapropertyeditor.cpp | 6 ------ src/app/valentina/core/vformulapropertyeditor.h | 2 +- src/libs/vpropertyexplorer/vpropertyformwidget.cpp | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/app/valentina/core/vformulapropertyeditor.cpp b/src/app/valentina/core/vformulapropertyeditor.cpp index ad894f790..865af3390 100644 --- a/src/app/valentina/core/vformulapropertyeditor.cpp +++ b/src/app/valentina/core/vformulapropertyeditor.cpp @@ -116,12 +116,6 @@ bool VFormulaPropertyEditor::eventFilter(QObject *obj, QEvent *ev) return QWidget::eventFilter(obj, ev); } -//--------------------------------------------------------------------------------------------------------------------- -VFormulaPropertyEditor::~VFormulaPropertyEditor() -{ - // -} - //--------------------------------------------------------------------------------------------------------------------- VFormula VFormulaPropertyEditor::GetFormula() const { diff --git a/src/app/valentina/core/vformulapropertyeditor.h b/src/app/valentina/core/vformulapropertyeditor.h index a8dbdc09e..d50ac5ccc 100644 --- a/src/app/valentina/core/vformulapropertyeditor.h +++ b/src/app/valentina/core/vformulapropertyeditor.h @@ -46,7 +46,7 @@ public: explicit VFormulaPropertyEditor(QWidget *parent); //! Destructor - virtual ~VFormulaPropertyEditor() Q_DECL_OVERRIDE; + virtual ~VFormulaPropertyEditor() Q_DECL_EQ_DEFAULT; //! Returns the formula currently set VFormula GetFormula() const; diff --git a/src/libs/vpropertyexplorer/vpropertyformwidget.cpp b/src/libs/vpropertyexplorer/vpropertyformwidget.cpp index e65d6c104..a2133034e 100644 --- a/src/libs/vpropertyexplorer/vpropertyformwidget.cpp +++ b/src/libs/vpropertyexplorer/vpropertyformwidget.cpp @@ -233,7 +233,7 @@ void VPE::VPropertyFormWidget::commitData(int row) } else if (parent->propertyType() == Property::Complex) { - parent->UpdateParent(newValue); + tmpProperty->UpdateParent(newValue); emit propertyDataSubmitted(parent); } }