Kill options.h and options.cpp, which have been empty for a while

Originally committed to SVN as r4676.

aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj

@@ -1331,14 +1331,6 @@
 				RelativePath="..\..\src\main.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\options.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\options.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\plugin_manager.cpp"
 				>

aegisub/src/Makefile.am

@@ -267,7 +267,6 @@ aegisub_2_2_SOURCES = \
 	md5.c \
 	mkv_wrap.cpp \
 	mythes.cxx \
-	options.cpp \
 	plugin_manager.cpp \
 	preferences.cpp \
 	scintilla_text_ctrl.cpp \

aegisub/src/ass_file.cpp

@@ -54,7 +54,6 @@
 #include "charset_detect.h"
 #include "compat.h"
 #include "main.h"
-#include "options.h"
 #include "subtitle_format.h"
 #include "text_file_reader.h"
 #include "text_file_writer.h"

aegisub/src/audio_box.cpp

@@ -57,7 +57,6 @@
 #include "hotkeys.h"
 #include "libresrc/libresrc.h"
 #include "main.h"
-#include "options.h"
 #include "toggle_bitmap.h"
 #include "tooltip_manager.h"
 

aegisub/src/audio_display.cpp

@@ -59,7 +59,6 @@
 #include "fft.h"
 #include "hotkeys.h"
 #include "main.h"
-#include "options.h"
 #include "standard_paths.h"
 #include "subs_edit_box.h"
 #include "subs_grid.h"

aegisub/src/audio_player.cpp

@@ -61,7 +61,6 @@
 #endif
 #include "compat.h"
 #include "main.h"
-#include "options.h"
 
 
 

aegisub/src/audio_player_alsa.cpp

@@ -51,7 +51,6 @@
 #include "main.h"
 #include "compat.h"
 #include "frame_main.h"
-#include "options.h"
 #include "utils.h"
 
 

aegisub/src/audio_player_alsa.h

@@ -44,7 +44,6 @@
 
 #include "include/aegisub/audio_player.h"
 #include "include/aegisub/audio_provider.h"
-#include "options.h"
 #include "utils.h"
 
 

aegisub/src/audio_player_dsound2.cpp

@@ -53,7 +53,6 @@
 #include "frame_main.h"
 #include "include/aegisub/audio_provider.h"
 #include "main.h"
-#include "options.h"
 #include "utils.h"
 
 

aegisub/src/audio_player_openal.cpp

@@ -48,7 +48,6 @@
 #include "audio_player_openal.h"
 #include "audio_provider_manager.h"
 #include "frame_main.h"
-#include "options.h"
 #include "utils.h"
 
 #ifdef __WINDOWS__

aegisub/src/audio_player_openal.h

@@ -43,7 +43,6 @@
 #include "audio_player_manager.h"
 #include "include/aegisub/audio_player.h"
 #include "include/aegisub/audio_provider.h"
-#include "options.h"
 #include "utils.h"
 
 #ifdef __WINDOWS__

aegisub/src/audio_player_oss.cpp

@@ -47,7 +47,6 @@
 #include "frame_main.h"
 #include "compat.h"
 #include "main.h"
-#include "options.h"
 #include "utils.h"
 
 

aegisub/src/audio_player_oss.h

@@ -56,7 +56,6 @@
 
 #include "include/aegisub/audio_player.h"
 #include "include/aegisub/audio_provider.h"
-#include "options.h"
 #include "utils.h"
 
 

aegisub/src/audio_player_portaudio.cpp

@@ -47,7 +47,6 @@
 #include "audio_provider_manager.h"
 #include "charset_conv.h"
 #include "main.h"
-#include "options.h"
 #include "utils.h"
 #include <wx/log.h>
 

aegisub/src/audio_player_pulse.cpp

@@ -48,7 +48,6 @@
 
 #include "audio_player_pulse.h"
 #include "audio_provider_manager.h"
-#include "options.h"
 #include "utils.h"
 
 

aegisub/src/audio_player_pulse.h

@@ -48,7 +48,6 @@
 
 #include "include/aegisub/audio_player.h"
 #include "include/aegisub/audio_provider.h"
