dwindows: ios/dw.m comparison

comparison ios/dw.m @ 2395:2618277de356

iOS: Code error cleanup reported by LLVM.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Thu, 25 Mar 2021 09:04:59 +0000
parents	6669e152e30b
children	5bb3491ceba2

comparison

equal deleted inserted replaced

-:e0c63f2cbdbf
+:2618277de356
 @end
 @implementation DWObject
 -(id)init
 {
+self = [super init];
 hiddenWindow = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
 [hiddenWindow setBackgroundColor:[UIColor clearColor]];
 [hiddenWindow setWindowLevel:UIWindowLevelAlert];
 [hiddenWindow setHidden:YES];
-return [super init];
+return self;
 }
 -(void)uselessThread:(id)sender { /* Thread only to initialize threading */ }
 -(void)menuHandler:(id)param
 {
 _dw_event_handler(param, nil, 8);
 handler:^(UIAlertAction * action) { iResponse = 1; }];
 [alert addAction:action];
 if([params count] > 4)
 action = [UIAlertAction actionWithTitle:[params objectAtIndex:4] style:UIAlertActionStyleDefault
 handler:^(UIAlertAction * action) { iResponse = 2; }];
+[alert addAction:action];
 if([params count] > 5)
 action = [UIAlertAction actionWithTitle:[params objectAtIndex:5] style:UIAlertActionStyleDefault
 handler:^(UIAlertAction * action) { iResponse = 3; }];
+[alert addAction:action];
 /* Unhide our hidden window and make it key */
 [hiddenWindow setHidden:NO];
 [hiddenWindow makeKeyAndVisible];
 [[hiddenWindow rootViewController] presentViewController:alert animated:YES completion:nil];
 /* Once the dialog is gone we can rehide our window */
 [hiddenWindow setHidden:YES];
-[alert release];
 [params addObject:[NSNumber numberWithInteger:iResponse]];
 }
 -(void)safeCall:(SEL)sel withObject:(id)param
 {
 if([self respondsToSelector:sel])
 -(void)viewWillLayoutSubviews
 {
 DWWindow *window = (DWWindow *)[[self view] window];
 NSArray *array = [window subviews];
 DWView *view = [array firstObject];
+#if 0
 id object = [array lastObject];
 /* Remove the UITransitionView... for testing purposes */
 if(![object isMemberOfClass:[DWView class]])
 [object removeFromSuperview];
+#endif
 [view setFrame:[window frame]];
 [view windowResized:[window frame].size];
 }
 @end
 [object sizeToFit];
 frame.size = [object bounds].size;
 frame.size.width += 2.0;
 frame.size.height += 2.0;
 [sv setFrame:frame];
+size = frame.size;
 }
 else
 size = [object getsize];
 thiswidth = size.width;
 id image = handle;
 UIImage *bi = nil;
 bool bCanDraw = YES;
 if(pixmap)
-bi = image = (id)pixmap->image;
+bi = (id)pixmap->image;
 else
 {
 if([image isMemberOfClass:[DWRender class]])
 {
 DWRender *render = image;
 id image = handle;
 UIImage *bi = nil;
 bool bCanDraw = YES;
 if(pixmap)
-bi = image = (id)pixmap->image;
+bi = (id)pixmap->image;
 else
 {
 if([image isMemberOfClass:[DWRender class]])
 {
 DWRender *render = image;
 DWRender *render;
 bool bCanDraw = YES;
 if(pixmap)
 {
-bi = image = (id)pixmap->image;
+bi = (id)pixmap->image;
 font = pixmap->font;
 render = pixmap->handle;
 if(!font && [render isMemberOfClass:[DWRender class]])
 {
 font = [render font];
 }
-image = (id)pixmap->image;
 }
 else if(image && [image isMemberOfClass:[DWRender class]])
 {
 render = image;
 font = [render font];
 UIImage *bi = nil;
 bool bCanDraw = YES;
 int z;
 if(pixmap)
-bi = image = (id)pixmap->image;
+bi = (id)pixmap->image;
 else
 {
 if([image isMemberOfClass:[DWRender class]])
 {
 DWRender *render = image;
 id image = handle;
 UIImage *bi = nil;
 bool bCanDraw = YES;
 if(pixmap)
-bi = image = (id)pixmap->image;
+bi = (id)pixmap->image;
 else
 {
 if([image isMemberOfClass:[DWRender class]])
 {
 DWRender *render = image;
 id image = handle;
 UIImage *bi = nil;
 bool bCanDraw = YES;
 if(pixmap)
-bi = image = (id)pixmap->image;
+bi = (id)pixmap->image;
 else
 {
 if([image isMemberOfClass:[DWRender class]])
 {
 DWRender *render = image;
 DW_FUNCTION_INIT;
 DWContainer *cont = handle;
 UIScrollView *sv = [cont scrollview];
 int rowcount = (int)[cont numberOfRowsInSection:0];
 CGPoint offset = [sv contentOffset];
-float change;
 /* Safety check */
 if(rowcount < 1)
 {
 return;
 }
-change = (float)rows/(float)rowcount;
 switch(direction)
 {
 case DW_SCROLL_TOP:
 {
 [split setViewController:vc forColumn:UISplitViewControllerColumnSecondary];
 } else {
 [split addChildViewController:vc];
 }
 [tmpbox autorelease];
+[vc autorelease];
 #if 0 /* TODO: All iOS splitbars are vertical */
 [split setVertical:(type == DW_VERT ? YES : NO)];
 #endif
 /* Set the default percent to 50% split */
 [split setPercent:50.0];

Mercurial > dwindows

comparison ios/dw.m @ 2395:2618277de356