From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Sun, 17 Jan 2016 09:50:45 +0000 (+0000)
Subject: Added ValidBaseObject check and implemented virtual Clear and ProcessData objects
X-Git-Tag: release-0.02~778
X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=commitdiff_plain;h=525581bc4b738c1d5976e53b3cd1905733329f7b

Added ValidBaseObject check and implemented virtual Clear and ProcessData objects
---

diff --git a/source/objects/calendarobject/CalendarObject.h b/source/objects/calendarobject/CalendarObject.h
index 1233fa1..96c3771 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,22 @@ 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:
+		
+	private:
+	std::vector<std::string> ObjectName;
+	std::vector<std::string> ObjectData;
   
 };