@@ -99,11 +99,11 @@
  * OFXMLParser is an event-based XML parser which calls the delegate's callbacks
  * as soon asit finds something, thus suitable for streams as well.
  */
 @interface OFXMLParser: OFObject <OFStringXMLUnescapingDelegate>
 {
-	OFObject <OFXMLParserDelegate> *delegate;
+	id <OFXMLParserDelegate> delegate;
 	enum {
 		OF_XMLPARSER_OUTSIDE_TAG,
 		OF_XMLPARSER_TAG_OPENED,
 		OF_XMLPARSER_IN_PROLOG,
 		OF_XMLPARSER_IN_TAG_NAME,
@@ -139,11 +139,11 @@
 	char delim;
 	OFMutableArray *previous;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (retain) OFObject <OFXMLParserDelegate> *delegate;
+@property (retain) id <OFXMLParserDelegate> delegate;
 #endif
 
 /**
  * \return A new, autoreleased OFXMLParser
  */
@@ -150,18 +150,18 @@
 + parser;
 
 /**
  * \return The delegate that is used by the XML parser
  */
-- (OFObject <OFXMLParserDelegate>*)delegate;
+- (id <OFXMLParserDelegate>)delegate;
 
 /**
  * Sets the delegate the OFXMLParser should use.
  *
  * \param delegate The delegate to use
  */
-- (void)setDelegate: (OFObject <OFXMLParserDelegate>*)delegate;
+- (void)setDelegate: (id <OFXMLParserDelegate>)delegate;
 
 /**
  * Parses a buffer with the specified size.
  *
  * \param buf The buffer to parse