[LLDB] Fix Clang-tidy misc-use-override warnings in source/Commands headers, unify closing inclusion guards

[Eugene.Zelenko]

Summary

I checked this patch on my own build on RHEL 6.

Please check it in if it's OK, because I don't have SVN write access.

[labath]

committed as r246628.

source/Commands/CommandObjectApropos.h

 
     CommandObjectApropos (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectApropos ();
+    ~CommandObjectApropos() override;
 
 protected:
-    virtual bool
-    DoExecute (Args& command,
-             CommandReturnObject &result);
-
-
+    bool
+    DoExecute(Args& command,
+        CommandReturnObject &result) override;
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectApropos_h_
+#endif // liblldb_CommandObjectApropos_h_

source/Commands/CommandObjectArgs.h

             
             CommandOptions (CommandInterpreter &interpreter);
             
-            virtual
-            ~CommandOptions ();
+            ~CommandOptions() override;
             
-            virtual Error
-            SetOptionValue (uint32_t option_idx, const char *option_arg);
+            Error
+            SetOptionValue(uint32_t option_idx, const char *option_arg) override;
             
             void
-            OptionParsingStarting ();
+            OptionParsingStarting() override;
             
             const OptionDefinition*
-            GetDefinitions ();
+            GetDefinitions() override;
             
             // Options table: Required for subclasses of Options.
             

         
         CommandObjectArgs (CommandInterpreter &interpreter);
         
-        virtual
-        ~CommandObjectArgs ();
+        ~CommandObjectArgs() override;
         
-        virtual
         Options *
-        GetOptions ();
+        GetOptions() override;
         
-        
     protected:
         
         CommandOptions m_options;
 
-        virtual bool
-        DoExecute (    Args& command,
-                 CommandReturnObject &result);
-        
+        bool
+        DoExecute(Args& command,
+      CommandReturnObject &result) override;
     };
     
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectArgs_h_
+#endif // liblldb_CommandObjectArgs_h_

