From 93e804d49822b8405f3f12158b2893bab695f60a Mon Sep 17 00:00:00 2001 From: kh1 Date: Mon, 15 Aug 2011 14:27:30 +0200 Subject: Remove now superfluous code as depenedencies work. Review-By: tjenssen --- installerbuilder/libinstaller/component.cpp | 1 - installerbuilder/libinstaller/component.h | 16 ---------------- installerbuilder/libinstaller/constants.h | 1 - 3 files changed, 18 deletions(-) diff --git a/installerbuilder/libinstaller/component.cpp b/installerbuilder/libinstaller/component.cpp index 12676c5ff..b7240e95c 100644 --- a/installerbuilder/libinstaller/component.cpp +++ b/installerbuilder/libinstaller/component.cpp @@ -146,7 +146,6 @@ void Component::loadDataFromPackage(const Package &package) setValue(scDependencies, package.data(scDependencies).toString()); setValue(scVirtual, package.data(scVirtual).toString()); setValue(scSortingPriority, package.data(scSortingPriority).toString()); - setValue(scInstallPriority, package.data(scInstallPriority).toString()); setValue(scImportant, package.data(scImportant).toString()); setValue(scUpdateText, package.data(scUpdateText).toString()); diff --git a/installerbuilder/libinstaller/component.h b/installerbuilder/libinstaller/component.h index 200f70916..c0bef1608 100644 --- a/installerbuilder/libinstaller/component.h +++ b/installerbuilder/libinstaller/component.h @@ -70,22 +70,6 @@ public: explicit Component(PackageManagerCore *core); ~Component(); - struct IsVirtual - { - bool operator() (const Component *comp) const - { - return comp->value(scVirtual, scFalse).toLower() == scTrue; - } - }; - - struct InstallPriorityLessThan - { - bool operator() (const Component *lhs, const Component *rhs) - { - return lhs->value(scInstallPriority).toInt() < rhs->value(scInstallPriority).toInt(); - } - }; - struct SortingPriorityLessThan { bool operator() (const Component *lhs, const Component *rhs) const diff --git a/installerbuilder/libinstaller/constants.h b/installerbuilder/libinstaller/constants.h index 621a2340f..dcce31ce6 100644 --- a/installerbuilder/libinstaller/constants.h +++ b/installerbuilder/libinstaller/constants.h @@ -52,7 +52,6 @@ static const QLatin1String scRequiresAdminRights("RequiresAdminRights"); // constants used throughout the components class static const QLatin1String scVirtual("Virtual"); -static const QLatin1String scInstallPriority("InstallPriority"); static const QLatin1String scSortingPriority("SortingPriority"); // constants used throughout the settings and package manager core class -- cgit v1.2.3