From 5a5d146510f3459c597f4c7ab35cc423db7dd321 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 10 Sep 2013 18:42:57 +0200 Subject: [PATCH] BPackageManager: Make _InstallationRepository() protected --- .../private/package/manager/PackageManager.h | 5 ++-- src/kits/package/manager/PackageManager.cpp | 24 +++++++++---------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/headers/private/package/manager/PackageManager.h b/headers/private/package/manager/PackageManager.h index fc0e0809c3..9ef3c7a45a 100644 --- a/headers/private/package/manager/PackageManager.h +++ b/headers/private/package/manager/PackageManager.h @@ -82,6 +82,9 @@ public: void Update(const char* const* packages, int packageCount); +protected: + InstalledRepository& InstallationRepository(); + private: void _HandleProblems(); void _AnalyzeResult(); @@ -100,8 +103,6 @@ private: int32 _FindBasePackage(const PackageList& packages, const BPackageInfo& info); - InstalledRepository& _InstallationRepository(); - void _AddInstalledRepository( InstalledRepository* repository); void _AddRemoteRepository(BPackageRoster& roster, diff --git a/src/kits/package/manager/PackageManager.cpp b/src/kits/package/manager/PackageManager.cpp index 577db36f61..e565a030f7 100644 --- a/src/kits/package/manager/PackageManager.cpp +++ b/src/kits/package/manager/PackageManager.cpp @@ -179,7 +179,7 @@ BPackageManager::Uninstall(const char* const* packages, int packageCount) // determine the inverse base package closure for the found packages // TODO: Optimize! - InstalledRepository& installationRepository = _InstallationRepository(); + InstalledRepository& installationRepository = InstallationRepository(); bool foundAnotherPackage; do { foundAnotherPackage = false; @@ -274,6 +274,16 @@ BPackageManager::Update(const char* const* packages, int packageCount) } +BPackageManager::InstalledRepository& +BPackageManager::InstallationRepository() +{ + if (fInstalledRepositories.IsEmpty()) + DIE("no installation repository"); + + return *fInstalledRepositories.LastItem(); +} + + void BPackageManager::_HandleProblems() { @@ -295,7 +305,7 @@ BPackageManager::_AnalyzeResult() if (error != B_OK) DIE(error, "failed to compute packages to un/-install"); - InstalledRepository& installationRepository = _InstallationRepository(); + InstalledRepository& installationRepository = InstallationRepository(); PackageList& packagesToActivate = installationRepository.PackagesToActivate(); PackageList& packagesToDeactivate @@ -563,16 +573,6 @@ BPackageManager::_FindBasePackage(const PackageList& packages, } -BPackageManager::InstalledRepository& -BPackageManager::_InstallationRepository() -{ - if (fInstalledRepositories.IsEmpty()) - DIE("no installation repository"); - - return *fInstalledRepositories.LastItem(); -} - - void BPackageManager::_AddInstalledRepository(InstalledRepository* repository) {