oddělení, čištění, kontrola ELC1

include/generator/licenceGenerator.h

@@ -7,19 +7,20 @@
 #include <stdint.h>
 #include "pugixml.hpp"
 #include "licenceCommon.h"
-#include "licenceELC11.h"
-#include "licenceELC21.h"
-#include "licenceELC31.h"
+// #include "licenceELC11.h"
+// #include "licenceELC21.h"
+// #include "licenceELC31.h"
 
 #include "licGenELC1.h"
 #include "licGenELC2.h"
 #include "licGenELC3.h"
 
 using namespace std;
-  
+
 class LicenceGenerator
 {
 
+public:
   struct LicData
   {
     string station = "";
@@ -32,31 +33,27 @@ class LicenceGenerator
     pugi::xml_document *doc;
   };
 
-public:
+  LicData licData;
   int elcSwitchType;
   string operationErrors = "";
   pugi::xml_document doc;
   bool argumentsCorrect = false;
   ErrorMessage error;
-  LicenceELC11 *licence11;
-  LicenceELC21 *licence21;
-  LicenceELC31 *licence31;
+  // LicenceELC11 *licence11;
+  // LicenceELC21 *licence21;
+  // LicenceELC31 *licence31;
   Mapping mapping;
 
-
   LicenceGenerator();
   ~LicenceGenerator();
   LicenceGenerator(string uid, string cid, string csd, string dataFileName);
-    
+
   void createLicenceFile();
-  
 
   LicenceInfoGeneral licenceInfo;
 
-
 private:
   LicenceIdentification licIdentification;
-  LicData licData;
   string configFileName = "";
 
   void *licence = nullptr;
@@ -66,7 +63,6 @@ private:
   void createLicenceELC1();
   void createLicenceELC2();
   void createLicenceELC3();
-
 };
 
 #endif

include/generator/pugixml.hpp

@@ -944,13 +944,17 @@ namespace pugi
 		char _memory[192];
 		
 		// Non-copyable semantics
-		xml_document(const xml_document&);
-		xml_document& operator=(const xml_document&);
+		// xml_document(const xml_document&);
+		// xml_document& operator=(const xml_document&);
 
 		void create();
 		void destroy();
 
 	public:
+
+		xml_document(const xml_document&);
+		xml_document& operator=(const xml_document&);
+
 		// Default constructor, makes empty document
 		xml_document();