[glom] Dialog_ImportCSV::get(): Correct the return type.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Dialog_ImportCSV::get(): Correct the return type.
- Date: Fri, 5 Feb 2016 11:19:43 +0000 (UTC)
commit 3a3b6cb8568277d9d03a9bdc9631cd50ce03f33a
Author: Murray Cumming <murrayc murrayc com>
Date: Fri Feb 5 10:13:28 2016 +0100
Dialog_ImportCSV::get(): Correct the return type.
glom/import_csv/dialog_import_csv.cc | 4 ++--
glom/import_csv/dialog_import_csv.h | 2 +-
glom/import_csv/dialog_import_csv_progress.cc | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/glom/import_csv/dialog_import_csv.cc b/glom/import_csv/dialog_import_csv.cc
index 7505113..8509f8f 100644
--- a/glom/import_csv/dialog_import_csv.cc
+++ b/glom/import_csv/dialog_import_csv.cc
@@ -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()
diff --git a/glom/import_csv/dialog_import_csv.h b/glom/import_csv/dialog_import_csv.h
index 786ee08..220acb7 100644
--- a/glom/import_csv/dialog_import_csv.h
+++ b/glom/import_csv/dialog_import_csv.h
@@ -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;
diff --git a/glom/import_csv/dialog_import_csv_progress.cc b/glom/import_csv/dialog_import_csv_progress.cc
index 64d3c2c..c928eab 100644
--- a/glom/import_csv/dialog_import_csv_progress.cc
+++ b/glom/import_csv/dialog_import_csv_progress.cc
@@ -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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]