From 52069b98994d3695c73f4b22d2ea66a04fdda2cf Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Sat, 30 Jan 2016 20:41:14 +0000 Subject: [PATCH] Added inclusion guards. --- source/common/file.h | 7 ++++++- source/common/text.h | 6 +++--- source/objects/calendarevent/CalendarEvent.h | 7 ++++++- source/objects/calendarobject/CalendarObject.h | 5 +++++ 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/source/common/file.h b/source/common/file.h index 84ca16f..b986eb5 100644 --- a/source/common/file.h +++ b/source/common/file.h @@ -1,3 +1,6 @@ +#ifndef __COMMON_FILE_H__ +#define __COMMON_FILE_H__ + #include #include #if defined (__WIN32__) @@ -6,4 +9,6 @@ #include #endif -bool FileExists(std::string Filename); \ No newline at end of file +bool FileExists(std::string Filename); + +#endif \ No newline at end of file diff --git a/source/common/text.h b/source/common/text.h index c4813e1..0cc513a 100644 --- a/source/common/text.h +++ b/source/common/text.h @@ -1,11 +1,11 @@ +#ifndef __COMMON_TEXT_H__ +#define __COMMON_TEXT_H__ + #include #include #include #include -#ifndef __COMMON_TEXT_H__ -#define __COMMON_TEXT_H__ - struct PropertyNameValue{ std::string Name; std::string Value; diff --git a/source/objects/calendarevent/CalendarEvent.h b/source/objects/calendarevent/CalendarEvent.h index e0f7df9..e2bdf0d 100644 --- a/source/objects/calendarevent/CalendarEvent.h +++ b/source/objects/calendarevent/CalendarEvent.h @@ -1,3 +1,6 @@ +#ifndef __OBJECTS_CALENDAREVENT_CALENDAREVENT_H__ +#define __OBJECTS_CALENDAREVENT_CALENDAREVENT_H__ + #include "../calendarobject/CalendarObject.h" class CalendarEventObject: public CalendarObject{ @@ -8,4 +11,6 @@ class CalendarEventObject: public CalendarObject{ void ProcessData(); -}; \ No newline at end of file +}; + +#endif \ No newline at end of file diff --git a/source/objects/calendarobject/CalendarObject.h b/source/objects/calendarobject/CalendarObject.h index 88ec948..6b33513 100644 --- a/source/objects/calendarobject/CalendarObject.h +++ b/source/objects/calendarobject/CalendarObject.h @@ -1,3 +1,6 @@ +#ifndef __OBJECTS_CALENDAROBJECT_CALENDAROBJECT_H__ +#define __OBJECTS_CALENDAROBJECT_CALENDAROBJECT_H__ + #include #include #include @@ -226,3 +229,5 @@ class CalendarObject{ virtual void ProcessData() {}; }; + +#endif \ No newline at end of file -- 2.39.5