diff --git a/src/lib/data/SqliteStorage.cpp b/src/lib/data/SqliteStorage.cpp index 31ab3ffc..2f131e13 100644 --- a/src/lib/data/SqliteStorage.cpp +++ b/src/lib/data/SqliteStorage.cpp @@ -30,7 +30,7 @@ bool SqliteStorage::init() setup(); return false; } - else if (version.isOlderStorageVersionThan(Version::getApplicationVersion())) + else if (version.isDifferentStorageVersionThan(Version::getApplicationVersion())) { clear(); return false; diff --git a/src/lib/utility/Version.cpp b/src/lib/utility/Version.cpp index f1fd50d9..5565e613 100644 --- a/src/lib/utility/Version.cpp +++ b/src/lib/utility/Version.cpp @@ -83,24 +83,11 @@ bool Version::operator<(const Version& other) const } } -bool Version::isOlderStorageVersionThan(const Version& other) const +bool Version::isDifferentStorageVersionThan(const Version& other) const { - if (m_majorNumber != other.m_majorNumber) - { - return m_majorNumber < other.m_majorNumber; - } - else if (m_minorNumber != other.m_minorNumber) - { - return m_minorNumber < other.m_minorNumber; - } - else if (m_refreshNumber != other.m_refreshNumber) - { - return m_refreshNumber < other.m_refreshNumber; - } - else - { - return false; - } + return m_majorNumber != other.m_majorNumber || + m_minorNumber != other.m_minorNumber || + m_refreshNumber != other.m_refreshNumber; } std::string Version::toString() const diff --git a/src/lib/utility/Version.h b/src/lib/utility/Version.h index f34598a4..7c4ceca3 100644 --- a/src/lib/utility/Version.h +++ b/src/lib/utility/Version.h @@ -15,7 +15,7 @@ public: bool isEmpty() const; bool operator<(const Version& other) const; - bool isOlderStorageVersionThan(const Version& other) const; + bool isDifferentStorageVersionThan(const Version& other) const; std::string toString() const; std::string toDisplayString() const;