From 911cfcc587d7200f6a2c5bcce2360316a61b0fd7 Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <deathbaba@gmail.com>
Date: Wed, 6 Apr 2011 17:41:01 +0200
Subject: [PATCH] [ios] Fixed some memory issues

---
 iphone/Sloynik/Shared/ArticleVC.mm | 17 ++++++++++-------
 iphone/Sloynik/Shared/SearchVC.mm  | 20 +++++++++++++-------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/iphone/Sloynik/Shared/ArticleVC.mm b/iphone/Sloynik/Shared/ArticleVC.mm
index 437803c64a..f4d36c07f7 100644
--- a/iphone/Sloynik/Shared/ArticleVC.mm
+++ b/iphone/Sloynik/Shared/ArticleVC.mm
@@ -16,11 +16,11 @@
 
 - (void)dealloc
 {
-  self.webView = nil;
-  self.navBar = nil;
-  self.navSearch = nil;
-  self.navArticle = nil;
-  self.pinchGestureRecognizer = nil;
+  [webView release];
+  [navBar release];
+  [navSearch release];
+  [navArticle release];
+  [pinchGestureRecognizer release];
   [super dealloc];
 }
 
@@ -66,8 +66,8 @@
   self.navBar = [[[UINavigationBar alloc] initWithFrame:navBarFrame] autorelease];
   self.navBar.delegate = self;
   self.navBar.autoresizingMask = UIViewAutoresizingFlexibleWidth;
-  self.navSearch  = [[UINavigationItem alloc] initWithTitle:@"Search"];
-  self.navArticle = [[UINavigationItem alloc] initWithTitle:@""];
+  self.navSearch  = [[[UINavigationItem alloc] initWithTitle:@"Search"] autorelease];
+  self.navArticle = [[[UINavigationItem alloc] initWithTitle:@""] autorelease];
   [self.navBar pushNavigationItem:navSearch  animated:NO];
   [self.navBar pushNavigationItem:navArticle animated:NO];
 
@@ -97,6 +97,9 @@
 
   self.webView = nil;
   self.navBar = nil;
+  self.navSearch = nil;
+  self.navArticle = nil;
+  self.pinchGestureRecognizer = nil;
   [super viewDidUnload];
 }
 
diff --git a/iphone/Sloynik/Shared/SearchVC.mm b/iphone/Sloynik/Shared/SearchVC.mm
index 416f4295ce..dae63422a7 100644
--- a/iphone/Sloynik/Shared/SearchVC.mm
+++ b/iphone/Sloynik/Shared/SearchVC.mm
@@ -29,9 +29,10 @@ struct SloynikData
 - (void)dealloc
 {
   delete m_pSloynikData;
-  self.searchBar = nil;
-  self.resultsView = nil;
-  self.articleVC = nil;
+  [searchBar release];
+  [resultsView release];
+  [articleVC release];
+
   [super dealloc];
 }
 
@@ -44,11 +45,9 @@ struct SloynikData
 
   self.resultsView.dataSource = self;
   self.resultsView.delegate = self;
-
-  LogTimeCounter("StartTime", "SearchVC initializing.");
+  
   m_pSloynikData = new SloynikData;
   GetSloynikEngine()->Search("", m_pSloynikData->m_SearchResult);
-  LogTimeCounter("StartTime", "SearchVC initialized.");
 
   [self onEmptySearch];
 }
@@ -65,6 +64,9 @@ struct SloynikData
   [super viewDidUnload];
   // Release any retained subviews of the main view.
   // e.g. self.myOutlet = nil;
+  self.searchBar = nil;
+  self.resultsView = nil;
+  self.articleVC = nil;
 }
 
 - (void)searchBar:(UISearchBar *)sender textDidChange:(NSString *)searchText
@@ -141,7 +143,6 @@ struct SloynikData
     return nil;
 }
 
-
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
   sl::SloynikEngine::WordId const wordId = indexPath.row;
@@ -179,4 +180,9 @@ struct SloynikData
   self.resultsView.hidden = YES;
 }
 
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+  return YES;  // All orientations are supported.
+}
+
 @end