glom r1805 - in trunk: . glom/libglom glom/libglom/connectionpool_backends glom/libglom/data_structure glom/libglom/document glom/mode_data glom/relationships_overview glom/translation glom/utility_widgets glom/utility_widgets/adddel glom/utility_widgets/calendar glom/utility_widgets/canvas glom/utility_widgets/egg/toolpalette
- From: murrayc svn gnome org
- To: svn-commits-list gnome org
- Subject: glom r1805 - in trunk: . glom/libglom glom/libglom/connectionpool_backends glom/libglom/data_structure glom/libglom/document glom/mode_data glom/relationships_overview glom/translation glom/utility_widgets glom/utility_widgets/adddel glom/utility_widgets/calendar glom/utility_widgets/canvas glom/utility_widgets/egg/toolpalette
- Date: Mon, 15 Dec 2008 14:00:34 +0000 (UTC)
Author: murrayc
Date: Mon Dec 15 14:00:33 2008
New Revision: 1805
URL: http://svn.gnome.org/viewvc/glom?rev=1805&view=rev
Log:
2008-12-15 Murray Cumming <murrayc murrayc com>
* glom/libglom/connectionpool.cc:
* glom/libglom/connectionpool.h:
* glom/libglom/connectionpool_backends/postgres_self.cc:
* glom/libglom/connectionpool_backends/sqlite.cc:
* glom/libglom/data_structure/glomconversions.cc:
* glom/libglom/document/document_glom.cc:
* glom/mode_data/box_data_calendar_related.cc:
* glom/mode_data/box_data_portal.cc:
* glom/mode_data/flowtablewithfields.cc:
* glom/relationships_overview/dialog_relationships_overview.cc:
* glom/relationships_overview/dialog_relationships_overview.h:
* glom/relationships_overview/printoperation_relationshipsoverview.cc:
* glom/translation/window_translations.cc:
* glom/utility_widgets/adddel/adddel.cc:
* glom/utility_widgets/calendar/glomcalendar.cc:
* glom/utility_widgets/calendar/glomcalendar.h:
* glom/utility_widgets/calendar/glomgtkcalendar.h:
* glom/utility_widgets/canvas/canvas_group_resizable.cc:
* glom/utility_widgets/canvas/canvas_item_movable.cc:
* glom/utility_widgets/datawidget.cc:
* glom/utility_widgets/egg/toolpalette/eggtoolpalette.h:
* glom/utility_widgets/flowtable.cc:
* glom/utility_widgets/flowtable_dnd.cc:
* glom/utility_widgets/sidebar.cc: Avoided compiler warnings, mostly
commenting out unused parameters.
Modified:
trunk/ChangeLog
trunk/glom/libglom/connectionpool.cc
trunk/glom/libglom/connectionpool.h
trunk/glom/libglom/connectionpool_backends/postgres_self.cc
trunk/glom/libglom/connectionpool_backends/sqlite.cc
trunk/glom/libglom/data_structure/glomconversions.cc
trunk/glom/libglom/document/document_glom.cc
trunk/glom/mode_data/box_data_calendar_related.cc
trunk/glom/mode_data/box_data_portal.cc
trunk/glom/mode_data/flowtablewithfields.cc
trunk/glom/relationships_overview/dialog_relationships_overview.cc
trunk/glom/relationships_overview/dialog_relationships_overview.h
trunk/glom/relationships_overview/printoperation_relationshipsoverview.cc
trunk/glom/translation/window_translations.cc
trunk/glom/utility_widgets/adddel/adddel.cc
trunk/glom/utility_widgets/calendar/glomcalendar.cc
trunk/glom/utility_widgets/calendar/glomcalendar.h
trunk/glom/utility_widgets/calendar/glomgtkcalendar.h
trunk/glom/utility_widgets/canvas/canvas_group_resizable.cc
trunk/glom/utility_widgets/canvas/canvas_item_movable.cc
trunk/glom/utility_widgets/datawidget.cc
trunk/glom/utility_widgets/egg/toolpalette/eggtoolpalette.h
trunk/glom/utility_widgets/flowtable.cc
trunk/glom/utility_widgets/flowtable_dnd.cc
trunk/glom/utility_widgets/sidebar.cc
Modified: trunk/glom/libglom/connectionpool.cc
==============================================================================
--- trunk/glom/libglom/connectionpool.cc (original)
+++ trunk/glom/libglom/connectionpool.cc Mon Dec 15 14:00:33 2008
@@ -220,6 +220,21 @@
}
+
+bool ConnectionPoolBackend::initialize(Gtk::Window* /* parent_window */, const Glib::ustring& /* initial_username */, const Glib::ustring& /* password */)
+{
+ return true;
+}
+
+bool ConnectionPoolBackend::startup(Gtk::Window* /* parent_window */)
+{
+ return true;
+}
+
+void ConnectionPoolBackend::cleanup(Gtk::Window* /* parent_window */)
+{}
+
+
//init_db_details static data:
ConnectionPool* ConnectionPool::m_instance = 0;
Modified: trunk/glom/libglom/connectionpool.h
==============================================================================
--- trunk/glom/libglom/connectionpool.h (original)
+++ trunk/glom/libglom/connectionpool.h Mon Dec 15 14:00:33 2008
@@ -98,7 +98,9 @@
class Document_Glom;
-/* This hides database specific functionality from the ConnectionPool, so
+//TODO: Put this in the sub-directory:
+
+/** This hides database specific functionality from the ConnectionPool, so
* the ConnectionPool can be used without worrying about the actual database
* backend in use. Use ConnectionPool::set_backend() to set the backend for
* the connectionpool to use. */
@@ -112,7 +114,7 @@
/* TODO: Merge create_database() and initialize() into a single function?
*/
- /* This method specifies the format of values in SQL expressions.
+ /** This method specifies the format of values in SQL expressions.
*/
virtual Field::sql_format get_sql_format() const = 0;
@@ -120,31 +122,31 @@
* was called. */
virtual bool supports_remote_access() const = 0;
- /* This method is called for one-time initialization of the database
+ /** This method is called for one-time initialization of the database
* storage. No need to implement this function if the data is centrally
* hosted, not managed by Glom. */
- virtual bool initialize(Gtk::Window* parent_window, const Glib::ustring& initial_username, const Glib::ustring& password) { return true; }
+ virtual bool initialize(Gtk::Window* parent_window, const Glib::ustring& initial_username, const Glib::ustring& password);
- /* This method is called before the backend is used otherwise. This can
- * be used to start a self-hosted database server. No need to implement
+ /** This method is called before the backend is used otherwise. This can
+ * be used to start a self-hosted database server. There is no need to implement
* this function if there is no need for extra startup code. */
- virtual bool startup(Gtk::Window* parent_window) { return true; }
+ virtual bool startup(Gtk::Window* parent_window);
- /* This method is called when the backend is no longer used. This can be
- * used to shut down a self-hosted database server. No need to
+ /** This method is called when the backend is no longer used. This can be
+ * used to shut down a self-hosted database server. There is no need to
* implement this function if there is no need for extra cleanup code. */
- virtual void cleanup(Gtk::Window* parent_window) {}
+ virtual void cleanup(Gtk::Window* parent_window);
- /* This method is called to create a connection to the database server.
+ /** This method is called to create a connection to the database server.
* There exists only the variant with an error variable as last parameter
* so we don't need #ifdefs all over the code. This part of the API is only
* used by the ConnectionPool which will translate the error back into
* an exception in case exceptions are enabled. */
virtual Glib::RefPtr<Gnome::Gda::Connection> connect(const Glib::ustring& database, const Glib::ustring& username, const Glib::ustring& password, std::auto_ptr<ExceptionConnection>& error) = 0;
- /* This method is called to create a new database on the
- * database server. */
#ifndef GLOM_ENABLE_CLIENT_ONLY
+ /** This method is called to create a new database on the
+ * database server. */
virtual bool create_database(const Glib::ustring& database_name, const Glib::ustring& username, const Glib::ustring& password, std::auto_ptr<Glib::Error>& error) = 0;
#endif
};
Modified: trunk/glom/libglom/connectionpool_backends/postgres_self.cc
==============================================================================
--- trunk/glom/libglom/connectionpool_backends/postgres_self.cc (original)
+++ trunk/glom/libglom/connectionpool_backends/postgres_self.cc Mon Dec 15 14:00:33 2008
@@ -201,7 +201,7 @@
/** Try to install postgres on the distro, though this will require a
* distro-specific patch to the implementation.
*/
-bool PostgresSelfHosted::install_postgres(Gtk::Window* parent_window)
+bool PostgresSelfHosted::install_postgres(Gtk::Window* /* parent_window */)
{
#if 0
// This is example code for Ubuntu, and possibly Debian,
Modified: trunk/glom/libglom/connectionpool_backends/sqlite.cc
==============================================================================
--- trunk/glom/libglom/connectionpool_backends/sqlite.cc (original)
+++ trunk/glom/libglom/connectionpool_backends/sqlite.cc Mon Dec 15 14:00:33 2008
@@ -92,7 +92,7 @@
}
#ifndef GLOM_ENABLE_CLIENT_ONLY
-bool Sqlite::create_database(const Glib::ustring& database_name, const Glib::ustring& username, const Glib::ustring& password, std::auto_ptr<Glib::Error>& error)
+bool Sqlite::create_database(const Glib::ustring& database_name, const Glib::ustring& /* username */, const Glib::ustring& /* password */, std::auto_ptr<Glib::Error>& error)
{
Glib::RefPtr<Gio::File> file = Gio::File::create_for_uri(m_database_directory_uri);
std::string database_directory = file->get_path();
Modified: trunk/glom/libglom/data_structure/glomconversions.cc
==============================================================================
--- trunk/glom/libglom/data_structure/glomconversions.cc (original)
+++ trunk/glom/libglom/data_structure/glomconversions.cc Mon Dec 15 14:00:33 2008
@@ -488,7 +488,7 @@
//This is just a way to get a NUMERIC Gnome::Gda::Value from a numeric type:
//Try to parse the inputted number, according to the current locale.
- GdaNumeric gda_numeric = {0, 0, 0};
+ GdaNumeric gda_numeric = {0, 0, 0, 0};
//Then generate a canonical representation of the number:
std::stringstream clocale_stream;
@@ -548,7 +548,7 @@
the_c_time = parse_time(text, success);
}
- Gnome::Gda::Time gda_time = {0, 0, 0, 0};
+ Gnome::Gda::Time gda_time = {0, 0, 0, 0, 0};
gda_time.hour = the_c_time.tm_hour;
gda_time.minute = the_c_time.tm_min;
gda_time.second = the_c_time.tm_sec;
@@ -580,7 +580,7 @@
double the_number = 0;
the_stream >> the_number; //TODO: Does this throw any exception if the text is an invalid time?
- GdaNumeric gda_numeric = {0, 0, 0};
+ GdaNumeric gda_numeric = {0, 0, 0, 0};
//Then generate a canonical representation of the number:
Modified: trunk/glom/libglom/document/document_glom.cc
==============================================================================
--- trunk/glom/libglom/document/document_glom.cc (original)
+++ trunk/glom/libglom/document/document_glom.cc Mon Dec 15 14:00:33 2008
@@ -1353,7 +1353,7 @@
}
}
-Document_Glom::type_list_layout_groups Document_Glom::get_data_layout_groups_default(const Glib::ustring& layout_name, const Glib::ustring& parent_table_name, const Glib::ustring& layout_platform) const
+Document_Glom::type_list_layout_groups Document_Glom::get_data_layout_groups_default(const Glib::ustring& layout_name, const Glib::ustring& parent_table_name, const Glib::ustring& /* layout_platform */) const
{
//std::cout << "debug: Document_Glom::get_data_layout_groups_default(): table_name = " << parent_table_name << std::endl;
Modified: trunk/glom/mode_data/box_data_calendar_related.cc
==============================================================================
--- trunk/glom/mode_data/box_data_calendar_related.cc (original)
+++ trunk/glom/mode_data/box_data_calendar_related.cc Mon Dec 15 14:00:33 2008
@@ -593,7 +593,7 @@
}
#endif // !GLOM_ENABLE_CLIENT_ONLY
-Gnome::Gda::Value Box_Data_Calendar_Related::get_primary_key_value(const Gtk::TreeModel::iterator& row) const
+Gnome::Gda::Value Box_Data_Calendar_Related::get_primary_key_value(const Gtk::TreeModel::iterator& /* row */) const
{
return Gnome::Gda::Value(); //TODO: m_AddDel.get_value_key(row);
}
Modified: trunk/glom/mode_data/box_data_portal.cc
==============================================================================
--- trunk/glom/mode_data/box_data_portal.cc (original)
+++ trunk/glom/mode_data/box_data_portal.cc Mon Dec 15 14:00:33 2008
@@ -154,7 +154,7 @@
signal_portal_record_changed().emit(m_portal->get_relationship_name());
}
-void Box_Data_Portal::on_record_added(const Gnome::Gda::Value& primary_key_value, const Gtk::TreeModel::iterator& row)
+void Box_Data_Portal::on_record_added(const Gnome::Gda::Value& /* primary_key_value */, const Gtk::TreeModel::iterator& /* row */)
{
//Allow the parent record (Details view) to recalculate aggregations:
signal_portal_record_changed().emit(m_portal->get_relationship_name());
Modified: trunk/glom/mode_data/flowtablewithfields.cc
==============================================================================
--- trunk/glom/mode_data/flowtablewithfields.cc (original)
+++ trunk/glom/mode_data/flowtablewithfields.cc Mon Dec 15 14:00:33 2008
@@ -633,7 +633,7 @@
}
}
-void FlowTableWithFields::add_placeholder_at_position(const sharedptr<LayoutItem_Placeholder>& layoutitem_placeholder, const Glib::ustring& /* table_name */, const type_list_layoutwidgets::iterator& add_before)
+void FlowTableWithFields::add_placeholder_at_position(const sharedptr<LayoutItem_Placeholder>& /* layoutitem_placeholder */, const Glib::ustring& /* table_name */, const type_list_layoutwidgets::iterator& add_before)
{
//Delete any existing placeholder (there can be only one):
if(m_placeholder)
Modified: trunk/glom/relationships_overview/dialog_relationships_overview.cc
==============================================================================
--- trunk/glom/relationships_overview/dialog_relationships_overview.cc (original)
+++ trunk/glom/relationships_overview/dialog_relationships_overview.cc Mon Dec 15 14:00:33 2008
@@ -328,7 +328,7 @@
draw_lines();
}
-void Dialog_RelationshipsOverview::on_response(int id)
+void Dialog_RelationshipsOverview::on_response(int /* id */)
{
if(m_modified && get_document())
get_document()->set_modified();
@@ -528,8 +528,8 @@
double width = m_scrolledwindow_canvas->get_hadjustment()->get_page_size();
double height = m_scrolledwindow_canvas->get_vadjustment()->get_page_size();
- double x = m_scrolledwindow_canvas->get_hadjustment()->get_value();
- double y = m_scrolledwindow_canvas->get_vadjustment()->get_value();
+ //double x = m_scrolledwindow_canvas->get_hadjustment()->get_value();
+ //double y = m_scrolledwindow_canvas->get_vadjustment()->get_value();
//Make sure that the canvas bounds are as big as the scrollable area:
double old_left = 0;
Modified: trunk/glom/relationships_overview/dialog_relationships_overview.h
==============================================================================
--- trunk/glom/relationships_overview/dialog_relationships_overview.h (original)
+++ trunk/glom/relationships_overview/dialog_relationships_overview.h Mon Dec 15 14:00:33 2008
@@ -105,6 +105,6 @@
Glib::RefPtr<Gtk::PageSetup> m_refPageSetup;
};
-}; //namespace Glom
+} //namespace Glom
#endif //GLOM_DIALOG_RELATIONSHIPS_OVERVIEW
Modified: trunk/glom/relationships_overview/printoperation_relationshipsoverview.cc
==============================================================================
--- trunk/glom/relationships_overview/printoperation_relationshipsoverview.cc (original)
+++ trunk/glom/relationships_overview/printoperation_relationshipsoverview.cc Mon Dec 15 14:00:33 2008
@@ -35,13 +35,13 @@
}
void PrintOperationRelationshipsOverview::on_begin_print(
- const Glib::RefPtr<Gtk::PrintContext>& print_context)
+ const Glib::RefPtr<Gtk::PrintContext>& /* print_context */)
{
set_n_pages(1);
}
void PrintOperationRelationshipsOverview::on_draw_page(
- const Glib::RefPtr<Gtk::PrintContext>& print_context, int page_nr)
+ const Glib::RefPtr<Gtk::PrintContext>& print_context, int /* page_nr */)
{
if(!m_canvas)
return;
@@ -52,7 +52,7 @@
//Set a drawing scale (before drawing) so that the cairo context fits on the page:
const double print_height = print_context->get_height();
const double print_width = print_context->get_width();
- std::cout << "print_height=" << print_height << ", print_width=" << print_width << std::endl;
+ //std::cout << "print_height=" << print_height << ", print_width=" << print_width << std::endl;
//TODO: Get the total size of the drawn objects instead of the bounds (which includes extra whitespace):
double canvas_left = 0;
Modified: trunk/glom/translation/window_translations.cc
==============================================================================
--- trunk/glom/translation/window_translations.cc (original)
+++ trunk/glom/translation/window_translations.cc Mon Dec 15 14:00:33 2008
@@ -416,10 +416,12 @@
static void show_gettext_error(int severity, const char* filename, const gchar* message)
{
std::ostringstream msg_stream;
- if(filename != NULL);
+ if(filename != NULL)
msg_stream << filename << ": ";
+
if(message != NULL)
msg_stream << message;
+
switch(severity)
{
#ifdef PO_SEVERITY_WARNING //This was introduced in libgettext-po some time after gettext version 0.14.5
@@ -456,8 +458,8 @@
* and longjmp to bypass this and return to the caller
*/
#ifdef HAVE_GETTEXTPO_XERROR
-static void on_gettextpo_xerror (int severity, po_message_t message, const char *filename, size_t lineno, size_t column,
- int multiline_p, const char *message_text)
+static void on_gettextpo_xerror (int severity, po_message_t /* message */, const char *filename, size_t /* lineno */, size_t /* column */,
+ int /* multiline_p */, const char *message_text)
{
show_gettext_error(severity, filename, message_text);
@@ -467,10 +469,10 @@
#endif //PO_SEVERITY_FATAL_ERROR
}
-static void on_gettextpo_xerror2 (int severity, po_message_t message1, const char *filename1, size_t lineno1, size_t column1,
- int multiline_p1, const char *message_text1,
- po_message_t message2, const char *filename2, size_t lineno2, size_t column2,
- int multiline_p2, const char *message_text2)
+static void on_gettextpo_xerror2 (int severity, po_message_t /* message1 */, const char * filename1, size_t /* lineno1 */, size_t /* column1 */,
+ int /* multiline_p1 */, const char *message_text1,
+ po_message_t /* message2 */, const char * /*filename2 */, size_t /* lineno2 */, size_t /* column2 */,
+ int /* multiline_p2 */, const char * /* message_text2 */)
{
show_gettext_error(severity, filename1, message_text1);
Modified: trunk/glom/utility_widgets/adddel/adddel.cc
==============================================================================
--- trunk/glom/utility_widgets/adddel/adddel.cc (original)
+++ trunk/glom/utility_widgets/adddel/adddel.cc Mon Dec 15 14:00:33 2008
@@ -1070,9 +1070,10 @@
}
AddDel::InnerIgnore::InnerIgnore(AddDel* pOuter)
+: m_pOuter(pOuter),
+ m_bPreventUserSignals(false),
+ m_bIgnoreSheetSignals(false)
{
- m_pOuter = pOuter;
-
if(m_pOuter)
{
m_bPreventUserSignals = m_pOuter->get_prevent_user_signals();
@@ -1304,7 +1305,7 @@
}
-void AddDel::on_treeview_cell_editing_started(Gtk::CellEditable* editable, const Glib::ustring& path_string, int model_column_index)
+void AddDel::on_treeview_cell_editing_started(Gtk::CellEditable* /* editable */, const Glib::ustring& path_string, int model_column_index)
{
Gtk::TreeModel::Path path(path_string);
Modified: trunk/glom/utility_widgets/calendar/glomcalendar.cc
==============================================================================
--- trunk/glom/utility_widgets/calendar/glomcalendar.cc (original)
+++ trunk/glom/utility_widgets/calendar/glomcalendar.cc Mon Dec 15 14:00:33 2008
@@ -84,7 +84,7 @@
#include <gtk/gtkcalendar.h>
-static gchar* SignalProxy_Details_gtk_callback(GlomGtkCalendar* model, guint year, guint month, guint day, gpointer user_data)
+static gchar* SignalProxy_Details_gtk_callback(GlomGtkCalendar* /* model */, guint year, guint month, guint day, gpointer user_data)
{
GlomGtk::Calendar::SlotDetails* the_slot = static_cast<GlomGtk::Calendar::SlotDetails*>(user_data);
Modified: trunk/glom/utility_widgets/calendar/glomcalendar.h
==============================================================================
--- trunk/glom/utility_widgets/calendar/glomcalendar.h (original)
+++ trunk/glom/utility_widgets/calendar/glomcalendar.h Mon Dec 15 14:00:33 2008
@@ -310,7 +310,6 @@
* @newin2p16
*/
void set_detail_func(const SlotDetails& slot);
- ;
void set_detail_width_chars(int chars);
Modified: trunk/glom/utility_widgets/calendar/glomgtkcalendar.h
==============================================================================
--- trunk/glom/utility_widgets/calendar/glomgtkcalendar.h (original)
+++ trunk/glom/utility_widgets/calendar/glomgtkcalendar.h Mon Dec 15 14:00:33 2008
@@ -80,7 +80,7 @@
GLOM_GTK_CALENDAR_NO_MONTH_CHANGE = 1 << 2,
GLOM_GTK_CALENDAR_SHOW_WEEK_NUMBERS = 1 << 3,
GLOM_GTK_CALENDAR_WEEK_START_MONDAY = 1 << 4,
- GLOM_GTK_CALENDAR_SHOW_DETAILS = 1 << 5,
+ GLOM_GTK_CALENDAR_SHOW_DETAILS = 1 << 5
} GlomGtkCalendarDisplayOptions;
/**
Modified: trunk/glom/utility_widgets/canvas/canvas_group_resizable.cc
==============================================================================
--- trunk/glom/utility_widgets/canvas/canvas_group_resizable.cc (original)
+++ trunk/glom/utility_widgets/canvas/canvas_group_resizable.cc Mon Dec 15 14:00:33 2008
@@ -516,7 +516,7 @@
return false;
}
-bool CanvasGroupResizable::on_manipulator_leave_notify_event(const Glib::RefPtr<Goocanvas::Item>& /* target */, GdkEventCrossing* /* event */t)
+bool CanvasGroupResizable::on_manipulator_leave_notify_event(const Glib::RefPtr<Goocanvas::Item>& /* target */, GdkEventCrossing* /* event */)
{
m_in_manipulator = false;
set_manipulators_visibility(Goocanvas::ITEM_INVISIBLE);
@@ -648,14 +648,14 @@
m_group_manipulators->property_visibility() = visibility;
}
-bool CanvasGroupResizable::on_rect_enter_notify_event(const Glib::RefPtr<Goocanvas::Item>& target, GdkEventCrossing* event)
+bool CanvasGroupResizable::on_rect_enter_notify_event(const Glib::RefPtr<Goocanvas::Item>& /* target */, GdkEventCrossing* /* event */)
{
set_manipulators_visibility(Goocanvas::ITEM_VISIBLE);
return true;
}
-bool CanvasGroupResizable::on_rect_leave_notify_event(const Glib::RefPtr<Goocanvas::Item>& target, GdkEventCrossing* event)
+bool CanvasGroupResizable::on_rect_leave_notify_event(const Glib::RefPtr<Goocanvas::Item>& /* target */, GdkEventCrossing* /* event */)
{
//std::cout << "CanvasGroupResizable::on_rect_leave_notify_event" << std::endl;
Modified: trunk/glom/utility_widgets/canvas/canvas_item_movable.cc
==============================================================================
--- trunk/glom/utility_widgets/canvas/canvas_item_movable.cc (original)
+++ trunk/glom/utility_widgets/canvas/canvas_item_movable.cc Mon Dec 15 14:00:33 2008
@@ -171,7 +171,7 @@
return true;
}
-bool CanvasItemMovable::on_enter_notify_event(const Glib::RefPtr<Goocanvas::Item>& target, GdkEventCrossing* event)
+bool CanvasItemMovable::on_enter_notify_event(const Glib::RefPtr<Goocanvas::Item>& /* target */, GdkEventCrossing* /* event */)
{
set_cursor(m_drag_cursor);
@@ -179,7 +179,7 @@
}
-bool CanvasItemMovable::on_leave_notify_event(const Glib::RefPtr<Goocanvas::Item>& target, GdkEventCrossing* event)
+bool CanvasItemMovable::on_leave_notify_event(const Glib::RefPtr<Goocanvas::Item>& /* target */, GdkEventCrossing* /* event */)
{
unset_cursor();
Modified: trunk/glom/utility_widgets/datawidget.cc
==============================================================================
--- trunk/glom/utility_widgets/datawidget.cc (original)
+++ trunk/glom/utility_widgets/datawidget.cc Mon Dec 15 14:00:33 2008
@@ -356,7 +356,7 @@
}
case(Field::TYPE_TIME):
{
- Gnome::Gda::Time time = {0, 0, 0, 0};
+ Gnome::Gda::Time time = {0, 0, 0, 0, 0};
time.hour = 24;
time.minute = 59;
time.second = 59;
@@ -793,7 +793,7 @@
}
}
-void DataWidget::on_self_style_changed(const Glib::RefPtr<Gtk::Style>& style)
+void DataWidget::on_self_style_changed(const Glib::RefPtr<Gtk::Style>& /* style */)
{
sharedptr<LayoutItem_Field> layoutField = sharedptr<LayoutItem_Field>::cast_dynamic(get_layout_item());
set_child_size_by_field(layoutField);
Modified: trunk/glom/utility_widgets/egg/toolpalette/eggtoolpalette.h
==============================================================================
--- trunk/glom/utility_widgets/egg/toolpalette/eggtoolpalette.h (original)
+++ trunk/glom/utility_widgets/egg/toolpalette/eggtoolpalette.h Mon Dec 15 14:00:33 2008
@@ -49,7 +49,7 @@
typedef enum /*< flags >*/
{
EGG_TOOL_PALETTE_DRAG_ITEMS = (1 << 0),
- EGG_TOOL_PALETTE_DRAG_GROUPS = (1 << 1),
+ EGG_TOOL_PALETTE_DRAG_GROUPS = (1 << 1)
}
EggToolPaletteDragTargets;
Modified: trunk/glom/utility_widgets/flowtable.cc
==============================================================================
--- trunk/glom/utility_widgets/flowtable.cc (original)
+++ trunk/glom/utility_widgets/flowtable.cc Mon Dec 15 14:00:33 2008
@@ -59,9 +59,6 @@
}
#endif
- void register_vfuncs(Glom::FlowTable& table)
- {
- }
#if 0
void glom_flowtable_class_init(gpointer g_class, gpointer class_data)
{
@@ -274,7 +271,7 @@
}
-FlowTable::FlowTableItem::FlowTableItem(Gtk::Widget* first, FlowTable* flowtable)
+FlowTable::FlowTableItem::FlowTableItem(Gtk::Widget* first, FlowTable* /* flowtable */)
: m_first(first),
m_second(0),
m_expand_first_full(false),
@@ -283,8 +280,8 @@
}
-FlowTable::FlowTableItem::FlowTableItem(Gtk::Widget* first, Gtk::Widget* second, FlowTable* flowtable)
-: m_first (first),
+FlowTable::FlowTableItem::FlowTableItem(Gtk::Widget* first, Gtk::Widget* second, FlowTable* /* flowtable */)
+: m_first(first),
m_second(second),
m_expand_first_full(false),
m_expand_second(false)
@@ -380,12 +377,12 @@
void FlowTable::add(Gtk::Widget& first, Gtk::Widget& second, bool expand_second)
{
- FlowTableItem item (&first, &second, this);
+ FlowTableItem item(&first, &second, this);
item.m_expand_second = expand_second; //Expand to fill the width for all of the second item.
m_children.push_back(item);
- gtk_widget_set_parent(GTK_WIDGET (item.m_first->gobj()), GTK_WIDGET(gobj()));
- gtk_widget_set_parent(GTK_WIDGET (item.m_second->gobj()), GTK_WIDGET(gobj()));
+ gtk_widget_set_parent(GTK_WIDGET(item.m_first->gobj()), GTK_WIDGET(gobj()));
+ gtk_widget_set_parent(GTK_WIDGET(item.m_second->gobj()), GTK_WIDGET(gobj()));
}
void FlowTable::add(Gtk::Widget& first, bool expand)
@@ -393,28 +390,28 @@
FlowTableItem item(&first, this);
item.m_expand_first_full = expand; //Expand to fill the width for first and second.
m_children.push_back(item);
- gtk_widget_set_parent(GTK_WIDGET (item.m_first->gobj()), GTK_WIDGET(gobj()));
+ gtk_widget_set_parent(GTK_WIDGET(item.m_first->gobj()), GTK_WIDGET(gobj()));
}
void FlowTable::insert_before(Gtk::Widget& first, Gtk::Widget& before, bool expand)
{
FlowTableItem item(&first, this);
item.m_expand_first_full = expand;
- insert_before (item, before);
+ insert_before(item, before);
}
void FlowTable::insert_before(Gtk::Widget& first, Gtk::Widget& second, Gtk::Widget& before, bool expand_second)
{
FlowTableItem item(&first, &second, this);
item.m_expand_second = expand_second;
- insert_before (item, before);
+ insert_before(item, before);
}
void FlowTable::insert_before(FlowTableItem& item, Gtk::Widget& before)
{
bool found = false;
std::vector<FlowTableItem>::iterator pos;
- for (pos = m_children.begin(); pos != m_children.end(); pos++)
+ for(pos = m_children.begin(); pos != m_children.end(); pos++)
{
FlowTableItem* item = &(*pos);
if(item->m_first)
@@ -449,13 +446,13 @@
}
}
- gtk_widget_set_parent(GTK_WIDGET (item.m_first->gobj()), GTK_WIDGET(gobj()));
+ gtk_widget_set_parent(GTK_WIDGET(item.m_first->gobj()), GTK_WIDGET(gobj()));
if(item.m_second)
{
- gtk_widget_set_parent(GTK_WIDGET (item.m_second->gobj()), GTK_WIDGET(gobj()));
+ gtk_widget_set_parent(GTK_WIDGET(item.m_second->gobj()), GTK_WIDGET(gobj()));
}
- if (pos == m_children.end())
+ if(pos == m_children.end())
m_children.push_back(item);
else
m_children.insert(pos, item);
@@ -952,7 +949,7 @@
FlowTableItem item(child, 0);
m_children.push_back(item);
- gtk_widget_set_parent(GTK_WIDGET (item.m_first->gobj()), GTK_WIDGET(gobj()));
+ gtk_widget_set_parent(GTK_WIDGET(item.m_first->gobj()), GTK_WIDGET(gobj()));
//This is protected, but should be public: child.set_parent(*this);
@@ -973,7 +970,7 @@
if(item.m_first == child)
{
//g_warning("FlowTable::on_remove unparenting first");
- gtk_widget_unparent(GTK_WIDGET (item.m_first->gobj())); //This is protected, but should be public: child.unparent();
+ gtk_widget_unparent(GTK_WIDGET(item.m_first->gobj())); //This is protected, but should be public: child.unparent();
item.m_first = 0;
if(visible)
@@ -983,7 +980,7 @@
if(item.m_second == child)
{
//g_warning("FlowTable::on_remove unparenting second");
- gtk_widget_unparent(GTK_WIDGET (item.m_second->gobj())); //This is protected, but should be public: child.unparent();
+ gtk_widget_unparent(GTK_WIDGET(item.m_second->gobj())); //This is protected, but should be public: child.unparent();
item.m_second = 0;
if(visible)
@@ -1014,7 +1011,7 @@
void FlowTable::forall(const ForallSlot& slot)
{
- ForallSlot slot_copy (slot);
+ ForallSlot slot_copy(slot);
gtk_container_forall(gobj(), &container_forall_callback, &slot_copy);
}
@@ -1062,7 +1059,7 @@
if(widget->is_managed_())
widget->reference();
- gtk_widget_unparent(GTK_WIDGET (iter->m_first->gobj()));
+ gtk_widget_unparent(GTK_WIDGET(iter->m_first->gobj()));
}
if(iter->m_second)
@@ -1072,7 +1069,7 @@
if(widget->is_managed_())
widget->reference();
- gtk_widget_unparent(GTK_WIDGET (iter->m_second->gobj()));
+ gtk_widget_unparent(GTK_WIDGET(iter->m_second->gobj()));
}
}
Modified: trunk/glom/utility_widgets/flowtable_dnd.cc
==============================================================================
--- trunk/glom/utility_widgets/flowtable_dnd.cc (original)
+++ trunk/glom/utility_widgets/flowtable_dnd.cc Mon Dec 15 14:00:33 2008
@@ -77,13 +77,13 @@
// Needed to move items around:
std::list<Gtk::TargetEntry> source_targets;
- source_targets.push_back (Gtk::TargetEntry (MOVE_TARGET));
+ source_targets.push_back(Gtk::TargetEntry(MOVE_TARGET));
child.drag_source_set(source_targets, Gdk::ModifierType(GDK_BUTTON1_MASK | GDK_BUTTON3_MASK),
Gdk::DragAction(GDK_ACTION_COPY | GDK_ACTION_MOVE));
- child.signal_drag_begin().connect (sigc::bind<Gtk::Widget*>(sigc::mem_fun (*this, &FlowTableDnd::on_child_drag_begin), &child), false);
- child.signal_drag_end().connect(sigc::bind<Gtk::Widget*>(sigc::mem_fun (*this, &FlowTableDnd::on_child_drag_end), &child), false);
- child.signal_drag_data_get().connect (sigc::bind<Gtk::Widget*>(sigc::mem_fun (*this, &FlowTableDnd::on_child_drag_data_get), &child), false);
- child.signal_drag_data_delete().connect (sigc::bind<Gtk::Widget*>(sigc::mem_fun (*this, &FlowTableDnd::on_child_drag_data_delete), &child), false);
+ child.signal_drag_begin().connect(sigc::bind<Gtk::Widget*>(sigc::mem_fun(*this, &FlowTableDnd::on_child_drag_begin), &child), false);
+ child.signal_drag_end().connect(sigc::bind<Gtk::Widget*>(sigc::mem_fun(*this, &FlowTableDnd::on_child_drag_end), &child), false);
+ child.signal_drag_data_get().connect(sigc::bind<Gtk::Widget*>(sigc::mem_fun(*this, &FlowTableDnd::on_child_drag_data_get), &child), false);
+ child.signal_drag_data_delete().connect(sigc::bind<Gtk::Widget*>(sigc::mem_fun(*this, &FlowTableDnd::on_child_drag_data_delete), &child), false);
if(!(child.get_flags() & Gtk::NO_WINDOW))
{
@@ -100,7 +100,7 @@
if(targets)
{
targets->add(drag_targets);
- child.drag_dest_set_target_list (targets);
+ child.drag_dest_set_target_list(targets);
}
else
{
@@ -109,9 +109,9 @@
}
// It's important to connect this one BEFORE
- child.signal_drag_motion().connect(sigc::bind<Gtk::Widget*>(sigc::mem_fun (*this, &FlowTableDnd::on_child_drag_motion), &child),
+ child.signal_drag_motion().connect(sigc::bind<Gtk::Widget*>(sigc::mem_fun(*this, &FlowTableDnd::on_child_drag_motion), &child),
false);
- child.signal_drag_data_received().connect(sigc::bind<Gtk::Widget*>(sigc::mem_fun (*this, &FlowTableDnd::on_child_drag_data_received), &child));
+ child.signal_drag_data_received().connect(sigc::bind<Gtk::Widget*>(sigc::mem_fun(*this, &FlowTableDnd::on_child_drag_data_received), &child));
child.signal_drag_leave().connect(sigc::mem_fun(*this, &FlowTableDnd::on_child_drag_leave));
}
}
@@ -128,17 +128,17 @@
{
typedef Glib::ListHandle<Gtk::Widget*>::const_iterator CI;
Glib::ListHandle<Gtk::Widget*> children = container->get_children();
- for (CI cur_child = children.begin(); cur_child != children.end();
+ for(CI cur_child = children.begin(); cur_child != children.end();
++cur_child)
{
- stop_dnd (*(*cur_child));
+ stop_dnd(*(*cur_child));
}
}
child.drag_source_unset();
}
-bool FlowTableDnd::on_drag_motion(const Glib::RefPtr<Gdk::DragContext>& drag_context, int x, int y, guint time)
+bool FlowTableDnd::on_drag_motion(const Glib::RefPtr<Gdk::DragContext>& /* drag_context */, int x, int y, guint /* time */)
{
// The drag position is relativ to the toplevel GdkWindow and not to
// the widget position. We fix this here to match the widget position
@@ -153,17 +153,17 @@
return false;
}
-void FlowTableDnd::on_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& drag_context, int drag_x, int drag_y, const Gtk::SelectionData& selection_data, guint, guint time)
+void FlowTableDnd::on_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& drag_context, int /* drag_x */, int /* drag_y */, const Gtk::SelectionData& selection_data, guint, guint /* time */)
{
- Gtk::Widget* palette = drag_get_source_widget (drag_context);
- while(palette && !EGG_IS_TOOL_PALETTE (palette->gobj()))
+ Gtk::Widget* palette = drag_get_source_widget(drag_context);
+ while(palette && !EGG_IS_TOOL_PALETTE(palette->gobj()))
palette = palette->get_parent();
on_dnd_remove_placeholder();
LayoutWidgetBase* above = dnd_datawidget_from_item(0);
if(palette)
{
- GtkWidget* tool_item = egg_tool_palette_get_drag_item(EGG_TOOL_PALETTE (palette->gobj()), selection_data.gobj());
+ GtkWidget* tool_item = egg_tool_palette_get_drag_item(EGG_TOOL_PALETTE(palette->gobj()), selection_data.gobj());
LayoutWidgetBase::enumType type =
static_cast<LayoutWidgetBase::enumType>(GPOINTER_TO_INT(g_object_get_data(G_OBJECT(tool_item), "glom-type")));
@@ -205,7 +205,7 @@
{
sharedptr<LayoutGroup> group = sharedptr<LayoutGroup>::cast_dynamic(get_layout_item());
LayoutGroup::type_list_items items = group->m_list_items;
- if(std::find (items.begin(), items.end(), item) != items.end())
+ if(std::find(items.begin(), items.end(), item) != items.end())
{
m_internal_drag = true;
group->remove_item(item);
@@ -220,7 +220,7 @@
}
}
-void FlowTableDnd::on_drag_leave(const Glib::RefPtr<Gdk::DragContext>& drag_context, guint time)
+void FlowTableDnd::on_drag_leave(const Glib::RefPtr<Gdk::DragContext>& /* drag_context */, guint /* time */)
{
dnd_remove_placeholder_idle();
}
@@ -243,8 +243,8 @@
if(cur_item->m_second)
{
Gdk::Rectangle second_rect = cur_item->m_second->get_allocation();
- rect.set_height (MAX (rect.get_height(), second_rect.get_height()));
- rect.set_width (rect.get_width() + m_padding + second_rect.get_width());
+ rect.set_height(MAX(rect.get_height(), second_rect.get_height()));
+ rect.set_width(rect.get_width() + m_padding + second_rect.get_width());
}
int cur_column = 0;
@@ -309,7 +309,7 @@
return above;
}
-FlowTable::FlowTableItem* FlowTableDnd::find_current_dnd_item(Gtk::Widget* child, int x, int y)
+FlowTable::FlowTableItem* FlowTableDnd::find_current_dnd_item(Gtk::Widget* child, int /* x */, int y)
{
FlowTableItem* item;
type_vecChildren::iterator cur_child;
@@ -368,7 +368,7 @@
return item;
}
-bool FlowTableDnd::on_child_drag_motion(const Glib::RefPtr<Gdk::DragContext>& drag_context, int x, int y, guint time,
+bool FlowTableDnd::on_child_drag_motion(const Glib::RefPtr<Gdk::DragContext>& /* drag_context */, int x, int y, guint /* time */,
Gtk::Widget* child)
{
m_current_dnd_item = find_current_dnd_item(child, x, y);
@@ -380,20 +380,20 @@
return false;
}
-void FlowTableDnd::on_child_drag_leave(const Glib::RefPtr<Gdk::DragContext>& drag_context, guint time)
+void FlowTableDnd::on_child_drag_leave(const Glib::RefPtr<Gdk::DragContext>& /* drag_context */, guint /* time */)
{
dnd_remove_placeholder_idle();
}
void FlowTableDnd::on_child_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& drag_context, int x, int y,
const Gtk::SelectionData& selection_data, guint info, guint time,
- Gtk::Widget* child)
+ Gtk::Widget* /* child */)
{
on_drag_data_received(drag_context, x, y, selection_data, info, time);
}
-void FlowTableDnd::on_child_drag_data_get(const Glib::RefPtr<Gdk::DragContext>& drag_context,
- Gtk::SelectionData& selection_data, guint, guint time,
+void FlowTableDnd::on_child_drag_data_get(const Glib::RefPtr<Gdk::DragContext>& /* drag_context */,
+ Gtk::SelectionData& selection_data, guint, guint /* time */,
Gtk::Widget* child)
{
FlowTableItem* item = find_current_dnd_item(child);
@@ -403,17 +403,17 @@
if(base)
data = base;
- selection_data.set ("LayoutWidgetBase*", 8, (guint8*)&data,
+ selection_data.set("LayoutWidgetBase*", 8, (guint8*)&data,
sizeof(gpointer*));
}
void FlowTableDnd::on_child_drag_begin(const Glib::RefPtr<Gdk::DragContext>& drag_context,
Gtk::Widget* child)
{
- FlowTableItem* item = find_current_dnd_item (child);
+ FlowTableItem* item = find_current_dnd_item(child);
if(!item)
{
- gdk_drag_abort (drag_context->gobj(), 0);
+ gdk_drag_abort(drag_context->gobj(), 0);
return;
}
@@ -423,18 +423,18 @@
if(item->m_second)
item->m_second->hide();
- LayoutWidgetBase* base = dnd_datawidget_from_item (item);
+ LayoutWidgetBase* base = dnd_datawidget_from_item(item);
base->set_dnd_in_progress();
}
-void FlowTableDnd::on_child_drag_end(const Glib::RefPtr<Gdk::DragContext>& drag_context,
+void FlowTableDnd::on_child_drag_end(const Glib::RefPtr<Gdk::DragContext>& /* drag_context */,
Gtk::Widget* child)
{
- FlowTableItem* item = find_current_dnd_item (child);
+ FlowTableItem* item = find_current_dnd_item(child);
if(!item)
return;
- LayoutWidgetBase* base = dnd_datawidget_from_item (item);
+ LayoutWidgetBase* base = dnd_datawidget_from_item(item);
if(base->get_dnd_in_progress())
{
if(!item)
@@ -454,8 +454,8 @@
signal_layout_changed().emit();
}
-void FlowTableDnd::on_child_drag_data_delete(const Glib::RefPtr<Gdk::DragContext>& drag_context,
- Gtk::Widget* child)
+void FlowTableDnd::on_child_drag_data_delete(const Glib::RefPtr<Gdk::DragContext>& /* drag_context */,
+ Gtk::Widget* /* child */)
{
// Do nothing for now
}
Modified: trunk/glom/utility_widgets/sidebar.cc
==============================================================================
--- trunk/glom/utility_widgets/sidebar.cc (original)
+++ trunk/glom/utility_widgets/sidebar.cc Mon Dec 15 14:00:33 2008
@@ -66,7 +66,7 @@
set_size_request(0, 0);
}
-void SideBar::on_child_attached(Gtk::Widget* child)
+void SideBar::on_child_attached(Gtk::Widget* /* child */)
{
set_size_request(m_width, m_height);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]