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

Utils: Limit the usage of qMakePair

Browse Source 
Change-Id: I93eba395ddc580950a7eeb908555736ff48a3e3d
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2022-09-30 11:40:32 +02:00
parent 738803a4da
commit d1e521d223
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/utils/environment.cpp
View File

@@ -61,7 +61,7 @@ void Environment::appendOrSet(const QString &key, const QString &value, const QS
QTC_ASSERT(!key.contains('='), return ); QTC_ASSERT(!key.contains('='), return );
const auto it = m_dict.findKey(key); const auto it = m_dict.findKey(key);
if (it == m_dict.m_values.end()) { if (it == m_dict.m_values.end()) {
m_dict.m_values.insert(DictKey(key, m_dict.nameCaseSensitivity()), qMakePair(value, true)); m_dict.m_values.insert(DictKey(key, m_dict.nameCaseSensitivity()), {value, true});
} else { } else {
// Append unless it is already there // Append unless it is already there
const QString toAppend = sep + value; const QString toAppend = sep + value;
@@ -75,7 +75,7 @@ void Environment::prependOrSet(const QString &key, const QString &value, const Q
QTC_ASSERT(!key.contains('='), return ); QTC_ASSERT(!key.contains('='), return );
const auto it = m_dict.findKey(key); const auto it = m_dict.findKey(key);
if (it == m_dict.m_values.end()) { if (it == m_dict.m_values.end()) {
m_dict.m_values.insert(DictKey(key, m_dict.nameCaseSensitivity()), qMakePair(value, true)); m_dict.m_values.insert(DictKey(key, m_dict.nameCaseSensitivity()), {value, true});
} else { } else {
// Prepend unless it is already there // Prepend unless it is already there
const QString toPrepend = value + sep; const QString toPrepend = value + sep;

32
src/libs/utils/wizard.cpp
View File

@@ -208,8 +208,8 @@ void LinearProgressWidget::recreateLayout()
{ {
disableUpdates(); disableUpdates();
QMap<WizardProgressItem *, ProgressItemWidget *>::ConstIterator it = m_itemToItemWidget.constBegin(); auto it = m_itemToItemWidget.constBegin();
QMap<WizardProgressItem *, ProgressItemWidget *>::ConstIterator itEnd = m_itemToItemWidget.constEnd(); const auto itEnd = m_itemToItemWidget.constEnd();
while (it != itEnd) { while (it != itEnd) {
it.value()->setVisible(false); it.value()->setVisible(false);
++it; ++it;
@@ -243,8 +243,8 @@ void LinearProgressWidget::updateProgress()
QList<WizardProgressItem *> visitedItems = m_wizardProgress->visitedItems(); QList<WizardProgressItem *> visitedItems = m_wizardProgress->visitedItems();
QMap<WizardProgressItem *, ProgressItemWidget *>::ConstIterator it = m_itemToItemWidget.constBegin(); auto it = m_itemToItemWidget.constBegin();
QMap<WizardProgressItem *, ProgressItemWidget *>::ConstIterator itEnd = m_itemToItemWidget.constEnd(); const auto itEnd = m_itemToItemWidget.constEnd();
while (it != itEnd) { while (it != itEnd) {
WizardProgressItem *item = it.key(); WizardProgressItem *item = it.key();
ProgressItemWidget *itemWidget = it.value(); ProgressItemWidget *itemWidget = it.value();
@@ -636,12 +636,12 @@ QList<WizardProgressItem *> WizardProgressPrivate::singlePathBetween(WizardProgr
if (item->nextItems().contains(toItem)) if (item->nextItems().contains(toItem))
return {toItem}; return {toItem};
QHash<WizardProgressItem *, QHash<WizardProgressItem *, bool> > visitedItemsToParents; QHash<WizardProgressItem *, QHash<WizardProgressItem *, bool>> visitedItemsToParents;
QList<QPair<WizardProgressItem *, WizardProgressItem *> > workingItems; // next to prev item QList<QPair<WizardProgressItem *, WizardProgressItem *>> workingItems; // next to prev item
QList<WizardProgressItem *> items = item->nextItems(); const QList<WizardProgressItem *> items = item->nextItems();
for (int i = 0; i < items.count(); i++) for (WizardProgressItem *i : items)
workingItems.append(qMakePair(items.at(i), item)); workingItems.push_back({i, item});
while (!workingItems.isEmpty()) { while (!workingItems.isEmpty()) {
QPair<WizardProgressItem *, WizardProgressItem *> workingItem = workingItems.takeFirst(); QPair<WizardProgressItem *, WizardProgressItem *> workingItem = workingItems.takeFirst();
@@ -651,16 +651,16 @@ QList<WizardProgressItem *> WizardProgressPrivate::singlePathBetween(WizardProgr
if (parents.count() > 1) if (parents.count() > 1)
continue; continue;
QList<WizardProgressItem *> items = workingItem.first->nextItems(); const QList<WizardProgressItem *> items = workingItem.first->nextItems();
for (int i = 0; i < items.count(); i++) for (WizardProgressItem *i : items)
workingItems.append(qMakePair(items.at(i), workingItem.first)); workingItems.push_back({i, workingItem.first});
} }
QList<WizardProgressItem *> path; QList<WizardProgressItem *> path;
WizardProgressItem *it = toItem; WizardProgressItem *it = toItem;
QHash<WizardProgressItem *, QHash<WizardProgressItem *, bool> >::ConstIterator itItem = visitedItemsToParents.constFind(it); auto itItem = visitedItemsToParents.constFind(it);
QHash<WizardProgressItem *, QHash<WizardProgressItem *, bool> >::ConstIterator itEnd = visitedItemsToParents.constEnd(); const auto itEnd = visitedItemsToParents.constEnd();
while (itItem != itEnd) { while (itItem != itEnd) {
path.prepend(itItem.key()); path.prepend(itItem.key());
if (itItem.value().count() != 1) if (itItem.value().count() != 1)
@@ -702,8 +702,8 @@ WizardProgress::~WizardProgress()
{ {
Q_D(WizardProgress); Q_D(WizardProgress);
QMap<WizardProgressItem *, WizardProgressItem *>::ConstIterator it = d->m_itemToItem.constBegin(); auto it = d->m_itemToItem.constBegin();
QMap<WizardProgressItem *, WizardProgressItem *>::ConstIterator itEnd = d->m_itemToItem.constEnd(); const auto itEnd = d->m_itemToItem.constEnd();
while (it != itEnd) { while (it != itEnd) {
delete it.key(); delete it.key();
++it; ++it;