From ebd18156c59549e7915c393956b3728e8cd1a25e Mon Sep 17 00:00:00 2001
From: eidheim <eidheim@gmail.com>
Date: Wed, 1 Jul 2015 14:18:21 +0200
Subject: [PATCH] Removed overloading (accidental) of on_motion_notify_event
 and on_mark_set.

---
 juci/source.cc | 10 +++++-----
 juci/source.h  |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/juci/source.cc b/juci/source.cc
index 230a574..6b391ea 100644
--- a/juci/source.cc
+++ b/juci/source.cc
@@ -217,8 +217,8 @@ parse_thread_go(true), parse_thread_mapped(false), parse_thread_stop(false), dia
   
   signal_key_press_event().connect(sigc::mem_fun(*this, &Source::ClangView::on_key_press), false);
   signal_key_release_event().connect(sigc::mem_fun(*this, &Source::ClangView::on_key_release), false);
-  signal_motion_notify_event().connect(sigc::mem_fun(*this, &Source::ClangView::on_motion_notify_event), false);
-  get_buffer()->signal_mark_set().connect(sigc::mem_fun(*this, &Source::ClangView::on_mark_set), false);
+  signal_motion_notify_event().connect(sigc::mem_fun(*this, &Source::ClangView::clangview_on_motion_notify_event), false);
+  get_buffer()->signal_mark_set().connect(sigc::mem_fun(*this, &Source::ClangView::clangview_on_mark_set), false);
 }
 
 Source::ClangView::~ClangView() {
@@ -375,10 +375,10 @@ void Source::ClangView::update_diagnostics() {
       buffer->apply_tag(tag, start, end);
     }
   }
-  on_mark_set(get_buffer()->get_insert()->get_iter(), get_buffer()->get_mark("insert"));
+  clangview_on_mark_set(get_buffer()->get_insert()->get_iter(), get_buffer()->get_mark("insert"));
 }
 
-bool Source::ClangView::on_motion_notify_event(GdkEventMotion* event) {
+bool Source::ClangView::clangview_on_motion_notify_event(GdkEventMotion* event) {
   Gdk::Rectangle rectangle(event->x, event->y, 1, 1);
   diagnostic_tooltips.show(rectangle);
   auto cursor=Gdk::Cursor::create(Gdk::CursorType::XTERM);
@@ -386,7 +386,7 @@ bool Source::ClangView::on_motion_notify_event(GdkEventMotion* event) {
   return false;
 }
 
-void Source::ClangView::on_mark_set(const Gtk::TextBuffer::iterator& iterator, const Glib::RefPtr<Gtk::TextBuffer::Mark>& mark) {
+void Source::ClangView::clangview_on_mark_set(const Gtk::TextBuffer::iterator& iterator, const Glib::RefPtr<Gtk::TextBuffer::Mark>& mark) {
   if(mark->get_name()=="insert") {
     Gdk::Rectangle rectangle;
     get_iter_location(iterator, rectangle);
diff --git a/juci/source.h b/juci/source.h
index 492717e..a1caafe 100644
--- a/juci/source.h
+++ b/juci/source.h
@@ -98,8 +98,8 @@ namespace Source {
     void update_syntax(const std::vector<Range> &locations);
     void update_diagnostics();
     Tooltips diagnostic_tooltips;
-    bool on_motion_notify_event(GdkEventMotion* event);
-    void on_mark_set(const Gtk::TextBuffer::iterator& iterator, const Glib::RefPtr<Gtk::TextBuffer::Mark>& mark);
+    bool clangview_on_motion_notify_event(GdkEventMotion* event);
+    void clangview_on_mark_set(const Gtk::TextBuffer::iterator& iterator, const Glib::RefPtr<Gtk::TextBuffer::Mark>& mark);
     
     static clang::Index clang_index;
     std::map<std::string, std::string> get_buffer_map() const;