Moved the inclusion of common/text.h to CalendarObject.

[xestiacalendar/.git] / source / objects / calendarobject / CalendarObject.h

diff --git a/source/objects/calendarobject/CalendarObject.h b/source/objects/calendarobject/CalendarObject.h
index 20db2c6..7404216 100644 (file)
--- a/source/objects/calendarobject/CalendarObject.h
+++ b/source/objects/calendarobject/CalendarObject.h
@@ -3,6 +3,10 @@
 #include <fstream>
 #include <sstream>
 #include <vector>
+#include <stdexcept>
+#include <map>
+
+#include "../../common/text.h"
 
 using namespace std;
 
@@ -33,13 +37,11 @@ class CalendarObject{
        virtual CalendarObjectValidResult ValidObject() { return CALENDAROBJECTVALID_OK; };
        virtual void Clear() {};
        
-       protected:
-       // Initial Loading Data.
-       vector<std::string> ObjectName;
-       vector<std::string> ObjectData;
-       
        // Object data.
        
+       std::string UniqueID;
+       std::string UniqueIDTokens;
+       
        vector<std::string> AttachList;
        vector<std::string> AttachListTokens;
        vector<std::string> AttachListEncoding;
@@ -211,6 +213,11 @@ class CalendarObject{
        vector<std::string> RequestStatusData;
        vector<std::string> RequestStatusLanguage;
        vector<std::string> RequestStatusTokens;
+       
+       protected:
+       // Initial Loading Data.
+       vector<std::string> ObjectName;
+       vector<std::string> ObjectData;
 
        private:
        virtual void ProcessData() {};