Move CompatUtility::GetCheckableInCheckPeriod() into Livestatus feature

[icinga2] / lib / livestatus / andfilter.hpp

diff --git a/lib/livestatus/andfilter.hpp b/lib/livestatus/andfilter.hpp
index 9d36e4cfc44f1be92d3ee90125a285152126153e..cdbd217522ea61c741cfbcac9736a874fdef456d 100644 (file)
--- a/lib/livestatus/andfilter.hpp
+++ b/lib/livestatus/andfilter.hpp
@@ -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                *
@@ -30,14 +30,12 @@ namespace icinga
 /**
  * @ingroup livestatus
  */
-class AndFilter : public CombinerFilter
+class AndFilter final : public CombinerFilter
 {
 public:
-       DECLARE_OBJECT(AndFilter);
+       DECLARE_PTR_TYPEDEFS(AndFilter);
 
-       AndFilter(void);
-
-       virtual bool Apply(const Table::Ptr& table, const Value& row);
+       bool Apply(const Table::Ptr& table, const Value& row) override;
 };
 
 }