[glom] Remove unused methods.



commit 9a70a42b246aad9bada5a12437880547cabf668c
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Oct 30 14:46:01 2015 +0100

    Remove unused methods.

 glom/base_db_table_data.cc               |    8 --------
 glom/base_db_table_data.h                |    1 -
 glom/print_layout/canvas_layout_item.cc  |   25 -------------------------
 glom/print_layout/canvas_layout_item.h   |    2 --
 glom/print_layout/canvas_print_layout.cc |    2 --
 glom/utility_widgets/flowtable.cc        |    5 -----
 glom/utility_widgets/flowtable.h         |    5 -----
 7 files changed, 0 insertions(+), 48 deletions(-)
---
diff --git a/glom/base_db_table_data.cc b/glom/base_db_table_data.cc
index b50eb13..4b0a1ce 100644
--- a/glom/base_db_table_data.cc
+++ b/glom/base_db_table_data.cc
@@ -40,14 +40,6 @@ Base_DB_Table_Data::~Base_DB_Table_Data()
 {
 }
 
-Gnome::Gda::Value Base_DB_Table_Data::get_entered_field_data_field_only(const std::shared_ptr<const Field>& 
field) const
-{
-  std::shared_ptr<LayoutItem_Field> layout_item = std::make_shared<LayoutItem_Field>();
-  layout_item->set_full_field_details(field);
-
-  return get_entered_field_data(layout_item);
-}
-
 Gnome::Gda::Value Base_DB_Table_Data::get_entered_field_data(const std::shared_ptr<const LayoutItem_Field>& 
/* field */) const
 {
   //Override this to use Field::set_data() too.
diff --git a/glom/base_db_table_data.h b/glom/base_db_table_data.h
index 742aca1..f65b076 100644
--- a/glom/base_db_table_data.h
+++ b/glom/base_db_table_data.h
@@ -52,7 +52,6 @@ protected:
    */
   bool record_new(bool use_entered_data = true, const Gnome::Gda::Value& primary_key_value = 
Gnome::Gda::Value());
 
-  Gnome::Gda::Value get_entered_field_data_field_only(const std::shared_ptr<const Field>& field) const;
   virtual Gnome::Gda::Value get_entered_field_data(const std::shared_ptr<const LayoutItem_Field>& field) 
const;
 
   //Gets the row being edited, for derived classes that have rows.
diff --git a/glom/print_layout/canvas_layout_item.cc b/glom/print_layout/canvas_layout_item.cc
index f4f3e35..602c2ff 100644
--- a/glom/print_layout/canvas_layout_item.cc
+++ b/glom/print_layout/canvas_layout_item.cc
@@ -157,31 +157,6 @@ void CanvasLayoutItem::set_layout_item(const std::shared_ptr<LayoutItem>& layout
   }
 }
 
-//TODO: Remove this?
-int CanvasLayoutItem::get_rows_count_for_portal(const std::shared_ptr<const LayoutItem_Portal>& portal, 
double& row_height)
-{
-  if(!portal)
-  {
-    row_height = 0;
-    return 0;
-  }
-
-  row_height = std::max(portal->get_print_layout_row_height(), (double)1); //Avoid 0, because that makes the 
whole thing zero sized.
-
-  double ignore_x = 0;
-  double ignore_y = 0;
-  double total_width = 0;
-  double total_height = 0;
-  portal->get_print_layout_position(ignore_x, ignore_y, total_width, total_height);
-
-  const double max_rows_fraction = total_height / row_height;
-  double max_rows = 0;
-  modf(max_rows_fraction, &max_rows);
-  std::cout << "debug: max_rows=" << max_rows << ", for total_height=" << total_height << ", row_height=" << 
row_height << std::endl;
-
-  return max_rows;
-}
-
 Glib::RefPtr<CanvasItemMovable> CanvasLayoutItem::create_canvas_item_for_layout_item(const 
std::shared_ptr<LayoutItem>& layout_item)
 {
   Glib::RefPtr<CanvasItemMovable> child;
diff --git a/glom/print_layout/canvas_layout_item.h b/glom/print_layout/canvas_layout_item.h
index 005e70c..07483ea 100644
--- a/glom/print_layout/canvas_layout_item.h
+++ b/glom/print_layout/canvas_layout_item.h
@@ -68,8 +68,6 @@ public:
   /// Hide the missing-image pixbuf from images, for instance.
   void remove_empty_indicators();
 
-  static int get_rows_count_for_portal(const std::shared_ptr<const LayoutItem_Portal>& portal, double& 
row_height);
-
   /** Make sure that the LayoutItem has the same position info as the CanvasItem that represents it.
    */
   void update_layout_position_from_canvas();
diff --git a/glom/print_layout/canvas_print_layout.cc b/glom/print_layout/canvas_print_layout.cc
index 12963ee..0bfe62d 100644
--- a/glom/print_layout/canvas_print_layout.cc
+++ b/glom/print_layout/canvas_print_layout.cc
@@ -927,8 +927,6 @@ void Canvas_PrintLayout::fill_with_data_portal(const Glib::RefPtr<CanvasLayoutIt
   //Do not use less than the minimum:
   rows_count = std::max(rows_count, (int)rows_count_min);
 
-  // TODO: Remove this method and/or change it to recalc the min when changing the height:
-  //CanvasLayoutItem::get_rows_count_for_portal(portal, row_height_ignored);
   const double portal_height = rows_count * portal->get_print_layout_row_height();
 
   double old_width = 0;
diff --git a/glom/utility_widgets/flowtable.cc b/glom/utility_widgets/flowtable.cc
index e6ce0f2..d25effe 100644
--- a/glom/utility_widgets/flowtable.cc
+++ b/glom/utility_widgets/flowtable.cc
@@ -202,11 +202,6 @@ void FlowTable::remove(Gtk::Widget& first)
 
   Egg::SpreadTableDnd::remove_child(first);
 }
-
-FlowTable::type_const_list_widgets FlowTable::get_first_child_widgets() const
-{
-  return m_list_first_widgets;
-}
   
 bool FlowTable::get_column_for_first_widget(const Gtk::Widget& first, guint& column) const
 {
diff --git a/glom/utility_widgets/flowtable.h b/glom/utility_widgets/flowtable.h
index 86bc826..82a1f8a 100644
--- a/glom/utility_widgets/flowtable.h
+++ b/glom/utility_widgets/flowtable.h
@@ -58,11 +58,6 @@ protected:
 
   typedef std::list<const Gtk::Widget*> type_const_list_widgets;
 
-  /** This returns all first widgets added with FlowTable::add().
-   * Gtk::Container::get_children() instead returns internal widgets.
-   */
-  type_const_list_widgets get_first_child_widgets() const;
-
   bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr) override;
 
 private:


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]