diff --git a/include/ProjectVersion.h b/include/ProjectVersion.h index adac28f7a..3e5502a9d 100644 --- a/include/ProjectVersion.h +++ b/include/ProjectVersion.h @@ -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; } ; diff --git a/src/core/ProjectVersion.cpp b/src/core/ProjectVersion.cpp index 6d5b1bd53..4e7ed5a5d 100644 --- a/src/core/ProjectVersion.cpp +++ b/src/core/ProjectVersion.cpp @@ -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()); }