@@ -40,11 +40,11 @@
 
 int
 of_application_main(int argc, char *argv[], Class cls)
 {
 	OFApplication *app;
-	id delegate = nil;
+	OFObject <OFApplicationDelegate> *delegate = nil;
 
 	if (cls != Nil)
 		delegate = [[cls alloc] init];
 
 	app = [OFApplication sharedApplication];
@@ -166,16 +166,16 @@
 - (OFDictionary*)environment
 {
 	return [[environment retain] autorelease];
 }
 
-- (id)delegate
+- (OFObject <OFApplicationDelegate>*)delegate
 {
 	return [[delegate retain] autorelease];
 }
 
-- (void)setDelegate: (id)delegate_
+- (void)setDelegate: (OFObject <OFApplicationDelegate>*)delegate_
 {
 	id old = delegate;
 	delegate = [delegate_ retain];
 	[old release];
 }