Merge pull request #7204 from episodeiv/master

[icinga2] / lib / livestatus / logtable.cpp

diff --git a/lib/livestatus/logtable.cpp b/lib/livestatus/logtable.cpp
index 3e069c004ea2150ea91e2d55b67ef9efeb53af6a..ed21b722eaf469977045b070c7b25d8e8b9c52bb 100644 (file)
--- a/lib/livestatus/logtable.cpp
+++ b/lib/livestatus/logtable.cpp
@@ -1,21 +1,4 @@
-/******************************************************************************
- * Icinga 2                                                                   *
- * Copyright (C) 2012-2018 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+ */
 
 #include "livestatus/logtable.hpp"
 #include "livestatus/livestatuslogutility.hpp"
@@ -36,10 +19,7 @@
 #include "base/logger.hpp"
 #include "base/application.hpp"
 #include "base/objectlock.hpp"
-#include <boost/tuple/tuple.hpp>
 #include <boost/algorithm/string.hpp>
-#include <boost/algorithm/string/split.hpp>
-#include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <fstream>
@@ -81,12 +61,12 @@ void LogTable::AddColumns(Table *table, const String& prefix,
        CommandsTable::AddColumns(table, "current_command_", std::bind(&LogTable::CommandAccessor, _1, objectAccessor));
 }
 
-String LogTable::GetName(void) const
+String LogTable::GetName() const
 {
        return "log";
 }
 
-String LogTable::GetPrefix(void) const
+String LogTable::GetPrefix() const
 {
        return "log";
 }