Merge pull request #7204 from episodeiv/master

[icinga2] / lib / livestatus / statehisttable.hpp

diff --git a/lib/livestatus/statehisttable.hpp b/lib/livestatus/statehisttable.hpp
index 661503b9f3de0fda6b1b2a8f06b389d711e852c5..9233fd559f09400bdf80f563584e9878bc675aa5 100644 (file)
--- a/lib/livestatus/statehisttable.hpp
+++ b/lib/livestatus/statehisttable.hpp
@@ -1,21 +1,4 @@
-/******************************************************************************
- * 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 STATEHISTTABLE_H
 #define STATEHISTTABLE_H
@@ -32,7 +15,7 @@ namespace icinga
 /**
  * @ingroup livestatus
  */
-class I2_LIVESTATUS_API StateHistTable : public HistoryTable
+class StateHistTable final : public HistoryTable
 {
 public:
        DECLARE_PTR_TYPEDEFS(StateHistTable);
@@ -40,15 +23,15 @@ public:
        StateHistTable(const String& compat_log_path, time_t from, time_t until);
 
        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;
 
        void UpdateLogEntries(const Dictionary::Ptr& log_entry_attrs, int line_count, int lineno, const AddRowFunction& addRowFn) 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 ServiceAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor);