From f2f6c9cab66e9dd633b05c0ffcb08f4add6802d9 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周六, 14 12月 2019 09:42:26 +0800
Subject: [PATCH] cleanup and change license generation parameters
---
src/library/locate/ApplicationFolder.cpp | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/library/locate/ApplicationFolder.cpp b/src/library/locate/ApplicationFolder.cpp
index e6a7446..8741988 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>
-//B#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>
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) + 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