Remove more redundant wrappers from CompatUtility class

[icinga2] / lib / livestatus / contactgroupstable.cpp

diff --git a/lib/livestatus/contactgroupstable.cpp b/lib/livestatus/contactgroupstable.cpp
index 6faf512c2bda6e1872ea46f4342246e6cfe96663..93587674a2796dd2416cf2cc3478b3993135f744 100644 (file)
--- a/lib/livestatus/contactgroupstable.cpp
+++ b/lib/livestatus/contactgroupstable.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Icinga 2                                                                   *
- * Copyright (C) 2012-2014 Icinga Development Team (http://www.icinga.org)    *
+ * Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com/)  *
  *                                                                            *
  * This program is free software; you can redistribute it and/or              *
  * modify it under the terms of the GNU General Public License                *
@@ -19,38 +19,38 @@
 
 #include "livestatus/contactgroupstable.hpp"
 #include "icinga/usergroup.hpp"
-#include "base/dynamictype.hpp"
-#include <boost/foreach.hpp>
+#include "base/configtype.hpp"
 
 using namespace icinga;
 
-ContactGroupsTable::ContactGroupsTable(void)
+ContactGroupsTable::ContactGroupsTable()
 {
        AddColumns(this);
 }
 
 void ContactGroupsTable::AddColumns(Table *table, const String& prefix,
-    const Column::ObjectAccessor& objectAccessor)
+       const Column::ObjectAccessor& objectAccessor)
 {
        table->AddColumn(prefix + "name", Column(&ContactGroupsTable::NameAccessor, objectAccessor));
        table->AddColumn(prefix + "alias", Column(&ContactGroupsTable::AliasAccessor, objectAccessor));
        table->AddColumn(prefix + "members", Column(&ContactGroupsTable::MembersAccessor, objectAccessor));
 }
 
-String ContactGroupsTable::GetName(void) const
+String ContactGroupsTable::GetName() const
 {
        return "contactgroups";
 }
 
-String ContactGroupsTable::GetPrefix(void) const
+String ContactGroupsTable::GetPrefix() const
 {
        return "contactgroup";
 }
 
 void ContactGroupsTable::FetchRows(const AddRowFunction& addRowFn)
 {
-       BOOST_FOREACH(const UserGroup::Ptr& ug, DynamicType::GetObjectsByType<UserGroup>()) {
-               addRowFn(ug);
+       for (const UserGroup::Ptr& ug : ConfigType::GetObjectsByType<UserGroup>()) {
+               if (!addRowFn(ug, LivestatusGroupByNone, Empty))
+                       return;
        }
 }
 
@@ -58,7 +58,7 @@ Value ContactGroupsTable::NameAccessor(const Value& row)
 {
        UserGroup::Ptr user_group = static_cast<UserGroup::Ptr>(row);
 
-       if(!user_group)
+       if (!user_group)
                return Empty;
 
        return user_group->GetName();
@@ -68,7 +68,7 @@ Value ContactGroupsTable::AliasAccessor(const Value& row)
 {
        UserGroup::Ptr user_group = static_cast<UserGroup::Ptr>(row);
 
-       if(!user_group)
+       if (!user_group)
                return Empty;
 
        return user_group->GetName();
@@ -78,12 +78,12 @@ Value ContactGroupsTable::MembersAccessor(const Value& row)
 {
        UserGroup::Ptr user_group = static_cast<UserGroup::Ptr>(row);
 
-       if(!user_group)
+       if (!user_group)
                return Empty;
 
        Array::Ptr members = new Array();
 
-       BOOST_FOREACH(const User::Ptr& user, user_group->GetMembers()) {
+       for (const User::Ptr& user : user_group->GetMembers()) {
                members->Add(user->GetName());
        }