mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

* Remove misplaced const on a void method.

Browse source 
* Forward declare Options to avoid including options.h in the header.

Originally committed to SVN as r5320.
This commit is contained in:
Amar Takhar 2011-02-08 03:48:00 +00:00
parent 7ae6e6da88
commit bf05289495
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
aegisub/libaegisub/common/path.cpp
View file

@ -25,6 +25,7 @@
#include "libaegisub/access.h" #include "libaegisub/access.h"
#include "libaegisub/log.h" #include "libaegisub/log.h"
#include "libaegisub/path.h" #include "libaegisub/path.h"
#include "libaegisub/option.h"
namespace agi { namespace agi {

9
aegisub/libaegisub/include/libaegisub/path.h
View file

@ -22,7 +22,6 @@
#endif #endif
#include <libaegisub/exception.h> #include <libaegisub/exception.h>
#include <libaegisub/option.h>
namespace agi { 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(PathErrorInvalid, PathError, "path/invalid")
DEFINE_SIMPLE_EXCEPTION_NOINNER(PathErrorInternal, PathError, "path") DEFINE_SIMPLE_EXCEPTION_NOINNER(PathErrorInternal, PathError, "path")
class Options;
/// @class Path /// @class Path
// Internal representation of all paths in aegisub. // Internal representation of all paths in aegisub.
class Path { class Path {
@ -73,7 +74,10 @@ public:
/// @brief Decode a path /// @brief Decode a path
/// @param path Decode a path in-place. /// @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: private:
/// Location of path config file. /// Location of path config file.
@ -102,7 +106,6 @@ private:
protected: protected:
const std::string Data(); ///< Shared resources const std::string Data(); ///< Shared resources
const std::string Config(); ///< Configuration directory
const std::string Doc(); ///< Documents const std::string Doc(); ///< Documents
const std::string User(); ///< User config directory const std::string User(); ///< User config directory
const std::string Temp(); ///< Temporary storage const std::string Temp(); ///< Temporary storage