From 8f401a838a9ba8f65836f45cda05ebbf426cb75e Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Sat, 8 Jan 2011 19:16:11 +0000
Subject: [PATCH] Add utilities to a util:: namespace for clarity.

Originally committed to SVN as r5148.
---
 aegisub/reporter/aegisub.cpp | 2 +-
 aegisub/reporter/main.cpp    | 2 +-
 aegisub/reporter/util.cpp    | 5 +++++
 aegisub/reporter/util.h      | 6 ++++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/aegisub/reporter/aegisub.cpp b/aegisub/reporter/aegisub.cpp
index e1511bba1..57777a888 100644
--- a/aegisub/reporter/aegisub.cpp
+++ b/aegisub/reporter/aegisub.cpp
@@ -32,7 +32,7 @@
 
 Aegisub::Aegisub() {
 	std::string default_config("{}");
-	opt = new agi::Options(config_path() + "config.json", default_config, agi::Options::FLUSH_SKIP);
+	opt = new agi::Options(util::config_path() + "config.json", default_config, agi::Options::FLUSH_SKIP);
 }
 
 
diff --git a/aegisub/reporter/main.cpp b/aegisub/reporter/main.cpp
index b514cdd60..af040e23c 100644
--- a/aegisub/reporter/main.cpp
+++ b/aegisub/reporter/main.cpp
@@ -41,7 +41,7 @@
 /// @brief Init the reporter.
 bool Reporter::OnInit() {
 
-	const std::string path_log(config_path() + "log/");
+	const std::string path_log(util::config_path() + "log/");
 	wxFileName::Mkdir(path_log, 0777, wxPATH_MKDIR_FULL);
 	agi::log::log = new agi::log::LogSink(path_log);
 //	if ( !wxApp::OnInit() )
diff --git a/aegisub/reporter/util.cpp b/aegisub/reporter/util.cpp
index 928c3b640..545fbc77f 100644
--- a/aegisub/reporter/util.cpp
+++ b/aegisub/reporter/util.cpp
@@ -28,6 +28,8 @@
 #include "../acconf.h"
 
 
+namespace util {
+
 std::string config_path() {
 	wxStandardPathsBase &paths = wxStandardPaths::Get();
 
@@ -39,3 +41,6 @@ std::string config_path() {
 	return std::string(wxString::Format("%s/Aegisub/", paths.GetUserConfigDir()));
 #endif
 }
+
+
+} // namespace util
diff --git a/aegisub/reporter/util.h b/aegisub/reporter/util.h
index 52612d325..a23484e3d 100644
--- a/aegisub/reporter/util.h
+++ b/aegisub/reporter/util.h
@@ -19,6 +19,12 @@
 /// @ingroup base
 
 
+/// Utilities.
+namespace util {
+
 /// Return config path.
 /// @return Config path.
 std::string config_path();
+
+
+} // namespace util