[glom/gtkmm4v4] Replace uses of Glib::WeakRef with std::weak_ptr.

[Murray Cumming <murrayc src gnome org>]

commit c167acf46ed539f15baf66e0fcf0f2c0eff6a23f
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Nov 1 16:09:27 2017 +0100

    Replace uses of Glib::WeakRef with std::weak_ptr.

 glom/import_csv/csv_parser.cc                      |    8 ++++----
 glom/import_csv/csv_parser.h                       |    5 ++---
 .../window_relationships_overview.cc               |   12 ++++++------
 .../window_relationships_overview.h                |    7 +++----
 .../report_layout/dialog_layout_report.cc          |    8 ++++----
 .../report_layout/dialog_layout_report.h           |    5 ++---
 glom/print_layout/canvas_print_layout.cc           |    4 ++--
 glom/print_layout/canvas_print_layout.h            |    3 +--
 8 files changed, 24 insertions(+), 28 deletions(-)
---
diff --git a/glom/import_csv/csv_parser.cc b/glom/import_csv/csv_parser.cc
index c48a21c..01efce6 100644
--- a/glom/import_csv/csv_parser.cc
+++ b/glom/import_csv/csv_parser.cc
@@ -497,9 +497,9 @@ void CsvParser::ensure_idle_handler_connection()
   }
 }
 
-void CsvParser::on_file_read(const Glib::RefPtr<Gio::AsyncResult>& result, const Glib::WeakRef<Gio::File>& 
source_weak)
+void CsvParser::on_file_read(const Glib::RefPtr<Gio::AsyncResult>& result, const std::weak_ptr<Gio::File>& 
source_weak)
 {
-  const auto source = source_weak.get();
+  const auto source = source_weak.lock();
   if (!source)
     return;
 
@@ -553,9 +553,9 @@ void CsvParser::on_buffer_read(const Glib::RefPtr<Gio::AsyncResult>& result)
   }
 }
 
