Merge branch 'support/2.10'

[icinga2] / lib / livestatus / commandstable.hpp

diff --git a/lib/livestatus/commandstable.hpp b/lib/livestatus/commandstable.hpp
index 789eaa46bb74c45b96f9809448466d56dca70b14..cd2d9152164b7f301b3654a9478f3c9219828789 100644 (file)
--- a/lib/livestatus/commandstable.hpp
+++ b/lib/livestatus/commandstable.hpp
@@ -1,21 +1,4 @@
-/******************************************************************************
- * Icinga 2                                                                   *
- * Copyright (C) 2012-2015 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 COMMANDSTABLE_H
 #define COMMANDSTABLE_H
@@ -30,21 +13,21 @@ namespace icinga
 /**
  * @ingroup livestatus
  */
-class I2_LIVESTATUS_API CommandsTable : public Table
+class CommandsTable final : public Table
 {
 public:
        DECLARE_PTR_TYPEDEFS(CommandsTable);
 
-       CommandsTable(void);
+       CommandsTable();
 
        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;
 
 protected:
-       virtual void FetchRows(const AddRowFunction& addRowFn) override;
+       void FetchRows(const AddRowFunction& addRowFn) override;
 
        static Value NameAccessor(const Value& row);
        static Value LineAccessor(const Value& row);