Differences From Artifact [fcf898c186]:
- File src/OFURL.m — part of check-in [e40729d406] at 2013-02-12 18:22:15 on branch trunk — Prefix all ivars with an underscore. (user: js, size: 10714) [annotate] [blame] [check-ins using]
To Artifact [269af2cde7]:
- File
src/OFURL.m
— part of check-in
[c5ef582958]
at
2013-03-04 17:20:15
on branch trunk
— Replace BOOL with bool.
The only places where BOOL is left are those where they are required by
the ABI. (user: js, size: 10761) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
285 286 287 288 289 290 291 | [_parameters release]; [_query release]; [_fragment release]; [super dealloc]; } | | | | | | | | | | | | | | 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 | [_parameters release]; [_query release]; [_fragment release]; [super dealloc]; } - (bool)isEqual: (id)object { OFURL *URL; if (![object isKindOfClass: [OFURL class]]) return false; URL = object; if (![URL->_scheme isEqual: _scheme]) return false; if (![URL->_host isEqual: _host]) return false; if (URL->_port != _port) return false; if (URL->_user != _user && ![URL->_user isEqual: _user]) return false; if (URL->_password != _password && ![URL->_password isEqual: _password]) return false; if (![URL->_path isEqual: _path]) return false; if (URL->_parameters != _parameters && ![URL->_parameters isEqual: _parameters]) return false; if (URL->_query != _query && ![URL->_query isEqual: _query]) return false; if (URL->_fragment != _fragment && ![URL->_fragment isEqual: _fragment]) return false; return true; } - (uint32_t)hash { uint32_t hash; OF_HASH_INIT(hash); |
︙ | ︙ | |||
366 367 368 369 370 371 372 | } return copy; } - (OFString*)scheme { | | | | | | | | | | | | | | | | | | 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 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 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 | } return copy; } - (OFString*)scheme { OF_GETTER(_scheme, true) } - (void)setScheme: (OFString*)scheme { if (![scheme isEqual: @"http"] && ![scheme isEqual: @"https"]) @throw [OFInvalidArgumentException exceptionWithClass: [self class] selector: _cmd]; OF_SETTER(_scheme, scheme, true, 1) } - (OFString*)host { OF_GETTER(_host, true) } - (void)setHost: (OFString*)host { OF_SETTER(_host, host, true, 1) } - (uint16_t)port { return _port; } - (void)setPort: (uint16_t)port { _port = port; } - (OFString*)user { OF_GETTER(_user, true) } - (void)setUser: (OFString*)user { OF_SETTER(_user, user, true, 1) } - (OFString*)password { OF_GETTER(_password, true) } - (void)setPassword: (OFString*)password { OF_SETTER(_password, password, true, 1) } - (OFString*)path { OF_GETTER(_path, true) } - (void)setPath: (OFString*)path { if (([_scheme isEqual: @"http"] || [_scheme isEqual: @"https"]) && ![path hasPrefix: @"/"]) @throw [OFInvalidArgumentException exceptionWithClass: [self class] selector: _cmd]; OF_SETTER(_path, path, true, 1) } - (OFString*)parameters { OF_GETTER(_parameters, true) } - (void)setParameters: (OFString*)parameters { OF_SETTER(_parameters, parameters, true, 1) } - (OFString*)query { OF_GETTER(_query, true) } - (void)setQuery: (OFString*)query { OF_SETTER(_query, query, true, 1) } - (OFString*)fragment { OF_GETTER(_fragment, true) } - (void)setFragment: (OFString*)fragment { OF_SETTER(_fragment, fragment, true, 1) } - (OFString*)string { OFMutableString *ret = [OFMutableString stringWithFormat: @"%@://", _scheme]; |
︙ | ︙ |