diff --git a/ChangeLog b/ChangeLog index d131eaf5fc..b99108bd7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2008-07-01 Tobias Doerffel + * src/core/mmp.cpp: + don't mess up projects when loading files being created using + 0.4.0-alpha in a later version because "0.4.0-alpha" < "0.4.0-svn..." + * include/mv_base.h: Qt 4.3 compatibility diff --git a/src/core/mmp.cpp b/src/core/mmp.cpp index 90a1f240dd..cefb68c864 100644 --- a/src/core/mmp.cpp +++ b/src/core/mmp.cpp @@ -337,10 +337,11 @@ void multimediaProject::cleanMetaNodes( QDomElement _de ) void multimediaProject::upgrade( void ) { - projectVersion version = documentElement().attribute( - "creatorversion" ); + projectVersion version = + documentElement().attribute( "creatorversion" ). + replace( "svn", "" ); - if( version < "0.2.1-svn20070501" ) + if( version < "0.2.1-20070501" ) { QDomNodeList list = elementsByTagName( "arpandchords" ); for( int i = 0; !list.item( i ).isNull(); ++i ) @@ -456,7 +457,7 @@ void multimediaProject::upgrade( void ) } } - if( version < "0.2.1-svn20070508" ) + if( version < "0.2.1-20070508" ) { QDomNodeList list = elementsByTagName( "arpandchords" ); for( int i = 0; !list.item( i ).isNull(); ++i ) @@ -549,14 +550,15 @@ void multimediaProject::upgrade( void ) el.setTagName( "lb302" ); } - while( !( list = elementsByTagName( "channelsettings" ) ).isEmpty() ) + while( !( list = elementsByTagName( "channelsettings" ) ). + isEmpty() ) { QDomElement el = list.item( 0 ).toElement(); el.setTagName( "instrumenttracksettings" ); } } - if( version < "0.4.0-svn20080104" ) + if( version < "0.4.0-20080104" ) { QDomNodeList list = elementsByTagName( "fx" ); for( int i = 0; !list.item( i ).isNull(); ++i ) @@ -570,7 +572,7 @@ void multimediaProject::upgrade( void ) } } - if( version < "0.4.0-svn20080118" ) + if( version < "0.4.0-20080118" ) { QDomNodeList list; while( !( list = elementsByTagName( "fx" ) ).isEmpty() ) @@ -590,7 +592,7 @@ void multimediaProject::upgrade( void ) } } - if( version < "0.4.0-svn20080129" ) + if( version < "0.4.0-20080129" ) { QDomNodeList list; while( !( list = @@ -604,7 +606,7 @@ void multimediaProject::upgrade( void ) } } - if( version < "0.4.0-svn20080409" ) + if( version < "0.4.0-20080409" ) { QStringList s; s << "note" << "pattern" << "bbtco" << "sampletco" << "time"; @@ -632,7 +634,7 @@ void multimediaProject::upgrade( void ) } - if( version < "0.4.0-svn20080607" ) + if( version < "0.4.0-20080607" ) { QDomNodeList list = elementsByTagName( "midi" ); for( int i = 0; !list.item( i ).isNull(); ++i ) @@ -642,7 +644,7 @@ void multimediaProject::upgrade( void ) } } - if( version < "0.4.0-svn20080622" ) + if( version < "0.4.0-20080622" ) { QDomNodeList list = elementsByTagName( "automation-pattern" ); for( int i = 0; !list.item( i ).isNull(); ++i )