Commit 09417c56 authored by Eike Ziller's avatar Eike Ziller

OS X: Use autoreleasepool blocks in Objective-C(++) code

And get rid of the helper class from utils.
All supported platforms support this.

Change-Id: Ic4307a42fc55ac4673438ea4325bca14ed33849b
Reviewed-by: default avatarErik Verbruggen <erik.verbruggen@theqtcompany.com>
parent d8f119c8
/****************************************************************************
**
** Copyright (C) 2015 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms and
** conditions see http://www.qt.io/terms-conditions. For further information
** use the contact form at http://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 or version 3 as published by the Free
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, The Qt Company gives you certain additional
** rights. These rights are described in The Qt Company LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#ifndef AUTORELEASEPOOL_H
#define AUTORELEASEPOOL_H
#import <Foundation/NSAutoreleasePool.h>
namespace Utils {
class AutoreleasePool
{
public:
AutoreleasePool() { pool = [[NSAutoreleasePool alloc] init]; }
~AutoreleasePool() { [pool release]; }
private:
NSAutoreleasePool *pool;
};
} // Utils
#endif // AUTORELEASEPOOL_H
......@@ -30,7 +30,6 @@
#include "fileutils_mac.h"
#include "autoreleasepool.h"
#include "qtcassert.h"
#include <QDir>
......@@ -44,45 +43,46 @@ namespace Internal {
QUrl filePathUrl(const QUrl &url)
{
Utils::AutoreleasePool pool; Q_UNUSED(pool)
QUrl ret = url;
NSURL *nsurl = url.toNSURL();
if ([nsurl isFileReferenceURL])
ret = QUrl::fromNSURL([nsurl filePathURL]);
@autoreleasepool {
NSURL *nsurl = url.toNSURL();
if ([nsurl isFileReferenceURL])
ret = QUrl::fromNSURL([nsurl filePathURL]);
}
return ret;
}
QString normalizePathName(const QString &filePath)
{
AutoreleasePool pool; Q_UNUSED(pool)
// NSURL getResourceValue returns values based on the cleaned path so we need to work on that.
// It also returns the disk name for "/" and "/.." and errors on "" and relative paths,
// so avoid that
QString result;
@autoreleasepool {
// NSURL getResourceValue returns values based on the cleaned path so we need to work on that.
// It also returns the disk name for "/" and "/.." and errors on "" and relative paths,
// so avoid that
// we cannot know the normalized name for relative paths
if (QFileInfo(filePath).isRelative())
return filePath;
// we cannot know the normalized name for relative paths
if (QFileInfo(filePath).isRelative())
return filePath;
QString result;
QString path = QDir::cleanPath(filePath);
// avoid empty paths and paths like "/../foo" or "/.."
if (path.isEmpty() || path.contains(QLatin1String("/../")) || path.endsWith(QLatin1String("/..")))
return filePath;
QString path = QDir::cleanPath(filePath);
// avoid empty paths and paths like "/../foo" or "/.."
if (path.isEmpty() || path.contains(QLatin1String("/../")) || path.endsWith(QLatin1String("/..")))
return filePath;
while (path != QLatin1String("/") /*be defensive->*/&& path != QLatin1String(".") && !path.isEmpty()) {
QFileInfo info(path);
NSURL *nsurl = [NSURL fileURLWithPath:path.toNSString()];
NSString *out;
QString component;
if ([nsurl getResourceValue:(NSString **)&out forKey:NSURLNameKey error:nil])
component = QString::fromNSString(out);
else // e.g. if the full path does not exist
component = info.fileName();
result.prepend(QLatin1Char('/') + component);
path = info.path();
while (path != QLatin1String("/") /*be defensive->*/&& path != QLatin1String(".") && !path.isEmpty()) {
QFileInfo info(path);
NSURL *nsurl = [NSURL fileURLWithPath:path.toNSString()];
NSString *out;
QString component;
if ([nsurl getResourceValue:(NSString **)&out forKey:NSURLNameKey error:nil])
component = QString::fromNSString(out);
else // e.g. if the full path does not exist
component = info.fileName();
result.prepend(QLatin1Char('/') + component);
path = info.path();
}
QTC_ASSERT(path == QLatin1String("/"), return filePath);
}
QTC_ASSERT(path == QLatin1String("/"), return filePath);
return result;
}
......
......@@ -208,7 +208,7 @@ FORMS += $$PWD/filewizardpage.ui \
RESOURCES += $$PWD/utils.qrc
osx {
HEADERS += $$PWD/autoreleasepool.h \
HEADERS += \
$$PWD/fileutils_mac.h
OBJECTIVE_SOURCES += \
$$PWD/fileutils_mac.mm
......
......@@ -30,7 +30,6 @@
#include "spotlightlocatorfilter.h"
#include <utils/autoreleasepool.h>
#include <utils/qtcassert.h>
#include <QMutex>
......@@ -38,7 +37,6 @@
#include <QWaitCondition>
#include <Foundation/NSArray.h>
#include <Foundation/NSAutoreleasePool.h>
#include <Foundation/NSDictionary.h>
#include <Foundation/NSMetadata.h>
#include <Foundation/NSNotification.h>
......@@ -85,33 +83,34 @@ SpotlightIterator::SpotlightIterator(const QString &expression)
m_queueIndex(-1),
m_finished(false)
{
Utils::AutoreleasePool pool; Q_UNUSED(pool)
NSPredicate *predicate = [NSPredicate predicateWithFormat:expression.toNSString()];
m_query = [[NSMetadataQuery alloc] init];
m_query.predicate = predicate;
m_query.searchScopes = [NSArray arrayWithObject:NSMetadataQueryLocalComputerScope];
m_queue = [[NSMutableArray alloc] init];
m_progressObserver = [[[NSNotificationCenter defaultCenter]
addObserverForName:NSMetadataQueryGatheringProgressNotification
object:m_query
queue:nil
usingBlock:^(NSNotification *note) {
[m_query disableUpdates];
QMutexLocker lock(&m_mutex); Q_UNUSED(lock)
[m_queue addObjectsFromArray:[note.userInfo objectForKey:(NSString *)kMDQueryUpdateAddedItems]];
[m_query enableUpdates];
m_waitForItems.wakeAll();
}] retain];
m_finishObserver = [[[NSNotificationCenter defaultCenter]
addObserverForName:NSMetadataQueryDidFinishGatheringNotification
object:m_query
queue:nil
usingBlock:^(NSNotification *) {
QMutexLocker lock(&m_mutex); Q_UNUSED(lock)
m_finished = true;
m_waitForItems.wakeAll();
}] retain];
[m_query startQuery];
@autoreleasepool {
NSPredicate *predicate = [NSPredicate predicateWithFormat:expression.toNSString()];
m_query = [[NSMetadataQuery alloc] init];
m_query.predicate = predicate;
m_query.searchScopes = [NSArray arrayWithObject:NSMetadataQueryLocalComputerScope];
m_queue = [[NSMutableArray alloc] init];
m_progressObserver = [[[NSNotificationCenter defaultCenter]
addObserverForName:NSMetadataQueryGatheringProgressNotification
object:m_query
queue:nil
usingBlock:^(NSNotification *note) {
[m_query disableUpdates];
QMutexLocker lock(&m_mutex); Q_UNUSED(lock)
[m_queue addObjectsFromArray:[note.userInfo objectForKey:(NSString *)kMDQueryUpdateAddedItems]];
[m_query enableUpdates];
m_waitForItems.wakeAll();
}] retain];
m_finishObserver = [[[NSNotificationCenter defaultCenter]
addObserverForName:NSMetadataQueryDidFinishGatheringNotification
object:m_query
queue:nil
usingBlock:^(NSNotification *) {
QMutexLocker lock(&m_mutex); Q_UNUSED(lock)
m_finished = true;
m_waitForItems.wakeAll();
}] retain];
[m_query startQuery];
}
}
SpotlightIterator::~SpotlightIterator()
......@@ -163,22 +162,23 @@ void SpotlightIterator::ensureNext()
return;
if (m_index >= 10000) // limit the amount of data that is passed on
return;
Utils::AutoreleasePool pool; Q_UNUSED(pool)
// check if there are items in the queue, otherwise wait for some
m_mutex.lock();
bool itemAvailable = (m_queueIndex + 1 < m_queue.count);
if (!itemAvailable && !m_finished) {
m_waitForItems.wait(&m_mutex);
itemAvailable = (m_queueIndex + 1 < m_queue.count);
}
if (itemAvailable) {
++m_queueIndex;
NSMetadataItem *item = [m_queue objectAtIndex:m_queueIndex];
m_filePaths.append(QString::fromNSString([item valueForAttribute:NSMetadataItemPathKey]));
m_fileNames.append(QString::fromNSString([item valueForAttribute:NSMetadataItemFSNameKey]));
@autoreleasepool {
// check if there are items in the queue, otherwise wait for some
m_mutex.lock();
bool itemAvailable = (m_queueIndex + 1 < m_queue.count);
if (!itemAvailable && !m_finished) {
m_waitForItems.wait(&m_mutex);
itemAvailable = (m_queueIndex + 1 < m_queue.count);
}
if (itemAvailable) {
++m_queueIndex;
NSMetadataItem *item = [m_queue objectAtIndex:m_queueIndex];
m_filePaths.append(QString::fromNSString([item valueForAttribute:NSMetadataItemPathKey]));
m_fileNames.append(QString::fromNSString([item valueForAttribute:NSMetadataItemFSNameKey]));
}
m_mutex.unlock();
}
m_mutex.unlock();
}
// #pragma mark -- SpotlightLocatorFilter
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment