From fb83c1d078b9f5e2e28a828c325dc62dcf060f2b Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Tue, 29 Jun 2010 19:10:47 +0200
Subject: rename AddSelectedVersion() to a better public FromPackage()

---
 cmdline/cacheset.cc | 11 ++++++-----
 cmdline/cacheset.h  | 14 +++++++++-----
 2 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'cmdline')

diff --git a/cmdline/cacheset.cc b/cmdline/cacheset.cc
index 42bc79693..35ef74f9a 100644
--- a/cmdline/cacheset.cc
+++ b/cmdline/cacheset.cc
@@ -321,7 +321,7 @@ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg,
 	for (PackageSet::const_iterator P = pkgset.begin();
 	     P != pkgset.end(); ++P) {
 		if (vertag == string::npos) {
-			AddSelectedVersion(Cache, verset, P, fallback, helper);
+			verset.insert(VersionSet::FromPackage(Cache, P, fallback, helper));
 			continue;
 		}
 		pkgCache::VerIterator V;
@@ -351,10 +351,10 @@ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg,
 	return verset;
 }
 									/*}}}*/
-// AddSelectedVersion - add version from package based on fallback	/*{{{*/
-void VersionSet::AddSelectedVersion(pkgCacheFile &Cache, VersionSet &verset,
-		pkgCache::PkgIterator const &P, VersionSet::Version const &fallback,
-		CacheSetHelper &helper) {
+// FromPackage - versions from package based on fallback		/*{{{*/
+VersionSet VersionSet::FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P,
+		VersionSet::Version const &fallback, CacheSetHelper &helper) {
+	VersionSet verset;
 	pkgCache::VerIterator V;
 	bool showErrors;
 	switch(fallback) {
@@ -404,6 +404,7 @@ void VersionSet::AddSelectedVersion(pkgCacheFile &Cache, VersionSet &verset,
 			verset.insert(helper.canNotFindNewestVer(Cache, P));
 		break;
 	}
+	return verset;
 }
 									/*}}}*/
 // getCandidateVer - Returns the candidate version of the given package	/*{{{*/
diff --git a/cmdline/cacheset.h b/cmdline/cacheset.h
index 21c42c511..bf863fb39 100644
--- a/cmdline/cacheset.h
+++ b/cmdline/cacheset.h
@@ -291,6 +291,15 @@ public:									/*{{{*/
 		return APT::VersionSet::FromString(Cache, pkg, CANDINST);
 	}
 
+	/** \brief returns all versions specified for the package
+
+	    \param Cache the package and versions are in
+	    \param P the package in question
+	    \param fallback the version(s) you want to get
+	    \param helper the helper used for display and error handling */
+	static VersionSet FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P,
+		VersionSet::Version const &fallback, CacheSetHelper &helper);
+
 	struct Modifier {
 		enum Position { NONE, PREFIX, POSTFIX };
 		unsigned short ID;
@@ -330,11 +339,6 @@ protected:								/*{{{*/
 	    \param Pkg we want the installed version from this package */
 	static pkgCache::VerIterator getInstalledVer(pkgCacheFile &Cache,
 		pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper);
-
-	static void AddSelectedVersion(pkgCacheFile &Cache, VersionSet &verset,
-		pkgCache::PkgIterator const &P, VersionSet::Version const &fallback,
-		CacheSetHelper &helper);
-
 									/*}}}*/
 };									/*}}}*/
 }
-- 
cgit v1.2.3