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

Formatting cleanup

Browse Source
This commit is contained in:
tresf
2015-01-09 00:05:13 -05:00
parent f0e7ea6fd1
commit d192df081d
2 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/ProjectVersion.h
View File

@@ -32,26 +32,26 @@
class ProjectVersion : public QString
{
public:
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 ) )
ProjectVersion(const QString & s) :
QString(s),
m_major(section( '.', 0, 0 ).toInt()) ,
m_minor(section( '.', 1, 1 ).toInt()) ,
m_release(section( '.', 2 ).section( '-', 0, 0 ).toInt()) ,
m_build(section( '.', 2 ).section( '-', 1 ))
{
}
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; }
static int compare(const ProjectVersion & v1, const ProjectVersion & v2);
const int majorVersion() const { return m_major; }
const int minorVersion() const { return m_minor; }
const int releaseVersion() const { return m_release; }
const QString buildVersion() const { return m_build; }
private:
const int major;
const int minor;
const int release;
const QString build;
const int m_major;
const int m_minor;
const int m_release;
const QString m_build;
} ;

15
src/core/ProjectVersion.cpp
View File

@@ -29,35 +29,34 @@
#include "ProjectVersion.h"
int ProjectVersion::compare( const ProjectVersion & v1,
const ProjectVersion & v2 )
int ProjectVersion::compare(const ProjectVersion & v1, const ProjectVersion & v2)
{
if( v1.majorVersion() != v2.majorVersion() )
if(v1.majorVersion() != v2.majorVersion())
{
return v1.majorVersion() - v2.majorVersion();
}
if( v1.minorVersion() != v2.minorVersion() )
if(v1.minorVersion() != v2.minorVersion())
{
return v1.minorVersion() - v2.minorVersion();
}
if( v1.releaseVersion() != v2.releaseVersion() )
if(v1.releaseVersion() != v2.releaseVersion())
{
return v1.releaseVersion() - v2.releaseVersion();
}
// make sure 0.x.y > 0.x.y-patch
if( v1.buildVersion().isEmpty() )
if(v1.buildVersion().isEmpty())
{
return 1;
}
if( v2.buildVersion().isEmpty() )
if(v2.buildVersion().isEmpty())
{
return -1;
}
return QString::compare( v1.buildVersion(), v2.buildVersion() );
return QString::compare(v1.buildVersion(), v2.buildVersion());
}