Browse Source

remove deprecated methods which nobody should have used anyway like

pseudo-package related and/or private
debian/1.8.y
David Kalnischkies 11 years ago
parent
commit
27e8981a61
  1. 4
      apt-pkg/cacheiterators.h
  2. 2
      apt-pkg/cacheset.h
  3. 54
      apt-pkg/depcache.cc
  4. 11
      apt-pkg/depcache.h
  5. 3
      apt-pkg/pkgcache.cc

4
apt-pkg/cacheiterators.h

@ -210,9 +210,6 @@ class pkgCache::VerIterator : public Iterator<Version, VerIterator> {
return "all";
return S->ParentPkg == 0?0:Owner->StrP + ParentPkg()->Arch;
};
__deprecated inline const char *Arch(bool const pseudo) const {
return S->ParentPkg == 0?0:Owner->StrP + ParentPkg()->Arch;
};
inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);};
inline DescIterator DescriptionList() const;
@ -225,7 +222,6 @@ class pkgCache::VerIterator : public Iterator<Version, VerIterator> {
string RelStr() const;
bool Automatic() const;
__deprecated bool Pseudo() const;
VerFileIterator NewestFile() const;
inline VerIterator(pkgCache &Owner,Version *Trg = 0) : Iterator<Version, VerIterator>(Owner, Trg) {

2
apt-pkg/cacheset.h

@ -257,7 +257,6 @@ public: /*{{{*/
inline const char *VerStr() const { return (**this).VerStr(); };
inline const char *Section() const { return (**this).Section(); };
inline const char *Arch() const { return (**this).Arch(); };
__deprecated inline const char *Arch(bool const pseudo) const { return (**this).Arch(); };
inline pkgCache::PkgIterator ParentPkg() const { return (**this).ParentPkg(); };
inline pkgCache::DescIterator DescriptionList() const { return (**this).DescriptionList(); };
inline pkgCache::DescIterator TranslatedDescription() const { return (**this).TranslatedDescription(); };
@ -268,7 +267,6 @@ public: /*{{{*/
inline const char *PriorityType() const { return (**this).PriorityType(); };
inline string RelStr() const { return (**this).RelStr(); };
inline bool Automatic() const { return (**this).Automatic(); };
__deprecated inline bool Pseudo() const { return false; };
inline pkgCache::VerFileIterator NewestFile() const { return (**this).NewestFile(); };
};
/*}}}*/

54
apt-pkg/depcache.cc

@ -406,58 +406,6 @@ bool pkgDepCache::CheckDep(DepIterator Dep,int Type,PkgIterator &Res)
/*}}}*/
// DepCache::AddSizes - Add the packages sizes to the counters /*{{{*/
// ---------------------------------------------------------------------
/* Call with Mult = -1 to preform the inverse opration
The Mult increases the complexity of the calulations here and is unused -
or do we really have a usecase for removing the size of a package two
times? So let us replace it with a simple bool and be done with it */
__deprecated void pkgDepCache::AddSizes(const PkgIterator &Pkg,signed long Mult)
{
StateCache &P = PkgState[Pkg->ID];
if (Pkg->VersionList == 0)
return;
if (Pkg.State() == pkgCache::PkgIterator::NeedsConfigure &&
P.Keep() == true)
return;
// Compute the size data
if (P.NewInstall() == true)
{
iUsrSize += (signed long long)(Mult*P.InstVerIter(*this)->InstalledSize);
iDownloadSize += (signed long long)(Mult*P.InstVerIter(*this)->Size);
return;
}
// Upgrading
if (Pkg->CurrentVer != 0 &&
(P.InstallVer != (Version *)Pkg.CurrentVer() ||
(P.iFlags & ReInstall) == ReInstall) && P.InstallVer != 0)
{
iUsrSize += (signed long long)(Mult*((signed long long)P.InstVerIter(*this)->InstalledSize -
(signed long long)Pkg.CurrentVer()->InstalledSize));
iDownloadSize += (signed long long)(Mult*P.InstVerIter(*this)->Size);
return;
}
// Reinstall
if (Pkg.State() == pkgCache::PkgIterator::NeedsUnpack &&
P.Delete() == false)
{
iDownloadSize += (signed long long)(Mult*P.InstVerIter(*this)->Size);
return;
}
// Removing
if (Pkg->CurrentVer != 0 && P.InstallVer == 0)
{
iUsrSize -= (signed long long)(Mult*Pkg.CurrentVer()->InstalledSize);
return;
}
}
/*}}}*/
// DepCache::AddSizes - Add the packages sizes to the counters /*{{{*/
// ---------------------------------------------------------------------
/* Call with Inverse = true to preform the inverse opration */
void pkgDepCache::AddSizes(const PkgIterator &Pkg, bool const &Inverse)
{
@ -1268,7 +1216,7 @@ void pkgDepCache::SetReInstall(PkgIterator const &Pkg,bool To)
// DepCache::SetCandidateVersion - Change the candidate version /*{{{*/
// ---------------------------------------------------------------------
/* */
void pkgDepCache::SetCandidateVersion(VerIterator TargetVer, bool const &Pseudo)
void pkgDepCache::SetCandidateVersion(VerIterator TargetVer)
{
pkgCache::PkgIterator Pkg = TargetVer.ParentPkg();
StateCache &P = PkgState[Pkg->ID];

11
apt-pkg/depcache.h

@ -318,7 +318,6 @@ class pkgDepCache : protected pkgCache::Namespace
// Count manipulators
void AddSizes(const PkgIterator &Pkg, bool const &Invert = false);
inline void RemoveSizes(const PkgIterator &Pkg) {AddSizes(Pkg, true);};
void AddSizes(const PkgIterator &Pkg,signed long Mult) __deprecated;
void AddStates(const PkgIterator &Pkg,int Add = 1);
inline void RemoveStates(const PkgIterator &Pkg) {AddStates(Pkg,-1);};
@ -399,8 +398,7 @@ class pkgDepCache : protected pkgCache::Namespace
void MarkProtected(PkgIterator const &Pkg) { PkgState[Pkg->ID].iFlags |= Protected; };
void SetReInstall(PkgIterator const &Pkg,bool To);
// FIXME: Remove the unused boolean parameter on abi break
void SetCandidateVersion(VerIterator TargetVer, bool const &Pseudo = true);
void SetCandidateVersion(VerIterator TargetVer);
bool SetCandidateRelease(pkgCache::VerIterator TargetVer,
std::string const &TargetRel);
/** Set the candidate version for dependencies too if needed.
@ -485,13 +483,6 @@ class pkgDepCache : protected pkgCache::Namespace
virtual ~pkgDepCache();
private:
// Helper for Update(OpProgress) to remove pseudoinstalled arch all packages
// FIXME: they are private so shouldn't affect abi, but just in case…
__deprecated bool RemovePseudoInstalledPkg(PkgIterator &Pkg, std::set<unsigned long> &recheck) { return true; };
__deprecated bool ReInstallPseudoForGroup(unsigned long const &Grp, std::set<unsigned long> &recheck) { return true; };
__deprecated bool ReInstallPseudoForGroup(pkgCache::PkgIterator const &P, std::set<unsigned long> &recheck) { return true; };
bool IsModeChangeOk(ModeList const mode, PkgIterator const &Pkg,
unsigned long const Depth, bool const FromUser);
};

3
apt-pkg/pkgcache.cc

@ -749,9 +749,6 @@ bool pkgCache::VerIterator::Automatic() const
return false;
}
/*}}}*/
// VerIterator::Pseudo - deprecated no-op method /*{{{*/
bool pkgCache::VerIterator::Pseudo() const { return false; }
/*}}}*/
// VerIterator::NewestFile - Return the newest file version relation /*{{{*/
// ---------------------------------------------------------------------
/* This looks at the version numbers associated with all of the sources

Loading…
Cancel
Save