ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src: Removed pointless singleton pattern from LicenseChecker

Browse Source
This commit is contained in:
Eberhard Graether
2018-10-21 13:59:48 +02:00
parent 6a6bd0fca8
commit 3d8afdb7be
5 changed files with 11 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/Application.cpp
+1 -2
View File
@@ -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
+2 -26
View File
@@ -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
-11
View File
@@ -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