Index: src/OFApplication.h
==================================================================
--- src/OFApplication.h
+++ src/OFApplication.h
@@ -46,18 +46,18 @@
 @interface OFApplication: OFObject
 {
 	OFString *programName;
 	OFMutableArray *arguments;
 	OFMutableDictionary *environment;
-	id delegate;
+	OFObject <OFApplicationDelegate> *delegate;
 }
 
 #ifdef OF_HAVE_PROPERTIES
 @property (readonly, retain) OFString *programName;
 @property (readonly, retain) OFArray *arguments;
 @property (readonly, retain) OFDictionary *environment;
-@property (retain) id delegate;
+@property (retain) OFObject <OFApplicationDelegate> *delegate;
 #endif
 
 /**
  * \return The only OFApplication instance in the application
  */
@@ -117,18 +117,18 @@
 - (OFDictionary*)environment;
 
 /**
  * \return The delegate of the application
  */
-- (id)delegate;
+- (OFObject <OFApplicationDelegate>*)delegate;
 
 /**
  * Sets the delegate of the application.
  *
  * \param delegate The delegate for the application
  */
-- (void)setDelegate: (id)delegate;
+- (void)setDelegate: (OFObject <OFApplicationDelegate>*)delegate;
 
 /**
  * Starts the application after everything has been initialized.
  */
 - (void)run;

Index: src/OFApplication.m
==================================================================
--- src/OFApplication.m
+++ src/OFApplication.m
@@ -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];
 }