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

[Daniel Burrows]

Author: dburrows
Date: Tue Aug 16 18:39:24 2005
New Revision: 3866

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/solution_fragment.cc
   branches/aptitude-0.3/aptitude/src/solution_fragment.h
Log:
Change dep_targets_fragment to dep_targets (more generic; returns a string).

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Aug 16 18:39:24 2005
@@ -1,5 +1,11 @@
 2005-08-16  Daniel Burrows  <dburrows at debian.org>
 
+	* src/solution_fragment.cc, src/solution_fragment.h:
+
+	  Rename dep_targets_fragment to dep_targets; now it just
+	  generates a plain string (and is a candidate for being pushed
+	  down into the generic layer).
+
 	* src/generic/aptcache.cc:
 
 	  Slightly *reward* longer solutions, rather than slightly

Modified: branches/aptitude-0.3/aptitude/src/solution_fragment.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/solution_fragment.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/solution_fragment.cc	Tue Aug 16 18:39:24 2005
@@ -68,7 +68,7 @@
   return join_fragments(archive_fragments, L",");
 }
 
-fragment *dep_targets_fragment(const pkgCache::DepIterator &start)
+string dep_targets(const pkgCache::DepIterator &start)
 {
   string rval;
 
@@ -98,13 +98,13 @@
 	break;
     }
 
-  return text_fragment(rval);
+  return rval;
 }
 
 fragment *dep_fragment(const pkgCache::DepIterator &d)
 {
   const char *name = const_cast<pkgCache::DepIterator &>(d).ParentPkg().Name();
-  fragment *targets = dep_targets_fragment(d);
+  fragment *targets = text_fragment(dep_targets(d));
 
   switch(d->Type)
     {

Modified: branches/aptitude-0.3/aptitude/src/solution_fragment.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/solution_fragment.h	(original)
+++ branches/aptitude-0.3/aptitude/src/solution_fragment.h	Tue Aug 16 18:39:24 2005
@@ -48,6 +48,6 @@
 fragment *dep_fragment(const pkgCache::DepIterator &d);
 
 /** \return descriptive text about the targets of a dependency. */
-fragment *dep_targets_fragment(const pkgCache::DepIterator &start);
+string dep_targets(const pkgCache::DepIterator &start);
 
 #endif // SOLUTION_FRAGMENT_H