[plasma/plasma-desktop] /: Prevent detaching temporary from Qt conatainers
Méven Car <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 15781c168946fc81b75e27f60ea76c9d8ad75f55 by Méven Car, on behalf of Christoph Grüninger.
Committed on 29/07/2026 at 07:58.
Pushed by meven into branch 'master'.
Prevent detaching temporary from Qt conatainers
Found by Clazy (detaching-temporary).
M +1 -1 applets/kimpanel/kimpanel.cpp
M +1 -1 containments/desktop/plugins/folder/autotests/foldermodeltest.cpp
M +2 -2 containments/desktop/plugins/folder/autotests/positionertest.cpp
M +1 -1 emojier/emojierplugin.cpp
M +1 -1 kcms/tablet/tabletsmodel.cpp
https://invent.kde.org/plasma/plasma-desktop/-/commit/15781c168946fc81b75e27f60ea76c9d8ad75f55
diff --git a/applets/kimpanel/kimpanel.cpp b/applets/kimpanel/kimpanel.cpp
index f7934880db..59543ab921 100644
--- a/applets/kimpanel/kimpanel.cpp
+++ b/applets/kimpanel/kimpanel.cpp
@@ -127,7 +127,7 @@ void Kimpanel::updateLookupTableFull(const KimpanelLookupTable &lookupTable, int
void Kimpanel::updateProperty(const KimpanelProperty &property)
{
for (auto &prop : m_props) {
- if (prop.toMap()[QStringLiteral("key")] == property.key) {
+ if (prop.toMap().value(QStringLiteral("key")) == property.key) {
prop = property.toMap();
Q_EMIT propertiesChanged();
break;
diff --git a/containments/desktop/plugins/folder/autotests/foldermodeltest.cpp b/containments/desktop/plugins/folder/autotests/foldermodeltest.cpp
index 1c72e5ed10..c10f0f9ccd 100644
--- a/containments/desktop/plugins/folder/autotests/foldermodeltest.cpp
+++ b/containments/desktop/plugins/folder/autotests/foldermodeltest.cpp
@@ -406,7 +406,7 @@ void FolderModelTest::tst_initializeOnCorrectScreens()
QSignalSpy screenMapSpy(screenMapper, &ScreenMapper::screenMappingChanged);
screenMapper->setScreenMapping(newMap);
QCOMPARE(screenMapSpy.count(), 1);
- QCOMPARE(screenMapper->screenMapping()[1], QStringLiteral("0"));
+ QCOMPARE(screenMapper->screenMapping().at(1), QStringLiteral("0"));
// Create screen_1
auto folderSecondScreen = new FolderModel(this);
diff --git a/containments/desktop/plugins/folder/autotests/positionertest.cpp b/containments/desktop/plugins/folder/autotests/positionertest.cpp
index d4bb6920de..e74efb10b4 100644
--- a/containments/desktop/plugins/folder/autotests/positionertest.cpp
+++ b/containments/desktop/plugins/folder/autotests/positionertest.cpp
@@ -443,8 +443,8 @@ void PositionerTest::checkDefaultPositions(int perStripe)
{
ensureFolderModelReady();
QCOMPARE(perStripe, m_positioner->perStripe());
- QCOMPARE(m_positioner->positions()[0].toInt(), 1 + ((m_positioner->rowCount() - 1) / perStripe)); // rows
- QCOMPARE(m_positioner->positions()[1].toInt(), perStripe); // columns
+ QCOMPARE(m_positioner->positions().at(0).toInt(), 1 + ((m_positioner->rowCount() - 1) / perStripe)); // rows
+ QCOMPARE(m_positioner->positions().at(1).toInt(), perStripe); // columns
const auto currentPositions = getPositionHash(m_positioner->positions());
// Checking default positions ignores configuration completely
// instead, it compares that the default values match, since the
diff --git a/emojier/emojierplugin.cpp b/emojier/emojierplugin.cpp
index 9c54fc1257..20168d94bc 100644
--- a/emojier/emojierplugin.cpp
+++ b/emojier/emojierplugin.cpp
@@ -81,7 +81,7 @@ QVariant TwoToneEmojiModel::data(const QModelIndex &index, int role) const
emoji = &m_twoToneEmojis[m_twoToneIndex + index.row() - skintone];
}
} else {
- const int mappedIndex = twoToneSortFilterMap[m_settings.skinTone()][index.row()];
+ const int mappedIndex = twoToneSortFilterMap[m_settings.skinTone()].at(index.row());
emoji = &m_twoToneEmojis[m_twoToneIndex + mappedIndex];
}
diff --git a/kcms/tablet/tabletsmodel.cpp b/kcms/tablet/tabletsmodel.cpp
index 798e79fa71..b65190d4d2 100644
--- a/kcms/tablet/tabletsmodel.cpp
+++ b/kcms/tablet/tabletsmodel.cpp
@@ -273,7 +273,7 @@ void TabletsModel::loadReply(QDBusMessage reply)
QStringList devicesSysNames;
if (reply.type() == QDBusMessage::ReplyMessage) {
- devicesSysNames = reply.arguments().first().value<QDBusVariant>().variant().toStringList();
+ devicesSysNames = reply.arguments().constFirst().value<QDBusVariant>().variant().toStringList();
} else {
qCWarning(KCM_TABLET) << "Error on receiving device list from KWin:" << reply.errorMessage();
return;