summaryrefslogtreecommitdiffstats
path: root/installerbuilder/libinstaller/packagemanagercore.cpp
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@nokia.com>2011-07-21 20:31:17 +0200
committerTim Jenssen <tim.jenssen@nokia.com>2011-07-21 20:31:17 +0200
commitdda1bc89d454995867df79bd277f2024177af28e (patch)
tree1c8796eacc53dd4fad4943f322e586be39e9f1a7 /installerbuilder/libinstaller/packagemanagercore.cpp
parent4b01b138a2c30369aa194314a448b0554883ed99 (diff)
use hash instead of map for the created components
Diffstat (limited to 'installerbuilder/libinstaller/packagemanagercore.cpp')
-rw-r--r--installerbuilder/libinstaller/packagemanagercore.cpp22
1 files changed, 9 insertions, 13 deletions
diff --git a/installerbuilder/libinstaller/packagemanagercore.cpp b/installerbuilder/libinstaller/packagemanagercore.cpp
index 123a3e11c..a5522a9c6 100644
--- a/installerbuilder/libinstaller/packagemanagercore.cpp
+++ b/installerbuilder/libinstaller/packagemanagercore.cpp
@@ -1512,7 +1512,7 @@ bool PackageManagerCore::updateComponentData(struct Data &data, Component *compo
return true;
}
-void PackageManagerCore::storeReplacedComponents(QMap<QString, Component*> &components, const struct Data &data)
+void PackageManagerCore::storeReplacedComponents(QHash<QString, Component*> &components, const struct Data &data)
{
QHash<Component*, QStringList>::const_iterator it;
// remeber all components that got a replacement, requierd for uninstall
@@ -1534,7 +1534,7 @@ bool PackageManagerCore::fetchAllPackages(const PackagesList &remotes, const Loc
emit startAllComponentsReset();
d->clearAllComponentLists();
- QMap<QString, QInstaller::Component*> components;
+ QHash<QString, QInstaller::Component*> components;
Data data;
data.runMode = AllMode;
@@ -1557,7 +1557,7 @@ bool PackageManagerCore::fetchAllPackages(const PackagesList &remotes, const Loc
try {
// append all components to their respective parents
- for (QMap<QString, Component*>::const_iterator it = components.begin(); it != components.end(); ++it) {
+ for (QHash<QString, Component*>::const_iterator it = components.begin(); it != components.end(); ++it) {
QString id = it.key();
QInstaller::Component *component = it.value();
while (!id.isEmpty() && component->parentComponent() == 0) {
@@ -1574,17 +1574,13 @@ bool PackageManagerCore::fetchAllPackages(const PackagesList &remotes, const Loc
}
// after everything is set up, load the scripts
- foreach (QInstaller::Component *component, components)
+ foreach (QInstaller::Component *component, components) {
component->loadComponentScript();
- // set the checked state for all components without child
- for (int i = 0; i < rootComponentCount(); ++i) {
- QList<Component*> children = rootComponent(i)->childs();
- foreach (Component *child, children) {
- if (child->isCheckable() && !child->isTristate()) {
- if (child->isInstalled() || child->isDefault())
- child->setCheckState(Qt::Checked);
- }
+ // set the checked state for all components without child(means without tristate)
+ if (component->isCheckable() && !component->isTristate()) {
+ if (component->isInstalled() || component->isDefault())
+ component->setCheckState(Qt::Checked);
}
}
} catch (const Error &error) {
@@ -1603,7 +1599,7 @@ bool PackageManagerCore::fetchUpdaterPackages(const PackagesList &remotes, const
emit startUpdaterComponentsReset();
d->clearUpdaterComponentLists();
- QMap<QString, QInstaller::Component*> components;
+ QHash<QString, QInstaller::Component*> components;
Data data;
data.runMode = UpdaterMode;