mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: remove deleteLater() in QMLProfile

Browse source 
The actual profile object was destroyed with deleteLater() in the
destructor of QMLProfile. This is ominous, because the subobject
shouldn't survive the parent object.

Therefore, automatically destroy the profile by using a QScopedPointer.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-05-25 23:30:10 +02:00 • committed by Dirk Hohndel
parent d21d42b691
commit d7f5246d6b
2 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
mobile-widgets/qmlprofile.cpp
View file

@ -1,7 +1,6 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include "qmlprofile.h" #include "qmlprofile.h"
#include "qmlmanager.h" #include "qmlmanager.h"
#include "profile-widget/profilewidget2.h"
#include "core/subsurface-string.h" #include "core/subsurface-string.h"
#include "core/metrics.h" #include "core/metrics.h"
#include <QTransform> #include <QTransform>
@ -10,10 +9,10 @@
QMLProfile::QMLProfile(QQuickItem *parent) : QMLProfile::QMLProfile(QQuickItem *parent) :
QQuickPaintedItem(parent), QQuickPaintedItem(parent),
m_devicePixelRatio(1.0), m_devicePixelRatio(1.0),
m_margin(0) m_margin(0),
m_profileWidget(new ProfileWidget2)
{ {
setAntialiasing(true); setAntialiasing(true);
m_profileWidget = new ProfileWidget2(0);
m_profileWidget->setProfileState(); m_profileWidget->setProfileState();
m_profileWidget->setPrintMode(true); m_profileWidget->setPrintMode(true);
m_profileWidget->setFontPrintScale(0.8); m_profileWidget->setFontPrintScale(0.8);
@ -21,11 +20,6 @@ QMLProfile::QMLProfile(QQuickItem *parent) :
setDevicePixelRatio(QMLManager::instance()->lastDevicePixelRatio()); setDevicePixelRatio(QMLManager::instance()->lastDevicePixelRatio());
} }
QMLProfile::~QMLProfile()
{
m_profileWidget->deleteLater();
}
void QMLProfile::paint(QPainter *painter) void QMLProfile::paint(QPainter *painter)
{ {
// let's look at the intended size of the content and scale our scene accordingly // let's look at the intended size of the content and scale our scene accordingly

6
mobile-widgets/qmlprofile.h
View file

@ -2,10 +2,9 @@
#ifndef QMLPROFILE_H #ifndef QMLPROFILE_H
#define QMLPROFILE_H #define QMLPROFILE_H
#include "profile-widget/profilewidget2.h"
#include <QQuickPaintedItem> #include <QQuickPaintedItem>
class ProfileWidget2;
class QMLProfile : public QQuickPaintedItem class QMLProfile : public QQuickPaintedItem
{ {
Q_OBJECT Q_OBJECT
@ -14,7 +13,6 @@ class QMLProfile : public QQuickPaintedItem
public: public:
explicit QMLProfile(QQuickItem *parent = 0); explicit QMLProfile(QQuickItem *parent = 0);
virtual ~QMLProfile();
void paint(QPainter *painter); void paint(QPainter *painter);
@ -30,7 +28,7 @@ private:
QString m_diveId; QString m_diveId;
qreal m_devicePixelRatio; qreal m_devicePixelRatio;
int m_margin; int m_margin;
ProfileWidget2 *m_profileWidget; QScopedPointer<ProfileWidget2> m_profileWidget;
signals: signals:
void rightAlignedChanged(); void rightAlignedChanged();