logic: versioning

src/lib/CMakeLists.txt

@@ -492,8 +492,6 @@ add_files(
 	utility/utilityUuid.h
 	utility/utilityXml.cpp
 	utility/utilityXml.h
-	utility/Version.cpp
-	utility/Version.h
 
 	Application.cpp
 	Application.h

src/lib/LicenseChecker.cpp

@@ -166,7 +166,7 @@ void LicenseChecker::handleMessage(MessageEnteredLicense* message)
 
 LicenseChecker::LicenseState LicenseChecker::checkLicense(License& license) const
 {
-	license.loadPublicKeyFromString(PublicKey);
+    license.loadPublicKeyFromString(PUBLIC_KEY);
 
 	if (license.isExpired())
 	{

src/lib/utility/Version.cpp

@@ -1,84 +0,0 @@
-#include "utility/Version.h"
-
-#include "utility/utilityString.h"
-#include "utility/logging/logging.h"
-
-Version Version::s_version;
-
-Version Version::fromString(const std::string& versionString)
-{
-	Version version;
-	std::vector<std::string> components = utility::splitToVector(versionString, '-');
-
-	if (components.size() != 3)
-	{
-		LOG_ERROR("Version string is invalid: " + versionString);
-		return version;
-	}
-
-	std::vector<std::string> numbers = utility::splitToVector(components[0], '.');
-	if (numbers.size() > 0)
-	{
-		version.m_majorNumber = std::stoi(numbers[0]);
-	}
-	if (numbers.size() > 1)
-	{
-		version.m_minorNumber = std::stoi(numbers[1]);
-	}
-	if (numbers.size() > 2)
-	{
-		version.m_refreshNumber = std::stoi(numbers[2]);
-	}
-
-	version.m_commitNumber = std::stoi(components[1]);
-	version.m_commitHash = components[2];
-
-	return version;
-}
-
-void Version::setApplicationVersion(const Version& version)
-{
-	s_version = version;
-}
-
-const Version& Version::getApplicationVersion()
-{
-	return s_version;
-}
-
-Version::Version()
-	: m_majorNumber(0)
-	, m_minorNumber(0)
-	, m_refreshNumber(-1)
-	, m_commitNumber(0)
-{
-}
-
-bool Version::isEmpty() const
-{
-	return m_majorNumber == 0 && m_minorNumber == 0 && m_refreshNumber == -1 && m_commitNumber == 0;
-}
-
-std::string Version::toString() const
-{
-	std::stringstream ss;
-	ss << m_majorNumber << '.' << m_minorNumber;
-	if (m_refreshNumber != -1)
-	{
-		ss << '.' << m_refreshNumber;
-	}
-	ss << '-' << m_commitNumber << '-' << m_commitHash;
-	return ss.str();
-}
-
-std::string Version::toDisplayString() const
-{
-	std::stringstream ss;
-	ss << m_majorNumber << '.' << m_minorNumber;
-	if (m_refreshNumber != -1)
-	{
-		ss << '.' << m_refreshNumber;
-	}
-	ss << '.' <<  m_commitNumber;
-	return ss.str();
-}

src/lib/utility/Version.h

@@ -1,32 +0,0 @@
-#ifndef VERSION_H
-#define VERSION_H
-
-#include <string>
-
-class Version
-{
-public:
-	static Version fromString(const std::string& versionString);
-
-	static void setApplicationVersion(const Version& version);
-	static const Version& getApplicationVersion();
-
-	Version();
-
-	bool isEmpty() const;
-
-	std::string toString() const;
-	std::string toDisplayString() const;
-
-private:
-	static Version s_version;
-
-	int m_majorNumber;
-	int m_minorNumber;
-	int m_refreshNumber; // deprecated since switch to storage_version, left for downward compatibility
-	int m_commitNumber;
-
-	std::string m_commitHash;
-};
-
-#endif // VERSION_H

src/lib/utility/commandline/CommandLineParser.cpp

@@ -110,7 +110,7 @@ void CommandLineParser::processLicense(const bool isLoaded)
 	{
 		std::cout << "Could not load License" << std::endl;
 	}
-	m_license.loadPublicKeyFromString(PublicKey);
+    m_license.loadPublicKeyFromString(PUBLIC_KEY);
 	if (!m_license.isValid())
 	{
 		std::cout << "License is not valid" << std::endl;

src/lib/utility/utilityUuid.h

@@ -9,6 +9,6 @@ namespace utility
 	boost::uuids::uuid getUuid();
 	std::string uuidToString(const boost::uuids::uuid& uuid);
 	std::string getUuidString();
-};
+}
 
 #endif // UTILITY_UUID_H