From c9608ab6101eb1ee3886ad3ee93bdb320d2c7ee9 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Fri, 27 Jun 2014 15:55:05 -0700
Subject: [PATCH] Remove an exception not used for anything useful

---
 libaegisub/common/option.cpp           | 3 ++-
 libaegisub/common/option_visit.h       | 2 ++
 libaegisub/include/libaegisub/option.h | 5 -----
 tests/tests/option.cpp                 | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/libaegisub/common/option.cpp b/libaegisub/common/option.cpp
index b28cf3c58..4c5a28169 100644
--- a/libaegisub/common/option.cpp
+++ b/libaegisub/common/option.cpp
@@ -22,6 +22,7 @@
 #include "libaegisub/cajun/writer.h"
 #include "libaegisub/cajun/elements.h"
 
+#include "libaegisub/exception.h"
 #include "libaegisub/fs.h"
 #include "libaegisub/io.h"
 #include "libaegisub/log.h"
@@ -114,7 +115,7 @@ OptionValue* Options::Get(const std::string &name) {
 		return index->second.get();
 
 	LOG_E("option/get") << "agi::Options::Get Option not found: (" << name << ")";
-	throw OptionErrorNotFound("Option value not found: " + name);
+	throw agi::InternalError("Option value not found: " + name);
 }
 
 void Options::Flush() const {
diff --git a/libaegisub/common/option_visit.h b/libaegisub/common/option_visit.h
index 529a02055..4362f7130 100644
--- a/libaegisub/common/option_visit.h
+++ b/libaegisub/common/option_visit.h
@@ -21,6 +21,8 @@
 #include "libaegisub/cajun/elements.h"
 #include "libaegisub/cajun/visitor.h"
 
+#include "libaegisub/exception.h"
+
 #include <memory>
 
 namespace agi {
diff --git a/libaegisub/include/libaegisub/option.h b/libaegisub/include/libaegisub/option.h
index ddf35d6f2..1406b7cc7 100644
--- a/libaegisub/include/libaegisub/option.h
+++ b/libaegisub/include/libaegisub/option.h
@@ -23,7 +23,6 @@
 #include <map>
 #include <memory>
 
-#include <libaegisub/exception.h>
 #include <libaegisub/fs_fwd.h>
 
 namespace json {
@@ -32,10 +31,6 @@ namespace json {
 }
 
 namespace agi {
-
-DEFINE_EXCEPTION(OptionError, Exception);
-DEFINE_EXCEPTION(OptionErrorNotFound, OptionError);
-
 class OptionValue;
 
 using OptionValueMap = std::map<std::string, std::unique_ptr<OptionValue>>;
diff --git a/tests/tests/option.cpp b/tests/tests/option.cpp
index 7573c58b3..1bdd39a11 100644
--- a/tests/tests/option.cpp
+++ b/tests/tests/option.cpp
@@ -49,7 +49,7 @@ TEST_F(lagi_option, get_existing_option) {
 
 TEST_F(lagi_option, get_nonexistant_option) {
 	agi::Options opt(conf_ok, default_opt, agi::Options::FLUSH_SKIP);
-	EXPECT_THROW(opt.Get("Nonexistant option"), agi::OptionErrorNotFound);
+	EXPECT_THROW(opt.Get("Nonexistant option"), agi::InternalError);
 }
 
 TEST_F(lagi_option, flush_skip) {