Merge {host,service}::StateTypeToString() & drop unused StateTypeFromString()

lib/compat/compatlogger.cpp

@@ -130,7 +130,7 @@ void CompatLogger::CheckResultHandler(const Checkable::Ptr& checkable, const Che
 			<< host->GetName() << ";"
 			<< service->GetShortName() << ";"
 			<< Service::StateToString(service->GetState()) << ";"
-			<< Service::StateTypeToString(service->GetStateType()) << ";"
+			<< Checkable::StateTypeToString(service->GetStateType()) << ";"
 			<< attempt_after << ";"
 			<< output << ""
 			<< "";
@@ -140,7 +140,7 @@ void CompatLogger::CheckResultHandler(const Checkable::Ptr& checkable, const Che
 		msgbuf << "HOST ALERT: "
 			<< host->GetName() << ";"
 			<< GetHostStateString(host) << ";"
-			<< Host::StateTypeToString(host->GetStateType()) << ";"
+			<< Checkable::StateTypeToString(host->GetStateType()) << ";"
 			<< attempt_after << ";"
 			<< output << ""
 			<< "";
@@ -413,14 +413,14 @@ void CompatLogger::EventCommandHandler(const Checkable::Ptr& checkable)
 			<< host->GetName() << ";"
 			<< service->GetShortName() << ";"
 			<< Service::StateToString(service->GetState()) << ";"
-			<< Service::StateTypeToString(service->GetStateType()) << ";"
+			<< Checkable::StateTypeToString(service->GetStateType()) << ";"
 			<< current_attempt << ";"
 			<< event_command_name;
 	} else {
 		msgbuf << "HOST EVENT HANDLER: "
 			<< host->GetName() << ";"
 			<< GetHostStateString(host) << ";"
-			<< Host::StateTypeToString(host->GetStateType()) << ";"
+			<< Checkable::StateTypeToString(host->GetStateType()) << ";"
 			<< current_attempt << ";"
 			<< event_command_name;
 	}
@@ -505,7 +505,7 @@ void CompatLogger::ReopenFile(bool rotate)
 		msgbuf << "CURRENT HOST STATE: "
 			<< host->GetName() << ";"
 			<< GetHostStateString(host) << ";"
-			<< Host::StateTypeToString(host->GetStateType()) << ";"
+			<< Checkable::StateTypeToString(host->GetStateType()) << ";"
 			<< host->GetCheckAttempt() << ";"
 			<< output << "";
 
@@ -526,7 +526,7 @@ void CompatLogger::ReopenFile(bool rotate)
 			<< host->GetName() << ";"
 			<< service->GetShortName() << ";"
 			<< Service::StateToString(service->GetState()) << ";"
-			<< Service::StateTypeToString(service->GetStateType()) << ";"
+			<< Checkable::StateTypeToString(service->GetStateType()) << ";"
 			<< service->GetCheckAttempt() << ";"
 			<< output << "";
 

lib/db_ido/dbevents.cpp

@@ -994,7 +994,7 @@ void DbEvents::AddCheckResultLogHistory(const Checkable::Ptr& checkable, const C
 			<< host->GetName() << ";"
 			<< service->GetShortName() << ";"
 			<< Service::StateToString(service->GetState()) << ";"
-			<< Service::StateTypeToString(service->GetStateType()) << ";"
+			<< Checkable::StateTypeToString(service->GetStateType()) << ";"
 			<< service->GetCheckAttempt() << ";"
 			<< output << ""
 			<< "";
@@ -1021,7 +1021,7 @@ void DbEvents::AddCheckResultLogHistory(const Checkable::Ptr& checkable, const C
 		msgbuf << "HOST ALERT: "
 			<< host->GetName() << ";"
 			<< GetHostStateString(host) << ";"
-			<< Host::StateTypeToString(host->GetStateType()) << ";"
+			<< Checkable::StateTypeToString(host->GetStateType()) << ";"
 			<< host->GetCheckAttempt() << ";"
 			<< output << ""
 			<< "";

lib/icinga/checkable.cpp

@@ -322,3 +322,9 @@ void Checkable::CleanDeadlinedExecutions(const Timer * const&)
 		}
 	}
 }
+
+String Checkable::StateTypeToString(StateType type)
+{
+	return type == StateTypeSoft ? "SOFT" : "HARD";
+}
+

lib/icinga/checkable.hpp

@@ -106,6 +106,8 @@ public:
 
 	void UpdateNextCheck(const MessageOrigin::Ptr& origin = nullptr);
 
+	static String StateTypeToString(StateType type);
+
 	bool HasBeenChecked() const;
 	virtual bool IsStateOK(ServiceState state) const = 0;
 

lib/icinga/host.cpp

@@ -227,22 +227,6 @@ String Host::StateToString(HostState state)
 	}
 }
 
-StateType Host::StateTypeFromString(const String& type)
-{
-	if (type == "SOFT")
-		return StateTypeSoft;
-	else
-		return StateTypeHard;
-}
-
-String Host::StateTypeToString(StateType type)
-{
-	if (type == StateTypeSoft)
-		return "SOFT";
-	else
-		return "HARD";
-}
-
 bool Host::ResolveMacro(const String& macro, const CheckResult::Ptr&, Value *result) const
 {
 	if (macro == "state") {

lib/icinga/host.hpp

@@ -45,9 +45,6 @@ public:
 	static HostState StateFromString(const String& state);
 	static String StateToString(HostState state);
 
-	static StateType StateTypeFromString(const String& state);
-	static String StateTypeToString(StateType state);
-
 	bool ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Value *result) const override;
 
 	void OnAllConfigLoaded() override;

lib/icinga/service.cpp

@@ -195,22 +195,6 @@ String Service::StateToString(ServiceState state)
 	}
 }
 
-StateType Service::StateTypeFromString(const String& type)
-{
-	if (type == "SOFT")
-		return StateTypeSoft;
-	else
-		return StateTypeHard;
-}
-
-String Service::StateTypeToString(StateType type)
-{
-	if (type == StateTypeSoft)
-		return "SOFT";
-	else
-		return "HARD";
-}
-
 bool Service::ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Value *result) const
 {
 	if (macro == "state") {

lib/icinga/service.hpp

@@ -39,9 +39,6 @@ public:
 	static ServiceState StateFromString(const String& state);
 	static String StateToString(ServiceState state);
 
-	static StateType StateTypeFromString(const String& state);
-	static String StateTypeToString(StateType state);
-
 	static void EvaluateApplyRules(const Host::Ptr& host);
 
 	void OnAllConfigLoaded() override;