summaryrefslogtreecommitdiffstats
path: root/installerbuilder
diff options
context:
space:
mode:
authorkh1 <qt-info@nokia.com>2011-08-10 15:18:42 +0200
committerkh1 <qt-info@nokia.com>2011-08-10 15:18:42 +0200
commitd1f0749d20f30bc48e26e802be15ad0722eb29ae (patch)
treef361b16632e16f20287c7ad2b86f8b0bed796875 /installerbuilder
parent19595841d7993520aa795795a0dff8132d12e78e (diff)
Rename function and add TODO.
I can't see the reason, needs to be discussed with Tim.
Diffstat (limited to 'installerbuilder')
-rw-r--r--installerbuilder/libinstaller/packagemanagercore.cpp2
-rw-r--r--installerbuilder/libinstaller/packagemanagercore.h2
-rw-r--r--installerbuilder/libinstaller/packagemanagergui.cpp8
3 files changed, 6 insertions, 6 deletions
diff --git a/installerbuilder/libinstaller/packagemanagercore.cpp b/installerbuilder/libinstaller/packagemanagercore.cpp
index 906e04219..c242d18a1 100644
--- a/installerbuilder/libinstaller/packagemanagercore.cpp
+++ b/installerbuilder/libinstaller/packagemanagercore.cpp
@@ -828,7 +828,7 @@ QString PackageManagerCore::installReason(Component* component) const
return d->installReason(component);
}
-bool PackageManagerCore::calculateToInstallComponents() const
+bool PackageManagerCore::calculateComponentsToInstall() const
{
d->clearComponentsToInstall();
QList<Component*> components;
diff --git a/installerbuilder/libinstaller/packagemanagercore.h b/installerbuilder/libinstaller/packagemanagercore.h
index 2783ca1b3..7cc82639c 100644
--- a/installerbuilder/libinstaller/packagemanagercore.h
+++ b/installerbuilder/libinstaller/packagemanagercore.h
@@ -146,7 +146,7 @@ public:
QList<Component*> updaterComponents() const;
QList<Component*> rootComponents() const;
- bool calculateToInstallComponents() const;
+ bool calculateComponentsToInstall() const;
QList<Component*> orderedComponentsToInstall() const;
QString installReason(Component* component) const;
diff --git a/installerbuilder/libinstaller/packagemanagergui.cpp b/installerbuilder/libinstaller/packagemanagergui.cpp
index f9e337d0d..4184ac722 100644
--- a/installerbuilder/libinstaller/packagemanagergui.cpp
+++ b/installerbuilder/libinstaller/packagemanagergui.cpp
@@ -473,7 +473,7 @@ void PackageManagerGui::wizardPageVisibilityChangeRequested(bool visible, int p)
} else if (!visible && page(p) != 0) {
//no component selection page means we can calculate it now
if (p == PackageManagerCore::ComponentSelection)
- m_core->calculateToInstallComponents();
+ m_core->calculateComponentsToInstall(); // TODO: why?
d->m_defaultPages[p] = page(p);
removePage(p);
}
@@ -1119,7 +1119,7 @@ void ComponentSelectionPage::entering()
void ComponentSelectionPage::leaving()
{
//now we can calculate the install order
- packageManagerCore()->calculateToInstallComponents();
+ packageManagerCore()->calculateComponentsToInstall(); // TODO: why here?
}
void ComponentSelectionPage::selectAll()
@@ -1540,10 +1540,10 @@ void ReadyForInstallationPage::refreshTaskDetailsBrowser()
{
if (packageManagerCore()->isUninstaller())
return;
+
QString htmlOutput;
QString lastInstallReason;
-
- if (!packageManagerCore()->calculateToInstallComponents()) {
+ if (!packageManagerCore()->calculateComponentsToInstall()) { // TODO: why again?
htmlOutput.append(QString(QLatin1String("<h2><font color=\"red\">%1</font></h2>")).arg(
tr("Can't resolve all dependencies.<br>")));
if (!m_taskDetailsBrowser->isVisible())