From 2118e4b4909292be5348ee26095e99d3a587678a Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Wed, 13 Feb 2013 19:32:44 +0100 Subject: [PATCH] Renamed 'alias' property to 'display_name'. --- lib/icinga/host.cpp | 4 ++-- lib/icinga/hostgroup.cpp | 2 +- lib/icinga/service.cpp | 2 +- lib/icinga/servicegroup.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/icinga/host.cpp b/lib/icinga/host.cpp index 4014c609b..0269c8b7c 100644 --- a/lib/icinga/host.cpp +++ b/lib/icinga/host.cpp @@ -52,7 +52,7 @@ Host::~Host(void) String Host::GetDisplayName(void) const { - String value = Get("alias"); + String value = Get("display_name"); if (!value.IsEmpty()) return value; else @@ -213,7 +213,7 @@ void Host::UpdateSlaveServices(void) builder->SetType("Service"); builder->SetName(name); builder->AddExpression("host_name", OperatorSet, GetName()); - builder->AddExpression("alias", OperatorSet, svcname); + builder->AddExpression("display_name", OperatorSet, svcname); builder->AddExpression("short_name", OperatorSet, svcname); CopyServiceAttributes(this, builder); diff --git a/lib/icinga/hostgroup.cpp b/lib/icinga/hostgroup.cpp index 1e692e6dc..7cb5d7d74 100644 --- a/lib/icinga/hostgroup.cpp +++ b/lib/icinga/hostgroup.cpp @@ -32,7 +32,7 @@ HostGroup::HostGroup(const Dictionary::Ptr& properties) String HostGroup::GetDisplayName(void) const { - String value = Get("alias"); + String value = Get("display_name"); if (!value.IsEmpty()) return value; diff --git a/lib/icinga/service.cpp b/lib/icinga/service.cpp index 26719f0ed..3a88eb9b8 100644 --- a/lib/icinga/service.cpp +++ b/lib/icinga/service.cpp @@ -59,7 +59,7 @@ Service::~Service(void) String Service::GetDisplayName(void) const { - String value = Get("alias"); + String value = Get("display_name"); if (!value.IsEmpty()) return value; diff --git a/lib/icinga/servicegroup.cpp b/lib/icinga/servicegroup.cpp index bba8789ef..e63c13427 100644 --- a/lib/icinga/servicegroup.cpp +++ b/lib/icinga/servicegroup.cpp @@ -32,7 +32,7 @@ ServiceGroup::ServiceGroup(const Dictionary::Ptr& properties) String ServiceGroup::GetDisplayName(void) const { - String value = Get("alias"); + String value = Get("display_name"); if (!value.IsEmpty()) return value; -- 2.40.0