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_gui/qt/window/QtLicenseWindow.cpp
+5 -6
View File
@@ -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
+3 -3
View File
@@ -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);