1 files changed, 117 insertions, 112 deletions

diff --git a/include/lldb/Interpreter/CommandObjectMultiword.h b/include/lldb/Interpreter/CommandObjectMultiword.h
index 491d43c4bd9db..e1ad2940c3837 100644
--- a/include/lldb/Interpreter/CommandObjectMultiword.h
+++ b/include/lldb/Interpreter/CommandObjectMultiword.h
@@ -12,8 +12,6 @@
 
 // C Includes
 // C++ Includes
-#include <map>
-
 // Other libraries and framework includes
 // Project includes
 #include "lldb/Interpreter/CommandObject.h"
@@ -30,57 +28,66 @@ class CommandObjectMultiword : public CommandObject
 friend class CommandInterpreter;
 friend class CommandObjectSyntax;
 public:
-    CommandObjectMultiword (CommandInterpreter &interpreter,
-                            const char *name,
-                            const char *help = NULL,
-                            const char *syntax = NULL,
-                            uint32_t flags = 0);
+    CommandObjectMultiword(CommandInterpreter &interpreter,
+                           const char *name,
+                           const char *help = nullptr,
+                           const char *syntax = nullptr,
+                           uint32_t flags = 0);
     
-    virtual
-    ~CommandObjectMultiword ();
+    ~CommandObjectMultiword() override;
 
-    virtual bool
-    IsMultiwordObject () { return true; }
+    bool
+    IsMultiwordObject() override
+    {
+        return true;
+    }
 
-    virtual bool
-    LoadSubCommand (const char *cmd_name, 
-                    const lldb::CommandObjectSP& command_obj);
+    bool
+    LoadSubCommand(const char *cmd_name,
+                   const lldb::CommandObjectSP& command_obj) override;
 
-    virtual void
-    GenerateHelpText (Stream &output_stream);
+    void
+    GenerateHelpText(Stream &output_stream) override;
 
-    virtual lldb::CommandObjectSP
-    GetSubcommandSP (const char *sub_cmd, StringList *matches = NULL);
+    lldb::CommandObjectSP
+    GetSubcommandSP(const char *sub_cmd, StringList *matches = nullptr) override;
 
-    virtual CommandObject *
-    GetSubcommandObject (const char *sub_cmd, StringList *matches = NULL);
-
-    virtual void
-    AproposAllSubCommands (const char *prefix,
-                           const char *search_word,
-                           StringList &commands_found,
-                           StringList &commands_help);
-
-    virtual bool
-    WantsRawCommandString() { return false; };
-
-    virtual int
-    HandleCompletion (Args &input,
-                      int &cursor_index,
-                      int &cursor_char_position,
-                      int match_start_point,
-                      int max_return_elements,
-                      bool &word_complete,
-                      StringList &matches);
-
-    virtual const char *GetRepeatCommand (Args &current_command_args, uint32_t index);
-
-    virtual bool
-    Execute (const char *args_string,
-             CommandReturnObject &result);
+    CommandObject *
+    GetSubcommandObject(const char *sub_cmd, StringList *matches = nullptr) override;
+
+    void
+    AproposAllSubCommands(const char *prefix,
+                          const char *search_word,
+                          StringList &commands_found,
+                          StringList &commands_help) override;
+
+    bool
+    WantsRawCommandString() override
+    {
+        return false;
+    }
+
+    int
+    HandleCompletion(Args &input,
+                     int &cursor_index,
+                     int &cursor_char_position,
+                     int match_start_point,
+                     int max_return_elements,
+                     bool &word_complete,
+                     StringList &matches) override;
+
+    const char *
+    GetRepeatCommand (Args &current_command_args, uint32_t index) override;
+
+    bool
+    Execute(const char *args_string,
+            CommandReturnObject &result) override;
     
-    virtual bool
-    IsRemovable() const { return m_can_be_removed; }
+    bool
+    IsRemovable() const override
+    {
+        return m_can_be_removed;
+    }
     
     void
     SetRemovable (bool removable)
@@ -93,95 +100,93 @@ protected:
     CommandObject::CommandMap m_subcommand_dict;
     bool m_can_be_removed;
 };
