ObjFW  Check-in [86c9b66b16]

Overview
Comment:OF(MutableDictionary): Use id <OFCopying> where appropriate.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 86c9b66b16e12a44d78b630950362fb93134e6150d79f84a292620d06528aadc
User & Date: js on 2011-05-08 18:35:48
Other Links: manifest | tags
Context
2011-05-08
18:36
More documentation improvements. check-in: 5192af129b user: js tags: trunk
18:35
OF(MutableDictionary): Use id <OFCopying> where appropriate. check-in: 86c9b66b16 user: js tags: trunk
18:32
OFNumber: Explicitly use signed and improve documentation. check-in: eb2402a77a user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified src/OFDictionary.h from [2c4b841ea9] to [59c7da2130].

︙︙
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167

 *
 * The returned object is <i>not</i> retained and autoreleased for performance
 * reasons!
 *
 * \param key The key whose object should be returned
 * \return The object for the given key or nil if the key was not found
 */
- (id)objectForKey: (id)key;

/**
 * \brief Returns an OFEnumerator to enumerate through the dictionary's keys.
 *
 * \return An OFEnumerator to enumerate through the dictionary's keys
 */
- (OFEnumerator*)keyEnumerator;








|








153
154
155
156
157
158
159
160
161
162
163
164
165
166
167

 *
 * The returned object is <i>not</i> retained and autoreleased for performance
 * reasons!
 *
 * \param key The key whose object should be returned
 * \return The object for the given key or nil if the key was not found
 */
- (id)objectForKey: (id <OFCopying>)key;

/**
 * \brief Returns an OFEnumerator to enumerate through the dictionary's keys.
 *
 * \return An OFEnumerator to enumerate through the dictionary's keys
 */
- (OFEnumerator*)keyEnumerator;
︙︙

Modified src/OFDictionary.m from [8c80e7b8f4] to [79d7aef834].

︙︙
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483

		[self release];
		@throw e;
	}

	return self;
}

- (id)objectForKey: (id)key
{
	uint32_t i, hash, last;

	if (key == nil)
		@throw [OFInvalidArgumentException newWithClass: isa
						       selector: _cmd];









|








469
470
471
472
473
474
475
476
477
478
479
480
481
482
483

		[self release];
		@throw e;
	}

	return self;
}

- (id)objectForKey: (id <OFCopying>)key
{
	uint32_t i, hash, last;

	if (key == nil)
		@throw [OFInvalidArgumentException newWithClass: isa
						       selector: _cmd];
︙︙

Modified src/OFMutableDictionary.h from [b7198b1755] to [17f7dd7a1c].

︙︙
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54

	   forKey: (id <OFCopying>)key;

/**
 * \brief Removes the object for the specified key from the dictionary.
 *
 * \param key The key whose object should be removed
 */
- (void)removeObjectForKey: (id)key;

#ifdef OF_HAVE_BLOCKS
/**
 * \brief Replaces each object with the object returned by the block.
 *
 * \param block The block which returns a new object for each object
 */








|








40
41
42
43
44
45
46
47
48
49
50
51
52
53
54

	   forKey: (id <OFCopying>)key;

/**
 * \brief Removes the object for the specified key from the dictionary.
 *
 * \param key The key whose object should be removed
 */
- (void)removeObjectForKey: (id <OFCopying>)key;

#ifdef OF_HAVE_BLOCKS
/**
 * \brief Replaces each object with the object returned by the block.
 *
 * \param block The block which returns a new object for each object
 */
︙︙

Modified src/OFMutableDictionary.m from [0467bbb9de] to [9f66c7a554].

︙︙
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186

	}

	old = data[i]->object;
	data[i]->object = [object retain];
	[old release];
}

- (void)removeObjectForKey: (id)key
{
	uint32_t i, hash, last;

	if (key == nil)
		@throw [OFInvalidArgumentException newWithClass: isa
						       selector: _cmd];









|








172
173
174
175
176
177
178
179
180
181
182
183
184
185
186

	}

	old = data[i]->object;
	data[i]->object = [object retain];
	[old release];
}

- (void)removeObjectForKey: (id <OFCopying>)key
{
	uint32_t i, hash, last;

	if (key == nil)
		@throw [OFInvalidArgumentException newWithClass: isa
						       selector: _cmd];
︙︙