From 91e1b0675d531e87a8866ab6595692a3fa52c322 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <gcontini@users.noreply.github.com>
Date: 周六, 14 12月 2019 13:56:41 +0800
Subject: [PATCH] Merge pull request #69 from open-license-manager/feature/issue_licenses_42

---
 src/library/base/StringUtils.h |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/library/base/StringUtils.h b/src/library/base/StringUtils.h
index a7d3cbe..41f303a 100644
--- a/src/library/base/StringUtils.h
+++ b/src/library/base/StringUtils.h
@@ -2,15 +2,16 @@
  * StringUtils.h
  *
  *  Created on: Apr 8, 2014
- *      Author: devel
+ *
  */
 
 #ifndef STRINGUTILS_H_
 #define STRINGUTILS_H_
+
 #include <string>
+#include <vector>
 
 namespace license {
-using namespace std;
 
 /**
  * Eliminate whitespace from both sides of a string and returns a copy
@@ -18,11 +19,24 @@
  * @param string_to_trim
  * @return the trimmed string
  */
-string trim_copy(const string& string_to_trim);
+std::string trim_copy(const std::string& string_to_trim);
 
-string toupper_copy(const string& lowercase);
+std::string toupper_copy(const std::string& lowercase);
 
 time_t seconds_from_epoch(const char* s);
-} /* namespace license */
+
+/**
+ * Split a string on a given character
+ */
+const std::vector<std::string> split_string(const std::string& stringToBeSplit, const char splitchar);
+
+typedef enum {
+	INI, BASE64, UNKNOWN
+} FILE_FORMAT;
+
+FILE_FORMAT identify_format(const std::string& license);
+}
+
+/* namespace license */
 
 #endif /* STRINGUTILS_H_ */

--
Gitblit v1.9.1