1 files changed, 21 insertions, 25 deletions

diff --git a/tools/lldb-mi/MICmdArgSet.cpp b/tools/lldb-mi/MICmdArgSet.cpp
index 3d63a6138f7f2..9fe5b2d97dc2a 100644
--- a/tools/lldb-mi/MICmdArgSet.cpp
+++ b/tools/lldb-mi/MICmdArgSet.cpp
@@ -20,7 +20,7 @@
 // Return:  None.
 // Throws:  None.
 //--
-CMICmdArgSet::CMICmdArgSet(void)
+CMICmdArgSet::CMICmdArgSet()
     : m_bIsArgsPresentButNotHandledByCmd(false)
     , m_constStrCommaSpc(", ")
 {
@@ -33,7 +33,7 @@ CMICmdArgSet::CMICmdArgSet(void)
 // Return:  None.
 // Throws:  None.
 //--
-CMICmdArgSet::~CMICmdArgSet(void)
+CMICmdArgSet::~CMICmdArgSet()
 {
     // Tidy up
     Destroy();
@@ -47,7 +47,7 @@ CMICmdArgSet::~CMICmdArgSet(void)
 // Throws:  None.
 //--
 void
-CMICmdArgSet::Destroy(void)
+CMICmdArgSet::Destroy()
 {
     // Delete command argument objects
     if (!m_setCmdArgs.empty())
@@ -81,7 +81,7 @@ CMICmdArgSet::Destroy(void)
 // Throws:  None.
 //--
 bool
-CMICmdArgSet::IsArgsPresentButNotHandledByCmd(void) const
+CMICmdArgSet::IsArgsPresentButNotHandledByCmd() const
 {
     return m_bIsArgsPresentButNotHandledByCmd;
 }
@@ -90,17 +90,13 @@ CMICmdArgSet::IsArgsPresentButNotHandledByCmd(void) const
 // Details: Add the list of command's arguments to parse and validate another one.
 // Type:    Method.
 // Args:    vArg    - (R) A command argument object.
-// Return:  MIstatus::success - Functional succeeded.
-//          MIstatus::failure - Functional failed.
+// Return:  None.
 // Throws:  None.
 //--
-bool
-CMICmdArgSet::Add(const CMICmdArgValBase &vArg)
+void
+CMICmdArgSet::Add(CMICmdArgValBase *vArg)
 {
-    CMICmdArgValBase *pArg = const_cast<CMICmdArgValBase *>(&vArg);
-    m_setCmdArgs.push_back(pArg);
-
-    return MIstatus::success;
+    m_setCmdArgs.push_back(vArg);
 }
 
 //++ ------------------------------------------------------------------------------------
@@ -113,7 +109,7 @@ CMICmdArgSet::Add(const CMICmdArgValBase &vArg)
 // Throws:  None.
 //--
 const CMICmdArgSet::SetCmdArgs_t &
-CMICmdArgSet::GetArgsThatAreMissing(void) const
+CMICmdArgSet::GetArgsThatAreMissing() const
 {
     return m_setCmdArgsThatAreMissing;
 }
@@ -128,7 +124,7 @@ CMICmdArgSet::GetArgsThatAreMissing(void) const
 // Throws:  None.
 //--
 const CMICmdArgSet::SetCmdArgs_t &
-CMICmdArgSet::GetArgsThatInvalid(void) const
+CMICmdArgSet::GetArgsThatInvalid() const
 {
     return m_setCmdArgsThatNotValid;
 }
@@ -146,7 +142,7 @@ CMICmdArgSet::GetArgsThatInvalid(void) const
 // Throws:  None.
 //--
 const CMICmdArgSet::SetCmdArgs_t &
-CMICmdArgSet::GetArgsNotHandledByCmd(void) const
+CMICmdArgSet::GetArgsNotHandledByCmd() const
 {
     return m_setCmdArgsNotHandledByCmd;
 }
@@ -172,25 +168,25 @@ CMICmdArgSet::Validate(const CMIUtilString &vStrMiCmd, CMICmdArgContext &vwCmdAr
     SetCmdArgs_t::const_iterator it = m_setCmdArgs.begin();
     while (it != m_setCmdArgs.end())
     {
-        const CMICmdArgValBase *pArg(*it);
+        CMICmdArgValBase *pArg = *it;
 
-        if (!const_cast<CMICmdArgValBase *>(pArg)->Validate(vwCmdArgsText))
+        if (!pArg->Validate(vwCmdArgsText))
         {
             if (pArg->GetFound())
             {
                 if (pArg->GetIsMissingOptions())
-                    m_setCmdArgsMissingInfo.push_back(const_cast<CMICmdArgValBase *>(pArg));
+                    m_setCmdArgsMissingInfo.push_back(pArg);
                 else if (!pArg->GetValid())
-                    m_setCmdArgsThatNotValid.push_back(const_cast<CMICmdArgValBase *>(pArg));
+                    m_setCmdArgsThatNotValid.push_back(pArg);
             }
             else if (pArg->GetIsMandatory())
-                m_setCmdArgsThatAreMissing.push_back(const_cast<CMICmdArgValBase *>(pArg));
+                m_setCmdArgsThatAreMissing.push_back(pArg);
         }
 
         if (pArg->GetFound() && !pArg->GetIsHandledByCmd())
         {
             m_bIsArgsPresentButNotHandledByCmd = true;
-            m_setCmdArgsNotHandledByCmd.push_back(const_cast<CMICmdArgValBase *>(pArg));
+            m_setCmdArgsNotHandledByCmd.push_back(pArg);
         }
 
         // Next
@@ -326,7 +322,7 @@ CMICmdArgSet::ValidationFormErrorMessages(const CMICmdArgContext &vwCmdArgsText)
 // Throws:  None.
 //--
 bool
-CMICmdArgSet::IsArgContextEmpty(void) const
+CMICmdArgSet::IsArgContextEmpty() const
 {
     return m_cmdArgContext.IsEmpty();
 }
@@ -335,11 +331,11 @@ CMICmdArgSet::IsArgContextEmpty(void) const
 // Details: Retrieve the number of arguments that are being used for the command.
 // Type:    Method.
 // Args:    None.
-// Return:  MIuint - Argument count.
+// Return:  size_t - Argument count.
 // Throws:  None.
 //--
-MIuint
-CMICmdArgSet::GetCount(void) const
+size_t
+CMICmdArgSet::GetCount() const
 {
     return m_setCmdArgs.size();
 }