From d8ab25db47247635d2ff60ace62d9beeeb09097b Mon Sep 17 00:00:00 2001
From: eidheim <eidheim@gmail.com>
Date: Wed, 2 Dec 2015 13:09:30 +0100
Subject: [PATCH] Renamed a few variables to more appropriate names

---
 src/source_clang.cc | 22 +++++++++++-----------
 src/source_clang.h  | 10 +++++-----
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/source_clang.cc b/src/source_clang.cc
index 102a533..f0c64b0 100644
--- a/src/source_clang.cc
+++ b/src/source_clang.cc
@@ -35,7 +35,7 @@ Source::View(file_path, project_path, language) {
   parsing_in_progress=Singleton::terminal->print_in_progress("Parsing "+file_path.string());
   //GTK-calls must happen in main thread, so the parse_thread
   //sends signals to the main thread that it is to call the following functions:
-  parse_start_connection=parse_preprocess.connect([this]{
+  parse_preprocess_connection=parse_preprocess.connect([this]{
     auto expected=ParseProcessState::PREPROCESSING;
     if(parse_mutex.try_lock()) {
       if(parse_process_state.compare_exchange_strong(expected, ParseProcessState::PROCESSING))
@@ -45,7 +45,7 @@ Source::View(file_path, project_path, language) {
     else
       parse_process_state.compare_exchange_strong(expected, ParseProcessState::STARTING);
   });
-  parse_done_connection=parse_postprocess.connect([this](){
+  parse_postprocess_connection=parse_postprocess.connect([this](){
     if(parse_mutex.try_lock()) {
       auto expected=ParseProcessState::POSTPROCESSING;
       if(parse_process_state.compare_exchange_strong(expected, ParseProcessState::IDLE)) {
@@ -57,7 +57,7 @@ Source::View(file_path, project_path, language) {
       parse_mutex.unlock();
     }
   });
-  parse_fail_connection=parse_error.connect([this](){
+  parse_error_connection=parse_error.connect([this](){
     Singleton::terminal->print("Error: failed to reparse "+this->file_path.string()+".\n", true);
     set_status("");
     set_info("");
@@ -663,7 +663,7 @@ Source::ClangViewParse(file_path, project_path, language), autocomplete_state(Au
     return false;
   });
   
-  autocomplete_done_connection=autocomplete_done.connect([this](){
+  autocomplete_error_connection=autocomplete_done.connect([this](){
     if(autocomplete_state==AutocompleteState::CANCELED) {
       set_status("");
       soft_reparse();
@@ -710,7 +710,7 @@ Source::ClangViewParse(file_path, project_path, language), autocomplete_state(Au
   autocomplete_restart_connection=autocomplete_restart.connect([this]() {
     autocomplete_check();
   });
-  autocomplete_fail_connection=autocomplete_fail.connect([this]() {
+  autocomplete_error_connection=autocomplete_error.connect([this]() {
     Singleton::terminal->print("Error: autocomplete failed, reparsing "+this->file_path.string()+"\n", true);
     autocomplete_state=AutocompleteState::CANCELED;
     full_reparse();
@@ -867,7 +867,7 @@ void Source::ClangViewAutocomplete::autocomplete() {
     if(parse_state==ParseState::PROCESSING)
       autocomplete_done();
     else
-      autocomplete_fail();
+      autocomplete_error();
     parse_mutex.unlock();
   });
 }
@@ -1393,12 +1393,12 @@ Source::ClangView::ClangView(const boost::filesystem::path &file_path, const boo
 
 void Source::ClangView::async_delete() {
   delayed_reparse_connection.disconnect();
-  parse_done_connection.disconnect();
-  parse_start_connection.disconnect();
-  parse_fail_connection.disconnect();
-  autocomplete_done_connection.disconnect();
+  parse_postprocess_connection.disconnect();
+  parse_preprocess_connection.disconnect();
+  parse_error_connection.disconnect();
+  autocomplete_error_connection.disconnect();
   autocomplete_restart_connection.disconnect();
-  autocomplete_fail_connection.disconnect();
+  autocomplete_error_connection.disconnect();
   do_restart_parse_connection.disconnect();
   delayed_tag_similar_tokens_connection.disconnect();
   ClangViewAutocomplete::async_delete();
diff --git a/src/source_clang.h b/src/source_clang.h
index 2309d5a..117d8d1 100644
--- a/src/source_clang.h
+++ b/src/source_clang.h
@@ -53,9 +53,9 @@ namespace Source {
     std::mutex parse_mutex;
     std::atomic<ParseState> parse_state;
     std::atomic<ParseProcessState> parse_process_state;
-    sigc::connection parse_done_connection;
-    sigc::connection parse_start_connection;
-    sigc::connection parse_fail_connection;
+    sigc::connection parse_preprocess_connection;
+    sigc::connection parse_postprocess_connection;
+    sigc::connection parse_error_connection;
   private:
     Glib::Dispatcher parse_preprocess;
     Glib::Dispatcher parse_postprocess;
@@ -92,7 +92,7 @@ namespace Source {
     std::thread autocomplete_thread;
     sigc::connection autocomplete_done_connection;
     sigc::connection autocomplete_restart_connection;
-    sigc::connection autocomplete_fail_connection;
+    sigc::connection autocomplete_error_connection;
     sigc::connection do_delete_object_connection;
     sigc::connection do_restart_parse_connection;
   private:
@@ -106,7 +106,7 @@ namespace Source {
     std::vector<AutoCompleteData> autocomplete_get_suggestions(const std::string &buffer, int line_number, int column);
     Glib::Dispatcher autocomplete_done;
     Glib::Dispatcher autocomplete_restart;
-    Glib::Dispatcher autocomplete_fail;
+    Glib::Dispatcher autocomplete_error;
     guint last_keyval=0;
     std::string prefix;
     std::mutex prefix_mutex;