[glom/gmenu] Minor code simplification
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom/gmenu] Minor code simplification
- Date: Tue, 6 Aug 2013 16:07:47 +0000 (UTC)
commit 4dc2a5d24fc731dc6e012a1f476ef4cbf4b1169b
Author: Murray Cumming <murrayc murrayc com>
Date: Mon Jul 29 21:13:16 2013 +0200
Minor code simplification
.../dialog_relationships_overview.cc | 14 ++++++--------
.../dialog_relationships_overview.h | 1 -
2 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/glom/mode_design/relationships_overview/dialog_relationships_overview.cc
b/glom/mode_design/relationships_overview/dialog_relationships_overview.cc
index dcb9729..5fa948b 100644
--- a/glom/mode_design/relationships_overview/dialog_relationships_overview.cc
+++ b/glom/mode_design/relationships_overview/dialog_relationships_overview.cc
@@ -496,19 +496,17 @@ void Dialog_RelationshipsOverview::setup_context_menu()
{
Glib::RefPtr<Gio::SimpleActionGroup> action_group = Gio::SimpleActionGroup::create();
- m_action_edit_fields = Gio::SimpleAction::create("editfields");
- action_group->add_action(m_action_edit_fields);
+ m_action_edit_fields = action_group->add_action("editfields");
- m_action_edit_relationships = Gio::SimpleAction::create("editrelationships");
- action_group->add_action(m_action_edit_relationships);
+ m_action_edit_relationships = action_group->add_action("editrelationships");
insert_action_group("context", action_group);
- m_context_menu_builder = Gtk::Builder::create();
+ Glib::RefPtr<Gtk::Builder> context_menu_builder = Gtk::Builder::create();
try
{
- Glib::ustring ui_info =
+ const char* ui_info =
"<interface>"
" <menu id='ContextMenu'>"
" <section>"
@@ -524,7 +522,7 @@ void Dialog_RelationshipsOverview::setup_context_menu()
" </menu>"
"</interface>";
- m_context_menu_builder->add_from_string(ui_info);
+ context_menu_builder->add_from_string(ui_info);
}
catch(const Glib::Error& ex)
{
@@ -533,7 +531,7 @@ void Dialog_RelationshipsOverview::setup_context_menu()
//Get the menu:
Glib::RefPtr<Glib::Object> object =
- m_context_menu_builder->get_object("ContextMenu");
+ context_menu_builder->get_object("ContextMenu");
Glib::RefPtr<Gio::Menu> gmenu =
Glib::RefPtr<Gio::Menu>::cast_dynamic(object);
if(!gmenu)
diff --git a/glom/mode_design/relationships_overview/dialog_relationships_overview.h
b/glom/mode_design/relationships_overview/dialog_relationships_overview.h
index 4f39486..89aabb3 100644
--- a/glom/mode_design/relationships_overview/dialog_relationships_overview.h
+++ b/glom/mode_design/relationships_overview/dialog_relationships_overview.h
@@ -98,7 +98,6 @@ private:
//Context menu:
Gtk::Menu* m_context_menu;
- Glib::RefPtr<Gtk::Builder> m_context_menu_builder;
Glib::RefPtr<Gio::SimpleAction> m_action_edit_fields, m_action_edit_relationships;
sigc::connection m_connection_edit_fields, m_connection_edit_relationships;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]