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

macOS file dialog refactor: don't heap allocate string and string list

Browse Source 
We always allocated them in the constructor function, and never tested
them for nullptr, so just manage them as regular members.

As a drive-by, apply const to read-only variables in relevant code.

Pick-to: 6.6
Change-Id: If0a3ac8982582f2adf5187a3c0357f4da93467fb
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Volker Hilsheimer 2023-09-08 16:25:44 +02:00
parent 2f945aaa26
commit a7b50c40a0
1 changed files with 30 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
View File

@ -58,9 +58,9 @@ typedef QSharedPointer<QFileDialogOptions> SharedPointerFileDialogOptions;
NSString *m_currentDirectory; NSString *m_currentDirectory;
SharedPointerFileDialogOptions m_options; SharedPointerFileDialogOptions m_options;
QString *m_currentSelection; QString m_currentSelection;
QStringList *m_nameFilterDropDownList; QStringList m_nameFilterDropDownList;
QStringList *m_selectedNameFilter; QStringList m_selectedNameFilter;
} }
- (instancetype)initWithAcceptMode:(const QString &)selectFile - (instancetype)initWithAcceptMode:(const QString &)selectFile
@ -80,24 +80,24 @@ typedef QSharedPointer<QFileDialogOptions> SharedPointerFileDialogOptions;
m_helper = helper; m_helper = helper;
m_nameFilterDropDownList = new QStringList(m_options->nameFilters()); m_nameFilterDropDownList = m_options->nameFilters();
QString selectedVisualNameFilter = m_options->initiallySelectedNameFilter(); QString selectedVisualNameFilter = m_options->initiallySelectedNameFilter();
m_selectedNameFilter = new QStringList([self findStrippedFilterWithVisualFilterName:selectedVisualNameFilter]); m_selectedNameFilter = [self findStrippedFilterWithVisualFilterName:selectedVisualNameFilter];
QFileInfo sel(selectFile); const QFileInfo sel(selectFile);
if (sel.isDir() && !sel.isBundle()){ if (sel.isDir() && !sel.isBundle()){
m_currentDirectory = [sel.absoluteFilePath().toNSString() retain]; m_currentDirectory = [sel.absoluteFilePath().toNSString() retain];
m_currentSelection = new QString; m_currentSelection.clear();
} else { } else {
m_currentDirectory = [sel.absolutePath().toNSString() retain]; m_currentDirectory = [sel.absolutePath().toNSString() retain];
m_currentSelection = new QString(sel.absoluteFilePath()); m_currentSelection = sel.absoluteFilePath();
} }
[self createPopUpButton:selectedVisualNameFilter hideDetails:options->testOption(QFileDialogOptions::HideNameFilterDetails)]; [self createPopUpButton:selectedVisualNameFilter hideDetails:options->testOption(QFileDialogOptions::HideNameFilterDetails)];
[self createTextField]; [self createTextField];
[self createAccessory]; [self createAccessory];
m_panel.accessoryView = m_nameFilterDropDownList->size() > 1 ? m_accessoryView : nil; m_panel.accessoryView = m_nameFilterDropDownList.size() > 1 ? m_accessoryView : nil;
// -setAccessoryView: can result in -panel:directoryDidChange: // -setAccessoryView: can result in -panel:directoryDidChange:
// resetting our m_currentDirectory, set the delegate // resetting our m_currentDirectory, set the delegate
// here to make sure it gets the correct value. // here to make sure it gets the correct value.
@ -113,10 +113,6 @@ typedef QSharedPointer<QFileDialogOptions> SharedPointerFileDialogOptions;
- (void)dealloc - (void)dealloc
{ {
delete m_nameFilterDropDownList;
delete m_selectedNameFilter;
delete m_currentSelection;
[m_panel orderOut:m_panel]; [m_panel orderOut:m_panel];
m_panel.accessoryView = nil; m_panel.accessoryView = nil;
[m_popupButton release]; [m_popupButton release];
@ -130,7 +126,7 @@ typedef QSharedPointer<QFileDialogOptions> SharedPointerFileDialogOptions;
- (bool)showPanel:(Qt::WindowModality) windowModality withParent:(QWindow *)parent - (bool)showPanel:(Qt::WindowModality) windowModality withParent:(QWindow *)parent
{ {
QFileInfo info(*m_currentSelection); const QFileInfo info(m_currentSelection);
NSString *filepath = info.filePath().toNSString(); NSString *filepath = info.filePath().toNSString();
NSURL *url = [NSURL fileURLWithPath:filepath isDirectory:info.isDir()]; NSURL *url = [NSURL fileURLWithPath:filepath isDirectory:info.isDir()];
bool selectable = (m_options->acceptMode() == QFileDialogOptions::AcceptSave) bool selectable = (m_options->acceptMode() == QFileDialogOptions::AcceptSave)
@ -184,7 +180,7 @@ typedef QSharedPointer<QFileDialogOptions> SharedPointerFileDialogOptions;
- (void)closePanel - (void)closePanel
{ {
*m_currentSelection = QString::fromNSString(m_panel.URL.path).normalized(QString::NormalizationForm_C); m_currentSelection = QString::fromNSString(m_panel.URL.path).normalized(QString::NormalizationForm_C);
if (m_panel.sheet) if (m_panel.sheet)
[NSApp endSheet:m_panel]; [NSApp endSheet:m_panel];
@ -202,7 +198,7 @@ typedef QSharedPointer<QFileDialogOptions> SharedPointerFileDialogOptions;
if (!filename.length) if (!filename.length)
return NO; return NO;
QFileInfo fileInfo(QString::fromNSString(filename)); const QFileInfo fileInfo(QString::fromNSString(filename));
// Always accept directories regardless of their names. // Always accept directories regardless of their names.
// This also includes symlinks and aliases to directories. // This also includes symlinks and aliases to directories.
@ -217,12 +213,12 @@ typedef QSharedPointer<QFileDialogOptions> SharedPointerFileDialogOptions;
return YES; return YES;
} }
QString qtFileName = fileInfo.fileName(); const QString qtFileName = fileInfo.fileName();
// No filter means accept everything // No filter means accept everything
bool nameMatches = m_selectedNameFilter->isEmpty(); bool nameMatches = m_selectedNameFilter.isEmpty();
// Check if the current file name filter accepts the file: // Check if the current file name filter accepts the file:
for (int i = 0; !nameMatches && i < m_selectedNameFilter->size(); ++i) { for (int i = 0; !nameMatches && i < m_selectedNameFilter.size(); ++i) {
if (QDir::match(m_selectedNameFilter->at(i), qtFileName)) if (QDir::match(m_selectedNameFilter.at(i), qtFileName))
nameMatches = true; nameMatches = true;
} }
if (!nameMatches) if (!nameMatches)
@ -256,10 +252,10 @@ typedef QSharedPointer<QFileDialogOptions> SharedPointerFileDialogOptions;
- (void)setNameFilters:(const QStringList &)filters hideDetails:(BOOL)hideDetails - (void)setNameFilters:(const QStringList &)filters hideDetails:(BOOL)hideDetails
{ {
[m_popupButton removeAllItems]; [m_popupButton removeAllItems];
*m_nameFilterDropDownList = filters; m_nameFilterDropDownList = filters;
if (filters.size() > 0){ if (filters.size() > 0){
for (int i = 0; i < filters.size(); ++i) { for (int i = 0; i < filters.size(); ++i) {
QString filter = hideDetails ? [self removeExtensions:filters.at(i)] : filters.at(i); const QString filter = hideDetails ? [self removeExtensions:filters.at(i)] : filters.at(i);
[m_popupButton.menu addItemWithTitle:filter.toNSString() action:nil keyEquivalent:@""]; [m_popupButton.menu addItemWithTitle:filter.toNSString() action:nil keyEquivalent:@""];
} }
[m_popupButton selectItemAtIndex:0]; [m_popupButton selectItemAtIndex:0];
@ -277,8 +273,8 @@ typedef QSharedPointer<QFileDialogOptions> SharedPointerFileDialogOptions;
Q_UNUSED(sender); Q_UNUSED(sender);
if (!m_helper) if (!m_helper)
return; return;
QString selection = m_nameFilterDropDownList->value([m_popupButton indexOfSelectedItem]); const QString selection = m_nameFilterDropDownList.value([m_popupButton indexOfSelectedItem]);
*m_selectedNameFilter = [self findStrippedFilterWithVisualFilterName:selection]; m_selectedNameFilter = [self findStrippedFilterWithVisualFilterName:selection];
[m_panel validateVisibleColumns]; [m_panel validateVisibleColumns];
[self updateProperties]; [self updateProperties];
@ -368,9 +364,9 @@ typedef QSharedPointer<QFileDialogOptions> SharedPointerFileDialogOptions;
return; return;
if (m_panel.visible) { if (m_panel.visible) {
QString selection = QString::fromNSString(m_panel.URL.path); const QString selection = QString::fromNSString(m_panel.URL.path);
if (selection != *m_currentSelection) { if (selection != m_currentSelection) {
*m_currentSelection = selection; m_currentSelection = selection;
emit m_helper->currentChanged(QUrl::fromLocalFile(selection)); emit m_helper->currentChanged(QUrl::fromLocalFile(selection));
} }
} }
@ -410,7 +406,7 @@ typedef QSharedPointer<QFileDialogOptions> SharedPointerFileDialogOptions;
return nil; // panel:shouldEnableURL: does the file filtering for NSOpenPanel return nil; // panel:shouldEnableURL: does the file filtering for NSOpenPanel
QStringList fileTypes; QStringList fileTypes;
for (const QString &filter : *m_selectedNameFilter) { for (const QString &filter : std::as_const(m_selectedNameFilter)) {
if (!filter.startsWith("*."_L1)) if (!filter.startsWith("*."_L1))
continue; continue;
@ -457,10 +453,10 @@ typedef QSharedPointer<QFileDialogOptions> SharedPointerFileDialogOptions;
m_popupButton.target = self; m_popupButton.target = self;
m_popupButton.action = @selector(filterChanged:); m_popupButton.action = @selector(filterChanged:);
if (m_nameFilterDropDownList->size() > 0) { if (!m_nameFilterDropDownList.isEmpty()) {
int filterToUse = -1; int filterToUse = -1;
for (int i = 0; i < m_nameFilterDropDownList->size(); ++i) { for (int i = 0; i < m_nameFilterDropDownList.size(); ++i) {
QString currentFilter = m_nameFilterDropDownList->at(i); const QString currentFilter = m_nameFilterDropDownList.at(i);
if (selectedFilter == currentFilter || if (selectedFilter == currentFilter ||
(filterToUse == -1 && currentFilter.startsWith(selectedFilter))) (filterToUse == -1 && currentFilter.startsWith(selectedFilter)))
filterToUse = i; filterToUse = i;
@ -474,9 +470,9 @@ typedef QSharedPointer<QFileDialogOptions> SharedPointerFileDialogOptions;
- (QStringList) findStrippedFilterWithVisualFilterName:(QString)name - (QStringList) findStrippedFilterWithVisualFilterName:(QString)name
{ {
for (int i = 0; i < m_nameFilterDropDownList->size(); ++i) { for (const QString &currentFilter : std::as_const(m_nameFilterDropDownList)) {
if (m_nameFilterDropDownList->at(i).startsWith(name)) if (currentFilter.startsWith(name))
return QPlatformFileDialogHelper::cleanFilterList(m_nameFilterDropDownList->at(i)); return QPlatformFileDialogHelper::cleanFilterList(currentFilter);
} }
return QStringList(); return QStringList();
} }