From d7ae51a5afbc5e6b558f81ea2a1f33fc4217dbea Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Thu, 22 Dec 2011 21:12:06 +0000
Subject: [PATCH] Remove some unused members of agi::Options

Originally committed to SVN as r6016.
---
 aegisub/libaegisub/common/option.cpp           | 3 +--
 aegisub/libaegisub/include/libaegisub/option.h | 6 ------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/aegisub/libaegisub/common/option.cpp b/aegisub/libaegisub/common/option.cpp
index 342fca32e..ec300d15b 100644
--- a/aegisub/libaegisub/common/option.cpp
+++ b/aegisub/libaegisub/common/option.cpp
@@ -41,7 +41,7 @@
 namespace agi {
 
 Options::Options(const std::string &file, const std::string& default_config, const OptionSetting setting)
-: config_file(file), config_default(default_config), config_loaded(false), setting(setting) {
+: config_file(file), setting(setting) {
 	LOG_D("agi/options") << "New Options object";
 	std::istringstream stream(default_config);
 	LoadConfig(stream);
@@ -72,7 +72,6 @@ void Options::ConfigUser() {
 
 	/// @todo Handle other errors such as parsing and notifying the user.
 	LoadConfig(*stream);
-	config_loaded = true;
 }
 
 void Options::LoadConfig(std::istream& stream) {
diff --git a/aegisub/libaegisub/include/libaegisub/option.h b/aegisub/libaegisub/include/libaegisub/option.h
index 98f322fec..857722a46 100644
--- a/aegisub/libaegisub/include/libaegisub/option.h
+++ b/aegisub/libaegisub/include/libaegisub/option.h
@@ -70,12 +70,6 @@ private:
 	/// User config (file that will be written to disk)
 	const std::string config_file;
 
-	/// Default config (for use when config file is/gets corrupted)
-	const std::string config_default;
-
-	/// Whether the user (final) config has been loaded
-	bool config_loaded;
-
 	/// Settings.
 	const OptionSetting setting;