Code cleanup.

base/object.cpp

@@ -55,7 +55,7 @@ void Object::ClearHeldObjects(void)
 	m_HeldObjects.clear();
 }
 
-SharedPtrHolder Object::GetSelf(void)
+Object::SharedPtrHolder Object::GetSelf(void)
 {
-	return SharedPtrHolder(shared_from_this());
+	return Object::SharedPtrHolder(shared_from_this());
 }

base/object.h

@@ -45,22 +45,13 @@ protected:
 
 	void Hold(void);
 
-	SharedPtrHolder GetSelf(void);
+	/**
-
-private:
-	Object(const Object& other);
-	Object operator=(const Object& rhs);
-
-	static vector<Object::Ptr> m_HeldObjects;
-};
-
-/**
 	 * Holds a shared pointer and provides support for implicit upcasts.
 	 */
-class SharedPtrHolder
+	class SharedPtrHolder
-{
+	{
-public:
+	public:
-	explicit SharedPtrHolder(const shared_ptr<Object>& object)
+		explicit SharedPtrHolder(const Object::Ptr& object)
 			: m_Object(object)
 		{ }
 
@@ -83,8 +74,17 @@ public:
 			return static_cast<shared_ptr<T> >(*this);
 		}
 
+	private:
+		Object::Ptr m_Object;
+	};
+
+	SharedPtrHolder GetSelf(void);
+
 private:
-	shared_ptr<Object> m_Object;
+	Object(const Object& other);
+	Object operator=(const Object& rhs);
+
+	static vector<Object::Ptr> m_HeldObjects;
 };
 
 /**

icinga/nagioschecktask.cpp

@@ -25,7 +25,7 @@ CheckResult NagiosCheckTask::Execute(void) const
 	fp = popen(command.c_str(), "r");
 #endif /* _MSC_VER */
 
-	stringstream output;
+	stringstream outputbuf;
 
 	while (!feof(fp)) {
 		char buffer[128];
@@ -34,10 +34,11 @@ CheckResult NagiosCheckTask::Execute(void) const
 		if (read == 0)
 			break;
 
-		output << string(buffer, buffer + read);
+		outputbuf << string(buffer, buffer + read);
 	}
 
-	cr.Output = output.str();
+	cr.Output = outputbuf.str();
+	boost::algorithm::trim(cr.Output);
 
 	Application::Log(LogDebug, "icinga", "Nagios plugin output: " + cr.Output);