Remove more redundant wrappers from CompatUtility class

[icinga2] / lib / livestatus / hostgroupstable.cpp

diff --git a/lib/livestatus/hostgroupstable.cpp b/lib/livestatus/hostgroupstable.cpp
index 5a4beff8fb583b8b00379676845d73a350bd0d55..117a84a7d8626a72b6db05212f1190bdd4c20aaf 100644 (file)
--- a/lib/livestatus/hostgroupstable.cpp
+++ b/lib/livestatus/hostgroupstable.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Icinga 2                                                                   *
- * Copyright (C) 2012-2016 Icinga Development Team (https://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                *
@@ -25,13 +25,13 @@
 
 using namespace icinga;
 
-HostGroupsTable::HostGroupsTable(void)
+HostGroupsTable::HostGroupsTable()
 {
        AddColumns(this);
 }
 
 void HostGroupsTable::AddColumns(Table *table, const String& prefix,
-    const Column::ObjectAccessor& objectAccessor)
+       const Column::ObjectAccessor& objectAccessor)
 {
        table->AddColumn(prefix + "name", Column(&HostGroupsTable::NameAccessor, objectAccessor));
        table->AddColumn(prefix + "alias", Column(&HostGroupsTable::AliasAccessor, objectAccessor));
@@ -47,7 +47,7 @@ void HostGroupsTable::AddColumns(Table *table, const String& prefix,
        table->AddColumn(prefix + "num_hosts_down", Column(&HostGroupsTable::NumHostsDownAccessor, objectAccessor));
        table->AddColumn(prefix + "num_hosts_unreach", Column(&HostGroupsTable::NumHostsUnreachAccessor, objectAccessor));
        table->AddColumn(prefix + "num_services", Column(&HostGroupsTable::NumServicesAccessor, objectAccessor));
-       table->AddColumn(prefix + "worst_services_state", Column(&HostGroupsTable::WorstServicesStateAccessor, objectAccessor));
+       table->AddColumn(prefix + "worst_service_state", Column(&HostGroupsTable::WorstServiceStateAccessor, objectAccessor));
        table->AddColumn(prefix + "num_services_pending", Column(&HostGroupsTable::NumServicesPendingAccessor, objectAccessor));
        table->AddColumn(prefix + "num_services_ok", Column(&HostGroupsTable::NumServicesOkAccessor, objectAccessor));
        table->AddColumn(prefix + "num_services_warn", Column(&HostGroupsTable::NumServicesWarnAccessor, objectAccessor));
@@ -60,12 +60,12 @@ void HostGroupsTable::AddColumns(Table *table, const String& prefix,
        table->AddColumn(prefix + "num_services_hard_unknown", Column(&HostGroupsTable::NumServicesHardUnknownAccessor, objectAccessor));
 }
 
-String HostGroupsTable::GetName(void) const
+String HostGroupsTable::GetName() const
 {
        return "hostgroups";
 }
 
-String HostGroupsTable::GetPrefix(void) const
+String HostGroupsTable::GetPrefix() const
 {
        return "hostgroup";
 }
@@ -278,7 +278,7 @@ Value HostGroupsTable::NumServicesAccessor(const Value& row)
        return num_services;
 }
 
-Value HostGroupsTable::WorstServicesStateAccessor(const Value& row)
+Value HostGroupsTable::WorstServiceStateAccessor(const Value& row)
 {
        HostGroup::Ptr hg = static_cast<HostGroup::Ptr>(row);