From 6a6c4942796ee317df00a04bf06383affdfe0dc4 Mon Sep 17 00:00:00 2001 From: Johannes Schmidt Date: Mon, 5 May 2025 09:12:41 +0200 Subject: [PATCH 1/2] Mark MakeName and ParseName virtual methods as override --- lib/icinga/comment.ti | 4 ++-- lib/icinga/dependency.ti | 4 ++-- lib/icinga/downtime.ti | 4 ++-- lib/icinga/notification.ti | 4 ++-- lib/icinga/scheduleddowntime.ti | 4 ++-- lib/icinga/service.ti | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/icinga/comment.ti b/lib/icinga/comment.ti index b8ad6f7f2..8fbb2da17 100644 --- a/lib/icinga/comment.ti +++ b/lib/icinga/comment.ti @@ -24,8 +24,8 @@ enum CommentType class CommentNameComposer : public NameComposer { public: - virtual String MakeName(const String& shortName, const Object::Ptr& context) const; - virtual Dictionary::Ptr ParseName(const String& name) const; + virtual String MakeName(const String& shortName, const Object::Ptr& context) const override; + virtual Dictionary::Ptr ParseName(const String& name) const override; }; }}} diff --git a/lib/icinga/dependency.ti b/lib/icinga/dependency.ti index a033420ea..6d6249d9f 100644 --- a/lib/icinga/dependency.ti +++ b/lib/icinga/dependency.ti @@ -13,8 +13,8 @@ code {{{ class DependencyNameComposer : public NameComposer { public: - virtual String MakeName(const String& shortName, const Object::Ptr& context) const; - virtual Dictionary::Ptr ParseName(const String& name) const; + virtual String MakeName(const String& shortName, const Object::Ptr& context) const override; + virtual Dictionary::Ptr ParseName(const String& name) const override; }; }}} diff --git a/lib/icinga/downtime.ti b/lib/icinga/downtime.ti index 21e97313e..b1530abe1 100644 --- a/lib/icinga/downtime.ti +++ b/lib/icinga/downtime.ti @@ -13,8 +13,8 @@ code {{{ class DowntimeNameComposer : public NameComposer { public: - virtual String MakeName(const String& shortName, const Object::Ptr& context) const; - virtual Dictionary::Ptr ParseName(const String& name) const; + virtual String MakeName(const String& shortName, const Object::Ptr& context) const override; + virtual Dictionary::Ptr ParseName(const String& name) const override; }; }}} diff --git a/lib/icinga/notification.ti b/lib/icinga/notification.ti index a35c4cffb..a8121ff6b 100644 --- a/lib/icinga/notification.ti +++ b/lib/icinga/notification.ti @@ -13,8 +13,8 @@ code {{{ class NotificationNameComposer : public NameComposer { public: - virtual String MakeName(const String& shortName, const Object::Ptr& context) const; - virtual Dictionary::Ptr ParseName(const String& name) const; + virtual String MakeName(const String& shortName, const Object::Ptr& context) const override; + virtual Dictionary::Ptr ParseName(const String& name) const override; }; }}} diff --git a/lib/icinga/scheduleddowntime.ti b/lib/icinga/scheduleddowntime.ti index 1653f27e7..c44228b1c 100644 --- a/lib/icinga/scheduleddowntime.ti +++ b/lib/icinga/scheduleddowntime.ti @@ -12,8 +12,8 @@ code {{{ class ScheduledDowntimeNameComposer : public NameComposer { public: - virtual String MakeName(const String& shortName, const Object::Ptr& context) const; - virtual Dictionary::Ptr ParseName(const String& name) const; + virtual String MakeName(const String& shortName, const Object::Ptr& context) const override; + virtual Dictionary::Ptr ParseName(const String& name) const override; }; }}} diff --git a/lib/icinga/service.ti b/lib/icinga/service.ti index 12c2d8c66..59684d110 100644 --- a/lib/icinga/service.ti +++ b/lib/icinga/service.ti @@ -15,8 +15,8 @@ code {{{ class ServiceNameComposer : public NameComposer { public: - virtual String MakeName(const String& shortName, const Object::Ptr& context) const; - virtual Dictionary::Ptr ParseName(const String& name) const; + virtual String MakeName(const String& shortName, const Object::Ptr& context) const override; + virtual Dictionary::Ptr ParseName(const String& name) const override; }; }}} From f8d3bacc2958dc041cda90629597986b71da8119 Mon Sep 17 00:00:00 2001 From: Johannes Schmidt Date: Tue, 6 May 2025 08:34:32 +0200 Subject: [PATCH 2/2] Fix warnings related to enum integer conversion --- lib/icinga/notification.cpp | 6 ++++-- lib/icingadb/icingadb-objects.cpp | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/icinga/notification.cpp b/lib/icinga/notification.cpp index d5597065f..63e24b746 100644 --- a/lib/icinga/notification.cpp +++ b/lib/icinga/notification.cpp @@ -472,7 +472,8 @@ void Notification::BeginExecuteNotification(NotificationType type, const CheckRe if (type == NotificationProblem && !reminder && !checkable->GetVolatile()) { auto [host, service] = GetHostService(checkable); - uint_fast8_t state = service ? service->GetState() : host->GetState(); + uint_fast8_t state = service ? static_cast(service->GetState()) + : static_cast(host->GetState()); if (state == (uint_fast8_t)GetLastNotifiedStatePerUser()->Get(userName)) { auto stateStr (service ? NotificationServiceStateToString(service->GetState()) : NotificationHostStateToString(host->GetState())); @@ -501,7 +502,8 @@ void Notification::BeginExecuteNotification(NotificationType type, const CheckRe if (type == NotificationProblem) { auto [host, service] = GetHostService(checkable); - uint_fast8_t state = service ? service->GetState() : host->GetState(); + uint_fast8_t state = service ? static_cast(service->GetState()) + : static_cast(host->GetState()); if (state != (uint_fast8_t)GetLastNotifiedStatePerUser()->Get(userName)) { GetLastNotifiedStatePerUser()->Set(userName, state); diff --git a/lib/icingadb/icingadb-objects.cpp b/lib/icingadb/icingadb-objects.cpp index 914d46bc0..56b74a3c1 100644 --- a/lib/icingadb/icingadb-objects.cpp +++ b/lib/icingadb/icingadb-objects.cpp @@ -2061,7 +2061,7 @@ void IcingaDB::SendSentNotification( "host_id", GetObjectIdentifier(host), "type", Convert::ToString(type), "state", Convert::ToString(cr ? service ? Convert::ToLong(cr->GetState()) : Convert::ToLong(Host::CalculateState(cr->GetState())) : 99), - "previous_hard_state", Convert::ToString(cr ? Convert::ToLong(service ? cr->GetPreviousHardState() : Host::CalculateState(cr->GetPreviousHardState())) : 99), + "previous_hard_state", Convert::ToString(cr ? service ? Convert::ToLong(cr->GetPreviousHardState()) : Convert::ToLong(Host::CalculateState(cr->GetPreviousHardState())) : 99), "author", Utility::ValidateUTF8(author), "text", Utility::ValidateUTF8(finalText), "users_notified", Convert::ToString(usersAmount),