-
     
 class CommandObjectProxy : public CommandObject
 {
 public:
-    CommandObjectProxy (CommandInterpreter &interpreter,
-                        const char *name,
-                        const char *help = NULL,
-                        const char *syntax = NULL,
-                        uint32_t flags = 0);
+    CommandObjectProxy(CommandInterpreter &interpreter,
+                       const char *name,
+                       const char *help = nullptr,
+                       const char *syntax = nullptr,
+                       uint32_t flags = 0);
     
-    virtual
-    ~CommandObjectProxy ();
+    ~CommandObjectProxy() override;
     
     // Subclasses must provide a command object that will be transparently
     // used for this object.
     virtual CommandObject *
     GetProxyCommandObject() = 0;
 
-    virtual const char *
-    GetHelpLong ();
+    const char *
+    GetHelpLong() override;
     
-    virtual bool
-    IsRemovable() const;
+    bool
+    IsRemovable() const override;
 
-    virtual bool
-    IsMultiwordObject ();
-    
-    virtual lldb::CommandObjectSP
-    GetSubcommandSP (const char *sub_cmd, StringList *matches = NULL);
-    
-    virtual CommandObject *
-    GetSubcommandObject (const char *sub_cmd, StringList *matches = NULL);
+    bool
+    IsMultiwordObject() override;
     
-    virtual void
-    AproposAllSubCommands (const char *prefix,
-                           const char *search_word,
-                           StringList &commands_found,
-                           StringList &commands_help);
-
-    virtual bool
-    LoadSubCommand (const char *cmd_name,
-                    const lldb::CommandObjectSP& command_obj);
-    
-    virtual bool
-    WantsRawCommandString();
+    void
+    GenerateHelpText (Stream &result) override;
     
-    virtual bool
-    WantsCompletion();
+    lldb::CommandObjectSP
+    GetSubcommandSP(const char *sub_cmd, StringList *matches = nullptr) override;
     
-    virtual Options *
-    GetOptions ();
+    CommandObject *
+    GetSubcommandObject(const char *sub_cmd, StringList *matches = nullptr) override;
     
-
-    virtual int
-    HandleCompletion (Args &input,
-                      int &cursor_index,
-                      int &cursor_char_position,
-                      int match_start_point,
-                      int max_return_elements,
-                      bool &word_complete,
-                      StringList &matches);
-
-    virtual int
-    HandleArgumentCompletion (Args &input,
-                              int &cursor_index,
-                              int &cursor_char_position,
-                              OptionElementVector &opt_element_vector,
-                              int match_start_point,
-                              int max_return_elements,
-                              bool &word_complete,
-                              StringList &matches);
-
-    virtual const char *
-    GetRepeatCommand (Args &current_command_args,
-                      uint32_t index);
-
-    virtual bool
-    Execute (const char *args_string,
-             CommandReturnObject &result);
+    void
+    AproposAllSubCommands(const char *prefix,
+                          const char *search_word,
+                          StringList &commands_found,
+                          StringList &commands_help) override;
+
+    bool
+    LoadSubCommand(const char *cmd_name,
+                   const lldb::CommandObjectSP& command_obj) override;
+    
+    bool
+    WantsRawCommandString() override;
+    
+    bool
+    WantsCompletion() override;
+    
+    Options *
+    GetOptions() override;
+
+    int
+    HandleCompletion(Args &input,
+                     int &cursor_index,
+                     int &cursor_char_position,
+                     int match_start_point,
+                     int max_return_elements,
+                     bool &word_complete,
+                     StringList &matches) override;
+
+    int
+    HandleArgumentCompletion(Args &input,
+                             int &cursor_index,
+                             int &cursor_char_position,
+                             OptionElementVector &opt_element_vector,
+                             int match_start_point,
+                             int max_return_elements,
+                             bool &word_complete,
+                             StringList &matches) override;
+
+    const char *
+    GetRepeatCommand(Args &current_command_args,
+                     uint32_t index) override;
+
+    bool
+    Execute(const char *args_string,
+            CommandReturnObject &result) override;
 
 protected:
-    
     // These two want to iterate over the subcommand dictionary.
     friend class CommandInterpreter;
     friend class CommandObjectSyntax;
-
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectMultiword_h_
+#endif // liblldb_CommandObjectMultiword_h_