[Lldb-commits] [lldb] r137357 - in /lldb/trunk/source/Commands: CommandObjectType.cpp CommandObjectType.h

[Enrico Granata]

Author: enrico
Date: Thu Aug 11 16:37:21 2011
New Revision: 137357

URL: http://llvm.org/viewvc/llvm-project?rev=137357&view=rev
Log:
changed some variables from char* to std::string

Modified:
    lldb/trunk/source/Commands/CommandObjectType.cpp
    lldb/trunk/source/Commands/CommandObjectType.h

Modified: lldb/trunk/source/Commands/CommandObjectType.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectType.cpp?rev=137357&r1=137356&r2=137357&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectType.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectType.cpp Thu Aug 11 16:37:21 2011
@@ -637,7 +637,7 @@
             m_is_add_script = true;
             break;
         case 'w':
-            m_category = ConstString(option_arg).GetCString();
+            m_category = std::string(option_arg);
             break;
         default:
             error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
@@ -662,7 +662,7 @@
     m_python_function = "";
     m_format_string = "";
     m_is_add_script = false;
-    m_category = NULL;
+    m_category = "default";
 }
 
 void
@@ -1036,11 +1036,11 @@
 CommandObjectTypeSummaryAdd::AddSummary(const ConstString& type_name,
                                         SummaryFormatSP entry,
                                         SummaryFormatType type,
-                                        const char* category_name,
+                                        std::string category_name,
                                         Error* error)
 {
     lldb::FormatCategorySP category;
-    Debugger::Formatting::Categories::Get(ConstString(category_name), category);
+    Debugger::Formatting::Categories::Get(ConstString(category_name.c_str()), category);
     
     if (type == eRegexSummary)
     {
@@ -2518,7 +2518,7 @@
         
         
         lldb::FormatCategorySP category;
-        Debugger::Formatting::Categories::Get(ConstString(options->m_category), category);
+        Debugger::Formatting::Categories::Get(ConstString(options->m_category.c_str()), category);
         
         for (size_t i = 0; i < options->m_target_types.GetSize(); i++) {
             const char *type_name = options->m_target_types.GetStringAtIndex(i);
@@ -2632,7 +2632,7 @@
     // now I have a valid provider, let's add it to every type
     
     lldb::FormatCategorySP category;
-    Debugger::Formatting::Categories::Get(ConstString(m_options.m_category), category);
+    Debugger::Formatting::Categories::Get(ConstString(m_options.m_category.c_str()), category);
     
     for (size_t i = 0; i < argc; i++) {
         const char* typeA = command.GetArgumentAtIndex(i);
@@ -2686,7 +2686,7 @@
     // now I have a valid provider, let's add it to every type
     
     lldb::FormatCategorySP category;
-    Debugger::Formatting::Categories::Get(ConstString(m_options.m_category), category);
+    Debugger::Formatting::Categories::Get(ConstString(m_options.m_category.c_str()), category);
     
     for (size_t i = 0; i < argc; i++) {
         const char* typeA = command.GetArgumentAtIndex(i);
@@ -2731,11 +2731,11 @@
 CommandObjectTypeSynthAdd::AddSynth(const ConstString& type_name,
          SyntheticChildrenSP entry,
          SynthFormatType type,
-         const char* category_name,
+         std::string category_name,
          Error* error)
 {
     lldb::FormatCategorySP category;
-    Debugger::Formatting::Categories::Get(ConstString(category_name), category);
+    Debugger::Formatting::Categories::Get(ConstString(category_name.c_str()), category);
     
     if (type == eRegexSynth)
     {

Modified: lldb/trunk/source/Commands/CommandObjectType.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectType.h?rev=137357&r1=137356&r2=137357&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectType.h (original)
+++ lldb/trunk/source/Commands/CommandObjectType.h Thu Aug 11 16:37:21 2011
@@ -41,7 +41,7 @@
     
     ConstString* m_name;
     
-    const char* m_category;
+    std::string m_category;
     
     ScriptAddOptions(bool sptr,
                      bool sref,
@@ -51,7 +51,7 @@
                      bool onel,
                      bool regx,
                      ConstString* name,
-                     const char* catg) :
+                     std::string catg) :
     m_skip_pointers(sptr),
     m_skip_references(sref),
     m_cascade(casc),
@@ -82,13 +82,13 @@
     StringList m_user_source;
     StringList m_target_types;
 
-    const char* m_category;
+    std::string m_category;
     
     SynthAddOptions(bool sptr,
                      bool sref,
                      bool casc,
                      bool regx,
-                     const char* catg) :
+                     std::string catg) :
     m_skip_pointers(sptr),
     m_skip_references(sref),
     m_cascade(casc),
@@ -160,7 +160,7 @@
         std::string m_python_script;
         std::string m_python_function;
         bool m_is_add_script;
-        const char* m_category;
+        std::string m_category;
     };
     
     CommandOptions m_options;
@@ -203,7 +203,7 @@
     AddSummary(const ConstString& type_name,
                lldb::SummaryFormatSP entry,
                SummaryFormatType type,
-               const char* category,
+               std::string category,
                Error* error = NULL);
 };
     
@@ -257,7 +257,7 @@
                     m_skip_references = true;
                     break;
                 case 'w':
-                    m_category = ConstString(option_arg).GetCString();
+                    m_category = std::string(option_arg);
                     break;
                 case 'x':
                     m_regex = true;
@@ -277,7 +277,7 @@
             m_class_name = "";
             m_skip_pointers = false;
             m_skip_references = false;
-            m_category = NULL;
+            m_category = "default";
             m_expr_paths.clear();
             is_class_based = false;
             handwrite_python = false;
@@ -303,7 +303,7 @@
         std::string m_class_name;
         bool m_input_python;
         option_vector m_expr_paths;
-        const char* m_category;
+        std::string m_category;
         
         bool is_class_based;
         
@@ -354,7 +354,7 @@
     AddSynth(const ConstString& type_name,
              lldb::SyntheticChildrenSP entry,
              SynthFormatType type,
-             const char* category_name,
+             std::string category_name,
              Error* error);
 };