Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

package_daemon: Cleanups.

Browse Source 
- Remove no longer needed context object, as well as dummy
  BDecisionProvider implementation, as the base class now does the same
  directly by default.
This commit is contained in:
Rene Gollent 2013-09-29 19:30:16 -04:00
parent 55cc9f852a
commit 3d97f9a0a9
2 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/servers/package/PackageManager.cpp
View File

@ -36,7 +36,6 @@ PackageManager::PackageManager(Root* root, Volume* volume)
BPackageManager::UserInteractionHandler(),
fRoot(root),
fVolume(volume),
fContext(*this, *this),
fSolverPackages(),
fPackagesAddedByUser(),
fPackagesRemovedByUser(),
@ -365,17 +364,6 @@ PackageManager::ProgressApplyingChangesDone(InstalledRepository& repository)
}
bool
PackageManager::YesNoDecisionNeeded(const BString& description,
const BString& question, const BString& yes, const BString& no,
const BString& defaultChoice)
{
// ATM we need the BDecisionProvider object for the BContext, but we don't
// execute any request which actually uses it.
return false;
}
void
PackageManager::JobFailed(BJob* job)
{

12
src/servers/package/PackageManager.h
View File

@ -17,7 +17,6 @@
using BPackageKit::BContext;
using BPackageKit::BDecisionProvider;
using BPackageKit::BJob;
using BPackageKit::BJobStateListener;
using BPackageKit::BPackageInstallationLocation;
@ -37,8 +36,7 @@ class Volume;
class PackageManager : public BPackageManager,
private BPackageManager::InstallationInterface,
private BPackageManager::UserInteractionHandler,
private BDecisionProvider {
private BPackageManager::UserInteractionHandler {
public:
PackageManager(Root* root, Volume* volume);
~PackageManager();
@ -83,13 +81,6 @@ private:
virtual void ProgressApplyingChangesDone(
InstalledRepository& repository);
private:
// BDecisionProvider
virtual bool YesNoDecisionNeeded(const BString& description,
const BString& question,
const BString& yes, const BString& no,
const BString& defaultChoice);
private:
// BJobStateListener
virtual void JobFailed(BJob* job);
@ -110,7 +101,6 @@ private:
private:
Root* fRoot;
Volume* fVolume;
BContext fContext;
SolverPackageMap fSolverPackages;
SolverPackageSet fPackagesAddedByUser;
SolverPackageSet fPackagesRemovedByUser;