-#include "options.h"
 #include "utils.h"
 
 

aegisub/src/audio_provider.cpp

@@ -59,7 +59,6 @@
 #include "audio_provider_ram.h"
 #include "compat.h"
 #include "main.h"
-#include "options.h"
 
 
 

aegisub/src/audio_provider_avs.cpp

@@ -53,7 +53,6 @@
 #include "charset_conv.h"
 #include "compat.h"
 #include "main.h"
-#include "options.h"
 #include "standard_paths.h"
 #include "utils.h"
 

aegisub/src/audio_provider_ffmpegsource.cpp

@@ -51,7 +51,6 @@
 #include "audio_provider_ffmpegsource.h"
 #include "include/aegisub/aegisub.h"
 #include "main.h"
-#include "options.h"
 
 
 /// @brief Constructor 

aegisub/src/audio_provider_hd.cpp

@@ -51,7 +51,6 @@
 #include "dialog_progress.h"
 #include "frame_main.h"
 #include "main.h"
-#include "options.h"
 #include "standard_paths.h"
 #include "utils.h"
 

aegisub/src/audio_renderer_spectrum.cpp

@@ -57,7 +57,6 @@
 #include "colorspace.h"
 #include "fft.h"
 #include "main.h"
-#include "options.h"
 #include "utils.h"
 
 

aegisub/src/auto4_base.cpp

@@ -70,7 +70,6 @@
 #include "auto4_base.h"
 #include "compat.h"
 #include "main.h"
-#include "options.h"
 #include "standard_paths.h"
 #include "string_codec.h"
 

aegisub/src/auto4_lua.cpp

@@ -61,7 +61,6 @@
 #include "auto4_lua_factory.h"
 #include "auto4_lua_scriptreader.h"
 #include "main.h"
-#include "options.h"
 #include "standard_paths.h"
 #include "text_file_reader.h"
 #include "video_context.h"

aegisub/src/avisynth_wrap.cpp

@@ -43,7 +43,6 @@
 #ifdef WITH_AVISYNTH
 #include "avisynth_wrap.h"
 #include "main.h"
-#include "options.h"
 
 #ifdef DEBUG_AVISYNTH_CODE
 #ifndef AGI_PRE

aegisub/src/base_grid.cpp

@@ -50,7 +50,6 @@
 #include "compat.h"
 #include "frame_main.h"
 #include "main.h"
-#include "options.h"
 #include "subs_edit_box.h"
 #include "utils.h"
 #include "video_box.h"

aegisub/src/dialog_about.cpp

@@ -51,7 +51,6 @@
 
 #include "dialog_about.h"
 #include "libresrc/libresrc.h"
-#include "options.h"
 #include "version.h"
 
 

aegisub/src/dialog_attachments.cpp

@@ -55,7 +55,6 @@
 #include "help_button.h"
 #include "libresrc/libresrc.h"
 #include "main.h"
-#include "options.h"
 #include "utils.h"
 
 

aegisub/src/dialog_automation.cpp

@@ -52,7 +52,6 @@
 #include "help_button.h"
 #include "libresrc/libresrc.h"
 #include "main.h"
-#include "options.h"
 #include "utils.h"
 
 

aegisub/src/dialog_colorpicker.cpp

@@ -69,7 +69,6 @@
 #include "help_button.h"
 #include "libresrc/libresrc.h"
 #include "main.h"
-#include "options.h"
 #include "utils.h"
 
 /// DOCME

aegisub/src/dialog_detached_video.cpp

@@ -45,7 +45,6 @@
 #include "dialog_detached_video.h"
 #include "frame_main.h"
 #include "main.h"
-#include "options.h"
 #include "video_box.h"
 #include "video_context.h"
 #include "video_display.h"

aegisub/src/dialog_dummy_video.cpp

@@ -48,7 +48,6 @@
 #include "dialog_dummy_video.h"
 #include "help_button.h"
 #include "main.h"
-#include "options.h"
 #include "utils.h"
 
 /// DOCME

aegisub/src/dialog_fonts_collector.cpp

