1 files changed, 14 insertions, 13 deletions
diff --git a/timerconflict.h b/timerconflict.h
index dc7c98f..d3def89 100644
--- a/timerconflict.h
+++ b/timerconflict.h
@@ -3,8 +3,8 @@
 
 class cTVGuideTimerConflict {
 public:
-	cTVGuideTimerConflict(void);
-	virtual ~cTVGuideTimerConflict(void);
+    cTVGuideTimerConflict(void);
+    virtual ~cTVGuideTimerConflict(void);
     time_t time;
     time_t timeStart;
     time_t timeStop;
@@ -18,20 +18,21 @@ public:
 
 class cTVGuideTimerConflicts {
 private:
-	std::vector<cTVGuideTimerConflict*> conflicts;
-	int numConflicts;
-	int currentConflict;
+    std::vector<cTVGuideTimerConflict*> conflicts;
+    int numConflicts;
+    int currentConflict;
 public:
-	cTVGuideTimerConflicts(void);
-	virtual ~cTVGuideTimerConflicts(void);
-	void AddConflict(std::string epgSearchConflictLine);
-	void CalculateConflicts(void);
-	int NumConflicts(void) {return numConflicts; };
-	void SetCurrentConflict(int current) { currentConflict = current; };
-	cTVGuideTimerConflict *GetCurrentConflict(void);
-	int GetCurrentConflictTimerID(int timerIndex);
+    cTVGuideTimerConflicts(void);
+    virtual ~cTVGuideTimerConflicts(void);
+    void AddConflict(std::string epgSearchConflictLine);
+    void CalculateConflicts(void);
+    int NumConflicts(void) {return numConflicts; };
+    void SetCurrentConflict(int current) { currentConflict = current; };
+    cTVGuideTimerConflict *GetCurrentConflict(void);
+    int GetCurrentConflictTimerID(int timerIndex);
     int GetCorrespondingConflict(int timerID);
     cTVGuideTimerConflict *GetConflict(int conflictIndex);
+    std::vector<cTVGuideTimerConflict*> GetConflictsBetween(time_t start, time_t stop);
 };
 
 #endif //__TVGUIDE_RECMMANAGER_H
 \ No newline at end of file