hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Rename TCO to Clip in the clipboard data (#6278)

Browse Source
This commit is contained in:
Alex
2022-01-16 05:47:58 +01:00
committed by GitHub
parent 7fe2152938
commit 1162856418
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/ClipView.cpp
View File

@@ -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<ClipView *> 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() );

4
src/gui/widgets/TrackContentWidget.cpp
View File

@@ -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