feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

MacroExpander: Delay variable chooser population

Browse Source 
Change-Id: I4bf81bcf8bb4f14bf6c31f613d79e79380b666e0
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2014-11-27 17:45:49 +01:00
parent 5c6f982636
commit 99e2c9dbd4
3 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/coreplugin/variablechooser.cpp
View File

@@ -127,23 +127,17 @@ class VariableGroupItem : public TreeItem
{
public:
VariableGroupItem()
: m_chooser(0), m_expander(0)
: m_chooser(0)
{
setLazy(true);
}
bool ensureExpander() const
{
if (!m_expander)
m_expander = m_provider();
return m_expander != 0;
}
QVariant data(int column, int role) const
{
if (role == Qt::DisplayRole || role == Qt::EditRole) {
if (column == 0 && ensureExpander())
return m_expander->displayName();
if (column == 0)
if (MacroExpander *expander = m_provider())
return expander->displayName();
}
return QVariant();
@@ -151,8 +145,8 @@ public:
void populate()
{
if (ensureExpander())
populateGroup(m_expander);
if (MacroExpander *expander = m_provider())
populateGroup(expander);
}
void populateGroup(MacroExpander *expander);
@@ -160,7 +154,6 @@ public:
public:
VariableChooserPrivate *m_chooser; // Not owned.
MacroExpanderProvider m_provider;
mutable MacroExpander *m_expander; // Not owned.
};
class VariableItem : public TreeItem
@@ -260,6 +253,9 @@ VariableChooserPrivate::VariableChooserPrivate(VariableChooser *parent)
void VariableGroupItem::populateGroup(MacroExpander *expander)
{
if (!expander)
return;
foreach (const QByteArray &variable, expander->visibleVariables()) {
auto item = new VariableItem;
item->m_variable = QString::fromUtf8(variable);
@@ -269,13 +265,15 @@ void VariableGroupItem::populateGroup(MacroExpander *expander)
appendChild(item);
}
foreach (MacroExpander *subExpander, expander->subExpanders()) {
foreach (const MacroExpanderProvider &subProvider, expander->subProviders()) {
if (!subProvider)
continue;
if (expander->isAccumulating()) {
populateGroup(subExpander);
populateGroup(subProvider());
} else {
auto item = new VariableGroupItem;
item->m_chooser = m_chooser;
item->m_expander = subExpander;
item->m_provider = subProvider;
appendChild(item);
}
}