Remove more redundant wrappers from CompatUtility class

[icinga2] / lib / livestatus / servicestable.hpp

diff --git a/lib/livestatus/servicestable.hpp b/lib/livestatus/servicestable.hpp
index c66ff2e97f989ed53ddd5a2277418cbae3834d83..afa9c84cde4240e2071979d98459de230b092cb2 100644 (file)
--- a/lib/livestatus/servicestable.hpp
+++ b/lib/livestatus/servicestable.hpp
@@ -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                *
@@ -30,7 +30,7 @@ namespace icinga
 /**
  * @ingroup livestatus
  */
-class I2_LIVESTATUS_API ServicesTable : public Table
+class ServicesTable final : public Table
 {
 public:
        DECLARE_PTR_TYPEDEFS(ServicesTable);
@@ -38,13 +38,13 @@ public:
        ServicesTable(LivestatusGroupByType type = LivestatusGroupByNone);
 
        static void AddColumns(Table *table, const String& prefix = String(),
-           const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
+               const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
 
-       virtual String GetName(void) const override;
-       virtual String GetPrefix(void) const override;
+       String GetName() const override;
+       String GetPrefix() const override;
 
 protected:
-       virtual void FetchRows(const AddRowFunction& addRowFn) override;
+       void FetchRows(const AddRowFunction& addRowFn) override;
 
        static Object::Ptr HostAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor);
        static Object::Ptr ServiceGroupAccessor(const Value& row, LivestatusGroupByType groupByType, const Object::Ptr& groupByObject);
@@ -58,7 +58,6 @@ protected:
        static Value PluginOutputAccessor(const Value& row);
        static Value LongPluginOutputAccessor(const Value& row);
        static Value PerfDataAccessor(const Value& row);
-       static Value NotificationPeriodAccessor(const Value& row);
        static Value CheckPeriodAccessor(const Value& row);
        static Value NotesAccessor(const Value& row);
        static Value NotesExpandedAccessor(const Value& row);
@@ -99,7 +98,6 @@ protected:
        static Value NotificationsEnabledAccessor(const Value& row);
        static Value ProcessPerformanceDataAccessor(const Value& row);
        static Value ActiveChecksEnabledAccessor(const Value& row);
-       static Value CheckOptionsAccessor(const Value& row);
        static Value FlapDetectionEnabledAccessor(const Value& row);
        static Value CheckFreshnessAccessor(const Value& row);
        static Value StalenessAccessor(const Value& row);