Added CalendarScaleData/CalendarScaleTokens for CALSCALE

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

diff --git a/source/objects/calendarobject/CalendarObject.h b/source/objects/calendarobject/CalendarObject.h
index 9887f93..142ef2f 100644 (file)
--- a/source/objects/calendarobject/CalendarObject.h
+++ b/source/objects/calendarobject/CalendarObject.h
@@ -4,6 +4,9 @@
 #include <sstream>
 #include <vector>
 #include <stdexcept>
+#include <map>
+
+#include "../../common/text.h"
 
 using namespace std;
 
@@ -27,6 +30,7 @@ class CalendarObject{
        CalendarObjectLoadResult LoadFile(std::string LoadFilename);
        CalendarObjectLoadResult LoadString(std::string *LoadStringData);
        CalendarObjectValidResult ValidBaseObject();
+       void ProcessBaseData();
        
        // Setup virtual subroutines for use by objects
        // inheriting from CalendarObject later on.
@@ -36,6 +40,12 @@ class CalendarObject{
        
        // Object data.
        
+       std::string MethodData;
+       std::string MethodTokens;
+       
+       std::string CalendarScaleData;
+       std::string CalendarScaleTokens;
+       
        std::string UniqueID;
        std::string UniqueIDTokens;