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

Expose major, minor, release and build values parsed from a project version

Browse Source
This commit is contained in:
tresf
2015-01-08 23:53:19 -05:00
parent db6f3e6e50
commit f0e7ea6fd1
2 changed files with 31 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/ProjectVersion.h
View File

@@ -27,27 +27,39 @@
#define PROJECT_VERSION_H
#include <QtCore/QString>
#include "export.h"
class ProjectVersion : public QString
{
public:
ProjectVersion( const QString & _s ) :
QString( _s )
ProjectVersion( const QString & s ) :
QString( s ),
major( section( '.', 0, 0 ).toInt() ) ,
minor( section( '.', 1, 1 ).toInt() ) ,
release( section( '.', 2 ).section( '-', 0, 0 ).toInt() ) ,
build( section( '.', 2 ).section( '-', 1 ) )
{
}
static int compare( const ProjectVersion & _v1,
const ProjectVersion & _v2 );
static int compare( const ProjectVersion & v1,
const ProjectVersion & v2 );
const int majorVersion() const { return major; }
const int minorVersion() const { return minor; }
const int releaseVersion() const { return release; }
const QString buildVersion() const { return build; }
private:
const int major;
const int minor;
const int release;
const QString build;
} ;
inline bool operator<( const ProjectVersion & _v1, const char * _str )
inline bool operator<( const ProjectVersion & v1, const char * str )
{
return ProjectVersion::compare( _v1, ProjectVersion( _str ) ) < 0;
return ProjectVersion::compare( v1, ProjectVersion( str ) ) < 0;
}

41
src/core/ProjectVersion.cpp
View File

@@ -29,54 +29,35 @@
#include "ProjectVersion.h"
int ProjectVersion::compare( const ProjectVersion & _v1,
const ProjectVersion & _v2 )
int ProjectVersion::compare( const ProjectVersion & v1,
const ProjectVersion & v2 )
{
int n1, n2;
// Major
n1 = _v1.section( '.', 0, 0 ).toInt();
n2 = _v2.section( '.', 0, 0 ).toInt();
if( n1 != n2 )
if( v1.majorVersion() != v2.majorVersion() )
{
return n1 - n2;
return v1.majorVersion() - v2.majorVersion();
}
// Minor
n1 = _v1.section( '.', 1, 1 ).toInt();
n2 = _v2.section( '.', 1, 1 ).toInt();
if( n1 != n2 )
if( v1.minorVersion() != v2.minorVersion() )
{
return n1 - n2;
return v1.minorVersion() - v2.minorVersion();
}
// Release
n1 = _v1.section( '.', 2 ).section( '-', 0, 0 ).toInt();
n2 = _v2.section( '.', 2 ).section( '-', 0, 0 ).toInt();
if( n1 != n2 )
if( v1.releaseVersion() != v2.releaseVersion() )
{
return n1 - n2;
return v1.releaseVersion() - v2.releaseVersion();
}
// Build
const QString b1 = _v1.section( '.', 2 ).section( '-', 1 );
const QString b2 = _v2.section( '.', 2 ).section( '-', 1 );
// make sure 0.x.y > 0.x.y-patch
if( b1.isEmpty() )
if( v1.buildVersion().isEmpty() )
{
return 1;
}
if( b2.isEmpty() )
if( v2.buildVersion().isEmpty() )
{
return -1;
}
return QString::compare( b1, b2 );
return QString::compare( v1.buildVersion(), v2.buildVersion() );
}