package_daemon: Cleanups.
- 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:
parent
55cc9f852a
commit
3d97f9a0a9
@ -36,7 +36,6 @@ PackageManager::PackageManager(Root* root, Volume* volume)
|
|||||||
BPackageManager::UserInteractionHandler(),
|
BPackageManager::UserInteractionHandler(),
|
||||||
fRoot(root),
|
fRoot(root),
|
||||||
fVolume(volume),
|
fVolume(volume),
|
||||||
fContext(*this, *this),
|
|
||||||
fSolverPackages(),
|
fSolverPackages(),
|
||||||
fPackagesAddedByUser(),
|
fPackagesAddedByUser(),
|
||||||
fPackagesRemovedByUser(),
|
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
|
void
|
||||||
PackageManager::JobFailed(BJob* job)
|
PackageManager::JobFailed(BJob* job)
|
||||||
{
|
{
|
||||||
|
@ -17,7 +17,6 @@
|
|||||||
|
|
||||||
|
|
||||||
using BPackageKit::BContext;
|
using BPackageKit::BContext;
|
||||||
using BPackageKit::BDecisionProvider;
|
|
||||||
using BPackageKit::BJob;
|
using BPackageKit::BJob;
|
||||||
using BPackageKit::BJobStateListener;
|
using BPackageKit::BJobStateListener;
|
||||||
using BPackageKit::BPackageInstallationLocation;
|
using BPackageKit::BPackageInstallationLocation;
|
||||||
@ -37,8 +36,7 @@ class Volume;
|
|||||||
|
|
||||||
class PackageManager : public BPackageManager,
|
class PackageManager : public BPackageManager,
|
||||||
private BPackageManager::InstallationInterface,
|
private BPackageManager::InstallationInterface,
|
||||||
private BPackageManager::UserInteractionHandler,
|
private BPackageManager::UserInteractionHandler {
|
||||||
private BDecisionProvider {
|
|
||||||
public:
|
public:
|
||||||
PackageManager(Root* root, Volume* volume);
|
PackageManager(Root* root, Volume* volume);
|
||||||
~PackageManager();
|
~PackageManager();
|
||||||
@ -83,13 +81,6 @@ private:
|
|||||||
virtual void ProgressApplyingChangesDone(
|
virtual void ProgressApplyingChangesDone(
|
||||||
InstalledRepository& repository);
|
InstalledRepository& repository);
|
||||||
|
|
||||||
private:
|
|
||||||
// BDecisionProvider
|
|
||||||
virtual bool YesNoDecisionNeeded(const BString& description,
|
|
||||||
const BString& question,
|
|
||||||
const BString& yes, const BString& no,
|
|
||||||
const BString& defaultChoice);
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
// BJobStateListener
|
// BJobStateListener
|
||||||
virtual void JobFailed(BJob* job);
|
virtual void JobFailed(BJob* job);
|
||||||
@ -110,7 +101,6 @@ private:
|
|||||||
private:
|
private:
|
||||||
Root* fRoot;
|
Root* fRoot;
|
||||||
Volume* fVolume;
|
Volume* fVolume;
|
||||||
BContext fContext;
|
|
||||||
SolverPackageMap fSolverPackages;
|
SolverPackageMap fSolverPackages;
|
||||||
SolverPackageSet fPackagesAddedByUser;
|
SolverPackageSet fPackagesAddedByUser;
|
||||||
SolverPackageSet fPackagesRemovedByUser;
|
SolverPackageSet fPackagesRemovedByUser;
|
||||||
|
Loading…
Reference in New Issue
Block a user