From 3605076f8b731e03b6fe28f60674e96e2c401a7e Mon Sep 17 00:00:00 2001
From: Michael Friedrich <michael.friedrich@icinga.com>
Date: Tue, 7 Jan 2020 14:21:43 +0100
Subject: [PATCH] Revert "Add OnNewNotificationResult signal and
 ProcessNotificationResult handler"

This reverts commit ac483f2a8a07e4962068408d18b10a17204b6454.
---
 lib/icinga/notification.cpp | 10 ----------
 lib/icinga/notification.hpp |  4 ----
 2 files changed, 14 deletions(-)

diff --git a/lib/icinga/notification.cpp b/lib/icinga/notification.cpp
index dff07699e..9c2ae7ec8 100644
--- a/lib/icinga/notification.cpp
+++ b/lib/icinga/notification.cpp
@@ -23,7 +23,6 @@ std::map<String, int> Notification::m_StateFilterMap;
 std::map<String, int> Notification::m_TypeFilterMap;
 
 boost::signals2::signal<void (const Notification::Ptr&, const MessageOrigin::Ptr&)> Notification::OnNextNotificationChanged;
-boost::signals2::signal<void (const Notification::Ptr&, const NotificationResult::Ptr&, const MessageOrigin::Ptr&)> Notification::OnNewNotificationResult;
 
 String NotificationNameComposer::MakeName(const String& shortName, const Object::Ptr& context) const
 {
@@ -528,15 +527,6 @@ void Notification::ExecuteNotificationHelper(NotificationType type, const User::
 	}
 }
 
-void Notification::ProcessNotificationResult(const NotificationResult::Ptr& nr, const MessageOrigin::Ptr& origin)
-{
-	if (!nr)
-		return;
-
-	/* Notify cluster, API and feature events. */
-	OnNewNotificationResult(this, nr, origin);
-}
-
 int icinga::ServiceStateToFilter(ServiceState state)
 {
 	switch (state) {
diff --git a/lib/icinga/notification.hpp b/lib/icinga/notification.hpp
index d9f6ff960..2922308c8 100644
--- a/lib/icinga/notification.hpp
+++ b/lib/icinga/notification.hpp
@@ -10,7 +10,6 @@
 #include "icinga/usergroup.hpp"
 #include "icinga/timeperiod.hpp"
 #include "icinga/checkresult.hpp"
-#include "icinga/notificationresult.hpp"
 #include "remote/endpoint.hpp"
 #include "remote/messageorigin.hpp"
 #include "base/array.hpp"
@@ -83,8 +82,6 @@ public:
 
 	Endpoint::Ptr GetCommandEndpoint() const;
 
-	void ProcessNotificationResult(const NotificationResult::Ptr& nr, const MessageOrigin::Ptr& origin);
-
 	// Logging, etc.
 	static String NotificationTypeToString(NotificationType type);
 	// Compat, used for notifications, etc.
@@ -95,7 +92,6 @@ public:
 	static String NotificationHostStateToString(HostState state);
 
 	static boost::signals2::signal<void (const Notification::Ptr&, const MessageOrigin::Ptr&)> OnNextNotificationChanged;
-	static boost::signals2::signal<void (const Notification::Ptr&, const NotificationResult::Ptr&, const MessageOrigin::Ptr&)> OnNewNotificationResult;
 
 	void Validate(int types, const ValidationUtils& utils) override;