Use id() instead of name() for components and slides

Since the names aren't unique the output ends up being less then
helpful.

Change-Id: I7ba5270dcff0c191638ff591bbabdca7f64a62aa
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

1 files changed, 9 insertions, 9 deletions

diff --git a/src/runtime/q3dsslideplayer.cpp b/src/runtime/q3dsslideplayer.cpp
index c82b81b..7f1e778 100644
--- a/src/runtime/q3dsslideplayer.cpp
+++ b/src/runtime/q3dsslideplayer.cpp
@@ -241,9 +241,9 @@ static void forAllSlideComponents(Q3DSSlide *slide, std::function<void (Q3DSComp
     }
 }
 
-static QString getSlideName(Q3DSSlide *slide)
+static QByteArray getSlideId(Q3DSSlide *slide)
 {
-    return slide ? slide->name() : QStringLiteral("no-slide");
+    return slide ? slide->id() : QByteArrayLiteral("no-slide");
 }
 
 static Q3DSSlidePlayer::PlayerState getInitialSlideState(Q3DSSlide *slide)
@@ -529,7 +529,7 @@ void Q3DSSlidePlayer::setSlideDeck(Q3DSSlideDeck *slideDeck)
         Q3DSSlideAttached *compMasterData = compMasterSlide->attached<Q3DSSlideAttached>();
         Q_ASSERT(compMasterData);
         qCDebug(lcSlidePlayer, "Processing component \"%s\", on slide \"%s\"",
-                qPrintable(comp->name()), qPrintable(getSlideName(slide)));
+                comp->id().constData(), getSlideId(slide).constData());
         if (!compMasterData->slidePlayer) {
             qCDebug(lcSlidePlayer, "No player found for Component \"%s\", adding one", qPrintable(comp->name()));
             compMasterData->slidePlayer = new Q3DSSlidePlayer(m_animationManager, m_sceneManager, comp, this);
@@ -651,10 +651,10 @@ void Q3DSSlidePlayer::reset()
 void Q3DSSlidePlayer::setInternalState(Q3DSSlidePlayer::PlayerState state)
 {
     m_data.pendingState = state;
-    qCDebug(lcSlidePlayer, "Setting internal state from %s to %s", getEnumName(m_data.state), getEnumName(m_data.pendingState));
-
     Q3DSSlide *currentSlide = m_data.slideDeck->currentSlide();
 
+    qCDebug(lcSlidePlayer, "Setting internal state for %s from %s to %s", getSlideId(currentSlide).constData(), getEnumName(m_data.state), getEnumName(m_data.pendingState));
+
     // The current slide is stored in the scene manager or in the component, depending
     // on which type of player we are.
     Q3DSSlide *previousSlide = (m_type == PlayerType::Slide) ? m_sceneManager->currentSlide()
@@ -731,7 +731,7 @@ void Q3DSSlidePlayer::handleCurrentSlideChanged(Q3DSSlide *slide, Q3DSSlide *pre
     };
 
     qCDebug(lcSlidePlayer, "Handling current slide change: from slide \"%s\", to slide \"%s\"",
-            qPrintable(getSlideName(previousSlide)), qPrintable(getSlideName(slide)));
+            getSlideId(previousSlide).constData(), getSlideId(slide).constData());
 
     // --------------------------------------------------------------------------------------------
 
@@ -918,7 +918,7 @@ void Q3DSSlidePlayer::sendPositionChanged(Q3DSSlide *slide, float pos)
             && timeLeft < 0.1f;
 
     if (onEOS) {
-        qCDebug(lcSlidePlayer, "Reached EOS at %.1fs", pos / 1000.f);
+        qCDebug(lcSlidePlayer, "Slide %s reached EOS at %.1fs", slide->id().constData(), pos / 1000.f);
         onSlideFinished(slide);
     }
 }
@@ -941,7 +941,7 @@ void Q3DSSlidePlayer::updateObjectVisibility(Q3DSGraphObject *obj, bool shouldBe
 
 bool Q3DSSlidePlayer::isSlideVisible(Q3DSSlide *slide)
 {
-    qCDebug(lcSlidePlayer, "Checking visibility for \"%s\"", qPrintable(getSlideName(slide)));
+    qCDebug(lcSlidePlayer, "Checking visibility for \"%s\"", getSlideId(slide).constData());
     // If we the slide is not null, we assume it's visible until proven otherwise.
     bool visible = (slide != nullptr);
     if (slide) {
@@ -962,7 +962,7 @@ bool Q3DSSlidePlayer::isSlideVisible(Q3DSSlide *slide)
         }
     }
 
-    qCDebug(lcSlidePlayer, "The slides's (\"%s\") visibility is %d", qPrintable(getSlideName(slide)), visible);
+    qCDebug(lcSlidePlayer, "The slides's (\"%s\") visibility is %d", getSlideId(slide).constData(), visible);
 
     return  visible;
 }