Overview
Context
Changes
Modified src/OFArray.h
from [b541f6a403]
to [f90f803ff9].
︙ | | |
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
|
432
433
434
435
436
437
438
439
440
441
442
443
444
445
|
-
-
-
-
-
-
-
-
-
|
*
* @param array The array with objects to add
* @return A new array with the objects from the specified array added
*/
- (OFArray OF_GENERIC(ObjectType) *)arrayByAddingObjectsFromArray:
(OFArray OF_GENERIC(ObjectType) *)array;
/**
* @brief Creates a new array with all occurrences of the specified object
* removed.
*
* @param object The object to remove
* @return A new array with all occurrences of the specified object removed
*/
- (OFArray OF_GENERIC(ObjectType) *)arrayByRemovingObject: (ObjectType)object;
#ifdef OF_HAVE_BLOCKS
/**
* @brief Executes a block for each object.
*
* @param block The block to execute for each object
*/
- (void)enumerateObjectsUsingBlock: (OFArrayEnumerationBlock)block;
|
︙ | | |
Modified src/OFArray.m
from [3f7a80c4c6]
to [7359b37923].
︙ | | |
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
|
811
812
813
814
815
816
817
818
819
820
821
822
823
824
|
-
-
-
-
-
-
-
-
|
OFMutableArray *ret = [[self mutableCopy] autorelease];
[ret addObjectsFromArray: array];
[ret makeImmutable];
return ret;
}
- (OFArray *)arrayByRemovingObject: (id)object
{
OFMutableArray *ret = [[self mutableCopy] autorelease];
[ret removeObject: object];
[ret makeImmutable];
return ret;
}
#ifdef OF_HAVE_BLOCKS
- (OFArray *)mappedArrayUsingBlock: (OFArrayMapBlock)block
{
OFArray *ret;
size_t count = self.count;
id *tmp = OFAllocMemory(count, sizeof(id));
|
︙ | | |
Modified src/OFLocale.h
from [ecd033e52b]
to [fcc8f077d2].
︙ | | |
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
|
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
|
-
+
|
/**
* @brief Initializes the current OFLocale.
*
* @warning This sets the locale via `setlocale()`!
*
* @warning You should never call this yourself, except if you do not use
* @ref OFApplication. In this case, you need to allocate exactly one
* instance of OFLocale, which will be come the current locale, and
* instance of OFLocale, which will become the current locale, and
* call this method.
*/
- (instancetype)init;
#ifdef OF_HAVE_FILES
/**
* @brief Adds a directory to scan for language files.
|
︙ | | |
Modified src/OFSet.h
from [d5a622be48]
to [4c0dd3a76f].
︙ | | |
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
|
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
|
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
|
* @brief Initializes an already allocated set with the specified objects.
*
* @param firstObject The first object for the set
* @return An initialized set with the specified objects
*/
- (instancetype)initWithObjects: (ObjectType)firstObject, ... OF_SENTINEL;
/**
* @brief Initializes an already allocated set with the specified objects.
*
* @param objects An array of objects for the set
* @param count The number of objects in the specified array
* @return An initialized set with the specified objects
*/
- (instancetype)initWithObjects: (ObjectType const _Nonnull *_Nonnull)objects
count: (size_t)count;
/**
* @brief Initializes an already allocated set with the specified object and
* va_list.
*
* @param firstObject The first object for the set
* @param arguments A va_list with the other objects
* @return An initialized set with the specified object and va_list
*/
- (instancetype)initWithObject: (ObjectType)firstObject
arguments: (va_list)arguments;
/**
* @brief Initializes an already allocated set with the specified objects.
*
* @param objects An array of objects for the set
* @param count The number of objects in the specified array
* @return An initialized set with the specified objects
*/
- (instancetype)initWithObjects: (ObjectType const _Nonnull *_Nonnull)objects
count: (size_t)count;
/**
* @brief Returns an OFEnumerator to enumerate through all objects of the set.
*
* @return An OFEnumerator to enumerate through all objects of the set
*/
- (OFEnumerator OF_GENERIC(ObjectType) *)objectEnumerator;
|
︙ | | |
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
|
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
|
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
|
* object in common.
*
* @return Whether the receiver and the specified set have at least one object
* in common
*/
- (bool)intersectsSet: (OFSet OF_GENERIC(ObjectType) *)set;
/**
* @brief Creates a new set which contains the objects which are in the
* receiver, but not in the specified set.
*
* @param set The set whose objects will not be in the new set
*/
- (OFSet OF_GENERIC(ObjectType) *)setBySubtractingSet:
(OFSet OF_GENERIC(ObjectType) *)set;
/**
* @brief Creates a new set by creating the intersection of the receiver and
* the specified set.
*
* @param set The set to intersect with
*/
- (OFSet OF_GENERIC(ObjectType) *)setByIntersectingWithSet:
(OFSet OF_GENERIC(ObjectType) *)set;
/**
* @brief Creates a new set by creating the union of the receiver and the
* specified set.
*
* @param set The set to create the union with
*/
- (OFSet OF_GENERIC(ObjectType) *)setByAddingSet:
- (OFSet OF_GENERIC(ObjectType) *)setByAddingObjectsFromSet:
(OFSet OF_GENERIC(ObjectType) *)set;
/**
* @brief Checks whether the set contains an object equal to the specified
* object.
*
* @param object The object which is checked for being in the set
|
︙ | | |
Modified src/OFSet.m
from [deacc26990]
to [c2dcb9f429].
︙ | | |
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
|
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
|
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
|
[element retain];
objc_autoreleasePoolPop(pool);
return [element autorelease];
}
- (OFSet *)setBySubtractingSet: (OFSet *)set
{
OFMutableSet *new = [[self mutableCopy] autorelease];
[new minusSet: set];
[new makeImmutable];
return new;
}
- (OFSet *)setByIntersectingWithSet: (OFSet *)set
{
OFMutableSet *new = [[self mutableCopy] autorelease];
[new intersectSet: set];
[new makeImmutable];
return new;
}
- (OFSet *)setByAddingSet: (OFSet *)set
- (OFSet *)setByAddingObjectsFromSet: (OFSet *)set
{
OFMutableSet *new = [[self mutableCopy] autorelease];
[new unionSet: set];
[new makeImmutable];
return new;
}
|
︙ | | |