From aac85143da14fc028d1447ef6c2641df8954bc73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= Date: Thu, 3 Sep 2015 11:15:49 +0200 Subject: [PATCH] qt: drop legacy NSAutoreleasePool pattern --- modules/gui/qt4/util/searchlineedit_mac.mm | 31 ++++++++++------------ 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/modules/gui/qt4/util/searchlineedit_mac.mm b/modules/gui/qt4/util/searchlineedit_mac.mm index 6d4da6c4cb..3ab386288e 100644 --- a/modules/gui/qt4/util/searchlineedit_mac.mm +++ b/modules/gui/qt4/util/searchlineedit_mac.mm @@ -41,23 +41,20 @@ SearchLineEdit::SearchLineEdit(QWidget *parent) { // Many Cocoa objects create temporary autorelease objects, // so create a pool to catch them. - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - // Create the NSSearchField, set it on the QCocoaViewContainer. - NSSearchField *search = [[NSSearchField alloc] init]; - setCocoaView(search); - [[search cell] setPlaceholderString:@"Search..."]; - - // Use a Qt menu for the search field menu. - // NSMenu *nsMenu = searchMenu->macMenu(0); - // [[search cell] setSearchMenuTemplate:nsMenu]; - - // Release our reference, since our super class takes ownership and we - // don't need it anymore. - [search release]; - - // Clean up our pool as we no longer need it. - [pool release]; + @autoreleasepool { + // Create the NSSearchField, set it on the QCocoaViewContainer. + NSSearchField *search = [[NSSearchField alloc] init]; + setCocoaView(search); + [[search cell] setPlaceholderString:@"Search..."]; + + // Use a Qt menu for the search field menu. + // NSMenu *nsMenu = searchMenu->macMenu(0); + // [[search cell] setSearchMenuTemplate:nsMenu]; + + // Release our reference, since our super class takes ownership and we + // don't need it anymore. + [search release]; + } } //![0] -- GitLab