ObjFW  Diff

Differences From Artifact [d49cdb7650]:

To Artifact [a5f326cd7a]:


65
66
67
68
69
70
71
72
73

74
75
76
77
78
79
80
81
82
83














84
85
86
87
88
89

90
91
92
93
94

95
96
97
98

99
100
101
102
103
104
105

106
107
108
109
110
111
112
113
114













115
116
117
118
119
120
121


122
123
124
125
126

127
128
129
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
178

179
180

181
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

221
222
223
224
225
226
227

228
229
230
231
232

233
234

235
236
237
238

239
240

241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267

268
269
270
271
272
273

274
275
276
277

278
279
280
281
282
283
284
285
286
287
288
289

290
291
292
293
294
295
296
297
298
299
300
301
302
65
66
67
68
69
70
71


72
73
74
75
76






77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94


95
96
97
98
99

100




101

102
103
104
105


106
107
108
109
110





111
112
113
114
115
116
117
118
119
120
121
122
123

124
125
126
127


128
129
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
178
179

180


181
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
221
222
223

224




225
226
227
228
229
230
231
232
233
234
235
236

237



238
239
240
241
242
243
244
245
246
247







-
-
+




-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+




-
-
+




-
+
-
-
-
-
+
-




-
-
+




-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-




-
-
+
+




-
+
-
-
-
-
-
+
+




-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+




-
+
-
-
-
-
+
-
-
+






-
-
+
+





-
-
-
+
+
+
+
+
+

+
+
+
+
+
+
+
+
+
+
-
+
-
-
+






-
+
-



-
+

-
+
-
-
-
-
+
-
-
+






-
+
-



-
+

-
+
-
-
-
-
+
-
-
+






-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+





-
+
-
-
-
-
+











-
+
-
-
-










		return;
	}

	*category = [path substringToIndex: pos];
	*key = [path substringFromIndex: pos + 1];
}

- (void)setStringValue: (OFString *)string
	       forPath: (OFString *)path
- (void)setString: (OFString *)string forPath: (OFString *)path
{
	void *pool = objc_autoreleasePoolPush();
	OFString *category, *key;

	[self of_getCategory: &category
		      andKey: &key
		     forPath: path];

	[[_INIFile categoryForName: category] setStringValue: string
						      forKey: key];
	[self of_getCategory: &category andKey: &key forPath: path];
	[[_INIFile categoryForName: category] setString: string forKey: key];

	objc_autoreleasePoolPop(pool);
}

- (void)setLongLong: (long long)longLong forPath: (OFString *)path
{
	void *pool = objc_autoreleasePoolPush();
	OFString *category, *key;

	[self of_getCategory: &category andKey: &key forPath: path];
	[[_INIFile categoryForName: category] setLongLong: longLong
						   forKey: key];

	objc_autoreleasePoolPop(pool);
}

- (void)setLongLongValue: (long long)longLongValue
		 forPath: (OFString *)path
- (void)setBool: (bool)bool_ forPath: (OFString *)path
{
	void *pool = objc_autoreleasePoolPush();
	OFString *category, *key;

	[self of_getCategory: &category
	[self of_getCategory: &category andKey: &key forPath: path];
		      andKey: &key
		     forPath: path];

	[[_INIFile categoryForName: category] setLongLongValue: longLongValue
	[[_INIFile categoryForName: category] setBool: bool_ forKey: key];
							forKey: key];

	objc_autoreleasePoolPop(pool);
}

- (void)setBoolValue: (bool)boolValue
	     forPath: (OFString *)path
- (void)setFloat: (float)float_ forPath: (OFString *)path
{
	void *pool = objc_autoreleasePoolPush();
	OFString *category, *key;

	[self of_getCategory: &category
		      andKey: &key
		     forPath: path];

	[[_INIFile categoryForName: category] setBoolValue: boolValue
	[self of_getCategory: &category andKey: &key forPath: path];
	[[_INIFile categoryForName: category] setFloat: float_ forKey: key];

	objc_autoreleasePoolPop(pool);
}

- (void)setDouble: (double)double_ forPath: (OFString *)path
{
	void *pool = objc_autoreleasePoolPush();
	OFString *category, *key;

	[self of_getCategory: &category andKey: &key forPath: path];
	[[_INIFile categoryForName: category] setDouble: double_ forKey: key];
						    forKey: key];

	objc_autoreleasePoolPop(pool);
}

- (void)setFloatValue: (float)floatValue
	      forPath: (OFString *)path
- (void)setStringArray: (OFArray OF_GENERIC(OFString *) *)array
	       forPath: (OFString *)path
{
	void *pool = objc_autoreleasePoolPush();
	OFString *category, *key;

	[self of_getCategory: &category
	[self of_getCategory: &category andKey: &key forPath: path];
		      andKey: &key
		     forPath: path];

	[[_INIFile categoryForName: category] setFloatValue: floatValue
						     forKey: key];
	[[_INIFile categoryForName: category] setStringArray: array
						      forKey: key];

	objc_autoreleasePoolPop(pool);
}

- (void)setDoubleValue: (double)doubleValue
	       forPath: (OFString *)path
- (OFString *)stringForPath: (OFString *)path
{
	void *pool = objc_autoreleasePoolPush();
	OFString *category, *key;

	[self of_getCategory: &category
		      andKey: &key
		     forPath: path];

	[[_INIFile categoryForName: category] setDoubleValue: doubleValue
						      forKey: key];

	objc_autoreleasePoolPop(pool);
}

