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

[Daniel Burrows]

Author: dburrows
Date: Wed Aug 17 01:36:56 2005
New Revision: 3883

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc
   branches/aptitude-0.3/aptitude/src/solution_fragment.cc
   branches/aptitude-0.3/aptitude/src/solution_fragment.h
Log:
Change dep_fragment to dep_text, returning a wstring, not a fragment.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Wed Aug 17 01:36:56 2005
@@ -1,5 +1,14 @@
 2005-08-16  Daniel Burrows  <dburrows at debian.org>
 
+	* src/cmdline/cmdline_resolver.cc, src/solution_fragment.cc, src/solution_fragment.h:
+
+	  Change dep_fragment to dep_text, returning a wstring, not a
+	  fragment.
+
+	* src/dep_item.cc, src/dep_item.h:
+
+	  Expose the dep_item class to the world.
+
 	* src/cmdline/cmdline_resolver.cc, src/generic/solution.h:
 
 	  Move the by-id comparison functor to the solution class.

Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc	Wed Aug 17 01:36:56 2005
@@ -61,8 +61,8 @@
 
   for(vector<aptitude_solution::action>::const_iterator i = actions.begin();
       i != actions.end(); ++i)
-    fragments.push_back(fragf("%F%n -> %F%n",
-			      dep_fragment(i->d.get_dep()),
+    fragments.push_back(fragf("%s%n -> %F%n",
+			      dep_text(i->d.get_dep()).c_str(),
 			      indentbox(0, 4, action_fragment(*i))));
 
   return sequence_fragment(fragments);

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	Wed Aug 17 01:36:56 2005
@@ -24,8 +24,10 @@
 
 #include <generic/aptitude_resolver_universe.h>
 #include <generic/problemresolver/solution.h>
+#include <generic/util.h>
 
 #include <vscreen/fragment.h>
+#include <vscreen/transcode.h>
 
 #include <vector>
 
@@ -101,27 +103,35 @@
   return rval;
 }
 
-fragment *dep_fragment(const pkgCache::DepIterator &d)
+wstring dep_text(const pkgCache::DepIterator &d)
 {
   const char *name = const_cast<pkgCache::DepIterator &>(d).ParentPkg().Name();
-  fragment *targets = text_fragment(dep_targets(d));
+
+  string targets = dep_targets(d);
 
   switch(d->Type)
     {
     case pkgCache::Dep::Depends:
-      return fragf(_("%s depends upon %F"), name, targets);
+      return swsprintf(transcode(_("%s depends upon %s")).c_str(),
+		       name, targets.c_str());
     case pkgCache::Dep::PreDepends:
-      return fragf(_("%s pre-depends upon %F"), name, targets);
+      return swsprintf(transcode(_("%s pre-depends upon %s")).c_str(),
+		       name, targets.c_str());
     case pkgCache::Dep::Suggests:
-      return fragf(_("%s suggests %F"), name, targets);
+      return swsprintf(transcode(_("%s suggests %s")).c_str(),
+		       name, targets.c_str());
     case pkgCache::Dep::Recommends:
-      return fragf(_("%s recommends %F"), name, targets);
+      return swsprintf(transcode(_("%s recommends %s")).c_str(),
+		       name, targets.c_str());
     case pkgCache::Dep::Conflicts:
-      return fragf(_("%s conflicts with %F"), name, targets);
+      return swsprintf(transcode(_("%s conflicts with %s")).c_str(),
+		       name, targets.c_str());
     case pkgCache::Dep::Replaces:
+      return swsprintf(transcode(_("%s replaces %s")).c_str(),
+				 name, targets.c_str());
     case pkgCache::Dep::Obsoletes:
-      // Should never happen.
-      abort();
+      return swsprintf(transcode(_("%s obsoletes %s")).c_str(),
+				 name, targets.c_str());
     default:
       abort();
     }
@@ -280,7 +290,7 @@
 
       for(set<aptitude_universe::dep>::const_iterator i = unresolved.begin();
 	  i != unresolved.end(); ++i)
-	fragments.push_back(dep_fragment((*i).get_dep()));
+	fragments.push_back(text_fragment(dep_text((*i).get_dep())));
     }
 
   char buf[512];

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	Wed Aug 17 01:36:56 2005
@@ -45,9 +45,9 @@
 fragment *action_fragment(const generic_solution<aptitude_universe>::action &a);
 
 /** \return descriptive text about a single dependency. */
-fragment *dep_fragment(const pkgCache::DepIterator &d);
+std::wstring dep_text(const pkgCache::DepIterator &d);
 
 /** \return descriptive text about the targets of a dependency. */
-string dep_targets(const pkgCache::DepIterator &start);
+std::string dep_targets(const pkgCache::DepIterator &start);
 
 #endif // SOLUTION_FRAGMENT_H