Minor cleanup.

src/CompletionString.cc

@@ -38,4 +38,4 @@ std::string clang::CompletionString::get_brief_comments() {
 
 clang::CompletionChunk::
 CompletionChunk(std::string chunk, clang::CompletionChunkKind kind) :
-  chunk_(chunk), kind_(kind) { }
+  chunk(chunk), kind(kind) { }

src/CompletionString.h

@@ -21,11 +21,8 @@ namespace clang {
   class CompletionChunk {
   public:
     CompletionChunk(std::string chunk, CompletionChunkKind kind);
-    const std::string& chunk() const { return chunk_; }
+    std::string chunk;
-    const CompletionChunkKind& kind() const { return kind_; }
+    CompletionChunkKind kind;
-  private:
-    std::string chunk_;
-    CompletionChunkKind kind_;
   };
 
   class CompletionString {

tests/CodeCompleteResults_H_Test.cc

@@ -32,7 +32,7 @@ BOOST_AUTO_TEST_CASE(code_complete_results) {
 
   bool substr_found=false;
   for(int c=0;c<results.size();c++) {
-    if(results.get(c).get_chunks()[1].chunk()=="substr") {
+    if(results.get(c).get_chunks()[1].chunk=="substr") {
       substr_found=true;
       break;
     }

tests/CompletionString_H_Test.cc

@@ -5,8 +5,8 @@
 BOOST_AUTO_TEST_CASE(completion_chunk) {
   clang::CompletionChunk str("(", clang::CompletionChunk_LeftBrace);
 
-  BOOST_CHECK(str.chunk() == "(");
+  BOOST_CHECK(str.chunk == "(");
-  BOOST_CHECK(str.kind() == clang::CompletionChunk_LeftBrace);
+  BOOST_CHECK(str.kind == clang::CompletionChunk_LeftBrace);
 }
 
 BOOST_AUTO_TEST_CASE(completion_string) {