From 97da5bd74b23d770b5bc45c0e12b3704ba2d3037 Mon Sep 17 00:00:00 2001 From: eidheim Date: Thu, 14 Jan 2016 11:47:38 +0100 Subject: [PATCH] Minor cleanup --- src/window.cc | 15 ++++++--------- src/window.h | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/window.cc b/src/window.cc index a167113..2c55f69 100644 --- a/src/window.cc +++ b/src/window.cc @@ -973,21 +973,18 @@ void Window::set_menu_actions() { }; view->selection_dialog->on_hide=[this]() { - if(debug_variable_tooltips) { - debug_variable_tooltips->hide(); - debug_variable_tooltips.reset(); - } + debug_variable_tooltips.hide(); + debug_variable_tooltips.clear(); }; view->selection_dialog->on_changed=[this, rows, iter](const std::string &selected) { if(selected.empty()) { - if(debug_variable_tooltips) - debug_variable_tooltips->hide(); + debug_variable_tooltips.hide(); return; } if(notebook.get_current_page()!=-1) { auto view=notebook.get_current_view(); - debug_variable_tooltips=std::unique_ptr(new Tooltips()); + debug_variable_tooltips.clear(); auto create_tooltip_buffer=[this, rows, view, selected]() { auto variable=rows->at(selected); auto tooltip_buffer=Gtk::TextBuffer::create(view->get_buffer()->get_tag_table()); @@ -1006,9 +1003,9 @@ void Window::set_menu_actions() { return tooltip_buffer; }; - debug_variable_tooltips->emplace_back(create_tooltip_buffer, *view, view->get_buffer()->create_mark(iter), view->get_buffer()->create_mark(iter)); + debug_variable_tooltips.emplace_back(create_tooltip_buffer, *view, view->get_buffer()->create_mark(iter), view->get_buffer()->create_mark(iter)); - debug_variable_tooltips->show(true); + debug_variable_tooltips.show(true); } }; diff --git a/src/window.h b/src/window.h index 6c55d87..a3485a2 100644 --- a/src/window.h +++ b/src/window.h @@ -48,7 +48,7 @@ private: std::mutex debug_status_mutex; Glib::Dispatcher debug_update_status; - std::unique_ptr debug_variable_tooltips; + Tooltips debug_variable_tooltips; std::unique_ptr get_cmake(); std::unordered_map project_run_arguments;