Module: check_mk
Branch: master
Commit: a2bfbcecac460258a8c0342c5ff20a464f37924e
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2bfbcecac4602…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Tue May 3 09:35:55 2016 +0200
IWYU.
---
livestatus/src/DynamicLogwatchFileColumn.cc | 11 ++++++-----
livestatus/src/DynamicLogwatchFileColumn.h | 4 +++-
livestatus/src/LogwatchListColumn.cc | 6 +++---
livestatus/src/LogwatchListColumn.h | 3 +++
livestatus/src/mk_logwatch.cc | 5 +++--
livestatus/src/mk_logwatch.h | 2 +-
6 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/livestatus/src/DynamicLogwatchFileColumn.cc
b/livestatus/src/DynamicLogwatchFileColumn.cc
index 223f7b0..28f4c34 100644
--- a/livestatus/src/DynamicLogwatchFileColumn.cc
+++ b/livestatus/src/DynamicLogwatchFileColumn.cc
@@ -22,15 +22,16 @@
// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
// Boston, MA 02110-1301 USA.
+#include "DynamicLogwatchFileColumn.h"
#include <string.h>
-#include "strutil.h"
+#include <syslog.h>
+#include <vector>
+#include "HostFileColumn.h"
#include "logger.h"
#include "mk_logwatch.h"
-#include "DynamicLogwatchFileColumn.h"
-#include "HostFileColumn.h"
-#include <vector>
-using namespace std;
+#include "strutil.h"
+using namespace std;
// Replace \\ with \ and \s with space
string unescape_filename(string filename)
diff --git a/livestatus/src/DynamicLogwatchFileColumn.h
b/livestatus/src/DynamicLogwatchFileColumn.h
index 899760c..fa14fc1 100644
--- a/livestatus/src/DynamicLogwatchFileColumn.h
+++ b/livestatus/src/DynamicLogwatchFileColumn.h
@@ -25,8 +25,10 @@
#ifndef DynamicLogwatchFileColumn_h
#define DynamicLogwatchFileColumn_h
+#include "config.h" // IWYU pragma: keep
+#include <string>
#include "DynamicColumn.h"
-
+class Column;
class DynamicLogwatchFileColumn : public DynamicColumn {
public:
diff --git a/livestatus/src/LogwatchListColumn.cc b/livestatus/src/LogwatchListColumn.cc
index 008cfaa..a34ccde 100644
--- a/livestatus/src/LogwatchListColumn.cc
+++ b/livestatus/src/LogwatchListColumn.cc
@@ -22,16 +22,16 @@
// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
// Boston, MA 02110-1301 USA.
-#include <string>
-#include <sys/types.h>
+#include "LogwatchListColumn.h"
#include <dirent.h>
#include <string.h>
-#include "LogwatchListColumn.h"
#include "Query.h"
#include "mk_logwatch.h"
#ifdef CMC
#include "Host.h"
+#else
+#include "nagios.h"
#endif
diff --git a/livestatus/src/LogwatchListColumn.h b/livestatus/src/LogwatchListColumn.h
index 9f515fe..dbe0b31 100644
--- a/livestatus/src/LogwatchListColumn.h
+++ b/livestatus/src/LogwatchListColumn.h
@@ -25,7 +25,10 @@
#ifndef LogwatchListColumn_h
#define LogwatchListColumn_h
+#include "config.h" // IWYU pragma: keep
+#include <string>
#include "Column.h"
+class Query;
class LogwatchListColumn : public Column {
public:
diff --git a/livestatus/src/mk_logwatch.cc b/livestatus/src/mk_logwatch.cc
index 7be473b..c7d9a05 100644
--- a/livestatus/src/mk_logwatch.cc
+++ b/livestatus/src/mk_logwatch.cc
@@ -22,11 +22,12 @@
// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
// Boston, MA 02110-1301 USA.
-
+#include "mk_logwatch.h"
+#include <errno.h>
#include <stdio.h>
#include <string.h>
+#include <syslog.h>
#include "logger.h"
-#include "mk_logwatch.h"
#include "pnp4nagios.h"
std::string mk_logwatch_path_of_host(const char *host_name)
diff --git a/livestatus/src/mk_logwatch.h b/livestatus/src/mk_logwatch.h
index 856bab0..b2bfed0 100644
--- a/livestatus/src/mk_logwatch.h
+++ b/livestatus/src/mk_logwatch.h
@@ -25,8 +25,8 @@
#ifndef mk_logwatch_h
#define mk_logwatch_h
-#include <string>
#include "config.h" // IWYU pragma: keep
+#include <string>
#ifdef CMC
#include <Config.h>