Merge pull request #6727 from Icinga/feature/cluster-config-sync-stage

[icinga2] / lib / icinga / service.hpp

diff --git a/lib/icinga/service.hpp b/lib/icinga/service.hpp
index 5292eb9ec6bab28cebd8b5a6d8b352d396857368..0e6e4d8d3e8f5fc6e79bf22d4e238ab3127c30b2 100644 (file)
--- a/lib/icinga/service.hpp
+++ b/lib/icinga/service.hpp
@@ -1,29 +1,15 @@
-/******************************************************************************
- * Icinga 2                                                                   *
- * Copyright (C) 2012-2016 Icinga Development Team (https://www.icinga.org/)  *
- *                                                                            *
- * This program is free software; you can redistribute it and/or              *
- * modify it under the terms of the GNU General Public License                *
- * as published by the Free Software Foundation; either version 2             *
- * of the License, or (at your option) any later version.                     *
- *                                                                            *
- * This program is distributed in the hope that it will be useful,            *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the              *
- * GNU General Public License for more details.                               *
- *                                                                            *
- * You should have received a copy of the GNU General Public License          *
- * along with this program; if not, write to the Free Software Foundation     *
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
- ******************************************************************************/
+/* Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ */
 
 #ifndef SERVICE_H
 #define SERVICE_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/service.thpp"
+#include "icinga/service-ti.hpp"
 #include "icinga/macroresolver.hpp"
 #include "icinga/host.hpp"
+#include <tuple>
+
+using std::tie;
 
 namespace icinga
 {
@@ -33,7 +19,7 @@ namespace icinga
  *
  * @ingroup icinga
  */
-class I2_ICINGA_API Service : public ObjectImpl<Service>, public MacroResolver
+class Service final : public ObjectImpl<Service>, public MacroResolver
 {
 public:
        DECLARE_OBJECT(Service);
@@ -41,12 +27,14 @@ public:
 
        static Service::Ptr GetByNamePair(const String& hostName, const String& serviceName);
 
-       virtual Host::Ptr GetHost(void) const override;
+       Host::Ptr GetHost() const override;
+       int GetSeverity() const override;
+       bool GetHandled() const override;
 
-       virtual bool ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Value *result) const override;
+       bool ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Value *result) const override;
 
-       virtual bool IsStateOK(ServiceState state) override;
-       virtual void SaveLastState(ServiceState state, double timestamp) override;
+       bool IsStateOK(ServiceState state) const override;
+       void SaveLastState(ServiceState state, double timestamp) override;
 
        static ServiceState StateFromString(const String& state);
        static String StateToString(ServiceState state);
@@ -57,8 +45,8 @@ public:
        static void EvaluateApplyRules(const Host::Ptr& host);
 
 protected:
-       virtual void OnAllConfigLoaded(void) override;
-       virtual void CreateChildObjects(const Type::Ptr& childType) override;
+       void OnAllConfigLoaded() override;
+       void CreateChildObjects(const Type::Ptr& childType) override;
 
 private:
        Host::Ptr m_Host;
@@ -67,7 +55,7 @@ private:
        static bool EvaluateApplyRule(const Host::Ptr& host, const ApplyRule& rule);
 };
 
-I2_ICINGA_API boost::tuple<Host::Ptr, Service::Ptr> GetHostService(const Checkable::Ptr& checkable);
+std::pair<Host::Ptr, Service::Ptr> GetHostService(const Checkable::Ptr& checkable);
 
 }