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

AbiWidget: Make custom ABI more explicit

Browse Source 
Do use less d->m_abi->currentIndex() and introduce a method instead.

Change-Id: I1127ce37b62658f9cfc90cdb623a446d5dc449a8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2013-11-04 16:24:00 +01:00
parent bdbb8a336d
commit 792530d082
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/projectexplorer/abiwidget.cpp
View File

@@ -52,6 +52,11 @@ namespace Internal {
class AbiWidgetPrivate class AbiWidgetPrivate
{ {
public: public:
bool isCustom() const
{
return m_abi->currentIndex() == 0;
}
QComboBox *m_abi; QComboBox *m_abi;
QComboBox *m_architectureComboBox; QComboBox *m_architectureComboBox;
@@ -168,7 +173,7 @@ void AbiWidget::setAbis(const QList<Abi> &abiList, const Abi &current)
} }
d->m_abi->setVisible(!abiList.isEmpty()); d->m_abi->setVisible(!abiList.isEmpty());
if (d->m_abi->currentIndex() == 0) { if (d->isCustom()) {
if (!current.isValid() && !abiList.isEmpty()) if (!current.isValid() && !abiList.isEmpty())
d->m_abi->setCurrentIndex(1); // default to the first Abi if none is selected. d->m_abi->setCurrentIndex(1); // default to the first Abi if none is selected.
else else
@@ -199,15 +204,14 @@ void AbiWidget::osChanged()
void AbiWidget::modeChanged() void AbiWidget::modeChanged()
{ {
const bool customMode = (d->m_abi->currentIndex() == 0); const bool customMode = d->isCustom();
d->m_architectureComboBox->setEnabled(customMode); d->m_architectureComboBox->setEnabled(customMode);
d->m_osComboBox->setEnabled(customMode); d->m_osComboBox->setEnabled(customMode);
d->m_osFlavorComboBox->setEnabled(customMode); d->m_osFlavorComboBox->setEnabled(customMode);
d->m_binaryFormatComboBox->setEnabled(customMode); d->m_binaryFormatComboBox->setEnabled(customMode);
d->m_wordWidthComboBox->setEnabled(customMode); d->m_wordWidthComboBox->setEnabled(customMode);
Abi current(d->m_abi->itemData(d->m_abi->currentIndex()).toString()); setCustomAbi(currentAbi());
setCustomAbi(current);
} }
void AbiWidget::customAbiChanged() void AbiWidget::customAbiChanged()
@@ -244,7 +248,7 @@ void AbiWidget::setCustomAbi(const Abi &current)
break; break;
} }
} }
if (d->m_abi->currentIndex() == 0) if (d->isCustom())
d->m_abi->setItemData(0, current.toString()); d->m_abi->setItemData(0, current.toString());
blockSignals(blocked); blockSignals(blocked);