src: Removed pointless singleton pattern from LicenseChecker

src/lib/Application.cpp

@@ -124,7 +124,6 @@ Application::Application(bool withGUI)
 	, m_licenseType(MessageEnteredLicense::LICENSE_NONE)
 	, m_lastLicenseCheck(TimeStamp::now())
 {
-	LicenseChecker::createInstance();
 }
 
 Application::~Application()
@@ -355,7 +354,7 @@ void Application::handleMessage(MessageWindowFocus* message)
 	{
 		m_lastLicenseCheck = TimeStamp::now();
 
-		LicenseChecker::LicenseState state = LicenseChecker::getInstance()->checkCurrentLicense();
+		LicenseChecker::LicenseState state = LicenseChecker::checkCurrentLicense();
 		if (state != LicenseChecker::LICENSE_VALID && state != LicenseChecker::LICENSE_MOVED)
 		{
 			MessageForceEnterLicense(state).dispatch();

src/lib/LicenseChecker.cpp

@@ -1,28 +1,10 @@
 #include "LicenseChecker.h"
 
+#include "ApplicationSettings.h"
 #include "AppPath.h"
+#include "License.h"
 #include "logging.h"
 #include "utilityApp.h"
-#include "MessageForceEnterLicense.h"
-
-#include "License.h"
-#include "PublicKey.h"
-#include "ApplicationSettings.h"
-
-void LicenseChecker::createInstance()
-{
-	if (!s_instance)
-	{
-		s_instance = std::shared_ptr<LicenseChecker>(new LicenseChecker());
-	}
-}
-
-std::shared_ptr<LicenseChecker> LicenseChecker::getInstance()
-{
-	createInstance();
-
-	return s_instance;
-}
 
 std::string LicenseChecker::getCurrentLicenseString()
 {
@@ -191,10 +173,6 @@ std::string LicenseChecker::getCurrentLicenseTypeString()
 	return "private";
 }
 
-LicenseChecker::LicenseChecker()
-{
-}
-
 LicenseChecker::LicenseState LicenseChecker::checkLicense(License& license)
 {
 	if (license.isExpired())
@@ -209,5 +187,3 @@ LicenseChecker::LicenseState LicenseChecker::checkLicense(License& license)
 
 	return LICENSE_INVALID;
 }
-
-std::shared_ptr<LicenseChecker> LicenseChecker::s_instance;

src/lib/LicenseChecker.h

@@ -18,11 +18,6 @@ public:
 		LICENSE_VALID
 	};
 
-	static void createInstance();
-	static std::shared_ptr<LicenseChecker> getInstance();
-
-	~LicenseChecker() = default;
-
 	static std::string getCurrentLicenseString();
 	static void saveCurrentLicenseString(const std::string& licenseString);
 
@@ -36,13 +31,7 @@ public:
 	static std::string getCurrentLicenseTypeString();
 
 private:
-	LicenseChecker();
-	LicenseChecker(const LicenseChecker&) = delete;
-	void operator=(const LicenseChecker&) = delete;
-
 	static LicenseState checkLicense(License& license);
-
-	static std::shared_ptr<LicenseChecker> s_instance;
 };
 
 #endif // LICENSE_CHECKER_H

src/lib_gui/qt/window/QtLicenseWindow.cpp

@@ -38,7 +38,7 @@ void QtLicenseWindow::load()
 {
 	clear();
 
-	std::string licenseString = LicenseChecker::getInstance()->getCurrentLicenseString();
+	std::string licenseString = LicenseChecker::getCurrentLicenseString();
 
 	if (licenseString.size() && m_licenseText)
 	{
@@ -153,8 +153,7 @@ void QtLicenseWindow::handleNext()
 	{
 		std::string licenseString = m_licenseText->toPlainText().toStdString();
 
-		LicenseChecker* checker = LicenseChecker::getInstance().get();
-		LicenseChecker::LicenseState state = checker->checkLicenseString(licenseString);
+		LicenseChecker::LicenseState state = LicenseChecker::checkLicenseString(licenseString);
 
 		std::string errorString;
 
@@ -175,7 +174,7 @@ void QtLicenseWindow::handleNext()
 				break;
 			case LicenseChecker::LICENSE_VALID:
 			{
-				if (checker->getLicenseType(licenseString) == MessageEnteredLicense::LICENSE_NON_COMMERCIAL)
+				if (LicenseChecker::getLicenseType(licenseString) == MessageEnteredLicense::LICENSE_NON_COMMERCIAL)
 				{
 					errorString =
 						"The entered license key does not permit commercial use. You no longer need a license "
@@ -183,7 +182,7 @@ void QtLicenseWindow::handleNext()
 					break;
 				}
 
-				checker->saveCurrentLicenseString(licenseString);
+				LicenseChecker::saveCurrentLicenseString(licenseString);
 				m_errorLabel->setText(" ");
 
 				ApplicationSettings::getInstance()->setNonCommercialUse(false);
@@ -325,4 +324,4 @@ void QtNonCommercialInfoWindow::windowReady()
 
 	setNextEnabled(false);
 	setPreviousVisible(false);
-}
+}

src/lib_gui/qt/window/QtMainWindow.cpp

@@ -260,12 +260,12 @@ void QtMainWindow::loadWindow(bool showStartWindow)
 
 	m_loaded = true;
 
-	LicenseChecker::LicenseState state = LicenseChecker::getInstance()->checkCurrentLicense();
+	LicenseChecker::LicenseState state = LicenseChecker::checkCurrentLicense();
 	bool licenseValid = (state == LicenseChecker::LICENSE_VALID);
 
 	if (licenseValid)
 	{
-		MessageEnteredLicense(LicenseChecker::getInstance()->getCurrentLicenseType()).dispatch();
+		MessageEnteredLicense(LicenseChecker::getCurrentLicenseType()).dispatch();
 	}
 
 	ApplicationSettings* appSettings = ApplicationSettings::getInstance().get();
@@ -528,7 +528,7 @@ void QtMainWindow::enteredLicense()
 
 	m_windowStack.clearWindows();
 
-	MessageEnteredLicense(LicenseChecker::getInstance()->getCurrentLicenseType()).dispatch();
+	MessageEnteredLicense(LicenseChecker::getCurrentLicenseType()).dispatch();
 
 	setEnabled(true);