From 7fe2152938db49c8b8a2d04a5ab1eccfd38c821a Mon Sep 17 00:00:00 2001
From: Alexandre Almeida <wilsalx@gmail.com>
Date: Sat, 15 Jan 2022 18:19:34 -0300
Subject: [PATCH] Fix broken data file upgrade (#6279)

Fixes issues introduced in previous commit (55d361fb6513193c465be1924167fb179c523fd3),
which affected loading, saving and drag-dropping of clips.
---
 include/AutomationClip.h | 2 +-
 include/BBClip.h         | 2 +-
 include/SampleClip.h     | 2 +-
 src/core/DataFile.cpp    | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/AutomationClip.h b/include/AutomationClip.h
index 521fc1aac..f29a0ae02 100644
--- a/include/AutomationClip.h
+++ b/include/AutomationClip.h
@@ -149,7 +149,7 @@ public:
 	void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
 	void loadSettings( const QDomElement & _this ) override;
 
-	static const QString classNodeName() { return "automationclip"; }
+	static const QString classNodeName() { return "automationpattern"; }
 	QString nodeName() const override { return classNodeName(); }
 
 	ClipView * createView( TrackView * _tv ) override;
diff --git a/include/BBClip.h b/include/BBClip.h
index 5c62e66ae..f073fca49 100644
--- a/include/BBClip.h
+++ b/include/BBClip.h
@@ -39,7 +39,7 @@ public:
 	void loadSettings( const QDomElement & _this ) override;
 	inline QString nodeName() const override
 	{
-		return( "bbclip" );
+		return( "bbtco" );
 	}
 
 	int bbTrackIndex();
diff --git a/include/SampleClip.h b/include/SampleClip.h
index e1e2a52a0..fd98b45db 100644
--- a/include/SampleClip.h
+++ b/include/SampleClip.h
@@ -48,7 +48,7 @@ public:
 	void loadSettings( const QDomElement & _this ) override;
 	inline QString nodeName() const override
 	{
-		return "sampleclip";
+		return "sampletco";
 	}
 
 	SampleBuffer* sampleBuffer()
diff --git a/src/core/DataFile.cpp b/src/core/DataFile.cpp
index 9e2f39716..156763926 100644
--- a/src/core/DataFile.cpp
+++ b/src/core/DataFile.cpp
@@ -54,7 +54,7 @@ static void findIds(const QDomElement& elem, QList<jo_id_t>& idList);
 
 // QMap with the DOM elements that access file resources
 const DataFile::ResourcesMap DataFile::ELEMENTS_WITH_RESOURCES = {
-{ "sampleclip", {"src"} },
+{ "sampletco", {"src"} },
 { "audiofileprocessor", {"src"} },
 };
 
@@ -915,7 +915,7 @@ void DataFile::upgrade_0_4_0_20080409()
 {
 	// Upgrade to version 0.4.0-20080409 from some version greater than or equal to 0.4.0-20080129
 	QStringList s;
-	s << "note" << "pattern" << "bbclip" << "sampleclip" << "time";
+	s << "note" << "pattern" << "bbtco" << "sampletco" << "time";
 	for( QStringList::iterator it = s.begin(); it < s.end(); ++it )
 	{
 		QDomNodeList list = elementsByTagName( *it );
@@ -1625,7 +1625,7 @@ void DataFile::upgrade_noHiddenClipNames()
 
 		QDomNodeList instClips = track.elementsByTagName("pattern");
 		QDomNodeList autoClips = track.elementsByTagName("automationpattern");
-		QDomNodeList bbClips = track.elementsByTagName("bbclip");
+		QDomNodeList bbClips = track.elementsByTagName("bbtco");
 
 		clearDefaultNames(instClips, trackName);
 		clearDefaultNames(autoClips, trackName);