From 980ba4282547f07b2de91af75cab5ed622d86ac1 Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Sun, 14 Aug 2016 22:20:31 +0200
Subject: [PATCH] Remove unused code in the IDO classes

fixes #12434
---
 lib/db_ido/commanddbobject.cpp      | 7 +------
 lib/db_ido/commanddbobject.hpp      | 3 ---
 lib/db_ido/dbobject.cpp             | 5 -----
 lib/db_ido/dbobject.hpp             | 2 --
 lib/db_ido/hostgroupdbobject.cpp    | 2 +-
 lib/db_ido/servicedbobject.cpp      | 5 -----
 lib/db_ido/servicedbobject.hpp      | 2 --
 lib/db_ido/servicegroupdbobject.cpp | 2 +-
 lib/db_ido/userdbobject.cpp         | 5 -----
 lib/db_ido/userdbobject.hpp         | 2 --
 lib/db_ido/usergroupdbobject.cpp    | 2 +-
 11 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/lib/db_ido/commanddbobject.cpp b/lib/db_ido/commanddbobject.cpp
index 6620c8332..391ce8990 100644
--- a/lib/db_ido/commanddbobject.cpp
+++ b/lib/db_ido/commanddbobject.cpp
@@ -46,10 +46,5 @@ Dictionary::Ptr CommandDbObject::GetConfigFields(void) const
 
 Dictionary::Ptr CommandDbObject::GetStatusFields(void) const
 {
-	return Empty;
-}
-
-void CommandDbObject::OnConfigUpdate(void)
-{
-	return;
+	return Dictionary::Ptr();
 }
diff --git a/lib/db_ido/commanddbobject.hpp b/lib/db_ido/commanddbobject.hpp
index 4c7d50aa3..5fa3a5f61 100644
--- a/lib/db_ido/commanddbobject.hpp
+++ b/lib/db_ido/commanddbobject.hpp
@@ -40,9 +40,6 @@ public:
 
 	virtual Dictionary::Ptr GetConfigFields(void) const override;
 	virtual Dictionary::Ptr GetStatusFields(void) const override;
-
-protected:
-	virtual void OnConfigUpdate(void) override;
 };
 
 }
diff --git a/lib/db_ido/dbobject.cpp b/lib/db_ido/dbobject.cpp
index 471bd426b..de7c92c78 100644
--- a/lib/db_ido/dbobject.cpp
+++ b/lib/db_ido/dbobject.cpp
@@ -269,11 +269,6 @@ double DbObject::GetLastStatusUpdate(void) const
 	return m_LastStatusUpdate;
 }
 
-bool DbObject::IsStatusAttribute(const String&) const
-{
-	return false;
-}
-
 void DbObject::OnConfigUpdate(void)
 {
 	/* Default handler does nothing. */
diff --git a/lib/db_ido/dbobject.hpp b/lib/db_ido/dbobject.hpp
index 486779421..f9ab0ec9a 100644
--- a/lib/db_ido/dbobject.hpp
+++ b/lib/db_ido/dbobject.hpp
@@ -92,8 +92,6 @@ public:
 protected:
 	DbObject(const intrusive_ptr<DbType>& type, const String& name1, const String& name2);
 
-	virtual bool IsStatusAttribute(const String& attribute) const;
-
 	virtual void OnConfigUpdate(void);
 	virtual void OnStatusUpdate(void);
 
diff --git a/lib/db_ido/hostgroupdbobject.cpp b/lib/db_ido/hostgroupdbobject.cpp
index fc6618311..7de968ec6 100644
--- a/lib/db_ido/hostgroupdbobject.cpp
+++ b/lib/db_ido/hostgroupdbobject.cpp
@@ -48,5 +48,5 @@ Dictionary::Ptr HostGroupDbObject::GetConfigFields(void) const
 
 Dictionary::Ptr HostGroupDbObject::GetStatusFields(void) const
 {
-	return Empty;
+	return Dictionary::Ptr();
 }
diff --git a/lib/db_ido/servicedbobject.cpp b/lib/db_ido/servicedbobject.cpp
index 2ad793a5f..81ca8a30f 100644
--- a/lib/db_ido/servicedbobject.cpp
+++ b/lib/db_ido/servicedbobject.cpp
@@ -171,11 +171,6 @@ Dictionary::Ptr ServiceDbObject::GetStatusFields(void) const
 	return fields;
 }
 
-bool ServiceDbObject::IsStatusAttribute(const String& attribute) const
-{
-	return (attribute == "last_result");
-}
-
 void ServiceDbObject::OnConfigUpdate(void)
 {
 	Service::Ptr service = static_pointer_cast<Service>(GetObject());
diff --git a/lib/db_ido/servicedbobject.hpp b/lib/db_ido/servicedbobject.hpp
index fa9446724..69958d6b3 100644
--- a/lib/db_ido/servicedbobject.hpp
+++ b/lib/db_ido/servicedbobject.hpp
@@ -45,8 +45,6 @@ public:
 	virtual Dictionary::Ptr GetStatusFields(void) const override;
 
 protected:
-	virtual bool IsStatusAttribute(const String& attribute) const override;
-
 	virtual void OnConfigUpdate(void) override;
 	virtual void OnStatusUpdate(void) override;
 };
diff --git a/lib/db_ido/servicegroupdbobject.cpp b/lib/db_ido/servicegroupdbobject.cpp
index 92bcfaabc..d3395fc90 100644
--- a/lib/db_ido/servicegroupdbobject.cpp
+++ b/lib/db_ido/servicegroupdbobject.cpp
@@ -47,5 +47,5 @@ Dictionary::Ptr ServiceGroupDbObject::GetConfigFields(void) const
 
 Dictionary::Ptr ServiceGroupDbObject::GetStatusFields(void) const
 {
-	return Empty;
+	return Dictionary::Ptr();
 }
diff --git a/lib/db_ido/userdbobject.cpp b/lib/db_ido/userdbobject.cpp
index ae6987465..ce0a89ec6 100644
--- a/lib/db_ido/userdbobject.cpp
+++ b/lib/db_ido/userdbobject.cpp
@@ -140,8 +140,3 @@ void UserDbObject::OnConfigUpdate(void)
 		}
 	}
 }
-
-bool UserDbObject::IsStatusAttribute(const String& attribute) const
-{
-	return (attribute == "last_notification");
-}
diff --git a/lib/db_ido/userdbobject.hpp b/lib/db_ido/userdbobject.hpp
index 176455b1c..df78299df 100644
--- a/lib/db_ido/userdbobject.hpp
+++ b/lib/db_ido/userdbobject.hpp
@@ -42,8 +42,6 @@ public:
 	virtual Dictionary::Ptr GetStatusFields(void) const override;
 
 	virtual void OnConfigUpdate(void) override;
-
-	virtual bool IsStatusAttribute(const String& attribute) const override;
 };
 
 }
diff --git a/lib/db_ido/usergroupdbobject.cpp b/lib/db_ido/usergroupdbobject.cpp
index 70ad6dbe7..a5419b58b 100644
--- a/lib/db_ido/usergroupdbobject.cpp
+++ b/lib/db_ido/usergroupdbobject.cpp
@@ -45,5 +45,5 @@ Dictionary::Ptr UserGroupDbObject::GetConfigFields(void) const
 
 Dictionary::Ptr UserGroupDbObject::GetStatusFields(void) const
 {
-	return Empty;
+	return Dictionary::Ptr();
 }