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

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

@@ -30,7 +30,6 @@
#include "fileutils_mac.h" #include "fileutils_mac.h"
#include "autoreleasepool.h"
#include "qtcassert.h" #include "qtcassert.h"
#include <QDir> #include <QDir>
@@ -44,45 +43,46 @@ namespace Internal {
QUrl filePathUrl(const QUrl &url) QUrl filePathUrl(const QUrl &url)
{ {
Utils::AutoreleasePool pool; Q_UNUSED(pool)
QUrl ret = url; QUrl ret = url;
NSURL *nsurl = url.toNSURL(); @autoreleasepool {
if ([nsurl isFileReferenceURL]) NSURL *nsurl = url.toNSURL();
ret = QUrl::fromNSURL([nsurl filePathURL]); if ([nsurl isFileReferenceURL])
ret = QUrl::fromNSURL([nsurl filePathURL]);
}
return ret; return ret;
} }
QString normalizePathName(const QString &filePath) 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 result;
QString path = QDir::cleanPath(filePath); @autoreleasepool {
// avoid empty paths and paths like "/../foo" or "/.." // NSURL getResourceValue returns values based on the cleaned path so we need to work on that.
if (path.isEmpty() || path.contains(QLatin1String("/../")) || path.endsWith(QLatin1String("/.."))) // It also returns the disk name for "/" and "/.." and errors on "" and relative paths,
return filePath; // so avoid that
while (path != QLatin1String("/") /*be defensive->*/&& path != QLatin1String(".") && !path.isEmpty()) { // we cannot know the normalized name for relative paths
QFileInfo info(path); if (QFileInfo(filePath).isRelative())
NSURL *nsurl = [NSURL fileURLWithPath:path.toNSString()]; return filePath;
NSString *out;
QString component; QString path = QDir::cleanPath(filePath);
if ([nsurl getResourceValue:(NSString **)&out forKey:NSURLNameKey error:nil]) // avoid empty paths and paths like "/../foo" or "/.."
component = QString::fromNSString(out); if (path.isEmpty() || path.contains(QLatin1String("/../")) || path.endsWith(QLatin1String("/..")))
else // e.g. if the full path does not exist return filePath;
component = info.fileName();
result.prepend(QLatin1Char('/') + component); while (path != QLatin1String("/") /*be defensive->*/&& path != QLatin1String(".") && !path.isEmpty()) {
path = info.path(); 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; return result;
} }

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

@@ -208,7 +208,7 @@ FORMS += $$PWD/filewizardpage.ui \
RESOURCES += $$PWD/utils.qrc RESOURCES += $$PWD/utils.qrc
osx { osx {
HEADERS += $$PWD/autoreleasepool.h \ HEADERS += \
$$PWD/fileutils_mac.h $$PWD/fileutils_mac.h
OBJECTIVE_SOURCES += \ OBJECTIVE_SOURCES += \
$$PWD/fileutils_mac.mm $$PWD/fileutils_mac.mm

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

@@ -30,7 +30,6 @@
#include "spotlightlocatorfilter.h" #include "spotlightlocatorfilter.h"
#include <utils/autoreleasepool.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <QMutex> #include <QMutex>
@@ -38,7 +37,6 @@
#include <QWaitCondition> #include <QWaitCondition>
#include <Foundation/NSArray.h> #include <Foundation/NSArray.h>
#include <Foundation/NSAutoreleasePool.h>
#include <Foundation/NSDictionary.h> #include <Foundation/NSDictionary.h>
#include <Foundation/NSMetadata.h> #include <Foundation/NSMetadata.h>
#include <Foundation/NSNotification.h> #include <Foundation/NSNotification.h>
@@ -85,33 +83,34 @@ SpotlightIterator::SpotlightIterator(const QString &expression)
m_queueIndex(-1), m_queueIndex(-1),
m_finished(false) m_finished(false)
{ {
Utils::AutoreleasePool pool; Q_UNUSED(pool) @autoreleasepool {
NSPredicate *predicate = [NSPredicate predicateWithFormat:expression.toNSString()]; NSPredicate *predicate = [NSPredicate predicateWithFormat:expression.toNSString()];
m_query = [[NSMetadataQuery alloc] init]; m_query = [[NSMetadataQuery alloc] init];
m_query.predicate = predicate; m_query.predicate = predicate;
m_query.searchScopes = [NSArray arrayWithObject:NSMetadataQueryLocalComputerScope]; m_query.searchScopes = [NSArray arrayWithObject:NSMetadataQueryLocalComputerScope];
m_queue = [[NSMutableArray alloc] init]; m_queue = [[NSMutableArray alloc] init];
m_progressObserver = [[[NSNotificationCenter defaultCenter] m_progressObserver = [[[NSNotificationCenter defaultCenter]
addObserverForName:NSMetadataQueryGatheringProgressNotification addObserverForName:NSMetadataQueryGatheringProgressNotification
object:m_query object:m_query
queue:nil queue:nil
usingBlock:^(NSNotification *note) { usingBlock:^(NSNotification *note) {
[m_query disableUpdates]; [m_query disableUpdates];
QMutexLocker lock(&m_mutex); Q_UNUSED(lock) QMutexLocker lock(&m_mutex); Q_UNUSED(lock)
[m_queue addObjectsFromArray:[note.userInfo objectForKey:(NSString *)kMDQueryUpdateAddedItems]]; [m_queue addObjectsFromArray:[note.userInfo objectForKey:(NSString *)kMDQueryUpdateAddedItems]];
[m_query enableUpdates]; [m_query enableUpdates];
m_waitForItems.wakeAll(); m_waitForItems.wakeAll();
}] retain]; }] retain];
m_finishObserver = [[[NSNotificationCenter defaultCenter] m_finishObserver = [[[NSNotificationCenter defaultCenter]
addObserverForName:NSMetadataQueryDidFinishGatheringNotification addObserverForName:NSMetadataQueryDidFinishGatheringNotification
object:m_query object:m_query
queue:nil queue:nil
usingBlock:^(NSNotification *) { usingBlock:^(NSNotification *) {
QMutexLocker lock(&m_mutex); Q_UNUSED(lock) QMutexLocker lock(&m_mutex); Q_UNUSED(lock)
m_finished = true; m_finished = true;
m_waitForItems.wakeAll(); m_waitForItems.wakeAll();
}] retain]; }] retain];
[m_query startQuery]; [m_query startQuery];
}
} }
SpotlightIterator::~SpotlightIterator() SpotlightIterator::~SpotlightIterator()
@@ -163,22 +162,23 @@ void SpotlightIterator::ensureNext()
return; return;
if (m_index >= 10000) // limit the amount of data that is passed on if (m_index >= 10000) // limit the amount of data that is passed on
return; return;
Utils::AutoreleasePool pool; Q_UNUSED(pool) @autoreleasepool {
// check if there are items in the queue, otherwise wait for some // check if there are items in the queue, otherwise wait for some
m_mutex.lock(); m_mutex.lock();
bool itemAvailable = (m_queueIndex + 1 < m_queue.count); bool itemAvailable = (m_queueIndex + 1 < m_queue.count);
if (!itemAvailable && !m_finished) { if (!itemAvailable && !m_finished) {
m_waitForItems.wait(&m_mutex); m_waitForItems.wait(&m_mutex);
itemAvailable = (m_queueIndex + 1 < m_queue.count); itemAvailable = (m_queueIndex + 1 < m_queue.count);
} }
if (itemAvailable) { if (itemAvailable) {
++m_queueIndex; ++m_queueIndex;
NSMetadataItem *item = [m_queue objectAtIndex:m_queueIndex]; NSMetadataItem *item = [m_queue objectAtIndex:m_queueIndex];
m_filePaths.append(QString::fromNSString([item valueForAttribute:NSMetadataItemPathKey])); m_filePaths.append(QString::fromNSString([item valueForAttribute:NSMetadataItemPathKey]));
m_fileNames.append(QString::fromNSString([item valueForAttribute:NSMetadataItemFSNameKey])); m_fileNames.append(QString::fromNSString([item valueForAttribute:NSMetadataItemFSNameKey]));
}
m_mutex.unlock();
} }
m_mutex.unlock();
} }
// #pragma mark -- SpotlightLocatorFilter // #pragma mark -- SpotlightLocatorFilter

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

@@ -34,7 +34,6 @@
#include "openpagesmanager.h" #include "openpagesmanager.h"
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <utils/autoreleasepool.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <QApplication> #include <QApplication>
@@ -437,18 +436,19 @@ MacWebKitHelpWidget::MacWebKitHelpWidget(MacWebKitHelpViewer *parent)
{ {
d->m_toolTipTimer.setSingleShot(true); d->m_toolTipTimer.setSingleShot(true);
connect(&d->m_toolTipTimer, &QTimer::timeout, this, &MacWebKitHelpWidget::showToolTip); connect(&d->m_toolTipTimer, &QTimer::timeout, this, &MacWebKitHelpWidget::showToolTip);
AutoreleasePool pool; Q_UNUSED(pool) @autoreleasepool {
d->m_webView = [[MyWebView alloc] init]; d->m_webView = [[MyWebView alloc] init];
// Turn layered rendering on. // Turn layered rendering on.
// Otherwise the WebView will render empty after any QQuickWidget was shown. // Otherwise the WebView will render empty after any QQuickWidget was shown.
d->m_webView.wantsLayer = YES; d->m_webView.wantsLayer = YES;
d->m_frameLoadDelegate = [[FrameLoadDelegate alloc] initWithMainFrame:d->m_webView.mainFrame d->m_frameLoadDelegate = [[FrameLoadDelegate alloc] initWithMainFrame:d->m_webView.mainFrame
viewer:parent]; viewer:parent];
[d->m_webView setFrameLoadDelegate:d->m_frameLoadDelegate]; [d->m_webView setFrameLoadDelegate:d->m_frameLoadDelegate];
d->m_uiDelegate = [[UIDelegate alloc] initWithWidget:this]; d->m_uiDelegate = [[UIDelegate alloc] initWithWidget:this];
[d->m_webView setUIDelegate:d->m_uiDelegate]; [d->m_webView setUIDelegate:d->m_uiDelegate];
setCocoaView(d->m_webView); setCocoaView(d->m_webView);
}
} }
MacWebKitHelpWidget::~MacWebKitHelpWidget() MacWebKitHelpWidget::~MacWebKitHelpWidget()
@@ -507,11 +507,12 @@ MacWebKitHelpViewer::MacWebKitHelpViewer(QWidget *parent)
new MacResponderHack(qApp); new MacResponderHack(qApp);
} }
AutoreleasePool pool; Q_UNUSED(pool) @autoreleasepool {
QVBoxLayout *layout = new QVBoxLayout; QVBoxLayout *layout = new QVBoxLayout;
setLayout(layout); setLayout(layout);
layout->setContentsMargins(0, 0, 0, 0); layout->setContentsMargins(0, 0, 0, 0);
layout->addWidget(m_widget, 10); layout->addWidget(m_widget, 10);
}
} }
MacWebKitHelpViewer::~MacWebKitHelpViewer() MacWebKitHelpViewer::~MacWebKitHelpViewer()
@@ -521,43 +522,49 @@ MacWebKitHelpViewer::~MacWebKitHelpViewer()
QFont MacWebKitHelpViewer::viewerFont() const QFont MacWebKitHelpViewer::viewerFont() const
{ {
AutoreleasePool pool; Q_UNUSED(pool) @autoreleasepool {
WebPreferences *preferences = m_widget->webView().preferences; WebPreferences *preferences = m_widget->webView().preferences;
QString family = QString::fromNSString([preferences standardFontFamily]); QString family = QString::fromNSString([preferences standardFontFamily]);
int size = [preferences defaultFontSize]; int size = [preferences defaultFontSize];
return QFont(family, size); return QFont(family, size);
}
} }
void MacWebKitHelpViewer::setViewerFont(const QFont &font) void MacWebKitHelpViewer::setViewerFont(const QFont &font)
{ {
AutoreleasePool pool; Q_UNUSED(pool) @autoreleasepool {
WebPreferences *preferences = m_widget->webView().preferences; WebPreferences *preferences = m_widget->webView().preferences;
[preferences setStandardFontFamily:font.family().toNSString()]; [preferences setStandardFontFamily:font.family().toNSString()];
[preferences setDefaultFontSize:font.pointSize()]; [preferences setDefaultFontSize:font.pointSize()];
}
} }
void MacWebKitHelpViewer::scaleUp() void MacWebKitHelpViewer::scaleUp()
{ {
AutoreleasePool pool; Q_UNUSED(pool) @autoreleasepool {
m_widget->webView().textSizeMultiplier += 0.1; m_widget->webView().textSizeMultiplier += 0.1;
}
} }
void MacWebKitHelpViewer::scaleDown() void MacWebKitHelpViewer::scaleDown()
{ {
AutoreleasePool pool; Q_UNUSED(pool) @autoreleasepool {
m_widget->webView().textSizeMultiplier = qMax(0.1, m_widget->webView().textSizeMultiplier - 0.1); m_widget->webView().textSizeMultiplier = qMax(0.1, m_widget->webView().textSizeMultiplier - 0.1);
}
} }
void MacWebKitHelpViewer::resetScale() void MacWebKitHelpViewer::resetScale()
{ {
AutoreleasePool pool; Q_UNUSED(pool) @autoreleasepool {
m_widget->webView().textSizeMultiplier = 1.0; m_widget->webView().textSizeMultiplier = 1.0;
}
} }
qreal MacWebKitHelpViewer::scale() const qreal MacWebKitHelpViewer::scale() const
{ {
AutoreleasePool pool; Q_UNUSED(pool) @autoreleasepool {
return m_widget->webView().textSizeMultiplier; return m_widget->webView().textSizeMultiplier;
}
} }
void MacWebKitHelpViewer::setScale(qreal scale) void MacWebKitHelpViewer::setScale(qreal scale)
@@ -567,24 +574,27 @@ void MacWebKitHelpViewer::setScale(qreal scale)
QString MacWebKitHelpViewer::title() const QString MacWebKitHelpViewer::title() const
{ {
AutoreleasePool pool; Q_UNUSED(pool) @autoreleasepool {
return QString::fromNSString(m_widget->webView().mainFrameTitle); return QString::fromNSString(m_widget->webView().mainFrameTitle);
}
} }
QUrl MacWebKitHelpViewer::source() const QUrl MacWebKitHelpViewer::source() const
{ {
AutoreleasePool pool; Q_UNUSED(pool) @autoreleasepool {
WebDataSource *dataSource = m_widget->webView().mainFrame.dataSource; WebDataSource *dataSource = m_widget->webView().mainFrame.dataSource;
if (!dataSource) if (!dataSource)
dataSource = m_widget->webView().mainFrame.provisionalDataSource; dataSource = m_widget->webView().mainFrame.provisionalDataSource;
return QUrl::fromNSURL(dataSource.request.URL); return QUrl::fromNSURL(dataSource.request.URL);
}
} }
void MacWebKitHelpViewer::setSource(const QUrl &url) void MacWebKitHelpViewer::setSource(const QUrl &url)
{ {
AutoreleasePool pool; Q_UNUSED(pool) @autoreleasepool {
ensureProtocolHandler(); ensureProtocolHandler();
[m_widget->webView().mainFrame loadRequest:[NSURLRequest requestWithURL:url.toNSURL()]]; [m_widget->webView().mainFrame loadRequest:[NSURLRequest requestWithURL:url.toNSURL()]];
}
} }
void MacWebKitHelpViewer::scrollToAnchor(const QString &anchor) void MacWebKitHelpViewer::scrollToAnchor(const QString &anchor)
@@ -596,57 +606,63 @@ void MacWebKitHelpViewer::scrollToAnchor(const QString &anchor)
void MacWebKitHelpViewer::setHtml(const QString &html) void MacWebKitHelpViewer::setHtml(const QString &html)
{ {
AutoreleasePool pool; Q_UNUSED(pool) @autoreleasepool {
[m_widget->webView().mainFrame [m_widget->webView().mainFrame
loadHTMLString:html.toNSString() loadHTMLString:html.toNSString()
baseURL:[NSURL fileURLWithPath:Core::ICore::resourcePath().toNSString()]]; baseURL:[NSURL fileURLWithPath:Core::ICore::resourcePath().toNSString()]];
}
} }
QString MacWebKitHelpViewer::selectedText() const QString MacWebKitHelpViewer::selectedText() const
{ {
AutoreleasePool pool; Q_UNUSED(pool) @autoreleasepool {
return QString::fromNSString(m_widget->webView().selectedDOMRange.text); return QString::fromNSString(m_widget->webView().selectedDOMRange.text);
}
} }
bool MacWebKitHelpViewer::isForwardAvailable() const bool MacWebKitHelpViewer::isForwardAvailable() const
{ {
AutoreleasePool pool; Q_UNUSED(pool) @autoreleasepool {
return m_widget->webView().canGoForward; return m_widget->webView().canGoForward;
}
} }
bool MacWebKitHelpViewer::isBackwardAvailable() const bool MacWebKitHelpViewer::isBackwardAvailable() const
{ {
AutoreleasePool pool; Q_UNUSED(pool) @autoreleasepool {
return m_widget->webView().canGoBack; return m_widget->webView().canGoBack;
}
} }
void MacWebKitHelpViewer::addBackHistoryItems(QMenu *backMenu) void MacWebKitHelpViewer::addBackHistoryItems(QMenu *backMenu)
{ {
AutoreleasePool pool; Q_UNUSED(pool) @autoreleasepool {
WebBackForwardList *list = m_widget->webView().backForwardList; WebBackForwardList *list = m_widget->webView().backForwardList;
int backListCount = list.backListCount; int backListCount = list.backListCount;
for (int i = 0; i < backListCount; ++i) { for (int i = 0; i < backListCount; ++i) {
int historyIndex = -(i+1); int historyIndex = -(i+1);
QAction *action = new QAction(backMenu); QAction *action = new QAction(backMenu);
action->setText(QString::fromNSString([list itemAtIndex:historyIndex].title)); action->setText(QString::fromNSString([list itemAtIndex:historyIndex].title));
action->setData(historyIndex); action->setData(historyIndex);
connect(action, SIGNAL(triggered()), this, SLOT(goToHistoryItem())); connect(action, SIGNAL(triggered()), this, SLOT(goToHistoryItem()));
backMenu->addAction(action); backMenu->addAction(action);
}
} }
} }
void MacWebKitHelpViewer::addForwardHistoryItems(QMenu *forwardMenu) void MacWebKitHelpViewer::addForwardHistoryItems(QMenu *forwardMenu)
{ {
AutoreleasePool pool; Q_UNUSED(pool) @autoreleasepool {
WebBackForwardList *list = m_widget->webView().backForwardList; WebBackForwardList *list = m_widget->webView().backForwardList;
int forwardListCount = list.forwardListCount; int forwardListCount = list.forwardListCount;
for (int i = 0; i < forwardListCount; ++i) { for (int i = 0; i < forwardListCount; ++i) {
int historyIndex = i + 1; int historyIndex = i + 1;
QAction *action = new QAction(forwardMenu); QAction *action = new QAction(forwardMenu);
action->setText(QString::fromNSString([list itemAtIndex:historyIndex].title)); action->setText(QString::fromNSString([list itemAtIndex:historyIndex].title));
action->setData(historyIndex); action->setData(historyIndex);
connect(action, SIGNAL(triggered()), this, SLOT(goToHistoryItem())); connect(action, SIGNAL(triggered()), this, SLOT(goToHistoryItem()));
forwardMenu->addAction(action); forwardMenu->addAction(action);
}
} }
} }
@@ -728,55 +744,56 @@ bool MacWebKitHelpViewer::findText(const QString &text, Core::FindFlags flags, b
{ {
Q_UNUSED(incremental); Q_UNUSED(incremental);
Q_UNUSED(fromSearch); Q_UNUSED(fromSearch);
AutoreleasePool pool; Q_UNUSED(pool) @autoreleasepool {
if (wrapped) if (wrapped)
*wrapped = false; *wrapped = false;
bool forward = !(flags & Core::FindBackward); bool forward = !(flags & Core::FindBackward);
bool caseSensitive = (flags & Core::FindCaseSensitively); bool caseSensitive = (flags & Core::FindCaseSensitively);
WebView *webView = m_widget->webView(); WebView *webView = m_widget->webView();
// WebView searchFor:.... grabs first responder, and when losing first responder afterwards, // WebView searchFor:.... grabs first responder, and when losing first responder afterwards,
// it removes the selection and forgets the search state, making it pretty useless for us // it removes the selection and forgets the search state, making it pretty useless for us
// define the start node and offset for the search // define the start node and offset for the search
DOMNode *start = nil; // default is search whole body DOMNode *start = nil; // default is search whole body
int startOffset = -1; int startOffset = -1;
DOMRange *selection = webView.selectedDOMRange; DOMRange *selection = webView.selectedDOMRange;
if (selection) { if (selection) {
if (QString::fromNSString(selection.text).compare( if (QString::fromNSString(selection.text).compare(
text, caseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive) != 0) { text, caseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive) != 0) {
// for incremental search we want to search from the beginning of the selection // for incremental search we want to search from the beginning of the selection
start = selection.startContainer;
startOffset = selection.startOffset;
} else {
// search for next occurrence
if (forward) {
start = selection.endContainer;
startOffset = selection.endOffset;
} else {
start = selection.startContainer; start = selection.startContainer;
startOffset = selection.startOffset; startOffset = selection.startOffset;
} else {
// search for next occurrence
if (forward) {
start = selection.endContainer;
startOffset = selection.endOffset;
} else {
start = selection.startContainer;
startOffset = selection.startOffset;
}
} }
} }
} DOMRange *newSelection = findText(text.toNSString(), forward, caseSensitive,
DOMRange *newSelection = findText(text.toNSString(), forward, caseSensitive, start, startOffset);
start, startOffset); if (!newSelection && start != nil) { // wrap
if (!newSelection && start != nil) { // wrap start = nil;
start = nil; startOffset = -1;
startOffset = -1; newSelection = findText(text.toNSString(), forward, caseSensitive,
newSelection = findText(text.toNSString(), forward, caseSensitive, start, startOffset);
start, startOffset); if (newSelection && wrapped)
if (newSelection && wrapped) *wrapped = true;
*wrapped = true; }
} if (newSelection) {
if (newSelection) { // found, select and scroll there
// found, select and scroll there [webView setSelectedDOMRange:newSelection affinity:NSSelectionAffinityDownstream];
[webView setSelectedDOMRange:newSelection affinity:NSSelectionAffinityDownstream]; if (forward)
if (forward) [newSelection.endContainer.parentElement scrollIntoViewIfNeeded:YES];
[newSelection.endContainer.parentElement scrollIntoViewIfNeeded:YES]; else
else [newSelection.startContainer.parentElement scrollIntoViewIfNeeded:YES];
[newSelection.startContainer.parentElement scrollIntoViewIfNeeded:YES]; return true;
return true; }
} }
return false; return false;
} }
@@ -793,18 +810,20 @@ void MacWebKitHelpViewer::stop()
void MacWebKitHelpViewer::forward() void MacWebKitHelpViewer::forward()
{ {
AutoreleasePool pool; Q_UNUSED(pool) @autoreleasepool {
[m_widget->webView() goForward]; [m_widget->webView() goForward];
emit forwardAvailable(isForwardAvailable()); emit forwardAvailable(isForwardAvailable());
emit backwardAvailable(isBackwardAvailable()); emit backwardAvailable(isBackwardAvailable());
}
} }
void MacWebKitHelpViewer::backward() void MacWebKitHelpViewer::backward()
{ {
AutoreleasePool pool; Q_UNUSED(pool) @autoreleasepool {
[m_widget->webView() goBack]; [m_widget->webView() goBack];
emit forwardAvailable(isForwardAvailable()); emit forwardAvailable(isForwardAvailable());
emit backwardAvailable(isBackwardAvailable()); emit backwardAvailable(isBackwardAvailable());
}
} }
void MacWebKitHelpViewer::print(QPrinter *printer) void MacWebKitHelpViewer::print(QPrinter *printer)
@@ -826,18 +845,19 @@ void MacWebKitHelpViewer::slotLoadFinished()
void MacWebKitHelpViewer::goToHistoryItem() void MacWebKitHelpViewer::goToHistoryItem()
{ {
AutoreleasePool pool; Q_UNUSED(pool) @autoreleasepool {
QAction *action = qobject_cast<QAction *>(sender()); QAction *action = qobject_cast<QAction *>(sender());
QTC_ASSERT(action, return); QTC_ASSERT(action, return);
bool ok = false; bool ok = false;
int index = action->data().toInt(&ok); int index = action->data().toInt(&ok);
QTC_ASSERT(ok, return); QTC_ASSERT(ok, return);
WebBackForwardList *list = m_widget->webView().backForwardList; WebBackForwardList *list = m_widget->webView().backForwardList;
WebHistoryItem *item = [list itemAtIndex:index]; WebHistoryItem *item = [list itemAtIndex:index];
QTC_ASSERT(item, return); QTC_ASSERT(item, return);
[m_widget->webView() goToBackForwardItem:item]; [m_widget->webView() goToBackForwardItem:item];
emit forwardAvailable(isForwardAvailable()); emit forwardAvailable(isForwardAvailable());
emit backwardAvailable(isBackwardAvailable()); emit backwardAvailable(isBackwardAvailable());
}
} }
// #pragma mark -- MacResponderHack // #pragma mark -- MacResponderHack
@@ -858,13 +878,14 @@ void MacResponderHack::responderHack(QWidget *old, QWidget *now)
Q_UNUSED(old) Q_UNUSED(old)
if (!now) if (!now)
return; return;
AutoreleasePool pool; Q_UNUSED(pool) @autoreleasepool {
NSView *view; NSView *view;
if (QMacCocoaViewContainer *viewContainer = qobject_cast<QMacCocoaViewContainer *>(now)) if (QMacCocoaViewContainer *viewContainer = qobject_cast<QMacCocoaViewContainer *>(now))
view = viewContainer->cocoaView(); view = viewContainer->cocoaView();
else else
view = (NSView *)now->effectiveWinId(); view = (NSView *)now->effectiveWinId();
[view.window makeFirstResponder:view]; [view.window makeFirstResponder:view];
}
} }
} // Internal } // Internal