@@ -38,82 +38,82 @@
  * Creates a new OFArray with the specified object.
  *
  * \param obj An object
  * \return A new autoreleased OFArray
  */
-+ arrayWithObject: (OFObject*)obj;
++ arrayWithObject: (id)obj;
 
 /**
  * Creates a new OFArray with the specified objects, terminated by nil.
  *
  * \param first The first object in the array
  * \return A new autoreleased OFArray
  */
-+ arrayWithObjects: (OFObject*)first, ...;
++ arrayWithObjects: (id)first, ...;
 
 /**
  * Creates a new OFArray with the objects from the specified C array.
  *
  * \param objs A C array of objects, terminated with nil
  * \return A new autoreleased OFArray
  */
-+ arrayWithCArray: (OFObject**)objs;
++ arrayWithCArray: (id*)objs;
 
 /**
  * Creates a new OFArray with the objects from the specified C array of the
  * specified length.
  *
  * \param objs A C array of objects
  * \param len The length of the C array
  * \return A new autoreleased OFArray
  */
-+ arrayWithCArray: (OFObject**)objs
++ arrayWithCArray: (id*)objs
 	   length: (size_t)length;
 
 /**
  * Initializes an OFArray with the specified object.
  *
  * \param obj An object
  * \return An initialized OFArray
  */
-- initWithObject: (OFObject*)obj;
+- initWithObject: (id)obj;
 
 /**
  * Initializes an OFArray with the specified objects.
  *
  * \param first The first object
  * \return An initialized OFArray
  */
-- initWithObjects: (OFObject*)first, ...;
+- initWithObjects: (id)first, ...;
 
 /**
  * Initializes an OFArray with the specified object and a va_list.
  *
  * \param first The first object
  * \param args A va_list
  * \return An initialized OFArray
  */
-- initWithObject: (OFObject*)first
+- initWithObject: (id)first
 	 argList: (va_list)args;
 
 /**
  * Initializes an OFArray with the objects from the specified C array.
  *
  * \param objs A C array of objects, terminated with nil
  * \return An initialized OFArray
  */
-- initWithCArray: (OFObject**)objs;
+- initWithCArray: (id*)objs;
 
 /**
  * Initializes an OFArray with the objects from the specified C array of the
  * specified length.
  *
  * \param objs A C array of objects
  * \param len The length of the C array
  * \return An initialized OFArray
  */
-- initWithCArray: (OFObject**)objs
+- initWithCArray: (id*)objs
 	  length: (size_t)len;
 
 /**
  * \return The number of objects in the array
  */
@@ -140,21 +140,21 @@
  * object.
  *
  * \param obj The object whose index is returned
  * \return The index of the first object equivalent to the specified object
  */
-- (size_t)indexOfObject: (OFObject*)obj;
+- (size_t)indexOfObject: (id)obj;
 
 /**
  * Returns the index of the first object that has the same address as the
  * specified object.
  *
  * \param obj The object whose index is returned
  * \return The index of the first object that has the same aaddress as
  *	   the specified object
  */
-- (size_t)indexOfObjectIdenticalTo: (OFObject*)obj;
+- (size_t)indexOfObjectIdenticalTo: (id)obj;
 
 /**
  * Returns the first object of the array or nil.
  *
  * The returned object is <i>not</i> retained and autoreleased for performance