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

51
src/libs/utils/autoreleasepool.h
View File

@@ -1,51 +0,0 @@
/****************************************************************************
**
** 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

10
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,18 +43,19 @@ namespace Internal {
QUrl filePathUrl(const QUrl &url)
{
Utils::AutoreleasePool pool; Q_UNUSED(pool)
QUrl ret = url;
@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)
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
@@ -64,7 +64,6 @@ QString normalizePathName(const QString &filePath)
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("/..")))
@@ -83,6 +82,7 @@ QString normalizePathName(const QString &filePath)
path = info.path();
}
QTC_ASSERT(path == QLatin1String("/"), return filePath);
}
return result;
}

2
src/libs/utils/utils-lib.pri
View File

@@ -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

8
src/plugins/coreplugin/locator/spotlightlocatorfilter.mm
View File

@@ -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,7 +83,7 @@ SpotlightIterator::SpotlightIterator(const QString &expression)
m_queueIndex(-1),
m_finished(false)
{
Utils::AutoreleasePool pool; Q_UNUSED(pool)
@autoreleasepool {
NSPredicate *predicate = [NSPredicate predicateWithFormat:expression.toNSString()];
m_query = [[NSMetadataQuery alloc] init];
m_query.predicate = predicate;
@@ -112,6 +110,7 @@ SpotlightIterator::SpotlightIterator(const QString &expression)
m_waitForItems.wakeAll();
}] retain];
[m_query startQuery];
}
}
SpotlightIterator::~SpotlightIterator()
@@ -163,7 +162,7 @@ void SpotlightIterator::ensureNext()
return;
if (m_index >= 10000) // limit the amount of data that is passed on
return;
Utils::AutoreleasePool pool; Q_UNUSED(pool)
@autoreleasepool {
// check if there are items in the queue, otherwise wait for some
m_mutex.lock();
bool itemAvailable = (m_queueIndex + 1 < m_queue.count);
@@ -179,6 +178,7 @@ void SpotlightIterator::ensureNext()
}
m_mutex.unlock();
}
}
// #pragma mark -- SpotlightLocatorFilter

67
src/plugins/help/macwebkithelpviewer.mm
View File

@@ -34,7 +34,6 @@
#include "openpagesmanager.h"
#include <coreplugin/icore.h>
#include <utils/autoreleasepool.h>
#include <utils/qtcassert.h>
#include <QApplication>
@@ -437,7 +436,7 @@ MacWebKitHelpWidget::MacWebKitHelpWidget(MacWebKitHelpViewer *parent)
{
d->m_toolTipTimer.setSingleShot(true);
connect(&d->m_toolTipTimer, &QTimer::timeout, this, &MacWebKitHelpWidget::showToolTip);
AutoreleasePool pool; Q_UNUSED(pool)
@autoreleasepool {
d->m_webView = [[MyWebView alloc] init];
// Turn layered rendering on.
// Otherwise the WebView will render empty after any QQuickWidget was shown.
@@ -449,6 +448,7 @@ MacWebKitHelpWidget::MacWebKitHelpWidget(MacWebKitHelpViewer *parent)
[d->m_webView setUIDelegate:d->m_uiDelegate];
setCocoaView(d->m_webView);
}
}
MacWebKitHelpWidget::~MacWebKitHelpWidget()
@@ -507,11 +507,12 @@ MacWebKitHelpViewer::MacWebKitHelpViewer(QWidget *parent)
new MacResponderHack(qApp);
}
AutoreleasePool pool; Q_UNUSED(pool)
@autoreleasepool {
QVBoxLayout *layout = new QVBoxLayout;
setLayout(layout);
layout->setContentsMargins(0, 0, 0, 0);
layout->addWidget(m_widget, 10);
}
}
MacWebKitHelpViewer::~MacWebKitHelpViewer()
@@ -521,43 +522,49 @@ MacWebKitHelpViewer::~MacWebKitHelpViewer()
QFont MacWebKitHelpViewer::viewerFont() const
{
AutoreleasePool pool; Q_UNUSED(pool)
@autoreleasepool {
WebPreferences *preferences = m_widget->webView().preferences;
QString family = QString::fromNSString([preferences standardFontFamily]);
int size = [preferences defaultFontSize];
return QFont(family, size);
}
}
void MacWebKitHelpViewer::setViewerFont(const QFont &font)
{
AutoreleasePool pool; Q_UNUSED(pool)
@autoreleasepool {
WebPreferences *preferences = m_widget->webView().preferences;
[preferences setStandardFontFamily:font.family().toNSString()];
[preferences setDefaultFontSize:font.pointSize()];
}
}
void MacWebKitHelpViewer::scaleUp()
{
AutoreleasePool pool; Q_UNUSED(pool)
@autoreleasepool {
m_widget->webView().textSizeMultiplier += 0.1;
}
}
void MacWebKitHelpViewer::scaleDown()
{
AutoreleasePool pool; Q_UNUSED(pool)
@autoreleasepool {
m_widget->webView().textSizeMultiplier = qMax(0.1, m_widget->webView().textSizeMultiplier - 0.1);
}
}
void MacWebKitHelpViewer::resetScale()
{
AutoreleasePool pool; Q_UNUSED(pool)
@autoreleasepool {
m_widget->webView().textSizeMultiplier = 1.0;
}
}
qreal MacWebKitHelpViewer::scale() const
{
AutoreleasePool pool; Q_UNUSED(pool)
@autoreleasepool {
return m_widget->webView().textSizeMultiplier;
}
}
void MacWebKitHelpViewer::setScale(qreal scale)
@@ -567,24 +574,27 @@ void MacWebKitHelpViewer::setScale(qreal scale)
QString MacWebKitHelpViewer::title() const
{
AutoreleasePool pool; Q_UNUSED(pool)
@autoreleasepool {
return QString::fromNSString(m_widget->webView().mainFrameTitle);
}
}
QUrl MacWebKitHelpViewer::source() const
{
AutoreleasePool pool; Q_UNUSED(pool)
@autoreleasepool {
WebDataSource *dataSource = m_widget->webView().mainFrame.dataSource;
if (!dataSource)
dataSource = m_widget->webView().mainFrame.provisionalDataSource;
return QUrl::fromNSURL(dataSource.request.URL);
}
}
void MacWebKitHelpViewer::setSource(const QUrl &url)
{
AutoreleasePool pool; Q_UNUSED(pool)
@autoreleasepool {
ensureProtocolHandler();
[m_widget->webView().mainFrame loadRequest:[NSURLRequest requestWithURL:url.toNSURL()]];
}
}
void MacWebKitHelpViewer::scrollToAnchor(const QString &anchor)
@@ -596,33 +606,37 @@ void MacWebKitHelpViewer::scrollToAnchor(const QString &anchor)
void MacWebKitHelpViewer::setHtml(const QString &html)
{
AutoreleasePool pool; Q_UNUSED(pool)
@autoreleasepool {
[m_widget->webView().mainFrame
loadHTMLString:html.toNSString()
baseURL:[NSURL fileURLWithPath:Core::ICore::resourcePath().toNSString()]];
}
}
QString MacWebKitHelpViewer::selectedText() const
{
AutoreleasePool pool; Q_UNUSED(pool)
@autoreleasepool {
return QString::fromNSString(m_widget->webView().selectedDOMRange.text);
}
}
bool MacWebKitHelpViewer::isForwardAvailable() const
{
AutoreleasePool pool; Q_UNUSED(pool)
@autoreleasepool {
return m_widget->webView().canGoForward;
}
}
bool MacWebKitHelpViewer::isBackwardAvailable() const
{
AutoreleasePool pool; Q_UNUSED(pool)
@autoreleasepool {
return m_widget->webView().canGoBack;
}
}
void MacWebKitHelpViewer::addBackHistoryItems(QMenu *backMenu)
{
AutoreleasePool pool; Q_UNUSED(pool)
@autoreleasepool {
WebBackForwardList *list = m_widget->webView().backForwardList;
int backListCount = list.backListCount;
for (int i = 0; i < backListCount; ++i) {
@@ -633,11 +647,12 @@ void MacWebKitHelpViewer::addBackHistoryItems(QMenu *backMenu)
connect(action, SIGNAL(triggered()), this, SLOT(goToHistoryItem()));
backMenu->addAction(action);
}
}
}
void MacWebKitHelpViewer::addForwardHistoryItems(QMenu *forwardMenu)
{
AutoreleasePool pool; Q_UNUSED(pool)
@autoreleasepool {
WebBackForwardList *list = m_widget->webView().backForwardList;
int forwardListCount = list.forwardListCount;
for (int i = 0; i < forwardListCount; ++i) {
@@ -648,6 +663,7 @@ void MacWebKitHelpViewer::addForwardHistoryItems(QMenu *forwardMenu)
connect(action, SIGNAL(triggered()), this, SLOT(goToHistoryItem()));
forwardMenu->addAction(action);
}
}
}
void MacWebKitHelpViewer::setOpenInNewPageActionVisible(bool visible)
@@ -728,7 +744,7 @@ bool MacWebKitHelpViewer::findText(const QString &text, Core::FindFlags flags, b
{
Q_UNUSED(incremental);
Q_UNUSED(fromSearch);
AutoreleasePool pool; Q_UNUSED(pool)
@autoreleasepool {
if (wrapped)
*wrapped = false;
bool forward = !(flags & Core::FindBackward);
@@ -778,6 +794,7 @@ bool MacWebKitHelpViewer::findText(const QString &text, Core::FindFlags flags, b
[newSelection.startContainer.parentElement scrollIntoViewIfNeeded:YES];
return true;
}
}
return false;
}
@@ -793,18 +810,20 @@ void MacWebKitHelpViewer::stop()
void MacWebKitHelpViewer::forward()
{
AutoreleasePool pool; Q_UNUSED(pool)
@autoreleasepool {
[m_widget->webView() goForward];
emit forwardAvailable(isForwardAvailable());
emit backwardAvailable(isBackwardAvailable());
}
}
void MacWebKitHelpViewer::backward()
{
AutoreleasePool pool; Q_UNUSED(pool)
@autoreleasepool {
[m_widget->webView() goBack];
emit forwardAvailable(isForwardAvailable());
emit backwardAvailable(isBackwardAvailable());
}
}
void MacWebKitHelpViewer::print(QPrinter *printer)
@@ -826,7 +845,7 @@ void MacWebKitHelpViewer::slotLoadFinished()
void MacWebKitHelpViewer::goToHistoryItem()
{
AutoreleasePool pool; Q_UNUSED(pool)
@autoreleasepool {
QAction *action = qobject_cast<QAction *>(sender());
QTC_ASSERT(action, return);
bool ok = false;
@@ -838,6 +857,7 @@ void MacWebKitHelpViewer::goToHistoryItem()
[m_widget->webView() goToBackForwardItem:item];
emit forwardAvailable(isForwardAvailable());
emit backwardAvailable(isBackwardAvailable());
}
}
// #pragma mark -- MacResponderHack
@@ -858,13 +878,14 @@ void MacResponderHack::responderHack(QWidget *old, QWidget *now)
Q_UNUSED(old)
if (!now)
return;
AutoreleasePool pool; Q_UNUSED(pool)
@autoreleasepool {
NSView *view;
if (QMacCocoaViewContainer *viewContainer = qobject_cast<QMacCocoaViewContainer *>(now))
view = viewContainer->cocoaView();
else
view = (NSView *)now->effectiveWinId();
[view.window makeFirstResponder:view];
}
}
} // Internal