diff --git a/include/project_version.h b/include/ProjectVersion.h similarity index 74% rename from include/project_version.h rename to include/ProjectVersion.h index 4be7f15a5..7326ce3c3 100644 --- a/include/project_version.h +++ b/include/ProjectVersion.h @@ -1,5 +1,5 @@ /* - * project_version.h - version compared in import upgrades + * ProjectVersion.h - version compared in import upgrades * * Copyright (c) 2007 Javier Serrano Polo * @@ -29,25 +29,25 @@ #include -class projectVersion : public QString +class ProjectVersion : public QString { public: - projectVersion( const QString & _s ) : + ProjectVersion( const QString & _s ) : QString( _s ) { } - static int compare( const projectVersion & _v1, - const projectVersion & _v2 ); + static int compare( const ProjectVersion & _v1, + const ProjectVersion & _v2 ); } ; -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; } diff --git a/src/core/DataFile.cpp b/src/core/DataFile.cpp index 40fda6cff..3eec74935 100644 --- a/src/core/DataFile.cpp +++ b/src/core/DataFile.cpp @@ -36,7 +36,7 @@ #include "ConfigManager.h" -#include "project_version.h" +#include "ProjectVersion.h" #include "SongEditor.h" #include "Effect.h" #include "lmmsversion.h" @@ -327,7 +327,7 @@ void DataFile::cleanMetaNodes( QDomElement _de ) void DataFile::upgrade() { - projectVersion version = + ProjectVersion version = documentElement().attribute( "creatorversion" ). replace( "svn", "" ); diff --git a/src/core/project_version.cpp b/src/core/ProjectVersion.cpp similarity index 90% rename from src/core/project_version.cpp rename to src/core/ProjectVersion.cpp index 15b584e07..58e5ac541 100644 --- a/src/core/project_version.cpp +++ b/src/core/ProjectVersion.cpp @@ -1,5 +1,5 @@ /* - * project_version.cpp - compare versions in import upgrades + * ProjectVersion.cpp - compare versions in import upgrades * * Copyright (c) 2007 Javier Serrano Polo * Copyright (c) 2008 Tobias Doerffel @@ -26,13 +26,13 @@ -#include "project_version.h" +#include "ProjectVersion.h" -int projectVersion::compare( const projectVersion & _v1, - const projectVersion & _v2 ) +int ProjectVersion::compare( const ProjectVersion & _v1, + const ProjectVersion & _v2 ) { int n1, n2;