StringRef'ify CodeCompletionString

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@89102 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Sema/CodeCompleteConsumer.h b/include/clang/Sema/CodeCompleteConsumer.h
index 5d27b1a90fde77d6b0f7d63c4bec15d4d41b4f59..43ff6869184d96e2761f2c8541f149b2de0291b5 100644 (file)
--- a/include/clang/Sema/CodeCompleteConsumer.h
+++ b/include/clang/Sema/CodeCompleteConsumer.h
@@ -109,19 +109,19 @@ public:
     Chunk(ChunkKind Kind, llvm::StringRef Text = "");
     
     /// \brief Create a new text chunk.
-    static Chunk CreateText(const char *Text);
+    static Chunk CreateText(llvm::StringRef Text);
 
     /// \brief Create a new optional chunk.
     static Chunk CreateOptional(std::auto_ptr<CodeCompletionString> Optional);
 
     /// \brief Create a new placeholder chunk.
-    static Chunk CreatePlaceholder(const char *Placeholder);
+    static Chunk CreatePlaceholder(llvm::StringRef Placeholder);
 
     /// \brief Create a new informative chunk.
-    static Chunk CreateInformative(const char *Informative);
+    static Chunk CreateInformative(llvm::StringRef Informative);
 
     /// \brief Create a new current-parameter chunk.
-    static Chunk CreateCurrentParameter(const char *CurrentParameter);
+    static Chunk CreateCurrentParameter(llvm::StringRef CurrentParameter);
 
     /// \brief Destroy this chunk, deallocating any memory it owns.
     void Destroy();
@@ -156,13 +156,13 @@ public:
   
   /// \brief Add a new typed-text chunk.
   /// The text string will be copied.
-  void AddTypedTextChunk(const char *Text) { 
+  void AddTypedTextChunk(llvm::StringRef Text) { 
     Chunks.push_back(Chunk(CK_TypedText, Text));
   }
   
   /// \brief Add a new text chunk.
   /// The text string will be copied.
-  void AddTextChunk(const char *Text) { 
+  void AddTextChunk(llvm::StringRef Text) { 
     Chunks.push_back(Chunk::CreateText(Text)); 
   }
   
@@ -173,19 +173,19 @@ public:
   
   /// \brief Add a new placeholder chunk.
   /// The placeholder text will be copied.
-  void AddPlaceholderChunk(const char *Placeholder) {
+  void AddPlaceholderChunk(llvm::StringRef Placeholder) {
     Chunks.push_back(Chunk::CreatePlaceholder(Placeholder));
   }
 
   /// \brief Add a new informative chunk.
   /// The text will be copied.
-  void AddInformativeChunk(const char *Text) {
+  void AddInformativeChunk(llvm::StringRef Text) {
     Chunks.push_back(Chunk::CreateInformative(Text));
   }
 
   /// \brief Add a new current-parameter chunk.
   /// The text will be copied.
-  void AddCurrentParameterChunk(const char *CurrentParameter) {
+  void AddCurrentParameterChunk(llvm::StringRef CurrentParameter) {
     Chunks.push_back(Chunk::CreateCurrentParameter(CurrentParameter));
   }
   

diff --git a/lib/Sema/CodeCompleteConsumer.cpp b/lib/Sema/CodeCompleteConsumer.cpp
index 3529ece25740bc3af34728596e71b23c426733c6..88ac4e49cf9edb2d2fd412470be7846d4141e546 100644 (file)
--- a/lib/Sema/CodeCompleteConsumer.cpp
+++ b/lib/Sema/CodeCompleteConsumer.cpp
@@ -22,7 +22,9 @@
 #include <algorithm>
 #include <cstring>
 #include <functional>
+
 using namespace clang;
+using llvm::StringRef;
 
 //===----------------------------------------------------------------------===//
 // Code completion string implementation
@@ -86,7 +88,7 @@ CodeCompletionString::Chunk::Chunk(ChunkKind Kind, llvm::StringRef Text)
 }
 
 CodeCompletionString::Chunk
-CodeCompletionString::Chunk::CreateText(const char *Text) {
+CodeCompletionString::Chunk::CreateText(StringRef Text) {
   return Chunk(CK_Text, Text);
 }
 
@@ -100,18 +102,18 @@ CodeCompletionString::Chunk::CreateOptional(
 }
 
 CodeCompletionString::Chunk 
-CodeCompletionString::Chunk::CreatePlaceholder(const char *Placeholder) {
+CodeCompletionString::Chunk::CreatePlaceholder(StringRef Placeholder) {
   return Chunk(CK_Placeholder, Placeholder);
 }
 
 CodeCompletionString::Chunk 
-CodeCompletionString::Chunk::CreateInformative(const char *Informative) {
+CodeCompletionString::Chunk::CreateInformative(StringRef Informative) {
   return Chunk(CK_Informative, Informative);
 }
 
 CodeCompletionString::Chunk 
 CodeCompletionString::Chunk::CreateCurrentParameter(
-                                                const char *CurrentParameter) {
+                                                StringRef CurrentParameter) {
   return Chunk(CK_CurrentParameter, CurrentParameter);
 }