oddeleni a lazeni ELC1

include/common/licenceCommon.h

@@ -6,6 +6,7 @@
 #include <cstring>
 #include <string>
 #include <map>
+#include <unordered_map>
 #include <stdint.h>
 
 using namespace std;
@@ -178,52 +179,57 @@ struct LicenceItem31
 struct LicenceInfo
 {
   int reqDataPointsCount = 0;
-  map<int, int> licences = {};
+  unordered_map<int, int> licences = {};
 };
 
 /// @brief základní struktura, seznam polozek licencí, kompatibilita 1
 struct LicenceInfoCompatibility1
 {
   int reqDataPointsCount = 0;
-  map<int, int> licences = {};
+  unordered_map<int, int> licences = {};
 };
 
-/// @brief základní struktura, seznam polozek licencí, kompatibilita 1
+/// @brief základní struktura, seznam polozek licencí, kompatibilita 2
 struct LicenceInfoCompatibility2
 {
   int reqDataPointsCount = 0;
-  map<int, int> licences = {};
+  unordered_map<int, int> licences = {};
 };
 
 /// @brief základní struktura, seznam polozek licencí, kompatibilita 3
 struct LicenceInfoCompatibility3
 {
   int reqDataPointsCount = 0;
-  map<int, int> licences = {};
+  unordered_map<int, int> licences = {};
+};
+
+struct LicenceInfo1
+{
+  bool isValid {false};
 };
 
 struct LicenceInfo11
 {
   int reqDataPointsCount = 0;
-  map<int, int> licences = {};
+  unordered_map<int, int> licences = {};
 };
 
 struct LicenceInfo21
 {
   int reqDataPointsCount = 0;
-  map<int, int> licences = {};
+  unordered_map<int, int> licences = {};
 };
 
 struct LicenceInfo31
 {
   int reqDataPointsCount = 0;
-  map<int, int> licences = {};
+  unordered_map<int, int> licences = {};
 };
 
 struct LicenceInfoGeneral
 {
   int reqDataPointsCount = 0;
-  map<int, int> licences = {};
+  unordered_map<int, int> licences = {};
 };
 
 class LicenceException : public std::exception

include/common/utils.h

@@ -40,11 +40,8 @@ int decrypt(const unsigned char *ciphertext, int ciphertext_len, unsigned char *
 string convertToString(char* a, int size);
 string base64_encode_ai(const std::string &input);
 unordered_map<string, string> getArguments(int argc, char *argv[]);
-char* getCharArray(string source);
-void getCharsFromString1(string source, char *charArray);
 void getCharsFromString(string& source, char *charArray, size_t length);
 string getCompletePath(string fileName);
-char* getFileContent(string fileName);
 void appendStringToVector(const std::string& str, std::vector<unsigned char>& charVector);
 uint16_t calculateCRC16(std::vector<unsigned char>& charVector);
 uint32_t bytesToDword(uint8_t byte1, uint8_t byte2, uint8_t byte3, uint8_t byte4);