diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2016-11-29 10:11:23 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-11-29 10:06:14 +0000 |
commit | 20f1f1b1a027dfe5dcdd91d25590095e99eb2bf3 (patch) | |
tree | 6302f434fcfff3ec6b95a65b651394d860ed3082 /src | |
parent | 37747423e5d3bd419fa1d413c7d545a2d4e5552f (diff) |
Drop some empty destructors
We don't need to expose explicit destructors when inheriting from
QObject.
Change-Id: I2c9e7b075cab9b8b44be10045aeddd3c1cfb89b7
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/scxml/qscxmlcppdatamodel.cpp | 5 | ||||
-rw-r--r-- | src/scxml/qscxmlcppdatamodel.h | 1 | ||||
-rw-r--r-- | src/scxml/qscxmldatamodel.cpp | 5 | ||||
-rw-r--r-- | src/scxml/qscxmldatamodel.h | 1 |
4 files changed, 0 insertions, 12 deletions
diff --git a/src/scxml/qscxmlcppdatamodel.cpp b/src/scxml/qscxmlcppdatamodel.cpp index 0c20381..69f0fbd 100644 --- a/src/scxml/qscxmlcppdatamodel.cpp +++ b/src/scxml/qscxmlcppdatamodel.cpp @@ -134,11 +134,6 @@ QScxmlCppDataModel::QScxmlCppDataModel(QObject *parent) : QScxmlDataModel(*(new QScxmlCppDataModelPrivate), parent) {} -/*! \internal */ -QScxmlCppDataModel::~QScxmlCppDataModel() -{ -} - /*! * Called during state machine initialization to set up a state machine using the initial values * for data model variables specified by their keys, \a initialDataValues. These diff --git a/src/scxml/qscxmlcppdatamodel.h b/src/scxml/qscxmlcppdatamodel.h index 97ca636..04607f2 100644 --- a/src/scxml/qscxmlcppdatamodel.h +++ b/src/scxml/qscxmlcppdatamodel.h @@ -59,7 +59,6 @@ class Q_SCXML_EXPORT QScxmlCppDataModel: public QScxmlDataModel Q_DECLARE_PRIVATE(QScxmlCppDataModel) public: explicit QScxmlCppDataModel(QObject *parent = nullptr); - ~QScxmlCppDataModel(); Q_INVOKABLE bool setup(const QVariantMap &initialDataValues) Q_DECL_OVERRIDE; diff --git a/src/scxml/qscxmldatamodel.cpp b/src/scxml/qscxmldatamodel.cpp index 9762e92..6e6d62b 100644 --- a/src/scxml/qscxmldatamodel.cpp +++ b/src/scxml/qscxmldatamodel.cpp @@ -96,11 +96,6 @@ QScxmlDataModel::QScxmlDataModel(QScxmlDataModelPrivate &dd, QObject *parent) : { } -/*! \internal */ -QScxmlDataModel::~QScxmlDataModel() -{ -} - /*! * Sets the state machine this model belongs to to \a stateMachine. There is a * 1:1 relation between state machines and models. After setting the state diff --git a/src/scxml/qscxmldatamodel.h b/src/scxml/qscxmldatamodel.h index 9f2b921..e1a575a 100644 --- a/src/scxml/qscxmldatamodel.h +++ b/src/scxml/qscxmldatamodel.h @@ -69,7 +69,6 @@ public: public: explicit QScxmlDataModel(QObject *parent = nullptr); - ~QScxmlDataModel(); void setStateMachine(QScxmlStateMachine *stateMachine); QScxmlStateMachine *stateMachine() const; |