- (void)setStringValues: (OFArray OF_GENERIC(OFString *) *)stringValues
		forPath: (OFString *)path
{
	void *pool = objc_autoreleasePoolPush();
	OFString *category, *key;

	[self of_getCategory: &category
		      andKey: &key
		     forPath: path];

	[[_INIFile categoryForName: category] setStringValues: stringValues
						       forKey: key];

	objc_autoreleasePoolPop(pool);
}

- (OFString *)stringValueForPath: (OFString *)path
		    defaultValue: (OFString *)defaultValue
	       defaultValue: (OFString *)defaultValue
{
	void *pool = objc_autoreleasePoolPush();
	OFString *category, *key, *ret;

	[self of_getCategory: &category
	[self of_getCategory: &category andKey: &key forPath: path];
		      andKey: &key
		     forPath: path];

	ret = [[_INIFile categoryForName: category]
	ret = [[_INIFile categoryForName: category] stringForKey: key
	    stringValueForKey: key
		 defaultValue: defaultValue];
						    defaultValue: defaultValue];

	[ret retain];
	objc_autoreleasePoolPop(pool);
	return [ret autorelease];
}

- (long long)longLongValueForPath: (OFString *)path
		     defaultValue: (long long)defaultValue
- (long long)longLongForPath: (OFString *)path
		defaultValue: (long long)defaultValue
{
	void *pool = objc_autoreleasePoolPush();
	OFString *category, *key;
	long long ret;

	[self of_getCategory: &category
		      andKey: &key
		     forPath: path];
	[self of_getCategory: &category andKey: &key forPath: path];
	ret = [[_INIFile categoryForName: category]
	    longLongForKey: key
	      defaultValue: defaultValue];

	objc_autoreleasePoolPop(pool);

	return ret;
}

- (bool)boolForPath: (OFString *)path defaultValue: (bool)defaultValue
{
	void *pool = objc_autoreleasePoolPush();
	OFString *category, *key;
	bool ret;

	[self of_getCategory: &category andKey: &key forPath: path];
	ret = [[_INIFile categoryForName: category]
	ret = [[_INIFile categoryForName: category] boolForKey: key
	    longLongValueForKey: key
		   defaultValue: defaultValue];
						  defaultValue: defaultValue];

	objc_autoreleasePoolPop(pool);

	return ret;
}

- (bool)boolValueForPath: (OFString *)path
- (float)floatForPath: (OFString *)path defaultValue: (float)defaultValue
	    defaultValue: (bool)defaultValue
{
	void *pool = objc_autoreleasePoolPush();
	OFString *category, *key;
	bool ret;
	float ret;

	[self of_getCategory: &category
	[self of_getCategory: &category andKey: &key forPath: path];
		      andKey: &key
		     forPath: path];

	ret = [[_INIFile categoryForName: category]
	ret = [[_INIFile categoryForName: category] floatForKey: key
	    boolValueForKey: key
	       defaultValue: defaultValue];
						   defaultValue: defaultValue];

	objc_autoreleasePoolPop(pool);

	return ret;
}

- (float)floatValueForPath: (OFString *)path
- (double)doubleForPath: (OFString *)path defaultValue: (double)defaultValue
	      defaultValue: (float)defaultValue
{
	void *pool = objc_autoreleasePoolPush();
	OFString *category, *key;
	float ret;
	double ret;

	[self of_getCategory: &category
	[self of_getCategory: &category andKey: &key forPath: path];
		      andKey: &key
		     forPath: path];

	ret = [[_INIFile categoryForName: category]
	ret = [[_INIFile categoryForName: category] doubleForKey: key
	    floatValueForKey: key
		defaultValue: defaultValue];
						    defaultValue: defaultValue];

	objc_autoreleasePoolPop(pool);

	return ret;
}

- (double)doubleValueForPath: (OFString *)path
		defaultValue: (double)defaultValue
{
	void *pool = objc_autoreleasePoolPush();
	OFString *category, *key;
	double ret;

	[self of_getCategory: &category
		      andKey: &key
		     forPath: path];

	ret = [[_INIFile categoryForName: category]
	    doubleValueForKey: key
		 defaultValue: defaultValue];

	objc_autoreleasePoolPop(pool);

	return ret;
}

- (OFArray OF_GENERIC(OFString *) *)stringValuesForPath: (OFString *)path
- (OFArray OF_GENERIC(OFString *) *)stringArrayForPath: (OFString *)path
{
	void *pool = objc_autoreleasePoolPush();
	OFString *category, *key;
	OFArray *ret;

	[self of_getCategory: &category
	[self of_getCategory: &category andKey: &key forPath: path];
		      andKey: &key
		     forPath: path];

	ret = [[_INIFile categoryForName: category] stringValuesForKey: key];
	ret = [[_INIFile categoryForName: category] stringArrayForKey: key];

	[ret retain];
	objc_autoreleasePoolPop(pool);
	return [ret autorelease];
}

- (void)removeValueForPath: (OFString *)path
{
	void *pool = objc_autoreleasePoolPush();
	OFString *category, *key;

	[self of_getCategory: &category
	[self of_getCategory: &category andKey: &key forPath: path];
		      andKey: &key
		     forPath: path];

	[[_INIFile categoryForName: category] removeValueForKey: key];

	objc_autoreleasePoolPop(pool);
}

- (void)save
{
	[_INIFile writeToFile: _filePath];
}
@end