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

[icinga2] / lib / icinga / checkcommand.hpp

diff --git a/lib/icinga/checkcommand.hpp b/lib/icinga/checkcommand.hpp
index f6349a3cc93e07d843cb6a80a60113eb233c3020..6eb6119a3c8bdd55a8ff091fee0a0871cab34eca 100644 (file)
--- a/lib/icinga/checkcommand.hpp
+++ b/lib/icinga/checkcommand.hpp
@@ -1,26 +1,9 @@
-/******************************************************************************
- * Icinga 2                                                                   *
- * Copyright (C) 2012-2014 Icinga Development Team (http://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 CHECKCOMMAND_H
 #define CHECKCOMMAND_H
 
-#include "icinga/checkcommand.thpp"
+#include "icinga/checkcommand-ti.hpp"
 #include "icinga/checkable.hpp"
 
 namespace icinga
@@ -31,15 +14,15 @@ namespace icinga
  *
  * @ingroup icinga
  */
-class I2_ICINGA_API CheckCommand : public ObjectImpl<CheckCommand>
+class CheckCommand final : public ObjectImpl<CheckCommand>
 {
 public:
        DECLARE_OBJECT(CheckCommand);
        DECLARE_OBJECTNAME(CheckCommand);
 
        virtual void Execute(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr,
-           const Dictionary::Ptr& resolvedMacros = Dictionary::Ptr(),
-           bool useResolvedMacros = false);
+               const Dictionary::Ptr& resolvedMacros = nullptr,
+               bool useResolvedMacros = false);
 };
 
 }