From b5dfa00cea79c100a24fdbfc84edb393d90bca41 Mon Sep 17 00:00:00 2001
From: kh1 <qt-info@nokia.com>
Date: Wed, 13 Apr 2011 11:30:05 +0200
Subject: [PATCH] Remove default arguments.

---
 installerbuilder/libinstaller/qinstaller.cpp            | 6 +++---
 installerbuilder/libinstaller/qinstallercomponent.cpp   | 6 +++---
 installerbuilder/libinstaller/qinstallercomponent.h     | 2 +-
 installerbuilder/libinstaller/qinstallercomponent_p.cpp | 7 ++++---
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/installerbuilder/libinstaller/qinstaller.cpp b/installerbuilder/libinstaller/qinstaller.cpp
index 1b8026cd..09309687 100644
--- a/installerbuilder/libinstaller/qinstaller.cpp
+++ b/installerbuilder/libinstaller/qinstaller.cpp
@@ -114,8 +114,8 @@ static Component* subComponentByName(const Installer *installer, const QString &
     if (check != 0 && componentMatches(check, name, version))
         return check;
 
-    const QList<Component*> rootComponents =
-        check == 0 ? installer->components(false, AllMode) : check->childComponents();
+    const QList<Component*> rootComponents = check == 0 ? installer->components(false, AllMode)
+        : check->childComponents(false, AllMode);
     foreach (QInstaller::Component* component, rootComponents) {
         Component* const result = subComponentByName(installer, name, version, component);
         if (result != 0)
@@ -1139,7 +1139,7 @@ QList<Component*> Installer::components(bool recursive, RunMode runMode) const
     QList<Component*> result;
     foreach (QInstaller::Component *component, d->m_rootComponents) {
         result.push_back(component);
-        result += component->childComponents(true);
+        result += component->childComponents(true, runMode);
     }
 
     return result;
diff --git a/installerbuilder/libinstaller/qinstallercomponent.cpp b/installerbuilder/libinstaller/qinstallercomponent.cpp
index 77a2745c..486d59cd 100644
--- a/installerbuilder/libinstaller/qinstallercomponent.cpp
+++ b/installerbuilder/libinstaller/qinstallercomponent.cpp
@@ -339,16 +339,16 @@ void Component::removeComponent(Component *component)
 */
 QList<Component*> Component::childComponents(bool recursive, RunMode runMode) const
 {
+    QList<Component*> result;
     if (runMode == UpdaterMode)
-        return QList<Component*>();
+        return result;
 
     if (!recursive)
         return d->m_allComponents;
 
-    QList<Component*> result;
     foreach (Component *component, d->m_allComponents) {
         result.append(component);
-        result += component->childComponents(true);
+        result += component->childComponents(true, runMode);
     }
     return result;
 }
diff --git a/installerbuilder/libinstaller/qinstallercomponent.h b/installerbuilder/libinstaller/qinstallercomponent.h
index 3c82e887..2c2e11be 100644
--- a/installerbuilder/libinstaller/qinstallercomponent.h
+++ b/installerbuilder/libinstaller/qinstallercomponent.h
@@ -109,7 +109,7 @@ public:
     Component *parentComponent() const;
     void appendComponent(Component *component);
     void removeComponent(Component *component);
-    QList<Component*> childComponents(bool recursive = false, RunMode runMode = AllMode) const;
+    QList<Component*> childComponents(bool recursive, RunMode runMode) const;
 
     void loadComponentScript();
 
diff --git a/installerbuilder/libinstaller/qinstallercomponent_p.cpp b/installerbuilder/libinstaller/qinstallercomponent_p.cpp
index 7e8f857a..bd77a9d1 100644
--- a/installerbuilder/libinstaller/qinstallercomponent_p.cpp
+++ b/installerbuilder/libinstaller/qinstallercomponent_p.cpp
@@ -150,9 +150,10 @@ int ComponentModelHelper::childCount() const
 */
 int ComponentModelHelper::indexInParent() const
 {
+    int index = 0;
     if (Component *parent = m_componentPrivate->m_parentComponent->parentComponent())
-        return parent->childComponents().indexOf(m_componentPrivate->m_parentComponent);
-    return 0;
+        index = parent->childComponents(false, AllMode).indexOf(m_componentPrivate->m_parentComponent);
+    return (index >= 0 ? index : 0);
 }
 
 /*!
@@ -167,7 +168,7 @@ QList<Component*> ComponentModelHelper::childs() const
     QList<Component*> result;
     foreach (Component *component, *components) {
         result.append(component);
-        result += component->childComponents(true);
+        result += component->childComponents(true, AllMode);
     }
     return result;
 }