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

[Daniel Burrows]

Author: dburrows
Date: Tue Jun  7 06:05:50 2005
New Revision: 3357

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:
Finally fix all the compilation problems in pkg_ver_item.cc (silly stuff I overlooked
like the return value of get_normal_style)

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Jun  7 06:05:50 2005
@@ -1,5 +1,9 @@
 2005-06-06  Daniel Burrows  <dburrows@debian.org>
 
+	* src/pkg_ver_item.cc, src/pkg_ver_item.h:
+
+	Fix some confusion over the return type of pkg_ver_item::get_normal_style.
+
 	* src/pkg_item_with_subtree.h:
 
 	Change the signature of paint() to match its new signature in

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	Tue Jun  7 06:05:50 2005
@@ -460,9 +460,9 @@
   return new pkg_grouppolicy_ver(sig, desc_sig);
 }
 
-int pkg_ver_item::get_normal_style()
+style pkg_ver_item::get_normal_style()
 {
-  return ver_style(version, vs_treeitem::get_normal_style());
+  return vs_treeitem::get_normal_style()+ver_style(version);
 }
 
 style pkg_ver_item::ver_style(pkgCache::VerIterator version)

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	Tue Jun  7 06:05:50 2005
@@ -49,7 +49,7 @@
   pkgCache::PkgIterator get_package() const {return version.ParentPkg();}
   const pkgCache::VerIterator &get_version() const {return version;}
 
-  virtual int get_normal_style();
+  virtual style get_normal_style();
   virtual void paint(vs_tree *win, int y, bool hierarchical,
 		     const style &st);