[checkmk-commits] Added remaining overrides in the Column hierarchy.

Module: check_mk Branch: master Commit: 6e3fd5cec666d536f7b85b05d515197fb1d98b4d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e3fd5cec666d5… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jan 14 10:55:39 2016 +0100 Added remaining overrides in the Column hierarchy. --- livestatus/src/AttributelistColumn.h | 2 +- livestatus/src/ContactgroupsColumn.h | 6 +++--- livestatus/src/ContactsColumn.h | 4 ++-- livestatus/src/DownCommColumn.h | 6 +++--- livestatus/src/DynamicColumn.h | 1 - livestatus/src/HostFileColumn.h | 2 +- livestatus/src/HostgroupsColumn.h | 6 +++--- livestatus/src/OffsetStringHostMacroColumn.h | 4 ++-- livestatus/src/OffsetStringServiceMacroColumn.h | 4 ++-- livestatus/src/ServicegroupsColumn.h | 6 +++--- livestatus/src/TimeColumnFilter.h | 2 +- 11 files changed, 21 insertions(+), 22 deletions(-) diff --git a/livestatus/src/AttributelistColumn.h b/livestatus/src/AttributelistColumn.h index 91c8f95..72340ac 100644 --- a/livestatus/src/AttributelistColumn.h +++ b/livestatus/src/AttributelistColumn.h @@ -54,7 +54,7 @@ public: Filter *createFilter(int opid, char *value) override; /* API of IntColumn */ - virtual int32_t getValue(void *data, Query *) { return getValue(data); } + int32_t getValue(void *data, Query *) override { return getValue(data); } unsigned long getValue(void *data); }; diff --git a/livestatus/src/ContactgroupsColumn.h b/livestatus/src/ContactgroupsColumn.h index a425014..3259b5b 100644 --- a/livestatus/src/ContactgroupsColumn.h +++ b/livestatus/src/ContactgroupsColumn.h @@ -38,9 +38,9 @@ public: ContactgroupsColumn(std::string name, std::string description, int offset, int indirect_offset) : ListColumn(name, description, indirect_offset), _offset(offset) {} void output(void *, Query *) override; - void *getNagiosObject(char *name); // return pointer to contact group - bool isNagiosMember(void *data, void *nagobject); - bool isEmpty(void *data); + void *getNagiosObject(char *name) override; // return pointer to contact group + bool isNagiosMember(void *data, void *nagobject) override; + bool isEmpty(void *data) override; }; #endif // ContactgroupsColumn_h diff --git a/livestatus/src/ContactsColumn.h b/livestatus/src/ContactsColumn.h index 7302d96..ea76767 100644 --- a/livestatus/src/ContactsColumn.h +++ b/livestatus/src/ContactsColumn.h @@ -38,8 +38,8 @@ public: ContactsColumn(std::string name, std::string description, int indirect_offset) : ListColumn(name, description, indirect_offset) {} int type() override { return COLTYPE_LIST; } - void *getNagiosObject(char *name); - bool isEmpty(void *data); + void *getNagiosObject(char *name) override; + bool isEmpty(void *data) override; void output(void *, Query *) override; }; diff --git a/livestatus/src/DownCommColumn.h b/livestatus/src/DownCommColumn.h index e702fbe..4757c32 100644 --- a/livestatus/src/DownCommColumn.h +++ b/livestatus/src/DownCommColumn.h @@ -43,9 +43,9 @@ public: : ListColumn(name, description, indirect_offset), _is_downtime(is_downtime), _with_info(with_info), _is_service(is_service), _with_extra_info(with_extra_info) {} int type() override { return COLTYPE_LIST; } void output(void *, Query *) override; - void *getNagiosObject(char *name); - bool isEmpty(void *data); - bool isNagiosMember(void *data, void *member); + void *getNagiosObject(char *name) override; + bool isEmpty(void *data) override; + bool isNagiosMember(void *data, void *member) override; }; #endif // DownCommColumn_h diff --git a/livestatus/src/DynamicColumn.h b/livestatus/src/DynamicColumn.h index 38aa08b..bf8f1e0 100644 --- a/livestatus/src/DynamicColumn.h +++ b/livestatus/src/DynamicColumn.h @@ -38,7 +38,6 @@ class DynamicColumn public: DynamicColumn(std::string name, std::string description, int indirect_offset) : _name(name), _description(description), _indirect_offset(indirect_offset) {} - virtual ~DynamicColumn() {} const char *name() const { return _name.c_str(); } const char *description() const { return _description.c_str(); } Column *createColumn(const char *arguments); diff --git a/livestatus/src/HostFileColumn.h b/livestatus/src/HostFileColumn.h index b4109d9..7fbb837 100644 --- a/livestatus/src/HostFileColumn.h +++ b/livestatus/src/HostFileColumn.h @@ -39,7 +39,7 @@ public: const char *suffice, int indirect_offset); // returns a buffer to be freed afterwards!! - char *getBlob(void *data, int *size); + char *getBlob(void *data, int *size) override; }; #endif // HostFileColumn_h diff --git a/livestatus/src/HostgroupsColumn.h b/livestatus/src/HostgroupsColumn.h index b9a67e8..9159beb 100644 --- a/livestatus/src/HostgroupsColumn.h +++ b/livestatus/src/HostgroupsColumn.h @@ -41,9 +41,9 @@ public: : ListColumn(name, description, indirect_offset), _offset(offset) {} int type() override { return COLTYPE_LIST; } void output(void *, Query *) override; - void *getNagiosObject(char *name); // return pointer to host group - bool isNagiosMember(void *data, void *nagobject); - bool isEmpty(void *data); + void *getNagiosObject(char *name) override; // return pointer to host group + bool isNagiosMember(void *data, void *nagobject) override; + bool isEmpty(void *data) override; private: objectlist *getData(void *); }; diff --git a/livestatus/src/OffsetStringHostMacroColumn.h b/livestatus/src/OffsetStringHostMacroColumn.h index 7eeba72..0f9e9b9 100644 --- a/livestatus/src/OffsetStringHostMacroColumn.h +++ b/livestatus/src/OffsetStringHostMacroColumn.h @@ -36,8 +36,8 @@ class OffsetStringHostMacroColumn : public OffsetStringMacroColumn public: OffsetStringHostMacroColumn(std::string name, std::string description, int offset, int indirect_offset = -1) : OffsetStringMacroColumn(name, description, offset, indirect_offset) {} - host *getHost(void *data); - service *getService(void *data); + host *getHost(void *data) override; + service *getService(void *data) override; }; #endif // OffsetStringHostMacroColumn_h diff --git a/livestatus/src/OffsetStringServiceMacroColumn.h b/livestatus/src/OffsetStringServiceMacroColumn.h index dfff759..3936eb5 100644 --- a/livestatus/src/OffsetStringServiceMacroColumn.h +++ b/livestatus/src/OffsetStringServiceMacroColumn.h @@ -36,8 +36,8 @@ class OffsetStringServiceMacroColumn : public OffsetStringMacroColumn public: OffsetStringServiceMacroColumn(std::string name, std::string description, int offset, int indirect_offset = -1) : OffsetStringMacroColumn(name, description, offset, indirect_offset) {} - host *getHost(void *data); - service *getService(void *data); + host *getHost(void *data) override; + service *getService(void *data) override; }; #endif // OffsetStringServiceMacroColumn_h diff --git a/livestatus/src/ServicegroupsColumn.h b/livestatus/src/ServicegroupsColumn.h index aff4e59..74a70a9 100644 --- a/livestatus/src/ServicegroupsColumn.h +++ b/livestatus/src/ServicegroupsColumn.h @@ -41,9 +41,9 @@ public: : ListColumn(name, description, indirect_offset), _offset(offset) {} int type() override { return COLTYPE_LIST; } void output(void *, Query *) override; - void *getNagiosObject(char *name); // return pointer to service group - bool isEmpty(void *data); - bool isNagiosMember(void *data, void *nagobject); + void *getNagiosObject(char *name) override; // return pointer to service group + bool isEmpty(void *data) override; + bool isNagiosMember(void *data, void *nagobject) override; private: objectlist *getData(void *); }; diff --git a/livestatus/src/TimeColumnFilter.h b/livestatus/src/TimeColumnFilter.h index 4a99c4d..e7c2572 100644 --- a/livestatus/src/TimeColumnFilter.h +++ b/livestatus/src/TimeColumnFilter.h @@ -36,7 +36,7 @@ class TimeColumnFilter : public IntColumnFilter public: TimeColumnFilter(IntColumn *column, int opid, char *value) : IntColumnFilter(column, opid, value) {} - virtual int32_t convertRefValue(); + virtual int32_t convertRefValue() override; }; #endif // TimeColumnFilter_h