@@ -60,10 +60,25 @@ OFMessagePackRepresentation> #if !defined(OF_HAVE_GENERICS) && !defined(DOXYGEN) # define KeyType id # define ObjectType id #endif +/*! + * @brief An array of all keys. + */ +@property (readonly, nonatomic) OFArray OF_GENERIC(KeyType) *allKeys; + +/*! + * @brief An array of all objects. + */ +@property (readonly, nonatomic) OFArray OF_GENERIC(ObjectType) *allObjects; + +/*! + * @brief A URL-encoded string with the contents of the dictionary. + */ +@property (readonly, nonatomic) OFString *stringByURLEncoding; + /*! * @brief Creates a new OFDictionary. * * @return A new autoreleased OFDictionary */ @@ -119,25 +134,10 @@ * @return A new autoreleased OFDictionary */ + (instancetype)dictionaryWithKeysAndObjects: (KeyType)firstKey, ... OF_SENTINEL; -/*! - * @brief An array of all keys. - */ -@property (readonly, nonatomic) OFArray OF_GENERIC(KeyType) *allKeys; - -/*! - * @brief An array of all objects. - */ -@property (readonly, nonatomic) OFArray OF_GENERIC(ObjectType) *allObjects; - -/*! - * @brief 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