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

Update mime database from Qt

Browse Source 
qtbase/8a1eb24de8ef063fc5d0c3f10a7324d95bbc8709
  Misc: Fix qsizetype-related narrowing coversions

Change-Id: I203c6d554d99c96ceddd7f38efc47123b8fc3154
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Eike Ziller
2024-08-27 12:53:38 +02:00
parent cfb6653854
commit 9c21c0a2a1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/utils/mimetypes2/mimetype.cpp
View File

@@ -241,7 +241,7 @@ QString MimeType::comment() const
const QString comm = d->localeComments.value(lang); const QString comm = d->localeComments.value(lang);
if (!comm.isEmpty()) if (!comm.isEmpty())
return comm; return comm;
const int pos = lang.indexOf(u'_'); const qsizetype pos = lang.indexOf(u'_');
if (pos != -1) { if (pos != -1) {
// "pt_BR" not found? try just "pt" // "pt_BR" not found? try just "pt"
const QString shortLang = lang.left(pos); const QString shortLang = lang.left(pos);
@@ -280,7 +280,7 @@ QString MimeType::genericIconName() const
// (i.e. "video-x-generic" in the previous example). // (i.e. "video-x-generic" in the previous example).
const QString group = name(); const QString group = name();
QStringView groupRef(group); QStringView groupRef(group);
const int slashindex = groupRef.indexOf(u'/'); const qsizetype slashindex = groupRef.indexOf(u'/');
if (slashindex != -1) if (slashindex != -1)
groupRef = groupRef.left(slashindex); groupRef = groupRef.left(slashindex);
return groupRef + "-x-generic"_L1; return groupRef + "-x-generic"_L1;
@@ -290,7 +290,7 @@ QString MimeType::genericIconName() const
static QString make_default_icon_name_from_mimetype_name(QString iconName) static QString make_default_icon_name_from_mimetype_name(QString iconName)
{ {
const int slashindex = iconName.indexOf(u'/'); const qsizetype slashindex = iconName.indexOf(u'/');
if (slashindex != -1) if (slashindex != -1)
iconName[slashindex] = u'-'; iconName[slashindex] = u'-';
return iconName; return iconName;