[glom] db_utils_export: Put These in their own namespace.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] db_utils_export: Put These in their own namespace.
- Date: Thu, 31 Mar 2016 18:32:29 +0000 (UTC)
commit 25f131ae6f2a62b59046440c57419e70c7f1cd59
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Mar 31 10:17:20 2016 +0200
db_utils_export: Put These in their own namespace.
glom/appwindow.cc | 2 +-
glom/frame_glom.cc | 2 +-
glom/libglom/db_utils_export.cc | 5 ++---
glom/libglom/db_utils_export.h | 4 ++--
tests/export/test_selfhosting_new_then_export.cc | 2 +-
...est_selfhosting_new_then_export_with_big_num.cc | 2 +-
6 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/glom/appwindow.cc b/glom/appwindow.cc
index e8c0b9b..1828894 100644
--- a/glom/appwindow.cc
+++ b/glom/appwindow.cc
@@ -2050,7 +2050,7 @@ void AppWindow::on_menu_file_save_as_example()
FoundSet found_set;
found_set.m_table_name = table_name;
auto const_sequence = Utils::const_list(sequence);
- DbUtils::export_data_to_vector(document, example_rows, found_set, const_sequence);
+ DbUtilsExport::export_data_to_vector(document, example_rows, found_set, const_sequence);
//std::cout << " debug after row_text=" << row_text << std::endl;
document->set_table_example_data(table_name, example_rows);
diff --git a/glom/frame_glom.cc b/glom/frame_glom.cc
index 184c505..1ab8347 100644
--- a/glom/frame_glom.cc
+++ b/glom/frame_glom.cc
@@ -587,7 +587,7 @@ void Frame_Glom::on_menu_file_export()
return;
}
- DbUtils::export_data_to_stream(document, the_stream, found_set, const_sequence);
+ DbUtilsExport::export_data_to_stream(document, the_stream, found_set, const_sequence);
}
void Frame_Glom::on_menu_file_import()
diff --git a/glom/libglom/db_utils_export.cc b/glom/libglom/db_utils_export.cc
index b368d22..f8d8115 100644
--- a/glom/libglom/db_utils_export.cc
+++ b/glom/libglom/db_utils_export.cc
@@ -29,10 +29,9 @@
namespace Glom
{
-namespace DbUtils
+namespace DbUtilsExport
{
-
//TODO: Reduce copy/pasting in these export_data_to_*() methods:
void export_data_to_vector(const std::shared_ptr<Document>& document, Document::type_example_rows&
the_vector, const FoundSet& found_set, const Document::type_list_const_layout_groups& sequence)
{
@@ -183,6 +182,6 @@ void export_data_to_stream(const std::shared_ptr<Document>& document, std::ostre
}
}
-} //namespace DbUtils
+} //namespace DbUtilsExport
} //namespace Glom
diff --git a/glom/libglom/db_utils_export.h b/glom/libglom/db_utils_export.h
index 89acaca..d55f509 100644
--- a/glom/libglom/db_utils_export.h
+++ b/glom/libglom/db_utils_export.h
@@ -28,14 +28,14 @@
namespace Glom
{
-namespace DbUtils
+namespace DbUtilsExport
{
void export_data_to_vector(const std::shared_ptr<Document>& document, Document::type_example_rows&
the_vector, const FoundSet& found_set, const Document::type_list_const_layout_groups& sequence);
void export_data_to_stream(const std::shared_ptr<Document>& document, std::ostream& the_stream, const
FoundSet& found_set, const Document::type_list_const_layout_groups& sequence);
-} //namespace DbUtils
+} //namespace DbUtilsExport
} //namespace Glom
diff --git a/tests/export/test_selfhosting_new_then_export.cc
b/tests/export/test_selfhosting_new_then_export.cc
index 50b79a6..edddfbe 100644
--- a/tests/export/test_selfhosting_new_then_export.cc
+++ b/tests/export/test_selfhosting_new_then_export.cc
@@ -50,7 +50,7 @@ static bool test(Glom::Document::HostingMode hosting_mode)
group->add_item(field_year);
std::stringstream the_stream;
- Glom::DbUtils::export_data_to_stream(document, the_stream, found_set, layout_groups);
+ Glom::DbUtilsExport::export_data_to_stream(document, the_stream, found_set, layout_groups);
const auto text = the_stream.str();
std::cout << "debug: " << text << std::endl;
diff --git a/tests/export/test_selfhosting_new_then_export_with_big_num.cc
b/tests/export/test_selfhosting_new_then_export_with_big_num.cc
index 5b312a9..d700d44 100644
--- a/tests/export/test_selfhosting_new_then_export_with_big_num.cc
+++ b/tests/export/test_selfhosting_new_then_export_with_big_num.cc
@@ -47,7 +47,7 @@ static bool test(Glom::Document::HostingMode hosting_mode)
group->add_item(field);
std::stringstream the_stream;
- Glom::DbUtils::export_data_to_stream(document, the_stream, found_set, layout_groups);
+ Glom::DbUtilsExport::export_data_to_stream(document, the_stream, found_set, layout_groups);
const auto text = the_stream.str();
if(text.empty())
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]