-void CsvParser::on_file_query_info(const Glib::RefPtr<Gio::AsyncResult>& result, const 
Glib::WeakRef<Gio::File>& source_weak) const
+void CsvParser::on_file_query_info(const Glib::RefPtr<Gio::AsyncResult>& result, const 
std::weak_ptr<Gio::File>& source_weak) const
 {
-  const auto source = source_weak.get();
+  const auto source = source_weak.lock();
   if (!source)
     return;
 
diff --git a/glom/import_csv/csv_parser.h b/glom/import_csv/csv_parser.h
index 4dd9265..75b2e44 100644
--- a/glom/import_csv/csv_parser.h
+++ b/glom/import_csv/csv_parser.h
@@ -29,7 +29,6 @@
 #include <giomm/file.h>
 #include <giomm/inputstream.h>
 //#include <gtkmm/liststore.h>
-#include <glibmm/weakref.h>
 
 namespace Glom
 {
@@ -172,9 +171,9 @@ private:
 
   void copy_buffer_and_continue_reading(gssize size);
 
-  void on_file_read(const Glib::RefPtr<Gio::AsyncResult>& result, const Glib::WeakRef<Gio::File>& source);
+  void on_file_read(const Glib::RefPtr<Gio::AsyncResult>& result, const std::weak_ptr<Gio::File>& source);
   void on_buffer_read(const Glib::RefPtr<Gio::AsyncResult>& result);
-  void on_file_query_info(const Glib::RefPtr<Gio::AsyncResult>& result, const Glib::WeakRef<Gio::File>& 
source) const;
+  void on_file_query_info(const Glib::RefPtr<Gio::AsyncResult>& result, const std::weak_ptr<Gio::File>& 
source) const;
 
   void set_state(State state);
 
diff --git a/glom/mode_design/relationships_overview/window_relationships_overview.cc 
b/glom/mode_design/relationships_overview/window_relationships_overview.cc
index 0e0c469..99f8e8b 100644
--- a/glom/mode_design/relationships_overview/window_relationships_overview.cc
+++ b/glom/mode_design/relationships_overview/window_relationships_overview.cc
@@ -406,9 +406,9 @@ void Window_RelationshipsOverview::on_table_moved(const Glib::RefPtr<CanvasItemM
   draw_lines();
 }
 
-void Window_RelationshipsOverview::on_table_show_context(Gdk::EventButton& event, const 
Glib::WeakRef<CanvasGroupDbTable>& table_weak)
+void Window_RelationshipsOverview::on_table_show_context(Gdk::EventButton& event, const 
std::weak_ptr<CanvasGroupDbTable>& table_weak)
 {
-  const auto table = table_weak.get();
+  const auto table = table_weak.lock();
   if (!table)
     return;
 
@@ -450,9 +450,9 @@ void Window_RelationshipsOverview::setup_context_menu()
   m_context_menu->attach_to_widget(*this);
 }
 
-void Window_RelationshipsOverview::on_context_menu_edit_fields(const Glib::VariantBase& /* parameter */, 
const Glib::WeakRef<CanvasGroupDbTable>& table_weak)
+void Window_RelationshipsOverview::on_context_menu_edit_fields(const Glib::VariantBase& /* parameter */, 
const std::weak_ptr<CanvasGroupDbTable>& table_weak)
 {
-  const auto table = table_weak.get();
+  const auto table = table_weak.lock();
   if (!table)
     return;
 
@@ -465,9 +465,9 @@ void Window_RelationshipsOverview::on_context_menu_edit_fields(const Glib::Varia
   }
 }
 
-void Window_RelationshipsOverview::on_context_menu_edit_relationships(const Glib::VariantBase& /* parameter 
*/, const Glib::WeakRef<CanvasGroupDbTable>& table_weak)
+void Window_RelationshipsOverview::on_context_menu_edit_relationships(const Glib::VariantBase& /* parameter 
*/, const std::weak_ptr<CanvasGroupDbTable>& table_weak)
 {
-  const auto table = table_weak.get();
+  const auto table = table_weak.lock();
   if (!table)
     return;
 
diff --git a/glom/mode_design/relationships_overview/window_relationships_overview.h 
b/glom/mode_design/relationships_overview/window_relationships_overview.h
index 6761e94..802246a 100644
--- a/glom/mode_design/relationships_overview/window_relationships_overview.h
+++ b/glom/mode_design/relationships_overview/window_relationships_overview.h
@@ -30,7 +30,6 @@
 #include <gtkmm/printoperation.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/builder.h>
-#include <glibmm/weakref.h>
 #include <goocanvasmm/canvas.h>
 #include <unordered_map>
 #include <vector>
@@ -68,10 +67,10 @@ private:
   void on_menu_view_showgrid(const Glib::VariantBase& /* parameter */);
 
   void on_table_moved(const Glib::RefPtr<CanvasItemMovable>& item, double x_offset, double y_offset);
-  void on_table_show_context(Gdk::EventButton& event, const Glib::WeakRef<CanvasGroupDbTable>& table);
+  void on_table_show_context(Gdk::EventButton& event, const std::weak_ptr<CanvasGroupDbTable>& table);
 
-  void on_context_menu_edit_fields(const Glib::VariantBase& parameter, const 
Glib::WeakRef<CanvasGroupDbTable>& table);
-  void on_context_menu_edit_relationships(const Glib::VariantBase& parameter, const 
Glib::WeakRef<CanvasGroupDbTable>& table);
+  void on_context_menu_edit_fields(const Glib::VariantBase& parameter, const 
std::weak_ptr<CanvasGroupDbTable>& table);
+  void on_context_menu_edit_relationships(const Glib::VariantBase& parameter, const 
std::weak_ptr<CanvasGroupDbTable>& table);
 
   void on_scroll_value_changed();
 
diff --git a/glom/mode_design/report_layout/dialog_layout_report.cc 
b/glom/mode_design/report_layout/dialog_layout_report.cc
index 8ed8584..80b0403 100644
--- a/glom/mode_design/report_layout/dialog_layout_report.cc
+++ b/glom/mode_design/report_layout/dialog_layout_report.cc
@@ -941,9 +941,9 @@ void Dialog_Layout_Report::on_treeview_parts_selection_changed()
   enable_buttons();
 }
 
-void Dialog_Layout_Report::on_cell_data_part(Gtk::CellRenderer* renderer, const 
Gtk::TreeModel::const_iterator& iter, const Glib::WeakRef<type_model>& model_weak)
+void Dialog_Layout_Report::on_cell_data_part(Gtk::CellRenderer* renderer, const 
Gtk::TreeModel::const_iterator& iter, const std::weak_ptr<type_model>& model_weak)
 {
-  const auto model = model_weak.get();
+  const auto model = model_weak.lock();
   if (!model)
     return;
 
@@ -966,9 +966,9 @@ void Dialog_Layout_Report::on_cell_data_part(Gtk::CellRenderer* renderer, const
   renderer_text->property_editable() = false; //Part names can never be edited.
 }
 
-void Dialog_Layout_Report::on_cell_data_details(Gtk::CellRenderer* renderer, const 
Gtk::TreeModel::const_iterator& iter, const Glib::WeakRef<type_model>& model_weak)
+void Dialog_Layout_Report::on_cell_data_details(Gtk::CellRenderer* renderer, const 
Gtk::TreeModel::const_iterator& iter, const std::weak_ptr<type_model>& model_weak)
 {
-  const auto model = model_weak.get();
+  const auto model = model_weak.lock();
   if(!model)
     return;
 
diff --git a/glom/mode_design/report_layout/dialog_layout_report.h 
b/glom/mode_design/report_layout/dialog_layout_report.h
index 3bad0f9..a97937b 100644
--- a/glom/mode_design/report_layout/dialog_layout_report.h
+++ b/glom/mode_design/report_layout/dialog_layout_report.h
@@ -27,7 +27,6 @@
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/label.h>
 #include <gtkmm/entry.h>
-#include <glibmm/weakref.h>
 #include "treestore_report_layout.h"
 //#include <libglom/data_structure/layout/layoutitem.h>
 //#include <libglom/sharedptr.h>
@@ -92,8 +91,8 @@ private:
   void on_treeview_parts_selection_changed();
   void on_treeview_available_parts_selection_changed();
 
-  void on_cell_data_part(Gtk::CellRenderer* renderer, const Gtk::TreeModel::const_iterator& iter, const 
Glib::WeakRef<type_model>& model);
-  void on_cell_data_details(Gtk::CellRenderer* renderer, const Gtk::TreeModel::const_iterator& iter, const 
Glib::WeakRef<type_model>& model);
+  void on_cell_data_part(Gtk::CellRenderer* renderer, const Gtk::TreeModel::const_iterator& iter, const 
std::weak_ptr<type_model>& model);
+  void on_cell_data_details(Gtk::CellRenderer* renderer, const Gtk::TreeModel::const_iterator& iter, const 
std::weak_ptr<type_model>& model);
 
   void on_cell_data_available_part(Gtk::CellRenderer* renderer, const Gtk::TreeModel::const_iterator& iter);
 
diff --git a/glom/print_layout/canvas_print_layout.cc b/glom/print_layout/canvas_print_layout.cc
index d1609b3..8dbac25 100644
--- a/glom/print_layout/canvas_print_layout.cc
+++ b/glom/print_layout/canvas_print_layout.cc
@@ -291,9 +291,9 @@ void Canvas_PrintLayout::setup_context_menu()
 }
 
 
-void Canvas_PrintLayout::on_item_show_context_menu(Gdk::EventButton& event, const 
Glib::WeakRef<CanvasLayoutItem>& item_weak)
+void Canvas_PrintLayout::on_item_show_context_menu(Gdk::EventButton& event, const 
std::weak_ptr<CanvasLayoutItem>& item_weak)
 {
-  const auto item = item_weak.get();
+  const auto item = item_weak.lock();
   if(!item)
     return;
 
diff --git a/glom/print_layout/canvas_print_layout.h b/glom/print_layout/canvas_print_layout.h
index 263ab95..f6b4374 100644
--- a/glom/print_layout/canvas_print_layout.h
+++ b/glom/print_layout/canvas_print_layout.h
@@ -29,7 +29,6 @@
 #include <giomm/simpleactiongroup.h>
 #include <gtkmm/pagesetup.h>
 #include <gtkmm/menu.h>
-#include <glibmm/weakref.h>
 
 namespace Glom
 {
@@ -120,7 +119,7 @@ private:
   std::shared_ptr<LayoutItem_Line> offer_line(const std::shared_ptr<LayoutItem_Line>& portal, Gtk::Window* 
parent);
 
   //TODO: Make the signal send the item, so we can pass it by const reference:
-  void on_item_show_context_menu(Gdk::EventButton& event, const Glib::WeakRef<CanvasLayoutItem>& item);
+  void on_item_show_context_menu(Gdk::EventButton& event, const std::weak_ptr<CanvasLayoutItem>& item);
   void on_context_menu_edit();
   void on_context_menu_formatting();
   void on_context_menu_delete();