diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/menu_redirect.cc | 4 | ||||
| -rw-r--r-- | src/mine/cmine.cc | 4 | ||||
| -rw-r--r-- | src/pkg_item.cc | 2 | ||||
| -rw-r--r-- | src/pkg_view.cc | 10 | ||||
| -rw-r--r-- | src/solution_dialog.cc | 4 | ||||
| -rw-r--r-- | src/solution_screen.cc | 4 | ||||
| -rw-r--r-- | src/ui.cc | 10 |
7 files changed, 19 insertions, 19 deletions
diff --git a/src/menu_redirect.cc b/src/menu_redirect.cc index 25876cd3..3eebe58e 100644 --- a/src/menu_redirect.cc +++ b/src/menu_redirect.cc @@ -63,7 +63,7 @@ bool menu_redirect::find_reset_limit() { return false; } bool menu_redirect::find_broken_enabled() { return false; } bool menu_redirect::find_broken() { return false; } -static bool do_menu_callback(cwidget::cw::widget &viewBare, +static bool do_menu_callback(cw::widget &viewBare, menu_redirect *redirect, bool (menu_redirect::* action)()) { @@ -83,7 +83,7 @@ static bool do_menu_callback(cwidget::cw::widget &viewBare, } void create_menu_bindings(menu_redirect *menu_handler, - const cw::util::ref_ptr<cwidget::cw::widget> &valve) + const cw::util::ref_ptr<cw::widget> &valve) { undo_undo_enabled.connect(sigc::bind(ptr_fun(do_menu_callback), valve.weak_ref(), diff --git a/src/mine/cmine.cc b/src/mine/cmine.cc index ce920101..4d97faa8 100644 --- a/src/mine/cmine.cc +++ b/src/mine/cmine.cc @@ -315,7 +315,7 @@ void cmine::do_custom_game() heightedit.weak_ref(), widthedit.weak_ref(), minesedit.weak_ref())); - cancelbutton->pressed.connect(sigc::mem_fun(*center.unsafe_get_ref(), &cwidget::cw::widget::destroy)); + cancelbutton->pressed.connect(sigc::mem_fun(*center.unsafe_get_ref(), &cw::widget::destroy)); table->connect_key("Cancel", &cwidget::config::global_bindings, cancelbutton->pressed.make_slot()); @@ -415,7 +415,7 @@ void cmine::do_new_game() } void cmine::do_continue_new_game(bool start, - cwidget::cw::widget &w_bare, + cw::widget &w_bare, cw::radiogroup *grp) { cw::widget_ref tmpref(this); diff --git a/src/pkg_item.cc b/src/pkg_item.cc index 9a8ce5f4..9e3616c6 100644 --- a/src/pkg_item.cc +++ b/src/pkg_item.cc @@ -456,7 +456,7 @@ bool pkg_item::dispatch_key(const cw::config::key &k, cw::tree *owner) add_main_widget(e, _("Hierarchy editor"), "", _("Hierarchy Editor")); e->connect_key("Quit", &cw::config::global_bindings, - sigc::mem_fun(*e.unsafe_get_ref(), &cwidget::cw::widget::destroy)); + sigc::mem_fun(*e.unsafe_get_ref(), &cw::widget::destroy)); } else return pkg_tree_node::dispatch_key(k, owner); diff --git a/src/pkg_view.cc b/src/pkg_view.cc index 7ceffc79..39ab0647 100644 --- a/src/pkg_view.cc +++ b/src/pkg_view.cc @@ -568,10 +568,10 @@ cw::widget_ref make_package_view(list<package_view_item> &format, &info_area_multiplex::cycle)); mainwidget->connect_key("EditHier", &cw::config::global_bindings, sigc::mem_fun(*e.unsafe_get_ref(), - &cwidget::cw::widget::show)); + &cw::widget::show)); mainwidget->connect_key("EditHier", &cw::config::global_bindings, sigc::mem_fun(*m.unsafe_get_ref(), - &cwidget::cw::widget::show)); + &cw::widget::show)); mainwidget->connect_key("EditHier", &cw::config::global_bindings, sigc::bind(sigc::mem_fun(*rval.unsafe_get_ref(), &cw::table::focus_widget_bare), m.weak_ref())); @@ -624,7 +624,7 @@ cw::widget_ref make_package_view(list<package_view_item> &format, rval->connect_key(i->popupdownkey, &cw::config::global_bindings, sigc::mem_fun(*i->widget.unsafe_get_ref(), - &cwidget::cw::widget::toggle_visible)); + &cw::widget::toggle_visible)); if(i->visible) i->widget->show(); @@ -643,8 +643,8 @@ cw::widget_ref make_package_view(list<package_view_item> &format, if(!strcasecmp(j->name.c_str(), i->popupdownlinked.c_str())) { // Having to make two connections is annoying. - j->widget->shown_sig.connect(sigc::mem_fun(*i->widget.unsafe_get_ref(), &cwidget::cw::widget::show)); - j->widget->hidden_sig.connect(sigc::mem_fun(*i->widget.unsafe_get_ref(), &cwidget::cw::widget::hide)); + j->widget->shown_sig.connect(sigc::mem_fun(*i->widget.unsafe_get_ref(), &cw::widget::show)); + j->widget->hidden_sig.connect(sigc::mem_fun(*i->widget.unsafe_get_ref(), &cw::widget::hide)); break; } } diff --git a/src/solution_dialog.cc b/src/solution_dialog.cc index 0c40106e..822fdde6 100644 --- a/src/solution_dialog.cc +++ b/src/solution_dialog.cc @@ -139,7 +139,7 @@ public: typedef cw::util::ref_ptr<solution_dialog> solution_dialog_ref; -static void do_apply(cwidget::cw::widget &wBare) +static void do_apply(cw::widget &wBare) { cw::widget_ref w(&wBare); @@ -184,7 +184,7 @@ cw::widget_ref make_solution_dialog() bapply->pressed.connect(sigc::bind(sigc::ptr_fun(do_apply), rval.weak_ref())); bclose->pressed.connect(sigc::mem_fun(rval.unsafe_get_ref(), - &cwidget::cw::widget::destroy)); + &cw::widget::destroy)); rval->connect_key("ApplySolution", &cw::config::global_bindings, sigc::bind(sigc::ptr_fun(do_apply), diff --git a/src/solution_screen.cc b/src/solution_screen.cc index 6feadde1..c17f3fa4 100644 --- a/src/solution_screen.cc +++ b/src/solution_screen.cc @@ -551,7 +551,7 @@ void update_dep_display(aptitude_resolver_dep d, cw::tree *tBare) } static -void maybe_remove_examiner(cwidget::cw::widget &wBare) +void maybe_remove_examiner(cw::widget &wBare) { cw::widget_ref w(&wBare); @@ -579,7 +579,7 @@ cw::widget_ref make_solution_screen() info_tree->connect_key("ShowHideDescription", &cw::config::global_bindings, sigc::mem_fun(info_tree.unsafe_get_ref(), - &cwidget::cw::widget::toggle_visible)); + &cw::widget::toggle_visible)); l->set_bg_style(cw::get_style("Status")); @@ -359,7 +359,7 @@ static bool do_read_only_permission() cw::center_ref c = cw::center::create(frame); - ok->pressed.connect(sigc::mem_fun(c.unsafe_get_ref(), &cwidget::cw::widget::destroy)); + ok->pressed.connect(sigc::mem_fun(c.unsafe_get_ref(), &cw::widget::destroy)); c->destroyed.connect(sigc::bind(sigc::ptr_fun(&read_only_permissions_table_destroyed), sigc::ref(*w))); popup_widget(c); @@ -1542,7 +1542,7 @@ static void lists_autoclean_msg(download_update_manager *m) { cw::widget_ref msg = cw::center::create(cw::frame::create(cw::label::create(_("Deleting obsolete downloaded files")))); m->post_autoclean_hook.connect(sigc::mem_fun(msg.unsafe_get_ref(), - &cwidget::cw::widget::destroy)); + &cw::widget::destroy)); popup_widget(msg); cw::toplevel::tryupdate(); @@ -2691,7 +2691,7 @@ static void setup_main_widget(const cw::widget_ref &w, const std::wstring &menur // FIXME: if w is removed from the multiplexer but not destroyed, this may // break. Fix for now: Don't Do That Then! w->destroyed.connect(sigc::bind(sigc::mem_fun(views_menu.unsafe_get_ref(), &cw::menu::remove_item), menuentry)); - menuentry->selected.connect(sigc::mem_fun(w.unsafe_get_ref(), &cwidget::cw::widget::show)); + menuentry->selected.connect(sigc::mem_fun(w.unsafe_get_ref(), &cw::widget::show)); views_menu->append_item(menuentry); } @@ -2869,13 +2869,13 @@ void prompt_string(const std::wstring &prompt, e->entered.connect(sigc::bind(sigc::ptr_fun(do_prompt_string), e.weak_ref(), - sigc::mem_fun(e.unsafe_get_ref(), &cwidget::cw::widget::destroy))); + sigc::mem_fun(e.unsafe_get_ref(), &cw::widget::destroy))); if(changed_slot) e->text_changed.connect(*changed_slot); e->connect_key("Cancel", &cw::config::global_bindings, - sigc::mem_fun(e.unsafe_get_ref(), &cwidget::cw::widget::destroy)); + sigc::mem_fun(e.unsafe_get_ref(), &cw::widget::destroy)); if(cancel_slot) e->connect_key("Cancel", |