Remove more redundant wrappers from CompatUtility class

[icinga2] / lib / livestatus / timeperiodstable.cpp

diff --git a/lib/livestatus/timeperiodstable.cpp b/lib/livestatus/timeperiodstable.cpp
index bca515d59894d7be39798746164993cf617fd9c8..bb1329511f26aed5fd35b93081bd852d63859692 100644 (file)
--- a/lib/livestatus/timeperiodstable.cpp
+++ b/lib/livestatus/timeperiodstable.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                *
@@ -20,42 +20,42 @@
 #include "livestatus/timeperiodstable.hpp"
 #include "icinga/icingaapplication.hpp"
 #include "icinga/timeperiod.hpp"
-#include "base/dynamictype.hpp"
+#include "base/configtype.hpp"
 #include "base/objectlock.hpp"
 #include "base/convert.hpp"
 #include "base/utility.hpp"
-#include <boost/foreach.hpp>
 #include <boost/algorithm/string/replace.hpp>
 
 using namespace icinga;
 
-TimePeriodsTable::TimePeriodsTable(void)
+TimePeriodsTable::TimePeriodsTable()
 {
        AddColumns(this);
 }
 
 void TimePeriodsTable::AddColumns(Table *table, const String& prefix,
-    const Column::ObjectAccessor& objectAccessor)
+       const Column::ObjectAccessor& objectAccessor)
 {
        table->AddColumn(prefix + "name", Column(&TimePeriodsTable::NameAccessor, objectAccessor));
        table->AddColumn(prefix + "alias", Column(&TimePeriodsTable::AliasAccessor, objectAccessor));
        table->AddColumn(prefix + "in", Column(&TimePeriodsTable::InAccessor, objectAccessor));
 }
 
-String TimePeriodsTable::GetName(void) const
+String TimePeriodsTable::GetName() const
 {
        return "timeperiod";
 }
 
-String TimePeriodsTable::GetPrefix(void) const
+String TimePeriodsTable::GetPrefix() const
 {
        return "timeperiod";
 }
 
 void TimePeriodsTable::FetchRows(const AddRowFunction& addRowFn)
 {
-       BOOST_FOREACH(const TimePeriod::Ptr& tp, DynamicType::GetObjectsByType<TimePeriod>()) {
-               addRowFn(tp);
+       for (const TimePeriod::Ptr& tp : ConfigType::GetObjectsByType<TimePeriod>()) {
+               if (!addRowFn(tp, LivestatusGroupByNone, Empty))
+                       return;
        }
 }
 
@@ -73,5 +73,3 @@ Value TimePeriodsTable::InAccessor(const Value& row)
 {
        return (static_cast<TimePeriod::Ptr>(row)->IsInside(Utility::GetTime()) ? 1 : 0);
 }
-
-