@@ -58,7 +58,6 @@
 #include "help_button.h"
 #include "libresrc/libresrc.h"
 #include "main.h"
-#include "options.h"
 #include "scintilla_text_ctrl.h"
 #include "subs_grid.h"
 #include "utils.h"

aegisub/src/dialog_kara_timing_copy.h

@@ -52,7 +52,6 @@
 #include "ass_entry.h"
 #include "ass_file.h"
 #include "kana_table.h"
-#include "options.h"
 
 
 //////////////

aegisub/src/dialog_paste_over.cpp

@@ -46,7 +46,6 @@
 #include "dialog_paste_over.h"
 #include "help_button.h"
 #include "main.h"
-#include "options.h"
 
 /// Button IDs
 enum {

aegisub/src/dialog_properties.cpp

@@ -47,7 +47,6 @@
 #include "dialog_properties.h"
 #include "help_button.h"
 #include "libresrc/libresrc.h"
-#include "options.h"
 #include "utils.h"
 #include "validators.h"
 #include "video_context.h"

aegisub/src/dialog_search_replace.cpp

@@ -50,7 +50,6 @@
 #include "dialog_search_replace.h"
 #include "frame_main.h"
 #include "main.h"
-#include "options.h"
 #include "subs_edit_box.h"
 #include "subs_grid.h"
 #include "video_display.h"

aegisub/src/dialog_selection.cpp

@@ -49,7 +49,6 @@
 #include "dialog_selection.h"
 #include "help_button.h"
 #include "main.h"
-#include "options.h"
 #include "subs_grid.h"
 #include "subs_edit_box.h"
 

aegisub/src/dialog_shift_times.cpp

@@ -56,7 +56,6 @@
 #include "help_button.h"
 #include "libresrc/libresrc.h"
 #include "main.h"
-#include "options.h"
 #include "standard_paths.h"
 #include "subs_edit_box.h"
 #include "subs_grid.h"

aegisub/src/dialog_spellchecker.cpp

@@ -50,7 +50,6 @@
 #include "help_button.h"
 #include "libresrc/libresrc.h"
 #include "main.h"
-#include "options.h"
 #include "spellchecker_manager.h"
 #include "subs_edit_box.h"
 #include "subs_grid.h"

aegisub/src/dialog_splash.cpp

@@ -48,7 +48,6 @@
 #include "dialog_splash.h"
 #include "dialog_tip.h"
 #include "libresrc/libresrc.h"
-#include "options.h"
 
 
 /// @brief Constructor 

aegisub/src/dialog_style_editor.cpp

@@ -55,7 +55,6 @@
 #include "help_button.h"
 #include "libresrc/libresrc.h"
 #include "main.h"
-#include "options.h"
 #include "subs_grid.h"
 #include "subs_preview.h"
 #include "subtitles_provider_manager.h"

aegisub/src/dialog_style_manager.cpp

@@ -53,7 +53,6 @@
 #include "help_button.h"
 #include "libresrc/libresrc.h"
 #include "main.h"
-#include "options.h"
 #include "standard_paths.h"
 #include "subs_grid.h"
 #include "utils.h"

aegisub/src/dialog_text_import.cpp

@@ -47,7 +47,6 @@
 #include "compat.h"
 #include "dialog_text_import.h"
 #include "main.h"
-#include "options.h"
 
 
 /// @brief Constructor 

aegisub/src/dialog_timing_processor.cpp

@@ -43,7 +43,6 @@
 #include "help_button.h"
 #include "libresrc/libresrc.h"
 #include "main.h"
-#include "options.h"
 #include "subs_grid.h"
 #include "utils.h"
 #include "validators.h"

aegisub/src/dialog_tip.cpp

@@ -46,7 +46,6 @@
 
 #include "dialog_tip.h"
 #include "main.h"
-#include "options.h"
 
 
 /// @brief Constructor 

aegisub/src/dialog_translation.cpp

@@ -51,7 +51,6 @@
 #include "help_button.h"
 #include "hotkeys.h"
 #include "libresrc/libresrc.h"
-#include "options.h"
 #include "subs_edit_box.h"
 #include "subs_grid.h"
 #include "utils.h"

aegisub/src/dialog_version_check.cpp

@@ -68,7 +68,6 @@
 #include "compat.h"
 #include "dialog_version_check.h"
 #include "main.h"
-#include "options.h"
 #include "string_codec.h"
 #include "version.h"
 

aegisub/src/ffmpegsource_common.cpp

@@ -53,7 +53,6 @@
 #include "frame_main.h"
 #include "main.h"
 #include "md5.h"
-#include "options.h"
 #include "standard_paths.h"
 
 

aegisub/src/frame_main.cpp

@@ -71,7 +71,6 @@
 #include "keyframe.h"
 #include "libresrc/libresrc.h"
 #include "main.h"
-#include "options.h"
 #include "standard_paths.h"
 #include "subs_edit_box.h"
 #include "subs_grid.h"

aegisub/src/frame_main_events.cpp

@@ -82,7 +82,6 @@
 #include "keyframe.h"
 #include "libresrc/libresrc.h"
 #include "main.h"
-#include "options.h"
 #include "preferences.h"
 #include "standard_paths.h"
 #include "subs_edit_box.h"

aegisub/src/gl_wrap.cpp

@@ -50,7 +50,6 @@
 
 #endif
 
-#include "options.h"
 
 /// @brief Constructor 
 ///

aegisub/src/keyframe.cpp

@@ -43,7 +43,6 @@
 #include "compat.h"
 #include "keyframe.h"
 #include "main.h"
-#include "options.h"
 #include "text_file_reader.h"
 #include "text_file_writer.h"
 #include "video_context.h"

aegisub/src/options.cpp

@@ -1,37 +0,0 @@
-// Copyright (c) 2005-2007, Rodrigo Braz Monteiro
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-//   * Redistributions of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//   * Redistributions in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//   * Neither the name of the Aegisub Group nor the names of its contributors
-//     may be used to endorse or promote products derived from this software
-//     without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Aegisub Project http://www.aegisub.org/
-//
-// $Id$
-
-/// @file options.cpp
-/// @brief Initialise, load and store configuration settings, including all defaults
-/// @ingroup main
-///
-
-

aegisub/src/options.h

@@ -1,39 +0,0 @@
-// Copyright (c) 2005, Rodrigo Braz Monteiro
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-//   * Redistributions of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//   * Redistributions in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//   * Neither the name of the Aegisub Group nor the names of its contributors
-//     may be used to endorse or promote products derived from this software
-//     without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Aegisub Project http://www.aegisub.org/
-//
-// $Id$
-
-/// @file options.h
-/// @see options.cpp
-/// @ingroup main
-///
-
-
-
-

aegisub/src/spellchecker.cpp

@@ -45,7 +45,6 @@
 
 #include "compat.h"
 #include "main.h"
-#include "options.h"
 #include "spellchecker_manager.h"
 
 

aegisub/src/spellchecker_hunspell.cpp

@@ -56,7 +56,6 @@
 #include "charset_conv.h"
 #include "compat.h"
 #include "main.h"
-#include "options.h"
 #include "spellchecker_hunspell.h"
 #include "standard_paths.h"
 #include "text_file_reader.h"

aegisub/src/subs_edit_box.cpp

@@ -56,7 +56,6 @@
 #include "idle_field_event.h"
 #include "libresrc/libresrc.h"
 #include "main.h"
-#include "options.h"
 #include "subs_edit_box.h"
 #include "subs_grid.h"
 #include "timeedit_ctrl.h"

aegisub/src/subs_edit_ctrl.cpp

@@ -46,7 +46,6 @@
 #include "ass_dialogue.h"
 #include "compat.h"
 #include "main.h"
-#include "options.h"
 #include "subs_edit_box.h"
 #include "subs_grid.h"
 #include "utils.h"

aegisub/src/subs_grid.cpp

@@ -54,7 +54,6 @@
 #include "frame_main.h"
 #include "hotkeys.h"
 #include "main.h"
-#include "options.h"
 #include "subs_edit_box.h"
 #include "subs_grid.h"
 #include "utils.h"

aegisub/src/subtitle_format_ttxt.cpp

@@ -43,7 +43,6 @@
 #include "ass_time.h"
 #include "compat.h"
 #include "main.h"
-#include "options.h"
 #include "subtitle_format_ttxt.h"
 
 

aegisub/src/subtitle_format_txt.cpp

@@ -43,7 +43,6 @@
 #include "compat.h"
 #include "dialog_text_import.h"
 #include "main.h"
-#include "options.h"
 #include "subtitle_format_txt.h"
 #include "text_file_reader.h"
 #include "text_file_writer.h"

aegisub/src/subtitles_provider.cpp

@@ -41,7 +41,6 @@
 
 #include "compat.h"
 #include "main.h"
-#include "options.h"
 #ifdef WITH_CSRI
 #include "subtitles_provider_csri.h"
 #endif

aegisub/src/text_file_writer.cpp

@@ -43,7 +43,6 @@
 #include "charset_conv.h"
 #include "compat.h"
 #include "main.h"
-#include "options.h"
 #include "text_file_writer.h"
 
 

aegisub/src/thesaurus_myspell.cpp

@@ -50,7 +50,6 @@
 #include "compat.h"
 #include "mythes.hxx"
 #include "main.h"
-#include "options.h"
 #include "standard_paths.h"
 #include "thesaurus_myspell.h"
 #include "utils.h"

aegisub/src/timeedit_ctrl.cpp

@@ -46,7 +46,6 @@
 #include "ass_time.h"
 #include "compat.h"
 #include "main.h"
-#include "options.h"
 #include "timeedit_ctrl.h"
 #include "video_context.h"
 

aegisub/src/video_box.cpp

@@ -53,7 +53,6 @@
 #include "help_button.h"
 #include "libresrc/libresrc.h"
 #include "main.h"
-#include "options.h"
 #include "subs_edit_box.h"
 #include "subs_grid.h"
 #include "toggle_bitmap.h"

aegisub/src/video_context.cpp

@@ -64,7 +64,6 @@
 #include <libaegisub/access.h>
 #include "main.h"
 #include "mkv_wrap.h"
-#include "options.h"
 #include "standard_paths.h"
 #include "subs_edit_box.h"
 #include "subs_grid.h"

aegisub/src/video_display.cpp

@@ -58,7 +58,6 @@
 
 #include "ass_dialogue.h"
 #include "hotkeys.h"
-#include "options.h"
 #include "main.h"
 #include "subs_grid.h"
 #include "video_out_gl.h"

aegisub/src/video_provider_avs.cpp

@@ -48,7 +48,6 @@
 #include "charset_conv.h"
 #include "gl_wrap.h"
 #include "mkv_wrap.h"
-#include "options.h"
 #include "standard_paths.h"
 #include "vfw_wrap.h"
 #include "video_context.h"

aegisub/src/video_provider_cache.cpp

@@ -36,7 +36,6 @@
 
 #include "config.h"
 #include "main.h"
-#include "options.h"
 
 #include "video_provider_cache.h"
 

aegisub/src/video_provider_ffmpegsource.cpp

@@ -53,7 +53,6 @@
 #include "aegisub_endian.h"
 #include "include/aegisub/aegisub.h"
 #include "main.h"
-#include "options.h"
 #include "video_context.h"
 #include "video_provider_ffmpegsource.h"
 

aegisub/src/video_provider_manager.cpp

@@ -40,7 +40,6 @@
 
 #include "compat.h"
 #include "main.h"
-#include "options.h"
 
 #ifdef WITH_AVISYNTH
 #include "video_provider_avs.h"

aegisub/src/video_slider.cpp

@@ -45,7 +45,6 @@
 
 #include "ass_dialogue.h"
 #include "main.h"
-#include "options.h"
 #include "subs_edit_box.h"
 #include "subs_grid.h"
 #include "utils.h"

aegisub/src/visual_tool.cpp

@@ -53,7 +53,6 @@
 #include "ass_time.h"
 #include "export_visible_lines.h"
 #include "main.h"
-#include "options.h"
 #include "subs_edit_box.h"
 #include "subs_grid.h"
 #include "utils.h"