1 files changed, 19 insertions, 22 deletions

diff --git a/include/lldb/Interpreter/ScriptInterpreter.h b/include/lldb/Interpreter/ScriptInterpreter.h
index 0f45dd8..eafc03a 100644
--- a/include/lldb/Interpreter/ScriptInterpreter.h
+++ b/include/lldb/Interpreter/ScriptInterpreter.h
@@ -10,37 +10,36 @@
 #ifndef liblldb_ScriptInterpreter_h_
 #define liblldb_ScriptInterpreter_h_
 
+// C Includes
+// C++ Includes
+// Other libraries and framework includes
+// Project includes
 #include "lldb/lldb-private.h"
 
 #include "lldb/Core/Broadcaster.h"
 #include "lldb/Core/Error.h"
+#include "lldb/Core/PluginInterface.h"
 #include "lldb/Core/StructuredData.h"
 
 #include "lldb/Utility/PseudoTerminal.h"
 
-
 namespace lldb_private {
     
 class ScriptInterpreterLocker
 {
 public:
     
-    ScriptInterpreterLocker ()
-    {
-    }
+    ScriptInterpreterLocker() = default;
     
-    virtual ~ScriptInterpreterLocker ()
-    {
-    }
+    virtual ~ScriptInterpreterLocker() = default;
+
 private:
     DISALLOW_COPY_AND_ASSIGN (ScriptInterpreterLocker);
 };
 
-
-class ScriptInterpreter
+class ScriptInterpreter : public PluginInterface
 {
 public:
-
     typedef enum
     {
         eScriptReturnTypeCharPtr,
@@ -62,7 +61,7 @@ public:
     
     ScriptInterpreter (CommandInterpreter &interpreter, lldb::ScriptLanguage script_lang);
 
-    virtual ~ScriptInterpreter ();
+    ~ScriptInterpreter() override;
 
     struct ExecuteScriptOptions
     {
@@ -174,13 +173,13 @@ public:
     }
     
     virtual bool
-    GenerateTypeScriptFunction (const char* oneliner, std::string& output, const void* name_token = NULL)
+    GenerateTypeScriptFunction(const char* oneliner, std::string& output, const void* name_token = nullptr)
     {
         return false;
     }
     
     virtual bool
-    GenerateTypeScriptFunction (StringList &input, std::string& output, const void* name_token = NULL)
+    GenerateTypeScriptFunction(StringList &input, std::string& output, const void* name_token = nullptr)
     {
         return false;
     }
@@ -192,13 +191,13 @@ public:
     }
     
     virtual bool
-    GenerateTypeSynthClass (StringList &input, std::string& output, const void* name_token = NULL)
+    GenerateTypeSynthClass(StringList &input, std::string& output, const void* name_token = nullptr)
     {
         return false;
     }
     
     virtual bool
-    GenerateTypeSynthClass (const char* oneliner, std::string& output, const void* name_token = NULL)
+    GenerateTypeSynthClass(const char* oneliner, std::string& output, const void* name_token = nullptr)
     {
         return false;
     }
@@ -324,7 +323,6 @@ public:
     SetBreakpointCommandCallbackFunction (BreakpointOptions *bp_options,
                                   const char *function_name)
     {
-        return;
     }
     
     /// Set a one-liner as the callback for the watchpoint.
@@ -332,7 +330,6 @@ public:
     SetWatchpointCommandCallback (WatchpointOptions *wp_options,
                                   const char *oneliner)
     {
-        return;
     }
 
     virtual bool
@@ -349,7 +346,7 @@ public:
     }
 
     virtual size_t
-    CalculateNumChildren(const StructuredData::ObjectSP &implementor)
+    CalculateNumChildren(const StructuredData::ObjectSP &implementor, uint32_t max)
     {
         return 0;
     }
@@ -459,7 +456,7 @@ public:
     virtual bool
     GetDocumentationForItem (const char* item, std::string& dest)
     {
-		dest.clear();
+        dest.clear();
         return false;
     }
     
@@ -514,8 +511,8 @@ public:
     int
     GetMasterFileDescriptor ();
 
-	CommandInterpreter &
-	GetCommandInterpreter ();
+    CommandInterpreter &
+    GetCommandInterpreter();
 
     static std::string
     LanguageToString (lldb::ScriptLanguage language);
@@ -530,4 +527,4 @@ protected:
 
 } // namespace lldb_private
 
-#endif // #ifndef liblldb_ScriptInterpreter_h_
+#endif // liblldb_ScriptInterpreter_h_