From 486d1269e08552008b9eecc9841caa0d98e3d0b2 Mon Sep 17 00:00:00 2001
From: Maxime Coste <frrrwww@gmail.com>
Date: Tue, 11 Feb 2014 22:23:44 +0000
Subject: Consistently name -foo things 'switches'

---
 src/parameters_parser.hh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/parameters_parser.hh')

diff --git a/src/parameters_parser.hh b/src/parameters_parser.hh
index 643a01f4..a7773476 100644
--- a/src/parameters_parser.hh
+++ b/src/parameters_parser.hh
@@ -34,22 +34,22 @@ struct wrong_argument_count : public parameter_error
     wrong_argument_count() : parameter_error("wrong argument count") {}
 };
 
-struct OptionDesc
+struct SwitchDesc
 {
     bool takes_arg;
     String description;
 };
 
-using OptionMap = std::unordered_map<String, OptionDesc>;
+using SwitchMap = std::unordered_map<String, SwitchDesc>;
 
-String generate_flags_doc(const OptionMap& opts);
+String generate_switches_doc(const SwitchMap& opts);
 
 struct ParameterDesc
 {
     enum class Flags
     {
         None = 0,
-        OptionsOnlyAtStart = 1,
+        SwitchesOnlyAtStart = 1,
     };
     friend constexpr Flags operator|(Flags lhs, Flags rhs)
     {
@@ -61,12 +61,12 @@ struct ParameterDesc
     }
 
     ParameterDesc() = default;
-    ParameterDesc(OptionMap options, Flags flags = Flags::None,
+    ParameterDesc(SwitchMap switches, Flags flags = Flags::None,
                   size_t min_positionals = 0, size_t max_positionals = -1)
-        : options(std::move(options)), flags(flags),
+        : switches(std::move(switches)), flags(flags),
           min_positionals(min_positionals), max_positionals(max_positionals) {}
 
-    OptionMap options;
+    SwitchMap switches;
     Flags flags = Flags::None;
     size_t min_positionals = 0;
     size_t max_positionals = -1;
-- 
cgit v1.2.3