Remove more redundant wrappers from CompatUtility class

[icinga2] / lib / livestatus / statustable.cpp

diff --git a/lib/livestatus/statustable.cpp b/lib/livestatus/statustable.cpp
index 0aad7ab5e71693545a963fc968fb93e3bd940ec8..135e15e99878562aef0aec2d0494899ff6413bbd 100644 (file)
--- a/lib/livestatus/statustable.cpp
+++ b/lib/livestatus/statustable.cpp
@@ -29,7 +29,7 @@
 
 using namespace icinga;
 
-StatusTable::StatusTable(void)
+StatusTable::StatusTable()
 {
        AddColumns(this);
 }
@@ -102,12 +102,12 @@ void StatusTable::AddColumns(Table *table, const String& prefix,
        table->AddColumn(prefix + "custom_variables", Column(&StatusTable::CustomVariablesAccessor, objectAccessor));
 }
 
-String StatusTable::GetName(void) const
+String StatusTable::GetName() const
 {
        return "status";
 }
 
-String StatusTable::GetPrefix(void) const
+String StatusTable::GetPrefix() const
 {
        return "status";
 }
@@ -132,25 +132,25 @@ Value StatusTable::ConnectionsRateAccessor(const Value&)
 
 Value StatusTable::HostChecksAccessor(const Value&)
 {
-       long timespan = static_cast<long>(Utility::GetTime() - Application::GetStartTime());
+       auto timespan = static_cast<long>(Utility::GetTime() - Application::GetStartTime());
        return CIB::GetActiveHostChecksStatistics(timespan);
 }
 
 Value StatusTable::HostChecksRateAccessor(const Value&)
 {
-       long timespan = static_cast<long>(Utility::GetTime() - Application::GetStartTime());
+       auto timespan = static_cast<long>(Utility::GetTime() - Application::GetStartTime());
        return (CIB::GetActiveHostChecksStatistics(timespan) / (Utility::GetTime() - Application::GetStartTime()));
 }
 
 Value StatusTable::ServiceChecksAccessor(const Value&)
 {
-       long timespan = static_cast<long>(Utility::GetTime() - Application::GetStartTime());
+       auto timespan = static_cast<long>(Utility::GetTime() - Application::GetStartTime());
        return CIB::GetActiveServiceChecksStatistics(timespan);
 }
 
 Value StatusTable::ServiceChecksRateAccessor(const Value&)
 {
-       long timespan = static_cast<long>(Utility::GetTime() - Application::GetStartTime());
+       auto timespan = static_cast<long>(Utility::GetTime() - Application::GetStartTime());
        return (CIB::GetActiveServiceChecksStatistics(timespan) / (Utility::GetTime() - Application::GetStartTime()));
 }