From f4e683fc6bd6ac76f9979f49d737588b6ddf16b0 Mon Sep 17 00:00:00 2001 From: gcontini <1121667+gcontini@users.noreply.github.com> Date: 周六, 14 11月 2020 22:13:13 +0800 Subject: [PATCH] windows smbios --- src/library/locate/ApplicationFolder.cpp | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/library/locate/ApplicationFolder.cpp b/src/library/locate/ApplicationFolder.cpp index b1fb0e3..8bc7f5a 100644 --- a/src/library/locate/ApplicationFolder.cpp +++ b/src/library/locate/ApplicationFolder.cpp @@ -7,37 +7,33 @@ #include <fstream> #include <sstream> #include <string> +#include <iostream> -#include <build_properties.h> +#include <licensecc/datatypes.h> +#include <licensecc_properties.h> #include "../base/logger.h" -#include "../api/datatypes.h" #include "../base/base.h" #include "../base/EventRegistry.h" -#include "../base/FileUtils.hpp" #include "../os/os.h" #include "ApplicationFolder.hpp" -#include <iostream> +#include "../base/file_utils.hpp" namespace license { namespace locate { using namespace std; -ApplicationFolder::ApplicationFolder() : - LocatorStrategy("ApplicationFolder") { -} +ApplicationFolder::ApplicationFolder() : LocatorStrategy("ApplicationFolder") {} -ApplicationFolder::~ApplicationFolder() { -} +ApplicationFolder::~ApplicationFolder() {} -const vector<string> ApplicationFolder::license_locations( - EventRegistry &eventRegistry) { +const vector<string> ApplicationFolder::license_locations(EventRegistry &eventRegistry) { vector<string> diskFiles; - char fname[MAX_PATH] = { 0 }; + char fname[MAX_PATH] = {0}; const FUNCTION_RETURN fret = getModuleName(fname); if (fret == FUNC_RET_OK) { const string module_name = remove_extension(fname); - const string temptativeLicense = string(module_name) + ".lic"; + const string temptativeLicense = string(module_name) + LCC_LICENSE_FILE_EXTENSION; ifstream f(temptativeLicense.c_str()); if (f.good()) { diskFiles.push_back(temptativeLicense); @@ -52,5 +48,5 @@ return diskFiles; } -} +} // namespace locate } /* namespace license */ -- Gitblit v1.9.1