source/Commands/CommandObjectBreakpoint.h

 public:
     CommandObjectMultiwordBreakpoint (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectMultiwordBreakpoint ();
+    ~CommandObjectMultiwordBreakpoint() override;
 
     static void
     VerifyBreakpointOrLocationIDs (Args &args, Target *target, CommandReturnObject &result, BreakpointIDList *valid_ids)

 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectBreakpoint_h_
+#endif // liblldb_CommandObjectBreakpoint_h_

source/Commands/CommandObjectBreakpointCommand.h

 // C Includes
 // C++ Includes
 
-
 // Other libraries and framework includes
 // Project includes
 

 #include "lldb/Interpreter/CommandReturnObject.h"
 #include "lldb/Interpreter/CommandObjectMultiword.h"
 
-
 namespace lldb_private {
 
 //-------------------------------------------------------------------------

 public:
     CommandObjectBreakpointCommand (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectBreakpointCommand ();
-
+    ~CommandObjectBreakpointCommand() override;
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectBreakpointCommand_h_
+#endif // liblldb_CommandObjectBreakpointCommand_h_

source/Commands/CommandObjectBugreport.h

 public:
     CommandObjectMultiwordBugreport(CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectMultiwordBugreport();
+    ~CommandObjectMultiwordBugreport() override;
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectBugreport_h_
+#endif // liblldb_CommandObjectBugreport_h_

source/Commands/CommandObjectCommands.h

 
     CommandObjectMultiwordCommands (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectMultiwordCommands ();
-
+    ~CommandObjectMultiwordCommands() override;
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectCommands_h_
+#endif // liblldb_CommandObjectCommands_h_

source/Commands/CommandObjectDisassemble.h

 
         CommandOptions (CommandInterpreter &interpreter);
 
-        virtual
-        ~CommandOptions ();
+        ~CommandOptions() override;
 
-        virtual Error
-        SetOptionValue (uint32_t option_idx, const char *option_arg);
+        Error
+        SetOptionValue(uint32_t option_idx, const char *option_arg) override;
 
         void
-        OptionParsingStarting ();
+        OptionParsingStarting() override;
 
         const OptionDefinition*
-        GetDefinitions ();
+        GetDefinitions() override;
 
         const char *
         GetPluginName ()

             return flavor_string.c_str();
         }
         
-        virtual Error
-        OptionParsingFinished ();
+        Error
+        OptionParsingFinished() override;
 
         bool show_mixed; // Show mixed source/assembly
         bool show_bytes;

 
     CommandObjectDisassemble (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectDisassemble ();
+    ~CommandObjectDisassemble() override;
 
-    virtual
     Options *
-    GetOptions ()
+    GetOptions() override
     {
         return &m_options;
     }
 
 protected:
-    virtual bool
-    DoExecute (Args& command,
-             CommandReturnObject &result);
+    bool
+    DoExecute(Args& command,
+        CommandReturnObject &result) override;
 
     CommandOptions m_options;
-
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectDisassemble_h_
+#endif // liblldb_CommandObjectDisassemble_h_

source/Commands/CommandObjectExpression.h

 
         CommandOptions ();
 
-        virtual
-        ~CommandOptions ();
+        ~CommandOptions() override;
 
-        virtual uint32_t
-        GetNumDefinitions ();
+        uint32_t
+        GetNumDefinitions() override;
         
-        virtual const OptionDefinition*
-        GetDefinitions ();
+        const OptionDefinition*
+        GetDefinitions() override;
         
-        virtual Error
-        SetOptionValue (CommandInterpreter &interpreter,
-                        uint32_t option_idx,
-                        const char *option_value);
+        Error
+        SetOptionValue(CommandInterpreter &interpreter,
+           uint32_t option_idx,
+           const char *option_value) override;
         
-        virtual void
-        OptionParsingStarting (CommandInterpreter &interpreter);
+        void
+        OptionParsingStarting(CommandInterpreter &interpreter) override;
 
         // Options table: Required for subclasses of Options.
 

 
     CommandObjectExpression (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectExpression ();
+    ~CommandObjectExpression() override;
 
-    virtual
     Options *
-    GetOptions ();
+    GetOptions() override;
 
 protected:
     
     //------------------------------------------------------------------
     // IOHandler::Delegate functions
     //------------------------------------------------------------------
-    virtual void
-    IOHandlerInputComplete (IOHandler &io_handler,
-                            std::string &line);
+    void
+    IOHandlerInputComplete(IOHandler &io_handler,
+         std::string &line) override;
 
     virtual LineStatus
     IOHandlerLinesUpdated (IOHandler &io_handler,
                            StringList &lines,
                            uint32_t line_idx,
                            Error &error);
-    virtual bool
-    DoExecute (const char *command,
-               CommandReturnObject &result);
+    bool
+    DoExecute(const char *command,
+        CommandReturnObject &result) override;
 
     bool
     EvaluateExpression (const char *expr,

 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectExpression_h_
+#endif // liblldb_CommandObjectExpression_h_

source/Commands/CommandObjectFrame.h

 
     CommandObjectMultiwordFrame (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectMultiwordFrame ();
-
+    ~CommandObjectMultiwordFrame() override;
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectFrame_h_
+#endif // liblldb_CommandObjectFrame_h_

source/Commands/CommandObjectGUI.h

 
     CommandObjectGUI (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectGUI ();
+    ~CommandObjectGUI() override;
 
 protected:
-    virtual bool
-    DoExecute (Args& args,
-               CommandReturnObject &result);
-
+    bool
+    DoExecute(Args& args,
+        CommandReturnObject &result) override;
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectGUI_h_
+#endif // liblldb_CommandObjectGUI_h_

source/Commands/CommandObjectHelp.h

 
     CommandObjectHelp (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectHelp ();
+    ~CommandObjectHelp() 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);
+    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;
     
     class CommandOptions : public Options
     {

         {
         }
         
-        virtual
-        ~CommandOptions (){}
+        ~CommandOptions() override {}
         
-        virtual Error
-        SetOptionValue (uint32_t option_idx, const char *option_arg)
+        Error
+        SetOptionValue(uint32_t option_idx, const char *option_arg) override
         {
             Error error;
             const int short_option = m_getopt_table[option_idx].val;

         }
         
         void
-        OptionParsingStarting ()
+        OptionParsingStarting() override
         {
             m_show_aliases = true;
             m_show_user_defined = true;

         }
         
         const OptionDefinition*
-        GetDefinitions ()
+        GetDefinitions() override
         {
             return g_option_table;
         }

         bool m_show_hidden;
     };
     
-    virtual Options *
-    GetOptions ()
+    Options *
+    GetOptions() override
     {
         return &m_options;
     }
     
 protected:
-    virtual bool
-    DoExecute (Args& command,
-             CommandReturnObject &result);
+    bool
+    DoExecute(Args& command,
+        CommandReturnObject &result) override;
     
 private:
     CommandOptions m_options;
-    
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectHelp_h_
+#endif // liblldb_CommandObjectHelp_h_

source/Commands/CommandObjectLanguage.h

 // C Includes
 // C++ Includes
 
-
 // Other libraries and framework includes
 // Project includes
 

     public:
         CommandObjectLanguage (CommandInterpreter &interpreter);
         
-        virtual
-        ~CommandObjectLanguage ();
+        ~CommandObjectLanguage() override;
         
-        virtual void
-        GenerateHelpText (Stream &output_stream);
+        void
+        GenerateHelpText(Stream &output_stream) override;
         
     protected:
         bool

     };
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectLanguage_h_
+#endif // liblldb_CommandObjectLanguage_h_

source/Commands/CommandObjectLog.h

     //------------------------------------------------------------------
     CommandObjectLog(CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectLog();
+    ~CommandObjectLog() override;
 
 private:
     //------------------------------------------------------------------

 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectLog_h_
+#endif // liblldb_CommandObjectLog_h_

source/Commands/CommandObjectMemory.h

 public:
     CommandObjectMemory (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectMemory ();
+    ~CommandObjectMemory() override;
 };
 
-
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectMemory_h_
+#endif // liblldb_CommandObjectMemory_h_

source/Commands/CommandObjectPlatform.h

 public:
     CommandObjectPlatform(CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectPlatform();
+    ~CommandObjectPlatform() override;
 
-    private:
     DISALLOW_COPY_AND_ASSIGN (CommandObjectPlatform);
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectPlatform_h_
+#endif // liblldb_CommandObjectPlatform_h_

source/Commands/CommandObjectPlugin.h

 // C Includes
 // C++ Includes
 
-
 // Other libraries and framework includes
 // Project includes
 

     public:
         CommandObjectPlugin (CommandInterpreter &interpreter);
         
-        virtual
-        ~CommandObjectPlugin ();
+        ~CommandObjectPlugin() override;
     };
     
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectPlugin_h_
+#endif // liblldb_CommandObjectPlugin_h_

source/Commands/CommandObjectProcess.h

 public:
     CommandObjectMultiwordProcess (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectMultiwordProcess ();
-
+    ~CommandObjectMultiwordProcess() override;
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectProcess_h_
+#endif // liblldb_CommandObjectProcess_h_

source/Commands/CommandObjectQuit.h

 
     CommandObjectQuit (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectQuit ();
+    ~CommandObjectQuit() override;
 
 protected:
-    virtual bool
-    DoExecute (Args& args,
-             CommandReturnObject &result);
+    bool
+    DoExecute(Args& args,
+        CommandReturnObject &result) override;
     
     bool
     ShouldAskForConfirmation (bool& is_a_detach);
-
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectQuit_h_
+#endif // liblldb_CommandObjectQuit_h_

source/Commands/CommandObjectRegister.h

     //------------------------------------------------------------------
     CommandObjectRegister(CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectRegister();
+    ~CommandObjectRegister() override;
 
 private:
     //------------------------------------------------------------------

 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectRegister_h_
+#endif // liblldb_CommandObjectRegister_h_

source/Commands/CommandObjectSettings.h

 
     CommandObjectMultiwordSettings (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectMultiwordSettings ();
-
+    ~CommandObjectMultiwordSettings() override;
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectSettings_h_
+#endif // liblldb_CommandObjectSettings_h_

source/Commands/CommandObjectSource.h

 
     CommandObjectMultiwordSource (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectMultiwordSource ();
-
+    ~CommandObjectMultiwordSource() override;
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectSource.h_h_
+#endif // liblldb_CommandObjectSource_h_

source/Commands/CommandObjectSyntax.h

 
     CommandObjectSyntax (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectSyntax ();
+    ~CommandObjectSyntax() override;
     
 protected:
-    virtual bool
-    DoExecute (Args& command,
-             CommandReturnObject &result);
-
-
+    bool
+    DoExecute(Args& command,
+        CommandReturnObject &result) override;
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectSyntax_h_
+#endif // liblldb_CommandObjectSyntax_h_

source/Commands/CommandObjectTarget.h

 
     CommandObjectMultiwordTarget (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectMultiwordTarget ();
-
-
+    ~CommandObjectMultiwordTarget() override;
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectTarget_h_
+#endif // liblldb_CommandObjectTarget_h_

source/Commands/CommandObjectThread.h

 
     CommandObjectMultiwordThread (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectMultiwordThread ();
-
+    ~CommandObjectMultiwordThread() override;
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectThread_h_
+#endif // liblldb_CommandObjectThread_h_

source/Commands/CommandObjectType.h

 // C Includes
 // C++ Includes
 
-
 // Other libraries and framework includes
 // Project includes
 

 public:
     CommandObjectType (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectType ();
+    ~CommandObjectType() override;
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectType_h_
+#endif // liblldb_CommandObjectType_h_

source/Commands/CommandObjectVersion.h

 
     CommandObjectVersion (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectVersion ();
+    ~CommandObjectVersion() override;
 
 protected:
-    virtual bool
-    DoExecute (Args& args,
-               CommandReturnObject &result);
-
+    bool
+    DoExecute(Args& args,
+        CommandReturnObject &result) override;
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectVersion_h_
+#endif // liblldb_CommandObjectVersion_h_

source/Commands/CommandObjectWatchpoint.h

 public:
     CommandObjectMultiwordWatchpoint (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectMultiwordWatchpoint ();
+    ~CommandObjectMultiwordWatchpoint() override;
 
     static bool
     VerifyWatchpointIDs(Target *target, Args &args, std::vector<uint32_t> &wp_ids);
-
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectWatchpoint_h_
+#endif // liblldb_CommandObjectWatchpoint_h_

source/Commands/CommandObjectWatchpointCommand.h

 // C Includes
 // C++ Includes
 
-
 // Other libraries and framework includes
 // Project includes
 

 public:
     CommandObjectWatchpointCommand (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectWatchpointCommand ();
-
+    ~CommandObjectWatchpointCommand() override;
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectWatchpointCommand_h_
+#endif // liblldb_CommandObjectWatchpointCommand_h_