2 files changed, 18 insertions, 12 deletions
diff --git a/Swiften/Base/format.h b/Swiften/Base/format.h
new file mode 100644
index 0000000..9e242ff
--- /dev/null
+++ b/Swiften/Base/format.h
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include <boost/format.hpp>
+
+namespace Swift {
+	inline boost::format format(const std::string& s) {
+		using namespace boost::io;
+		boost::format fmter(s);
+		fmter.exceptions( all_error_bits ^ ( too_many_args_bit | too_few_args_bit )  );
+		return fmter;
+	}
+}
diff --git a/Swiften/Elements/StatusShow.h b/Swiften/Elements/StatusShow.h
index f579ace..a158239 100644
--- a/Swiften/Elements/StatusShow.h
+++ b/Swiften/Elements/StatusShow.h
@@ -26,18 +26,6 @@ namespace Swift {
 				return type_;
 			}
 
-			static std::string typeToFriendlyName(Type type) {
-				switch (type) {
-				case Online: return "Available";
-				case FFC: return "Available";
-				case Away: return "Away";
-				case XA: return "Away";
-				case DND: return "Busy";
-				case None: return "Offline";
-				}
-				return "Unknown";
-			}
-
 			/**
 			 * Can be used for rough ordering of Types.
 			 * Greater magnitude = more available.