From 918bfab524bd9144f969f8df70226accd55adf44 Mon Sep 17 00:00:00 2001
From: eidheim <eidheim@gmail.com>
Date: Fri, 10 Jul 2015 13:35:37 +0200
Subject: [PATCH] Minor cleanup.

---
 src/CompletionString.cc             | 2 +-
 src/CompletionString.h              | 7 ++-----
 tests/CodeCompleteResults_H_Test.cc | 2 +-
 tests/CompletionString_H_Test.cc    | 4 ++--
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/CompletionString.cc b/src/CompletionString.cc
index 9cccaa0..07dd5bc 100644
--- a/src/CompletionString.cc
+++ b/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) { }
diff --git a/src/CompletionString.h b/src/CompletionString.h
index 34f04b7..0018bc3 100644
--- a/src/CompletionString.h
+++ b/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_; }
-    const CompletionChunkKind& kind() const { return kind_; }
-  private:
-    std::string chunk_;
-    CompletionChunkKind kind_;
+    std::string chunk;
+    CompletionChunkKind kind;
   };
 
   class CompletionString {
diff --git a/tests/CodeCompleteResults_H_Test.cc b/tests/CodeCompleteResults_H_Test.cc
index 32bcd76..c696727 100644
--- a/tests/CodeCompleteResults_H_Test.cc
+++ b/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;
     }
diff --git a/tests/CompletionString_H_Test.cc b/tests/CompletionString_H_Test.cc
index 4f70843..ba404ca 100644
--- a/tests/CompletionString_H_Test.cc
+++ b/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.kind() == clang::CompletionChunk_LeftBrace);
+  BOOST_CHECK(str.chunk == "(");
+  BOOST_CHECK(str.kind == clang::CompletionChunk_LeftBrace);
 }
 
 BOOST_AUTO_TEST_CASE(completion_string) {