Author: rmottola
Date: Wed Jun 1 18:35:46 2016
New Revision: 39834
URL: http://svn.gna.org/viewcvs/gnustep?rev=39834&view=rev
Log:
fix warnings
Modified:
apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/ImageViewer.h
apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/ImageViewer.m
apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/Resizer.h
apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/Resizer.m
Modified:
apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/ImageViewer.h
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/ImageViewer.h?rev=39834&r1=39833&r2=39834&view=diff
==============================================================================
--- apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/ImageViewer.h
(original)
+++ apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/ImageViewer.h
Wed Jun 1 18:35:46 2016
@@ -69,8 +69,6 @@
NSString *editPath;
NSConnection *conn;
- NSConnection *resizerConn;
- BOOL waitingResizer;
ImageResizer *resizer;
id <ContentInspectorProtocol>inspector;
@@ -78,9 +76,6 @@
NSNotificationCenter *nc;
NSWorkspace *ws;
}
-
-- (BOOL)connection:(NSConnection *)ancestor
-shouldMakeNewConnection:(NSConnection *)newConn;
- (void)connectionDidDie:(NSNotification *)notification;
Modified:
apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/ImageViewer.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/ImageViewer.m?rev=39834&r1=39833&r2=39834&view=diff
==============================================================================
--- apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/ImageViewer.m
(original)
+++ apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/ImageViewer.m
Wed Jun 1 18:35:46 2016
@@ -35,11 +35,7 @@
{
[nc removeObserver: self];
- if (resizerConn != nil) {
- DESTROY (resizer);
- DESTROY (resizerConn);
- }
-
+ DESTROY (resizer);
RELEASE (imagePath);
RELEASE (image);
RELEASE (nextPath);
@@ -140,7 +136,6 @@
valid = YES;
resizer = nil;
- waitingResizer = NO;
imagePath = nil;
nextPath = nil;
editPath = nil;
@@ -220,27 +215,11 @@
[anObject setProtocolForProxy: @protocol(ImageResizerProtocol)];
resizer = (ImageResizer *)anObject;
RETAIN (resizer);
- waitingResizer = NO;
[self addSubview: progView];
[progView start];
[resizer readImageAtPath: imagePath setSize: imsize];
}
-- (BOOL)connection:(NSConnection *)ancestor
-shouldMakeNewConnection:(NSConnection *)newConn
-{
- if (ancestor == conn) {
- ASSIGN (resizerConn, newConn);
- [resizerConn setDelegate: self];
-
- [nc addObserver: self
- selector: @selector(connectionDidDie:)
- name: NSConnectionDidDieNotification
- object: resizerConn];
- }
-
- return YES;
-}
- (void)connectionDidDie:(NSNotification *)notification
{
@@ -250,10 +229,8 @@
name: NSConnectionDidDieNotification
object: diedconn];
- if ((diedconn == conn) || (resizerConn && (diedconn == resizerConn))) {
+ if ((diedconn == conn)) {
DESTROY (resizer);
- DESTROY (resizerConn);
- waitingResizer = NO;
if ([[self subviews] containsObject: progView]) {
[progView stop];
Modified: apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/Resizer.h
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/Resizer.h?rev=39834&r1=39833&r2=39834&view=diff
==============================================================================
--- apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/Resizer.h
(original)
+++ apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/Resizer.h
Wed Jun 1 18:35:46 2016
@@ -31,8 +31,6 @@
}
-- (id)initWithConnectionName:(NSString *)cname;
-
- (void)readImageAtPath:(NSString *)path
setSize:(NSSize)imsize;
Modified: apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/Resizer.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/Resizer.m?rev=39834&r1=39833&r2=39834&view=diff
==============================================================================
--- apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/Resizer.m
(original)
+++ apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/Resizer.m
Wed Jun 1 18:35:46 2016
@@ -37,7 +37,7 @@
- (oneway void)setResizer:(id)anObject;
-- (oneway void)imageReady:(NSData *)data;
+- (oneway void)imageReady:(NSDictionary *)dict;
@end
@@ -60,7 +60,7 @@
serverObject = [[self alloc] init];
if (serverObject)
{
- [[serverConnection rootProxy] setServer:serverObject];
+ [(id)[serverConnection rootProxy] setServer:serverObject];
[serverObject release];
[[NSRunLoop currentRunLoop] run];
}
@@ -191,7 +191,7 @@
RELEASE (srcImage);
}
- [[serverConnection rootProxy] imageReady: info];
+ [(id <ImageViewerProtocol>)[serverConnection rootProxy] imageReady: info];
RELEASE (arp);
}
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
