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

QbsProjectManager: Limit the usage of qMakePair

Browse Source 
Change-Id: I00cf4e3608d275051c142ab574a47ff4688c7970
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2022-09-30 13:59:32 +02:00
parent 7eb778dc3d
commit 93dc9ce591
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qbsprojectmanager/qbskitinformation.cpp
View File

@@ -94,7 +94,7 @@ Tasks QbsKitAspect::validate(const Kit *) const { return {}; }
KitAspect::ItemList QbsKitAspect::toUserOutput(const Kit *k) const KitAspect::ItemList QbsKitAspect::toUserOutput(const Kit *k) const
{ {
return ItemList({qMakePair(displayName(), representation(k))}); return {{displayName(), representation(k)}};
} }
KitAspectWidget *QbsKitAspect::createConfigWidget(Kit *k) const KitAspectWidget *QbsKitAspect::createConfigWidget(Kit *k) const

7
src/plugins/qbsprojectmanager/qbssession.cpp
View File

@@ -197,8 +197,7 @@ void QbsSession::initialize()
void QbsSession::sendQuitPacket() void QbsSession::sendQuitPacket()
{ {
d->qbsProcess->writeRaw(Packet::createPacket(QJsonObject{qMakePair(QString("type"), d->qbsProcess->writeRaw(Packet::createPacket({{"type", "quit"}}));
QJsonValue("quit"))}));
} }
QbsSession::~QbsSession() QbsSession::~QbsSession()
@@ -262,7 +261,7 @@ void QbsSession::sendRequest(const QJsonObject &request)
void QbsSession::cancelCurrentJob() void QbsSession::cancelCurrentJob()
{ {
if (d->state == State::Active) if (d->state == State::Active)
sendRequest(QJsonObject{qMakePair(QString("type"), QJsonValue("cancel-job"))}); sendRequest({{"type", "cancel-job"}});
} }
void QbsSession::requestFilesGeneratedFrom(const QHash<QString, QStringList> &sourceFilesPerProduct) void QbsSession::requestFilesGeneratedFrom(const QHash<QString, QStringList> &sourceFilesPerProduct)
@@ -275,7 +274,7 @@ void QbsSession::requestFilesGeneratedFrom(const QHash<QString, QStringList> &so
product.insert("full-display-name", it.key()); product.insert("full-display-name", it.key());
QJsonArray requests; QJsonArray requests;
for (const QString &sourceFile : it.value()) for (const QString &sourceFile : it.value())
requests << QJsonObject({qMakePair(QString("source-file"), sourceFile)}); requests << QJsonObject({{"source-file", sourceFile}});
product.insert("requests", requests); product.insert("requests", requests);
products << product; products << product;
} }