@@ -115,10 +115,25 @@ * @return A new autoreleased OFDictionary */ + (instancetype)dictionaryWithKeysAndObjects: (KeyType)firstKey, ... OF_SENTINEL; +/*! + * An array of all keys. + */ +@property (readonly, nonatomic) OFArray OF_GENERIC(KeyType) *allKeys; + +/*! + * An array of all objects. + */ +@property (readonly, nonatomic) OFArray OF_GENERIC(ObjectType) *allObjects; + +/*! + * A URL-encoded string with the contents of the dictionary. + */ +@property (readonly, nonatomic) OFString *stringByURLEncoding; + /*! * @brief Initializes an already allocated OFDictionary with the specified * OFDictionary. * * @param dictionary An OFDictionary @@ -241,31 +256,10 @@ * @return A boolean whether the dictionary contains an object with the * specified address */ - (bool)containsObjectIdenticalTo: (ObjectType)object; -/*! - * @brief Returns an array of all keys. - * - * @return An array of all keys - */ -- (OFArray OF_GENERIC(KeyType) *)allKeys; - -/*! - * @brief Returns an array of all objects. - * - * @return An array of all objects - */ -- (OFArray OF_GENERIC(ObjectType) *)allObjects; - -/*! - * @brief Creates a string by URL-encoding the contents of the dictionary. - * - * @return A URL-encoded string with the contents of the dictionary - */ -- (OFString *)stringByURLEncoding; - /*! * @brief Returns an OFEnumerator to enumerate through the dictionary's keys. * * @return An OFEnumerator to enumerate through the dictionary's keys */