Fetched livestatus from downstream.

Change-Id: I2a5a57f33007c1f7867fcd2f2f80e5acfd016c7d
Checkmk · Dec 27, 2016 · eebe2d6 · eebe2d6
1 parent 683f904
commit eebe2d6
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 14 deletions.
diff --git a/livestatus/src/ContactGroupsMemberColumn.h b/livestatus/src/ContactGroupsMemberColumn.h
@@ -28,7 +28,6 @@
 #include "config.h"  // IWYU pragma: keep
 #include <memory>
 #include <string>
-#include "Column.h"
 #include "ContactsColumn.h"
 #include "nagios.h"
 
@@ -38,7 +37,6 @@ class ContactGroupsMemberColumn : public ContactsColumn {
                               const std::string& description,
                               int indirect_offset, int extra_offset = -1)
         : ContactsColumn(name, description, indirect_offset, extra_offset) {}
-    ColumnType type() override { return ColumnType::list; }
     std::unique_ptr<Contains> makeContains(const std::string& name) override;
     std::unique_ptr<Contains> containsContact(contact* ctc) override;
 };

diff --git a/livestatus/src/ContactsColumn.h b/livestatus/src/ContactsColumn.h
@@ -28,7 +28,6 @@
 #include "config.h"  // IWYU pragma: keep
 #include <memory>
 #include <string>
-#include "Column.h"
 #include "ListColumn.h"
 #include "nagios.h"
 class RowRenderer;
@@ -38,7 +37,6 @@ class ContactsColumn : public ListColumn {
     ContactsColumn(const std::string &name, const std::string &description,
                    int indirect_offset, int extra_offset)
         : ListColumn(name, description, indirect_offset, extra_offset) {}
-    ColumnType type() override { return ColumnType::list; }
     virtual std::unique_ptr<Contains> containsContact(contact *ctc) = 0;
     bool isEmpty(void *data) override;
     void output(void *row, RowRenderer &r, contact *auth_user) override;

diff --git a/livestatus/src/DownCommColumn.h b/livestatus/src/DownCommColumn.h
@@ -28,7 +28,6 @@
 #include "config.h"  // IWYU pragma: keep
 #include <memory>
 #include <string>
-#include "Column.h"
 #include "ListColumn.h"
 #include "nagios.h"
 class DowntimeOrComment;
@@ -55,7 +54,6 @@ class DownCommColumn : public ListColumn {
         , _with_info(with_info)
         , _is_service(is_service)
         , _with_extra_info(with_extra_info) {}
-    ColumnType type() override { return ColumnType::list; }
     std::unique_ptr<Contains> makeContains(const std::string &name) override;
     void output(void *row, RowRenderer &r, contact *auth_user) override;
     bool isEmpty(void *data) override;

diff --git a/livestatus/src/HostContactsColumn.h b/livestatus/src/HostContactsColumn.h
@@ -28,7 +28,6 @@
 #include "config.h"  // IWYU pragma: keep
 #include <memory>
 #include <string>
-#include "Column.h"
 #include "ContactsColumn.h"
 #include "nagios.h"
 
@@ -38,7 +37,6 @@ class HostContactsColumn : public ContactsColumn {
                        int indirect_offset, int extra_offset = -1)
         : ContactsColumn(name, description, indirect_offset,
                          extra_offset = -1) {}
-    ColumnType type() override { return ColumnType::list; }
     std::unique_ptr<Contains> makeContains(const std::string& name) override;
     std::unique_ptr<Contains> containsContact(contact* ctc) override;
 };

diff --git a/livestatus/src/HostGroupsColumn.h b/livestatus/src/HostGroupsColumn.h
@@ -28,7 +28,6 @@
 #include "config.h"  // IWYU pragma: keep
 #include <memory>
 #include <string>
-#include "Column.h"
 #include "ListColumn.h"
 #include "nagios.h"
 class RowRenderer;
@@ -41,7 +40,6 @@ class HostGroupsColumn : public ListColumn {
                      int offset, int indirect_offset, int extra_offset = -1)
         : ListColumn(name, description, indirect_offset, extra_offset)
         , _offset(offset) {}
-    ColumnType type() override { return ColumnType::list; }
     std::unique_ptr<Contains> makeContains(const std::string &name) override;
     void output(void *row, RowRenderer &r, contact *auth_user) override;
     bool isEmpty(void *data) override;

diff --git a/livestatus/src/ServiceContactsColumn.h b/livestatus/src/ServiceContactsColumn.h
@@ -28,7 +28,6 @@
 #include "config.h"  // IWYU pragma: keep
 #include <memory>
 #include <string>
-#include "Column.h"
 #include "ContactsColumn.h"
 #include "nagios.h"
 
@@ -38,7 +37,6 @@ class ServiceContactsColumn : public ContactsColumn {
                           const std::string& description, int indirect_offset,
                           int extra_offset = -1)
         : ContactsColumn(name, description, indirect_offset, extra_offset) {}
-    ColumnType type() override { return ColumnType::list; }
     std::unique_ptr<Contains> makeContains(const std::string& name) override;
     std::unique_ptr<Contains> containsContact(contact* ctc) override;
 };

diff --git a/livestatus/src/ServiceGroupsColumn.h b/livestatus/src/ServiceGroupsColumn.h
@@ -28,7 +28,6 @@
 #include "config.h"  // IWYU pragma: keep
 #include <memory>
 #include <string>
-#include "Column.h"
 #include "ListColumn.h"
 #include "nagios.h"
 class RowRenderer;
@@ -41,7 +40,6 @@ class ServiceGroupsColumn : public ListColumn {
                         int offset, int indirect_offset, int extra_offset = -1)
         : ListColumn(name, description, indirect_offset, extra_offset)
         , _offset(offset) {}
-    ColumnType type() override { return ColumnType::list; }
     void output(void *row, RowRenderer &r, contact *auth_user) override;
     std::unique_ptr<Contains> makeContains(const std::string &name) override;
     bool isEmpty(void *data) override;