Remove unused parameter.

diff --git a/lib/db_ido/servicedbobject.cpp b/lib/db_ido/servicedbobject.cpp
index 814409eb86d6c88adfb40a37e14504f73f4f1208..52110797301239e264f784955b2458d7d97d4b66 100644 (file)
--- a/lib/db_ido/servicedbobject.cpp
+++ b/lib/db_ido/servicedbobject.cpp
@@ -49,7 +49,7 @@ void ServiceDbObject::StaticInitialize(void)
 
        /* History */
        Service::OnAcknowledgementSet.connect(boost::bind(&ServiceDbObject::AddAcknowledgement, _1, _2, _3, _4, _5, _6));
-       Service::OnNotificationSentToAllUsers.connect(bind(&ServiceDbObject::AddNotification, _1, _2, _3, _4, _5, _6, _7));
+       Service::OnNotificationSentToAllUsers.connect(bind(&ServiceDbObject::AddNotification, _1, _2, _3, _4, _5, _6));
 }
 
 ServiceDbObject::ServiceDbObject(const DbType::Ptr& type, const String& name1, const String& name2)
@@ -786,7 +786,7 @@ void ServiceDbObject::AddAcknowledgement(const Service::Ptr& service, const Stri
 }
 
 void ServiceDbObject::AddNotification(const Service::Ptr& service, const std::set<User::Ptr>& users, NotificationType type,
-                                     const Dictionary::Ptr& cr, const String& author, const String& text, unsigned long notified_users)
+                                     const Dictionary::Ptr& cr, const String& author, const String& text)
 {
        Host::Ptr host = service->GetHost();
 
@@ -823,7 +823,7 @@ void ServiceDbObject::AddNotification(const Service::Ptr& service, const std::se
        }
 
        fields1->Set("escalated", 0);
-       fields1->Set("contacts_notified", notified_users);
+       fields1->Set("contacts_notified", users.size());
        fields1->Set("instance_id", 0); /* DbConnection class fills in real ID */
 
        query1.Fields = fields1;
@@ -856,7 +856,7 @@ void ServiceDbObject::AddNotification(const Service::Ptr& service, const std::se
                }
 
                fields2->Set("escalated", 0);
-               fields2->Set("contacts_notified", notified_users);
+               fields2->Set("contacts_notified", users.size());
                fields2->Set("instance_id", 0); /* DbConnection class fills in real ID */
 
                query2.Fields = fields2;

diff --git a/lib/db_ido/servicedbobject.h b/lib/db_ido/servicedbobject.h
index 01d3c412e2242d8122b4e247ba55e86191aaf6b4..204583a27ae1470fffb937e82cdcf36a5227403a 100644 (file)
--- a/lib/db_ido/servicedbobject.h
+++ b/lib/db_ido/servicedbobject.h
@@ -67,7 +67,7 @@ private:
 
         /* History */
         static void AddAcknowledgement(const Service::Ptr& service, const String& author, const String& comment, AcknowledgementType type, double expiry, const String& authority);
-        static void AddNotification(const Service::Ptr& service, const std::set<User::Ptr>& users, NotificationType type, const Dictionary::Ptr& cr, const String& author, const String& text, unsigned long notified_users);
+        static void AddNotification(const Service::Ptr& service, const std::set<User::Ptr>& users, NotificationType type, const Dictionary::Ptr& cr, const String& author, const String& text);
 
 };
 

diff --git a/lib/icinga/notification.cpp b/lib/icinga/notification.cpp
index d227c1175a9d3f63fe45a67aa3b2b000208ebd1f..327c69f41bf1754a22423c1612b5404822bcb489 100644 (file)
--- a/lib/icinga/notification.cpp
+++ b/lib/icinga/notification.cpp
@@ -303,7 +303,7 @@ void Notification::BeginExecuteNotification(NotificationType type, const Diction
                notified_users++;
        }
 
-       Service::OnNotificationSentToAllUsers(GetService(), allUsers, type, cr, author, text, notified_users);
+       Service::OnNotificationSentToAllUsers(GetService(), allUsers, type, cr, author, text);
 }
 
 void Notification::ExecuteNotificationHelper(NotificationType type, const User::Ptr& user, const Dictionary::Ptr& cr, bool force, const String& author, const String& text)

diff --git a/lib/icinga/service-notification.cpp b/lib/icinga/service-notification.cpp
index 0b91b0232dd8db56baef55be0c11210a119acaf9..e7b67efa0d2f2d21c35968b8845345a988c58f48 100644 (file)
--- a/lib/icinga/service-notification.cpp
+++ b/lib/icinga/service-notification.cpp
@@ -31,7 +31,7 @@
 
 using namespace icinga;
 
-boost::signals2::signal<void (const Service::Ptr&, const std::set<User::Ptr>&, const NotificationType&, const Dictionary::Ptr&, const String&, const String&, unsigned long)> Service::OnNotificationSentToAllUsers;
+boost::signals2::signal<void (const Service::Ptr&, const std::set<User::Ptr>&, const NotificationType&, const Dictionary::Ptr&, const String&, const String&)> Service::OnNotificationSentToAllUsers;
 boost::signals2::signal<void (const Service::Ptr&, const User::Ptr&, const NotificationType&, const Dictionary::Ptr&, const String&, const String&)> Service::OnNotificationSentToUser;
 
 Dictionary::Ptr Service::GetNotificationDescriptions(void) const

diff --git a/lib/icinga/service.h b/lib/icinga/service.h
index 2bb1dbfbb9e8939a817bbb1108d52be5935ce4f5..cfece1f24556bbb9ff86c96a8454cf17ca3683da 100644 (file)
--- a/lib/icinga/service.h
+++ b/lib/icinga/service.h
@@ -240,7 +240,7 @@ public:
        static boost::signals2::signal<void (const Service::Ptr&, const Dictionary::Ptr&, const String&)> OnNewCheckResult;
        static boost::signals2::signal<void (const Service::Ptr&, NotificationType, const Dictionary::Ptr&, const String&, const String&)> OnNotificationsRequested;
        static boost::signals2::signal<void (const Service::Ptr&, const User::Ptr&, const NotificationType&, const Dictionary::Ptr&, const String&, const String&)> OnNotificationSentToUser;
-       static boost::signals2::signal<void (const Service::Ptr&, const std::set<User::Ptr>&, const NotificationType&, const Dictionary::Ptr&, const String&, const String&, unsigned long)> OnNotificationSentToAllUsers;
+       static boost::signals2::signal<void (const Service::Ptr&, const std::set<User::Ptr>&, const NotificationType&, const Dictionary::Ptr&, const String&, const String&)> OnNotificationSentToAllUsers;
        static boost::signals2::signal<void (const Service::Ptr&, const Dictionary::Ptr&, const String&)> OnCommentAdded;
        static boost::signals2::signal<void (const Service::Ptr&, const Dictionary::Ptr&, const String&)> OnCommentRemoved;
        static boost::signals2::signal<void (const Service::Ptr&, const Dictionary::Ptr&, const String&)> OnDowntimeAdded;