diff options
| author | Janne Kangas <janne.kangas@qt.io> | 2018-11-14 13:40:38 +0200 |
|---|---|---|
| committer | Janne Kangas <janne.kangas@qt.io> | 2019-02-12 05:56:44 +0000 |
| commit | 72c4b5fc9d7fde2a2bdf730eab22ffb99b9c2ca3 (patch) | |
| tree | e104cafc82ecaff28c2b908d01a82bd3e4b8987e | |
| parent | 4a1b50066c9d7ea7adccad152032cb33d0960847 (diff) | |
Code tidy-upsv2.3.0-beta1
Change-Id: I30a55df70ab39eaf24ac7194602507d94701dc30
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| -rw-r--r-- | examples/3dstudioruntime2/cppdatainput/main.cpp | 3 | ||||
| -rw-r--r-- | src/runtime/api/q3dspresentation.cpp | 3 | ||||
| -rw-r--r-- | src/runtime/api/q3dspresentation_p.h | 1 | ||||
| -rw-r--r-- | src/runtime/q3dsengine_p.h | 1 |
4 files changed, 5 insertions, 3 deletions
diff --git a/examples/3dstudioruntime2/cppdatainput/main.cpp b/examples/3dstudioruntime2/cppdatainput/main.cpp index 0366ca0..92f1018 100644 --- a/examples/3dstudioruntime2/cppdatainput/main.cpp +++ b/examples/3dstudioruntime2/cppdatainput/main.cpp @@ -112,7 +112,8 @@ int main(int argc, char *argv[]) qDebug() << "Metadata key for" << dynDi->name() << ":" << dynDi->metadataKey(); qDebug() << "Metadata: " << dynDi->metadata(); dynDi->setMetadata("metadata2", "Secondary rotation control"); - qDebug() << "New metadata key for" << dynDi->name() << ":" << dynDi->metadataKey(); + qDebug() << "New metadata key for" << dynDi->name() << ":" + << dynDi->metadataKey(); qDebug() << "New metadata for " << dynDi->name() << ":" << dynDi->metadata(); QObject::connect(&viewer, &Q3DSSurfaceViewer::frameUpdate, [&range, dynDi] { diff --git a/src/runtime/api/q3dspresentation.cpp b/src/runtime/api/q3dspresentation.cpp index 4f311ee..2d127e9 100644 --- a/src/runtime/api/q3dspresentation.cpp +++ b/src/runtime/api/q3dspresentation.cpp @@ -554,7 +554,8 @@ QVariantList Q3DSPresentation::getDataInputs() } /*! - Returns a list of datainputs defined for this presentation which have metadata key \a metadataKey. + Returns a list of datainputs defined for this presentation which have metadata key + \a metadataKey. \sa Q3DSDataInput */ diff --git a/src/runtime/api/q3dspresentation_p.h b/src/runtime/api/q3dspresentation_p.h index 49a514c..55e41bc 100644 --- a/src/runtime/api/q3dspresentation_p.h +++ b/src/runtime/api/q3dspresentation_p.h @@ -106,7 +106,6 @@ public: Q3DSEngine *pcEngine() const { return m_pcEngine; } - protected: Q3DSEngine *m_pcEngine = nullptr; // don't want clashes with commonly used m_engine members QVector<QPair<QString, QVariant> > m_pendingDataInputSets; diff --git a/src/runtime/q3dsengine_p.h b/src/runtime/q3dsengine_p.h index 89dfdd5..94624ab 100644 --- a/src/runtime/q3dsengine_p.h +++ b/src/runtime/q3dsengine_p.h @@ -231,6 +231,7 @@ public: Q3DSSubPresentation loadSubUipPresentation(const QString &subPresId); void createAspectEngine(); + public Q_SLOTS: void requestGrab(); |