From 2083b66e8ea6f75d40f3b0f77a9a3820942b5e44 Mon Sep 17 00:00:00 2001
From: Serhii Hadzhilov <serhii-external@symless.com>
Date: Fri, 25 Sep 2020 22:01:17 +0300
Subject: [PATCH] Fix solnar issues

---
 src/gui/src/LicenseManager.cpp   | 4 ++--
 src/gui/src/LicenseManager.h     | 2 +-
 src/lib/shared/SerialKey.cpp     | 7 ++-----
 src/lib/shared/SerialKeyType.cpp | 4 +---
 src/lib/shared/SerialKeyType.h   | 4 ++--
 5 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/gui/src/LicenseManager.cpp b/src/gui/src/LicenseManager.cpp
index e6bb6c4e6..ce2c48578 100644
--- a/src/gui/src/LicenseManager.cpp
+++ b/src/gui/src/LicenseManager.cpp
@@ -144,7 +144,7 @@ LicenseManager::getEditionName(Edition const edition, bool trial)
 }
 
 void
-LicenseManager::notifyActivation(QString identity)
+LicenseManager::notifyActivation(QString identity) const
 {
 	ActivationNotifier* notifier = new ActivationNotifier();
 	notifier->setIdentity(identity);
@@ -222,7 +222,7 @@ LicenseManager::getTemporaryNotice() const
 	}
 	else if (m_serialKey.isExpiring(::time(0))) {
 		Notice = "<html><head/><body><p><span style=\""
-				"font-weight:600;\">%1</span> day%2 / "
+				"font-weight:600;\">%1</span> day%2 "
 				"before your license expires.<a href="
 				"\"https://members.symless.com/purchase\">"
 				"<span style=\"text-decoration: underline;"
diff --git a/src/gui/src/LicenseManager.h b/src/gui/src/LicenseManager.h
index a7556dc3b..f8ec07b1c 100644
--- a/src/gui/src/LicenseManager.h
+++ b/src/gui/src/LicenseManager.h
@@ -40,7 +40,7 @@ public:
     void skipActivation();
     void notifyUpdate(QString fromVersion, QString toVersion);
     static QString getEditionName(Edition edition, bool trial = false);
-    void notifyActivation(QString identity);
+	void notifyActivation(QString identity) const;
     QString getLicenseNotice() const;
 
 private:
diff --git a/src/lib/shared/SerialKey.cpp b/src/lib/shared/SerialKey.cpp
index 5d456b2e0..ae9af3275 100644
--- a/src/lib/shared/SerialKey.cpp
+++ b/src/lib/shared/SerialKey.cpp
@@ -33,8 +33,7 @@ SerialKey::SerialKey(Edition edition):
 	m_userLimit(1),
 	m_warnTime(ULLONG_MAX),
 	m_expireTime(ULLONG_MAX),
-	m_edition(edition),
-	m_KeyType()
+	m_edition(edition)
 {
 }
 
@@ -42,8 +41,7 @@ SerialKey::SerialKey(std::string serial) :
 	m_userLimit(1),
 	m_warnTime(0),
 	m_expireTime(0),
-	m_edition(kBasic),
-	m_KeyType()
+	m_edition(kBasic)
 {
 	string plainText = decode(serial);
 	bool valid = false;
@@ -74,7 +72,6 @@ bool
 SerialKey::isExpired(time_t currentTime) const
 {
 	bool result = false;
-	std::cout<<"Current time = "<<static_cast<unsigned long long>(currentTime)<<std::endl;
 
 	if (isTemporary()) {
 		unsigned long long currentTimeAsLL = static_cast<unsigned long long>(currentTime);
diff --git a/src/lib/shared/SerialKeyType.cpp b/src/lib/shared/SerialKeyType.cpp
index 09b2622c8..74942e6da 100644
--- a/src/lib/shared/SerialKeyType.cpp
+++ b/src/lib/shared/SerialKeyType.cpp
@@ -20,9 +20,7 @@
 const std::string SerialKeyType::TRIAL = "trial";
 const std::string SerialKeyType::TEMPORARY = "temp";
 
-SerialKeyType::SerialKeyType() :
-	m_isTrial(false),
-	m_isTemporary(false)
+SerialKeyType::SerialKeyType()
 {
 
 }
diff --git a/src/lib/shared/SerialKeyType.h b/src/lib/shared/SerialKeyType.h
index f37afcfc4..bc0c6974d 100644
--- a/src/lib/shared/SerialKeyType.h
+++ b/src/lib/shared/SerialKeyType.h
@@ -35,8 +35,8 @@ public:
 	bool isPermanent() const;
 
 protected:
-	bool m_isTrial;
-	bool m_isTemporary;
+	bool m_isTrial = false;
+	bool m_isTemporary = false;
 };
 
 inline bool