From: Gunnar Beutner <gunnar@beutner.name>
Date: Fri, 29 Aug 2014 14:46:46 +0000 (+0200)
Subject: Make props argument for NameComposer::MakeName constant
X-Git-Tag: v2.1.1~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eaea65a36642975138f1dd030742e1be151618e8;p=icinga2

Make props argument for NameComposer::MakeName constant
---

diff --git a/lib/base/dynamicobject.ti b/lib/base/dynamicobject.ti
index 25ee6d74e..7a34ba743 100644
--- a/lib/base/dynamicobject.ti
+++ b/lib/base/dynamicobject.ti
@@ -10,7 +10,7 @@ enum HAMode
 
 class NameComposer {
 public:
-	virtual String MakeName(const String& shortName, const Dictionary::Ptr props) const = 0;
+	virtual String MakeName(const String& shortName, const Dictionary::Ptr& props) const = 0;
 };
 }}}
 
diff --git a/lib/icinga/dependency.cpp b/lib/icinga/dependency.cpp
index fc9dff210..3bfae8874 100644
--- a/lib/icinga/dependency.cpp
+++ b/lib/icinga/dependency.cpp
@@ -29,7 +29,7 @@ using namespace icinga;
 REGISTER_TYPE(Dependency);
 REGISTER_SCRIPTFUNCTION(ValidateDependencyFilters, &Dependency::ValidateFilters);
 
-String DependencyNameComposer::MakeName(const String& shortName, const Dictionary::Ptr props) const
+String DependencyNameComposer::MakeName(const String& shortName, const Dictionary::Ptr& props) const
 {
 	if (!props)
 		return "";
diff --git a/lib/icinga/dependency.ti b/lib/icinga/dependency.ti
index 40de2aec8..b4162241e 100644
--- a/lib/icinga/dependency.ti
+++ b/lib/icinga/dependency.ti
@@ -8,7 +8,7 @@ code {{{
 class I2_ICINGA_API DependencyNameComposer : public NameComposer
 {
 public:
-	virtual String MakeName(const String& shortName, const Dictionary::Ptr props) const;
+	virtual String MakeName(const String& shortName, const Dictionary::Ptr& props) const;
 };
 }}}
 
diff --git a/lib/icinga/notification.cpp b/lib/icinga/notification.cpp
index 2e5cb234d..361ccaa6b 100644
--- a/lib/icinga/notification.cpp
+++ b/lib/icinga/notification.cpp
@@ -39,7 +39,7 @@ INITIALIZE_ONCE(&Notification::StaticInitialize);
 
 boost::signals2::signal<void (const Notification::Ptr&, double, const MessageOrigin&)> Notification::OnNextNotificationChanged;
 
-String NotificationNameComposer::MakeName(const String& shortName, const Dictionary::Ptr props) const
+String NotificationNameComposer::MakeName(const String& shortName, const Dictionary::Ptr& props) const
 {
 	if (!props)
 		return "";
diff --git a/lib/icinga/notification.ti b/lib/icinga/notification.ti
index f73af49a4..ab5ff8942 100644
--- a/lib/icinga/notification.ti
+++ b/lib/icinga/notification.ti
@@ -7,7 +7,7 @@ code {{{
 class I2_ICINGA_API NotificationNameComposer : public NameComposer
 {
 public:
-	virtual String MakeName(const String& shortName, const Dictionary::Ptr props) const;
+	virtual String MakeName(const String& shortName, const Dictionary::Ptr& props) const;
 };
 }}}
 
diff --git a/lib/icinga/scheduleddowntime.cpp b/lib/icinga/scheduleddowntime.cpp
index e71e9f6fc..09bb8ecac 100644
--- a/lib/icinga/scheduleddowntime.cpp
+++ b/lib/icinga/scheduleddowntime.cpp
@@ -39,7 +39,7 @@ INITIALIZE_ONCE(&ScheduledDowntime::StaticInitialize);
 
 static Timer::Ptr l_Timer;
 
-String ScheduledDowntimeNameComposer::MakeName(const String& shortName, const Dictionary::Ptr props) const
+String ScheduledDowntimeNameComposer::MakeName(const String& shortName, const Dictionary::Ptr& props) const
 {
 	if (!props)
 		return "";
diff --git a/lib/icinga/scheduleddowntime.ti b/lib/icinga/scheduleddowntime.ti
index eead4fd5a..175ae8131 100644
--- a/lib/icinga/scheduleddowntime.ti
+++ b/lib/icinga/scheduleddowntime.ti
@@ -7,7 +7,7 @@ code {{{
 class I2_ICINGA_API ScheduledDowntimeNameComposer : public NameComposer
 {
 public:
-	virtual String MakeName(const String& shortName, const Dictionary::Ptr props) const;
+	virtual String MakeName(const String& shortName, const Dictionary::Ptr& props) const;
 };
 }}}
 
diff --git a/lib/icinga/service.cpp b/lib/icinga/service.cpp
index fd12f735b..3d14fcc6c 100644
--- a/lib/icinga/service.cpp
+++ b/lib/icinga/service.cpp
@@ -30,7 +30,7 @@ using namespace icinga;
 
 REGISTER_TYPE(Service);
 
-String ServiceNameComposer::MakeName(const String& shortName, const Dictionary::Ptr props) const {
+String ServiceNameComposer::MakeName(const String& shortName, const Dictionary::Ptr& props) const {
 	if (!props)
 		return "";
 
diff --git a/lib/icinga/service.ti b/lib/icinga/service.ti
index bef085fcf..51ba5e5e9 100644
--- a/lib/icinga/service.ti
+++ b/lib/icinga/service.ti
@@ -10,7 +10,7 @@ code {{{
 class I2_ICINGA_API ServiceNameComposer : public NameComposer
 {
 public:
-	virtual String MakeName(const String& shortName, const Dictionary::Ptr props) const;
+	virtual String MakeName(const String& shortName, const Dictionary::Ptr& props) const;
 };
 }}}