From bf05289495b2e1d94bf1e0fc80c8059e0ef84cbb Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Tue, 8 Feb 2011 03:48:00 +0000 Subject: [PATCH] * Remove misplaced const on a void method. * Forward declare Options to avoid including options.h in the header. Originally committed to SVN as r5320. --- aegisub/libaegisub/common/path.cpp | 1 + aegisub/libaegisub/include/libaegisub/path.h | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/aegisub/libaegisub/common/path.cpp b/aegisub/libaegisub/common/path.cpp index 097e3d728..3f6465fb2 100644 --- a/aegisub/libaegisub/common/path.cpp +++ b/aegisub/libaegisub/common/path.cpp @@ -25,6 +25,7 @@ #include "libaegisub/access.h" #include "libaegisub/log.h" #include "libaegisub/path.h" +#include "libaegisub/option.h" namespace agi { diff --git a/aegisub/libaegisub/include/libaegisub/path.h b/aegisub/libaegisub/include/libaegisub/path.h index c484b76b0..362c940a2 100644 --- a/aegisub/libaegisub/include/libaegisub/path.h +++ b/aegisub/libaegisub/include/libaegisub/path.h @@ -22,7 +22,6 @@ #endif #include -#include namespace agi { @@ -31,6 +30,8 @@ DEFINE_SIMPLE_EXCEPTION_NOINNER(PathErrorNotFound, PathError, "path/not_found") DEFINE_SIMPLE_EXCEPTION_NOINNER(PathErrorInvalid, PathError, "path/invalid") DEFINE_SIMPLE_EXCEPTION_NOINNER(PathErrorInternal, PathError, "path") +class Options; + /// @class Path // Internal representation of all paths in aegisub. class Path { @@ -73,7 +74,10 @@ public: /// @brief Decode a path /// @param path Decode a path in-place. - const void Decode(std::string &path); + void Decode(std::string &path); + + /// Configuration directory + static const std::string Config(); private: /// Location of path config file. @@ -102,7 +106,6 @@ private: protected: const std::string Data(); ///< Shared resources - const std::string Config(); ///< Configuration directory const std::string Doc(); ///< Documents const std::string User(); ///< User config directory const std::string Temp(); ///< Temporary storage