forked from qt-creator/qt-creator
Fix warning: "Don't call QHash::operator[]() on temporary"
[-Wclazy-detaching-temporary] Change-Id: Ide503c9260af285fa1dbedb63f7819c8ad616db6 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
@@ -284,7 +284,7 @@ QMap<QString, QString> languageIds()
|
|||||||
|
|
||||||
QString TextDocumentItem::mimeTypeToLanguageId(const Utils::MimeType &mimeType)
|
QString TextDocumentItem::mimeTypeToLanguageId(const Utils::MimeType &mimeType)
|
||||||
{
|
{
|
||||||
return mimeTypeLanguageIdMap()[mimeType];
|
return mimeTypeLanguageIdMap().value(mimeType);
|
||||||
}
|
}
|
||||||
|
|
||||||
QString TextDocumentItem::mimeTypeToLanguageId(const QString &mimeTypeName)
|
QString TextDocumentItem::mimeTypeToLanguageId(const QString &mimeTypeName)
|
||||||
|
|||||||
@@ -237,7 +237,7 @@ QVector<Core::Id> ClangDiagnosticConfigsModel::changedOrRemovedConfigs(
|
|||||||
const int i = newConfigsModel.indexOfConfig(old.id());
|
const int i = newConfigsModel.indexOfConfig(old.id());
|
||||||
if (i == -1)
|
if (i == -1)
|
||||||
changedConfigs.append(old.id()); // Removed
|
changedConfigs.append(old.id()); // Removed
|
||||||
else if (newConfigsModel.configs()[i] != old)
|
else if (newConfigsModel.configs().value(i) != old)
|
||||||
changedConfigs.append(old.id()); // Changed
|
changedConfigs.append(old.id()); // Changed
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ QVariant PerfConfigEventsModel::data(const QModelIndex &index, int role) const
|
|||||||
return QVariant(); // ignore
|
return QVariant(); // ignore
|
||||||
}
|
}
|
||||||
|
|
||||||
QString event = m_settings->events()[index.row()];
|
QString event = m_settings->events().value(index.row());
|
||||||
const EventDescription description = parseEvent(event);
|
const EventDescription description = parseEvent(event);
|
||||||
switch (index.column()) {
|
switch (index.column()) {
|
||||||
case ColumnEventType: {
|
case ColumnEventType: {
|
||||||
|
|||||||
@@ -410,7 +410,7 @@ bool MainQmlFileAspect::isQmlFilePresent()
|
|||||||
for (const Utils::FileName &filename : files) {
|
for (const Utils::FileName &filename : files) {
|
||||||
const QFileInfo fi = filename.toFileInfo();
|
const QFileInfo fi = filename.toFileInfo();
|
||||||
|
|
||||||
if (!filename.isEmpty() && fi.baseName()[0].isLower()) {
|
if (!filename.isEmpty() && fi.baseName().at(0).isLower()) {
|
||||||
Utils::MimeType type = Utils::mimeTypeForFile(fi);
|
Utils::MimeType type = Utils::mimeTypeForFile(fi);
|
||||||
if (type.matchesName(QLatin1String(ProjectExplorer::Constants::QML_MIMETYPE))
|
if (type.matchesName(QLatin1String(ProjectExplorer::Constants::QML_MIMETYPE))
|
||||||
|| type.matchesName(
|
|| type.matchesName(
|
||||||
|
|||||||
@@ -221,7 +221,7 @@ void layout(const QList<QGraphicsItem*> &items)
|
|||||||
// Change initial-item position
|
// Change initial-item position
|
||||||
ConnectableItem *firstItem = nullptr;
|
ConnectableItem *firstItem = nullptr;
|
||||||
if (initialItem && initialItem->outputTransitionCount() == 1) {
|
if (initialItem && initialItem->outputTransitionCount() == 1) {
|
||||||
firstItem = initialItem->outputTransitions()[0]->connectedItem(initialItem);
|
firstItem = initialItem->outputTransitions().constFirst()->connectedItem(initialItem);
|
||||||
int index = childItems.indexOf(firstItem);
|
int index = childItems.indexOf(firstItem);
|
||||||
if (index > 0)
|
if (index > 0)
|
||||||
childItems.swap(index, 0);
|
childItems.swap(index, 0);
|
||||||
@@ -230,7 +230,7 @@ void layout(const QList<QGraphicsItem*> &items)
|
|||||||
// Search final-item
|
// Search final-item
|
||||||
ConnectableItem *lastItem = nullptr;
|
ConnectableItem *lastItem = nullptr;
|
||||||
if (finalItem && finalItem->inputTransitionCount() > 0)
|
if (finalItem && finalItem->inputTransitionCount() > 0)
|
||||||
lastItem = finalItem->inputTransitions()[0]->connectedItem(finalItem);
|
lastItem = finalItem->inputTransitions().constFirst()->connectedItem(finalItem);
|
||||||
|
|
||||||
int startAngle = qrand() % 2 == 0 ? 180 : 90;
|
int startAngle = qrand() % 2 == 0 ? 180 : 90;
|
||||||
int startDistance = 40 + childItems.count() * 10;
|
int startDistance = 40 + childItems.count() * 10;
|
||||||
|
|||||||
Reference in New Issue
Block a user