Revision: 6429
          http://skim-app.svn.sourceforge.net/skim-app/?rev=6429&view=rev
Author:   hofman
Date:     2010-04-07 00:09:38 +0000 (Wed, 07 Apr 2010)

Log Message:
-----------
retain some outlets in setters

Modified Paths:
--------------
    trunk/SKBookmarkController.h
    trunk/SKBookmarkController.m
    trunk/SKIBArray.h
    trunk/SKIBArray.m
    trunk/SKMainWindowController.h
    trunk/SKMainWindowController.m
    trunk/SKNotesDocument.h
    trunk/SKNotesDocument.m

Modified: trunk/SKBookmarkController.h
===================================================================
--- trunk/SKBookmarkController.h        2010-04-06 21:51:28 UTC (rev 6428)
+++ trunk/SKBookmarkController.h        2010-04-07 00:09:38 UTC (rev 6429)
@@ -55,7 +55,7 @@
 + (id)sharedBookmarkController;
 
 @property (nonatomic, assign) IBOutlet SKOutlineView *outlineView;
-...@property (nonatomic, assign) IBOutlet SKStatusBar *statusBar;
+...@property (nonatomic, retain) IBOutlet SKStatusBar *statusBar;
 @property (nonatomic, readonly) SKBookmark *bookmarkRoot;
 @property (nonatomic, readonly) NSArray *recentDocuments;
 

Modified: trunk/SKBookmarkController.m
===================================================================
--- trunk/SKBookmarkController.m        2010-04-06 21:51:28 UTC (rev 6428)
+++ trunk/SKBookmarkController.m        2010-04-07 00:09:38 UTC (rev 6429)
@@ -165,7 +165,6 @@
     
     [self setWindowFrameAutosaveName:SKBookmarksWindowFrameAutosaveName];
     
-    [statusBar retain];
     [[self window] setAutorecalculatesContentBorderThickness:NO 
forEdge:NSMinYEdge];
     if ([[NSUserDefaults standardUserDefaults] 
boolForKey:SKShowBookmarkStatusBarKey] == NO)
         [self toggleStatusBar:nil];

Modified: trunk/SKIBArray.h
===================================================================
--- trunk/SKIBArray.h   2010-04-06 21:51:28 UTC (rev 6428)
+++ trunk/SKIBArray.h   2010-04-07 00:09:38 UTC (rev 6429)
@@ -42,5 +42,5 @@
 @interface SKIBArray : NSArray {
     id object[9];
 }
-...@property (nonatomic, assign) IBOutlet id object1, object2, object3, 
object4, object5, object6, object7, object8, object9;
+...@property (nonatomic, retain) IBOutlet id object1, object2, object3, 
object4, object5, object6, object7, object8, object9;
 @end

Modified: trunk/SKIBArray.m
===================================================================
--- trunk/SKIBArray.m   2010-04-06 21:51:28 UTC (rev 6428)
+++ trunk/SKIBArray.m   2010-04-07 00:09:38 UTC (rev 6429)
@@ -45,7 +45,12 @@
 
 #define DEFINE_ACCESSORS(i) \
 - (id)object##i { return object[i-1]; } \
-- (void)setObject##i:(id)obj { object[i-1] = obj; }
+- (void)setObject##i:(id)obj { \
+    if (object[i-1] != obj) { \
+        [object[i-1] release]; \
+        object[i-1] = [obj retain]; \
+    } \
+}
 
 DEFINE_ACCESSORS(1)
 DEFINE_ACCESSORS(2)
@@ -57,6 +62,19 @@
 DEFINE_ACCESSORS(8)
 DEFINE_ACCESSORS(9)
 
