From: Steve Brokenshire Date: Sat, 6 Feb 2016 12:16:30 +0000 (+0000) Subject: Removed std:: as now using namespace std in CalendarObject.h X-Git-Tag: release-0.02~391 X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=commitdiff_plain;h=1278c332f6292bd961155ad45029144c8a806a1e Removed std:: as now using namespace std in CalendarObject.h --- diff --git a/source/objects/calendarobject/CalendarObject.h b/source/objects/calendarobject/CalendarObject.h index 8777498..1c700c4 100644 --- a/source/objects/calendarobject/CalendarObject.h +++ b/source/objects/calendarobject/CalendarObject.h @@ -30,8 +30,8 @@ enum CalendarObjectValidResult{ class CalendarObject{ public: - CalendarObjectLoadResult LoadFile(std::string LoadFilename); - CalendarObjectLoadResult LoadString(std::string *LoadStringData); + CalendarObjectLoadResult LoadFile(string LoadFilename); + CalendarObjectLoadResult LoadString(string *LoadStringData); CalendarObjectValidResult ValidBaseObject(); void ProcessBaseData(); @@ -43,190 +43,190 @@ class CalendarObject{ // Object data. - std::string MethodData; - std::string MethodTokens; + string MethodData; + string MethodTokens; - std::string CalendarScaleData; - std::string CalendarScaleTokens; + string CalendarScaleData; + string CalendarScaleTokens; - std::string UniqueID; - std::string UniqueIDTokens; + string UniqueID; + string UniqueIDTokens; - vector AttachList; - vector AttachListTokens; - vector AttachListEncoding; - vector AttachListFormatType; - vector AttachListValue; + vector AttachList; + vector AttachListTokens; + vector AttachListEncoding; + vector AttachListFormatType; + vector AttachListValue; - vector CategoriesList; - vector CategoriesListLanguage; - vector CategoriesListTokens; + vector CategoriesList; + vector CategoriesListLanguage; + vector CategoriesListTokens; - std::string ClassData; - std::string ClassDataTokens; + string ClassData; + string ClassDataTokens; - std::string CompletedData; - std::string CompletedDataTokens; + string CompletedData; + string CompletedDataTokens; - vector CommentList; - vector CommentListAltRep; - vector CommentListLanguage; - vector CommentListTokens; + vector CommentList; + vector CommentListAltRep; + vector CommentListLanguage; + vector CommentListTokens; - vector DescriptionList; - vector DescriptionListAltRep; - vector DescriptionListLanguage; - vector DescriptionListTokens; + vector DescriptionList; + vector DescriptionListAltRep; + vector DescriptionListLanguage; + vector DescriptionListTokens; - std::string GeographicData; - std::string GeographicTokens; + string GeographicData; + string GeographicTokens; - std::string LocationData; - std::string LocationDataAltRep; - std::string LocationDataLanguage; - std::string LocationDataTokens; + string LocationData; + string LocationDataAltRep; + string LocationDataLanguage; + string LocationDataTokens; - std::string PercentCompleteData; - std::string PercentCompleteTokens; + string PercentCompleteData; + string PercentCompleteTokens; int PriorityData = -1; - std::string PriorityTokens; - - vector ResourcesData; - vector ResourcesDataAltRep; - vector ResourcesDataLanguage; - vector ResourcesDataTokens; - - std::string StatusData; - std::string StatusLanguage; - std::string StatusTokens; - - std::string SummaryData; - std::string SummaryDataAltRep; - std::string SummaryDataLanguage; - std::string SummaryDataTokens; - - std::string DateTimeEndData; - std::string DateTimeEndDataValue; - std::string DateTimeEndDataTimeZoneID; - std::string DateTimeEndDataTokens; - - std::string DueData; - std::string DueDataValue; - std::string DueDataTimeZoneID; - std::string DueDataTokens; - - std::string DateTimeStartData; - std::string DateTimeStartDataValue; - std::string DateTimeStartDataTimeZoneID; - std::string DateTimeStartDataTokens; - - std::string DurationData; - std::string DurationDataTokens; - - vector FreeBusyList; - vector FreeBusyListType; - vector FreeBusyListTokens; - - std::string TimeTransparencyData; - std::string TimeTransparencyDataTokens; - - std::string TimeZoneData; - std::string TimeZoneDataTokens; - - vector TimeZoneNameList; - vector TimeZoneNameListLanguage; - vector TimeZoneNameListTokens; - - std::string TimeZoneOffsetFromData; - std::string TimeZoneOffsetFromDataTokens; - - std::string TimeZoneOffsetToData; - std::string TimeZoneOffsetToDataTokens; - - std::string TimeZoneURLData; - std::string TimeZoneURLTokens; - - vector AttendeeList; - vector AttendeeListMember; - vector AttendeeListDelegatedFrom; - vector AttendeeListDelegatedTo; - vector AttendeeListRole; - vector AttendeeListRSVP; - vector AttendeeListDirectoryEntry; - vector AttendeeListSentBy; - vector AttendeeListCommonName; - vector AttendeeListCalendarUserType; - vector AttendeeListParticipationStatus; - vector AttendeeListLanguage; - vector AttendeeListTokens; - - vector ContactList; - vector ContactListAltRep; - vector ContactListLanguage; - vector ContactListTokens; - - std::string OrganiserData; - std::string OrganiserDataCommonName; - std::string OrganiserDataDirectoryEntry; - std::string OrganiserDataSentByParam; - std::string OrganiserDataLanguage; - std::string OrganiserDataTokens; - - std::string RecurranceIDData; - std::string RecurranceIDDataTimeZoneParam; - std::string RecurranceIDDataRangeParam; - std::string RecurranceIDDataValue; - std::string RecurranceIDDataTokens; - - vector RelatedToData; - vector RelatedToDataRelationType; - vector RelatedToDataTokens; - - std::string URLData; - std::string URLDataTokens; - - vector ExcludeDateData; - vector ExcludeDateDataValue; - vector ExcludeDateDataTimeZoneParam; - vector ExcludeDateDataTokens; - - vector RecurranceDateData; - vector RecurranceDateDataValue; - vector RecurranceDateDataTimeZoneParam; - vector RecurranceDateDataTokens; - - std::string RecurranceRuleData; - std::string RecurranceRuleDataTokens; - - std::string TriggerDataList; - std::string TriggerDataValue; - std::string TriggerDataRelatedParam; - std::string TriggerDataTokens; - - std::string DateTimeCreatedData; - std::string DateTimeCreatedTokens; - - std::string DateTimeStampData; - std::string DateTimeStampTokens; - - std::string LastModifiedData; - std::string LastModifiedTokens; + string PriorityTokens; + + vector ResourcesData; + vector ResourcesDataAltRep; + vector ResourcesDataLanguage; + vector ResourcesDataTokens; + + string StatusData; + string StatusLanguage; + string StatusTokens; + + string SummaryData; + string SummaryDataAltRep; + string SummaryDataLanguage; + string SummaryDataTokens; + + string DateTimeEndData; + string DateTimeEndDataValue; + string DateTimeEndDataTimeZoneID; + string DateTimeEndDataTokens; + + string DueData; + string DueDataValue; + string DueDataTimeZoneID; + string DueDataTokens; + + string DateTimeStartData; + string DateTimeStartDataValue; + string DateTimeStartDataTimeZoneID; + string DateTimeStartDataTokens; + + string DurationData; + string DurationDataTokens; + + vector FreeBusyList; + vector FreeBusyListType; + vector FreeBusyListTokens; + + string TimeTransparencyData; + string TimeTransparencyDataTokens; + + string TimeZoneData; + string TimeZoneDataTokens; + + vector TimeZoneNameList; + vector TimeZoneNameListLanguage; + vector TimeZoneNameListTokens; + + string TimeZoneOffsetFromData; + string TimeZoneOffsetFromDataTokens; + + string TimeZoneOffsetToData; + string TimeZoneOffsetToDataTokens; + + string TimeZoneURLData; + string TimeZoneURLTokens; + + vector AttendeeList; + vector AttendeeListMember; + vector AttendeeListDelegatedFrom; + vector AttendeeListDelegatedTo; + vector AttendeeListRole; + vector AttendeeListRSVP; + vector AttendeeListDirectoryEntry; + vector AttendeeListSentBy; + vector AttendeeListCommonName; + vector AttendeeListCalendarUserType; + vector AttendeeListParticipationStatus; + vector AttendeeListLanguage; + vector AttendeeListTokens; + + vector ContactList; + vector ContactListAltRep; + vector ContactListLanguage; + vector ContactListTokens; + + string OrganiserData; + string OrganiserDataCommonName; + string OrganiserDataDirectoryEntry; + string OrganiserDataSentByParam; + string OrganiserDataLanguage; + string OrganiserDataTokens; + + string RecurranceIDData; + string RecurranceIDDataTimeZoneParam; + string RecurranceIDDataRangeParam; + string RecurranceIDDataValue; + string RecurranceIDDataTokens; + + vector RelatedToData; + vector RelatedToDataRelationType; + vector RelatedToDataTokens; + + string URLData; + string URLDataTokens; + + vector ExcludeDateData; + vector ExcludeDateDataValue; + vector ExcludeDateDataTimeZoneParam; + vector ExcludeDateDataTokens; + + vector RecurranceDateData; + vector RecurranceDateDataValue; + vector RecurranceDateDataTimeZoneParam; + vector RecurranceDateDataTokens; + + string RecurranceRuleData; + string RecurranceRuleDataTokens; + + string TriggerDataList; + string TriggerDataValue; + string TriggerDataRelatedParam; + string TriggerDataTokens; + + string DateTimeCreatedData; + string DateTimeCreatedTokens; + + string DateTimeStampData; + string DateTimeStampTokens; + + string LastModifiedData; + string LastModifiedTokens; int SequenceData = -1; - std::string SequenceTokens; + string SequenceTokens; - vector XTokensData; - vector XTokensDataTokens; + vector XTokensData; + vector XTokensDataTokens; - vector RequestStatusData; - vector RequestStatusLanguage; - vector RequestStatusTokens; + vector RequestStatusData; + vector RequestStatusLanguage; + vector RequestStatusTokens; protected: // Initial Loading Data. - vector ObjectName; - vector ObjectData; + vector ObjectName; + vector ObjectData; private: virtual void ProcessData() {};