[Aptitude-svn-commit] r3748 - in branches/aptitude-0.3/aptitude: . src

Daniel Burrows dburrows at costa.debian.org
Mon Aug 8 18:16:20 UTC 2005


Author: dburrows
Date: Mon Aug  8 18:16:18 2005
New Revision: 3748

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/pkg_ver_item.cc
   branches/aptitude-0.3/aptitude/src/pkg_ver_item.h
Log:
Update pkg_ver_item.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Mon Aug  8 18:16:18 2005
@@ -1,5 +1,9 @@
 2005-08-08  Daniel Burrows  <dburrows at debian.org>
 
+	* src/pkg_ver_item.cc, src/pkg_ver_item.h:
+
+	  Update pkg_ver_item for refcounting.
+
 	* src/pkg_info_screen.h:
 
 	  Update the pkg_info_screen signature for refcounting.

Modified: branches/aptitude-0.3/aptitude/src/pkg_ver_item.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_ver_item.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/pkg_ver_item.cc	Mon Aug  8 18:16:18 2005
@@ -635,7 +635,7 @@
 
 void pkg_ver_item::show_information()
 {
-  vscreen_widget *w=make_info_screen(version.ParentPkg(), version);
+  vs_widget_ref w=make_info_screen(version.ParentPkg(), version);
 
   char buf[512];
   snprintf(buf, 512, _("Information about %s"), version.ParentPkg().Name());
@@ -673,7 +673,7 @@
       snprintf(buf, 512, _("%s deps"), version.ParentPkg().Name());
       string tablabel(buf);
 
-      vscreen_widget *w=make_dep_screen(version.ParentPkg(), version);
+      vs_widget_ref w=make_dep_screen(version.ParentPkg(), version);
       insert_main_widget(w, menulabel, "", tablabel);
       return true;
     }
@@ -685,7 +685,7 @@
       snprintf(buf, 512, _("%s reverse deps"), version.ParentPkg().Name());
       string tablabel(buf);
 
-      vscreen_widget *w=make_dep_screen(version.ParentPkg(), version, true);
+      vs_widget_ref w=make_dep_screen(version.ParentPkg(), version, true);
       insert_main_widget(w, menulabel, "", tablabel);
       return true;
     }
@@ -744,8 +744,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();
 
       return true;

Modified: branches/aptitude-0.3/aptitude/src/pkg_ver_item.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_ver_item.h	(original)
+++ branches/aptitude-0.3/aptitude/src/pkg_ver_item.h	Mon Aug  8 18:16:18 2005
@@ -134,10 +134,16 @@
 protected:
   virtual vs_treeitem *setup_new_root(const pkgCache::PkgIterator &pkg,
 				      const pkgCache::VerIterator &ver);
-public:
   pkg_ver_screen(const pkgCache::PkgIterator &pkg);
+public:
+  static ref_ptr<pkg_ver_screen> create(const pkgCache::PkgIterator &pkg)
+  {
+    return new pkg_ver_screen(pkg);
+  }
 };
 
+typedef ref_ptr<pkg_ver_screen> pkg_ver_screen_ref;
+
 void setup_package_versions(const pkgCache::PkgIterator &pkg, pkg_vertree *tree, pkg_signal *sig);
 void setup_package_versions(const pkgCache::PkgIterator &pkg, pkg_vertree_generic *tree, pkg_signal *sig);
 // Adds all versions of a package to the given tree.



More information about the Aptitude-svn-commit mailing list