* Remove misplaced const on a void method.
* Forward declare Options to avoid including options.h in the header. Originally committed to SVN as r5320.
This commit is contained in:
parent
7ae6e6da88
commit
bf05289495
2 changed files with 7 additions and 3 deletions
|
@ -25,6 +25,7 @@
|
|||
#include "libaegisub/access.h"
|
||||
#include "libaegisub/log.h"
|
||||
#include "libaegisub/path.h"
|
||||
#include "libaegisub/option.h"
|
||||
|
||||
namespace agi {
|
||||
|
||||
|
|
|
@ -22,7 +22,6 @@
|
|||
#endif
|
||||
|
||||
#include <libaegisub/exception.h>
|
||||
#include <libaegisub/option.h>
|
||||
|
||||
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
|
||||
|
|
Loading…
Reference in a new issue