1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cocoa: use const method more

Browse Source 
to avoid implicit detach

Change-Id: Ifeea193639f357cc53f8af884ae868a18149fbc8
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Anton Kudryavtsev 2023-09-07 15:46:55 +03:00
parent 87b5d85641
commit f5478b8a63
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/cocoa/qcocoadrag.mm
View File

@ -251,7 +251,7 @@ QPixmap QCocoaDrag::dragPixmap(QDrag *drag, QPoint &hotSpot) const
} }
if (pm.isNull() && (data->hasText() || data->hasUrls()) ) { if (pm.isNull() && (data->hasText() || data->hasUrls()) ) {
QString s = data->hasText() ? data->text() : data->urls().first().toString(); QString s = data->hasText() ? data->text() : data->urls().constFirst().toString();
if (s.length() > dragImageMaxChars) if (s.length() > dragImageMaxChars)
s = s.left(dragImageMaxChars -3) + QChar(0x2026); s = s.left(dragImageMaxChars -3) + QChar(0x2026);
if (!s.isEmpty()) { if (!s.isEmpty()) {

2
src/plugins/platforms/cocoa/qcocoamenu.mm
View File

@ -62,7 +62,7 @@ void QCocoaMenu::setMinimumWidth(int width)
void QCocoaMenu::setFont(const QFont &font) void QCocoaMenu::setFont(const QFont &font)
{ {
if (font.resolveMask()) { if (font.resolveMask()) {
NSFont *customMenuFont = [NSFont fontWithName:font.families().first().toNSString() NSFont *customMenuFont = [NSFont fontWithName:font.families().constFirst().toNSString()
size:font.pointSize()]; size:font.pointSize()];
m_nativeMenu.font = customMenuFont; m_nativeMenu.font = customMenuFont;
} }