From 6ce9ce15461a49a306fa21b10689a9bd49a565a5 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Thu, 3 Jul 2014 10:14:09 -0700 Subject: [PATCH] Remove unused helper function --- libaegisub/common/json.cpp | 4 ---- libaegisub/include/libaegisub/json.h | 5 ----- 2 files changed, 9 deletions(-) diff --git a/libaegisub/common/json.cpp b/libaegisub/common/json.cpp index af7798e0a..493ca2f5d 100644 --- a/libaegisub/common/json.cpp +++ b/libaegisub/common/json.cpp @@ -41,10 +41,6 @@ json::UnknownElement parse(std::istream &stream) { } } -json::UnknownElement file(agi::fs::path const& file) { - return parse(*io::Open(file)); -} - json::UnknownElement file(agi::fs::path const& file, std::pair default_config) { try { if (fs::FileExists(file)) diff --git a/libaegisub/include/libaegisub/json.h b/libaegisub/include/libaegisub/json.h index cad86fd9c..4862cd0c1 100644 --- a/libaegisub/include/libaegisub/json.h +++ b/libaegisub/include/libaegisub/json.h @@ -26,11 +26,6 @@ namespace agi { namespace json_util { /// @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(agi::fs::path const& file); - /// Parse a json stream, with default handler. /// @param file Path to JSON file. /// @param Default config file to load incase of nonexistent file