diff options
author | Tomi Korpipää <tomi.korpipaa@theqtcompany.com> | 2015-12-08 11:50:37 +0200 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@theqtcompany.com> | 2015-12-09 05:18:19 +0000 |
commit | 0e15154c9f0d982096a551efc53fd363d2b2f68d (patch) | |
tree | 4917ca73c44a92297db7cc3dbd72d2716481ccc7 /src/render/io | |
parent | 036ea9fcfdd343c805e1a900528e7a2367d6c373 (diff) |
Added parameters to signals and made setters Q_SLOTS
Change-Id: Icec2f9f207221e35ffdeeb594bb9b4dc6ef890f1
Task-number: QTBUG-49797
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/io')
-rw-r--r-- | src/render/io/qabstractsceneloader.cpp | 4 | ||||
-rw-r--r-- | src/render/io/qabstractsceneloader.h | 9 | ||||
-rw-r--r-- | src/render/io/qabstractsceneparser.cpp | 4 | ||||
-rw-r--r-- | src/render/io/qabstractsceneparser.h | 4 |
4 files changed, 11 insertions, 10 deletions
diff --git a/src/render/io/qabstractsceneloader.cpp b/src/render/io/qabstractsceneloader.cpp index 6c90c15ad..7894d4d3d 100644 --- a/src/render/io/qabstractsceneloader.cpp +++ b/src/render/io/qabstractsceneloader.cpp @@ -88,7 +88,7 @@ void QAbstractSceneLoader::setSource(const QUrl &arg) Q_D(QAbstractSceneLoader); if (d->m_source != arg) { d->m_source = arg; - emit sourceChanged(); + emit sourceChanged(arg); } } @@ -103,7 +103,7 @@ void QAbstractSceneLoader::setStatus(QAbstractSceneLoader::Status status) Q_D(QAbstractSceneLoader); if (d->m_status != status) { d->m_status = status; - emit statusChanged(); + emit statusChanged(status); } } diff --git a/src/render/io/qabstractsceneloader.h b/src/render/io/qabstractsceneloader.h index e4f19eb12..599ca1fc7 100644 --- a/src/render/io/qabstractsceneloader.h +++ b/src/render/io/qabstractsceneloader.h @@ -66,14 +66,15 @@ public: Q_ENUM(Status) QUrl source() const; - void setSource(const QUrl &arg); - Status status() const; + +public Q_SLOTS: + void setSource(const QUrl &arg); void setStatus(Status status); Q_SIGNALS: - void sourceChanged(); - void statusChanged(); + void sourceChanged(const QUrl &source); + void statusChanged(Status status); protected: QAbstractSceneLoader(QAbstractSceneLoaderPrivate &dd, Qt3DCore::QNode *parent = 0); diff --git a/src/render/io/qabstractsceneparser.cpp b/src/render/io/qabstractsceneparser.cpp index 0a5378541..d26e99a13 100644 --- a/src/render/io/qabstractsceneparser.cpp +++ b/src/render/io/qabstractsceneparser.cpp @@ -65,14 +65,14 @@ void QAbstractSceneParser::setParserStatus(ParserStatus parserStatus) { if (parserStatus != m_parserStatus) { m_parserStatus = parserStatus; - emit parserStatusChanged(); + emit parserStatusChanged(parserStatus); } } void QAbstractSceneParser::logError(const QString &error) { m_errors.append(error); - emit errorsChanged(); + emit errorsChanged(m_errors); } void QAbstractSceneParser::logInfo(const QString &info) diff --git a/src/render/io/qabstractsceneparser.h b/src/render/io/qabstractsceneparser.h index 3f1681e3a..a91d392e9 100644 --- a/src/render/io/qabstractsceneparser.h +++ b/src/render/io/qabstractsceneparser.h @@ -80,8 +80,8 @@ public: QStringList errors() const; Q_SIGNALS: - void parserStatusChanged(); - void errorsChanged(); + void parserStatusChanged(ParserStatus parserStatus); + void errorsChanged(const QStringList &errors); protected: void setParserStatus(ParserStatus parserStatus); |