[glom] Use the newer R(Args...) libsigc++ syntax.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Use the newer R(Args...) libsigc++ syntax.
- Date: Thu, 31 Mar 2016 19:51:31 +0000 (UTC)
commit d6c2a021ef700bc73440c486264d33a25aaa995d
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Mar 31 21:50:26 2016 +0200
Use the newer R(Args...) libsigc++ syntax.
Available as of libsigc++-2.0 version 2.10.
glom/bakery/appwindow.h | 2 +-
glom/base_db_table_data.h | 2 +-
glom/box_withbuttons.h | 4 ++--
glom/import_csv/csv_parser.h | 12 ++++++------
glom/import_csv/dialog_import_csv.h | 2 +-
glom/libglom/appstate.h | 2 +-
glom/libglom/connectionpool.h | 2 +-
glom/libglom/document/bakery/document.h | 2 +-
glom/libglom/document/document.h | 2 +-
glom/libglom/spawn_with_feedback.cc | 4 ++--
glom/mode_data/box_data.h | 2 +-
glom/mode_data/box_data_details.h | 6 +++---
glom/mode_data/box_data_manyrecords.h | 4 ++--
glom/mode_data/box_data_portal.h | 4 ++--
.../datawidget/cellrenderer_buttonimage.h | 2 +-
.../mode_data/datawidget/cellrenderer_buttontext.h | 2 +-
glom/mode_data/datawidget/datawidget.h | 6 +++---
glom/mode_data/db_adddel/db_adddel.h | 12 ++++++------
glom/mode_data/flowtablewithfields.h | 12 ++++++------
glom/mode_data/notebook_data.h | 4 ++--
glom/mode_design/dialog_add_related_table.h | 2 +-
.../layout/layout_item_dialogs/box_formatting.h | 2 +-
glom/mode_design/users/dialog_groups_list.cc | 2 +-
glom/mode_design/users/dialog_groups_list.h | 2 +-
glom/mode_find/notebook_find.h | 2 +-
glom/notebook_glom.h | 2 +-
glom/utility_widgets/adddel/adddel.h | 14 +++++++-------
glom/utility_widgets/canvas/canvas_editable.h | 4 ++--
.../canvas/canvas_group_resizable.h | 2 +-
glom/utility_widgets/canvas/canvas_item_movable.h | 6 +++---
glom/utility_widgets/dialog_properties.h | 2 +-
glom/utility_widgets/layoutwidgetbase.h | 8 ++++----
glom/utility_widgets/layoutwidgetfield.h | 2 +-
glom/utility_widgets/notebook_noframe.h | 2 +-
tests/import/utils.h | 2 +-
tests/test_signal_reemit.cc | 8 ++++----
36 files changed, 75 insertions(+), 75 deletions(-)
---
diff --git a/glom/bakery/appwindow.h b/glom/bakery/appwindow.h
index 6fa4c3c..656507f 100644
--- a/glom/bakery/appwindow.h
+++ b/glom/bakery/appwindow.h
@@ -57,7 +57,7 @@ public:
static void set_command_line_args(int argc, char** &argv); //Needed for session management.
- typedef sigc::signal<void> type_signal_hide;
+ typedef sigc::signal<void()> type_signal_hide;
type_signal_hide ui_signal_hide();
protected:
diff --git a/glom/base_db_table_data.h b/glom/base_db_table_data.h
index b9e7326..4a8f334 100644
--- a/glom/base_db_table_data.h
+++ b/glom/base_db_table_data.h
@@ -41,7 +41,7 @@ public:
*
* @param relationship_name, if any.
*/
- typedef sigc::signal<void> type_signal_record_changed;
+ typedef sigc::signal<void()> type_signal_record_changed;
type_signal_record_changed signal_record_changed();
protected:
diff --git a/glom/box_withbuttons.h b/glom/box_withbuttons.h
index 1b60076..cadab19 100644
--- a/glom/box_withbuttons.h
+++ b/glom/box_withbuttons.h
@@ -56,8 +56,8 @@ public:
void set_button_cancel(Gtk::Button& button);
//Signals:
- sigc::signal<void, Glib::ustring> signal_selected; //When an item is selected.
- sigc::signal<void> signal_cancelled; //When the cancel button is clicked.
+ sigc::signal<void(Glib::ustring)> signal_selected; //When an item is selected.
+ sigc::signal<void()> signal_cancelled; //When the cancel button is clicked.
virtual Gtk::Widget* get_default_button();
diff --git a/glom/import_csv/csv_parser.h b/glom/import_csv/csv_parser.h
index ce42d9f..a7651c1 100644
--- a/glom/import_csv/csv_parser.h
+++ b/glom/import_csv/csv_parser.h
@@ -87,14 +87,14 @@ public:
type_row_strings fetch_next_row();
// Signals:
- typedef sigc::signal<void, const Glib::ustring&> type_signal_file_read_error;
+ typedef sigc::signal<void(const Glib::ustring&)> type_signal_file_read_error;
/** This signal will be emitted if the parser encounters an error while trying to open the file for
reading.
*/
type_signal_file_read_error signal_file_read_error() const;
- typedef sigc::signal<void, const Glib::ustring&> type_signal_have_display_name;
+ typedef sigc::signal<void(const Glib::ustring&)> type_signal_have_display_name;
/** This signal will be emitted when the parser has discovered the
* display name for the file. This does not require any parsing of the contents,
@@ -103,7 +103,7 @@ public:
type_signal_have_display_name signal_have_display_name() const;
- typedef sigc::signal<void> type_signal_encoding_error;
+ typedef sigc::signal<void()> type_signal_encoding_error;
/** This signal will be emitted when the parser encounters an error while parsing.
* TODO: How do we discover what the error is?
@@ -111,21 +111,21 @@ public:
type_signal_encoding_error signal_encoding_error() const;
- typedef sigc::signal<void, type_row_strings, unsigned int> type_signal_line_scanned;
+ typedef sigc::signal<void(type_row_strings, unsigned int)> type_signal_line_scanned;
/** This signal will be emitted each time the parser has scanned a line. TODO: Do we mean row instead of
line? - A row contain a newline.
*/
type_signal_line_scanned signal_line_scanned() const;
- typedef sigc::signal<void> type_signal_finished_parsing;
+ typedef sigc::signal<void()> type_signal_finished_parsing;
/** This signal will be emitted when the parser successfully finished to parse a file.
*/
type_signal_finished_parsing signal_finished_parsing() const;
- typedef sigc::signal<void> type_signal_state_changed;
+ typedef sigc::signal<void()> type_signal_state_changed;
/** This signal will be emitted when the state changes.
*/
diff --git a/glom/import_csv/dialog_import_csv.h b/glom/import_csv/dialog_import_csv.h
index eb2a3d9..65dd65f 100644
--- a/glom/import_csv/dialog_import_csv.h
+++ b/glom/import_csv/dialog_import_csv.h
@@ -64,7 +64,7 @@ public:
CsvParser::type_row_strings parser_fetch_next_row();
- typedef sigc::signal<void> type_signal_state_changed;
+ typedef sigc::signal<void()> type_signal_state_changed;
/** This signal will be emitted when the parser's state changes.
*/
diff --git a/glom/libglom/appstate.h b/glom/libglom/appstate.h
index 21c0e7e..3b8fe61 100644
--- a/glom/libglom/appstate.h
+++ b/glom/libglom/appstate.h
@@ -53,7 +53,7 @@ public:
/// Use this to set the initial UI state:
void emit_userlevel_changed();
- typedef sigc::signal<void, userlevels> type_signal_userlevel_changed;
+ typedef sigc::signal<void(userlevels)> type_signal_userlevel_changed;
/// The user interface should handle this signal and alter itself accordingly.
type_signal_userlevel_changed signal_userlevel_changed();
diff --git a/glom/libglom/connectionpool.h b/glom/libglom/connectionpool.h
index b266472..b0792fd 100644
--- a/glom/libglom/connectionpool.h
+++ b/glom/libglom/connectionpool.h
@@ -68,7 +68,7 @@ public:
void close();
//TODO: Document this:
- typedef sigc::signal<void> type_signal_finished;
+ typedef sigc::signal<void()> type_signal_finished;
type_signal_finished signal_finished();
private:
diff --git a/glom/libglom/document/bakery/document.h b/glom/libglom/document/bakery/document.h
index 95d152b..f64957e 100644
--- a/glom/libglom/document/bakery/document.h
+++ b/glom/libglom/document/bakery/document.h
@@ -100,7 +100,7 @@ public:
//Signals
/** For instance, void on_document_modified(bool modified);
*/
- typedef sigc::signal<void, bool> type_signal_modified;
+ typedef sigc::signal<void(bool)> type_signal_modified;
/** This signal is emitted when the document has been modified.
* It allows the view to update itself to show the new information.
diff --git a/glom/libglom/document/document.h b/glom/libglom/document/document.h
index e3647a1..cd024f7 100644
--- a/glom/libglom/document/document.h
+++ b/glom/libglom/document/document.h
@@ -438,7 +438,7 @@ public:
*/
bool set_userlevel(AppState::userlevels userlevel);
- typedef sigc::signal<void, AppState::userlevels> type_signal_userlevel_changed;
+ typedef sigc::signal<void(AppState::userlevels)> type_signal_userlevel_changed;
type_signal_userlevel_changed signal_userlevel_changed();
//TODO: This is a rather indirect way for application.cc to request the UI to update for the userlevel.
diff --git a/glom/libglom/spawn_with_feedback.cc b/glom/libglom/spawn_with_feedback.cc
index 3f75064..f12c8f2 100644
--- a/glom/libglom/spawn_with_feedback.cc
+++ b/glom/libglom/spawn_with_feedback.cc
@@ -146,7 +146,7 @@ private:
#endif // !G_OS_WIN32
public:
- typedef sigc::signal<void> SignalFinished;
+ typedef sigc::signal<void()> SignalFinished;
/** TODO: Document the redirect parameter.
*/
@@ -188,7 +188,7 @@ public:
std::vector<std::string> arguments = Glib::shell_parse_argv(command_line);
int child_stdout = 0;
int child_stderr = 0;
- Glib::spawn_async_with_pipes(Glib::get_current_dir(), arguments, Glib::SPAWN_DO_NOT_REAP_CHILD,
sigc::slot<void>(), &pid, 0, (redirect & REDIRECT_STDOUT) ? &child_stdout : 0, (redirect & REDIRECT_STDERR) ?
&child_stderr : 0);
+ Glib::spawn_async_with_pipes(Glib::get_current_dir(), arguments, Glib::SPAWN_DO_NOT_REAP_CHILD,
sigc::slot<void()>(), &pid, 0, (redirect & REDIRECT_STDOUT) ? &child_stdout : 0, (redirect & REDIRECT_STDERR)
? &child_stderr : 0);
if(redirect & REDIRECT_STDOUT)
redirect_to_string(child_stdout, stdout_text);
if(redirect & REDIRECT_STDERR)
diff --git a/glom/mode_data/box_data.h b/glom/mode_data/box_data.h
index bd9e343..82dea55 100644
--- a/glom/mode_data/box_data.h
+++ b/glom/mode_data/box_data.h
@@ -80,7 +80,7 @@ public:
*/
//Should be a MI class, derived by those sub-classes. TODO.
//where_clause.
- sigc::signal<void, Gnome::Gda::SqlExpr> signal_find_criteria;
+ sigc::signal<void(Gnome::Gda::SqlExpr)> signal_find_criteria;
#ifndef GLOM_ENABLE_CLIENT_ONLY
//g++ 3.4 needs this to be public when used from Box_Data_Details. I'm not sure why. murrayc.
diff --git a/glom/mode_data/box_data_details.h b/glom/mode_data/box_data_details.h
index 0fcea46..df7c231 100644
--- a/glom/mode_data/box_data_details.h
+++ b/glom/mode_data/box_data_details.h
@@ -48,19 +48,19 @@ public:
//Signals:
- typedef sigc::signal<void> type_signal_void;
+ typedef sigc::signal<void()> type_signal_void;
type_signal_void signal_nav_first();
type_signal_void signal_nav_prev();
type_signal_void signal_nav_next();
type_signal_void signal_nav_last();
- typedef sigc::signal<void, const Gnome::Gda::Value&> type_signal_record_deleted; //arg is PrimaryKey.
+ typedef sigc::signal<void(const Gnome::Gda::Value&)> type_signal_record_deleted; //arg is PrimaryKey.
type_signal_record_deleted signal_record_deleted();
/** For instance,
* void on_requested_related_details(const Glib::ustring& table_name, Gnome::Gda::Value
primary_key_value);
*/
- typedef sigc::signal<void, const Glib::ustring&, Gnome::Gda::Value> type_signal_requested_related_details;
+ typedef sigc::signal<void(const Glib::ustring&, Gnome::Gda::Value)> type_signal_requested_related_details;
type_signal_requested_related_details signal_requested_related_details();
#ifndef GLOM_ENABLE_CLIENT_ONLY
diff --git a/glom/mode_data/box_data_manyrecords.h b/glom/mode_data/box_data_manyrecords.h
index d0bf6e4..b9414d3 100644
--- a/glom/mode_data/box_data_manyrecords.h
+++ b/glom/mode_data/box_data_manyrecords.h
@@ -40,10 +40,10 @@ public:
virtual void set_primary_key_value_selected(const Gnome::Gda::Value& primary_key_value);
//Primary Key value:
- typedef sigc::signal<void, const Gnome::Gda::Value&> type_signal_user_requested_details;
+ typedef sigc::signal<void(const Gnome::Gda::Value&)> type_signal_user_requested_details;
type_signal_user_requested_details signal_user_requested_details();
- typedef sigc::signal<void> type_signal_record_selection_changed;
+ typedef sigc::signal<void()> type_signal_record_selection_changed;
type_signal_record_selection_changed signal_record_selection_changed();
protected:
void print_layout() override;
diff --git a/glom/mode_data/box_data_portal.h b/glom/mode_data/box_data_portal.h
index 646a723..33b80af 100644
--- a/glom/mode_data/box_data_portal.h
+++ b/glom/mode_data/box_data_portal.h
@@ -63,14 +63,14 @@ public:
std::shared_ptr<const LayoutItem_Portal> get_portal() const;
std::shared_ptr<const Field> get_key_field() const;
- sigc::signal<void, Gnome::Gda::Value> signal_record_added;
+ sigc::signal<void(Gnome::Gda::Value)> signal_record_added;
/** Tell the parent widget that something has changed in one of the related records,
* or a record was added or deleted.
*
* @param relationship_name, if any.
*/
- typedef sigc::signal<void, const Glib::ustring&> type_signal_portal_record_changed;
+ typedef sigc::signal<void(const Glib::ustring&)> type_signal_portal_record_changed;
type_signal_portal_record_changed signal_portal_record_changed();
bool get_has_suitable_record_to_view_details() const;
diff --git a/glom/mode_data/datawidget/cellrenderer_buttonimage.h
b/glom/mode_data/datawidget/cellrenderer_buttonimage.h
index 8b218af..fc1595f 100644
--- a/glom/mode_data/datawidget/cellrenderer_buttonimage.h
+++ b/glom/mode_data/datawidget/cellrenderer_buttonimage.h
@@ -33,7 +33,7 @@ class GlomCellRenderer_ButtonImage : public Gtk::CellRendererPixbuf
public:
GlomCellRenderer_ButtonImage();
- typedef sigc::signal<void, const Gtk::TreeModel::Path&> type_signal_clicked;
+ typedef sigc::signal<void(const Gtk::TreeModel::Path&)> type_signal_clicked;
type_signal_clicked signal_clicked();
private:
diff --git a/glom/mode_data/datawidget/cellrenderer_buttontext.h
b/glom/mode_data/datawidget/cellrenderer_buttontext.h
index aaf3403..a86ed56 100644
--- a/glom/mode_data/datawidget/cellrenderer_buttontext.h
+++ b/glom/mode_data/datawidget/cellrenderer_buttontext.h
@@ -33,7 +33,7 @@ class GlomCellRenderer_ButtonText : public Gtk::CellRendererText
public:
GlomCellRenderer_ButtonText();
- typedef sigc::signal<void, const Gtk::TreeModel::Path&> type_signal_clicked;
+ typedef sigc::signal<void(const Gtk::TreeModel::Path&)> type_signal_clicked;
type_signal_clicked signal_clicked();
private:
diff --git a/glom/mode_data/datawidget/datawidget.h b/glom/mode_data/datawidget/datawidget.h
index 59daf0c..1e5987b 100644
--- a/glom/mode_data/datawidget/datawidget.h
+++ b/glom/mode_data/datawidget/datawidget.h
@@ -72,16 +72,16 @@ public:
Gtk::Widget* get_data_child_widget();
const Gtk::Widget* get_data_child_widget() const;
- typedef sigc::signal<void, const Gnome::Gda::Value&> type_signal_edited;
+ typedef sigc::signal<void(const Gnome::Gda::Value&)> type_signal_edited;
type_signal_edited signal_edited();
- typedef sigc::signal<void, const Gnome::Gda::Value&> type_signal_open_details_requested;
+ typedef sigc::signal<void(const Gnome::Gda::Value&)> type_signal_open_details_requested;
type_signal_open_details_requested signal_open_details_requested();
/** For instance,
* void on_choices_changed();
*/
- typedef sigc::signal<void> type_signal_choices_changed;
+ typedef sigc::signal<void()> type_signal_choices_changed;
/** This is emitted when the related records, used by a choices combobox,
* have been changed. For instance, when the user adds a new choice via the "New" button.
diff --git a/glom/mode_data/db_adddel/db_adddel.h b/glom/mode_data/db_adddel/db_adddel.h
index d886721..1868fb6 100644
--- a/glom/mode_data/db_adddel/db_adddel.h
+++ b/glom/mode_data/db_adddel/db_adddel.h
@@ -204,21 +204,21 @@ public:
#ifndef GLOM_ENABLE_CLIENT_ONLY
/** Emitted when the user wants to edit the layout of the items in this widget.
*/
- typedef sigc::signal<void> type_signal_user_requested_layout;
+ typedef sigc::signal<void()> type_signal_user_requested_layout;
type_signal_user_requested_layout signal_user_requested_layout();
#endif // !GLOM_ENABLE_CLIENT_ONLY
/** Emitted when the user request a view/edit of the details of the record.
* @param row
*/
- typedef sigc::signal<void, const Gtk::TreeModel::iterator&> type_signal_user_requested_edit;
+ typedef sigc::signal<void(const Gtk::TreeModel::iterator&)> type_signal_user_requested_edit;
type_signal_user_requested_edit signal_user_requested_edit();
/** Emitted when the user clicks on a script button.
* @param layout_button The layout item for the script button that was clicked.
* @param row
*/
- typedef sigc::signal<void, const std::shared_ptr<const LayoutItem_Button>&, const
Gtk::TreeModel::iterator&> type_signal_script_button_clicked;
+ typedef sigc::signal<void(const std::shared_ptr<const LayoutItem_Button>&, const
Gtk::TreeModel::iterator&)> type_signal_script_button_clicked;
type_signal_script_button_clicked signal_script_button_clicked();
/** Allow a parent widget to set the foreign key when a record is added,
@@ -227,18 +227,18 @@ public:
* @param row Row number
* @param primary_key_value The value of the primary key of the new related record.
*/
- typedef sigc::signal<void, const Gtk::TreeModel::iterator&, const Gnome::Gda::Value&>
type_signal_record_added;
+ typedef sigc::signal<void(const Gtk::TreeModel::iterator&, const Gnome::Gda::Value&)>
type_signal_record_added;
type_signal_record_added signal_record_added();
/** Emitted when the user changed the sort order,
* for instance by clicking on a column header.
*/
- typedef sigc::signal<void> type_signal_sort_clause_changed;
+ typedef sigc::signal<void()> type_signal_sort_clause_changed;
type_signal_sort_clause_changed signal_sort_clause_changed();
/** Emitted when the user selected (or deselected) a record.
*/
- typedef sigc::signal<void> type_signal_record_selection_changed;
+ typedef sigc::signal<void()> type_signal_record_selection_changed;
type_signal_record_selection_changed signal_record_selection_changed();
/** Get the last row.
diff --git a/glom/mode_data/flowtablewithfields.h b/glom/mode_data/flowtablewithfields.h
index 70a27f7..afe20b1 100644
--- a/glom/mode_data/flowtablewithfields.h
+++ b/glom/mode_data/flowtablewithfields.h
@@ -142,38 +142,38 @@ public:
/** For instance,
* void on_flowtable_field_edited(const std::shared_ptr<const LayoutItem_Field>& field, const
Gnome::Gda::Value& value);
*/
- typedef sigc::signal<void, const std::shared_ptr<const LayoutItem_Field>&, const Gnome::Gda::Value&>
type_signal_field_edited;
+ typedef sigc::signal<void(const std::shared_ptr<const LayoutItem_Field>&, const Gnome::Gda::Value&)>
type_signal_field_edited;
type_signal_field_edited signal_field_edited();
/** For instance,
* void on_flowtable_field_choices_changed(const std::shared_ptr<const LayoutItem_Field>& field);
*/
- typedef sigc::signal<void, const std::shared_ptr<const LayoutItem_Field>&>
type_signal_field_choices_changed;
+ typedef sigc::signal<void(const std::shared_ptr<const LayoutItem_Field>&)>
type_signal_field_choices_changed;
type_signal_field_choices_changed signal_field_choices_changed();
/** For instance,
* void on_flowtable_field_open_details_requested(const std::shared_ptr<const LayoutItem_Field>& field,
const Gnome::Gda::Value& value);
*/
- typedef sigc::signal<void, const std::shared_ptr<const LayoutItem_Field>&, const Gnome::Gda::Value&>
type_signal_field_open_details_requested;
+ typedef sigc::signal<void(const std::shared_ptr<const LayoutItem_Field>&, const Gnome::Gda::Value&)>
type_signal_field_open_details_requested;
type_signal_field_open_details_requested signal_field_open_details_requested();
/** For instance,
* void on_related_record_changed(const Glib::ustring& relationship_name);
*/
- typedef sigc::signal<void, const Glib::ustring&> type_signal_related_record_changed;
+ typedef sigc::signal<void(const Glib::ustring&)> type_signal_related_record_changed;
type_signal_related_record_changed signal_related_record_changed();
/** For instance,
* void on_requested_related_details(const Glib::ustring& table_name, Gnome::Gda::Value primary_key_value);
*/
- typedef sigc::signal<void, const Glib::ustring&, Gnome::Gda::Value> type_signal_requested_related_details;
+ typedef sigc::signal<void(const Glib::ustring&, Gnome::Gda::Value)> type_signal_requested_related_details;
type_signal_requested_related_details signal_requested_related_details();
/** For instance,
* void on_script_button_clicked(const std::shared_ptr<LayoutItem_Button>& layout_item>);
*/
- typedef sigc::signal<void, const std::shared_ptr<LayoutItem_Button>&> type_signal_script_button_clicked;
+ typedef sigc::signal<void(const std::shared_ptr<LayoutItem_Button>&)> type_signal_script_button_clicked;
type_signal_script_button_clicked signal_script_button_clicked();
private:
diff --git a/glom/mode_data/notebook_data.h b/glom/mode_data/notebook_data.h
index 51c6347..e066af7 100644
--- a/glom/mode_data/notebook_data.h
+++ b/glom/mode_data/notebook_data.h
@@ -75,10 +75,10 @@ public:
dataview get_current_view() const;
void set_current_view(dataview view);
- typedef sigc::signal<void, const Glib::ustring&, Gnome::Gda::Value> type_signal_record_details_requested;
+ typedef sigc::signal<void(const Glib::ustring&, Gnome::Gda::Value)> type_signal_record_details_requested;
type_signal_record_details_requested signal_record_details_requested();
- typedef sigc::signal<void> type_signal_record_selection_changed;
+ typedef sigc::signal<void()> type_signal_record_selection_changed;
/** This signal is emitted when the a record is selected, or deselected,
* in the list view.
diff --git a/glom/mode_design/dialog_add_related_table.h b/glom/mode_design/dialog_add_related_table.h
index 7b2f4a5..50cb15d 100644
--- a/glom/mode_design/dialog_add_related_table.h
+++ b/glom/mode_design/dialog_add_related_table.h
@@ -45,7 +45,7 @@ public:
//Get the user input:
void get_input(Glib::ustring& table_name, Glib::ustring& relationship_name, Glib::ustring& from_key_name);
- typedef sigc::signal<void> type_signal_request_edit_fields;
+ typedef sigc::signal<void()> type_signal_request_edit_fields;
type_signal_request_edit_fields signal_request_edit_fields();
private:
diff --git a/glom/mode_design/layout/layout_item_dialogs/box_formatting.h
b/glom/mode_design/layout/layout_item_dialogs/box_formatting.h
index 8395a4b..83bb985 100644
--- a/glom/mode_design/layout/layout_item_dialogs/box_formatting.h
+++ b/glom/mode_design/layout/layout_item_dialogs/box_formatting.h
@@ -71,7 +71,7 @@ public:
*/
void set_is_for_non_editable();
- typedef sigc::signal<void> type_signal_modified;
+ typedef sigc::signal<void()> type_signal_modified;
type_signal_modified signal_modified();
private:
diff --git a/glom/mode_design/users/dialog_groups_list.cc b/glom/mode_design/users/dialog_groups_list.cc
index 0e32e73..87f0bd2 100644
--- a/glom/mode_design/users/dialog_groups_list.cc
+++ b/glom/mode_design/users/dialog_groups_list.cc
@@ -422,7 +422,7 @@ void Dialog_GroupsList::load_from_document()
//fill_table_list();
}
-void Dialog_GroupsList::treeview_append_bool_column(Gtk::TreeView& treeview, const Glib::ustring& title,
Gtk::TreeModelColumn<bool>& model_column, const sigc::slot<void, const Glib::ustring&>& slot_toggled)
+void Dialog_GroupsList::treeview_append_bool_column(Gtk::TreeView& treeview, const Glib::ustring& title,
Gtk::TreeModelColumn<bool>& model_column, const sigc::slot<void(const Glib::ustring&)>& slot_toggled)
{
auto pCellRenderer = Gtk::manage( new Gtk::CellRendererToggle() );
diff --git a/glom/mode_design/users/dialog_groups_list.h b/glom/mode_design/users/dialog_groups_list.h
index 1f7e1d4..37583e7 100644
--- a/glom/mode_design/users/dialog_groups_list.h
+++ b/glom/mode_design/users/dialog_groups_list.h
@@ -57,7 +57,7 @@ private:
void fill_table_list(const Glib::ustring& group_name);
Glib::ustring get_selected_group() const;
- void treeview_append_bool_column(Gtk::TreeView& treeview, const Glib::ustring& title,
Gtk::TreeModelColumn<bool>& model_column, const sigc::slot<void, const Glib::ustring&>& slot_toggled);
+ void treeview_append_bool_column(Gtk::TreeView& treeview, const Glib::ustring& title,
Gtk::TreeModelColumn<bool>& model_column, const sigc::slot<void(const Glib::ustring&)>& slot_toggled);
//Enable/disable buttons, depending on treeview selection:
void enable_buttons();
diff --git a/glom/mode_find/notebook_find.h b/glom/mode_find/notebook_find.h
index c7ec347..f2f777e 100644
--- a/glom/mode_find/notebook_find.h
+++ b/glom/mode_find/notebook_find.h
@@ -42,7 +42,7 @@ public:
* should be used to find and display records.
* @param find_criteria The SQL where clause.
*/
- sigc::signal<void, Gnome::Gda::SqlExpr> signal_find_criteria;
+ sigc::signal<void(Gnome::Gda::SqlExpr)> signal_find_criteria;
private:
diff --git a/glom/notebook_glom.h b/glom/notebook_glom.h
index f9f3404..33cb923 100644
--- a/glom/notebook_glom.h
+++ b/glom/notebook_glom.h
@@ -41,7 +41,7 @@ public:
//Signals:
//Page number
- //typedef sigc::signal<void, guint> type_signal_leave_page;
+ //typedef sigc::signal<void(guint)> type_signal_leave_page;
// type_signal_leave_page signal_leave_page();
//Overridden by derived classes:
diff --git a/glom/utility_widgets/adddel/adddel.h b/glom/utility_widgets/adddel/adddel.h
index 5c6e550..76511c0 100644
--- a/glom/utility_widgets/adddel/adddel.h
+++ b/glom/utility_widgets/adddel/adddel.h
@@ -180,33 +180,33 @@ public:
//Signals:
//row number.
- typedef sigc::signal<void, const Gtk::TreeModel::iterator&> type_signal_user_added;
+ typedef sigc::signal<void(const Gtk::TreeModel::iterator&)> type_signal_user_added;
type_signal_user_added signal_user_added();
//row number, col number.
- typedef sigc::signal<void, const Gtk::TreeModel::iterator&, guint> type_signal_user_changed;
+ typedef sigc::signal<void(const Gtk::TreeModel::iterator&, guint)> type_signal_user_changed;
type_signal_user_changed signal_user_changed();
//start row, end row
- typedef sigc::signal<void, const Gtk::TreeModel::iterator&, const Gtk::TreeModel::iterator&>
type_signal_user_requested_delete;
+ typedef sigc::signal<void(const Gtk::TreeModel::iterator&, const Gtk::TreeModel::iterator&)>
type_signal_user_requested_delete;
type_signal_user_requested_delete signal_user_requested_delete();
//row number.
- typedef sigc::signal<void, const Gtk::TreeModel::iterator&> type_signal_user_requested_edit;
+ typedef sigc::signal<void(const Gtk::TreeModel::iterator&)> type_signal_user_requested_edit;
type_signal_user_requested_edit signal_user_requested_edit();
//TODO: Add this to the menu?
/** This signal is emitted when the user presses the "extra" button.
* This sends the row number.
*/
- typedef sigc::signal<void, const Gtk::TreeModel::iterator&> type_signal_user_requested_extra;
+ typedef sigc::signal<void(const Gtk::TreeModel::iterator&)> type_signal_user_requested_extra;
type_signal_user_requested_extra signal_user_requested_extra();
- typedef sigc::signal<void> type_signal_user_requested_add;
+ typedef sigc::signal<void()> type_signal_user_requested_add;
type_signal_user_requested_add signal_user_requested_add();
//row number, col number.
- typedef sigc::signal<void, const Gtk::TreeModel::iterator&, guint> type_signal_user_activated;
+ typedef sigc::signal<void(const Gtk::TreeModel::iterator&, guint)> type_signal_user_activated;
type_signal_user_activated signal_user_activated();
bool get_model_column_index(guint view_column_index, guint& model_column_index);
diff --git a/glom/utility_widgets/canvas/canvas_editable.h b/glom/utility_widgets/canvas/canvas_editable.h
index 864c2ae..18eb678 100644
--- a/glom/utility_widgets/canvas/canvas_editable.h
+++ b/glom/utility_widgets/canvas/canvas_editable.h
@@ -84,14 +84,14 @@ public:
//TODO: Actually emit this, so we actually show the context menu when clicking on blank space:
/** void on_show_context(guint button, guint32 activate_time);
*/
- typedef sigc::signal<void, guint, guint32> type_signal_show_context;
+ typedef sigc::signal<void(guint, guint32)> type_signal_show_context;
type_signal_show_context signal_show_context();
/** For instance,
* void on_selection_changed();
*/
- typedef sigc::signal<void> type_signal_selection_changed;
+ typedef sigc::signal<void()> type_signal_selection_changed;
/** This signal is emitted if the user causes items
* to be selected or deselected. See get_selected_items().
diff --git a/glom/utility_widgets/canvas/canvas_group_resizable.h
b/glom/utility_widgets/canvas/canvas_group_resizable.h
index 6c2fd56..2c326e2 100644
--- a/glom/utility_widgets/canvas/canvas_group_resizable.h
+++ b/glom/utility_widgets/canvas/canvas_group_resizable.h
@@ -64,7 +64,7 @@ public:
void set_outline_visible(bool visible = true);
- typedef sigc::signal<void> type_signal_resized;
+ typedef sigc::signal<void()> type_signal_resized;
/// This signal is emitted when the canvas item is resized by the user.
type_signal_resized signal_resized();
diff --git a/glom/utility_widgets/canvas/canvas_item_movable.h
b/glom/utility_widgets/canvas/canvas_item_movable.h
index 5d5731e..b77826d 100644
--- a/glom/utility_widgets/canvas/canvas_item_movable.h
+++ b/glom/utility_widgets/canvas/canvas_item_movable.h
@@ -66,14 +66,14 @@ public:
*
* void on_moved(bool group_select, double x_offset, double y_offset);
*/
- typedef sigc::signal<void, const Glib::RefPtr<CanvasItemMovable>&, double, double> type_signal_moved;
+ typedef sigc::signal<void(const Glib::RefPtr<CanvasItemMovable>&, double, double)> type_signal_moved;
/// This signal is emitted when the canvas item is moved by the user.
type_signal_moved signal_moved();
/** void on_show_context(guint button, guint32 activate_time);
*/
- typedef sigc::signal<void, guint, guint32> type_signal_show_context;
+ typedef sigc::signal<void(guint, guint32)> type_signal_show_context;
type_signal_show_context signal_show_context();
/** For instance,
@@ -83,7 +83,7 @@ public:
*
* void on_selected(bool group_select);
*/
- typedef sigc::signal<void, const Glib::RefPtr<CanvasItemMovable>&, bool> type_signal_selected;
+ typedef sigc::signal<void(const Glib::RefPtr<CanvasItemMovable>&, bool)> type_signal_selected;
/** This signal is emitted if the user causes the item
* to be selected or deselected. See get_selected().
diff --git a/glom/utility_widgets/dialog_properties.h b/glom/utility_widgets/dialog_properties.h
index 683f995..b67854e 100644
--- a/glom/utility_widgets/dialog_properties.h
+++ b/glom/utility_widgets/dialog_properties.h
@@ -41,7 +41,7 @@ public:
virtual void set_modified(bool modified = true);
//int page_number
- typedef sigc::signal<void> type_signal_apply;
+ typedef sigc::signal<void()> type_signal_apply;
type_signal_apply signal_apply();
protected:
diff --git a/glom/utility_widgets/layoutwidgetbase.h b/glom/utility_widgets/layoutwidgetbase.h
index 8ba0859..93a5f7d 100644
--- a/glom/utility_widgets/layoutwidgetbase.h
+++ b/glom/utility_widgets/layoutwidgetbase.h
@@ -56,22 +56,22 @@ public:
};
#ifndef GLOM_ENABLE_CLIENT_ONLY
- typedef sigc::signal<void> type_signal_layout_changed;
+ typedef sigc::signal<void()> type_signal_layout_changed;
/// Signals that the layout has changed, so it should be saved to the document again.
type_signal_layout_changed signal_layout_changed();
- typedef sigc::signal<void, enumType> type_signal_layout_item_added;
+ typedef sigc::signal<void(enumType)> type_signal_layout_item_added;
///Requests the addition of an item:
type_signal_layout_item_added signal_layout_item_added();
//Allow a child widget to delegate to a parent widget:
- typedef sigc::signal<void> type_signal_user_requested_layout;
+ typedef sigc::signal<void()> type_signal_user_requested_layout;
type_signal_user_requested_layout signal_user_requested_layout();
//Allow a child widget to delegate to a parent widget:
- typedef sigc::signal<void> type_signal_user_requested_layout_properties;
+ typedef sigc::signal<void()> type_signal_user_requested_layout_properties;
type_signal_user_requested_layout_properties signal_user_requested_layout_properties();
#endif // !GLOM_ENABLE_CLIENT_ONLY
diff --git a/glom/utility_widgets/layoutwidgetfield.h b/glom/utility_widgets/layoutwidgetfield.h
index 4d5455e..cfdabeb 100644
--- a/glom/utility_widgets/layoutwidgetfield.h
+++ b/glom/utility_widgets/layoutwidgetfield.h
@@ -35,7 +35,7 @@ public:
virtual Gnome::Gda::Value get_value() const = 0;
- typedef sigc::signal<void> type_signal_edited;
+ typedef sigc::signal<void()> type_signal_edited;
type_signal_edited signal_edited();
protected:
diff --git a/glom/utility_widgets/notebook_noframe.h b/glom/utility_widgets/notebook_noframe.h
index 6ded78c..6d1eb95 100644
--- a/glom/utility_widgets/notebook_noframe.h
+++ b/glom/utility_widgets/notebook_noframe.h
@@ -53,7 +53,7 @@ public:
void set_action_widget(Gtk::Widget* widget, Gtk::PackType pack_type);
- typedef sigc::signal<void, Gtk::Widget*> type_signal_switch_page;
+ typedef sigc::signal<void(Gtk::Widget*)> type_signal_switch_page;
type_signal_switch_page signal_switch_page();
diff --git a/tests/import/utils.h b/tests/import/utils.h
index 03bc556..391a236 100644
--- a/tests/import/utils.h
+++ b/tests/import/utils.h
@@ -8,7 +8,7 @@ namespace ImportTests
bool check(const std::string& name, bool test, std::stringstream& report);
-typedef sigc::slot<void, Glom::CsvParser&> FuncConnectParserSignals;
+typedef sigc::slot<void(Glom::CsvParser&)> FuncConnectParserSignals;
/**
* @result Whether the parser finished without being killed by a timeout.
diff --git a/tests/test_signal_reemit.cc b/tests/test_signal_reemit.cc
index 45025ae..5570114 100644
--- a/tests/test_signal_reemit.cc
+++ b/tests/test_signal_reemit.cc
@@ -22,8 +22,8 @@ void on_reemit_int(int param)
int main()
{
{
- sigc::signal<void> signal_first_emit;
- sigc::signal<void> signal_to_reemit;
+ sigc::signal<void()> signal_first_emit;
+ sigc::signal<void()> signal_to_reemit;
Glom::signal_connect_for_reemit_0args(signal_first_emit, signal_to_reemit);
signal_to_reemit.connect( sigc::ptr_fun(&on_reemit_void) );
@@ -32,8 +32,8 @@ int main()
}
{
- sigc::signal<void, int> signal_first_emit;
- sigc::signal<void, int> signal_to_reemit;
+ sigc::signal<void(int)> signal_first_emit;
+ sigc::signal<void(int)> signal_to_reemit;
Glom::signal_connect_for_reemit_1arg(signal_first_emit, signal_to_reemit);
signal_to_reemit.connect( sigc::ptr_fun(&on_reemit_int) );
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]