From 3164a45f5f58a72d092993c81d902851c73bab42 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
Date: Wed, 26 Feb 2020 15:45:49 +0100
Subject: [PATCH] Drop TimePeriod#Merge()

refs #7398
---
 lib/icinga/timeperiod.cpp | 17 -----------------
 lib/icinga/timeperiod.hpp |  2 --
 2 files changed, 19 deletions(-)

diff --git a/lib/icinga/timeperiod.cpp b/lib/icinga/timeperiod.cpp
index c70227f94..7bf646d2b 100644
--- a/lib/icinga/timeperiod.cpp
+++ b/lib/icinga/timeperiod.cpp
@@ -201,23 +201,6 @@ void TimePeriod::PurgeSegments(double end)
 	SetSegments(newSegments);
 }
 
-void TimePeriod::Merge(const TimePeriod::Ptr& timeperiod, bool include)
-{
-	Log(LogDebug, "TimePeriod")
-		<< "Merge TimePeriod '" << GetName() << "' with '" << timeperiod->GetName() << "' "
-		<< "Method: " << (include ? "include" : "exclude");
-
-	Array::Ptr segments = timeperiod->GetSegments();
-
-	if (segments) {
-		ObjectLock dlock(segments);
-		ObjectLock ilock(this);
-		for (const Dictionary::Ptr& segment : segments) {
-			include ? AddSegment(segment) : RemoveSegment(segment);
-		}
-	}
-}
-
 void TimePeriod::UpdateRegion(double begin, double end, bool clearExisting)
 {
 	if (clearExisting) {
diff --git a/lib/icinga/timeperiod.hpp b/lib/icinga/timeperiod.hpp
index 94591ef69..e49ee93dc 100644
--- a/lib/icinga/timeperiod.hpp
+++ b/lib/icinga/timeperiod.hpp
@@ -37,8 +37,6 @@ private:
 	void RemoveSegment(const Dictionary::Ptr& segment);
 	void PurgeSegments(double end);
 
-	void Merge(const TimePeriod::Ptr& timeperiod, bool include = true);
-
 	void Dump();
 
 	static void UpdateTimerHandler();