Commit 3a3b6cb8 authored by Murray Cumming's avatar Murray Cumming
Browse files

Dialog_ImportCSV::get(): Correct the return type.

parent dd4833a3
......@@ -241,9 +241,9 @@ const Glib::ustring& Dialog_Import_CSV::get_data(guint row, guint col)
return m_parser->get_data(row, col);
}
CsvParser& Dialog_Import_CSV::get_parser()
std::shared_ptr<CsvParser> Dialog_Import_CSV::get_parser()
{
return *(m_parser.get());
return m_parser;
}
void Dialog_Import_CSV::clear()
......
......@@ -63,7 +63,7 @@ public:
const Glib::ustring& get_data(unsigned int row, unsigned int col);
// TODO: perhaps it would be safer to just wrap the needed parser API here.
CsvParser& get_parser();
std::shared_ptr<CsvParser> get_parser();
typedef sigc::signal<void> type_signal_state_changed;
......
......@@ -163,7 +163,7 @@ bool Dialog_Import_CSV_Progress::on_idle_import()
while(gtk_events_pending())
gtk_main_iteration_do(true);
const auto row = m_data_source->get_parser().fetch_next_row();
const auto row = m_data_source->get_parser()->fetch_next_row();
//If there are no more rows to import, then stop, by returning false:
// TODO: Perhaps abort on 0 == row instead, so that we do not stop import on
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment