Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
// Copyright (c) 2010, Amar Takhar <verm@aegisub.org>
|
|
|
|
//
|
|
|
|
// Permission to use, copy, modify, and distribute this software for any
|
|
|
|
// purpose with or without fee is hereby granted, provided that the above
|
|
|
|
// copyright notice and this permission notice appear in all copies.
|
|
|
|
//
|
|
|
|
// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
|
|
// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
|
|
// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
|
|
// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
|
|
// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
|
|
// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
|
|
// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
|
|
//
|
|
|
|
// $Id$
|
|
|
|
|
|
|
|
/// @file json.h
|
|
|
|
/// @brief Parse JSON files and return json::UnknownElement
|
|
|
|
/// @ingroup libaegisub io
|
|
|
|
|
|
|
|
#include <libaegisub/cajun/reader.h>
|
|
|
|
#include <libaegisub/cajun/elements.h>
|
|
|
|
|
|
|
|
namespace agi {
|
2011-07-15 06:04:34 +02:00
|
|
|
namespace json_util {
|
Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
|
|
|
|
/// Parse a JSON stream.
|
|
|
|
/// @param stream JSON stream, this is deleted internally.
|
|
|
|
/// @return json::UnknownElement
|
|
|
|
json::UnknownElement parse(std::istream *stream);
|
|
|
|
|
|
|
|
/// Parse a JSON file.
|
|
|
|
/// @param file Path JSON to file
|
|
|
|
/// @return json::UnknownElement
|
|
|
|
json::UnknownElement file(const std::string file);
|
|
|
|
|
|
|
|
/// Parse a json stream, with default handler.
|
|
|
|
/// @param file Path to JSON file.
|
|
|
|
/// @param Default config file to load incase of nonexistent file
|
|
|
|
/// @return json::UnknownElement
|
|
|
|
json::UnknownElement file(const std::string file, const std::string &default_config);
|
|
|
|
|
|
|
|
|
|
|
|
} // namespace json_util
|
|
|
|
} // namespace agi
|