From 8bec1cd58d9c6a89d1dcb961d28651dc594bd3a7 Mon Sep 17 00:00:00 2001 From: eidheim Date: Fri, 26 Jun 2015 21:37:52 +0200 Subject: [PATCH] Small cleanup. --- juci/terminal.cc | 9 ++++----- juci/terminal.h | 3 +-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/juci/terminal.cc b/juci/terminal.cc index 02b9933..cce7496 100644 --- a/juci/terminal.cc +++ b/juci/terminal.cc @@ -2,12 +2,11 @@ #include #include "logging.h" -Terminal::InProgress::InProgress(Controller& terminal, const std::string& start_msg): - start_msg(start_msg), terminal(terminal), stop(false) { +Terminal::InProgress::InProgress(Controller& terminal, const std::string& start_msg): terminal(terminal), stop(false) { waiting_print.connect([this](){ this->terminal.print(line_nr-1, "."); }); - start(); + start(start_msg); } Terminal::InProgress::~InProgress() { @@ -16,8 +15,8 @@ Terminal::InProgress::~InProgress() { wait_thread.join(); } -void Terminal::InProgress::start() { - line_nr=this->terminal.print(start_msg+"...\n"); +void Terminal::InProgress::start(const std::string& msg) { + line_nr=this->terminal.print(msg+"...\n"); wait_thread=std::thread([this](){ size_t c=0; while(!stop) { diff --git a/juci/terminal.h b/juci/terminal.h index 00e2fba..317e43e 100644 --- a/juci/terminal.h +++ b/juci/terminal.h @@ -32,9 +32,8 @@ namespace Terminal { void done(const std::string& msg); void cancel(const std::string& msg); private: - void start(); + void start(const std::string& msg); Controller& terminal; - std::string start_msg; int line_nr; std::atomic stop; Glib::Dispatcher waiting_print;