diff options
| -rw-r--r-- | src/download_screen.cc | 6 | ||||
| -rw-r--r-- | src/menu_text_layout.cc | 4 | ||||
| -rw-r--r-- | src/menu_tree.cc | 12 | ||||
| -rw-r--r-- | src/mine/cmine.cc | 4 | ||||
| -rw-r--r-- | src/pkg_item.cc | 2 | ||||
| -rw-r--r-- | src/pkg_tree.cc | 6 | ||||
| -rw-r--r-- | src/ui.cc | 26 | ||||
| -rw-r--r-- | src/ui_download_manager.cc | 2 | ||||
| -rw-r--r-- | src/view_changelog.cc | 4 |
9 files changed, 33 insertions, 33 deletions
diff --git a/src/download_screen.cc b/src/download_screen.cc index d7603a49..188c9577 100644 --- a/src/download_screen.cc +++ b/src/download_screen.cc @@ -65,10 +65,10 @@ bool download_screen::MediaChange(string Media, string Drive) bool rval=true; popup_widget(cw::dialogs::yesno(cw::util::transcode(buf), - arg(sigc::bind(sigc::ptr_fun(set_and_exit), + cw::util::arg(sigc::bind(sigc::ptr_fun(set_and_exit), rval, true)), W_("Continue"), - arg(sigc::bind(sigc::ptr_fun(set_and_exit), + cw::util::arg(sigc::bind(sigc::ptr_fun(set_and_exit), rval, false)), W_("Abort"), cw::get_style("MediaChange"))); @@ -188,7 +188,7 @@ void download_screen::Stop() snprintf(buf, 256, _("Downloaded %sB in %ss (%sB/s)."), SizeToStr(FetchedBytes).c_str(), TimeToStr(ElapsedTime).c_str(), SizeToStr(CurrentCPS).c_str()); popup_widget(cw::dialogs::ok(cw::util::transcode(buf), - arg(sigc::ptr_fun(cw::toplevel::exitmain)))); + cw::util::arg(sigc::ptr_fun(cw::toplevel::exitmain)))); cw::toplevel::mainloop(); diff --git a/src/menu_text_layout.cc b/src/menu_text_layout.cc index 10d865e2..7447c136 100644 --- a/src/menu_text_layout.cc +++ b/src/menu_text_layout.cc @@ -36,7 +36,7 @@ bool menu_text_layout::find_search() { prompt_string(W_("Search for: "), last_search, - arg(sigc::mem_fun(this, &menu_text_layout::do_find_search)), + cw::util::arg(sigc::mem_fun(this, &menu_text_layout::do_find_search)), NULL, NULL, &search_history); @@ -68,7 +68,7 @@ bool menu_text_layout::find_search_back() { prompt_string(_("Search backwards for: "), cw::util::transcode(last_search), - arg(sigc::mem_fun(this, &menu_text_layout::do_find_search_back)), + cw::util::arg(sigc::mem_fun(this, &menu_text_layout::do_find_search_back)), NULL, NULL, &search_history); diff --git a/src/menu_tree.cc b/src/menu_tree.cc index 40b34dfd..0354d931 100644 --- a/src/menu_tree.cc +++ b/src/menu_tree.cc @@ -207,9 +207,9 @@ bool menu_tree::find_search() { prompt_string(W_("Search for: "), last_search_term, - arg(sigc::bind(sigc::mem_fun(*this, &menu_tree::do_search), false)), - arg(sigc::mem_fun(*this, &menu_tree::do_cancel_incsearch)), - arg(sigc::bind(sigc::mem_fun(*this, &menu_tree::do_incsearch), false)), + cw::util::arg(sigc::bind(sigc::mem_fun(*this, &menu_tree::do_search), false)), + cw::util::arg(sigc::mem_fun(*this, &menu_tree::do_cancel_incsearch)), + cw::util::arg(sigc::bind(sigc::mem_fun(*this, &menu_tree::do_incsearch), false)), &search_history); return true; @@ -224,9 +224,9 @@ bool menu_tree::find_search_back() { prompt_string(W_("Search backwards for: "), last_search_term, - arg(sigc::bind(sigc::mem_fun(*this, &menu_tree::do_search), true)), - arg(sigc::mem_fun(*this, &menu_tree::do_cancel_incsearch)), - arg(sigc::bind(sigc::mem_fun(*this, &menu_tree::do_incsearch), true)), + cw::util::arg(sigc::bind(sigc::mem_fun(*this, &menu_tree::do_search), true)), + cw::util::arg(sigc::mem_fun(*this, &menu_tree::do_cancel_incsearch)), + cw::util::arg(sigc::bind(sigc::mem_fun(*this, &menu_tree::do_incsearch), true)), &search_history); return true; diff --git a/src/mine/cmine.cc b/src/mine/cmine.cc index 54a0907c..403b580f 100644 --- a/src/mine/cmine.cc +++ b/src/mine/cmine.cc @@ -668,14 +668,14 @@ bool cmine::handle_key(const cwidget::config::key &k) else if(bindings->key_matches(k, "MineLoadGame")) prompt_string(_("Enter the filename to load: "), "", - arg(sigc::mem_fun(*this, &cmine::do_load_game)), + cw::util::arg(sigc::mem_fun(*this, &cmine::do_load_game)), NULL, NULL, &load_history); else if(bindings->key_matches(k, "MineSaveGame")) prompt_string(_("Enter the filename to save: "), "", - arg(sigc::mem_fun(*this, &cmine::do_save_game)), + cw::util::arg(sigc::mem_fun(*this, &cmine::do_save_game)), NULL, NULL, &save_history); diff --git a/src/pkg_item.cc b/src/pkg_item.cc index daf8f507..e86ce4c2 100644 --- a/src/pkg_item.cc +++ b/src/pkg_item.cc @@ -81,7 +81,7 @@ static void confirm_delete_essential(const pkgCache::PkgIterator &pkg, cw::widget_ref w=cw::dialogs::string(f, L"", - arg(sigc::bind(sigc::ptr_fun(try_delete_essential), + cw::util::arg(sigc::bind(sigc::ptr_fun(try_delete_essential), pkg, purge)), NULL, NULL, diff --git a/src/pkg_tree.cc b/src/pkg_tree.cc index 73edda7a..74317bcc 100644 --- a/src/pkg_tree.cc +++ b/src/pkg_tree.cc @@ -258,7 +258,7 @@ bool pkg_tree::find_limit() { prompt_string(W_("Enter the new package tree limit: "), limitstr, - arg(sigc::mem_fun(*this, &pkg_tree::set_limit)), + cw::util::arg(sigc::mem_fun(*this, &pkg_tree::set_limit)), NULL, NULL, &limit_history); @@ -292,7 +292,7 @@ bool pkg_tree::handle_key(const cwi::key &k) else if(bindings->key_matches(k, "ChangePkgTreeGrouping")) prompt_string(_("Enter the new package grouping mechanism for this display: "), groupingstr, - arg(sigc::mem_fun(*this, + cw::util::arg(sigc::mem_fun(*this, (void (pkg_tree::*) (const std::wstring &)) &pkg_tree::set_grouping)), NULL, NULL, @@ -300,7 +300,7 @@ bool pkg_tree::handle_key(const cwi::key &k) else if(bindings->key_matches(k, "ChangePkgTreeSorting")) prompt_string(_("Enter the new package sorting mechanism for this display: "), "", - arg(sigc::mem_fun(*this, + cw::util::arg(sigc::mem_fun(*this, (void (pkg_tree::*) (const std::wstring &)) &pkg_tree::set_sorting)), NULL, NULL, @@ -241,7 +241,7 @@ static void pager_search(cw::pager &p) { prompt_string(W_("Search for:"), p.get_last_search(), - arg(sigc::mem_fun(p, &cw::pager::search_for)), + cw::util::arg(sigc::mem_fun(p, &cw::pager::search_for)), NULL, NULL, NULL); @@ -631,8 +631,8 @@ static void do_quit() { really_quit_active = true; prompt_yesno(_("Really quit Aptitude?"), false, - arg(sigc::bind(ptr_fun(do_really_quit_answer), true)), - arg(sigc::bind(ptr_fun(do_really_quit_answer), false))); + cw::util::arg(sigc::bind(ptr_fun(do_really_quit_answer), true)), + cw::util::arg(sigc::bind(ptr_fun(do_really_quit_answer), false))); } } else @@ -722,7 +722,7 @@ static void do_revert_options() { prompt_yesno(_("Really discard your personal settings and reload the defaults?"), false, - arg(sigc::ptr_fun(really_do_revert_options)), + cw::util::arg(sigc::ptr_fun(really_do_revert_options)), NULL); } @@ -1170,8 +1170,8 @@ static void maybe_show_old_tmpdir_message() if(access(tmpdir_path.c_str(), F_OK) == 0) prompt_yesno_popup(wrapbox(fragf(_("It appears that a previous version of aptitude left files behind in %s. These files are probably useless and safe to delete.%n%nDo you want to remove this directory and all its contents? If you select \"No\", you will not see this message again."), tmpdir_path.c_str())), false, - arg(sigc::bind(sigc::ptr_fun(do_kill_old_tmp), tmpdir_path)), - arg(sigc::bind(sigc::ptr_fun(cancel_kill_old_tmp), tmpdir_path))); + cw::util::arg(sigc::bind(sigc::ptr_fun(do_kill_old_tmp), tmpdir_path)), + cw::util::arg(sigc::bind(sigc::ptr_fun(cancel_kill_old_tmp), tmpdir_path))); } // There are some circular references because of the code to test @@ -1256,7 +1256,7 @@ static void check_package_trust() i->ParentPkg().Name(), i->VerStr()))); main_stacked->add_visible_widget(cw::dialogs::yesno(sequence_fragment(frags), - arg(sigc::ptr_fun(install_or_remove_packages)), + cw::util::arg(sigc::ptr_fun(install_or_remove_packages)), W_("Really Continue"), NULL, W_("Abort Installation"), @@ -1440,10 +1440,10 @@ static void actually_do_package_run() else { popup_widget(cw::dialogs::yesno(wrapbox(text_fragment(_("Installing/removing packages requires administrative privileges, which you currently do not have. Would you like to change to the root account?"))), - arg(sigc::bind(sigc::ptr_fun(&do_su_to_root), + cw::util::arg(sigc::bind(sigc::ptr_fun(&do_su_to_root), "-i")), W_("Become root"), - arg(sigc::ptr_fun(&check_package_trust)), + cw::util::arg(sigc::ptr_fun(&check_package_trust)), W_("Don't become root"), cw::get_style("Error"))); } @@ -1569,10 +1569,10 @@ void do_update_lists() else { popup_widget(cw::dialogs::yesno(wrapbox(text_fragment(_("Updating the package lists requires administrative privileges, which you currently do not have. Would you like to change to the root account?"))), - arg(sigc::bind(sigc::ptr_fun(&do_su_to_root), + cw::util::arg(sigc::bind(sigc::ptr_fun(&do_su_to_root), "-u")), W_("Become root"), - arg(sigc::ptr_fun(&really_do_update_lists)), + cw::util::arg(sigc::ptr_fun(&really_do_update_lists)), W_("Don't become root"), cw::get_style("Error"))); } @@ -2073,7 +2073,7 @@ static void do_dump_resolver() if(resman != NULL && resman->resolver_exists()) prompt_string(_("File to which the resolver state should be dumped:"), "", - arg(sigc::ptr_fun(handle_dump_resolver_response)), + cw::util::arg(sigc::ptr_fun(handle_dump_resolver_response)), NULL, NULL, &history); @@ -2312,7 +2312,7 @@ cw::menu_info options_menu[]={ sigc::ptr_fun(do_revert_options)), //{cw::menu_info::VS_MENU_ITEM, N_("^Save options"), NULL, - // N_("Save current settings for future sessions"), arg(bind(sigc::ptr_fun(apt_dumpcfg)), + // N_("Save current settings for future sessions"), cw::util::arg(bind(sigc::ptr_fun(apt_dumpcfg)), // PACKAGE)}, VS_MENU_END diff --git a/src/ui_download_manager.cc b/src/ui_download_manager.cc index 86055d4c..b4670cb1 100644 --- a/src/ui_download_manager.cc +++ b/src/ui_download_manager.cc @@ -44,7 +44,7 @@ ui_download_manager::ui_download_manager(download_manager *_manager, std::pair<download_signal_log *, cw::widget_ref> progpair = gen_download_progress(force_noninvasive, list_update, title, longtitle, tablabel, - arg(sigc::mem_fun(abort_state, + cw::util::arg(sigc::mem_fun(abort_state, &aborter::abort))); log = progpair.first; diff --git a/src/view_changelog.cc b/src/view_changelog.cc index 21c94528..5d10bb70 100644 --- a/src/view_changelog.cc +++ b/src/view_changelog.cc @@ -54,7 +54,7 @@ class pkg_changelog_screen : public cw::file_pager, public menu_redirect prompt_string(W_("Search for: "), get_last_search(), - arg(sigc::mem_fun(*this, &cw::pager::search_for)), + cw::util::arg(sigc::mem_fun(*this, &cw::pager::search_for)), NULL, NULL, NULL); @@ -66,7 +66,7 @@ class pkg_changelog_screen : public cw::file_pager, public menu_redirect prompt_string(W_("Search backwards for: "), get_last_search(), - arg(sigc::mem_fun(*this, &cw::pager::search_back_for)), + cw::util::arg(sigc::mem_fun(*this, &cw::pager::search_back_for)), NULL, NULL, NULL); |