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

[icinga2] / lib / icinga / comment.hpp

diff --git a/lib/icinga/comment.hpp b/lib/icinga/comment.hpp
index 26f824cec21972dadacf280be325d1d5bd2691db..166654d3194625612160e6eca4cf7022618e6317 100644 (file)
--- a/lib/icinga/comment.hpp
+++ b/lib/icinga/comment.hpp
@@ -1,28 +1,11 @@
-/******************************************************************************
- * Icinga 2                                                                   *
- * Copyright (C) 2012-2017 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                *
- * 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 COMMENT_H
 #define COMMENT_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/comment.thpp"
-#include "icinga/checkable.thpp"
+#include "icinga/comment-ti.hpp"
+#include "icinga/checkable-ti.hpp"
 #include "remote/messageorigin.hpp"
 
 namespace icinga
@@ -33,7 +16,7 @@ namespace icinga
  *
  * @ingroup icinga
  */
-class I2_ICINGA_API Comment : public ObjectImpl<Comment>
+class Comment final : public ObjectImpl<Comment>
 {
 public:
        DECLARE_OBJECT(Comment);
@@ -42,29 +25,29 @@ public:
        static boost::signals2::signal<void (const Comment::Ptr&)> OnCommentAdded;
        static boost::signals2::signal<void (const Comment::Ptr&)> OnCommentRemoved;
 
-       intrusive_ptr<Checkable> GetCheckable(void) const;
+       intrusive_ptr<Checkable> GetCheckable() const;
 
-       bool IsExpired(void) const;
+       bool IsExpired() const;
 
-       static int GetNextCommentID(void);
+       static int GetNextCommentID();
 
        static String AddComment(const intrusive_ptr<Checkable>& checkable, CommentType entryType,
-           const String& author, const String& text, bool persistent, double expireTime,
-           const String& id = String(), const MessageOrigin::Ptr& origin = nullptr);
+               const String& author, const String& text, bool persistent, double expireTime,
+               const String& id = String(), const MessageOrigin::Ptr& origin = nullptr);
 
        static void RemoveComment(const String& id, const MessageOrigin::Ptr& origin = nullptr);
 
        static String GetCommentIDFromLegacyID(int id);
 
 protected:
-       virtual void OnAllConfigLoaded(void) override;
-       virtual void Start(bool runtimeCreated) override;
-       virtual void Stop(bool runtimeRemoved) override;
+       void OnAllConfigLoaded() override;
+       void Start(bool runtimeCreated) override;
+       void Stop(bool runtimeRemoved) override;
 
 private:
        ObjectImpl<Checkable>::Ptr m_Checkable;
 
-       static void CommentsExpireTimerHandler(void);
+       static void CommentsExpireTimerHandler();
 };
 
 }