mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-05-17 11:18:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Classier enums (#6760)

Browse Source
This commit is contained in:
Dominic Clark
2023-08-24 19:16:02 +01:00
committed by GitHub
parent 3aed361b82
commit f10277715f
276 changed files with 2607 additions and 2521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/core/DataFile.cpp
View File

@@ -26,6 +26,7 @@
#include "DataFile.h"
#include <algorithm>
#include <cmath>
#include <map>
@@ -98,17 +99,16 @@ namespace
QString m_name;
};
const auto s_types = std::array<TypeDescStruct, DataFile::TypeCount>
{
TypeDescStruct{ DataFile::UnknownType, "unknown" },
TypeDescStruct{ DataFile::SongProject, "song" },
TypeDescStruct{ DataFile::SongProjectTemplate, "songtemplate" },
TypeDescStruct{ DataFile::InstrumentTrackSettings, "instrumenttracksettings" },
TypeDescStruct{ DataFile::DragNDropData, "dnddata" },
TypeDescStruct{ DataFile::ClipboardData, "clipboard-data" },
TypeDescStruct{ DataFile::JournalData, "journaldata" },
TypeDescStruct{ DataFile::EffectSettings, "effectsettings" },
TypeDescStruct{ DataFile::MidiClip, "midiclip" }
const auto s_types = std::array{
TypeDescStruct{ DataFile::Type::Unknown, "unknown" },
TypeDescStruct{ DataFile::Type::SongProject, "song" },
TypeDescStruct{ DataFile::Type::SongProjectTemplate, "songtemplate" },
TypeDescStruct{ DataFile::Type::InstrumentTrackSettings, "instrumenttracksettings" },
TypeDescStruct{ DataFile::Type::DragNDropData, "dnddata" },
TypeDescStruct{ DataFile::Type::ClipboardData, "clipboard-data" },
TypeDescStruct{ DataFile::Type::JournalData, "journaldata" },
TypeDescStruct{ DataFile::Type::EffectSettings, "effectsettings" },
TypeDescStruct{ DataFile::Type::MidiClip, "midiclip" }
};
}
@@ -214,7 +214,7 @@ bool DataFile::validate( QString extension )
return true;
}
break;
case Type::UnknownType:
case Type::Unknown:
if (! ( extension == "mmp" || extension == "mpt" || extension == "mmpz" ||
extension == "xpf" || extension == "xml" ||
( extension == "xiz" && ! getPluginFactory()->pluginSupportingExtension(extension).isNull()) ||
@@ -251,7 +251,7 @@ QString DataFile::nameWithExtension( const QString & _fn ) const
switch( type() )
{
case SongProject:
case Type::SongProject:
if( extension != "mmp" &&
extension != "mpt" &&
extension != "mmpz" )
@@ -264,13 +264,13 @@ QString DataFile::nameWithExtension( const QString & _fn ) const
return _fn + ".mmp";
}
break;
case SongProjectTemplate:
case Type::SongProjectTemplate:
if( extension != "mpt" )
{
return _fn + ".mpt";
}
break;
case InstrumentTrackSettings:
case Type::InstrumentTrackSettings:
if( extension != "xpf" )
{
return _fn + ".xpf";
@@ -286,8 +286,8 @@ QString DataFile::nameWithExtension( const QString & _fn ) const
void DataFile::write( QTextStream & _strm )
{
if( type() == SongProject || type() == SongProjectTemplate
|| type() == InstrumentTrackSettings )
if( type() == Type::SongProject || type() == Type::SongProjectTemplate
|| type() == Type::InstrumentTrackSettings )
{
cleanMetaNodes( documentElement() );
}
@@ -585,21 +585,17 @@ bool DataFile::hasLocalPlugins(QDomElement parent /* = QDomElement()*/, bool fir
DataFile::Type DataFile::type( const QString& typeName )
{
for( int i = 0; i < TypeCount; ++i )
{
if( s_types[i].m_name == typeName )
{
return static_cast<DataFile::Type>( i );
}
}
const auto it = std::find_if(s_types.begin(), s_types.end(),
[&typeName](const TypeDescStruct& type) { return type.m_name == typeName; });
if (it != s_types.end()) { return it->m_type; }
// compat code
if( typeName == "channelsettings" )
{
return DataFile::InstrumentTrackSettings;
return Type::InstrumentTrackSettings;
}
return UnknownType;
return Type::Unknown;
}
@@ -607,12 +603,7 @@ DataFile::Type DataFile::type( const QString& typeName )
QString DataFile::typeName( Type type )
{
if( type >= UnknownType && type < TypeCount )
{
return s_types[type].m_name;
}
return s_types[UnknownType].m_name;
return s_types[static_cast<std::size_t>(type)].m_name;
}
@@ -1760,8 +1751,8 @@ void DataFile::upgrade_bbTcoRename()
for (int i = 0; !elements.item(i).isNull(); ++i)
{
auto e = elements.item(i).toElement();
static_assert(Track::PatternTrack == 1, "Must be type=1 for backwards compatibility");
if (e.attribute("type").toInt() == Track::PatternTrack)
static_assert(Track::Type::Pattern == static_cast<Track::Type>(1), "Must be type=1 for backwards compatibility");
if (static_cast<Track::Type>(e.attribute("type").toInt()) == Track::Type::Pattern)
{
e.setAttribute("name", e.attribute("name").replace("Beat/Bassline", "Pattern"));
}
@@ -1789,7 +1780,7 @@ void DataFile::upgrade()
documentElement().setAttribute( "creator", "LMMS" );
documentElement().setAttribute( "creatorversion", LMMS_VERSION );
if( type() == SongProject || type() == SongProjectTemplate )
if( type() == Type::SongProject || type() == Type::SongProjectTemplate )
{
// Time-signature
if ( !m_head.hasAttribute( "timesig_numerator" ) )
@@ -1867,8 +1858,8 @@ void DataFile::loadData( const QByteArray & _data, const QString & _sourceFile )
ProjectVersion createdWith = root.attribute("creatorversion");
ProjectVersion openedWith = LMMS_VERSION;
if (createdWith.setCompareType(ProjectVersion::Minor)
!= openedWith.setCompareType(ProjectVersion::Minor)
if (createdWith.setCompareType(ProjectVersion::CompareType::Minor)
!= openedWith.setCompareType(ProjectVersion::CompareType::Minor)
&& gui::getGUI() != nullptr && root.attribute("type") == "song"
){
auto projectType = _sourceFile.endsWith(".mpt") ?