From 1c18dbea1cbd759aaf42a7e78afe0d8781065a50 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 10 11月 2019 22:25:22 +0800
Subject: [PATCH] improvements for issue #42
---
src/library/locate/ApplicationFolder.cpp | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/library/locate/ApplicationFolder.cpp b/src/library/locate/ApplicationFolder.cpp
index 9ba99ee..e6a7446 100644
--- a/src/library/locate/ApplicationFolder.cpp
+++ b/src/library/locate/ApplicationFolder.cpp
@@ -8,7 +8,7 @@
#include <sstream>
#include <string>
-#include <build_properties.h>
+//B#include <build_properties.h>
#include "../base/logger.h"
#include "../api/datatypes.h"
@@ -23,18 +23,15 @@
namespace locate {
using namespace std;
-
-
ApplicationFolder::ApplicationFolder() :
LocatorStrategy("ApplicationFolder") {
-
}
ApplicationFolder::~ApplicationFolder() {
}
-const vector<string> ApplicationFolder::licenseLocations(
- EventRegistry &eventRegistry) const {
+const vector<string> ApplicationFolder::license_locations(
+ EventRegistry &eventRegistry) {
vector<string> diskFiles;
char fname[MAX_PATH] = { 0 };
const FUNCTION_RETURN fret = getModuleName(fname);
@@ -44,11 +41,9 @@
ifstream f(temptativeLicense.c_str());
if (f.good()) {
diskFiles.push_back(temptativeLicense);
- eventRegistry.addEvent((EVENT_TYPE) LICENSE_FILE_FOUND,
- (SEVERITY) SVRT_INFO, temptativeLicense);
+ eventRegistry.addEvent(LICENSE_FOUND, temptativeLicense.c_str());
} else {
- eventRegistry.addEvent(LICENSE_FILE_NOT_FOUND, SVRT_WARN,
- temptativeLicense);
+ eventRegistry.addEvent(LICENSE_FILE_NOT_FOUND, temptativeLicense.c_str());
}
f.close();
} else {
--
Gitblit v1.9.1