X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fobjects%2Fcalendarobject%2FCalendarObject.h;h=48d9978c0bd732d594117bf04b0142b9b5cb22a6;hb=bb8ddf169d357be6ea448a5d8502c49bdaa53f7b;hp=1233fa1273977b1c5a3d424996cf117d1d287103;hpb=e623dcc4464ff0ffc10a2484eec12fbb461a354e;p=xestiacalendar%2F.git

diff --git a/source/objects/calendarobject/CalendarObject.h b/source/objects/calendarobject/CalendarObject.h
index 1233fa1..48d9978 100644
--- a/source/objects/calendarobject/CalendarObject.h
+++ b/source/objects/calendarobject/CalendarObject.h
@@ -1,5 +1,8 @@
 #include <string>
 #include <iostream>
+#include <fstream>
+#include <sstream>
+#include <vector>
 
 enum CalendarObjectLoadResult {
     CALENDAROBJECTLOAD_UNITTESTFAIL = -1,
@@ -17,12 +20,23 @@ enum CalendarObjectValidResult{
 
 class CalendarObject{
 
-    CalendarObjectLoadResult LoadFile();
-    CalendarObjectLoadResult LoadString();
-    
-    // Setup virtual subroutines for use by objects
-    // inheriting from CalendarObject later on.
-    
-    virtual CalendarObjectValidResult ValidObject() {};
+	public:
+	CalendarObjectLoadResult LoadFile(std::string LoadFilename);
+	CalendarObjectLoadResult LoadString(std::string *LoadStringData);
+	CalendarObjectValidResult ValidBaseObject();
+	
+	// Setup virtual subroutines for use by objects
+	// inheriting from CalendarObject later on.
+	
+	virtual CalendarObjectValidResult ValidObject() { return CALENDAROBJECTVALID_OK; };
+	virtual void Clear() {};
+	virtual void ProcessData() {};
+	
+	protected:
+	std::vector<std::string> ObjectName;
+	std::vector<std::string> ObjectData;
+	
+	private:
+
   
 };