[glom] Removed more unused methods.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Removed more unused methods.
- Date: Thu, 16 Dec 2010 13:59:57 +0000 (UTC)
commit e0cc4bf3d6120dd0d9fb84bba1a56327201204c9
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Dec 16 14:43:21 2010 +0100
Removed more unused methods.
glom/bakery/app_withdoc.cc | 5 ----
glom/bakery/app_withdoc.h | 3 --
glom/frame_glom.cc | 21 ------------------
glom/frame_glom.h | 3 --
glom/import_csv/dialog_import_csv.cc | 5 ----
glom/import_csv/dialog_import_csv.h | 2 +-
glom/libglom/connectionpool_backends/postgres.cc | 5 ----
glom/libglom/connectionpool_backends/postgres.h | 7 ------
glom/libglom/data_structure/fieldtypes.cc | 15 -------------
glom/libglom/data_structure/fieldtypes.h | 1 -
glom/libglom/data_structure/glomconversions.cc | 25 ----------------------
glom/libglom/data_structure/glomconversions.h | 2 -
glom/print_layout/canvas_print_layout.cc | 5 ----
glom/print_layout/canvas_print_layout.h | 1 -
14 files changed, 1 insertions(+), 99 deletions(-)
---
diff --git a/glom/bakery/app_withdoc.cc b/glom/bakery/app_withdoc.cc
index 5dc768e..e11b5b6 100644
--- a/glom/bakery/app_withdoc.cc
+++ b/glom/bakery/app_withdoc.cc
@@ -386,11 +386,6 @@ void App_WithDoc::offer_to_save_changes()
}
}
-void App_WithDoc::close_mark_or_destroy()
-{
- ui_hide();
-}
-
void App_WithDoc::cancel_close_or_exit()
{
set_operation_cancelled();
diff --git a/glom/bakery/app_withdoc.h b/glom/bakery/app_withdoc.h
index 71cdbbc..678890e 100644
--- a/glom/bakery/app_withdoc.h
+++ b/glom/bakery/app_withdoc.h
@@ -140,9 +140,6 @@ protected:
///Stop the File|Close or the File|Exit.
virtual void cancel_close_or_exit();
- ///destroy it or mark it for destruction.
- virtual void close_mark_or_destroy();
-
virtual void update_window_title();
virtual void after_successful_save(); //e.g. disable File|Save.
diff --git a/glom/frame_glom.cc b/glom/frame_glom.cc
index 2f3887a..5d80be5 100644
--- a/glom/frame_glom.cc
+++ b/glom/frame_glom.cc
@@ -1207,11 +1207,6 @@ void Frame_Glom::on_menu_Reports_EditReports()
on_menu_developer_reports();
}
-void Frame_Glom::on_menu_File_EditPrintLayouts()
-{
- on_menu_developer_print_layouts();
-}
-
void Frame_Glom::on_menu_Tables_EditTables()
{
do_menu_Navigate_Table();
@@ -2577,22 +2572,6 @@ void Frame_Glom::on_dialog_layout_print_hide()
if(pApp)
pApp->fill_menu_print_layouts(m_table_name);
}
-
-void Frame_Glom::on_dialog_reports_hide()
-{
- //Update the reports menu:
- Application* pApp = dynamic_cast<Application*>(get_app_window());
- if(pApp)
- pApp->fill_menu_reports(m_table_name);
-}
-
-void Frame_Glom::on_dialog_print_layouts_hide()
-{
- //Update the reports menu:
- Application* pApp = dynamic_cast<Application*>(get_app_window());
- if(pApp)
- pApp->fill_menu_print_layouts(m_table_name);
-}
#endif // !GLOM_ENABLE_CLIENT_ONLY
void Frame_Glom::on_dialog_tables_hide()
diff --git a/glom/frame_glom.h b/glom/frame_glom.h
index 94de94e..77c83eb 100644
--- a/glom/frame_glom.h
+++ b/glom/frame_glom.h
@@ -113,7 +113,6 @@ public:
#ifndef GLOM_ENABLE_CLIENT_ONLY
void on_menu_Reports_EditReports();
- void on_menu_File_EditPrintLayouts();
void on_menu_developer_database_preferences();
void on_menu_developer_fields();
void do_menu_developer_fields(Gtk::Window& parent);
@@ -130,9 +129,7 @@ public:
void on_developer_dialog_hide();
void on_dialog_layout_report_hide();
- void on_dialog_reports_hide();
void on_dialog_layout_print_hide();
- void on_dialog_print_layouts_hide();
void on_dialog_add_related_table_request_edit_fields();
#endif // !GLOM_ENABLE_CLIENT_ONLY
diff --git a/glom/import_csv/dialog_import_csv.cc b/glom/import_csv/dialog_import_csv.cc
index 2cf937b..378d978 100644
--- a/glom/import_csv/dialog_import_csv.cc
+++ b/glom/import_csv/dialog_import_csv.cc
@@ -223,11 +223,6 @@ void Dialog_Import_CSV::import(const Glib::ustring& uri, const Glib::ustring& in
}
}
-guint Dialog_Import_CSV::get_column_count() const
-{
- return m_cols_count;
-}
-
sharedptr<const Field> Dialog_Import_CSV::get_field_for_column(guint col) const
{
if(col >= m_fields.size())
diff --git a/glom/import_csv/dialog_import_csv.h b/glom/import_csv/dialog_import_csv.h
index 48b3c2b..b56d802 100644
--- a/glom/import_csv/dialog_import_csv.h
+++ b/glom/import_csv/dialog_import_csv.h
@@ -55,7 +55,7 @@ public:
Glib::ustring get_target_table_name() const;
const Glib::ustring& get_file_uri() const;
- unsigned int get_column_count() const;
+
sharedptr<const Field> get_field_for_column(unsigned int col) const;
const Glib::ustring& get_data(unsigned int row, unsigned int col);
diff --git a/glom/libglom/connectionpool_backends/postgres.cc b/glom/libglom/connectionpool_backends/postgres.cc
index cdc8a9f..957fd65 100644
--- a/glom/libglom/connectionpool_backends/postgres.cc
+++ b/glom/libglom/connectionpool_backends/postgres.cc
@@ -58,11 +58,6 @@ Postgres::Postgres()
{
}
-float Postgres::get_postgres_server_version() const
-{
- return m_postgres_server_version;
-}
-
Glib::RefPtr<Gnome::Gda::Connection> Postgres::attempt_connect(const Glib::ustring& port, const Glib::ustring& database, const Glib::ustring& username, const Glib::ustring& password)
{
//We must specify _some_ database even when we just want to create a database.
diff --git a/glom/libglom/connectionpool_backends/postgres.h b/glom/libglom/connectionpool_backends/postgres.h
index 7f6d213..cf80638 100644
--- a/glom/libglom/connectionpool_backends/postgres.h
+++ b/glom/libglom/connectionpool_backends/postgres.h
@@ -37,13 +37,6 @@ class Postgres : public Backend
public:
Postgres();
- /** Return the version number of the connected postgres server.
- * This can be used to adapt to different server features.
- *
- * @result The version, or 0 if no connection has been made.
- */
- float get_postgres_server_version() const;
-
/** Check whether the libgda postgres provider is really available,
* so we can connect to postgres servers,
* in case the distro package has incorrect dependencies.
diff --git a/glom/libglom/data_structure/fieldtypes.cc b/glom/libglom/data_structure/fieldtypes.cc
index b4c460d..4a3b181 100644
--- a/glom/libglom/data_structure/fieldtypes.cc
+++ b/glom/libglom/data_structure/fieldtypes.cc
@@ -105,21 +105,6 @@ FieldTypes::~FieldTypes()
{
}
-GType FieldTypes::get_gdavalue_for_schema_type_string(const Glib::ustring& schema_type_string) const
-{
- // Special case varchar, because we also specialized it in
- // get_string_name_for_gdavaluetype, so that we can properly convert back
- // and forth between sql typename and gda type.
- if(schema_type_string == "varchar")
- return G_TYPE_STRING;
-
- type_mapSchemaStringsToGdaTypes::const_iterator iterFind = m_mapSchemaStringsToGdaTypes.find(schema_type_string);
- if(iterFind == m_mapSchemaStringsToGdaTypes.end())
- return GDA_TYPE_NULL;
- else
- return iterFind->second;
-}
-
Glib::ustring FieldTypes::get_string_name_for_gdavaluetype(GType field_type) const
{
//Special-case gchararray (G_TYPE_STRING) because Gda reports this GType for several
diff --git a/glom/libglom/data_structure/fieldtypes.h b/glom/libglom/data_structure/fieldtypes.h
index 49265f9..0eb1fb2 100644
--- a/glom/libglom/data_structure/fieldtypes.h
+++ b/glom/libglom/data_structure/fieldtypes.h
@@ -35,7 +35,6 @@ public:
FieldTypes(const Glib::RefPtr<Gnome::Gda::Connection>& gda_connection);
virtual ~FieldTypes();
- GType get_gdavalue_for_schema_type_string(const Glib::ustring& schema_type_string) const;
Glib::ustring get_string_name_for_gdavaluetype(GType field_type) const;
GType get_fallback_type_for_gdavaluetype(GType field_type) const;
diff --git a/glom/libglom/data_structure/glomconversions.cc b/glom/libglom/data_structure/glomconversions.cc
index 03218ca..d70bc0d 100644
--- a/glom/libglom/data_structure/glomconversions.cc
+++ b/glom/libglom/data_structure/glomconversions.cc
@@ -34,34 +34,9 @@
#include <iomanip>
#include <string.h> // for strlen, memset, strcmp
-namespace
-{
- char hextochar(guint8 hex)
- {
- if(hex < 10) return '0' + hex;
- if(hex < 16) return 'a' - 10 + hex;
- return '\0';
- }
-
- guint8 chartohex(char c)
- {
- if(c >= '0' && c <= '9') return c - '0';
- if(c >= 'a' && c <= 'f') return c - 'a' + 10;
- if(c >= 'A' && c <= 'F') return c - 'A' + 10;
- return 0;
- }
-}
-
namespace Glom
{
-
-unsigned int Conversions::get_stringstream_precision_default()
-{
- static const unsigned int stringstream_precision_default = 15;
- return stringstream_precision_default;
-}
-
Glib::ustring Conversions::format_time(const tm& tm_data)
{
return format_time( tm_data, std::locale("") /* the user's current locale */ ); //Get the current locale.
diff --git a/glom/libglom/data_structure/glomconversions.h b/glom/libglom/data_structure/glomconversions.h
index c4d0f51..868de48 100644
--- a/glom/libglom/data_structure/glomconversions.h
+++ b/glom/libglom/data_structure/glomconversions.h
@@ -32,8 +32,6 @@ namespace Glom
namespace Conversions
{
- unsigned int get_stringstream_precision_default();
-
///Get text for display to the user.
Glib::ustring get_text_for_gda_value(Field::glom_field_type glom_type, const Gnome::Gda::Value& value, const NumericFormat& numeric_format = NumericFormat());
Glib::ustring get_text_for_gda_value(Field::glom_field_type glom_type, const Gnome::Gda::Value& value, const std::locale& locale, const NumericFormat& numeric_format = NumericFormat(), bool iso_format = false);
diff --git a/glom/print_layout/canvas_print_layout.cc b/glom/print_layout/canvas_print_layout.cc
index fa5f220..d1caa90 100644
--- a/glom/print_layout/canvas_print_layout.cc
+++ b/glom/print_layout/canvas_print_layout.cc
@@ -783,11 +783,6 @@ void Canvas_PrintLayout::set_zoom_percent(guint percent)
set_scale(scale);
}
-guint Canvas_PrintLayout::get_zoom_percent() const
-{
- return (guint)(get_scale() * (double)100);
-}
-
void Canvas_PrintLayout::hide_page_bounds()
{
m_bounds_group->property_visibility() = Goocanvas::ITEM_HIDDEN;
diff --git a/glom/print_layout/canvas_print_layout.h b/glom/print_layout/canvas_print_layout.h
index ec8e326..73ca62a 100644
--- a/glom/print_layout/canvas_print_layout.h
+++ b/glom/print_layout/canvas_print_layout.h
@@ -51,7 +51,6 @@ public:
Glib::RefPtr<Gtk::PageSetup> get_page_setup();
void set_zoom_percent(guint percent);
- guint get_zoom_percent() const;
/** Hide the bounds rectangle and the margin lines:
*/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]