From 63d69c6ca3f007c440be4e62663f05ee409098df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Lien=20Sell=C3=A6g?= <jorgen@guut.org>
Date: Thu, 16 Apr 2015 10:58:04 +0200
Subject: [PATCH] add vector as parameter

---
 juci/notebook.cc |  7 ++++---
 juci/source.cc   | 28 ++++++++++++++--------------
 juci/source.h    | 14 +++++++-------
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/juci/notebook.cc b/juci/notebook.cc
index a6a613e..876e619 100644
--- a/juci/notebook.cc
+++ b/juci/notebook.cc
@@ -393,9 +393,10 @@ void Notebook::Controller::OnBufferChange() {
   std::cout << start.get_line_offset() << std::endl;
   if (word == ".") {
     // TODO(Forgie) Zalox,Forgie) Remove TEST
-    std::vector<std::string> TEST
-      = text_vec_[page]->GetAutoCompleteSuggestions(start.get_line()+1,
-                                                    start.get_line_offset()+2);
+    std::vector<std::string> TEST;
+    text_vec_[page]->GetAutoCompleteSuggestions(start.get_line()+1,
+                                                start.get_line_offset()+2,
+                                                &TEST);
     GeneratePopup(TEST);
   }
 }
diff --git a/juci/source.cc b/juci/source.cc
index 5946bf1..baec800 100644
--- a/juci/source.cc
+++ b/juci/source.cc
@@ -132,22 +132,24 @@ ReParse(const std::string &buffer) {
 // fired when a line in the buffer is edited
 void Source::Controller::OnLineEdit() { }
 
-std::vector<std::string> Source::Controller::
+void Source::Controller::
 GetAutoCompleteSuggestions(int line_number,
-                           int column) {
-  return model().GetAutoCompleteSuggestions(view().get_buffer()
-                                            ->get_text().raw(),
-                                            line_number,
-                                            column);
+                           int column,
+                           std::vector<std::string> *suggestions) {
+  parsing.lock();
+  model().GetAutoCompleteSuggestions(view().get_buffer()
+                                     ->get_text().raw(),
+                                     line_number,
+                                     column,
+                                     suggestions);
+  parsing.unlock();
 }
 
-std::vector<std::string> Source::Model::
+void Source::Model::
 GetAutoCompleteSuggestions(const std::string& buffer,
                            int line_number,
-                           int column) {
-  
-  std::vector<std::string> res;
-  parsing.lock();
+                           int column,
+                           std::vector<std::string> *suggestions) {
   clang::CodeCompleteResults results(&tu_,
                                      file_path(),
                                      buffer,
@@ -159,10 +161,8 @@ GetAutoCompleteSuggestions(const std::string& buffer,
     for (auto &stringchunk : c) {
       ss << stringchunk.chunk();
     }
-    res.emplace_back(ss.str());
+    suggestions->emplace_back(ss.str());
   }
-  parsing.unlock();
-  return res;
 }
 
 // sets the filepath for this mvc
diff --git a/juci/source.h b/juci/source.h
index c674110..8450807 100644
--- a/juci/source.h
+++ b/juci/source.h
@@ -95,10 +95,10 @@ namespace Source {
     const string& project_path() const;
     // gets the config member
     const Config& config() const;
-    std::vector<std::string>
-    GetAutoCompleteSuggestions(const std::string& buffer,
-                               int line_number,
-                               int column);
+    void GetAutoCompleteSuggestions(const std::string& buffer,
+                                    int line_number,
+                                    int column,
+                                    std::vector<std::string> *suggestions);
       ~Model() { }
     int ReParse(const std::string &buffer);
     std::vector<Range> ExtractTokens(int, int);
@@ -125,9 +125,9 @@ namespace Source {
     Model& model();
     void OnNewEmptyFile();
     void OnOpenFile(const string &filename);
-    std::vector<std::string>
-    GetAutoCompleteSuggestions(int line_number,
-                               int column);
+    void GetAutoCompleteSuggestions(int line_number,
+                                    int column,
+                                    std::vector<std::string> *suggestions);
     Glib::RefPtr<Gtk::TextBuffer> buffer();
 
   private: