summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkh1 <qt-info@nokia.com>2011-08-10 15:48:57 +0200
committerkh1 <qt-info@nokia.com>2011-08-10 15:48:57 +0200
commit3b2c5a9d8500a5b1fb208e239d6a30c020573215 (patch)
tree724af1cc21a47acec02565e7b2addb358260073d
parent2da21f18becc8cdc18870f1dc0b0056837b5f505 (diff)
Let the member name follow the function name.
-rw-r--r--installerbuilder/libinstaller/packagemanagercore.cpp2
-rw-r--r--installerbuilder/libinstaller/packagemanagercore_p.cpp9
-rw-r--r--installerbuilder/libinstaller/packagemanagercore_p.h2
3 files changed, 7 insertions, 6 deletions
diff --git a/installerbuilder/libinstaller/packagemanagercore.cpp b/installerbuilder/libinstaller/packagemanagercore.cpp
index c242d18a1..463215c84 100644
--- a/installerbuilder/libinstaller/packagemanagercore.cpp
+++ b/installerbuilder/libinstaller/packagemanagercore.cpp
@@ -820,7 +820,7 @@ QList<Component*> PackageManagerCore::rootComponents() const
QList<Component*> PackageManagerCore::orderedComponentsToInstall() const
{
- return d->m_orderedToInstallComponents;
+ return d->m_orderedComponentsToInstall;
}
QString PackageManagerCore::installReason(Component* component) const
diff --git a/installerbuilder/libinstaller/packagemanagercore_p.cpp b/installerbuilder/libinstaller/packagemanagercore_p.cpp
index 4ad433c8a..0119c8366 100644
--- a/installerbuilder/libinstaller/packagemanagercore_p.cpp
+++ b/installerbuilder/libinstaller/packagemanagercore_p.cpp
@@ -296,10 +296,11 @@ QHash<QString, QPair<Component*, Component*> > &PackageManagerCorePrivate::compo
return mode == AllMode ? m_componentsToReplaceAllMode : m_componentsToReplaceUpdaterMode;
}
-void PackageManagerCorePrivate::clearComponentsToInstall() {
- m_orderedToInstallComponents.clear();
+void PackageManagerCorePrivate::clearComponentsToInstall()
+{
m_visitedComponents.clear();
m_toInstallComponentIds.clear();
+ m_orderedComponentsToInstall.clear();
m_toInstallComponentIdReasonHash.clear();
}
@@ -1831,9 +1832,9 @@ bool PackageManagerCorePrivate::addUpdateResourcesFromRepositories(bool parseChe
void PackageManagerCorePrivate::realAppendToInstallComponents(Component *component)
{
- m_orderedToInstallComponents.append(component);
+ m_orderedComponentsToInstall.append(component);
m_toInstallComponentIds.insert(component->name());
- std::sort(m_orderedToInstallComponents.begin(), m_orderedToInstallComponents.end(), Component::InstallPriorityLessThan());
+ std::sort(m_orderedComponentsToInstall.begin(), m_orderedComponentsToInstall.end(), Component::InstallPriorityLessThan());
}
void PackageManagerCorePrivate::insertInstallReason(Component *component, const QString &reason)
diff --git a/installerbuilder/libinstaller/packagemanagercore_p.h b/installerbuilder/libinstaller/packagemanagercore_p.h
index 11c4b6cdb..1c1c0a408 100644
--- a/installerbuilder/libinstaller/packagemanagercore_p.h
+++ b/installerbuilder/libinstaller/packagemanagercore_p.h
@@ -218,7 +218,7 @@ private:
QHash<QString, QPair<Component*, Component*> > m_componentsToReplaceUpdaterMode;
//calculate installation order variables
- QList<Component*> m_orderedToInstallComponents;
+ QList<Component*> m_orderedComponentsToInstall;
QHash<QString, QString> m_toInstallComponentIdReasonHash; //for faster lookups
QHash<Component*, QSet<Component*> > m_visitedComponents;