+- (void)dealloc {
+    SKDESTROY(object[0]);
+    SKDESTROY(object[1]);
+    SKDESTROY(object[2]);
+    SKDESTROY(object[3]);
+    SKDESTROY(object[4]);
+    SKDESTROY(object[5]);
+    SKDESTROY(object[6]);
+    SKDESTROY(object[7]);
+    SKDESTROY(object[8]);
+    [super dealloc];
+}
+
 - (NSUInteger)count {
     NSUInteger i;
     for (i = 0; i < 9; i++)

Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h      2010-04-06 21:51:28 UTC (rev 6428)
+++ trunk/SKMainWindowController.h      2010-04-07 00:09:38 UTC (rev 6429)
@@ -183,14 +183,14 @@
 @property (nonatomic, assign) IBOutlet SKSplitView *splitView;
     
 @property (nonatomic, assign) IBOutlet NSView *centerContentView;
-...@property (nonatomic, assign) IBOutlet SKSplitView *pdfSplitView;
+...@property (nonatomic, retain) IBOutlet SKSplitView *pdfSplitView;
 @property (nonatomic, assign) IBOutlet NSView *pdfContentView;
-...@property (nonatomic, assign) IBOutlet SKPDFView *pdfView;
+...@property (nonatomic, retain) IBOutlet SKPDFView *pdfView;
 
-...@property (nonatomic, assign) IBOutlet SKLeftSideViewController 
*leftSideController;
-...@property (nonatomic, assign) IBOutlet SKRightSideViewController 
*rightSideController;
+...@property (nonatomic, retain) IBOutlet SKLeftSideViewController 
*leftSideController;
+...@property (nonatomic, retain) IBOutlet SKRightSideViewController 
*rightSideController;
     
-...@property (nonatomic, assign) IBOutlet SKMainToolbarController 
*toolbarController;
+...@property (nonatomic, retain) IBOutlet SKMainToolbarController 
*toolbarController;
     
 @property (nonatomic, assign) IBOutlet NSView *leftSideContentView, 
*rightSideContentView;
 

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m      2010-04-06 21:51:28 UTC (rev 6428)
+++ trunk/SKMainWindowController.m      2010-04-07 00:09:38 UTC (rev 6429)
@@ -297,6 +297,9 @@
     SKDESTROY(secondaryPdfContentView);
     SKDESTROY(presentationNotesDocument);
     SKDESTROY(noteTypeSheetController);
+    SKDESTROY(leftSideController);
+    SKDESTROY(rightSideController);
+    SKDESTROY(toolbarController);
     [super dealloc];
 }
 
@@ -371,8 +374,6 @@
     // Set up the window
     // we retain as we might replace it with the full screen window
     mainWindow = [[self window] retain];
-    [pdfView retain];
-    [pdfSplitView retain];
     
     [self setWindowFrameAutosaveNameOrCascade:SKMainWindowFrameAutosaveName];
     

Modified: trunk/SKNotesDocument.h
===================================================================
--- trunk/SKNotesDocument.h     2010-04-06 21:51:28 UTC (rev 6428)
+++ trunk/SKNotesDocument.h     2010-04-07 00:09:38 UTC (rev 6429)
@@ -46,8 +46,8 @@
 @interface SKNotesDocument : NSDocument <NSWindowDelegate, NSToolbarDelegate, 
SKNoteOutlineViewDelegate, NSOutlineViewDataSource, 
SKNoteTypeSheetControllerDelegate> {
     SKNoteOutlineView *outlineView;
     NSArrayController *arrayController;
-    SKStatusBar *statusBar;
     NSSearchField *searchField;
+    SKStatusBar *statusBar;
     NSMutableDictionary *toolbarItems;
     NSArray *notes;
     PDFDocument *pdfDocument;
@@ -59,7 +59,6 @@
 
 @property (nonatomic, assign) IBOutlet SKNoteOutlineView *outlineView;
 @property (nonatomic, assign) IBOutlet NSArrayController *arrayController;
-...@property (nonatomic, assign) IBOutlet SKStatusBar *statusBar;
 @property (nonatomic, assign) IBOutlet NSSearchField *searchField;
 @property (nonatomic, readonly) NSArray *notes;
 @property (nonatomic, readonly) PDFDocument *pdfDocument;

Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m     2010-04-06 21:51:28 UTC (rev 6428)
+++ trunk/SKNotesDocument.m     2010-04-07 00:09:38 UTC (rev 6429)
@@ -82,7 +82,7 @@
 
 @implementation SKNotesDocument
 
-...@synthesize outlineView, arrayController, statusBar, searchField, notes, 
pdfDocument;
+...@synthesize outlineView, arrayController, searchField, notes, pdfDocument;
 
 - (id)init {
     if (self = [super init]) {


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to