ObjFW  Diff

Differences From Artifact [5774d8a182]:

To Artifact [dd1d8a52aa]:


130
131
132
133
134
135
136
137

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
173
174
175
176
177
130
131
132
133
134
135
136

137
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
173
174
175
176
177







-
+




-
+




-
-
+
+





-
-
+
+





-
-
+
+







-
+







{
	if (self == [OFDictionary class])
		return (id)&placeholder;

	return [super alloc];
}

+ dictionary
+ (instancetype)dictionary
{
	return [[[self alloc] init] autorelease];
}

+ dictionaryWithDictionary: (OFDictionary*)dictionary
+ (instancetype)dictionaryWithDictionary: (OFDictionary*)dictionary
{
	return [[[self alloc] initWithDictionary: dictionary] autorelease];
}

+ dictionaryWithObject: (id)object
		forKey: (id)key
+ (instancetype)dictionaryWithObject: (id)object
			      forKey: (id)key
{
	return [[[self alloc] initWithObject: object
				      forKey: key] autorelease];
}

+ dictionaryWithObjects: (OFArray*)objects
		forKeys: (OFArray*)keys
+ (instancetype)dictionaryWithObjects: (OFArray*)objects
			      forKeys: (OFArray*)keys
{
	return [[[self alloc] initWithObjects: objects
				      forKeys: keys] autorelease];
}

+ dictionaryWithObjects: (id const*)objects
		forKeys: (id const*)keys
+ (instancetype)dictionaryWithObjects: (id const*)objects
			      forKeys: (id const*)keys
		  count: (size_t)count
{
	return [[[self alloc] initWithObjects: objects
				      forKeys: keys
					count: count] autorelease];
}

+ dictionaryWithKeysAndObjects: (id)firstKey, ...
+ (instancetype)dictionaryWithKeysAndObjects: (id)firstKey, ...
{
	id ret;
	va_list arguments;

	va_start(arguments, firstKey);
	ret = [[[self alloc] initWithKey: firstKey
			       arguments: arguments] autorelease];