From 116285641894d72ca5715aef330421040f8c7be8 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 16 Jan 2022 05:47:58 +0100 Subject: [PATCH] Rename TCO to Clip in the clipboard data (#6278) --- src/gui/ClipView.cpp | 8 ++++---- src/gui/widgets/TrackContentWidget.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gui/ClipView.cpp b/src/gui/ClipView.cpp index a5397035f..e77ebd67d 100644 --- a/src/gui/ClipView.cpp +++ b/src/gui/ClipView.cpp @@ -481,7 +481,7 @@ void ClipView::dropEvent( QDropEvent * de ) // Copy state into existing clip DataFile dataFile( value.toUtf8() ); TimePos pos = m_clip->startPosition(); - QDomElement clips = dataFile.content().firstChildElement( "tcos" ); //TODO: rename "tcos" to "clips" + QDomElement clips = dataFile.content().firstChildElement("clips"); m_clip->restoreState( clips.firstChildElement().firstChildElement() ); m_clip->movePosition( pos ); AutomationClip::resolveAllIDs(); @@ -532,16 +532,16 @@ DataFile ClipView::createClipDataFiles( Track * t = m_trackView->getTrack(); TrackContainer * tc = t->trackContainer(); DataFile dataFile( DataFile::DragNDropData ); - QDomElement clipParent = dataFile.createElement( "tcos" ); //TODO: rename to "clips" + QDomElement clipParent = dataFile.createElement("clips"); typedef QVector clipViewVector; for( clipViewVector::const_iterator it = clipViews.begin(); it != clipViews.end(); ++it ) { - // Insert into the dom under the "tcos" element (TODO: rename element to "clips") + // Insert into the dom under the "clips" element Track* clipTrack = ( *it )->m_trackView->getTrack(); int trackIndex = tc->tracks().indexOf( clipTrack ); - QDomElement clipElement = dataFile.createElement( "tco" ); //TODO: rename to "clip" + QDomElement clipElement = dataFile.createElement("clip"); clipElement.setAttribute( "trackIndex", trackIndex ); clipElement.setAttribute( "trackType", clipTrack->type() ); clipElement.setAttribute( "trackName", clipTrack->name() ); diff --git a/src/gui/widgets/TrackContentWidget.cpp b/src/gui/widgets/TrackContentWidget.cpp index 07c94dca4..2dd9c1f9b 100644 --- a/src/gui/widgets/TrackContentWidget.cpp +++ b/src/gui/widgets/TrackContentWidget.cpp @@ -377,7 +377,7 @@ bool TrackContentWidget::canPasteSelection( TimePos clipPos, const QMimeData* md } // Extract the clip data - QDomElement clipParent = dataFile.content().firstChildElement( "tcos" ); //TODO: rename "tcos" to "clips" + QDomElement clipParent = dataFile.content().firstChildElement("clips"); QDomNodeList clipNodes = clipParent.childNodes(); // Determine if all the Clips will land on a valid track @@ -444,7 +444,7 @@ bool TrackContentWidget::pasteSelection( TimePos clipPos, const QMimeData * md, DataFile dataFile( value.toUtf8() ); // Extract the clip data - QDomElement clipParent = dataFile.content().firstChildElement( "tcos" ); //TODO: rename "tcos" to "clips" + QDomElement clipParent = dataFile.content().firstChildElement("clips"); QDomNodeList clipNodes = clipParent.childNodes(); // Extract the track index that was originally clicked