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

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

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

Change-Id: Ic4307a42fc55ac4673438ea4325bca14ed33849b
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
This commit is contained in:
Eike Ziller
2015-11-09 10:39:08 +01:00
parent d8f119c8a2
commit 09417c56bd
5 changed files with 240 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/libs/utils/fileutils_mac.mm
View File

@@ -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
// 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;
@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
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();
// we cannot know the normalized name for relative paths
if (QFileInfo(filePath).isRelative())
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();
}
QTC_ASSERT(path == QLatin1String("/"), return filePath);
}
QTC_ASSERT(path == QLatin1String("/"), return filePath);
return result;
}