[Aptitude-svn-commit] r3744 - in branches/aptitude-0.3/aptitude: .
src
Daniel Burrows
dburrows at costa.debian.org
Mon Aug 8 17:58:53 UTC 2005
Author: dburrows
Date: Mon Aug 8 17:58:50 2005
New Revision: 3744
Modified:
branches/aptitude-0.3/aptitude/ChangeLog
branches/aptitude-0.3/aptitude/src/pkg_item.cc
Log:
Update pkg_item for refcounting.
Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog (original)
+++ branches/aptitude-0.3/aptitude/ChangeLog Mon Aug 8 17:58:50 2005
@@ -1,5 +1,9 @@
2005-08-08 Daniel Burrows <dburrows at debian.org>
+ * src/pkg_item.cc:
+
+ Update the pkg_item implementation for refcounting.
+
* src/edit_pkg_hier.h:
Update the vs_hier_editor class for the refcounting protocol.
Modified: branches/aptitude-0.3/aptitude/src/pkg_item.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_item.cc (original)
+++ branches/aptitude-0.3/aptitude/src/pkg_item.cc Mon Aug 8 17:58:50 2005
@@ -80,14 +80,14 @@
fragment *f=wrapbox(fragf(_("%s is an essential package!%n%nAre you sure you want to remove it?%nType '%s' if you are."), pkg.Name(), _(confirm_str)));
- vscreen_widget *w=vs_dialog_string(f,
- L"",
- arg(sigc::bind(sigc::ptr_fun(try_delete_essential),
- pkg, purge)),
- NULL,
- NULL,
- NULL,
- style_attrs_flip(A_REVERSE));
+ vs_widget_ref w=vs_dialog_string(f,
+ L"",
+ arg(sigc::bind(sigc::ptr_fun(try_delete_essential),
+ pkg, purge)),
+ NULL,
+ NULL,
+ NULL,
+ style_attrs_flip(A_REVERSE));
w->show_all();
@@ -223,7 +223,7 @@
snprintf(buf, 512, _("%s info"), package.Name());
string tablabel(buf);
- vscreen_widget *w=make_info_screen(package, visible_version());
+ vs_widget_ref w=make_info_screen(package, visible_version());
// what to use as the menu description?
insert_main_widget(w, menulabel, "", tablabel);
}
@@ -314,7 +314,7 @@
package.Name());
string tablabel(buf);
- vscreen_widget *w=make_ver_screen(package);
+ vs_widget_ref w=make_ver_screen(package);
insert_main_widget(w, menulabel, "", tablabel);
}
else if(bindings->key_matches(k, "Dependencies"))
@@ -327,7 +327,7 @@
snprintf(buf, 512, _("%s deps"), package.Name());
string tablabel(buf);
- vscreen_widget *w=make_dep_screen(package, visible_version());
+ vs_widget_ref w=make_dep_screen(package, visible_version());
insert_main_widget(w, menulabel, "", tablabel);
w->show();
}
@@ -340,7 +340,7 @@
snprintf(buf, 512, _("%s reverse deps"), package.Name());
string tablabel(buf);
- vscreen_widget *w=make_dep_screen(package, visible_version(), true);
+ vs_widget_ref w=make_dep_screen(package, visible_version(), true);
insert_main_widget(w, menulabel, "", tablabel);
}
else if(bindings->key_matches(k, "InfoScreen"))
@@ -395,8 +395,8 @@
vscreen_resume();
- vs_progress *p = gen_progress_bar();
- apt_reload_cache(p, true);
+ vs_progress_ref p = gen_progress_bar();
+ apt_reload_cache(p.unsafe_get_ref(), true);
p->destroy();
}
else if(bindings->key_matches(k, "DpkgReconfigure"))
@@ -437,21 +437,21 @@
vscreen_resume();
}
- vs_progress *p = gen_progress_bar();
- apt_reload_cache(p, true);
+ vs_progress_ref p = gen_progress_bar();
+ apt_reload_cache(p.unsafe_get_ref(), true);
p->destroy();
}
}
else if(bindings->key_matches(k, "EditHier"))
{
- vs_hier_editor *e=new vs_hier_editor;
+ vs_hier_editor_ref e=vs_hier_editor::create();
e->set_package(package, visible_version());
// FIXME: better title
add_main_widget(e, _("Hierarchy editor"), "", _("Hierarchy Editor"));
e->connect_key("Quit", &global_bindings,
- sigc::mem_fun(*e, &vscreen_widget::destroy));
+ sigc::mem_fun(*e.unsafe_get_ref(), &vscreen_widget::destroy));
}
else
return pkg_tree_node::dispatch_key(k, owner);
More information about the Aptitude-svn-commit
mailing list