diff options
author | Tim Jenssen <tim.jenssen@nokia.com> | 2011-07-27 18:17:48 +0200 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@nokia.com> | 2011-07-28 12:34:12 +0200 |
commit | 771b0eee70febbf93539ed292d4ccab80a3d5a2e (patch) | |
tree | a26781e16f29064831d18816426234e42d9e8d6e /installerbuilder | |
parent | a1a130b92997e42c37788684f28976be3079a053 (diff) |
renamed list to set, because data type is a set
Review-by: Maurice Kalinowski
Diffstat (limited to 'installerbuilder')
-rw-r--r-- | installerbuilder/libinstaller/componentmodel.cpp | 34 | ||||
-rw-r--r-- | installerbuilder/libinstaller/componentmodel.h | 4 |
2 files changed, 19 insertions, 19 deletions
diff --git a/installerbuilder/libinstaller/componentmodel.cpp b/installerbuilder/libinstaller/componentmodel.cpp index 3757fd1b6..eea8ce497 100644 --- a/installerbuilder/libinstaller/componentmodel.cpp +++ b/installerbuilder/libinstaller/componentmodel.cpp @@ -235,8 +235,8 @@ void ComponentModel::setRootComponents(QList<Component*> rootComponents) m_indexByNameCache.clear(); m_rootComponentList.clear(); - m_initialCheckedList.clear(); - m_currentCheckedList.clear(); + m_initialCheckedSet.clear(); + m_currentCheckedSet.clear(); m_rootIndex = 0; m_rootComponentList = rootComponents; @@ -275,7 +275,7 @@ PackageManagerCore *ComponentModel::packageManagerCore() const */ bool ComponentModel::isChanged() const { - return m_initialCheckedList == m_currentCheckedList; + return m_initialCheckedSet == m_currentCheckedSet; } /*! @@ -283,7 +283,7 @@ bool ComponentModel::isChanged() const */ bool ComponentModel::hasCheckedComponents() const { - return !m_currentCheckedList.isEmpty(); + return !m_currentCheckedSet.isEmpty(); } /*! @@ -292,7 +292,7 @@ bool ComponentModel::hasCheckedComponents() const QList<Component*> ComponentModel::checkedComponents() const { QList<Component*> list; - foreach (const QString &name, m_currentCheckedList) + foreach (const QString &name, m_currentCheckedSet) list.append(componentFromIndex(indexFromComponentName(name))); return list; } @@ -330,8 +330,8 @@ Component* ComponentModel::componentFromIndex(const QModelIndex &index) const */ void ComponentModel::selectAll() { - m_currentCheckedList = m_currentCheckedList.unite(select(Qt::Checked)); - emit defaultCheckStateChanged(m_initialCheckedList != m_currentCheckedList); + m_currentCheckedSet = m_currentCheckedSet.unite(select(Qt::Checked)); + emit defaultCheckStateChanged(m_initialCheckedSet != m_currentCheckedSet); } /*! @@ -341,8 +341,8 @@ void ComponentModel::selectAll() */ void ComponentModel::deselectAll() { - m_currentCheckedList = m_currentCheckedList.subtract(select(Qt::Unchecked)); - emit defaultCheckStateChanged(m_initialCheckedList != m_currentCheckedList); + m_currentCheckedSet = m_currentCheckedSet.subtract(select(Qt::Unchecked)); + emit defaultCheckStateChanged(m_initialCheckedSet != m_currentCheckedSet); } /*! @@ -360,7 +360,7 @@ void ComponentModel::selectDefault() for (int i = 0; i < m_rootComponentList.count(); ++i) { foreach (Component *child, m_rootComponentList.at(i)->childs()) { if (child->isCheckable() && !child->isTristate() && child->isDefault()) { - m_initialCheckedList.insert(child->name()); + m_initialCheckedSet.insert(child->name()); } } } @@ -368,14 +368,14 @@ void ComponentModel::selectDefault() for (int i = 0; i < m_rootComponentList.count(); ++i) { foreach (Component *child, m_rootComponentList.at(i)->childs()) { if (child->isCheckable() && !child->isTristate() && child->isInstalled()) - m_initialCheckedList.insert(child->name()); + m_initialCheckedSet.insert(child->name()); } } } - m_currentCheckedList += m_initialCheckedList; - foreach (const QString &name, m_currentCheckedList) + m_currentCheckedSet += m_initialCheckedSet; + foreach (const QString &name, m_currentCheckedSet) setData(indexFromComponentName(name), Qt::Checked, Qt::CheckStateRole); - emit defaultCheckStateChanged(m_initialCheckedList != m_currentCheckedList); + emit defaultCheckStateChanged(m_initialCheckedSet != m_currentCheckedSet); } // -- private slots @@ -429,10 +429,10 @@ void ComponentModel::slotCheckStateChanged(const QModelIndex &index) return; if (component->checkState() == Qt::Checked && !component->isTristate()) - m_currentCheckedList.insert(component->name()); + m_currentCheckedSet.insert(component->name()); else if (component->checkState() == Qt::Unchecked && !component->isTristate()) - m_currentCheckedList.remove(component->name()); - emit defaultCheckStateChanged(m_initialCheckedList != m_currentCheckedList); + m_currentCheckedSet.remove(component->name()); + emit defaultCheckStateChanged(m_initialCheckedSet != m_currentCheckedSet); if (component->isVirtual()) return; diff --git a/installerbuilder/libinstaller/componentmodel.h b/installerbuilder/libinstaller/componentmodel.h index 5c737a145..4c7a6acca 100644 --- a/installerbuilder/libinstaller/componentmodel.h +++ b/installerbuilder/libinstaller/componentmodel.h @@ -96,8 +96,8 @@ private: int m_rootIndex; QVector<QVariant> m_headerData; - QSet<QString> m_initialCheckedList; - QSet<QString> m_currentCheckedList; + QSet<QString> m_initialCheckedSet; + QSet<QString> m_currentCheckedSet; QList<Component*> m_rootComponentList; mutable QMap<QString, QPersistentModelIndex> m_indexByNameCache; |